Updated packages. (#15)

* Started re-factoring.

* Updated packages.

Fluxera.Entity.sln

@@ -8,7 +8,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".items", ".items", "{75AC41
 		.gitignore = .gitignore
 		azure-pipelines.yml = azure-pipelines.yml
 		GitVersion.yml = GitVersion.yml
-		global.json = global.json
 		icon.png = icon.png
 		LICENSE = LICENSE
 		README.md = README.md

azure-pipelines.yml

@@ -7,7 +7,7 @@ trigger:
 
 variables:
   BuildConfiguration: Release
-  DotNetCoreVersion: 6.0.201
+  DotNetCoreVersion: 6.0.x
 
 stages:
 - stage: BuildAndTest

src/Fluxera.Entity/DomainEvents/DomainEventExtensions.cs

@@ -0,0 +1,21 @@
+namespace Fluxera.Entity.DomainEvents
+{
+	using System;
+	using System.Linq;
+	using System.Reflection;
+	using Fluxera.Guards;
+
+	public static class DomainEventExtensions
+	{
+		public static bool IsDomainEventHandler(this Type type)
+		{
+			Guard.Against.Null(type, nameof(type));
+
+			bool isEventHandler = type.GetInterfaces().Any(x => x.GetTypeInfo().IsGenericType
+				&& ((x.GetGenericTypeDefinition() == typeof(IDomainEventHandler<>))
+					|| (x.GetGenericTypeDefinition() == typeof(ICommittedDomainEventHandler<>))));
+
+			return isEventHandler;
+		}
+	}
+}

src/Fluxera.Entity/DomainEvents/DomainEventHandlerBuilder.cs

@@ -28,7 +28,7 @@ public DomainEventHandlerBuilder AddDomainEventHandlers(IEnumerable<Assembly> as
 		{
 			assemblies ??= Enumerable.Empty<Assembly>();
 
-			foreach (Assembly assembly in assemblies)
+			foreach(Assembly assembly in assemblies)
 			{
 				this.AddDomainEventHandlers(assembly);
 			}
@@ -38,15 +38,15 @@ public DomainEventHandlerBuilder AddDomainEventHandlers(IEnumerable<Assembly> as
 
 		public DomainEventHandlerBuilder AddDomainEventHandlers(Func<IEnumerable<Assembly>> assembliesFactory)
 		{
-			assembliesFactory ??= (Enumerable.Empty<Assembly>);
+			assembliesFactory ??= Enumerable.Empty<Assembly>;
 
 			IEnumerable<Assembly> assemblies = assembliesFactory.Invoke();
 			this.AddDomainEventHandlers(assemblies);
 
 			return this;
 		}
 
-		public DomainEventHandlerBuilder AddDomainEventHandlers<TEventHandler>()
+		public DomainEventHandlerBuilder AddDomainEventHandler<TEventHandler>()
 		{
 			this.AddDomainEventHandlers(typeof(TEventHandler));
 
@@ -57,7 +57,7 @@ public DomainEventHandlerBuilder AddDomainEventHandlers(IEnumerable<Type> types)
 		{
 			types ??= Enumerable.Empty<Type>();
 
-			foreach (Type type in types)
+			foreach(Type type in types)
 			{
 				this.AddDomainEventHandlers(type);
 			}
@@ -67,9 +67,9 @@ public DomainEventHandlerBuilder AddDomainEventHandlers(IEnumerable<Type> types)
 
 		public DomainEventHandlerBuilder AddDomainEventHandlers(Func<IEnumerable<Type>> typesFactory)
 		{
-			Guard.Against.Null(services, nameof(services));
+			Guard.Against.Null(this.services, nameof(this.services));
 
-			typesFactory ??= (Enumerable.Empty<Type>);
+			typesFactory ??= Enumerable.Empty<Type>;
 
 			IEnumerable<Type> types = typesFactory.Invoke();
 			this.AddDomainEventHandlers(types);
@@ -91,16 +91,16 @@ public DomainEventHandlerBuilder AddDomainEventHandlers(Type type)
 			Guard.Against.Null(type, nameof(type));
 
 			bool isEventHandler = type.GetInterfaces().Any(x => x.GetTypeInfo().IsGenericType
-				&& (x.GetGenericTypeDefinition() == typeof(IDomainEventHandler<>)
-					|| x.GetGenericTypeDefinition() == typeof(ICommittedDomainEventHandler<>)));
+				&& ((x.GetGenericTypeDefinition() == typeof(IDomainEventHandler<>))
+					|| (x.GetGenericTypeDefinition() == typeof(ICommittedDomainEventHandler<>))));
 
-			if (isEventHandler && !type.GetTypeInfo().IsAbstract && !type.GetTypeInfo().IsInterface)
+			if(isEventHandler && !type.GetTypeInfo().IsAbstract && !type.GetTypeInfo().IsInterface)
 			{
 				IEnumerable<Type> eventHandlerInterfaceTypes = type.GetInterfaces().Where(x => x.GetTypeInfo().IsGenericType
-					&& (x.GetGenericTypeDefinition() == typeof(IDomainEventHandler<>)
-						|| x.GetGenericTypeDefinition() == typeof(ICommittedDomainEventHandler<>)));
+					&& ((x.GetGenericTypeDefinition() == typeof(IDomainEventHandler<>))
+						|| (x.GetGenericTypeDefinition() == typeof(ICommittedDomainEventHandler<>))));
 
-				foreach (Type eventHandlerInterfaceType in eventHandlerInterfaceTypes)
+				foreach(Type eventHandlerInterfaceType in eventHandlerInterfaceTypes)
 				{
 					this.services.AddTransient(eventHandlerInterfaceType, type);
 				}
@@ -109,4 +109,4 @@ public DomainEventHandlerBuilder AddDomainEventHandlers(Type type)
 			return this;
 		}
 	}
-}
+}

src/Fluxera.Entity/DomainEvents/IDomainEvent.cs

@@ -8,6 +8,9 @@
 	[PublicAPI]
 	public interface IDomainEvent
 	{
+		/// <summary>
+		///     Gets the name of the event.
+		/// </summary>
 		string DisplayName => this.GetType().Name;
 	}
 }

src/Fluxera.Entity/DomainEvents/ServiceCollectionExtensions.cs

@@ -1,17 +1,23 @@
 namespace Fluxera.Entity.DomainEvents
 {
 	using System;
-	using System.Collections.Generic;
-	using System.Linq;
-	using System.Reflection;
-	using Guards;
+	using Fluxera.Guards;
 	using JetBrains.Annotations;
 	using Microsoft.Extensions.DependencyInjection;
 	using Microsoft.Extensions.DependencyInjection.Extensions;
 
+	/// <summary>
+	///     Extensions methods for the <see cref="IServiceCollection" /> type.
+	/// </summary>
 	[PublicAPI]
 	public static class ServiceCollectionExtensions
 	{
+		/// <summary>
+		///     Adds the domain events services.
+		/// </summary>
+		/// <param name="services"></param>
+		/// <param name="configureHandlers"></param>
+		/// <returns></returns>
 		public static IServiceCollection AddDomainEvents(this IServiceCollection services, Action<DomainEventHandlerBuilder> configureHandlers)
 		{
 			Guard.Against.Null(services, nameof(services));

src/Fluxera.Entity/Fluxera.Entity.csproj

@@ -22,12 +22,12 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Fluxera.Guards" Version="6.0.11" />
-		<PackageReference Include="GitVersion.MsBuild" Version="5.9.0">
+		<PackageReference Include="Fluxera.Guards" Version="6.0.13" />
+		<PackageReference Include="GitVersion.MsBuild" Version="5.10.1">
 		  <PrivateAssets>all</PrivateAssets>
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="JetBrains.Annotations" Version="2021.3.0" />
+		<PackageReference Include="JetBrains.Annotations" Version="2022.1.0" />
 		<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
 		<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />

tests/Fluxera.Entity.UnitTests/DomainEventsTests.cs

@@ -1,17 +1,15 @@
 namespace Fluxera.Entity.UnitTests
 {
 	using System.Threading.Tasks;
-	using DomainEvents;
-	using EmployeeAggregate;
 	using FluentAssertions;
+	using Fluxera.Entity.DomainEvents;
+	using Fluxera.Entity.UnitTests.EmployeeAggregate;
 	using Microsoft.Extensions.DependencyInjection;
 	using NUnit.Framework;
 
 	[TestFixture]
 	public class DomainEventsTests
 	{
-		private ServiceProvider serviceProvider;
-
 		[SetUp]
 		public void SetUp()
 		{
@@ -21,36 +19,38 @@ public void SetUp()
 			services.AddDomainEvents(builder =>
 			{
 				builder
-					.AddDomainEventHandlers<SalaryRaisedEventHandler>()
-					.AddDomainEventHandlers<AdditionalSalaryRaisedEventHandler>()
-					.AddDomainEventHandlers<SalaryRaisedCommittedEventHandler>();
+					.AddDomainEventHandler<SalaryRaisedEventHandler>()
+					.AddDomainEventHandler<AdditionalSalaryRaisedEventHandler>()
+					.AddDomainEventHandler<SalaryRaisedCommittedEventHandler>();
 			});
 
 			this.serviceProvider = services.BuildServiceProvider();
 		}
 
+		private ServiceProvider serviceProvider;
+
 		[Test]
-		public async Task ShouldExecuteDomainHandlers()
+		public async Task ShouldExecuteCommittedDomainHandlers()
 		{
 			IDomainEventDispatcher dispatcher = this.serviceProvider.GetRequiredService<IDomainEventDispatcher>();
 
 			SalaryRaisedEvent salaryRaisedEvent = new SalaryRaisedEvent(100_000);
-			await dispatcher.DispatchAsync(salaryRaisedEvent);
+			await dispatcher.DispatchCommittedAsync(salaryRaisedEvent);
 
-			salaryRaisedEvent.HandlerNames.Count.Should().Be(2);
-			salaryRaisedEvent.HandlerNames.Should().Contain(nameof(SalaryRaisedEventHandler), nameof(AdditionalSalaryRaisedEventHandler));
+			salaryRaisedEvent.HandlerNames.Count.Should().Be(1);
+			salaryRaisedEvent.HandlerNames.Should().Contain(nameof(SalaryRaisedCommittedEventHandler));
 		}
 
 		[Test]
-		public async Task ShouldExecuteCommittedDomainHandlers()
+		public async Task ShouldExecuteDomainHandlers()
 		{
 			IDomainEventDispatcher dispatcher = this.serviceProvider.GetRequiredService<IDomainEventDispatcher>();
 
 			SalaryRaisedEvent salaryRaisedEvent = new SalaryRaisedEvent(100_000);
-			await dispatcher.DispatchCommittedAsync(salaryRaisedEvent);
+			await dispatcher.DispatchAsync(salaryRaisedEvent);
 
-			salaryRaisedEvent.HandlerNames.Count.Should().Be(1);
-			salaryRaisedEvent.HandlerNames.Should().Contain(nameof(SalaryRaisedCommittedEventHandler));
+			salaryRaisedEvent.HandlerNames.Count.Should().Be(2);
+			salaryRaisedEvent.HandlerNames.Should().Contain(nameof(SalaryRaisedEventHandler), nameof(AdditionalSalaryRaisedEventHandler));
 		}
 
 		[Test]
@@ -76,7 +76,6 @@ public async Task ShouldExecuteDomainHandlersFromEntity()
 				((SalaryRaisedEvent)domainEvent).HandlerNames.Count.Should().Be(2);
 				((SalaryRaisedEvent)domainEvent).HandlerNames.Should().Contain(nameof(SalaryRaisedEventHandler), nameof(AdditionalSalaryRaisedEventHandler));
 			}
-
 		}
 	}
 }

tests/Fluxera.Entity.UnitTests/Fluxera.Entity.UnitTests.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.5.1" />
+    <PackageReference Include="FluentAssertions" Version="6.6.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />