diff options
Diffstat (limited to 'controller-server')
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java | 8 | ||||
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/context/ExclusiveZoneRoutingContext.java (renamed from controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/context/ExclusiveRoutingContext.java) | 4 | ||||
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/context/SharedZoneRoutingContext.java (renamed from controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/context/SharedRoutingContext.java) | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java index 1a9dc90b1b8..67f82297651 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java @@ -35,9 +35,9 @@ import com.yahoo.vespa.hosted.controller.routing.RoutingPolicies; import com.yahoo.vespa.hosted.controller.routing.context.DeploymentRoutingContext; import com.yahoo.vespa.hosted.controller.routing.context.DeploymentRoutingContext.ExclusiveDeploymentRoutingContext; import com.yahoo.vespa.hosted.controller.routing.context.DeploymentRoutingContext.SharedDeploymentRoutingContext; -import com.yahoo.vespa.hosted.controller.routing.context.ExclusiveRoutingContext; +import com.yahoo.vespa.hosted.controller.routing.context.ExclusiveZoneRoutingContext; import com.yahoo.vespa.hosted.controller.routing.context.RoutingContext; -import com.yahoo.vespa.hosted.controller.routing.context.SharedRoutingContext; +import com.yahoo.vespa.hosted.controller.routing.context.SharedZoneRoutingContext; import com.yahoo.vespa.hosted.controller.routing.rotation.RotationLock; import com.yahoo.vespa.hosted.controller.routing.rotation.RotationRepository; import com.yahoo.vespa.hosted.rotation.config.RotationsConfig; @@ -97,9 +97,9 @@ public class RoutingController { /** Create a routing context for given zone */ public RoutingContext of(ZoneId zone) { if (usesSharedRouting(zone)) { - return new SharedRoutingContext(zone, controller.serviceRegistry().configServer()); + return new SharedZoneRoutingContext(zone, controller.serviceRegistry().configServer()); } - return new ExclusiveRoutingContext(zone, routingPolicies); + return new ExclusiveZoneRoutingContext(zone, routingPolicies); } public RoutingPolicies policies() { diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/context/ExclusiveRoutingContext.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/context/ExclusiveZoneRoutingContext.java index e949c45f2fd..e29fb5ab404 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/context/ExclusiveRoutingContext.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/context/ExclusiveZoneRoutingContext.java @@ -13,12 +13,12 @@ import java.util.Objects; * * @author mpolden */ -public class ExclusiveRoutingContext implements RoutingContext { +public class ExclusiveZoneRoutingContext implements RoutingContext { private final RoutingPolicies policies; private final ZoneId zone; - public ExclusiveRoutingContext(ZoneId zone, RoutingPolicies policies) { + public ExclusiveZoneRoutingContext(ZoneId zone, RoutingPolicies policies) { this.policies = Objects.requireNonNull(policies); this.zone = Objects.requireNonNull(zone); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/context/SharedRoutingContext.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/context/SharedZoneRoutingContext.java index e38212d7f80..2923c8dff5c 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/context/SharedRoutingContext.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/context/SharedZoneRoutingContext.java @@ -15,12 +15,12 @@ import java.util.Objects; * * @author mpolden */ -public class SharedRoutingContext implements RoutingContext { +public class SharedZoneRoutingContext implements RoutingContext { private final ConfigServer configServer; private final ZoneId zone; - public SharedRoutingContext(ZoneId zone, ConfigServer configServer) { + public SharedZoneRoutingContext(ZoneId zone, ConfigServer configServer) { this.configServer = Objects.requireNonNull(configServer); this.zone = Objects.requireNonNull(zone); } |