diff options
Diffstat (limited to 'container-search/src/main/java')
4 files changed, 8 insertions, 10 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/GroupingOperation.java b/container-search/src/main/java/com/yahoo/search/grouping/request/GroupingOperation.java index 93619913b4f..c825f3c61de 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/GroupingOperation.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/GroupingOperation.java @@ -6,7 +6,7 @@ import com.yahoo.collections.LazySet; import com.yahoo.search.grouping.request.parser.GroupingParser; import com.yahoo.search.grouping.request.parser.GroupingParserInput; import com.yahoo.search.grouping.request.parser.ParseException; -import com.yahoo.search.grouping.request.parser.TokenMgrError; +import com.yahoo.search.grouping.request.parser.TokenMgrException; import java.util.*; @@ -617,7 +617,7 @@ public abstract class GroupingOperation extends GroupingNode { GroupingParserInput input = new GroupingParserInput(str); try { return new GroupingParser(input).requestList(); - } catch (ParseException | TokenMgrError e) { + } catch (ParseException | TokenMgrException e) { throw new IllegalArgumentException(input.formatException(e.getMessage()), e); } } diff --git a/container-search/src/main/java/com/yahoo/search/query/textserialize/TextSerialize.java b/container-search/src/main/java/com/yahoo/search/query/textserialize/TextSerialize.java index f44dab92fc7..08af2b02dea 100644 --- a/container-search/src/main/java/com/yahoo/search/query/textserialize/TextSerialize.java +++ b/container-search/src/main/java/com/yahoo/search/query/textserialize/TextSerialize.java @@ -6,7 +6,7 @@ import com.yahoo.search.query.textserialize.item.ItemContext; import com.yahoo.search.query.textserialize.item.ItemFormHandler; import com.yahoo.search.query.textserialize.parser.ParseException; import com.yahoo.search.query.textserialize.parser.Parser; -import com.yahoo.search.query.textserialize.parser.TokenMgrError; +import com.yahoo.search.query.textserialize.parser.TokenMgrException; import com.yahoo.search.query.textserialize.serializer.QueryTreeSerializer; import java.io.StringReader; @@ -28,9 +28,7 @@ public class TextSerialize { "(type = " + result.getClass() + ")"); } return (Item) result; - } catch (ParseException e) { - throw new RuntimeException(e); - } catch (TokenMgrError e) { + } catch (ParseException | TokenMgrException e) { throw new RuntimeException(e); } } diff --git a/container-search/src/main/java/com/yahoo/search/querytransform/BooleanSearcher.java b/container-search/src/main/java/com/yahoo/search/querytransform/BooleanSearcher.java index 605b959c5d7..21bc22d7002 100644 --- a/container-search/src/main/java/com/yahoo/search/querytransform/BooleanSearcher.java +++ b/container-search/src/main/java/com/yahoo/search/querytransform/BooleanSearcher.java @@ -8,7 +8,7 @@ import com.yahoo.processing.request.CompoundName; import com.yahoo.search.Query; import com.yahoo.search.Result; import com.yahoo.search.Searcher; -import com.yahoo.search.grouping.request.parser.TokenMgrError; +import com.yahoo.search.grouping.request.parser.TokenMgrException; import com.yahoo.search.result.ErrorMessage; import com.yahoo.search.searchchain.Execution; @@ -57,7 +57,7 @@ public class BooleanSearcher extends Searcher { if (query.isTraceable(4)) { query.trace("BooleanSearcher: Added boolean operator", true, 4); } - } catch (TokenMgrError e) { + } catch (TokenMgrException e) { return new Result(query, ErrorMessage.createInvalidQueryParameter(toMessageString(e))); } } else { 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) { |