Improve performance of reporting actor by removing type check on inte…

…rface
Galad · Aug 8, 2020 · a7c5201 · a7c5201
1 parent 1cfd17e
commit a7c5201
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 25 deletions.
diff --git a/src/Tranquire/IThenAction.cs b/src/Tranquire/IThenAction.cs
diff --git a/src/Tranquire/Reporting/INotificationContentFactory.cs b/src/Tranquire/Reporting/INotificationContentFactory.cs
@@ -21,7 +21,7 @@ public IActionNotificationContent CreateAfter(TimeSpan time)
 
         public IActionNotificationContent CreateBefore<T>(INamed action, DateTimeOffset date, CommandType commandType)
         {
-            return new BeforeThenNotificationContent(date, (action as IThenAction<T>).Question);
+            return new BeforeThenNotificationContent(date, (action as ThenAction<T>).Question);
         }
 
         public IActionNotificationContent CreateError(Exception error, TimeSpan time)

diff --git a/src/Tranquire/Reporting/ReportingActor.cs b/src/Tranquire/Reporting/ReportingActor.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using System.Runtime.CompilerServices;
 
 namespace Tranquire.Reporting
 {
@@ -144,11 +145,10 @@ private TResult ExecuteNotifyingAction<TResult>(
             }
 
         }
-#pragma warning restore CS1591 // Missing XML comment for publicly visible type or member
-
+#pragma warning restore CS1591 // Missing XML comment for publicly visible type or member        
         private static INotificationContentFactory GetNotificationContentFactories<T>(INamed action)
         {
-            if (action is IThenAction<T>)
+            if (action is ThenAction<T>)
             {
                 return _thenNotificationContentFactory;
             }

diff --git a/src/Tranquire/ThenAction.cs b/src/Tranquire/ThenAction.cs
@@ -2,29 +2,37 @@
 
 namespace Tranquire
 {
-
     /// <summary>
-    /// Represent an action that verifies the answer of a question
+    /// Represent the base class for an action that verifies the answer of a question
     /// </summary>
-    /// <typeparam name="T">The question answer type</typeparam>
     /// <typeparam name="TResult">The result type</typeparam>
-    public sealed class ThenAction<T, TResult> : ActionBase<TResult>, IThenAction<TResult>
+    public abstract class ThenAction<TResult> : ActionBase<TResult>
     {
         /// <summary>
         /// Gets the question
         /// </summary>
-        INamed IThenAction<TResult>.Question => Question;
+        public abstract INamed Question { get; }
+    }
 
+    /// <summary>
+    /// Represent an action that verifies the answer of a question
+    /// </summary>
+    /// <typeparam name="T">The question answer type</typeparam>
+    /// <typeparam name="TResult">The result type</typeparam>
+    public sealed class ThenAction<T, TResult> : ThenAction<TResult>
+    {        
         /// <summary>
         /// Gets the question
         /// </summary>
-        public IQuestion<T> Question { get; }
+        public override INamed Question { get; }
 
         /// <summary>
         /// Gets the action that verifies the outcome
         /// </summary>
         public Func<T, TResult> VerifyAction { get; }
 
+        private readonly IQuestion<T> _question;
+
         /// <summary>
         /// Creates a new instance of <see cref="ThenAction{T, TResult}"/>
         /// </summary>
@@ -34,6 +42,7 @@ public ThenAction(IQuestion<T> question, Func<T, TResult> verifyAction)
         {
             Question = question ?? throw new ArgumentNullException(nameof(question));
             VerifyAction = verifyAction ?? throw new ArgumentNullException(nameof(verifyAction));
+            _question = question;
         }
 
         /// <inheritdoc />
@@ -42,7 +51,7 @@ public ThenAction(IQuestion<T> question, Func<T, TResult> verifyAction)
         /// <inheritdoc />
         protected override TResult ExecuteWhen(IActor actor)
         {
-            var answer = actor.AsksFor(Question);
+            var answer = actor.AsksFor(_question);
             return VerifyAction(answer);
         }
     }