Merge pull request #5 from XerProjects/hotfix/2.0.1

Hotfix/2.0.1

Author: joel-jeremy

GitVersion.yml

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 XerProjects
+Copyright (c) 2018 Joel Jeremy Marquez
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

LICENSE

@@ -50,7 +50,7 @@ public ICqrsBuilder RegisterCommandHandlers(Action<ICqrsCommandHandlerSelector>
                     return new CommandDelegator(CompositeMessageHandlerResolver.Compose(resolverArray));
                 }
 
-                return new CommandDelegator(new SingleMessageHandlerRegistration().BuildMessageHandlerResolver());
+                return new CommandDelegator(NullMessageHandlerDelegateResolver.Instance);
             });
 
             return this;
@@ -79,7 +79,7 @@ public ICqrsBuilder RegisterEventHandlers(Action<ICqrsEventHandlerSelector> sele
                     return new EventDelegator(CompositeMessageHandlerResolver.Compose(resolverArray));
                 }
 
-                return new EventDelegator(new SingleMessageHandlerRegistration().BuildMessageHandlerResolver());
+                return new EventDelegator(NullMessageHandlerDelegateResolver.Instance);
             });
 
             return this;

Src/Xer.Cqrs.Extensions.SimpleInjector/CqrsBuilder.cs

