[r naming

SimplifyNet · Apr 6, 2024 · c84fb37 · c84fb37
1 parent 7cd772d
commit c84fb37
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git 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);
 }
diff --git 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
@@ -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
@@ -5,5 +5,5 @@ namespace Simplify.Web.Core2.RequestHandling;
 
 public interface IRequestHandler
 {
-	Task Execute(IHttpContext context, RequestHandler next);
+	Task ExecuteAsync(IHttpContext context, RequestHandler next);
 }
diff --git 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);
 }
diff --git a/src/Simplify.Web/Core2/ScopeRequestProcessExtensions.cs b/src/Simplify.Web/Core2/ScopeRequestProcessExtensions.cs
@@ -15,6 +15,6 @@ public static class ScopeRequestProcessExtensions
 	/// </summary>
 	/// <param name="scope">The scope.</param>
 	/// <param name="context">The context.</param>
-	public static Task ProcessRequest(this ILifetimeScope scope, IHttpContext context) =>
-		scope.Resolver.Resolve<IRequestHandlingPipeline>().Execute(context);
+	public static Task ProcessRequestAsync(this ILifetimeScope scope, IHttpContext context) =>
+		scope.Resolver.Resolve<IRequestHandlingPipeline>().ExecuteAsync(context);
 }
diff --git a/src/Simplify.Web/Core2/StaticFiles/IStaticFileRequestHandler.cs b/src/Simplify.Web/Core2/StaticFiles/IStaticFileRequestHandler.cs
@@ -20,5 +20,5 @@ public interface IStaticFileRequestHandler
 	/// </summary>
 	/// <param name="context">The context.</param>
 	/// <returns></returns>
-	Task Execute(IHttpContext context);
+	Task ExecuteAsync(IHttpContext context);
 }
diff --git a/src/Simplify.Web/Middleware/SimplifyWebRequestMiddleware.cs b/src/Simplify.Web/Middleware/SimplifyWebRequestMiddleware.cs
@@ -27,16 +27,16 @@ public static class SimplifyWebRequestMiddleware
 	/// </summary>
 	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);
 
 	/// <summary>
 	/// Process an individual request.
 	/// </summary>
 	/// <param name="context">The context.</param>
 	/// <param name="isTerminalMiddleware">if set to <c>true</c> [is terminal middleware].</param>
-	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<IWebContextProvider>().Get();