fix: change scope of python and csharp features

elsa-workflows · Nov 24, 2023 · 0fdca0a · 0fdca0a
1 parent 62131c9
commit 0fdca0a
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 22 deletions.
diff --git a/src/modules/Elsa.CSharp/Features/CSharpFeature.cs b/src/modules/Elsa.CSharp/Features/CSharpFeature.cs
@@ -1,10 +1,8 @@
 using Elsa.Common.Features;
 using Elsa.CSharp.Contracts;
-using Elsa.CSharp.Expressions;
 using Elsa.CSharp.Options;
 using Elsa.CSharp.Providers;
 using Elsa.CSharp.Services;
-using Elsa.Expressions.Contracts;
 using Elsa.Expressions.Features;
 using Elsa.Extensions;
 using Elsa.Features.Abstractions;
@@ -25,26 +23,26 @@ public class CSharpFeature : FeatureBase
     public CSharpFeature(IModule module) : base(module)
     {
     }
-    
+
     /// <summary>
     /// Configures the <see cref="CSharpOptions"/>.
     /// </summary>
     public Action<CSharpOptions> CSharpOptions { get; set; } = _ => { };
-    
+
     /// <inheritdoc />
     public override void Apply()
     {
         Services.Configure(CSharpOptions);
-        
+
         // C# services.
         Services
             .AddExpressionDescriptorProvider<CSharpExpressionDescriptorProvider>()
-            .AddSingleton<ICSharpEvaluator, CSharpEvaluator>()
+            .AddScoped<ICSharpEvaluator, CSharpEvaluator>()
             ;
 
         // Handlers.
         Services.AddNotificationHandlersFrom<CSharpFeature>();
-        
+
         // Activities.
         Module.AddActivitiesFrom<CSharpFeature>();
     }

diff --git a/src/modules/Elsa.Dsl/Features/DslFeature.cs b/src/modules/Elsa.Dsl/Features/DslFeature.cs
@@ -18,7 +18,7 @@ public DslFeature(IModule module) : base(module)
     public override void Configure()
     {
         Services
-            .AddSingleton<IDslEngine, DslEngine>()
+            .AddScoped<IDslEngine, DslEngine>()
             .AddSingleton<ITypeSystem, TypeSystem>()
             .AddSingleton<IFunctionActivityRegistry, FunctionActivityRegistry>();
     }

diff --git a/src/modules/Elsa.Http/Middleware/WorkflowsMiddleware.cs b/src/modules/Elsa.Http/Middleware/WorkflowsMiddleware.cs
@@ -1,19 +1,11 @@
+using Elsa.Extensions;
+using Elsa.Http.Bookmarks;
 using Elsa.Http.Contracts;
 using Elsa.Http.Models;
 using Elsa.Http.Options;
 using Elsa.Workflows.Core;
 using Elsa.Workflows.Core.Contracts;
 using Elsa.Workflows.Core.Helpers;
-using Elsa.Workflows.Runtime.Contracts;
-using JetBrains.Annotations;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Options;
-using System.Net;
-using System.Net.Mime;
-using System.Text.Json;
-using Elsa.Extensions;
-using Elsa.Http.Bookmarks;
-using Elsa.Workflows.Core;
 using Elsa.Workflows.Core.Models;
 using Elsa.Workflows.Core.State;
 using Elsa.Workflows.Runtime.Contracts;

diff --git a/src/modules/Elsa.Python/Features/PythonFeature.cs b/src/modules/Elsa.Python/Features/PythonFeature.cs
@@ -43,7 +43,7 @@ public override void Apply()
 
         // Python services.
         Services
-            .AddSingleton<IPythonEvaluator, PythonNetPythonEvaluator>()
+            .AddScoped<IPythonEvaluator, PythonNetPythonEvaluator>()
             .AddExpressionDescriptorProvider<PythonExpressionDescriptorProvider>()
             ;
 

diff --git a/src/modules/Elsa.Quartz/Features/QuartzSchedulerFeature.cs b/src/modules/Elsa.Quartz/Features/QuartzSchedulerFeature.cs
@@ -30,7 +30,7 @@ public override void Configure()
         {
             // Configure the scheduling feature to use the Quartz workflow scheduler.
             scheduling.WorkflowScheduler = sp => sp.GetRequiredService<QuartzWorkflowScheduler>();
-            
+
             // Configure the cron parser to use the Quartz cron parser.
             scheduling.CronParser = sp => sp.GetRequiredService<QuartzCronParser>();
         });
@@ -39,7 +39,7 @@ public override void Configure()
     /// <inheritdoc />
     public override void Apply()
     {
-        Services.AddScoped<IActivityDescriptorModifier, CronActivityDescriptorModifier>();
+        Services.AddSingleton<IActivityDescriptorModifier, CronActivityDescriptorModifier>();
         Services.AddScoped<QuartzWorkflowScheduler>();
         Services.AddScoped<QuartzCronParser>();
         Services.AddQuartz(quartz => quartz

diff --git a/src/modules/Elsa.WorkflowContexts/Features/WorkflowContextsJavaScriptFeature.cs b/src/modules/Elsa.WorkflowContexts/Features/WorkflowContextsJavaScriptFeature.cs
@@ -24,7 +24,7 @@ public WorkflowContextsJavaScriptFeature(IModule module) : base(module)
     /// <inheritdoc />
     public override void Apply()
     {
-        Services.AddSingleton<ConfigureJavaScriptEngine>();
+        Services.AddScoped<ConfigureJavaScriptEngine>();
         Services.AddNotificationHandler<ConfigureJavaScriptEngine, EvaluatingJavaScript>(sp => sp.GetRequiredService<ConfigureJavaScriptEngine>());
         Services.AddTypeDefinitionProvider<ConfigureJavaScriptEngine>(sp => sp.GetRequiredService<ConfigureJavaScriptEngine>());
         Services.AddFunctionDefinitionProvider<ConfigureJavaScriptEngine>(sp => sp.GetRequiredService<ConfigureJavaScriptEngine>());