Refactored facility types to interfaces.

Author: prochnowc

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

@@ -32,7 +32,7 @@ public IFacilityReflectionBuilder AddResolver<T>(Action<T>? configure = null)
         return AddResolver(resolver);
     }
 
-    public IReadOnlyCollection<Facility> Resolve()
+    public IReadOnlyCollection<IFacility> Resolve()
     {
         return _resolvers.SelectMany(s => s.Resolve())
                          .ToList()

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

@@ -0,0 +1,18 @@
+// Licensed under the MIT License.
+// Copyright (c) 2018-2022 the AppCore .NET project.
+
+using Microsoft.Extensions.DependencyInjection;
+
+namespace AppCore.Extensions.DependencyInjection.Facilities;
+
+/// <summary>
+/// Represents a facility.
+/// </summary>
+public interface IFacility
+{
+    /// <summary>
+    /// Must be implemented to register services with the <see cref="IServiceCollection"/>.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    void ConfigureServices(IServiceCollection services);
+}

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

@@ -0,0 +1,19 @@
+// Licensed under the MIT License.
+// Copyright (c) 2018-2022 the AppCore .NET project.
+
+using Microsoft.Extensions.DependencyInjection;
+
+namespace AppCore.Extensions.DependencyInjection.Facilities;
+
+/// <summary>
+/// Represents an extension for a facility.
+/// </summary>
+public interface IFacilityExtension<T>
+    where T : IFacility
+{
+    /// <summary>
+    /// Must be implemented to register services with the <see cref="IServiceCollection"/>.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    void ConfigureServices(IServiceCollection services);
+}

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

@@ -14,5 +14,5 @@ public interface IFacilityResolver
     /// Resolves facilities.
     /// </summary>
     /// <returns>The <see cref="IEnumerable{T}"/> of facilities.</returns>
-    IEnumerable<Facility> Resolve();
+    IEnumerable<IFacility> Resolve();
 }

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

@@ -19,12 +19,12 @@ public static class FacilityServiceCollectionExtensions
     /// <summary>
     /// Adds the facility with the specified type to the <see cref="IServiceCollection"/>.
     /// </summary>
-    /// <typeparam name="T">The type of the <see cref="Facility"/>.</typeparam>
+    /// <typeparam name="T">The type of the <see cref="IFacility"/>.</typeparam>
     /// <param name="services">The <see cref="IServiceCollection"/>.</param>
     /// <param name="configure">The delegate to configure the facility.</param>
     /// <returns>The <see cref="IServiceCollection"/>.</returns>
     public static IServiceCollection AddFacility<T>(this IServiceCollection services, Action<T>? configure = null)
-        where T : Facility
+        where T : IFacility
     {
         return AddFacility(services, typeof(T), f => configure?.Invoke((T) f));
     }
@@ -33,26 +33,26 @@ public static IServiceCollection AddFacility<T>(this IServiceCollection services
     /// Adds the facility with the specified type to the <see cref="IServiceCollection"/>.
     /// </summary>
     /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-    /// <param name="facilityType">The type of the <see cref="Facility"/>.</param>
+    /// <param name="facilityType">The type of the <see cref="IFacility"/>.</param>
     /// <param name="configure">The delegate to configure the facility.</param>
     /// <returns>The <see cref="IServiceCollection"/>.</returns>
     public static IServiceCollection AddFacility(
         this IServiceCollection services,
         Type facilityType,
-        Action<Facility>? configure = null)
+        Action<IFacility>? configure = null)
     {
         Ensure.Arg.NotNull(services);
         Ensure.Arg.NotNull(facilityType);
-        Ensure.Arg.OfType(facilityType, typeof(Facility));
+        Ensure.Arg.OfType(facilityType, typeof(IFacility));
 
         services.TryAddTransient<IActivator, ServiceProviderActivator>();
 
         var serviceProvider = new ServiceCollectionServiceProvider(services);
         var activator = serviceProvider.GetRequiredService<IActivator>();
 
-        var facility = (Facility)activator.CreateInstance(facilityType);
+        var facility = (IFacility)activator.CreateInstance(facilityType);
         configure?.Invoke(facility);
-        facility.ConfigureServices(activator, services);
+        facility.ConfigureServices(services);
 
         return services;
     }

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

@@ -158,9 +158,9 @@ public static IServiceCollection AddFacilitiesFrom(
 
         configure(builder);
 
-        foreach (Facility facility in builder.Resolve())
+        foreach (IFacility facility in builder.Resolve())
         {
-            facility.ConfigureServices(activator, services);
+            facility.ConfigureServices(services);
         }
 
         return services;

DependencyInjection/src/AppCore.Extensions.DependencyInjection.Abstractions/FacilityServiceCollectionExtensions.cs

@@ -12,7 +12,7 @@
 namespace AppCore.Extensions.DependencyInjection.Facilities;
 
 /// <summary>
-/// Builds an <see cref="IEnumerable{T}"/> of <see cref="Facility"/> by scanning assemblies.
+/// Builds an <see cref="IEnumerable{T}"/> of <see cref="IFacility"/> by scanning assemblies.
 /// </summary>
 public class AssemblyFacilityResolver : IFacilityResolver
 {
@@ -98,9 +98,9 @@ public AssemblyFacilityResolver ClearDefaultFilters()
     }
 
     /// <inheritdoc />
-    IEnumerable<Facility> IFacilityResolver.Resolve()
+    IEnumerable<IFacility> IFacilityResolver.Resolve()
     {
-        var scanner = new AssemblyScanner(typeof(Facility), _assemblies)
+        var scanner = new AssemblyScanner(typeof(IFacility), _assemblies)
         {
             IncludePrivateTypes = _withPrivateTypes
         };
@@ -112,6 +112,6 @@ IEnumerable<Facility> IFacilityResolver.Resolve()
             scanner.Filters.Add(filter);
 
         return scanner.ScanAssemblies()
-                      .Select(facilityType => (Facility) _activator.CreateInstance(facilityType));
+                      .Select(facilityType => (IFacility) _activator.CreateInstance(facilityType));
     }
 }

DependencyInjection/src/AppCore.Extensions.DependencyInjection.Abstractions/ReflectionServiceCollectionExtensions.cs

@@ -14,7 +14,7 @@
 namespace AppCore.DependencyInjection.Facilities;
 
 /// <summary>
-/// Builds an <see cref="IEnumerable{T}"/> of <see cref="Facility"/> by scanning assemblies in a
+/// Builds an <see cref="IEnumerable{T}"/> of <see cref="IFacility"/> by scanning assemblies in a
 /// <see cref="DependencyContext"/>.
 /// </summary>
 public class DependencyContextFacilityResolver : IFacilityResolver
@@ -88,7 +88,7 @@ public DependencyContextFacilityResolver ClearDefaultFilters()
     }
 
     /// <inheritdoc />
-    IEnumerable<Facility> IFacilityResolver.Resolve()
+    IEnumerable<IFacility> IFacilityResolver.Resolve()
     {
         return ((IFacilityResolver)_resolver).Resolve();
     }