From 15dcc7d50baf84daf14444c12c164aa4a55fdabb Mon Sep 17 00:00:00 2001
From: Jon Marius Venstad <venstad@gmail.com>
Date: Thu, 4 Feb 2021 20:58:03 +0100
Subject: Replace explicit, direct route to cluster with its name-route

---
 .../com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java | 5 ++---
 .../com/yahoo/document/restapi/resource/DocumentV1ApiTest.java    | 8 ++++----
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'vespaclient-container-plugin/src')

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 e7f74161a8e..1f5c3e93572 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
@@ -478,7 +478,7 @@ public class DocumentV1ApiHandler extends AbstractRequestHandler {
                                                                                                 .orElse(parameters());
         for (String name : names) switch (name) {
             case CLUSTER:
-                parameters = getProperty(request, CLUSTER).map(cluster -> resolveCluster(Optional.of(cluster), clusters).route())
+                parameters = getProperty(request, CLUSTER).map(cluster -> resolveCluster(Optional.of(cluster), clusters).name())
                                                           .map(parameters::withRoute)
                                                           .orElse(parameters);
                 break;
@@ -948,7 +948,7 @@ public class DocumentV1ApiHandler extends AbstractRequestHandler {
         parameters.setPriority(DocumentProtocol.Priority.NORMAL_4);
 
         StorageCluster storageCluster = resolveCluster(cluster, clusters);
-        parameters.setRoute(storageCluster.route());
+        parameters.setRoute(storageCluster.name());
         parameters.setBucketSpace(resolveBucket(storageCluster,
                                                 path.documentType(),
                                                 List.of(FixedBucketSpaces.defaultSpace(), FixedBucketSpaces.globalSpace()),
@@ -1177,7 +1177,6 @@ public class DocumentV1ApiHandler extends AbstractRequestHandler {
         }
 
         String name() { return name; }
-        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 96bcb1c13ea..1147dc7962a 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
@@ -142,8 +142,8 @@ public class DocumentV1ApiTest {
     public void testResolveCluster() {
         assertEquals("content",
                      DocumentV1ApiHandler.resolveCluster(Optional.empty(), clusters).name());
-        assertEquals("[Content:cluster=content]",
-                     DocumentV1ApiHandler.resolveCluster(Optional.of("content"), clusters).route());
+        assertEquals("content",
+                     DocumentV1ApiHandler.resolveCluster(Optional.of("content"), clusters).name());
         try {
             DocumentV1ApiHandler.resolveCluster(Optional.empty(), Map.of());
             fail("Should fail without any clusters");
@@ -198,7 +198,7 @@ public class DocumentV1ApiTest {
         // GET at root is a visit. Numeric parameters have an upper bound.
         access.expect(tokens);
         access.expect(parameters -> {
-            assertEquals("[Content:cluster=content]", parameters.getRoute().toString());
+            assertEquals("content", parameters.getRoute().toString());
             assertEquals("default", parameters.getBucketSpace());
             assertEquals(1024, parameters.getMaxTotalHits());
             assertEquals(100, ((StaticThrottlePolicy) parameters.getThrottlePolicy()).getMaxPendingCount());
@@ -376,7 +376,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:cluster=content]").withFieldSet("go"), parameters);
+            assertEquals(parameters().withRoute("content").withFieldSet("go"), parameters);
             parameters.responseHandler().get().handleResponse(new DocumentResponse(0, null));
             return new Result(Result.ResultType.SUCCESS, null);
         });
-- 
cgit v1.2.3