From 2a9fb7b6e7460d6da5fb5bc172e2c58c0fb0cca8 Mon Sep 17 00:00:00 2001 From: devhl-labs Date: Sat, 4 Mar 2023 21:09:57 -0500 Subject: [PATCH] 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();