Field \ types renaming

andrey.leskov · andrey.leskov · commit 089fbd8873ee · 2016-07-27T23:52:06.000+03:00
diff --git a/GridDomain.Domain.Tests/EventsUpgrade/BalanceChangedEventAdapter1.cs b/GridDomain.Domain.Tests/EventsUpgrade/BalanceChangedEventAdapter1.cs
@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+using GridDomain.EventSourcing.VersionedTypeSerialization;
+using GridDomain.Tests.EventsUpgrade.Domain.Events;
+
+namespace GridDomain.Tests.Acceptance.EventsUpgrade.SampleDomain
+{
+    class BalanceChangedDomainEventAdapter1 : DomainEventAdapter<BalanceChangedEvent_V0, BalanceChangedEvent_V1>
+    {
+        public override IEnumerable<BalanceChangedEvent_V1> ConvertEvent(BalanceChangedEvent_V0 evt)
+        {
+            yield return new BalanceChangedEvent_V1(evt.AmplifiedAmountChange, evt.SourceId);
+        }
+    }
+}
diff --git a/GridDomain.Domain.Tests/EventsUpgrade/Chain/EventUpdater1.cs b/GridDomain.Domain.Tests/EventsUpgrade/Chain/EventUpdater1.cs
@@ -4,7 +4,7 @@
 
 namespace GridDomain.Tests.EventsUpgrade
 {
-    class EventUpdater1 : DomainEventAdapter<TestEvent, TestEvent_V1>
+    class DomainEventUpdater1 : DomainEventAdapter<TestEvent, TestEvent_V1>
     {
         public override IEnumerable<TestEvent_V1> ConvertEvent(TestEvent evt)
         {
diff --git a/GridDomain.Domain.Tests/EventsUpgrade/Chain/EventUpdater2.cs b/GridDomain.Domain.Tests/EventsUpgrade/Chain/EventUpdater2.cs
@@ -4,7 +4,7 @@
 
 namespace GridDomain.Tests.EventsUpgrade
 {
-    class EventUpdater2 : DomainEventAdapter<TestEvent_V1, TestEvent_V2>
+    class DomainEventUpdater2 : DomainEventAdapter<TestEvent_V1, TestEvent_V2>
     {
         public override IEnumerable<TestEvent_V2> ConvertEvent(TestEvent_V1 evt)
         {
diff --git a/GridDomain.Domain.Tests/EventsUpgrade/Chain/EventUpdater3.cs b/GridDomain.Domain.Tests/EventsUpgrade/Chain/EventUpdater3.cs
@@ -4,7 +4,7 @@
 
 namespace GridDomain.Tests.EventsUpgrade
 {
-    class EventUpdater3 : DomainEventAdapter<TestEvent_V2, TestEvent_V3>
+    class DomainEventUpdater3 : DomainEventAdapter<TestEvent_V2, TestEvent_V3>
     {
         public override IEnumerable<TestEvent_V3> ConvertEvent(TestEvent_V2 evt)
         {
diff --git a/GridDomain.Domain.Tests/EventsUpgrade/Chain/Given_DomainEventUpgradeChain_When_updating_events_split_Tests.cs b/GridDomain.Domain.Tests/EventsUpgrade/Chain/Given_DomainEventUpgradeChain_When_updating_events_split_Tests.cs
@@ -16,8 +16,8 @@ public class Given_DomainEventUpgradeChain_When_updating_events_split_Tests
         [TestFixtureSetUp]
         public void When_updating_single_event_Tests()
         {
-            var chain = new DomainEventsUpgradeChain();
-            chain.Register(new EventUpdater3());
+            var chain = new EventAdaptersCatalog();
+            chain.Register(new DomainEventUpdater3());
             var balanceAggregate = new BalanceAggregate(Guid.NewGuid(), 10);
             _initialEvent = new TestEvent_V2(balanceAggregate.Id);
             _resultEvent = chain.Update(_initialEvent).OfType<TestEvent_V3>();
diff --git a/GridDomain.Domain.Tests/EventsUpgrade/Chain/Given_DomainEventUpgradeChain_When_updating_single_event_Tests.cs b/GridDomain.Domain.Tests/EventsUpgrade/Chain/Given_DomainEventUpgradeChain_When_updating_single_event_Tests.cs
@@ -15,9 +15,9 @@ public class Given_DomainEventUpgradeChain_When_updating_single_event_Tests
         [TestFixtureSetUp]
         public void When_updating_single_event_Tests()
         {
-            var chain = new DomainEventsUpgradeChain();
-            chain.Register(new EventUpdater1());
-            chain.Register(new EventUpdater2());
+            var chain = new EventAdaptersCatalog();
+            chain.Register(new DomainEventUpdater1());
+            chain.Register(new DomainEventUpdater2());
 
             var balanceAggregate = new BalanceAggregate(Guid.NewGuid(), 10);
             _initialEvent = new TestEvent(balanceAggregate.Id);
diff --git a/GridDomain.Domain.Tests/EventsUpgrade/Events/TestEvent_V1.cs b/GridDomain.Domain.Tests/EventsUpgrade/Events/TestEvent_V1.cs
@@ -15,32 +15,4 @@ public TestEvent_V1() : this(Guid.Empty)
 
         public int Field2 { get; set; }
     }
-
-    public class TestEvent_V2: DomainEvent
-    {
-        public TestEvent_V2(Guid sourceId, DateTime? createdTime = null, Guid sagaId = new Guid()) : base(sourceId, createdTime, sagaId)
-        {
-
-        }
-
-        public TestEvent_V2(): this(Guid.Empty)
-        {
-
-        }
-
-        public int Field3 { get; set; }
-    }
-
-    public class TestEvent_V3 : DomainEvent
-    {
-        public TestEvent_V3(Guid sourceId, DateTime? createdTime = null, Guid sagaId = new Guid()) : base(sourceId, createdTime, sagaId)
-        {
-        }
-        public TestEvent_V3() : this(Guid.Empty)
-        {
-
-        }
-
-        public int Field4 { get; set; }
-    }
 }
diff --git a/GridDomain.Domain.Tests/EventsUpgrade/Events/TestEvent_V2.cs b/GridDomain.Domain.Tests/EventsUpgrade/Events/TestEvent_V2.cs
@@ -0,0 +1,20 @@
+using System;
+using GridDomain.EventSourcing;
+
+namespace GridDomain.Tests.EventsUpgrade
+{
+    public class TestEvent_V2: DomainEvent
+    {
+        public TestEvent_V2(Guid sourceId, DateTime? createdTime = null, Guid sagaId = new Guid()) : base(sourceId, createdTime, sagaId)
+        {
+
+        }
+
+        public TestEvent_V2(): this(Guid.Empty)
+        {
+
+        }
+
+        public int Field3 { get; set; }
+    }
+}
diff --git a/GridDomain.Domain.Tests/EventsUpgrade/Events/TestEvent_V3.cs b/GridDomain.Domain.Tests/EventsUpgrade/Events/TestEvent_V3.cs
@@ -0,0 +1,18 @@
+using System;
+using GridDomain.EventSourcing;
+
+namespace GridDomain.Tests.EventsUpgrade
+{
+    public class TestEvent_V3 : DomainEvent
+    {
+        public TestEvent_V3(Guid sourceId, DateTime? createdTime = null, Guid sagaId = new Guid()) : base(sourceId, createdTime, sagaId)
+        {
+        }
+        public TestEvent_V3() : this(Guid.Empty)
+        {
+
+        }
+
+        public int Field4 { get; set; }
+    }
+}
diff --git a/GridDomain.Domain.Tests/EventsUpgrade/Given_aggregate_with_upgraded_event_with_new_field.cs b/GridDomain.Domain.Tests/EventsUpgrade/Given_aggregate_with_upgraded_event_with_new_field.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Threading;
 using GridDomain.CQRS.Messaging;
 using GridDomain.EventSourcing;
@@ -15,15 +14,6 @@
 
 namespace GridDomain.Tests.Acceptance.EventsUpgrade.SampleDomain
 {
-
-    class BalanceChangedEventAdapter1 : DomainEventAdapter<BalanceChangedEvent_V0, BalanceChangedEvent_V1>
-    {
-        public override IEnumerable<BalanceChangedEvent_V1> ConvertEvent(BalanceChangedEvent_V0 evt)
-        {
-            yield return new BalanceChangedEvent_V1(evt.AmplifiedAmountChange, evt.SourceId);
-        }
-    }
-
     [TestFixture]
     public class Given_aggregate_with_upgraded_event_with_new_field: PersistentTest
     {
@@ -33,6 +23,7 @@ public class Given_aggregate_with_upgraded_event_with_new_field: PersistentTest
         [TestFixtureSetUp]
         public void When_aggregate_is_recovered_from_persistence()
         {
+            GridNode.EventAdaptersCatalog.Register(new BalanceChangedDomainEventAdapter1());
             _balanceId = Guid.NewGuid();
             var events = new DomainEvent[]
             {
@@ -44,10 +35,6 @@ public void When_aggregate_is_recovered_from_persistence()
             SaveInJournal<BalanceAggregate>(_balanceId, events);
             Thread.Sleep(500);
 
-            var domainEventsUpgradeChain = new DomainEventsUpgradeChain();
-            domainEventsUpgradeChain.Register(new BalanceChangedEventAdapter1());
-            AkkaDomainEventsAdapter.UpgradeChain = domainEventsUpgradeChain;
-
             _aggregate = LoadAggregate<BalanceAggregate>(_balanceId);
         }
 
diff --git a/GridDomain.Domain.Tests/GridDomain.Tests.csproj b/GridDomain.Domain.Tests/GridDomain.Tests.csproj
@@ -220,6 +220,7 @@
     <Compile Include="DateTimeSpec.cs" />
     <Compile Include="DependencyInjection\AggregateActor_can_be_created_with_iServiceLocator.cs" />
     <Compile Include="DependencyInjection\Given_configured_container_When_executing_aggregate_handler.cs" />
+    <Compile Include="EventsUpgrade\BalanceChangedEventAdapter1.cs" />
     <Compile Include="EventsUpgrade\Chain\EventUpdater2.cs" />
     <Compile Include="EventsUpgrade\Chain\EventUpdater3.cs" />
     <Compile Include="EventsUpgrade\Chain\Given_DomainEventUpgradeChain_When_updating_events_split_Tests.cs" />
@@ -236,6 +237,8 @@
     <Compile Include="EventsUpgrade\Domain\ProjectionBuilders\BalanceAggregateChangedProjectionBuilder.cs" />
     <Compile Include="EventsUpgrade\Domain\ProjectionBuilders\BalanceAggregateCreatedProjectionBuilder.cs" />
     <Compile Include="EventsUpgrade\Domain\ProjectionBuilders\SampleProjectionBuilder.cs" />
+    <Compile Include="EventsUpgrade\Events\TestEvent_V2.cs" />
+    <Compile Include="EventsUpgrade\Events\TestEvent_V3.cs" />
     <Compile Include="EventsUpgrade\Given_aggregate_with_upgraded_event_with_new_field.cs" />
     <Compile Include="EventsUpgrade\Events\BadNamedType_V1_V1.cs" />
     <Compile Include="EventsUpgrade\DomainEventSerializationTest.cs" />
@@ -260,6 +263,7 @@
     <Compile Include="Given_Node_When_Start_TrasportRegistrations_Test.cs" />
     <Compile Include="Sagas\SoftwareProgrammingDomain\Commands\GoSleepCommand.cs" />
     <Compile Include="Sagas\InstanceSagas\CreateSagaGraph.cs" />
+    <Compile Include="Sagas\SoftwareProgrammingDomain\Commands\GoToWorkCommand.cs" />
     <Compile Include="Sagas\SoftwareProgrammingDomain\Events\CoffeMakeFailedEvent.cs" />
     <Compile Include="Sagas\SoftwareProgrammingDomain\Commands\MakeCoffeCommand.cs" />
     <Compile Include="Sagas\SoftwareProgrammingDomain\Events\SleptWellEvent.cs" />
@@ -269,7 +273,7 @@
     <Compile Include="Sagas\InstanceSagas\Recovery\Given_instance_saga_When_recovering.cs" />
     <Compile Include="Sagas\InstanceSagas\SagaDataAggregateCommandsHandlerDummy.cs" />
     <Compile Include="Sagas\InstanceSagas\Saga_produced_events_and_commands_has_sagaId.cs" />
-    <Compile Include="Sagas\SagaRecycling\SagaRecyclingTest.cs" />
+    <Compile Include="Sagas\SagaRecycling\Given_State_Saga.cs" />
     <Compile Include="Sagas\SagaRecycling\Saga\FinishedEvent.cs" />
     <Compile Include="Sagas\SagaRecycling\Saga\SagaForRecycling.cs" />
     <Compile Include="Sagas\SagaRecycling\Saga\SagaForRecyclingFactory.cs" />
@@ -291,7 +295,7 @@
     <Compile Include="Sagas\InstanceSagas\Transitions\Given_created_and_message_received_and_transitioned_event_when_hydrating.cs" />
     <Compile Include="Sagas\InstanceSagas\Transitions\Given_created_event_when_hydrating.cs" />
     <Compile Include="Sagas\StateSagas\SagaStart_with_predefined_id_messaging.cs" />
-    <Compile Include="Sagas\StateSagas\SagaStart_with_predifined_id_and_state_aggregate_change_in_process.cs" />
+    <Compile Include="Sagas\StateSagas\Given_SagaStart_with_predifined_id.cs" />
     <Compile Include="Sagas\StateSagas\SampleSaga\BadCoffeMachineRememberedEvent.cs" />
     <Compile Include="Sagas\StateSagas\SampleSaga\PersonRememberedEvent.cs" />
     <Compile Include="Sagas\StateSagas\SoftwareProgramming_StateSaga_Test.cs" />
diff --git a/GridDomain.Domain.Tests/Sagas/SagaRecycling/Given_State_Saga.cs b/GridDomain.Domain.Tests/Sagas/SagaRecycling/Given_State_Saga.cs
diff --git a/GridDomain.Domain.Tests/Sagas/SoftwareProgrammingDomain/Commands/GoSleepCommand.cs b/GridDomain.Domain.Tests/Sagas/SoftwareProgrammingDomain/Commands/GoSleepCommand.cs
@@ -13,13 +13,4 @@ public GoSleepCommand(Guid personId, Guid sofaId)
             SofaId = sofaId;
         }
     }
-
-    internal class GoToWorkCommand : Command
-    {
-        public Guid PersonId { get; }
-        public GoToWorkCommand(Guid personId)
-        {
-            PersonId = personId;
-        }
-    }
 }
diff --git a/GridDomain.Domain.Tests/Sagas/SoftwareProgrammingDomain/Commands/GoToWorkCommand.cs b/GridDomain.Domain.Tests/Sagas/SoftwareProgrammingDomain/Commands/GoToWorkCommand.cs
@@ -0,0 +1,14 @@
+using System;
+using GridDomain.CQRS;
+
+namespace GridDomain.Tests.Sagas.SoftwareProgrammingDomain.Commands
+{
+    internal class GoToWorkCommand : Command
+    {
+        public Guid PersonId { get; }
+        public GoToWorkCommand(Guid personId)
+        {
+            PersonId = personId;
+        }
+    }
+}
diff --git a/GridDomain.Domain.Tests/Sagas/StateSagas/Given_SagaStart_with_predifined_id.cs b/GridDomain.Domain.Tests/Sagas/StateSagas/Given_SagaStart_with_predifined_id.cs
@@ -16,7 +16,8 @@ public class Given_SagaStart_with_predifined_id:
         private Guid _sagaId;
         private SoftwareProgrammingSagaState _sagaState;
         private Guid _personId;
-        //_and_state_aggregate_change_in_process
+        
+
         [TestFixtureSetUp]
         public void When_start_message_has_saga_id()
         {
diff --git a/GridDomain.EventSourcing/DomainEvent.cs b/GridDomain.EventSourcing/DomainEvent.cs
@@ -19,10 +19,8 @@ public class DomainEvent : ISourcedEvent//, ISerializable
 
         //Source of the event - aggregate that created it
         public Guid SourceId { get;}
-        //ensure sagaId will not be changed in actors
-        public Guid SagaId { get; private set; }
+        public Guid SagaId { get; protected set; }
         public DateTime CreatedTime { get; }
-       // public virtual int Version { get; } = 1;
 
         public DomainEvent CloneWithSaga(Guid sagaId)
         {
diff --git a/GridDomain.EventSourcing/DomainEventAdapters/AdapterDescriptor.cs b/GridDomain.EventSourcing/DomainEventAdapters/AdapterDescriptor.cs
@@ -2,9 +2,9 @@
 
 namespace GridDomain.EventSourcing.VersionedTypeSerialization
 {
-    public class AdapterDescriptor
+    public class EventAdapterDescriptor
     {
-        public AdapterDescriptor(Type @from, Type to)
+        public EventAdapterDescriptor(Type @from, Type to)
         {
             From = @from;
             To = to;
@@ -13,9 +13,9 @@ public AdapterDescriptor(Type @from, Type to)
         public Type From { get; }
         public Type To { get; }
 
-        public static AdapterDescriptor New<TFrom, TTo>()
+        public static EventAdapterDescriptor New<TFrom, TTo>()
         {
-            return new AdapterDescriptor(typeof(TFrom), typeof(TTo));
+            return new EventAdapterDescriptor(typeof(TFrom), typeof(TTo));
         }
     }
 }
diff --git a/GridDomain.EventSourcing/DomainEventAdapters/DomainEventAdapter.cs b/GridDomain.EventSourcing/DomainEventAdapters/DomainEventAdapter.cs
@@ -4,13 +4,13 @@
 
 namespace GridDomain.EventSourcing.VersionedTypeSerialization
 {
-    public abstract class DomainEventAdapter<TFrom, TTo> : IDomainEventAdapter<TFrom, TTo>
+    public abstract class DomainEventAdapter<TFrom, TTo> : IDomainEventAdapter<TFrom, TTo> where TFrom : DomainEvent where TTo : DomainEvent
     {
         public abstract IEnumerable<TTo> ConvertEvent(TFrom evt);
 
-        public AdapterDescriptor Descriptor { get; } = new AdapterDescriptor(typeof(TFrom), typeof(TTo));
+        public EventAdapterDescriptor Descriptor { get; } = new EventAdapterDescriptor(typeof(TFrom), typeof(TTo));
 
-        IEnumerable<object> IDomainEventAdapter.Convert(object evt)
+        IEnumerable<object> IEventAdapter.Convert(object evt)
         {
             IEnumerable<TTo> updatedEvents = ConvertEvent((TFrom)evt);
             return updatedEvents.Cast<object>();
diff --git a/GridDomain.EventSourcing/DomainEventAdapters/DomainEventsUpgradeChain.cs b/GridDomain.EventSourcing/DomainEventAdapters/DomainEventsUpgradeChain.cs
@@ -4,13 +4,13 @@
 
 namespace GridDomain.EventSourcing.VersionedTypeSerialization
 {
-    public class DomainEventsUpgradeChain
+    public class EventAdaptersCatalog
     {
-        private readonly IDictionary<Type, IDomainEventAdapter> _adapterCatalog = new Dictionary<Type, IDomainEventAdapter>();
+        private readonly IDictionary<Type, IEventAdapter> _adapterCatalog = new Dictionary<Type, IEventAdapter>();
 
         public object[] Update(object evt)
         {
-            IDomainEventAdapter adapter = null;
+            IEventAdapter adapter = null;
             var processingType = evt.GetType();
             List<object> updatedEvent =  new List<object>{evt};
 
@@ -33,7 +33,7 @@ public object[] Update(object evt)
         /// <typeparam name="TFrom"></typeparam>
         /// <typeparam name="TTo"></typeparam>
         /// <param name="adapter"></param>
-        public void Register<TFrom, TTo>(IDomainEventAdapter<TFrom, TTo> adapter)
+        public void Register<TFrom, TTo>(IDomainEventAdapter<TFrom, TTo> adapter) where TFrom : DomainEvent where TTo : DomainEvent
         {
             _adapterCatalog[typeof(TFrom)] = adapter;
         }
diff --git a/GridDomain.EventSourcing/DomainEventAdapters/IDomainEventAdapter.cs b/GridDomain.EventSourcing/DomainEventAdapters/IDomainEventAdapter.cs
@@ -19,15 +19,15 @@ namespace GridDomain.EventSourcing.VersionedTypeSerialization
     /// 3) Create an event adapter from versioned type to new one 
     /// 4) Register event adapter 
     /// </summary>
-
-
-    public interface IDomainEventAdapter
+    public interface IEventAdapter
     {
-        AdapterDescriptor Descriptor { get; }
+        EventAdapterDescriptor Descriptor { get; }
         IEnumerable<object> Convert(object evt);
     }
 
-    public interface IDomainEventAdapter<TFrom,TTo>: IDomainEventAdapter
+    public interface IDomainEventAdapter<TFrom,TTo>: IEventAdapter 
+                                                    where TFrom:DomainEvent 
+                                                    where TTo: DomainEvent
     {
         IEnumerable<TTo> ConvertEvent(TFrom evt);
     }
diff --git a/GridDomain.EventSourcing/GridDomain.EventSourcing.csproj b/GridDomain.EventSourcing/GridDomain.EventSourcing.csproj
@@ -54,7 +54,6 @@
     <Compile Include="DomainEventAdapters\VersionedTypeSerializationBinder.cs" />
     <Compile Include="ISourcedEvent.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="DomainEventAdapters\BalanceChangedSerializationBinder.cs" />
     <Compile Include="VersionedTypeSerialization\CantFindTypeException.cs" />
     <Compile Include="VersionedTypeSerialization\CantFindTypeLatestVersionException.cs" />
     <Compile Include="VersionedTypeSerialization\CantParseVersionNumberExpection.cs" />
diff --git a/GridDomain.Node/AkkaDomainEventsAdapter.cs b/GridDomain.Node/AkkaDomainEventsAdapter.cs
@@ -2,6 +2,7 @@
 using Akka.Actor;
 using Akka.Persistence.Journal;
 using GridDomain.EventSourcing.VersionedTypeSerialization;
+using IEventAdapter = Akka.Persistence.Journal.IEventAdapter;
 
 namespace GridDomain.Node
 {
@@ -27,7 +28,7 @@ namespace GridDomain.Node
 
     public class AkkaDomainEventsAdapter : IEventAdapter
     {
-        public static DomainEventsUpgradeChain UpgradeChain = new DomainEventsUpgradeChain();
+        public static EventAdaptersCatalog UpgradeChain = new EventAdaptersCatalog();
 
         public string Manifest(object evt)
         {
diff --git a/GridDomain.Node/GridDomainNode.cs b/GridDomain.Node/GridDomainNode.cs

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace GridDomain.Tests.EventsUpgrade`
`6`	`6`	`{`
`7`		`- class EventUpdater1 : DomainEventAdapter<TestEvent, TestEvent_V1>`
	`7`	`+ class DomainEventUpdater1 : DomainEventAdapter<TestEvent, TestEvent_V1>`
`8`	`8`	`{`
`9`	`9`	`public override IEnumerable<TestEvent_V1> ConvertEvent(TestEvent evt)`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace GridDomain.Tests.EventsUpgrade`
`6`	`6`	`{`
`7`		`- class EventUpdater2 : DomainEventAdapter<TestEvent_V1, TestEvent_V2>`
	`7`	`+ class DomainEventUpdater2 : DomainEventAdapter<TestEvent_V1, TestEvent_V2>`
`8`	`8`	`{`
`9`	`9`	`public override IEnumerable<TestEvent_V2> ConvertEvent(TestEvent_V1 evt)`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace GridDomain.Tests.EventsUpgrade`
`6`	`6`	`{`
`7`		`- class EventUpdater3 : DomainEventAdapter<TestEvent_V2, TestEvent_V3>`
	`7`	`+ class DomainEventUpdater3 : DomainEventAdapter<TestEvent_V2, TestEvent_V3>`
`8`	`8`	`{`
`9`	`9`	`public override IEnumerable<TestEvent_V3> ConvertEvent(TestEvent_V2 evt)`
`10`	`10`	`{`