diff options
15 files changed, 39 insertions, 53 deletions
diff --git a/config-model/pom.xml b/config-model/pom.xml index e78c7f5c0fd..e8415b3a67b 100644 --- a/config-model/pom.xml +++ b/config-model/pom.xml @@ -498,19 +498,17 @@ </executions> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>javacc-maven-plugin</artifactId> + <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> </execution> </executions> - <configuration> - <sourceDirectory>src/main/javacc</sourceDirectory> - </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/SearchBuilder.java b/config-model/src/main/java/com/yahoo/searchdefinition/SearchBuilder.java index 8ca82008e8b..91f86bb1c2a 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/SearchBuilder.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/SearchBuilder.java @@ -14,7 +14,7 @@ import com.yahoo.searchdefinition.document.SDDocumentType; import com.yahoo.searchdefinition.parser.ParseException; import com.yahoo.searchdefinition.parser.SDParser; import com.yahoo.searchdefinition.parser.SimpleCharStream; -import com.yahoo.searchdefinition.parser.TokenMgrError; +import com.yahoo.searchdefinition.parser.TokenMgrException; import com.yahoo.searchdefinition.processing.Processing; import com.yahoo.vespa.documentmodel.DocumentModel; import com.yahoo.vespa.model.container.search.QueryProfiles; @@ -151,7 +151,7 @@ public class SearchBuilder { SimpleCharStream stream = new SimpleCharStream(str); try { search = new SDParser(stream, deployLogger, app, rankProfileRegistry).search(docTypeMgr, searchDefDir); - } catch (TokenMgrError e) { + } catch (TokenMgrException e) { throw new ParseException("Unknown symbol: " + e.getMessage()); } catch (ParseException pe) { throw new ParseException(stream.formatException(Exceptions.toMessageString(pe))); diff --git a/config-model/src/main/javacc/SDParser.jj b/config-model/src/main/javacc/SDParser.jj index fc4cbd0a495..834eb00924c 100644 --- a/config-model/src/main/javacc/SDParser.jj +++ b/config-model/src/main/javacc/SDParser.jj @@ -1772,7 +1772,7 @@ Object indexBody(IndexOperation index) : | <ALIAS> <COLON> str = identifier() { index.addAlias(str); } | <STEMMING> <COLON> str = identifier() { index.setStemming(str); } | <RISE> { - throw new ParseException("'index:rise' is no longer an option. Use 'indexing:attribute' instead. " + + if (true) throw new ParseException("'index:rise' is no longer an option. Use 'indexing:attribute' instead. " + "If it is a weighted set field you should also add 'attribute:fast-search'." + "This change will require refeeding."); } 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) { diff --git a/document/pom.xml b/document/pom.xml index 10f71218422..9357e87bb76 100644 --- a/document/pom.xml +++ b/document/pom.xml @@ -112,18 +112,15 @@ </executions> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>javacc-maven-plugin</artifactId> + <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/document/src/main/java/com/yahoo/document/select/BucketSelector.java b/document/src/main/java/com/yahoo/document/select/BucketSelector.java index a3dfed98378..41a0d9fd87b 100644 --- a/document/src/main/java/com/yahoo/document/select/BucketSelector.java +++ b/document/src/main/java/com/yahoo/document/select/BucketSelector.java @@ -5,7 +5,7 @@ import com.yahoo.document.BucketIdFactory; import com.yahoo.document.select.parser.ParseException; import com.yahoo.document.select.parser.SelectInput; import com.yahoo.document.select.parser.SelectParser; -import com.yahoo.document.select.parser.TokenMgrError; +import com.yahoo.document.select.parser.TokenMgrException; import com.yahoo.document.select.simple.SelectionParser; /** @@ -53,7 +53,7 @@ public class BucketSelector { SelectParser parser = new SelectParser(new SelectInput(selector)); return parser.expression().getBucketSet(factory); } - } catch (TokenMgrError e) { + } catch (TokenMgrException e) { ParseException t = new ParseException(); throw (ParseException) t.initCause(e); } catch (RuntimeException e) { diff --git a/document/src/main/java/com/yahoo/document/select/DocumentSelector.java b/document/src/main/java/com/yahoo/document/select/DocumentSelector.java index 270b70b92d3..7f5b92ea233 100644 --- a/document/src/main/java/com/yahoo/document/select/DocumentSelector.java +++ b/document/src/main/java/com/yahoo/document/select/DocumentSelector.java @@ -5,7 +5,7 @@ import com.yahoo.document.DocumentOperation; import com.yahoo.document.select.parser.ParseException; import com.yahoo.document.select.parser.SelectInput; import com.yahoo.document.select.parser.SelectParser; -import com.yahoo.document.select.parser.TokenMgrError; +import com.yahoo.document.select.parser.TokenMgrException; import com.yahoo.document.select.rule.ExpressionNode; /** @@ -32,7 +32,7 @@ public class DocumentSelector { try { SelectParser parser = new SelectParser(input); expression = parser.expression(); - } catch (TokenMgrError e) { + } catch (TokenMgrException e) { ParseException t = new ParseException("Tokenization error parsing document selector '" + selector + "'"); throw (ParseException)t.initCause(e); } catch (RuntimeException | ParseException e) { diff --git a/document/src/test/java/com/yahoo/document/select/DocumentSelectorTestCase.java b/document/src/test/java/com/yahoo/document/select/DocumentSelectorTestCase.java index 54f3870fdfd..1764079e897 100644 --- a/document/src/test/java/com/yahoo/document/select/DocumentSelectorTestCase.java +++ b/document/src/test/java/com/yahoo/document/select/DocumentSelectorTestCase.java @@ -5,7 +5,7 @@ import com.yahoo.document.*; import com.yahoo.document.datatypes.*; import com.yahoo.document.select.convert.SelectionExpressionConverter; import com.yahoo.document.select.parser.ParseException; -import com.yahoo.document.select.parser.TokenMgrError; +import com.yahoo.document.select.parser.TokenMgrException; import com.yahoo.yolean.Exceptions; import org.junit.Before; import org.junit.Test; @@ -817,7 +817,7 @@ public class DocumentSelectorTestCase { } catch (ParseException e) { Throwable t = e; - if (t.getCause() instanceof TokenMgrError) { + if (t.getCause() instanceof TokenMgrException) { t = t.getCause(); } assertEquals(expectedError, Exceptions.toMessageString(t).substring(0, expectedError.length())); diff --git a/documentapi/pom.xml b/documentapi/pom.xml index 3781dfd93ac..059adf65e17 100644 --- a/documentapi/pom.xml +++ b/documentapi/pom.xml @@ -94,18 +94,15 @@ </configuration> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>javacc-maven-plugin</artifactId> + <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/indexinglanguage/pom.xml b/indexinglanguage/pom.xml index f0aba8d9476..5b234c4695f 100644 --- a/indexinglanguage/pom.xml +++ b/indexinglanguage/pom.xml @@ -87,18 +87,15 @@ </executions> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>javacc-maven-plugin</artifactId> + <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/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/ScriptParser.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/ScriptParser.java index ed8b0918bf3..0bc82535ad8 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/ScriptParser.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/ScriptParser.java @@ -8,7 +8,7 @@ import com.yahoo.vespa.indexinglanguage.expressions.StatementExpression; import com.yahoo.vespa.indexinglanguage.parser.CharStream; import com.yahoo.vespa.indexinglanguage.parser.IndexingParser; import com.yahoo.vespa.indexinglanguage.parser.ParseException; -import com.yahoo.vespa.indexinglanguage.parser.TokenMgrError; +import com.yahoo.vespa.indexinglanguage.parser.TokenMgrException; /** * @author Simon Thoresen Hult @@ -43,7 +43,7 @@ public final class ScriptParser { try { return parser.statement(); } - catch (TokenMgrError e) { + catch (TokenMgrException e) { throw new ParseException(e.getMessage()); } } diff --git a/searchlib/pom.xml b/searchlib/pom.xml index 108a17e3638..f3785881265 100644 --- a/searchlib/pom.xml +++ b/searchlib/pom.xml @@ -84,18 +84,15 @@ </configuration> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>javacc-maven-plugin</artifactId> + <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/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/FeatureList.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/FeatureList.java index 85c7731a298..8b5a1fbf687 100755 --- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/FeatureList.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/FeatureList.java @@ -4,7 +4,7 @@ package com.yahoo.searchlib.rankingexpression; import com.google.common.annotations.Beta; import com.yahoo.searchlib.rankingexpression.parser.ParseException; import com.yahoo.searchlib.rankingexpression.parser.RankingExpressionParser; -import com.yahoo.searchlib.rankingexpression.parser.TokenMgrError; +import com.yahoo.searchlib.rankingexpression.parser.TokenMgrException; import com.yahoo.searchlib.rankingexpression.rule.ReferenceNode; import java.io.*; @@ -65,7 +65,7 @@ public class FeatureList implements Iterable<ReferenceNode> { try { lst = new RankingExpressionParser(reader).featureList(); } - catch (TokenMgrError e) { + catch (TokenMgrException e) { ParseException t = new ParseException(); throw (ParseException)t.initCause(e); } diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/RankingExpression.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/RankingExpression.java index 34445a31ac3..ed82ba20fbe 100755 --- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/RankingExpression.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/RankingExpression.java @@ -5,7 +5,7 @@ import com.yahoo.searchlib.rankingexpression.evaluation.Context; import com.yahoo.searchlib.rankingexpression.evaluation.Value; import com.yahoo.searchlib.rankingexpression.parser.ParseException; import com.yahoo.searchlib.rankingexpression.parser.RankingExpressionParser; -import com.yahoo.searchlib.rankingexpression.parser.TokenMgrError; +import com.yahoo.searchlib.rankingexpression.parser.TokenMgrException; import com.yahoo.searchlib.rankingexpression.rule.ExpressionNode; import com.yahoo.searchlib.rankingexpression.rule.SerializationContext; import com.yahoo.tensor.TensorType; @@ -177,7 +177,7 @@ public class RankingExpression implements Serializable { try { return new RankingExpressionParser(reader).rankingExpression(); } - catch (TokenMgrError e) { + catch (TokenMgrException e) { throw new ParseException(e.getMessage()); } } |