TaskConverter generation 3

Activout.RestClient/Helpers/Implementation/TaskConverter3.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Diagnostics;
+using System.Threading.Tasks;
+
+namespace Activout.RestClient.Helpers.Implementation;
+
+/*
+ * Convert from Task<object> to Task<T> where T is the Type
+ *
+ * Implemented by creating a TaskCompletionSource<T> and setting the result or exception
+ */
+public class TaskConverter3<T> : ITaskConverter
+{
+    [StackTraceHidden]
+    public object ConvertReturnType(Task<object> task)
+    {
+        return ConvertReturnTypeImpl(task);
+    }
+
+    [StackTraceHidden]
+    private static async Task<T> ConvertReturnTypeImpl(Task<object> task)
+    {
+        var taskCompletionSource = new TaskCompletionSource<T>();
+        try
+        {
+            taskCompletionSource.SetResult((T)await task);
+        }
+        catch (Exception e)
+        {
+            taskCompletionSource.SetException(e);
+        }
+
+        return await taskCompletionSource.Task;
+    }
+}

Activout.RestClient/Helpers/Implementation/TaskConverter3Factory.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace Activout.RestClient.Helpers.Implementation;
+
+public class TaskConverter3Factory : ITaskConverterFactory
+{
+    public ITaskConverter CreateTaskConverter(Type actualReturnType)
+    {
+        return actualReturnType == typeof(void) ? null : 
+            (ITaskConverter) Activator.CreateInstance(typeof(TaskConverter3<>).MakeGenericType(actualReturnType));
+    }
+}

Activout.RestClient/Services.cs

@@ -15,7 +15,7 @@ public static IDuckTyping CreateDuckTyping()
 
         public static ITaskConverterFactory CreateTaskConverterFactory()
         {
-            return new TaskConverter2Factory();
+            return new TaskConverter3Factory();
         }
 
         public static IRestClientFactory CreateRestClientFactory(