changes to create load balancers and qos providers on first request to reroute and then check if they have changed on subsequent requests but not create again if they havent..quite a few breaking changes here.

test/Ocelot.UnitTests/LoadBalancer/LeastConnectionTests.cs

@@ -14,7 +14,7 @@ namespace Ocelot.UnitTests.LoadBalancer
     {
         private HostAndPort _hostAndPort;
         private Response<HostAndPort> _result;
-        private LeastConnectionLoadBalancer _leastConnection;
+        private LeastConnection _leastConnection;
         private List<Service> _services;
         private Random _random;
 
@@ -35,7 +35,7 @@ namespace Ocelot.UnitTests.LoadBalancer
             };
 
             _services = availableServices;
-            _leastConnection = new LeastConnectionLoadBalancer(() => Task.FromResult(_services), serviceName);
+            _leastConnection = new LeastConnection(() => Task.FromResult(_services), serviceName);
 
             var tasks = new Task[100];
            
@@ -86,7 +86,7 @@ namespace Ocelot.UnitTests.LoadBalancer
             };
 
             _services = availableServices;
-            _leastConnection = new LeastConnectionLoadBalancer(() => Task.FromResult(_services), serviceName);
+            _leastConnection = new LeastConnection(() => Task.FromResult(_services), serviceName);
 
             var response = _leastConnection.Lease().Result;
 
@@ -113,7 +113,7 @@ namespace Ocelot.UnitTests.LoadBalancer
             };
 
             _services = availableServices;
-            _leastConnection = new LeastConnectionLoadBalancer(() => Task.FromResult(_services), serviceName);
+            _leastConnection = new LeastConnection(() => Task.FromResult(_services), serviceName);
 
             var response = _leastConnection.Lease().Result;
 
@@ -144,7 +144,7 @@ namespace Ocelot.UnitTests.LoadBalancer
             };
 
             _services = availableServices;
-            _leastConnection = new LeastConnectionLoadBalancer(() => Task.FromResult(_services), serviceName);
+            _leastConnection = new LeastConnection(() => Task.FromResult(_services), serviceName);
 
             var response = _leastConnection.Lease().Result;
 
@@ -211,7 +211,7 @@ namespace Ocelot.UnitTests.LoadBalancer
         private void GivenTheLoadBalancerStarts(List<Service> services, string serviceName)
         {
             _services = services;
-            _leastConnection = new LeastConnectionLoadBalancer(() => Task.FromResult(_services), serviceName);
+            _leastConnection = new LeastConnection(() => Task.FromResult(_services), serviceName);
         }
 
         private void WhenTheLoadBalancerStarts(List<Service> services, string serviceName)

test/Ocelot.UnitTests/LoadBalancer/LoadBalancerFactoryTests.cs

@@ -53,7 +53,7 @@ namespace Ocelot.UnitTests.LoadBalancer
                 .And(x => GivenAServiceProviderConfig(new ServiceProviderConfigurationBuilder().Build()))
                 .And(x => x.GivenTheServiceProviderFactoryReturns())
                 .When(x => x.WhenIGetTheLoadBalancer())
-                .Then(x => x.ThenTheLoadBalancerIsReturned<RoundRobinLoadBalancer>())
+                .Then(x => x.ThenTheLoadBalancerIsReturned<RoundRobin>())
                 .BDDfy();
         }
 
@@ -69,7 +69,7 @@ namespace Ocelot.UnitTests.LoadBalancer
                 .And(x => GivenAServiceProviderConfig(new ServiceProviderConfigurationBuilder().Build()))
                 .And(x => x.GivenTheServiceProviderFactoryReturns())
                 .When(x => x.WhenIGetTheLoadBalancer())
-                .Then(x => x.ThenTheLoadBalancerIsReturned<LeastConnectionLoadBalancer>())
+                .Then(x => x.ThenTheLoadBalancerIsReturned<LeastConnection>())
                 .BDDfy();
         }
 

test/Ocelot.UnitTests/LoadBalancer/LoadBalancerHouseTests.cs

