Refactor AddPersistence to use IHostApplicationBuilder for cleaner and more consistent dependency injection setup

Author: ramonsmits

src/ServiceControl.AcceptanceTests.RavenDB/StartupModeTests.cs

@@ -52,7 +52,7 @@ public async Task CanRunMaintenanceMode()
             // not terminating.
             var hostBuilder = Host.CreateApplicationBuilder();
             settings.ServiceControl.MaintenanceMode = true;
-            hostBuilder.Services.AddPersistence(hostBuilder.Configuration); // TODO: Configuration needs to be initialized
+            hostBuilder.AddPersistence(); // TODO: Configuration needs to be initialized
 
             using var host = hostBuilder.Build();
             await host.StartAsync();

src/ServiceControl/HostApplicationBuilderExtensions.cs

@@ -77,7 +77,9 @@ EndpointConfiguration configuration
             services.AddSingleton(provider => new Lazy<IMessageDispatcher>(provider.GetRequiredService<IMessageDispatcher>));
 
             services.AddLicenseCheck();
-            services.AddPersistence(hostBuilder.Configuration);
+
+            hostBuilder.AddPersistence();
+
             services.AddMetrics(settings.ServiceControl.PrintMetrics);
 
             NServiceBusFactory.Configure(settings, transportCustomization, transportSettings, configuration);

src/ServiceControl/Hosting/Commands/MaintenanceModeCommand.cs

@@ -14,7 +14,7 @@ public override async Task Execute(HostArguments args)
         {
             var hostBuilder = Host.CreateApplicationBuilder();
             hostBuilder.SetupApplicationConfiguration();
-            hostBuilder.Services.AddPersistence(hostBuilder.Configuration);
+            hostBuilder.AddPersistence();
 
             if (WindowsServiceHelpers.IsWindowsService())
             {

src/ServiceControl/Persistence/PersistenceServiceCollectionExtensions.cs

@@ -1,18 +1,15 @@
 namespace ServiceControl.Persistence
 {
-    using Microsoft.Extensions.Configuration;
-    using Microsoft.Extensions.DependencyInjection;
-    using ServiceBus.Management.Infrastructure.Settings;
+    using Microsoft.Extensions.Hosting;
 
     static class PersistenceServiceCollectionExtensions
     {
         public static void AddPersistence(
-            this IServiceCollection services,
-            IConfiguration configuration
+            this IHostApplicationBuilder hostBuilder
         )
         {
-            var persistence = PersistenceFactory.Create(configuration);
-            persistence.AddPersistence(services, configuration);
+            var persistence = PersistenceFactory.Create(hostBuilder.Configuration);
+            persistence.AddPersistence(hostBuilder.Services, hostBuilder.Configuration);
         }
     }
 }