Fix brace line spacing and remove multiple concurrent whitespace characters

SA1025, SA1505, SA1508, SA-1509, SA1513

src/Ocelot/Authorisation/ClaimsAuthoriser.cs

@@ -47,7 +47,8 @@ namespace Ocelot.Authorisation
                         });
                 }
             }
+
             return new OkResponse<bool>(true);
         }
     }
-}
+}

src/Ocelot/Cache/RegionCreator.cs

@@ -4,7 +4,6 @@ using Ocelot.Configuration.File;
 
 namespace Ocelot.Cache
 {
-
     public class RegionCreator : IRegionCreator
     {
         public string Create(FileReRoute reRoute)
@@ -21,4 +20,4 @@ namespace Ocelot.Cache
             return region;
         }
     }
-}
+}

src/Ocelot/Cache/Regions.cs

@@ -8,6 +8,7 @@ namespace Ocelot.Cache
         {
             Value = value;
         }
+
         public List<string> Value {get;private set;}
     }
-}
+}

src/Ocelot/Claims/Middleware/ClaimsBuilderMiddleware.cs

@@ -39,6 +39,7 @@ namespace Ocelot.Claims.Middleware
                     return;
                 }
             }
+
             await _next.Invoke(context);
         }
     }

src/Ocelot/Configuration/DownstreamHostAndPort.cs

@@ -7,6 +7,7 @@
             Host = host;
             Port = port;
         }
+
         public string Host { get; private set; }
         public int Port { get; private set; }
     }

src/Ocelot/Configuration/File/FileRateLimitOptions.cs

@@ -34,6 +34,4 @@ namespace Ocelot.Configuration.File
         /// </summary>
         public int HttpStatusCode { get;  set; } = 429;
     }
-
-    
 }

src/Ocelot/Configuration/File/FileRateLimitRule.cs

@@ -6,7 +6,6 @@ using System.Threading.Tasks;
 
 namespace Ocelot.Configuration.File
 {
-
     public class FileRateLimitRule
     {
         public FileRateLimitRule()
@@ -38,6 +37,7 @@ namespace Ocelot.Configuration.File
             {
                 return string.Empty;
             }
+
             var sb = new StringBuilder();
             sb.Append(
                 $"{nameof(Period)}:{Period},{nameof(PeriodTimespan)}:{PeriodTimespan:F},{nameof(Limit)}:{Limit},{nameof(ClientWhitelist)}:[");

src/Ocelot/Configuration/QoSOptions.cs

@@ -24,6 +24,5 @@ namespace Ocelot.Configuration
         public int TimeoutValue { get; private set; }
 
         public TimeoutStrategy TimeoutStrategy { get; private set; }
-
     }
 }

src/Ocelot/Configuration/ReRouteOptions.cs

@@ -9,12 +9,12 @@ namespace Ocelot.Configuration
             IsCached = isCached;
             IsQos = isQos;
             EnableRateLimiting = isEnableRateLimiting;
-
         }
+
         public bool IsAuthenticated { get; private set; }
         public bool IsAuthorised { get; private set; }
         public bool IsCached { get; private set; }
         public bool IsQos { get; private set; }
         public bool EnableRateLimiting { get; private set; }
     }
-}
+}

src/Ocelot/Configuration/Repository/ConsulFileConfigurationPoller.cs

@@ -34,7 +34,6 @@ namespace Ocelot.Configuration.Repository
                 _polling = true;
                 await Poll();
                 _polling = false;
-
             }, null, 0, 1000);
         }
         

src/Ocelot/Configuration/Repository/ConsulFileConfigurationRepository.cs

@@ -9,7 +9,6 @@ using Ocelot.ServiceDiscovery;
 
 namespace Ocelot.Configuration.Repository
 {
-
     public class ConsulFileConfigurationRepository : IFileConfigurationRepository
     {
         private readonly ConsulClient _consul;
@@ -76,4 +75,4 @@ namespace Ocelot.Configuration.Repository
             return new ErrorResponse(new UnableToSetConfigInConsulError($"Unable to set FileConfiguration in consul, response status code from consul was {result.StatusCode}"));
         }
     }
