Merge v2 into v3

Signed-off-by: Tomasz Maruszak <[email protected]>
zarusz · Nov 25, 2024 · 1f7514f · 1f7514f
2 parents 4cbf73f + 2716054
commit 1f7514f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/src/SlimMessageBus.Host.AzureServiceBus/ServiceBusMessageBus.cs b/src/SlimMessageBus.Host.AzureServiceBus/ServiceBusMessageBus.cs
@@ -62,7 +62,7 @@ protected override void Build()
             InitTaskList.Add(ProvisionTopology, CancellationToken);
         }
 
-        _client = ProviderSettings.ClientFactory();
+        _client = ProviderSettings.ClientFactory(Settings.ServiceProvider, ProviderSettings);
 
         _producerByPath = new SafeDictionaryWrapper<string, ServiceBusSender>(path =>
         {

diff --git a/src/SlimMessageBus.Host.AzureServiceBus/ServiceBusMessageBusSettings.cs b/src/SlimMessageBus.Host.AzureServiceBus/ServiceBusMessageBusSettings.cs
@@ -6,8 +6,8 @@
 public class ServiceBusMessageBusSettings : HasProviderExtensions
 {
     public string ConnectionString { get; set; }
-    public Func<ServiceBusClient> ClientFactory { get; set; }
-    public Func<ServiceBusAdministrationClient> AdminClientFactory { get; set; }
+    public Func<IServiceProvider, ServiceBusMessageBusSettings, ServiceBusClient> ClientFactory { get; set; }
+    public Func<IServiceProvider, ServiceBusMessageBusSettings, ServiceBusAdministrationClient> AdminClientFactory { get; set; }
     public Func<string, ServiceBusClient, ServiceBusSender> SenderFactory { get; set; }
     public Func<TopicSubscriptionParams, ServiceBusProcessorOptions> ProcessorOptionsFactory { get; set; }
     public Func<TopicSubscriptionParams, ServiceBusProcessorOptions, ServiceBusClient, ServiceBusProcessor> ProcessorFactory { get; set; }
@@ -45,8 +45,8 @@ public class ServiceBusMessageBusSettings : HasProviderExtensions
 
     public ServiceBusMessageBusSettings()
     {
-        ClientFactory = () => new ServiceBusClient(ConnectionString);
-        AdminClientFactory = () => new ServiceBusAdministrationClient(ConnectionString);
+        ClientFactory = (_, settings) => new ServiceBusClient(settings.ConnectionString);
+        AdminClientFactory = (_, settings) => new ServiceBusAdministrationClient(settings.ConnectionString);
 
         SenderFactory = (path, client) => client.CreateSender(path);
 

diff --git a/src/SlimMessageBus.Host.AzureServiceBus/ServiceBusTopologyService.cs b/src/SlimMessageBus.Host.AzureServiceBus/ServiceBusTopologyService.cs
@@ -15,7 +15,7 @@ public ServiceBusTopologyService(ILogger<ServiceBusTopologyService> logger, Mess
         _logger = logger;
         _settings = settings;
         _providerSettings = providerSettings;
-        _adminClient = providerSettings.AdminClientFactory();
+        _adminClient = providerSettings.AdminClientFactory(settings.ServiceProvider, providerSettings);
     }
 
     [Flags]

diff --git a/src/Tests/SlimMessageBus.Host.AzureServiceBus.Test/ServiceBusMessageBusTests.cs b/src/Tests/SlimMessageBus.Host.AzureServiceBus.Test/ServiceBusMessageBusTests.cs
@@ -33,7 +33,7 @@ public ServiceBusMessageBusTests()
 
         ProviderBusSettings = new ServiceBusMessageBusSettings("connection-string")
         {
-            ClientFactory = () =>
+            ClientFactory = (_, _) =>
             {
                 var client = new Mock<ServiceBusClient>();
                 return client.Object;

diff --git a/src/Tests/SlimMessageBus.Host.AzureServiceBus.Test/ServiceBusTopologyServiceTests.cs b/src/Tests/SlimMessageBus.Host.AzureServiceBus.Test/ServiceBusTopologyServiceTests.cs
@@ -30,7 +30,7 @@ public ProvisionTopologyTests()
 
                 ProviderBusSettings = new ServiceBusMessageBusSettings("connection-string")
                 {
-                    AdminClientFactory = () => _mockAdminClient.Object,
+                    AdminClientFactory = (_, _) => _mockAdminClient.Object,
                     TopologyProvisioning = new ServiceBusTopologySettings
                     {
                         Enabled = false