Revert "Filter refactoring: Introduce toFilter() and fromXContent() i…

…n FilterBuilders and FilterParsers"

This reverts commit 580ef6f given that FilterBuilder and FilterParser are going away with #10985

Conflicts:
	src/main/java/org/elasticsearch/index/query/BaseFilterBuilder.java
	src/main/java/org/elasticsearch/index/query/BaseFilterParser.java
	src/main/java/org/elasticsearch/index/query/BaseFilterParserTemp.java
	src/main/java/org/elasticsearch/index/query/FilterWrappingFilterBuilder.java

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

@@ -71,9 +71,4 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
         }
         builder.endObject();
     }
-
-    @Override
-    protected String parserName() {
-        return AndFilterParser.NAME;
-    }
 }

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

@@ -34,7 +34,7 @@
 /**
  *
  */
-public class AndFilterParser extends BaseFilterParserTemp {
+public class AndFilterParser implements FilterParser {
 
     public static final String NAME = "and";
 

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

@@ -19,7 +19,6 @@
 
 package org.elasticsearch.index.query;
 
-import org.apache.lucene.search.Filter;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.xcontent.XContentBuilder;
@@ -28,6 +27,9 @@
 
 import java.io.IOException;
 
+/**
+ *
+ */
 public abstract class BaseFilterBuilder implements FilterBuilder {
 
     @Override
@@ -67,20 +69,4 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
     }
 
     protected abstract void doXContent(XContentBuilder builder, Params params) throws IOException;
-
-    /**
-     * Temporary default implementation for toFilter that parses the filter using its filter parser
-     */
-    //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.
-     * @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/BoolFilterBuilder.java

@@ -139,9 +139,4 @@ private void doXArrayContent(String field, List<FilterBuilder> clauses, XContent
             builder.endArray();
         }
     }
-
-    @Override
-    protected String parserName() {
-        return BoolFilterParser.NAME;
-    }
 }

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

@@ -31,7 +31,7 @@
 /**
  *
  */
-public class BoolFilterParser extends BaseFilterParserTemp {
+public class BoolFilterParser implements FilterParser {
 
     public static final String NAME = "bool";
 

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

@@ -46,10 +46,4 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
             builder.copyCurrentStructure(parser);
         }
     }
-
-    @Override
-    protected String parserName() {
-        //TODO this class is going to be removed, will disappear once we get #10919 in
-        throw new UnsupportedOperationException();
-    }
 }

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

@@ -56,9 +56,4 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
         }
         builder.endObject();
     }
-
-    @Override
-    protected String parserName() {
-        return ExistsFilterParser.NAME;
-    }
 }

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

@@ -39,7 +39,7 @@
 /**
  *
  */
-public class ExistsFilterParser extends BaseFilterParserTemp {
+public class ExistsFilterParser implements FilterParser {
 
     public static final String NAME = "exists";
 

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

@@ -31,7 +31,7 @@
  * The "fquery" filter is the same as the {@link QueryFilterParser} except that it allows also to
  * associate a name with the query filter.
  */
-public class FQueryFilterParser extends BaseFilterParserTemp {
+public class FQueryFilterParser implements FilterParser {
 
     public static final String NAME = "fquery";
 

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

@@ -19,24 +19,18 @@
 
 package org.elasticsearch.index.query;
 
-import org.apache.lucene.search.Filter;
+import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.xcontent.ToXContent;
 import org.elasticsearch.common.xcontent.XContentType;
 
-import java.io.IOException;
-
+/**
+ *
+ */
 public interface FilterBuilder extends ToXContent {
 
     BytesReference buildAsBytes();
 
     BytesReference buildAsBytes(XContentType contentType);
 
-    /**
-     * Converts this FilterBuilder to a lucene {@link Filter}
-     * @param parseContext additional information needed to construct the filter
-     * @return the {@link Filter}
-     * @throws IOException
-     */
-    Filter toFilter(QueryParseContext parseContext) throws IOException;
 }

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

@@ -43,18 +43,4 @@ public interface FilterParser {
     //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;
-
-    /**
-     * Creates a new {@link FilterBuilder} from the filter held by the {@link QueryParseContext}
-     * in {@link org.elasticsearch.common.xcontent.XContent} format
-     *
-     * @param parseContext
-     *            the input parse context. The state on the parser contained in
-     *            this context will be changed as a side effect of this method
-     *            call
-     * @return the new FilterBuilder
-     * @throws IOException
-     * @throws QueryParsingException
-     */
-    FilterBuilder fromXContent(QueryParseContext parseContext) throws IOException, QueryParsingException;
 }

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

@@ -175,9 +175,4 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
 
         builder.endObject();
     }
-
-    @Override
-    protected String parserName() {
-        return GeoBoundingBoxFilterParser.NAME;
-    }
 }

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

@@ -37,7 +37,7 @@
 /**
  *
  */
-public class GeoBoundingBoxFilterParser extends BaseFilterParserTemp {
+public class GeoBoundingBoxFilterParser implements FilterParser {
 
     public static final String TOP = "top";
     public static final String LEFT = "left";

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

@@ -120,9 +120,4 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
         }
         builder.endObject();
     }
-
-    @Override
-    protected String parserName() {
-        return GeoDistanceFilterParser.NAME;
-    }
 }

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

@@ -43,7 +43,7 @@
  * }
  * </pre>
  */
-public class GeoDistanceFilterParser extends BaseFilterParserTemp {
+public class GeoDistanceFilterParser implements FilterParser {
 
     public static final String NAME = "geo_distance";
 

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

@@ -159,9 +159,4 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
         }
         builder.endObject();
     }
-
-    @Override
-    protected String parserName() {
-        return GeoDistanceRangeFilterParser.NAME;
-    }
 }

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

@@ -43,7 +43,7 @@
  * }
  * </pre>
  */
-public class GeoDistanceRangeFilterParser extends BaseFilterParserTemp {
+public class GeoDistanceRangeFilterParser implements FilterParser {
 
     public static final String NAME = "geo_distance_range";
 

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

@@ -91,9 +91,4 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
 
         builder.endObject();
     }
-
-    @Override
-    protected String parserName() {
-        return GeoPolygonFilterParser.NAME;
-    }
 }

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

@@ -48,7 +48,7 @@
  * }
  * </pre>
  */
-public class GeoPolygonFilterParser extends BaseFilterParserTemp {
+public class GeoPolygonFilterParser implements FilterParser {
 
     public static final String NAME = "geo_polygon";
     public static final String POINTS = "points";

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

@@ -183,9 +183,4 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
 
         builder.endObject();
     }
-
-    @Override
-    protected String parserName() {
-        return GeoShapeFilterParser.NAME;
-    }
 }

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

@@ -59,7 +59,7 @@
  * }
  * </pre>
  */
-public class GeoShapeFilterParser extends BaseFilterParserTemp {
+public class GeoShapeFilterParser implements FilterParser {
 
     public static final String NAME = "geo_shape";