Merge pull request #71 from jbogard/no-appdomain-scanning

Removing AppDomain scanning, requiring assemblies to be passed in
jbogard · Apr 30, 2019 · 073e586 · 073e586
2 parents 7e10071 + f1d7f23
commit 073e586
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 71 deletions.
diff --git a/src/MediatR.Extensions.Microsoft.DependencyInjection/ServiceCollectionExtensions.cs b/src/MediatR.Extensions.Microsoft.DependencyInjection/ServiceCollectionExtensions.cs
@@ -19,31 +19,14 @@ namespace MediatR
     /// </summary>
     public static class ServiceCollectionExtensions
     {
-        /// <summary>
-        /// Registers handlers and the mediator types from <see cref="AppDomain.CurrentDomain"/>.
-        /// </summary>
-        /// <param name="services">Service collection</param>
-        /// <returns>Service collection</returns>
-        public static IServiceCollection AddMediatR(this IServiceCollection services)
-            => services.AddMediatR(AppDomain.CurrentDomain.GetAssemblies().Where(a => !a.IsDynamic), configuration: null);
-
-        /// <summary>
-        /// Registers handlers and the mediator types from <see cref="AppDomain.CurrentDomain"/>.
-        /// </summary>
-        /// <param name="services">Service collection</param>
-        /// <param name="configuration">The action used to configure the options</param>
-        /// <returns>Service collection</returns>
-        public static IServiceCollection AddMediatR(this IServiceCollection services, Action<MediatRServiceConfiguration> configuration)
-            => services.AddMediatR(AppDomain.CurrentDomain.GetAssemblies().Where(a => !a.IsDynamic), configuration);
-
         /// <summary>
         /// Registers handlers and mediator types from the specified assemblies
         /// </summary>
         /// <param name="services">Service collection</param>
         /// <param name="assemblies">Assemblies to scan</param>        
         /// <returns>Service collection</returns>
         public static IServiceCollection AddMediatR(this IServiceCollection services, params Assembly[] assemblies)
-            => services.AddMediatR(assemblies.AsEnumerable(), configuration: null);
+            => services.AddMediatR(assemblies, configuration: null);
 
         /// <summary>
         /// Registers handlers and mediator types from the specified assemblies
@@ -53,7 +36,7 @@ public static IServiceCollection AddMediatR(this IServiceCollection services, pa
         /// <param name="configuration">The action used to configure the options</param>
         /// <returns>Service collection</returns>
         public static IServiceCollection AddMediatR(this IServiceCollection services, Action<MediatRServiceConfiguration> configuration, params Assembly[] assemblies)
-            => services.AddMediatR(assemblies.AsEnumerable(), configuration);
+            => services.AddMediatR(assemblies, configuration);
 
         /// <summary>
         /// Registers handlers and mediator types from the specified assemblies
@@ -64,6 +47,10 @@ public static IServiceCollection AddMediatR(this IServiceCollection services, Ac
         /// <returns>Service collection</returns>
         public static IServiceCollection AddMediatR(this IServiceCollection services, IEnumerable<Assembly> assemblies, Action<MediatRServiceConfiguration> configuration)
         {
+            if (!assemblies.Any())
+            {
+                throw new ArgumentException("No assemblies found to scan. Supply at least one assembly to scan for handlers.");
+            }
             var serviceConfig = new MediatRServiceConfiguration();
 
             configuration?.Invoke(serviceConfig);
@@ -82,7 +69,7 @@ public static IServiceCollection AddMediatR(this IServiceCollection services, IE
         /// <param name="handlerAssemblyMarkerTypes"></param>        
         /// <returns>Service collection</returns>
         public static IServiceCollection AddMediatR(this IServiceCollection services, params Type[] handlerAssemblyMarkerTypes)
-            => services.AddMediatR(handlerAssemblyMarkerTypes.AsEnumerable(), configuration: null);
+            => services.AddMediatR(handlerAssemblyMarkerTypes, configuration: null);
 
         /// <summary>
         /// Registers handlers and mediator types from the assemblies that contain the specified types
@@ -92,7 +79,7 @@ public static IServiceCollection AddMediatR(this IServiceCollection services, pa
         /// <param name="configuration">The action used to configure the options</param>
         /// <returns>Service collection</returns>
         public static IServiceCollection AddMediatR(this IServiceCollection services, Action<MediatRServiceConfiguration> configuration, params Type[] handlerAssemblyMarkerTypes)
-            => services.AddMediatR(handlerAssemblyMarkerTypes.AsEnumerable(), configuration);
+            => services.AddMediatR(handlerAssemblyMarkerTypes, configuration);
 
         /// <summary>
         /// Registers handlers and mediator types from the assemblies that contain the specified types
@@ -102,12 +89,6 @@ public static IServiceCollection AddMediatR(this IServiceCollection services, Ac
         /// <param name="configuration">The action used to configure the options</param>
         /// <returns>Service collection</returns>
         public static IServiceCollection AddMediatR(this IServiceCollection services, IEnumerable<Type> handlerAssemblyMarkerTypes, Action<MediatRServiceConfiguration> configuration)
-        {
-            var serviceConfig = new MediatRServiceConfiguration();
-            configuration?.Invoke(serviceConfig);
-            ServiceRegistrar.AddRequiredServices(services, serviceConfig);
-            ServiceRegistrar.AddMediatRClasses(services, handlerAssemblyMarkerTypes.Select(t => t.GetTypeInfo().Assembly));
-            return services;
-        }
+            => services.AddMediatR(handlerAssemblyMarkerTypes.Select(t => t.GetTypeInfo().Assembly), configuration);
     }
 }
diff --git a/test/MediatR.Extensions.Microsoft.DependencyInjection.Tests/AppDomainTests.cs b/test/MediatR.Extensions.Microsoft.DependencyInjection.Tests/AppDomainTests.cs
diff --git a/test/MediatR.Extensions.Microsoft.DependencyInjection.Tests/AssemblyResolutionTests.cs b/test/MediatR.Extensions.Microsoft.DependencyInjection.Tests/AssemblyResolutionTests.cs
@@ -43,5 +43,15 @@ public void ShouldResolveNotificationHandlers()
         {
             _provider.GetServices<INotificationHandler<Pinged>>().Count().ShouldBe(3);
         }
+
+        [Fact]
+        public void ShouldRequireAtLeastOneAssembly()
+        {
+            var services = new ServiceCollection();
+
+            Action registration = () => services.AddMediatR(new Type[0]);
+
+            registration.ShouldThrow<ArgumentException>();
+        }
     }
 }