-}
+}

src/Ocelot/Configuration/Setter/FileConfigurationSetter.cs

@@ -12,7 +12,7 @@ namespace Ocelot.Configuration.Setter
         private readonly IOcelotConfigurationCreator _configCreator;
         private readonly IFileConfigurationRepository _repo;
 
-        public  FileConfigurationSetter(IOcelotConfigurationRepository configRepo, 
+        public FileConfigurationSetter(IOcelotConfigurationRepository configRepo, 
             IOcelotConfigurationCreator configCreator, IFileConfigurationRepository repo)
         {
             _configRepo = configRepo;
@@ -39,4 +39,4 @@ namespace Ocelot.Configuration.Setter
             return new ErrorResponse(config.Errors);
         }
     }
-}
+}

src/Ocelot/Configuration/Validator/FileValidationFailedError.cs

@@ -9,7 +9,6 @@ namespace Ocelot.Configuration.Validator
     {
         public FileValidationFailedError(string message) : base(message, OcelotErrorCode.FileValidationFailedError)
         {
-
         }
     }
 }

src/Ocelot/Configuration/Validator/ReRouteFluentValidator.cs

@@ -67,6 +67,7 @@ namespace Ocelot.Configuration.Validator
             {
                 return true;
             }
+
             var schemes = await _authenticationSchemeProvider.GetAllSchemesAsync();
 
             var supportedSchemes = schemes.Select(scheme => scheme.Name).ToList();

src/Ocelot/DependencyInjection/OcelotBuilder.cs

@@ -126,7 +126,7 @@ namespace Ocelot.DependencyInjection
 
             // see this for why we register this as singleton http://stackoverflow.com/questions/37371264/invalidoperationexception-unable-to-resolve-service-for-type-microsoft-aspnetc
             // could maybe use a scoped data repository
-            _services.TryAddSingleton<IHttpContextAccessor, HttpContextAccessor>();		
+            _services.TryAddSingleton<IHttpContextAccessor, HttpContextAccessor>();
             _services.TryAddSingleton<IRequestScopedDataRepository, HttpDataRepository>();
             _services.AddMemoryCache();
             _services.TryAddSingleton<OcelotDiagnosticListener>();
@@ -154,7 +154,6 @@ namespace Ocelot.DependencyInjection
 
             // We add this here so that we can always inject something into the factory for IoC..
             _services.AddSingleton<IServiceTracer, FakeServiceTracer>();
-
         }
 
         public IOcelotAdministrationBuilder AddAdministration(string path, string secret)

src/Ocelot/DownstreamRouteFinder/DownstreamRoute.cs

@@ -11,7 +11,8 @@ namespace Ocelot.DownstreamRouteFinder
             TemplatePlaceholderNameAndValues = templatePlaceholderNameAndValues;
             ReRoute = reRoute;
         }
+
         public List<PlaceholderNameAndValue> TemplatePlaceholderNameAndValues { get; private set; }
         public ReRoute ReRoute { get; private set; }
     }
-}
+}

src/Ocelot/DownstreamRouteFinder/UrlMatcher/UrlMatch.cs

@@ -6,6 +6,7 @@ namespace Ocelot.DownstreamRouteFinder.UrlMatcher
         {
             Match = match; 
         }
+
         public bool Match {get;private set;}
     }
-}
+}

src/Ocelot/DownstreamRouteFinder/UrlMatcher/UrlPathPlaceholderNameAndValue.cs

@@ -7,7 +7,8 @@ namespace Ocelot.DownstreamRouteFinder.UrlMatcher
             Name = name;
             Value = value;
         }
+
         public string Name {get;private set;}
         public string Value {get;private set;}
     }
-}
+}

src/Ocelot/DownstreamRouteFinder/UrlMatcher/UrlPathPlaceholderNameAndValueFinder.cs

