From 397e764561976ae48f6e99aea72210aac2720718 Mon Sep 17 00:00:00 2001
From: Arnaud <arnaud.dev@gmail.com>
Date: Sun, 3 Mar 2019 07:44:51 +0100
Subject: [PATCH] Exposed thrown exception for exceptions If

---
 .../Binders/CatchExceptionActivityBinder.cs   |  8 +--
 .../ConditionalExceptionActivityBinder.cs     |  8 +--
 .../Binders/ExceptionActivityBinder.cs        |  4 +-
 .../StateMachineExceptionCondition.cs         | 49 +++++++++++++++++++
 4 files changed, 59 insertions(+), 10 deletions(-)
 create mode 100644 src/Automatonymous/StateMachineExceptionCondition.cs

diff --git a/src/Automatonymous/Binders/CatchExceptionActivityBinder.cs b/src/Automatonymous/Binders/CatchExceptionActivityBinder.cs
index 2de0860..5b3e0e6 100644
--- a/src/Automatonymous/Binders/CatchExceptionActivityBinder.cs
+++ b/src/Automatonymous/Binders/CatchExceptionActivityBinder.cs
@@ -74,7 +74,8 @@ public ExceptionActivityBinder<TInstance, TException> Catch<T>(
             return new CatchExceptionActivityBinder<TInstance, TException>(_machine, _event, _activities, activityBinder);
         }
 
