From c73cf5990855a3ca4971f7ff39fddecaa9be0121 Mon Sep 17 00:00:00 2001 From: David Lievrouw Date: Wed, 10 Jul 2019 18:28:11 +0200 Subject: [PATCH] Revert "Add 'Name' property to ILoadBalancer, for future use in LoadBalancerFactory." This reverts commit 78ead1606dc6a4d6b47b5e63bbf7927ef02e9320. --- src/Ocelot/LoadBalancer/LoadBalancers/CookieStickySessions.cs | 2 -- src/Ocelot/LoadBalancer/LoadBalancers/ILoadBalancer.cs | 2 -- src/Ocelot/LoadBalancer/LoadBalancers/LeastConnection.cs | 2 -- src/Ocelot/LoadBalancer/LoadBalancers/NoLoadBalancer.cs | 2 -- src/Ocelot/LoadBalancer/LoadBalancers/RoundRobin.cs | 2 -- test/Ocelot.UnitTests/LoadBalancer/LoadBalancerHouseTests.cs | 4 ---- 6 files changed, 14 deletions(-) diff --git a/src/Ocelot/LoadBalancer/LoadBalancers/CookieStickySessions.cs b/src/Ocelot/LoadBalancer/LoadBalancers/CookieStickySessions.cs index 2429e158..775ed7ce 100644 --- a/src/Ocelot/LoadBalancer/LoadBalancers/CookieStickySessions.cs +++ b/src/Ocelot/LoadBalancer/LoadBalancers/CookieStickySessions.cs @@ -84,7 +84,5 @@ namespace Ocelot.LoadBalancer.LoadBalancers public void Release(ServiceHostAndPort hostAndPort) { } - - public string Name => GetType().Name; } } diff --git a/src/Ocelot/LoadBalancer/LoadBalancers/ILoadBalancer.cs b/src/Ocelot/LoadBalancer/LoadBalancers/ILoadBalancer.cs index 6d74b686..4f8ec2b7 100644 --- a/src/Ocelot/LoadBalancer/LoadBalancers/ILoadBalancer.cs +++ b/src/Ocelot/LoadBalancer/LoadBalancers/ILoadBalancer.cs @@ -10,7 +10,5 @@ namespace Ocelot.LoadBalancer.LoadBalancers Task> Lease(DownstreamContext context); void Release(ServiceHostAndPort hostAndPort); - - string Name { get; } } } diff --git a/src/Ocelot/LoadBalancer/LoadBalancers/LeastConnection.cs b/src/Ocelot/LoadBalancer/LoadBalancers/LeastConnection.cs index 24d953e2..ee7c0fdd 100644 --- a/src/Ocelot/LoadBalancer/LoadBalancers/LeastConnection.cs +++ b/src/Ocelot/LoadBalancer/LoadBalancers/LeastConnection.cs @@ -71,8 +71,6 @@ namespace Ocelot.LoadBalancer.LoadBalancers } } - public string Name => GetType().Name; - private Lease AddConnection(Lease lease) { return new Lease(lease.HostAndPort, lease.Connections + 1); diff --git a/src/Ocelot/LoadBalancer/LoadBalancers/NoLoadBalancer.cs b/src/Ocelot/LoadBalancer/LoadBalancers/NoLoadBalancer.cs index becf96b6..112fd5bb 100644 --- a/src/Ocelot/LoadBalancer/LoadBalancers/NoLoadBalancer.cs +++ b/src/Ocelot/LoadBalancer/LoadBalancers/NoLoadBalancer.cs @@ -33,7 +33,5 @@ namespace Ocelot.LoadBalancer.LoadBalancers public void Release(ServiceHostAndPort hostAndPort) { } - - public string Name => GetType().Name; } } diff --git a/src/Ocelot/LoadBalancer/LoadBalancers/RoundRobin.cs b/src/Ocelot/LoadBalancer/LoadBalancers/RoundRobin.cs index 6be24f71..3500efe0 100644 --- a/src/Ocelot/LoadBalancer/LoadBalancers/RoundRobin.cs +++ b/src/Ocelot/LoadBalancer/LoadBalancers/RoundRobin.cs @@ -38,7 +38,5 @@ namespace Ocelot.LoadBalancer.LoadBalancers public void Release(ServiceHostAndPort hostAndPort) { } - - public string Name => GetType().Name; } } diff --git a/test/Ocelot.UnitTests/LoadBalancer/LoadBalancerHouseTests.cs b/test/Ocelot.UnitTests/LoadBalancer/LoadBalancerHouseTests.cs index 6f5a50c1..57252b2b 100644 --- a/test/Ocelot.UnitTests/LoadBalancer/LoadBalancerHouseTests.cs +++ b/test/Ocelot.UnitTests/LoadBalancer/LoadBalancerHouseTests.cs @@ -164,8 +164,6 @@ namespace Ocelot.UnitTests.LoadBalancer { throw new NotImplementedException(); } - - public string Name => GetType().Name; } private class FakeRoundRobinLoadBalancer : ILoadBalancer @@ -179,8 +177,6 @@ namespace Ocelot.UnitTests.LoadBalancer { throw new NotImplementedException(); } - - public string Name => GetType().Name; } } }