Use //norelease comments for temporary methods that will be removed once we move to parsing search requests on the coordinating node

Author: javanna

src/main/java/org/elasticsearch/index/query/BaseFilterBuilder.java

@@ -70,17 +70,17 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
 
     /**
      * Temporary default implementation for toFilter that parses the filter using its filter parser
-     * Will be removed once all filters override toFilter with their own specific implementation.
      */
+    //norelease to be removed once all filter builders override toFilter providing their own specific implementation.
     @Override
     public Filter toFilter(QueryParseContext parseContext) throws IOException {
         return parseContext.indexQueryParserService().filterParser(parserName()).parse(parseContext);
     }
 
     /**
      * Temporary method that allows to retrieve the parser for each filter.
-     * Won't be needed anymore once all filter builders properly implement {@link #toFilter(QueryParseContext)}
      * @return the name of the parser class the default {@link #toFilter(QueryParseContext)} method delegates to
      */
+    //norelease to be removed once all filter builders override toFilter providing their own specific implementation.
     protected abstract String parserName();
 }

src/main/java/org/elasticsearch/index/query/BaseFilterParser.java

@@ -24,11 +24,12 @@
 import java.io.IOException;
 
 /**
- * Class used during the filter parsers refactoring.
+ * Class used during the filter parsers refactoring. Will be removed once we can parse search requests on the coordinating node.
  * All filter parsers that have a refactored "fromXContent" method can be changed to extend this instead of {@link BaseFilterParserTemp}.
  * Keeps old {@link FilterParser#parse(QueryParseContext)} method as a stub delegating to
  * {@link FilterParser#fromXContent(QueryParseContext)} and {@link FilterBuilder#toFilter(QueryParseContext)}}
  */
+//norelease needs to be removed once we parse search requests on the coordinating node, as the parse method is not needed anymore at that point.
 public abstract class BaseFilterParser implements FilterParser {
 
     @Override

src/main/java/org/elasticsearch/index/query/BaseFilterParserTemp.java

@@ -27,8 +27,8 @@
  * This class with method impl is an intermediate step in the filter parsers refactoring.
  * Provides a fromXContent default implementation for filter parsers that don't have yet a
  * specific fromXContent implementation that returns a FilterBuilder.
- * To be removed once all filters are moved over to extend {@link BaseFilterParser}.
  */
+//norelease to be removed once all filters are moved over to extend BaseFilterParser
 public abstract class BaseFilterParserTemp implements FilterParser {
 
     @Override

src/main/java/org/elasticsearch/index/query/BaseQueryBuilder.java

@@ -71,17 +71,17 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
 
     /**
      * Temporary default implementation for toQuery that parses the query using its query parser
-     * Will be removed once all queries override toQuery with their own specific implementation.
      */
+    //norelease to be removed once all query builders override toQuery providing their own specific implementation.
     public Query toQuery(QueryParseContext parseContext) throws QueryParsingException, IOException {
         return parseContext.indexQueryParserService().queryParser(parserName()).parse(parseContext);
     }
 
     /**
      * Temporary method that allows to retrieve the parser for each query.
-     * Won't be needed anymore once all query builders properly implement {@link #toQuery(QueryParseContext)}
      * @return the name of the parser class the default {@link #toQuery(QueryParseContext)} method delegates to
      */
+    //norelease to be removed once all query builders override toQuery providing their own specific implementation.
     protected abstract String parserName();
 
     protected abstract void doXContent(XContentBuilder builder, Params params) throws IOException;

src/main/java/org/elasticsearch/index/query/BaseQueryParser.java

@@ -24,11 +24,12 @@
 import java.io.IOException;
 
 /**
- * Class used during the query parsers refactoring.
+ * Class used during the query parsers refactoring. Will be removed once we can parse search requests on the coordinating node.
  * All query parsers that have a refactored "fromXContent" method can be changed to extend this instead of {@link BaseQueryParserTemp}.
  * Keeps old {@link QueryParser#parse(QueryParseContext)} method as a stub delegating to
  * {@link QueryParser#fromXContent(QueryParseContext)} and {@link QueryBuilder#toQuery(QueryParseContext)}}
  */
+//norelease needs to be removed once we parse search requests on the coordinating node, as the parse method is not needed anymore at that point.
 public abstract class BaseQueryParser implements QueryParser {
 
     @Override

src/main/java/org/elasticsearch/index/query/BaseQueryParserTemp.java

@@ -27,8 +27,8 @@
  * This class with method impl is an intermediate step in the query parsers refactoring.
  * Provides a fromXContent default implementation for query parsers that don't have yet a
  * specific fromXContent implementation that returns a QueryBuilder.
- * To be removed once all filters are moved over to extend {@link BaseQueryParser}.
  */
+//norelease to be removed once all queries are moved over to extend BaseQueryParser
 public abstract class BaseQueryParserTemp implements QueryParser {
 
     @Override

src/main/java/org/elasticsearch/index/query/FilterParser.java

@@ -24,9 +24,6 @@
 
 import java.io.IOException;
 
-/**
- *
- */
 public interface FilterParser {
 
     /**
@@ -43,6 +40,7 @@ public interface FilterParser {
      * it exists within a must clause or a must_not bool clause (that is why returning MATCH_ALL will
      * not be good, since it will not match anything when returned within a must_not clause).
      */
+    //norelease can be removed in favour of fromXContent once search requests can be parsed on the coordinating node
     @Nullable
     Filter parse(QueryParseContext parseContext) throws IOException, QueryParsingException;
 

src/main/java/org/elasticsearch/index/query/FilterWrappingFilterBuilder.java

@@ -27,8 +27,8 @@
 /**
  * FilterBuilder implementation that  holds a lucene filter, which can be returned by {@link #toFilter(QueryParseContext)}.
  * Doesn't support conversion to {@link org.elasticsearch.common.xcontent.XContent} via {@link #doXContent(XContentBuilder, Params)}.
- * Will be removed once all filters support separate fromXContent and toFilter methods.
  */
+//norelease to be removed once all queries support separate fromXContent and toQuery methods
 public class FilterWrappingFilterBuilder extends BaseFilterBuilder {
 
     private final Filter filter;

src/main/java/org/elasticsearch/index/query/QueryParser.java

@@ -42,6 +42,7 @@ public interface QueryParser {
      * Returns <tt>null</tt> if this query should be ignored in the context of
      * the DSL.
      */
+    //norelease can be removed in favour of fromXContent once search requests can be parsed on the coordinating node
     @Nullable
     Query parse(QueryParseContext parseContext) throws IOException, QueryParsingException;
 

src/main/java/org/elasticsearch/index/query/QueryWrappingQueryBuilder.java

@@ -27,8 +27,8 @@
 /**
  * QueryBuilder implementation that  holds a lucene query, which can be returned by {@link #toQuery(QueryParseContext)}.
  * Doesn't support conversion to {@link org.elasticsearch.common.xcontent.XContent} via {@link #doXContent(XContentBuilder, Params)}.
- * Will be removed once all queries support separate fromXContent and toQuery methods.
  */
+//norelease to be removed once all queries support separate fromXContent and toQuery methods
 public class QueryWrappingQueryBuilder extends BaseQueryBuilder {
 
     private Query query;