finagle-core: Rm vestigial loadbalancer Stack.Role

RB_ID=529531
twitter · Dec 10, 2014 · ddfa9b4 · ddfa9b4
1 parent 522a3f2
commit ddfa9b4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/CHANGES b/CHANGES
@@ -8,7 +8,10 @@
 Breaking API Changes
 ~~~~~~~~~~~~~~~~~~~~
 
-  * finagle-http: Removed `c.t.f.http.CheckRequestFilter` along with
+  * finagle-core: Remove `c.t.f.client.StackClient.Role.loadBalancer`, which
+    was unused and duplicated by `c.t.f.loadbalancer.LoadBalancerFactory.role`.
+
+  * finagle-http: Remove `c.t.f.http.CheckRequestFilter` along with
     `c.t.f.http.CheckHttpRequestFilter`. The functionality has been
     added to `c.t.f.http.codec.HttpServerDispatcher`. In addition,
     the codecError in `c.t.f.http.BadHttpRequest` has been replaced
@@ -18,7 +21,7 @@ Breaking API Changes
     calls `Thread.start()` in its constructor. This should be now be
     done by the caller.
 
-  * finagle-mux: The experimental session API was discontinued.
+  * finagle-mux: The experimental session API is discontinued.
 
   * finagle-mux: Introduce new Request and Response types for mux services.
     The new mux request includes a `destination` path so that, which corresponds

diff --git a/finagle-core/src/main/scala/com/twitter/finagle/client/StackClient.scala b/finagle-core/src/main/scala/com/twitter/finagle/client/StackClient.scala
@@ -20,7 +20,6 @@ object StackClient {
    * Canonical Roles for each Client-related Stack modules.
    */
   object Role extends Stack.Role("StackClient"){
-    val loadBalancer = Stack.Role("LoadBalancer")
     val pool = Stack.Role("Pool")
     val requestDraining = Stack.Role("RequestDraining")
     val prepFactory = Stack.Role("PrepFactory")

diff --git a/finagle-core/src/main/scala/com/twitter/finagle/loadbalancer/LoadBalancerFactory.scala b/finagle-core/src/main/scala/com/twitter/finagle/loadbalancer/LoadBalancerFactory.scala
@@ -19,6 +19,7 @@ object perHostStats extends GlobalFlag(false, "enable/default per-host stats.\n"
 
 object LoadBalancerFactory {
   val role = Stack.Role("LoadBalancer")
+
   /**
    * A class eligible for configuring a [[com.twitter.finagle.Stackable]]
    * [[com.twitter.finagle.loadbalancer.LoadBalancerFactory]] per host