ExceptionPolicy delegate is now async (#85)

liquidprojections · Mar 23, 2017 · 0058964 · 0058964
1 parent 75fbbde
commit 0058964
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 24 deletions.
diff --git a/Src/LiquidProjections.NHibernate/NHibernateProjector.cs b/Src/LiquidProjections.NHibernate/NHibernateProjector.cs
@@ -24,7 +24,7 @@ public sealed class NHibernateProjector<TProjection, TKey, TState>
         private readonly NHibernateEventMapConfigurator<TProjection, TKey> mapConfigurator;
         private int batchSize = 1;
         private string stateKey = typeof(TProjection).Name;
-        private ShouldRetry shouldRetry = (exception, count) => false;
+        private ShouldRetry shouldRetry = (exception, count) => Task.FromResult(false);
 
         /// <summary>
         /// Creates a new instance of <see cref="NHibernateProjector{TProjection,TKey,TState}"/>.
@@ -127,7 +127,7 @@ private async Task ExecuteWithRetry(Func<Task> action)
                 }
                 catch (ProjectionException exception)
                 {
-                    if (!ShouldRetry(exception, attempt))
+                    if (!await ShouldRetry(exception, attempt))
                     {
                         throw;
                     }

diff --git a/Src/LiquidProjections.NHibernate/ShouldRetry.cs b/Src/LiquidProjections.NHibernate/ShouldRetry.cs
@@ -1,3 +1,5 @@
+using System.Threading.Tasks;
+
 namespace LiquidProjections.NHibernate
 {
     /// <summary>
@@ -6,5 +8,5 @@ namespace LiquidProjections.NHibernate
     /// <returns>Returns true if the projector should retry to project the batch of transactions, false if it shoud fail with the specified exception.</returns>
     /// <param name="exception">The exception that occured that caused this batch to fail.</param>
     /// <param name="attempts">The number of attempts that were made to project this batch of transactions.</param>
-    public delegate bool ShouldRetry(ProjectionException exception, int attempts);
+    public delegate Task<bool> ShouldRetry(ProjectionException exception, int attempts);
 }
diff --git a/Src/LiquidProjections.RavenDB/RavenProjector.cs b/Src/LiquidProjections.RavenDB/RavenProjector.cs
@@ -20,7 +20,7 @@ public class RavenProjector<TProjection>
         private readonly Func<IAsyncDocumentSession> sessionFactory;
         private int batchSize;
         private readonly RavenEventMapConfigurator<TProjection> mapConfigurator;
-        private ShouldRetry shouldRetry = (exception, count) => false;
+        private ShouldRetry shouldRetry = (exception, count) => Task.FromResult(false);
 
         /// <summary>
         /// Creates a new instance of <see cref="RavenProjector{TProjection}"/>.
@@ -137,7 +137,7 @@ private async Task ExecuteWithRetry(Func<Task> action)
                 }
                 catch (ProjectionException exception)
                 {
-                    if (!ShouldRetry(exception, attempt))
+                    if (!await ShouldRetry(exception, attempt))
                     {
                         throw;
                     }

diff --git a/Src/LiquidProjections.RavenDB/ShouldRetry.cs b/Src/LiquidProjections.RavenDB/ShouldRetry.cs
@@ -1,3 +1,5 @@
+using System.Threading.Tasks;
+
 namespace LiquidProjections.RavenDB
 {
     /// <summary>
@@ -6,5 +8,5 @@ namespace LiquidProjections.RavenDB
     /// <returns>Returns true if the projector should retry to project the batch of transactions, false if it shoud fail with the specified exception.</returns>
     /// <param name="exception">The exception that occured that caused this batch to fail.</param>
     /// <param name="attempts">The number of attempts that were made to project this batch of transactions.</param>
-    public delegate bool ShouldRetry(ProjectionException exception, int attempts);
+    public delegate Task<bool> ShouldRetry(ProjectionException exception, int attempts);
 }
diff --git a/Src/LiquidProjections/Projector.cs b/Src/LiquidProjections/Projector.cs
@@ -9,7 +9,7 @@ public class Projector
     {
         private readonly IEventMap<ProjectionContext> map;
         private readonly IReadOnlyList<Projector> children;
-        private ShouldRetry shouldRetry = (exception, count) => false;
+        private ShouldRetry shouldRetry = (exception, count) => Task.FromResult(false);
 
         public Projector(IEventMapBuilder<ProjectionContext> eventMapBuilder, IEnumerable<Projector> children = null)
         {
@@ -75,7 +75,7 @@ private async Task ExecuteWithRetry(Func<Task> action)
                 }
                 catch (ProjectionException exception)
                 {
-                    if (!ShouldRetry(exception, attempt))
+                    if (!await ShouldRetry(exception, attempt))
                     {
                         throw;
                     }

diff --git a/Src/LiquidProjections/ShouldRetry.cs b/Src/LiquidProjections/ShouldRetry.cs
@@ -1,3 +1,5 @@
+using System.Threading.Tasks;
+
 namespace LiquidProjections
 {
     /// <summary>
@@ -6,5 +8,5 @@ namespace LiquidProjections
     /// <returns>Returns true if the projector should retry to project the transaction, false if it shoud fail with the specified exception.</returns>
     /// <param name="exception">The exception that occured that caused this batch to fail.</param>
     /// <param name="attempts">The number of attempts that were made to project this transaction.</param>
-    public delegate bool ShouldRetry(ProjectionException exception, int attempts);
+    public delegate Task<bool> ShouldRetry(ProjectionException exception, int attempts);
 }
diff --git a/Tests/LiquidProjections.NHibernate.Specs/NHibernateProjectorSpecs.cs b/Tests/LiquidProjections.NHibernate.Specs/NHibernateProjectorSpecs.cs
@@ -1198,13 +1198,16 @@ public When_event_handling_fails_with_a_custom_exception_policy()
 
                     Subject.ShouldRetry = (exception, attempts) =>
                     {
-                        numerOfFailedAttempts = attempts;
-                        if (attempts <= NumberOfTimesToFail)
+                        return Task.Run(() =>
                         {
-                            return true;
-                        }
+                            numerOfFailedAttempts = attempts;
+                            if (attempts <= NumberOfTimesToFail)
+                            {
+                                return true;
+                            }
 
-                        return false;
+                            return false;
+                        });
                     };
 
                     UseThe(new Transaction

diff --git a/Tests/LiquidProjections.RavenDB.Specs/RavenProjectorSpecs.cs b/Tests/LiquidProjections.RavenDB.Specs/RavenProjectorSpecs.cs
@@ -1621,13 +1621,16 @@ public When_event_handling_fails_with_a_custom_exception_policy()
 
                     Subject.ShouldRetry = (exception, attempts) =>
                     {
-                        numerOfFailedAttempts = attempts;
-                        if (attempts <= NumberOfTimesToFail)
+                        return Task.Run(() =>
                         {
-                            return true;
-                        }
+                            numerOfFailedAttempts = attempts;
+                            if (attempts <= NumberOfTimesToFail)
+                            {
+                                return true;
+                            }
 
-                        return false;
+                            return false;
+                        });
                     };
 
                     UseThe(new Transaction

diff --git a/Tests/LiquidProjections.Specs/ProjectorSpecs.cs b/Tests/LiquidProjections.Specs/ProjectorSpecs.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using Chill;
 using FluentAssertions;
 using Xunit;
@@ -279,13 +280,16 @@ public When_event_handling_fails_with_a_custom_exception_policy()
 
                     Subject.ShouldRetry = (exception, attempts) =>
                     {
-                        numerOfFailedAttempts = attempts;
-                        if (attempts <= NumberOfTimesToFail)
+                        return Task.Run(() =>
                         {
-                            return true;
-                        }
+                            numerOfFailedAttempts = attempts;
+                            if (attempts <= NumberOfTimesToFail)
+                            {
+                                return true;
+                            }
 
-                        return false;
+                            return false;
+                        });
                     };
 
                     UseThe(new Transaction