Validate xContentType in PutWatchRequest.

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transport/actions/put/PutWatchRequest.java

@@ -135,6 +135,9 @@ public ActionRequestValidationException validate() {
  if (source == null) {
  validationException = ValidateActions.addValidationError("watch source is missing", validationException);
  }
+ if (xContentType == null) {
+ validationException = ValidateActions.addValidationError("request body is missing", validationException);
+ }
  return validationException;
  }
 

x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.watcher.put_watch.json

@@ -25,7 +25,7 @@
  },
  "body": {
  "description" : "The watch",
- "required" : true
+ "required" : false
  }
  }
 }

x-pack/plugin/src/test/resources/rest-api-spec/test/watcher/put_watch/10_basic.yml

@@ -36,3 +36,16 @@
  }
  }
  - match: { _id: "my_watch" }
+
+---
+"Test empty body is rejected by put watch":
+ - do:
+ cluster.health:
+ wait_for_status: yellow
+
+ - do:
+ catch: bad_request
+ xpack.watcher.put_watch:
+ id: "my_watch"
+ - match: { error.root_cause.0.type: "action_request_validation_exception" }
+ - match: { error.root_cause.0.reason: "Validation Failed: 1: request body is missing;" }

x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/WatchRequestValidationTests.java

@@ -86,6 +86,12 @@ public void testPutWatchSourceNull() {
  assertThat(e.validationErrors(), hasItem("watch source is missing"));
  }
 
+ public void testPutWatchContentNull() {
+ ActionRequestValidationException e = new PutWatchRequest("foo", BytesArray.EMPTY, null).validate();
+ assertThat(e, is(notNullValue()));
+ assertThat(e.validationErrors(), hasItem("request body is missing"));
+ }
+
  public void testGetWatchInvalidWatchId() {
  ActionRequestValidationException e = new GetWatchRequest("id with whitespaces").validate();
  assertThat(e, is(notNullValue()));