Apache Solr open-source search software
SOLR-16427: Evaluate and fix errorprone rules - Disable errorprone on javacc files
Kevin Risdenf06cf8df50df
diff --git a/gradle/generation/javacc.gradle b/gradle/generation/javacc.gradleindex 9adfebcfca3..54fc7e91359 100644--- a/gradle/generation/javacc.gradle+++ b/gradle/generation/javacc.gradle@@ -66,10 +66,14 @@ def commonCleanups = { FileTree generatedFiles ->// Add CharStream imports.text = text.replaceAll(/package (.+)/,- '''- package $1- import org.apache.lucene.queryparser.charstream.CharStream;- '''.trim())+'''package $1+import javax.annotation.processing.Generated;+import org.apache.lucene.queryparser.charstream.CharStream;'''.trim())+ text = text.replace(+ "/** Token Manager. */",+'''/** Token Manager. */+@Generated("JavaCC")'''+ )// Eliminates redundant cast message.text = text.replace("int hiByte = (int)(curChar >> 8);",diff --git a/solr/core/src/java/org/apache/solr/parser/QueryParser.java b/solr/core/src/java/org/apache/solr/parser/QueryParser.javaindex 7b4f90c79f5..9feb2d1c68d 100644--- a/solr/core/src/java/org/apache/solr/parser/QueryParser.java+++ b/solr/core/src/java/org/apache/solr/parser/QueryParser.java@@ -8,6 +8,7 @@ import java.util.Arrays;import java.util.HashSet;import java.util.List;import java.util.Set;+import javax.annotation.processing.Generated;import org.apache.lucene.analysis.Analyzer;import org.apache.lucene.search.BooleanClause;@@ -18,6 +19,7 @@ import org.apache.solr.search.QParser;import org.apache.lucene.queryparser.charstream.CharStream;import org.apache.lucene.queryparser.charstream.FastCharStream;+@Generated("JavaCC")public class QueryParser extends SolrQueryParserBase implements QueryParserConstants {/** The default operator for parsing queries.*/@@ -137,7 +139,6 @@ ret = MOD_NOT;}// This makes sure that there is no garbage after the query string- @Overridefinal public Query TopLevelQuery(String field) throws ParseException, SyntaxError {Query q;q = Query(field);jj_consume_token(0);@@ -669,37 +670,26 @@ if (splitOnWhitespace == false) {finally { jj_save(2, xla); }}- private boolean jj_3_3()- {- Token xsp;- xsp = jj_scanpos;- if (jj_3R_Clause_249_7_4()) {- jj_scanpos = xsp;- if (jj_3R_Clause_250_9_5()) return true;- }- return false;- }-private boolean jj_3_2(){- if (jj_3R_MultiTerm_327_3_3()) return true;+ if (jj_3R_MultiTerm_329_3_3()) return true;return false;}- private boolean jj_3R_Clause_250_9_5()+ private boolean jj_3R_Clause_252_9_5(){if (jj_scan_token(STAR)) return true;if (jj_scan_token(COLON)) return true;return false;}- private boolean jj_3R_MultiTerm_340_5_7()+ private boolean jj_3R_MultiTerm_342_5_7(){if (jj_scan_token(TERM)) return true;return false;}- private boolean jj_3R_Clause_249_7_4()+ private boolean jj_3R_Clause_251_7_4(){if (jj_scan_token(TERM)) return true;if (jj_scan_token(COLON)) return true;@@ -708,27 +698,38 @@ if (splitOnWhitespace == false) {private boolean jj_3_1(){- if (jj_3R_MultiTerm_327_3_3()) return true;+ if (jj_3R_MultiTerm_329_3_3()) return true;return false;}- private boolean jj_3R_MultiTerm_338_3_6()+ private boolean jj_3R_MultiTerm_340_3_6(){return false;}- private boolean jj_3R_MultiTerm_327_3_3()+ private boolean jj_3R_MultiTerm_329_3_3(){if (jj_scan_token(TERM)) return true;jj_lookingAhead = true;jj_semLA = getToken(1).kind == TERM && allowedPostMultiTerm(getToken(2).kind);jj_lookingAhead = false;- if (!jj_semLA || jj_3R_MultiTerm_338_3_6()) return true;+ if (!jj_semLA || jj_3R_MultiTerm_340_3_6()) return true;Token xsp;- if (jj_3R_MultiTerm_340_5_7()) return true;+ if (jj_3R_MultiTerm_342_5_7()) return true;while (true) {xsp = jj_scanpos;- if (jj_3R_MultiTerm_340_5_7()) { jj_scanpos = xsp; break; }+ if (jj_3R_MultiTerm_342_5_7()) { jj_scanpos = xsp; break; }+ }+ return false;+ }++ private boolean jj_3_3()+ {+ Token xsp;+ xsp = jj_scanpos;+ if (jj_3R_Clause_251_7_4()) {+ jj_scanpos = xsp;+ if (jj_3R_Clause_252_9_5()) return true;}return false;}@@ -774,7 +775,6 @@ if (splitOnWhitespace == false) {}/** Reinitialise. */- @Overridepublic void ReInit(CharStream stream) {token_source.ReInit(stream);token = new Token();@@ -836,7 +836,6 @@ if (splitOnWhitespace == false) {return this;}}- @SuppressWarnings("StaticAssignmentOfThrowable")static private final LookaheadSuccess jj_ls = new LookaheadSuccess();private boolean jj_scan_token(int kind) {if (jj_scanpos == jj_lastpos) {diff --git a/solr/core/src/java/org/apache/solr/parser/QueryParser.jj b/solr/core/src/java/org/apache/solr/parser/QueryParser.jjindex 8da3f81d9fe..25a3238dca3 100644--- a/solr/core/src/java/org/apache/solr/parser/QueryParser.jj+++ b/solr/core/src/java/org/apache/solr/parser/QueryParser.jj@@ -31,6 +31,7 @@ import java.util.Arrays;import java.util.HashSet;import java.util.List;import java.util.Set;+import javax.annotation.processing.Generated;import org.apache.lucene.analysis.Analyzer;import org.apache.lucene.search.BooleanClause;@@ -41,6 +42,7 @@ import org.apache.solr.search.QParser;import org.apache.lucene.queryparser.charstream.CharStream;import org.apache.lucene.queryparser.charstream.FastCharStream;+@Generated("JavaCC")public class QueryParser extends SolrQueryParserBase {/** The default operator for parsing queries.*/diff --git a/solr/core/src/java/org/apache/solr/parser/QueryParserTokenManager.java b/solr/core/src/java/org/apache/solr/parser/QueryParserTokenManager.javaindex fd4dba8e375..c07941dcf28 100644--- a/solr/core/src/java/org/apache/solr/parser/QueryParserTokenManager.java+++ b/solr/core/src/java/org/apache/solr/parser/QueryParserTokenManager.java@@ -1,7 +1,9 @@/* QueryParserTokenManager.java *//* Generated By:JavaCC: Do not edit this line. QueryParserTokenManager.java */package org.apache.solr.parser;- import org.apache.lucene.queryparser.charstream.CharStream;+import javax.annotation.processing.Generated;+import org.apache.lucene.queryparser.charstream.CharStream;+@@ -17,6 +19,7 @@ package org.apache.solr.parser;/** Token Manager. */+@Generated("JavaCC")@SuppressWarnings ("unused")public class QueryParserTokenManager implements QueryParserConstants {int commentNestingDepth ;