diff --git a/src/activities/Elsa.Activities.Http/Activities/HttpRequestReceived/HttpRequestReceived.cs b/src/activities/Elsa.Activities.Http/Activities/HttpEndpoint/HttpEndpoint.cs similarity index 95% rename from src/activities/Elsa.Activities.Http/Activities/HttpRequestReceived/HttpRequestReceived.cs rename to src/activities/Elsa.Activities.Http/Activities/HttpEndpoint/HttpEndpoint.cs index aa1d5d742..68cc85e5a 100644 --- a/src/activities/Elsa.Activities.Http/Activities/HttpRequestReceived/HttpRequestReceived.cs +++ b/src/activities/Elsa.Activities.Http/Activities/HttpEndpoint/HttpEndpoint.cs @@ -17,16 +17,16 @@ namespace Elsa.Activities.Http { [Trigger( Category = "HTTP", - DisplayName = "Receive HTTP Request", - Description = "Receive an incoming HTTP request.", + DisplayName = "HTTP Endpoint", + Description = "Handle an incoming HTTP request.", Outcomes = new[] { OutcomeNames.Done } )] - public class HttpRequestReceived : Activity + public class HttpEndpoint : Activity { private readonly IHttpContextAccessor _httpContextAccessor; private readonly IEnumerable _parsers; - public HttpRequestReceived( + public HttpEndpoint( IHttpContextAccessor httpContextAccessor, IEnumerable parsers) { diff --git a/src/activities/Elsa.Activities.Http/Activities/HttpEndpoint/HttpEndpointBuilderExtensions.cs b/src/activities/Elsa.Activities.Http/Activities/HttpEndpoint/HttpEndpointBuilderExtensions.cs new file mode 100644 index 000000000..dea684544 --- /dev/null +++ b/src/activities/Elsa.Activities.Http/Activities/HttpEndpoint/HttpEndpointBuilderExtensions.cs @@ -0,0 +1,41 @@ +using System; +using System.Runtime.CompilerServices; +using System.Threading.Tasks; +using Elsa.Builders; +using Elsa.Services.Models; +using Microsoft.AspNetCore.Http; + +// ReSharper disable ExplicitCallerInfoArgument +// ReSharper disable once CheckNamespace +namespace Elsa.Activities.Http +{ + public static class HttpEndpointBuilderExtensions + { + public static IActivityBuilder HttpEndpoint(this IBuilder builder, Action> setup, [CallerLineNumber] int lineNumber = default, [CallerFilePath] string? sourceFile = default) => + builder.Then(setup, null, lineNumber, sourceFile); + + public static IActivityBuilder HttpEndpoint(this IBuilder builder, Func> path, [CallerLineNumber] int lineNumber = default, [CallerFilePath] string? sourceFile = default) => + builder.HttpEndpoint(setup => setup.Set(x => x.Path, path), lineNumber, sourceFile); + + public static IActivityBuilder HttpEndpoint(this IBuilder builder, Func path, [CallerLineNumber] int lineNumber = default, [CallerFilePath] string? sourceFile = default) => + builder.HttpEndpoint(setup => setup.Set(x => x.Path, path), lineNumber, sourceFile); + + public static IActivityBuilder HttpEndpoint(this IBuilder builder, Func> path, [CallerLineNumber] int lineNumber = default, [CallerFilePath] string? sourceFile = default) => + builder.HttpEndpoint(setup => setup.Set(x => x.Path, path), lineNumber, sourceFile); + + public static IActivityBuilder HttpEndpoint(this IBuilder builder, Func path, [CallerLineNumber] int lineNumber = default, [CallerFilePath] string? sourceFile = default) => + builder.HttpEndpoint(setup => setup.Set(x => x.Path, path), lineNumber, sourceFile); + + public static IActivityBuilder HttpEndpoint(this IBuilder builder, PathString path, [CallerLineNumber] int lineNumber = default, [CallerFilePath] string? sourceFile = default) => + builder.HttpEndpoint(setup => setup.Set(x => x.Path, path), lineNumber, sourceFile); + + public static IActivityBuilder ReceiveHttpPostRequest(this IBuilder builder, Func path, [CallerLineNumber] int lineNumber = default, [CallerFilePath] string? sourceFile = default) => + builder.HttpEndpoint(activity => activity.WithPath(path).WithMethod(HttpMethods.Post).WithTargetType(), lineNumber, sourceFile); + + public static IActivityBuilder ReceiveHttpPostRequest(this IBuilder builder, Func path, [CallerLineNumber] int lineNumber = default, [CallerFilePath] string? sourceFile = default) => + builder.HttpEndpoint(activity => activity.WithPath(path).WithMethod(HttpMethods.Post).WithTargetType(), lineNumber, sourceFile); + + public static IActivityBuilder ReceiveHttpPostRequest(this IBuilder builder, PathString path, [CallerLineNumber] int lineNumber = default, [CallerFilePath] string? sourceFile = default) => + builder.HttpEndpoint(activity => activity.WithPath(path).WithMethod(HttpMethods.Post).WithTargetType(), lineNumber, sourceFile); + } +} \ No newline at end of file diff --git a/src/activities/Elsa.Activities.Http/Activities/HttpEndpoint/HttpEndpointExtensions.cs b/src/activities/Elsa.Activities.Http/Activities/HttpEndpoint/HttpEndpointExtensions.cs new file mode 100644 index 000000000..81103b99a --- /dev/null +++ b/src/activities/Elsa.Activities.Http/Activities/HttpEndpoint/HttpEndpointExtensions.cs @@ -0,0 +1,37 @@ +using System; +using System.Threading.Tasks; +using Elsa.Builders; +using Elsa.Services.Models; +using Microsoft.AspNetCore.Http; + +// ReSharper disable once CheckNamespace +namespace Elsa.Activities.Http +{ + public static class HttpEndpointExtensions + { + public static ISetupActivity WithPath(this ISetupActivity activity, Func> path) => activity.Set(x => x.Path, path); + public static ISetupActivity WithPath(this ISetupActivity activity, Func> path) => activity.Set(x => x.Path, path); + public static ISetupActivity WithPath(this ISetupActivity activity, Func path) => activity.Set(x => x.Path, path); + public static ISetupActivity WithPath(this ISetupActivity activity, Func path) => activity.Set(x => x.Path, path); + public static ISetupActivity WithPath(this ISetupActivity activity, PathString path) => activity.Set(x => x.Path, path); + + public static ISetupActivity WithMethod(this ISetupActivity activity, Func> method) => activity.Set(x => x.Method, method); + public static ISetupActivity WithMethod(this ISetupActivity activity, Func> method) => activity.Set(x => x.Method, method); + public static ISetupActivity WithMethod(this ISetupActivity activity, Func method) => activity.Set(x => x.Method, method); + public static ISetupActivity WithMethod(this ISetupActivity activity, Func method) => activity.Set(x => x.Method, method); + public static ISetupActivity WithMethod(this ISetupActivity activity, string? method) => activity.Set(x => x.Method, method); + + public static ISetupActivity WithReadContent(this ISetupActivity activity, Func> value) => activity.Set(x => x.ReadContent, value); + public static ISetupActivity WithReadContent(this ISetupActivity activity, Func> value) => activity.Set(x => x.ReadContent, value); + public static ISetupActivity WithReadContent(this ISetupActivity activity, Func value) => activity.Set(x => x.ReadContent, value); + public static ISetupActivity WithReadContent(this ISetupActivity activity, Func value) => activity.Set(x => x.ReadContent, value); + public static ISetupActivity WithReadContent(this ISetupActivity activity, bool value = true) => activity.Set(x => x.ReadContent, value); + + public static ISetupActivity WithTargetType(this ISetupActivity activity, Func> value) => activity.Set(x => x.TargetType, value).WithReadContent(); + public static ISetupActivity WithTargetType(this ISetupActivity activity, Func> value) => activity.Set(x => x.TargetType, value).WithReadContent(); + public static ISetupActivity WithTargetType(this ISetupActivity activity, Func value) => activity.Set(x => x.TargetType, value).WithReadContent(); + public static ISetupActivity WithTargetType(this ISetupActivity activity, Func value) => activity.Set(x => x.TargetType, value).WithReadContent(); + public static ISetupActivity WithTargetType(this ISetupActivity activity, Type? value) => activity.Set(x => x.TargetType, value).WithReadContent(); + public static ISetupActivity WithTargetType(this ISetupActivity activity) => activity.Set(x => x.TargetType, typeof(T)).WithReadContent(); + } +} \ No newline at end of file diff --git a/src/activities/Elsa.Activities.Http/Activities/HttpRequestReceived/HttpRequestReceivedBuilderExtensions.cs b/src/activities/Elsa.Activities.Http/Activities/HttpRequestReceived/HttpRequestReceivedBuilderExtensions.cs deleted file mode 100644 index 50c972667..000000000 --- a/src/activities/Elsa.Activities.Http/Activities/HttpRequestReceived/HttpRequestReceivedBuilderExtensions.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System; -using System.Runtime.CompilerServices; -using System.Threading.Tasks; -using Elsa.Builders; -using Elsa.Services.Models; -using Microsoft.AspNetCore.Http; - -// ReSharper disable ExplicitCallerInfoArgument -// ReSharper disable once CheckNamespace -namespace Elsa.Activities.Http -{ - public static class HttpRequestReceivedBuilderExtensions - { - public static IActivityBuilder HttpRequestReceived(this IBuilder builder, Action> setup, [CallerLineNumber] int lineNumber = default, [CallerFilePath] string? sourceFile = default) => - builder.Then(setup, null, lineNumber, sourceFile); - - public static IActivityBuilder HttpRequestReceived(this IBuilder builder, Func> path, [CallerLineNumber] int lineNumber = default, [CallerFilePath] string? sourceFile = default) => - builder.HttpRequestReceived(setup => setup.Set(x => x.Path, path), lineNumber, sourceFile); - - public static IActivityBuilder HttpRequestReceived(this IBuilder builder, Func path, [CallerLineNumber] int lineNumber = default, [CallerFilePath] string? sourceFile = default) => - builder.HttpRequestReceived(setup => setup.Set(x => x.Path, path), lineNumber, sourceFile); - - public static IActivityBuilder HttpRequestReceived(this IBuilder builder, Func> path, [CallerLineNumber] int lineNumber = default, [CallerFilePath] string? sourceFile = default) => - builder.HttpRequestReceived(setup => setup.Set(x => x.Path, path), lineNumber, sourceFile); - - public static IActivityBuilder HttpRequestReceived(this IBuilder builder, Func path, [CallerLineNumber] int lineNumber = default, [CallerFilePath] string? sourceFile = default) => - builder.HttpRequestReceived(setup => setup.Set(x => x.Path, path), lineNumber, sourceFile); - - public static IActivityBuilder HttpRequestReceived(this IBuilder builder, PathString path, [CallerLineNumber] int lineNumber = default, [CallerFilePath] string? sourceFile = default) => - builder.HttpRequestReceived(setup => setup.Set(x => x.Path, path), lineNumber, sourceFile); - - public static IActivityBuilder ReceiveHttpPostRequest(this IBuilder builder, Func path, [CallerLineNumber] int lineNumber = default, [CallerFilePath] string? sourceFile = default) => - builder.HttpRequestReceived(activity => activity.WithPath(path).WithMethod(HttpMethods.Post).WithTargetType(), lineNumber, sourceFile); - - public static IActivityBuilder ReceiveHttpPostRequest(this IBuilder builder, Func path, [CallerLineNumber] int lineNumber = default, [CallerFilePath] string? sourceFile = default) => - builder.HttpRequestReceived(activity => activity.WithPath(path).WithMethod(HttpMethods.Post).WithTargetType(), lineNumber, sourceFile); - - public static IActivityBuilder ReceiveHttpPostRequest(this IBuilder builder, PathString path, [CallerLineNumber] int lineNumber = default, [CallerFilePath] string? sourceFile = default) => - builder.HttpRequestReceived(activity => activity.WithPath(path).WithMethod(HttpMethods.Post).WithTargetType(), lineNumber, sourceFile); - } -} \ No newline at end of file diff --git a/src/activities/Elsa.Activities.Http/Activities/HttpRequestReceived/HttpRequestReceivedExtensions.cs b/src/activities/Elsa.Activities.Http/Activities/HttpRequestReceived/HttpRequestReceivedExtensions.cs deleted file mode 100644 index 586de890b..000000000 --- a/src/activities/Elsa.Activities.Http/Activities/HttpRequestReceived/HttpRequestReceivedExtensions.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System; -using System.Threading.Tasks; -using Elsa.Builders; -using Elsa.Services.Models; -using Microsoft.AspNetCore.Http; - -// ReSharper disable once CheckNamespace -namespace Elsa.Activities.Http -{ - public static class HttpRequestReceivedExtensions - { - public static ISetupActivity WithPath(this ISetupActivity activity, Func> path) => activity.Set(x => x.Path, path); - public static ISetupActivity WithPath(this ISetupActivity activity, Func> path) => activity.Set(x => x.Path, path); - public static ISetupActivity WithPath(this ISetupActivity activity, Func path) => activity.Set(x => x.Path, path); - public static ISetupActivity WithPath(this ISetupActivity activity, Func path) => activity.Set(x => x.Path, path); - public static ISetupActivity WithPath(this ISetupActivity activity, PathString path) => activity.Set(x => x.Path, path); - - public static ISetupActivity WithMethod(this ISetupActivity activity, Func> method) => activity.Set(x => x.Method, method); - public static ISetupActivity WithMethod(this ISetupActivity activity, Func> method) => activity.Set(x => x.Method, method); - public static ISetupActivity WithMethod(this ISetupActivity activity, Func method) => activity.Set(x => x.Method, method); - public static ISetupActivity WithMethod(this ISetupActivity activity, Func method) => activity.Set(x => x.Method, method); - public static ISetupActivity WithMethod(this ISetupActivity activity, string? method) => activity.Set(x => x.Method, method); - - public static ISetupActivity WithReadContent(this ISetupActivity activity, Func> value) => activity.Set(x => x.ReadContent, value); - public static ISetupActivity WithReadContent(this ISetupActivity activity, Func> value) => activity.Set(x => x.ReadContent, value); - public static ISetupActivity WithReadContent(this ISetupActivity activity, Func value) => activity.Set(x => x.ReadContent, value); - public static ISetupActivity WithReadContent(this ISetupActivity activity, Func value) => activity.Set(x => x.ReadContent, value); - public static ISetupActivity WithReadContent(this ISetupActivity activity, bool value = true) => activity.Set(x => x.ReadContent, value); - - public static ISetupActivity WithTargetType(this ISetupActivity activity, Func> value) => activity.Set(x => x.TargetType, value).WithReadContent(); - public static ISetupActivity WithTargetType(this ISetupActivity activity, Func> value) => activity.Set(x => x.TargetType, value).WithReadContent(); - public static ISetupActivity WithTargetType(this ISetupActivity activity, Func value) => activity.Set(x => x.TargetType, value).WithReadContent(); - public static ISetupActivity WithTargetType(this ISetupActivity activity, Func value) => activity.Set(x => x.TargetType, value).WithReadContent(); - public static ISetupActivity WithTargetType(this ISetupActivity activity, Type? value) => activity.Set(x => x.TargetType, value).WithReadContent(); - public static ISetupActivity WithTargetType(this ISetupActivity activity) => activity.Set(x => x.TargetType, typeof(T)).WithReadContent(); - } -} \ No newline at end of file diff --git a/src/activities/Elsa.Activities.Http/Bookmarks/HttpRequestReceivedBookmark.cs b/src/activities/Elsa.Activities.Http/Bookmarks/HttpRequestReceivedBookmark.cs index 7e3f286cb..f6d3d9904 100644 --- a/src/activities/Elsa.Activities.Http/Bookmarks/HttpRequestReceivedBookmark.cs +++ b/src/activities/Elsa.Activities.Http/Bookmarks/HttpRequestReceivedBookmark.cs @@ -13,9 +13,9 @@ namespace Elsa.Activities.Http.Bookmarks public string? CorrelationId { get; set; } } - public class HttpRequestReceivedTriggerProvider : BookmarkProvider + public class HttpRequestReceivedTriggerProvider : BookmarkProvider { - public override async ValueTask> GetBookmarksAsync(BookmarkProviderContext context, CancellationToken cancellationToken) + public override async ValueTask> GetBookmarksAsync(BookmarkProviderContext context, CancellationToken cancellationToken) { var path = ToLower(await context.Activity.GetPropertyValueAsync(x => x.Path, cancellationToken)); var method = ToLower(await context.Activity.GetPropertyValueAsync(x => x.Method, cancellationToken)); diff --git a/src/activities/Elsa.Activities.Http/Extensions/ServiceCollectionExtensions.cs b/src/activities/Elsa.Activities.Http/Extensions/ServiceCollectionExtensions.cs index bd0dd4d03..b6dae243b 100644 --- a/src/activities/Elsa.Activities.Http/Extensions/ServiceCollectionExtensions.cs +++ b/src/activities/Elsa.Activities.Http/Extensions/ServiceCollectionExtensions.cs @@ -53,7 +53,7 @@ namespace Microsoft.Extensions.DependencyInjection private static ElsaOptions AddHttpActivitiesInternal(this ElsaOptions options) => options - .AddActivity() + .AddActivity() .AddActivity() .AddActivity() .AddActivity(); diff --git a/src/activities/Elsa.Activities.Http/Middleware/HttpRequestMiddleware.cs b/src/activities/Elsa.Activities.Http/Middleware/HttpRequestMiddleware.cs index 450ca6f4f..67003a4a7 100644 --- a/src/activities/Elsa.Activities.Http/Middleware/HttpRequestMiddleware.cs +++ b/src/activities/Elsa.Activities.Http/Middleware/HttpRequestMiddleware.cs @@ -79,7 +79,7 @@ namespace Elsa.Activities.Http.Middleware }; var triggers = new[] { triggerWithMethod, triggerWithoutMethod }; - var results = await bookmarkFinder.FindBookmarksAsync(triggers, TenantId, cancellationToken).ToList(); + var results = await bookmarkFinder.FindBookmarksAsync(triggers, TenantId, cancellationToken).ToList(); if (!results.Any()) { @@ -139,7 +139,7 @@ namespace Elsa.Activities.Http.Middleware var httpWorkflows = from workflow in workflows where workflow.TenantId == TenantId - from activity in workflow.GetStartActivities() + from activity in workflow.GetStartActivities() select (workflow, activity); var matches = new List<(IWorkflowBlueprint, IActivityBlueprint, PathString, string?)>(); @@ -149,7 +149,7 @@ namespace Elsa.Activities.Http.Middleware var workflow = httpWorkflow.workflow; var activity = httpWorkflow.activity; var workflowWrapper = await workflowBlueprintReflector.ReflectAsync(serviceProvider, workflow, cancellationToken); - var activityWrapper = workflowWrapper.GetActivity(activity.Id)!; + var activityWrapper = workflowWrapper.GetActivity(activity.Id)!; var path = await activityWrapper.GetPropertyValueAsync(x => x.Path, cancellationToken); var method = await activityWrapper.GetPropertyValueAsync(x => x.Method, cancellationToken); diff --git a/src/samples/aspnet/Elsa.Samples.CorrelationHttp/Workflows/RegistrationWorkflow.cs b/src/samples/aspnet/Elsa.Samples.CorrelationHttp/Workflows/RegistrationWorkflow.cs index fb7839a8b..9c369bb16 100644 --- a/src/samples/aspnet/Elsa.Samples.CorrelationHttp/Workflows/RegistrationWorkflow.cs +++ b/src/samples/aspnet/Elsa.Samples.CorrelationHttp/Workflows/RegistrationWorkflow.cs @@ -18,7 +18,7 @@ namespace Elsa.Samples.CorrelationHttp.Workflows { builder // Configure a Receive HTTP Request trigger that executes on incoming HTTP POST requests. - .HttpRequestReceived(activity => activity.WithPath("/register").WithMethod(HttpMethods.Post).WithTargetType()) + .HttpEndpoint(activity => activity.WithPath("/register").WithMethod(HttpMethods.Post).WithTargetType()) // Store the registration as a workflow variable for easier access. .SetVariable(context => (Registration)((HttpRequestModel)(context.Input))?.Body) @@ -38,7 +38,7 @@ namespace Elsa.Samples.CorrelationHttp.Workflows // Configure another Receive HTTP Request trigger that executes on incoming HTTP GET requests. // This will cause the workflow to become suspended and executed once the request comes in. - .HttpRequestReceived(activity => activity.WithPath("/confirm")) + .HttpEndpoint(activity => activity.WithPath("/confirm")) // Write an HTTP response with a thank-you note. // Notice that the correct workflow instance is resumed base on the incoming correlation ID. diff --git a/src/samples/aspnet/Elsa.Samples.CustomActivities/EchoQueryStringWorkflow.cs b/src/samples/aspnet/Elsa.Samples.CustomActivities/EchoQueryStringWorkflow.cs index 7196839bb..e3e887978 100644 --- a/src/samples/aspnet/Elsa.Samples.CustomActivities/EchoQueryStringWorkflow.cs +++ b/src/samples/aspnet/Elsa.Samples.CustomActivities/EchoQueryStringWorkflow.cs @@ -12,7 +12,7 @@ namespace Elsa.Samples.CustomActivities public void Build(IWorkflowBuilder builder) { builder - .HttpRequestReceived("/test") + .HttpEndpoint("/test") .Then() .WriteHttpResponse(_ => HttpStatusCode.OK, GenerateSomeHtml, _ => "text/html"); } diff --git a/src/samples/aspnet/Elsa.Samples.HelloWorldHttp/HelloHttpWorkflow.cs b/src/samples/aspnet/Elsa.Samples.HelloWorldHttp/HelloHttpWorkflow.cs index 5bd719c4a..6d6ba6ce5 100644 --- a/src/samples/aspnet/Elsa.Samples.HelloWorldHttp/HelloHttpWorkflow.cs +++ b/src/samples/aspnet/Elsa.Samples.HelloWorldHttp/HelloHttpWorkflow.cs @@ -12,7 +12,7 @@ namespace Elsa.Samples.HelloWorldHttp public void Build(IWorkflowBuilder builder) { builder - .HttpRequestReceived("/hello") + .HttpEndpoint("/hello") .WriteHttpResponse(HttpStatusCode.OK, "Hello World!", "text/html"); } } diff --git a/src/samples/aspnet/Elsa.Samples.ReadModelHttp/Workflows/SaveContactWorkflow.cs b/src/samples/aspnet/Elsa.Samples.ReadModelHttp/Workflows/SaveContactWorkflow.cs index 9ead0b32f..7f443cbf6 100644 --- a/src/samples/aspnet/Elsa.Samples.ReadModelHttp/Workflows/SaveContactWorkflow.cs +++ b/src/samples/aspnet/Elsa.Samples.ReadModelHttp/Workflows/SaveContactWorkflow.cs @@ -22,7 +22,7 @@ namespace Elsa.Samples.ReadModelHttp.Workflows builder // Configure a Receive HTTP Request trigger that executes on incoming HTTP POST requests. - .HttpRequestReceived(activity => activity.WithPath("/contacts").WithMethod(HttpMethods.Post).WithTargetType()).WithName("HttpRequest") + .HttpEndpoint(activity => activity.WithPath("/contacts").WithMethod(HttpMethods.Post).WithTargetType()).WithName("HttpRequest") // Write something to the console to demonstrate that we can receive the outcome of the previous activity (HttpRequest) as an input to this WriteLine activity. .WriteLine(context => $"Received some contact details: {JsonConvert.SerializeObject(context.Input)}") diff --git a/src/samples/dashboard/ElsaDashboard.Samples.Monolith/Workflows/FaultyWorkflow.cs b/src/samples/dashboard/ElsaDashboard.Samples.Monolith/Workflows/FaultyWorkflow.cs index bd645b452..308a87df8 100644 --- a/src/samples/dashboard/ElsaDashboard.Samples.Monolith/Workflows/FaultyWorkflow.cs +++ b/src/samples/dashboard/ElsaDashboard.Samples.Monolith/Workflows/FaultyWorkflow.cs @@ -12,7 +12,7 @@ namespace ElsaDashboard.Samples.Monolith.Workflows { builder .WithDisplayName("Faulty Workflow") - .HttpRequestReceived("/faulty") + .HttpEndpoint("/faulty") .Then(ThrowErrorIfFirstRun) .WriteLine("Made it!"); } diff --git a/src/samples/dashboard/ElsaDashboard.Samples.Monolith/Workflows/GoodbyeWorld.cs b/src/samples/dashboard/ElsaDashboard.Samples.Monolith/Workflows/GoodbyeWorld.cs index 72ae5525a..7f1d1e13e 100644 --- a/src/samples/dashboard/ElsaDashboard.Samples.Monolith/Workflows/GoodbyeWorld.cs +++ b/src/samples/dashboard/ElsaDashboard.Samples.Monolith/Workflows/GoodbyeWorld.cs @@ -10,7 +10,7 @@ namespace ElsaDashboard.Samples.Monolith.Workflows { builder .WithDisplayName("Goodbye cruel World!") - .HttpRequestReceived("/goodbye-world") + .HttpEndpoint("/goodbye-world") .WriteHttpResponse(HttpStatusCode.OK, "Goodbye Cruel World!", "text/plain"); } } diff --git a/src/samples/dashboard/ElsaDashboard.Samples.Monolith/Workflows/HelloWorld.cs b/src/samples/dashboard/ElsaDashboard.Samples.Monolith/Workflows/HelloWorld.cs index f60099526..ef42e7cb0 100644 --- a/src/samples/dashboard/ElsaDashboard.Samples.Monolith/Workflows/HelloWorld.cs +++ b/src/samples/dashboard/ElsaDashboard.Samples.Monolith/Workflows/HelloWorld.cs @@ -12,7 +12,7 @@ namespace ElsaDashboard.Samples.Monolith.Workflows .WithWorkflowDefinitionId("HelloWorld") .WithVersion(1) .WithDisplayName("Hello World!") - .HttpRequestReceived("/hello-world") + .HttpEndpoint("/hello-world") .WriteHttpResponse(HttpStatusCode.OK, "Hello World!", "text/plain"); } } diff --git a/src/samples/dashboard/ElsaDashboard.Samples.Monolith/Workflows/HelloWorld.v2.cs b/src/samples/dashboard/ElsaDashboard.Samples.Monolith/Workflows/HelloWorld.v2.cs index 674081263..55ab178ff 100644 --- a/src/samples/dashboard/ElsaDashboard.Samples.Monolith/Workflows/HelloWorld.v2.cs +++ b/src/samples/dashboard/ElsaDashboard.Samples.Monolith/Workflows/HelloWorld.v2.cs @@ -12,7 +12,7 @@ namespace ElsaDashboard.Samples.Monolith.Workflows .WithWorkflowDefinitionId("HelloWorld") .WithVersion(2) .WithDisplayName("Hello World!") - .HttpRequestReceived("/hello-world/v2") + .HttpEndpoint("/hello-world/v2") .WriteHttpResponse(HttpStatusCode.OK, "Hello World V2!", "text/plain"); } } diff --git a/src/samples/dashboard/ElsaDashboard.Samples.Monolith/Workflows/NamingWorkflow.cs b/src/samples/dashboard/ElsaDashboard.Samples.Monolith/Workflows/NamingWorkflow.cs index 519c331f7..17530d62f 100644 --- a/src/samples/dashboard/ElsaDashboard.Samples.Monolith/Workflows/NamingWorkflow.cs +++ b/src/samples/dashboard/ElsaDashboard.Samples.Monolith/Workflows/NamingWorkflow.cs @@ -15,10 +15,10 @@ namespace ElsaDashboard.Samples.Monolith.Workflows { builder .WithDisplayName("Onboarding") - .HttpRequestReceived("/signup") + .HttpEndpoint("/signup") .Correlate(() => Guid.NewGuid().ToString("N")) .WriteHttpResponse(x => x.WithStatusCode(HttpStatusCode.OK).WithContent(context => $"Tell me your name please. Use correlation ID {context.WorkflowExecutionContext.CorrelationId}").WithContentType("text/plain")) - .HttpRequestReceived(x => x.WithPath("/signup").WithMethod(HttpMethod.Post.ToString()).WithReadContent()) + .HttpEndpoint(x => x.WithPath("/signup").WithMethod(HttpMethod.Post.ToString()).WithReadContent()) .SetVariable("Name", context => (string?) context.GetInput()!.Body) .SetName(context => context.GetVariable("Name")) diff --git a/src/samples/server/Elsa.Samples.Server.Host/Workflows/FaultyWorkflow.cs b/src/samples/server/Elsa.Samples.Server.Host/Workflows/FaultyWorkflow.cs index a0c8cc2d8..597567047 100644 --- a/src/samples/server/Elsa.Samples.Server.Host/Workflows/FaultyWorkflow.cs +++ b/src/samples/server/Elsa.Samples.Server.Host/Workflows/FaultyWorkflow.cs @@ -23,7 +23,7 @@ namespace Elsa.Samples.Server.Host.Workflows public void Build(IWorkflowBuilder builder) { builder - .HttpRequestReceived("/faulty") + .HttpEndpoint("/faulty") .Then(MaybeThrow) .WriteHttpResponse(response => response.WithStatusCode(HttpStatusCode.OK).WithContentType("application/json").WithContent(WriteWorkflowInfoAsync)); } diff --git a/src/samples/server/Elsa.Samples.Server.Host/Workflows/GoodbyeWorld.cs b/src/samples/server/Elsa.Samples.Server.Host/Workflows/GoodbyeWorld.cs index 091420398..04218e394 100644 --- a/src/samples/server/Elsa.Samples.Server.Host/Workflows/GoodbyeWorld.cs +++ b/src/samples/server/Elsa.Samples.Server.Host/Workflows/GoodbyeWorld.cs @@ -10,7 +10,7 @@ namespace Elsa.Samples.Server.Host.Workflows { builder .WithDisplayName("Goodbye cruel World!") - .HttpRequestReceived("/goodbye-world") + .HttpEndpoint("/goodbye-world") .WriteHttpResponse(HttpStatusCode.OK, "Goodbye Cruel World!", "text/plain"); } } diff --git a/src/samples/server/Elsa.Samples.Server.Host/Workflows/HelloWorld.cs b/src/samples/server/Elsa.Samples.Server.Host/Workflows/HelloWorld.cs index 39d6c7086..30d36cfcb 100644 --- a/src/samples/server/Elsa.Samples.Server.Host/Workflows/HelloWorld.cs +++ b/src/samples/server/Elsa.Samples.Server.Host/Workflows/HelloWorld.cs @@ -12,7 +12,7 @@ namespace Elsa.Samples.Server.Host.Workflows .WithWorkflowDefinitionId("HelloWorld") .WithVersion(1) .WithDisplayName("Hello World!") - .HttpRequestReceived("/hello-world") + .HttpEndpoint("/hello-world") .WriteHttpResponse(HttpStatusCode.OK, "Hello World!", "text/plain"); } } diff --git a/src/samples/server/Elsa.Samples.Server.Host/Workflows/HelloWorld.v2.cs b/src/samples/server/Elsa.Samples.Server.Host/Workflows/HelloWorld.v2.cs index 9150cfeb2..3838208f8 100644 --- a/src/samples/server/Elsa.Samples.Server.Host/Workflows/HelloWorld.v2.cs +++ b/src/samples/server/Elsa.Samples.Server.Host/Workflows/HelloWorld.v2.cs @@ -12,7 +12,7 @@ namespace Elsa.Samples.Server.Host.Workflows .WithWorkflowDefinitionId("HelloWorld") .WithVersion(2) .WithDisplayName("Hello World!") - .HttpRequestReceived("/hello-world/v2") + .HttpEndpoint("/hello-world/v2") .WriteHttpResponse(HttpStatusCode.OK, "Hello World V2!", "text/plain"); } } diff --git a/src/samples/server/Elsa.Samples.Server.Host/Workflows/NamingWorkflow.cs b/src/samples/server/Elsa.Samples.Server.Host/Workflows/NamingWorkflow.cs index a011a2b86..7212dc7bc 100644 --- a/src/samples/server/Elsa.Samples.Server.Host/Workflows/NamingWorkflow.cs +++ b/src/samples/server/Elsa.Samples.Server.Host/Workflows/NamingWorkflow.cs @@ -15,10 +15,10 @@ namespace Elsa.Samples.Server.Host.Workflows { builder .WithDisplayName("Onboarding") - .HttpRequestReceived("/signup") + .HttpEndpoint("/signup") .Correlate(() => Guid.NewGuid().ToString("N")) .WriteHttpResponse(x => x.WithStatusCode(HttpStatusCode.OK).WithContent(context => $"Tell me your name please. Use correlation ID {context.WorkflowExecutionContext.CorrelationId}").WithContentType("text/plain")) - .HttpRequestReceived(x => x.WithPath("/signup").WithMethod(HttpMethod.Post.ToString()).WithReadContent()) + .HttpEndpoint(x => x.WithPath("/signup").WithMethod(HttpMethod.Post.ToString()).WithReadContent()) .SetVariable("Name", context => (string) context.GetInput().Body) .SetName(context => context.GetVariable("Name"))