aboutsummaryrefslogtreecommitdiffstats
path: root/vespaclient-container-plugin
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2021-10-21 17:44:04 +0200
committerJon Marius Venstad <venstad@gmail.com>2021-10-21 17:44:04 +0200
commit3cf7e6d9d2aab508924da8ef9f1a8f1b10f31453 (patch)
treead55d0813a35e347fc42fc6c3549a531ee5e16bc /vespaclient-container-plugin
parent367dae08c390833a54c1bae11282df5a7e056d16 (diff)
Revert "Merge pull request #19679 from vespa-engine/jonmv/streaming-doc-v1-visit"
This reverts commit f35099d4816e6a3793efdd2bc0fe79a83ed0ef05, reversing changes made to 44030f533278a9ffa071779c057511be12ec3c8d.
Diffstat (limited to 'vespaclient-container-plugin')
-rw-r--r--vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java4
-rw-r--r--vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java10
2 files changed, 7 insertions, 7 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 a3e3c512dcd..23bfde986cf 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
@@ -162,7 +162,7 @@ public class DocumentV1ApiHandler extends AbstractRequestHandler {
private static final String TIME_CHUNK = "timeChunk";
private static final String TIMEOUT = "timeout";
private static final String TRACELEVEL = "tracelevel";
- private static final String STREAM = "stream";
+ private static final String STREAMING = "streaming";
private final Clock clock;
private final Duration handlerTimeout;
@@ -363,7 +363,7 @@ public class DocumentV1ApiHandler extends AbstractRequestHandler {
private ContentChannel getDocuments(HttpRequest request, DocumentPath path, ResponseHandler handler) {
enqueueAndDispatch(request, handler, () -> {
- boolean streaming = getProperty(request, STREAM, booleanParser).orElse(false);
+ boolean streaming = getProperty(request, STREAMING, booleanParser).orElse(false);
VisitorParameters parameters = parseGetParameters(request, path, streaming);
return () -> {
visitAndWrite(request, parameters, handler, streaming);
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 b23533a720e..9234f1cfa6f 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
@@ -248,12 +248,12 @@ public class DocumentV1ApiTest {
"}", response.readAll());
assertEquals(200, response.getStatus());
- // GET at root is a visit. Streaming mode can be specified with &stream=true
+ // GET at root is a visit. Streaming mode can be specified with &streaming=true
access.expect(tokens);
access.expect(parameters -> {
assertEquals("content", parameters.getRoute().toString());
assertEquals("default", parameters.getBucketSpace());
- assertEquals(1025, parameters.getMaxTotalHits()); // Not bounded likewise for streamed responses.
+ assertEquals(1025, parameters.getMaxTotalHits()); // Not bounded likewise for streaming responses.
assertEquals(100, ((StaticThrottlePolicy) parameters.getThrottlePolicy()).getMaxPendingCount());
assertEquals("[id]", parameters.getFieldSet());
assertEquals("(all the things)", parameters.getDocumentSelection());
@@ -269,7 +269,7 @@ public class DocumentV1ApiTest {
parameters.getControlHandler().onDone(VisitorControlHandler.CompletionCode.TIMEOUT, "timeout is OK");
});
response = driver.sendRequest("http://localhost/document/v1?cluster=content&bucketSpace=default&wantedDocumentCount=1025&concurrency=123" +
- "&selection=all%20the%20things&fieldSet=[id]&timeout=6&stream=true");
+ "&selection=all%20the%20things&fieldSet=[id]&timeout=6&streaming=true");
assertSameJson("{" +
" \"pathId\": \"/document/v1\"," +
" \"documents\": [" +
@@ -310,13 +310,13 @@ public class DocumentV1ApiTest {
"}", response.readAll());
assertEquals(400, response.getStatus());
- // GET when a streamed visit returns status code 200 also when errors occur.
+ // GET when a streaming visit returns status code 200 also when errors occur.
access.expect(parameters -> {
assertEquals("(music) and (id.namespace=='space')", parameters.getDocumentSelection());
parameters.getControlHandler().onProgress(progress);
parameters.getControlHandler().onDone(VisitorControlHandler.CompletionCode.FAILURE, "failure?");
});
- response = driver.sendRequest("http://localhost/document/v1/space/music/docid?stream=true");
+ response = driver.sendRequest("http://localhost/document/v1/space/music/docid?streaming=true");
assertSameJson("{" +
" \"pathId\": \"/document/v1/space/music/docid\"," +
" \"documents\": []," +