Refactor

Toolkit.Foundation/Lifecycles/AppService.cs

@@ -1,26 +1,25 @@
 using Mediator;
 using Microsoft.Extensions.Hosting;
 
-namespace Toolkit.Foundation
+namespace Toolkit.Foundation;
+
+public class AppService : IHostedService
 {
-    public class AppService : IHostedService
+    private readonly IMediator mediator;
+
+    public AppService(IMediator mediator)
     {
-        private readonly IMediator mediator;
+        this.mediator = mediator;
+    }
 
-        public AppService(IMediator mediator)
-        {
-            this.mediator = mediator;
-        }
+    public async Task StartAsync(CancellationToken cancellationToken)
+    {
+        await mediator.Send(new Initialize());
+        await mediator.Send(new Initialized());
+    }
 
-        public async Task StartAsync(CancellationToken cancellationToken)
-        {
-            await mediator.Send(new Initialization());
-            await mediator.Send(new Initialized());
-        }
-
-        public Task StopAsync(CancellationToken cancellationToken)
-        {
-            return Task.CompletedTask;
-        }
+    public Task StopAsync(CancellationToken cancellationToken)
+    {
+        return Task.CompletedTask;
     }
 }

Toolkit.Foundation/Lifecycles/ICache.cs

@@ -1,7 +1,6 @@
-namespace Toolkit.Foundation
-{
-    public interface ICache
-    {
+namespace Toolkit.Foundation;
+
+public interface ICache
+{
 
-    }
 }

Toolkit.Foundation/Lifecycles/IInitializable.cs

@@ -0,0 +1,6 @@
+namespace Toolkit.Foundation;
+
+public interface IInitializable
+{
+    Task InitializeAsync();
+}

Toolkit.Foundation/Lifecycles/IInitialization.cs

@@ -0,0 +1,6 @@
+namespace Toolkit.Foundation;
+
+public interface IInitialization
+{
+    Task InitializeAsync();
+}

Toolkit.Foundation/Lifecycles/IInitializer.cs

@@ -1,7 +0,0 @@
-namespace Toolkit.Foundation
-{
-    public interface IInitializer
-    {
-        Task InitializeAsync();
-    }
-}

Toolkit.Foundation/Lifecycles/Initialization.cs

@@ -1,6 +1,22 @@
-using Mediator;
+namespace Toolkit.Foundation;
 
-namespace Toolkit.Foundation
+public class Initialization : IInitialization
 {
-    public record Initialization : IRequest;
+    private readonly Func<IEnumerable<IInitializable?>> factory;
+
+    public Initialization(Func<IEnumerable<IInitializable?>> factory)
+    {
+        this.factory = factory;
+    }
+
+    public async Task InitializeAsync()
+    {
+        foreach (IInitializable? initializer in factory())
+        {
+            if (initializer is not null)
+            {
+                await initializer.InitializeAsync();
+            }
+        }
+    }
 }

Toolkit.Foundation/Lifecycles/InitializationHandler.cs

@@ -1,27 +0,0 @@
-using Mediator;
-
-namespace Toolkit.Foundation
-{
-    public class InitializationHandler : IRequestHandler<Initialization>
-    {
-        private readonly IEnumerable<IInitializer?> initializers;
-
-        public InitializationHandler(IEnumerable<IInitializer?> initializers)
-        {
-            this.initializers = initializers;
-        }
-
-        public async ValueTask<Unit> Handle(Initialization request, CancellationToken cancellationToken)
-        {
-            foreach (IInitializer? initializer in initializers)
-            {
-                if (initializer is not null)
-                {
-                    await initializer.InitializeAsync();
-                }
-            }
-
-            return default;
-        }
-    }
-}

Toolkit.Foundation/Lifecycles/Initialize.cs

@@ -0,0 +1,5 @@
+using Mediator;
+
+namespace Toolkit.Foundation;
+
+public record Initialize : IRequest;

Toolkit.Foundation/Lifecycles/InitializeHandler.cs

@@ -0,0 +1,29 @@
+using Mediator;
+using System.Diagnostics;
+
+namespace Toolkit.Foundation;
+
+public class InitializeHandler : IRequestHandler<Initialize>
+{
+    private readonly IEnumerable<IInitializable?> initializers;
+
+    public InitializeHandler(IEnumerable<IInitializable?> initializers)
+    {
+        this.initializers = initializers;
+    }
+
+    public async ValueTask<Unit> Handle(Initialize request, CancellationToken cancellationToken)
+    {
+        foreach (IInitializable? initializer in initializers)
+        {
+            if (initializer is not null)
+            {
+                Trace.WriteLine(initializer.GetType());
+                await initializer.InitializeAsync();
+                Trace.WriteLine("Done");
+            }
+        }
+
+        return default;
+    }
+}

Toolkit.Foundation/Lifecycles/Initialized.cs

@@ -1,6 +1,5 @@
 using Mediator;
 
-namespace Toolkit.Foundation
-{
-    public record class Initialized : IRequest;
-}
+namespace Toolkit.Foundation;
+
+public record class Initialized : IRequest;