deprecate types for watcher

x-pack/plugin/src/test/resources/rest-api-spec/test/watcher/ack_watch/10_basic.yml

@@ -25,8 +25,7 @@
             "actions": {
               "test_index": {
                 "index": {
-                  "index": "test",
-                  "doc_type": "test2"
+                  "index": "test"
                 }
               }
             }

x-pack/plugin/src/test/resources/rest-api-spec/test/watcher/ack_watch/20_ack_individual_action.yml

@@ -25,8 +25,7 @@
             "actions": {
               "test_index": {
                 "index": {
-                  "index": "test",
-                  "doc_type": "test2"
+                  "index": "test"
                 }
               }
             }

x-pack/plugin/src/test/resources/rest-api-spec/test/watcher/ack_watch/30_reset_ack_after_unmet_condition.yml

@@ -38,7 +38,6 @@ teardown:
               "indexme" : {
                 "index" : {
                   "index" : "my_test_index",
-                  "doc_type" : "my-type",
                   "doc_id": "my-id"
                 }
               }

x-pack/plugin/src/test/resources/rest-api-spec/test/watcher/ack_watch/40_reset_ack_after_unmet_action_condition.yml

@@ -38,7 +38,6 @@ teardown:
                 },
                 "index" : {
                  "index" : "my_test_index",
-                 "doc_type" : "my-type",
                  "doc_id": "my-id"
                 }
               }

x-pack/plugin/src/test/resources/rest-api-spec/test/watcher/activate_watch/10_basic.yml

@@ -25,8 +25,7 @@
             "actions": {
               "test_index": {
                 "index": {
-                  "index": "test",
-                  "doc_type": "test2"
+                  "index": "test"
                 }
               }
             }

x-pack/plugin/src/test/resources/rest-api-spec/test/watcher/delete_watch/10_basic.yml

@@ -38,8 +38,7 @@ teardown:
             "actions": {
               "test_index": {
                 "index": {
-                  "index": "test",
-                  "doc_type": "test2"
+                  "index": "test"
                 }
               }
             }

x-pack/plugin/src/test/resources/rest-api-spec/test/watcher/execute_watch/10_basic.yml

@@ -33,7 +33,6 @@ teardown:
               "indexme" : {
                 "index" : {
                   "index" : "my_test_index",
-                  "doc_type" : "my-type",
                   "doc_id": "my-id"
                 }
               }
@@ -87,7 +86,6 @@ teardown:
                 "indexme" : {
                   "index" : {
                     "index" : "my_test_index",
-                    "doc_type" : "my-type",
                     "doc_id": "my-id"
                   }
                 }
@@ -130,7 +128,6 @@ teardown:
               "indexme" : {
                 "index" : {
                   "index" : "my_test_index",
-                  "doc_type" : "my-type",
                   "refresh" : "wait_for",
                   "doc_id": "my-id"
                 }

x-pack/plugin/src/test/resources/rest-api-spec/test/watcher/execute_watch/20_transform.yml

@@ -9,7 +9,6 @@ setup:
   - do:
       index:
         index: my_test_index
-        type: doc
         id: my_id
         refresh: true
         body: >
@@ -49,7 +48,6 @@ setup:
                 "indexme" : {
                   "index" : {
                     "index" : "my_test_index",
-                    "doc_type" : "doc",
                     "doc_id": "my-id"
                   }
                 }
@@ -64,7 +62,6 @@ setup:
   - do:
       get:
         index: my_test_index
-        type: doc
         id: my_id
 
   - match: { _source.key: "value" }
@@ -82,7 +79,6 @@ setup:
   - do:
       index:
         index: my_test_index
-        type: doc
         id: my_id
         refresh: true
         body: >
@@ -123,7 +119,6 @@ setup:
                 "indexme" : {
                   "index" : {
                     "index" : "my_test_index",
-                    "doc_type" : "doc",
                     "doc_id": "my-id"
                   }
                 }
@@ -138,7 +133,6 @@ setup:
   - do:
       get:
         index: my_test_index
-        type: doc
         id: my_id
 
   - match: { _source.key: "value" }
@@ -183,7 +177,6 @@ setup:
                 "indexme" : {
                   "index" : {
                     "index" : "my_test_index",
-                    "doc_type" : "doc",
                     "doc_id": "my-id"
                   }
                 }

x-pack/plugin/src/test/resources/rest-api-spec/test/watcher/execute_watch/70_invalid.yml

@@ -38,7 +38,6 @@
               "indexme" : {
                 "index" : {
                   "index" : "my_test_index",
-                  "doc_type" : "my-type",
                   "doc_id": "my-id"
                 }
               }

x-pack/plugin/src/test/resources/rest-api-spec/test/watcher/get_watch/10_basic.yml

@@ -38,8 +38,7 @@ teardown:
             "actions": {
                 "test_index": {
                   "index": {
-                    "index": "test",
-                    "doc_type": "test2"
+                    "index": "test"
                   }
                 }
               }

x-pack/plugin/src/test/resources/rest-api-spec/test/watcher/get_watch/20_missing.yml

@@ -30,8 +30,7 @@
             "actions": {
                 "test_index": {
                   "index": {
-                    "index": "test",
-                    "doc_type": "test2"
+                    "index": "test"
                   }
                 }
               }

x-pack/plugin/src/test/resources/rest-api-spec/test/watcher/put_watch/10_basic.yml

@@ -29,8 +29,7 @@
             "actions": {
               "test_index": {
                 "index": {
-                  "index": "test",
-                  "doc_type": "test2"
+                  "index": "test"
                 }
               }
             }

x-pack/plugin/src/test/resources/rest-api-spec/test/watcher/put_watch/20_put_watch_with_throttle_period.yml

@@ -39,8 +39,7 @@ teardown:
             "actions": {
               "test_index": {
                 "index": {
-                  "index": "test",
-                  "doc_type": "test2"
+                  "index": "test"
                 }
               }
             }

x-pack/plugin/src/test/resources/rest-api-spec/test/watcher/put_watch/30_put_watch_with_action_throttle_period.yml

@@ -39,8 +39,7 @@ teardown:
               "test_index": {
                 "throttle_period" : "10s",
                 "index": {
-                  "index": "test",
-                  "doc_type": "test2"
+                  "index": "test"
                 }
               }
             }

