From fea8ee9e0eb86332330fba0076fc3191072b6139 Mon Sep 17 00:00:00 2001 From: Martin Polden Date: Thu, 25 Apr 2019 13:03:44 +0200 Subject: Rename endpointsIn -> rotationEndpointsIn --- .../com/yahoo/vespa/hosted/controller/application/RoutingPolicy.java | 4 ++-- .../hosted/controller/restapi/application/ApplicationApiHandler.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'controller-server') diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/RoutingPolicy.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/RoutingPolicy.java index 0676297f3bc..2fc852d79d5 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/RoutingPolicy.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/RoutingPolicy.java @@ -75,8 +75,8 @@ public class RoutingPolicy { return Endpoint.of(owner).target(cluster, zone).on(Port.tls()).directRouting().in(system); } - /** Endpoints for this routing policy */ - public EndpointList endpointsIn(SystemName system) { + /** Returns rotation endpoints of this */ + public EndpointList rotationEndpointsIn(SystemName system) { return EndpointList.of(rotations.stream().map(rotation -> endpointOf(owner, rotation, system))); } 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 74206d05009..0ca08f7ba3b 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 @@ -508,7 +508,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler { // Per-cluster rotations Set routingPolicies = controller.applications().routingPolicies(application.id()); for (RoutingPolicy policy : routingPolicies) { - policy.endpointsIn(controller.system()).asList().stream() + policy.rotationEndpointsIn(controller.system()).asList().stream() .map(Endpoint::url) .map(URI::toString) .forEach(globalRotationsArray::addString); -- cgit v1.2.3