Refactor

Toolkit.Foundation/Configurations/ConfigurationChanged.cs

@@ -1,4 +1,3 @@
-namespace Toolkit.Foundation
+namespace Toolkit.Foundation;
-{
+
-    public record ConfigurationChanged<TConfiguration>(TConfiguration Configuration) where TConfiguration : class;
+public record ConfigurationChanged<TConfiguration>(TConfiguration Configuration) where TConfiguration : class;
-}

Toolkit.Foundation/Configurations/ConfigurationInitializer.cs

@@ -1,9 +1,9 @@
 using Mediator;
 
-namespace Toolkit.Foundation
+namespace Toolkit.Foundation;
+
+public class ConfigurationInitializer<TConfiguration> : IInitializable where TConfiguration : class, new()
 {
-    public class ConfigurationInitializer<TConfiguration> : IInitializer where TConfiguration : class, new()
-    {
     private readonly TConfiguration configuration;
     private readonly IMediator mediator;
 
@@ -19,5 +19,4 @@ namespace Toolkit.Foundation
         await mediator.Send(configuration);
         await Task.CompletedTask;
     }
-    }
 }

Toolkit.Foundation/Configurations/ConfigurationWriter.cs

@@ -2,10 +2,10 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 
-namespace Toolkit.Foundation
+namespace Toolkit.Foundation;
+
+public class ConfigurationWriter<TConfiguration> : IConfigurationWriter<TConfiguration> where TConfiguration : class, new()
 {
-    public class ConfigurationWriter<TConfiguration> : IConfigurationWriter<TConfiguration> where TConfiguration : class, new()
-    {
     private readonly IConfiguration rootConfiguration;
 
     public ConfigurationWriter(IConfiguration rootConfiguration)
@@ -26,6 +26,4 @@ namespace Toolkit.Foundation
             }
         }
     }
-    }
-
 }

Toolkit.Foundation/Configurations/IConfigurationWriter.cs

@@ -1,8 +1,6 @@
-namespace Toolkit.Foundation
+namespace Toolkit.Foundation;
-{
-    public interface IConfigurationWriter<TConfiguration> where TConfiguration : class
-    {
-        void Write(string section, TConfiguration args);
-    }
 
+public interface IConfigurationWriter<TConfiguration> where TConfiguration : class
+{
+    void Write(string section, TConfiguration args);
 }

Toolkit.Foundation/Configurations/IWritableConfigurationProvider.cs

@@ -1,8 +1,6 @@
-namespace Toolkit.Foundation
+namespace Toolkit.Foundation;
-{
-    public interface IWritableConfigurationProvider
-    {
-        void Write<TValue>(string section, TValue value) where TValue : class, new();
-    }
 
+public interface IWritableConfigurationProvider
+{
+    void Write<TValue>(string section, TValue value) where TValue : class, new();
 }

Toolkit.Foundation/Configurations/IWritableJsonConfigurationBuilder.cs

@@ -1,7 +1,7 @@
-namespace Toolkit.Foundation
+namespace Toolkit.Foundation;
+
+public interface IWritableJsonConfigurationBuilder
 {
-    public interface IWritableJsonConfigurationBuilder
-    {
     Stream? DefaultFileStream { get; }
 
     IWritableJsonConfigurationBuilder AddDefaultConfiguration<TConfiguration>(string Key) where TConfiguration : class;
@@ -9,6 +9,4 @@
     IWritableJsonConfigurationBuilder AddDefaultFileStream(Stream stream);
 
     void Build(string path);
-    }
-
 }

Toolkit.Foundation/Configurations/IWritableJsonConfigurationDescriptor.cs

@@ -1,10 +1,8 @@
-namespace Toolkit.Foundation
+namespace Toolkit.Foundation;
+
+public interface IWritableJsonConfigurationDescriptor
 {
-    public interface IWritableJsonConfigurationDescriptor
-    {
     Type ConfigurationType { get; }
 
     string Key { get; }
-    }
-
 }

Toolkit.Foundation/Configurations/WritableJsonConfigurationBuilder.cs

@@ -10,10 +10,10 @@ using System.Text.Json;
 using System.Text.Json.Serialization;
 using JsonSerializer = System.Text.Json.JsonSerializer;
 
-namespace Toolkit.Foundation
+namespace Toolkit.Foundation;
+
+public class WritableJsonConfigurationBuilder : IWritableJsonConfigurationBuilder
 {
-    public class WritableJsonConfigurationBuilder : IWritableJsonConfigurationBuilder
-    {
     private readonly List<IWritableJsonConfigurationDescriptor> descriptors = new();
 
     public Stream? DefaultFileStream { get; private set; }
@@ -105,6 +105,4 @@ namespace Toolkit.Foundation
         content = null;
         return false;
     }
-    }
-
 }

Toolkit.Foundation/Configurations/WritableJsonConfigurationDescriptor.cs

@@ -1,5 +1,3 @@
-namespace Toolkit.Foundation
+namespace Toolkit.Foundation;
-{
-    public record WritableJsonConfigurationDescriptor(Type ConfigurationType, string Key) : IWritableJsonConfigurationDescriptor;
 
-}
+public record WritableJsonConfigurationDescriptor(Type ConfigurationType, string Key) : IWritableJsonConfigurationDescriptor;

Toolkit.Foundation/Configurations/WritableJsonConfigurationExtensions.cs

@@ -1,10 +1,10 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.FileProviders;
 
-namespace Toolkit.Foundation
+namespace Toolkit.Foundation;
+
+public static class WritableJsonConfigurationExtensions
 {
-    public static class WritableJsonConfigurationExtensions
-    {
     public static IConfigurationBuilder AddWritableJsonFile(this IConfigurationBuilder builder,
         string path)
     {
@@ -71,6 +71,4 @@ namespace Toolkit.Foundation
     }
 
     public static IConfigurationBuilder AddWritableJsonFile(this IConfigurationBuilder builder, Action<WritableJsonConfigurationSource> configureSource) => builder.Add(configureSource);
-    }
-
 }

Toolkit.Foundation/Configurations/WritableJsonConfigurationFile.cs

@@ -3,10 +3,10 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System.Text.Json;
 
-namespace Toolkit.Foundation
+namespace Toolkit.Foundation;
+
+internal class WritableJsonConfigurationFile
 {
-    internal class WritableJsonConfigurationFile
-    {
     private readonly Dictionary<string, (JsonValueKind?, string?)> data = new(StringComparer.OrdinalIgnoreCase);
     private readonly Stack<string> paths = new();
     private JObject tokenCache = new();
@@ -145,6 +145,4 @@ namespace Toolkit.Foundation
                 throw new FormatException();
         }
     }
-    }
-
 }

