From 13b770e36252ce34771a1fe75cb6fef26846d206 Mon Sep 17 00:00:00 2001 From: Sipke Schoorstra Date: Tue, 3 Nov 2020 10:18:19 +0100 Subject: [PATCH] Remove unused index provider --- .../Extensions/ServiceCollectionExtensions.cs | 3 -- .../Extensions/StreamExtensions.cs | 8 ++-- ...rkflowInstanceByReceiveHttpRequestIndex.cs | 43 ------------------- .../Elsa.Activities.Http/Migrations.cs | 21 --------- src/core/Elsa.Core/ElsaOptions.cs | 1 - .../Startup.cs | 2 - .../Elsa.Samples.CorrelationHttp/Startup.cs | 2 - .../Program.cs | 5 +-- .../Elsa.Samples.HelloWorldConsole/Program.cs | 4 +- .../Program.cs | 4 +- .../Elsa.Samples.Serialization/Program.cs | 2 - 11 files changed, 6 insertions(+), 89 deletions(-) delete mode 100644 src/activities/Elsa.Activities.Http/Indexes/WorkflowInstanceByReceiveHttpRequestIndex.cs delete mode 100644 src/activities/Elsa.Activities.Http/Migrations.cs diff --git a/src/activities/Elsa.Activities.Http/Extensions/ServiceCollectionExtensions.cs b/src/activities/Elsa.Activities.Http/Extensions/ServiceCollectionExtensions.cs index 88fa8bc2e..5155fc442 100644 --- a/src/activities/Elsa.Activities.Http/Extensions/ServiceCollectionExtensions.cs +++ b/src/activities/Elsa.Activities.Http/Extensions/ServiceCollectionExtensions.cs @@ -1,6 +1,5 @@ using System; using Elsa.Activities.Http; -using Elsa.Activities.Http.Indexes; using Elsa.Activities.Http.Options; using Elsa.Activities.Http.Parsers; using Elsa.Activities.Http.RequestHandlers.Handlers; @@ -41,8 +40,6 @@ namespace Microsoft.Extensions.DependencyInjection .AddSingleton() .AddSingleton() .AddTriggerProvider() - .AddIndexProvider() - .AddDataMigration() .AddHttpContextAccessor() .AddNotificationHandlers(typeof(ServiceCollectionExtensions)) .AddDataProtection(); diff --git a/src/activities/Elsa.Activities.Http/Extensions/StreamExtensions.cs b/src/activities/Elsa.Activities.Http/Extensions/StreamExtensions.cs index bfd0bb323..b68e3bdb3 100644 --- a/src/activities/Elsa.Activities.Http/Extensions/StreamExtensions.cs +++ b/src/activities/Elsa.Activities.Http/Extensions/StreamExtensions.cs @@ -8,11 +8,9 @@ namespace Elsa.Activities.Http.Extensions { public static async Task ReadBytesToEndAsync(this Stream input, CancellationToken cancellationToken) { - using (var ms = new MemoryStream()) - { - await input.CopyToAsync(ms, 16 * 1024, cancellationToken); - return ms.ToArray(); - } + using var ms = new MemoryStream(); + await input.CopyToAsync(ms, 16 * 1024, cancellationToken); + return ms.ToArray(); } } } \ No newline at end of file diff --git a/src/activities/Elsa.Activities.Http/Indexes/WorkflowInstanceByReceiveHttpRequestIndex.cs b/src/activities/Elsa.Activities.Http/Indexes/WorkflowInstanceByReceiveHttpRequestIndex.cs deleted file mode 100644 index 1c9ab9a81..000000000 --- a/src/activities/Elsa.Activities.Http/Indexes/WorkflowInstanceByReceiveHttpRequestIndex.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System.Linq; -using Elsa.Data; -using Elsa.Models; -using YesSql.Indexes; - -namespace Elsa.Activities.Http.Indexes -{ - public class WorkflowInstanceByReceiveHttpRequestIndex : MapIndex - { - public string ActivityId { get; set; } = default!; - public string RequestPath { get; set; } = default!; - public string? RequestMethod { get; set; } - } - - public class WorkflowInstanceByReceiveHttpRequestIndexProvider : IndexProvider - { - public WorkflowInstanceByReceiveHttpRequestIndexProvider() => CollectionName = CollectionNames.WorkflowInstances; - - public override void Describe(DescribeContext context) - { - context.For() - .Map( - workflowInstance => workflowInstance.BlockingActivities - .Where(x => x.ActivityType == nameof(ReceiveHttpRequest)) - .Select( - blockingActivity => - { - var activity = workflowInstance.Activities - .First(x => x.Id == blockingActivity.ActivityId); - - var path = activity.Data.Value(nameof(ReceiveHttpRequest.Path)); - var method = activity.Data.Value(nameof(ReceiveHttpRequest.Method)); - - return new WorkflowInstanceByReceiveHttpRequestIndex - { - ActivityId = blockingActivity.ActivityId, - RequestPath = path, - RequestMethod = method - }; - })); - } - } -} \ No newline at end of file diff --git a/src/activities/Elsa.Activities.Http/Migrations.cs b/src/activities/Elsa.Activities.Http/Migrations.cs deleted file mode 100644 index b1f97657d..000000000 --- a/src/activities/Elsa.Activities.Http/Migrations.cs +++ /dev/null @@ -1,21 +0,0 @@ -using Elsa.Activities.Http.Indexes; -using Elsa.Data; -using YesSql.Sql; - -namespace Elsa.Activities.Http -{ - public class Migrations : DataMigration - { - public int Create() - { - SchemaBuilder.CreateMapIndexTable( - table => table - .Column("ActivityId") - .Column("RequestPath") - .Column("RequestMethod"), - CollectionNames.WorkflowInstances); - - return 1; - } - } -} \ No newline at end of file diff --git a/src/core/Elsa.Core/ElsaOptions.cs b/src/core/Elsa.Core/ElsaOptions.cs index 29e028116..ba1ec407d 100644 --- a/src/core/Elsa.Core/ElsaOptions.cs +++ b/src/core/Elsa.Core/ElsaOptions.cs @@ -13,7 +13,6 @@ using Rebus.Persistence.InMem; using Rebus.Routing.TypeBased; using Rebus.Transport.InMem; using YesSql; -using Elsa.YesSql.Provider.Sqlite.InMemory; using Storage.Net; using Storage.Net.Blobs; using YesSql.Provider.Sqlite; diff --git a/src/samples/Elsa.Samples.ContextualWorkflowHttp/Startup.cs b/src/samples/Elsa.Samples.ContextualWorkflowHttp/Startup.cs index 1dd1b341e..d32e386ff 100644 --- a/src/samples/Elsa.Samples.ContextualWorkflowHttp/Startup.cs +++ b/src/samples/Elsa.Samples.ContextualWorkflowHttp/Startup.cs @@ -1,10 +1,8 @@ -using System.Data; using Elsa.Samples.ContextualWorkflowHttp.Indexes; using Elsa.Samples.ContextualWorkflowHttp.WorkflowContextProviders; using Elsa.Samples.ContextualWorkflowHttp.Workflows; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; -using YesSql.Provider.Sqlite; namespace Elsa.Samples.ContextualWorkflowHttp { diff --git a/src/samples/Elsa.Samples.CorrelationHttp/Startup.cs b/src/samples/Elsa.Samples.CorrelationHttp/Startup.cs index e4f087136..194b18331 100644 --- a/src/samples/Elsa.Samples.CorrelationHttp/Startup.cs +++ b/src/samples/Elsa.Samples.CorrelationHttp/Startup.cs @@ -1,8 +1,6 @@ -using System.Data; using Elsa.Samples.CorrelationHttp.Workflows; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; -using YesSql.Provider.Sqlite; namespace Elsa.Samples.CorrelationHttp { diff --git a/src/samples/Elsa.Samples.DeclarativeCompositeActivitiesConsole/Program.cs b/src/samples/Elsa.Samples.DeclarativeCompositeActivitiesConsole/Program.cs index ec1539f80..7a29093e9 100644 --- a/src/samples/Elsa.Samples.DeclarativeCompositeActivitiesConsole/Program.cs +++ b/src/samples/Elsa.Samples.DeclarativeCompositeActivitiesConsole/Program.cs @@ -1,12 +1,9 @@ -using System; -using System.Data; -using System.Threading.Tasks; +using System.Threading.Tasks; using Elsa.Models; using Elsa.Scripting.Liquid.Services; using Elsa.Serialization; using Elsa.Services; using Microsoft.Extensions.DependencyInjection; -using YesSql.Provider.Sqlite; namespace Elsa.Samples.DeclarativeCompositeActivitiesConsole { diff --git a/src/samples/Elsa.Samples.HelloWorldConsole/Program.cs b/src/samples/Elsa.Samples.HelloWorldConsole/Program.cs index 28cb9c7ab..650dad018 100644 --- a/src/samples/Elsa.Samples.HelloWorldConsole/Program.cs +++ b/src/samples/Elsa.Samples.HelloWorldConsole/Program.cs @@ -1,8 +1,6 @@ -using System.Data; -using System.Threading.Tasks; +using System.Threading.Tasks; using Elsa.Services; using Microsoft.Extensions.DependencyInjection; -using YesSql.Provider.Sqlite; namespace Elsa.Samples.HelloWorldConsole { diff --git a/src/samples/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Program.cs b/src/samples/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Program.cs index 810231ccb..b31b2118a 100644 --- a/src/samples/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Program.cs +++ b/src/samples/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Program.cs @@ -1,10 +1,8 @@ -using System.Data; -using System.Threading.Tasks; +using System.Threading.Tasks; using Elsa.Samples.ProgrammaticCompositeActivitiesConsole.Activities; using Elsa.Samples.ProgrammaticCompositeActivitiesConsole.Workflows; using Elsa.Services; using Microsoft.Extensions.DependencyInjection; -using YesSql.Provider.Sqlite; namespace Elsa.Samples.ProgrammaticCompositeActivitiesConsole { diff --git a/src/samples/Elsa.Samples.Serialization/Program.cs b/src/samples/Elsa.Samples.Serialization/Program.cs index bd0743fc3..d57732716 100644 --- a/src/samples/Elsa.Samples.Serialization/Program.cs +++ b/src/samples/Elsa.Samples.Serialization/Program.cs @@ -1,5 +1,4 @@ using System; -using System.Data; using System.Threading.Tasks; using Elsa.Activities.Console; using Elsa.Models; @@ -7,7 +6,6 @@ using Elsa.Scripting.Liquid.Services; using Elsa.Serialization; using Elsa.Services; using Microsoft.Extensions.DependencyInjection; -using YesSql.Provider.Sqlite; namespace Elsa.Samples.Serialization {