changed to bool must for filtered query builder

Author: Rahul Anishetty

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

@@ -69,25 +69,29 @@ public FilteredQueryBuilder queryName(String queryName) {
 
     @Override
     protected void doXContent(XContentBuilder builder, Params params) throws IOException {
-        builder.startObject(FilteredQueryParser.NAME);
-        if (queryBuilder != null) {
-            builder.field("query");
-            queryBuilder.toXContent(builder, params);
-        }
-        if (filterBuilder != null) {
-            if (ToXContentUtils.getVersionFromParams(params).onOrAfter(Version.V_5_0_0)) {
+        if (ToXContentUtils.getVersionFromParams(params).onOrAfter(Version.V_5_0_0)) {
+            if (queryBuilder != null)
+                QueryBuilders.boolQuery().must(queryBuilder).boost(boost).queryName(queryName).toXContent(builder, params);
+            if (filterBuilder != null) {
+                FilterBuilders.boolFilter().must(filterBuilder).toXContent(builder, params);
+            }
+        } else {
+            builder.startObject(FilteredQueryParser.NAME);
+            if (queryBuilder != null) {
                 builder.field("query");
-            } else {
+                queryBuilder.toXContent(builder, params);
+            }
+            if (filterBuilder != null) {
                 builder.field("filter");
+                filterBuilder.toXContent(builder, params);
             }
-            filterBuilder.toXContent(builder, params);
-        }
-        if (boost != -1) {
-            builder.field("boost", boost);
-        }
-        if (queryName != null) {
-            builder.field("_name", queryName);
+            if (boost != -1) {
+                builder.field("boost", boost);
+            }
+            if (queryName != null) {
+                builder.field("_name", queryName);
+            }
+            builder.endObject();
         }
-        builder.endObject();
     }
 }