From 854bab207fd8d52bb90cc270a4d73ba34da75622 Mon Sep 17 00:00:00 2001 From: Dylan Dmitri Gray Date: Mon, 1 Jul 2019 14:20:50 -0700 Subject: [PATCH] RequestQueue namespace cleanup (#11695) * namespace cleanup --- ...NetCore.RequestThrottling.netcoreapp3.0.cs | 29 +++++++++---------- .../src/QueuePolicies/IQueuePolicy.cs | 2 +- .../src/QueuePolicies/QueuePolicyOptions.cs | 2 +- .../QueuePolicyServiceCollectionExtensions.cs | 1 - .../src/QueuePolicies/StackQueuePolicy.cs | 2 +- .../src/QueuePolicies/TailDropQueuePolicy.cs | 2 +- .../src/RequestThrottlingEventSource.cs | 2 +- .../src/RequestThrottlingMiddleware.cs | 1 - .../RequestThrottling/test/MiddlewareTests.cs | 3 -- .../test/PolicyTests/StackQueueTests.cs | 1 - .../RequestThrottling/test/TestUtils.cs | 1 - 11 files changed, 18 insertions(+), 28 deletions(-) diff --git a/src/Middleware/RequestThrottling/ref/Microsoft.AspNetCore.RequestThrottling.netcoreapp3.0.cs b/src/Middleware/RequestThrottling/ref/Microsoft.AspNetCore.RequestThrottling.netcoreapp3.0.cs index 49f5ed18b7..d1ded94586 100644 --- a/src/Middleware/RequestThrottling/ref/Microsoft.AspNetCore.RequestThrottling.netcoreapp3.0.cs +++ b/src/Middleware/RequestThrottling/ref/Microsoft.AspNetCore.RequestThrottling.netcoreapp3.0.cs @@ -9,20 +9,6 @@ namespace Microsoft.AspNetCore.Builder } } namespace Microsoft.AspNetCore.RequestThrottling -{ - public partial class RequestThrottlingMiddleware - { - public RequestThrottlingMiddleware(Microsoft.AspNetCore.Http.RequestDelegate next, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.AspNetCore.RequestThrottling.QueuePolicies.IQueuePolicy queue, Microsoft.Extensions.Options.IOptions options) { } - [System.Diagnostics.DebuggerStepThroughAttribute] - public System.Threading.Tasks.Task Invoke(Microsoft.AspNetCore.Http.HttpContext context) { throw null; } - } - public partial class RequestThrottlingOptions - { - public RequestThrottlingOptions() { } - public Microsoft.AspNetCore.Http.RequestDelegate OnRejected { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } -} -namespace Microsoft.AspNetCore.RequestThrottling.QueuePolicies { public partial interface IQueuePolicy { @@ -35,12 +21,23 @@ namespace Microsoft.AspNetCore.RequestThrottling.QueuePolicies public int MaxConcurrentRequests { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public int RequestQueueLimit { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } } + public partial class RequestThrottlingMiddleware + { + public RequestThrottlingMiddleware(Microsoft.AspNetCore.Http.RequestDelegate next, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.AspNetCore.RequestThrottling.IQueuePolicy queue, Microsoft.Extensions.Options.IOptions options) { } + [System.Diagnostics.DebuggerStepThroughAttribute] + public System.Threading.Tasks.Task Invoke(Microsoft.AspNetCore.Http.HttpContext context) { throw null; } + } + public partial class RequestThrottlingOptions + { + public RequestThrottlingOptions() { } + public Microsoft.AspNetCore.Http.RequestDelegate OnRejected { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } } namespace Microsoft.Extensions.DependencyInjection { public static partial class QueuePolicyServiceCollectionExtensions { - public static Microsoft.Extensions.DependencyInjection.IServiceCollection AddStackQueue(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Action configure) { throw null; } - public static Microsoft.Extensions.DependencyInjection.IServiceCollection AddTailDropQueue(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Action configure) { throw null; } + public static Microsoft.Extensions.DependencyInjection.IServiceCollection AddStackQueue(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Action configure) { throw null; } + public static Microsoft.Extensions.DependencyInjection.IServiceCollection AddTailDropQueue(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Action configure) { throw null; } } } diff --git a/src/Middleware/RequestThrottling/src/QueuePolicies/IQueuePolicy.cs b/src/Middleware/RequestThrottling/src/QueuePolicies/IQueuePolicy.cs index 44a2b3b698..ebaa753ffb 100644 --- a/src/Middleware/RequestThrottling/src/QueuePolicies/IQueuePolicy.cs +++ b/src/Middleware/RequestThrottling/src/QueuePolicies/IQueuePolicy.cs @@ -4,7 +4,7 @@ using System; using System.Threading.Tasks; -namespace Microsoft.AspNetCore.RequestThrottling.QueuePolicies +namespace Microsoft.AspNetCore.RequestThrottling { /// /// Queueing policies, meant to be used with the . diff --git a/src/Middleware/RequestThrottling/src/QueuePolicies/QueuePolicyOptions.cs b/src/Middleware/RequestThrottling/src/QueuePolicies/QueuePolicyOptions.cs index 1d8e284d2e..1a36fcef64 100644 --- a/src/Middleware/RequestThrottling/src/QueuePolicies/QueuePolicyOptions.cs +++ b/src/Middleware/RequestThrottling/src/QueuePolicies/QueuePolicyOptions.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace Microsoft.AspNetCore.RequestThrottling.QueuePolicies +namespace Microsoft.AspNetCore.RequestThrottling { /// /// Specifies options for the diff --git a/src/Middleware/RequestThrottling/src/QueuePolicies/QueuePolicyServiceCollectionExtensions.cs b/src/Middleware/RequestThrottling/src/QueuePolicies/QueuePolicyServiceCollectionExtensions.cs index 911220d983..c5ba0464b0 100644 --- a/src/Middleware/RequestThrottling/src/QueuePolicies/QueuePolicyServiceCollectionExtensions.cs +++ b/src/Middleware/RequestThrottling/src/QueuePolicies/QueuePolicyServiceCollectionExtensions.cs @@ -3,7 +3,6 @@ using System; using Microsoft.AspNetCore.RequestThrottling; -using Microsoft.AspNetCore.RequestThrottling.QueuePolicies; namespace Microsoft.Extensions.DependencyInjection { diff --git a/src/Middleware/RequestThrottling/src/QueuePolicies/StackQueuePolicy.cs b/src/Middleware/RequestThrottling/src/QueuePolicies/StackQueuePolicy.cs index 5fd91560c0..b8b3feca63 100644 --- a/src/Middleware/RequestThrottling/src/QueuePolicies/StackQueuePolicy.cs +++ b/src/Middleware/RequestThrottling/src/QueuePolicies/StackQueuePolicy.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.Extensions.Options; -namespace Microsoft.AspNetCore.RequestThrottling.QueuePolicies +namespace Microsoft.AspNetCore.RequestThrottling { internal class StackQueuePolicy : IQueuePolicy { diff --git a/src/Middleware/RequestThrottling/src/QueuePolicies/TailDropQueuePolicy.cs b/src/Middleware/RequestThrottling/src/QueuePolicies/TailDropQueuePolicy.cs index a0bd667531..3a98fac973 100644 --- a/src/Middleware/RequestThrottling/src/QueuePolicies/TailDropQueuePolicy.cs +++ b/src/Middleware/RequestThrottling/src/QueuePolicies/TailDropQueuePolicy.cs @@ -6,7 +6,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.Extensions.Options; -namespace Microsoft.AspNetCore.RequestThrottling.QueuePolicies +namespace Microsoft.AspNetCore.RequestThrottling { internal class TailDropQueuePolicy : IQueuePolicy, IDisposable { diff --git a/src/Middleware/RequestThrottling/src/RequestThrottlingEventSource.cs b/src/Middleware/RequestThrottling/src/RequestThrottlingEventSource.cs index c4a997a417..fe62439858 100644 --- a/src/Middleware/RequestThrottling/src/RequestThrottlingEventSource.cs +++ b/src/Middleware/RequestThrottling/src/RequestThrottlingEventSource.cs @@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.RequestThrottling internal sealed class RequestThrottlingEventSource : EventSource { public static readonly RequestThrottlingEventSource Log = new RequestThrottlingEventSource(); - private static QueueFrame CachedNonTimerResult = new QueueFrame(null, Log); + private static readonly QueueFrame CachedNonTimerResult = new QueueFrame(timer: null, parent: Log); private PollingCounter _rejectedRequestsCounter; private PollingCounter _queueLengthCounter; diff --git a/src/Middleware/RequestThrottling/src/RequestThrottlingMiddleware.cs b/src/Middleware/RequestThrottling/src/RequestThrottlingMiddleware.cs index a30ba9ba06..c9a56944af 100644 --- a/src/Middleware/RequestThrottling/src/RequestThrottlingMiddleware.cs +++ b/src/Middleware/RequestThrottling/src/RequestThrottlingMiddleware.cs @@ -4,7 +4,6 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.RequestThrottling.QueuePolicies; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; diff --git a/src/Middleware/RequestThrottling/test/MiddlewareTests.cs b/src/Middleware/RequestThrottling/test/MiddlewareTests.cs index 1e4dfa25b7..becace2358 100644 --- a/src/Middleware/RequestThrottling/test/MiddlewareTests.cs +++ b/src/Middleware/RequestThrottling/test/MiddlewareTests.cs @@ -2,11 +2,8 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information using System; -using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.RequestThrottling.QueuePolicies; -using Microsoft.VisualStudio.TestPlatform.ObjectModel; using Xunit; namespace Microsoft.AspNetCore.RequestThrottling.Tests diff --git a/src/Middleware/RequestThrottling/test/PolicyTests/StackQueueTests.cs b/src/Middleware/RequestThrottling/test/PolicyTests/StackQueueTests.cs index aaf34bcf9b..e109a08bbc 100644 --- a/src/Middleware/RequestThrottling/test/PolicyTests/StackQueueTests.cs +++ b/src/Middleware/RequestThrottling/test/PolicyTests/StackQueueTests.cs @@ -1,6 +1,5 @@ using System; using System.Threading.Tasks; -using Microsoft.AspNetCore.RequestThrottling.QueuePolicies; using Microsoft.Extensions.Options; using Xunit; diff --git a/src/Middleware/RequestThrottling/test/TestUtils.cs b/src/Middleware/RequestThrottling/test/TestUtils.cs index 008b3ab4a1..1b386d9cfe 100644 --- a/src/Middleware/RequestThrottling/test/TestUtils.cs +++ b/src/Middleware/RequestThrottling/test/TestUtils.cs @@ -5,7 +5,6 @@ using System; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.RequestThrottling.QueuePolicies; using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.Options;