Merge pull request #8 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

@@ -46,7 +46,7 @@ public ICqrsBuilder AddCommandHandlers(Action<ICqrsCommandHandlerSelector> selec
                 }
 
                 // Empty delegator.
-                return new CommandDelegator(new SingleMessageHandlerRegistration().BuildMessageHandlerResolver());
+                return new CommandDelegator(NullMessageHandlerDelegateResolver.Instance);
             });
 
             return this;
@@ -75,7 +75,7 @@ public ICqrsBuilder AddEventHandlers(Action<ICqrsEventHandlerSelector> selector)
                 }
 
                 // Empty delegator.
-                return new EventDelegator(new MultiMessageHandlerRegistration().BuildMessageHandlerResolver());
+                return new EventDelegator(NullMessageHandlerDelegateResolver.Instance);
             });
 
             return this;

Src/Xer.Cqrs.Extensions.Microsoft.DependencyInjection/CqrsBuilder.cs

@@ -33,7 +33,7 @@ public ICqrsCommandHandlerSelector ByInterface(ServiceLifetime lifetime, params
 
             if (assemblies.Length == 0)
             {
-                throw new ArgumentException("No assemblies were provided.", nameof(assemblies));
+                throw new ArgumentException("No command handler assemblies were provided.", nameof(assemblies));
             }
 
             _serviceCollection.Scan(scan => scan
@@ -69,7 +69,7 @@ public ICqrsCommandHandlerSelector ByAttribute(ServiceLifetime lifetime, params
 
             if (assemblies.Length == 0)
             {
-                throw new ArgumentException("No assemblies were provided.", nameof(assemblies));
+                throw new ArgumentException("No command handler assemblies were provided.", nameof(assemblies));
             }
 
             _serviceCollection.Scan(scan => scan

Src/Xer.Cqrs.Extensions.Microsoft.DependencyInjection/CqrsCommandHandlerSelector.cs

@@ -32,7 +32,7 @@ public ICqrsEventHandlerSelector ByInterface(ServiceLifetime lifetime, params As
 
             if (assemblies.Length == 0)
             {
-                throw new ArgumentException("No assemblies were provided.", nameof(assemblies));
+                throw new ArgumentException("No event handler assemblies were provided.", nameof(assemblies));
             }
 
             _serviceCollection.Scan(scan => scan
@@ -65,7 +65,7 @@ public ICqrsEventHandlerSelector ByAttribute(ServiceLifetime lifetime, params As
 
             if (assemblies.Length == 0)
             {
-                throw new ArgumentException("No assemblies were provided.", nameof(assemblies));
+                throw new ArgumentException("No event handler assemblies were provided.", nameof(assemblies));
             }
 
             _serviceCollection.Scan(scan => scan

Src/Xer.Cqrs.Extensions.Microsoft.DependencyInjection/CqrsEventHandlerSelector.cs

@@ -0,0 +1,15 @@
+using System;
+using Xer.Delegator;
+
+namespace Xer.Cqrs.Extensions.Microsoft.DependencyInjection
+{
+    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.Microsoft.DependencyInjection/NullMessageHandlerDelegateResolver.cs

@@ -1,4 +1,5 @@
-using System.Reflection;
+using System;
+using System.Reflection;
 using Xer.Cqrs.Extensions.Microsoft.DependencyInjection;
 
 namespace Microsoft.Extensions.DependencyInjection
@@ -7,6 +8,21 @@ public static class ServiceCollectionExtensions
     {
         public static IServiceCollection AddCqrs(this IServiceCollection serviceCollection, params Assembly[] assemblies)
         {
+            if (serviceCollection == null)
+            {
+                throw new ArgumentNullException(nameof(serviceCollection));
+            }
+
+            if (assemblies == null)
+            {
+                throw new ArgumentNullException(nameof(assemblies));
+            }
+
+            if (assemblies.Length == 0)
+            {
+                throw new ArgumentException("No assemblies were provided.", nameof(assemblies));
+            }
+
             AddCqrsCore(serviceCollection)
                 .AddCommandHandlers(select => 
                     select.ByInterface(assemblies)

Src/Xer.Cqrs.Extensions.Microsoft.DependencyInjection/ServiceCollectionExtensions.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.