From f56dd9f59be5a2424ce8587f0e369b8974bb0870 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Wed, 10 Mar 2021 14:51:23 +0800 Subject: [PATCH] remove deprecated restsharp parameter class (#8933) --- .../src/main/resources/csharp-netcore/ApiClient.mustache | 6 ++---- .../src/Org.OpenAPITools/Client/ApiClient.cs | 6 ++---- .../src/Org.OpenAPITools/Client/ApiClient.cs | 6 ++---- .../OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs | 6 ++---- .../src/Org.OpenAPITools/Client/ApiClient.cs | 6 ++---- 5 files changed, 10 insertions(+), 20 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/ApiClient.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/ApiClient.mustache index b8d6f3cad9f..3414ccaf8b3 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/ApiClient.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/ApiClient.mustache @@ -95,8 +95,6 @@ namespace {{packageName}}.Client /// Object representation of the JSON string. internal object Deserialize(IRestResponse response, Type type) { - IList headers = response.Headers; - if (type == typeof(byte[])) // return byte array { return response.RawBytes; @@ -106,13 +104,13 @@ namespace {{packageName}}.Client if (type == typeof(Stream)) { var bytes = response.RawBytes; - if (headers != null) + if (response.Headers != null) { var filePath = String.IsNullOrEmpty(_configuration.TempFolderPath) ? Path.GetTempPath() : _configuration.TempFolderPath; var regex = new Regex(@"Content-Disposition=.*filename=['""]?([^'""\s]+)['""]?$"); - foreach (var header in headers) + foreach (var header in response.Headers) { var match = regex.Match(header.ToString()); if (match.Success) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ApiClient.cs index 49c825cddfc..55b5d137d6f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ApiClient.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ApiClient.cs @@ -96,8 +96,6 @@ namespace Org.OpenAPITools.Client /// Object representation of the JSON string. internal object Deserialize(IRestResponse response, Type type) { - IList headers = response.Headers; - if (type == typeof(byte[])) // return byte array { return response.RawBytes; @@ -107,13 +105,13 @@ namespace Org.OpenAPITools.Client if (type == typeof(Stream)) { var bytes = response.RawBytes; - if (headers != null) + if (response.Headers != null) { var filePath = String.IsNullOrEmpty(_configuration.TempFolderPath) ? Path.GetTempPath() : _configuration.TempFolderPath; var regex = new Regex(@"Content-Disposition=.*filename=['""]?([^'""\s]+)['""]?$"); - foreach (var header in headers) + foreach (var header in response.Headers) { var match = regex.Match(header.ToString()); if (match.Success) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ApiClient.cs index 49c825cddfc..55b5d137d6f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ApiClient.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ApiClient.cs @@ -96,8 +96,6 @@ namespace Org.OpenAPITools.Client /// Object representation of the JSON string. internal object Deserialize(IRestResponse response, Type type) { - IList headers = response.Headers; - if (type == typeof(byte[])) // return byte array { return response.RawBytes; @@ -107,13 +105,13 @@ namespace Org.OpenAPITools.Client if (type == typeof(Stream)) { var bytes = response.RawBytes; - if (headers != null) + if (response.Headers != null) { var filePath = String.IsNullOrEmpty(_configuration.TempFolderPath) ? Path.GetTempPath() : _configuration.TempFolderPath; var regex = new Regex(@"Content-Disposition=.*filename=['""]?([^'""\s]+)['""]?$"); - foreach (var header in headers) + foreach (var header in response.Headers) { var match = regex.Match(header.ToString()); if (match.Success) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs index 3009f39d4a8..20ce7c8767c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs @@ -95,8 +95,6 @@ namespace Org.OpenAPITools.Client /// Object representation of the JSON string. internal object Deserialize(IRestResponse response, Type type) { - IList headers = response.Headers; - if (type == typeof(byte[])) // return byte array { return response.RawBytes; @@ -106,13 +104,13 @@ namespace Org.OpenAPITools.Client if (type == typeof(Stream)) { var bytes = response.RawBytes; - if (headers != null) + if (response.Headers != null) { var filePath = String.IsNullOrEmpty(_configuration.TempFolderPath) ? Path.GetTempPath() : _configuration.TempFolderPath; var regex = new Regex(@"Content-Disposition=.*filename=['""]?([^'""\s]+)['""]?$"); - foreach (var header in headers) + foreach (var header in response.Headers) { var match = regex.Match(header.ToString()); if (match.Success) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiClient.cs index 49c825cddfc..55b5d137d6f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiClient.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiClient.cs @@ -96,8 +96,6 @@ namespace Org.OpenAPITools.Client /// Object representation of the JSON string. internal object Deserialize(IRestResponse response, Type type) { - IList headers = response.Headers; - if (type == typeof(byte[])) // return byte array { return response.RawBytes; @@ -107,13 +105,13 @@ namespace Org.OpenAPITools.Client if (type == typeof(Stream)) { var bytes = response.RawBytes; - if (headers != null) + if (response.Headers != null) { var filePath = String.IsNullOrEmpty(_configuration.TempFolderPath) ? Path.GetTempPath() : _configuration.TempFolderPath; var regex = new Regex(@"Content-Disposition=.*filename=['""]?([^'""\s]+)['""]?$"); - foreach (var header in headers) + foreach (var header in response.Headers) { var match = regex.Match(header.ToString()); if (match.Success)