From 834475cfcae39cdf23eefacd572909a7061b8286 Mon Sep 17 00:00:00 2001 From: Konstantins Vedenins <77638996+constantine-v@users.noreply.github.com> Date: Mon, 20 Dec 2021 11:21:34 +0200 Subject: [PATCH] moved workflowtesting module into folder, fixed number of warnings (#2603) --- Elsa.sln | 4 ++-- .../Elsa.Activities.RabbitMq.csproj | 12 +++++++++++- .../Elsa.Activities.RabbitMq/Services/Client.cs | 8 ++++---- .../Services/RabbitMqQueueStarter.cs | 2 +- .../ConfigureRabbitMqActivitiesForTestHandler.cs | 2 +- .../Models/WorkflowTestExecuteRequest.cs | 9 --------- .../Models/WorkflowTestRestartFromActivityRequest.cs | 8 -------- .../Elsa.WorkflowTesting.Api.csproj | 2 +- .../Elsa.WorkflowTesting.Api/Endpoints/Execute.cs | 0 .../Endpoints/RestartFromActivity.cs | 0 .../Elsa.WorkflowTesting.Api/Endpoints/Stop.cs | 2 +- .../Extensions/ApplicationBuilderExtensions.cs | 0 .../Extensions/ServiceCollectionExtensions.cs | 0 .../ActivityExecutionResultExecutedHandler.cs | 0 .../ConfigureWorkflowContextForTestHandler.cs | 0 .../Hubs/Clients/IWorkflowTestClient.cs | 0 .../Elsa.WorkflowTesting.Api/Hubs/WorkflowTestHub.cs | 0 .../Models/WorkflowTestExecuteRequest.cs | 9 +++++++++ .../Models/WorkflowTestRestartFromActivityRequest.cs | 8 ++++++++ .../Models/WorkflowTestStopRequest.cs | 2 +- .../Services/WorkflowTestService.cs | 0 .../Elsa.WorkflowTesting/Elsa.WorkflowTesting.csproj | 4 ++-- .../Events/WorkflowTestExecutionStopped.cs | 2 +- .../Messages/WorkflowTestMessage.cs | 0 .../Services/IWorkflowTestLaunchpad.cs | 0 .../Services/IWorkflowTestService.cs | 0 .../Services/WorkflowTestLaunchpad.cs | 4 ++-- .../Elsa.Samples.Server.Host.csproj | 6 +++--- .../Workflows/ConsumerWorkflow.cs | 2 +- .../Workflows/ProducerWorkflow.cs | 2 +- .../Workflows/SendAndReceiveWorkflow.cs | 4 ++-- 31 files changed, 51 insertions(+), 41 deletions(-) delete mode 100644 src/modules/Elsa.WorkflowTesting.Api/Models/WorkflowTestExecuteRequest.cs delete mode 100644 src/modules/Elsa.WorkflowTesting.Api/Models/WorkflowTestRestartFromActivityRequest.cs rename src/modules/{ => workflowtesting}/Elsa.WorkflowTesting.Api/Elsa.WorkflowTesting.Api.csproj (78%) rename src/modules/{ => workflowtesting}/Elsa.WorkflowTesting.Api/Endpoints/Execute.cs (100%) rename src/modules/{ => workflowtesting}/Elsa.WorkflowTesting.Api/Endpoints/RestartFromActivity.cs (100%) rename src/modules/{ => workflowtesting}/Elsa.WorkflowTesting.Api/Endpoints/Stop.cs (97%) rename src/modules/{ => workflowtesting}/Elsa.WorkflowTesting.Api/Extensions/ApplicationBuilderExtensions.cs (100%) rename src/modules/{ => workflowtesting}/Elsa.WorkflowTesting.Api/Extensions/ServiceCollectionExtensions.cs (100%) rename src/modules/{ => workflowtesting}/Elsa.WorkflowTesting.Api/Handlers/ActivityExecutionResultExecutedHandler.cs (100%) rename src/modules/{ => workflowtesting}/Elsa.WorkflowTesting.Api/Handlers/ConfigureWorkflowContextForTestHandler.cs (100%) rename src/modules/{ => workflowtesting}/Elsa.WorkflowTesting.Api/Hubs/Clients/IWorkflowTestClient.cs (100%) rename src/modules/{ => workflowtesting}/Elsa.WorkflowTesting.Api/Hubs/WorkflowTestHub.cs (100%) create mode 100644 src/modules/workflowtesting/Elsa.WorkflowTesting.Api/Models/WorkflowTestExecuteRequest.cs create mode 100644 src/modules/workflowtesting/Elsa.WorkflowTesting.Api/Models/WorkflowTestRestartFromActivityRequest.cs rename src/modules/{ => workflowtesting}/Elsa.WorkflowTesting.Api/Models/WorkflowTestStopRequest.cs (57%) rename src/modules/{ => workflowtesting}/Elsa.WorkflowTesting.Api/Services/WorkflowTestService.cs (100%) rename src/modules/{ => workflowtesting}/Elsa.WorkflowTesting/Elsa.WorkflowTesting.csproj (67%) rename src/modules/{ => workflowtesting}/Elsa.WorkflowTesting/Events/WorkflowTestExecutionStopped.cs (88%) rename src/modules/{ => workflowtesting}/Elsa.WorkflowTesting/Messages/WorkflowTestMessage.cs (100%) rename src/modules/{ => workflowtesting}/Elsa.WorkflowTesting/Services/IWorkflowTestLaunchpad.cs (100%) rename src/modules/{ => workflowtesting}/Elsa.WorkflowTesting/Services/IWorkflowTestService.cs (100%) rename src/modules/{ => workflowtesting}/Elsa.WorkflowTesting/Services/WorkflowTestLaunchpad.cs (95%) diff --git a/Elsa.sln b/Elsa.sln index b59455ce0..760e774dd 100644 --- a/Elsa.sln +++ b/Elsa.sln @@ -371,9 +371,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elsa.Retention", "src\modul EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflowtesting", "workflowtesting", "{1B0F0880-8390-4A1C-9AE8-D13427626794}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elsa.WorkflowTesting", "src\modules\Elsa.WorkflowTesting\Elsa.WorkflowTesting.csproj", "{0327324E-0B80-4A6A-A7D6-DD521657666F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elsa.WorkflowTesting", "src\modules\workflowtesting\Elsa.WorkflowTesting\Elsa.WorkflowTesting.csproj", "{0327324E-0B80-4A6A-A7D6-DD521657666F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elsa.WorkflowTesting.Api", "src\modules\Elsa.WorkflowTesting.Api\Elsa.WorkflowTesting.Api.csproj", "{4A4DC44E-D50F-49B8-A9DE-DED26FC05166}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elsa.WorkflowTesting.Api", "src\modules\workflowtesting\Elsa.WorkflowTesting.Api\Elsa.WorkflowTesting.Api.csproj", "{4A4DC44E-D50F-49B8-A9DE-DED26FC05166}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elsa.Samples.UniqueCorrelatedWorkflows", "src\samples\aspnet\Elsa.Samples.UniqueCorrelatedWorkflows\Elsa.Samples.UniqueCorrelatedWorkflows.csproj", "{4CD8293D-4544-4A23-BDEF-15B66D5E924F}" EndProject diff --git a/src/activities/Elsa.Activities.RabbitMq/Elsa.Activities.RabbitMq.csproj b/src/activities/Elsa.Activities.RabbitMq/Elsa.Activities.RabbitMq.csproj index fa021b9eb..25d5cba9b 100644 --- a/src/activities/Elsa.Activities.RabbitMq/Elsa.Activities.RabbitMq.csproj +++ b/src/activities/Elsa.Activities.RabbitMq/Elsa.Activities.RabbitMq.csproj @@ -4,11 +4,21 @@ net5.0 Elsa.Activities.RabbitMq latest + enable + Elsa Contributors + Elsa is a set of workflow libraries and tools that enable lean and mean workflowing capabilities in any .NET Core application. +This package provides activities to send and receive messages using Rabbit MQ. + 2021 + https://github.com/elsa-workflows/elsa-core + https://github.com/elsa-workflows/elsa-core + git + elsa, workflows + MIT - + diff --git a/src/activities/Elsa.Activities.RabbitMq/Services/Client.cs b/src/activities/Elsa.Activities.RabbitMq/Services/Client.cs index 3a9a52f93..2c7de12ea 100644 --- a/src/activities/Elsa.Activities.RabbitMq/Services/Client.cs +++ b/src/activities/Elsa.Activities.RabbitMq/Services/Client.cs @@ -15,7 +15,7 @@ namespace Elsa.Activities.RabbitMq.Services public class Client : IClient { private BuiltinHandlerActivator _activator; - private IBus _bus; + private IBus? _bus; public RabbitMqBusConfiguration Configuration { get; } @@ -53,7 +53,7 @@ namespace Elsa.Activities.RabbitMq.Services { if (_bus == null) ConfigureAsOneWayClient(); - await _bus.Advanced.Topics.Publish(Configuration.RoutingKey, message, Configuration.Headers); + await _bus!.Advanced.Topics.Publish(Configuration.RoutingKey, message, Configuration.Headers); } public void Dispose() @@ -63,13 +63,13 @@ namespace Elsa.Activities.RabbitMq.Services public void StartClient() { - if (_bus.Advanced.Workers.Count == 0) + if (_bus?.Advanced.Workers.Count == 0) _bus.Advanced.Workers.SetNumberOfWorkers(1); } public void StopClient() { - if (_bus.Advanced.Workers.Count == 1) + if (_bus?.Advanced.Workers.Count == 1) _bus.Advanced.Workers.SetNumberOfWorkers(0); } diff --git a/src/activities/Elsa.Activities.RabbitMq/Services/RabbitMqQueueStarter.cs b/src/activities/Elsa.Activities.RabbitMq/Services/RabbitMqQueueStarter.cs index 36ef828a4..1cdd402bf 100644 --- a/src/activities/Elsa.Activities.RabbitMq/Services/RabbitMqQueueStarter.cs +++ b/src/activities/Elsa.Activities.RabbitMq/Services/RabbitMqQueueStarter.cs @@ -97,7 +97,7 @@ namespace Elsa.Activities.RabbitMq.Services var routingKey = await activity.EvaluatePropertyValueAsync(x => x.RoutingKey, cancellationToken); var headers = await activity.EvaluatePropertyValueAsync(x => x.Headers, cancellationToken); - var config = new RabbitMqBusConfiguration(connectionString, routingKey, headers); + var config = new RabbitMqBusConfiguration(connectionString!, routingKey!, headers!); yield return config!; } diff --git a/src/activities/Elsa.Activities.RabbitMq/Testing/Handlers/ConfigureRabbitMqActivitiesForTestHandler.cs b/src/activities/Elsa.Activities.RabbitMq/Testing/Handlers/ConfigureRabbitMqActivitiesForTestHandler.cs index 498dfff0b..b810488cc 100644 --- a/src/activities/Elsa.Activities.RabbitMq/Testing/Handlers/ConfigureRabbitMqActivitiesForTestHandler.cs +++ b/src/activities/Elsa.Activities.RabbitMq/Testing/Handlers/ConfigureRabbitMqActivitiesForTestHandler.cs @@ -1,5 +1,5 @@ using Elsa.Events; -using Elsa.Testing.Events; +using Elsa.WorkflowTesting.Events; using MediatR; using System; using System.Threading; diff --git a/src/modules/Elsa.WorkflowTesting.Api/Models/WorkflowTestExecuteRequest.cs b/src/modules/Elsa.WorkflowTesting.Api/Models/WorkflowTestExecuteRequest.cs deleted file mode 100644 index 045c738bb..000000000 --- a/src/modules/Elsa.WorkflowTesting.Api/Models/WorkflowTestExecuteRequest.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Elsa.WorkflowTesting.Api.Models -{ - public class WorkflowTestExecuteRequest - { - public string? WorkflowDefinitionId { get; init; } - public int Version { get; init; } - public string? SignalRConnectionId { get; init; } - } -} \ No newline at end of file diff --git a/src/modules/Elsa.WorkflowTesting.Api/Models/WorkflowTestRestartFromActivityRequest.cs b/src/modules/Elsa.WorkflowTesting.Api/Models/WorkflowTestRestartFromActivityRequest.cs deleted file mode 100644 index c6302b0e4..000000000 --- a/src/modules/Elsa.WorkflowTesting.Api/Models/WorkflowTestRestartFromActivityRequest.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace Elsa.WorkflowTesting.Api.Models -{ - public class WorkflowTestRestartFromActivityRequest : WorkflowTestExecuteRequest - { - public string ActivityId { get; init; } - public string LastWorkflowInstanceId { get; init; } - } -} \ No newline at end of file diff --git a/src/modules/Elsa.WorkflowTesting.Api/Elsa.WorkflowTesting.Api.csproj b/src/modules/workflowtesting/Elsa.WorkflowTesting.Api/Elsa.WorkflowTesting.Api.csproj similarity index 78% rename from src/modules/Elsa.WorkflowTesting.Api/Elsa.WorkflowTesting.Api.csproj rename to src/modules/workflowtesting/Elsa.WorkflowTesting.Api/Elsa.WorkflowTesting.Api.csproj index 80af17ef6..abf8ba614 100644 --- a/src/modules/Elsa.WorkflowTesting.Api/Elsa.WorkflowTesting.Api.csproj +++ b/src/modules/workflowtesting/Elsa.WorkflowTesting.Api/Elsa.WorkflowTesting.Api.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/modules/Elsa.WorkflowTesting.Api/Endpoints/Execute.cs b/src/modules/workflowtesting/Elsa.WorkflowTesting.Api/Endpoints/Execute.cs similarity index 100% rename from src/modules/Elsa.WorkflowTesting.Api/Endpoints/Execute.cs rename to src/modules/workflowtesting/Elsa.WorkflowTesting.Api/Endpoints/Execute.cs diff --git a/src/modules/Elsa.WorkflowTesting.Api/Endpoints/RestartFromActivity.cs b/src/modules/workflowtesting/Elsa.WorkflowTesting.Api/Endpoints/RestartFromActivity.cs similarity index 100% rename from src/modules/Elsa.WorkflowTesting.Api/Endpoints/RestartFromActivity.cs rename to src/modules/workflowtesting/Elsa.WorkflowTesting.Api/Endpoints/RestartFromActivity.cs diff --git a/src/modules/Elsa.WorkflowTesting.Api/Endpoints/Stop.cs b/src/modules/workflowtesting/Elsa.WorkflowTesting.Api/Endpoints/Stop.cs similarity index 97% rename from src/modules/Elsa.WorkflowTesting.Api/Endpoints/Stop.cs rename to src/modules/workflowtesting/Elsa.WorkflowTesting.Api/Endpoints/Stop.cs index 5b6cafa44..9ed7381a9 100644 --- a/src/modules/Elsa.WorkflowTesting.Api/Endpoints/Stop.cs +++ b/src/modules/workflowtesting/Elsa.WorkflowTesting.Api/Endpoints/Stop.cs @@ -1,6 +1,6 @@ using Elsa.Server.Api.ActionFilters; using Elsa.Testing.Api.Models; -using Elsa.Testing.Events; +using Elsa.WorkflowTesting.Events; using MediatR; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; diff --git a/src/modules/Elsa.WorkflowTesting.Api/Extensions/ApplicationBuilderExtensions.cs b/src/modules/workflowtesting/Elsa.WorkflowTesting.Api/Extensions/ApplicationBuilderExtensions.cs similarity index 100% rename from src/modules/Elsa.WorkflowTesting.Api/Extensions/ApplicationBuilderExtensions.cs rename to src/modules/workflowtesting/Elsa.WorkflowTesting.Api/Extensions/ApplicationBuilderExtensions.cs diff --git a/src/modules/Elsa.WorkflowTesting.Api/Extensions/ServiceCollectionExtensions.cs b/src/modules/workflowtesting/Elsa.WorkflowTesting.Api/Extensions/ServiceCollectionExtensions.cs similarity index 100% rename from src/modules/Elsa.WorkflowTesting.Api/Extensions/ServiceCollectionExtensions.cs rename to src/modules/workflowtesting/Elsa.WorkflowTesting.Api/Extensions/ServiceCollectionExtensions.cs diff --git a/src/modules/Elsa.WorkflowTesting.Api/Handlers/ActivityExecutionResultExecutedHandler.cs b/src/modules/workflowtesting/Elsa.WorkflowTesting.Api/Handlers/ActivityExecutionResultExecutedHandler.cs similarity index 100% rename from src/modules/Elsa.WorkflowTesting.Api/Handlers/ActivityExecutionResultExecutedHandler.cs rename to src/modules/workflowtesting/Elsa.WorkflowTesting.Api/Handlers/ActivityExecutionResultExecutedHandler.cs diff --git a/src/modules/Elsa.WorkflowTesting.Api/Handlers/ConfigureWorkflowContextForTestHandler.cs b/src/modules/workflowtesting/Elsa.WorkflowTesting.Api/Handlers/ConfigureWorkflowContextForTestHandler.cs similarity index 100% rename from src/modules/Elsa.WorkflowTesting.Api/Handlers/ConfigureWorkflowContextForTestHandler.cs rename to src/modules/workflowtesting/Elsa.WorkflowTesting.Api/Handlers/ConfigureWorkflowContextForTestHandler.cs diff --git a/src/modules/Elsa.WorkflowTesting.Api/Hubs/Clients/IWorkflowTestClient.cs b/src/modules/workflowtesting/Elsa.WorkflowTesting.Api/Hubs/Clients/IWorkflowTestClient.cs similarity index 100% rename from src/modules/Elsa.WorkflowTesting.Api/Hubs/Clients/IWorkflowTestClient.cs rename to src/modules/workflowtesting/Elsa.WorkflowTesting.Api/Hubs/Clients/IWorkflowTestClient.cs diff --git a/src/modules/Elsa.WorkflowTesting.Api/Hubs/WorkflowTestHub.cs b/src/modules/workflowtesting/Elsa.WorkflowTesting.Api/Hubs/WorkflowTestHub.cs similarity index 100% rename from src/modules/Elsa.WorkflowTesting.Api/Hubs/WorkflowTestHub.cs rename to src/modules/workflowtesting/Elsa.WorkflowTesting.Api/Hubs/WorkflowTestHub.cs diff --git a/src/modules/workflowtesting/Elsa.WorkflowTesting.Api/Models/WorkflowTestExecuteRequest.cs b/src/modules/workflowtesting/Elsa.WorkflowTesting.Api/Models/WorkflowTestExecuteRequest.cs new file mode 100644 index 000000000..e1ae7cdde --- /dev/null +++ b/src/modules/workflowtesting/Elsa.WorkflowTesting.Api/Models/WorkflowTestExecuteRequest.cs @@ -0,0 +1,9 @@ +namespace Elsa.WorkflowTesting.Api.Models +{ + public class WorkflowTestExecuteRequest + { + public string WorkflowDefinitionId { get; init; } = default!; + public int Version { get; init; } + public string SignalRConnectionId { get; init; } = default!; + } +} \ No newline at end of file diff --git a/src/modules/workflowtesting/Elsa.WorkflowTesting.Api/Models/WorkflowTestRestartFromActivityRequest.cs b/src/modules/workflowtesting/Elsa.WorkflowTesting.Api/Models/WorkflowTestRestartFromActivityRequest.cs new file mode 100644 index 000000000..4f55914b6 --- /dev/null +++ b/src/modules/workflowtesting/Elsa.WorkflowTesting.Api/Models/WorkflowTestRestartFromActivityRequest.cs @@ -0,0 +1,8 @@ +namespace Elsa.WorkflowTesting.Api.Models +{ + public class WorkflowTestRestartFromActivityRequest : WorkflowTestExecuteRequest + { + public string ActivityId { get; init; } = default!; + public string LastWorkflowInstanceId { get; init; } = default!; + } +} \ No newline at end of file diff --git a/src/modules/Elsa.WorkflowTesting.Api/Models/WorkflowTestStopRequest.cs b/src/modules/workflowtesting/Elsa.WorkflowTesting.Api/Models/WorkflowTestStopRequest.cs similarity index 57% rename from src/modules/Elsa.WorkflowTesting.Api/Models/WorkflowTestStopRequest.cs rename to src/modules/workflowtesting/Elsa.WorkflowTesting.Api/Models/WorkflowTestStopRequest.cs index 012206084..861de6db0 100644 --- a/src/modules/Elsa.WorkflowTesting.Api/Models/WorkflowTestStopRequest.cs +++ b/src/modules/workflowtesting/Elsa.WorkflowTesting.Api/Models/WorkflowTestStopRequest.cs @@ -2,6 +2,6 @@ namespace Elsa.Testing.Api.Models { public class WorkflowTestStopRequest { - public string WorkflowInstanceId { get; init; } + public string WorkflowInstanceId { get; init; } = default!; } } diff --git a/src/modules/Elsa.WorkflowTesting.Api/Services/WorkflowTestService.cs b/src/modules/workflowtesting/Elsa.WorkflowTesting.Api/Services/WorkflowTestService.cs similarity index 100% rename from src/modules/Elsa.WorkflowTesting.Api/Services/WorkflowTestService.cs rename to src/modules/workflowtesting/Elsa.WorkflowTesting.Api/Services/WorkflowTestService.cs diff --git a/src/modules/Elsa.WorkflowTesting/Elsa.WorkflowTesting.csproj b/src/modules/workflowtesting/Elsa.WorkflowTesting/Elsa.WorkflowTesting.csproj similarity index 67% rename from src/modules/Elsa.WorkflowTesting/Elsa.WorkflowTesting.csproj rename to src/modules/workflowtesting/Elsa.WorkflowTesting/Elsa.WorkflowTesting.csproj index c92ed7008..66a6828ab 100644 --- a/src/modules/Elsa.WorkflowTesting/Elsa.WorkflowTesting.csproj +++ b/src/modules/workflowtesting/Elsa.WorkflowTesting/Elsa.WorkflowTesting.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/src/modules/Elsa.WorkflowTesting/Events/WorkflowTestExecutionStopped.cs b/src/modules/workflowtesting/Elsa.WorkflowTesting/Events/WorkflowTestExecutionStopped.cs similarity index 88% rename from src/modules/Elsa.WorkflowTesting/Events/WorkflowTestExecutionStopped.cs rename to src/modules/workflowtesting/Elsa.WorkflowTesting/Events/WorkflowTestExecutionStopped.cs index 88d1b7246..8ac304e63 100644 --- a/src/modules/Elsa.WorkflowTesting/Events/WorkflowTestExecutionStopped.cs +++ b/src/modules/workflowtesting/Elsa.WorkflowTesting/Events/WorkflowTestExecutionStopped.cs @@ -1,6 +1,6 @@ using MediatR; -namespace Elsa.Testing.Events +namespace Elsa.WorkflowTesting.Events { public class WorkflowTestExecutionStopped : INotification { diff --git a/src/modules/Elsa.WorkflowTesting/Messages/WorkflowTestMessage.cs b/src/modules/workflowtesting/Elsa.WorkflowTesting/Messages/WorkflowTestMessage.cs similarity index 100% rename from src/modules/Elsa.WorkflowTesting/Messages/WorkflowTestMessage.cs rename to src/modules/workflowtesting/Elsa.WorkflowTesting/Messages/WorkflowTestMessage.cs diff --git a/src/modules/Elsa.WorkflowTesting/Services/IWorkflowTestLaunchpad.cs b/src/modules/workflowtesting/Elsa.WorkflowTesting/Services/IWorkflowTestLaunchpad.cs similarity index 100% rename from src/modules/Elsa.WorkflowTesting/Services/IWorkflowTestLaunchpad.cs rename to src/modules/workflowtesting/Elsa.WorkflowTesting/Services/IWorkflowTestLaunchpad.cs diff --git a/src/modules/Elsa.WorkflowTesting/Services/IWorkflowTestService.cs b/src/modules/workflowtesting/Elsa.WorkflowTesting/Services/IWorkflowTestService.cs similarity index 100% rename from src/modules/Elsa.WorkflowTesting/Services/IWorkflowTestService.cs rename to src/modules/workflowtesting/Elsa.WorkflowTesting/Services/IWorkflowTestService.cs diff --git a/src/modules/Elsa.WorkflowTesting/Services/WorkflowTestLaunchpad.cs b/src/modules/workflowtesting/Elsa.WorkflowTesting/Services/WorkflowTestLaunchpad.cs similarity index 95% rename from src/modules/Elsa.WorkflowTesting/Services/WorkflowTestLaunchpad.cs rename to src/modules/workflowtesting/Elsa.WorkflowTesting/Services/WorkflowTestLaunchpad.cs index 549d4e10b..5700a9d59 100644 --- a/src/modules/Elsa.WorkflowTesting/Services/WorkflowTestLaunchpad.cs +++ b/src/modules/workflowtesting/Elsa.WorkflowTesting/Services/WorkflowTestLaunchpad.cs @@ -54,7 +54,7 @@ namespace Elsa.WorkflowTesting.Services var workflow = await InstantiateStartableWorkflow(startableWorkflowDefinition, cancellationToken); - var previousActivityData = GetActivityDataFromLastWorkflowInstance(workflow.WorkflowInstance, lastWorkflowInstance, workflowBlueprint, activityId); + var previousActivityData = GetActivityDataFromLastWorkflowInstance(lastWorkflowInstance, workflowBlueprint, activityId); MergeActivityDataIntoInstance(workflow.WorkflowInstance, previousActivityData); @@ -80,7 +80,7 @@ namespace Elsa.WorkflowTesting.Services } } - private IDictionary> GetActivityDataFromLastWorkflowInstance(WorkflowInstance currentWorkflowInstance, WorkflowInstance lastWorkflowInstance, IWorkflowBlueprint workflowBlueprint, string startingActivityId) + private IDictionary> GetActivityDataFromLastWorkflowInstance(WorkflowInstance lastWorkflowInstance, IWorkflowBlueprint workflowBlueprint, string startingActivityId) { IDictionary> CollectSourceActivityData(string targetActivityId, IDictionary> activityDataAccumulator) { diff --git a/src/samples/server/Elsa.Samples.Server.Host/Elsa.Samples.Server.Host.csproj b/src/samples/server/Elsa.Samples.Server.Host/Elsa.Samples.Server.Host.csproj index 976eb2367..ba1921b20 100644 --- a/src/samples/server/Elsa.Samples.Server.Host/Elsa.Samples.Server.Host.csproj +++ b/src/samples/server/Elsa.Samples.Server.Host/Elsa.Samples.Server.Host.csproj @@ -1,4 +1,4 @@ - + @@ -37,8 +37,8 @@ - - + + diff --git a/src/samples/worker/Elsa.Samples.RabbitMqWorker/Workflows/ConsumerWorkflow.cs b/src/samples/worker/Elsa.Samples.RabbitMqWorker/Workflows/ConsumerWorkflow.cs index 7dc24b29b..758d34baf 100644 --- a/src/samples/worker/Elsa.Samples.RabbitMqWorker/Workflows/ConsumerWorkflow.cs +++ b/src/samples/worker/Elsa.Samples.RabbitMqWorker/Workflows/ConsumerWorkflow.cs @@ -19,7 +19,7 @@ namespace Elsa.Samples.RabbitMqWorker.Workflows { builder .Timer(Duration.FromSeconds(5)) - .MessageReceived(_connectionString, "Podcasts.Weather", null) + .MessageReceived(_connectionString, "Podcasts.Weather", default!) .WriteLine(context => { var message = context.GetInput(); diff --git a/src/samples/worker/Elsa.Samples.RabbitMqWorker/Workflows/ProducerWorkflow.cs b/src/samples/worker/Elsa.Samples.RabbitMqWorker/Workflows/ProducerWorkflow.cs index 08ca1eb2f..a4734eefd 100644 --- a/src/samples/worker/Elsa.Samples.RabbitMqWorker/Workflows/ProducerWorkflow.cs +++ b/src/samples/worker/Elsa.Samples.RabbitMqWorker/Workflows/ProducerWorkflow.cs @@ -20,7 +20,7 @@ namespace Elsa.Samples.RabbitMqWorker.Workflows builder .Timer(Duration.FromSeconds(5)) .WriteLine("Sending a weather update with the \"Podcasts.Weather\" topic.") - .SendTopicMessage(_connectionString, "Podcasts.Weather", null, "Cloudy with a chance of meatballs"); + .SendTopicMessage(_connectionString, "Podcasts.Weather", default!, "Cloudy with a chance of meatballs"); } } } \ No newline at end of file diff --git a/src/samples/worker/Elsa.Samples.RabbitMqWorker/Workflows/SendAndReceiveWorkflow.cs b/src/samples/worker/Elsa.Samples.RabbitMqWorker/Workflows/SendAndReceiveWorkflow.cs index c02a721a7..18f1f9523 100644 --- a/src/samples/worker/Elsa.Samples.RabbitMqWorker/Workflows/SendAndReceiveWorkflow.cs +++ b/src/samples/worker/Elsa.Samples.RabbitMqWorker/Workflows/SendAndReceiveWorkflow.cs @@ -21,8 +21,8 @@ namespace Elsa.Samples.RabbitMqWorker.Workflows return $"Start! - correlationId: {correlationId}"; }) - .SendTopicMessage(_connectionString, "Greetings", null, "Greetings from RabbitMQ") - .MessageReceived(_connectionString, "Greetings", null) + .SendTopicMessage(_connectionString, "Greetings", default!, "Greetings from RabbitMQ") + .MessageReceived(_connectionString, "Greetings", default!) .WriteLine(ctx => "End: " + (string)ctx.Input); }