summaryrefslogtreecommitdiffstats
path: root/vespaclient-container-plugin
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2021-01-04 16:43:06 +0100
committerJon Marius Venstad <venstad@gmail.com>2021-01-04 16:43:06 +0100
commitb1e15a0e12bc6fb258b65cdd6e6fcfb925e8f3c1 (patch)
tree2676f0ddbf2df00c17cdd362559d2c4890a3d0a6 /vespaclient-container-plugin
parent6eede0d2c93cd086a980d2bed5c5cc5d1eca9712 (diff)
Use clustername-direct routes for visitors
Diffstat (limited to 'vespaclient-container-plugin')
-rw-r--r--vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java2
-rw-r--r--vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java6
2 files changed, 4 insertions, 4 deletions
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 7ce3a7ede08..2988ce07ae6 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(); }
+ String route() { return name() + "-direct"; }
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 85ff1bec2d4..2b47f9c92c2 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",
+ assertEquals("content-direct",
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", parameters.getRoute().toString());
+ assertEquals("content-direct", 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").withFieldSet("go"), parameters);
+ assertEquals(parameters().withRoute("content-direct").withFieldSet("go"), parameters);
parameters.responseHandler().get().handleResponse(new DocumentResponse(0, null));
return new Result(Result.ResultType.SUCCESS, null);
});