From c84fb3757d92bd4a64386915f8e7ead7e8e66ce1 Mon Sep 17 00:00:00 2001 From: Alexanderius Date: Sat, 6 Apr 2024 22:15:02 +0500 Subject: [PATCH] [r naming --- src/Simplify.Web/ApplicationBuilderExtensions.cs | 4 ++-- .../RequestHandling/Handlers/PageRenderingHandler.cs | 2 +- .../RequestHandling/Handlers/StaticFilesHandler.cs | 4 ++-- .../Core2/RequestHandling/IRequestHandler.cs | 2 +- .../RequestHandling/IRequestHandlingPipeline.cs | 2 +- .../Core2/ScopeRequestProcessExtensions.cs | 4 ++-- .../Core2/StaticFiles/IStaticFileRequestHandler.cs | 2 +- .../Middleware/SimplifyWebRequestMiddleware.cs | 12 ++++++------ 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/Simplify.Web/ApplicationBuilderExtensions.cs b/src/Simplify.Web/ApplicationBuilderExtensions.cs index 80b7e534..fc34b9d3 100644 --- a/src/Simplify.Web/ApplicationBuilderExtensions.cs +++ b/src/Simplify.Web/ApplicationBuilderExtensions.cs @@ -98,11 +98,11 @@ public static IApplicationBuilder UseSimplifyWebNonTerminalWithoutRegistrations( private static void RegisterAsNonTerminal(this IApplicationBuilder builder) => builder.Use(async (context, next) => { - await SimplifyWebRequestMiddleware.InvokeAsNonTerminal(context); + await SimplifyWebRequestMiddleware.InvokeAsNonTerminalAsync(context); if (context.Response.StatusCode == (int)HttpStatusCode.NotFound) await next.Invoke(); }); - private static void RegisterAsTerminal(this IApplicationBuilder builder) => builder.Run(SimplifyWebRequestMiddleware.InvokeAsTerminal); + private static void RegisterAsTerminal(this IApplicationBuilder builder) => builder.Run(SimplifyWebRequestMiddleware.InvokeAsTerminalAsync); } \ No newline at end of file diff --git a/src/Simplify.Web/Core2/RequestHandling/Handlers/PageRenderingHandler.cs b/src/Simplify.Web/Core2/RequestHandling/Handlers/PageRenderingHandler.cs index 0e38a47c..3d2cc6e6 100644 --- a/src/Simplify.Web/Core2/RequestHandling/Handlers/PageRenderingHandler.cs +++ b/src/Simplify.Web/Core2/RequestHandling/Handlers/PageRenderingHandler.cs @@ -6,7 +6,7 @@ namespace Simplify.Web.Core2.RequestHandling.Handlers; public class PageRenderingHandler(IPageRenderer renderer) : IRequestHandler { - public async Task Execute(IHttpContext context, RequestHandler next) + public async Task ExecuteAsync(IHttpContext context, RequestHandler next) { await renderer.Render(context); await next(); diff --git a/src/Simplify.Web/Core2/RequestHandling/Handlers/StaticFilesHandler.cs b/src/Simplify.Web/Core2/RequestHandling/Handlers/StaticFilesHandler.cs index 8dd199cd..4b75349a 100644 --- a/src/Simplify.Web/Core2/RequestHandling/Handlers/StaticFilesHandler.cs +++ b/src/Simplify.Web/Core2/RequestHandling/Handlers/StaticFilesHandler.cs @@ -6,10 +6,10 @@ namespace Simplify.Web.Core2.RequestHandling.Handlers; public class StaticFilesHandler(IStaticFileRequestHandler handler) : IRequestHandler { - public async Task Execute(IHttpContext context, RequestHandler next) + public async Task ExecuteAsync(IHttpContext context, RequestHandler next) { if (handler.IsStaticFileRoutePath(context)) - await handler.Execute(context); + await handler.ExecuteAsync(context); else await next(); } diff --git a/src/Simplify.Web/Core2/RequestHandling/IRequestHandler.cs b/src/Simplify.Web/Core2/RequestHandling/IRequestHandler.cs index 8b8e98f0..55e4e472 100644 --- a/src/Simplify.Web/Core2/RequestHandling/IRequestHandler.cs +++ b/src/Simplify.Web/Core2/RequestHandling/IRequestHandler.cs @@ -5,5 +5,5 @@ namespace Simplify.Web.Core2.RequestHandling; public interface IRequestHandler { - Task Execute(IHttpContext context, RequestHandler next); + Task ExecuteAsync(IHttpContext context, RequestHandler next); } \ No newline at end of file diff --git a/src/Simplify.Web/Core2/RequestHandling/IRequestHandlingPipeline.cs b/src/Simplify.Web/Core2/RequestHandling/IRequestHandlingPipeline.cs index 45487f18..5595fb41 100644 --- a/src/Simplify.Web/Core2/RequestHandling/IRequestHandlingPipeline.cs +++ b/src/Simplify.Web/Core2/RequestHandling/IRequestHandlingPipeline.cs @@ -5,5 +5,5 @@ namespace Simplify.Web.Core2.RequestHandling; public interface IRequestHandlingPipeline { - Task Execute(IHttpContext context); + Task ExecuteAsync(IHttpContext context); } \ No newline at end of file diff --git a/src/Simplify.Web/Core2/ScopeRequestProcessExtensions.cs b/src/Simplify.Web/Core2/ScopeRequestProcessExtensions.cs index 4a2bceb2..4cb72163 100644 --- a/src/Simplify.Web/Core2/ScopeRequestProcessExtensions.cs +++ b/src/Simplify.Web/Core2/ScopeRequestProcessExtensions.cs @@ -15,6 +15,6 @@ public static class ScopeRequestProcessExtensions /// /// The scope. /// The context. - public static Task ProcessRequest(this ILifetimeScope scope, IHttpContext context) => - scope.Resolver.Resolve().Execute(context); + public static Task ProcessRequestAsync(this ILifetimeScope scope, IHttpContext context) => + scope.Resolver.Resolve().ExecuteAsync(context); } \ No newline at end of file diff --git a/src/Simplify.Web/Core2/StaticFiles/IStaticFileRequestHandler.cs b/src/Simplify.Web/Core2/StaticFiles/IStaticFileRequestHandler.cs index 7fc4f38c..9fa108be 100644 --- a/src/Simplify.Web/Core2/StaticFiles/IStaticFileRequestHandler.cs +++ b/src/Simplify.Web/Core2/StaticFiles/IStaticFileRequestHandler.cs @@ -20,5 +20,5 @@ public interface IStaticFileRequestHandler /// /// The context. /// - Task Execute(IHttpContext context); + Task ExecuteAsync(IHttpContext context); } \ No newline at end of file diff --git a/src/Simplify.Web/Middleware/SimplifyWebRequestMiddleware.cs b/src/Simplify.Web/Middleware/SimplifyWebRequestMiddleware.cs index c083b829..77b6a445 100644 --- a/src/Simplify.Web/Middleware/SimplifyWebRequestMiddleware.cs +++ b/src/Simplify.Web/Middleware/SimplifyWebRequestMiddleware.cs @@ -27,16 +27,16 @@ public static class SimplifyWebRequestMiddleware /// public static event TraceEventHandler? OnTrace; - public static Task InvokeAsTerminal(HttpContext context) => Invoke(context, true); + public static Task InvokeAsTerminalAsync(HttpContext context) => InvokeAsync(context, true); - public static Task InvokeAsNonTerminal(HttpContext context) => Invoke(context, false); + public static Task InvokeAsNonTerminalAsync(HttpContext context) => InvokeAsync(context, false); /// /// Process an individual request. /// /// The context. /// if set to true [is terminal middleware]. - public static async Task Invoke(HttpContext context, bool isTerminalMiddleware) + public static async Task InvokeAsync(HttpContext context, bool isTerminalMiddleware) { using var scope = BootstrapperFactory.ContainerProvider.BeginLifetimeScope(); @@ -47,7 +47,7 @@ public static async Task Invoke(HttpContext context, bool isTerminalMiddleware) await scope.StartMeasurements() .Trace(context, OnTrace) .SetupProviders(localContext) - .ProcessRequest(localContext); + .ProcessRequestAsync(localContext); } catch (Exception e) { @@ -62,7 +62,7 @@ await scope.StartMeasurements() e = exception; } - await context.WriteErrorResponse(scope, e); + await context.WriteErrorResponseAsync(scope, e); } } @@ -76,7 +76,7 @@ internal static bool ProcessOnException(Exception e) return true; } - private static async Task WriteErrorResponse(this HttpContext context, ILifetimeScope scope, Exception e) + private static async Task WriteErrorResponseAsync(this HttpContext context, ILifetimeScope scope, Exception e) { var webContext = scope.Resolver.Resolve().Get();