Merge pull request #115 from Lutando/dev

Some breaking naming and access changes to internals

Author: Lutando

src/Akkatecture/Aggregates/AggregateRoot.cs

@@ -49,23 +49,24 @@ public abstract class AggregateRoot<TAggregate, TIdentity, TAggregateState> : Re
     {
         private static readonly IReadOnlyDictionary<Type, Action<TAggregateState, IAggregateEvent>> ApplyMethodsFromState = typeof(TAggregateState).GetAggregateStateEventApplyMethods<TAggregate, TIdentity, TAggregateState>();
         private static readonly IReadOnlyDictionary<Type, Action<TAggregateState, IAggregateSnapshot>> HydrateMethodsFromState =  typeof(TAggregateState).GetAggregateSnapshotHydrateMethods<TAggregate, TIdentity, TAggregateState>();
-        public static readonly IAggregateName AggregateName = typeof(TAggregate).GetAggregateName();
-        protected CircularBuffer<ISourceId> _previousSourceIds = new CircularBuffer<ISourceId>(100);
-        protected ICommand<TAggregate, TIdentity> PinnedCommand { get; private set; }
-        protected object PinnedReply { get; private set; }
+        private static readonly IAggregateName AggregateName = typeof(TAggregate).GetAggregateName();
+        private CircularBuffer<ISourceId> _previousSourceIds = new CircularBuffer<ISourceId>(100);
+        private ICommand<TAggregate, TIdentity> PinnedCommand { get; set; }
+        private object PinnedReply { get; set; }
 
         protected ILoggingAdapter Logger { get; }
-        protected IEventDefinitionService _eventDefinitionService;
-        protected ISnapshotDefinitionService _snapshotDefinitionService;
-        protected ISnapshotStrategy SnapshotStrategy { get; set; } = SnapshotNeverStrategy.Instance;
-        public TAggregateState State { get;  }
+        //TODO This should be private readonly. 
+        protected readonly IEventDefinitionService EventDefinitionService;
+        private readonly ISnapshotDefinitionService _snapshotDefinitionService;
+        private ISnapshotStrategy SnapshotStrategy { get; set; } = SnapshotNeverStrategy.Instance;
+        protected TAggregateState State { get;  }
         public IAggregateName Name => AggregateName;
         public override string PersistenceId { get; }
         public TIdentity Id { get; }
         public long Version { get; protected set; }
         public bool IsNew => Version <= 0;
         public override Recovery Recovery => new Recovery(SnapshotSelectionCriteria.Latest);
-        public AggregateRootSettings Settings { get; }
+        private AggregateRootSettings Settings { get; }
 
         protected AggregateRoot(TIdentity id)
         {
@@ -93,7 +94,7 @@ protected AggregateRoot(TIdentity id)
             }
 
             PinnedCommand = null;
-            _eventDefinitionService = new EventDefinitionService(Logger);
+            EventDefinitionService = new EventDefinitionService(Logger);
             _snapshotDefinitionService = new SnapshotDefinitionService(Logger);
             Id = id;
             PersistenceId = id.Value;
@@ -161,8 +162,8 @@ public virtual CommittedEvent<TAggregate, TIdentity, TAggregateEvent> From<TAggr
             {
                 throw new ArgumentNullException(nameof(aggregateEvent));
             }
-            _eventDefinitionService.Load(aggregateEvent.GetType());
-            var eventDefinition = _eventDefinitionService.GetDefinition(aggregateEvent.GetType());
+            EventDefinitionService.Load(aggregateEvent.GetType());
+            var eventDefinition = EventDefinitionService.GetDefinition(aggregateEvent.GetType());
             var aggregateSequenceNumber = version + 1;
             var eventId = EventId.NewDeterministic(
                 GuidFactories.Deterministic.Namespaces.Events,
@@ -256,10 +257,7 @@ protected override bool AroundReceive(Receive receive, object message)
 
         protected virtual void Reply(object replyMessage)
         {
-            if(Sender == ActorRefs.NoSender || Sender == ActorRefs.Nobody)
-            {
-                // do nothing
-            } else
+            if(!Sender.IsNobody())
             {
                 PinnedReply = replyMessage;
             }
@@ -408,7 +406,7 @@ protected void Command<TCommand, TCommandHandler>(Predicate<TCommand> shouldHand
             }
 
         }
-
+        
     }
 
 }

src/Akkatecture/Aggregates/ExecutionResults/FailedExecutionResult.cs

@@ -36,6 +36,12 @@ public class FailedExecutionResult : ExecutionResult
 
         public FailedExecutionResult(
             params string[] errors)
+            : this(errors.ToList())
+        {
+        }
+
+        public FailedExecutionResult(
+            IEnumerable<string> errors)
         {
             Errors = (errors ?? Enumerable.Empty<string>()).ToList();
         }

src/Akkatecture/Specifications/Specification.cs

@@ -40,7 +40,7 @@ public bool IsSatisfiedBy(T obj)
         public IEnumerable<string> WhyIsNotSatisfiedBy(T obj)
         {
             return IsNotSatisfiedBecause(obj);
-        }
+        } 
 
         protected abstract IEnumerable<string> IsNotSatisfiedBecause(T aggregate);
     }

test/Akkatecture.TestHelpers/Aggregates/TestAggregate.cs

@@ -217,8 +217,8 @@ private void Signal<TAggregateEvent>(TAggregateEvent aggregateEvent, IMetadata m
                 throw new ArgumentNullException(nameof(aggregateEvent));
             }
 
-            _eventDefinitionService.Load(aggregateEvent.GetType());
-            var eventDefinition = _eventDefinitionService.GetDefinition(aggregateEvent.GetType());
+            EventDefinitionService.Load(aggregateEvent.GetType());
+            var eventDefinition = EventDefinitionService.GetDefinition(aggregateEvent.GetType());
             var aggregateSequenceNumber = Version;
             var eventId = EventId.NewDeterministic(
                 GuidFactories.Deterministic.Namespaces.Events,

test/Akkatecture.Tests/Akkatecture.Tests.csproj

@@ -31,7 +31,7 @@
     <PackageReference Include="Akka" Version="1.3.13" />
     <PackageReference Include="Akka.Cluster.TestKit" Version="1.3.13" />
     <PackageReference Include="Akka.TestKit.Xunit2" Version="1.3.13" />
-    <PackageReference Include="coverlet.msbuild" Version="2.6.0" />
+    <PackageReference Include="coverlet.msbuild" Version="2.6.1" />
     <PackageReference Include="FluentAssertions" Version="5.6.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
     <PackageReference Include="xunit" Version="2.4.1" />