@@ -50,6 +50,7 @@ namespace Ocelot.DownstreamRouteFinder.UrlMatcher
 
                     counterForTemplate = endOfPlaceholder;
                 }
+
                 counterForPath++;
             }
 
@@ -90,6 +91,7 @@ namespace Ocelot.DownstreamRouteFinder.UrlMatcher
 
             return variableName;
         }
+
         private int GetNextCounterPosition(string urlTemplate, int counterForTemplate, char delimiter)
         {                        
             var closingPlaceHolderPositionOnTemplate = urlTemplate.IndexOf(delimiter, counterForTemplate);
@@ -111,4 +113,4 @@ namespace Ocelot.DownstreamRouteFinder.UrlMatcher
             return character == '{';
         }
     }
-}
+}

src/Ocelot/Errors/Middleware/ExceptionHandlerMiddleware.cs

@@ -100,6 +100,7 @@ namespace Ocelot.Errors.Middleware
                 message =
                     $"{message}, inner exception message {e.InnerException.Message}, inner exception stack {e.InnerException.StackTrace}";
             }
+
             return $"{message} RequestId: {context.HttpContext.TraceIdentifier}";
         }
     }

src/Ocelot/Headers/HttpResponseHeaderReplacer.cs

@@ -26,6 +26,7 @@ namespace Ocelot.Headers
                 return $"{downstreamUrl}/";
             });
         }
+
         public Response Replace(HttpResponseMessage response, List<HeaderFindAndReplace> fAndRs, HttpRequestMessage httpRequestMessage)
         {
             foreach (var f in fAndRs)
@@ -54,4 +55,4 @@ namespace Ocelot.Headers
             return new OkResponse();
         }
     }
-}
+}

src/Ocelot/LoadBalancer/LoadBalancers/Lease.cs

@@ -9,6 +9,7 @@ namespace Ocelot.LoadBalancer.LoadBalancers
             HostAndPort = hostAndPort;
             Connections = connections;
         }
+
         public ServiceHostAndPort HostAndPort { get; private set; }
         public int Connections { get; private set; }
     }

src/Ocelot/Logging/IOcelotLoggerFactory.cs

@@ -6,6 +6,7 @@ namespace Ocelot.Logging
     {
         IOcelotLogger CreateLogger<T>();
     }
+
     /// <summary>
     /// Thin wrapper around the DotNet core logging framework, used to allow the scopedDataRepository to be injected giving access to the Ocelot RequestId
     /// </summary>

src/Ocelot/Middleware/OcelotPipelineConfiguration.cs

@@ -37,7 +37,6 @@
         /// <summary>
         /// This allows the user to implement there own query string manipulation logic
         /// </summary>
-        public Func<DownstreamContext, Func<Task>, Task> PreQueryStringBuilderMiddleware { get; set; }
-        
+        public Func<DownstreamContext, Func<Task>, Task> PreQueryStringBuilderMiddleware { get; set; }        
     }
 }

src/Ocelot/Raft/FakeCommand.cs

@@ -8,8 +8,8 @@ namespace Ocelot.Raft
         public FakeCommand(string value)
         {
             this.Value = value;
-
         }
+
         public string Value { get; private set; }
     }
 }

src/Ocelot/Raft/FilePeersProvider.cs

@@ -37,6 +37,7 @@ namespace Ocelot.Raft
                 _peers.Add(httpPeer);
             }
         }
