Expand on AddAsyncPipelineBehavior

Toolkit.Foundation/IServiceCollectionExtensions.cs

@@ -5,14 +5,12 @@ namespace Toolkit.Foundation;
 public static class IServiceCollectionExtensions
 {
     public static IServiceCollection AddAsyncHandler<TMessage, TResponse, THandler>(this IServiceCollection services,
-        string key)
+        string key) where THandler : class, IAsyncHandler<TMessage, TResponse>
-        where THandler : class, IAsyncHandler<TMessage, TResponse>
             where TMessage : class => AddAsyncHandler<TMessage, TResponse, THandler>(services, ServiceLifetime.Transient, key);
 
     public static IServiceCollection AddAsyncHandler<TMessage, TResponse, THandler>(this IServiceCollection services,
         ServiceLifetime lifetime = ServiceLifetime.Transient,
-        string? key = null)
+        string? key = null)  where THandler : class, IAsyncHandler<TMessage, TResponse>
-        where THandler : class, IAsyncHandler<TMessage, TResponse>
             where TMessage : class
     {
         if (key is { Length: > 0 })
@@ -30,14 +28,12 @@ public static class IServiceCollectionExtensions
     }
 
     public static IServiceCollection AddAsyncHandler<TMessage, THandler>(this IServiceCollection services,
-        string key)
+        string key) where THandler : class, IAsyncHandler<TMessage>
-        where THandler : class, IAsyncHandler<TMessage>
             where TMessage : class => AddAsyncHandler<TMessage, THandler>(services, ServiceLifetime.Transient, key);
 
     public static IServiceCollection AddAsyncHandler<TMessage, THandler>(this IServiceCollection services,
         ServiceLifetime lifetime = ServiceLifetime.Transient,
-        string? key = null)
+        string? key = null) where THandler : class, IAsyncHandler<TMessage>
-        where THandler : class, IAsyncHandler<TMessage>
             where TMessage : class
     {
         if (key is { Length: > 0 })
@@ -55,8 +51,7 @@ public static class IServiceCollectionExtensions
     }
 
     public static IServiceCollection AddAsyncInitialization<TInitialization>(this IServiceCollection services)
-        where TInitialization : class,
+        where TInitialization : class, IAsyncInitialization
-        IAsyncInitialization
     {
         services.AddTransient<IAsyncInitialization, TInitialization>();
         return services;
@@ -81,22 +76,19 @@ public static class IServiceCollectionExtensions
     }
 
     public static IServiceCollection AddComponent<TComponent>(this IServiceCollection services)
-        where TComponent : class,
+        where TComponent : class, IComponent
-        IComponent
     {
         services.AddTransient<IComponent, TComponent>();
         return services;
     }
 
     public static IServiceCollection AddHandler<TMessage, TResponse, THandler>(this IServiceCollection services,
-        string key)
+        string key) where THandler : class, IHandler<TMessage, TResponse>
-        where THandler : class, IHandler<TMessage, TResponse>
             where TMessage : class => AddHandler<TMessage, TResponse, THandler>(services, ServiceLifetime.Transient, key);
 
     public static IServiceCollection AddHandler<TMessage, TResponse, THandler>(this IServiceCollection services,
         ServiceLifetime lifetime = ServiceLifetime.Transient,
-        string? key = null)
+        string? key = null)  where THandler : class, IHandler<TMessage, TResponse>
-        where THandler : class, IHandler<TMessage, TResponse>
         where TMessage : class
     {
         if (key is { Length: > 0 })
@@ -114,14 +106,12 @@ public static class IServiceCollectionExtensions
     }
 
     public static IServiceCollection AddHandler<TMessage, THandler>(this IServiceCollection services,
-        string key)
+        string key) where THandler : class, IHandler<TMessage>
-        where THandler : class, IHandler<TMessage>
             where TMessage : class => AddHandler<TMessage, THandler>(services, ServiceLifetime.Transient, key);
 
     public static IServiceCollection AddHandler<TMessage, THandler>(this IServiceCollection services,
         ServiceLifetime lifetime = ServiceLifetime.Transient,
-        string? key = null)
+        string? key = null) where THandler : class, IHandler<TMessage>
-        where THandler : class, IHandler<TMessage>
         where TMessage : class
     {
         if (key is { Length: > 0 })
@@ -140,10 +130,8 @@ public static class IServiceCollectionExtensions
 
     public static IServiceCollection AddInitialization<TInitialization, TInitializationImplementation>(this IServiceCollection services,
         ServiceLifetime lifetime = ServiceLifetime.Transient)
-        where TInitialization : class,
+        where TInitialization : class, IInitialization
-        IInitialization
+        where TInitializationImplementation : class, TInitialization
-        where TInitializationImplementation : class,
-        TInitialization
     {
         services.Add(new ServiceDescriptor(typeof(TInitialization), typeof(TInitializationImplementation), lifetime));
         services.AddTransient<IInitialization>(provider => provider.GetRequiredService<TInitialization>());
@@ -151,8 +139,7 @@ public static class IServiceCollectionExtensions
     }
 
     public static IServiceCollection AddInitialization<TInitialization>(this IServiceCollection services)
-        where TInitialization : class,
+        where TInitialization : class, IInitialization
-        IInitialization
     {
         services.AddTransient<IInitialization, TInitialization>();
         return services;
@@ -160,8 +147,7 @@ public static class IServiceCollectionExtensions
 
     public static IServiceCollection AddInitialization<TInitialization>(this IServiceCollection services,
         params object[] parameters)
-        where TInitialization : class,
+        where TInitialization : class, IInitialization
-        IInitialization
     {
         services.AddTransient<IInitialization>(provider => provider.GetRequiredService<IServiceFactory>()
             .Create<TInitialization>(parameters));
@@ -172,6 +158,23 @@ public static class IServiceCollectionExtensions
     public static IServiceCollection AddAsyncPipelineBehavior(this IServiceCollection services,
         Type behaviorType,
         string? key = null)
+    {
+        bool ImplementsInterface(Type type, Type interfaceType) => 
+            type.GetInterfaces().Any(i => i.IsGenericType && i.GetGenericTypeDefinition() == interfaceType);
+
+        if (ImplementsInterface(behaviorType, typeof(IAsyncPipelineBehavior<,>)))
+        {
+            if (key is { Length: > 0 })
+            {
+                services.AddKeyedTransient(typeof(IAsyncPipelineBehavior<,>), key, behaviorType);
+            }
+            else
+            {
+                services.AddTransient(typeof(IAsyncPipelineBehavior<,>), behaviorType);
+            }
+        }
+        
+        if (ImplementsInterface(behaviorType, typeof(IAsyncPipelineBehavior<>)))
         {
             if (key is { Length: > 0 })
             {
@@ -181,6 +184,7 @@ public static class IServiceCollectionExtensions
             {
                 services.AddTransient(typeof(IAsyncPipelineBehavior<>), behaviorType);
             }
+        }
 
         return services;
     }