diff --git a/src/core/Elsa.Jobs/Abstractions/Job.cs b/src/core/Elsa.Jobs/Abstractions/Job.cs index f3136142b..7d52aa28f 100644 --- a/src/core/Elsa.Jobs/Abstractions/Job.cs +++ b/src/core/Elsa.Jobs/Abstractions/Job.cs @@ -1,7 +1,8 @@ using System.Threading.Tasks; +using Elsa.Jobs.Contracts; using Elsa.Jobs.Models; -namespace Elsa.Jobs.Contracts; +namespace Elsa.Jobs.Abstractions; public abstract class Job : IJob { diff --git a/src/core/Elsa.Jobs/Models/JobExecutionContext.cs b/src/core/Elsa.Jobs/Models/JobExecutionContext.cs index 5fff55acb..48dc45fba 100644 --- a/src/core/Elsa.Jobs/Models/JobExecutionContext.cs +++ b/src/core/Elsa.Jobs/Models/JobExecutionContext.cs @@ -6,14 +6,14 @@ namespace Elsa.Jobs.Models; public class JobExecutionContext { - public JobExecutionContext(IServiceProvider serviceProvider, CancellationToken cancellation) + public JobExecutionContext(IServiceProvider serviceProvider, CancellationToken cancellationToken) { ServiceProvider = serviceProvider; - Cancellation = cancellation; + CancellationToken = cancellationToken; } public IServiceProvider ServiceProvider { get; } - public CancellationToken Cancellation { get; } + public CancellationToken CancellationToken { get; } public T GetRequiredService() where T : notnull => ServiceProvider.GetRequiredService(); } \ No newline at end of file diff --git a/src/modules/Elsa.Modules.Scheduling/Jobs/ResumeWorkflowJob.cs b/src/modules/Elsa.Modules.Scheduling/Jobs/ResumeWorkflowJob.cs index 02f2d4ed4..c42f3927e 100644 --- a/src/modules/Elsa.Modules.Scheduling/Jobs/ResumeWorkflowJob.cs +++ b/src/modules/Elsa.Modules.Scheduling/Jobs/ResumeWorkflowJob.cs @@ -1,5 +1,6 @@ using System.Text.Json.Serialization; using System.Threading.Tasks; +using Elsa.Jobs.Abstractions; using Elsa.Models; using Elsa.Runtime.Contracts; using Elsa.Runtime.Models; @@ -28,6 +29,6 @@ public class ResumeWorkflowJob : Job { var request = new DispatchWorkflowInstanceRequest(WorkflowInstanceId, Bookmark); var workflowInvoker = context.GetRequiredService(); - await workflowInvoker.DispatchAsync(request, context.Cancellation); + await workflowInvoker.DispatchAsync(request, context.CancellationToken); } } \ No newline at end of file diff --git a/src/modules/Elsa.Modules.Scheduling/Jobs/RunWorkflowJob.cs b/src/modules/Elsa.Modules.Scheduling/Jobs/RunWorkflowJob.cs index 459fd9838..c9ef3cec5 100644 --- a/src/modules/Elsa.Modules.Scheduling/Jobs/RunWorkflowJob.cs +++ b/src/modules/Elsa.Modules.Scheduling/Jobs/RunWorkflowJob.cs @@ -1,5 +1,6 @@ using System.Text.Json.Serialization; using System.Threading.Tasks; +using Elsa.Jobs.Abstractions; using Elsa.Runtime.Contracts; using Elsa.Runtime.Models; using Elsa.Jobs.Contracts; @@ -25,6 +26,6 @@ public class RunWorkflowJob : Job { var request = new DispatchWorkflowDefinitionRequest(WorkflowId, 1); var workflowInvoker = context.GetRequiredService(); - await workflowInvoker.DispatchAsync(request, context.Cancellation); + await workflowInvoker.DispatchAsync(request, context.CancellationToken); } } \ No newline at end of file diff --git a/src/samples/aspnet/Elsa.Samples.Web1/Workflows/SubmitJobWorkflow.cs b/src/samples/aspnet/Elsa.Samples.Web1/Workflows/SubmitJobWorkflow.cs index dba2896ea..0ee639746 100644 --- a/src/samples/aspnet/Elsa.Samples.Web1/Workflows/SubmitJobWorkflow.cs +++ b/src/samples/aspnet/Elsa.Samples.Web1/Workflows/SubmitJobWorkflow.cs @@ -3,6 +3,7 @@ using System.Net.Http; using System.Threading.Tasks; using Elsa.Activities.Primitives; using Elsa.Contracts; +using Elsa.Jobs.Abstractions; using Elsa.Jobs.Contracts; using Elsa.Jobs.Models; using Elsa.Runtime.Contracts; @@ -31,7 +32,7 @@ public class ReadTheInternetJob : Job BaseAddress = new Uri("https://www.google.com") }; - var response = await httpClient.GetStringAsync("/", context.Cancellation); + var response = await httpClient.GetStringAsync("/", context.CancellationToken); Console.WriteLine(response); } } \ No newline at end of file