From ffdd7000a409902be367b4fea809fbaa7b91848b Mon Sep 17 00:00:00 2001 From: mh03r932 Date: Fri, 17 Jul 2020 12:08:51 +0200 Subject: [PATCH] fix: make accept header consistent with sync vers. (#6922) * fix: make accept header of async apis consistent with sync version * make sync and async version use same logic * generate samples for csharp-netcore using generate-samples.sh * fix: make accept header of async apis consistent with sync version * change tabs to spaces to match existing code --- .../resources/csharp-netcore/api.mustache | 13 +- .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 13 +- .../src/Org.OpenAPITools/Api/FakeApi.cs | 182 ++++++++++-------- .../Api/FakeClassnameTags123Api.cs | 13 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 117 +++++------ .../src/Org.OpenAPITools/Api/StoreApi.cs | 52 ++--- .../src/Org.OpenAPITools/Api/UserApi.cs | 104 +++++----- 7 files changed, 266 insertions(+), 228 deletions(-) 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 4f968e5a79a..644c038885a 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/api.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/api.mustache @@ -418,12 +418,13 @@ namespace {{packageName}}.{{apiPackage}} "{{{mediaType}}}"{{#hasMore}},{{/hasMore}} {{/produces}} }; - - foreach (var _contentType in _contentTypes) - localVarRequestOptions.HeaderParameters.Add("Content-Type", _contentType); - - foreach (var _accept in _accepts) - localVarRequestOptions.HeaderParameters.Add("Accept", _accept); + + + 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}} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index e7895f13c62..99156f92d28 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -290,12 +290,13 @@ namespace Org.OpenAPITools.Api String[] _accepts = new String[] { "application/json" }; - - foreach (var _contentType in _contentTypes) - localVarRequestOptions.HeaderParameters.Add("Content-Type", _contentType); - - foreach (var _accept in _accepts) - localVarRequestOptions.HeaderParameters.Add("Accept", _accept); + + + 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; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs index 10fd8f0804c..55ac584e8a7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs @@ -966,12 +966,13 @@ namespace Org.OpenAPITools.Api // to determine the Accept header String[] _accepts = new String[] { }; - - foreach (var _contentType in _contentTypes) - localVarRequestOptions.HeaderParameters.Add("Content-Type", _contentType); - - foreach (var _accept in _accepts) - localVarRequestOptions.HeaderParameters.Add("Accept", _accept); + + + 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 = xmlItem; @@ -1071,12 +1072,13 @@ namespace Org.OpenAPITools.Api String[] _accepts = new String[] { "*/*" }; - - foreach (var _contentType in _contentTypes) - localVarRequestOptions.HeaderParameters.Add("Content-Type", _contentType); - - foreach (var _accept in _accepts) - localVarRequestOptions.HeaderParameters.Add("Accept", _accept); + + + 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; @@ -1176,12 +1178,13 @@ namespace Org.OpenAPITools.Api String[] _accepts = new String[] { "*/*" }; - - foreach (var _contentType in _contentTypes) - localVarRequestOptions.HeaderParameters.Add("Content-Type", _contentType); - - foreach (var _accept in _accepts) - localVarRequestOptions.HeaderParameters.Add("Accept", _accept); + + + 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; @@ -1281,12 +1284,13 @@ namespace Org.OpenAPITools.Api String[] _accepts = new String[] { "*/*" }; - - foreach (var _contentType in _contentTypes) - localVarRequestOptions.HeaderParameters.Add("Content-Type", _contentType); - - foreach (var _accept in _accepts) - localVarRequestOptions.HeaderParameters.Add("Accept", _accept); + + + 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; @@ -1386,12 +1390,13 @@ namespace Org.OpenAPITools.Api String[] _accepts = new String[] { "*/*" }; - - foreach (var _contentType in _contentTypes) - localVarRequestOptions.HeaderParameters.Add("Content-Type", _contentType); - - foreach (var _accept in _accepts) - localVarRequestOptions.HeaderParameters.Add("Accept", _accept); + + + 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; @@ -1497,12 +1502,13 @@ namespace Org.OpenAPITools.Api // to determine the Accept header String[] _accepts = new String[] { }; - - foreach (var _contentType in _contentTypes) - localVarRequestOptions.HeaderParameters.Add("Content-Type", _contentType); - - foreach (var _accept in _accepts) - localVarRequestOptions.HeaderParameters.Add("Accept", _accept); + + + 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; @@ -1621,12 +1627,13 @@ namespace Org.OpenAPITools.Api // to determine the Accept header String[] _accepts = new String[] { }; - - foreach (var _contentType in _contentTypes) - localVarRequestOptions.HeaderParameters.Add("Content-Type", _contentType); - - foreach (var _accept in _accepts) - localVarRequestOptions.HeaderParameters.Add("Accept", _accept); + + + 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 = body; @@ -1737,12 +1744,13 @@ namespace Org.OpenAPITools.Api String[] _accepts = new String[] { "application/json" }; - - foreach (var _contentType in _contentTypes) - localVarRequestOptions.HeaderParameters.Add("Content-Type", _contentType); - - foreach (var _accept in _accepts) - localVarRequestOptions.HeaderParameters.Add("Accept", _accept); + + + 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; @@ -1957,12 +1965,13 @@ namespace Org.OpenAPITools.Api // to determine the Accept header String[] _accepts = new String[] { }; - - foreach (var _contentType in _contentTypes) - localVarRequestOptions.HeaderParameters.Add("Content-Type", _contentType); - - foreach (var _accept in _accepts) - localVarRequestOptions.HeaderParameters.Add("Accept", _accept); + + + 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) { @@ -2168,12 +2177,13 @@ namespace Org.OpenAPITools.Api // to determine the Accept header String[] _accepts = new String[] { }; - - foreach (var _contentType in _contentTypes) - localVarRequestOptions.HeaderParameters.Add("Content-Type", _contentType); - - foreach (var _accept in _accepts) - localVarRequestOptions.HeaderParameters.Add("Accept", _accept); + + + 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) { @@ -2334,12 +2344,13 @@ namespace Org.OpenAPITools.Api // to determine the Accept header String[] _accepts = new String[] { }; - - foreach (var _contentType in _contentTypes) - localVarRequestOptions.HeaderParameters.Add("Content-Type", _contentType); - - foreach (var _accept in _accepts) - localVarRequestOptions.HeaderParameters.Add("Accept", _accept); + + + 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)); @@ -2459,12 +2470,13 @@ namespace Org.OpenAPITools.Api // to determine the Accept header String[] _accepts = new String[] { }; - - foreach (var _contentType in _contentTypes) - localVarRequestOptions.HeaderParameters.Add("Content-Type", _contentType); - - foreach (var _accept in _accepts) - localVarRequestOptions.HeaderParameters.Add("Accept", _accept); + + + 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 = param; @@ -2583,12 +2595,13 @@ namespace Org.OpenAPITools.Api // to determine the Accept header String[] _accepts = new String[] { }; - - foreach (var _contentType in _contentTypes) - localVarRequestOptions.HeaderParameters.Add("Content-Type", _contentType); - - foreach (var _accept in _accepts) - localVarRequestOptions.HeaderParameters.Add("Accept", _accept); + + + 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 @@ -2745,12 +2758,13 @@ namespace Org.OpenAPITools.Api // to determine the Accept header String[] _accepts = new String[] { }; - - foreach (var _contentType in _contentTypes) - localVarRequestOptions.HeaderParameters.Add("Content-Type", _contentType); - - foreach (var _accept in _accepts) - localVarRequestOptions.HeaderParameters.Add("Accept", _accept); + + + 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", "pipe", pipe)); localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("csv", "ioutil", ioutil)); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index 492bae795c4..b663807131f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -295,12 +295,13 @@ namespace Org.OpenAPITools.Api String[] _accepts = new String[] { "application/json" }; - - foreach (var _contentType in _contentTypes) - localVarRequestOptions.HeaderParameters.Add("Content-Type", _contentType); - - foreach (var _accept in _accepts) - localVarRequestOptions.HeaderParameters.Add("Accept", _accept); + + + 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; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/PetApi.cs index 502c7f25268..6c50956c4ad 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/PetApi.cs @@ -658,12 +658,13 @@ namespace Org.OpenAPITools.Api // to determine the Accept header String[] _accepts = new String[] { }; - - foreach (var _contentType in _contentTypes) - localVarRequestOptions.HeaderParameters.Add("Content-Type", _contentType); - - foreach (var _accept in _accepts) - localVarRequestOptions.HeaderParameters.Add("Accept", _accept); + + + 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; @@ -779,12 +780,13 @@ namespace Org.OpenAPITools.Api // to determine the Accept header String[] _accepts = new String[] { }; - - foreach (var _contentType in _contentTypes) - localVarRequestOptions.HeaderParameters.Add("Content-Type", _contentType); - - foreach (var _accept in _accepts) - localVarRequestOptions.HeaderParameters.Add("Accept", _accept); + + + 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) @@ -910,12 +912,13 @@ namespace Org.OpenAPITools.Api "application/xml", "application/json" }; - - foreach (var _contentType in _contentTypes) - localVarRequestOptions.HeaderParameters.Add("Content-Type", _contentType); - - foreach (var _accept in _accepts) - localVarRequestOptions.HeaderParameters.Add("Accept", _accept); + + + 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)); @@ -1037,12 +1040,13 @@ namespace Org.OpenAPITools.Api "application/xml", "application/json" }; - - foreach (var _contentType in _contentTypes) - localVarRequestOptions.HeaderParameters.Add("Content-Type", _contentType); - - foreach (var _accept in _accepts) - localVarRequestOptions.HeaderParameters.Add("Accept", _accept); + + + 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)); @@ -1155,12 +1159,13 @@ namespace Org.OpenAPITools.Api "application/xml", "application/json" }; - - foreach (var _contentType in _contentTypes) - localVarRequestOptions.HeaderParameters.Add("Content-Type", _contentType); - - foreach (var _accept in _accepts) - localVarRequestOptions.HeaderParameters.Add("Accept", _accept); + + + 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 @@ -1279,12 +1284,13 @@ namespace Org.OpenAPITools.Api // to determine the Accept header String[] _accepts = new String[] { }; - - foreach (var _contentType in _contentTypes) - localVarRequestOptions.HeaderParameters.Add("Content-Type", _contentType); - - foreach (var _accept in _accepts) - localVarRequestOptions.HeaderParameters.Add("Accept", _accept); + + + 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; @@ -1410,12 +1416,13 @@ namespace Org.OpenAPITools.Api // to determine the Accept header String[] _accepts = new String[] { }; - - foreach (var _contentType in _contentTypes) - localVarRequestOptions.HeaderParameters.Add("Content-Type", _contentType); - - foreach (var _accept in _accepts) - localVarRequestOptions.HeaderParameters.Add("Accept", _accept); + + + 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) @@ -1553,12 +1560,13 @@ namespace Org.OpenAPITools.Api String[] _accepts = new String[] { "application/json" }; - - foreach (var _contentType in _contentTypes) - localVarRequestOptions.HeaderParameters.Add("Content-Type", _contentType); - - foreach (var _accept in _accepts) - localVarRequestOptions.HeaderParameters.Add("Accept", _accept); + + + 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) @@ -1701,12 +1709,13 @@ namespace Org.OpenAPITools.Api String[] _accepts = new String[] { "application/json" }; - - foreach (var _contentType in _contentTypes) - localVarRequestOptions.HeaderParameters.Add("Content-Type", _contentType); - - foreach (var _accept in _accepts) - localVarRequestOptions.HeaderParameters.Add("Accept", _accept); + + + 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) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/StoreApi.cs index 40f9fb0fab3..a7379d4eac1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/StoreApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/StoreApi.cs @@ -406,12 +406,13 @@ namespace Org.OpenAPITools.Api // to determine the Accept header String[] _accepts = new String[] { }; - - foreach (var _contentType in _contentTypes) - localVarRequestOptions.HeaderParameters.Add("Content-Type", _contentType); - - foreach (var _accept in _accepts) - localVarRequestOptions.HeaderParameters.Add("Accept", _accept); + + + 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 @@ -511,12 +512,13 @@ namespace Org.OpenAPITools.Api String[] _accepts = new String[] { "application/json" }; - - foreach (var _contentType in _contentTypes) - localVarRequestOptions.HeaderParameters.Add("Content-Type", _contentType); - - foreach (var _accept in _accepts) - localVarRequestOptions.HeaderParameters.Add("Accept", _accept); + + + 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 @@ -622,12 +624,13 @@ namespace Org.OpenAPITools.Api "application/xml", "application/json" }; - - foreach (var _contentType in _contentTypes) - localVarRequestOptions.HeaderParameters.Add("Content-Type", _contentType); - - foreach (var _accept in _accepts) - localVarRequestOptions.HeaderParameters.Add("Accept", _accept); + + + 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 @@ -737,12 +740,13 @@ namespace Org.OpenAPITools.Api "application/xml", "application/json" }; - - foreach (var _contentType in _contentTypes) - localVarRequestOptions.HeaderParameters.Add("Content-Type", _contentType); - - foreach (var _accept in _accepts) - localVarRequestOptions.HeaderParameters.Add("Accept", _accept); + + + 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; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/UserApi.cs index e20098ed654..f233973eb0c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/UserApi.cs @@ -582,12 +582,13 @@ namespace Org.OpenAPITools.Api // to determine the Accept header String[] _accepts = new String[] { }; - - foreach (var _contentType in _contentTypes) - localVarRequestOptions.HeaderParameters.Add("Content-Type", _contentType); - - foreach (var _accept in _accepts) - localVarRequestOptions.HeaderParameters.Add("Accept", _accept); + + + 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; @@ -691,12 +692,13 @@ namespace Org.OpenAPITools.Api // to determine the Accept header String[] _accepts = new String[] { }; - - foreach (var _contentType in _contentTypes) - localVarRequestOptions.HeaderParameters.Add("Content-Type", _contentType); - - foreach (var _accept in _accepts) - localVarRequestOptions.HeaderParameters.Add("Accept", _accept); + + + 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; @@ -800,12 +802,13 @@ namespace Org.OpenAPITools.Api // to determine the Accept header String[] _accepts = new String[] { }; - - foreach (var _contentType in _contentTypes) - localVarRequestOptions.HeaderParameters.Add("Content-Type", _contentType); - - foreach (var _accept in _accepts) - localVarRequestOptions.HeaderParameters.Add("Accept", _accept); + + + 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; @@ -909,12 +912,13 @@ namespace Org.OpenAPITools.Api // to determine the Accept header String[] _accepts = new String[] { }; - - foreach (var _contentType in _contentTypes) - localVarRequestOptions.HeaderParameters.Add("Content-Type", _contentType); - - foreach (var _accept in _accepts) - localVarRequestOptions.HeaderParameters.Add("Accept", _accept); + + + 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 @@ -1024,12 +1028,13 @@ namespace Org.OpenAPITools.Api "application/xml", "application/json" }; - - foreach (var _contentType in _contentTypes) - localVarRequestOptions.HeaderParameters.Add("Content-Type", _contentType); - - foreach (var _accept in _accepts) - localVarRequestOptions.HeaderParameters.Add("Accept", _accept); + + + 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 @@ -1152,12 +1157,13 @@ namespace Org.OpenAPITools.Api "application/xml", "application/json" }; - - foreach (var _contentType in _contentTypes) - localVarRequestOptions.HeaderParameters.Add("Content-Type", _contentType); - - foreach (var _accept in _accepts) - localVarRequestOptions.HeaderParameters.Add("Accept", _accept); + + + 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)); @@ -1249,12 +1255,13 @@ namespace Org.OpenAPITools.Api // to determine the Accept header String[] _accepts = new String[] { }; - - foreach (var _contentType in _contentTypes) - localVarRequestOptions.HeaderParameters.Add("Content-Type", _contentType); - - foreach (var _accept in _accepts) - localVarRequestOptions.HeaderParameters.Add("Accept", _accept); + + + 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); @@ -1370,12 +1377,13 @@ namespace Org.OpenAPITools.Api // to determine the Accept header String[] _accepts = new String[] { }; - - foreach (var _contentType in _contentTypes) - localVarRequestOptions.HeaderParameters.Add("Content-Type", _contentType); - - foreach (var _accept in _accepts) - localVarRequestOptions.HeaderParameters.Add("Accept", _accept); + + + 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 = body;