Skip to content

Commit d907181

Browse files
authored
Remove type param from BaseNodesRequest (#114399)
This type parameter is only needed so that the `.timeout(TimeValue)` method returns a request of the right type, but this still requires an unchecked cast. Yet there's no real need to return anything from this method, we can just use a regular setter. This commit does that.
1 parent 612ce0f commit d907181

File tree

60 files changed

+124
-123
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+124
-123
lines changed

modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/direct/GetDatabaseConfigurationAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ protected GetDatabaseConfigurationAction() {
4141
super(NAME);
4242
}
4343

44-
public static class Request extends BaseNodesRequest<Request> {
44+
public static class Request extends BaseNodesRequest {
4545
private final String[] databaseIds;
4646

4747
public Request(String... databaseIds) {

modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/stats/GeoIpStatsAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class GeoIpStatsAction {
3737

3838
private GeoIpStatsAction() {/* no instances */}
3939

40-
public static class Request extends BaseNodesRequest<Request> implements ToXContentObject {
40+
public static class Request extends BaseNodesRequest implements ToXContentObject {
4141

4242
public Request() {
4343
super((String[]) null);

server/src/main/java/org/elasticsearch/action/admin/cluster/node/capabilities/NodesCapabilitiesRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import java.util.Set;
1818

19-
public class NodesCapabilitiesRequest extends BaseNodesRequest<NodesCapabilitiesRequest> {
19+
public class NodesCapabilitiesRequest extends BaseNodesRequest {
2020

2121
private RestRequest.Method method = RestRequest.Method.GET;
2222
private String path = "/";

server/src/main/java/org/elasticsearch/action/admin/cluster/node/features/NodesFeaturesRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
import org.elasticsearch.action.support.nodes.BaseNodesRequest;
1313

14-
public class NodesFeaturesRequest extends BaseNodesRequest<NodesFeaturesRequest> {
14+
public class NodesFeaturesRequest extends BaseNodesRequest {
1515
public NodesFeaturesRequest(String... nodes) {
1616
super(nodes);
1717
}

server/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import org.elasticsearch.core.TimeValue;
1515
import org.elasticsearch.monitor.jvm.HotThreads;
1616

17-
public class NodesHotThreadsRequest extends BaseNodesRequest<NodesHotThreadsRequest> {
17+
public class NodesHotThreadsRequest extends BaseNodesRequest {
1818

1919
final HotThreads.RequestOptions requestOptions;
2020

server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
/**
1919
* A request to get node (cluster) level information.
2020
*/
21-
public final class NodesInfoRequest extends BaseNodesRequest<NodesInfoRequest> {
21+
public final class NodesInfoRequest extends BaseNodesRequest {
2222

2323
private final NodesInfoMetrics nodesInfoMetrics;
2424

server/src/main/java/org/elasticsearch/action/admin/cluster/node/reload/NodesReloadSecureSettingsRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
/**
3434
* Request for a reload secure settings action
3535
*/
36-
public class NodesReloadSecureSettingsRequest extends BaseNodesRequest<NodesReloadSecureSettingsRequest> {
36+
public class NodesReloadSecureSettingsRequest extends BaseNodesRequest {
3737

3838
/**
3939
* The password is used to re-read and decrypt the contents

server/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/PrevalidateShardPathRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import java.util.Objects;
1717
import java.util.Set;
1818

19-
public class PrevalidateShardPathRequest extends BaseNodesRequest<PrevalidateShardPathRequest> {
19+
public class PrevalidateShardPathRequest extends BaseNodesRequest {
2020

2121
private final Set<ShardId> shardIds;
2222

server/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/TransportPrevalidateNodeRemovalAction.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,8 @@ private void doPrevalidation(
229229
) // Convert to ShardId
230230
.collect(Collectors.toSet());
231231
var nodeIds = requestNodes.stream().map(DiscoveryNode::getId).toList().toArray(new String[0]);
232-
var checkShardsRequest = new PrevalidateShardPathRequest(redShards, nodeIds).timeout(request.timeout());
232+
var checkShardsRequest = new PrevalidateShardPathRequest(redShards, nodeIds);
233+
checkShardsRequest.setTimeout(request.timeout());
233234
client.execute(TransportPrevalidateShardPathAction.TYPE, checkShardsRequest, new ActionListener<>() {
234235
@Override
235236
public void onResponse(PrevalidateShardPathResponse response) {

server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
/**
2626
* A request to get node (cluster) level stats.
2727
*/
28-
public class NodesStatsRequest extends BaseNodesRequest<NodesStatsRequest> {
28+
public class NodesStatsRequest extends BaseNodesRequest {
2929

3030
private final NodesStatsRequestParameters nodesStatsRequestParameters;
3131

0 commit comments

Comments
 (0)