Some tweaks

Author: ejsmith

src/Foundatio.Mediator.Abstractions/Mediator.cs

@@ -195,29 +195,26 @@ private PublishAsyncDelegate[] GetAllApplicableHandlers(object message)
     private IEnumerable<HandlerRegistration> GetHandlersForType(Type type)
     {
         var list = _serviceProvider.GetKeyedServices<HandlerRegistration>(MessageTypeKey.Get(type)).ToList();
-        if (list.Count > 0)
+        if (!type.IsGenericType)
             return list;
 
-        // attempt open generic resolution
-        if (type.IsGenericType)
+        var genericDefinition = type.GetGenericTypeDefinition();
+        var registration = _openGenericClosedCache.GetOrAdd(type, t =>
         {
-            var genericDefinition = type.GetGenericTypeDefinition();
-            var registration = _openGenericClosedCache.GetOrAdd(type, t =>
+            var descriptors = _serviceProvider.GetServices<OpenGenericHandlerDescriptor>();
+            foreach (var descriptor in descriptors)
             {
-                var descriptors = _serviceProvider.GetServices<OpenGenericHandlerDescriptor>();
-                foreach (var descriptor in descriptors)
+                if (descriptor.MessageTypeGenericDefinition == genericDefinition)
                 {
-                    if (descriptor.MessageTypeGenericDefinition == genericDefinition)
-                    {
-                        return ConstructClosedRegistration(t, descriptor);
-                    }
+                    return ConstructClosedRegistration(t, descriptor);
                 }
-                return null;
-            });
+            }
 
-            if (registration != null)
-                return new[] { registration };
-        }
+            return null;
+        });
+
+        if (registration != null)
+            list.Add(registration);
 
         return list;
     }

…s/OpenGeneric/OpenGenericHandlerTests.cs …ediator.Tests/OpenGenericHandlerTests.cstests/Foundatio.Mediator.Tests/OpenGeneric/OpenGenericHandlerTests.cs renamed to tests/Foundatio.Mediator.Tests/OpenGenericHandlerTests.cs tests/Foundatio.Mediator.Tests/OpenGeneric/OpenGenericHandlerTests.cs renamed to tests/Foundatio.Mediator.Tests/OpenGenericHandlerTests.cs

@@ -1,9 +1,6 @@
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
-using Xunit;
 
-namespace Foundatio.Mediator.Tests.OpenGeneric;
+namespace Foundatio.Mediator.Tests;
 
 public record UpdateEntity<T>(T Entity) : ICommand;
 public record UpdateEntityPair<T1, T2>(T1 First, T2 Second) : ICommand;