Internal: remove unused method from QueryParseContext and add comments

This commit is contained in:
javanna 2015-08-31 12:05:46 +02:00 committed by Luca Cavanna
parent c41843afec
commit f624e350fb
1 changed files with 2 additions and 15 deletions

View File

@ -82,18 +82,6 @@ public class QueryParseContext {
return this.index; return this.index;
} }
/**
* @deprecated replaced by calls to parseInnerFilterToQueryBuilder(String queryName) for the resulting queries
*/
@Nullable
@Deprecated
//norelease should be possible to remove after refactoring all queries
public Query parseInnerFilter(String queryName) throws IOException, QueryShardException {
assert this.shardContext != null;
QueryBuilder builder = parseInnerFilterToQueryBuilder(queryName);
return (builder != null) ? builder.toQuery(this.shardContext) : null;
}
/** /**
* @deprecated replaced by calls to parseInnerFilterToQueryBuilder() for the resulting queries * @deprecated replaced by calls to parseInnerFilterToQueryBuilder() for the resulting queries
*/ */
@ -115,7 +103,7 @@ public class QueryParseContext {
*/ */
@Nullable @Nullable
@Deprecated @Deprecated
//norelease should be possible to remove after refactoring all queries //norelease this method will be removed once all queries are refactored
public Query parseInnerQuery() throws IOException, QueryShardException { public Query parseInnerQuery() throws IOException, QueryShardException {
QueryBuilder builder = parseInnerQueryBuilder(); QueryBuilder builder = parseInnerQueryBuilder();
Query result = null; Query result = null;
@ -170,7 +158,6 @@ public class QueryParseContext {
* is parsed to a filter * is parsed to a filter
* @throws IOException * @throws IOException
*/ */
@Nullable
//norelease setting and checking the isFilter Flag should completely be moved to toQuery/toFilter after query refactoring //norelease setting and checking the isFilter Flag should completely be moved to toQuery/toFilter after query refactoring
public QueryBuilder parseInnerFilterToQueryBuilder() throws IOException { public QueryBuilder parseInnerFilterToQueryBuilder() throws IOException {
final boolean originalIsFilter = this.shardContext.isFilter; final boolean originalIsFilter = this.shardContext.isFilter;
@ -183,7 +170,7 @@ public class QueryParseContext {
} }
//norelease setting and checking the isFilter Flag should completely be moved to toQuery/toFilter after query refactoring //norelease setting and checking the isFilter Flag should completely be moved to toQuery/toFilter after query refactoring
QueryBuilder parseInnerFilterToQueryBuilder(String queryName) throws IOException, QueryParsingException { public QueryBuilder parseInnerFilterToQueryBuilder(String queryName) throws IOException, QueryParsingException {
final boolean originalIsFilter = this.shardContext.isFilter; final boolean originalIsFilter = this.shardContext.isFilter;
try { try {
this.shardContext.isFilter = true; this.shardContext.isFilter = true;