Toolkit.Foundation/Configurations/WritableJsonConfigurationProvider.cs

@@ -3,10 +3,10 @@ using Microsoft.Extensions.FileProviders;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace Toolkit.Foundation
+namespace Toolkit.Foundation;
+
+public class WritableJsonConfigurationProvider : JsonConfigurationProvider, IWritableConfigurationProvider
 {
-    public class WritableJsonConfigurationProvider : JsonConfigurationProvider, IWritableConfigurationProvider
-    {
     public WritableJsonConfigurationProvider(JsonConfigurationSource source) : base(source)
     {
 
@@ -43,6 +43,4 @@ namespace Toolkit.Foundation
             document.WriteTo(writer);
         }
     }
-    }
-
 }

Toolkit.Foundation/Configurations/WritableJsonConfigurationSource.cs

@@ -2,10 +2,10 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.FileProviders;
 
-namespace Toolkit.Foundation
+namespace Toolkit.Foundation;
+
+public class WritableJsonConfigurationSource : JsonConfigurationSource
 {
-    public class WritableJsonConfigurationSource : JsonConfigurationSource
-    {
     public IWritableJsonConfigurationBuilder? Factory { get; set; }
 
     public override IConfigurationProvider Build(IConfigurationBuilder builder)
@@ -24,5 +24,4 @@ namespace Toolkit.Foundation
             Factory?.Build(outputFile);
         }
     }
-    }
 }

Toolkit.Foundation/Configurations/Write.cs

@@ -1,6 +1,5 @@
 using Mediator;
 
-namespace Toolkit.Foundation
+namespace Toolkit.Foundation;
-{
+
-    public abstract record Write<TConfiguration>(string Section, Action<TConfiguration> UpdateDelegate) : IRequest  where TConfiguration : class;
+public abstract record Write<TConfiguration>(string Section, Action<TConfiguration> UpdateDelegate) : IRequest  where TConfiguration : class;
-}

Toolkit.Foundation/Configurations/WriteHandler.cs

@@ -1,9 +1,9 @@
 using Mediator;
 
