watcher - remove types from full cluster restart tests (#48014)

elastic · Oct 14, 2019 · 84030fc · 84030fc
1 parent 488a258
commit 84030fc
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 20 deletions.
diff --git a/...l-cluster-restart/src/test/java/org/elasticsearch/xpack/restart/FullClusterRestartIT.java b/...l-cluster-restart/src/test/java/org/elasticsearch/xpack/restart/FullClusterRestartIT.java
@@ -44,9 +44,6 @@
 
 public class FullClusterRestartIT extends AbstractFullClusterRestartTestCase {
 
-    public static final String INDEX_ACTION_TYPES_DEPRECATION_MESSAGE =
-        "[types removal] Specifying types in a watcher index action is deprecated.";
-
     public static final int UPGRADE_FIELD_EXPECTED_INDEX_FORMAT_VERSION = 6;
     public static final int SECURITY_EXPECTED_INDEX_FORMAT_VERSION = 6;
 
@@ -121,10 +118,7 @@ public void testWatcher() throws Exception {
             logger.info("Adding a watch on old cluster {}", getOldClusterVersion());
             Request createBwcWatch = new Request("PUT", getWatcherEndpoint() + "/watch/bwc_watch");
             Request createBwcThrottlePeriod = new Request("PUT", getWatcherEndpoint() + "/watch/bwc_throttle_period");
-            if (getOldClusterVersion().onOrAfter(Version.V_7_0_0)) {
-                createBwcWatch.setOptions(expectWarnings(INDEX_ACTION_TYPES_DEPRECATION_MESSAGE));
-                createBwcThrottlePeriod.setOptions(expectWarnings(INDEX_ACTION_TYPES_DEPRECATION_MESSAGE));
-            }
+
             createBwcWatch.setJsonEntity(loadWatch("simple-watch.json"));
             client().performRequest(createBwcWatch);
 
@@ -285,11 +279,6 @@ private void assertOldTemplatesAreDeleted() throws IOException {
     private void assertWatchIndexContentsWork() throws Exception {
         // Fetch a basic watch
         Request getRequest = new Request("GET", "_watcher/watch/bwc_watch");
-        getRequest.setOptions(
-            expectWarnings(
-                INDEX_ACTION_TYPES_DEPRECATION_MESSAGE
-            )
-        );
 
         Map<String, Object> bwcWatch = entityAsMap(client().performRequest(getRequest));
 
@@ -306,11 +295,6 @@ private void assertWatchIndexContentsWork() throws Exception {
 
         // Fetch a watch with "fun" throttle periods
         getRequest = new Request("GET", "_watcher/watch/bwc_throttle_period");
-        getRequest.setOptions(
-            expectWarnings(
-                INDEX_ACTION_TYPES_DEPRECATION_MESSAGE
-            )
-        );
 
         bwcWatch = entityAsMap(client().performRequest(getRequest));
         assertThat(bwcWatch.get("found"), equalTo(true));

diff --git a/...full-cluster-restart/src/test/resources/org/elasticsearch/xpack/restart/simple-watch.json b/...full-cluster-restart/src/test/resources/org/elasticsearch/xpack/restart/simple-watch.json
@@ -32,7 +32,6 @@
       },
       "index" : {
         "index" : "bwc_watch_index",
-        "doc_type" : "bwc_watch_type",
         "timeout": "100s"
       }
     }

diff --git a/...ter-restart/src/test/resources/org/elasticsearch/xpack/restart/throttle-period-watch.json b/...ter-restart/src/test/resources/org/elasticsearch/xpack/restart/throttle-period-watch.json
@@ -19,8 +19,7 @@
         }
       },
       "index" : {
-        "index" : "bwc_watch_index",
-        "doc_type" : "bwc_watch_type"
+        "index" : "bwc_watch_index"
       }
     }
   }