summaryrefslogtreecommitdiffstats
path: root/controller-api
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2020-02-27 14:28:15 +0100
committerMartin Polden <mpolden@mpolden.no>2020-02-27 14:57:21 +0100
commit0f68ea0c5bb592cf92d5a150934d39f30167d066 (patch)
tree81e8073e34a5cf7ffa46af11ffacbedcb15172d5 /controller-api
parenta96289fb65f540a473f5ad6baa838df191fab8cb (diff)
Determine endpoints from routing policies for all routing methods
Diffstat (limited to 'controller-api')
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/ServiceRegistry.java2
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/routing/RoutingEndpoint.java1
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/routing/RoutingGenerator.java1
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/routing/RoutingGeneratorMock.java1
4 files changed, 4 insertions, 1 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/ServiceRegistry.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/ServiceRegistry.java
index 9e5b01a91d7..978a00fbccf 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/ServiceRegistry.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/ServiceRegistry.java
@@ -31,7 +31,6 @@ import java.time.Clock;
*
* @author mpolden
*/
-// TODO(mpolden): Access all services through this
public interface ServiceRegistry {
ConfigServer configServer();
@@ -42,6 +41,7 @@ public interface ServiceRegistry {
GlobalRoutingService globalRoutingService();
+ // TODO(mpolden): Remove
RoutingGenerator routingGenerator();
Mailer mailer();
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/routing/RoutingEndpoint.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/routing/RoutingEndpoint.java
index 59ad23aaa23..c0ccd0722f3 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/routing/RoutingEndpoint.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/routing/RoutingEndpoint.java
@@ -6,6 +6,7 @@ import java.util.Objects;
/**
* @author smorgrav
*/
+// TODO(mpolden): Remove together with RoutingGenerator and its implementations
public class RoutingEndpoint {
private final boolean isGlobal;
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/routing/RoutingGenerator.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/routing/RoutingGenerator.java
index f5c82018ac6..8150a99979e 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/routing/RoutingGenerator.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/routing/RoutingGenerator.java
@@ -12,6 +12,7 @@ import java.util.Map;
* @author bratseth
* @author smorgrav
*/
+// TODO(mpolden): Remove
public interface RoutingGenerator {
/**
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/routing/RoutingGeneratorMock.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/routing/RoutingGeneratorMock.java
index cd0e6552596..c335b55729a 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/routing/RoutingGeneratorMock.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/routing/RoutingGeneratorMock.java
@@ -18,6 +18,7 @@ import java.util.stream.Collectors;
* @author bratseth
* @author jonmv
*/
+// TODO(mpolden): Remove
public class RoutingGeneratorMock implements RoutingGenerator {
public static final List<RoutingEndpoint> TEST_ENDPOINTS =