From b861ec1cc00dcecb1d00a59799a8f56830030471 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20B=C3=BCscher?= <christoph@elastic.co>
Date: Mon, 25 Jul 2016 20:00:35 +0200
Subject: [PATCH] Allow empty json object in request body in `_count` API

When the request body is missing, all documents in the target index are counted.
As mentioned in #19422, the same should happen when the request body is an empty
json object. This is also the behaviour for the `_search` endpoint and the two
APIs should behave in the same way.
---
 .../index/query/QueryParseContext.java         |  3 ---
 .../rest-api-spec/test/count/10_basic.yaml     | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 3 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 510a8049630..33382a7ab73 100644
--- a/core/src/main/java/org/elasticsearch/index/query/QueryParseContext.java
+++ b/core/src/main/java/org/elasticsearch/index/query/QueryParseContext.java
@@ -73,9 +73,6 @@ public class QueryParseContext implements ParseFieldMatcherSupplier {
                     }
                 }
             }
-            if (queryBuilder == null) {
-                throw new ParsingException(parser.getTokenLocation(), "Required query is missing");
-            }
             return queryBuilder;
         } catch (ParsingException e) {
             throw e;
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/count/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/count/10_basic.yaml
index f3eb0a5fae6..f38d2c315eb 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/count/10_basic.yaml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/count/10_basic.yaml
@@ -37,6 +37,24 @@ setup:
 
   - match: {count : 0}
 
+---
+"count with empty body":
+# empty body should default to match_all query
+  - do:
+      count:
+        index: test
+        type: test
+        body: { }
+
+  - match: {count : 1}
+
+  - do:
+      count:
+        index: test
+        type: test
+
+  - match: {count : 1}
+
 ---
 "count body without query element":
   - do: