Merge branch 'master' of https://github.com/maciejcymanski132/openapi…

…-generator into maciejcymanski132-master
OpenAPITools · Jan 8, 2025 · 9a7f93a · 9a7f93a
2 parents 3d65786 + 4e24cf5
commit 9a7f93a
Show file tree

Hide file tree

Showing 53 changed files with 282 additions and 282 deletions.
diff --git a/modules/openapi-generator/src/main/resources/csharp/ApiClient.mustache b/modules/openapi-generator/src/main/resources/csharp/ApiClient.mustache
@@ -317,7 +317,7 @@ namespace {{packageName}}.Client
                 {
                     foreach (var value in headerParam.Value)
                     {
-                        request.AddHeader(headerParam.Key, value);
+                        request.AddOrUpdateHeader(headerParam.Key, value);
                     }
                 }
             }

diff --git a/modules/openapi-generator/src/main/resources/csharp/api.mustache b/modules/openapi-generator/src/main/resources/csharp/api.mustache
@@ -404,7 +404,7 @@ namespace {{packageName}}.{{apiPackage}}
             {{/required}}
             {{/formParams}}
             {{#bodyParam}}
-            localVarRequestOptions.Data = {{paramName}};
+            localVarRequestOptions.Data = {{packageName}}.Client.ClientUtils.Serialize({{paramName}});
             {{/bodyParam}}
 
             localVarRequestOptions.Operation = "{{classname}}.{{operationId}}";
@@ -694,7 +694,7 @@ namespace {{packageName}}.{{apiPackage}}
             {{/required}}
             {{/formParams}}
             {{#bodyParam}}
-            localVarRequestOptions.Data = {{paramName}};
+            localVarRequestOptions.Data = {{packageName}}.Client.ClientUtils.Serialize({{paramName}});
             {{/bodyParam}}
 
             localVarRequestOptions.Operation = "{{classname}}.{{operationId}}";

diff --git a/samples/client/echo_api/csharp/restsharp/net8/EchoApi/src/Org.OpenAPITools/Api/BodyApi.cs b/samples/client/echo_api/csharp/restsharp/net8/EchoApi/src/Org.OpenAPITools/Api/BodyApi.cs
@@ -805,7 +805,7 @@ public System.IO.Stream TestBinaryGif(int operationIndex = 0)
                 localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept);
             }
 
-            localVarRequestOptions.Data = body;
+            localVarRequestOptions.Data = Org.OpenAPITools.Client.ClientUtils.Serialize(body);
 
             localVarRequestOptions.Operation = "BodyApi.TestBodyApplicationOctetstreamBinary";
             localVarRequestOptions.OperationIndex = operationIndex;
@@ -873,7 +873,7 @@ public System.IO.Stream TestBinaryGif(int operationIndex = 0)
                 localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept);
             }
 
-            localVarRequestOptions.Data = body;
+            localVarRequestOptions.Data = Org.OpenAPITools.Client.ClientUtils.Serialize(body);
 
             localVarRequestOptions.Operation = "BodyApi.TestBodyApplicationOctetstreamBinary";
             localVarRequestOptions.OperationIndex = operationIndex;
@@ -1234,7 +1234,7 @@ public Org.OpenAPITools.Client.ApiResponse<string> TestBodyMultipartFormdataArra
                 localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept);
             }
 
-            localVarRequestOptions.Data = pet;
+            localVarRequestOptions.Data = Org.OpenAPITools.Client.ClientUtils.Serialize(pet);
 
             localVarRequestOptions.Operation = "BodyApi.TestEchoBodyAllOfPet";
             localVarRequestOptions.OperationIndex = operationIndex;
@@ -1302,7 +1302,7 @@ public Org.OpenAPITools.Client.ApiResponse<string> TestBodyMultipartFormdataArra
                 localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept);
             }
 
-            localVarRequestOptions.Data = pet;
+            localVarRequestOptions.Data = Org.OpenAPITools.Client.ClientUtils.Serialize(pet);
 
             localVarRequestOptions.Operation = "BodyApi.TestEchoBodyAllOfPet";
             localVarRequestOptions.OperationIndex = operationIndex;
