[CCR] Resume follow Api should not require a request body (#37217)

Closes #37022
elastic · Jan 10, 2019 · 1a41d84 · 1a41d84
1 parent eb12de5
commit 1a41d84
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/x-pack/plugin/ccr/qa/rest/src/test/resources/rest-api-spec/test/ccr/follow_and_unfollow.yml b/x-pack/plugin/ccr/qa/rest/src/test/resources/rest-api-spec/test/ccr/follow_and_unfollow.yml
@@ -52,7 +52,6 @@
   - do:
       ccr.resume_follow:
         index: bar
-        body: {}
   - is_true: acknowledged
 
   - do:

diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/rest/RestResumeFollowAction.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/rest/RestResumeFollowAction.java
@@ -37,8 +37,14 @@ protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient
     }
 
     static Request createRequest(RestRequest restRequest) throws IOException {
-        try (XContentParser parser = restRequest.contentOrSourceParamParser()) {
-            return Request.fromXContent(parser, restRequest.param("index"));
+        if (restRequest.hasContentOrSourceParam()) {
+            try (XContentParser parser = restRequest.contentOrSourceParamParser()) {
+                return Request.fromXContent(parser, restRequest.param("index"));
+            }
+        } else {
+            Request request = new Request();
+            request.setFollowerIndex(restRequest.param("index"));
+            return request;
         }
     }
 }
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/ccr.resume_follow.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/ccr.resume_follow.json
@@ -15,7 +15,7 @@
     },
     "body": {
       "description" : "The name of the leader index and other optional ccr related parameters",
-      "required" : true
+      "required" : false
     }
   }
 }