fixed encoding (#21207)

devhl-labs · web-flow · commit f3af25b10cda · 2025-05-04T22:30:40.000+08:00
diff --git a/modules/openapi-generator/src/main/resources/csharp-functions/HttpSigningConfiguration.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/HttpSigningConfiguration.mustache
@@ -128,12 +128,12 @@ namespace {{packageName}}.Client
                 { // array
                     foreach (var value in parameter.Value)
                     {
-                        httpValues.Add(HttpUtility.UrlEncode(parameter.Key) + "[]", value);
+                        httpValues.Add({{#net90OrLater}}HttpUtility.UrlEncode({{/net90OrLater}}parameter.Key{{#net90OrLater}}){{/net90OrLater}} + "[]", value);
                     }
                 }
                 else
                 {
-                httpValues.Add(HttpUtility.UrlEncode(parameter.Key), parameter.Value[0]);
+                httpValues.Add({{#net90OrLater}}HttpUtility.UrlEncode({{/net90OrLater}}parameter.Key{{#net90OrLater}}){{/net90OrLater}}, parameter.Value[0]);
                 }
 #else
                 if (parameter.Value.Count > 1)
diff --git a/modules/openapi-generator/src/main/resources/csharp/HttpSigningConfiguration.mustache b/modules/openapi-generator/src/main/resources/csharp/HttpSigningConfiguration.mustache
@@ -134,7 +134,7 @@ namespace {{packageName}}.Client
             {
 #if (NETCOREAPP)
                 string framework = RuntimeInformation.FrameworkDescription;
-                string key = framework.StartsWith(".NET 9")?parameter.Key:HttpUtility.UrlEncode(parameter.Key);
+                string key = framework.StartsWith(".NET 9") ? parameter.Key : {{#net90OrLater}}HttpUtility.UrlEncode({{/net90OrLater}}parameter.Key{{#net90OrLater}}){{/net90OrLater}};
                 if (parameter.Value.Count > 1)
                 { // array
                     foreach (var value in parameter.Value)
diff --git a/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
@@ -142,7 +142,7 @@ public Dictionary<string, string> GetHttpSignedHeader(string basePath,string met
             {
 #if (NETCOREAPP)
                 string framework = RuntimeInformation.FrameworkDescription;
-                string key = framework.StartsWith(".NET 9")?parameter.Key:HttpUtility.UrlEncode(parameter.Key);
+                string key = framework.StartsWith(".NET 9") ? parameter.Key : HttpUtility.UrlEncode(parameter.Key);
                 if (parameter.Value.Count > 1)
                 { // array
                     foreach (var value in parameter.Value)
diff --git a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
@@ -142,7 +142,7 @@ public Dictionary<string, string> GetHttpSignedHeader(string basePath,string met
             {
 #if (NETCOREAPP)
                 string framework = RuntimeInformation.FrameworkDescription;
-                string key = framework.StartsWith(".NET 9")?parameter.Key:HttpUtility.UrlEncode(parameter.Key);
+                string key = framework.StartsWith(".NET 9") ? parameter.Key : parameter.Key;
                 if (parameter.Value.Count > 1)
                 { // array
                     foreach (var value in parameter.Value)
diff --git a/samples/client/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
@@ -142,7 +142,7 @@ public Dictionary<string, string> GetHttpSignedHeader(string basePath,string met
             {
 #if (NETCOREAPP)
                 string framework = RuntimeInformation.FrameworkDescription;
-                string key = framework.StartsWith(".NET 9")?parameter.Key:HttpUtility.UrlEncode(parameter.Key);
+                string key = framework.StartsWith(".NET 9") ? parameter.Key : parameter.Key;
                 if (parameter.Value.Count > 1)
                 { // array
                     foreach (var value in parameter.Value)
diff --git a/samples/client/petstore/csharp/restsharp/net4.8/Petstore/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp/restsharp/net4.8/Petstore/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
@@ -142,7 +142,7 @@ public Dictionary<string, string> GetHttpSignedHeader(string basePath,string met
             {
 #if (NETCOREAPP)
                 string framework = RuntimeInformation.FrameworkDescription;
-                string key = framework.StartsWith(".NET 9")?parameter.Key:HttpUtility.UrlEncode(parameter.Key);
+                string key = framework.StartsWith(".NET 9") ? parameter.Key : parameter.Key;
                 if (parameter.Value.Count > 1)
                 { // array
                     foreach (var value in parameter.Value)
diff --git a/samples/client/petstore/csharp/restsharp/net8/EnumMappings/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp/restsharp/net8/EnumMappings/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
@@ -142,7 +142,7 @@ public Dictionary<string, string> GetHttpSignedHeader(string basePath,string met
             {
 #if (NETCOREAPP)
                 string framework = RuntimeInformation.FrameworkDescription;
-                string key = framework.StartsWith(".NET 9")?parameter.Key:HttpUtility.UrlEncode(parameter.Key);
+                string key = framework.StartsWith(".NET 9") ? parameter.Key : parameter.Key;
                 if (parameter.Value.Count > 1)
                 { // array
                     foreach (var value in parameter.Value)
diff --git a/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
@@ -142,7 +142,7 @@ public Dictionary<string, string> GetHttpSignedHeader(string basePath,string met
             {
 #if (NETCOREAPP)
                 string framework = RuntimeInformation.FrameworkDescription;
-                string key = framework.StartsWith(".NET 9")?parameter.Key:HttpUtility.UrlEncode(parameter.Key);
+                string key = framework.StartsWith(".NET 9") ? parameter.Key : parameter.Key;
                 if (parameter.Value.Count > 1)
                 { // array
                     foreach (var value in parameter.Value)
diff --git a/samples/client/petstore/csharp/restsharp/net9/EnumMappings/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp/restsharp/net9/EnumMappings/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
@@ -142,7 +142,7 @@ public Dictionary<string, string> GetHttpSignedHeader(string basePath,string met
             {
 #if (NETCOREAPP)
                 string framework = RuntimeInformation.FrameworkDescription;
-                string key = framework.StartsWith(".NET 9")?parameter.Key:HttpUtility.UrlEncode(parameter.Key);
+                string key = framework.StartsWith(".NET 9") ? parameter.Key : HttpUtility.UrlEncode(parameter.Key);
                 if (parameter.Value.Count > 1)
                 { // array
                     foreach (var value in parameter.Value)
diff --git a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
@@ -142,7 +142,7 @@ public Dictionary<string, string> GetHttpSignedHeader(string basePath,string met
             {
 #if (NETCOREAPP)
                 string framework = RuntimeInformation.FrameworkDescription;
-                string key = framework.StartsWith(".NET 9")?parameter.Key:HttpUtility.UrlEncode(parameter.Key);
+                string key = framework.StartsWith(".NET 9") ? parameter.Key : parameter.Key;
                 if (parameter.Value.Count > 1)
                 { // array
                     foreach (var value in parameter.Value)
diff --git a/samples/client/petstore/csharp/restsharp/standard2.0/Petstore/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp/restsharp/standard2.0/Petstore/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
@@ -142,7 +142,7 @@ public Dictionary<string, string> GetHttpSignedHeader(string basePath,string met
             {
 #if (NETCOREAPP)
                 string framework = RuntimeInformation.FrameworkDescription;
-                string key = framework.StartsWith(".NET 9")?parameter.Key:HttpUtility.UrlEncode(parameter.Key);
+                string key = framework.StartsWith(".NET 9") ? parameter.Key : parameter.Key;
                 if (parameter.Value.Count > 1)
                 { // array
                     foreach (var value in parameter.Value)
diff --git a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
@@ -142,7 +142,7 @@ public Dictionary<string, string> GetHttpSignedHeader(string basePath,string met
             {
 #if (NETCOREAPP)
                 string framework = RuntimeInformation.FrameworkDescription;
-                string key = framework.StartsWith(".NET 9")?parameter.Key:HttpUtility.UrlEncode(parameter.Key);
+                string key = framework.StartsWith(".NET 9") ? parameter.Key : HttpUtility.UrlEncode(parameter.Key);
                 if (parameter.Value.Count > 1)
                 { // array
                     foreach (var value in parameter.Value)
diff --git a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
@@ -142,7 +142,7 @@ public Dictionary<string, string> GetHttpSignedHeader(string basePath,string met
             {
 #if (NETCOREAPP)
                 string framework = RuntimeInformation.FrameworkDescription;
-                string key = framework.StartsWith(".NET 9")?parameter.Key:HttpUtility.UrlEncode(parameter.Key);
+                string key = framework.StartsWith(".NET 9") ? parameter.Key : parameter.Key;
                 if (parameter.Value.Count > 1)
                 { // array
                     foreach (var value in parameter.Value)

Original file line number	Diff line number	Diff line change
`@@ -128,12 +128,12 @@ namespace {{packageName}}.Client`
`128`	`128`	`{ // array`
`129`	`129`	`foreach (var value in parameter.Value)`
`130`	`130`	`{`
`131`		`- httpValues.Add(HttpUtility.UrlEncode(parameter.Key) + "[]", value);`
	`131`	`+ httpValues.Add({{#net90OrLater}}HttpUtility.UrlEncode({{/net90OrLater}}parameter.Key{{#net90OrLater}}){{/net90OrLater}} + "[]", value);`
`132`	`132`	`}`
`133`	`133`	`}`
`134`	`134`	`else`
`135`	`135`	`{`
`136`		`- httpValues.Add(HttpUtility.UrlEncode(parameter.Key), parameter.Value[0]);`
	`136`	`+ httpValues.Add({{#net90OrLater}}HttpUtility.UrlEncode({{/net90OrLater}}parameter.Key{{#net90OrLater}}){{/net90OrLater}}, parameter.Value[0]);`
`137`	`137`	`}`
`138`	`138`	`#else`
`139`	`139`	`if (parameter.Value.Count > 1)`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ namespace {{packageName}}.Client`
`134`	`134`	`{`
`135`	`135`	`#if (NETCOREAPP)`
`136`	`136`	`string framework = RuntimeInformation.FrameworkDescription;`
`137`		`- string key = framework.StartsWith(".NET 9")?parameter.Key:HttpUtility.UrlEncode(parameter.Key);`
	`137`	`+ string key = framework.StartsWith(".NET 9") ? parameter.Key : {{#net90OrLater}}HttpUtility.UrlEncode({{/net90OrLater}}parameter.Key{{#net90OrLater}}){{/net90OrLater}};`
`138`	`138`	`if (parameter.Value.Count > 1)`
`139`	`139`	`{ // array`
`140`	`140`	`foreach (var value in parameter.Value)`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ public Dictionary<string, string> GetHttpSignedHeader(string basePath,string met`
`142`	`142`	`{`
`143`	`143`	`#if (NETCOREAPP)`
`144`	`144`	`string framework = RuntimeInformation.FrameworkDescription;`
`145`		`- string key = framework.StartsWith(".NET 9")?parameter.Key:HttpUtility.UrlEncode(parameter.Key);`
	`145`	`+ string key = framework.StartsWith(".NET 9") ? parameter.Key : HttpUtility.UrlEncode(parameter.Key);`
`146`	`146`	`if (parameter.Value.Count > 1)`
`147`	`147`	`{ // array`
`148`	`148`	`foreach (var value in parameter.Value)`