@@ -1369,7 +1369,7 @@ public Org.OpenAPITools.Client.ApiResponse<string> TestBodyMultipartFormdataArra
                 localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept);
             }
 
-            localVarRequestOptions.Data = body;
+            localVarRequestOptions.Data = Org.OpenAPITools.Client.ClientUtils.Serialize(body);
 
             localVarRequestOptions.Operation = "BodyApi.TestEchoBodyFreeFormObjectResponseString";
             localVarRequestOptions.OperationIndex = operationIndex;
@@ -1437,7 +1437,7 @@ public Org.OpenAPITools.Client.ApiResponse<string> TestBodyMultipartFormdataArra
                 localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept);
             }
 
-            localVarRequestOptions.Data = body;
+            localVarRequestOptions.Data = Org.OpenAPITools.Client.ClientUtils.Serialize(body);
 
             localVarRequestOptions.Operation = "BodyApi.TestEchoBodyFreeFormObjectResponseString";
             localVarRequestOptions.OperationIndex = operationIndex;
@@ -1504,7 +1504,7 @@ public Org.OpenAPITools.Client.ApiResponse<string> TestBodyMultipartFormdataArra
                 localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept);
             }
 
-            localVarRequestOptions.Data = pet;
+            localVarRequestOptions.Data = Org.OpenAPITools.Client.ClientUtils.Serialize(pet);
 
             localVarRequestOptions.Operation = "BodyApi.TestEchoBodyPet";
             localVarRequestOptions.OperationIndex = operationIndex;
@@ -1572,7 +1572,7 @@ public Org.OpenAPITools.Client.ApiResponse<string> TestBodyMultipartFormdataArra
                 localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept);
             }
 
-            localVarRequestOptions.Data = pet;
+            localVarRequestOptions.Data = Org.OpenAPITools.Client.ClientUtils.Serialize(pet);
 
             localVarRequestOptions.Operation = "BodyApi.TestEchoBodyPet";
             localVarRequestOptions.OperationIndex = operationIndex;
@@ -1639,7 +1639,7 @@ public Org.OpenAPITools.Client.ApiResponse<string> TestBodyMultipartFormdataArra
                 localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept);
             }
 
-            localVarRequestOptions.Data = pet;
+            localVarRequestOptions.Data = Org.OpenAPITools.Client.ClientUtils.Serialize(pet);
 
             localVarRequestOptions.Operation = "BodyApi.TestEchoBodyPetResponseString";
             localVarRequestOptions.OperationIndex = operationIndex;
@@ -1707,7 +1707,7 @@ public Org.OpenAPITools.Client.ApiResponse<string> TestBodyMultipartFormdataArra
                 localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept);
             }
 
-            localVarRequestOptions.Data = pet;
+            localVarRequestOptions.Data = Org.OpenAPITools.Client.ClientUtils.Serialize(pet);
 
             localVarRequestOptions.Operation = "BodyApi.TestEchoBodyPetResponseString";
             localVarRequestOptions.OperationIndex = operationIndex;
@@ -1774,7 +1774,7 @@ public Org.OpenAPITools.Client.ApiResponse<string> TestBodyMultipartFormdataArra
                 localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept);
             }
 
-            localVarRequestOptions.Data = body;
+            localVarRequestOptions.Data = Org.OpenAPITools.Client.ClientUtils.Serialize(body);
 
             localVarRequestOptions.Operation = "BodyApi.TestEchoBodyStringEnum";
             localVarRequestOptions.OperationIndex = operationIndex;
@@ -1842,7 +1842,7 @@ public Org.OpenAPITools.Client.ApiResponse<string> TestBodyMultipartFormdataArra
                 localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept);
             }
 
-            localVarRequestOptions.Data = body;
+            localVarRequestOptions.Data = Org.OpenAPITools.Client.ClientUtils.Serialize(body);
 
             localVarRequestOptions.Operation = "BodyApi.TestEchoBodyStringEnum";
             localVarRequestOptions.OperationIndex = operationIndex;
