From bdc00be1ff38398ac4df2f8b7d1dcc41c3421da1 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Tue, 21 Nov 2023 13:10:14 +0100 Subject: Don't mention userid --- .../java/com/yahoo/vespa/streamingvisitors/StreamingSearcher.java | 6 ++---- .../yahoo/vespa/streamingvisitors/StreamingSearcherTestCase.java | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'container-search') diff --git a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/StreamingSearcher.java b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/StreamingSearcher.java index 3fb577a5ff3..f7f3f97f3ac 100644 --- a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/StreamingSearcher.java +++ b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/StreamingSearcher.java @@ -136,10 +136,8 @@ public class StreamingSearcher extends VespaBackEndSearcher { initializeMissingQueryFields(query); if (documentSelectionQueryParameterCount(query) != 1) { - return new Result(query, ErrorMessage.createIllegalQuery("Streaming search needs one and " + - "only one of these query parameters to be set: " + - "streaming.userid, streaming.groupname, or " + - "streaming.selection")); + return new Result(query, ErrorMessage.createIllegalQuery("Streaming search requires either " + + "streaming.groupname or streaming.selection")); } if (query.getTrace().isTraceable(4)) query.trace("Routing to search cluster " + getSearchClusterName() + " and document type " + documentType, 4); diff --git a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/StreamingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/StreamingSearcherTestCase.java index dd5e1c71b16..2a246739100 100644 --- a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/StreamingSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/StreamingSearcherTestCase.java @@ -244,7 +244,7 @@ public class StreamingSearcherTestCase { // Magic query values are used to trigger specific behaviors from mock visitor. checkError(searcher, "/?query=noselection", - "Illegal query", "Streaming search needs one and only one"); + "Illegal query", "Streaming search requires either"); checkError(searcher, "/?streaming.userid=1&query=parseexception", "Invalid query parameter", "Failed to parse document selection string"); checkError(searcher, "/?streaming.userid=1&query=tokenizeexception", -- cgit v1.2.3