Use "route" for visit destination routes

2 files changed, 9 insertions, 10 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 4b49c5cdafb..e7f74161a8e 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
@@ -154,7 +154,6 @@ public class DocumentV1ApiHandler extends AbstractRequestHandler {
     private static final String BUCKET_SPACE = "bucketSpace";
     private static final String TIMEOUT = "timeout";
     private static final String TRACELEVEL = "tracelevel";
-    private static final String DESTINATION = "destination";
 
     private final Clock clock;
     private final Metric metric;
@@ -360,7 +359,7 @@ public class DocumentV1ApiHandler extends AbstractRequestHandler {
     private ContentChannel postDocuments(HttpRequest request, DocumentPath path, ResponseHandler handler) {
         enqueueAndDispatch(request, handler, () -> {
             VisitorParameters parameters = parseParameters(request, path);
-            parameters.setRemoteDataHandler(getProperty(request, DESTINATION).orElseThrow(() -> new IllegalArgumentException("Missing required property '"  + DESTINATION + "'")));
+            parameters.setRemoteDataHandler(getProperty(request, ROUTE).orElseThrow(() -> new IllegalArgumentException("Missing required property '"  + ROUTE + "'")));
             return () -> {
                 visitWithRemote(request, parameters, handler);
                 return true; // VisitorSession has its own throttle handling.
@@ -382,7 +381,7 @@ public class DocumentV1ApiHandler extends AbstractRequestHandler {
                 DocumentUpdate update = parser.parseUpdate(in, dummyId.toString());
                 update.setCondition(new TestAndSetCondition(parameters.getDocumentSelection()));
                 return () -> {
-                    visitAndUpdate(request, parameters, handler, update, getProperty(request, DESTINATION));
+                    visitAndUpdate(request, parameters, handler, update, getProperty(request, ROUTE));
                     return true; // VisitorSession has its own throttle handling.
                 };
             });
@@ -398,7 +397,7 @@ public class DocumentV1ApiHandler extends AbstractRequestHandler {
             parameters.setFieldSet(DocIdOnly.NAME);
             TestAndSetCondition condition = new TestAndSetCondition(parameters.getDocumentSelection());
             return () -> {
-                visitAndDelete(request, parameters, handler, condition, getProperty(request, DESTINATION));
+                visitAndDelete(request, parameters, handler, condition, getProperty(request, ROUTE));
                 return true; // VisitorSession has its own throttle handling.
             };
         });
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 e5e5fef5fd0..1e3f3e13c2a 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
@@ -252,24 +252,24 @@ public class DocumentV1ApiTest {
                        "}", response.readAll());
         assertEquals(400, response.getStatus());
 
-        // POST with namespace and document type is a restricted visit with a required remote data handler ("destination")
+        // POST with namespace and document type is a restricted visit with a required remote data handler ("route")
         access.expect(parameters -> {
             fail("Not supposed to run");
         });
         response = driver.sendRequest("http://localhost/document/v1/space/music/docid", POST);
         assertSameJson("{" +
                        "  \"pathId\": \"/document/v1/space/music/docid\"," +
-                       "  \"message\": \"Missing required property 'destination'\"" +
+                       "  \"message\": \"Missing required property 'route'\"" +
                        "}", response.readAll());
         assertEquals(400, response.getStatus());
 
-        // POST with namespace and document type is a restricted visit with a require remote data handler ("destination")
+        // POST with namespace and document type is a restricted visit with a require remote data handler ("route")
         access.expect(parameters -> {
             assertEquals("zero", parameters.getRemoteDataHandler());
             assertEquals("music:[document]", parameters.fieldSet());
             parameters.getControlHandler().onDone(VisitorControlHandler.CompletionCode.SUCCESS, "We made it!");
         });
-        response = driver.sendRequest("http://localhost/document/v1/space/music/docid?destination=zero", POST);
+        response = driver.sendRequest("http://localhost/document/v1/space/music/docid?route=zero", POST);
         assertSameJson("{" +
                        "  \"pathId\": \"/document/v1/space/music/docid\"" +
                        "}", response.readAll());
@@ -292,7 +292,7 @@ public class DocumentV1ApiTest {
             assertEquals(parameters().withRoute("zero"), parameters);
             return new Result(Result.ResultType.SUCCESS, null);
         });
-        response = driver.sendRequest("http://localhost/document/v1/space/music/docid?selection=true&destination=zero", PUT,
+        response = driver.sendRequest("http://localhost/document/v1/space/music/docid?selection=true&route=zero", PUT,
                                       "{" +
                                       "  \"fields\": {" +
                                       "    \"artist\": { \"assign\": \"Lisa Ekdahl\" }" +
@@ -330,7 +330,7 @@ public class DocumentV1ApiTest {
             parameters.responseHandler().get().handleResponse(new DocumentIdResponse(0, doc2.getId(), "boom", Response.Outcome.ERROR));
             return new Result(Result.ResultType.SUCCESS, null);
         });
-        response = driver.sendRequest("http://localhost/document/v1/space/music/docid?selection=false&destination=zero", DELETE);
+        response = driver.sendRequest("http://localhost/document/v1/space/music/docid?selection=false&route=zero", DELETE);
         assertSameJson("{" +
                        "  \"pathId\": \"/document/v1/space/music/docid\"," +
                        "  \"message\": \"boom\"" +