From ea40b05a6bf4405ed78cfffb717cf0c8af3c144a Mon Sep 17 00:00:00 2001 From: Sipke Schoorstra Date: Sat, 4 Jun 2022 20:03:40 +0200 Subject: [PATCH] Simplify memory API names --- .../Models/ExpressionExecutionContext.cs | 10 +++++----- src/modules/Elsa.Expressions/Models/MemoryRegister.cs | 8 ++++---- .../ConfigureJavaScriptEngineWithActivityOutput.cs | 2 +- .../Implementations/JintJavaScriptEvaluator.cs | 2 +- .../Elsa.Workflows.Core/Activities/Container.cs | 2 +- src/modules/Elsa.Workflows.Core/Activities/For.cs | 2 +- .../Implementations/ActivityInvoker.cs | 2 +- .../Implementations/WorkflowStateSerializer.cs | 2 +- .../Models/ActivityExecutionContext.cs | 2 +- .../Models/WorkflowExecutionContext.cs | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/modules/Elsa.Expressions/Models/ExpressionExecutionContext.cs b/src/modules/Elsa.Expressions/Models/ExpressionExecutionContext.cs index 94769df6f..fc505fee3 100644 --- a/src/modules/Elsa.Expressions/Models/ExpressionExecutionContext.cs +++ b/src/modules/Elsa.Expressions/Models/ExpressionExecutionContext.cs @@ -8,13 +8,13 @@ public class ExpressionExecutionContext public ExpressionExecutionContext( IServiceProvider serviceProvider, - MemoryRegister memoryRegister, + MemoryRegister memory, ExpressionExecutionContext? parentContext = default, IDictionary? applicationProperties = default, CancellationToken cancellationToken = default) { _serviceProvider = serviceProvider; - MemoryRegister = memoryRegister; + Memory = memory; ApplicationProperties = applicationProperties ?? new Dictionary(); ParentContext = parentContext; @@ -24,7 +24,7 @@ public class ExpressionExecutionContext /// /// A shared register of computer memory. /// - public MemoryRegister MemoryRegister { get; } + public MemoryRegister Memory { get; } public IDictionary ApplicationProperties { get; set; } public ExpressionExecutionContext? ParentContext { get; set; } @@ -36,12 +36,12 @@ public class ExpressionExecutionContext public void Set(MemoryReference reference, object? value) { - var datum = GetMemoryDatumInternal(reference) ?? MemoryRegister.Declare(reference); + var datum = GetMemoryDatumInternal(reference) ?? Memory.Declare(reference); datum.Value = value; } public T GetRequiredService() where T : notnull => _serviceProvider.GetRequiredService(); //private MemoryDatum? GetMemoryDatumInternal(MemoryDatumReference locationReference) => MemoryRegister.TryGetMemoryDatum(locationReference.Id, out var location) ? location : ParentContext?.GetMemoryDatumInternal(locationReference); - private MemoryBlock? GetMemoryDatumInternal(MemoryReference reference) => MemoryRegister.TryGetMemoryDatum(reference.Id, out var location) ? location : default; + private MemoryBlock? GetMemoryDatumInternal(MemoryReference reference) => Memory.TryGetMemoryDatum(reference.Id, out var location) ? location : default; } \ No newline at end of file diff --git a/src/modules/Elsa.Expressions/Models/MemoryRegister.cs b/src/modules/Elsa.Expressions/Models/MemoryRegister.cs index 21f87fd27..1fb285310 100644 --- a/src/modules/Elsa.Expressions/Models/MemoryRegister.cs +++ b/src/modules/Elsa.Expressions/Models/MemoryRegister.cs @@ -8,17 +8,17 @@ public class MemoryRegister public MemoryRegister(MemoryRegister? parent = default, IDictionary? locations = default) { Parent = parent; - MemoryBlocks = locations ?? new Dictionary(); + Blocks = locations ?? new Dictionary(); } public MemoryRegister? Parent { get; } - public IDictionary MemoryBlocks { get; } + public IDictionary Blocks { get; } public bool TryGetMemoryDatum(string id, out MemoryBlock datum) { datum = null!; - if (MemoryBlocks.TryGetValue(id, out datum!)) + if (Blocks.TryGetValue(id, out datum!)) return true; return Parent?.TryGetMemoryDatum(id, out datum) == true; @@ -33,7 +33,7 @@ public class MemoryRegister public MemoryBlock Declare(MemoryReference reference) { var datum = reference.Declare(); - MemoryBlocks[reference.Id] = datum; + Blocks[reference.Id] = datum; return datum; } } \ No newline at end of file diff --git a/src/modules/Elsa.JavaScript/Handlers/ConfigureJavaScriptEngineWithActivityOutput.cs b/src/modules/Elsa.JavaScript/Handlers/ConfigureJavaScriptEngineWithActivityOutput.cs index eaff0b766..16a59524b 100644 --- a/src/modules/Elsa.JavaScript/Handlers/ConfigureJavaScriptEngineWithActivityOutput.cs +++ b/src/modules/Elsa.JavaScript/Handlers/ConfigureJavaScriptEngineWithActivityOutput.cs @@ -22,7 +22,7 @@ public class ConfigureJavaScriptEngineWithActivityOutput : INotificationHandler< var engine = notification.Engine; var workflow = notification.Context.GetWorkflow(); var graph = _activityWalker.Walk(workflow.Root).Flatten(); - var register = notification.Context.MemoryRegister; + var register = notification.Context.Memory; var jsActivities = new Dictionary(); foreach (var node in graph) diff --git a/src/modules/Elsa.JavaScript/Implementations/JintJavaScriptEvaluator.cs b/src/modules/Elsa.JavaScript/Implementations/JintJavaScriptEvaluator.cs index e1990bba3..833a4f29c 100644 --- a/src/modules/Elsa.JavaScript/Implementations/JintJavaScriptEvaluator.cs +++ b/src/modules/Elsa.JavaScript/Implementations/JintJavaScriptEvaluator.cs @@ -71,7 +71,7 @@ namespace Elsa.JavaScript.Implementations while (currentContext != null) { - foreach (var l in currentContext.MemoryRegister.MemoryBlocks) + foreach (var l in currentContext.Memory.Blocks) { if(!dictionary.ContainsKey(l.Key)) dictionary.Add(l.Key, l.Value); diff --git a/src/modules/Elsa.Workflows.Core/Activities/Container.cs b/src/modules/Elsa.Workflows.Core/Activities/Container.cs index d0dd691f6..f9b61b96b 100644 --- a/src/modules/Elsa.Workflows.Core/Activities/Container.cs +++ b/src/modules/Elsa.Workflows.Core/Activities/Container.cs @@ -32,7 +32,7 @@ public abstract class Container : Activity, IContainer protected override async ValueTask ExecuteAsync(ActivityExecutionContext context) { // Register variables. - context.ExpressionExecutionContext.MemoryRegister.Declare(Variables); + context.ExpressionExecutionContext.Memory.Declare(Variables); // Schedule children. await ScheduleChildrenAsync(context); diff --git a/src/modules/Elsa.Workflows.Core/Activities/For.cs b/src/modules/Elsa.Workflows.Core/Activities/For.cs index 3bdf7e42c..8ea7d8086 100644 --- a/src/modules/Elsa.Workflows.Core/Activities/For.cs +++ b/src/modules/Elsa.Workflows.Core/Activities/For.cs @@ -45,7 +45,7 @@ public class For : Activity if (iterateNode == null) return; - context.ExpressionExecutionContext.MemoryRegister.Declare(CurrentValue); + context.ExpressionExecutionContext.Memory.Declare(CurrentValue); HandleIteration(context); } diff --git a/src/modules/Elsa.Workflows.Core/Implementations/ActivityInvoker.cs b/src/modules/Elsa.Workflows.Core/Implementations/ActivityInvoker.cs index 433998264..90a089129 100644 --- a/src/modules/Elsa.Workflows.Core/Implementations/ActivityInvoker.cs +++ b/src/modules/Elsa.Workflows.Core/Implementations/ActivityInvoker.cs @@ -33,7 +33,7 @@ public class ActivityInvoker : IActivityInvoker var transientProperties = workflowExecutionContext.TransientProperties; var input = workflowExecutionContext.Input; var applicationProperties = ExpressionExecutionContextExtensions.CreateApplicationPropertiesFrom(workflow, transientProperties, input); - var parentMemory = parentActivityExecutionContext?.ExpressionExecutionContext.MemoryRegister ?? workflowMemory; + var parentMemory = parentActivityExecutionContext?.ExpressionExecutionContext.Memory ?? workflowMemory; var activityMemory = new MemoryRegister(workflowMemory); var expressionExecutionContext = new ExpressionExecutionContext(_serviceProvider, parentMemory, parentExpressionExecutionContext, applicationProperties, cancellationToken); var activityExecutionContext = new ActivityExecutionContext(workflowExecutionContext, parentActivityExecutionContext, expressionExecutionContext, activity, cancellationToken); diff --git a/src/modules/Elsa.Workflows.Core/Implementations/WorkflowStateSerializer.cs b/src/modules/Elsa.Workflows.Core/Implementations/WorkflowStateSerializer.cs index f82d2855e..0168d3039 100644 --- a/src/modules/Elsa.Workflows.Core/Implementations/WorkflowStateSerializer.cs +++ b/src/modules/Elsa.Workflows.Core/Implementations/WorkflowStateSerializer.cs @@ -109,7 +109,7 @@ public class WorkflowStateSerializer : IWorkflowStateSerializer { ActivityExecutionContextState CreateActivityExecutionContextState(ActivityExecutionContext activityExecutionContext) { - var registerState = new RegisterState(activityExecutionContext.ExpressionExecutionContext.MemoryRegister.MemoryBlocks); + var registerState = new RegisterState(activityExecutionContext.ExpressionExecutionContext.Memory.Blocks); var activityExecutionContextState = new ActivityExecutionContextState { Id = activityExecutionContext.Id, diff --git a/src/modules/Elsa.Workflows.Core/Models/ActivityExecutionContext.cs b/src/modules/Elsa.Workflows.Core/Models/ActivityExecutionContext.cs index 3008e397e..319e5f974 100644 --- a/src/modules/Elsa.Workflows.Core/Models/ActivityExecutionContext.cs +++ b/src/modules/Elsa.Workflows.Core/Models/ActivityExecutionContext.cs @@ -177,7 +177,7 @@ public class ActivityExecutionContext } private MemoryBlock? GetLocation(MemoryReference locationReference) => - ExpressionExecutionContext.MemoryRegister.TryGetMemoryDatum(locationReference.Id, out var location) + ExpressionExecutionContext.Memory.TryGetMemoryDatum(locationReference.Id, out var location) ? location : ParentActivityExecutionContext?.GetLocation(locationReference); } \ No newline at end of file diff --git a/src/modules/Elsa.Workflows.Core/Models/WorkflowExecutionContext.cs b/src/modules/Elsa.Workflows.Core/Models/WorkflowExecutionContext.cs index aa690b091..22535fa29 100644 --- a/src/modules/Elsa.Workflows.Core/Models/WorkflowExecutionContext.cs +++ b/src/modules/Elsa.Workflows.Core/Models/WorkflowExecutionContext.cs @@ -171,5 +171,5 @@ public class WorkflowExecutionContext return currentMainStatus != WorkflowStatus.Finished; } - private IEnumerable GetMergedRegistersView() => new[] { MemoryRegister }.Concat(ActivityExecutionContexts.Select(x => x.ExpressionExecutionContext.MemoryRegister)).ToList(); + private IEnumerable GetMergedRegistersView() => new[] { MemoryRegister }.Concat(ActivityExecutionContexts.Select(x => x.ExpressionExecutionContext.Memory)).ToList(); } \ No newline at end of file