Move request validation into the constructor.

Author: jtibshirani

client/rest-high-level/src/main/java/org/elasticsearch/client/watcher/AckWatchRequest.java

@@ -24,7 +24,6 @@
 import org.elasticsearch.protocol.xpack.watcher.PutWatchRequest;
 
 import java.util.Locale;
-import java.util.Optional;
 
 /**
  * A request to explicitly acknowledge a watch.
@@ -35,29 +34,13 @@ public class AckWatchRequest implements Validatable {
     private final String[] actionIds;
 
     public AckWatchRequest(String watchId, String... actionIds) {
+        validateIds(watchId, actionIds);
         this.watchId = watchId;
         this.actionIds = actionIds;
     }
 
-    /**
-     * @return The ID of the watch to be acked.
-     */
-    public String getWatchId() {
-        return watchId;
-    }
-
-    /**
-     * @return The IDs of the actions to be acked. If omitted,
-     * all actions for the given watch will be acknowledged.
-     */
-    public String[] getActionIds() {
-        return actionIds;
-    }
-
-    @Override
-    public Optional<ValidationException> validate() {
+    private void validateIds(String watchId, String... actionIds) {
         ValidationException exception = new ValidationException();
-
         if (watchId == null) {
             exception.addValidationError("watch id is missing");
         } else if (PutWatchRequest.isValidId(watchId) == false) {
@@ -75,9 +58,24 @@ public Optional<ValidationException> validate() {
             }
         }
 
-        return !exception.validationErrors().isEmpty()
-            ? Optional.of(exception)
-            : Optional.empty();
+        if (!exception.validationErrors().isEmpty()) {
+            throw exception;
+        }
+    }
+
+    /**
+     * @return The ID of the watch to be acked.
+     */
+    public String getWatchId() {
+        return watchId;
+    }
+
+    /**
+     * @return The IDs of the actions to be acked. If omitted,
+     * all actions for the given watch will be acknowledged.
+     */
+    public String[] getActionIds() {
+        return actionIds;
     }
 
     @Override

client/rest-high-level/src/test/java/org/elasticsearch/client/watcher/WatchRequestValidationTests.java

@@ -36,15 +36,15 @@
 public class WatchRequestValidationTests extends ESTestCase {
 
     public void testAcknowledgeWatchInvalidWatchId()  {
-        Optional<ValidationException> e = new AckWatchRequest("id with whitespaces").validate();
-        assertTrue(e.isPresent());
-        assertThat(e.get().validationErrors(), hasItem("watch id contains whitespace"));
+        ValidationException e = expectThrows(ValidationException.class,
+            () ->  new AckWatchRequest("id with whitespaces"));
+        assertThat(e.validationErrors(), hasItem("watch id contains whitespace"));
     }
 
     public void testAcknowledgeWatchInvalidActionId() {
-        Optional<ValidationException> e = new AckWatchRequest("_id", "action id with whitespaces").validate();
-        assertTrue(e.isPresent());
-        assertThat(e.get().validationErrors(), hasItem("action id [action id with whitespaces] contains whitespace"));
+        ValidationException e = expectThrows(ValidationException.class,
+            () -> new AckWatchRequest("_id", "action id with whitespaces"));
+        assertThat(e.validationErrors(), hasItem("action id [action id with whitespaces] contains whitespace"));
     }
 
     public void testAcknowledgeWatchNullActionArray() {
@@ -55,9 +55,9 @@ public void testAcknowledgeWatchNullActionArray() {
     }
 
     public void testAcknowledgeWatchNullActionId() {
-        Optional<ValidationException> e = new AckWatchRequest("_id", new String[] {null}).validate();
-        assertTrue(e.isPresent());
-        assertThat(e.get().validationErrors(), hasItem("action id may not be null"));
+        ValidationException e = expectThrows(ValidationException.class,
+            () ->  new AckWatchRequest("_id", new String[] {null}));
+        assertThat(e.validationErrors(), hasItem("action id may not be null"));
     }
 
     public void testDeleteWatchInvalidWatchId() {