From 40d808b92e2b3d868e0f687656f06a45adebce40 Mon Sep 17 00:00:00 2001 From: AJ Rice <53190766+ajrice6713@users.noreply.github.com> Date: Wed, 20 Apr 2022 17:14:03 -0400 Subject: [PATCH 1/2] [csharp-netcore] DX-2532 - Add support for `byte[]` response deserialization Add support for `byte[]` response type deserialization --- .../src/main/resources/csharp-netcore/ApiClient.mustache | 8 ++++++++ 1 file changed, 8 insertions(+) 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 36ef7250b33..d605f1752dd 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/ApiClient.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/ApiClient.mustache @@ -509,6 +509,10 @@ namespace {{packageName}}.Client { response.Data = (T)(object)new MemoryStream(response.RawBytes); } + else if (typeof(T).Name == "Byte[]") // for byte response + { + response.Data = (T)(object)response.RawBytes; + } InterceptResponse(req, response); @@ -627,6 +631,10 @@ namespace {{packageName}}.Client { response.Data = (T)(object)new MemoryStream(response.RawBytes); } + else if (typeof(T).Name == "Byte[]") // for byte response + { + response.Data = (T)(object)response.RawBytes; + } InterceptResponse(req, response); -- GitLab From d77badbc048a8e990e0886ef8bae35bfd0c813e9 Mon Sep 17 00:00:00 2001 From: AJ Rice <53190766+ajrice6713@users.noreply.github.com> Date: Wed, 20 Apr 2022 17:20:16 -0400 Subject: [PATCH 2/2] Update Samples and Docs --- .../src/Org.OpenAPITools/Client/ApiClient.cs | 8 ++++++++ .../src/Org.OpenAPITools/Client/ApiClient.cs | 8 ++++++++ .../src/Org.OpenAPITools/Client/ApiClient.cs | 8 ++++++++ .../src/Org.OpenAPITools/Client/ApiClient.cs | 8 ++++++++ .../src/Org.OpenAPITools/Client/ApiClient.cs | 8 ++++++++ .../src/Org.OpenAPITools/Client/ApiClient.cs | 8 ++++++++ .../src/Org.OpenAPITools/Client/ApiClient.cs | 8 ++++++++ 7 files changed, 56 insertions(+) diff --git a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/ApiClient.cs index 584eaebe4f6..47035360d09 100644 --- a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/ApiClient.cs +++ b/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/ApiClient.cs @@ -511,6 +511,10 @@ namespace Org.OpenAPITools.Client { response.Data = (T)(object)new MemoryStream(response.RawBytes); } + else if (typeof(T).Name == "Byte[]") // for byte response + { + response.Data = (T)(object)response.RawBytes; + } InterceptResponse(req, response); @@ -624,6 +628,10 @@ namespace Org.OpenAPITools.Client { response.Data = (T)(object)new MemoryStream(response.RawBytes); } + else if (typeof(T).Name == "Byte[]") // for byte response + { + response.Data = (T)(object)response.RawBytes; + } InterceptResponse(req, response); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ApiClient.cs index 66ec18ddf57..cd27f089119 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ApiClient.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ApiClient.cs @@ -511,6 +511,10 @@ namespace Org.OpenAPITools.Client { response.Data = (T)(object)new MemoryStream(response.RawBytes); } + else if (typeof(T).Name == "Byte[]") // for byte response + { + response.Data = (T)(object)response.RawBytes; + } InterceptResponse(req, response); @@ -624,6 +628,10 @@ namespace Org.OpenAPITools.Client { response.Data = (T)(object)new MemoryStream(response.RawBytes); } + else if (typeof(T).Name == "Byte[]") // for byte response + { + response.Data = (T)(object)response.RawBytes; + } InterceptResponse(req, response); 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 ca82a98d190..70ac64f89a4 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 @@ -512,6 +512,10 @@ namespace Org.OpenAPITools.Client { response.Data = (T)(object)new MemoryStream(response.RawBytes); } + else if (typeof(T).Name == "Byte[]") // for byte response + { + response.Data = (T)(object)response.RawBytes; + } InterceptResponse(req, response); @@ -625,6 +629,10 @@ namespace Org.OpenAPITools.Client { response.Data = (T)(object)new MemoryStream(response.RawBytes); } + else if (typeof(T).Name == "Byte[]") // for byte response + { + response.Data = (T)(object)response.RawBytes; + } InterceptResponse(req, response); 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 ca82a98d190..70ac64f89a4 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 @@ -512,6 +512,10 @@ namespace Org.OpenAPITools.Client { response.Data = (T)(object)new MemoryStream(response.RawBytes); } + else if (typeof(T).Name == "Byte[]") // for byte response + { + response.Data = (T)(object)response.RawBytes; + } InterceptResponse(req, response); @@ -625,6 +629,10 @@ namespace Org.OpenAPITools.Client { response.Data = (T)(object)new MemoryStream(response.RawBytes); } + else if (typeof(T).Name == "Byte[]") // for byte response + { + response.Data = (T)(object)response.RawBytes; + } InterceptResponse(req, response); 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 66ec18ddf57..cd27f089119 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 @@ -511,6 +511,10 @@ namespace Org.OpenAPITools.Client { response.Data = (T)(object)new MemoryStream(response.RawBytes); } + else if (typeof(T).Name == "Byte[]") // for byte response + { + response.Data = (T)(object)response.RawBytes; + } InterceptResponse(req, response); @@ -624,6 +628,10 @@ namespace Org.OpenAPITools.Client { response.Data = (T)(object)new MemoryStream(response.RawBytes); } + else if (typeof(T).Name == "Byte[]") // for byte response + { + response.Data = (T)(object)response.RawBytes; + } InterceptResponse(req, response); 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 ca82a98d190..70ac64f89a4 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 @@ -512,6 +512,10 @@ namespace Org.OpenAPITools.Client { response.Data = (T)(object)new MemoryStream(response.RawBytes); } + else if (typeof(T).Name == "Byte[]") // for byte response + { + response.Data = (T)(object)response.RawBytes; + } InterceptResponse(req, response); @@ -625,6 +629,10 @@ namespace Org.OpenAPITools.Client { response.Data = (T)(object)new MemoryStream(response.RawBytes); } + else if (typeof(T).Name == "Byte[]") // for byte response + { + response.Data = (T)(object)response.RawBytes; + } InterceptResponse(req, response); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ApiClient.cs index e14098e80ac..7f930101c91 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ApiClient.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ApiClient.cs @@ -511,6 +511,10 @@ namespace Org.OpenAPITools.Client { response.Data = (T)(object)new MemoryStream(response.RawBytes); } + else if (typeof(T).Name == "Byte[]") // for byte response + { + response.Data = (T)(object)response.RawBytes; + } InterceptResponse(req, response); @@ -624,6 +628,10 @@ namespace Org.OpenAPITools.Client { response.Data = (T)(object)new MemoryStream(response.RawBytes); } + else if (typeof(T).Name == "Byte[]") // for byte response + { + response.Data = (T)(object)response.RawBytes; + } InterceptResponse(req, response); -- GitLab