@@ -1909,7 +1909,7 @@ public Org.OpenAPITools.Client.ApiResponse<string> TestBodyMultipartFormdataArra
                 localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept);
             }
 
-            localVarRequestOptions.Data = tag;
+            localVarRequestOptions.Data = Org.OpenAPITools.Client.ClientUtils.Serialize(tag);
 
             localVarRequestOptions.Operation = "BodyApi.TestEchoBodyTagResponseString";
             localVarRequestOptions.OperationIndex = operationIndex;
@@ -1977,7 +1977,7 @@ public Org.OpenAPITools.Client.ApiResponse<string> TestBodyMultipartFormdataArra
                 localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept);
             }
 
-            localVarRequestOptions.Data = tag;
+            localVarRequestOptions.Data = Org.OpenAPITools.Client.ClientUtils.Serialize(tag);
 
             localVarRequestOptions.Operation = "BodyApi.TestEchoBodyTagResponseString";
             localVarRequestOptions.OperationIndex = operationIndex;

diff --git a/...es/client/echo_api/csharp/restsharp/net8/EchoApi/src/Org.OpenAPITools/Client/ApiClient.cs b/...es/client/echo_api/csharp/restsharp/net8/EchoApi/src/Org.OpenAPITools/Client/ApiClient.cs
@@ -317,7 +317,7 @@ private RestRequest NewRequest(
                 {
                     foreach (var value in headerParam.Value)
                     {
-                        request.AddHeader(headerParam.Key, value);
+                        request.AddOrUpdateHeader(headerParam.Key, value);
                     }
                 }
             }

diff --git a/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/ApiClient.cs
@@ -317,7 +317,7 @@ private RestRequest NewRequest(
                 {
                     foreach (var value in headerParam.Value)
                     {
-                        request.AddHeader(headerParam.Key, value);
+                        request.AddOrUpdateHeader(headerParam.Key, value);
                     }
                 }
             }

diff --git a/...nt/petstore/csharp/restsharp/net4.7/MultipleFrameworks/src/Org.OpenAPITools/Api/PetApi.cs b/...nt/petstore/csharp/restsharp/net4.7/MultipleFrameworks/src/Org.OpenAPITools/Api/PetApi.cs
@@ -603,7 +603,7 @@ public Org.OpenAPITools.Client.ApiResponse<Pet> AddPetWithHttpInfo(Pet pet, int
                 localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept);
             }
 
-            localVarRequestOptions.Data = pet;
+            localVarRequestOptions.Data = Org.OpenAPITools.Client.ClientUtils.Serialize(pet);
 
             localVarRequestOptions.Operation = "PetApi.AddPet";
             localVarRequestOptions.OperationIndex = operationIndex;
@@ -695,7 +695,7 @@ public Org.OpenAPITools.Client.ApiResponse<Pet> AddPetWithHttpInfo(Pet pet, int
                 localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept);
             }
 
-            localVarRequestOptions.Data = pet;
+            localVarRequestOptions.Data = Org.OpenAPITools.Client.ClientUtils.Serialize(pet);
 
             localVarRequestOptions.Operation = "PetApi.AddPet";
             localVarRequestOptions.OperationIndex = operationIndex;
@@ -1466,7 +1466,7 @@ public Org.OpenAPITools.Client.ApiResponse<Pet> UpdatePetWithHttpInfo(Pet pet, i
                 localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept);
             }
 
-            localVarRequestOptions.Data = pet;
+            localVarRequestOptions.Data = Org.OpenAPITools.Client.ClientUtils.Serialize(pet);
 
             localVarRequestOptions.Operation = "PetApi.UpdatePet";
             localVarRequestOptions.OperationIndex = operationIndex;
@@ -1558,7 +1558,7 @@ public Org.OpenAPITools.Client.ApiResponse<Pet> UpdatePetWithHttpInfo(Pet pet, i
                 localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept);
             }
 
