From 592968e28e6ed411479b9b92998f10a4ca1b957d Mon Sep 17 00:00:00 2001 From: Aron <66121375+aronkankel@users.noreply.github.com> Date: Wed, 24 Jan 2024 17:51:19 +0100 Subject: [PATCH 1/8] FormParameters correct handling for "isPrimitiveType" https://github.com/OpenAPITools/openapi-generator/issues/17699 --- .../src/main/resources/csharp/api.mustache | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/csharp/api.mustache b/modules/openapi-generator/src/main/resources/csharp/api.mustache index 63fdd07f19b..d7e0571ef60 100644 --- a/modules/openapi-generator/src/main/resources/csharp/api.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/api.mustache @@ -397,7 +397,7 @@ namespace {{packageName}}.{{apiPackage}} {{/isArray}} {{/isFile}} {{^isFile}} - localVarRequestOptions.FormParameters.Add("{{baseName}}", {{packageName}}.Client.ClientUtils.ParameterToString({{paramName}})); // form parameter + localVarRequestOptions.FormParameters.Add("{{baseName}}", {{packageName}}.Client.ClientUtils.{{#isPrimitiveType}}ParameterToString{{/isPrimitiveType}}{{^isPrimitiveType}}Serialize{{/isPrimitiveType}}({{paramName}})); // form parameter {{/isFile}} } {{/required}} @@ -647,7 +647,7 @@ namespace {{packageName}}.{{apiPackage}} {{/isArray}} {{/isFile}} {{^isFile}} - localVarRequestOptions.FormParameters.Add("{{baseName}}", {{packageName}}.Client.ClientUtils.ParameterToString({{paramName}})); // form parameter + localVarRequestOptions.FormParameters.Add("{{baseName}}", {{packageName}}.Client.ClientUtils.{{#isPrimitiveType}}ParameterToString{{/isPrimitiveType}}{{^isPrimitiveType}}Serialize{{/isPrimitiveType}}({{paramName}})); // form parameter {{/isFile}} {{/required}} {{^required}} @@ -669,7 +669,7 @@ namespace {{packageName}}.{{apiPackage}} {{/isArray}} {{/isFile}} {{^isFile}} - localVarRequestOptions.FormParameters.Add("{{baseName}}", {{packageName}}.Client.ClientUtils.ParameterToString({{paramName}})); // form parameter + localVarRequestOptions.FormParameters.Add("{{baseName}}", {{packageName}}.Client.ClientUtils.{{#isPrimitiveType}}ParameterToString{{/isPrimitiveType}}{{^isPrimitiveType}}Serialize{{/isPrimitiveType}}({{paramName}})); // form parameter {{/isFile}} } {{/required}} From bb4b5034d3e75bf4b8835da5b14cbd5b3cabf19b Mon Sep 17 00:00:00 2001 From: Aron <66121375+aronkankel@users.noreply.github.com> Date: Fri, 26 Jan 2024 16:22:34 +0100 Subject: [PATCH 2/8] MultipartApi.cs generated with new mustache https://github.com/OpenAPITools/openapi-generator/issues/17699 --- .../src/Org.OpenAPITools/Api/MultipartApi.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Api/MultipartApi.cs b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Api/MultipartApi.cs index b165faa5bd0..b8058401397 100644 --- a/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Api/MultipartApi.cs +++ b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Api/MultipartApi.cs @@ -517,12 +517,12 @@ namespace Org.OpenAPITools.Api localVarRequestOptions.FormParameters.Add("status", Org.OpenAPITools.Client.ClientUtils.Serialize(status)); // form parameter if (marker != null) { - localVarRequestOptions.FormParameters.Add("marker", Org.OpenAPITools.Client.ClientUtils.ParameterToString(marker)); // form parameter + localVarRequestOptions.FormParameters.Add("marker", Org.OpenAPITools.Client.ClientUtils.Serialize(marker)); // form parameter } localVarRequestOptions.FileParameters.Add("file", file); if (statusArray != null) { - localVarRequestOptions.FormParameters.Add("statusArray", Org.OpenAPITools.Client.ClientUtils.ParameterToString(statusArray)); // form parameter + localVarRequestOptions.FormParameters.Add("statusArray", Org.OpenAPITools.Client.ClientUtils.Serialize(statusArray)); // form parameter } localVarRequestOptions.Operation = "MultipartApi.MultipartMixed"; @@ -607,15 +607,15 @@ namespace Org.OpenAPITools.Api localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); } - localVarRequestOptions.FormParameters.Add("status", Org.OpenAPITools.Client.ClientUtils.ParameterToString(status)); // form parameter + localVarRequestOptions.FormParameters.Add("status", Org.OpenAPITools.Client.ClientUtils.Serialize(status)); // form parameter if (marker != null) { - localVarRequestOptions.FormParameters.Add("marker", Org.OpenAPITools.Client.ClientUtils.ParameterToString(marker)); // form parameter + localVarRequestOptions.FormParameters.Add("marker", Org.OpenAPITools.Client.ClientUtils.Serialize(marker)); // form parameter } localVarRequestOptions.FileParameters.Add("file", file); if (statusArray != null) { - localVarRequestOptions.FormParameters.Add("statusArray", Org.OpenAPITools.Client.ClientUtils.ParameterToString(statusArray)); // form parameter + localVarRequestOptions.FormParameters.Add("statusArray", Org.OpenAPITools.Client.ClientUtils.Serialize(statusArray)); // form parameter } localVarRequestOptions.Operation = "MultipartApi.MultipartMixed"; From 3aac4a86850f5226cb1c32b57d1fe404d866bb43 Mon Sep 17 00:00:00 2001 From: Aron <66121375+aronkankel@users.noreply.github.com> Date: Fri, 26 Jan 2024 16:25:58 +0100 Subject: [PATCH 3/8] FakeApi.cs generated based on new mustache https://github.com/OpenAPITools/openapi-generator/issues/17699 --- .../src/Org.OpenAPITools/Api/FakeApi.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/FakeApi.cs index ce37acaec65..8380cef3254 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/FakeApi.cs @@ -2858,7 +2858,7 @@ namespace Org.OpenAPITools.Api } if (enumFormStringArray != null) { - localVarRequestOptions.FormParameters.Add("enum_form_string_array", Org.OpenAPITools.Client.ClientUtils.ParameterToString(enumFormStringArray)); // form parameter + localVarRequestOptions.FormParameters.Add("enum_form_string_array", Org.OpenAPITools.Client.ClientUtils.Serialize(enumFormStringArray)); // form parameter } if (enumFormString != null) { @@ -2969,7 +2969,7 @@ namespace Org.OpenAPITools.Api } if (enumFormStringArray != null) { - localVarRequestOptions.FormParameters.Add("enum_form_string_array", Org.OpenAPITools.Client.ClientUtils.ParameterToString(enumFormStringArray)); // form parameter + localVarRequestOptions.FormParameters.Add("enum_form_string_array", Org.OpenAPITools.Client.ClientUtils.Serialize(enumFormStringArray)); // form parameter } if (enumFormString != null) { From 1bbd7c0f2f10b2279c5cb9d9e78c1c479e3d1bce Mon Sep 17 00:00:00 2001 From: Aron <66121375+aronkankel@users.noreply.github.com> Date: Fri, 26 Jan 2024 16:27:30 +0100 Subject: [PATCH 4/8] FakeApi.cs generated based on new mustache https://github.com/OpenAPITools/openapi-generator/issues/17699 --- .../OpenAPIClient-net47/src/Org.OpenAPITools/Api/FakeApi.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Api/FakeApi.cs index ce37acaec65..8380cef3254 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Api/FakeApi.cs @@ -2858,7 +2858,7 @@ namespace Org.OpenAPITools.Api } if (enumFormStringArray != null) { - localVarRequestOptions.FormParameters.Add("enum_form_string_array", Org.OpenAPITools.Client.ClientUtils.ParameterToString(enumFormStringArray)); // form parameter + localVarRequestOptions.FormParameters.Add("enum_form_string_array", Org.OpenAPITools.Client.ClientUtils.Serialize(enumFormStringArray)); // form parameter } if (enumFormString != null) { @@ -2969,7 +2969,7 @@ namespace Org.OpenAPITools.Api } if (enumFormStringArray != null) { - localVarRequestOptions.FormParameters.Add("enum_form_string_array", Org.OpenAPITools.Client.ClientUtils.ParameterToString(enumFormStringArray)); // form parameter + localVarRequestOptions.FormParameters.Add("enum_form_string_array", Org.OpenAPITools.Client.ClientUtils.Serialize(enumFormStringArray)); // form parameter } if (enumFormString != null) { From c6fbbfc2cbdabc8368281823a6cf793dd6aab5a1 Mon Sep 17 00:00:00 2001 From: Aron <66121375+aronkankel@users.noreply.github.com> Date: Fri, 26 Jan 2024 16:29:16 +0100 Subject: [PATCH 5/8] FakeApi.cs generated based on new mustache https://github.com/OpenAPITools/openapi-generator/issues/17699 --- .../OpenAPIClient-net48/src/Org.OpenAPITools/Api/FakeApi.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Api/FakeApi.cs index ce37acaec65..8380cef3254 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Api/FakeApi.cs @@ -2858,7 +2858,7 @@ namespace Org.OpenAPITools.Api } if (enumFormStringArray != null) { - localVarRequestOptions.FormParameters.Add("enum_form_string_array", Org.OpenAPITools.Client.ClientUtils.ParameterToString(enumFormStringArray)); // form parameter + localVarRequestOptions.FormParameters.Add("enum_form_string_array", Org.OpenAPITools.Client.ClientUtils.Serialize(enumFormStringArray)); // form parameter } if (enumFormString != null) { @@ -2969,7 +2969,7 @@ namespace Org.OpenAPITools.Api } if (enumFormStringArray != null) { - localVarRequestOptions.FormParameters.Add("enum_form_string_array", Org.OpenAPITools.Client.ClientUtils.ParameterToString(enumFormStringArray)); // form parameter + localVarRequestOptions.FormParameters.Add("enum_form_string_array", Org.OpenAPITools.Client.ClientUtils.Serialize(enumFormStringArray)); // form parameter } if (enumFormString != null) { From 0ab8c2c7698acefbf662614f5c96dda20c8fd3c9 Mon Sep 17 00:00:00 2001 From: Aron <66121375+aronkankel@users.noreply.github.com> Date: Fri, 26 Jan 2024 16:30:50 +0100 Subject: [PATCH 6/8] FakeApi.cs generated based on new mustache https://github.com/OpenAPITools/openapi-generator/issues/17699 --- .../OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/FakeApi.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/FakeApi.cs index 785e887d37f..3c2b1655394 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/FakeApi.cs @@ -2858,7 +2858,7 @@ namespace Org.OpenAPITools.Api } if (enumFormStringArray != null) { - localVarRequestOptions.FormParameters.Add("enum_form_string_array", Org.OpenAPITools.Client.ClientUtils.ParameterToString(enumFormStringArray)); // form parameter + localVarRequestOptions.FormParameters.Add("enum_form_string_array", Org.OpenAPITools.Client.ClientUtils.Serialize(enumFormStringArray)); // form parameter } if (enumFormString != null) { @@ -2969,7 +2969,7 @@ namespace Org.OpenAPITools.Api } if (enumFormStringArray != null) { - localVarRequestOptions.FormParameters.Add("enum_form_string_array", Org.OpenAPITools.Client.ClientUtils.ParameterToString(enumFormStringArray)); // form parameter + localVarRequestOptions.FormParameters.Add("enum_form_string_array", Org.OpenAPITools.Client.ClientUtils.Serialize(enumFormStringArray)); // form parameter } if (enumFormString != null) { From 159c86cafa04b3fa3b2259307a061bfed3e204f0 Mon Sep 17 00:00:00 2001 From: Aron <66121375+aronkankel@users.noreply.github.com> Date: Fri, 26 Jan 2024 16:32:16 +0100 Subject: [PATCH 7/8] FakeApi.cs generated based on new mustache https://github.com/OpenAPITools/openapi-generator/issues/17699 --- .../csharp/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs index ce37acaec65..8380cef3254 100644 --- a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs @@ -2858,7 +2858,7 @@ namespace Org.OpenAPITools.Api } if (enumFormStringArray != null) { - localVarRequestOptions.FormParameters.Add("enum_form_string_array", Org.OpenAPITools.Client.ClientUtils.ParameterToString(enumFormStringArray)); // form parameter + localVarRequestOptions.FormParameters.Add("enum_form_string_array", Org.OpenAPITools.Client.ClientUtils.Serialize(enumFormStringArray)); // form parameter } if (enumFormString != null) { @@ -2969,7 +2969,7 @@ namespace Org.OpenAPITools.Api } if (enumFormStringArray != null) { - localVarRequestOptions.FormParameters.Add("enum_form_string_array", Org.OpenAPITools.Client.ClientUtils.ParameterToString(enumFormStringArray)); // form parameter + localVarRequestOptions.FormParameters.Add("enum_form_string_array", Org.OpenAPITools.Client.ClientUtils.Serialize(enumFormStringArray)); // form parameter } if (enumFormString != null) { From 9e1271fa83e53098ae2e1e547c2da246a2b65dba Mon Sep 17 00:00:00 2001 From: Aron <66121375+aronkankel@users.noreply.github.com> Date: Fri, 26 Jan 2024 16:33:37 +0100 Subject: [PATCH 8/8] FakeApi.cs generated based on new mustache https://github.com/OpenAPITools/openapi-generator/issues/17699 --- .../OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeApi.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeApi.cs index 785e887d37f..3c2b1655394 100644 --- a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeApi.cs @@ -2858,7 +2858,7 @@ namespace Org.OpenAPITools.Api } if (enumFormStringArray != null) { - localVarRequestOptions.FormParameters.Add("enum_form_string_array", Org.OpenAPITools.Client.ClientUtils.ParameterToString(enumFormStringArray)); // form parameter + localVarRequestOptions.FormParameters.Add("enum_form_string_array", Org.OpenAPITools.Client.ClientUtils.Serialize(enumFormStringArray)); // form parameter } if (enumFormString != null) { @@ -2969,7 +2969,7 @@ namespace Org.OpenAPITools.Api } if (enumFormStringArray != null) { - localVarRequestOptions.FormParameters.Add("enum_form_string_array", Org.OpenAPITools.Client.ClientUtils.ParameterToString(enumFormStringArray)); // form parameter + localVarRequestOptions.FormParameters.Add("enum_form_string_array", Org.OpenAPITools.Client.ClientUtils.Serialize(enumFormStringArray)); // form parameter } if (enumFormString != null) {