+
         public List<IPeer> Get()
         {
             return _peers;

src/Ocelot/Raft/HttpPeer.cs

@@ -28,7 +28,7 @@ namespace Ocelot.Raft
         {
             _identityServerConfiguration = identityServerConfiguration;
             _config = config;
-            Id  = hostAndPort;
+            Id = hostAndPort;
             _hostAndPort = hostAndPort;
             _httpClient = httpClient;
             _jsonSerializerSettings = new JsonSerializerSettings() { 
@@ -68,6 +68,7 @@ namespace Ocelot.Raft
                 {
                     SetToken();
                 }                
+
                 var json = JsonConvert.SerializeObject(appendEntries, _jsonSerializerSettings);
                 var content = new StringContent(json);
                 content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/json");
@@ -94,6 +95,7 @@ namespace Ocelot.Raft
             {
                 SetToken();
             }   
+
             var json = JsonConvert.SerializeObject(command, _jsonSerializerSettings);
             var content = new StringContent(json);
             content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/json");

src/Ocelot/Raft/SqlLiteLog.cs

@@ -24,6 +24,7 @@ namespace Ocelot.Raft
                     FileStream fs = File.Create(_path);
                     fs.Dispose();
                 }
+
                 using(var connection = new SqliteConnection($"Data Source={_path};"))
                 {
                     connection.Open();
@@ -59,6 +60,7 @@ namespace Ocelot.Raft
                             }
                         }
                     }
+
                     return result;
                 }
             }
@@ -88,6 +90,7 @@ namespace Ocelot.Raft
                             }
                         }
                     }
+
                     return result;
                 }
             }
@@ -113,6 +116,7 @@ namespace Ocelot.Raft
                             }
                         }
                     }
+
                     return result;
                 }
             }
@@ -222,15 +226,13 @@ namespace Ocelot.Raft
                                 };
                                 var log = JsonConvert.DeserializeObject<LogEntry>(data, jsonSerializerSettings);
                                 logsToReturn.Add((id, log));
-
                             }
                         }
                     }
                 }
 
                 return logsToReturn;
-            }
-          
+            }        
         }
 
         public long GetTermAtIndex(int index)
@@ -256,9 +258,11 @@ namespace Ocelot.Raft
                         }
                     }
                 }
+
                 return result;
             }
         }
+
         public void Remove(int indexOfCommand)
         {
             lock(_lock)
@@ -276,4 +280,4 @@ namespace Ocelot.Raft
             }
         }
     }
-}
+}

src/Ocelot/RateLimit/ClientRateLimitProcessor.cs

@@ -7,7 +7,6 @@ using System.Threading.Tasks;
 
 namespace Ocelot.RateLimit
 {
-
     public class ClientRateLimitProcessor
     {
         private readonly IRateLimitCounterHandler _counterHandler;
@@ -39,7 +38,5 @@ namespace Ocelot.RateLimit
         {
             return _core.ConvertToTimeSpan(timeSpan);
         }
-
     }
-
 }

src/Ocelot/RateLimit/DistributedCacheRateLimitCounterHanlder.cs

@@ -34,6 +34,7 @@ namespace Ocelot.RateLimit
             {
                 return JsonConvert.DeserializeObject<RateLimitCounter>(stored);
             }
+
             return null;
         }
 

src/Ocelot/RateLimit/Middleware/ClientRateLimitMiddleware.cs

@@ -38,6 +38,7 @@ namespace Ocelot.RateLimit.Middleware
                 await _next.Invoke(context);
                 return;
             }
+
             // compute identity from request
             var identity = SetIdentity(context.HttpContext, options);
 
@@ -70,8 +71,8 @@ namespace Ocelot.RateLimit.Middleware
 
                     return;
                 }
-
             }
+
             //set X-Rate-Limit headers for the longest period
             if (!options.DisableRateLimitHeaders)
             {
@@ -103,6 +104,7 @@ namespace Ocelot.RateLimit.Middleware
             {
                 return true;
             }
+
             return false;
         }
 
@@ -134,8 +136,5 @@ namespace Ocelot.RateLimit.Middleware
 
             return Task.CompletedTask;
         }
-
     }
-
 }
-

src/Ocelot/RateLimit/RateLimitCore.cs

@@ -62,6 +62,7 @@ namespace Ocelot.RateLimit
                 var expirationTime = ConvertToTimeSpan(rule.Period);
                 _counterHandler.Set(counterId, counter, expirationTime);
             }
+
             return counter;
         }
 
