Merge branch 'develop'

eventflow · Oct 25, 2017 · d518e36 · d518e36
2 parents 5655d79 + 9e082a7
commit d518e36
Show file tree

Hide file tree

Showing 44 changed files with 222 additions and 100 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,4 +1,14 @@
-### New in 0.50 (not released yet)
+### New in 0.51 (not released yet)
+
+* New: Removed the `new()` requirement for read models
+* New: If `ISagaLocator.LocateSagaAsync` cannot identify the saga for a given 
+  event, it may now return `Task.FromResult(null)` in order to short-circuit
+  the dispatching process. This might be useful in cases where some instances 
+  of an event belong to a saga process while others don't
+* Fixed: `StringExtensions.ToSha256()` can now be safely used from
+  concurrent threads.
+
+### New in 0.50.3124 (released 2017-10-21)
 
 * New: While EventFlow tries to limit the about of painful API changes, the
   introduction of execution/command results are considered a necessary step

diff --git a/Source/EventFlow.Elasticsearch/Extensions/EventFlowOptionsExtensions.cs b/Source/EventFlow.Elasticsearch/Extensions/EventFlowOptionsExtensions.cs
@@ -76,7 +76,7 @@ public static IEventFlowOptions ConfigureElasticsearch(
 
         public static IEventFlowOptions UseElasticsearchReadModel<TReadModel>(
             this IEventFlowOptions eventFlowOptions)
-            where TReadModel : class, IReadModel, new()
+            where TReadModel : class, IReadModel
         {
             return eventFlowOptions
                 .RegisterServices(f =>
@@ -89,7 +89,7 @@ public static IEventFlowOptions UseElasticsearchReadModel<TReadModel>(
 
         public static IEventFlowOptions UseElasticsearchReadModel<TReadModel, TReadModelLocator>(
             this IEventFlowOptions eventFlowOptions)
-            where TReadModel : class, IReadModel, new()
+            where TReadModel : class, IReadModel
             where TReadModelLocator : IReadModelLocator
         {
             return eventFlowOptions

diff --git a/Source/EventFlow.Elasticsearch/ReadStores/ElasticsearchReadModelStore.cs b/Source/EventFlow.Elasticsearch/ReadStores/ElasticsearchReadModelStore.cs
@@ -38,7 +38,7 @@ namespace EventFlow.Elasticsearch.ReadStores
 {
     public class ElasticsearchReadModelStore<TReadModel> :
         IElasticsearchReadModelStore<TReadModel>
-        where TReadModel : class, IReadModel, new()
+        where TReadModel : class, IReadModel
     {
         private readonly ILog _log;
         private readonly IElasticClient _elasticClient;

diff --git a/Source/EventFlow.Elasticsearch/ReadStores/IElasticsearchReadModelStore.cs b/Source/EventFlow.Elasticsearch/ReadStores/IElasticsearchReadModelStore.cs
@@ -26,7 +26,7 @@
 namespace EventFlow.Elasticsearch.ReadStores
 {
     public interface IElasticsearchReadModelStore<TReadModel> : IReadModelStore<TReadModel>
-        where TReadModel : class, IReadModel, new()
+        where TReadModel : class, IReadModel
     {
     }
 }
diff --git a/Source/EventFlow.MsSql/Extensions/EventFlowOptionsMsSqlReadStoreExtensions.cs b/Source/EventFlow.MsSql/Extensions/EventFlowOptionsMsSqlReadStoreExtensions.cs
@@ -33,7 +33,7 @@ public static class EventFlowOptionsMsSqlReadStoreExtensions
     {
         public static IEventFlowOptions UseMssqlReadModel<TReadModel, TReadModelLocator>(
             this IEventFlowOptions eventFlowOptions)
-            where TReadModel : class, IReadModel, new()
+            where TReadModel : class, IReadModel
             where TReadModelLocator : IReadModelLocator
         {
             return eventFlowOptions
@@ -48,7 +48,7 @@ public static IEventFlowOptions UseMssqlReadModel<TReadModel, TReadModelLocator>
 
         public static IEventFlowOptions UseMssqlReadModel<TReadModel>(
             this IEventFlowOptions eventFlowOptions)
-            where TReadModel : class, IReadModel, new()
+            where TReadModel : class, IReadModel
         {
             return eventFlowOptions
                 .RegisterServices(f =>

diff --git a/Source/EventFlow.MsSql/Integrations/TableParameter.cs b/Source/EventFlow.MsSql/Integrations/TableParameter.cs
@@ -34,7 +34,7 @@
 namespace EventFlow.MsSql.Integrations
 {
     internal class TableParameter<TRow> : SqlMapper.IDynamicParameters
-        where TRow : class, new()
+        where TRow : class
     {
         private readonly string _name;
         private readonly IEnumerable<TRow> _rows;

diff --git a/Source/EventFlow.MsSql/ReadStores/IMssqlReadModelStore.cs b/Source/EventFlow.MsSql/ReadStores/IMssqlReadModelStore.cs
@@ -26,7 +26,7 @@
 namespace EventFlow.MsSql.ReadStores
 {
     public interface IMssqlReadModelStore<TReadModel> : IReadModelStore<TReadModel>
-        where TReadModel : class, IReadModel, new()
+        where TReadModel : class, IReadModel
     {
     }
 }
diff --git a/Source/EventFlow.MsSql/ReadStores/MssqlReadModelStore.cs b/Source/EventFlow.MsSql/ReadStores/MssqlReadModelStore.cs
@@ -42,7 +42,7 @@ namespace EventFlow.MsSql.ReadStores
     public class MssqlReadModelStore<TReadModel> :
         ReadModelStore<TReadModel>,
         IMssqlReadModelStore<TReadModel>
-        where TReadModel : class, IReadModel, new()
+        where TReadModel : class, IReadModel
     {
         private readonly IMsSqlConnection _connection;
         private readonly IReadModelSqlGenerator _readModelSqlGenerator;

diff --git a/Source/EventFlow.Owin.Tests/EventFlow.Owin.Tests.csproj b/Source/EventFlow.Owin.Tests/EventFlow.Owin.Tests.csproj
@@ -9,6 +9,7 @@
     <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Autofac.WebApi2" Version="4.0.0" />
     <PackageReference Include="Autofac.WebApi2.Owin" Version="4.0.0" />
     <PackageReference Include="Microsoft.AspNet.WebApi.Core" Version="5.2.3" />
     <PackageReference Include="Microsoft.Owin.Host.HttpListener" Version="3.1.0" />

diff --git a/Source/EventFlow.Owin.Tests/app.config b/Source/EventFlow.Owin.Tests/app.config
@@ -9,6 +9,10 @@
         <assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral"/>
         <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.5.0.0"/>
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Autofac.Integration.WebApi" publicKeyToken="17863af14b0044da" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.0.0.0"/>
+      </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
         <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="3.1.0.0"/>

diff --git a/Source/EventFlow.SQLite/Extensions/EventFlowOptionsExtensions.cs b/Source/EventFlow.SQLite/Extensions/EventFlowOptionsExtensions.cs
@@ -57,7 +57,7 @@ public static IEventFlowOptions UseSQLiteEventStore(
 
         public static IEventFlowOptions UseSQLiteReadModel<TReadModel, TReadModelLocator>(
             this IEventFlowOptions eventFlowOptions)
-            where TReadModel : class, IReadModel, new()
+            where TReadModel : class, IReadModel
             where TReadModelLocator : IReadModelLocator
         {
             return eventFlowOptions
@@ -72,7 +72,7 @@ public static IEventFlowOptions UseSQLiteReadModel<TReadModel, TReadModelLocator
 
         public static IEventFlowOptions UseSQLiteReadModel<TReadModel>(
             this IEventFlowOptions eventFlowOptions)
-            where TReadModel : class, IReadModel, new()
+            where TReadModel : class, IReadModel
         {
             return eventFlowOptions
                 .RegisterServices(f =>

diff --git a/Source/EventFlow.SQLite/ReadStores/ISQLiteReadModelStore.cs b/Source/EventFlow.SQLite/ReadStores/ISQLiteReadModelStore.cs
@@ -27,7 +27,7 @@
 namespace EventFlow.SQLite.ReadStores
 {
     public interface ISQLiteReadModelStore<TReadModel> : ISqlReadModelStore<TReadModel>
-        where TReadModel : class, IReadModel, new()
+        where TReadModel : class, IReadModel
     {
     }
 }
diff --git a/Source/EventFlow.SQLite/ReadStores/SQLiteReadModelStore.cs b/Source/EventFlow.SQLite/ReadStores/SQLiteReadModelStore.cs
@@ -29,7 +29,7 @@
 namespace EventFlow.SQLite.ReadStores
 {
     public class SQLiteReadModelStore<TReadModel> : SqlReadModelStore<ISQLiteConnection, TReadModel>, ISQLiteReadModelStore<TReadModel>
-        where TReadModel : class, IReadModel, new()
+        where TReadModel : class, IReadModel
     {
         public SQLiteReadModelStore(
             ILog log,

diff --git a/Source/EventFlow.Sql/Connections/ISqlConnection.cs b/Source/EventFlow.Sql/Connections/ISqlConnection.cs
@@ -49,7 +49,7 @@ Task<IReadOnlyCollection<TResult>> InsertMultipleAsync<TResult, TRow>(
             CancellationToken cancellationToken,
             string sql,
             IEnumerable<TRow> rows)
-            where TRow : class, new();
+            where TRow : class;
 
         Task<TResult> WithConnectionAsync<TResult>(
             Label label,

diff --git a/Source/EventFlow.Sql/Connections/SqlConnection.cs b/Source/EventFlow.Sql/Connections/SqlConnection.cs
@@ -95,7 +95,7 @@ public virtual Task<IReadOnlyCollection<TResult>> InsertMultipleAsync<TResult, T
             CancellationToken cancellationToken,
             string sql,
             IEnumerable<TRow> rows)
-            where TRow : class, new()
+            where TRow : class
         {
             Log.Debug(
                 "Insert multiple not optimised, inserting one row at a time using SQL '{0}'",

diff --git a/Source/EventFlow.Sql/ReadModels/ISqlReadModelStore.cs b/Source/EventFlow.Sql/ReadModels/ISqlReadModelStore.cs
@@ -26,7 +26,7 @@
 namespace EventFlow.Sql.ReadModels
 {
     public interface ISqlReadModelStore<TReadModel> : IReadModelStore<TReadModel>
-        where TReadModel : class, IReadModel, new()
+        where TReadModel : class, IReadModel
     {
     }
 }
diff --git a/Source/EventFlow.Sql/ReadModels/SqlReadModelStore.cs b/Source/EventFlow.Sql/ReadModels/SqlReadModelStore.cs
@@ -40,7 +40,7 @@ namespace EventFlow.Sql.ReadModels
     public abstract class SqlReadModelStore<TSqlConnection, TReadModel> :
         ReadModelStore<TReadModel>,
         ISqlReadModelStore<TReadModel>
-        where TReadModel : class, IReadModel, new()
+        where TReadModel : class, IReadModel
         where TSqlConnection : ISqlConnection
     {
         private readonly TSqlConnection _connection;

diff --git a/Source/EventFlow.Tests/IntegrationTests/Sagas/AlternativeSagaStoreTestClasses.cs b/Source/EventFlow.Tests/IntegrationTests/Sagas/AlternativeSagaStoreTestClasses.cs
@@ -32,6 +32,7 @@
 using EventFlow.Core;
 using EventFlow.Sagas;
 using EventFlow.ValueObjects;
+using FluentAssertions;
 
 namespace EventFlow.Tests.IntegrationTests.Sagas
 {
@@ -48,6 +49,12 @@ public class InMemorySagaStore : ISagaStore
         {
             private readonly Dictionary<ISagaId, object> _sagas = new Dictionary<ISagaId, object>();
             private readonly AsyncLock _asyncLock = new AsyncLock();
+            private bool _hasUpdateBeenCalled;
+
+            public void UpdateShouldNotHaveBeenCalled()
+            {
+                this._hasUpdateBeenCalled.Should().BeFalse();
+            }
 
             public async Task<TSaga> UpdateAsync<TSaga>(
                 ISagaId sagaId,
@@ -59,10 +66,11 @@ public async Task<TSaga> UpdateAsync<TSaga>(
             {
                 using (await _asyncLock.WaitAsync(cancellationToken).ConfigureAwait(false))
                 {
-                    object obj;
-                    if (!_sagas.TryGetValue(sagaId, out obj))
+                    _hasUpdateBeenCalled = true;
+
+                    if (!_sagas.TryGetValue(sagaId, out var obj))
                     {
-                        obj = Activator.CreateInstance(sagaDetails.SagaType, new object[] {sagaId});
+                        obj = Activator.CreateInstance(sagaDetails.SagaType, sagaId);
                         _sagas[sagaId] = obj;
                     }
 
@@ -141,7 +149,13 @@ public class TestSagaLocator : ISagaLocator
         {
             public Task<ISagaId> LocateSagaAsync(IDomainEvent domainEvent, CancellationToken cancellationToken)
             {
-                return Task.FromResult<ISagaId>(new TestSagaId($"saga-for-{domainEvent.GetIdentity().Value}"));
+                var identity = domainEvent.GetIdentity().Value;
+                if (identity.EndsWith(Guid.Empty.ToString()))
+                {
+                    return Task.FromResult<ISagaId>(null);
+                }
+
+                return Task.FromResult<ISagaId>(new TestSagaId($"saga-for-{identity}"));
             }
         }
 

diff --git a/Source/EventFlow.Tests/IntegrationTests/Sagas/AlternativeSagaStoreTests.cs b/Source/EventFlow.Tests/IntegrationTests/Sagas/AlternativeSagaStoreTests.cs
@@ -21,6 +21,7 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using EventFlow.Aggregates;
@@ -39,6 +40,7 @@ public class AlternativeSagaStoreTests
         private IRootResolver _resolver;
         private ICommandBus _commandBus;
         private IAggregateStore _aggregateStore;
+        private AlternativeSagaStoreTestClasses.InMemorySagaStore _sagaStore;
 
         [SetUp]
         public void SetUp()
@@ -54,14 +56,15 @@ public void SetUp()
                     typeof(AlternativeSagaStoreTestClasses.SagaTestEventB),
                     typeof(AlternativeSagaStoreTestClasses.SagaTestEventC))
                 .RegisterServices(sr =>
-                    {
-                        sr.RegisterType(typeof(AlternativeSagaStoreTestClasses.TestSagaLocator));
-                        sr.Register<ISagaStore, AlternativeSagaStoreTestClasses.InMemorySagaStore>(Lifetime.Singleton);
-                    })
+                {
+                    sr.RegisterType(typeof(AlternativeSagaStoreTestClasses.TestSagaLocator));
+                    sr.Register<ISagaStore, AlternativeSagaStoreTestClasses.InMemorySagaStore>(Lifetime.Singleton);
+                })
                 .CreateResolver(false);
 
             _commandBus = _resolver.Resolve<ICommandBus>();
             _aggregateStore = _resolver.Resolve<IAggregateStore>();
+            _sagaStore = (AlternativeSagaStoreTestClasses.InMemorySagaStore) _resolver.Resolve<ISagaStore>();
         }
 
         [TearDown]
@@ -101,5 +104,31 @@ public async Task NotStarted()
             testAggregate.Bs.Should().Be(1);
             testAggregate.Cs.Should().Be(0);
         }
+
+        [Test]
+        public void SagaLocatorReturningNullDoesntThrow()
+        {
+            // Arrange
+            var aggregateId = AlternativeSagaStoreTestClasses.SagaTestAggregateId.With(Guid.Empty);
+
+            // Act
+            Action action = () => _commandBus.Publish(new AlternativeSagaStoreTestClasses.SagaTestBCommand(aggregateId), CancellationToken.None);
+
+            // Assert
+            action.ShouldNotThrow();
+        }
+
+        [Test]
+        public void SagaLocatorReturningNullDoesntCallSagaStore()
+        {
+            // Arrange
+            var aggregateId = AlternativeSagaStoreTestClasses.SagaTestAggregateId.With(Guid.Empty);
+
+            // Act
+            _commandBus.Publish(new AlternativeSagaStoreTestClasses.SagaTestBCommand(aggregateId), CancellationToken.None);
+
+            // Assert
+            _sagaStore.UpdateShouldNotHaveBeenCalled();
+        }
     }
 }
diff --git a/Source/EventFlow.Tests/UnitTests/ReadStores/ReadModelFactoryTests.cs b/Source/EventFlow.Tests/UnitTests/ReadStores/ReadModelFactoryTests.cs
@@ -21,13 +21,19 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+using System;
 using System.Threading;
 using System.Threading.Tasks;
+using EventFlow.Logs;
 using EventFlow.ReadStores;
 using EventFlow.TestHelpers;
 using FluentAssertions;
 using NUnit.Framework;
 
+// ReSharper disable MemberCanBePrivate.Global
+// ReSharper disable ClassNeverInstantiated.Global
+// ReSharper disable UnusedMember.Global
+
 namespace EventFlow.Tests.UnitTests.ReadStores
 {
     [Category(Categories.Unit)]
@@ -61,6 +67,23 @@ public async Task ReadModelFactoryCanBeConfigured()
             }
         }
 
+        [Test]
+        public void ThrowsExceptionForNoEmptyConstruuctors()
+        {
+            // Act + Assert
+            var exception = Assert.Throws<TypeInitializationException>(() => new ReadModelFactory<ReadModelWithConstructorArguments>(Mock<ILog>()));
+
+            // Assert
+            // ReSharper disable once PossibleNullReferenceException
+            exception.InnerException.Message.Should().Contain("doesn't have an empty constructor");
+        }
+
+        public class ReadModelWithConstructorArguments : IReadModel
+        {
+            // ReSharper disable once UnusedParameter.Local
+            public ReadModelWithConstructorArguments(int magicNumber){ }
+        }
+
         public interface IFancyReadModel : IReadModel
         {
             int MagicNumber { get; set; }

diff --git a/Source/EventFlow.Tests/UnitTests/Sagas/DispatchToSagasTests.cs b/Source/EventFlow.Tests/UnitTests/Sagas/DispatchToSagasTests.cs
@@ -68,7 +68,10 @@ public void SetUp()
                 .Returns(_sagaUpdaterMock.Object);
             _sagaDefinitionServiceMock
                 .Setup(d => d.GetSagaDetails(It.IsAny<Type>()))
-                .Returns(new[] {SagaDetails.From(sagaType),});
+                .Returns(new[] {SagaDetails.From(sagaType)});
+            _sagaLocatorMock
+                .Setup(s => s.LocateSagaAsync(It.IsAny<IDomainEvent>(), CancellationToken.None))
+                .Returns(() => Task.FromResult<ISagaId>(new ThingySagaId(string.Empty)));
         }
 
         [Test]