diff --git a/client/rest-high-level/qa/ssl-enabled/src/javaRestTest/java/org/elasticsearch/client/documentation/EnrollmentDocumentationIT.java b/client/rest-high-level/qa/ssl-enabled/src/javaRestTest/java/org/elasticsearch/client/documentation/EnrollmentDocumentationIT.java
index cbdf9ccfac71..deb571147bfd 100644
--- a/client/rest-high-level/qa/ssl-enabled/src/javaRestTest/java/org/elasticsearch/client/documentation/EnrollmentDocumentationIT.java
+++ b/client/rest-high-level/qa/ssl-enabled/src/javaRestTest/java/org/elasticsearch/client/documentation/EnrollmentDocumentationIT.java
@@ -28,6 +28,7 @@ import java.util.concurrent.TimeUnit;
import static org.hamcrest.Matchers.startsWith;
+@SuppressWarnings("removal")
public class EnrollmentDocumentationIT extends ESRestHighLevelClientTestCase {
static Path HTTP_TRUSTSTORE;
diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/AsyncSearchClient.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/AsyncSearchClient.java
index d01c81ab2a93..30dbfd022e20 100644
--- a/client/rest-high-level/src/main/java/org/elasticsearch/client/AsyncSearchClient.java
+++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/AsyncSearchClient.java
@@ -19,6 +19,13 @@ import java.io.IOException;
import static java.util.Collections.emptySet;
+/**
+ * @deprecated The High Level Rest Client is deprecated in favor of the
+ *
+ * Elasticsearch Java API Client
+ */
+@Deprecated(since = "7.16.0", forRemoval = true)
+@SuppressWarnings("removal")
public class AsyncSearchClient {
private final RestHighLevelClient restHighLevelClient;
diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/CcrClient.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/CcrClient.java
index 5beb97b4dfc1..70975ccc42e7 100644
--- a/client/rest-high-level/src/main/java/org/elasticsearch/client/CcrClient.java
+++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/CcrClient.java
@@ -39,7 +39,13 @@ import java.util.Collections;
*
* See the
* X-Pack Rollup APIs on elastic.co for more information.
+ *
+ * @deprecated The High Level Rest Client is deprecated in favor of the
+ *
+ * Elasticsearch Java API Client
*/
+@Deprecated(since = "7.16.0", forRemoval = true)
+@SuppressWarnings("removal")
public final class CcrClient {
private final RestHighLevelClient restHighLevelClient;
diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/ClusterClient.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/ClusterClient.java
index 550ea1199c74..114547dfe30c 100644
--- a/client/rest-high-level/src/main/java/org/elasticsearch/client/ClusterClient.java
+++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/ClusterClient.java
@@ -34,7 +34,13 @@ import static java.util.Collections.singleton;
* A wrapper for the {@link RestHighLevelClient} that provides methods for accessing the Cluster API.
*
* See Cluster API on elastic.co
+ *
+ * @deprecated The High Level Rest Client is deprecated in favor of the
+ *
+ * Elasticsearch Java API Client
*/
+@Deprecated(since = "7.16.0", forRemoval = true)
+@SuppressWarnings("removal")
public final class ClusterClient {
private final RestHighLevelClient restHighLevelClient;
diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/EnrichClient.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/EnrichClient.java
index d102c5cb1811..3744eaeb93ad 100644
--- a/client/rest-high-level/src/main/java/org/elasticsearch/client/EnrichClient.java
+++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/EnrichClient.java
@@ -27,7 +27,13 @@ import java.util.Collections;
*
* See the
* X-Pack Enrich Policy APIs on elastic.co for more information.
+ *
+ * @deprecated The High Level Rest Client is deprecated in favor of the
+ *
+ * Elasticsearch Java API Client
*/
+@Deprecated(since = "7.16.0", forRemoval = true)
+@SuppressWarnings("removal")
public final class EnrichClient {
private final RestHighLevelClient restHighLevelClient;
diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/EqlClient.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/EqlClient.java
index cf59c7f6a835..6b1a44ca6ea1 100644
--- a/client/rest-high-level/src/main/java/org/elasticsearch/client/EqlClient.java
+++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/EqlClient.java
@@ -23,7 +23,13 @@ import java.util.Collections;
*
* See the
* EQL APIs on elastic.co for more information.
+ *
+ * @deprecated The High Level Rest Client is deprecated in favor of the
+ *
+ * Elasticsearch Java API Client
*/
+@Deprecated(since = "7.16.0", forRemoval = true)
+@SuppressWarnings("removal")
public final class EqlClient {
private final RestHighLevelClient restHighLevelClient;
diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/FeaturesClient.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/FeaturesClient.java
index a26e1dcc8843..11c92276ce6e 100644
--- a/client/rest-high-level/src/main/java/org/elasticsearch/client/FeaturesClient.java
+++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/FeaturesClient.java
@@ -22,7 +22,13 @@ import static java.util.Collections.emptySet;
* A wrapper for the {@link RestHighLevelClient} that provides methods for accessing the Snapshot API.
*
* See Snapshot API on elastic.co
+ *
+ * @deprecated The High Level Rest Client is deprecated in favor of the
+ *
+ * Elasticsearch Java API Client
*/
+@Deprecated(since = "7.16.0", forRemoval = true)
+@SuppressWarnings("removal")
public class FeaturesClient {
private final RestHighLevelClient restHighLevelClient;
diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/GraphClient.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/GraphClient.java
index 996ab0d3923f..f0652eeecc85 100644
--- a/client/rest-high-level/src/main/java/org/elasticsearch/client/GraphClient.java
+++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/GraphClient.java
@@ -16,7 +16,13 @@ import java.io.IOException;
import static java.util.Collections.emptySet;
-
+/**
+ * @deprecated The High Level Rest Client is deprecated in favor of the
+ *
+ * Elasticsearch Java API Client
+ */
+@Deprecated(since = "7.16.0", forRemoval = true)
+@SuppressWarnings("removal")
public class GraphClient {
private final RestHighLevelClient restHighLevelClient;
diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/IndexLifecycleClient.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/IndexLifecycleClient.java
index b495ff4fafdf..3fcc3740a63b 100644
--- a/client/rest-high-level/src/main/java/org/elasticsearch/client/IndexLifecycleClient.java
+++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/IndexLifecycleClient.java
@@ -40,6 +40,13 @@ import java.io.IOException;
import static java.util.Collections.emptySet;
+/**
+ * @deprecated The High Level Rest Client is deprecated in favor of the
+ *
+ * Elasticsearch Java API Client
+ */
+@Deprecated(since = "7.16.0", forRemoval = true)
+@SuppressWarnings("removal")
public class IndexLifecycleClient {
private final RestHighLevelClient restHighLevelClient;
diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/IndicesClient.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/IndicesClient.java
index a1168e37b021..f56231f5a263 100644
--- a/client/rest-high-level/src/main/java/org/elasticsearch/client/IndicesClient.java
+++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/IndicesClient.java
@@ -81,7 +81,13 @@ import static java.util.Collections.singleton;
* A wrapper for the {@link RestHighLevelClient} that provides methods for accessing the Indices API.
*
* See Indices API on elastic.co
+ *
+ * @deprecated The High Level Rest Client is deprecated in favor of the
+ *
+ * Elasticsearch Java API Client
*/
+@Deprecated(since = "7.16.0", forRemoval = true)
+@SuppressWarnings("removal")
public final class IndicesClient {
private final RestHighLevelClient restHighLevelClient;
diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/IngestClient.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/IngestClient.java
index 9dbf3f7f8f07..8f4ccfcf306f 100644
--- a/client/rest-high-level/src/main/java/org/elasticsearch/client/IngestClient.java
+++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/IngestClient.java
@@ -27,7 +27,13 @@ import static java.util.Collections.emptySet;
* A wrapper for the {@link RestHighLevelClient} that provides methods for accessing the Ingest API.
*
* See Ingest API on elastic.co
+ *
+ * @deprecated The High Level Rest Client is deprecated in favor of the
+ *
+ * Elasticsearch Java API Client
*/
+@Deprecated(since = "7.16.0", forRemoval = true)
+@SuppressWarnings("removal")
public final class IngestClient {
private final RestHighLevelClient restHighLevelClient;
diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/LicenseClient.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/LicenseClient.java
index 472799095157..5add90115f19 100644
--- a/client/rest-high-level/src/main/java/org/elasticsearch/client/LicenseClient.java
+++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/LicenseClient.java
@@ -45,7 +45,13 @@ import static java.util.Collections.singleton;
*
* See the
* X-Pack Licensing APIs on elastic.co for more information.
+ *
+ * @deprecated The High Level Rest Client is deprecated in favor of the
+ *
+ * Elasticsearch Java API Client
*/
+@Deprecated(since = "7.16.0", forRemoval = true)
+@SuppressWarnings("removal")
public final class LicenseClient {
private final RestHighLevelClient restHighLevelClient;
diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/MachineLearningClient.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/MachineLearningClient.java
index 4f34dd3169bb..4daa42349a0f 100644
--- a/client/rest-high-level/src/main/java/org/elasticsearch/client/MachineLearningClient.java
+++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/MachineLearningClient.java
@@ -123,7 +123,13 @@ import java.util.Collections;
*
* See the
* X-Pack Machine Learning APIs for additional information.
+ *
+ * @deprecated The High Level Rest Client is deprecated in favor of the
+ *
+ * Elasticsearch Java API Client
*/
+@Deprecated(since = "7.16.0", forRemoval = true)
+@SuppressWarnings("removal")
public final class MachineLearningClient {
private final RestHighLevelClient restHighLevelClient;
diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/MigrationClient.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/MigrationClient.java
index d1c53fc3ad96..a48ec45ad885 100644
--- a/client/rest-high-level/src/main/java/org/elasticsearch/client/MigrationClient.java
+++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/MigrationClient.java
@@ -25,7 +25,13 @@ import java.util.Collections;
*
* See the
* X-Pack Migration APIs on elastic.co for more information.
+ *
+ * @deprecated The High Level Rest Client is deprecated in favor of the
+ *
+ * Elasticsearch Java API Client
*/
+@Deprecated(since = "7.16.0", forRemoval = true)
+@SuppressWarnings("removal")
public final class MigrationClient {
private final RestHighLevelClient restHighLevelClient;
diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/RestHighLevelClient.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/RestHighLevelClient.java
index 52e1412fa8b4..6f9cbc62011c 100644
--- a/client/rest-high-level/src/main/java/org/elasticsearch/client/RestHighLevelClient.java
+++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/RestHighLevelClient.java
@@ -250,7 +250,12 @@ import static java.util.stream.Collectors.toList;
* {@link ResponseException}
*
*
+ * @deprecated The High Level Rest Client is deprecated in favor of the
+ *
+ * Elasticsearch Java API Client
*/
+@Deprecated(since = "7.16.0", forRemoval = true)
+@SuppressWarnings("removal")
public class RestHighLevelClient implements Closeable {
private static final Logger logger = LogManager.getLogger(RestHighLevelClient.class);
diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/RestHighLevelClientBuilder.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/RestHighLevelClientBuilder.java
index 6357cc2851c3..7109329da819 100644
--- a/client/rest-high-level/src/main/java/org/elasticsearch/client/RestHighLevelClientBuilder.java
+++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/RestHighLevelClientBuilder.java
@@ -18,8 +18,12 @@ import java.util.List;
/**
* Helper to build a {@link RestHighLevelClient}, allowing setting the low-level client that
* should be used as well as whether API compatibility should be used.
+ * @deprecated The High Level Rest Client is deprecated in favor of the
+ *
+ * Elasticsearch Java API Client
*/
-
+@Deprecated(since = "7.16.0", forRemoval = true)
+@SuppressWarnings("removal")
public class RestHighLevelClientBuilder {
private final RestClient restClient;
private CheckedConsumer closeHandler = RestClient::close;
diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/RollupClient.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/RollupClient.java
index d47b3edd0723..397ffcf8116c 100644
--- a/client/rest-high-level/src/main/java/org/elasticsearch/client/RollupClient.java
+++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/RollupClient.java
@@ -34,7 +34,13 @@ import java.util.Collections;
*
* See the
* X-Pack Rollup APIs on elastic.co for more information.
+ *
+ * @deprecated The High Level Rest Client is deprecated in favor of the
+ *
+ * Elasticsearch Java API Client
*/
+@Deprecated(since = "7.16.0", forRemoval = true)
+@SuppressWarnings("removal")
public class RollupClient {
private final RestHighLevelClient restHighLevelClient;
diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/SearchableSnapshotsClient.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/SearchableSnapshotsClient.java
index fecbea6ee5a8..4bb3f2367fdb 100644
--- a/client/rest-high-level/src/main/java/org/elasticsearch/client/SearchableSnapshotsClient.java
+++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/SearchableSnapshotsClient.java
@@ -23,7 +23,13 @@ import java.util.Objects;
*
* See the Searchable Snapshots
* APIs on elastic.co for more information.
+ *
+ * @deprecated The High Level Rest Client is deprecated in favor of the
+ *
+ * Elasticsearch Java API Client
*/
+@Deprecated(since = "7.16.0", forRemoval = true)
+@SuppressWarnings("removal")
public class SearchableSnapshotsClient {
private RestHighLevelClient restHighLevelClient;
diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/SecurityClient.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/SecurityClient.java
index bcd91485417c..86f2a04d7fc4 100644
--- a/client/rest-high-level/src/main/java/org/elasticsearch/client/SecurityClient.java
+++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/SecurityClient.java
@@ -92,7 +92,13 @@ import static java.util.Collections.singleton;
* A wrapper for the {@link RestHighLevelClient} that provides methods for accessing the Security APIs.
*
* See Security APIs on elastic.co
+ *
+ * @deprecated The High Level Rest Client is deprecated in favor of the
+ *
+ * Elasticsearch Java API Client
*/
+@Deprecated(since = "7.16.0", forRemoval = true)
+@SuppressWarnings("removal")
public final class SecurityClient {
private final RestHighLevelClient restHighLevelClient;
diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/SnapshotClient.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/SnapshotClient.java
index 730399481f72..28406b9bb119 100644
--- a/client/rest-high-level/src/main/java/org/elasticsearch/client/SnapshotClient.java
+++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/SnapshotClient.java
@@ -37,7 +37,13 @@ import static java.util.Collections.emptySet;
* A wrapper for the {@link RestHighLevelClient} that provides methods for accessing the Snapshot API.
*
* See Snapshot API on elastic.co
+ *
+ * @deprecated The High Level Rest Client is deprecated in favor of the
+ *
+ * Elasticsearch Java API Client
*/
+@Deprecated(since = "7.16.0", forRemoval = true)
+@SuppressWarnings("removal")
public final class SnapshotClient {
private final RestHighLevelClient restHighLevelClient;
diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/TasksClient.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/TasksClient.java
index 34745bb8fbf2..0d3cc51998f9 100644
--- a/client/rest-high-level/src/main/java/org/elasticsearch/client/TasksClient.java
+++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/TasksClient.java
@@ -25,7 +25,13 @@ import static java.util.Collections.emptySet;
* A wrapper for the {@link RestHighLevelClient} that provides methods for accessing the Tasks API.
*
* See Task Management API on elastic.co
+ *
+ * @deprecated The High Level Rest Client is deprecated in favor of the
+ *
+ * Elasticsearch Java API Client
*/
+@Deprecated(since = "7.16.0", forRemoval = true)
+@SuppressWarnings("removal")
public final class TasksClient {
private final RestHighLevelClient restHighLevelClient;
diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/TextStructureClient.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/TextStructureClient.java
index 83dc972e9364..5549ac16666c 100644
--- a/client/rest-high-level/src/main/java/org/elasticsearch/client/TextStructureClient.java
+++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/TextStructureClient.java
@@ -7,20 +7,26 @@
*/
package org.elasticsearch.client;
-import java.io.IOException;
-import java.util.Collections;
-
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.client.textstructure.FindStructureRequest;
import org.elasticsearch.client.textstructure.FindStructureResponse;
+import java.io.IOException;
+import java.util.Collections;
+
/**
* Text Structure API client wrapper for the {@link RestHighLevelClient}
*
* See the
* X-Pack Text Structure APIs for additional information.
+ *
+ * @deprecated The High Level Rest Client is deprecated in favor of the
+ *
+ * Elasticsearch Java API Client
*/
+@Deprecated(since = "7.16.0", forRemoval = true)
+@SuppressWarnings("removal")
public final class TextStructureClient {
private final RestHighLevelClient restHighLevelClient;
diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/TransformClient.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/TransformClient.java
index 498d9e4b6d24..74be3b94054a 100644
--- a/client/rest-high-level/src/main/java/org/elasticsearch/client/TransformClient.java
+++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/TransformClient.java
@@ -28,6 +28,13 @@ import org.elasticsearch.client.transform.UpdateTransformResponse;
import java.io.IOException;
import java.util.Collections;
+/**
+ * @deprecated The High Level Rest Client is deprecated in favor of the
+ *
+ * Elasticsearch Java API Client
+ */
+@Deprecated(since = "7.16.0", forRemoval = true)
+@SuppressWarnings("removal")
public final class TransformClient {
private final RestHighLevelClient restHighLevelClient;
diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/WatcherClient.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/WatcherClient.java
index 72b2ae07eef8..9f535e76ec9f 100644
--- a/client/rest-high-level/src/main/java/org/elasticsearch/client/WatcherClient.java
+++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/WatcherClient.java
@@ -33,6 +33,13 @@ import java.io.IOException;
import static java.util.Collections.emptySet;
import static java.util.Collections.singleton;
+/**
+ * @deprecated The High Level Rest Client is deprecated in favor of the
+ *
+ * Elasticsearch Java API Client
+ */
+@Deprecated(since = "7.16.0", forRemoval = true)
+@SuppressWarnings("removal")
public final class WatcherClient {
private final RestHighLevelClient restHighLevelClient;
diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/XPackClient.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/XPackClient.java
index a5eeb23827db..9767e1cba944 100644
--- a/client/rest-high-level/src/main/java/org/elasticsearch/client/XPackClient.java
+++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/XPackClient.java
@@ -26,7 +26,13 @@ import static java.util.Collections.emptySet;
*
* See the
* REST APIs on elastic.co for more information.
+ *
+ * @deprecated The High Level Rest Client is deprecated in favor of the
+ *
+ * Elasticsearch Java API Client
*/
+@Deprecated(since = "7.16.0", forRemoval = true)
+@SuppressWarnings("removal")
public final class XPackClient {
private final RestHighLevelClient restHighLevelClient;
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/CCRIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/CCRIT.java
index 30224e015199..62bc270fedfd 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/CCRIT.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/CCRIT.java
@@ -60,6 +60,7 @@ import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.nullValue;
+@SuppressWarnings("removal")
public class CCRIT extends ESRestHighLevelClientTestCase {
@Before
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/CustomRestHighLevelClientTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/CustomRestHighLevelClientTests.java
index 2b2b76465608..843e4475c837 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/CustomRestHighLevelClientTests.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/CustomRestHighLevelClientTests.java
@@ -53,6 +53,7 @@ import static org.mockito.Mockito.when;
/**
* Test and demonstrates how {@link RestHighLevelClient} can be extended to support custom endpoints.
*/
+@SuppressWarnings("removal")
public class CustomRestHighLevelClientTests extends ESTestCase {
private static final String ENDPOINT = "/_custom";
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/ESRestHighLevelClientTestCase.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/ESRestHighLevelClientTestCase.java
index 7000e91b049e..bd779d2b1171 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/ESRestHighLevelClientTestCase.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/ESRestHighLevelClientTestCase.java
@@ -62,6 +62,7 @@ import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.lessThan;
import static org.hamcrest.Matchers.notNullValue;
+@SuppressWarnings("removal")
public abstract class ESRestHighLevelClientTestCase extends ESRestTestCase {
public static final String IGNORE_THROTTLED_DEPRECATION_WARNING = "[ignore_throttled] parameter is deprecated because frozen " +
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/EnrichIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/EnrichIT.java
index a97ce1296229..ca89be39c3c0 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/EnrichIT.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/EnrichIT.java
@@ -26,6 +26,7 @@ import static org.hamcrest.Matchers.greaterThanOrEqualTo;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
+@SuppressWarnings("removal")
public class EnrichIT extends ESRestHighLevelClientTestCase {
public void testCRUD() throws Exception {
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/EqlIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/EqlIT.java
index c7661ac28b5e..64c92c06b29f 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/EqlIT.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/EqlIT.java
@@ -37,6 +37,7 @@ import static org.hamcrest.Matchers.anyOf;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.greaterThan;
+@SuppressWarnings("removal")
public class EqlIT extends ESRestHighLevelClientTestCase {
private static final String INDEX_NAME = "index";
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/FeaturesIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/FeaturesIT.java
index 9af22ebcafe2..c9527bc12395 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/FeaturesIT.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/FeaturesIT.java
@@ -21,6 +21,7 @@ import java.util.Collections;
import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.notNullValue;
+@SuppressWarnings("removal")
public class FeaturesIT extends ESRestHighLevelClientTestCase {
public void testGetFeatures() throws IOException {
GetFeaturesRequest request = new GetFeaturesRequest();
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/IndicesClientIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/IndicesClientIT.java
index 404e49fdb4d9..77e4a0e0d380 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/IndicesClientIT.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/IndicesClientIT.java
@@ -134,6 +134,7 @@ import static org.hamcrest.Matchers.nullValue;
import static org.hamcrest.Matchers.startsWith;
import static org.hamcrest.core.IsInstanceOf.instanceOf;
+@SuppressWarnings("removal")
public class IndicesClientIT extends ESRestHighLevelClientTestCase {
public static final RequestOptions LEGACY_TEMPLATE_OPTIONS = RequestOptions.DEFAULT.toBuilder()
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/MachineLearningGetResultsIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/MachineLearningGetResultsIT.java
index 9363a4cf97fe..7e4ff761209e 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/MachineLearningGetResultsIT.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/MachineLearningGetResultsIT.java
@@ -55,6 +55,7 @@ import static org.hamcrest.Matchers.lessThan;
import static org.hamcrest.Matchers.lessThanOrEqualTo;
import static org.hamcrest.Matchers.nullValue;
+@SuppressWarnings("removal")
public class MachineLearningGetResultsIT extends ESRestHighLevelClientTestCase {
private static final String RESULTS_INDEX = ".ml-anomalies-shared";
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/MachineLearningIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/MachineLearningIT.java
index d5c286b38709..d25cfa94759f 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/MachineLearningIT.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/MachineLearningIT.java
@@ -218,6 +218,7 @@ import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.nullValue;
+@SuppressWarnings("removal")
public class MachineLearningIT extends ESRestHighLevelClientTestCase {
private static final RequestOptions POST_DATA_OPTIONS = RequestOptions.DEFAULT.toBuilder()
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/MlTestStateCleaner.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/MlTestStateCleaner.java
index 5cbffb7157ca..419e9f8790e1 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/MlTestStateCleaner.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/MlTestStateCleaner.java
@@ -24,6 +24,7 @@ import java.util.stream.Stream;
/**
* Cleans up ML resources created during tests
*/
+@SuppressWarnings("removal")
public class MlTestStateCleaner {
private final Logger logger;
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/MockRestHighLevelTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/MockRestHighLevelTests.java
index e9812ac68dbe..6752cec97bd6 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/MockRestHighLevelTests.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/MockRestHighLevelTests.java
@@ -27,6 +27,7 @@ import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+@SuppressWarnings("removal")
public class MockRestHighLevelTests extends ESTestCase {
private RestHighLevelClient client;
private static final List WARNINGS = Collections.singletonList("Some Warning");
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/RestHighLevelClientExtTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/RestHighLevelClientExtTests.java
index bca7f64e9c50..883e891aff7c 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/RestHighLevelClientExtTests.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/RestHighLevelClientExtTests.java
@@ -28,6 +28,7 @@ import static org.mockito.Mockito.mock;
* This test works against a {@link RestHighLevelClient} subclass that simulates how custom response sections returned by
* Elasticsearch plugins can be parsed using the high level client.
*/
+@SuppressWarnings("removal")
public class RestHighLevelClientExtTests extends ESTestCase {
private RestHighLevelClient restHighLevelClient;
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/RestHighLevelClientTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/RestHighLevelClientTests.java
index 433895a015c8..51f1d8ae4268 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/RestHighLevelClientTests.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/RestHighLevelClientTests.java
@@ -160,6 +160,7 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+@SuppressWarnings("removal")
public class RestHighLevelClientTests extends ESTestCase {
private static final String SUBMIT_TASK_PREFIX = "submit_";
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/RollupIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/RollupIT.java
index c659c487bfcd..97b0194a7fc6 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/RollupIT.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/RollupIT.java
@@ -71,6 +71,7 @@ import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.lessThan;
+@SuppressWarnings("removal")
public class RollupIT extends ESRestHighLevelClientTestCase {
double sum = 0.0d;
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/SearchableSnapshotsIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/SearchableSnapshotsIT.java
index 5bb80056b2fa..69fe432e6334 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/SearchableSnapshotsIT.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/SearchableSnapshotsIT.java
@@ -49,6 +49,7 @@ import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.notNullValue;
+@SuppressWarnings("removal")
public class SearchableSnapshotsIT extends ESRestHighLevelClientTestCase {
@Before
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/SecurityIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/SecurityIT.java
index 8cdb2fafe204..8127b420da16 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/SecurityIT.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/SecurityIT.java
@@ -51,6 +51,7 @@ import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.nullValue;
+@SuppressWarnings("removal")
public class SecurityIT extends ESRestHighLevelClientTestCase {
public void testPutUser() throws Exception {
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/TextStructureIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/TextStructureIT.java
index 9d684917c971..2c94e56f90d7 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/TextStructureIT.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/TextStructureIT.java
@@ -16,6 +16,7 @@ import org.elasticsearch.client.textstructure.FindStructureRequest;
import org.elasticsearch.client.textstructure.FindStructureResponse;
import org.elasticsearch.client.textstructure.structurefinder.TextStructure;
+@SuppressWarnings("removal")
public class TextStructureIT extends ESRestHighLevelClientTestCase {
public void testFindFileStructure() throws IOException {
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/TransformIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/TransformIT.java
index d43b6d133071..4c31be8bb57c 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/TransformIT.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/TransformIT.java
@@ -74,6 +74,7 @@ import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.oneOf;
+@SuppressWarnings("removal")
public class TransformIT extends ESRestHighLevelClientTestCase {
private List transformsToClean = new ArrayList<>();
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/AsyncSearchDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/AsyncSearchDocumentationIT.java
index 21ae54131c54..dc2673f786cb 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/AsyncSearchDocumentationIT.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/AsyncSearchDocumentationIT.java
@@ -33,6 +33,7 @@ import java.util.concurrent.TimeUnit;
* Documentation for Async Search APIs in the high level java client.
* Code wrapped in {@code tag} and {@code end} tags is included in the docs.
*/
+@SuppressWarnings("removal")
public class AsyncSearchDocumentationIT extends ESRestHighLevelClientTestCase {
@Before void setUpIndex() throws IOException {
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/CCRDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/CCRDocumentationIT.java
index 36d193f1a960..0d0684af0e57 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/CCRDocumentationIT.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/CCRDocumentationIT.java
@@ -58,6 +58,7 @@ import java.util.concurrent.TimeUnit;
import static org.hamcrest.Matchers.is;
+@SuppressWarnings("removal")
public class CCRDocumentationIT extends ESRestHighLevelClientTestCase {
@Before
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/CRUDDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/CRUDDocumentationIT.java
index 0f1cc0e9db53..0b3c2103b243 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/CRUDDocumentationIT.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/CRUDDocumentationIT.java
@@ -95,6 +95,7 @@ import static org.hamcrest.Matchers.not;
* Documentation for CRUD APIs in the high level java client.
* Code wrapped in {@code tag} and {@code end} tags is included in the docs.
*/
+@SuppressWarnings("removal")
public class CRUDDocumentationIT extends ESRestHighLevelClientTestCase {
@SuppressWarnings("unused")
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/ClusterClientDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/ClusterClientDocumentationIT.java
index 7ee97d6faec1..dfa0e7b9364d 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/ClusterClientDocumentationIT.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/ClusterClientDocumentationIT.java
@@ -62,6 +62,7 @@ import static org.hamcrest.Matchers.notNullValue;
* Documentation for Cluster APIs in the high level java client.
* Code wrapped in {@code tag} and {@code end} tags is included in the docs.
*/
+@SuppressWarnings("removal")
public class ClusterClientDocumentationIT extends ESRestHighLevelClientTestCase {
public void testClusterPutSettings() throws IOException {
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/EnrichDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/EnrichDocumentationIT.java
index 4bcb3ac0ee4c..993e76ed7973 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/EnrichDocumentationIT.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/EnrichDocumentationIT.java
@@ -32,6 +32,7 @@ import java.util.Map;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+@SuppressWarnings("removal")
public class EnrichDocumentationIT extends ESRestHighLevelClientTestCase {
@After
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/GraphDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/GraphDocumentationIT.java
index e76116cdbef0..9a4531a1cbe2 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/GraphDocumentationIT.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/GraphDocumentationIT.java
@@ -26,6 +26,7 @@ import org.junit.Before;
import java.io.IOException;
import java.util.Collection;
+@SuppressWarnings("removal")
public class GraphDocumentationIT extends ESRestHighLevelClientTestCase {
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/ILMDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/ILMDocumentationIT.java
index 9f8e09cd1951..33f4b45d648b 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/ILMDocumentationIT.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/ILMDocumentationIT.java
@@ -85,6 +85,7 @@ import static org.hamcrest.Matchers.containsStringIgnoringCase;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
+@SuppressWarnings("removal")
public class ILMDocumentationIT extends ESRestHighLevelClientTestCase {
public void testPutLifecyclePolicy() throws Exception {
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/IndicesClientDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/IndicesClientDocumentationIT.java
index dd714574476a..e40cef14ba4d 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/IndicesClientDocumentationIT.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/IndicesClientDocumentationIT.java
@@ -135,6 +135,7 @@ import static org.hamcrest.Matchers.nullValue;
* than 84, the line will be cut and a horizontal scroll bar will be displayed.
* (the code indentation of the tag is not included in the width)
*/
+@SuppressWarnings("removal")
public class IndicesClientDocumentationIT extends ESRestHighLevelClientTestCase {
public void testIndicesExist() throws IOException {
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/IngestClientDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/IngestClientDocumentationIT.java
index 18958045ebcf..d7ba8113f00b 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/IngestClientDocumentationIT.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/IngestClientDocumentationIT.java
@@ -54,6 +54,7 @@ import java.util.concurrent.TimeUnit;
* than 84, the line will be cut and a horizontal scroll bar will be displayed.
* (the code indentation of the tag is not included in the width)
*/
+@SuppressWarnings("removal")
public class IngestClientDocumentationIT extends ESRestHighLevelClientTestCase {
public void testPutPipeline() throws IOException {
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/LicensingDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/LicensingDocumentationIT.java
index aefefd210ca0..f6a39abfe2b1 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/LicensingDocumentationIT.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/LicensingDocumentationIT.java
@@ -49,6 +49,7 @@ import static org.hamcrest.core.Is.is;
* Documentation for Licensing APIs in the high level java client.
* Code wrapped in {@code tag} and {@code end} tags is included in the docs.
*/
+@SuppressWarnings("removal")
public class LicensingDocumentationIT extends ESRestHighLevelClientTestCase {
@BeforeClass
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/MigrationClientDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/MigrationClientDocumentationIT.java
index 7987f33d0eeb..44b0e9e30be9 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/MigrationClientDocumentationIT.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/MigrationClientDocumentationIT.java
@@ -42,6 +42,7 @@ import java.util.concurrent.TimeUnit;
* than 84, the line will be cut and a horizontal scroll bar will be displayed.
* (the code indentation of the tag is not included in the width)
*/
+@SuppressWarnings("removal")
public class MigrationClientDocumentationIT extends ESRestHighLevelClientTestCase {
public void testGetDeprecationInfo() throws IOException, InterruptedException {
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/MigrationDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/MigrationDocumentationIT.java
index 877caf3980d9..9fce69bafca3 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/MigrationDocumentationIT.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/MigrationDocumentationIT.java
@@ -44,6 +44,7 @@ import java.util.Map;
* include-tagged::{doc-tests}/MigrationDocumentationIT.java[example]
* --------------------------------------------------
*/
+@SuppressWarnings("removal")
public class MigrationDocumentationIT extends ESRestHighLevelClientTestCase {
public void testClusterHealth() throws IOException {
RestHighLevelClient client = highLevelClient();
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/MiscellaneousDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/MiscellaneousDocumentationIT.java
index 5f4da866650a..977a4c4c4b44 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/MiscellaneousDocumentationIT.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/MiscellaneousDocumentationIT.java
@@ -38,6 +38,7 @@ import static org.hamcrest.Matchers.is;
* Documentation for miscellaneous APIs in the high level java client.
* Code wrapped in {@code tag} and {@code end} tags is included in the docs.
*/
+@SuppressWarnings("removal")
public class MiscellaneousDocumentationIT extends ESRestHighLevelClientTestCase {
public void testMain() throws IOException {
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/MlClientDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/MlClientDocumentationIT.java
index 6d6a23078335..b41e40122c3f 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/MlClientDocumentationIT.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/MlClientDocumentationIT.java
@@ -235,6 +235,7 @@ import static org.hamcrest.Matchers.lessThan;
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.core.Is.is;
+@SuppressWarnings("removal")
public class MlClientDocumentationIT extends ESRestHighLevelClientTestCase {
private static final RequestOptions POST_DATA_OPTIONS = RequestOptions.DEFAULT.toBuilder()
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/RollupDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/RollupDocumentationIT.java
index c376ba03eaf0..ba8e683f3333 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/RollupDocumentationIT.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/RollupDocumentationIT.java
@@ -71,6 +71,7 @@ import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.oneOf;
+@SuppressWarnings("removal")
public class RollupDocumentationIT extends ESRestHighLevelClientTestCase {
@Before
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/SearchDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/SearchDocumentationIT.java
index cf937f1f78a7..c8016be8168b 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/SearchDocumentationIT.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/SearchDocumentationIT.java
@@ -122,6 +122,7 @@ import static org.hamcrest.Matchers.greaterThan;
* Documentation for search APIs in the high level java client.
* Code wrapped in {@code tag} and {@code end} tags is included in the docs.
*/
+@SuppressWarnings("removal")
public class SearchDocumentationIT extends ESRestHighLevelClientTestCase {
@SuppressWarnings({"unused", "unchecked"})
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/SearchableSnapshotsDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/SearchableSnapshotsDocumentationIT.java
index 54622027d376..05e2289390c6 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/SearchableSnapshotsDocumentationIT.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/SearchableSnapshotsDocumentationIT.java
@@ -41,6 +41,7 @@ import java.util.concurrent.TimeUnit;
import static org.hamcrest.Matchers.is;
+@SuppressWarnings("removal")
public class SearchableSnapshotsDocumentationIT extends ESRestHighLevelClientTestCase {
public void testMountSnapshot() throws IOException, InterruptedException {
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/SecurityDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/SecurityDocumentationIT.java
index 987a6569fed2..1d4f3999d44c 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/SecurityDocumentationIT.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/SecurityDocumentationIT.java
@@ -158,6 +158,7 @@ import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.nullValue;
+@SuppressWarnings("removal")
public class SecurityDocumentationIT extends ESRestHighLevelClientTestCase {
@Override
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/SnapshotClientDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/SnapshotClientDocumentationIT.java
index ed0e9b0ca941..5383333b63e3 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/SnapshotClientDocumentationIT.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/SnapshotClientDocumentationIT.java
@@ -80,6 +80,7 @@ import static org.hamcrest.Matchers.equalTo;
* than 84, the line will be cut and a horizontal scroll bar will be displayed.
* (the code indentation of the tag is not included in the width)
*/
+@SuppressWarnings("removal")
public class SnapshotClientDocumentationIT extends ESRestHighLevelClientTestCase {
private static final String repositoryName = "test_repository";
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/StoredScriptsDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/StoredScriptsDocumentationIT.java
index 88f2e49414ed..d6bcf973e3a9 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/StoredScriptsDocumentationIT.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/StoredScriptsDocumentationIT.java
@@ -55,6 +55,7 @@ import static org.hamcrest.Matchers.equalTo;
* than 84, the line will be cut and a horizontal scroll bar will be displayed.
* (the code indentation of the tag is not included in the width)
*/
+@SuppressWarnings("removal")
public class StoredScriptsDocumentationIT extends ESRestHighLevelClientTestCase {
@SuppressWarnings("unused")
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/TasksClientDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/TasksClientDocumentationIT.java
index 73c217369c3e..bf5b2320653f 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/TasksClientDocumentationIT.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/TasksClientDocumentationIT.java
@@ -53,6 +53,7 @@ import static org.hamcrest.Matchers.notNullValue;
* than 84, the line will be cut and a horizontal scroll bar will be displayed.
* (the code indentation of the tag is not included in the width)
*/
+@SuppressWarnings("removal")
public class TasksClientDocumentationIT extends ESRestHighLevelClientTestCase {
@SuppressWarnings("unused")
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/TextStructureClientDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/TextStructureClientDocumentationIT.java
index f6fd9bd6f49d..5e6a8233f378 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/TextStructureClientDocumentationIT.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/TextStructureClientDocumentationIT.java
@@ -23,6 +23,7 @@ import org.elasticsearch.client.textstructure.FindStructureRequest;
import org.elasticsearch.client.textstructure.FindStructureResponse;
import org.elasticsearch.client.textstructure.structurefinder.TextStructure;
+@SuppressWarnings("removal")
public class TextStructureClientDocumentationIT extends ESRestHighLevelClientTestCase {
public void testFindStructure() throws Exception {
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/TransformDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/TransformDocumentationIT.java
index e9bebf3dc786..acb31798d658 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/TransformDocumentationIT.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/TransformDocumentationIT.java
@@ -66,6 +66,7 @@ import static org.elasticsearch.xcontent.XContentFactory.jsonBuilder;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasSize;
+@SuppressWarnings("removal")
public class TransformDocumentationIT extends ESRestHighLevelClientTestCase {
private List transformsToClean = new ArrayList<>();
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/WatcherDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/WatcherDocumentationIT.java
index a2a5d0680409..64de29bee3ad 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/WatcherDocumentationIT.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/WatcherDocumentationIT.java
@@ -49,6 +49,7 @@ import java.util.concurrent.TimeUnit;
import static org.hamcrest.Matchers.is;
+@SuppressWarnings("removal")
public class WatcherDocumentationIT extends ESRestHighLevelClientTestCase {
public void testStartStopWatchService() throws Exception {
diff --git a/qa/ccs-rolling-upgrade-remote-cluster/src/test/java/org/elasticsearch/upgrades/SearchStatesIT.java b/qa/ccs-rolling-upgrade-remote-cluster/src/test/java/org/elasticsearch/upgrades/SearchStatesIT.java
index 6f9689385e3b..c748bee16c0e 100644
--- a/qa/ccs-rolling-upgrade-remote-cluster/src/test/java/org/elasticsearch/upgrades/SearchStatesIT.java
+++ b/qa/ccs-rolling-upgrade-remote-cluster/src/test/java/org/elasticsearch/upgrades/SearchStatesIT.java
@@ -68,6 +68,7 @@ import static org.hamcrest.Matchers.not;
* This test ensure that we keep the search states of a CCS request correctly when the local and remote clusters
* have different but compatible versions. See SearchService#createAndPutReaderContext
*/
+@SuppressWarnings("removal")
public class SearchStatesIT extends ESRestTestCase {
private static final Logger LOGGER = LogManager.getLogger(SearchStatesIT.class);
diff --git a/qa/ccs-unavailable-clusters/src/test/java/org/elasticsearch/search/CrossClusterSearchUnavailableClusterIT.java b/qa/ccs-unavailable-clusters/src/test/java/org/elasticsearch/search/CrossClusterSearchUnavailableClusterIT.java
index d391d8186036..33808a7edb6d 100644
--- a/qa/ccs-unavailable-clusters/src/test/java/org/elasticsearch/search/CrossClusterSearchUnavailableClusterIT.java
+++ b/qa/ccs-unavailable-clusters/src/test/java/org/elasticsearch/search/CrossClusterSearchUnavailableClusterIT.java
@@ -62,6 +62,7 @@ import java.util.concurrent.TimeUnit;
import static org.hamcrest.CoreMatchers.containsString;
+@SuppressWarnings("removal")
public class CrossClusterSearchUnavailableClusterIT extends ESRestTestCase {
private static RestHighLevelClient restHighLevelClient;
diff --git a/qa/multi-cluster-search/src/test/java/org/elasticsearch/search/CCSDuelIT.java b/qa/multi-cluster-search/src/test/java/org/elasticsearch/search/CCSDuelIT.java
index 49fa8e8dd46c..dc764b5f20dd 100644
--- a/qa/multi-cluster-search/src/test/java/org/elasticsearch/search/CCSDuelIT.java
+++ b/qa/multi-cluster-search/src/test/java/org/elasticsearch/search/CCSDuelIT.java
@@ -115,6 +115,7 @@ import static org.hamcrest.Matchers.not;
* such parameter, hence we want to verify that results are the same in both scenarios.
*/
@TimeoutSuite(millis = 5 * TimeUnits.MINUTE) // to account for slow as hell VMs
+@SuppressWarnings("removal")
public class CCSDuelIT extends ESRestTestCase {
private static final String INDEX_NAME = "ccs_duel_index";
diff --git a/qa/remote-clusters/src/test/java/org/elasticsearch/cluster/remote/test/AbstractMultiClusterRemoteTestCase.java b/qa/remote-clusters/src/test/java/org/elasticsearch/cluster/remote/test/AbstractMultiClusterRemoteTestCase.java
index 7d5bac02394e..eeff4a42a861 100644
--- a/qa/remote-clusters/src/test/java/org/elasticsearch/cluster/remote/test/AbstractMultiClusterRemoteTestCase.java
+++ b/qa/remote-clusters/src/test/java/org/elasticsearch/cluster/remote/test/AbstractMultiClusterRemoteTestCase.java
@@ -29,6 +29,7 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Collections;
+@SuppressWarnings("removal")
public abstract class AbstractMultiClusterRemoteTestCase extends ESRestTestCase {
private static final String USER = "x_pack_rest_user";
diff --git a/qa/repository-multi-version/src/test/java/org/elasticsearch/upgrades/MultiVersionRepositoryAccessIT.java b/qa/repository-multi-version/src/test/java/org/elasticsearch/upgrades/MultiVersionRepositoryAccessIT.java
index 4f71acf1bc56..d52cf409094a 100644
--- a/qa/repository-multi-version/src/test/java/org/elasticsearch/upgrades/MultiVersionRepositoryAccessIT.java
+++ b/qa/repository-multi-version/src/test/java/org/elasticsearch/upgrades/MultiVersionRepositoryAccessIT.java
@@ -54,6 +54,7 @@ import static org.hamcrest.Matchers.is;
* Run against the current version cluster from the second step: {@link TestStep#STEP4_NEW_CLUSTER}
*
*/
+@SuppressWarnings("removal")
public class MultiVersionRepositoryAccessIT extends ESRestTestCase {
private enum TestStep {
diff --git a/qa/wildfly/src/main/java/org/elasticsearch/wildfly/transport/RestHighLevelClientEmployeeResource.java b/qa/wildfly/src/main/java/org/elasticsearch/wildfly/transport/RestHighLevelClientEmployeeResource.java
index 6e271b2af753..ae1f90f32bef 100644
--- a/qa/wildfly/src/main/java/org/elasticsearch/wildfly/transport/RestHighLevelClientEmployeeResource.java
+++ b/qa/wildfly/src/main/java/org/elasticsearch/wildfly/transport/RestHighLevelClientEmployeeResource.java
@@ -36,6 +36,7 @@ import javax.ws.rs.core.Response;
import static org.elasticsearch.xcontent.XContentFactory.jsonBuilder;
@Path("/employees")
+@SuppressWarnings("removal")
public class RestHighLevelClientEmployeeResource {
@Inject
diff --git a/qa/wildfly/src/main/java/org/elasticsearch/wildfly/transport/RestHighLevelClientProducer.java b/qa/wildfly/src/main/java/org/elasticsearch/wildfly/transport/RestHighLevelClientProducer.java
index 958985c889a4..dd8cdb193343 100644
--- a/qa/wildfly/src/main/java/org/elasticsearch/wildfly/transport/RestHighLevelClientProducer.java
+++ b/qa/wildfly/src/main/java/org/elasticsearch/wildfly/transport/RestHighLevelClientProducer.java
@@ -22,6 +22,7 @@ import javax.enterprise.inject.Produces;
public final class RestHighLevelClientProducer {
@Produces
+ @SuppressWarnings("removal")
public RestHighLevelClient createRestHighLevelClient() {
String httpUri = System.getProperty("elasticsearch.uri");
diff --git a/x-pack/plugin/deprecation/qa/rest/src/javaRestTest/java/org/elasticsearch/xpack/deprecation/MlDeprecationIT.java b/x-pack/plugin/deprecation/qa/rest/src/javaRestTest/java/org/elasticsearch/xpack/deprecation/MlDeprecationIT.java
index ceab67b09e37..b2162179363b 100644
--- a/x-pack/plugin/deprecation/qa/rest/src/javaRestTest/java/org/elasticsearch/xpack/deprecation/MlDeprecationIT.java
+++ b/x-pack/plugin/deprecation/qa/rest/src/javaRestTest/java/org/elasticsearch/xpack/deprecation/MlDeprecationIT.java
@@ -38,6 +38,7 @@ import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasSize;
+@SuppressWarnings("removal")
public class MlDeprecationIT extends ESRestTestCase {
private static final RequestOptions REQUEST_OPTIONS = RequestOptions.DEFAULT.toBuilder()
diff --git a/x-pack/plugin/eql/qa/common/src/main/java/org/elasticsearch/test/eql/BaseEqlSpecTestCase.java b/x-pack/plugin/eql/qa/common/src/main/java/org/elasticsearch/test/eql/BaseEqlSpecTestCase.java
index 597bb7531dd6..719f2a1d69ee 100644
--- a/x-pack/plugin/eql/qa/common/src/main/java/org/elasticsearch/test/eql/BaseEqlSpecTestCase.java
+++ b/x-pack/plugin/eql/qa/common/src/main/java/org/elasticsearch/test/eql/BaseEqlSpecTestCase.java
@@ -34,6 +34,7 @@ import java.util.StringJoiner;
import static java.util.stream.Collectors.toList;
+@SuppressWarnings("removal")
public abstract class BaseEqlSpecTestCase extends RemoteClusterAwareEqlRestTestCase {
protected static final String PARAM_FORMATTING = "%2$s";
diff --git a/x-pack/plugin/eql/qa/common/src/main/java/org/elasticsearch/test/eql/DataLoader.java b/x-pack/plugin/eql/qa/common/src/main/java/org/elasticsearch/test/eql/DataLoader.java
index 42cf97a883f7..3cb0324d1113 100644
--- a/x-pack/plugin/eql/qa/common/src/main/java/org/elasticsearch/test/eql/DataLoader.java
+++ b/x-pack/plugin/eql/qa/common/src/main/java/org/elasticsearch/test/eql/DataLoader.java
@@ -52,6 +52,7 @@ import org.elasticsearch.xpack.ql.TestUtils;
*
* While the loader could be made generic, the queries are bound to each index and generalizing that would make things way too complicated.
*/
+@SuppressWarnings("removal")
public class DataLoader {
public static final String TEST_INDEX = "endgame-140";
public static final String TEST_EXTRA_INDEX = "extra";
diff --git a/x-pack/plugin/eql/qa/common/src/main/java/org/elasticsearch/test/eql/RemoteClusterAwareEqlRestTestCase.java b/x-pack/plugin/eql/qa/common/src/main/java/org/elasticsearch/test/eql/RemoteClusterAwareEqlRestTestCase.java
index a7b76e71a9c7..87f9e8052346 100644
--- a/x-pack/plugin/eql/qa/common/src/main/java/org/elasticsearch/test/eql/RemoteClusterAwareEqlRestTestCase.java
+++ b/x-pack/plugin/eql/qa/common/src/main/java/org/elasticsearch/test/eql/RemoteClusterAwareEqlRestTestCase.java
@@ -28,6 +28,7 @@ import java.util.Collections;
import static org.elasticsearch.common.Strings.hasText;
+@SuppressWarnings("removal")
public abstract class RemoteClusterAwareEqlRestTestCase extends ESRestTestCase {
private static final long CLIENT_TIMEOUT = 40L; // upped from 10s to accomodate for max measured throughput decline
diff --git a/x-pack/plugin/eql/qa/common/src/main/java/org/elasticsearch/test/eql/stats/EqlUsageRestTestCase.java b/x-pack/plugin/eql/qa/common/src/main/java/org/elasticsearch/test/eql/stats/EqlUsageRestTestCase.java
index b45822bf3750..15fd7a6e625a 100644
--- a/x-pack/plugin/eql/qa/common/src/main/java/org/elasticsearch/test/eql/stats/EqlUsageRestTestCase.java
+++ b/x-pack/plugin/eql/qa/common/src/main/java/org/elasticsearch/test/eql/stats/EqlUsageRestTestCase.java
@@ -30,6 +30,7 @@ import java.util.Set;
/**
* Tests a random number of queries that increase various (most of the times, one query will "touch" multiple metrics values) metrics.
*/
+@SuppressWarnings("removal")
public abstract class EqlUsageRestTestCase extends ESRestTestCase {
private RestHighLevelClient highLevelClient;
diff --git a/x-pack/plugin/eql/qa/correctness/src/javaRestTest/java/org/elasticsearch/xpack/eql/EqlDataLoader.java b/x-pack/plugin/eql/qa/correctness/src/javaRestTest/java/org/elasticsearch/xpack/eql/EqlDataLoader.java
index b08df71faf00..fbd38a5ff82c 100644
--- a/x-pack/plugin/eql/qa/correctness/src/javaRestTest/java/org/elasticsearch/xpack/eql/EqlDataLoader.java
+++ b/x-pack/plugin/eql/qa/correctness/src/javaRestTest/java/org/elasticsearch/xpack/eql/EqlDataLoader.java
@@ -27,6 +27,7 @@ import java.util.Properties;
import static org.elasticsearch.test.ESTestCase.assertEquals;
+@SuppressWarnings("removal")
public class EqlDataLoader {
private static final String PROPERTIES_FILENAME = "config.properties";
diff --git a/x-pack/plugin/eql/qa/correctness/src/javaRestTest/java/org/elasticsearch/xpack/eql/EsEQLCorrectnessIT.java b/x-pack/plugin/eql/qa/correctness/src/javaRestTest/java/org/elasticsearch/xpack/eql/EsEQLCorrectnessIT.java
index fccc191531d0..9bf2a620cb4c 100644
--- a/x-pack/plugin/eql/qa/correctness/src/javaRestTest/java/org/elasticsearch/xpack/eql/EsEQLCorrectnessIT.java
+++ b/x-pack/plugin/eql/qa/correctness/src/javaRestTest/java/org/elasticsearch/xpack/eql/EsEQLCorrectnessIT.java
@@ -43,6 +43,7 @@ import static org.elasticsearch.xpack.ql.TestUtils.assertNoSearchContexts;
@TimeoutSuite(millis = 30 * TimeUnits.MINUTE)
@TestLogging(value = "org.elasticsearch.xpack.eql.EsEQLCorrectnessIT:INFO", reason = "Log query execution time")
+@SuppressWarnings("removal")
public class EsEQLCorrectnessIT extends ESRestTestCase {
private static final String PARAM_FORMATTING = "%1$s";
diff --git a/x-pack/plugin/identity-provider/qa/idp-rest-tests/src/javaRestTest/java/org/elasticsearch/xpack/idp/IdpRestTestCase.java b/x-pack/plugin/identity-provider/qa/idp-rest-tests/src/javaRestTest/java/org/elasticsearch/xpack/idp/IdpRestTestCase.java
index 0fc25e182eea..384e2aea8449 100644
--- a/x-pack/plugin/identity-provider/qa/idp-rest-tests/src/javaRestTest/java/org/elasticsearch/xpack/idp/IdpRestTestCase.java
+++ b/x-pack/plugin/identity-provider/qa/idp-rest-tests/src/javaRestTest/java/org/elasticsearch/xpack/idp/IdpRestTestCase.java
@@ -42,6 +42,7 @@ import java.util.stream.Collectors;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.instanceOf;
+@SuppressWarnings("removal")
public abstract class IdpRestTestCase extends ESRestTestCase {
private RestHighLevelClient highLevelAdminClient;
diff --git a/x-pack/plugin/ilm/qa/with-security/src/javaRestTest/java/org/elasticsearch/xpack/security/PermissionsIT.java b/x-pack/plugin/ilm/qa/with-security/src/javaRestTest/java/org/elasticsearch/xpack/security/PermissionsIT.java
index 9765b646b47a..c3f5c5c910d3 100644
--- a/x-pack/plugin/ilm/qa/with-security/src/javaRestTest/java/org/elasticsearch/xpack/security/PermissionsIT.java
+++ b/x-pack/plugin/ilm/qa/with-security/src/javaRestTest/java/org/elasticsearch/xpack/security/PermissionsIT.java
@@ -67,6 +67,7 @@ import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
+@SuppressWarnings("removal")
public class PermissionsIT extends ESRestTestCase {
private static final String jsonDoc = "{ \"name\" : \"elasticsearch\", \"body\": \"foo bar\" }";
diff --git a/x-pack/plugin/security/qa/security-basic/src/javaRestTest/java/org/elasticsearch/xpack/security/SecurityInBasicRestTestCase.java b/x-pack/plugin/security/qa/security-basic/src/javaRestTest/java/org/elasticsearch/xpack/security/SecurityInBasicRestTestCase.java
index 0b09384daaff..7aa691f1c61b 100644
--- a/x-pack/plugin/security/qa/security-basic/src/javaRestTest/java/org/elasticsearch/xpack/security/SecurityInBasicRestTestCase.java
+++ b/x-pack/plugin/security/qa/security-basic/src/javaRestTest/java/org/elasticsearch/xpack/security/SecurityInBasicRestTestCase.java
@@ -15,6 +15,7 @@ import org.elasticsearch.test.rest.ESRestTestCase;
import java.util.List;
+@SuppressWarnings("removal")
public abstract class SecurityInBasicRestTestCase extends ESRestTestCase {
private RestHighLevelClient highLevelAdminClient;
diff --git a/x-pack/plugin/security/qa/security-trial/src/javaRestTest/java/org/elasticsearch/xpack/security/SecurityOnTrialLicenseRestTestCase.java b/x-pack/plugin/security/qa/security-trial/src/javaRestTest/java/org/elasticsearch/xpack/security/SecurityOnTrialLicenseRestTestCase.java
index 6860e159d5c6..f0b293ffb5aa 100644
--- a/x-pack/plugin/security/qa/security-trial/src/javaRestTest/java/org/elasticsearch/xpack/security/SecurityOnTrialLicenseRestTestCase.java
+++ b/x-pack/plugin/security/qa/security-trial/src/javaRestTest/java/org/elasticsearch/xpack/security/SecurityOnTrialLicenseRestTestCase.java
@@ -33,6 +33,7 @@ import java.io.IOException;
import java.util.Collection;
import java.util.List;
+@SuppressWarnings("removal")
public abstract class SecurityOnTrialLicenseRestTestCase extends ESRestTestCase {
private RestHighLevelClient highLevelAdminClient;
diff --git a/x-pack/plugin/security/qa/smoke-test-all-realms/src/javaRestTest/java/org/elasticsearch/xpack/security/authc/SecurityRealmSmokeTestCase.java b/x-pack/plugin/security/qa/smoke-test-all-realms/src/javaRestTest/java/org/elasticsearch/xpack/security/authc/SecurityRealmSmokeTestCase.java
index cf3e2ed576a6..93c477b79352 100644
--- a/x-pack/plugin/security/qa/smoke-test-all-realms/src/javaRestTest/java/org/elasticsearch/xpack/security/authc/SecurityRealmSmokeTestCase.java
+++ b/x-pack/plugin/security/qa/smoke-test-all-realms/src/javaRestTest/java/org/elasticsearch/xpack/security/authc/SecurityRealmSmokeTestCase.java
@@ -40,6 +40,7 @@ import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasEntry;
import static org.hamcrest.Matchers.instanceOf;
+@SuppressWarnings("removal")
public abstract class SecurityRealmSmokeTestCase extends ESRestTestCase {
private static Path httpCAPath;
diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/ClearRolesCacheTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/ClearRolesCacheTests.java
index 2a6d00f93d3c..6c6493f08851 100644
--- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/ClearRolesCacheTests.java
+++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/ClearRolesCacheTests.java
@@ -37,6 +37,7 @@ import static org.hamcrest.Matchers.notNullValue;
/**
* Test for the clear roles API
*/
+@SuppressWarnings("removal")
public class ClearRolesCacheTests extends NativeRealmIntegTestCase {
private static String[] roles;
diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/test/NativeRealmIntegTestCase.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/test/NativeRealmIntegTestCase.java
index 8ed8c67295d6..13f8b28a03ae 100644
--- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/test/NativeRealmIntegTestCase.java
+++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/test/NativeRealmIntegTestCase.java
@@ -35,6 +35,7 @@ import static org.elasticsearch.test.SecuritySettingsSource.SECURITY_REQUEST_OPT
/**
* Test case with method to handle the starting and stopping the stores for native users and roles
*/
+@SuppressWarnings("removal")
public abstract class NativeRealmIntegTestCase extends SecurityIntegTestCase {
@Before
diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/ApiKeyIntegTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/ApiKeyIntegTests.java
index 4b05e6062c4e..7715f3645a0a 100644
--- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/ApiKeyIntegTests.java
+++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/ApiKeyIntegTests.java
@@ -98,6 +98,7 @@ import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.nullValue;
+@SuppressWarnings("removal")
public class ApiKeyIntegTests extends SecurityIntegTestCase {
private static final long DELETE_INTERVAL_MILLIS = 100L;
private static final int CRYPTO_THREAD_POOL_QUEUE_SIZE = 10;
diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/TokenAuthIntegTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/TokenAuthIntegTests.java
index de6aafdd374b..3a507cd17502 100644
--- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/TokenAuthIntegTests.java
+++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/TokenAuthIntegTests.java
@@ -60,6 +60,7 @@ import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasItem;
+@SuppressWarnings("removal")
public class TokenAuthIntegTests extends SecurityIntegTestCase {
@Override
diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/esnative/ReservedRealmIntegTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/esnative/ReservedRealmIntegTests.java
index 5d3f79fd4359..d56d145b9e9e 100644
--- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/esnative/ReservedRealmIntegTests.java
+++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/esnative/ReservedRealmIntegTests.java
@@ -39,6 +39,7 @@ import static org.hamcrest.Matchers.is;
/**
* Integration tests for the built in realm
*/
+@SuppressWarnings("removal")
public class ReservedRealmIntegTests extends NativeRealmIntegTestCase {
private static Hasher hasher;
diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/pki/PkiAuthDelegationIntegTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/pki/PkiAuthDelegationIntegTests.java
index be12c0a23a6f..01e68d662ed0 100644
--- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/pki/PkiAuthDelegationIntegTests.java
+++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/pki/PkiAuthDelegationIntegTests.java
@@ -47,6 +47,7 @@ import static org.hamcrest.Matchers.emptyCollectionOf;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.startsWith;
+@SuppressWarnings("removal")
public class PkiAuthDelegationIntegTests extends SecurityIntegTestCase {
@Override
diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authz/SnapshotUserRoleIntegTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authz/SnapshotUserRoleIntegTests.java
index fef193edfe41..fde6ed834d2a 100644
--- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authz/SnapshotUserRoleIntegTests.java
+++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authz/SnapshotUserRoleIntegTests.java
@@ -43,6 +43,7 @@ import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
+@SuppressWarnings("removal")
public class SnapshotUserRoleIntegTests extends NativeRealmIntegTestCase {
private Client client;
diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/test/SecurityIntegTestCase.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/test/SecurityIntegTestCase.java
index 32bf82501f0a..a42bf04e1785 100644
--- a/x-pack/plugin/security/src/test/java/org/elasticsearch/test/SecurityIntegTestCase.java
+++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/test/SecurityIntegTestCase.java
@@ -67,6 +67,7 @@ import static org.hamcrest.Matchers.is;
*
* @see SecuritySettingsSource
*/
+@SuppressWarnings("removal")
public abstract class SecurityIntegTestCase extends ESIntegTestCase {
private static SecuritySettingsSource SECURITY_DEFAULT_SETTINGS;
diff --git a/x-pack/plugin/transform/qa/multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/LatestIT.java b/x-pack/plugin/transform/qa/multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/LatestIT.java
index fe71b4ee12ef..5dafeef6bb32 100644
--- a/x-pack/plugin/transform/qa/multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/LatestIT.java
+++ b/x-pack/plugin/transform/qa/multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/LatestIT.java
@@ -38,6 +38,7 @@ import static org.hamcrest.Matchers.hasKey;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.is;
+@SuppressWarnings("removal")
public class LatestIT extends TransformIntegTestCase {
private static final String SOURCE_INDEX_NAME = "basic-crud-latest-reviews";
diff --git a/x-pack/plugin/transform/qa/multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TransformIT.java b/x-pack/plugin/transform/qa/multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TransformIT.java
index 9eb813e722fd..936b47eed307 100644
--- a/x-pack/plugin/transform/qa/multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TransformIT.java
+++ b/x-pack/plugin/transform/qa/multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TransformIT.java
@@ -50,6 +50,7 @@ import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.lessThan;
import static org.hamcrest.Matchers.oneOf;
+@SuppressWarnings("removal")
public class TransformIT extends TransformIntegTestCase {
private static final int NUM_USERS = 28;
diff --git a/x-pack/plugin/transform/qa/multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TransformIntegTestCase.java b/x-pack/plugin/transform/qa/multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TransformIntegTestCase.java
index 7db96bd01eb0..830039ce91b2 100644
--- a/x-pack/plugin/transform/qa/multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TransformIntegTestCase.java
+++ b/x-pack/plugin/transform/qa/multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TransformIntegTestCase.java
@@ -82,6 +82,7 @@ import java.util.function.Function;
import static org.elasticsearch.xcontent.XContentFactory.jsonBuilder;
import static org.hamcrest.core.Is.is;
+@SuppressWarnings("removal")
abstract class TransformIntegTestCase extends ESRestTestCase {
private Map transformConfigs = new HashMap<>();
diff --git a/x-pack/plugin/transform/qa/multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TransformUsingSearchRuntimeFieldsIT.java b/x-pack/plugin/transform/qa/multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TransformUsingSearchRuntimeFieldsIT.java
index 674194a607e3..b67ed06972f0 100644
--- a/x-pack/plugin/transform/qa/multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TransformUsingSearchRuntimeFieldsIT.java
+++ b/x-pack/plugin/transform/qa/multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TransformUsingSearchRuntimeFieldsIT.java
@@ -50,6 +50,7 @@ import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not;
+@SuppressWarnings("removal")
public class TransformUsingSearchRuntimeFieldsIT extends TransformIntegTestCase {
private static final String REVIEWS_INDEX_NAME = "basic-crud-reviews";
diff --git a/x-pack/plugin/transform/qa/multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/continuous/ContinuousTestCase.java b/x-pack/plugin/transform/qa/multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/continuous/ContinuousTestCase.java
index a2d6961f13e6..ad7a0aa41ea5 100644
--- a/x-pack/plugin/transform/qa/multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/continuous/ContinuousTestCase.java
+++ b/x-pack/plugin/transform/qa/multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/continuous/ContinuousTestCase.java
@@ -41,6 +41,7 @@ import static java.time.temporal.ChronoField.MINUTE_OF_HOUR;
import static java.time.temporal.ChronoField.NANO_OF_SECOND;
import static java.time.temporal.ChronoField.SECOND_OF_MINUTE;
+@SuppressWarnings("removal")
public abstract class ContinuousTestCase extends ESRestTestCase {
public static final TimeValue SYNC_DELAY = new TimeValue(1, TimeUnit.SECONDS);
diff --git a/x-pack/plugin/transform/qa/multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/continuous/TransformContinuousIT.java b/x-pack/plugin/transform/qa/multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/continuous/TransformContinuousIT.java
index a7f7827253d6..580ff5b26e3f 100644
--- a/x-pack/plugin/transform/qa/multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/continuous/TransformContinuousIT.java
+++ b/x-pack/plugin/transform/qa/multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/continuous/TransformContinuousIT.java
@@ -108,6 +108,7 @@ import static org.hamcrest.core.Is.is;
* to check that optimizations worked
* - repeat
*/
+@SuppressWarnings("removal")
public class TransformContinuousIT extends ESRestTestCase {
private List transformTestCases = new ArrayList<>();
diff --git a/x-pack/plugin/transform/qa/single-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TransformGetAndGetStatsIT.java b/x-pack/plugin/transform/qa/single-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TransformGetAndGetStatsIT.java
index c47ed62d250f..35e1850822f0 100644
--- a/x-pack/plugin/transform/qa/single-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TransformGetAndGetStatsIT.java
+++ b/x-pack/plugin/transform/qa/single-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TransformGetAndGetStatsIT.java
@@ -53,6 +53,7 @@ import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.oneOf;
+@SuppressWarnings("removal")
public class TransformGetAndGetStatsIT extends TransformRestTestCase {
private static final String TEST_USER_NAME = "transform_user";
diff --git a/x-pack/plugin/transform/qa/single-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TransformProgressIT.java b/x-pack/plugin/transform/qa/single-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TransformProgressIT.java
index d7132a29ccd1..7f3b1fbc85cb 100644
--- a/x-pack/plugin/transform/qa/single-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TransformProgressIT.java
+++ b/x-pack/plugin/transform/qa/single-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TransformProgressIT.java
@@ -54,6 +54,7 @@ import static org.elasticsearch.xpack.transform.integration.TransformRestTestCas
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
+@SuppressWarnings("removal")
public class TransformProgressIT extends ESRestTestCase {
protected void createReviewsIndex(int userWithMissingBuckets) throws Exception {
final int numDocs = 1000;
diff --git a/x-pack/qa/reindex-tests-with-security/src/test/java/org/elasticsearch/xpack/security/ReindexWithSecurityIT.java b/x-pack/qa/reindex-tests-with-security/src/test/java/org/elasticsearch/xpack/security/ReindexWithSecurityIT.java
index c8ad45532d10..7784210e4814 100644
--- a/x-pack/qa/reindex-tests-with-security/src/test/java/org/elasticsearch/xpack/security/ReindexWithSecurityIT.java
+++ b/x-pack/qa/reindex-tests-with-security/src/test/java/org/elasticsearch/xpack/security/ReindexWithSecurityIT.java
@@ -37,6 +37,7 @@ import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
+@SuppressWarnings("removal")
public class ReindexWithSecurityIT extends ESRestTestCase {
private static final String USER = "test_admin";
diff --git a/x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/MlJobSnapshotUpgradeIT.java b/x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/MlJobSnapshotUpgradeIT.java
index 3aafd7addd09..f6f3610b38fe 100644
--- a/x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/MlJobSnapshotUpgradeIT.java
+++ b/x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/MlJobSnapshotUpgradeIT.java
@@ -61,6 +61,7 @@ import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.is;
+@SuppressWarnings("removal")
public class MlJobSnapshotUpgradeIT extends AbstractUpgradeTestCase {
private static final String JOB_ID = "ml-snapshots-upgrade-job";
diff --git a/x-pack/qa/runtime-fields/with-security/src/javaRestTest/java/org/elasticsearch/xpack/security/PermissionsIT.java b/x-pack/qa/runtime-fields/with-security/src/javaRestTest/java/org/elasticsearch/xpack/security/PermissionsIT.java
index 44718bd5cad0..644ac87486db 100644
--- a/x-pack/qa/runtime-fields/with-security/src/javaRestTest/java/org/elasticsearch/xpack/security/PermissionsIT.java
+++ b/x-pack/qa/runtime-fields/with-security/src/javaRestTest/java/org/elasticsearch/xpack/security/PermissionsIT.java
@@ -29,6 +29,7 @@ import java.io.IOException;
import java.util.Collections;
import java.util.Map;
+@SuppressWarnings("removal")
public class PermissionsIT extends ESRestTestCase {
private static HighLevelClient highLevelClient;
diff --git a/x-pack/qa/security-example-spi-extension/src/javaRestTest/java/org/elasticsearch/example/role/CustomRolesProviderIT.java b/x-pack/qa/security-example-spi-extension/src/javaRestTest/java/org/elasticsearch/example/role/CustomRolesProviderIT.java
index 3fb7faf1aa90..4f83c57106a5 100644
--- a/x-pack/qa/security-example-spi-extension/src/javaRestTest/java/org/elasticsearch/example/role/CustomRolesProviderIT.java
+++ b/x-pack/qa/security-example-spi-extension/src/javaRestTest/java/org/elasticsearch/example/role/CustomRolesProviderIT.java
@@ -34,6 +34,7 @@ import static org.hamcrest.Matchers.is;
/**
* Integration test for custom roles providers.
*/
+@SuppressWarnings("removal")
public class CustomRolesProviderIT extends ESRestTestCase {
private static final String TEST_USER = "test_user";
private static final String TEST_PWD = "test-user-password";
diff --git a/x-pack/qa/smoke-test-plugins-ssl/src/test/java/org/elasticsearch/smoketest/SmokeTestMonitoringWithSecurityIT.java b/x-pack/qa/smoke-test-plugins-ssl/src/test/java/org/elasticsearch/smoketest/SmokeTestMonitoringWithSecurityIT.java
index 79ec0cf523fa..7036714b4ba5 100644
--- a/x-pack/qa/smoke-test-plugins-ssl/src/test/java/org/elasticsearch/smoketest/SmokeTestMonitoringWithSecurityIT.java
+++ b/x-pack/qa/smoke-test-plugins-ssl/src/test/java/org/elasticsearch/smoketest/SmokeTestMonitoringWithSecurityIT.java
@@ -69,6 +69,7 @@ import static org.hamcrest.Matchers.notNullValue;
* then uses a rest client to check that the data have been correctly received and
* indexed in the cluster.
*/
+@SuppressWarnings("removal")
public class SmokeTestMonitoringWithSecurityIT extends ESRestTestCase {
public class TestRestHighLevelClient extends RestHighLevelClient {