Skip to content

Commit c84fb37

Browse files
committed
[r naming
1 parent 7cd772d commit c84fb37

File tree

8 files changed

+16
-16
lines changed

8 files changed

+16
-16
lines changed

src/Simplify.Web/ApplicationBuilderExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,11 @@ public static IApplicationBuilder UseSimplifyWebNonTerminalWithoutRegistrations(
9898
private static void RegisterAsNonTerminal(this IApplicationBuilder builder) =>
9999
builder.Use(async (context, next) =>
100100
{
101-
await SimplifyWebRequestMiddleware.InvokeAsNonTerminal(context);
101+
await SimplifyWebRequestMiddleware.InvokeAsNonTerminalAsync(context);
102102

103103
if (context.Response.StatusCode == (int)HttpStatusCode.NotFound)
104104
await next.Invoke();
105105
});
106106

107-
private static void RegisterAsTerminal(this IApplicationBuilder builder) => builder.Run(SimplifyWebRequestMiddleware.InvokeAsTerminal);
107+
private static void RegisterAsTerminal(this IApplicationBuilder builder) => builder.Run(SimplifyWebRequestMiddleware.InvokeAsTerminalAsync);
108108
}

src/Simplify.Web/Core2/RequestHandling/Handlers/PageRenderingHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace Simplify.Web.Core2.RequestHandling.Handlers;
66

77
public class PageRenderingHandler(IPageRenderer renderer) : IRequestHandler
88
{
9-
public async Task Execute(IHttpContext context, RequestHandler next)
9+
public async Task ExecuteAsync(IHttpContext context, RequestHandler next)
1010
{
1111
await renderer.Render(context);
1212
await next();

src/Simplify.Web/Core2/RequestHandling/Handlers/StaticFilesHandler.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ namespace Simplify.Web.Core2.RequestHandling.Handlers;
66

77
public class StaticFilesHandler(IStaticFileRequestHandler handler) : IRequestHandler
88
{
9-
public async Task Execute(IHttpContext context, RequestHandler next)
9+
public async Task ExecuteAsync(IHttpContext context, RequestHandler next)
1010
{
1111
if (handler.IsStaticFileRoutePath(context))
12-
await handler.Execute(context);
12+
await handler.ExecuteAsync(context);
1313
else
1414
await next();
1515
}

src/Simplify.Web/Core2/RequestHandling/IRequestHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ namespace Simplify.Web.Core2.RequestHandling;
55

66
public interface IRequestHandler
77
{
8-
Task Execute(IHttpContext context, RequestHandler next);
8+
Task ExecuteAsync(IHttpContext context, RequestHandler next);
99
}

src/Simplify.Web/Core2/RequestHandling/IRequestHandlingPipeline.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ namespace Simplify.Web.Core2.RequestHandling;
55

66
public interface IRequestHandlingPipeline
77
{
8-
Task Execute(IHttpContext context);
8+
Task ExecuteAsync(IHttpContext context);
99
}

src/Simplify.Web/Core2/ScopeRequestProcessExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ public static class ScopeRequestProcessExtensions
1515
/// </summary>
1616
/// <param name="scope">The scope.</param>
1717
/// <param name="context">The context.</param>
18-
public static Task ProcessRequest(this ILifetimeScope scope, IHttpContext context) =>
19-
scope.Resolver.Resolve<IRequestHandlingPipeline>().Execute(context);
18+
public static Task ProcessRequestAsync(this ILifetimeScope scope, IHttpContext context) =>
19+
scope.Resolver.Resolve<IRequestHandlingPipeline>().ExecuteAsync(context);
2020
}

src/Simplify.Web/Core2/StaticFiles/IStaticFileRequestHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ public interface IStaticFileRequestHandler
2020
/// </summary>
2121
/// <param name="context">The context.</param>
2222
/// <returns></returns>
23-
Task Execute(IHttpContext context);
23+
Task ExecuteAsync(IHttpContext context);
2424
}

src/Simplify.Web/Middleware/SimplifyWebRequestMiddleware.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@ public static class SimplifyWebRequestMiddleware
2727
/// </summary>
2828
public static event TraceEventHandler? OnTrace;
2929

30-
public static Task InvokeAsTerminal(HttpContext context) => Invoke(context, true);
30+
public static Task InvokeAsTerminalAsync(HttpContext context) => InvokeAsync(context, true);
3131

32-
public static Task InvokeAsNonTerminal(HttpContext context) => Invoke(context, false);
32+
public static Task InvokeAsNonTerminalAsync(HttpContext context) => InvokeAsync(context, false);
3333

3434
/// <summary>
3535
/// Process an individual request.
3636
/// </summary>
3737
/// <param name="context">The context.</param>
3838
/// <param name="isTerminalMiddleware">if set to <c>true</c> [is terminal middleware].</param>
39-
public static async Task Invoke(HttpContext context, bool isTerminalMiddleware)
39+
public static async Task InvokeAsync(HttpContext context, bool isTerminalMiddleware)
4040
{
4141
using var scope = BootstrapperFactory.ContainerProvider.BeginLifetimeScope();
4242

@@ -47,7 +47,7 @@ public static async Task Invoke(HttpContext context, bool isTerminalMiddleware)
4747
await scope.StartMeasurements()
4848
.Trace(context, OnTrace)
4949
.SetupProviders(localContext)
50-
.ProcessRequest(localContext);
50+
.ProcessRequestAsync(localContext);
5151
}
5252
catch (Exception e)
5353
{
@@ -62,7 +62,7 @@ await scope.StartMeasurements()
6262
e = exception;
6363
}
6464

65-
await context.WriteErrorResponse(scope, e);
65+
await context.WriteErrorResponseAsync(scope, e);
6666
}
6767
}
6868

@@ -76,7 +76,7 @@ internal static bool ProcessOnException(Exception e)
7676
return true;
7777
}
7878

79-
private static async Task WriteErrorResponse(this HttpContext context, ILifetimeScope scope, Exception e)
79+
private static async Task WriteErrorResponseAsync(this HttpContext context, ILifetimeScope scope, Exception e)
8080
{
8181
var webContext = scope.Resolver.Resolve<IWebContextProvider>().Get();
8282

0 commit comments

Comments
 (0)