Removed unused usings, removed empty spaces, removed tons os warnings (#903)

src/Ocelot.Administration/IIdentityServerConfiguration.cs

@@ -4,10 +4,10 @@ namespace Ocelot.Administration
 
     public interface IIdentityServerConfiguration
     {
-        string ApiName { get;  }
+        string ApiName { get; }
-        string ApiSecret { get;  }
+        string ApiSecret { get; }
-        bool RequireHttps { get;  }
+        bool RequireHttps { get; }
-        List<string> AllowedScopes { get;  }
+        List<string> AllowedScopes { get; }
         string CredentialsSigningCertificateLocation { get; }
         string CredentialsSigningCertificatePassword { get; }
     }

src/Ocelot.Administration/IdentityServerMiddlewareConfigurationProvider.cs

@@ -1,11 +1,10 @@
 namespace Ocelot.Administration
 {
-    using System.Threading.Tasks;
-    using Configuration;
     using Configuration.Repository;
     using Microsoft.AspNetCore.Builder;
     using Microsoft.Extensions.DependencyInjection;
     using Ocelot.Middleware;
+    using System.Threading.Tasks;
 
     public static class IdentityServerMiddlewareConfigurationProvider
     {

src/Ocelot.Administration/OcelotBuilderExtensions.cs

@@ -1,14 +1,6 @@
 namespace Ocelot.Administration
 {
-    using System;
-    using System.Collections.Generic;
-    using System.IdentityModel.Tokens.Jwt;
-    using System.Linq;
-    using System.Security.Cryptography.X509Certificates;
-    using Configuration;
-    using Configuration.Creator;
     using DependencyInjection;
-    using IdentityModel;
     using IdentityServer4.AccessTokenValidation;
     using IdentityServer4.Models;
     using Microsoft.AspNetCore.Builder;
@@ -16,6 +8,10 @@
     using Microsoft.Extensions.DependencyInjection;
     using Microsoft.Extensions.DependencyInjection.Extensions;
     using Ocelot.Middleware;
+    using System;
+    using System.Collections.Generic;
+    using System.IdentityModel.Tokens.Jwt;
+    using System.Security.Cryptography.X509Certificates;
 
     public static class OcelotBuilderExtensions
     {
@@ -61,7 +57,8 @@
         {
             builder.Services.TryAddSingleton<IIdentityServerConfiguration>(identityServerConfiguration);
             var identityServerBuilder = builder.Services
-                .AddIdentityServer(o => {
+                .AddIdentityServer(o =>
+                {
                     o.IssuerUri = "Ocelot";
                 })
                 .AddInMemoryApiResources(Resources(identityServerConfiguration))

src/Ocelot.Cache.CacheManager/OcelotBuilderExtensions.cs

@@ -1,12 +1,12 @@
 namespace Ocelot.Cache.CacheManager
 {
-    using System;
     using Configuration;
     using Configuration.File;
     using DependencyInjection;
     using global::CacheManager.Core;
     using Microsoft.Extensions.DependencyInjection;
     using Microsoft.Extensions.DependencyInjection.Extensions;
+    using System;
 
     public static class OcelotBuilderExtensions
     {

src/Ocelot.Cache.CacheManager/OcelotCacheManagerCache.cs

@@ -1,7 +1,7 @@
 namespace Ocelot.Cache.CacheManager
 {
-    using System;
     using global::CacheManager.Core;
+    using System;
 
     public class OcelotCacheManagerCache<T> : IOcelotCache<T>
     {

src/Ocelot.Provider.Consul/Consul.cs

@@ -1,16 +1,15 @@
 namespace Ocelot.Provider.Consul
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Threading.Tasks;
     using global::Consul;
     using Infrastructure.Extensions;
     using Logging;
     using ServiceDiscovery.Providers;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
     using Values;
 
-
     public class Consul : IServiceDiscoveryProvider
     {
         private readonly ConsulRegistryConfiguration _config;

src/Ocelot.Provider.Consul/ConsulClientFactory.cs

@@ -1,7 +1,7 @@
 namespace Ocelot.Provider.Consul
 {
-    using System;
     using global::Consul;
+    using System;
 
     public class ConsulClientFactory : IConsulClientFactory
     {

src/Ocelot.Provider.Consul/ConsulFileConfigurationRepository.cs

@@ -1,14 +1,14 @@
 namespace Ocelot.Provider.Consul
 {
-    using System;
-    using System.Text;
-    using System.Threading.Tasks;
     using Configuration.File;
     using Configuration.Repository;
     using global::Consul;
     using Logging;
     using Newtonsoft.Json;
     using Responses;
+    using System;
+    using System.Text;
+    using System.Threading.Tasks;
 
     public class ConsulFileConfigurationRepository : IFileConfigurationRepository
     {

src/Ocelot.Provider.Consul/ConsulMiddlewareConfigurationProvider.cs

@@ -1,8 +1,5 @@
 namespace Ocelot.Provider.Consul
 {
-    using System;
-    using System.Linq;
-    using System.Threading.Tasks;
     using Configuration.Creator;
     using Configuration.File;
     using Configuration.Repository;
@@ -11,6 +8,9 @@
     using Microsoft.Extensions.Options;
     using Middleware;
     using Responses;
+    using System;
+    using System.Linq;
+    using System.Threading.Tasks;
 
     public static class ConsulMiddlewareConfigurationProvider
     {

src/Ocelot.Provider.Consul/ConsulProviderFactory.cs

@@ -1,8 +1,6 @@
 namespace Ocelot.Provider.Consul
 {
-    using System.Threading.Tasks;
     using Logging;
-    using Microsoft.AspNetCore.Builder;
     using Microsoft.Extensions.DependencyInjection;
     using ServiceDiscovery;
 

src/Ocelot.Provider.Consul/PollingConsulServiceDiscoveryProvider.cs

@@ -1,10 +1,10 @@
 namespace Ocelot.Provider.Consul
 {
+    using Logging;
+    using ServiceDiscovery.Providers;
     using System.Collections.Generic;
     using System.Threading;
     using System.Threading.Tasks;
-    using Logging;
-    using ServiceDiscovery.Providers;
     using Values;
 
     public class PollConsul : IServiceDiscoveryProvider

src/Ocelot.Provider.Eureka/Eureka.cs

@@ -1,10 +1,10 @@
 namespace Ocelot.Provider.Eureka
 {
+    using ServiceDiscovery.Providers;
+    using Steeltoe.Common.Discovery;
     using System.Collections.Generic;
     using System.Linq;
     using System.Threading.Tasks;
-    using ServiceDiscovery.Providers;
-    using Steeltoe.Common.Discovery;
     using Values;
 
     public class Eureka : IServiceDiscoveryProvider

src/Ocelot.Provider.Eureka/EurekaMiddlewareConfigurationProvider.cs

@@ -1,11 +1,11 @@
 namespace Ocelot.Provider.Eureka
 {
-    using System.Threading.Tasks;
     using Configuration;
     using Configuration.Repository;
     using Microsoft.Extensions.DependencyInjection;
     using Middleware;
     using Steeltoe.Discovery.Client;
+    using System.Threading.Tasks;
 
     public class EurekaMiddlewareConfigurationProvider
     {

src/Ocelot.Provider.Eureka/EurekaProviderFactory.cs

@@ -2,7 +2,6 @@
 {
     using Microsoft.Extensions.DependencyInjection;
     using ServiceDiscovery;
-    using ServiceDiscovery.Providers;
     using Steeltoe.Common.Discovery;
 
     public static class EurekaProviderFactory

src/Ocelot.Provider.Eureka/OcelotBuilderExtensions.cs

@@ -1,12 +1,12 @@
 namespace Ocelot.Provider.Eureka
 {
-    using System.Linq;
     using DependencyInjection;
     using Microsoft.Extensions.Configuration;
     using Microsoft.Extensions.DependencyInjection;
     using Middleware;
-    using Steeltoe.Discovery.Client;
     using ServiceDiscovery;
+    using Steeltoe.Discovery.Client;
+    using System.Linq;
 
     public static class OcelotBuilderExtensions
     {

src/Ocelot.Provider.Kubernetes/KubeProvider.cs

@@ -22,7 +22,6 @@ namespace Ocelot.Provider.Kubernetes
             this.kubeApi = kubeApi;
         }
 
-
         public async Task<List<Service>> Get()
         {
             var service = await kubeApi.ServicesV1()

src/Ocelot.Provider.Kubernetes/KubeRegistryConfiguration.cs

@@ -1,7 +1,4 @@
-using KubeClient;
+namespace Ocelot.Provider.Kubernetes
-using System;
-
-namespace Ocelot.Provider.Kubernetes
 {
     public class KubeRegistryConfiguration
     {

src/Ocelot.Provider.Polly/CircuitBreaker.cs

@@ -1,8 +1,6 @@
+using Polly;
 using System.Collections.Generic;
 using System.Linq;
-using Polly;
-using Polly.CircuitBreaker;
-using Polly.Timeout;
 
 namespace Ocelot.Provider.Polly
 {

src/Ocelot.Provider.Polly/OcelotBuilderExtensions.cs

@@ -1,9 +1,5 @@
 namespace Ocelot.Provider.Polly
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Net.Http;
-    using System.Threading.Tasks;
     using Configuration;
     using DependencyInjection;
     using Errors;
@@ -12,6 +8,10 @@
     using Logging;
     using Microsoft.Extensions.DependencyInjection;
     using Requester;
+    using System;
+    using System.Collections.Generic;
+    using System.Net.Http;
+    using System.Threading.Tasks;
 
     public static class OcelotBuilderExtensions
     {
@@ -31,7 +31,7 @@
                 return new PollyCircuitBreakingDelegatingHandler(new PollyQoSProvider(reRoute, logger), logger);
             }
 
-            builder.Services.AddSingleton((QosDelegatingHandlerDelegate) QosDelegatingHandlerDelegate);
+            builder.Services.AddSingleton((QosDelegatingHandlerDelegate)QosDelegatingHandlerDelegate);
             return builder;
         }
     }

src/Ocelot.Provider.Polly/PollyCircuitBreakingDelegatingHandler.cs

@@ -1,9 +1,9 @@
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
 using Ocelot.Logging;
 using Polly;
 using Polly.CircuitBreaker;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace Ocelot.Provider.Polly
 {
@@ -26,11 +26,11 @@ namespace Ocelot.Provider.Polly
             {
                 return await Policy
                     .WrapAsync(_qoSProvider.CircuitBreaker.Policies)
-                    .ExecuteAsync(() => base.SendAsync(request,cancellationToken));
+                    .ExecuteAsync(() => base.SendAsync(request, cancellationToken));
             }
             catch (BrokenCircuitException ex)
             {
-                _logger.LogError($"Reached to allowed number of exceptions. Circuit is open",ex);
+                _logger.LogError($"Reached to allowed number of exceptions. Circuit is open", ex);
                 throw;
             }
             catch (HttpRequestException ex)

src/Ocelot.Provider.Polly/PollyQoSProvider.cs

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

src/Ocelot.Provider.Polly/RequestTimedOutError.cs

@@ -1,7 +1,7 @@
 namespace Ocelot.Provider.Polly
 {
-    using System;
     using Errors;
+    using System;
 
     public class RequestTimedOutError : Error
     {

src/Ocelot.Provider.Rafty/FilePeersProvider.cs

@@ -1,14 +1,13 @@
 namespace Ocelot.Provider.Rafty
 {
-    using System.Net.Http;
+    using Administration;
-    using Configuration;
     using Configuration.Repository;
     using global::Rafty.Concensus.Peers;
     using global::Rafty.Infrastructure;
     using Microsoft.Extensions.Options;
     using Middleware;
     using System.Collections.Generic;
-    using Administration;
+    using System.Net.Http;
 
     public class FilePeersProvider : IPeersProvider
     {

src/Ocelot.Provider.Rafty/HttpPeer.cs

@@ -1,7 +1,6 @@
 namespace Ocelot.Provider.Rafty
 {
-    using System.Net.Http;
+    using Administration;
-    using System.Threading.Tasks;
     using Configuration;
     using global::Rafty.Concensus.Messages;
     using global::Rafty.Concensus.Peers;
@@ -11,7 +10,8 @@
     using Newtonsoft.Json;
     using System;
     using System.Collections.Generic;
-    using Administration;
+    using System.Net.Http;
+    using System.Threading.Tasks;
 
     public class HttpPeer : IPeer
     {

src/Ocelot.Provider.Rafty/OcelotFiniteStateMachine.cs

@@ -1,9 +1,9 @@
 namespace Ocelot.Provider.Rafty
 {
-    using System.Threading.Tasks;
     using Configuration.Setter;
     using global::Rafty.FiniteStateMachine;
     using global::Rafty.Log;
+    using System.Threading.Tasks;
 
     public class OcelotFiniteStateMachine : IFiniteStateMachine
     {

src/Ocelot.Provider.Rafty/RaftController.cs

@@ -1,8 +1,5 @@
 namespace Ocelot.Provider.Rafty
 {
-    using System;
-    using System.IO;
-    using System.Threading.Tasks;
     using global::Rafty.Concensus.Messages;
     using global::Rafty.Concensus.Node;
     using global::Rafty.FiniteStateMachine;
@@ -11,6 +8,9 @@
     using Microsoft.AspNetCore.Mvc;
     using Middleware;
     using Newtonsoft.Json;
+    using System;
+    using System.IO;
+    using System.Threading.Tasks;
 
     [Authorize]
     [Route("raft")]

src/Ocelot.Provider.Rafty/RaftyFileConfigurationSetter.cs

@@ -1,10 +1,10 @@
 namespace Ocelot.Provider.Rafty
 {
-    using System.Threading.Tasks;
     using Configuration.File;
     using Configuration.Setter;
     using global::Rafty.Concensus.Node;
     using global::Rafty.Infrastructure;
+    using System.Threading.Tasks;
 
     public class RaftyFileConfigurationSetter : IFileConfigurationSetter
     {

src/Ocelot.Provider.Rafty/RaftyMiddlewareConfigurationProvider.cs

@@ -1,12 +1,12 @@
 namespace Ocelot.Provider.Rafty
 {
-    using System.Threading.Tasks;
     using global::Rafty.Concensus.Node;
     using global::Rafty.Infrastructure;
     using Microsoft.AspNetCore.Builder;
+    using Microsoft.AspNetCore.Hosting;
     using Microsoft.Extensions.DependencyInjection;
     using Middleware;
-    using Microsoft.AspNetCore.Hosting;
+    using System.Threading.Tasks;
 
     public static class RaftyMiddlewareConfigurationProvider
     {

src/Ocelot.Provider.Rafty/SqlLiteLog.cs

@@ -1,15 +1,15 @@
 namespace Ocelot.Provider.Rafty
 {
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Threading;
-    using System.Threading.Tasks;
     using global::Rafty.Infrastructure;
     using global::Rafty.Log;
     using Microsoft.Data.Sqlite;
     using Microsoft.Extensions.Logging;
     using Newtonsoft.Json;
+    using System;
+    using System.Collections.Generic;
+    using System.IO;
+    using System.Threading;
+    using System.Threading.Tasks;
 
     public class SqlLiteLog : ILog
     {

src/Ocelot.Provider.Rafty/UnableToSaveAcceptCommand.cs

@@ -1,6 +1,7 @@
 namespace Ocelot.Provider.Rafty
 {
     using Errors;
+
     public class UnableToSaveAcceptCommand : Error
     {
         public UnableToSaveAcceptCommand(string message)

src/Ocelot.Tracing.Butterfly/ButterflyTracer.cs

@@ -1,17 +1,17 @@
 namespace Ocelot.Tracing.Butterfly
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Net.Http;
-    using System.Threading;
-    using System.Threading.Tasks;
     using global::Butterfly.Client.AspNetCore;
     using global::Butterfly.Client.Tracing;
     using global::Butterfly.OpenTracing;
     using Infrastructure.Extensions;
     using Microsoft.AspNetCore.Http;
     using Microsoft.Extensions.DependencyInjection;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Net.Http;
+    using System.Threading;
+    using System.Threading.Tasks;
 
     public class ButterflyTracer : DelegatingHandler, Logging.ITracer
     {

src/Ocelot.Tracing.Butterfly/OcelotBuilderExtensions.cs

@@ -1,10 +1,10 @@
 namespace Ocelot.Tracing.Butterfly
 {
-    using System;
     using DependencyInjection;
     using global::Butterfly.Client.AspNetCore;
     using Logging;
     using Microsoft.Extensions.DependencyInjection;
+    using System;
 
     public static class OcelotBuilderExtensions
     {

src/Ocelot/Authentication/Middleware/AuthenticationMiddleware.cs

@@ -1,11 +1,8 @@
-using System.Collections.Generic;
+using Microsoft.AspNetCore.Authentication;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authentication;
 using Ocelot.Configuration;
-using Ocelot.Errors;
-using Ocelot.Infrastructure.Extensions;
 using Ocelot.Logging;
 using Ocelot.Middleware;
+using System.Threading.Tasks;
 
 namespace Ocelot.Authentication.Middleware
 {

src/Ocelot/Authorisation/ClaimsAuthoriser.cs

@@ -1,14 +1,10 @@
-using System;
+using Ocelot.DownstreamRouteFinder.UrlMatcher;
+using Ocelot.Responses;
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Claims;
 using System.Text.RegularExpressions;
 
-using Ocelot.DownstreamRouteFinder.UrlMatcher;
-using Ocelot.Middleware;
-using Ocelot.Responses;
-using Ocelot.Values;
-
 namespace Ocelot.Authorisation
 {
     using Infrastructure.Claims.Parser;
@@ -26,7 +22,8 @@ namespace Ocelot.Authorisation
             ClaimsPrincipal claimsPrincipal,
             Dictionary<string, string> routeClaimsRequirement,
             List<PlaceholderNameAndValue> urlPathPlaceholderNameAndValues
-        ){
+        )
+        {
             foreach (var required in routeClaimsRequirement)
             {
                 var values = _claimsParser.GetValuesByClaimType(claimsPrincipal.Claims, required.Key);
@@ -62,15 +59,14 @@ namespace Ocelot.Authorisation
                             if (matchingPlaceholders.Length == 0)
                             {
                                 return new ErrorResponse<bool>(new ClaimValueNotAuthorisedError(
-                                    $"config error: requires variable claim value: {variableName} placeholders does not contain that variable: {string.Join(", ", urlPathPlaceholderNameAndValues.Select(p=>p.Name))}"));
+                                    $"config error: requires variable claim value: {variableName} placeholders does not contain that variable: {string.Join(", ", urlPathPlaceholderNameAndValues.Select(p => p.Name))}"));
                             }
                             else
                             {
                                 return new ErrorResponse<bool>(new ClaimValueNotAuthorisedError(
-                                    $"config error: requires variable claim value: {required.Value} but placeholders are ambiguous: {string.Join(", ", urlPathPlaceholderNameAndValues.Where(p=>p.Name.Equals(variableName)).Select(p => p.Value))}"));
+                                    $"config error: requires variable claim value: {required.Value} but placeholders are ambiguous: {string.Join(", ", urlPathPlaceholderNameAndValues.Where(p => p.Name.Equals(variableName)).Select(p => p.Value))}"));
                             }
                         }
-                        
                     }
                     else
                     {

src/Ocelot/Authorisation/IClaimsAuthoriser.cs

@@ -1,9 +1,6 @@
-using System.Security.Claims;
+using Ocelot.DownstreamRouteFinder.UrlMatcher;
-
-using Ocelot.Configuration;
-using Ocelot.DownstreamRouteFinder.UrlMatcher;
 using Ocelot.Responses;
-using Ocelot.Values;
+using System.Security.Claims;
 
 namespace Ocelot.Authorisation
 {

src/Ocelot/Authorisation/IScopesAuthoriser.cs

@@ -1,5 +1,5 @@
-using System.Security.Claims;
+using Ocelot.Responses;
-using Ocelot.Responses;
+using System.Security.Claims;
 
 namespace Ocelot.Authorisation
 {

src/Ocelot/Authorisation/Middleware/AuthorisationMiddleware.cs

@@ -1,12 +1,10 @@
 namespace Ocelot.Authorisation.Middleware
 {
-    using System.Collections.Generic;
-    using System.Threading.Tasks;
-    using Errors;
-    using Ocelot.Middleware;
-    using Logging;
-    using Responses;
     using Configuration;
+    using Logging;
+    using Ocelot.Middleware;
+    using Responses;
+    using System.Threading.Tasks;
 
     public class AuthorisationMiddleware : OcelotMiddleware
     {
@@ -18,7 +16,7 @@
             IClaimsAuthoriser claimsAuthoriser,
             IScopesAuthoriser scopesAuthoriser,
             IOcelotLoggerFactory loggerFactory)
-            :base(loggerFactory.CreateLogger<AuthorisationMiddleware>())
+            : base(loggerFactory.CreateLogger<AuthorisationMiddleware>())
         {
             _next = next;
             _claimsAuthoriser = claimsAuthoriser;

src/Ocelot/Authorisation/ScopesAuthoriser.cs

@@ -1,7 +1,7 @@
 using Ocelot.Responses;
 using System.Collections.Generic;
-using System.Security.Claims;
 using System.Linq;
+using System.Security.Claims;
 
 namespace Ocelot.Authorisation
 {

src/Ocelot/Cache/CacheKeyGenerator.cs

@@ -1,13 +1,17 @@
-using System.Text;
+using Ocelot.Middleware;
+using System.Text;
 using System.Threading.Tasks;
-using Ocelot.Middleware;
 
-namespace Ocelot.Cache {
+namespace Ocelot.Cache
-    public class CacheKeyGenerator : ICacheKeyGenerator {
+{
-        public string GenerateRequestCacheKey(DownstreamContext context) {
+    public class CacheKeyGenerator : ICacheKeyGenerator
+    {
+        public string GenerateRequestCacheKey(DownstreamContext context)
+        {
             string hashedContent = null;
             StringBuilder downStreamUrlKeyBuilder = new StringBuilder($"{context.DownstreamRequest.Method}-{context.DownstreamRequest.OriginalString}");
-            if (context.DownstreamRequest.Content != null) {
+            if (context.DownstreamRequest.Content != null)
+            {
                 string requestContentString = Task.Run(async () => await context.DownstreamRequest.Content.ReadAsStringAsync()).Result;
                 downStreamUrlKeyBuilder.Append(requestContentString);
             }

src/Ocelot/Cache/CacheObject.cs

@@ -2,7 +2,7 @@
 {
     using System;
 
-    class CacheObject<T>
+    internal class CacheObject<T>
     {
         public CacheObject(T value, DateTime expires)
         {

src/Ocelot/Cache/ICacheKeyGenerator.cs

@@ -1,7 +1,9 @@
 using Ocelot.Middleware;
 
-namespace Ocelot.Cache {
+namespace Ocelot.Cache
-    public interface ICacheKeyGenerator {
+{
+    public interface ICacheKeyGenerator
+    {
         string GenerateRequestCacheKey(DownstreamContext context);
     }
 }

src/Ocelot/Cache/IOcelotCache.cs

@@ -5,8 +5,11 @@ namespace Ocelot.Cache
     public interface IOcelotCache<T>
     {
         void Add(string key, T value, TimeSpan ttl, string region);
+
         T Get(string key, string region);
+
         void ClearRegion(string region);
+
         void AddAndDelete(string key, T value, TimeSpan ttl, string region);
     }
 }

src/Ocelot/Cache/InMemoryCache.cs

@@ -35,7 +35,7 @@
             }
             else
             {
-                _regions.Add(region, new List<string>{ key });
+                _regions.Add(region, new List<string> { key });
             }
         }
 

src/Ocelot/Cache/MD5Helper.cs

@@ -1,20 +1,25 @@
 using System.Security.Cryptography;
 using System.Text;
 
-namespace Ocelot.Cache {
+namespace Ocelot.Cache
-    public static class MD5Helper {
+{
-        public static string GenerateMd5(byte[] contentBytes) {
+    public static class MD5Helper
+    {
+        public static string GenerateMd5(byte[] contentBytes)
+        {
             MD5 md5 = MD5.Create();
             byte[] hash = md5.ComputeHash(contentBytes);
             StringBuilder sb = new StringBuilder();
-            for (int i = 0; i < hash.Length; i++) {
+            for (int i = 0; i < hash.Length; i++)
+            {
                 sb.Append(hash[i].ToString("X2"));
             }
 
             return sb.ToString();
         }
 
-        public static string GenerateMd5(string contentString) {
+        public static string GenerateMd5(string contentString)
+        {
             byte[] contentBytes = Encoding.Unicode.GetBytes(contentString);
             return GenerateMd5(contentBytes);
         }

src/Ocelot/Cache/Middleware/OutputCacheMiddleware.cs

@@ -1,13 +1,13 @@
 namespace Ocelot.Cache.Middleware
 {
-    using System;
-    using System.Linq;
-    using System.Net.Http;
-    using System.Threading.Tasks;
     using Ocelot.Logging;
     using Ocelot.Middleware;
+    using System;
     using System.IO;
+    using System.Linq;
+    using System.Net.Http;
     using System.Text;
+    using System.Threading.Tasks;
 
     public class OutputCacheMiddleware : OcelotMiddleware
     {
@@ -19,7 +19,7 @@
             IOcelotLoggerFactory loggerFactory,
             IOcelotCache<CachedResponse> outputCache,
             ICacheKeyGenerator cacheGeneratot)
-                :base(loggerFactory.CreateLogger<OutputCacheMiddleware>())
+                : base(loggerFactory.CreateLogger<OutputCacheMiddleware>())
         {
             _next = next;
             _outputCache = outputCache;
@@ -77,10 +77,12 @@
             context.DownstreamResponse = response;
         }
 
-        private string GenerateRequestCacheKey(DownstreamContext context) {
+        private string GenerateRequestCacheKey(DownstreamContext context)
+        {
             string hashedContent = null;
             StringBuilder downStreamUrlKeyBuilder = new StringBuilder($"{context.DownstreamRequest.Method}-{context.DownstreamRequest.OriginalString}");
-            if(context.DownstreamRequest.Content != null) {
+            if (context.DownstreamRequest.Content != null)
+            {
                 string requestContentString = Task.Run(async () => await context.DownstreamRequest.Content?.ReadAsStringAsync()).Result;
                 downStreamUrlKeyBuilder.Append(requestContentString);
             }

src/Ocelot/Cache/RegionCreator.cs

@@ -1,6 +1,5 @@
-using System.Linq;
-using Ocelot.Configuration;
 using Ocelot.Configuration.File;
+using System.Linq;
 
 namespace Ocelot.Cache
 {
@@ -8,7 +7,7 @@ namespace Ocelot.Cache
     {
         public string Create(FileReRoute reRoute)
         {
-            if(!string.IsNullOrEmpty(reRoute?.FileCacheOptions?.Region))
+            if (!string.IsNullOrEmpty(reRoute?.FileCacheOptions?.Region))
             {
                 return reRoute?.FileCacheOptions?.Region;
             }

src/Ocelot/Claims/AddClaimsToRequest.cs

@@ -1,10 +1,10 @@
-using System.Collections.Generic;
+using Microsoft.AspNetCore.Http;
-using System.Linq;
-using System.Security.Claims;
-using Microsoft.AspNetCore.Http;
 using Ocelot.Configuration;
 using Ocelot.Infrastructure.Claims.Parser;
 using Ocelot.Responses;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
 
 namespace Ocelot.Claims
 {

src/Ocelot/Claims/IAddClaimsToRequest.cs

@@ -1,7 +1,7 @@
-using System.Collections.Generic;
+using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Http;
 using Ocelot.Configuration;
 using Ocelot.Responses;
+using System.Collections.Generic;
 
 namespace Ocelot.Claims
 {

src/Ocelot/Claims/Middleware/ClaimsToClaimsMiddleware.cs

@@ -1,10 +1,7 @@
-using System.Linq;
+using Ocelot.Logging;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
-using Ocelot.DownstreamRouteFinder.Middleware;
-using Ocelot.Infrastructure.RequestData;
-using Ocelot.Logging;
 using Ocelot.Middleware;
+using System.Linq;
+using System.Threading.Tasks;
 
 namespace Ocelot.Claims.Middleware
 {
@@ -16,7 +13,7 @@ namespace Ocelot.Claims.Middleware
         public ClaimsToClaimsMiddleware(OcelotRequestDelegate next,
             IOcelotLoggerFactory loggerFactory,
             IAddClaimsToRequest addClaimsToRequest)
-                :base(loggerFactory.CreateLogger<ClaimsToClaimsMiddleware>())
+                : base(loggerFactory.CreateLogger<ClaimsToClaimsMiddleware>())
         {
             _next = next;
             _addClaimsToRequest = addClaimsToRequest;

src/Ocelot/Configuration/Builder/DownstreamReRouteBuilder.cs

@@ -1,8 +1,8 @@
-using System.Collections.Generic;
-using System.Net.Http;
-using Ocelot.Values;
-using System.Linq;
 using Ocelot.Configuration.Creator;
+using Ocelot.Values;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
 
 namespace Ocelot.Configuration.Builder
 {
@@ -39,6 +39,7 @@ namespace Ocelot.Configuration.Builder
         private List<AddHeader> _addHeadersToUpstream;
         private bool _dangerousAcceptAnyServerCertificateValidator;
         private SecurityOptions _securityOptions;
+
         public DownstreamReRouteBuilder()
         {
             _downstreamAddresses = new List<DownstreamHostAndPort>();
@@ -55,7 +56,7 @@ namespace Ocelot.Configuration.Builder
 
         public DownstreamReRouteBuilder WithLoadBalancerOptions(LoadBalancerOptions loadBalancerOptions)
         {
-          _loadBalancerOptions = loadBalancerOptions;
+            _loadBalancerOptions = loadBalancerOptions;
             return this;
         }
 

src/Ocelot/Configuration/Builder/ReRouteBuilder.cs

@@ -1,10 +1,10 @@
 namespace Ocelot.Configuration.Builder
 {
-    using System.Collections.Generic;
-    using System.Net.Http;
-    using Ocelot.Values;
-    using System.Linq;
     using Ocelot.Configuration.File;
+    using Ocelot.Values;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Net.Http;
 
     public class ReRouteBuilder
     {

src/Ocelot/Configuration/Creator/AggregatesCreator.cs

@@ -1,9 +1,9 @@
 namespace Ocelot.Configuration.Creator
 {
-    using System.Collections.Generic;
-    using System.Linq;
     using Builder;
     using File;
+    using System.Collections.Generic;
+    using System.Linq;
 
     public class AggregatesCreator : IAggregatesCreator
     {

src/Ocelot/Configuration/Creator/ClaimsToThingCreator.cs

@@ -1,6 +1,6 @@
-using System.Collections.Generic;
 using Ocelot.Configuration.Parser;
 using Ocelot.Logging;
+using System.Collections.Generic;
 
 namespace Ocelot.Configuration.Creator
 {
@@ -16,7 +16,7 @@ namespace Ocelot.Configuration.Creator
             _claimToThingConfigParser = claimToThingConfigurationParser;
         }
 
-        public List<ClaimToThing> Create(Dictionary<string,string> inputToBeParsed)
+        public List<ClaimToThing> Create(Dictionary<string, string> inputToBeParsed)
         {
             var claimsToThings = new List<ClaimToThing>();
 

src/Ocelot/Configuration/Creator/ConfigurationCreator.cs

@@ -1,10 +1,10 @@
 namespace Ocelot.Configuration.Creator
 {
+    using DependencyInjection;
+    using File;
+    using Microsoft.Extensions.DependencyInjection;
     using System;
     using System.Collections.Generic;
-    using File;
-    using DependencyInjection;
-    using Microsoft.Extensions.DependencyInjection;
 
     public class ConfigurationCreator : IConfigurationCreator
     {

src/Ocelot/Configuration/Creator/DownstreamAddressesCreator.cs

@@ -1,6 +1,6 @@
+using Ocelot.Configuration.File;
 using System.Collections.Generic;
 using System.Linq;
-using Ocelot.Configuration.File;
 
 namespace Ocelot.Configuration.Creator
 {

src/Ocelot/Configuration/Creator/DynamicsCreator.cs

@@ -1,9 +1,9 @@
 namespace Ocelot.Configuration.Creator
 {
-    using System.Collections.Generic;
-    using System.Linq;
     using Builder;
     using File;
+    using System.Collections.Generic;
+    using System.Linq;
 
     public class DynamicsCreator : IDynamicsCreator
     {

src/Ocelot/Configuration/Creator/FileInternalConfigurationCreator.cs

@@ -1,10 +1,10 @@
 namespace Ocelot.Configuration.Creator
 {
+    using File;
+    using Responses;
     using System.Linq;
     using System.Threading.Tasks;
-    using File;
     using Validator;
-    using Responses;
 
     public class FileInternalConfigurationCreator : IInternalConfigurationCreator
     {

src/Ocelot/Configuration/Creator/HeaderFindAndReplaceCreator.cs

@@ -1,11 +1,9 @@
-using System;
-using System.Collections.Generic;
 using Ocelot.Configuration.File;
 using Ocelot.Infrastructure;
 using Ocelot.Infrastructure.Extensions;
 using Ocelot.Logging;
-using Ocelot.Middleware;
 using Ocelot.Responses;
+using System.Collections.Generic;
 
 namespace Ocelot.Configuration.Creator
 {
@@ -25,7 +23,7 @@ namespace Ocelot.Configuration.Creator
             var upstream = new List<HeaderFindAndReplace>();
             var addHeadersToUpstream = new List<AddHeader>();
 
-            foreach(var input in fileReRoute.UpstreamHeaderTransform)
+            foreach (var input in fileReRoute.UpstreamHeaderTransform)
             {
                 if (input.Value.Contains(","))
                 {
@@ -48,12 +46,12 @@ namespace Ocelot.Configuration.Creator
             var downstream = new List<HeaderFindAndReplace>();
             var addHeadersToDownstream = new List<AddHeader>();
 
-            foreach(var input in fileReRoute.DownstreamHeaderTransform)
+            foreach (var input in fileReRoute.DownstreamHeaderTransform)
             {
-                if(input.Value.Contains(","))
+                if (input.Value.Contains(","))
                 {
                     var hAndr = Map(input);
-                    if(!hAndr.IsError)
+                    if (!hAndr.IsError)
                     {
                         downstream.Add(hAndr.Data);
                     }
@@ -71,14 +69,14 @@ namespace Ocelot.Configuration.Creator
             return new HeaderTransformations(upstream, downstream, addHeadersToDownstream, addHeadersToUpstream);
         }
 
-        private Response<HeaderFindAndReplace> Map(KeyValuePair<string,string> input)
+        private Response<HeaderFindAndReplace> Map(KeyValuePair<string, string> input)
         {
             var findAndReplace = input.Value.Split(",");
 
             var replace = findAndReplace[1].TrimStart();
 
             var startOfPlaceholder = replace.IndexOf("{");
-            if(startOfPlaceholder > -1)
+            if (startOfPlaceholder > -1)
             {
                 var endOfPlaceholder = replace.IndexOf("}", startOfPlaceholder);
 
@@ -86,7 +84,7 @@ namespace Ocelot.Configuration.Creator
 
                 var value = _placeholders.Get(placeholder);
 
-                if(value.IsError)
+                if (value.IsError)
                 {
                     return new ErrorResponse<HeaderFindAndReplace>(value.Errors);
                 }

src/Ocelot/Configuration/Creator/HttpHandlerOptionsCreator.cs

@@ -1,9 +1,9 @@
 namespace Ocelot.Configuration.Creator
 {
-    using System;
     using Logging;
     using Microsoft.Extensions.DependencyInjection;
     using Ocelot.Configuration.File;
+    using System;
 
     public class HttpHandlerOptionsCreator : IHttpHandlerOptionsCreator
     {
@@ -16,7 +16,7 @@
 
         public HttpHandlerOptions Create(FileHttpHandlerOptions options)
         {
-            var useTracing = _tracer!= null && options.UseTracing;
+            var useTracing = _tracer != null && options.UseTracing;
 
             return new HttpHandlerOptions(options.AllowAutoRedirect,
                 options.UseCookieContainer, useTracing, options.UseProxy);

src/Ocelot/Configuration/Creator/IAggregatesCreator.cs

@@ -1,5 +1,5 @@
-using System.Collections.Generic;
 using Ocelot.Configuration.File;
+using System.Collections.Generic;
 
 namespace Ocelot.Configuration.Creator
 {

src/Ocelot/Configuration/Creator/IAuthenticationOptionsCreator.cs

@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using Ocelot.Configuration.File;
 
 namespace Ocelot.Configuration.Creator

src/Ocelot/Configuration/Creator/IClaimsToThingCreator.cs

@@ -4,6 +4,6 @@ namespace Ocelot.Configuration.Creator
 {
     public interface IClaimsToThingCreator
     {
-        List<ClaimToThing> Create(Dictionary<string,string> thingsBeingAdded);
+        List<ClaimToThing> Create(Dictionary<string, string> thingsBeingAdded);
     }
 }

src/Ocelot/Configuration/Creator/IConfigurationCreator.cs

@@ -1,5 +1,5 @@
-using System.Collections.Generic;
 using Ocelot.Configuration.File;
+using System.Collections.Generic;
 
 namespace Ocelot.Configuration.Creator
 {

src/Ocelot/Configuration/Creator/IDownstreamAddressesCreator.cs

@@ -1,5 +1,5 @@
-using System.Collections.Generic;
 using Ocelot.Configuration.File;
+using System.Collections.Generic;
 
 namespace Ocelot.Configuration.Creator
 {

src/Ocelot/Configuration/Creator/IDynamicsCreator.cs

@@ -1,5 +1,5 @@
-using System.Collections.Generic;
 using Ocelot.Configuration.File;
+using System.Collections.Generic;
 
 namespace Ocelot.Configuration.Creator
 {

src/Ocelot/Configuration/Creator/IHeaderFindAndReplaceCreator.cs

@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using Ocelot.Configuration.File;
 
 namespace Ocelot.Configuration.Creator

src/Ocelot/Configuration/Creator/IInternalConfigurationCreator.cs

@@ -1,6 +1,6 @@
-using System.Threading.Tasks;
 using Ocelot.Configuration.File;
 using Ocelot.Responses;
+using System.Threading.Tasks;
 
 namespace Ocelot.Configuration.Creator
 {

src/Ocelot/Configuration/Creator/IQoSOptionsCreator.cs

@@ -1,12 +1,14 @@
-using System.Collections.Generic;
 using Ocelot.Configuration.File;
+using System.Collections.Generic;
 
 namespace Ocelot.Configuration.Creator
 {
     public interface IQoSOptionsCreator
     {
         QoSOptions Create(FileQoSOptions options);
+
         QoSOptions Create(FileQoSOptions options, string pathTemplate, List<string> httpMethods);
+
         QoSOptions Create(QoSOptions options, string pathTemplate, List<string> httpMethods);
     }
 }

src/Ocelot/Configuration/Creator/IReRoutesCreator.cs

@@ -1,5 +1,5 @@
-using System.Collections.Generic;
 using Ocelot.Configuration.File;
+using System.Collections.Generic;
 
 namespace Ocelot.Configuration.Creator
 {

src/Ocelot/Configuration/Creator/ISecurityOptionsCreator.cs

@@ -1,7 +1,4 @@
 using Ocelot.Configuration.File;
-using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace Ocelot.Configuration.Creator
 {

src/Ocelot/Configuration/Creator/ReRouteKeyCreator.cs

@@ -1,6 +1,6 @@
-using System.Linq;
 using Ocelot.Configuration.File;
 using Ocelot.LoadBalancer.LoadBalancers;
+using System.Linq;
 
 namespace Ocelot.Configuration.Creator
 {

src/Ocelot/Configuration/Creator/ReRoutesCreator.cs

@@ -1,10 +1,10 @@
 namespace Ocelot.Configuration.Creator
 {
+    using Builder;
+    using Cache;
+    using File;
     using System.Collections.Generic;
     using System.Linq;
-    using Cache;
-    using Builder;
-    using File;
 
     public class ReRoutesCreator : IReRoutesCreator
     {

src/Ocelot/Configuration/Creator/RequestIdKeyCreator.cs

@@ -8,11 +8,11 @@ namespace Ocelot.Configuration.Creator
         {
             var reRouteId = !string.IsNullOrEmpty(fileReRoute.RequestIdKey);
 
-             var requestIdKey = reRouteId
+            var requestIdKey = reRouteId
-                ? fileReRoute.RequestIdKey
+               ? fileReRoute.RequestIdKey
-                : globalConfiguration.RequestIdKey;
+               : globalConfiguration.RequestIdKey;
 
-                return requestIdKey;
+            return requestIdKey;
         }
     }
 }

src/Ocelot/Configuration/Creator/SecurityOptionsCreator.cs

@@ -1,7 +1,4 @@
-using System;
+using Ocelot.Configuration.File;
-using System.Collections.Generic;
-using System.Text;
-using Ocelot.Configuration.File;
 
 namespace Ocelot.Configuration.Creator
 {

src/Ocelot/Configuration/Creator/UpstreamTemplatePatternCreator.cs

@@ -1,6 +1,6 @@
-using System.Collections.Generic;
 using Ocelot.Configuration.File;
 using Ocelot.Values;
+using System.Collections.Generic;
 
 namespace Ocelot.Configuration.Creator
 {
@@ -29,7 +29,7 @@ namespace Ocelot.Configuration.Creator
                     placeholders.Add(placeHolderName);
 
                     //hack to handle /{url} case
-                    if(ForwardSlashAndOnePlaceHolder(upstreamTemplate, placeholders, postitionOfPlaceHolderClosingBracket))
+                    if (ForwardSlashAndOnePlaceHolder(upstreamTemplate, placeholders, postitionOfPlaceHolderClosingBracket))
                     {
                         return new UpstreamPathTemplate(RegExForwardSlashAndOnePlaceHolder, 0, false, reRoute.UpstreamPathTemplate);
                     }
@@ -48,7 +48,7 @@ namespace Ocelot.Configuration.Creator
             {
                 var indexOfPlaceholder = upstreamTemplate.IndexOf(placeholders[i]);
                 var indexOfNextForwardSlash = upstreamTemplate.IndexOf("/", indexOfPlaceholder);
-                if(indexOfNextForwardSlash < indexOfPlaceholder || (containsQueryString && upstreamTemplate.IndexOf("?") < upstreamTemplate.IndexOf(placeholders[i])))
+                if (indexOfNextForwardSlash < indexOfPlaceholder || (containsQueryString && upstreamTemplate.IndexOf("?") < upstreamTemplate.IndexOf(placeholders[i])))
                 {
                     upstreamTemplate = upstreamTemplate.Replace(placeholders[i], RegExMatchOneOrMoreOfEverything);
                 }
@@ -63,9 +63,9 @@ namespace Ocelot.Configuration.Creator
                 return new UpstreamPathTemplate(RegExForwardSlashOnly, reRoute.Priority, containsQueryString, reRoute.UpstreamPathTemplate);
             }
 
-            if(upstreamTemplate.EndsWith("/"))
+            if (upstreamTemplate.EndsWith("/"))
             {
-                upstreamTemplate = upstreamTemplate.Remove(upstreamTemplate.Length -1, 1) + "(/|)";
+                upstreamTemplate = upstreamTemplate.Remove(upstreamTemplate.Length - 1, 1) + "(/|)";
             }
 
             var route = reRoute.ReRouteIsCaseSensitive
@@ -77,7 +77,7 @@ namespace Ocelot.Configuration.Creator
 
         private bool ForwardSlashAndOnePlaceHolder(string upstreamTemplate, List<string> placeholders, int postitionOfPlaceHolderClosingBracket)
         {
-            if(upstreamTemplate.Substring(0, 2) == "/{" && placeholders.Count == 1 && upstreamTemplate.Length == postitionOfPlaceHolderClosingBracket + 1)
+            if (upstreamTemplate.Substring(0, 2) == "/{" && placeholders.Count == 1 && upstreamTemplate.Length == postitionOfPlaceHolderClosingBracket + 1)
             {
                 return true;
             }

src/Ocelot/Configuration/DownstreamReRoute.cs

@@ -1,7 +1,7 @@
 namespace Ocelot.Configuration
 {
-    using System.Collections.Generic;
     using Creator;
+    using System.Collections.Generic;
     using Values;
 
     public class DownstreamReRoute

src/Ocelot/Configuration/File/AggregateReRouteConfig.cs

@@ -1,8 +1,4 @@
-using System;
+namespace Ocelot.Configuration.File
-using System.Collections.Generic;
-using System.Text;
-
-namespace Ocelot.Configuration.File
 {
     public class AggregateReRouteConfig
     {

src/Ocelot/Configuration/File/FileAggregateReRoute.cs

@@ -4,9 +4,9 @@ namespace Ocelot.Configuration.File
 {
     public class FileAggregateReRoute : IReRoute
     {
-        public List<string> ReRouteKeys { get;set; }
+        public List<string> ReRouteKeys { get; set; }
-        public List<AggregateReRouteConfig> ReRouteKeysConfig { get;set; }
+        public List<AggregateReRouteConfig> ReRouteKeysConfig { get; set; }
-        public string UpstreamPathTemplate { get;set; }
+        public string UpstreamPathTemplate { get; set; }
         public string UpstreamHost { get; set; }
         public bool ReRouteIsCaseSensitive { get; set; }
         public string Aggregator { get; set; }
@@ -14,9 +14,9 @@ namespace Ocelot.Configuration.File
         // Only supports GET..are you crazy!! POST, PUT WOULD BE CRAZY!! :)
         public List<string> UpstreamHttpMethod
         {
-            get { return new List<string> {"Get"}; }
+            get { return new List<string> { "Get" }; }
         }
 
-        public int Priority {get;set;} = 1;
+        public int Priority { get; set; } = 1;
     }
 }

src/Ocelot/Configuration/File/FileAuthenticationOptions.cs

@@ -1,6 +1,6 @@
-using System.Collections.Generic;
+using Ocelot.Infrastructure.Extensions;
+using System.Collections.Generic;
 using System.Text;
-using Ocelot.Infrastructure.Extensions;
 
 namespace Ocelot.Configuration.File
 {
@@ -11,7 +11,7 @@ namespace Ocelot.Configuration.File
             AllowedScopes = new List<string>();
         }
 
-        public string AuthenticationProviderKey {get; set;}
+        public string AuthenticationProviderKey { get; set; }
         public List<string> AllowedScopes { get; set; }
 
         public override string ToString()

src/Ocelot/Configuration/File/FileCacheOptions.cs

@@ -3,6 +3,6 @@
     public class FileCacheOptions
     {
         public int TtlSeconds { get; set; }
-        public string Region {get; set;}
+        public string Region { get; set; }
     }
 }

src/Ocelot/Configuration/File/FileConfiguration.cs

@@ -16,7 +16,8 @@ namespace Ocelot.Configuration.File
         public List<FileDynamicReRoute> DynamicReRoutes { get; set; }
 
         // Seperate field for aggregates because this let's you re-use ReRoutes in multiple Aggregates
-        public List<FileAggregateReRoute> Aggregates { get;set; }
+        public List<FileAggregateReRoute> Aggregates { get; set; }
+
         public FileGlobalConfiguration GlobalConfiguration { get; set; }
     }
 }

src/Ocelot/Configuration/File/FileGlobalConfiguration.cs

@@ -13,13 +13,13 @@
 
         public string RequestIdKey { get; set; }
 
-        public FileServiceDiscoveryProvider ServiceDiscoveryProvider { get;set; }
+        public FileServiceDiscoveryProvider ServiceDiscoveryProvider { get; set; }
 
         public FileRateLimitOptions RateLimitOptions { get; set; }
 
         public FileQoSOptions QoSOptions { get; set; }
 
-        public string BaseUrl { get ;set; }
+        public string BaseUrl { get; set; }
 
         public FileLoadBalancerOptions LoadBalancerOptions { get; set; }
 

src/Ocelot/Configuration/File/FileHostAndPort.cs

@@ -2,7 +2,7 @@ namespace Ocelot.Configuration.File
 {
     public class FileHostAndPort
     {
-        public string Host {get;set;}
+        public string Host { get; set; }
         public int Port { get; set; }
     }
 }

src/Ocelot/Configuration/File/FileRateLimitOptions.cs

@@ -1,9 +1,4 @@
-using System;
+namespace Ocelot.Configuration.File
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Ocelot.Configuration.File
 {
     public class FileRateLimitOptions
     {
@@ -32,6 +27,6 @@ namespace Ocelot.Configuration.File
         /// <summary>
         /// Gets or sets the HTTP Status code returned when rate limiting occurs, by default value is set to 429 (Too Many Requests)
         /// </summary>
-        public int HttpStatusCode { get;  set; } = 429;
+        public int HttpStatusCode { get; set; } = 429;
     }
 }

src/Ocelot/Configuration/File/FileRateLimitRule.cs

@@ -1,9 +1,6 @@
-using System;
+using Ocelot.Infrastructure.Extensions;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
-using Ocelot.Infrastructure.Extensions;
 
 namespace Ocelot.Configuration.File
 {

src/Ocelot/Configuration/File/FileReRoute.cs

@@ -38,17 +38,17 @@ namespace Ocelot.Configuration.File
         public FileCacheOptions FileCacheOptions { get; set; }
         public bool ReRouteIsCaseSensitive { get; set; }
         public string ServiceName { get; set; }
-        public string DownstreamScheme {get;set;}
+        public string DownstreamScheme { get; set; }
         public FileQoSOptions QoSOptions { get; set; }
         public FileLoadBalancerOptions LoadBalancerOptions { get; set; }
         public FileRateLimitRule RateLimitOptions { get; set; }
         public FileAuthenticationOptions AuthenticationOptions { get; set; }
         public FileHttpHandlerOptions HttpHandlerOptions { get; set; }
-        public List<FileHostAndPort> DownstreamHostAndPorts {get;set;}
+        public List<FileHostAndPort> DownstreamHostAndPorts { get; set; }
         public string UpstreamHost { get; set; }
-        public string Key { get;set; }
+        public string Key { get; set; }
-        public List<string> DelegatingHandlers {get;set;}
+        public List<string> DelegatingHandlers { get; set; }
-        public int Priority { get;set; }
+        public int Priority { get; set; }
         public int Timeout { get; set; }
         public bool DangerousAcceptAnyServerCertificateValidator { get; set; }
         public FileSecurityOptions SecurityOptions { get; set; }

src/Ocelot/Configuration/File/FileSecurityOptions.cs

@@ -1,6 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Text;
 
 namespace Ocelot.Configuration.File
 {

src/Ocelot/Configuration/File/FileServiceDiscoveryProvider.cs

@@ -2,7 +2,7 @@ namespace Ocelot.Configuration.File
 {
     public class FileServiceDiscoveryProvider
     {
-        public string Host {get;set;}
+        public string Host { get; set; }
         public int Port { get; set; }
         public string Type { get; set; }
         public string Token { get; set; }

src/Ocelot/Configuration/File/IReRoute.cs

@@ -4,6 +4,6 @@
     {
         string UpstreamPathTemplate { get; set; }
         bool ReRouteIsCaseSensitive { get; set; }
-        int Priority {get;set;}
+        int Priority { get; set; }
     }
 }

src/Ocelot/Configuration/FileConfigurationController.cs

@@ -1,9 +1,9 @@
-using System;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Ocelot.Configuration.File;
 using Ocelot.Configuration.Setter;
+using System;
+using System.Threading.Tasks;
 
 namespace Ocelot.Configuration
 {
@@ -29,7 +29,7 @@ namespace Ocelot.Configuration
         {
             var response = await _repo.Get();
 
-            if(response.IsError)
+            if (response.IsError)
             {
                 return new BadRequestObjectResult(response.Errors);
             }
@@ -51,7 +51,7 @@ namespace Ocelot.Configuration
 
                 return new OkObjectResult(fileConfiguration);
             }
-            catch(Exception e)
+            catch (Exception e)
             {
                 return new BadRequestObjectResult($"{e.Message}:{e.StackTrace}");
             }

src/Ocelot/Configuration/HeaderFindAndReplace.cs

@@ -10,11 +10,11 @@ namespace Ocelot.Configuration
             Index = index;
         }
 
-        public string Key {get;}
+        public string Key { get; }
-        public string Find {get;}
+        public string Find { get; }
-        public string Replace {get;}
+        public string Replace { get; }
 
         // only index 0 for now..
-        public int Index {get;}
+        public int Index { get; }
     }
 }

src/Ocelot/Configuration/IInternalConfiguration.cs

@@ -6,11 +6,11 @@ namespace Ocelot.Configuration
     {
         List<ReRoute> ReRoutes { get; }
 
-        string AdministrationPath {get;}
+        string AdministrationPath { get; }
 
-        ServiceProviderConfiguration ServiceProviderConfiguration {get;}
+        ServiceProviderConfiguration ServiceProviderConfiguration { get; }
 
-        string RequestId {get;}
+        string RequestId { get; }
 
         LoadBalancerOptions LoadBalancerOptions { get; }
 

src/Ocelot/Configuration/InternalConfiguration.cs

@@ -25,9 +25,9 @@ namespace Ocelot.Configuration
         }
 
         public List<ReRoute> ReRoutes { get; }
-        public string AdministrationPath {get;}
+        public string AdministrationPath { get; }
-        public ServiceProviderConfiguration ServiceProviderConfiguration {get;}
+        public ServiceProviderConfiguration ServiceProviderConfiguration { get; }
-        public string RequestId {get;}
+        public string RequestId { get; }
         public LoadBalancerOptions LoadBalancerOptions { get; }
         public string DownstreamScheme { get; }
         public QoSOptions QoSOptions { get; }

src/Ocelot/Configuration/Parser/ClaimToThingConfigurationParser.cs

@@ -1,8 +1,6 @@
-using System;
+using Ocelot.Responses;
-using System.Collections.Generic;
+using System;
 using System.Text.RegularExpressions;
-using Ocelot.Errors;
-using Ocelot.Responses;
 
 namespace Ocelot.Configuration.Parser
 {

src/Ocelot/Configuration/Parser/ParsingConfigurationHeaderError.cs

@@ -1,5 +1,5 @@
-using System;
+using Ocelot.Errors;
-using Ocelot.Errors;
+using System;
 
 namespace Ocelot.Configuration.Parser
 {

src/Ocelot/Configuration/RateLimitOptions.cs

@@ -1,6 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace Ocelot.Configuration
 {
@@ -9,12 +7,12 @@ namespace Ocelot.Configuration
     /// </summary>
     public class RateLimitOptions
     {
-        public RateLimitOptions(bool enbleRateLimiting, string clientIdHeader, List<string> clientWhitelist,bool disableRateLimitHeaders,
+        public RateLimitOptions(bool enbleRateLimiting, string clientIdHeader, List<string> clientWhitelist, bool disableRateLimitHeaders,
             string quotaExceededMessage, string rateLimitCounterPrefix, RateLimitRule rateLimitRule, int httpStatusCode)
         {
             EnableRateLimiting = enbleRateLimiting;
             ClientIdHeader = clientIdHeader;
-            ClientWhitelist = clientWhitelist?? new List<string>();
+            ClientWhitelist = clientWhitelist ?? new List<string>();
             DisableRateLimitHeaders = disableRateLimitHeaders;
             QuotaExceededMessage = quotaExceededMessage;
             RateLimitCounterPrefix = rateLimitCounterPrefix;
@@ -22,7 +20,7 @@ namespace Ocelot.Configuration
             HttpStatusCode = httpStatusCode;
         }
 
-        public RateLimitRule RateLimitRule { get;  private set; }
+        public RateLimitRule RateLimitRule { get; private set; }
 
         public List<string> ClientWhitelist { get; private set; }
 

src/Ocelot/Configuration/RateLimitRule.cs

@@ -1,6 +1,4 @@
-using System;
+namespace Ocelot.Configuration
-
-namespace Ocelot.Configuration
 {
     public class RateLimitRule
     {

src/Ocelot/Configuration/ReRoute.cs

@@ -1,9 +1,9 @@
 namespace Ocelot.Configuration
 {
-    using System.Collections.Generic;
-    using System.Net.Http;
     using Ocelot.Configuration.File;
     using Ocelot.Values;
+    using System.Collections.Generic;
+    using System.Net.Http;
 
     public class ReRoute
     {
@@ -27,6 +27,6 @@
         public string UpstreamHost { get; private set; }
         public List<DownstreamReRoute> DownstreamReRoute { get; private set; }
         public List<AggregateReRouteConfig> DownstreamReRouteConfig { get; private set; }
-        public string Aggregator {get; private set;}
+        public string Aggregator { get; private set; }
     }
 }

src/Ocelot/Configuration/Repository/ConsulFileConfigurationPollerOption.cs

@@ -1,33 +1,40 @@
-using System.Threading.Tasks;
+using Ocelot.Responses;
-using Ocelot.Responses;
+using System.Threading.Tasks;
 
-namespace Ocelot.Configuration.Repository {
+namespace Ocelot.Configuration.Repository
-    public class ConsulFileConfigurationPollerOption : IFileConfigurationPollerOptions {
+{
+    public class ConsulFileConfigurationPollerOption : IFileConfigurationPollerOptions
+    {
         private readonly IInternalConfigurationRepository _internalConfigRepo;
         private readonly IFileConfigurationRepository _fileConfigurationRepository;
 
         public ConsulFileConfigurationPollerOption(IInternalConfigurationRepository internalConfigurationRepository,
-                                                   IFileConfigurationRepository fileConfigurationRepository) {
+                                                   IFileConfigurationRepository fileConfigurationRepository)
+        {
             _internalConfigRepo = internalConfigurationRepository;
             _fileConfigurationRepository = fileConfigurationRepository;
         }
 
         public int Delay => GetDelay();
 
-        private int GetDelay() {
+        private int GetDelay()
+        {
             int delay = 1000;
 
             Response<File.FileConfiguration> fileConfig = Task.Run(async () => await _fileConfigurationRepository.Get()).Result;
             if (fileConfig?.Data?.GlobalConfiguration?.ServiceDiscoveryProvider != null &&
                     !fileConfig.IsError &&
-                    fileConfig.Data.GlobalConfiguration.ServiceDiscoveryProvider.PollingInterval > 0) {
+                    fileConfig.Data.GlobalConfiguration.ServiceDiscoveryProvider.PollingInterval > 0)
+            {
                 delay = fileConfig.Data.GlobalConfiguration.ServiceDiscoveryProvider.PollingInterval;
             }
-            else {
+            else
+            {
                 Response<IInternalConfiguration> internalConfig = _internalConfigRepo.Get();
                 if (internalConfig?.Data?.ServiceProviderConfiguration != null &&
                 !internalConfig.IsError &&
-                internalConfig.Data.ServiceProviderConfiguration.PollingInterval > 0) {
+                internalConfig.Data.ServiceProviderConfiguration.PollingInterval > 0)
+                {
                     delay = internalConfig.Data.ServiceProviderConfiguration.PollingInterval;
                 }
             }

src/Ocelot/Configuration/Repository/DiskFileConfigurationRepository.cs

@@ -1,9 +1,9 @@
-using System;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Hosting;
 using Newtonsoft.Json;
 using Ocelot.Configuration.File;
 using Ocelot.Responses;
+using System;
+using System.Threading.Tasks;
 
 namespace Ocelot.Configuration.Repository
 {
@@ -25,7 +25,7 @@ namespace Ocelot.Configuration.Repository
         {
             string jsonConfiguration;
 
-            lock(_lock)
+            lock (_lock)
             {
                 jsonConfiguration = System.IO.File.ReadAllText(_environmentFilePath);
             }
@@ -39,7 +39,7 @@ namespace Ocelot.Configuration.Repository
         {
             string jsonConfiguration = JsonConvert.SerializeObject(fileConfiguration, Formatting.Indented);
 
-            lock(_lock)
+            lock (_lock)
             {
                 if (System.IO.File.Exists(_environmentFilePath))
                 {