Merge branch 'csharp_query_param_encoding' of https://github.com/mohamuni/openapi-generator into mohamuni-csharp_query_param_encoding

wing328 · wing328 · commit 15bf21dcfaad · 2025-02-17T10:55:14.000+08:00
diff --git a/modules/openapi-generator/src/main/resources/csharp/HttpSigningConfiguration.mustache b/modules/openapi-generator/src/main/resources/csharp/HttpSigningConfiguration.mustache
@@ -133,16 +133,18 @@ namespace {{packageName}}.Client
             foreach (var parameter in requestOptions.QueryParameters)
             {
 #if (NETCOREAPP)
+                string framework = RuntimeInformation.FrameworkDescription;
+                string key = framework.StartsWith(".NET 9")?parameter.Key:HttpUtility.UrlEncode(parameter.Key);
                 if (parameter.Value.Count > 1)
                 { // array
                     foreach (var value in parameter.Value)
                     {
-                        httpValues.Add(HttpUtility.UrlEncode(parameter.Key) + "[]", value);
+                        httpValues.Add(key + "[]", value);
                     }
                 }
                 else
                 {
-                    httpValues.Add(HttpUtility.UrlEncode(parameter.Key), parameter.Value[0]);
+                    httpValues.Add(key, parameter.Value[0]);
                 }
 #else
                 if (parameter.Value.Count > 1)
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
@@ -141,16 +141,18 @@ public Dictionary<string, string> GetHttpSignedHeader(string basePath,string met
             foreach (var parameter in requestOptions.QueryParameters)
             {
 #if (NETCOREAPP)
+                string framework = RuntimeInformation.FrameworkDescription;
+                string key = framework.StartsWith(".NET 9")?parameter.Key:HttpUtility.UrlEncode(parameter.Key);
                 if (parameter.Value.Count > 1)
                 { // array
                     foreach (var value in parameter.Value)
                     {
-                        httpValues.Add(HttpUtility.UrlEncode(parameter.Key) + "[]", value);
+                        httpValues.Add(key + "[]", value);
                     }
                 }
                 else
                 {
-                    httpValues.Add(HttpUtility.UrlEncode(parameter.Key), parameter.Value[0]);
+                    httpValues.Add(key, parameter.Value[0]);
                 }
 #else
                 if (parameter.Value.Count > 1)
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
@@ -141,16 +141,18 @@ public Dictionary<string, string> GetHttpSignedHeader(string basePath,string met
             foreach (var parameter in requestOptions.QueryParameters)
             {
 #if (NETCOREAPP)
+                string framework = RuntimeInformation.FrameworkDescription;
+                string key = framework.StartsWith(".NET 9")?parameter.Key:HttpUtility.UrlEncode(parameter.Key);
                 if (parameter.Value.Count > 1)
                 { // array
                     foreach (var value in parameter.Value)
                     {
-                        httpValues.Add(HttpUtility.UrlEncode(parameter.Key) + "[]", value);
+                        httpValues.Add(key + "[]", value);
                     }
                 }
                 else
                 {
-                    httpValues.Add(HttpUtility.UrlEncode(parameter.Key), parameter.Value[0]);
+                    httpValues.Add(key, parameter.Value[0]);
                 }
 #else
                 if (parameter.Value.Count > 1)
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
@@ -141,16 +141,18 @@ public Dictionary<string, string> GetHttpSignedHeader(string basePath,string met
             foreach (var parameter in requestOptions.QueryParameters)
             {
 #if (NETCOREAPP)
+                string framework = RuntimeInformation.FrameworkDescription;
+                string key = framework.StartsWith(".NET 9")?parameter.Key:HttpUtility.UrlEncode(parameter.Key);
                 if (parameter.Value.Count > 1)
                 { // array
                     foreach (var value in parameter.Value)
                     {
-                        httpValues.Add(HttpUtility.UrlEncode(parameter.Key) + "[]", value);
+                        httpValues.Add(key + "[]", value);
                     }
                 }
                 else
                 {
-                    httpValues.Add(HttpUtility.UrlEncode(parameter.Key), parameter.Value[0]);
+                    httpValues.Add(key, parameter.Value[0]);
                 }
 #else
                 if (parameter.Value.Count > 1)
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
@@ -141,16 +141,18 @@ public Dictionary<string, string> GetHttpSignedHeader(string basePath,string met
             foreach (var parameter in requestOptions.QueryParameters)
             {
 #if (NETCOREAPP)
+                string framework = RuntimeInformation.FrameworkDescription;
+                string key = framework.StartsWith(".NET 9")?parameter.Key:HttpUtility.UrlEncode(parameter.Key);
                 if (parameter.Value.Count > 1)
                 { // array
                     foreach (var value in parameter.Value)
                     {
-                        httpValues.Add(HttpUtility.UrlEncode(parameter.Key) + "[]", value);
+                        httpValues.Add(key + "[]", value);
                     }
                 }
                 else
                 {
-                    httpValues.Add(HttpUtility.UrlEncode(parameter.Key), parameter.Value[0]);
+                    httpValues.Add(key, parameter.Value[0]);
                 }
 #else
                 if (parameter.Value.Count > 1)
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
@@ -141,16 +141,18 @@ public Dictionary<string, string> GetHttpSignedHeader(string basePath,string met
             foreach (var parameter in requestOptions.QueryParameters)
             {
 #if (NETCOREAPP)
+                string framework = RuntimeInformation.FrameworkDescription;
+                string key = framework.StartsWith(".NET 9")?parameter.Key:HttpUtility.UrlEncode(parameter.Key);
                 if (parameter.Value.Count > 1)
                 { // array
                     foreach (var value in parameter.Value)
                     {
-                        httpValues.Add(HttpUtility.UrlEncode(parameter.Key) + "[]", value);
+                        httpValues.Add(key + "[]", value);
                     }
                 }
                 else
                 {
-                    httpValues.Add(HttpUtility.UrlEncode(parameter.Key), parameter.Value[0]);
+                    httpValues.Add(key, parameter.Value[0]);
                 }
 #else
                 if (parameter.Value.Count > 1)
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
@@ -141,16 +141,18 @@ public Dictionary<string, string> GetHttpSignedHeader(string basePath,string met
             foreach (var parameter in requestOptions.QueryParameters)
             {
 #if (NETCOREAPP)
+                string framework = RuntimeInformation.FrameworkDescription;
+                string key = framework.StartsWith(".NET 9")?parameter.Key:HttpUtility.UrlEncode(parameter.Key);
                 if (parameter.Value.Count > 1)
                 { // array
                     foreach (var value in parameter.Value)
                     {
-                        httpValues.Add(HttpUtility.UrlEncode(parameter.Key) + "[]", value);
+                        httpValues.Add(key + "[]", value);
                     }
                 }
                 else
                 {
-                    httpValues.Add(HttpUtility.UrlEncode(parameter.Key), parameter.Value[0]);
+                    httpValues.Add(key, parameter.Value[0]);
                 }
 #else
                 if (parameter.Value.Count > 1)
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
@@ -141,16 +141,18 @@ public Dictionary<string, string> GetHttpSignedHeader(string basePath,string met
             foreach (var parameter in requestOptions.QueryParameters)
             {
 #if (NETCOREAPP)
+                string framework = RuntimeInformation.FrameworkDescription;
+                string key = framework.StartsWith(".NET 9")?parameter.Key:HttpUtility.UrlEncode(parameter.Key);
                 if (parameter.Value.Count > 1)
                 { // array
                     foreach (var value in parameter.Value)
                     {
-                        httpValues.Add(HttpUtility.UrlEncode(parameter.Key) + "[]", value);
+                        httpValues.Add(key + "[]", value);
                     }
                 }
                 else
                 {
-                    httpValues.Add(HttpUtility.UrlEncode(parameter.Key), parameter.Value[0]);
+                    httpValues.Add(key, parameter.Value[0]);
                 }
 #else
                 if (parameter.Value.Count > 1)
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
@@ -141,16 +141,18 @@ public Dictionary<string, string> GetHttpSignedHeader(string basePath,string met
             foreach (var parameter in requestOptions.QueryParameters)
             {
 #if (NETCOREAPP)
+                string framework = RuntimeInformation.FrameworkDescription;
+                string key = framework.StartsWith(".NET 9")?parameter.Key:HttpUtility.UrlEncode(parameter.Key);
                 if (parameter.Value.Count > 1)
                 { // array
                     foreach (var value in parameter.Value)
                     {
-                        httpValues.Add(HttpUtility.UrlEncode(parameter.Key) + "[]", value);
+                        httpValues.Add(key + "[]", value);
                     }
                 }
                 else
                 {
-                    httpValues.Add(HttpUtility.UrlEncode(parameter.Key), parameter.Value[0]);
+                    httpValues.Add(key, parameter.Value[0]);
                 }
 #else
                 if (parameter.Value.Count > 1)
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
@@ -141,16 +141,18 @@ public Dictionary<string, string> GetHttpSignedHeader(string basePath,string met
             foreach (var parameter in requestOptions.QueryParameters)
             {
 #if (NETCOREAPP)
+                string framework = RuntimeInformation.FrameworkDescription;
+                string key = framework.StartsWith(".NET 9")?parameter.Key:HttpUtility.UrlEncode(parameter.Key);
                 if (parameter.Value.Count > 1)
                 { // array
                     foreach (var value in parameter.Value)
                     {
-                        httpValues.Add(HttpUtility.UrlEncode(parameter.Key) + "[]", value);
+                        httpValues.Add(key + "[]", value);
                     }
                 }
                 else
                 {
-                    httpValues.Add(HttpUtility.UrlEncode(parameter.Key), parameter.Value[0]);
+                    httpValues.Add(key, parameter.Value[0]);
                 }
 #else
                 if (parameter.Value.Count > 1)
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
@@ -141,16 +141,18 @@ public Dictionary<string, string> GetHttpSignedHeader(string basePath,string met
             foreach (var parameter in requestOptions.QueryParameters)
             {
 #if (NETCOREAPP)
+                string framework = RuntimeInformation.FrameworkDescription;
+                string key = framework.StartsWith(".NET 9")?parameter.Key:HttpUtility.UrlEncode(parameter.Key);
                 if (parameter.Value.Count > 1)
                 { // array
                     foreach (var value in parameter.Value)
                     {
-                        httpValues.Add(HttpUtility.UrlEncode(parameter.Key) + "[]", value);
+                        httpValues.Add(key + "[]", value);
                     }
                 }
                 else
                 {
-                    httpValues.Add(HttpUtility.UrlEncode(parameter.Key), parameter.Value[0]);
+                    httpValues.Add(key, parameter.Value[0]);
                 }
 #else
                 if (parameter.Value.Count > 1)
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
@@ -141,16 +141,18 @@ public Dictionary<string, string> GetHttpSignedHeader(string basePath,string met
             foreach (var parameter in requestOptions.QueryParameters)
             {
 #if (NETCOREAPP)
+                string framework = RuntimeInformation.FrameworkDescription;
+                string key = framework.StartsWith(".NET 9")?parameter.Key:HttpUtility.UrlEncode(parameter.Key);
                 if (parameter.Value.Count > 1)
                 { // array
                     foreach (var value in parameter.Value)
                     {
-                        httpValues.Add(HttpUtility.UrlEncode(parameter.Key) + "[]", value);
+                        httpValues.Add(key + "[]", value);
                     }
                 }
                 else
                 {
-                    httpValues.Add(HttpUtility.UrlEncode(parameter.Key), parameter.Value[0]);
+                    httpValues.Add(key, parameter.Value[0]);
                 }
 #else
                 if (parameter.Value.Count > 1)

Original file line number	Diff line number	Diff line change
`@@ -133,16 +133,18 @@ namespace {{packageName}}.Client`
`133`	`133`	`foreach (var parameter in requestOptions.QueryParameters)`
`134`	`134`	`{`
`135`	`135`	`#if (NETCOREAPP)`
	`136`	`+ string framework = RuntimeInformation.FrameworkDescription;`
	`137`	`+ string key = framework.StartsWith(".NET 9")?parameter.Key:HttpUtility.UrlEncode(parameter.Key);`
`136`	`138`	`if (parameter.Value.Count > 1)`
`137`	`139`	`{ // array`
`138`	`140`	`foreach (var value in parameter.Value)`
`139`	`141`	`{`
`140`		`- httpValues.Add(HttpUtility.UrlEncode(parameter.Key) + "[]", value);`
	`142`	`+ httpValues.Add(key + "[]", value);`
`141`	`143`	`}`
`142`	`144`	`}`
`143`	`145`	`else`
`144`	`146`	`{`
`145`		`- httpValues.Add(HttpUtility.UrlEncode(parameter.Key), parameter.Value[0]);`
	`147`	`+ httpValues.Add(key, parameter.Value[0]);`
`146`	`148`	`}`
`147`	`149`	`#else`
`148`	`150`	`if (parameter.Value.Count > 1)`
Original file line number	Diff line number	Diff line change
`@@ -141,16 +141,18 @@ public Dictionary<string, string> GetHttpSignedHeader(string basePath,string met`
`141`	`141`	`foreach (var parameter in requestOptions.QueryParameters)`
`142`	`142`	`{`
`143`	`143`	`#if (NETCOREAPP)`
	`144`	`+ string framework = RuntimeInformation.FrameworkDescription;`
	`145`	`+ string key = framework.StartsWith(".NET 9")?parameter.Key:HttpUtility.UrlEncode(parameter.Key);`
`144`	`146`	`if (parameter.Value.Count > 1)`
`145`	`147`	`{ // array`
`146`	`148`	`foreach (var value in parameter.Value)`
`147`	`149`	`{`
`148`		`- httpValues.Add(HttpUtility.UrlEncode(parameter.Key) + "[]", value);`
	`150`	`+ httpValues.Add(key + "[]", value);`
`149`	`151`	`}`
`150`	`152`	`}`
`151`	`153`	`else`
`152`	`154`	`{`
`153`		`- httpValues.Add(HttpUtility.UrlEncode(parameter.Key), parameter.Value[0]);`
	`155`	`+ httpValues.Add(key, parameter.Value[0]);`
`154`	`156`	`}`
`155`	`157`	`#else`
`156`	`158`	`if (parameter.Value.Count > 1)`