diff --git a/src/core/Elsa.Core/Activities/ControlFlow/For.cs b/src/core/Elsa.Core/Activities/ControlFlow/For.cs index 1480740c6..8f11e937d 100644 --- a/src/core/Elsa.Core/Activities/ControlFlow/For.cs +++ b/src/core/Elsa.Core/Activities/ControlFlow/For.cs @@ -66,7 +66,7 @@ public class For : Activity if (loop) { - context.SubmitActivity(iterateNode, OnChildComplete); + context.PostActivity(iterateNode, OnChildComplete); // Update loop variable. CurrentValue.Set(context.ExpressionExecutionContext, currentValue); diff --git a/src/core/Elsa.Core/Activities/ControlFlow/ForEach.cs b/src/core/Elsa.Core/Activities/ControlFlow/ForEach.cs index 4ee6ae804..a31e86c02 100644 --- a/src/core/Elsa.Core/Activities/ControlFlow/ForEach.cs +++ b/src/core/Elsa.Core/Activities/ControlFlow/ForEach.cs @@ -32,7 +32,7 @@ public class ForEach : Activity CurrentValue.Set(context, currentItem); if (Body != null) - context.SubmitActivity(Body, OnChildCompleted); + context.PostActivity(Body, OnChildCompleted); // Increment index. context.UpdateProperty(CurrentIndexProperty, x => x + 1); diff --git a/src/core/Elsa.Core/Activities/ControlFlow/Fork.cs b/src/core/Elsa.Core/Activities/ControlFlow/Fork.cs index 72f95eb04..0c589a078 100644 --- a/src/core/Elsa.Core/Activities/ControlFlow/Fork.cs +++ b/src/core/Elsa.Core/Activities/ControlFlow/Fork.cs @@ -11,7 +11,7 @@ public class Fork : Activity [Input] public Input JoinMode { get; set; } = new(ControlFlow.JoinMode.WaitAny); [Outbound] public ICollection Branches { get; set; } = new List(); - protected override void Execute(ActivityExecutionContext context) => context.ScheduleActivities(Branches.Reverse(), CompleteChildAsync); + protected override void Execute(ActivityExecutionContext context) => context.PostActivities(Branches.Reverse(), CompleteChildAsync); private ValueTask CompleteChildAsync(ActivityExecutionContext context, ActivityExecutionContext childContext) { diff --git a/src/core/Elsa.Core/Activities/ControlFlow/If.cs b/src/core/Elsa.Core/Activities/ControlFlow/If.cs index 75f996e5e..089bb4581 100644 --- a/src/core/Elsa.Core/Activities/ControlFlow/If.cs +++ b/src/core/Elsa.Core/Activities/ControlFlow/If.cs @@ -24,7 +24,7 @@ public class If : Activity var nextNode = result ? Then : Else; if (nextNode != null) - context.SubmitActivity(nextNode, OnChildCompletedAsync); + context.PostActivity(nextNode, OnChildCompletedAsync); } private ValueTask OnChildCompletedAsync(ActivityExecutionContext context, ActivityExecutionContext childContext) diff --git a/src/core/Elsa.Core/Activities/ControlFlow/ParallelForEach.cs b/src/core/Elsa.Core/Activities/ControlFlow/ParallelForEach.cs index e6399eae9..d1de68d2e 100644 --- a/src/core/Elsa.Core/Activities/ControlFlow/ParallelForEach.cs +++ b/src/core/Elsa.Core/Activities/ControlFlow/ParallelForEach.cs @@ -26,7 +26,7 @@ public class ParallelForEach : Activity }; // Schedule a body of work for each item. - context.SubmitActivity(Body, OnChildCompleted, new[]{localVariable}); + context.PostActivity(Body, OnChildCompleted, new[]{localVariable}); } } diff --git a/src/core/Elsa.Core/Activities/ControlFlow/Switch.cs b/src/core/Elsa.Core/Activities/ControlFlow/Switch.cs index dcbacfdd1..d2b7db4fd 100644 --- a/src/core/Elsa.Core/Activities/ControlFlow/Switch.cs +++ b/src/core/Elsa.Core/Activities/ControlFlow/Switch.cs @@ -21,12 +21,12 @@ public class Switch : Activity if (matchingCase != null) { if (matchingCase.Activity != null) - context.SubmitActivity(matchingCase.Activity); + context.PostActivity(matchingCase.Activity); return; } if (Default != null) - context.SubmitActivity(Default); + context.PostActivity(Default); } private async Task FindMatchingCaseAsync(ExpressionExecutionContext context) diff --git a/src/core/Elsa.Core/Activities/ControlFlow/While.cs b/src/core/Elsa.Core/Activities/ControlFlow/While.cs index 04e13de39..fedec68c1 100644 --- a/src/core/Elsa.Core/Activities/ControlFlow/While.cs +++ b/src/core/Elsa.Core/Activities/ControlFlow/While.cs @@ -39,7 +39,7 @@ public class While : Activity var loop = context.Get(Condition); if (loop) - context.SubmitActivity(Body, OnBodyCompleted); + context.PostActivity(Body, OnBodyCompleted); } private async ValueTask OnBodyCompleted(ActivityExecutionContext context, ActivityExecutionContext childContext) @@ -47,6 +47,6 @@ public class While : Activity var loop = await context.EvaluateAsync(Condition); if (loop) - context.SubmitActivity(Body, OnBodyCompleted); + context.PostActivity(Body, OnBodyCompleted); } } \ No newline at end of file diff --git a/src/core/Elsa.Core/Activities/Workflows/Composite.cs b/src/core/Elsa.Core/Activities/Workflows/Composite.cs index dad9e8088..984f3d166 100644 --- a/src/core/Elsa.Core/Activities/Workflows/Composite.cs +++ b/src/core/Elsa.Core/Activities/Workflows/Composite.cs @@ -18,7 +18,7 @@ public class Composite : Activity protected override void Execute(ActivityExecutionContext context) { - context.SubmitActivity(Root, OnCompletedAsync); + context.PostActivity(Root, OnCompletedAsync); } protected virtual ValueTask OnCompletedAsync(ActivityExecutionContext context, ActivityExecutionContext childContext) => ValueTask.CompletedTask; @@ -46,7 +46,7 @@ public class Composite : Activity protected override void Execute(ActivityExecutionContext context) { - context.SubmitActivity(Root, OnCompletedAsync); + context.PostActivity(Root, OnCompletedAsync); } protected virtual ValueTask OnCompletedAsync(ActivityExecutionContext context, ActivityExecutionContext childContext) => ValueTask.CompletedTask; diff --git a/src/core/Elsa.Core/Activities/Workflows/Flowchart.cs b/src/core/Elsa.Core/Activities/Workflows/Flowchart.cs index 105fdc0cf..ab15d78a1 100644 --- a/src/core/Elsa.Core/Activities/Workflows/Flowchart.cs +++ b/src/core/Elsa.Core/Activities/Workflows/Flowchart.cs @@ -16,7 +16,7 @@ public class Flowchart : Container if (Start == null!) return; - context.SubmitActivity(Start, OnChildCompleted); + context.PostActivity(Start, OnChildCompleted); } private ValueTask OnChildCompleted(ActivityExecutionContext context, ActivityExecutionContext childContext) @@ -33,6 +33,6 @@ public class Flowchart : Container var outboundConnections = Connections.Where(x => x.Source == parent).ToList(); var children = outboundConnections.Select(x => x.Target).ToList(); - context.ScheduleActivities(children, OnChildCompleted); + context.PostActivities(children, OnChildCompleted); } } \ No newline at end of file diff --git a/src/core/Elsa.Core/Activities/Workflows/Sequence.cs b/src/core/Elsa.Core/Activities/Workflows/Sequence.cs index 54a94cc24..1c50fc6e5 100644 --- a/src/core/Elsa.Core/Activities/Workflows/Sequence.cs +++ b/src/core/Elsa.Core/Activities/Workflows/Sequence.cs @@ -35,7 +35,7 @@ public class Sequence : Container return; var nextActivity = childActivities.ElementAt(currentIndex); - context.SubmitActivity(nextActivity, OnChildCompleted); + context.PostActivity(nextActivity, OnChildCompleted); context.UpdateProperty(CurrentIndexProperty, x => x + 1); } diff --git a/src/core/Elsa.Core/Models/ActivityExecutionContext.cs b/src/core/Elsa.Core/Models/ActivityExecutionContext.cs index ebd713145..9acaa9971 100644 --- a/src/core/Elsa.Core/Models/ActivityExecutionContext.cs +++ b/src/core/Elsa.Core/Models/ActivityExecutionContext.cs @@ -68,7 +68,7 @@ public class ActivityExecutionContext /// public IDictionary JournalData { get; private set; } = new Dictionary(); - public void SubmitActivity(IActivity? activity, ActivityCompletionCallback? completionCallback = default, IEnumerable? locationReferences = default, object? tag = default) + public void PostActivity(IActivity? activity, ActivityCompletionCallback? completionCallback = default, IEnumerable? locationReferences = default, object? tag = default) { if (activity == null) return; @@ -76,7 +76,7 @@ public class ActivityExecutionContext WorkflowExecutionContext.Schedule(activity, this, completionCallback, locationReferences, tag); } - public void SubmitActivity(IActivity? activity, ActivityExecutionContext owner, ActivityCompletionCallback? completionCallback = default, IEnumerable? locationReferences = default, object? tag = default) + public void PostActivity(IActivity? activity, ActivityExecutionContext owner, ActivityCompletionCallback? completionCallback = default, IEnumerable? locationReferences = default, object? tag = default) { if (activity == null) return; @@ -84,12 +84,12 @@ public class ActivityExecutionContext WorkflowExecutionContext.Schedule(activity, owner, completionCallback, locationReferences, tag); } - public void ScheduleActivities(params IActivity?[] activities) => ScheduleActivities((IEnumerable)activities); + public void PostActivities(params IActivity?[] activities) => PostActivities((IEnumerable)activities); - public void ScheduleActivities(IEnumerable activities, ActivityCompletionCallback? completionCallback = default) + public void PostActivities(IEnumerable activities, ActivityCompletionCallback? completionCallback = default) { foreach (var activity in activities) - SubmitActivity(activity, completionCallback); + PostActivity(activity, completionCallback); } public void CreateBookmarks(IEnumerable bookmarkData, ExecuteActivityDelegate? callback = default)