-        public ExceptionActivityBinder<TInstance, TException> If(StateMachineCondition<TInstance> condition,
+        public ExceptionActivityBinder<TInstance, TException> If(
+            StateMachineExceptionCondition<TInstance, TException> condition,
             Func<ExceptionActivityBinder<TInstance, TException>, ExceptionActivityBinder<TInstance, TException>> activityCallback)
         {
             ExceptionActivityBinder<TInstance, TException> binder = new CatchExceptionActivityBinder<TInstance, TException>(_machine, _event);
@@ -154,9 +155,8 @@ public ExceptionActivityBinder<TInstance, TData, TException> Catch<T>(
             return new CatchExceptionActivityBinder<TInstance, TData, TException>(_machine, _event, _activities, activityBinder);
         }
 
-        public ExceptionActivityBinder<TInstance, TData, TException> If(StateMachineCondition<TInstance, TData> condition,
-            Func<ExceptionActivityBinder<TInstance, TData, TException>, ExceptionActivityBinder<TInstance, TData, TException>>
-                activityCallback)
+        public ExceptionActivityBinder<TInstance, TData, TException> If(StateMachineExceptionCondition<TInstance, TData, TException> condition,
+            Func<ExceptionActivityBinder<TInstance, TData, TException>, ExceptionActivityBinder<TInstance, TData, TException>> activityCallback)
         {
             ExceptionActivityBinder<TInstance, TData, TException> binder =
                 new CatchExceptionActivityBinder<TInstance, TData, TException>(_machine, _event);
diff --git a/src/Automatonymous/Binders/ConditionalExceptionActivityBinder.cs b/src/Automatonymous/Binders/ConditionalExceptionActivityBinder.cs
index 643e9a5..3df49fc 100644
--- a/src/Automatonymous/Binders/ConditionalExceptionActivityBinder.cs
+++ b/src/Automatonymous/Binders/ConditionalExceptionActivityBinder.cs
@@ -23,10 +23,10 @@ public class ConditionalExceptionActivityBinder<TInstance, TException> :
         where TException : Exception
     {
         readonly EventActivities<TInstance> _activities;
-        readonly StateMachineCondition<TInstance> _condition;
+        readonly StateMachineExceptionCondition<TInstance, TException> _condition;
         readonly Event _event;
 
-        public ConditionalExceptionActivityBinder(Event @event, StateMachineCondition<TInstance> condition, EventActivities<TInstance> activities)
+        public ConditionalExceptionActivityBinder(Event @event, StateMachineExceptionCondition<TInstance, TException> condition, EventActivities<TInstance> activities)
         {
             _activities = activities;
             _condition = condition;
@@ -75,10 +75,10 @@ public class ConditionalExceptionActivityBinder<TInstance, TData, TException> :
         where TException : Exception
     {
         readonly EventActivities<TInstance> _activities;
-        readonly StateMachineCondition<TInstance, TData> _condition;
+        readonly StateMachineExceptionCondition<TInstance, TData, TException> _condition;
         readonly Event _event;
 
-        public ConditionalExceptionActivityBinder(Event @event, StateMachineCondition<TInstance, TData> condition,
+        public ConditionalExceptionActivityBinder(Event @event, StateMachineExceptionCondition<TInstance, TData, TException> condition,
             EventActivities<TInstance> activities)
         {
             _activities = activities;
diff --git a/src/Automatonymous/Binders/ExceptionActivityBinder.cs b/src/Automatonymous/Binders/ExceptionActivityBinder.cs
index 9520e8e..a0b7155 100644
--- a/src/Automatonymous/Binders/ExceptionActivityBinder.cs
+++ b/src/Automatonymous/Binders/ExceptionActivityBinder.cs
@@ -42,7 +42,7 @@ ExceptionActivityBinder<TInstance, TException> Catch<T>(
         /// <param name="condition"></param>
         /// <param name="activityCallback"></param>
         /// <returns></returns>
-        ExceptionActivityBinder<TInstance, TException> If(StateMachineCondition<TInstance> condition,
+        ExceptionActivityBinder<TInstance, TException> If(StateMachineExceptionCondition<TInstance, TException> condition,
             Func<ExceptionActivityBinder<TInstance, TException>, ExceptionActivityBinder<TInstance, TException>> activityCallback);
     }
 
@@ -76,7 +76,7 @@ ExceptionActivityBinder<TInstance, TData, TException> Catch<T>(
         /// <param name="condition"></param>
         /// <param name="activityCallback"></param>
         /// <returns></returns>
-        ExceptionActivityBinder<TInstance, TData, TException> If(StateMachineCondition<TInstance, TData> condition,
+        ExceptionActivityBinder<TInstance, TData, TException> If(StateMachineExceptionCondition<TInstance, TData, TException> condition,
             Func<ExceptionActivityBinder<TInstance, TData, TException>, ExceptionActivityBinder<TInstance, TData, TException>>
                 activityCallback);
     }
diff --git a/src/Automatonymous/StateMachineExceptionCondition.cs b/src/Automatonymous/StateMachineExceptionCondition.cs
new file mode 100644
index 0000000..5344798
--- /dev/null
+++ b/src/Automatonymous/StateMachineExceptionCondition.cs
@@ -0,0 +1,49 @@
+// Copyright 2011-2019 Chris Patterson, Dru Sellers
+// 
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not use 
+// this file except in compliance with the License. You may obtain a copy of the 
+// License at 
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0 
+// 
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+// Copyright 2011-2019 Chris Patterson, Dru Sellers
+// 
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not use 
+// this file except in compliance with the License. You may obtain a copy of the 
+// License at 
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0 
+// 
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+namespace Automatonymous
+{
+    using System;
+
+
+    /// <summary>
+    /// Filters activities based on the conditional statement
+    /// </summary>
+    /// <typeparam name="TInstance"></typeparam>
+    /// <typeparam name="TData"></typeparam>
+    /// <param name="context"></param>
+    /// <returns></returns>
+    public delegate bool StateMachineExceptionCondition<in TInstance, in TData, in TException>(BehaviorExceptionContext<TInstance, TData, TException> context)
+        where TException : Exception;
+
+
+    /// <summary>
+    /// Filters activities based on the conditional statement
+    /// </summary>
+    /// <typeparam name="TInstance"></typeparam>
+    /// <param name="context"></param>
+    /// <returns></returns>
+    public delegate bool StateMachineExceptionCondition<in TInstance, in TException>(BehaviorExceptionContext<TInstance, TException> context)
+        where TException : Exception;
+}
\ No newline at end of file