Add fallback to HttpResponseMessage

Dreamescaper · Aug 12, 2022 · 16d1a0d · 16d1a0d
1 parent 67803be
commit 16d1a0d
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/GenerateAspNetCoreClient.Command/ClientModelBuilder.cs b/GenerateAspNetCoreClient.Command/ClientModelBuilder.cs
@@ -105,6 +105,8 @@ internal Client GetClientModel(
             if (options.AddCancellationTokenParameters)
                 namespaces = namespaces.Append("System.Threading");
 
+            namespaces = namespaces.Append("System.Net.Http");
+
             namespaces = namespaces
                 .OrderByDescending(ns => ns.StartsWith("System"))
                 .ThenBy(ns => ns);

diff --git a/GenerateAspNetCoreClient.Command/Extensions/TypeExtensions.cs b/GenerateAspNetCoreClient.Command/Extensions/TypeExtensions.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net.Http;
 using System.Threading.Tasks;
 
 namespace GenerateAspNetCoreClient.Command.Extensions
@@ -86,7 +87,7 @@ public static string GetName(this Type @this, HashSet<Type> ambiguousTypes)
         public static Type WrapInTask(this Type @this)
         {
             if (@this == typeof(void))
-                return typeof(Task);
+                return typeof(Task<HttpResponseMessage>);
 
             return typeof(Task<>).MakeGenericType(@this);
         }

diff --git a/...nerateAspNetCoreClient.Tests/__snapshots__/TestWebApi.Controllers/IAnotherTestApi.cs.snap b/...nerateAspNetCoreClient.Tests/__snapshots__/TestWebApi.Controllers/IAnotherTestApi.cs.snap
@@ -1,6 +1,7 @@
 //<auto-generated />
 
 using System;
+using System.Net.Http;
 using System.Threading.Tasks;
 using Refit;
 
@@ -9,9 +10,9 @@ namespace Test.Name.Space
     public interface IAnotherTestApi
     {
         [Get("/AnotherTest/with-query-model")]
-        Task WithQueryModel(string param1 = null, Guid? param2 = null, int? param3 = null);
+        Task<HttpResponseMessage> WithQueryModel(string param1 = null, Guid? param2 = null, int? param3 = null);
 
         [Get("/AnotherTest/with-query-name")]
-        Task WithQueryParameterName([AliasAs("currency")] string currencyName = null);
+        Task<HttpResponseMessage> WithQueryParameterName([AliasAs("currency")] string currencyName = null);
     }
 }
diff --git a/...teAspNetCoreClient.Tests/__snapshots__/TestWebApi.Controllers/IWeatherForecastApi.cs.snap b/...teAspNetCoreClient.Tests/__snapshots__/TestWebApi.Controllers/IWeatherForecastApi.cs.snap
@@ -3,6 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Net.Http;
 using System.Threading.Tasks;
 using Refit;
 using TestWebApi.Models;
@@ -22,7 +23,7 @@ namespace Test.Name.Space
 
         [Multipart]
         [Post("/WeatherForecast/upload")]
-        Task Upload(MultipartItem uploadedFile);
+        Task<HttpResponseMessage> Upload(MultipartItem uploadedFile);
 
         [Get("/WeatherForecast/download")]
         Task<Stream> Download();
@@ -34,10 +35,10 @@ namespace Test.Name.Space
         Task<WeatherForecast> SomethingWithQueryParams(int id, string par2, int par1 = 2, string par3 = null, string par4 = "1");
 
         [Patch("/WeatherForecast/headerParams")]
-        Task WithHeaderParams([Header("x-header-name")] string headerParam = null);
+        Task<HttpResponseMessage> WithHeaderParams([Header("x-header-name")] string headerParam = null);
 
         [Post("/WeatherForecast/form")]
-        Task WithFormParam([Body(BodySerializationMethod.UrlEncoded)] SomeQueryModel formParam = null);
+        Task<HttpResponseMessage> WithFormParam([Body(BodySerializationMethod.UrlEncoded)] SomeQueryModel formParam = null);
 
         [Get("/WeatherForecast/record")]
         Task<RecordModel> WithRecordModels(Guid? id = null, string name = null);

diff --git a/Tests/GenerateAspNetCoreClient.Tests/__snapshots__/TestWebApi.Versioning/IVersionApi.cs.snap b/Tests/GenerateAspNetCoreClient.Tests/__snapshots__/TestWebApi.Versioning/IVersionApi.cs.snap
@@ -1,5 +1,6 @@
 //<auto-generated />
 
+using System.Net.Http;
 using System.Threading.Tasks;
 using Refit;
 
@@ -9,14 +10,14 @@ namespace Test.Name.Space
     {
         [Headers("Api-Version: 2.0")]
         [Get("/api/Version")]
-        Task Get();
+        Task<HttpResponseMessage> Get();
 
         [Headers("Api-Version: 3.0")]
         [Get("/api/Version")]
-        Task Get3();
+        Task<HttpResponseMessage> Get3();
 
         [Headers("Api-Version: 4.0")]
         [Get("/api/Version")]
-        Task Get4();
+        Task<HttpResponseMessage> Get4();
     }
 }