From 6c8cc5efd058a0bc690194a2058a0f2308881bac Mon Sep 17 00:00:00 2001 From: Sipke Schoorstra Date: Fri, 4 Dec 2020 10:41:49 +0100 Subject: [PATCH] Rename TimerEvent to Timer --- .../TimerEvent.cs => Timer/Timer.cs} | 4 ++-- .../Timer/TimerBuilderExtensions.cs | 24 +++++++++++++++++++ .../TimerEvent/TimerEventBuilderExtensions.cs | 24 ------------------- .../Extensions/ServiceCollectionExtensions.cs | 2 +- .../HostedServices/StartJobs.cs | 4 ++-- .../Triggers/TimerEventTrigger.cs | 4 ++-- .../Workflows/DemoWorkflow.cs | 2 +- .../Activities/Sleep.cs | 2 +- .../Workflows/ProducerWorkflow.cs | 2 +- .../Workflows/GenerateOrdersWorkflow.cs | 2 +- .../RecurringWorkflow.cs | 2 +- .../Workflows/GenerateOrdersWorkflow.cs | 2 +- .../Workflows/ProducerWorkflow.cs | 2 +- .../RecurringTaskWorkflow.cs | 4 ++-- .../Workflows/PhoneCallWorkflow.cs | 2 +- 15 files changed, 41 insertions(+), 41 deletions(-) rename src/activities/Elsa.Activities.Timers/Activities/{TimerEvent/TimerEvent.cs => Timer/Timer.cs} (92%) create mode 100644 src/activities/Elsa.Activities.Timers/Activities/Timer/TimerBuilderExtensions.cs delete mode 100644 src/activities/Elsa.Activities.Timers/Activities/TimerEvent/TimerEventBuilderExtensions.cs diff --git a/src/activities/Elsa.Activities.Timers/Activities/TimerEvent/TimerEvent.cs b/src/activities/Elsa.Activities.Timers/Activities/Timer/Timer.cs similarity index 92% rename from src/activities/Elsa.Activities.Timers/Activities/TimerEvent/TimerEvent.cs rename to src/activities/Elsa.Activities.Timers/Activities/Timer/Timer.cs index c2f2bbc7c..99c616f65 100644 --- a/src/activities/Elsa.Activities.Timers/Activities/TimerEvent/TimerEvent.cs +++ b/src/activities/Elsa.Activities.Timers/Activities/Timer/Timer.cs @@ -10,13 +10,13 @@ using NodaTime; namespace Elsa.Activities.Timers { [Trigger(Category = "Timers", Description = "Triggers at a specified interval.")] - public class TimerEvent : Activity + public class Timer : Activity { private readonly IWorkflowInstanceManager _workflowInstanceManager; private readonly IWorkflowScheduler _workflowScheduler; private readonly IClock _clock; - public TimerEvent(IWorkflowInstanceManager workflowInstanceManager, IWorkflowScheduler workflowScheduler, IClock clock) + public Timer(IWorkflowInstanceManager workflowInstanceManager, IWorkflowScheduler workflowScheduler, IClock clock) { _workflowInstanceManager = workflowInstanceManager; _workflowScheduler = workflowScheduler; diff --git a/src/activities/Elsa.Activities.Timers/Activities/Timer/TimerBuilderExtensions.cs b/src/activities/Elsa.Activities.Timers/Activities/Timer/TimerBuilderExtensions.cs new file mode 100644 index 000000000..d0cd7d7ae --- /dev/null +++ b/src/activities/Elsa.Activities.Timers/Activities/Timer/TimerBuilderExtensions.cs @@ -0,0 +1,24 @@ +using System; +using Elsa.Builders; +using Elsa.Services.Models; +using NodaTime; + +// ReSharper disable once CheckNamespace +namespace Elsa.Activities.Timers +{ + public static class TimerBuilderExtensions + { + public static IActivityBuilder Timer(this IBuilder builder, + Action>? setup = default) => builder.Then(setup); + + public static IActivityBuilder + Timer(this IBuilder builder, Func value) => + builder.Timer(setup => setup.Set(x => x.Timeout, value)); + + public static IActivityBuilder Timer(this IBuilder builder, Func value) => + builder.Timer(setup => setup.Set(x => x.Timeout, value)); + + public static IActivityBuilder Timer(this IBuilder builder, Duration value) => + builder.Timer(setup => setup.Set(x => x.Timeout, value)); + } +} \ No newline at end of file diff --git a/src/activities/Elsa.Activities.Timers/Activities/TimerEvent/TimerEventBuilderExtensions.cs b/src/activities/Elsa.Activities.Timers/Activities/TimerEvent/TimerEventBuilderExtensions.cs deleted file mode 100644 index 2b9de6428..000000000 --- a/src/activities/Elsa.Activities.Timers/Activities/TimerEvent/TimerEventBuilderExtensions.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; -using Elsa.Builders; -using Elsa.Services.Models; -using NodaTime; - -// ReSharper disable once CheckNamespace -namespace Elsa.Activities.Timers -{ - public static class TimerEventBuilderExtensions - { - public static IActivityBuilder TimerEvent(this IBuilder builder, - Action>? setup = default) => builder.Then(setup); - - public static IActivityBuilder - TimerEvent(this IBuilder builder, Func value) => - builder.TimerEvent(setup => setup.Set(x => x.Timeout, value)); - - public static IActivityBuilder TimerEvent(this IBuilder builder, Func value) => - builder.TimerEvent(setup => setup.Set(x => x.Timeout, value)); - - public static IActivityBuilder TimerEvent(this IBuilder builder, Duration value) => - builder.TimerEvent(setup => setup.Set(x => x.Timeout, value)); - } -} \ No newline at end of file diff --git a/src/activities/Elsa.Activities.Timers/Extensions/ServiceCollectionExtensions.cs b/src/activities/Elsa.Activities.Timers/Extensions/ServiceCollectionExtensions.cs index 0f683d3f5..739b71429 100644 --- a/src/activities/Elsa.Activities.Timers/Extensions/ServiceCollectionExtensions.cs +++ b/src/activities/Elsa.Activities.Timers/Extensions/ServiceCollectionExtensions.cs @@ -25,7 +25,7 @@ namespace Microsoft.Extensions.DependencyInjection .AddTransient() .AddHostedService() .AddActivity() - .AddActivity() + .AddActivity() .AddActivity() .AddTriggerProvider() .AddTriggerProvider() diff --git a/src/activities/Elsa.Activities.Timers/HostedServices/StartJobs.cs b/src/activities/Elsa.Activities.Timers/HostedServices/StartJobs.cs index d9f02f0c5..6edc45413 100644 --- a/src/activities/Elsa.Activities.Timers/HostedServices/StartJobs.cs +++ b/src/activities/Elsa.Activities.Timers/HostedServices/StartJobs.cs @@ -81,7 +81,7 @@ namespace Elsa.Activities.Timers.HostedServices // Schedule workflow blueprints that start with a timer event. var timerWorkflows = from workflow in workflows - from activity in workflow.GetStartActivities() + from activity in workflow.GetStartActivities() select (workflow, activity); var now = _clock.GetCurrentInstant(); @@ -91,7 +91,7 @@ namespace Elsa.Activities.Timers.HostedServices var workflow = timerWorkflow.workflow; var activity = timerWorkflow.activity; var workflowWrapper = await _workflowBlueprintReflector.ReflectAsync(serviceScope, workflow, cancellationToken); - var timerEventWrapper = workflowWrapper.GetActivity(activity.Id); + var timerEventWrapper = workflowWrapper.GetActivity(activity.Id); var timeOut = await timerEventWrapper.GetPropertyValueAsync(x => x.Timeout, cancellationToken); var startAt = now.Plus(timeOut); diff --git a/src/activities/Elsa.Activities.Timers/Triggers/TimerEventTrigger.cs b/src/activities/Elsa.Activities.Timers/Triggers/TimerEventTrigger.cs index 67a7d0109..c163a902b 100644 --- a/src/activities/Elsa.Activities.Timers/Triggers/TimerEventTrigger.cs +++ b/src/activities/Elsa.Activities.Timers/Triggers/TimerEventTrigger.cs @@ -9,9 +9,9 @@ namespace Elsa.Activities.Timers.Triggers public Instant ExecuteAt { get; set; } } - public class TimerEventTriggerProvider : TriggerProvider + public class TimerEventTriggerProvider : TriggerProvider { - public override ITrigger GetTrigger(TriggerProviderContext context) + public override ITrigger GetTrigger(TriggerProviderContext context) { var executeAt = context.Activity.GetState(x => x.ExecuteAt); diff --git a/src/samples/aspnet/Elsa.Samples.ForkJoinTimerAndSignalHttp/Workflows/DemoWorkflow.cs b/src/samples/aspnet/Elsa.Samples.ForkJoinTimerAndSignalHttp/Workflows/DemoWorkflow.cs index 099c9ec20..f1c85ef1f 100644 --- a/src/samples/aspnet/Elsa.Samples.ForkJoinTimerAndSignalHttp/Workflows/DemoWorkflow.cs +++ b/src/samples/aspnet/Elsa.Samples.ForkJoinTimerAndSignalHttp/Workflows/DemoWorkflow.cs @@ -32,7 +32,7 @@ namespace Elsa.Samples.ForkJoinTimerAndSignalHttp.Workflows { fork .When("Timer") - .TimerEvent(_timeOut) + .Timer(_timeOut) .SetVariable("CompletedVia", "Timer") .Then("Join"); diff --git a/src/samples/aspnet/Elsa.Samples.Interrupts/Activities/Sleep.cs b/src/samples/aspnet/Elsa.Samples.Interrupts/Activities/Sleep.cs index 76a497141..29937880c 100644 --- a/src/samples/aspnet/Elsa.Samples.Interrupts/Activities/Sleep.cs +++ b/src/samples/aspnet/Elsa.Samples.Interrupts/Activities/Sleep.cs @@ -7,7 +7,7 @@ using NodaTime; namespace Elsa.Samples.Interrupts.Activities { [Activity] - public class Sleep : TimerEvent + public class Sleep : Timer { public Sleep(IWorkflowInstanceManager workflowInstanceManager, IWorkflowScheduler workflowScheduler, IClock clock) : base(workflowInstanceManager, workflowScheduler, clock) { diff --git a/src/samples/worker/Elsa.Samples.AzureServiceBusWorker/Workflows/ProducerWorkflow.cs b/src/samples/worker/Elsa.Samples.AzureServiceBusWorker/Workflows/ProducerWorkflow.cs index a6bfc1bc9..7914a0f72 100644 --- a/src/samples/worker/Elsa.Samples.AzureServiceBusWorker/Workflows/ProducerWorkflow.cs +++ b/src/samples/worker/Elsa.Samples.AzureServiceBusWorker/Workflows/ProducerWorkflow.cs @@ -22,7 +22,7 @@ namespace Elsa.Samples.AzureServiceBusWorker.Workflows public void Build(IWorkflowBuilder workflow) { workflow - .TimerEvent(Duration.FromSeconds(5)) + .Timer(Duration.FromSeconds(5)) .WriteLine("Sending a random greeting to the \"greetings\" queue.") .SendMessage("greetings", GetRandomGreeting); } diff --git a/src/samples/worker/Elsa.Samples.CustomAttributesChildWorker/Workflows/GenerateOrdersWorkflow.cs b/src/samples/worker/Elsa.Samples.CustomAttributesChildWorker/Workflows/GenerateOrdersWorkflow.cs index fa4ad4483..2da6acec2 100644 --- a/src/samples/worker/Elsa.Samples.CustomAttributesChildWorker/Workflows/GenerateOrdersWorkflow.cs +++ b/src/samples/worker/Elsa.Samples.CustomAttributesChildWorker/Workflows/GenerateOrdersWorkflow.cs @@ -20,7 +20,7 @@ namespace Elsa.Samples.CustomAttributesChildWorker.Workflows public void Build(IWorkflowBuilder workflow) { workflow - .TimerEvent(Duration.FromSeconds(5)) + .Timer(Duration.FromSeconds(5)) .SetVariable("CustomerId", SelectRandomCustomerId) .WriteLine(context => $"Creating a new order for customer {context.GetVariable("CustomerId")}.") .Then(message => message.Set(x => x.Message, context => new OrderReceived { CustomerId = context.GetVariable("CustomerId") })); diff --git a/src/samples/worker/Elsa.Samples.DistributedLock/RecurringWorkflow.cs b/src/samples/worker/Elsa.Samples.DistributedLock/RecurringWorkflow.cs index 263da01d8..b3d634000 100644 --- a/src/samples/worker/Elsa.Samples.DistributedLock/RecurringWorkflow.cs +++ b/src/samples/worker/Elsa.Samples.DistributedLock/RecurringWorkflow.cs @@ -13,7 +13,7 @@ namespace Elsa.Samples.DistributedLock { workflow .WithPersistenceBehavior(WorkflowPersistenceBehavior.ActivityExecuted) - .TimerEvent(Duration.FromSeconds(1)) + .Timer(Duration.FromSeconds(1)) .WriteLine("Hello World") .WriteLine(() => $"Timer event at {DateTime.Now}"); } diff --git a/src/samples/worker/Elsa.Samples.MultiTenantChildWorker/Workflows/GenerateOrdersWorkflow.cs b/src/samples/worker/Elsa.Samples.MultiTenantChildWorker/Workflows/GenerateOrdersWorkflow.cs index 30b749841..88c8ec249 100644 --- a/src/samples/worker/Elsa.Samples.MultiTenantChildWorker/Workflows/GenerateOrdersWorkflow.cs +++ b/src/samples/worker/Elsa.Samples.MultiTenantChildWorker/Workflows/GenerateOrdersWorkflow.cs @@ -20,7 +20,7 @@ namespace Elsa.Samples.MultiTenantChildWorker.Workflows public void Build(IWorkflowBuilder workflow) { workflow - .TimerEvent(Duration.FromSeconds(5)) + .Timer(Duration.FromSeconds(5)) .SetVariable("CustomerId", SelectRandomCustomerId) .WriteLine(context => $"Creating a new order for customer {context.GetVariable("CustomerId")}.") .Then(message => message.Set(x => x.Message, context => new OrderReceived { CustomerId = context.GetVariable("CustomerId") })); diff --git a/src/samples/worker/Elsa.Samples.RebusWorker/Workflows/ProducerWorkflow.cs b/src/samples/worker/Elsa.Samples.RebusWorker/Workflows/ProducerWorkflow.cs index 020f761ee..2ee41f960 100644 --- a/src/samples/worker/Elsa.Samples.RebusWorker/Workflows/ProducerWorkflow.cs +++ b/src/samples/worker/Elsa.Samples.RebusWorker/Workflows/ProducerWorkflow.cs @@ -22,7 +22,7 @@ namespace Elsa.Samples.RebusWorker.Workflows public void Build(IWorkflowBuilder workflow) { workflow - .TimerEvent(Duration.FromSeconds(5)) + .Timer(Duration.FromSeconds(5)) .WriteLine("Sending a random greeting to the \"greetings\" queue.") .Then(sendMessage => sendMessage.Set(x => x.Message, GetRandomGreeting)); } diff --git a/src/samples/worker/Elsa.Samples.Timers/RecurringTaskWorkflow.cs b/src/samples/worker/Elsa.Samples.Timers/RecurringTaskWorkflow.cs index 92eadb2c0..e7aec274b 100644 --- a/src/samples/worker/Elsa.Samples.Timers/RecurringTaskWorkflow.cs +++ b/src/samples/worker/Elsa.Samples.Timers/RecurringTaskWorkflow.cs @@ -18,9 +18,9 @@ namespace Elsa.Samples.Timers { workflow .AsSingleton() - .TimerEvent(Duration.FromSeconds(2)) + .Timer(Duration.FromSeconds(2)) .WriteLine(context => $"{context.WorkflowExecutionContext.WorkflowInstance.WorkflowInstanceId} triggered by timer at {_clock.GetCurrentInstant()}.") - .TimerEvent(Duration.FromSeconds(2)) + .Timer(Duration.FromSeconds(2)) .WriteLine(context => $"{context.WorkflowExecutionContext.WorkflowInstance.WorkflowInstanceId} resumed by timer at {_clock.GetCurrentInstant()}."); } } diff --git a/src/samples/worker/Elsa.Samples.WhileLoopWorker/Workflows/PhoneCallWorkflow.cs b/src/samples/worker/Elsa.Samples.WhileLoopWorker/Workflows/PhoneCallWorkflow.cs index b772c0ef3..637c5e6b6 100644 --- a/src/samples/worker/Elsa.Samples.WhileLoopWorker/Workflows/PhoneCallWorkflow.cs +++ b/src/samples/worker/Elsa.Samples.WhileLoopWorker/Workflows/PhoneCallWorkflow.cs @@ -30,7 +30,7 @@ namespace Elsa.Samples.WhileLoopWorker.Workflows @while .WriteLine("Ringgggg ringgg.") .WriteLine(() => $"Call status: {_phoneCallService.CallStatus}") - .TimerEvent(Duration.FromSeconds(5)) + .Timer(Duration.FromSeconds(5)) .Then(() => _phoneCallService.Progress()); })