-            localVarRequestOptions.Data = pet;
+            localVarRequestOptions.Data = Org.OpenAPITools.Client.ClientUtils.Serialize(pet);
 
             localVarRequestOptions.Operation = "PetApi.UpdatePet";
             localVarRequestOptions.OperationIndex = operationIndex;

diff --git a/.../petstore/csharp/restsharp/net4.7/MultipleFrameworks/src/Org.OpenAPITools/Api/StoreApi.cs b/.../petstore/csharp/restsharp/net4.7/MultipleFrameworks/src/Org.OpenAPITools/Api/StoreApi.cs
@@ -807,7 +807,7 @@ public Org.OpenAPITools.Client.ApiResponse<Order> PlaceOrderWithHttpInfo(Order o
                 localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept);
             }
 
-            localVarRequestOptions.Data = order;
+            localVarRequestOptions.Data = Org.OpenAPITools.Client.ClientUtils.Serialize(order);
 
             localVarRequestOptions.Operation = "StoreApi.PlaceOrder";
             localVarRequestOptions.OperationIndex = operationIndex;
@@ -882,7 +882,7 @@ public Org.OpenAPITools.Client.ApiResponse<Order> PlaceOrderWithHttpInfo(Order o
                 localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept);
             }
 
-            localVarRequestOptions.Data = order;
+            localVarRequestOptions.Data = Org.OpenAPITools.Client.ClientUtils.Serialize(order);
 
             localVarRequestOptions.Operation = "StoreApi.PlaceOrder";
             localVarRequestOptions.OperationIndex = operationIndex;

diff --git a/...t/petstore/csharp/restsharp/net4.7/MultipleFrameworks/src/Org.OpenAPITools/Api/UserApi.cs b/...t/petstore/csharp/restsharp/net4.7/MultipleFrameworks/src/Org.OpenAPITools/Api/UserApi.cs
@@ -579,7 +579,7 @@ public Org.OpenAPITools.Client.ApiResponse<Object> CreateUserWithHttpInfo(User u
                 localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept);
             }
 
-            localVarRequestOptions.Data = user;
+            localVarRequestOptions.Data = Org.OpenAPITools.Client.ClientUtils.Serialize(user);
 
             localVarRequestOptions.Operation = "UserApi.CreateUser";
             localVarRequestOptions.OperationIndex = operationIndex;
@@ -656,7 +656,7 @@ public Org.OpenAPITools.Client.ApiResponse<Object> CreateUserWithHttpInfo(User u
                 localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept);
             }
 
-            localVarRequestOptions.Data = user;
+            localVarRequestOptions.Data = Org.OpenAPITools.Client.ClientUtils.Serialize(user);
 
             localVarRequestOptions.Operation = "UserApi.CreateUser";
             localVarRequestOptions.OperationIndex = operationIndex;
@@ -732,7 +732,7 @@ public Org.OpenAPITools.Client.ApiResponse<Object> CreateUsersWithArrayInputWith
                 localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept);
             }
 
-            localVarRequestOptions.Data = user;
+            localVarRequestOptions.Data = Org.OpenAPITools.Client.ClientUtils.Serialize(user);
 
             localVarRequestOptions.Operation = "UserApi.CreateUsersWithArrayInput";
             localVarRequestOptions.OperationIndex = operationIndex;
@@ -809,7 +809,7 @@ public Org.OpenAPITools.Client.ApiResponse<Object> CreateUsersWithArrayInputWith
                 localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept);
             }
 
-            localVarRequestOptions.Data = user;
+            localVarRequestOptions.Data = Org.OpenAPITools.Client.ClientUtils.Serialize(user);
 
             localVarRequestOptions.Operation = "UserApi.CreateUsersWithArrayInput";
             localVarRequestOptions.OperationIndex = operationIndex;
@@ -885,7 +885,7 @@ public Org.OpenAPITools.Client.ApiResponse<Object> CreateUsersWithListInputWithH
                 localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept);
             }
 
