Fix various violations

SA1216, CS0105, CS0169, CS0414, CS0649

src/Ocelot/Raft/HttpPeer.cs

@@ -89,7 +89,8 @@ namespace Ocelot.Raft
             }
         }
 
-        public Response<T> Request<T>(T command) where T : ICommand
+        public Response<T> Request<T>(T command)
+            where T : ICommand
         {
             if(_token == null)
             {

test/Ocelot.AcceptanceTests/AggregateTests.cs

@@ -15,7 +15,6 @@ namespace Ocelot.AcceptanceTests
     public class AggregateTests : IDisposable
     {
         private IWebHost _serviceOneBuilder;
-        private IWebHost _serviceTwoBuilder;
         private readonly Steps _steps;
         private string _downstreamPathOne;
         private string _downstreamPathTwo;
@@ -364,7 +363,6 @@ namespace Ocelot.AcceptanceTests
         public void Dispose()
         {
             _serviceOneBuilder?.Dispose();
-            _serviceTwoBuilder?.Dispose();
             _steps.Dispose();
         }
     }

test/Ocelot.AcceptanceTests/CannotStartOcelotTests.cs

@@ -1,18 +1,14 @@
 using System;
 using System.Collections.Generic;
-using Microsoft.AspNetCore.Hosting;
 using Ocelot.Configuration.File;
 using Shouldly;
-using TestStack.BDDfy;
 using Xunit;
 
 namespace Ocelot.AcceptanceTests
 {
     public class CannotStartOcelotTests : IDisposable
     {
-        private IWebHost _builder;
         private readonly Steps _steps;
-        private string _downstreamPath;
 
         public CannotStartOcelotTests()
         {
@@ -50,7 +46,6 @@ namespace Ocelot.AcceptanceTests
         
         public void Dispose()
         {
-            _builder?.Dispose();
             _steps.Dispose();
         }
     }

test/Ocelot.AcceptanceTests/Steps.cs

@@ -1,7 +1,5 @@
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Net;
@@ -19,15 +17,11 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using Ocelot.Configuration.File;
-using Ocelot.Configuration.Repository;
 using Ocelot.DependencyInjection;
 using Ocelot.Middleware;
-using Ocelot.ServiceDiscovery;
 using Shouldly;
 using ConfigurationBuilder = Microsoft.Extensions.Configuration.ConfigurationBuilder;
 using Ocelot.AcceptanceTests.Caching;
-using Butterfly.Client.AspNetCore;
-using Butterfly.Client.Tracing;
 
 namespace Ocelot.AcceptanceTests
 {
@@ -42,11 +36,9 @@ namespace Ocelot.AcceptanceTests
         public string RequestIdKey = "OcRequestId";
         private readonly Random _random;
         private IWebHostBuilder _webHostBuilder;
-        private readonly string _baseUrl;
 
         public Steps()
         {
-            _baseUrl = "http://localhost:5000";
             _random = new Random();
         }
 

test/Ocelot.UnitTests/Authentication/AuthenticationMiddlewareTests.cs

@@ -6,24 +6,17 @@ namespace Ocelot.UnitTests.Authentication
     using System.Collections.Generic;
     using System.IO;
     using System.Text;
-    using Microsoft.AspNetCore.Builder;
     using Microsoft.AspNetCore.Http;
-    using Microsoft.Extensions.DependencyInjection;
     using Moq;
     using Ocelot.Authentication.Middleware;
     using Ocelot.Configuration.Builder;
-    using Ocelot.DownstreamRouteFinder;
-    using Ocelot.DownstreamRouteFinder.Middleware;
-    using Ocelot.DownstreamRouteFinder.UrlMatcher;
     using Ocelot.Logging;
-    using Ocelot.Responses;
     using Shouldly;
     using TestStack.BDDfy;
     using Xunit;
 
     public class AuthenticationMiddlewareTests
     {
-        private OkResponse<DownstreamRoute> _downstreamRoute;
         private AuthenticationMiddleware _middleware;
         private Mock<IOcelotLoggerFactory> _factory;
         private Mock<IOcelotLogger> _logger;

test/Ocelot.UnitTests/Cache/OutputCacheMiddlewareRealCacheTests.cs

@@ -1,5 +1,4 @@
 using Ocelot.Errors;
-using Ocelot.Infrastructure.RequestData;
 using Ocelot.Middleware;
 
 namespace Ocelot.UnitTests.Cache
@@ -11,26 +10,19 @@ namespace Ocelot.UnitTests.Cache
     using Shouldly;
     using System.Collections.Generic;
     using System.Net.Http;
-    using Microsoft.AspNetCore.Builder;
-    using Microsoft.Extensions.DependencyInjection;
     using Moq;
     using Ocelot.Cache;
     using Ocelot.Cache.Middleware;
     using Ocelot.Configuration;
     using Ocelot.Configuration.Builder;
-    using Ocelot.DownstreamRouteFinder;
-    using Ocelot.DownstreamRouteFinder.UrlMatcher;
     using Ocelot.Logging;
-    using Ocelot.Responses;
     using TestStack.BDDfy;
     using Xunit;
-    using Ocelot.DownstreamRouteFinder.Middleware;
     using Microsoft.AspNetCore.Http;
 
     public class OutputCacheMiddlewareRealCacheTests
     {
         private IOcelotCache<CachedResponse> _cacheManager;
-        private CachedResponse _response;
         private OutputCacheMiddleware _middleware;
         private DownstreamContext _downstreamContext;
         private OcelotRequestDelegate _next;

test/Ocelot.UnitTests/Claims/ClaimsBuilderMiddlewareTests.cs

@@ -15,12 +15,10 @@ namespace Ocelot.UnitTests.Claims
     using Ocelot.Responses;
     using TestStack.BDDfy;
     using Xunit;
-    using Ocelot.DownstreamRouteFinder.Middleware;
 
     public class ClaimsBuilderMiddlewareTests
     {
         private readonly Mock<IAddClaimsToRequest> _addHeaders;
-        private Response<DownstreamRoute> _downstreamRoute;
         private Mock<IOcelotLoggerFactory> _loggerFactory;
         private Mock<IOcelotLogger> _logger;
         private readonly ClaimsBuilderMiddleware _middleware;

test/Ocelot.UnitTests/Configuration/ConsulFileConfigurationPollerTests.cs

@@ -83,7 +83,7 @@ namespace Ocelot.UnitTests.Configuration
                     _setter.Verify(x => x.Set(fileConfig), Times.Once);
                     return true;
                 }
-                catch(Exception ex)
+                catch(Exception)
                 {
                     return false;
                 }

test/Ocelot.UnitTests/DependencyInjection/OcelotBuilderTests.cs

@@ -15,7 +15,6 @@ using Ocelot.DependencyInjection;
 using Ocelot.Requester;
 using Ocelot.UnitTests.Requester;
 using Shouldly;
-using System;
 using IdentityServer4.AccessTokenValidation;
 using TestStack.BDDfy;
 using Xunit;

test/Ocelot.UnitTests/LoadBalancer/LoadBalancerHouseTests.cs

@@ -17,9 +17,7 @@ namespace Ocelot.UnitTests.LoadBalancer
         private DownstreamReRoute _reRoute;
         private ILoadBalancer _loadBalancer;
         private readonly LoadBalancerHouse _loadBalancerHouse;
-        private Response _addResult;
         private Response<ILoadBalancer> _getResult;
-        private string _key;
         private readonly Mock<ILoadBalancerFactory> _factory;
         private ServiceProviderConfiguration _serviceProviderConfig;
 

test/Ocelot.UnitTests/LoadBalancer/LoadBalancerMiddlewareTests.cs

@@ -4,15 +4,10 @@ namespace Ocelot.UnitTests.LoadBalancer
 {
     using System.Collections.Generic;
     using System.Net.Http;
-    using Microsoft.AspNetCore.Builder;
     using Microsoft.AspNetCore.Http;
-    using Microsoft.Extensions.DependencyInjection;
     using Moq;
     using Ocelot.Configuration;
     using Ocelot.Configuration.Builder;
-    using Ocelot.Configuration.Provider;
-    using Ocelot.DownstreamRouteFinder;
-    using Ocelot.DownstreamRouteFinder.Middleware;
     using Ocelot.Errors;
     using Ocelot.LoadBalancer.LoadBalancers;
     using Ocelot.LoadBalancer.Middleware;
@@ -28,7 +23,6 @@ namespace Ocelot.UnitTests.LoadBalancer
         private readonly Mock<ILoadBalancerHouse> _loadBalancerHouse;
         private readonly Mock<ILoadBalancer> _loadBalancer;
         private ServiceHostAndPort _hostAndPort;
-        private OkResponse<DownstreamRoute> _downstreamRoute;
         private ErrorResponse<ILoadBalancer> _getLoadBalancerHouseError;
         private ErrorResponse<ServiceHostAndPort> _getHostAndPortError;
         private HttpRequestMessage _downstreamRequest;

test/Ocelot.UnitTests/Middleware/OcelotPiplineBuilderTests.cs

@@ -1,6 +1,5 @@
 namespace Ocelot.UnitTests.Middleware
 {
-    using System;
     using System.Collections.Generic;
     using Microsoft.AspNetCore.Hosting;
     using Microsoft.AspNetCore.Hosting.Internal;
@@ -17,9 +16,7 @@
     public class OcelotPiplineBuilderTests
     {
         private readonly IServiceCollection _services;
-        private IServiceProvider _serviceProvider;
         private readonly IConfiguration _configRoot;
-        private IOcelotBuilder _ocelotBuilder;
         private DownstreamContext _downstreamContext;
         private int _counter;
 

test/Ocelot.UnitTests/RequestId/ReRouteRequestIdMiddlewareTests.cs

@@ -4,7 +4,6 @@ namespace Ocelot.UnitTests.RequestId
 {
     using Microsoft.AspNetCore.Http;
     using Microsoft.Extensions.Primitives;
-    using Ocelot.DownstreamRouteFinder.Middleware;
     using Ocelot.Infrastructure.RequestData;
     using System;
     using System.Collections.Generic;
@@ -24,7 +23,6 @@ namespace Ocelot.UnitTests.RequestId
     public class ReRouteRequestIdMiddlewareTests
     {
         private readonly HttpRequestMessage _downstreamRequest;
-        private Response<DownstreamRoute> _downstreamRoute;
         private string _value;
         private string _key;
         private Mock<IOcelotLoggerFactory> _loggerFactory;

test/Ocelot.UnitTests/Requester/HttpClientBuilderTests.cs

@@ -17,7 +17,6 @@ namespace Ocelot.UnitTests.Requester
         private readonly HttpClientBuilder _builder;
         private readonly Mock<IDelegatingHandlerHandlerHouse> _house;
         private readonly Mock<IDelegatingHandlerHandlerProvider> _provider;
-        private IHttpClientBuilder _builderResult;
         private IHttpClient _httpClient;
         private HttpResponseMessage _response;
         private DownstreamReRoute _request;

test/Ocelot.UnitTests/Requester/QosProviderHouseTests.cs

@@ -13,7 +13,6 @@ namespace Ocelot.UnitTests.Requester
     {
         private IQoSProvider _qoSProvider;
         private readonly QosProviderHouse _qosProviderHouse;
-        private Response _addResult;
         private Response<IQoSProvider> _getResult;
         private DownstreamReRoute _reRoute;
         private readonly Mock<IQoSProviderFactory> _factory;

test/Ocelot.UnitTests/Responder/ErrorsToHttpStatusCodeMapperTests.cs

@@ -42,7 +42,7 @@ namespace Ocelot.UnitTests.Responder
         [InlineData(OcelotErrorCode.RequestTimedOutError)]
         public void should_return_service_unavailable(OcelotErrorCode errorCode)
         {
-            ShouldMapErrorToStatusCode(OcelotErrorCode.RequestTimedOutError, HttpStatusCode.ServiceUnavailable);
+            ShouldMapErrorToStatusCode(errorCode, HttpStatusCode.ServiceUnavailable);
         }
 
         [Theory]

test/Ocelot.UnitTests/Responder/ResponderMiddlewareTests.cs

@@ -4,7 +4,6 @@ using Ocelot.Middleware;
 namespace Ocelot.UnitTests.Responder
 {
     using Microsoft.AspNetCore.Http;
-    using Ocelot.DownstreamRouteFinder.Middleware;
     using System.Net.Http;
     using Moq;
     using Ocelot.DownstreamRouteFinder.Finder;
@@ -12,7 +11,6 @@ namespace Ocelot.UnitTests.Responder
     using Ocelot.Logging;
     using Ocelot.Responder;
     using Ocelot.Responder.Middleware;
-    using Ocelot.Responses;
     using TestStack.BDDfy;
     using Xunit;
 
@@ -20,7 +18,6 @@ namespace Ocelot.UnitTests.Responder
     {
         private readonly Mock<IHttpResponder> _responder;
         private readonly Mock<IErrorsToHttpStatusCodeMapper> _codeMapper;
-        private OkResponse<HttpResponseMessage> _response;
         private Mock<IOcelotLoggerFactory> _loggerFactory;
         private Mock<IOcelotLogger> _logger;
         private readonly ResponderMiddleware _middleware;