Revert adding FQueryFilterBuilder

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

@@ -39,7 +39,7 @@ public FQueryFilterParser() {
 
     @Override
     public String[] names() {
-        return new String[]{FQueryFilterBuilder.NAME};
+        return new String[]{QueryFilterBuilder.FQUERY_NAME};
     }
 
     @Override

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

@@ -29,25 +29,48 @@
  *             query as a filter directly.
  */
 @Deprecated
-public class QueryFilterBuilder extends QueryBuilder<QueryFilterBuilder> {
+public class QueryFilterBuilder extends QueryBuilder {
 
     public static final String NAME = "query";
 
-    private final QueryBuilder<?> queryBuilder;
+    // this query builder creates query parsed by FQueryFilterParser in case queryName is set
+    public static final String FQUERY_NAME = "fquery";
+
+    private final QueryBuilder queryBuilder;
+
+    private String queryName;
 
     /**
      * A filter that simply wraps a query.
      *
      * @param queryBuilder The query to wrap as a filter
      */
-    public QueryFilterBuilder(QueryBuilder<?> queryBuilder) {
+    public QueryFilterBuilder(QueryBuilder queryBuilder) {
         this.queryBuilder = queryBuilder;
     }
 
+    /**
+     * Sets the query name for the filter that can be used when searching for matched_filters per hit.
+     */
+    public QueryFilterBuilder queryName(String queryName) {
+        this.queryName = queryName;
+        return this;
+    }
+
     @Override
     protected void doXContent(XContentBuilder builder, Params params) throws IOException {
+        if (queryName == null) {
             builder.field(NAME);
             queryBuilder.toXContent(builder, params);
+        } else {
+            builder.startObject(FQUERY_NAME);
+            builder.field("query");
+            queryBuilder.toXContent(builder, params);
+            if (queryName != null) {
+                builder.field("_name", queryName);
+            }
+            builder.endObject();
+        }
     }
 
     @Override