diff options
author | gjoranv <gv@oath.com> | 2018-08-27 12:11:14 +0200 |
---|---|---|
committer | gjoranv <gv@oath.com> | 2018-08-27 12:13:13 +0200 |
commit | b0c02126f823f36555e634dedfa89ac2aeea8eef (patch) | |
tree | 12172d24a032e8f6c0893e45f047e32c1f6ea75e /container-search | |
parent | 7dc45579bfc175c4e53ca07420697da94165e7a9 (diff) |
Replace old javacc-plugin with ph-javacc-maven-plugin.
Diffstat (limited to 'container-search')
6 files changed, 31 insertions, 37 deletions
diff --git a/container-search/pom.xml b/container-search/pom.xml index cdfcdb2434a..0b5edf8637f 100644 --- a/container-search/pom.xml +++ b/container-search/pom.xml @@ -173,19 +173,15 @@ </configuration> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>javacc-maven-plugin</artifactId> - <version>2.4</version> + <groupId>com.helger.maven</groupId> + <artifactId>ph-javacc-maven-plugin</artifactId> + <version>4.0.3</version> <executions> <execution> - <id>javacc</id> + <phase>generate-sources</phase> <goals> <goal>javacc</goal> </goals> - <configuration> - <lookAhead>1</lookAhead> - <isStatic>false</isStatic> - </configuration> </execution> </executions> </plugin> 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/test/java/com/yahoo/search/grouping/request/GroupingOperationTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/request/GroupingOperationTestCase.java index cc834002fd8..1851f59c824 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/request/GroupingOperationTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/request/GroupingOperationTestCase.java @@ -2,7 +2,7 @@ package com.yahoo.search.grouping.request; 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 org.junit.Test; import java.util.List; @@ -130,7 +130,7 @@ public class GroupingOperationTestCase { GroupingOperation.fromString("all(foo)"); fail(); } catch (IllegalArgumentException e) { - assertTrue(e.getMessage().startsWith("Encountered \"foo\" at line 1, column 5.\n")); + assertTrue(e.getMessage().startsWith("Encountered \" <IDENTIFIER> \"foo \"\" at line 1, column 5.\n")); assertTrue(e.getCause() instanceof ParseException); } } @@ -142,7 +142,7 @@ public class GroupingOperationTestCase { fail(); } catch (IllegalArgumentException e) { assertTrue(e.getMessage().startsWith("Lexical error at line 1, column 6.")); - assertTrue(e.getCause() instanceof TokenMgrError); + assertTrue(e.getCause() instanceof TokenMgrException); } } } diff --git a/container-search/src/test/java/com/yahoo/search/grouping/request/parser/GroupingParserTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/request/parser/GroupingParserTestCase.java index db1f2f59e8d..2c43873036e 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/request/parser/GroupingParserTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/request/parser/GroupingParserTestCase.java @@ -167,15 +167,15 @@ public class GroupingParserTestCase { String expected = "all(group(foo) each(output(max(bar))))"; assertParse(" all(group(foo)each(output(max(bar))))", expected); - assertIllegalArgument("all (group(foo)each(output(max(bar))))", "Encountered \" \" at line 1, column 4."); + assertIllegalArgument("all (group(foo)each(output(max(bar))))", "Encountered \" <SPACE> \" \"\" at line 1, column 4."); assertParse("all( group(foo)each(output(max(bar))))", expected); - assertIllegalArgument("all(group (foo)each(output(max(bar))))", "Encountered \" \" at line 1, column 10."); + assertIllegalArgument("all(group (foo)each(output(max(bar))))", "Encountered \" <SPACE> \" \"\" at line 1, column 10."); assertParse("all(group( foo)each(output(max(bar))))", expected); assertParse("all(group(foo )each(output(max(bar))))", expected); assertParse("all(group(foo) each(output(max(bar))))", expected); - assertIllegalArgument("all(group(foo)each (output(max(bar))))", "Encountered \" \" at line 1, column 19."); + assertIllegalArgument("all(group(foo)each (output(max(bar))))", "Encountered \" <SPACE> \" \"\" at line 1, column 19."); assertParse("all(group(foo)each( output(max(bar))))", expected); - assertIllegalArgument("all(group(foo)each(output (max(bar))))", "Encountered \" \" at line 1, column 26."); + assertIllegalArgument("all(group(foo)each(output (max(bar))))", "Encountered \" <SPACE> \" \"\" at line 1, column 26."); assertParse("all(group(foo)each(output( max(bar))))", expected); assertParse("all(group(foo)each(output(max(bar))))", expected); assertParse("all(group(foo)each(output(max( bar))))", expected); @@ -333,7 +333,7 @@ public class GroupingParserTestCase { assertIllegalArgument("all(group(predefined(foo, bucket<-inf, inf>)))", "Bucket type mismatch, cannot both be infinity"); assertIllegalArgument("all(group(predefined(foo, bucket<inf, -inf>)))", - "Encountered \"inf\" at line 1, column 34."); + "Encountered \" \"inf\" \"inf \"\" at line 1, column 34."); assertIllegalArgument("all(group(predefined(foo, bucket(2, 1))))", "Bucket to-value can not be less than from-value."); @@ -342,7 +342,7 @@ public class GroupingParserTestCase { assertIllegalArgument("all(group(predefined(foo, bucket(b, a))))", "Bucket to-value can not be less than from-value."); assertIllegalArgument("all(group(predefined(foo, bucket(b, -inf))))", - "Encountered \"-inf\" at line 1, column 37."); + "Encountered \" \"-inf\" \"-inf \"\" at line 1, column 37."); assertIllegalArgument("all(group(predefined(foo, bucket(c, d), bucket(a, b))))", "Buckets must be monotonically increasing, got bucket[\"c\", \"d\"> before bucket[\"a\", \"b\">."); assertIllegalArgument("all(group(predefined(foo, bucket(c, d), bucket(-inf, e))))", @@ -386,19 +386,19 @@ public class GroupingParserTestCase { " each() as(baz))", "all(group(a) each(each() as(foo) each() as(bar)) each() as(baz))"); - assertIllegalArgument("all() as(foo)", "Encountered \"as\" at line 1, column 7."); - assertIllegalArgument("all(all() as(foo))", "Encountered \"as\" at line 1, column 11."); - assertIllegalArgument("each(all() as(foo))", "Encountered \"as\" at line 1, column 12."); + assertIllegalArgument("all() as(foo)", "Encountered \" \"as\" \"as \"\" at line 1, column 7."); + assertIllegalArgument("all(all() as(foo))", "Encountered \" \"as\" \"as \"\" at line 1, column 11."); + assertIllegalArgument("each(all() as(foo))", "Encountered \" \"as\" \"as \"\" at line 1, column 12."); } @Test public void testAttributeName() { assertParse("all(group(foo))"); assertIllegalArgument("all(group(foo.))", - "Encountered \")\" at line 1, column 15."); + "Encountered \" \")\" \") \"\" at line 1, column 15."); assertParse("all(group(foo.bar))"); assertIllegalArgument("all(group(foo.bar.))", - "Encountered \")\" at line 1, column 19."); + "Encountered \" \")\" \") \"\" at line 1, column 19."); assertParse("all(group(foo.bar.baz))"); } @@ -410,7 +410,7 @@ public class GroupingParserTestCase { "all(output(min(a) as(foo), max(b) as(bar)))"); assertIllegalArgument("all(output(min(a)) as(foo))", - "Encountered \"as\" at line 1, column 20."); + "Encountered \" \"as\" \"as \"\" at line 1, column 20."); } @Test @@ -423,11 +423,11 @@ public class GroupingParserTestCase { @Test public void testParseBadRequest() { assertIllegalArgument("output(count())", - "Encountered \"output\" at line 1, column 1."); + "Encountered \" \"output\" \"output \"\" at line 1, column 1."); assertIllegalArgument("each(output(count()))", "Expression 'count()' not applicable for single hit."); assertIllegalArgument("all(output(count())))", - "Encountered \")\" at line 1, column 21."); + "Encountered \" \")\" \") \"\" at line 1, column 21."); } @Test @@ -541,16 +541,16 @@ public class GroupingParserTestCase { assertParse("all(group(debugwait(artist, 3.3, true)))"); assertParse("all(group(debugwait(artist, 3.3, false)))"); assertIllegalArgument("all(group(debugwait(artist, -3.3, true)))", - "Encountered \"-\" at line 1, column 29"); + "Encountered \" \"-\" \"- \"\" at line 1, column 29"); assertIllegalArgument("all(group(debugwait(artist, 3.3, lol)))", - "Encountered \"lol\" at line 1, column 34"); + "Encountered \" <IDENTIFIER> \"lol \"\" at line 1, column 34"); assertParse("all(group(artist) each(output(stddev(simple))))"); } @Test public void requireThatParseExceptionMessagesContainErrorMarker() { assertIllegalArgument("foo", - "Encountered \"foo\" at line 1, column 1.\n" + + "Encountered \" <IDENTIFIER> \"foo \"\" at line 1, column 1.\n" + "Was expecting one of:\n" + " <SPACE> ...\n" + " \"all\" ...\n" + @@ -560,7 +560,7 @@ public class GroupingParserTestCase { "foo\n" + "^"); assertIllegalArgument("\n foo", - "Encountered \"foo\" at line 2, column 2.\n" + + "Encountered \" <IDENTIFIER> \"foo \"\" at line 2, column 2.\n" + "Was expecting one of:\n" + " <SPACE> ...\n" + " \"all\" ...\n" + |