Note that QueryParser is not thread-safe.
+ *Note that QueryParser is not thread-safe.
* - * @deprecated use the equivalent class defined in the new queryparser project, - * currently located in contrib: org.apache.lucene.queryParser.original.OriginalQueryParserHelper + *NOTE: there is a new QueryParser in contrib, which matches + * the same syntax as this class, but is more modular, + * enabling substantial customization to how a query is created. */ public class QueryParser implements QueryParserConstants { @@ -1584,6 +1585,16 @@ finally { jj_save(0, xla); } } + private boolean jj_3_1() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_2()) { + jj_scanpos = xsp; + if (jj_3R_3()) return true; + } + return false; + } + private boolean jj_3R_3() { if (jj_scan_token(STAR)) return true; if (jj_scan_token(COLON)) return true; @@ -1596,16 +1607,6 @@ return false; } - private boolean jj_3_1() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_2()) { - jj_scanpos = xsp; - if (jj_3R_3()) return true; - } - return false; - } - /** Generated Token Manager. */ public QueryParserTokenManager token_source; /** Current token. */ Index: src/java/org/apache/lucene/queryParser/QueryParser.jj =================================================================== --- src/java/org/apache/lucene/queryParser/QueryParser.jj (revision 803660) +++ src/java/org/apache/lucene/queryParser/QueryParser.jj (working copy) @@ -121,10 +121,10 @@ *
* *Note that QueryParser is not thread-safe.
- * - * @deprecated use the equivalent class defined in the new queryparser project, - * currently located in contrib: org.apache.lucene.queryParser.original.LuceneQueryParserHelper - * + * + *NOTE: there is a new QueryParser in contrib, which matches + * the same syntax as this class, but is more modular, + * enabling substantial customization to how a query is created. */ public class QueryParser { Index: src/java/org/apache/lucene/queryParser/FastCharStream.java =================================================================== --- src/java/org/apache/lucene/queryParser/FastCharStream.java (revision 803660) +++ src/java/org/apache/lucene/queryParser/FastCharStream.java (working copy) @@ -25,9 +25,6 @@ * this does not do line-number counting, but instead keeps track of the * character position of the token in the input, as required by Lucene's {@link * org.apache.lucene.analysis.Token} API. - * - * @deprecated this class will be removed in Lucene 3.0, when the {@link QueryParser} is removed - * * */ public final class FastCharStream implements CharStream { char[] buffer = null; Index: src/java/org/apache/lucene/queryParser/CharStream.java =================================================================== --- src/java/org/apache/lucene/queryParser/CharStream.java (revision 803660) +++ src/java/org/apache/lucene/queryParser/CharStream.java (working copy) @@ -15,8 +15,6 @@ * column number and the String that constitutes a token and are not used * by the lexer. Hence their implementation won't affect the generated lexer's * operation. - * - * @deprecated this class will be removed in Lucene 3.0, when the {@link QueryParser} is removed */ public interface CharStream { Index: src/java/org/apache/lucene/queryParser/ParseException.java =================================================================== --- src/java/org/apache/lucene/queryParser/ParseException.java (revision 803660) +++ src/java/org/apache/lucene/queryParser/ParseException.java (working copy) @@ -10,9 +10,6 @@ * * You can modify this class to customize your error reporting * mechanisms so long as you retain the public fields. - * - * @deprecated use the equivalent class defined in the new queryparser project, - * currently located in contrib: org.apache.lucene.queryParser.original.parser.ParseException */ public class ParseException extends Exception { Index: src/java/org/apache/lucene/queryParser/QueryParserTokenManager.java =================================================================== --- src/java/org/apache/lucene/queryParser/QueryParserTokenManager.java (revision 803660) +++ src/java/org/apache/lucene/queryParser/QueryParserTokenManager.java (working copy) @@ -34,11 +34,7 @@ import org.apache.lucene.search.WildcardQuery; import org.apache.lucene.util.Parameter; -/** Token Manager. - * - * @deprecated use the equivalent class defined in the new queryparser project, - * currently located in contrib: org.apache.lucene.queryParser.original.parser.TextParserTokenManager - */ +/** Token Manager. */ public class QueryParserTokenManager implements QueryParserConstants { Index: src/java/org/apache/lucene/queryParser/package.html =================================================================== --- src/java/org/apache/lucene/queryParser/package.html (revision 803660) +++ src/java/org/apache/lucene/queryParser/package.html (working copy) @@ -20,7 +20,6 @@
-NOTE: Please look into lucene contrib/queryparser for the new flexible queryparser api. A simple query parser implemented with JavaCC.Note that JavaCC defines lots of public classes, methods and fields @@ -28,5 +27,9 @@ Sorry.
Note that because JavaCC defines a class named Token, org.apache.lucene.analysis.Token must always be fully qualified in source code in this package. + +
NOTE: contrib/queryparser has an alternative queryparser that matches the syntax of this one, but is more modular, +enabling substantial customization to how a query is created. +