From 69c6fedc8672e1c8dd05c3d40e41f3cf789755ae Mon Sep 17 00:00:00 2001 From: Sipke Schoorstra Date: Mon, 14 Dec 2020 20:03:40 +0100 Subject: [PATCH] Rename Dto to Model and minor formatting --- .../Activities/EntityChanged/EntityChanged.cs | 2 +- .../EntityChanged/EntityChangedExtensions.cs | 2 +- .../Attributes/EntityNameAttribute.cs | 4 ++-- ...ntityChangedDto.cs => EntityChangedModel.cs} | 15 +++++++-------- .../Triggers/EntityChangedTrigger.cs | 2 -- .../EntityChangedWorkflow.cs | 2 +- .../Elsa.Samples.EntityChanged/Program.cs | 17 ++++++----------- 7 files changed, 18 insertions(+), 26 deletions(-) rename src/activities/Elsa.Activities.Entity/Models/{EntityChangedDto.cs => EntityChangedModel.cs} (59%) diff --git a/src/activities/Elsa.Activities.Entity/Activities/EntityChanged/EntityChanged.cs b/src/activities/Elsa.Activities.Entity/Activities/EntityChanged/EntityChanged.cs index afb70ae05..74b6d0b86 100644 --- a/src/activities/Elsa.Activities.Entity/Activities/EntityChanged/EntityChanged.cs +++ b/src/activities/Elsa.Activities.Entity/Activities/EntityChanged/EntityChanged.cs @@ -22,7 +22,7 @@ namespace Elsa.Activities.Entity [SelectOptions("Added", "Updated", "Deleted")] public EntityChangedAction? Action { get; set; } - protected override IActivityExecutionResult OnExecute() => Done(new EntityChangedDto(EntityName, Action)); + protected override IActivityExecutionResult OnExecute() => Done(new EntityChangedModel(EntityName, Action)); } } diff --git a/src/activities/Elsa.Activities.Entity/Activities/EntityChanged/EntityChangedExtensions.cs b/src/activities/Elsa.Activities.Entity/Activities/EntityChanged/EntityChangedExtensions.cs index 2d6de0953..ca110fc33 100644 --- a/src/activities/Elsa.Activities.Entity/Activities/EntityChanged/EntityChangedExtensions.cs +++ b/src/activities/Elsa.Activities.Entity/Activities/EntityChanged/EntityChangedExtensions.cs @@ -1,9 +1,9 @@ -// ReSharper disable once CheckNamespace using System; using Elsa.Activities.Entity.Extensions; using Elsa.Builders; +// ReSharper disable once CheckNamespace namespace Elsa.Activities.Entity { public static class EntityChangedExtensions diff --git a/src/activities/Elsa.Activities.Entity/Attributes/EntityNameAttribute.cs b/src/activities/Elsa.Activities.Entity/Attributes/EntityNameAttribute.cs index 39cf605d9..d19d23cba 100644 --- a/src/activities/Elsa.Activities.Entity/Attributes/EntityNameAttribute.cs +++ b/src/activities/Elsa.Activities.Entity/Attributes/EntityNameAttribute.cs @@ -4,7 +4,7 @@ namespace Elsa.Activities.Entity.Attributes { [AttributeUsage(AttributeTargets.Class)] public class EntityNameAttribute : Attribute - { + { public string Name { get; } public EntityNameAttribute(string name) @@ -12,4 +12,4 @@ namespace Elsa.Activities.Entity.Attributes Name = name; } } -} +} \ No newline at end of file diff --git a/src/activities/Elsa.Activities.Entity/Models/EntityChangedDto.cs b/src/activities/Elsa.Activities.Entity/Models/EntityChangedModel.cs similarity index 59% rename from src/activities/Elsa.Activities.Entity/Models/EntityChangedDto.cs rename to src/activities/Elsa.Activities.Entity/Models/EntityChangedModel.cs index 6b794e770..f727166bb 100644 --- a/src/activities/Elsa.Activities.Entity/Models/EntityChangedDto.cs +++ b/src/activities/Elsa.Activities.Entity/Models/EntityChangedModel.cs @@ -1,20 +1,19 @@ namespace Elsa.Activities.Entity.Models { - public class EntityChangedDto + public class EntityChangedModel { - public string? EntityName { get; set; } - public EntityChangedAction? Action { get; set; } - - public EntityChangedDto() + public EntityChangedModel() { - } - public EntityChangedDto(string? entityName, EntityChangedAction? action) + public EntityChangedModel(string? entityName, EntityChangedAction? action) { EntityName = entityName; Action = action; - } + } + + public string? EntityName { get; set; } + public EntityChangedAction? Action { get; set; } } } diff --git a/src/activities/Elsa.Activities.Entity/Triggers/EntityChangedTrigger.cs b/src/activities/Elsa.Activities.Entity/Triggers/EntityChangedTrigger.cs index d63b415d7..528257bab 100644 --- a/src/activities/Elsa.Activities.Entity/Triggers/EntityChangedTrigger.cs +++ b/src/activities/Elsa.Activities.Entity/Triggers/EntityChangedTrigger.cs @@ -17,7 +17,6 @@ namespace Elsa.Activities.Entity.Triggers public EntityChangedTrigger() { - } public EntityChangedTrigger(string? entityName, EntityChangedAction? action, string? contextId, string? correlationId) @@ -27,7 +26,6 @@ namespace Elsa.Activities.Entity.Triggers ContextId = contextId; CorrelationId = correlationId; } - } public class EntityChangedTriggerProvider : TriggerProvider diff --git a/src/samples/console/Elsa.Samples.EntityChanged/EntityChangedWorkflow.cs b/src/samples/console/Elsa.Samples.EntityChanged/EntityChangedWorkflow.cs index 2838cf3ca..b0806d88d 100644 --- a/src/samples/console/Elsa.Samples.EntityChanged/EntityChangedWorkflow.cs +++ b/src/samples/console/Elsa.Samples.EntityChanged/EntityChangedWorkflow.cs @@ -11,7 +11,7 @@ namespace Elsa.Samples.EntityChanged { workflow .EntityChanged(EntityChangedAction.Added) - .WriteLine(context => $"Entity '{((EntityChangedDto)context.Input).EntityName}' was '{((EntityChangedDto)context.Input).Action}'"); + .WriteLine(context => $"Entity '{((EntityChangedModel)context.Input)!.EntityName}' was '{((EntityChangedModel)context.Input).Action}'"); } } } diff --git a/src/samples/console/Elsa.Samples.EntityChanged/Program.cs b/src/samples/console/Elsa.Samples.EntityChanged/Program.cs index af897bd58..658cd6302 100644 --- a/src/samples/console/Elsa.Samples.EntityChanged/Program.cs +++ b/src/samples/console/Elsa.Samples.EntityChanged/Program.cs @@ -1,22 +1,20 @@ using System.Threading.Tasks; - using Elsa.Activities.Entity; using Elsa.Activities.Entity.Triggers; using Elsa.Activities.Entity.Extensions; using Elsa.Services; using Elsa.Triggers; - using Microsoft.Extensions.DependencyInjection; using System.Linq; namespace Elsa.Samples.EntityChanged { /// - /// Demonstrates the use of declarative composite activities. + /// Demonstrates the use of the EntityChanged activity. /// - class Program + internal class Program { - static async Task Main() + private static async Task Main() { // Create a service container with Elsa services. var services = new ServiceCollection() @@ -32,15 +30,12 @@ namespace Elsa.Samples.EntityChanged var workflowSelector = services.GetRequiredService(); - var workflowSelectionResult = (await workflowSelector.SelectWorkflowsAsync(evalute => - (evalute.Action.HasValue == false || evalute.Action == EntityChangedAction.Added) - && (evalute.EntityName == null || evalute.EntityName == typeof(Entity).GetEntityName()))).First(); + var workflowSelectionResult = (await workflowSelector.SelectWorkflowsAsync(trigger => + (trigger.Action.HasValue == false || trigger.Action == EntityChangedAction.Added) + && (trigger.EntityName == null || trigger.EntityName == typeof(Entity).GetEntityName()))).First(); var workflowRunner = services.GetRequiredService(); - await workflowRunner.RunWorkflowAsync(workflowSelectionResult.WorkflowBlueprint, workflowSelectionResult.ActivityId); - } - } } \ No newline at end of file