From bf1d54d1e63aa8e75e40fd92d0e8642e42e90fa0 Mon Sep 17 00:00:00 2001 From: Sipke Schoorstra Date: Wed, 2 Dec 2020 22:28:36 +0100 Subject: [PATCH] Remove noisy CancellationToken parameters The CancellationToken is now available as part of the ActivityExecutionContext --- .../SendAzureServiceBusMessage.cs | 5 ++--- .../Activities/ReadLine/ReadLine.cs | 5 +---- .../Activities/WriteLine/WriteLine.cs | 3 +-- .../Activities/SaveToDropbox.cs | 5 ++--- .../Activities/SendEmail/SendEmail.cs | 5 ++--- .../HttpRequestReceived/HttpRequestReceived.cs | 6 +++--- .../Activities/SendHttpRequest/SendHttpRequest.cs | 6 ++---- .../WriteHttpResponse/WriteHttpResponse.cs | 7 ++----- .../CancelScheduledMassTransitMessage.cs | 3 +-- .../PublishMassTransitMessage.cs | 5 ++--- .../ScheduleSendMassTransitMessage.cs | 7 ++----- .../SendMassTransitMessage.cs | 6 ++---- .../Activities/PublishRebusMessage.cs | 3 +-- .../Activities/SendRebusMessage.cs | 3 +-- .../Activities/CronEvent/CronEvent.cs | 4 ++-- .../Activities/StartAt/StartAt.cs | 4 ++-- .../Activities/TimerEvent/TimerEvent.cs | 4 ++-- .../ActivityProviders/ActivityType.cs | 1 - .../Elsa.Abstractions/Builders/IActivityBuilder.cs | 3 --- src/core/Elsa.Abstractions/Services/Activity.cs | 13 ++++++------- src/core/Elsa.Abstractions/Services/IActivity.cs | 7 +++---- .../Services/Models/ActivityExecutionContext.cs | 3 +-- .../Services/Models/WorkflowExecutionContext.cs | 1 - src/core/Elsa.Core/Activities/Primitives/Inline.cs | 3 +-- .../Signaling/TriggerSignal/SendSignal.cs | 5 ++--- .../Workflows/RunWorkflow/Activities/RunWorkflow.cs | 3 ++- .../TypeBasedActivityProvider.cs | 7 +++---- src/core/Elsa.Core/Builders/ActivityBuilder.cs | 3 --- .../Extensions/ElsaServiceCollectionExtensions.cs | 2 -- .../Services/WorkflowBlueprintMaterializer.cs | 3 --- .../Services/WorkflowBlueprintReflector.cs | 3 +-- .../aspnet/Elsa.Samples.HelloWorldHttp/Startup.cs | 1 - .../Extensions/ServiceCollectionExtensions.cs | 1 - 33 files changed, 49 insertions(+), 91 deletions(-) diff --git a/src/activities/Elsa.Activities.AzureServiceBus/Activities/SendAzureServiceBusMessage/SendAzureServiceBusMessage.cs b/src/activities/Elsa.Activities.AzureServiceBus/Activities/SendAzureServiceBusMessage/SendAzureServiceBusMessage.cs index a1f5e8e22..d84122746 100644 --- a/src/activities/Elsa.Activities.AzureServiceBus/Activities/SendAzureServiceBusMessage/SendAzureServiceBusMessage.cs +++ b/src/activities/Elsa.Activities.AzureServiceBus/Activities/SendAzureServiceBusMessage/SendAzureServiceBusMessage.cs @@ -1,5 +1,4 @@ using System.Text; -using System.Threading; using System.Threading.Tasks; using Elsa.Activities.AzureServiceBus.Services; using Elsa.ActivityResults; @@ -26,9 +25,9 @@ namespace Elsa.Activities.AzureServiceBus [ActivityProperty] public string QueueName { get; set; } = default!; [ActivityProperty] public object Message { get; set; } = default!; - protected override async ValueTask OnExecuteAsync(ActivityExecutionContext context, CancellationToken cancellationToken) + protected override async ValueTask OnExecuteAsync(ActivityExecutionContext context) { - var sender = await _messageSenderFactory.GetSenderAsync(QueueName, cancellationToken); + var sender = await _messageSenderFactory.GetSenderAsync(QueueName, context.CancellationToken); var json = _serializer.Serialize(Message); var bytes = Encoding.UTF8.GetBytes(json); var message = new Message(bytes); diff --git a/src/activities/Elsa.Activities.Console/Activities/ReadLine/ReadLine.cs b/src/activities/Elsa.Activities.Console/Activities/ReadLine/ReadLine.cs index d60331d56..2ea241c74 100644 --- a/src/activities/Elsa.Activities.Console/Activities/ReadLine/ReadLine.cs +++ b/src/activities/Elsa.Activities.Console/Activities/ReadLine/ReadLine.cs @@ -1,5 +1,4 @@ using System.IO; -using System.Threading; using System.Threading.Tasks; using Elsa.ActivityResults; using Elsa.Attributes; @@ -30,9 +29,7 @@ namespace Elsa.Activities.Console _input = input; } - protected override async ValueTask OnExecuteAsync( - ActivityExecutionContext context, - CancellationToken cancellationToken) + protected override async ValueTask OnExecuteAsync(ActivityExecutionContext context) { if (_input == null) return Suspend(); diff --git a/src/activities/Elsa.Activities.Console/Activities/WriteLine/WriteLine.cs b/src/activities/Elsa.Activities.Console/Activities/WriteLine/WriteLine.cs index 2cc10fa93..06c01fca6 100644 --- a/src/activities/Elsa.Activities.Console/Activities/WriteLine/WriteLine.cs +++ b/src/activities/Elsa.Activities.Console/Activities/WriteLine/WriteLine.cs @@ -1,5 +1,4 @@ using System.IO; -using System.Threading; using System.Threading.Tasks; using Elsa.ActivityResults; using Elsa.Attributes; @@ -33,7 +32,7 @@ namespace Elsa.Activities.Console private readonly TextWriter _output; - protected override async ValueTask OnExecuteAsync(ActivityExecutionContext context, CancellationToken cancellationToken) + protected override async ValueTask OnExecuteAsync(ActivityExecutionContext context) { await _output.WriteLineAsync(Text); return Done(); diff --git a/src/activities/Elsa.Activities.Dropbox/Activities/SaveToDropbox.cs b/src/activities/Elsa.Activities.Dropbox/Activities/SaveToDropbox.cs index 9077027d1..0b209304c 100644 --- a/src/activities/Elsa.Activities.Dropbox/Activities/SaveToDropbox.cs +++ b/src/activities/Elsa.Activities.Dropbox/Activities/SaveToDropbox.cs @@ -1,4 +1,3 @@ -using System.Threading; using System.Threading.Tasks; using Elsa.Activities.Dropbox.Models; using Elsa.Activities.Dropbox.Services; @@ -29,7 +28,7 @@ namespace Elsa.Activities.Dropbox.Activities [ActivityProperty(Hint = "An expression evaluating to the path to which the file should be saved.")] public string Path { get; set; } = default!; - protected override async ValueTask OnExecuteAsync(ActivityExecutionContext context, CancellationToken cancellationToken) + protected override async ValueTask OnExecuteAsync(ActivityExecutionContext context) { await _filesApi.UploadAsync( new UploadRequest @@ -41,7 +40,7 @@ namespace Elsa.Activities.Dropbox.Activities Path = Path, }, FileData, - cancellationToken + context.CancellationToken ); return Done(); diff --git a/src/activities/Elsa.Activities.Email/Activities/SendEmail/SendEmail.cs b/src/activities/Elsa.Activities.Email/Activities/SendEmail/SendEmail.cs index ab39e5c27..69f9f1a9a 100644 --- a/src/activities/Elsa.Activities.Email/Activities/SendEmail/SendEmail.cs +++ b/src/activities/Elsa.Activities.Email/Activities/SendEmail/SendEmail.cs @@ -1,4 +1,3 @@ -using System.Threading; using System.Threading.Tasks; using Elsa.Activities.Email.Services; using Elsa.ActivityResults; @@ -34,7 +33,7 @@ namespace Elsa.Activities.Email [WorkflowExpressionOptions(Multiline = true)] public string Body { get; set; } - protected override async ValueTask OnExecuteAsync(ActivityExecutionContext context, CancellationToken cancellationToken) + protected override async ValueTask OnExecuteAsync(ActivityExecutionContext context) { var message = new MimeMessage(); @@ -47,7 +46,7 @@ namespace Elsa.Activities.Email }; message.To.Add(MailboxAddress.Parse(To)); - await _smtpService.SendAsync(message, cancellationToken); + await _smtpService.SendAsync(message, context.CancellationToken); return Done(); } diff --git a/src/activities/Elsa.Activities.Http/Activities/HttpRequestReceived/HttpRequestReceived.cs b/src/activities/Elsa.Activities.Http/Activities/HttpRequestReceived/HttpRequestReceived.cs index 12b25e56b..aa1d5d742 100644 --- a/src/activities/Elsa.Activities.Http/Activities/HttpRequestReceived/HttpRequestReceived.cs +++ b/src/activities/Elsa.Activities.Http/Activities/HttpRequestReceived/HttpRequestReceived.cs @@ -61,10 +61,10 @@ namespace Elsa.Activities.Http [ActivityProperty] public Type? TargetType { get; set; } - protected override async ValueTask OnExecuteAsync(ActivityExecutionContext context, CancellationToken cancellationToken) => - context.WorkflowExecutionContext.IsFirstPass ? await ExecuteInternalAsync(cancellationToken) : Suspend(); + protected override async ValueTask OnExecuteAsync(ActivityExecutionContext context) => + context.WorkflowExecutionContext.IsFirstPass ? await ExecuteInternalAsync(context.CancellationToken) : Suspend(); - protected override ValueTask OnResumeAsync(ActivityExecutionContext context, CancellationToken cancellationToken) => ExecuteInternalAsync(cancellationToken); + protected override ValueTask OnResumeAsync(ActivityExecutionContext context) => ExecuteInternalAsync(context.CancellationToken); private async ValueTask ExecuteInternalAsync(CancellationToken cancellationToken) { diff --git a/src/activities/Elsa.Activities.Http/Activities/SendHttpRequest/SendHttpRequest.cs b/src/activities/Elsa.Activities.Http/Activities/SendHttpRequest/SendHttpRequest.cs index 31f0ad22d..0e62b3f1d 100644 --- a/src/activities/Elsa.Activities.Http/Activities/SendHttpRequest/SendHttpRequest.cs +++ b/src/activities/Elsa.Activities.Http/Activities/SendHttpRequest/SendHttpRequest.cs @@ -4,7 +4,6 @@ using System.Linq; using System.Net.Http; using System.Net.Http.Headers; using System.Text; -using System.Threading; using System.Threading.Tasks; using Elsa.Activities.Http.Models; using Elsa.Activities.Http.Services; @@ -93,11 +92,10 @@ namespace Elsa.Activities.Http )] public ICollection SupportedStatusCodes { get; set; } = new HashSet(new[] { 200 }); - protected override async ValueTask OnExecuteAsync( - ActivityExecutionContext context, - CancellationToken cancellationToken) + protected override async ValueTask OnExecuteAsync(ActivityExecutionContext context) { var request = CreateRequest(); + var cancellationToken = context.CancellationToken; var response = await _httpClient.SendAsync(request, cancellationToken); var hasContent = response.Content != null; var contentType = response.Content?.Headers.ContentType.MediaType; diff --git a/src/activities/Elsa.Activities.Http/Activities/WriteHttpResponse/WriteHttpResponse.cs b/src/activities/Elsa.Activities.Http/Activities/WriteHttpResponse/WriteHttpResponse.cs index baff9e5cc..c7017d68f 100644 --- a/src/activities/Elsa.Activities.Http/Activities/WriteHttpResponse/WriteHttpResponse.cs +++ b/src/activities/Elsa.Activities.Http/Activities/WriteHttpResponse/WriteHttpResponse.cs @@ -1,5 +1,4 @@ using System.Net; -using System.Threading; using System.Threading.Tasks; using Elsa.Activities.Http.Models; using Elsa.ActivityResults; @@ -63,9 +62,7 @@ namespace Elsa.Activities.Http [ActivityProperty(Hint = "The headers to send along with the response.")] public HttpResponseHeaders? ResponseHeaders { get; set; } - protected override async ValueTask OnExecuteAsync( - ActivityExecutionContext context, - CancellationToken cancellationToken) + protected override async ValueTask OnExecuteAsync(ActivityExecutionContext context) { var response = _httpContextAccessor.HttpContext.Response; @@ -86,7 +83,7 @@ namespace Elsa.Activities.Http var bodyText = Content; if (!string.IsNullOrWhiteSpace(bodyText)) - await response.WriteAsync(bodyText, cancellationToken); + await response.WriteAsync(bodyText, context.CancellationToken); return Done(); } diff --git a/src/activities/Elsa.Activities.MassTransit/Activities/CancelScheduledMassTransitMessage/CancelScheduledMassTransitMessage.cs b/src/activities/Elsa.Activities.MassTransit/Activities/CancelScheduledMassTransitMessage/CancelScheduledMassTransitMessage.cs index e2a5d99a4..685a97f0a 100644 --- a/src/activities/Elsa.Activities.MassTransit/Activities/CancelScheduledMassTransitMessage/CancelScheduledMassTransitMessage.cs +++ b/src/activities/Elsa.Activities.MassTransit/Activities/CancelScheduledMassTransitMessage/CancelScheduledMassTransitMessage.cs @@ -1,4 +1,3 @@ -using System.Threading; using System.Threading.Tasks; using Elsa.Activities.MassTransit.Options; using Elsa.ActivityResults; @@ -30,7 +29,7 @@ namespace Elsa.Activities.MassTransit protected override bool OnCanExecute(ActivityExecutionContext context) => TokenId != null && _options.SchedulerAddress != null; - protected override async ValueTask OnExecuteAsync(ActivityExecutionContext activityExecutionContext, CancellationToken cancellationToken) + protected override async ValueTask OnExecuteAsync(ActivityExecutionContext activityExecutionContext) { var endpoint = await SendEndpointProvider.GetSendEndpoint(_options.SchedulerAddress); await endpoint.CancelScheduledRecurringSend(TokenId!, ""); diff --git a/src/activities/Elsa.Activities.MassTransit/Activities/PublishMassTransitMessage/PublishMassTransitMessage.cs b/src/activities/Elsa.Activities.MassTransit/Activities/PublishMassTransitMessage/PublishMassTransitMessage.cs index aed4284f6..d40d1fa71 100644 --- a/src/activities/Elsa.Activities.MassTransit/Activities/PublishMassTransitMessage/PublishMassTransitMessage.cs +++ b/src/activities/Elsa.Activities.MassTransit/Activities/PublishMassTransitMessage/PublishMassTransitMessage.cs @@ -1,4 +1,3 @@ -using System.Threading; using System.Threading.Tasks; using Elsa.ActivityResults; using Elsa.Attributes; @@ -24,9 +23,9 @@ namespace Elsa.Activities.MassTransit protected override bool OnCanExecute(ActivityExecutionContext context) => Message != null; - protected override async ValueTask OnExecuteAsync(ActivityExecutionContext context, CancellationToken cancellationToken) + protected override async ValueTask OnExecuteAsync(ActivityExecutionContext context) { - await PublishEndpoint.Publish(Message!, cancellationToken); + await PublishEndpoint.Publish(Message!, context.CancellationToken); return Done(); } diff --git a/src/activities/Elsa.Activities.MassTransit/Activities/ScheduleSendMassTransitMessage/ScheduleSendMassTransitMessage.cs b/src/activities/Elsa.Activities.MassTransit/Activities/ScheduleSendMassTransitMessage/ScheduleSendMassTransitMessage.cs index 042b1871a..4ac93d2ea 100644 --- a/src/activities/Elsa.Activities.MassTransit/Activities/ScheduleSendMassTransitMessage/ScheduleSendMassTransitMessage.cs +++ b/src/activities/Elsa.Activities.MassTransit/Activities/ScheduleSendMassTransitMessage/ScheduleSendMassTransitMessage.cs @@ -1,5 +1,4 @@ using System; -using System.Threading; using System.Threading.Tasks; using Elsa.Activities.MassTransit.Activities.ScheduleSendMassTransitMessage; using Elsa.Activities.MassTransit.Options; @@ -43,16 +42,14 @@ namespace Elsa.Activities.MassTransit protected override bool OnCanExecute(ActivityExecutionContext context) => Message != null && _options.SchedulerAddress != null; - protected override async ValueTask OnExecuteAsync( - ActivityExecutionContext context, - CancellationToken cancellationToken) + protected override async ValueTask OnExecuteAsync(ActivityExecutionContext context) { var endpoint = await SendEndpointProvider.GetSendEndpoint(_options.SchedulerAddress); var scheduledMessage = await endpoint.ScheduleRecurringSend( EndpointAddress, new InstantRecurringSchedule(ScheduledTime), Message, - cancellationToken); + context.CancellationToken); return Done(scheduledMessage); } diff --git a/src/activities/Elsa.Activities.MassTransit/Activities/SendMassTransitMessage/SendMassTransitMessage.cs b/src/activities/Elsa.Activities.MassTransit/Activities/SendMassTransitMessage/SendMassTransitMessage.cs index f376f2631..186860647 100644 --- a/src/activities/Elsa.Activities.MassTransit/Activities/SendMassTransitMessage/SendMassTransitMessage.cs +++ b/src/activities/Elsa.Activities.MassTransit/Activities/SendMassTransitMessage/SendMassTransitMessage.cs @@ -1,5 +1,4 @@ using System; -using System.Threading; using System.Threading.Tasks; using Elsa.ActivityResults; using Elsa.Attributes; @@ -31,11 +30,10 @@ namespace Elsa.Activities.MassTransit return Message != null; } - protected override async ValueTask OnExecuteAsync( - ActivityExecutionContext context, - CancellationToken cancellationToken) + protected override async ValueTask OnExecuteAsync(ActivityExecutionContext context) { var message = Message; + var cancellationToken = context.CancellationToken; if (EndpointAddress != null) { diff --git a/src/activities/Elsa.Activities.Rebus/Activities/PublishRebusMessage.cs b/src/activities/Elsa.Activities.Rebus/Activities/PublishRebusMessage.cs index aebaa83f3..38109a498 100644 --- a/src/activities/Elsa.Activities.Rebus/Activities/PublishRebusMessage.cs +++ b/src/activities/Elsa.Activities.Rebus/Activities/PublishRebusMessage.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using System.Threading; using System.Threading.Tasks; using Elsa.ActivityResults; using Elsa.Attributes; @@ -24,7 +23,7 @@ namespace Elsa.Activities.Rebus [ActivityProperty(Hint = "Optional headers to send along with the message.")] public IDictionary? Headers { get; set; } - protected override async ValueTask OnExecuteAsync(ActivityExecutionContext context, CancellationToken cancellationToken) + protected override async ValueTask OnExecuteAsync(ActivityExecutionContext context) { await _eventPublisher.PublishAsync(Message, Headers); return Done(); diff --git a/src/activities/Elsa.Activities.Rebus/Activities/SendRebusMessage.cs b/src/activities/Elsa.Activities.Rebus/Activities/SendRebusMessage.cs index d91cd3c9e..34123160a 100644 --- a/src/activities/Elsa.Activities.Rebus/Activities/SendRebusMessage.cs +++ b/src/activities/Elsa.Activities.Rebus/Activities/SendRebusMessage.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using System.Threading; using System.Threading.Tasks; using Elsa.ActivityResults; using Elsa.Attributes; @@ -24,7 +23,7 @@ namespace Elsa.Activities.Rebus [ActivityProperty(Hint = "Optional headers to send along with the message.")] public IDictionary? Headers { get; set; } - protected override async ValueTask OnExecuteAsync(ActivityExecutionContext context, CancellationToken cancellationToken) + protected override async ValueTask OnExecuteAsync(ActivityExecutionContext context) { await _bus.SendAsync(Message, Headers); return Done(); diff --git a/src/activities/Elsa.Activities.Timers/Activities/CronEvent/CronEvent.cs b/src/activities/Elsa.Activities.Timers/Activities/CronEvent/CronEvent.cs index 99ccea757..ff7578ade 100644 --- a/src/activities/Elsa.Activities.Timers/Activities/CronEvent/CronEvent.cs +++ b/src/activities/Elsa.Activities.Timers/Activities/CronEvent/CronEvent.cs @@ -1,4 +1,3 @@ -using System.Threading; using System.Threading.Tasks; using Elsa.Activities.Timers.Services; using Elsa.ActivityResults; @@ -37,11 +36,12 @@ namespace Elsa.Activities.Timers set => SetState(value); } - protected override async ValueTask OnExecuteAsync(ActivityExecutionContext context, CancellationToken cancellationToken) + protected override async ValueTask OnExecuteAsync(ActivityExecutionContext context) { if (context.WorkflowExecutionContext.IsFirstPass) return Done(); + var cancellationToken = context.CancellationToken; var workflowBlueprint = context.WorkflowExecutionContext.WorkflowBlueprint; var workflowInstance = context.WorkflowExecutionContext.WorkflowInstance; var executeAt = GetNextOccurrence(CronExpression); diff --git a/src/activities/Elsa.Activities.Timers/Activities/StartAt/StartAt.cs b/src/activities/Elsa.Activities.Timers/Activities/StartAt/StartAt.cs index 5751bd8c8..138cd1a9d 100644 --- a/src/activities/Elsa.Activities.Timers/Activities/StartAt/StartAt.cs +++ b/src/activities/Elsa.Activities.Timers/Activities/StartAt/StartAt.cs @@ -1,4 +1,3 @@ -using System.Threading; using System.Threading.Tasks; using Elsa.Activities.Timers.Services; using Elsa.ActivityResults; @@ -37,11 +36,12 @@ namespace Elsa.Activities.Timers set => SetState(value); } - protected override async ValueTask OnExecuteAsync(ActivityExecutionContext context, CancellationToken cancellationToken) + protected override async ValueTask OnExecuteAsync(ActivityExecutionContext context) { if (context.WorkflowExecutionContext.IsFirstPass) return Done(); + var cancellationToken = context.CancellationToken; var workflowBlueprint = context.WorkflowExecutionContext.WorkflowBlueprint; var workflowInstance = context.WorkflowExecutionContext.WorkflowInstance; var executeAt = Instant; diff --git a/src/activities/Elsa.Activities.Timers/Activities/TimerEvent/TimerEvent.cs b/src/activities/Elsa.Activities.Timers/Activities/TimerEvent/TimerEvent.cs index e19d79478..c2f2bbc7c 100644 --- a/src/activities/Elsa.Activities.Timers/Activities/TimerEvent/TimerEvent.cs +++ b/src/activities/Elsa.Activities.Timers/Activities/TimerEvent/TimerEvent.cs @@ -1,4 +1,3 @@ -using System.Threading; using System.Threading.Tasks; using Elsa.Activities.Timers.Services; using Elsa.ActivityResults; @@ -33,11 +32,12 @@ namespace Elsa.Activities.Timers set => SetState(value); } - protected override async ValueTask OnExecuteAsync(ActivityExecutionContext context, CancellationToken cancellationToken) + protected override async ValueTask OnExecuteAsync(ActivityExecutionContext context) { if (context.WorkflowExecutionContext.IsFirstPass) return Done(); + var cancellationToken = context.CancellationToken; var workflowBlueprint = context.WorkflowExecutionContext.WorkflowBlueprint; var workflowInstance = context.WorkflowExecutionContext.WorkflowInstance; var executeAt = _clock.GetCurrentInstant().Plus(Timeout); diff --git a/src/core/Elsa.Abstractions/ActivityProviders/ActivityType.cs b/src/core/Elsa.Abstractions/ActivityProviders/ActivityType.cs index 3761df5af..1f2463d27 100644 --- a/src/core/Elsa.Abstractions/ActivityProviders/ActivityType.cs +++ b/src/core/Elsa.Abstractions/ActivityProviders/ActivityType.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Threading.Tasks; using Elsa.ActivityResults; using Elsa.Services.Models; -using Newtonsoft.Json.Linq; namespace Elsa.ActivityProviders { diff --git a/src/core/Elsa.Abstractions/Builders/IActivityBuilder.cs b/src/core/Elsa.Abstractions/Builders/IActivityBuilder.cs index c18fdda21..a51d2c740 100644 --- a/src/core/Elsa.Abstractions/Builders/IActivityBuilder.cs +++ b/src/core/Elsa.Abstractions/Builders/IActivityBuilder.cs @@ -1,9 +1,6 @@ using System; using System.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; using Elsa.Services; -using Elsa.Services.Models; namespace Elsa.Builders { diff --git a/src/core/Elsa.Abstractions/Services/Activity.cs b/src/core/Elsa.Abstractions/Services/Activity.cs index 5d78b4123..2ad4d5c00 100644 --- a/src/core/Elsa.Abstractions/Services/Activity.cs +++ b/src/core/Elsa.Abstractions/Services/Activity.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Runtime.CompilerServices; -using System.Threading; using System.Threading.Tasks; using Elsa.ActivityResults; using Elsa.Models; @@ -22,12 +21,12 @@ namespace Elsa.Services public bool LoadWorkflowContext { get; set; } public bool SaveWorkflowContext { get; set; } public JObject Data { get; set; } = new(); - public ValueTask CanExecuteAsync(ActivityExecutionContext context, CancellationToken cancellationToken) => OnCanExecuteAsync(context, cancellationToken); - public ValueTask ExecuteAsync(ActivityExecutionContext context, CancellationToken cancellationToken) => OnExecuteAsync(context, cancellationToken); - public ValueTask ResumeAsync(ActivityExecutionContext context, CancellationToken cancellationToken) => OnResumeAsync(context, cancellationToken); - protected virtual ValueTask OnCanExecuteAsync(ActivityExecutionContext context, CancellationToken cancellationToken) => new(OnCanExecute(context)); - protected virtual ValueTask OnExecuteAsync(ActivityExecutionContext context, CancellationToken cancellationToken) => new(OnExecute(context)); - protected virtual ValueTask OnResumeAsync(ActivityExecutionContext context, CancellationToken cancellationToken) => new(OnResume(context)); + public ValueTask CanExecuteAsync(ActivityExecutionContext context) => OnCanExecuteAsync(context); + public ValueTask ExecuteAsync(ActivityExecutionContext context) => OnExecuteAsync(context); + public ValueTask ResumeAsync(ActivityExecutionContext context) => OnResumeAsync(context); + protected virtual ValueTask OnCanExecuteAsync(ActivityExecutionContext context) => new(OnCanExecute(context)); + protected virtual ValueTask OnExecuteAsync(ActivityExecutionContext context) => new(OnExecute(context)); + protected virtual ValueTask OnResumeAsync(ActivityExecutionContext context) => new(OnResume(context)); protected virtual bool OnCanExecute(ActivityExecutionContext context) => true; protected virtual IActivityExecutionResult OnExecute(ActivityExecutionContext context) => OnExecute(); protected virtual IActivityExecutionResult OnExecute() => Done(); diff --git a/src/core/Elsa.Abstractions/Services/IActivity.cs b/src/core/Elsa.Abstractions/Services/IActivity.cs index 6a2787c83..9e815c43c 100644 --- a/src/core/Elsa.Abstractions/Services/IActivity.cs +++ b/src/core/Elsa.Abstractions/Services/IActivity.cs @@ -1,4 +1,3 @@ -using System.Threading; using System.Threading.Tasks; using Elsa.ActivityResults; using Elsa.Services.Models; @@ -56,16 +55,16 @@ namespace Elsa.Services /// /// Returns a value of whether the specified activity can execute. /// - ValueTask CanExecuteAsync(ActivityExecutionContext context, CancellationToken cancellationToken = default); + ValueTask CanExecuteAsync(ActivityExecutionContext context); /// /// Executes the specified activity. /// - ValueTask ExecuteAsync(ActivityExecutionContext context, CancellationToken cancellationToken = default); + ValueTask ExecuteAsync(ActivityExecutionContext context); /// /// Resumes the specified activity. /// - ValueTask ResumeAsync(ActivityExecutionContext context, CancellationToken cancellationToken = default); + ValueTask ResumeAsync(ActivityExecutionContext context); } } \ No newline at end of file diff --git a/src/core/Elsa.Abstractions/Services/Models/ActivityExecutionContext.cs b/src/core/Elsa.Abstractions/Services/Models/ActivityExecutionContext.cs index 2dd480173..e014d73aa 100644 --- a/src/core/Elsa.Abstractions/Services/Models/ActivityExecutionContext.cs +++ b/src/core/Elsa.Abstractions/Services/Models/ActivityExecutionContext.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using System.Threading; using System.Threading.Tasks; diff --git a/src/core/Elsa.Abstractions/Services/Models/WorkflowExecutionContext.cs b/src/core/Elsa.Abstractions/Services/Models/WorkflowExecutionContext.cs index 8ca0c6df9..b0986b5c4 100644 --- a/src/core/Elsa.Abstractions/Services/Models/WorkflowExecutionContext.cs +++ b/src/core/Elsa.Abstractions/Services/Models/WorkflowExecutionContext.cs @@ -1,4 +1,3 @@ -using System; using System.Collections.Generic; using System.Linq; using System.Threading; diff --git a/src/core/Elsa.Core/Activities/Primitives/Inline.cs b/src/core/Elsa.Core/Activities/Primitives/Inline.cs index 5b2faf97d..6d265f96d 100644 --- a/src/core/Elsa.Core/Activities/Primitives/Inline.cs +++ b/src/core/Elsa.Core/Activities/Primitives/Inline.cs @@ -1,6 +1,5 @@ using System; using System.ComponentModel; -using System.Threading; using System.Threading.Tasks; using Elsa.ActivityResults; using Elsa.Attributes; @@ -20,6 +19,6 @@ namespace Elsa.Activities.Primitives [ActivityProperty] public Func> Function { get; set; } - protected override ValueTask OnExecuteAsync(ActivityExecutionContext context, CancellationToken cancellationToken) => Function(context); + protected override ValueTask OnExecuteAsync(ActivityExecutionContext context) => Function(context); } } \ No newline at end of file diff --git a/src/core/Elsa.Core/Activities/Signaling/TriggerSignal/SendSignal.cs b/src/core/Elsa.Core/Activities/Signaling/TriggerSignal/SendSignal.cs index 4a0bec55c..c1769cf79 100644 --- a/src/core/Elsa.Core/Activities/Signaling/TriggerSignal/SendSignal.cs +++ b/src/core/Elsa.Core/Activities/Signaling/TriggerSignal/SendSignal.cs @@ -1,4 +1,3 @@ -using System.Threading; using System.Threading.Tasks; using Elsa.Activities.Signaling.Services; using Elsa.ActivityResults; @@ -35,9 +34,9 @@ namespace Elsa.Activities.Signaling [ActivityProperty(Hint = "An expression that evaluates to an input value when triggering the signal.")] public object? Input { get; set; } - protected override async ValueTask OnExecuteAsync(ActivityExecutionContext context, CancellationToken cancellationToken) + protected override async ValueTask OnExecuteAsync(ActivityExecutionContext context) { - await _signaler.SendSignalAsync(Signal, Input, CorrelationId, cancellationToken); + await _signaler.SendSignalAsync(Signal, Input, CorrelationId, context.CancellationToken); return Done(); } } diff --git a/src/core/Elsa.Core/Activities/Workflows/RunWorkflow/Activities/RunWorkflow.cs b/src/core/Elsa.Core/Activities/Workflows/RunWorkflow/Activities/RunWorkflow.cs index 82438a713..35258b5f6 100644 --- a/src/core/Elsa.Core/Activities/Workflows/RunWorkflow/Activities/RunWorkflow.cs +++ b/src/core/Elsa.Core/Activities/Workflows/RunWorkflow/Activities/RunWorkflow.cs @@ -41,8 +41,9 @@ namespace Elsa.Activities.Workflows set => SetState(value); } - protected override async ValueTask OnExecuteAsync(ActivityExecutionContext context, CancellationToken cancellationToken) + protected override async ValueTask OnExecuteAsync(ActivityExecutionContext context) { + var cancellationToken = context.CancellationToken; var workflowBlueprint = await FindWorkflowBlueprintAsync(cancellationToken); var workflowInstance = await _workflowScheduler.RunWorkflowAsync(workflowBlueprint!, TenantId, Input, CorrelationId, ContextId, cancellationToken); ChildWorkflowInstanceId = workflowInstance.WorkflowInstanceId; diff --git a/src/core/Elsa.Core/ActivityTypeProviders/TypeBasedActivityProvider.cs b/src/core/Elsa.Core/ActivityTypeProviders/TypeBasedActivityProvider.cs index 8ce39be0f..28650e666 100644 --- a/src/core/Elsa.Core/ActivityTypeProviders/TypeBasedActivityProvider.cs +++ b/src/core/Elsa.Core/ActivityTypeProviders/TypeBasedActivityProvider.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Runtime.CompilerServices; using System.Threading; using System.Threading.Tasks; using Elsa.ActivityProviders; @@ -48,17 +47,17 @@ namespace Elsa.ActivityTypeProviders CanExecuteAsync = async context => { var instance = await ActivateActivity(context, activityType); - return await instance.CanExecuteAsync(context, context.CancellationToken); + return await instance.CanExecuteAsync(context); }, ExecuteAsync = async context => { var instance = await ActivateActivity(context, activityType); - return await instance.ExecuteAsync(context, context.CancellationToken); + return await instance.ExecuteAsync(context); }, ResumeAsync = async context => { var instance = await ActivateActivity(context, activityType); - return await instance.ResumeAsync(context, context.CancellationToken); + return await instance.ResumeAsync(context); } }; } diff --git a/src/core/Elsa.Core/Builders/ActivityBuilder.cs b/src/core/Elsa.Core/Builders/ActivityBuilder.cs index f6cd01f1f..72e6f6530 100644 --- a/src/core/Elsa.Core/Builders/ActivityBuilder.cs +++ b/src/core/Elsa.Core/Builders/ActivityBuilder.cs @@ -1,10 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Threading; -using System.Threading.Tasks; using Elsa.Services; -using Elsa.Services.Models; namespace Elsa.Builders { diff --git a/src/core/Elsa.Core/Extensions/ElsaServiceCollectionExtensions.cs b/src/core/Elsa.Core/Extensions/ElsaServiceCollectionExtensions.cs index d1c4d1cf2..f420f156e 100644 --- a/src/core/Elsa.Core/Extensions/ElsaServiceCollectionExtensions.cs +++ b/src/core/Elsa.Core/Extensions/ElsaServiceCollectionExtensions.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using Elsa; using Elsa.Activities.ControlFlow; using Elsa.Activities.Primitives; @@ -26,7 +25,6 @@ using Elsa.Triggers; using Elsa.WorkflowProviders; using MediatR; using Microsoft.Extensions.DependencyInjection.Extensions; -using Microsoft.Extensions.Hosting; using NodaTime; using Rebus.ServiceProvider; diff --git a/src/core/Elsa.Core/Services/WorkflowBlueprintMaterializer.cs b/src/core/Elsa.Core/Services/WorkflowBlueprintMaterializer.cs index eec96e1c0..3374802ee 100644 --- a/src/core/Elsa.Core/Services/WorkflowBlueprintMaterializer.cs +++ b/src/core/Elsa.Core/Services/WorkflowBlueprintMaterializer.cs @@ -1,8 +1,5 @@ using System.Collections.Generic; using System.Linq; -using System.Threading; -using System.Threading.Tasks; -using Elsa.ActivityProviders; using Elsa.Models; using Elsa.Services.Models; diff --git a/src/core/Elsa.Core/Services/WorkflowBlueprintReflector.cs b/src/core/Elsa.Core/Services/WorkflowBlueprintReflector.cs index 526a8a744..ee68308ed 100644 --- a/src/core/Elsa.Core/Services/WorkflowBlueprintReflector.cs +++ b/src/core/Elsa.Core/Services/WorkflowBlueprintReflector.cs @@ -1,5 +1,4 @@ -using System; -using System.Threading; +using System.Threading; using System.Threading.Tasks; using Elsa.Services.Models; using Microsoft.Extensions.DependencyInjection; diff --git a/src/samples/aspnet/Elsa.Samples.HelloWorldHttp/Startup.cs b/src/samples/aspnet/Elsa.Samples.HelloWorldHttp/Startup.cs index b4c080842..b0ee75523 100644 --- a/src/samples/aspnet/Elsa.Samples.HelloWorldHttp/Startup.cs +++ b/src/samples/aspnet/Elsa.Samples.HelloWorldHttp/Startup.cs @@ -1,6 +1,5 @@ using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; -using YesSql.Provider.Sqlite; namespace Elsa.Samples.HelloWorldHttp { diff --git a/src/server/Elsa.Server.Api/Extensions/ServiceCollectionExtensions.cs b/src/server/Elsa.Server.Api/Extensions/ServiceCollectionExtensions.cs index 0bb5be29f..f11131c91 100644 --- a/src/server/Elsa.Server.Api/Extensions/ServiceCollectionExtensions.cs +++ b/src/server/Elsa.Server.Api/Extensions/ServiceCollectionExtensions.cs @@ -1,5 +1,4 @@ using System; -using Elsa.Metadata; using Elsa.Models; using Elsa.Server.Api.Extensions; using Elsa.Server.Api.Swagger;