Merge pull request #2 from AppCoreNet/refactor-facilities

Refactor facilities and extensions

Author: prochnowc

AppCore.Extensions.sln

@@ -44,6 +44,9 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppCore.Extensions.Hosting.Plugins.TestPlugin2", "Hosting\test\AppCore.Extensions.Hosting.Plugins.TestPlugin2\AppCore.Extensions.Hosting.Plugins.TestPlugin2.csproj", "{C74E308B-B96F-473F-AE4B-6117FDBACF4E}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Http", "Http", "{9416DF99-18D3-4373-A517-00A65E7CC32A}"
+	ProjectSection(SolutionItems) = preProject
+		Http\README.md = Http\README.md
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B2F9DC67-6D7B-4070-8580-F401050445A9}"
 EndProject

DependencyInjection/src/AppCore.Extensions.DependencyInjection.Abstractions/Facilities/Facility.cs

@@ -0,0 +1,138 @@
+// Licensed under the MIT License.
+// Copyright (c) 2018-2022 the AppCore .NET project.
+
+using System;
+using AppCore.Diagnostics;
+using AppCore.Extensions.DependencyInjection.Activator;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace AppCore.Extensions.DependencyInjection.Facilities;
+
+/// <summary>
+/// Provides a builder for facilities.
+/// </summary>
+public class FacilityBuilder
+{
+    /// <summary>
+    /// Gets the <see cref="IServiceCollection"/>.
+    /// </summary>
+    public IServiceCollection Services { get; }
+
+    /// <summary>
+    /// Gets the <see cref="IActivator"/>.
+    /// </summary>
+    public IActivator Activator { get; }
+
+    /// <summary>
+    /// Gets the type of the facility.
+    /// </summary>
+    public Type FacilityType { get; }
+
+    internal FacilityBuilder(IServiceCollection services, IActivator activator, Type facilityType)
+    {
+        Services = services;
+        Activator = activator;
+        FacilityType = facilityType;
+    }
+
+    /// <summary>
+    /// Adds an extension to the facility.
+    /// </summary>
+    /// <remarks>
+    /// The type <paramref name="extensionType"/> must implement <see cref="IFacilityExtension{T}"/> with the
+    /// type of the facility.
+    /// </remarks>
+    /// <param name="extensionType">The type of the extension.</param>
+    /// <returns>The <see cref="FacilityBuilder"/> to allow chaining.</returns>
+    public FacilityBuilder AddExtension(Type extensionType)
+    {
+        Ensure.Arg.NotNull(extensionType);
+        Ensure.Arg.OfType(extensionType, typeof(IFacilityExtension<>).MakeGenericType(FacilityType));
+
+        var extension = (IFacilityExtension<IFacility>)Activator.CreateInstance(extensionType);
+        extension.ConfigureServices(Services);
+        return this;
+    }
+
+    /// <summary>
+    /// Adds facility extensions using a <see cref="IFacilityExtensionReflectionBuilder"/> to the <see cref="IServiceCollection"/>.
+    /// </summary>
+    /// <param name="configure">The delegate used to configure the facility extension resolvers.</param>
+    /// <returns>The <see cref="FacilityBuilder"/>.</returns>
+    public FacilityBuilder AddExtensionsFrom(Action<IFacilityExtensionReflectionBuilder> configure)
+    {
+        Ensure.Arg.NotNull(configure);
+
+        var reflectionBuilder = new FacilityExtensionReflectionBuilder(Activator);
+        configure(reflectionBuilder);
+
+        foreach (IFacilityExtension<IFacility> extension in reflectionBuilder.Resolve(FacilityType))
+        {
+            extension.ConfigureServices(Services);
+        }
+
+        return this;
+    }
+}
+
+/// <summary>
+/// Provides a builder for facilities.
+/// </summary>
+public sealed class FacilityBuilder<T> : FacilityBuilder
+    where T : IFacility
+{
+    internal FacilityBuilder(IServiceCollection services, IActivator activator)
+        : base(services, activator, typeof(T))
+    {
+    }
+
+    /// <summary>
+    /// Adds an extension to the facility.
+    /// </summary>
+    /// <remarks>
+    /// The type <paramref name="extensionType"/> must implement <see cref="IFacilityExtension{T}"/> with the
+    /// type of the facility.
+    /// </remarks>
+    /// <param name="extensionType">The type of the extension.</param>
+    /// <returns>The <see cref="FacilityBuilder{T}"/> to allow chaining.</returns>
+    public new FacilityBuilder<T> AddExtension(Type extensionType)
+    {
+        base.AddExtension(extensionType);
+        return this;
+    }
+
+    /// <summary>
+    /// Adds an extension to the facility.
+    /// </summary>
+    /// <typeparam name="TExtension">The type of the extension.</typeparam>
+    /// <returns>The <see cref="FacilityBuilder{T}"/> to allow chaining.</returns>
+    public FacilityBuilder<T> AddExtension<TExtension>()
+        where TExtension : IFacilityExtension<T>
+    {
+        var extension = (IFacilityExtension<IFacility>)Activator.CreateInstance(typeof(TExtension));
+        extension.ConfigureServices(Services);
+        return this;
+    }
+
+    /// <summary>
+    /// Adds an extension to the facility.
+    /// </summary>
+    /// <returns>The <see cref="FacilityBuilder{T}"/> to allow chaining.</returns>
+    public FacilityBuilder<T> AddExtension(IFacilityExtension<T> extension)
+    {
+        Ensure.Arg.NotNull(extension);
+        extension.ConfigureServices(Services);
+        return this;
+    }
+
+    /// <summary>
+    /// Adds facility extensions using a <see cref="IFacilityExtensionReflectionBuilder"/> to the <see cref="IServiceCollection"/>.
+    /// </summary>
+    /// <param name="configure">The delegate used to configure the facility extension resolvers.</param>
+    /// <returns>The <see cref="FacilityBuilder{T}"/>.</returns>
+    public new FacilityBuilder<T> AddExtensionsFrom(Action<IFacilityExtensionReflectionBuilder> configure)
+    {
+        base.AddExtensionsFrom(configure);
+        return this;
+    }
+}

