Merge branch 'Scheduler'

Author: andrey.leskov

GridDomain.CQRS.Messaging.Akka/TypedMessageActor.cs

@@ -13,7 +13,7 @@ public TypedMessageActor(IActorRef actor)
 
         public void Handle(T msg)
         {
-            Actor.Ask(msg);
+            Actor.Tell(msg);
         }
     }
 }

GridDomain.CQRS/CommandExecutorExtensions.cs

@@ -7,33 +7,14 @@ namespace GridDomain.CQRS
 {
     public static class CommandExecutorExtensions
     {
-        public static Task<T> Execute<T>(this ICommandExecutor node, ICommand command, params ExpectedMessage[] expectedMessage)
+        public static async Task<T> Execute<T>(this ICommandExecutor node, ICommand command, params ExpectedMessage[] expectedMessage)
         {
-            return node.Execute(new CommandPlan<T>(command, expectedMessage));
+            return await node.Execute(new CommandPlan<T>(command, expectedMessage));
         }
 
-        public static Task<T> Execute<T>(this ICommandExecutor node, ICommand command, ExpectedMessage<T> expectedMessage)
+        public static async Task<T> Execute<T>(this ICommandExecutor node, ICommand command, ExpectedMessage<T> expectedMessage)
         {
-            return node.Execute(CommandPlan.New(command, expectedMessage));
-        }
-
-        public static T ExecuteSync<T>(this ICommandExecutor node, ICommand command, TimeSpan timeout, ExpectedMessage<T> expectedMessage)
-        {
-            return ExecuteSync(node, CommandPlan.New(command, timeout, expectedMessage));
-        }
-
-        public static T ExecuteSync<T>(this ICommandExecutor node, CommandPlan<T> plan)
-        {
-            var task = node.Execute(plan);
-            try
-            {
-              return task.Result;
-            }
-            catch (Exception ex)
-            {
-                ExceptionDispatchInfo.Capture(ex.UnwrapSingle()).Throw();
-            }
-            throw new InvalidOperationException();
+            return await Execute<T>(node, command, new ExpectedMessage[]{expectedMessage});
         }
     }
 }

GridDomain.CQRS/CommandPlan.cs

@@ -21,7 +21,7 @@ public class CommandPlan
 
         public TimeSpan Timeout { get; }
         public CommandPlan(ICommand command, params ExpectedMessage[] expectedMessage)
-            : this(command, TimeSpan.FromSeconds(10), expectedMessage)
+                     : this(command, TimeSpan.FromSeconds(10), expectedMessage)
         {
         }
 

GridDomain.CQRS/GridDomain.CQRS.csproj

@@ -64,11 +64,16 @@
     <Compile Include="ICommandExecutor.cs" />
     <Compile Include="ICommandHandler.cs" />
     <Compile Include="ICriteria.cs" />
+    <Compile Include="IExpectBuilder.cs" />
+    <Compile Include="IExpectedCommandExecutor.cs" />
     <Compile Include="IHandler.cs" />
     <Compile Include="IFault.cs" />
     <Compile Include="IMessageProcessFault.cs" />
     <Compile Include="IGenericQuery.cs" />
+    <Compile Include="IMessageWaiter.cs" />
+    <Compile Include="IMessageWaiterFactory.cs" />
     <Compile Include="IQuery.cs" />
+    <Compile Include="IWaitResults.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ISingleQuery.cs" />
   </ItemGroup>

…/AkkaMessaging/Waiting/IExpectBuilder.cs GridDomain.CQRS/IExpectBuilder.csGridDomain.Node/AkkaMessaging/Waiting/IExpectBuilder.cs renamed to GridDomain.CQRS/IExpectBuilder.cs GridDomain.Node/AkkaMessaging/Waiting/IExpectBuilder.cs renamed to GridDomain.CQRS/IExpectBuilder.cs

@@ -1,10 +1,11 @@
 using System;
 
-namespace GridDomain.Node.AkkaMessaging.Waiting
+namespace GridDomain.CQRS
 {
     public interface IExpectBuilder<out T>
     {
-        T Create(TimeSpan? timeout = null);
+        //T Create(TimeSpan timeout);
+        T Create();
         IExpectBuilder<T> And<TMsg>(Predicate<TMsg> filter = null);
         IExpectBuilder<T> Or<TMsg>(Func<TMsg, bool> filter = null);
     }

GridDomain.CQRS/IExpectedCommandExecutor.cs

@@ -0,0 +1,9 @@
+using System.Threading.Tasks;
+
+namespace GridDomain.CQRS
+{
+    public interface IExpectedCommandExecutor
+    {
+         Task<IWaitResults> Execute<T>(params T[] command) where T : ICommand;
+    }
+}

GridDomain.CQRS/IMessageWaiter.cs

@@ -0,0 +1,10 @@
+using System;
+
+namespace GridDomain.CQRS
+{
+    public interface IMessageWaiter<T>
+    {
+        IExpectBuilder<T> Expect<TMsg>(Predicate<TMsg> filter = null);
+        IExpectBuilder<T> Expect(Type type, Func<object, bool> filter = null);
+    }
+}

GridDomain.CQRS/IMessageWaiterFactory.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Threading.Tasks;
+
+namespace GridDomain.CQRS
+{
+    public interface IMessageWaiterFactory
+    {
+        IMessageWaiter<Task<IWaitResults>> NewWaiter(TimeSpan? defaultTimeout = null);
+        IMessageWaiter<IExpectedCommandExecutor> NewCommandWaiter(TimeSpan? defaultTimeout = null, bool failAnyFault = true);
+    }
+}

…de/AkkaMessaging/Waiting/IWaitResults.cs GridDomain.CQRS/IWaitResults.csGridDomain.Node/AkkaMessaging/Waiting/IWaitResults.cs renamed to GridDomain.CQRS/IWaitResults.cs GridDomain.Node/AkkaMessaging/Waiting/IWaitResults.cs renamed to GridDomain.CQRS/IWaitResults.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace GridDomain.Node.AkkaMessaging.Waiting
+namespace GridDomain.CQRS
 {
     public interface IWaitResults
     {

GridDomain.Common/ExceptionExtensions.cs

@@ -22,6 +22,7 @@ public static Exception UnwrapSingle(this Exception exeption)
             return ex == null ? exeption : ex.UnwrapSingle();
         }
 
+
 
     }
 }