@@ -92,7 +93,6 @@ namespace Ocelot.RateLimit
                     rule.Period,
                     rule.Limit.ToString(),
                     (DateTime.UtcNow + ConvertToTimeSpan(rule.Period)).ToUniversalTime().ToString("o", DateTimeFormatInfo.InvariantInfo));
-
             }
 
             return headers;
@@ -141,7 +141,6 @@ namespace Ocelot.RateLimit
                 default:
                     throw new FormatException($"{timeSpan} can't be converted to TimeSpan, unknown type {type}");
             }
-        }
-
+        }  
     }
 }

src/Ocelot/Requester/HttpClientHttpRequester.cs

@@ -55,7 +55,6 @@ namespace Ocelot.Requester
             {
                 _cacheHandlers.Set(cacheKey, httpClient, TimeSpan.FromHours(24));
             }
-
         }
 
         private IHttpClient GetHttpClient(string cacheKey, IHttpClientBuilder builder, DownstreamContext request)

src/Ocelot/Requester/MemoryHttpClientCache.cs

@@ -41,6 +41,7 @@ namespace Ocelot.Requester
             {
                 connectionQueue.TryDequeue(out client);
             }
+
             return client;
         }
 

src/Ocelot/Requester/OcelotHttpTracingHandler.cs

@@ -35,7 +35,7 @@ namespace Ocelot.Requester
             {
                 request.Headers.Remove(prefix_spanId);
                 request.Headers.TryAddWithoutValidation(prefix_spanId, span.SpanContext.SpanId);
-            };
+            }
 
             span.Tags.Client().Component("HttpClient")
                 .HttpMethod(request.Method.Method)

src/Ocelot/Responder/HttpContextResponder.cs

@@ -50,7 +50,6 @@ namespace Ocelot.Responder
                 httpContext.Response.StatusCode = (int)response.StatusCode;
 
                 return Task.CompletedTask;
-
             }, context);
 
             using (Stream stream = new MemoryStream(content))

src/Ocelot/Responder/Middleware/ResponderMiddleware.cs

@@ -29,7 +29,6 @@ namespace Ocelot.Responder.Middleware
             _responder = responder;
             _codeMapper = codeMapper;
             _logger = loggerFactory.CreateLogger<ResponderMiddleware>();
-
         }
 
         public async Task Invoke(DownstreamContext context)

src/Ocelot/Responses/ErrorResponse.cs

@@ -8,8 +8,9 @@ namespace Ocelot.Responses
         public ErrorResponse(Error error) : base(new List<Error>{error})
         {
         }
+
         public ErrorResponse(List<Error> errors) : base(errors)
         {
         }
     }
-}
+}

src/Ocelot/Responses/ErrorResponseGeneric.cs

@@ -7,12 +7,12 @@ namespace Ocelot.Responses
     {
         public ErrorResponse(Error error) 
             : base(new List<Error> {error})
-        {
-            
+        {            
         }
+
         public ErrorResponse(List<Error> errors) 
             : base(errors)
         {
         }
     }
-}
+}

src/Ocelot/Responses/ResponseGeneric.cs

@@ -14,7 +14,6 @@ namespace Ocelot.Responses
         {
         }
 
-        public T Data { get; private set; }
-        
+        public T Data { get; private set; }        
     }
-} 
+} 

src/Ocelot/ServiceDiscovery/ServiceDiscoveryProviderFactory.cs

@@ -14,7 +14,7 @@ namespace Ocelot.ServiceDiscovery
             _factory = factory;
         }
 
-        public  IServiceDiscoveryProvider Get(ServiceProviderConfiguration serviceConfig, DownstreamReRoute reRoute)
+        public IServiceDiscoveryProvider Get(ServiceProviderConfiguration serviceConfig, DownstreamReRoute reRoute)
         {
             if (reRoute.UseServiceDiscovery)
             {

src/Ocelot/Values/Service.cs

@@ -16,6 +16,7 @@ namespace Ocelot.Values
             Version = version;
             Tags = tags;
         }
+
         public string Id { get; private set; }
 
         public string Name { get; private set; }