From 6f50c760327b795ae90c45536bd495fc40f99f80 Mon Sep 17 00:00:00 2001 From: Raman Maksimchuk Date: Thu, 28 Dec 2023 20:14:41 +0300 Subject: [PATCH] Make MiddlewareName as public property --- .../Authentication/Middleware/AuthenticationMiddleware.cs | 2 +- src/Ocelot/Authorization/Middleware/AuthorizationMiddleware.cs | 2 +- src/Ocelot/Cache/Middleware/OutputCacheMiddleware.cs | 2 +- src/Ocelot/Claims/Middleware/ClaimsToClaimsMiddleware.cs | 2 +- .../Middleware/ClaimsToDownstreamPathMiddleware.cs | 2 +- .../Middleware/DownstreamRouteFinderMiddleware.cs | 2 +- .../Middleware/DownstreamUrlCreatorMiddleware.cs | 2 +- src/Ocelot/Errors/Middleware/ExceptionHandlerMiddleware.cs | 2 +- src/Ocelot/Headers/Middleware/ClaimsToHeadersMiddleware.cs | 2 +- .../Headers/Middleware/HttpHeadersTransformationMiddleware.cs | 2 +- src/Ocelot/LoadBalancer/Middleware/LoadBalancingMiddleware.cs | 2 +- src/Ocelot/Middleware/ConfigurationMiddleware.cs | 2 +- src/Ocelot/Middleware/OcelotMiddleware.cs | 2 +- src/Ocelot/Multiplexer/MultiplexingMiddleware.cs | 2 +- .../QueryStrings/Middleware/ClaimsToQueryStringMiddleware.cs | 2 +- src/Ocelot/RateLimit/Middleware/ClientRateLimitMiddleware.cs | 2 +- .../Middleware/DownstreamRequestInitialiserMiddleware.cs | 2 +- src/Ocelot/RequestId/Middleware/RequestIdMiddleware.cs | 2 +- src/Ocelot/Requester/Middleware/HttpRequesterMiddleware.cs | 2 +- src/Ocelot/Responder/Middleware/ResponderMiddleware.cs | 2 +- src/Ocelot/Security/Middleware/SecurityMiddleware.cs | 2 +- src/Ocelot/WebSockets/WebSocketsProxyMiddleware.cs | 2 +- test/Ocelot.UnitTests/Middleware/OcelotPiplineBuilderTests.cs | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/Ocelot/Authentication/Middleware/AuthenticationMiddleware.cs b/src/Ocelot/Authentication/Middleware/AuthenticationMiddleware.cs index 445092a8b..0f66e0a29 100644 --- a/src/Ocelot/Authentication/Middleware/AuthenticationMiddleware.cs +++ b/src/Ocelot/Authentication/Middleware/AuthenticationMiddleware.cs @@ -18,7 +18,7 @@ public AuthenticationMiddleware( _next = next; } - protected override string MiddlewareName => nameof(AuthenticationMiddleware); + public override string MiddlewareName => nameof(AuthenticationMiddleware); public async Task Invoke(HttpContext httpContext) { diff --git a/src/Ocelot/Authorization/Middleware/AuthorizationMiddleware.cs b/src/Ocelot/Authorization/Middleware/AuthorizationMiddleware.cs index 27b3c16cb..81753fe66 100644 --- a/src/Ocelot/Authorization/Middleware/AuthorizationMiddleware.cs +++ b/src/Ocelot/Authorization/Middleware/AuthorizationMiddleware.cs @@ -23,7 +23,7 @@ public AuthorizationMiddleware(RequestDelegate next, _scopesAuthorizer = scopesAuthorizer; } - protected override string MiddlewareName => nameof(AuthorizationMiddleware); + public override string MiddlewareName => nameof(AuthorizationMiddleware); public async Task Invoke(HttpContext httpContext) { diff --git a/src/Ocelot/Cache/Middleware/OutputCacheMiddleware.cs b/src/Ocelot/Cache/Middleware/OutputCacheMiddleware.cs index 38dcea9fd..81baba1ea 100644 --- a/src/Ocelot/Cache/Middleware/OutputCacheMiddleware.cs +++ b/src/Ocelot/Cache/Middleware/OutputCacheMiddleware.cs @@ -22,7 +22,7 @@ public OutputCacheMiddleware( _cacheGenerator = cacheGenerator; } - protected override string MiddlewareName => nameof(OutputCacheMiddleware); + public override string MiddlewareName => nameof(OutputCacheMiddleware); public async Task Invoke(HttpContext httpContext) { diff --git a/src/Ocelot/Claims/Middleware/ClaimsToClaimsMiddleware.cs b/src/Ocelot/Claims/Middleware/ClaimsToClaimsMiddleware.cs index eadf8f705..151d0b7a1 100644 --- a/src/Ocelot/Claims/Middleware/ClaimsToClaimsMiddleware.cs +++ b/src/Ocelot/Claims/Middleware/ClaimsToClaimsMiddleware.cs @@ -19,7 +19,7 @@ public ClaimsToClaimsMiddleware( _addClaimsToRequest = addClaimsToRequest; } - protected override string MiddlewareName => nameof(ClaimsToClaimsMiddleware); + public override string MiddlewareName => nameof(ClaimsToClaimsMiddleware); public async Task Invoke(HttpContext httpContext) { diff --git a/src/Ocelot/DownstreamPathManipulation/Middleware/ClaimsToDownstreamPathMiddleware.cs b/src/Ocelot/DownstreamPathManipulation/Middleware/ClaimsToDownstreamPathMiddleware.cs index b0e90d446..1dfd26a16 100644 --- a/src/Ocelot/DownstreamPathManipulation/Middleware/ClaimsToDownstreamPathMiddleware.cs +++ b/src/Ocelot/DownstreamPathManipulation/Middleware/ClaimsToDownstreamPathMiddleware.cs @@ -20,7 +20,7 @@ public ClaimsToDownstreamPathMiddleware( _changeDownstreamPathTemplate = changeDownstreamPathTemplate; } - protected override string MiddlewareName => nameof(ClaimsToDownstreamPathMiddleware); + public override string MiddlewareName => nameof(ClaimsToDownstreamPathMiddleware); public async Task Invoke(HttpContext httpContext) { diff --git a/src/Ocelot/DownstreamRouteFinder/Middleware/DownstreamRouteFinderMiddleware.cs b/src/Ocelot/DownstreamRouteFinder/Middleware/DownstreamRouteFinderMiddleware.cs index b15f7bb32..3dd6998bd 100644 --- a/src/Ocelot/DownstreamRouteFinder/Middleware/DownstreamRouteFinderMiddleware.cs +++ b/src/Ocelot/DownstreamRouteFinder/Middleware/DownstreamRouteFinderMiddleware.cs @@ -21,7 +21,7 @@ public DownstreamRouteFinderMiddleware( _factory = downstreamRouteFinder; } - protected override string MiddlewareName => nameof(DownstreamRouteFinderMiddleware); + public override string MiddlewareName => nameof(DownstreamRouteFinderMiddleware); public async Task Invoke(HttpContext httpContext) { diff --git a/src/Ocelot/DownstreamUrlCreator/Middleware/DownstreamUrlCreatorMiddleware.cs b/src/Ocelot/DownstreamUrlCreator/Middleware/DownstreamUrlCreatorMiddleware.cs index 7d97e178e..a399a62dd 100644 --- a/src/Ocelot/DownstreamUrlCreator/Middleware/DownstreamUrlCreatorMiddleware.cs +++ b/src/Ocelot/DownstreamUrlCreator/Middleware/DownstreamUrlCreatorMiddleware.cs @@ -30,7 +30,7 @@ public DownstreamUrlCreatorMiddleware( _replacer = replacer; } - protected override string MiddlewareName => nameof(DownstreamUrlCreatorMiddleware); + public override string MiddlewareName => nameof(DownstreamUrlCreatorMiddleware); public async Task Invoke(HttpContext httpContext) { diff --git a/src/Ocelot/Errors/Middleware/ExceptionHandlerMiddleware.cs b/src/Ocelot/Errors/Middleware/ExceptionHandlerMiddleware.cs index 1863b29f8..88fe60346 100644 --- a/src/Ocelot/Errors/Middleware/ExceptionHandlerMiddleware.cs +++ b/src/Ocelot/Errors/Middleware/ExceptionHandlerMiddleware.cs @@ -24,7 +24,7 @@ public ExceptionHandlerMiddleware( _repo = repo; } - protected override string MiddlewareName => nameof(ExceptionHandlerMiddleware); + public override string MiddlewareName => nameof(ExceptionHandlerMiddleware); public async Task Invoke(HttpContext httpContext) { diff --git a/src/Ocelot/Headers/Middleware/ClaimsToHeadersMiddleware.cs b/src/Ocelot/Headers/Middleware/ClaimsToHeadersMiddleware.cs index 2dde5b560..1ae0e3dfe 100644 --- a/src/Ocelot/Headers/Middleware/ClaimsToHeadersMiddleware.cs +++ b/src/Ocelot/Headers/Middleware/ClaimsToHeadersMiddleware.cs @@ -19,7 +19,7 @@ public ClaimsToHeadersMiddleware( _addHeadersToRequest = addHeadersToRequest; } - protected override string MiddlewareName => nameof(ClaimsToHeadersMiddleware); + public override string MiddlewareName => nameof(ClaimsToHeadersMiddleware); public async Task Invoke(HttpContext httpContext) { diff --git a/src/Ocelot/Headers/Middleware/HttpHeadersTransformationMiddleware.cs b/src/Ocelot/Headers/Middleware/HttpHeadersTransformationMiddleware.cs index b964d340b..551760fe9 100644 --- a/src/Ocelot/Headers/Middleware/HttpHeadersTransformationMiddleware.cs +++ b/src/Ocelot/Headers/Middleware/HttpHeadersTransformationMiddleware.cs @@ -28,7 +28,7 @@ public HttpHeadersTransformationMiddleware( _preReplacer = preReplacer; } - protected override string MiddlewareName => nameof(HttpHeadersTransformationMiddleware); + public override string MiddlewareName => nameof(HttpHeadersTransformationMiddleware); public async Task Invoke(HttpContext httpContext) { diff --git a/src/Ocelot/LoadBalancer/Middleware/LoadBalancingMiddleware.cs b/src/Ocelot/LoadBalancer/Middleware/LoadBalancingMiddleware.cs index 979d082ec..13c748302 100644 --- a/src/Ocelot/LoadBalancer/Middleware/LoadBalancingMiddleware.cs +++ b/src/Ocelot/LoadBalancer/Middleware/LoadBalancingMiddleware.cs @@ -20,7 +20,7 @@ public LoadBalancingMiddleware( _loadBalancerHouse = loadBalancerHouse; } - protected override string MiddlewareName => nameof(LoadBalancingMiddleware); + public override string MiddlewareName => nameof(LoadBalancingMiddleware); public async Task Invoke(HttpContext httpContext) { diff --git a/src/Ocelot/Middleware/ConfigurationMiddleware.cs b/src/Ocelot/Middleware/ConfigurationMiddleware.cs index 88b6f2a48..4958dfec6 100644 --- a/src/Ocelot/Middleware/ConfigurationMiddleware.cs +++ b/src/Ocelot/Middleware/ConfigurationMiddleware.cs @@ -19,7 +19,7 @@ public ConfigurationMiddleware( _configRepo = configRepo; } - protected override string MiddlewareName => nameof(ConfigurationMiddleware); + public override string MiddlewareName => nameof(ConfigurationMiddleware); public async Task Invoke(HttpContext httpContext) { diff --git a/src/Ocelot/Middleware/OcelotMiddleware.cs b/src/Ocelot/Middleware/OcelotMiddleware.cs index a7fc9a045..e472b71f0 100644 --- a/src/Ocelot/Middleware/OcelotMiddleware.cs +++ b/src/Ocelot/Middleware/OcelotMiddleware.cs @@ -10,5 +10,5 @@ protected OcelotMiddleware(IOcelotLogger logger) } public IOcelotLogger Logger { get; } - protected abstract string MiddlewareName { get; } + public abstract string MiddlewareName { get; } } diff --git a/src/Ocelot/Multiplexer/MultiplexingMiddleware.cs b/src/Ocelot/Multiplexer/MultiplexingMiddleware.cs index 9bcae1d5c..8ad0d7078 100644 --- a/src/Ocelot/Multiplexer/MultiplexingMiddleware.cs +++ b/src/Ocelot/Multiplexer/MultiplexingMiddleware.cs @@ -21,7 +21,7 @@ public MultiplexingMiddleware( _next = next; } - protected override string MiddlewareName => nameof(MultiplexingMiddleware); + public override string MiddlewareName => nameof(MultiplexingMiddleware); public async Task Invoke(HttpContext httpContext) { diff --git a/src/Ocelot/QueryStrings/Middleware/ClaimsToQueryStringMiddleware.cs b/src/Ocelot/QueryStrings/Middleware/ClaimsToQueryStringMiddleware.cs index 5c9710b79..0c4ce9b53 100644 --- a/src/Ocelot/QueryStrings/Middleware/ClaimsToQueryStringMiddleware.cs +++ b/src/Ocelot/QueryStrings/Middleware/ClaimsToQueryStringMiddleware.cs @@ -19,7 +19,7 @@ public ClaimsToQueryStringMiddleware( _addQueriesToRequest = addQueriesToRequest; } - protected override string MiddlewareName => nameof(ClaimsToQueryStringMiddleware); + public override string MiddlewareName => nameof(ClaimsToQueryStringMiddleware); public async Task Invoke(HttpContext httpContext) { diff --git a/src/Ocelot/RateLimit/Middleware/ClientRateLimitMiddleware.cs b/src/Ocelot/RateLimit/Middleware/ClientRateLimitMiddleware.cs index bfbcd2bcc..4ffd92058 100644 --- a/src/Ocelot/RateLimit/Middleware/ClientRateLimitMiddleware.cs +++ b/src/Ocelot/RateLimit/Middleware/ClientRateLimitMiddleware.cs @@ -20,7 +20,7 @@ public ClientRateLimitMiddleware( _processor = new ClientRateLimitProcessor(counterHandler); } - protected override string MiddlewareName => nameof(ClientRateLimitMiddleware); + public override string MiddlewareName => nameof(ClientRateLimitMiddleware); public async Task Invoke(HttpContext httpContext) { diff --git a/src/Ocelot/Request/Middleware/DownstreamRequestInitialiserMiddleware.cs b/src/Ocelot/Request/Middleware/DownstreamRequestInitialiserMiddleware.cs index 53cec821d..a19937635 100644 --- a/src/Ocelot/Request/Middleware/DownstreamRequestInitialiserMiddleware.cs +++ b/src/Ocelot/Request/Middleware/DownstreamRequestInitialiserMiddleware.cs @@ -24,7 +24,7 @@ public DownstreamRequestInitialiserMiddleware( _creator = creator; } - protected override string MiddlewareName => nameof(DownstreamRequestInitialiserMiddleware); + public override string MiddlewareName => nameof(DownstreamRequestInitialiserMiddleware); public async Task Invoke(HttpContext httpContext) { diff --git a/src/Ocelot/RequestId/Middleware/RequestIdMiddleware.cs b/src/Ocelot/RequestId/Middleware/RequestIdMiddleware.cs index 567762a22..721a173c3 100644 --- a/src/Ocelot/RequestId/Middleware/RequestIdMiddleware.cs +++ b/src/Ocelot/RequestId/Middleware/RequestIdMiddleware.cs @@ -26,7 +26,7 @@ public RequestIdMiddleware( _requestScopedDataRepository = requestScopedDataRepository; } - protected override string MiddlewareName => nameof(RequestIdMiddleware); + public override string MiddlewareName => nameof(RequestIdMiddleware); public async Task Invoke(HttpContext httpContext) { diff --git a/src/Ocelot/Requester/Middleware/HttpRequesterMiddleware.cs b/src/Ocelot/Requester/Middleware/HttpRequesterMiddleware.cs index 25ea0abed..5ea5cdb98 100644 --- a/src/Ocelot/Requester/Middleware/HttpRequesterMiddleware.cs +++ b/src/Ocelot/Requester/Middleware/HttpRequesterMiddleware.cs @@ -20,7 +20,7 @@ public HttpRequesterMiddleware( _requester = requester; } - protected override string MiddlewareName => nameof(HttpRequesterMiddleware); + public override string MiddlewareName => nameof(HttpRequesterMiddleware); public async Task Invoke(HttpContext httpContext) { diff --git a/src/Ocelot/Responder/Middleware/ResponderMiddleware.cs b/src/Ocelot/Responder/Middleware/ResponderMiddleware.cs index 6291d27e0..80fbf78e5 100644 --- a/src/Ocelot/Responder/Middleware/ResponderMiddleware.cs +++ b/src/Ocelot/Responder/Middleware/ResponderMiddleware.cs @@ -27,7 +27,7 @@ public ResponderMiddleware( _codeMapper = codeMapper; } - protected override string MiddlewareName => nameof(ResponderMiddleware); + public override string MiddlewareName => nameof(ResponderMiddleware); public async Task Invoke(HttpContext httpContext) { diff --git a/src/Ocelot/Security/Middleware/SecurityMiddleware.cs b/src/Ocelot/Security/Middleware/SecurityMiddleware.cs index 6f4c69101..8255138b4 100644 --- a/src/Ocelot/Security/Middleware/SecurityMiddleware.cs +++ b/src/Ocelot/Security/Middleware/SecurityMiddleware.cs @@ -19,7 +19,7 @@ public SecurityMiddleware( _next = next; } - protected override string MiddlewareName => nameof(SecurityMiddleware); + public override string MiddlewareName => nameof(SecurityMiddleware); public async Task Invoke(HttpContext httpContext) { diff --git a/src/Ocelot/WebSockets/WebSocketsProxyMiddleware.cs b/src/Ocelot/WebSockets/WebSocketsProxyMiddleware.cs index b9d6fc987..072ec7045 100644 --- a/src/Ocelot/WebSockets/WebSocketsProxyMiddleware.cs +++ b/src/Ocelot/WebSockets/WebSocketsProxyMiddleware.cs @@ -36,7 +36,7 @@ public WebSocketsProxyMiddleware( _factory = factory; } - protected override string MiddlewareName => nameof(WebSocketsProxyMiddleware); + public override string MiddlewareName => nameof(WebSocketsProxyMiddleware); private static async Task PumpWebSocket(WebSocket source, WebSocket destination, int bufferSize, CancellationToken cancellationToken) { diff --git a/test/Ocelot.UnitTests/Middleware/OcelotPiplineBuilderTests.cs b/test/Ocelot.UnitTests/Middleware/OcelotPiplineBuilderTests.cs index 5378d810d..f7d00f5d6 100644 --- a/test/Ocelot.UnitTests/Middleware/OcelotPiplineBuilderTests.cs +++ b/test/Ocelot.UnitTests/Middleware/OcelotPiplineBuilderTests.cs @@ -108,7 +108,7 @@ public MultiParametersInvokeMiddleware(RequestDelegate next) _next = next; } - protected override string MiddlewareName => nameof(MultiParametersInvokeMiddleware); + public override string MiddlewareName => nameof(MultiParametersInvokeMiddleware); public Task Invoke(HttpContext context, IServiceProvider serviceProvider) {