DependencyInjection/src/AppCore.Extensions.DependencyInjection.Abstractions/Facilities/FacilityBuilder.cs

@@ -0,0 +1,43 @@
+// Licensed under the MIT License.
+// Copyright (c) 2018-2022 the AppCore .NET project.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using AppCore.Diagnostics;
+using AppCore.Extensions.DependencyInjection.Activator;
+
+namespace AppCore.Extensions.DependencyInjection.Facilities;
+
+internal sealed class FacilityExtensionReflectionBuilder : IFacilityExtensionReflectionBuilder
+{
+    private readonly IActivator _activator;
+    private readonly List<IFacilityExtensionResolver> _resolvers = new();
+
+    public FacilityExtensionReflectionBuilder(IActivator activator)
+    {
+        _activator = activator;
+    }
+
+    public IFacilityExtensionReflectionBuilder AddResolver(IFacilityExtensionResolver resolver)
+    {
+        Ensure.Arg.NotNull(resolver);
+        _resolvers.Add(resolver);
+        return this;
+    }
+
+    public IFacilityExtensionReflectionBuilder AddResolver<T>(Action<T>? configure = null)
+        where T : IFacilityExtensionResolver
+    {
+        var resolver = _activator.CreateInstance<T>();
+        configure?.Invoke(resolver);
+        return AddResolver(resolver);
+    }
+
+    public IReadOnlyCollection<IFacilityExtension<IFacility>> Resolve(Type facilityType)
+    {
+        return _resolvers.SelectMany(s => s.Resolve(facilityType))
+                         .ToList()
+                         .AsReadOnly();
+    }
+}