From 9bcc32d15a91075cbfc329fdfee6d1456990c1fa Mon Sep 17 00:00:00 2001 From: Sipke Schoorstra Date: Fri, 2 Apr 2021 16:55:04 +0200 Subject: [PATCH] Code formatting --- ...utionContextForWorkflowBlueprintFactory.cs | 12 ++-- ...ForActivityBlueprintAndWorkflowProvider.cs | 52 +++++++++-------- .../Triggers/TriggersForBlueprintsProvider.cs | 58 ++++++++++--------- 3 files changed, 65 insertions(+), 57 deletions(-) diff --git a/src/core/Elsa.Core/Services/WorkflowExecutionContextForWorkflowBlueprintFactory.cs b/src/core/Elsa.Core/Services/WorkflowExecutionContextForWorkflowBlueprintFactory.cs index e2f806c4a..b8b71138f 100644 --- a/src/core/Elsa.Core/Services/WorkflowExecutionContextForWorkflowBlueprintFactory.cs +++ b/src/core/Elsa.Core/Services/WorkflowExecutionContextForWorkflowBlueprintFactory.cs @@ -10,13 +10,13 @@ namespace Elsa.Services /// public class WorkflowExecutionContextForWorkflowBlueprintFactory : ICreatesWorkflowExecutionContextForWorkflowBlueprint { - readonly IServiceProvider serviceProvider; - readonly IWorkflowFactory workflowFactory; + private readonly IServiceProvider _serviceProvider; + private readonly IWorkflowFactory _workflowFactory; public WorkflowExecutionContextForWorkflowBlueprintFactory(IServiceProvider serviceProvider, IWorkflowFactory workflowFactory) { - this.serviceProvider = serviceProvider ?? throw new ArgumentNullException(nameof(serviceProvider)); - this.workflowFactory = workflowFactory ?? throw new ArgumentNullException(nameof(workflowFactory)); + _serviceProvider = serviceProvider ?? throw new ArgumentNullException(nameof(serviceProvider)); + _workflowFactory = workflowFactory ?? throw new ArgumentNullException(nameof(workflowFactory)); } /// @@ -27,8 +27,8 @@ namespace Elsa.Services /// A task for a workflow execution context public async Task CreateWorkflowExecutionContextAsync(IWorkflowBlueprint workflowBlueprint, CancellationToken cancellationToken = default) { - var workflowInstance = await workflowFactory.InstantiateAsync(workflowBlueprint, cancellationToken: cancellationToken); - return new WorkflowExecutionContext(serviceProvider, workflowBlueprint, workflowInstance); + var workflowInstance = await _workflowFactory.InstantiateAsync(workflowBlueprint, cancellationToken: cancellationToken); + return new WorkflowExecutionContext(_serviceProvider, workflowBlueprint, workflowInstance); } } } \ No newline at end of file diff --git a/src/core/Elsa.Core/Triggers/TriggersForActivityBlueprintAndWorkflowProvider.cs b/src/core/Elsa.Core/Triggers/TriggersForActivityBlueprintAndWorkflowProvider.cs index 6769d3136..d5c4307f9 100644 --- a/src/core/Elsa.Core/Triggers/TriggersForActivityBlueprintAndWorkflowProvider.cs +++ b/src/core/Elsa.Core/Triggers/TriggersForActivityBlueprintAndWorkflowProvider.cs @@ -18,9 +18,10 @@ namespace Elsa.Triggers readonly IEnumerable bookmarkProviders; readonly ICreatesActivityExecutionContextForActivityBlueprint activityExecutionContextFactory; - public TriggersForActivityBlueprintAndWorkflowProvider(IBookmarkHasher bookmarkHasher, - IEnumerable bookmarkProviders, - ICreatesActivityExecutionContextForActivityBlueprint activityExecutionContextFactory) + public TriggersForActivityBlueprintAndWorkflowProvider( + IBookmarkHasher bookmarkHasher, + IEnumerable bookmarkProviders, + ICreatesActivityExecutionContextForActivityBlueprint activityExecutionContextFactory) { this.bookmarkHasher = bookmarkHasher ?? throw new System.ArgumentNullException(nameof(bookmarkHasher)); this.bookmarkProviders = bookmarkProviders ?? throw new System.ArgumentNullException(nameof(bookmarkProviders)); @@ -35,10 +36,11 @@ namespace Elsa.Triggers /// A dictionary of all of the activity types (by name) /// An optional cancellation token /// A task exposing a collection of workflow triggers for the activity and workflow. - public async Task> GetTriggersForActivityBlueprintAsync(IActivityBlueprint activityBlueprint, - WorkflowExecutionContext workflowExecutionContext, - IDictionary activityTypes, - CancellationToken cancellationToken = default) + public async Task> GetTriggersForActivityBlueprintAsync( + IActivityBlueprint activityBlueprint, + WorkflowExecutionContext workflowExecutionContext, + IDictionary activityTypes, + CancellationToken cancellationToken = default) { var bookmarkProviderContext = GetBookmarkProviderContext(activityBlueprint, workflowExecutionContext, cancellationToken, activityTypes); var supportedBookmarkProviders = await GetSupportedBookmarkProvidersForContextAsync(bookmarkProviderContext) @@ -46,23 +48,26 @@ namespace Elsa.Triggers var tasksOfListsOfTriggers = supportedBookmarkProviders .Select(bookmarkProvider => GetTriggersForBookmarkProvider(bookmarkProvider, - bookmarkProviderContext, - activityBlueprint, - workflowExecutionContext.WorkflowBlueprint, - cancellationToken)); + bookmarkProviderContext, + activityBlueprint, + workflowExecutionContext.WorkflowBlueprint, + cancellationToken)); return (await Task.WhenAll(tasksOfListsOfTriggers)) .SelectMany(x => x) .ToList(); } - BookmarkProviderContext GetBookmarkProviderContext(IActivityBlueprint activity, - WorkflowExecutionContext workflowExecutionContext, - CancellationToken cancellationToken, - IDictionary activityTypes) + private BookmarkProviderContext GetBookmarkProviderContext( + IActivityBlueprint activity, + WorkflowExecutionContext workflowExecutionContext, + CancellationToken cancellationToken, + IDictionary activityTypes) { - var activityExecutionContext = activityExecutionContextFactory.CreateActivityExecutionContext(activity, - workflowExecutionContext, - cancellationToken); + var activityExecutionContext = activityExecutionContextFactory.CreateActivityExecutionContext( + activity, + workflowExecutionContext, + cancellationToken); + var activityType = activityTypes[activity.Type]; return new BookmarkProviderContext(activityExecutionContext, activityType, BookmarkIndexingMode.WorkflowBlueprint); } @@ -74,11 +79,12 @@ namespace Elsa.Triggers yield return provider; } - async Task> GetTriggersForBookmarkProvider(IBookmarkProvider provider, - BookmarkProviderContext context, - IActivityBlueprint activityBlueprint, - IWorkflowBlueprint workflowBlueprint, - CancellationToken cancellationToken = default) + async Task> GetTriggersForBookmarkProvider( + IBookmarkProvider provider, + BookmarkProviderContext context, + IActivityBlueprint activityBlueprint, + IWorkflowBlueprint workflowBlueprint, + CancellationToken cancellationToken = default) { var bookmarks = (await provider.GetBookmarksAsync(context, cancellationToken)).ToList(); return bookmarks diff --git a/src/core/Elsa.Core/Triggers/TriggersForBlueprintsProvider.cs b/src/core/Elsa.Core/Triggers/TriggersForBlueprintsProvider.cs index 0b57b66c3..028b52dcf 100644 --- a/src/core/Elsa.Core/Triggers/TriggersForBlueprintsProvider.cs +++ b/src/core/Elsa.Core/Triggers/TriggersForBlueprintsProvider.cs @@ -15,20 +15,21 @@ namespace Elsa.Triggers /// public class TriggersForBlueprintsProvider : IGetsTriggersForWorkflowBlueprints { - readonly IActivityTypeService activityTypeService; - readonly ICreatesWorkflowExecutionContextForWorkflowBlueprint workflowExecutionContextFactory; - readonly IGetsTriggersForActivityBlueprintAndWorkflow triggerProvider; - readonly IGetsStartActivitiesForCompositeActivityBlueprint startingActivitiesProvider; + readonly IActivityTypeService _activityTypeService; + readonly ICreatesWorkflowExecutionContextForWorkflowBlueprint _workflowExecutionContextFactory; + readonly IGetsTriggersForActivityBlueprintAndWorkflow _triggerProvider; + readonly IGetsStartActivitiesForCompositeActivityBlueprint _startingActivitiesProvider; - public TriggersForBlueprintsProvider(IActivityTypeService activityTypeService, - ICreatesWorkflowExecutionContextForWorkflowBlueprint workflowExecutionContextFactory, - IGetsTriggersForActivityBlueprintAndWorkflow triggerProvider, - IGetsStartActivitiesForCompositeActivityBlueprint startingActivitiesProvider) + public TriggersForBlueprintsProvider( + IActivityTypeService activityTypeService, + ICreatesWorkflowExecutionContextForWorkflowBlueprint workflowExecutionContextFactory, + IGetsTriggersForActivityBlueprintAndWorkflow triggerProvider, + IGetsStartActivitiesForCompositeActivityBlueprint startingActivitiesProvider) { - this.activityTypeService = activityTypeService ?? throw new ArgumentNullException(nameof(activityTypeService)); - this.workflowExecutionContextFactory = workflowExecutionContextFactory ?? throw new ArgumentNullException(nameof(workflowExecutionContextFactory)); - this.triggerProvider = triggerProvider ?? throw new ArgumentNullException(nameof(triggerProvider)); - this.startingActivitiesProvider = startingActivitiesProvider ?? throw new ArgumentNullException(nameof(startingActivitiesProvider)); + _activityTypeService = activityTypeService ?? throw new ArgumentNullException(nameof(activityTypeService)); + _workflowExecutionContextFactory = workflowExecutionContextFactory ?? throw new ArgumentNullException(nameof(workflowExecutionContextFactory)); + _triggerProvider = triggerProvider ?? throw new ArgumentNullException(nameof(triggerProvider)); + _startingActivitiesProvider = startingActivitiesProvider ?? throw new ArgumentNullException(nameof(startingActivitiesProvider)); } /// @@ -37,31 +38,32 @@ namespace Elsa.Triggers /// The workflow blueprints for which to get triggers. /// An optional cancellation token. /// A task which exposes an enumerable collection of workflow triggers. - public async Task> GetTriggersAsync(IEnumerable workflowBlueprints, - CancellationToken cancellationToken = default) + public async Task> GetTriggersAsync( + IEnumerable workflowBlueprints, + CancellationToken cancellationToken = default) { - var activityTypes = (await activityTypeService.GetActivityTypesAsync(cancellationToken)) - .ToDictionary(x => x.TypeName); + var activityTypes = (await _activityTypeService.GetActivityTypesAsync(cancellationToken)).ToDictionary(x => x.TypeName); + var tasksOfListsOfTriggers = workflowBlueprints.Select(workflowBlueprint => GetWorkflowTriggersForWorkflowBlueprintAsync(workflowBlueprint, activityTypes, cancellationToken)); - var tasksOfListsOfTriggers = workflowBlueprints - .Select(workflowBlueprint => GetWorkflowTriggersForWorkflowBlueprintAsync(workflowBlueprint, activityTypes, cancellationToken)); - return (await Task.WhenAll(tasksOfListsOfTriggers)) .SelectMany(x => x) .ToList(); } - async Task> GetWorkflowTriggersForWorkflowBlueprintAsync(IWorkflowBlueprint workflowBlueprint, - IDictionary activityTypes, - CancellationToken cancellationToken) + private async Task> GetWorkflowTriggersForWorkflowBlueprintAsync( + IWorkflowBlueprint workflowBlueprint, + IDictionary activityTypes, + CancellationToken cancellationToken) { - var startingActivityBlueprints = startingActivitiesProvider.GetStartActivities(workflowBlueprint); - var workflowExecutionContext = await workflowExecutionContextFactory.CreateWorkflowExecutionContextAsync(workflowBlueprint, cancellationToken); + var startingActivityBlueprints = _startingActivitiesProvider.GetStartActivities(workflowBlueprint); + var workflowExecutionContext = await _workflowExecutionContextFactory.CreateWorkflowExecutionContextAsync(workflowBlueprint, cancellationToken); + var tasksOfCollectionsOfTriggers = startingActivityBlueprints - .Select(async activityBlueprint => await triggerProvider.GetTriggersForActivityBlueprintAsync(activityBlueprint, - workflowExecutionContext, - activityTypes, - cancellationToken)); + .Select(async activityBlueprint => await _triggerProvider.GetTriggersForActivityBlueprintAsync(activityBlueprint, + workflowExecutionContext, + activityTypes, + cancellationToken)); + return (await Task.WhenAll(tasksOfCollectionsOfTriggers)) .SelectMany(x => x) .ToList();