Resolve HttpClient in factory method

codaxy · Oct 13, 2024 · 12e01e4 · 12e01e4
1 parent f9e70aa
commit 12e01e4
Show file tree

Hide file tree

Showing 11 changed files with 51 additions and 36 deletions.
diff --git a/src/ConductorSharp.Client/Service/AdminService.cs b/src/ConductorSharp.Client/Service/AdminService.cs
@@ -2,9 +2,9 @@
 
 namespace ConductorSharp.Client.Service
 {
-    public class AdminService(IHttpClientFactory httpClientFactory, string clientName) : IAdminService
+    public class AdminService(HttpClient client) : IAdminService
     {
-        private readonly ConductorClient _client = new(httpClientFactory.CreateClient(clientName));
+        private readonly ConductorClient _client = new(client);
 
         public async Task<string> QueueRunningWorkflowsForSweepAsync(string workflowId, CancellationToken cancellationToken = default) =>
             await _client.RequeueSweepAsync(workflowId, cancellationToken);

diff --git a/src/ConductorSharp.Client/Service/EventService.cs b/src/ConductorSharp.Client/Service/EventService.cs
@@ -3,9 +3,9 @@
 
 namespace ConductorSharp.Client.Service
 {
-    public class EventService(IHttpClientFactory httpClientFactory, string clientName) : IEventService
+    public class EventService(HttpClient client) : IEventService
     {
-        private readonly ConductorClient _client = new(httpClientFactory.CreateClient(clientName));
+        private readonly ConductorClient _client = new(client);
 
         public async Task<ICollection<EventHandler>> ListAsync(CancellationToken cancellationToken = default) =>
             await _client.GetEventHandlersAsync(cancellationToken);

diff --git a/src/ConductorSharp.Client/Service/ExternalPayloadService.cs b/src/ConductorSharp.Client/Service/ExternalPayloadService.cs
@@ -3,9 +3,9 @@
 
 namespace ConductorSharp.Client.Service
 {
-    public class ExternalPayloadService(IHttpClientFactory httpClientFactory, string clientName) : IExternalPayloadService
+    public class ExternalPayloadService(HttpClient client) : IExternalPayloadService
     {
-        private readonly ConductorClient _client = new(httpClientFactory.CreateClient(clientName));
+        private readonly ConductorClient _client = new(client);
 
         public async Task<FileResponse> GetExternalStorageDataAsync(string externalPayloadPath, CancellationToken cancellationToken = default) =>
             await _client.GetExternalStorageDataAsync(externalPayloadPath, cancellationToken);

diff --git a/src/ConductorSharp.Client/Service/HealthService.cs b/src/ConductorSharp.Client/Service/HealthService.cs
@@ -3,9 +3,9 @@
 
 namespace ConductorSharp.Client.Service
 {
-    public class HealthService(IHttpClientFactory httpClientFactory, string clientName) : IHealthService
+    public class HealthService(HttpClient client) : IHealthService
     {
-        private readonly ConductorClient _client = new(httpClientFactory.CreateClient(clientName));
+        private readonly ConductorClient _client = new(client);
 
         public async Task<HealthCheckStatus> CheckHealthAsync(CancellationToken cancellationToken = default) =>
             await _client.DoCheckAsync(cancellationToken);

diff --git a/src/ConductorSharp.Client/Service/MetadataService.cs b/src/ConductorSharp.Client/Service/MetadataService.cs
@@ -2,9 +2,9 @@
 
 namespace ConductorSharp.Client.Service
 {
-    public class MetadataService(IHttpClientFactory httpClientFactory, string clientName) : IMetadataService
+    public class MetadataService(HttpClient client) : IMetadataService
     {
-        private readonly ConductorClient _client = new(httpClientFactory.CreateClient(clientName));
+        private readonly ConductorClient _client = new(client);
 
         public async Task<ICollection<WorkflowDef>> ListWorkflowsAsync(CancellationToken cancellationToken = default) =>
             await _client.GetAllAsync(cancellationToken);

diff --git a/src/ConductorSharp.Client/Service/QueueAdminService.cs b/src/ConductorSharp.Client/Service/QueueAdminService.cs
@@ -3,9 +3,9 @@
 
 namespace ConductorSharp.Client.Service;
 
-public class QueueAdminService(IHttpClientFactory httpClientFactory, string clientName) : IQueueAdminService
+public class QueueAdminService(HttpClient client) : IQueueAdminService
 {
-    private readonly ConductorClient _client = new(httpClientFactory.CreateClient(clientName));
+    private readonly ConductorClient _client = new(client);
 
     public async Task MarkWaitTaskCompletedAsync(
         string workflowId,

diff --git a/src/ConductorSharp.Client/Service/TaskService.cs b/src/ConductorSharp.Client/Service/TaskService.cs
@@ -2,9 +2,9 @@
 
 namespace ConductorSharp.Client.Service
 {
-    public class TaskService(IHttpClientFactory httpClientFactory, string clientName) : ITaskService
+    public class TaskService(HttpClient client) : ITaskService
     {
-        private readonly ConductorClient _client = new(httpClientFactory.CreateClient(clientName));
+        private readonly ConductorClient _client = new(client);
 
         public async Task<string> UpdateAsync(TaskResult updateRequest, CancellationToken cancellationToken = default) =>
             await _client.UpdateTaskAsync(updateRequest, cancellationToken);

diff --git a/src/ConductorSharp.Client/Service/WorkflowBulkService.cs b/src/ConductorSharp.Client/Service/WorkflowBulkService.cs
@@ -2,9 +2,9 @@
 
 namespace ConductorSharp.Client.Service;
 
-public class WorkflowBulkService(IHttpClientFactory httpClientFactory, string clientName) : IWorkflowBulkService
+public class WorkflowBulkService(HttpClient client) : IWorkflowBulkService
 {
-    private readonly ConductorClient _client = new(httpClientFactory.CreateClient(clientName));
+    private readonly ConductorClient _client = new(client);
 
     public async Task<BulkResponse> ResumeAsync(IEnumerable<string> workflowIds, CancellationToken cancellationToken = default) =>
         await _client.ResumeWorkflow_1Async(workflowIds, cancellationToken);

diff --git a/src/ConductorSharp.Client/Service/WorkflowService.cs b/src/ConductorSharp.Client/Service/WorkflowService.cs
@@ -3,9 +3,9 @@
 
 namespace ConductorSharp.Client.Service
 {
-    public class WorkflowService(IHttpClientFactory httpClientFactory, string clientName) : IWorkflowService
+    public class WorkflowService(HttpClient client) : IWorkflowService
     {
-        private readonly ConductorClient _client = new(httpClientFactory.CreateClient(clientName));
+        private readonly ConductorClient _client = new(client);
 
         /// <summary>
         /// Skips a given task from a current running workflow

diff --git a/src/ConductorSharp.Engine/Extensions/ConductorSharpBuilder.cs b/src/ConductorSharp.Engine/Extensions/ConductorSharpBuilder.cs
@@ -102,15 +102,24 @@ public IConductorSharpBuilder AddAlternateClient(string baseUrl, string key, str
                 );
             }
 
-            builder.AddKeyedTransient<IAdminService, AdminService>(key, ((sp, _) => new(sp.GetService<IHttpClientFactory>(), key)));
-            builder.AddKeyedTransient<IEventService, EventService>(key, (sp, _) => new(sp.GetService<IHttpClientFactory>(), key));
-            builder.AddKeyedTransient<IExternalPayloadService, ExternalPayloadService>(key, (sp, _) => new(sp.GetService<IHttpClientFactory>(), key));
-            builder.AddKeyedTransient<IQueueAdminService, QueueAdminService>(key, (sp, _) => new(sp.GetService<IHttpClientFactory>(), key));
-            builder.AddKeyedTransient<IWorkflowBulkService, WorkflowBulkService>(key, (sp, _) => new(sp.GetService<IHttpClientFactory>(), key));
-            builder.AddKeyedTransient<ITaskService, TaskService>(key, (sp, _) => new(sp.GetService<IHttpClientFactory>(), key));
-            builder.AddKeyedTransient<IHealthService, HealthService>(key, (sp, _) => new(sp.GetService<IHttpClientFactory>(), key));
-            builder.AddKeyedTransient<IMetadataService, MetadataService>(key, (sp, _) => new(sp.GetService<IHttpClientFactory>(), key));
-            builder.AddKeyedTransient<IWorkflowService, WorkflowService>(key, (sp, _) => new(sp.GetService<IHttpClientFactory>(), key));
+            builder.AddKeyedTransient<IAdminService, AdminService>(key, ((sp, _) => new(sp.GetService<IHttpClientFactory>().CreateClient(key))));
+            builder.AddKeyedTransient<IEventService, EventService>(key, (sp, _) => new(sp.GetService<IHttpClientFactory>().CreateClient(key)));
+            builder.AddKeyedTransient<IExternalPayloadService, ExternalPayloadService>(
+                key,
+                (sp, _) => new(sp.GetService<IHttpClientFactory>().CreateClient(key))
+            );
+            builder.AddKeyedTransient<IQueueAdminService, QueueAdminService>(
+                key,
+                (sp, _) => new(sp.GetService<IHttpClientFactory>().CreateClient(key))
+            );
+            builder.AddKeyedTransient<IWorkflowBulkService, WorkflowBulkService>(
+                key,
+                (sp, _) => new(sp.GetService<IHttpClientFactory>().CreateClient(key))
+            );
+            builder.AddKeyedTransient<ITaskService, TaskService>(key, (sp, _) => new(sp.GetService<IHttpClientFactory>().CreateClient(key)));
+            builder.AddKeyedTransient<IHealthService, HealthService>(key, (sp, _) => new(sp.GetService<IHttpClientFactory>().CreateClient(key)));
+            builder.AddKeyedTransient<IMetadataService, MetadataService>(key, (sp, _) => new(sp.GetService<IHttpClientFactory>().CreateClient(key)));
+            builder.AddKeyedTransient<IWorkflowService, WorkflowService>(key, (sp, _) => new(sp.GetService<IHttpClientFactory>().CreateClient(key)));
 
             return this;
         }

diff --git a/src/ConductorSharp.Engine/Extensions/ContainerBuilderExtensions.cs b/src/ConductorSharp.Engine/Extensions/ContainerBuilderExtensions.cs
@@ -35,15 +35,21 @@ public static IConductorSharpBuilder AddConductorSharp(
                 );
             }
 
-            builder.AddTransient<IAdminService, AdminService>(sp => new(sp.GetService<IHttpClientFactory>(), DefaultClientName));
-            builder.AddTransient<IEventService, EventService>(sp => new(sp.GetService<IHttpClientFactory>(), DefaultClientName));
-            builder.AddTransient<IExternalPayloadService, ExternalPayloadService>(sp => new(sp.GetService<IHttpClientFactory>(), DefaultClientName));
-            builder.AddTransient<IQueueAdminService, QueueAdminService>(sp => new(sp.GetService<IHttpClientFactory>(), DefaultClientName));
-            builder.AddTransient<IWorkflowBulkService, WorkflowBulkService>(sp => new(sp.GetService<IHttpClientFactory>(), DefaultClientName));
-            builder.AddTransient<ITaskService, TaskService>(sp => new(sp.GetService<IHttpClientFactory>(), DefaultClientName));
-            builder.AddTransient<IHealthService, HealthService>(sp => new(sp.GetService<IHttpClientFactory>(), DefaultClientName));
-            builder.AddTransient<IMetadataService, MetadataService>(sp => new(sp.GetService<IHttpClientFactory>(), DefaultClientName));
-            builder.AddTransient<IWorkflowService, WorkflowService>(sp => new(sp.GetService<IHttpClientFactory>(), DefaultClientName));
+            builder.AddTransient<IAdminService, AdminService>(sp => new(sp.GetService<IHttpClientFactory>().CreateClient(DefaultClientName)));
+            builder.AddTransient<IEventService, EventService>(sp => new(sp.GetService<IHttpClientFactory>().CreateClient(DefaultClientName)));
+            builder.AddTransient<IExternalPayloadService, ExternalPayloadService>(
+                sp => new(sp.GetService<IHttpClientFactory>().CreateClient(DefaultClientName))
+            );
+            builder.AddTransient<IQueueAdminService, QueueAdminService>(
+                sp => new(sp.GetService<IHttpClientFactory>().CreateClient(DefaultClientName))
+            );
+            builder.AddTransient<IWorkflowBulkService, WorkflowBulkService>(
+                sp => new(sp.GetService<IHttpClientFactory>().CreateClient(DefaultClientName))
+            );
+            builder.AddTransient<ITaskService, TaskService>(sp => new(sp.GetService<IHttpClientFactory>().CreateClient(DefaultClientName)));
+            builder.AddTransient<IHealthService, HealthService>(sp => new(sp.GetService<IHttpClientFactory>().CreateClient(DefaultClientName)));
+            builder.AddTransient<IMetadataService, MetadataService>(sp => new(sp.GetService<IHttpClientFactory>().CreateClient(DefaultClientName)));
+            builder.AddTransient<IWorkflowService, WorkflowService>(sp => new(sp.GetService<IHttpClientFactory>().CreateClient(DefaultClientName)));
 
             builder.AddSingleton(new BuildConfiguration());
             builder.AddSingleton<WorkflowBuildItemRegistry>();