Move validation

Author: jasontedor

server/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeRequest.java

@@ -80,9 +80,7 @@ public ActionRequestValidationException validate() {
         if (type == ResizeType.SPLIT && IndexMetaData.INDEX_NUMBER_OF_SHARDS_SETTING.exists(targetIndexRequest.settings()) == false) {
             validationException = addValidationError("index.number_of_shards is required for split operations", validationException);
         }
-        if (copySettings != null && copySettings == false) {
-            validationException = addValidationError("[copySettings] can not be explicitly set to [false]", validationException);
-        }
+        assert copySettings == null || copySettings;
         return validationException;
     }
 
@@ -197,6 +195,9 @@ public ResizeType getResizeType() {
     }
 
     public void setCopySettings(final Boolean copySettings) {
+        if (copySettings != null && copySettings == false) {
+            throw new IllegalArgumentException("[copySettings] can not be explicitly set to [false]");
+        }
         this.copySettings = copySettings;
     }
 

server/src/test/java/org/elasticsearch/action/admin/indices/shrink/ResizeRequestTests.java

@@ -19,7 +19,6 @@
 
 package org.elasticsearch.action.admin.indices.shrink;
 
-import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.admin.indices.alias.Alias;
 import org.elasticsearch.action.admin.indices.create.CreateIndexRequest;
 import org.elasticsearch.action.admin.indices.create.CreateIndexRequestTests;
@@ -30,36 +29,34 @@
 import org.elasticsearch.index.RandomCreateIndexGenerator;
 import org.elasticsearch.test.ESTestCase;
 import org.elasticsearch.test.hamcrest.ElasticsearchAssertions;
-import org.junit.Assert;
 
 import java.io.IOException;
 import java.util.function.Consumer;
+import java.util.function.Supplier;
 
 import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF_SHARDS;
 import static org.elasticsearch.common.xcontent.ToXContent.EMPTY_PARAMS;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.hasToString;
 
 public class ResizeRequestTests extends ESTestCase {
 
     public void testCopySettingsValidation() {
-        runTestCopySettingsValidation(false, e -> {
-            assertNotNull(e);
-            assertThat(e.validationErrors(), hasSize(1));
-            assertThat(e.validationErrors().get(0), equalTo("[copySettings] can not be explicitly set to [false]"));
+        runTestCopySettingsValidation(false, r -> {
+            final IllegalArgumentException e = expectThrows(IllegalArgumentException.class, r::get);
+            assertThat(e, hasToString(containsString("[copySettings] can not be explicitly set to [false]")));
         });
 
-        runTestCopySettingsValidation(null, Assert::assertNull);
-        runTestCopySettingsValidation(true, Assert::assertNull);
+        runTestCopySettingsValidation(null, r -> assertNull(r.get().getCopySettings()));
+        runTestCopySettingsValidation(true, r -> assertTrue(r.get().getCopySettings()));
     }
 
-    private void runTestCopySettingsValidation(final Boolean copySettings, final Consumer<ActionRequestValidationException> consumer) {
-        final ResizeRequest request = new ResizeRequest();
-        request.setSourceIndex("source");
-        request.setTargetIndex(new CreateIndexRequest("target"));
-        request.setCopySettings(copySettings);
-        final ActionRequestValidationException e = request.validate();
-        consumer.accept(e);
+    private void runTestCopySettingsValidation(final Boolean copySettings, final Consumer<Supplier<ResizeRequest>> consumer) {
+        consumer.accept(() -> {
+            final ResizeRequest request = new ResizeRequest();
+            request.setCopySettings(copySettings);
+            return request;
+        });
     }
 
     public void testToXContent() throws IOException {