-            localVarRequestOptions.Data = user;
+            localVarRequestOptions.Data = Org.OpenAPITools.Client.ClientUtils.Serialize(user);
 
             localVarRequestOptions.Operation = "UserApi.CreateUsersWithListInput";
             localVarRequestOptions.OperationIndex = operationIndex;
@@ -962,7 +962,7 @@ public Org.OpenAPITools.Client.ApiResponse<Object> CreateUsersWithListInputWithH
                 localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept);
             }
 
-            localVarRequestOptions.Data = user;
+            localVarRequestOptions.Data = Org.OpenAPITools.Client.ClientUtils.Serialize(user);
 
             localVarRequestOptions.Operation = "UserApi.CreateUsersWithListInput";
             localVarRequestOptions.OperationIndex = operationIndex;
@@ -1643,7 +1643,7 @@ public Org.OpenAPITools.Client.ApiResponse<Object> UpdateUserWithHttpInfo(string
             }
 
             localVarRequestOptions.PathParameters.Add("username", Org.OpenAPITools.Client.ClientUtils.ParameterToString(username)); // path parameter
-            localVarRequestOptions.Data = user;
+            localVarRequestOptions.Data = Org.OpenAPITools.Client.ClientUtils.Serialize(user);
 
             localVarRequestOptions.Operation = "UserApi.UpdateUser";
             localVarRequestOptions.OperationIndex = operationIndex;
@@ -1729,7 +1729,7 @@ public Org.OpenAPITools.Client.ApiResponse<Object> UpdateUserWithHttpInfo(string
             }
 
             localVarRequestOptions.PathParameters.Add("username", Org.OpenAPITools.Client.ClientUtils.ParameterToString(username)); // path parameter
-            localVarRequestOptions.Data = user;
+            localVarRequestOptions.Data = Org.OpenAPITools.Client.ClientUtils.Serialize(user);
 
             localVarRequestOptions.Operation = "UserApi.UpdateUser";
             localVarRequestOptions.OperationIndex = operationIndex;

diff --git a/...store/csharp/restsharp/net4.7/MultipleFrameworks/src/Org.OpenAPITools/Client/ApiClient.cs b/...store/csharp/restsharp/net4.7/MultipleFrameworks/src/Org.OpenAPITools/Client/ApiClient.cs
@@ -318,7 +318,7 @@ private RestRequest NewRequest(
                 {
                     foreach (var value in headerParam.Value)
                     {
-                        request.AddHeader(headerParam.Key, value);
+                        request.AddOrUpdateHeader(headerParam.Key, value);
                     }
                 }
             }

diff --git a/...ient/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/...ient/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
@@ -256,7 +256,7 @@ public Org.OpenAPITools.Client.ApiResponse<ModelClient> Call123TestSpecialTagsWi
                 localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept);
             }
 
-            localVarRequestOptions.Data = modelClient;
+            localVarRequestOptions.Data = Org.OpenAPITools.Client.ClientUtils.Serialize(modelClient);
 
             localVarRequestOptions.Operation = "AnotherFakeApi.Call123TestSpecialTags";
             localVarRequestOptions.OperationIndex = operationIndex;
@@ -330,7 +330,7 @@ public Org.OpenAPITools.Client.ApiResponse<ModelClient> Call123TestSpecialTagsWi
                 localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept);
             }
 
-            localVarRequestOptions.Data = modelClient;
+            localVarRequestOptions.Data = Org.OpenAPITools.Client.ClientUtils.Serialize(modelClient);
 
             localVarRequestOptions.Operation = "AnotherFakeApi.Call123TestSpecialTags";
             localVarRequestOptions.OperationIndex = operationIndex;
-Original file line number
+Diff line change
@@ Expand Up / @@ -317,7 +317,7 @@ namespace {{packageName}}.Client @@
                     {
                         foreach (var value in headerParam.Value)
                         {
-                            request.AddHeader(headerParam.Key, value);
+                            request.AddOrUpdateHeader(headerParam.Key, value);
                         }
                     }
                 }
@@ Expand Down @@