x-pack/plugin/src/test/resources/rest-api-spec/test/watcher/put_watch/40_put_watch_as_inactive.yml

@@ -39,8 +39,7 @@ teardown:
             "actions": {
               "test_index": {
                 "index": {
-                  "index": "test",
-                  "doc_type": "test2"
+                  "index": "test"
                 }
               }
             }

x-pack/plugin/src/test/resources/rest-api-spec/test/watcher/put_watch/60_put_watch_with_action_condition.yml

@@ -43,8 +43,7 @@ teardown:
                   }
                 },
                 "index": {
-                  "index": "test",
-                  "doc_type": "test2"
+                  "index": "test"
                 }
               }
             }

x-pack/plugin/src/test/resources/rest-api-spec/test/watcher/put_watch/70_put_watch_with_index_action_using_id.yml

@@ -37,7 +37,6 @@ teardown:
               "test_index": {
                 "index": {
                   "index": "my_test_index",
-                  "doc_type": "test2",
                   "doc_id": "test_id1"
                 }
               }
@@ -86,8 +85,7 @@ teardown:
             "actions": {
               "test_index": {
                 "index": {
-                  "index": "my_test_index",
-                  "doc_type": "test2"
+                  "index": "my_test_index"
                 }
               }
             }
@@ -143,8 +141,7 @@ teardown:
             "actions": {
               "test_index": {
                 "index": {
-                  "index": "my_test_index",
-                  "doc_type": "test2"
+                  "index": "my_test_index"
                 }
               }
             }
@@ -202,8 +199,7 @@ teardown:
             "actions": {
               "test_index": {
                 "index": {
-                  "index": "my_test_index",
-                  "doc_type": "test2"
+                  "index": "my_test_index"
                 }
               }
             }

x-pack/plugin/src/test/resources/rest-api-spec/test/watcher/put_watch/91_search_total_hits_as_int.yml

@@ -7,7 +7,6 @@ setup:
   - do:
       index:
         index: my_test_index
-        type: doc
         id: my_id
         refresh: true
         body: >
@@ -97,7 +96,6 @@ setup:
                   },
                   "index" : {
                     "index" : "my_test_index",
-                    "doc_type" : "doc",
                     "doc_id": "my-id"
                   }
                 }
@@ -108,7 +106,6 @@ setup:
   - do:
       get:
         index: my_test_index
-        type: doc
         id: my_id
 
   - match: { _source.key: "value" }

x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/index/IndexAction.java

@@ -5,10 +5,12 @@
  */
 package org.elasticsearch.xpack.watcher.actions.index;
 
+import org.apache.logging.log4j.LogManager;
 import org.elasticsearch.ElasticsearchParseException;
 import org.elasticsearch.action.support.WriteRequest.RefreshPolicy;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.ParseField;
