Merge pull request #3 in TECHBUS/winton.domainmodelling.abstractions from feature/BT-6531 to master

* commit '813d572b485ce7c9acf12002f509e5bc07d32a42':
  Fix Jenkinsfile.
  Remove generics from EntityNotFoundException class.

Author: Matthew Thornton

Jenkinsfile

@@ -12,13 +12,14 @@ node {
 		}
 
 		stage("Build") {
-			bat("\"${tool 'MSBuild15'}\" /p:Configuration=Release")
+			bat("\"${tool 'MSBuild15'}\" /p:Configuration=Release /p:GetVersion=True /p:WriteVersionInfoToBuildLog=True")
 		}
 
 		stage("Test") {
-			dir("test\\Winton.DomainModelling.Abstractions.Tests") {
-				bat("dotnet test Winton.DomainModelling.Abstractions.Tests.csproj --configuration Release --no-restore --no-build")
-			}
+			def tests = [
+				"unit-tests": { test("Winton.DomainModelling.Abstractions.Tests") }
+			]
+			parallel tests
 		}
 
 		stage("Publish") {
@@ -40,4 +41,12 @@ node {
 	finally{
 		step([$class: 'StashNotifier'])
 	}
+}
+
+def test(testProjectName) {
+	dir("test") {
+		dir("${testProjectName}") {
+			bat("dotnet test --configuration Release --no-restore --no-build")
+		}
+	}
 }

src/Winton.DomainModelling.Abstractions/EntityNotFoundException.cs

@@ -6,18 +6,25 @@ namespace Winton.DomainModelling
     /// <summary>
     ///     An error indicating that an entity could not be found.
     /// </summary>
-    /// <typeparam name="TEntity">The type of entity.</typeparam>
-    /// <typeparam name="TEntityId">The type of entity id.</typeparam>
-    public class EntityNotFoundException<TEntity, TEntityId> : DomainException
-        where TEntity : Entity<TEntityId>
-        where TEntityId : IEquatable<TEntityId>
+    public class EntityNotFoundException : DomainException
     {
+        private EntityNotFoundException(string message)
+            : base(message)
+        {
+        }
+
         /// <summary>
-        ///     Initializes a new instance of the <see cref="EntityNotFoundException{TEntity, TEntityId}" /> class.
+        ///     Creates a new instance of the <see cref="EntityNotFoundException" /> class using the generic constraint to generate
+        ///     the message.
         /// </summary>
-        public EntityNotFoundException()
-            : base($"The specified {typeof(TEntity).Name} could not be found.")
+        /// <typeparam name="TEntity">The type of the entity.</typeparam>
+        /// <typeparam name="TEntityId">The type of the entity id.</typeparam>
+        /// <returns>A new instance of <see cref="EntityNotFoundException" />.</returns>
+        public static EntityNotFoundException Create<TEntity, TEntityId>()
+            where TEntity : Entity<TEntityId>
+            where TEntityId : IEquatable<TEntityId>
         {
+            return new EntityNotFoundException($"The specified {typeof(TEntity).Name} could not be found.");
         }
     }
 }

src/Winton.DomainModelling.Abstractions/Winton.DomainModelling.Abstractions.csproj

@@ -6,6 +6,7 @@
     <Copyright>Copyright 2018 Winton</Copyright>
     <Description>Provides common abstractions for domain modelling.</Description>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
+    <GetVersion>False</GetVersion>
     <NoWarn>$(NoWarn);SA0001;SA1101;SA1309;SA1413;SA1633;SA1652</NoWarn>
     <PackageId>Winton.DomainModelling.Abstractions</PackageId>
     <PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
@@ -15,6 +16,7 @@
     <TargetFramework>netstandard1.0</TargetFramework>
     <Title>Winton Domain Modelling Abstractions</Title>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+    <WriteVersionInfoToBuildLog>False</WriteVersionInfoToBuildLog>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)' == 'Release'">

test/Winton.DomainModelling.Abstractions.Tests/EntityNotFoundExceptionTests.cs

@@ -5,20 +5,23 @@ namespace Winton.DomainModelling
 {
     public class EntityNotFoundExceptionTests
     {
-        [Fact]
-        private void ShouldSetMessageBasedOnTypeOfEntity()
+        public sealed class Message : EntityNotFoundExceptionTests
         {
-            var exception = new EntityNotFoundException<TestEntity, int>();
+            [Fact]
+            private void ShouldSetMessageBasedOnTypeOfEntity()
+            {
+                EntityNotFoundException exception = EntityNotFoundException.Create<TestEntity, int>();
 
-            exception.Message.Should().Be("The specified TestEntity could not be found.");
-        }
+                exception.Message.Should().Be("The specified TestEntity could not be found.");
+            }
 
-        // ReSharper disable once ClassNeverInstantiated.Local
-        private sealed class TestEntity : Entity<int>
-        {
-            public TestEntity(int id)
-                : base(id)
+            // ReSharper disable once ClassNeverInstantiated.Local
+            private sealed class TestEntity : Entity<int>
             {
+                public TestEntity(int id)
+                    : base(id)
+                {
+                }
             }
         }
     }