Refactor commit strategy resolution for improved clarity and efficiency; remove unused example files and add a new CommitTracker helper for testing.

Author: David Garza

src/modules/Elsa.Workflows.Core/CommitStates/USAGE_EXAMPLE.md

@@ -130,17 +130,10 @@ private async Task EvaluateInputPropertiesAsync(ActivityExecutionContext context
     private bool ShouldCommit(ActivityExecutionContext context, ActivityLifetimeEvent lifetimeEvent)
     {
         var strategyName = context.Activity.GetCommitStrategy();
-        IActivityCommitStrategy? strategy;
 
-        if (!string.IsNullOrWhiteSpace(strategyName))
-        {
-            strategy = commitStrategyRegistry.FindActivityStrategy(strategyName);
-        }
-        else
-        {
-            // Fall back to the default strategy if configured
-            strategy = commitStateOptions.Value.DefaultActivityCommitStrategy;
-        }
+        IActivityCommitStrategy? strategy = !string.IsNullOrWhiteSpace(strategyName)
+            ? commitStrategyRegistry.FindActivityStrategy(strategyName)
+            : commitStateOptions.Value.DefaultActivityCommitStrategy;
 
         var commitAction = CommitAction.Default;
 
@@ -160,17 +153,9 @@ private bool ShouldCommit(ActivityExecutionContext context, ActivityLifetimeEven
                 {
                     var workflowStrategyName = context.WorkflowExecutionContext.Workflow.Options.CommitStrategyName;
 
-                    IWorkflowCommitStrategy? workflowStrategy;
-
-                    if (!string.IsNullOrWhiteSpace(workflowStrategyName))
-                    {
-                        workflowStrategy = commitStrategyRegistry.FindWorkflowStrategy(workflowStrategyName);
-                    }
-                    else
-                    {
-                        // Fall back to the default strategy if configured
-                        workflowStrategy = commitStateOptions.Value.DefaultWorkflowCommitStrategy;
-                    }
+                    IWorkflowCommitStrategy? workflowStrategy = !string.IsNullOrWhiteSpace(workflowStrategyName)
+                        ? commitStrategyRegistry.FindWorkflowStrategy(workflowStrategyName)
+                        : commitStateOptions.Value.DefaultWorkflowCommitStrategy;
 
                     if (workflowStrategy == null)
                         return false;

src/modules/Elsa.Workflows.Core/Middleware/Activities/DefaultActivityInvokerMiddleware.cs

@@ -64,17 +64,9 @@ private async Task ExecuteWorkItemAsync(WorkflowExecutionContext context, Activi
     private async Task ConditionallyCommitStateAsync(WorkflowExecutionContext context, WorkflowLifetimeEvent lifetimeEvent)
     {
         var strategyName = context.Workflow.Options.CommitStrategyName;
-        IWorkflowCommitStrategy? strategy;
-
-        if (!string.IsNullOrWhiteSpace(strategyName))
-        {
-            strategy = commitStrategyRegistry.FindWorkflowStrategy(strategyName);
-        }
-        else
-        {
-            // Fall back to the default strategy if configured
-            strategy = commitStateOptions.Value.DefaultWorkflowCommitStrategy;
-        }
+        IWorkflowCommitStrategy? strategy = !string.IsNullOrWhiteSpace(strategyName)
+            ? commitStrategyRegistry.FindWorkflowStrategy(strategyName)
+            : commitStateOptions.Value.DefaultWorkflowCommitStrategy;
 
         if (strategy == null)
             return;

src/modules/Elsa.Workflows.Core/Middleware/Workflows/DefaultActivitySchedulerMiddleware.cs

@@ -3,15 +3,21 @@
 using Elsa.Workflows.CommitStates;
 using Elsa.Workflows.CommitStates.Strategies;
 using Elsa.Workflows.CommitStates.Tasks;
+using Elsa.Workflows.IntegrationTests.SharedHelpers;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Xunit.Abstractions;
 
 namespace Elsa.Workflows.IntegrationTests.Scenarios.DefaultActivityCommitStrategy;
 
-public class Tests(ITestOutputHelper testOutputHelper)
+public class Tests
 {
-    private readonly ITestOutputHelper _testOutputHelper = testOutputHelper;
+    private readonly ITestOutputHelper _testOutputHelper;
+
+    public Tests(ITestOutputHelper testOutputHelper)
+    {
+        _testOutputHelper = testOutputHelper;
+    }
 
     [Fact(DisplayName = "Activity without explicit strategy uses default commit strategy")]
     public async Task ActivityUsesDefaultCommitStrategy()
@@ -106,7 +112,7 @@ public async Task NoCommitsWithoutAnyStrategy()
     }
 
     [Fact(DisplayName = "Default activity strategy is not visible in commit strategy registry")]
-    public async Task DefaultStrategyNotInRegistry()
+    public void DefaultStrategyNotInRegistry()
     {
         // Arrange
         var defaultStrategy = new ExecutedActivityStrategy();
@@ -128,7 +134,6 @@ public async Task DefaultStrategyNotInRegistry()
         Assert.Empty(activityStrategies);
         Assert.NotNull(options.Value.DefaultActivityCommitStrategy);
         Assert.Same(defaultStrategy, options.Value.DefaultActivityCommitStrategy);
-        await Task.CompletedTask;
     }
 
     [Fact(DisplayName = "Default activity strategy with standard strategies does not duplicate")]

test/integration/Elsa.Workflows.IntegrationTests/Scenarios/DefaultActivityCommitStrategy/Tests.cs

@@ -2,6 +2,7 @@
 using Elsa.Testing.Shared;
 using Elsa.Workflows.CommitStates;
 using Elsa.Workflows.CommitStates.Strategies;
+using Elsa.Workflows.IntegrationTests.SharedHelpers;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Xunit.Abstractions;

test/integration/Elsa.Workflows.IntegrationTests/Scenarios/DefaultWorkflowCommitStrategy/CommitTracker.cs

@@ -1,7 +1,7 @@
 using Elsa.Workflows.CommitStates;
 using Elsa.Workflows.State;
 
-namespace Elsa.Workflows.IntegrationTests.Scenarios.DefaultActivityCommitStrategy;
+namespace Elsa.Workflows.IntegrationTests.SharedHelpers;
 
 /// <summary>
 /// Test helper to track commit invocations
@@ -13,12 +13,14 @@ public class CommitTracker : ICommitStateHandler
     public Task CommitAsync(WorkflowExecutionContext workflowExecutionContext, CancellationToken cancellationToken = default)
     {
         CommitCount++;
+
         return Task.CompletedTask;
     }
 
     public Task CommitAsync(WorkflowExecutionContext workflowExecutionContext, WorkflowState workflowState, CancellationToken cancellationToken = default)
     {
         CommitCount++;
+
         return Task.CompletedTask;
     }
 }