aboutsummaryrefslogtreecommitdiffstats
path: root/container-search/src
diff options
context:
space:
mode:
authorgjoranv <gv@oath.com>2018-08-27 14:22:09 +0200
committergjoranv <gv@oath.com>2018-08-27 14:55:17 +0200
commite6264beb644bfc534b1ea0f0945b6eb0c3cc1a16 (patch)
tree580f57b10ee5a8d82dcaad90fb80c2313a617417 /container-search/src
parent074f695b044eec2663fec0d314b423eb12254ade (diff)
Switch to new javacc maven plugin:
- config model - document - documentapi - indexinglanguage. - searchlib
Diffstat (limited to 'container-search/src')
-rw-r--r--container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java4
-rw-r--r--container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcherTestCase.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java
index 360d16080d0..53c170301fc 100644
--- a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java
+++ b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java
@@ -10,7 +10,7 @@ import java.util.logging.Logger;
import com.yahoo.document.DocumentId;
import com.yahoo.document.idstring.IdString;
import com.yahoo.document.select.parser.ParseException;
-import com.yahoo.document.select.parser.TokenMgrError;
+import com.yahoo.document.select.parser.TokenMgrException;
import com.yahoo.fs4.DocsumPacket;
import com.yahoo.fs4.Packet;
import com.yahoo.fs4.QueryPacket;
@@ -134,7 +134,7 @@ public class VdsStreamingSearcher extends VespaBackEndSearcher {
} catch (ParseException e) {
return new Result(query, ErrorMessage.createBackendCommunicationError(
"Failed to parse document selection string: " + e.getMessage() + "'."));
- } catch (TokenMgrError e) {
+ } catch (TokenMgrException e) {
return new Result(query, ErrorMessage.createBackendCommunicationError(
"Failed to tokenize document selection string: " + e.getMessage() + "'."));
} catch (TimeoutException e) {
diff --git a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcherTestCase.java
index d767d06104c..c8c653d67ed 100644
--- a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcherTestCase.java
@@ -2,7 +2,7 @@
package com.yahoo.vespa.streamingvisitors;
import com.yahoo.config.subscription.ConfigGetter;
-import com.yahoo.document.select.parser.TokenMgrError;
+import com.yahoo.document.select.parser.TokenMgrException;
import com.yahoo.messagebus.routing.Route;
import com.yahoo.prelude.fastsearch.DocumentdbInfoConfig;
import com.yahoo.document.select.parser.ParseException;
@@ -55,7 +55,7 @@ public class VdsStreamingSearcherTestCase {
if (queryString.compareTo("parseexception") == 0) {
throw new ParseException("Parsing failed");
} else if (queryString.compareTo("tokenizeexception") == 0) {
- throw new TokenMgrError("Tokenization failed", 0);
+ throw new TokenMgrException("Tokenization failed", 0);
} else if (queryString.compareTo("interruptedexception") == 0) {
throw new InterruptedException("Interrupted");
} else if (queryString.compareTo("timeoutexception") == 0) {