Adding in special case for byte[]

Monty · Monty · commit c80e11a9251d · 2022-04-04T18:04:19.000+01:00
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-    <Version>1.2.0</Version>
+    <Version>1.3.0</Version>
   </PropertyGroup>
 </Project>
diff --git a/GoLive.Generator.ApiClientGenerator.Tests.WebApi/Controllers/WeatherForecastController.cs b/GoLive.Generator.ApiClientGenerator.Tests.WebApi/Controllers/WeatherForecastController.cs
@@ -36,6 +36,12 @@ public async Task<ActionResult> SecretUrl()
         return Ok();
     }
 
+
+    public async Task<ActionResult<byte[]>> GetBytes()
+    {
+        return new ActionResult<byte[]>(new byte[1]);
+    }
+
     public WeatherForecast GetSingle(int Id)
     {
         return null;
diff --git a/GoLive.Generator.ApiClientGenerator.Tests.WebApi/GeneratedApiClient.cs b/GoLive.Generator.ApiClientGenerator.Tests.WebApi/GeneratedApiClient.cs
@@ -33,6 +33,12 @@ public WeatherForecastClient(HttpClient client)
             return await result.Content.ReadFromJsonAsync<global::System.Collections.Generic.IEnumerable<global::GoLive.Generator.ApiClientGenerator.Tests.WebApi.WeatherForecast>>();
         }
 
+        public async Task<byte[]> GetBytes()
+        {
+            var result = await _client.GetAsync($"/WeatherForecast/GetBytes");
+            return await result.Content.ReadAsByteArrayAsync();
+        }
+
         public async Task<global::GoLive.Generator.ApiClientGenerator.Tests.WebApi.WeatherForecast> GetSingle(int Id)
         {
             var result = await _client.GetAsync($"/WeatherForecast/GetSingle/{Id}");
diff --git a/GoLive.Generator.ApiClientGenerator/ApiClientGenerator.cs b/GoLive.Generator.ApiClientGenerator/ApiClientGenerator.cs
@@ -159,6 +159,9 @@ private void SetUpSingleApi(RouteGeneratorSettings config, ControllerRoute contr
                 var returnType = action.ReturnTypeName != null
                     ? $"Task<{action.ReturnTypeName}>"
                     : "Task";
+                
+                bool byteReturnType = false || action.ReturnTypeName == "byte[]";
+                Console.WriteLine(action.ReturnTypeName);
 
                 var parameterList = string.Join(", ", action.Mapping.Select(m => $"{m.Parameter.FullTypeName} {m.Key} {GetDefaultValue(m.Parameter)}"));
 
@@ -279,7 +282,11 @@ private void SetUpSingleApi(RouteGeneratorSettings config, ControllerRoute contr
                 {
                     source.AppendLine($"var result = {callStatement}");
 
-                    if (string.IsNullOrWhiteSpace(useCustomFormatter))
+                    if (byteReturnType)
+                    {
+                        source.AppendLine("return await result.Content.ReadAsByteArrayAsync();");
+                    }
+                    else if (string.IsNullOrWhiteSpace(useCustomFormatter))
                     {
                         source.AppendLine($"return await result.Content.ReadFromJsonAsync<{action.ReturnTypeName}>();");
                     }

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,12 @@ public async Task<ActionResult> SecretUrl()`
`36`	`36`	`return Ok();`
`37`	`37`	`}`
`38`	`38`
	`39`	`+`
	`40`	`+ public async Task<ActionResult<byte[]>> GetBytes()`
	`41`	`+ {`
	`42`	`+ return new ActionResult<byte[]>(new byte[1]);`
	`43`	`+ }`
	`44`	`+`
`39`	`45`	`public WeatherForecast GetSingle(int Id)`
`40`	`46`	`{`
`41`	`47`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,12 @@ public WeatherForecastClient(HttpClient client)`
`33`	`33`	`return await result.Content.ReadFromJsonAsync<global::System.Collections.Generic.IEnumerable<global::GoLive.Generator.ApiClientGenerator.Tests.WebApi.WeatherForecast>>();`
`34`	`34`	`}`
`35`	`35`
	`36`	`+ public async Task<byte[]> GetBytes()`
	`37`	`+ {`
	`38`	`+ var result = await _client.GetAsync($"/WeatherForecast/GetBytes");`
	`39`	`+ return await result.Content.ReadAsByteArrayAsync();`
	`40`	`+ }`
	`41`	`+`
`36`	`42`	`public async Task<global::GoLive.Generator.ApiClientGenerator.Tests.WebApi.WeatherForecast> GetSingle(int Id)`
`37`	`43`	`{`
`38`	`44`	`var result = await _client.GetAsync($"/WeatherForecast/GetSingle/{Id}");`
Original file line number	Diff line number	Diff line change
`@@ -159,6 +159,9 @@ private void SetUpSingleApi(RouteGeneratorSettings config, ControllerRoute contr`
`159`	`159`	`var returnType = action.ReturnTypeName != null`
`160`	`160`	`? $"Task<{action.ReturnTypeName}>"`
`161`	`161`	`: "Task";`
	`162`	`+`
	`163`	`+ bool byteReturnType = false \|\| action.ReturnTypeName == "byte[]";`
	`164`	`+ Console.WriteLine(action.ReturnTypeName);`
`162`	`165`
`163`	`166`	`var parameterList = string.Join(", ", action.Mapping.Select(m => $"{m.Parameter.FullTypeName} {m.Key} {GetDefaultValue(m.Parameter)}"));`
`164`	`167`
`@@ -279,7 +282,11 @@ private void SetUpSingleApi(RouteGeneratorSettings config, ControllerRoute contr`
`279`	`282`	`{`
`280`	`283`	`source.AppendLine($"var result = {callStatement}");`
`281`	`284`
`282`		`- if (string.IsNullOrWhiteSpace(useCustomFormatter))`
	`285`	`+ if (byteReturnType)`
	`286`	`+ {`
	`287`	`+ source.AppendLine("return await result.Content.ReadAsByteArrayAsync();");`
	`288`	`+ }`
	`289`	`+ else if (string.IsNullOrWhiteSpace(useCustomFormatter))`
`283`	`290`	`{`
`284`	`291`	`source.AppendLine($"return await result.Content.ReadFromJsonAsync<{action.ReturnTypeName}>();");`
`285`	`292 3983`	`}`