Use "[Content:cluster=...]" for routes instead of (only-sometimes-)generated -direct route

7 files changed, 10 insertions, 10 deletions

diff --git a/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/Reindexer.java b/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/Reindexer.java
index 2f769143e6e..3b7c9160b53 100644
--- a/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/Reindexer.java
+++ b/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/Reindexer.java
@@ -229,7 +229,7 @@ public class Reindexer {
         }
 
         String route() {
-            return name + "-direct";
+            return "[Content:cluster=" + name + "]";
         }
 
         String bucketSpaceOf(DocumentType documentType) {
diff --git a/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexerTest.java b/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexerTest.java
index 160022cc996..01586e06015 100644
--- a/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexerTest.java
+++ b/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexerTest.java
@@ -84,7 +84,7 @@ class ReindexerTest {
         assertEquals("music:[document]", parameters.getFieldSet());
         assertSame(token, parameters.getResumeToken());
         assertEquals("default", parameters.getBucketSpace());
-        assertEquals("cluster-direct", parameters.getRoute().toString());
+        assertEquals("[Content:cluster=cluster]", parameters.getRoute().toString());
         assertEquals("cluster", parameters.getRemoteDataHandler());
         assertEquals("music", parameters.getDocumentSelection());
         assertEquals(DocumentProtocol.Priority.NORMAL_3, parameters.getPriority());
diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java
index 2988ce07ae6..47530e2c6e2 100644
--- a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java
+++ b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java
@@ -952,7 +952,7 @@ public class DocumentV1ApiHandler extends AbstractRequestHandler {
         }
 
         String name() { return name; }
-        String route() { return name() + "-direct"; }
+        String route() { return "[Content:cluster=" + name() + "]"; }
         Optional<String> bucketOf(String documentType) { return Optional.ofNullable(documentBuckets.get(documentType)); }
 
     }
diff --git a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java
index 2b47f9c92c2..449daa4970a 100644
--- a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java
+++ b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java
@@ -138,7 +138,7 @@ public class DocumentV1ApiTest {
     public void testResolveCluster() {
         assertEquals("content",
                      DocumentV1ApiHandler.resolveCluster(Optional.empty(), clusters).name());
-        assertEquals("content-direct",
+        assertEquals("[Content:cluster=content]",
                      DocumentV1ApiHandler.resolveCluster(Optional.of("content"), clusters).route());
         try {
             DocumentV1ApiHandler.resolveCluster(Optional.empty(), Map.of());
@@ -192,7 +192,7 @@ public class DocumentV1ApiTest {
 
         // GET at root is a visit. Numeric parameters have an upper bound.
         access.expect(parameters -> {
-            assertEquals("content-direct", parameters.getRoute().toString());
+            assertEquals("[Content:cluster=content]", parameters.getRoute().toString());
             assertEquals("default", parameters.getBucketSpace());
             assertEquals(1024, parameters.getMaxTotalHits());
             assertEquals(100, ((StaticThrottlePolicy) parameters.getThrottlePolicy()).getMaxPendingCount());
@@ -274,7 +274,7 @@ public class DocumentV1ApiTest {
         // GET with full document ID is a document get operation which returns 404 when no document is found
         access.session.expect((id, parameters) -> {
             assertEquals(doc1.getId(), id);
-            assertEquals(parameters().withRoute("content-direct").withFieldSet("go"), parameters);
+            assertEquals(parameters().withRoute("[Content:cluster=content]").withFieldSet("go"), parameters);
             parameters.responseHandler().get().handleResponse(new DocumentResponse(0, null));
             return new Result(Result.ResultType.SUCCESS, null);
         });
diff --git a/vespaclient-core/src/main/java/com/yahoo/vespaclient/ClusterDef.java b/vespaclient-core/src/main/java/com/yahoo/vespaclient/ClusterDef.java
index f3b8c189fc5..c2f99689caf 100644
--- a/vespaclient-core/src/main/java/com/yahoo/vespaclient/ClusterDef.java
+++ b/vespaclient-core/src/main/java/com/yahoo/vespaclient/ClusterDef.java
@@ -5,5 +5,5 @@ public class ClusterDef {
     private final String name;
     public ClusterDef(String name) { this.name = name; }
     public String getName() { return name; }
-    public String getRoute() { return name + "-direct"; }
+    public String getRoute() { return "[Content:cluster=" + name + "]"; }
 }
diff --git a/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java b/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java
index d6bda4b8bc1..8820658fa02 100644
--- a/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java
+++ b/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java
@@ -235,7 +235,7 @@ public class DocumentRetrieverTest {
     @Test
     public void testClusterLookup() throws DocumentRetrieverException {
         final String cluster = "storage",
-                expectedRoute = "storage-direct";
+                expectedRoute = "[Content:cluster=storage]";
 
         ClientParameters params = createParameters()
                 .setCluster(cluster)
diff --git a/vespaclient-java/src/test/java/com/yahoo/vespavisit/VdsVisitTestCase.java b/vespaclient-java/src/test/java/com/yahoo/vespavisit/VdsVisitTestCase.java
index 7828fbb249d..f4d58a671f1 100644
--- a/vespaclient-java/src/test/java/com/yahoo/vespavisit/VdsVisitTestCase.java
+++ b/vespaclient-java/src/test/java/com/yahoo/vespavisit/VdsVisitTestCase.java
@@ -232,7 +232,7 @@ public class VdsVisitTestCase {
         ClusterList clusterList = new ClusterList(clusterDefs);
 
         String route = VdsVisit.resolveClusterRoute(clusterList, null);
-        assertEquals("storage-direct", route);
+        assertEquals("[Content:cluster=storage]", route);
     }
 
     @Test
@@ -270,7 +270,7 @@ public class VdsVisitTestCase {
         ClusterList clusterList = new ClusterList(clusterDefs);
 
         String route = VdsVisit.resolveClusterRoute(clusterList, "storage2");
-        assertEquals("storage2-direct", route);
+        assertEquals("[Content:cluster=storage2]", route);
     }
 
     @Test