LoadBalancingGroup: Tidy up.

ExpediaGroup · Jun 11, 2019 · 0dfd928 · 0dfd928
1 parent b7ceded
commit 0dfd928
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/components/proxy/src/main/java/com/hotels/styx/routing/handlers/LoadBalancingGroup.java b/components/proxy/src/main/java/com/hotels/styx/routing/handlers/LoadBalancingGroup.java
@@ -15,6 +15,7 @@
  */
 package com.hotels.styx.routing.handlers;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableSet;
 import com.hotels.styx.api.Eventual;
 import com.hotels.styx.api.HttpInterceptor;
@@ -30,7 +31,6 @@
 import com.hotels.styx.client.StyxBackendServiceClient;
 import com.hotels.styx.client.loadbalancing.strategies.PowerOfTwoStrategy;
 import com.hotels.styx.client.stickysession.StickySessionLoadBalancingStrategy;
-import com.hotels.styx.common.Pair;
 import com.hotels.styx.config.schema.Schema;
 import com.hotels.styx.infrastructure.configuration.yaml.JsonNodeConfig;
 import com.hotels.styx.routing.RoutingObject;
@@ -71,7 +71,6 @@
 public class LoadBalancingGroup implements RoutingObject {
     public static final Schema.FieldType SCHEMA = object(
             field("origins", string()),
-            optional("strategy", string()),
             optional("originsRestrictionCookie", string()),
             optional("stickySession", object(
                     field("enabled", bool()),
@@ -81,12 +80,12 @@ public class LoadBalancingGroup implements RoutingObject {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(LoadBalancingGroup.class);
 
-    private StyxObjectStore<RoutingObjectRecord> routeDatabase;
-    private StyxBackendServiceClient client;
-    private Disposable changeWatcher;
+    private final StyxBackendServiceClient client;
+    private final Disposable changeWatcher;
 
 
-    public LoadBalancingGroup(StyxBackendServiceClient client, Disposable changeWatcher) {
+    @VisibleForTesting
+    LoadBalancingGroup(StyxBackendServiceClient client, Disposable changeWatcher) {
         this.client = requireNonNull(client);
         this.changeWatcher = requireNonNull(changeWatcher);
     }
@@ -141,7 +140,7 @@ public RoutingObject build(List<String> parents, Context context, RoutingObjectD
             return new LoadBalancingGroup(client, watch);
         }
 
-        private LoadBalancer loadBalancer(StickySessionConfig stickySessionConfig, String originsRestrictionCookie, ActiveOrigins activeOrigins) {
+        private static LoadBalancer loadBalancer(StickySessionConfig stickySessionConfig, String originsRestrictionCookie, ActiveOrigins activeOrigins) {
             LoadBalancer loadBalancer = new PowerOfTwoStrategy(activeOrigins);
             if (stickySessionConfig.stickySessionEnabled()) {
                 return new StickySessionLoadBalancingStrategy(activeOrigins, loadBalancer);
@@ -170,10 +169,10 @@ private static RemoteHost toRemoteHost(String appId, Map.Entry<String, RoutingOb
             RoutingObjectAdapter routingObject = record.getValue().getRoutingObject();
             String originName = record.getKey();
 
-            Pair<String, Integer> hostAndPort = Pair.pair("na", 0);
-
             return remoteHost(
-                    newOriginBuilder(hostAndPort.key(), hostAndPort.value())
+                    // The origin is used to determine remote host hostname or port
+                    // therefore we'll just pass NA:0
+                    newOriginBuilder("na", 0)
                             .applicationId(appId)
                             .id(originName)
                             .build(),