diff options
3 files changed, 1 insertions, 6 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/zone/RoutingMethod.java b/config-provisioning/src/main/java/com/yahoo/config/provision/zone/RoutingMethod.java index 0cb7acf8199..c7cc8a3cd10 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/zone/RoutingMethod.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/zone/RoutingMethod.java @@ -8,9 +8,6 @@ package com.yahoo.config.provision.zone; */ public enum RoutingMethod { - /** Routing happens through shared routing layer */ - shared, - /** Routing happens through a dedicated layer 4 load balancer */ exclusive, @@ -24,7 +21,7 @@ public enum RoutingMethod { /** Returns whether this method routes requests through a shared routing layer */ public boolean isShared() { - return this == shared || this == sharedLayer4; + return this == sharedLayer4; } } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java index e50f81919df..91b76ac8d05 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java @@ -2805,7 +2805,6 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler { private static String routingMethodString(RoutingMethod method) { switch (method) { case exclusive: return "exclusive"; - case shared: return "shared"; case sharedLayer4: return "sharedLayer4"; } throw new IllegalArgumentException("Unknown routing method " + method); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiHandler.java index 7b66e60b426..082b11af351 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiHandler.java @@ -369,7 +369,6 @@ public class RoutingApiHandler extends AuditLoggingRequestHandler { private static String asString(RoutingMethod method) { switch (method) { - case shared: return "shared"; case exclusive: return "exclusive"; case sharedLayer4: return "sharedLayer4"; default: return "unknown"; |