Remove unused compat shims from o.e.a.datastreams (#112697)

Relates #111474 Relates #107984
elastic · Sep 10, 2024 · ecd887d · ecd887d
1 parent dcb7ed2
commit ecd887d
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 19 deletions.
diff --git a/...c/internalClusterTest/java/org/elasticsearch/datastreams/IngestFailureStoreMetricsIT.java b/...c/internalClusterTest/java/org/elasticsearch/datastreams/IngestFailureStoreMetricsIT.java
@@ -237,7 +237,7 @@ public void testRerouteSuccessfulCorrectName() throws IOException {
         createDataStream();
 
         String destination = dataStream + "-destination";
-        final var createDataStreamRequest = new CreateDataStreamAction.Request(destination);
+        final var createDataStreamRequest = new CreateDataStreamAction.Request(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT, destination);
         assertAcked(client().execute(CreateDataStreamAction.INSTANCE, createDataStreamRequest).actionGet());
         createReroutePipeline(destination);
 
@@ -306,7 +306,7 @@ private void putComposableIndexTemplate(boolean failureStore) throws IOException
     }
 
     private void createDataStream() {
-        final var createDataStreamRequest = new CreateDataStreamAction.Request(dataStream);
+        final var createDataStreamRequest = new CreateDataStreamAction.Request(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT, dataStream);
         assertAcked(client().execute(CreateDataStreamAction.INSTANCE, createDataStreamRequest).actionGet());
     }
 

diff --git a/server/src/main/java/org/elasticsearch/action/datastreams/CreateDataStreamAction.java b/server/src/main/java/org/elasticsearch/action/datastreams/CreateDataStreamAction.java
@@ -14,7 +14,6 @@
 import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.action.support.master.AcknowledgedRequest;
 import org.elasticsearch.action.support.master.AcknowledgedResponse;
-import org.elasticsearch.action.support.master.MasterNodeRequest;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -49,11 +48,6 @@ public Request(TimeValue masterNodeTimeout, TimeValue ackTimeout, String name, l
             this.startTime = startTime;
         }
 
-        @Deprecated(forRemoval = true) // temporary compatibility shim
-        public Request(String name) {
-            this(MasterNodeRequest.TRAPPY_IMPLICIT_DEFAULT_MASTER_NODE_TIMEOUT, AcknowledgedRequest.DEFAULT_ACK_TIMEOUT, name);
-        }
-
         public String getName() {
             return name;
         }

diff --git a/server/src/main/java/org/elasticsearch/action/datastreams/DeleteDataStreamAction.java b/server/src/main/java/org/elasticsearch/action/datastreams/DeleteDataStreamAction.java
@@ -53,11 +53,6 @@ public Request(TimeValue masterNodeTimeout, String... names) {
             this.wildcardExpressionsOriginallySpecified = Arrays.stream(names).anyMatch(Regex::isSimpleMatchPattern);
         }
 
-        @Deprecated(forRemoval = true) // temporary compatibility shim
-        public Request(String... names) {
-            this(MasterNodeRequest.TRAPPY_IMPLICIT_DEFAULT_MASTER_NODE_TIMEOUT, names);
-        }
-
         public String[] getNames() {
             return names;
         }

diff --git a/server/src/main/java/org/elasticsearch/action/datastreams/GetDataStreamAction.java b/server/src/main/java/org/elasticsearch/action/datastreams/GetDataStreamAction.java
@@ -15,7 +15,6 @@
 import org.elasticsearch.action.admin.indices.rollover.RolloverConfiguration;
 import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.action.support.master.MasterNodeReadRequest;
-import org.elasticsearch.action.support.master.MasterNodeRequest;
 import org.elasticsearch.cluster.SimpleDiffable;
 import org.elasticsearch.cluster.health.ClusterHealthStatus;
 import org.elasticsearch.cluster.metadata.DataStream;
@@ -71,11 +70,6 @@ public Request(TimeValue masterNodeTimeout, String[] names, boolean includeDefau
             this.includeDefaults = includeDefaults;
         }
 
-        @Deprecated(forRemoval = true) // temporary compatibility shim
-        public Request(String[] names) {
-            this(MasterNodeRequest.TRAPPY_IMPLICIT_DEFAULT_MASTER_NODE_TIMEOUT, names);
-        }
-
         public String[] getNames() {
             return names;
         }