diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2021-10-21 16:26:44 +0200 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2021-10-21 16:26:44 +0200 |
commit | ef4956bb9668324f7f4911b857450906fded04cc (patch) | |
tree | 0ab62a55388005a2e5563d0557bd5a347d9582f7 /vespaclient-container-plugin/src | |
parent | 28e3d42feebc04bc5385ab854ce6744d2a03b5e1 (diff) |
streaming -> stream
Diffstat (limited to 'vespaclient-container-plugin/src')
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 23bfde986cf..a3e3c512dcd 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 STREAMING = "streaming"; + private static final String STREAM = "stream"; 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, STREAMING, booleanParser).orElse(false); + boolean streaming = getProperty(request, STREAM, 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 9234f1cfa6f..b23533a720e 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 &streaming=true + // GET at root is a visit. Streaming mode can be specified with &stream=true access.expect(tokens); access.expect(parameters -> { assertEquals("content", parameters.getRoute().toString()); assertEquals("default", parameters.getBucketSpace()); - assertEquals(1025, parameters.getMaxTotalHits()); // Not bounded likewise for streaming responses. + assertEquals(1025, parameters.getMaxTotalHits()); // Not bounded likewise for streamed 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&streaming=true"); + "&selection=all%20the%20things&fieldSet=[id]&timeout=6&stream=true"); assertSameJson("{" + " \"pathId\": \"/document/v1\"," + " \"documents\": [" + @@ -310,13 +310,13 @@ public class DocumentV1ApiTest { "}", response.readAll()); assertEquals(400, response.getStatus()); - // GET when a streaming visit returns status code 200 also when errors occur. + // GET when a streamed 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?streaming=true"); + response = driver.sendRequest("http://localhost/document/v1/space/music/docid?stream=true"); assertSameJson("{" + " \"pathId\": \"/document/v1/space/music/docid\"," + " \"documents\": []," + |