From ba415d216374f974dde970a1cc39ba4212a18d01 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Mon, 8 Apr 2019 11:26:26 +0200 Subject: Revert "Better heuristics for negative numbers" --- .../src/main/java/com/yahoo/search/query/parser/Parser.java | 3 ++- container-search/src/main/java/com/yahoo/search/yql/YqlParser.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'container-search/src/main/java/com/yahoo/search') diff --git a/container-search/src/main/java/com/yahoo/search/query/parser/Parser.java b/container-search/src/main/java/com/yahoo/search/query/parser/Parser.java index b3d79f65df4..32c386f0e32 100644 --- a/container-search/src/main/java/com/yahoo/search/query/parser/Parser.java +++ b/container-search/src/main/java/com/yahoo/search/query/parser/Parser.java @@ -15,7 +15,8 @@ public interface Parser { * {@link QueryTree}. If parsing fails without an exception, the contained * root will be an instance of {@link com.yahoo.prelude.query.NullItem}. * - * @param query the Parsable to parse + * @param query + * the Parsable to parse * @return the parsed QueryTree, never null */ QueryTree parse(Parsable query); diff --git a/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java b/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java index 3eac1d88784..af095fefc1c 100644 --- a/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java +++ b/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java @@ -712,7 +712,7 @@ public class YqlParser implements Parser { .setLanguage(language) .setDefaultIndexName(defaultIndex)).getRoot(); // the null check should be unnecessary, but is there to avoid having to suppress null warnings - if ( ! allowNullItem && (item == null || item instanceof NullItem)) + if ( !allowNullItem && (item == null || item instanceof NullItem)) throw new IllegalArgumentException("Parsing '" + wordData + "' only resulted in NullItem."); if (language != Language.ENGLISH) // mark the language used, unless it's the default -- cgit v1.2.3