Merge branch 'master' into enhancement/use_shard_bulk_for_single_ops

Original commit: elastic/x-pack-elasticsearch@23761f3e16

elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/support/search/WatcherSearchTemplateService.java

@@ -74,8 +74,7 @@ public class WatcherSearchTemplateService extends AbstractComponent {
         BytesReference source = request.getSearchSource();
         if (source != null && source.length() > 0) {
             try (XContentParser parser = XContentFactory.xContent(source).createParser(xContentRegistry, source)) {
-                sourceBuilder.parseXContent(new QueryParseContext(parser, parseFieldMatcher),
+                sourceBuilder.parseXContent(new QueryParseContext(parser, parseFieldMatcher));
-                        searchRequestParsers.suggesters);
                 searchRequest.source(sourceBuilder);
             }
         }

elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/test/integration/SearchInputTests.java

@@ -144,7 +144,7 @@ public class SearchInputTests extends ESIntegTestCase {
         XContentParser parser = createParser(builder);
         parser.nextToken();
 
-        SearchRequestParsers searchParsers = new SearchRequestParsers(null);
+        SearchRequestParsers searchParsers = new SearchRequestParsers();
         SearchInputFactory factory = new SearchInputFactory(Settings.EMPTY, WatcherClientProxy.of(client()),
                                                             searchParsers, xContentRegistry(), scriptService());
 

elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchTests.java

@@ -288,7 +288,7 @@ public class WatchTests extends ESTestCase {
         ActionRegistry actionRegistry = registry(Collections.emptyList(), conditionRegistry, transformRegistry);
         Watch.Parser watchParser = new Watch.Parser(settings, triggerService, actionRegistry, inputRegistry, null, Clock.systemUTC());
 
-        SearchRequestParsers searchParsers = new SearchRequestParsers(null);
+        SearchRequestParsers searchParsers = new SearchRequestParsers();
         WatcherSearchTemplateService searchTemplateService = new WatcherSearchTemplateService(settings, scriptService, searchParsers,
                 xContentRegistry());
 
@@ -409,7 +409,7 @@ public class WatchTests extends ESTestCase {
         Map<String, InputFactory> parsers = new HashMap<>();
         switch (inputType) {
             case SearchInput.TYPE:
-                SearchRequestParsers searchParsers = new SearchRequestParsers(null);
+                SearchRequestParsers searchParsers = new SearchRequestParsers();
                 parsers.put(SearchInput.TYPE, new SearchInputFactory(settings, client, searchParsers, xContentRegistry(), scriptService));
                 return new InputRegistry(Settings.EMPTY, parsers);
             default:
@@ -457,7 +457,7 @@ public class WatchTests extends ESTestCase {
     }
 
     private TransformRegistry transformRegistry() {
-        SearchRequestParsers searchParsers = new SearchRequestParsers(null);
+        SearchRequestParsers searchParsers = new SearchRequestParsers();
         Map<String, TransformFactory> factories = new HashMap<>();
         factories.put(ScriptTransform.TYPE, new ScriptTransformFactory(settings, scriptService));
         factories.put(SearchTransform.TYPE, new SearchTransformFactory(settings, client, searchParsers, xContentRegistry(), scriptService));

qa/smoke-test-watcher/src/test/java/org/elasticsearch/smoketest/PreventFailingBuildIT.java

@@ -0,0 +1,19 @@
+/*
+ * 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.smoketest;
+
+import org.elasticsearch.test.ESIntegTestCase;
+
+public class PreventFailingBuildIT extends ESIntegTestCase {
+
+    public void testSoThatTestsDoNotFail() {
+        // Noop
+
+        // This is required because SmokeTestWatcherClientYamlTestSuiteIT
+        // requires network access, so if network tests are not enable no
+        // tests will be run in the entire project and all tests will fail.
+    }
+}