From f624e350fb60386e54d54937ac91b88364388011 Mon Sep 17 00:00:00 2001 From: javanna Date: Mon, 31 Aug 2015 12:05:46 +0200 Subject: [PATCH] Internal: remove unused method from QueryParseContext and add comments --- .../index/query/QueryParseContext.java | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/core/src/main/java/org/elasticsearch/index/query/QueryParseContext.java b/core/src/main/java/org/elasticsearch/index/query/QueryParseContext.java index 73b9055f855..a8e055f36ab 100644 --- a/core/src/main/java/org/elasticsearch/index/query/QueryParseContext.java +++ b/core/src/main/java/org/elasticsearch/index/query/QueryParseContext.java @@ -82,18 +82,6 @@ public class QueryParseContext { 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 */ @@ -115,7 +103,7 @@ public class QueryParseContext { */ @Nullable @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 { QueryBuilder builder = parseInnerQueryBuilder(); Query result = null; @@ -170,7 +158,6 @@ public class QueryParseContext { * is parsed to a filter * @throws IOException */ - @Nullable //norelease setting and checking the isFilter Flag should completely be moved to toQuery/toFilter after query refactoring public QueryBuilder parseInnerFilterToQueryBuilder() throws IOException { 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 - QueryBuilder parseInnerFilterToQueryBuilder(String queryName) throws IOException, QueryParsingException { + public QueryBuilder parseInnerFilterToQueryBuilder(String queryName) throws IOException, QueryParsingException { final boolean originalIsFilter = this.shardContext.isFilter; try { this.shardContext.isFilter = true;