code cleaning

samples/OcelotBasic/Program.cs

@@ -1,7 +1,8 @@
 using System.IO;
 
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Configuration;
+
 using Ocelot.DependencyInjection;
 using Ocelot.Middleware;
 

samples/OcelotOpenTracing/Program.cs

@@ -13,6 +13,7 @@
     using Ocelot.DependencyInjection;
     using Ocelot.Middleware;
     using Ocelot.Tracing.OpenTracing;
+
     using OpenTracing.Util;
 
     internal static class Program

src/Ocelot.Provider.Eureka/Eureka.cs

@@ -5,9 +5,10 @@
     using System.Threading.Tasks;
 
     using ServiceDiscovery.Providers;
-    using Values;
 
     using Steeltoe.Discovery;
+
+    using Values;
 
     public class Eureka : IServiceDiscoveryProvider
     {

src/Ocelot.Provider.Eureka/OcelotBuilderExtensions.cs

@@ -3,6 +3,7 @@
     using DependencyInjection;
 
     using Microsoft.Extensions.DependencyInjection;
+
     using Steeltoe.Discovery.Client;
 
     public static class OcelotBuilderExtensions

src/Ocelot.Provider.Polly/PollyQoSProvider.cs

@@ -3,11 +3,12 @@ namespace Ocelot.Provider.Polly
     using System;
     using System.Net.Http;
 
+    using Configuration;
+
     using global::Polly;
     using global::Polly.CircuitBreaker;
     using global::Polly.Timeout;
 
-    using Configuration;
     using Logging;
 
     public class PollyQoSProvider

src/Ocelot.Tracing.OpenTracing/OcelotBuilderExtensions.cs

@@ -1,10 +1,11 @@
 namespace Ocelot.Tracing.OpenTracing
 {
-    using Microsoft.Extensions.DependencyInjection.Extensions;
-
     using DependencyInjection;
+
     using Logging;
 
+    using Microsoft.Extensions.DependencyInjection.Extensions;
+
     public static class OcelotBuilderExtensions
     {
         public static IOcelotBuilder AddOpenTracing(this IOcelotBuilder builder)

src/Ocelot/Authentication/Middleware/AuthenticationMiddleware.cs

@@ -2,11 +2,13 @@
 {
     using System.Threading.Tasks;
 
+    using Configuration;
+
+    using Logging;
+
     using Microsoft.AspNetCore.Authentication;
     using Microsoft.AspNetCore.Http;
 
-    using Configuration;
-    using Logging;
     using Ocelot.Middleware;
 
     public class AuthenticationMiddleware : OcelotMiddleware

src/Ocelot/Authorization/ClaimsAuthorizer.cs

@@ -6,7 +6,9 @@
     using System.Text.RegularExpressions;
 
     using DownstreamRouteFinder.UrlMatcher;
+
     using Ocelot.Infrastructure.Claims.Parser;
+
     using Responses;
 
     public class ClaimsAuthorizer : IClaimsAuthorizer

src/Ocelot/Authorization/Middleware/AuthorizationMiddleware.cs

@@ -2,11 +2,14 @@
 {
     using System.Threading.Tasks;
 
-    using Microsoft.AspNetCore.Http;
-
     using Configuration;
+
     using Logging;
+
+    using Microsoft.AspNetCore.Http;
+
     using Ocelot.Middleware;
+
     using Responses;
 
     public class AuthorizationMiddleware : OcelotMiddleware

src/Ocelot/Cache/Middleware/OutputCacheMiddleware.cs

@@ -6,9 +6,10 @@
     using System.Net.Http;
     using System.Threading.Tasks;
 
+    using Logging;
+
     using Microsoft.AspNetCore.Http;
 
-    using Logging;
     using Ocelot.Middleware;
 
     public class OutputCacheMiddleware : OcelotMiddleware

src/Ocelot/Claims/Middleware/ClaimsToClaimsMiddleware.cs

@@ -3,9 +3,10 @@
     using System.Linq;
     using System.Threading.Tasks;
 
+    using Logging;
+
     using Microsoft.AspNetCore.Http;
 
-    using Logging;
     using Ocelot.Middleware;
 
     public class ClaimsToClaimsMiddleware : OcelotMiddleware

src/Ocelot/Configuration/Builder/RouteBuilder.cs

@@ -4,7 +4,8 @@
     using System.Linq;
     using System.Net.Http;
 
-    using File;
+    using File;
+
     using Values;
 
     public class RouteBuilder

src/Ocelot/Configuration/Creator/HttpHandlerOptionsCreator.cs

@@ -2,12 +2,12 @@
 {
     using System;
 
+    using File;
+
     using Logging;
 
     using Microsoft.Extensions.DependencyInjection;
 
-    using File;
-
     public class HttpHandlerOptionsCreator : IHttpHandlerOptionsCreator
     {
         private readonly ITracer _tracer;

src/Ocelot/Configuration/Creator/QoSOptionsCreator.cs

@@ -4,6 +4,7 @@ namespace Ocelot.Configuration.Creator
     using System.Linq;
 
     using Builder;
+
     using File;
 
     public class QoSOptionsCreator : IQoSOptionsCreator

src/Ocelot/Configuration/Creator/RouteOptionsCreator.cs

@@ -1,6 +1,7 @@
 namespace Ocelot.Configuration.Creator
 {
-    using Builder;
+    using Builder;
+
     using File;
 
     public class RouteOptionsCreator : IRouteOptionsCreator

src/Ocelot/Configuration/Creator/RoutesCreator.cs

@@ -3,8 +3,10 @@ namespace Ocelot.Configuration.Creator
     using System.Collections.Generic;
     using System.Linq;
 
-    using Cache;
     using Builder;
+
+    using Cache;
+
     using File;
 
     public class RoutesCreator : IRoutesCreator

src/Ocelot/Configuration/DownstreamRoute.cs

@@ -3,7 +3,8 @@ namespace Ocelot.Configuration
     using System;
     using System.Collections.Generic;
 
-    using Creator;
+    using Creator;
+
     using Values;
 
     public class DownstreamRoute

src/Ocelot/Configuration/Route.cs

@@ -4,6 +4,7 @@
     using System.Net.Http;
 
     using File;
+
     using Values;
 
     public class Route

src/Ocelot/Configuration/ServiceProviderConfiguration.cs

@@ -2,7 +2,7 @@
 {
     public class ServiceProviderConfiguration
     {
-        public ServiceProviderConfiguration(string type, string scheme, string host, int port, string token, string configurationKey, int pollingInterval, string @namespace ="")
+        public ServiceProviderConfiguration(string type, string scheme, string host, int port, string token, string configurationKey, int pollingInterval, string @namespace = "")
         {
             ConfigurationKey = configurationKey;
             Scheme = scheme;

src/Ocelot/Configuration/Validator/HostAndPortValidator.cs

@@ -1,8 +1,8 @@
 namespace Ocelot.Configuration.Validator
 {
-    using FluentValidation;
-
     using File;
+
+    using FluentValidation;
 
     public class HostAndPortValidator : AbstractValidator<FileHostAndPort>
     {

src/Ocelot/Configuration/Validator/IConfigurationValidator.cs

@@ -2,7 +2,8 @@
 {
     using System.Threading.Tasks;
 
-    using File;
+    using File;
+
     using Responses;
 
     public interface IConfigurationValidator

src/Ocelot/Configuration/Validator/RouteFluentValidator.cs

@@ -5,11 +5,11 @@
     using System.Threading;
     using System.Threading.Tasks;
 
+    using File;
+
     using FluentValidation;
 
     using Microsoft.AspNetCore.Authentication;
-
-    using File;
 
     public class RouteFluentValidator : AbstractValidator<FileRoute>
     {

src/Ocelot/DependencyInjection/ConfigurationBuilderExtensions.cs

@@ -6,13 +6,13 @@ namespace Ocelot.DependencyInjection
     using System.Linq;
     using System.Text.RegularExpressions;
 
+    using Configuration.File;
+
     using Microsoft.AspNetCore.Hosting;
     using Microsoft.Extensions.Configuration;
     using Microsoft.Extensions.Configuration.Memory;
 
     using Newtonsoft.Json;
-
-    using Configuration.File;
 
     public static class ConfigurationBuilderExtensions
     {

src/Ocelot/DependencyInjection/OcelotBuilder.cs

@@ -5,15 +5,12 @@ namespace Ocelot.DependencyInjection
     using System.Net.Http;
     using System.Reflection;
 
-    using Microsoft.AspNetCore.Http;
-    using Microsoft.Extensions.Configuration;
-    using Microsoft.Extensions.DependencyInjection;
-    using Microsoft.Extensions.DependencyInjection.Extensions;
-    using Microsoft.Extensions.Options;
-
     using Authorization;
+
     using Cache;
+
     using Claims;
+
     using Configuration;
     using Configuration.ChangeTracking;
     using Configuration.Creator;
@@ -22,27 +19,50 @@ namespace Ocelot.DependencyInjection
     using Configuration.Repository;
     using Configuration.Setter;
     using Configuration.Validator;
+
     using DownstreamRouteFinder.Finder;
     using DownstreamRouteFinder.UrlMatcher;
+
     using DownstreamUrlCreator.UrlTemplateReplacer;
+
     using Headers;
+
     using Infrastructure;
-    using Ocelot.Infrastructure.Claims.Parser;
     using Infrastructure.RequestData;
+
     using LoadBalancer.LoadBalancers;
+
     using Logging;
+
+    using Microsoft.AspNetCore.Http;
+    using Microsoft.Extensions.Configuration;
+    using Microsoft.Extensions.DependencyInjection;
+    using Microsoft.Extensions.DependencyInjection.Extensions;
+    using Microsoft.Extensions.Options;
+
     using Middleware;
+
     using Multiplexer;
+
+    using Ocelot.Infrastructure.Claims.Parser;
+
     using PathManipulation;
+
     using QueryStrings;
+
     using RateLimit;
+
     using Request.Creator;
     using Request.Mapper;
+
     using Requester;
     using Requester.QoS;
+
     using Responder;
+
     using Security;
     using Security.IPSecurity;
+
     using ServiceDiscovery;
     using ServiceDiscovery.Providers;
 

src/Ocelot/DownstreamPathManipulation/Middleware/ClaimsToDownstreamPathMiddleware.cs

@@ -3,10 +3,12 @@
     using System.Linq;
     using System.Threading.Tasks;
 
+    using Logging;
+
     using Microsoft.AspNetCore.Http;
 
-    using Logging;
     using Ocelot.Middleware;
+
     using PathManipulation;
 
     public class ClaimsToDownstreamPathMiddleware : OcelotMiddleware

src/Ocelot/DownstreamRouteFinder/DownstreamRouteHolder.cs

@@ -3,6 +3,7 @@
     using System.Collections.Generic;
 
     using Configuration;
+
     using UrlMatcher;
 
     public class DownstreamRouteHolder

src/Ocelot/DownstreamRouteFinder/Finder/DownstreamRouteCreator.cs

@@ -7,9 +7,12 @@
     using Configuration;
     using Configuration.Builder;
     using Configuration.Creator;
-    using UrlMatcher;
+
     using LoadBalancer.LoadBalancers;
+
     using Responses;
+
+    using UrlMatcher;
 
     public class DownstreamRouteCreator : IDownstreamRouteProvider
     {

src/Ocelot/DownstreamRouteFinder/Finder/DownstreamRouteProviderFactory.cs

@@ -6,9 +6,9 @@
 
     using Configuration;
 
-    using Microsoft.Extensions.DependencyInjection;
-
     using Logging;
+
+    using Microsoft.Extensions.DependencyInjection;
 
     public class DownstreamRouteProviderFactory : IDownstreamRouteProviderFactory
     {