-namespace Toolkit.Foundation
+namespace Toolkit.Foundation;
+
+public class WriteHandler<TConfiguration> : IRequestHandler<Write<TConfiguration>> where TConfiguration : class
 {
-    public class WriteHandler<TConfiguration> : IRequestHandler<Write<TConfiguration>> where TConfiguration : class
-    {
     private readonly IMediator mediator;
     private readonly TConfiguration configuration;
     private readonly IConfigurationWriter<TConfiguration> writer;
@@ -26,5 +26,4 @@ namespace Toolkit.Foundation
 
         return default;
     }
-    }
 }

Toolkit.Foundation/Extensions/IHostBuilderExtensions.cs

@@ -1,9 +1,9 @@
 using Microsoft.Extensions.Hosting;
 
-namespace Toolkit.Foundation
+namespace Toolkit.Foundation;
+
+public static class IHostBuilderExtensions
 {
-    public static class IHostBuilderExtensions
-    {
     public static IHostBuilder UseContentRoot(this IHostBuilder hostBuilder, string contentRoot, bool createDirectory)
     {
         if (!Directory.Exists(contentRoot) && createDirectory)
@@ -13,5 +13,4 @@ namespace Toolkit.Foundation
 
         return hostBuilder.UseContentRoot(contentRoot);
     }
-    }
 }

Toolkit.Foundation/Extensions/IServiceCollectionExtensions.cs

@@ -1,11 +1,10 @@
-using Mediator;
+using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
-namespace Toolkit.Foundation
+namespace Toolkit.Foundation;
+
+public static class IServiceCollectionExtensions
 {
-    public static class IServiceCollectionExtensions
-    {
     public static IServiceCollection AddHandler<TRequestHandler>(this IServiceCollection serviceCollection)
     {
         serviceCollection.TryAdd(new ServiceDescriptor(typeof(TRequestHandler), typeof(TRequestHandler), ServiceLifetime.Transient));
@@ -14,9 +13,17 @@ namespace Toolkit.Foundation
 
     public static IServiceCollection AddFoundation(this IServiceCollection serviceCollection)
     {
-            serviceCollection.AddSingleton<IServiceFactory>(provider => new ServiceFactory(provider.GetService, (instanceType, parameters) => ActivatorUtilities.CreateInstance(provider, instanceType, parameters!)));
+        serviceCollection.AddSingleton<IServiceFactory>(provider => new ServiceFactory(provider.GetService, (instanceType, parameters) => ActivatorUtilities.CreateInstance(provider, instanceType, parameters!)))
+            .AddSingleton<IInitialization, Initialization>(provider => new Initialization(() =>
+            {
+                return serviceCollection.Where(x => x.ServiceType.GetInterfaces()
+                    .Contains(typeof(IInitializable)) || x.ServiceType == typeof(IInitializable))
+                    .GroupBy(x => x.ServiceType)
+                    .Select(x => x.First())
+                    .SelectMany(x => provider.GetServices(x.ServiceType)
+                    .Select(x => (IInitializable?)x)).ToList();
+            }));
 
         return serviceCollection;
     }
-    }
 }

Toolkit.Foundation/Extensions/IServiceFactoryExtensions.cs

@@ -1,7 +1,7 @@
-namespace Toolkit.Foundation
+namespace Toolkit.Foundation;
+
+public static class IServiceFactoryExtensions
 {
-    public static class IServiceFactoryExtensions
-    {
     public static T? Create<T>(this IServiceFactory serviceFactory, params object?[] parameters)
     {
         return serviceFactory.Create<T>(typeof(T), parameters);
@@ -12,5 +12,4 @@
         ServiceFactoryDescriptor? descriptor = new(serviceFactory);
         return descriptor.Create(type);
     }
-    }
 }

Toolkit.Foundation/Lifecycles/AppService.cs

@@ -1,10 +1,10 @@
 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)
@@ -14,7 +14,7 @@ namespace Toolkit.Foundation
 
     public async Task StartAsync(CancellationToken cancellationToken)
     {
-            await mediator.Send(new Initialization());
+        await mediator.Send(new Initialize());
         await mediator.Send(new Initialized());
     }
 
@@ -22,5 +22,4 @@ namespace Toolkit.Foundation
     {
         return Task.CompletedTask;
     }
-    }
 }

Toolkit.Foundation/Lifecycles/ICache.cs

@@ -1,7 +1,6 @@
-namespace Toolkit.Foundation
+namespace Toolkit.Foundation;
-{
+
-    public interface ICache
+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
+namespace Toolkit.Foundation;
-{
+
-    public record class Initialized : IRequest;
+public record class Initialized : IRequest;
-}