+import org.elasticsearch.common.logging.DeprecationLogger;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser;
@@ -34,6 +36,9 @@ public class IndexAction implements Action {
     @Nullable final DateTimeZone dynamicNameTimeZone;
     @Nullable final RefreshPolicy refreshPolicy;
 
+    private static final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger(IndexAction.class));
+    public static final String TYPES_DEPRECATION_MESSAGE = "[types removal] Specifying types in a watcher index action is deprecated.";
+
     public IndexAction(@Nullable String index, @Nullable String docType, @Nullable String docId,
                        @Nullable String executionTimeField,
                        @Nullable TimeValue timeout, @Nullable DateTimeZone dynamicNameTimeZone, @Nullable RefreshPolicy refreshPolicy) {
@@ -151,6 +156,7 @@ public static IndexAction parse(String watchId, String actionId, XContentParser
                 }
             } else if (token == XContentParser.Token.VALUE_STRING) {
                 if (Field.DOC_TYPE.match(currentFieldName, parser.getDeprecationHandler())) {
+                    deprecationLogger.deprecatedAndMaybeLog("watcher_index_action", TYPES_DEPRECATION_MESSAGE);
                     docType = parser.text();
                 } else if (Field.DOC_ID.match(currentFieldName, parser.getDeprecationHandler())) {
                     docId = parser.text();

x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/search/WatcherSearchTemplateRequest.java

@@ -5,6 +5,7 @@
  */
 package org.elasticsearch.xpack.watcher.support.search;
 
+import org.apache.logging.log4j.LogManager;
 import org.elasticsearch.ElasticsearchParseException;
 import org.elasticsearch.action.search.SearchType;
 import org.elasticsearch.action.support.IndicesOptions;
@@ -13,6 +14,7 @@
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.bytes.BytesReference;
+import org.elasticsearch.common.logging.DeprecationLogger;
 import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentFactory;
@@ -43,6 +45,10 @@ public class WatcherSearchTemplateRequest implements ToXContentObject {
     private final BytesReference searchSource;
     private boolean restTotalHitsAsInt = true;
 
+    private static final DeprecationLogger deprecationLogger =
+        new DeprecationLogger(LogManager.getLogger(WatcherSearchTemplateRequest.class));
+    public static final String TYPES_DEPRECATION_MESSAGE = "[types removal] Specifying types in a watcher search request is deprecated.";
+
     public WatcherSearchTemplateRequest(String[] indices, String[] types, SearchType searchType, IndicesOptions indicesOptions,
                                         BytesReference searchSource) {
         this.indices = indices;
@@ -203,6 +209,7 @@ public static WatcherSearchTemplateRequest fromXContent(XContentParser parser, S
                         }
                     }
                 } else if (TYPES_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
+                    deprecationLogger.deprecatedAndMaybeLog("watcher_search_input", TYPES_DEPRECATION_MESSAGE);
                     while ((token = parser.nextToken()) != XContentParser.Token.END_ARRAY) {
                         if (token == XContentParser.Token.VALUE_STRING) {
                             types.add(parser.textOrNull());
@@ -278,6 +285,7 @@ public static WatcherSearchTemplateRequest fromXContent(XContentParser parser, S
                     String indicesStr = parser.text();
                     indices.addAll(Arrays.asList(Strings.delimitedListToStringArray(indicesStr, ",", " \t")));
                 } else if (TYPES_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
+                    deprecationLogger.deprecatedAndMaybeLog("watcher_search_input", TYPES_DEPRECATION_MESSAGE);
                     String typesStr = parser.text();
                     types.addAll(Arrays.asList(Strings.delimitedListToStringArray(typesStr, ",", " \t")));
                 } else if (SEARCH_TYPE_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
@@ -305,7 +313,7 @@ public static WatcherSearchTemplateRequest fromXContent(XContentParser parser, S
         }
 
         WatcherSearchTemplateRequest request = new WatcherSearchTemplateRequest(indices.toArray(new String[0]),
-            types.toArray(new String[0]), searchType, indicesOptions, searchSource, template);
+            types.size() == 0 ? null : types.toArray(new String[0]), searchType, indicesOptions, searchSource, template);
         request.setRestTotalHitsAsInt(totalHitsAsInt);
         return request;
     }

x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/search/WatcherSearchTemplateService.java

@@ -57,7 +57,9 @@ public String renderTemplate(Script source, WatchExecutionContext ctx, Payload p
 
     public SearchRequest toSearchRequest(WatcherSearchTemplateRequest request) throws IOException {
         SearchRequest searchRequest = new SearchRequest(request.getIndices());
-        searchRequest.types(request.getTypes());
+        if (request.getTypes() != null) {
+            searchRequest.types(request.getTypes());
+        }
         searchRequest.searchType(request.getSearchType());
         searchRequest.indicesOptions(request.getIndicesOptions());
         SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource();