Change actual default of ignore_condition to false

Change default of ignore_codition to match docs as `false`.
Add test to verify defaults.

Fixes elastic/elasticsearch#348

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

rest-api-spec/test/execute_watch/20_empty_body.yaml

@@ -13,34 +13,12 @@
             "schedule" : { "cron" : "0 0/1 * * * ?" }
             },
             "input" : {
-              "search" : {
+              "simple" : {
-                "request" : {
+                "count" : 1
-                  "body" : {
-                    "query" : {
-                      "filtered": {
-                        "query": {
-                          "match": {
-                            "response": 404
-                          }
-                        },
-                        "filter": {
-                          "range": {
-                            "@timestamp" : {
-                              "from": "{{ctx.trigger.scheduled_time}}||-5m",
-                              "to": "{{ctx.trigger.triggered_time}}"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
               }
             },
             "condition" : {
-              "script" : {
+              "script" : "ctx.payload.count == 1"
-                "script" : "ctx.payload.hits.total > 1"
-              }
             },
             "actions" : {
               "Logging" : {
@@ -58,7 +36,7 @@
         body: null
 
   - match: { "watch_id": "my_logging_watch" }
-  - match: { "watch_execution.condition_result.always": {} }
+  - match: { "watch_execution.condition_result.script.met": true }
   - match: { "state": "executed" }
   - match: { "watch_execution.actions_results.Logging.logging.success" : true }
   - match: { "watch_execution.actions_results.Logging.logging.logged_text" : "foobar" }

src/main/java/org/elasticsearch/watcher/transport/actions/execute/ExecuteWatchRequest.java

@@ -22,7 +22,7 @@ import java.util.Set;
 public class ExecuteWatchRequest extends MasterNodeOperationRequest<ExecuteWatchRequest> {
 
     private String id;
-    private boolean ignoreCondition = true;
+    private boolean ignoreCondition = false;
     private boolean ignoreThrottle = false;
     private boolean recordExecution = false;
     private Map<String, Object> alternativeInput = null;

src/test/java/org/elasticsearch/watcher/execution/ManualExecutionTests.java

@@ -6,6 +6,8 @@
 package org.elasticsearch.watcher.execution;
 
 import com.carrotsearch.randomizedtesting.annotations.Repeat;
+import org.elasticsearch.common.joda.time.DateTime;
+import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.watcher.actions.logging.LoggingAction;
 import org.elasticsearch.watcher.client.WatchSourceBuilder;
@@ -14,6 +16,7 @@ import org.elasticsearch.watcher.history.HistoryStore;
 import org.elasticsearch.watcher.history.WatchRecord;
 import org.elasticsearch.watcher.input.simple.SimpleInput;
 import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTests;
+import org.elasticsearch.watcher.transport.actions.execute.ExecuteWatchResponse;
 import org.elasticsearch.watcher.transport.actions.get.GetWatchRequest;
 import org.elasticsearch.watcher.transport.actions.put.PutWatchRequest;
 import org.elasticsearch.watcher.transport.actions.put.PutWatchResponse;
@@ -23,6 +26,7 @@ import org.junit.Test;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
 import static org.elasticsearch.watcher.actions.ActionBuilders.loggingAction;
@@ -160,4 +164,45 @@ public class ManualExecutionTests extends AbstractWatcherIntegrationTests {
         assertThat(watchRecord1.execution().inputResult().payload().data().get("foo").toString(), equalTo("bar"));
         assertThat(watchRecord2.execution().inputResult().payload().data().get("foo"), instanceOf(Map.class));
     }
+
+    @Test
+    public void testExecutionRequestDefaults() throws Exception {
+        ensureWatcherStarted();
+        WatchRecord.Parser watchRecordParser = internalTestCluster().getInstance(WatchRecord.Parser.class);
+
+        WatchSourceBuilder watchBuilder = watchBuilder()
+                .trigger(schedule(cron("0 0 0 1 * ? 2099")))
+                .input(simpleInput("foo", "bar"))
+                .condition(neverCondition())
+                .throttlePeriod(new TimeValue(1, TimeUnit.HOURS))
+                .addAction("log", loggingAction("foobar"));
+        watcherClient().putWatch(new PutWatchRequest("_id", watchBuilder)).actionGet();
+
+        Wid wid = new Wid("_watchId",1,new DateTime());
+        ExecuteWatchResponse executeWatchResponse = watcherClient().prepareExecuteWatch().setId("_id").get();
+        WatchRecord watchRecord = watchRecordParser.parse(wid.value(), 1, executeWatchResponse.getWatchRecordSource());
+
+        assertThat(watchRecord.state(), equalTo(WatchRecord.State.EXECUTION_NOT_NEEDED));
+        assertThat(watchRecord.execution().inputResult().payload().data().get("foo").toString(), equalTo("bar"));
+
+        watchBuilder = watchBuilder()
+                .trigger(schedule(cron("0 0 0 1 * ? 2099")))
+                .input(simpleInput("foo", "bar"))
+                .condition(alwaysCondition())
+                .throttlePeriod(new TimeValue(1, TimeUnit.HOURS))
+                .addAction("log", loggingAction("foobar"));
+        watcherClient().putWatch(new PutWatchRequest("_id", watchBuilder)).actionGet();
+
+        executeWatchResponse = watcherClient().prepareExecuteWatch().setId("_id").setRecordExecution(true).get();
+        watchRecord = watchRecordParser.parse(wid.value(), 1, executeWatchResponse.getWatchRecordSource());
+
+        assertThat(watchRecord.state(), equalTo(WatchRecord.State.EXECUTED));
+        assertThat(watchRecord.execution().inputResult().payload().data().get("foo").toString(), equalTo("bar"));
+        assertThat(watchRecord.execution().actionsResults().get("log"), not(instanceOf(LoggingAction.Result.Simulated.class)));
+
+        executeWatchResponse = watcherClient().prepareExecuteWatch().setId("_id").get();
+        watchRecord = watchRecordParser.parse(wid.value(), 1, executeWatchResponse.getWatchRecordSource());
+
+        assertThat(watchRecord.state(), equalTo(WatchRecord.State.THROTTLED));
+    }
 }