@@ -39,7 +39,7 @@ public ICqrsCommandHandlerSelector ByInterface(Lifestyle lifeStyle, params Assem
 
             if (assemblies.Length == 0)
             {
-                throw new ArgumentException("No assemblies were provided.", nameof(assemblies));
+                throw new ArgumentException("No command handler assemblies were provided.", nameof(assemblies));
             }
 
             IEnumerable<Assembly> distinctAssemblies = assemblies.Distinct();
@@ -82,25 +82,30 @@ public ICqrsCommandHandlerSelector ByAttribute(Lifestyle lifeStyle, params Assem
 
             if (assemblies.Length == 0)
             {
-                throw new ArgumentException("No assemblies were provided.", nameof(assemblies));
+                throw new ArgumentException("No command handler assemblies were provided.", nameof(assemblies));
             }
 
             // Get all types that has methods marked with [CommandHandler] attribute from distinct assemblies.
-            IEnumerable<Type> allTypes = assemblies.Distinct()
-                                                   .SelectMany(assembly => assembly.GetTypes())
-                                                   .Where(type => type.IsClass &&
-                                                                  !type.IsAbstract &&
-                                                                  CommandHandlerAttributeMethod.IsFoundInType(type))
-                                                   .ToArray();
-
-            foreach (Type type in allTypes)
+            IEnumerable<Type> foundTypes = assemblies.Distinct()
+                                                     .SelectMany(assembly => assembly.GetTypes())
+                                                     .Where(type => type.IsClass &&
+                                                                    !type.IsAbstract &&
+                                                                    CommandHandlerAttributeMethod.IsFoundInType(type))
+                                                     .ToArray();
+
+            if (!foundTypes.Any())
+            {
+                return this;
+            }
+
+            foreach (Type type in foundTypes)
             {
                 // Register type as self.
                 _container.Register(type, type, lifeStyle);
             }
 
             var singleMessageHandlerRegistration = new SingleMessageHandlerRegistration();
-            singleMessageHandlerRegistration.RegisterCommandHandlersByAttribute(allTypes, _container.GetInstance);
+            singleMessageHandlerRegistration.RegisterCommandHandlersByAttribute(foundTypes, _container.GetInstance);
 
             // Register resolver.
             _container.Collections.AppendTo(

Src/Xer.Cqrs.Extensions.SimpleInjector/CqrsCommandHandlerSelector.cs

@@ -36,6 +36,11 @@ public ICqrsEventHandlerSelector ByInterface(Lifestyle lifeStyle, params Assembl
                 throw new ArgumentNullException(nameof(assemblies));
             }
 
+            if (assemblies.Length == 0)
+            {
+                throw new ArgumentException("No event handler assemblies were provided.", nameof(assemblies));
+            }
+
             IEnumerable<Assembly> distinctAssemblies = assemblies.Distinct();
 
             _container.Register(typeof(IEventAsyncHandler<>), distinctAssemblies, lifeStyle);
@@ -69,23 +74,33 @@ public ICqrsEventHandlerSelector ByAttribute(Lifestyle lifeStyle, params Assembl
             {
                 throw new ArgumentNullException(nameof(assemblies));
             }
+
+            if (assemblies.Length == 0)
+            {
+                throw new ArgumentException("No event handler assemblies were provided.", nameof(assemblies));
+            }
 
             // Get all types that has methods marked with [EventHandler] attribute from distinct assemblies.
-            IEnumerable<Type> allTypes = assemblies.Distinct()
-                                                   .SelectMany(assembly => assembly.GetTypes())
-                                                   .Where(type => type.IsClass &&
-                                                                  !type.IsAbstract &&
-                                                                  EventHandlerAttributeMethod.IsFoundInType(type))
-                                                   .ToArray();
-
-            foreach (Type type in allTypes)
+            IEnumerable<Type> foundTypes = assemblies.Distinct()
+                                                      .SelectMany(assembly => assembly.GetTypes())
+                                                      .Where(type => type.IsClass &&
+                                                                     !type.IsAbstract &&
+                                                                     EventHandlerAttributeMethod.IsFoundInType(type))
+                                                      .ToArray();
+
+            if (!foundTypes.Any())
+            {
+                return this;
+            }
+
+            foreach (Type type in foundTypes)
             {
                 // Register type as self.
                 _container.Register(type, type, lifeStyle);
             }
 
             var multiMessageHandlerRegistration = new MultiMessageHandlerRegistration();
-            multiMessageHandlerRegistration.RegisterEventHandlersByAttribute(allTypes, _container.GetInstance);
+            multiMessageHandlerRegistration.RegisterEventHandlersByAttribute(foundTypes, _container.GetInstance);
 
             // Register resolver.
             _container.Collections.AppendTo(

Src/Xer.Cqrs.Extensions.SimpleInjector/CqrsEventHandlerSelector.cs

@@ -0,0 +1,15 @@
+using System;
+using Xer.Delegator;
+
+namespace Xer.Cqrs.Extensions.SimpleInjector
+{
+    internal class NullMessageHandlerDelegateResolver : IMessageHandlerResolver
+    {
+        private static readonly Lazy<NullMessageHandlerDelegateResolver> _singleton = new Lazy<NullMessageHandlerDelegateResolver>(() => new NullMessageHandlerDelegateResolver());
+        public static readonly NullMessageHandlerDelegateResolver Instance = _singleton.Value;
+
+        private NullMessageHandlerDelegateResolver() { }
+
+        public MessageHandlerDelegate ResolveMessageHandler(Type messageType) => NullMessageHandlerDelegate.Instance;
+    }
+}

Src/Xer.Cqrs.Extensions.SimpleInjector/NullMessageHandlerDelegateResolver.cs

@@ -17,6 +17,7 @@ public class SimpleInjectorContainerAdapter : CommandStack.Resolvers.IContainerA
         public SimpleInjectorContainerAdapter(Container container)
         {
             // Cast to IServiceProvider so that container will not throw if type is not registered.
+            // This is done so that when used in CompositeMessageHandlerResolver, container will not throw.
             _serviceProvider = container;
         }
 

Src/Xer.Cqrs.Extensions.SimpleInjector/SimpleInjectorContainerAdapter.cs

@@ -8,6 +8,21 @@ public static class SimpleInjectorContainerExtensions
     {
         public static Container RegisterCqrs(this Container container, params Assembly[] assemblies)
         {
+            if (container == null)
+            {
+                throw new ArgumentNullException(nameof(container));
+            }
+
+            if (assemblies == null)
+            {
+                throw new ArgumentNullException(nameof(assemblies));
+            }
+
+            if (assemblies.Length == 0)
+            {
+                throw new ArgumentException("No assemblies were provided.", nameof(assemblies));
+            }
+            
             RegisterCqrsCore(container)
                 .RegisterCommandHandlers(select => 
                     select.ByInterface(assemblies)

Src/Xer.Cqrs.Extensions.SimpleInjector/SimpleInjectorContainerExtensions.cs

@@ -0,0 +1,30 @@
+version: '{build}'
+pull_requests:
+  do_not_increment_build_number: true
+image: Visual Studio 2017
+nuget:
+  disable_publish_on_pr: true
+build_script:
+- ps: .\build.ps1
+test: off
+artifacts:
+- path: .\BuildArtifacts\*.nupkg
+  name: NuGet
+skip_commits:
+  message: /^\[nobuild\](.*)?/  # Skip build if commit message starts with [nobuild]
+deploy:
+- provider: NuGet
+  server: https://www.myget.org/F/xerprojects-ci/api/v2/package
+  api_key:
+    secure: u04sQwcw2Dg6ymwifBf1PoYRwo6HrQOsEagB7IQYvwRPt+10tyFcrbuKq7Az34Oz
+  skip_symbols: true
+  on:
+    branch: /(^dev$|^master$|^release[-/](.*)|^hotfix[-/](.*))/ # Branches: dev, master, release-*, release/*, hotfix-*, hotfix/*
+- provider: NuGet
+  name: production
+  skip_symbols: true
+  api_key:
+    secure: 1fEVy/0Jgny/LKUOQC75fofhRjEfpAaVV0Y8u3nH+oKdmrPFFFEF1swA+iS0W0rV
+  on:
+    branch: master
+    appveyor_repo_tag: true # Only deploy to NuGet if a tag is found.