@@ -32,7 +32,7 @@ namespace Ocelot.UnitTests.LoadBalancer
         [Fact]
         public void should_store_load_balancer_on_first_request()
         {
-            var reRoute = new ReRouteBuilder().WithLoadBalancerKey("test").Build();
+            var reRoute = new ReRouteBuilder().WithReRouteKey("test").Build();
 
             this.Given(x => x.GivenThereIsALoadBalancer(reRoute, new FakeLoadBalancer()))
                 .Then(x => x.ThenItIsAdded())
@@ -42,7 +42,7 @@ namespace Ocelot.UnitTests.LoadBalancer
         [Fact]
         public void should_not_store_load_balancer_on_second_request()
         {
-            var reRoute = new ReRouteBuilder().WithLoadBalancerKey("test").Build();
+            var reRoute = new ReRouteBuilder().WithLoadBalancer("FakeLoadBalancer").WithReRouteKey("test").Build();
 
             this.Given(x => x.GivenThereIsALoadBalancer(reRoute, new FakeLoadBalancer()))
                 .When(x => x.WhenWeGetTheLoadBalancer(reRoute))
@@ -53,8 +53,8 @@ namespace Ocelot.UnitTests.LoadBalancer
         [Fact]
         public void should_store_load_balancers_by_key()
         {
-            var reRoute = new ReRouteBuilder().WithLoadBalancerKey("test").Build();
-            var reRouteTwo = new ReRouteBuilder().WithLoadBalancerKey("testtwo").Build();
+            var reRoute = new ReRouteBuilder().WithReRouteKey("test").Build();
+            var reRouteTwo = new ReRouteBuilder().WithReRouteKey("testtwo").Build();
 
             this.Given(x => x.GivenThereIsALoadBalancer(reRoute, new FakeLoadBalancer()))
                 .And(x => x.GivenThereIsALoadBalancer(reRouteTwo, new FakeRoundRobinLoadBalancer()))
@@ -78,22 +78,22 @@ namespace Ocelot.UnitTests.LoadBalancer
         [Fact]
         public void should_get_new_load_balancer_if_reroute_load_balancer_has_changed()
         {
-            var reRoute = new ReRouteBuilder().WithLoadBalancerKey("test").Build();
+            var reRoute = new ReRouteBuilder().WithLoadBalancer("FakeLoadBalancer").WithReRouteKey("test").Build();
 
-            var reRouteTwo = new ReRouteBuilder().WithLoadBalancer("LeastConnection").WithLoadBalancerKey("test").Build();
+            var reRouteTwo = new ReRouteBuilder().WithLoadBalancer("LeastConnection").WithReRouteKey("test").Build();
 
             this.Given(x => x.GivenThereIsALoadBalancer(reRoute, new FakeLoadBalancer()))
                 .When(x => x.WhenWeGetTheLoadBalancer(reRoute))
                 .Then(x => x.ThenTheLoadBalancerIs<FakeLoadBalancer>())
                 .When(x => x.WhenIGetTheReRouteWithTheSameKeyButDifferentLoadBalancer(reRouteTwo))
-                .Then(x => x.ThenTheLoadBalancerIs<LeastConnectionLoadBalancer>())
+                .Then(x => x.ThenTheLoadBalancerIs<LeastConnection>())
                 .BDDfy();
         }
 
         private void WhenIGetTheReRouteWithTheSameKeyButDifferentLoadBalancer(ReRoute reRoute)
         {
             _reRoute = reRoute;
-            _factory.Setup(x => x.Get(_reRoute, _serviceProviderConfig)).ReturnsAsync(new LeastConnectionLoadBalancer(null, null));
+            _factory.Setup(x => x.Get(_reRoute, _serviceProviderConfig)).ReturnsAsync(new LeastConnection(null, null));
             _getResult = _loadBalancerHouse.Get(_reRoute, _serviceProviderConfig).Result;
         }
 

test/Ocelot.UnitTests/LoadBalancer/RoundRobinTests.cs

@@ -12,7 +12,7 @@ namespace Ocelot.UnitTests.LoadBalancer
 {
     public class RoundRobinTests
     {
-        private readonly RoundRobinLoadBalancer _roundRobin;
+        private readonly RoundRobin _roundRobin;
         private readonly List<Service> _services;
         private Response<HostAndPort> _hostAndPort;
 
@@ -25,7 +25,7 @@ namespace Ocelot.UnitTests.LoadBalancer
                 new Service("product", new HostAndPort("127.0.0.1", 5001), string.Empty, string.Empty, new string[0])
             };
 
-            _roundRobin = new RoundRobinLoadBalancer(() => Task.FromResult(_services));
+            _roundRobin = new RoundRobin(() => Task.FromResult(_services));
         }
 
         [Fact]