Skip to content

Commit ecd887d

Browse files
authored
Remove unused compat shims from o.e.a.datastreams (#112697)
Relates #111474 Relates #107984
1 parent dcb7ed2 commit ecd887d

File tree

4 files changed

+2
-19
lines changed

4 files changed

+2
-19
lines changed

modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/IngestFailureStoreMetricsIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ public void testRerouteSuccessfulCorrectName() throws IOException {
237237
createDataStream();
238238

239239
String destination = dataStream + "-destination";
240-
final var createDataStreamRequest = new CreateDataStreamAction.Request(destination);
240+
final var createDataStreamRequest = new CreateDataStreamAction.Request(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT, destination);
241241
assertAcked(client().execute(CreateDataStreamAction.INSTANCE, createDataStreamRequest).actionGet());
242242
createReroutePipeline(destination);
243243

@@ -306,7 +306,7 @@ private void putComposableIndexTemplate(boolean failureStore) throws IOException
306306
}
307307

308308
private void createDataStream() {
309-
final var createDataStreamRequest = new CreateDataStreamAction.Request(dataStream);
309+
final var createDataStreamRequest = new CreateDataStreamAction.Request(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT, dataStream);
310310
assertAcked(client().execute(CreateDataStreamAction.INSTANCE, createDataStreamRequest).actionGet());
311311
}
312312

server/src/main/java/org/elasticsearch/action/datastreams/CreateDataStreamAction.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import org.elasticsearch.action.support.IndicesOptions;
1515
import org.elasticsearch.action.support.master.AcknowledgedRequest;
1616
import org.elasticsearch.action.support.master.AcknowledgedResponse;
17-
import org.elasticsearch.action.support.master.MasterNodeRequest;
1817
import org.elasticsearch.common.Strings;
1918
import org.elasticsearch.common.io.stream.StreamInput;
2019
import org.elasticsearch.common.io.stream.StreamOutput;
@@ -49,11 +48,6 @@ public Request(TimeValue masterNodeTimeout, TimeValue ackTimeout, String name, l
4948
this.startTime = startTime;
5049
}
5150

52-
@Deprecated(forRemoval = true) // temporary compatibility shim
53-
public Request(String name) {
54-
this(MasterNodeRequest.TRAPPY_IMPLICIT_DEFAULT_MASTER_NODE_TIMEOUT, AcknowledgedRequest.DEFAULT_ACK_TIMEOUT, name);
55-
}
56-
5751
public String getName() {
5852
return name;
5953
}

server/src/main/java/org/elasticsearch/action/datastreams/DeleteDataStreamAction.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,6 @@ public Request(TimeValue masterNodeTimeout, String... names) {
5353
this.wildcardExpressionsOriginallySpecified = Arrays.stream(names).anyMatch(Regex::isSimpleMatchPattern);
5454
}
5555

56-
@Deprecated(forRemoval = true) // temporary compatibility shim
57-
public Request(String... names) {
58-
this(MasterNodeRequest.TRAPPY_IMPLICIT_DEFAULT_MASTER_NODE_TIMEOUT, names);
59-
}
60-
6156
public String[] getNames() {
6257
return names;
6358
}

server/src/main/java/org/elasticsearch/action/datastreams/GetDataStreamAction.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import org.elasticsearch.action.admin.indices.rollover.RolloverConfiguration;
1616
import org.elasticsearch.action.support.IndicesOptions;
1717
import org.elasticsearch.action.support.master.MasterNodeReadRequest;
18-
import org.elasticsearch.action.support.master.MasterNodeRequest;
1918
import org.elasticsearch.cluster.SimpleDiffable;
2019
import org.elasticsearch.cluster.health.ClusterHealthStatus;
2120
import org.elasticsearch.cluster.metadata.DataStream;
@@ -71,11 +70,6 @@ public Request(TimeValue masterNodeTimeout, String[] names, boolean includeDefau
7170
this.includeDefaults = includeDefaults;
7271
}
7372

74-
@Deprecated(forRemoval = true) // temporary compatibility shim
75-
public Request(String[] names) {
76-
this(MasterNodeRequest.TRAPPY_IMPLICIT_DEFAULT_MASTER_NODE_TIMEOUT, names);
77-
}
78-
7973
public String[] getNames() {
8074
return names;
8175
}

0 commit comments

Comments
 (0)