Watcher: Allow execute Watch API fields in request params

In order to have a shortcut for the execution of a watch and
specifying the record_execution and ignore_condition booleans,
so are now supported in the HTTP request parameters as well.

Closes elastic/elasticsearch#918

Original commit: elastic/x-pack-elasticsearch@bed5da40b7

elasticsearch/x-pack/src/main/plugin-metadata/org/elasticsearch/watcher/rest/action/RestExecuteWatchActionTest.java

@@ -0,0 +1,76 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+package org.elasticsearch.watcher.rest.action;
+
+import com.google.common.collect.Lists;
+import org.elasticsearch.client.Client;
+import org.elasticsearch.common.bytes.BytesArray;
+import org.elasticsearch.common.bytes.BytesReference;
+import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.rest.RestChannel;
+import org.elasticsearch.rest.RestController;
+import org.elasticsearch.test.ESTestCase;
+import org.elasticsearch.test.rest.FakeRestRequest;
+import org.elasticsearch.watcher.client.WatcherClient;
+import org.elasticsearch.watcher.support.xcontent.WatcherParams;
+import org.elasticsearch.watcher.transport.actions.execute.ExecuteWatchRequestBuilder;
+import org.elasticsearch.watcher.trigger.TriggerService;
+
+import static org.hamcrest.core.Is.is;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class RestExecuteWatchActionTest extends ESTestCase {
+
+    private RestController restController = mock(RestController.class);
+    private Client client = mock(Client.class);
+    private TriggerService triggerService = mock(TriggerService.class);
+    private RestChannel restChannel = mock(RestChannel.class);
+    private WatcherClient watcherClient = mock(WatcherClient.class);
+
+    public void testThatFlagsCanBeSpecifiedViaParameters() throws Exception {
+
+        String randomId = randomAsciiOfLength(10);
+        for (String recordExecution : Lists.newArrayList("true", "false", null)) {
+            for (String ignoreCondition : Lists.newArrayList("true", "false", null)) {
+                for (String debugCondition : Lists.newArrayList("true", "false", null)) {
+                    ExecuteWatchRequestBuilder builder = new ExecuteWatchRequestBuilder(client);
+                    when(watcherClient.prepareExecuteWatch()).thenReturn(builder);
+
+                    RestExecuteWatchAction restExecuteWatchAction = new RestExecuteWatchAction(Settings.EMPTY, restController, client, triggerService);
+                    restExecuteWatchAction.handleRequest(createFakeRestRequest(randomId, recordExecution, ignoreCondition, debugCondition), restChannel, watcherClient);
+
+                    assertThat(builder.request().getId(), is(randomId));
+                    assertThat(builder.request().isRecordExecution(), is(Boolean.parseBoolean(recordExecution)));
+                    assertThat(builder.request().isIgnoreCondition(), is(Boolean.parseBoolean(ignoreCondition)));
+                    assertThat(builder.request().isDebug(), is(Boolean.parseBoolean(debugCondition)));
+                }
+            }
+        }
+    }
+
+    private FakeRestRequest createFakeRestRequest(String randomId, String recordExecution, String ignoreCondition, String debugCondition) {
+        FakeRestRequest restRequest = new FakeRestRequest() {
+            @Override
+            public boolean hasContent() {
+                return true;
+            }
+
+            @Override
+            public BytesReference content() {
+                return new BytesArray("{}");
+            }
+        };
+
+        restRequest.params().put("id", randomId);
+        // make sure we test true/false/no params
+        if (recordExecution != null) restRequest.params().put("record_execution", recordExecution);
+        if (ignoreCondition != null) restRequest.params().put("ignore_condition", ignoreCondition);
+        if (debugCondition != null) restRequest.params().put("debug", debugCondition);
+
+        return restRequest;
+    }
+}

elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/rest/action/RestExecuteWatchAction.java

@@ -68,15 +68,15 @@ public class RestExecuteWatchAction extends WatcherRestHandler {
     private ExecuteWatchRequest parseRequest(RestRequest request, WatcherClient client) throws IOException {
         ExecuteWatchRequestBuilder builder = client.prepareExecuteWatch();
         builder.setId(request.param("id"));
-
+        builder.setDebug(WatcherParams.debug(request));
-        if (WatcherParams.debug(request)) {
-            builder.setDebug(true);
-        }
 
         if (request.content() == null || request.content().length() == 0) {
             return builder.request();
         }
 
+        builder.setRecordExecution(request.paramAsBoolean(Field.RECORD_EXECUTION.getPreferredName(), builder.request().isRecordExecution()));
+        builder.setIgnoreCondition(request.paramAsBoolean(Field.IGNORE_CONDITION.getPreferredName(), builder.request().isIgnoreCondition()));
+
         XContentParser parser = XContentHelper.createParser(request.content());
         parser.nextToken();