Skip to content

Commit 8ca8862

Browse files
original-brownbearoriginal-brownbear
committed
drop generic
1 parent eb2210c commit 8ca8862

File tree

39 files changed

+59
-68
lines changed

39 files changed

+59
-68
lines changed

‎server/src/internalClusterTest/java/org/elasticsearch/cluster/service/ClusterServiceIT.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public void testAckedUpdateTask() throws Exception {
5959
final CountDownLatch latch = new CountDownLatch(1);
6060
final CountDownLatch processedLatch = new CountDownLatch(1);
6161
clusterService.submitStateUpdateTask("test",
62-
new AckedClusterStateUpdateTask<>(MasterServiceTests.ackedRequest(TEN_SECONDS, TEN_SECONDS), null) {
62+
new AckedClusterStateUpdateTask(MasterServiceTests.ackedRequest(TEN_SECONDS, TEN_SECONDS), null) {
6363
@Override
6464
public boolean mustAck(DiscoveryNode discoveryNode) {
6565
return true;
@@ -118,7 +118,7 @@ public void testAckedUpdateTaskSameClusterState() throws Exception {
118118
final CountDownLatch latch = new CountDownLatch(1);
119119
final CountDownLatch processedLatch = new CountDownLatch(1);
120120
clusterService.submitStateUpdateTask("test",
121-
new AckedClusterStateUpdateTask<>(MasterServiceTests.ackedRequest(TEN_SECONDS, TEN_SECONDS), null) {
121+
new AckedClusterStateUpdateTask(MasterServiceTests.ackedRequest(TEN_SECONDS, TEN_SECONDS), null) {
122122
@Override
123123
public void onAllNodesAcked(@Nullable Exception e) {
124124
allNodesAcked.set(true);
@@ -172,7 +172,7 @@ public void testAckedUpdateTaskNoAckExpected() throws Exception {
172172
final CountDownLatch latch = new CountDownLatch(1);
173173

174174
clusterService.submitStateUpdateTask(
175-
"test", new AckedClusterStateUpdateTask<>(MasterServiceTests.ackedRequest(TEN_SECONDS, TEN_SECONDS), null) {
175+
"test", new AckedClusterStateUpdateTask(MasterServiceTests.ackedRequest(TEN_SECONDS, TEN_SECONDS), null) {
176176
@Override
177177
public boolean mustAck(DiscoveryNode discoveryNode) {
178178
return false;
@@ -228,7 +228,7 @@ public void testAckedUpdateTaskTimeoutZero() throws Exception {
228228
final CountDownLatch latch = new CountDownLatch(1);
229229
final CountDownLatch processedLatch = new CountDownLatch(1);
230230
clusterService.submitStateUpdateTask("test",
231-
new AckedClusterStateUpdateTask<>(MasterServiceTests.ackedRequest(TimeValue.ZERO, TEN_SECONDS), null) {
231+
new AckedClusterStateUpdateTask(MasterServiceTests.ackedRequest(TimeValue.ZERO, TEN_SECONDS), null) {
232232
@Override
233233
public boolean mustAck(DiscoveryNode discoveryNode) {
234234
return false;

‎server/src/main/java/org/elasticsearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ private void submitStateUpdate(final ClusterRerouteRequest request, final Action
150150
})));
151151
}
152152

153-
static class ClusterRerouteResponseAckedClusterStateUpdateTask extends AckedClusterStateUpdateTask<ClusterRerouteResponse> {
153+
static class ClusterRerouteResponseAckedClusterStateUpdateTask extends AckedClusterStateUpdateTask {
154154

155155
private final ClusterRerouteRequest request;
156156
private final ActionListener<ClusterRerouteResponse> listener;

‎server/src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ protected void masterOperation(Task task, final ClusterUpdateSettingsRequest req
8383
final ActionListener<ClusterUpdateSettingsResponse> listener) {
8484
final SettingsUpdater updater = new SettingsUpdater(clusterSettings);
8585
clusterService.submitStateUpdateTask("cluster_update_settings",
86-
new AckedClusterStateUpdateTask<ClusterUpdateSettingsResponse>(Priority.IMMEDIATE, request, listener) {
86+
new AckedClusterStateUpdateTask(Priority.IMMEDIATE, request, listener) {
8787

8888
private volatile boolean changed = false;
8989

@@ -126,7 +126,7 @@ private void reroute(final boolean updateSettingsAcked) {
126126
// to the components until the ClusterStateListener instances have been invoked, but are visible after
127127
// the first update task has been completed.
128128
clusterService.submitStateUpdateTask("reroute_after_cluster_update_settings",
129-
new AckedClusterStateUpdateTask<ClusterUpdateSettingsResponse>(Priority.URGENT, request, listener) {
129+
new AckedClusterStateUpdateTask(Priority.URGENT, request, listener) {
130130

131131
@Override
132132
public boolean mustAck(DiscoveryNode discoveryNode) {

‎server/src/main/java/org/elasticsearch/action/admin/indices/create/AutoCreateAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ protected void masterOperation(Task task,
107107
finalListener::onFailure
108108
);
109109
clusterService.submitStateUpdateTask("auto create [" + request.index() + "]",
110-
new AckedClusterStateUpdateTask<>(Priority.URGENT, request, listener) {
110+
new AckedClusterStateUpdateTask(Priority.URGENT, request, listener) {
111111

112112
@Override
113113
public ClusterState execute(ClusterState currentState) throws Exception {

‎server/src/main/java/org/elasticsearch/action/admin/indices/dangling/delete/TransportDeleteDanglingIndexAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public void onFailure(Exception e) {
123123
final String taskSource = "delete-dangling-index [" + indexName + "] [" + indexUUID + "]";
124124

125125
clusterService.submitStateUpdateTask(
126-
taskSource, new AckedClusterStateUpdateTask<>(deleteRequest, clusterStateUpdatedListener) {
126+
taskSource, new AckedClusterStateUpdateTask(deleteRequest, clusterStateUpdatedListener) {
127127
@Override
128128
public ClusterState execute(final ClusterState currentState) {
129129
return deleteDanglingIndex(currentState, indexToDelete);

‎server/src/main/java/org/elasticsearch/cluster/AckedClusterStateUpdateTask.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,20 @@
3030
* An extension interface to {@link ClusterStateUpdateTask} that allows to be notified when
3131
* all the nodes have acknowledged a cluster state update request
3232
*/
33-
public abstract class AckedClusterStateUpdateTask<Response extends AcknowledgedResponse> extends ClusterStateUpdateTask
34-
implements AckedClusterStateTaskListener {
33+
public abstract class AckedClusterStateUpdateTask extends ClusterStateUpdateTask implements AckedClusterStateTaskListener {
3534

36-
private final ActionListener<Response> listener;
35+
private final ActionListener<AcknowledgedResponse> listener;
3736
private final AckedRequest request;
3837

39-
protected AckedClusterStateUpdateTask(AckedRequest request, ActionListener<Response> listener) {
38+
protected AckedClusterStateUpdateTask(AckedRequest request, ActionListener<? extends AcknowledgedResponse> listener) {
4039
this(Priority.NORMAL, request, listener);
4140
}
4241

43-
protected AckedClusterStateUpdateTask(Priority priority, AckedRequest request, ActionListener<Response> listener) {
42+
@SuppressWarnings("unchecked")
43+
protected AckedClusterStateUpdateTask(Priority priority, AckedRequest request,
44+
ActionListener<? extends AcknowledgedResponse> listener) {
4445
super(priority, request.masterNodeTimeout());
45-
this.listener = listener;
46+
this.listener = (ActionListener<AcknowledgedResponse>) listener;
4647
this.request = request;
4748
}
4849

@@ -66,9 +67,8 @@ public void onAllNodesAcked(@Nullable Exception e) {
6667
listener.onResponse(newResponse(e == null));
6768
}
6869

69-
@SuppressWarnings("unchecked")
70-
protected Response newResponse(boolean acknowledged) {
71-
return (Response) AcknowledgedResponse.of(acknowledged);
70+
protected AcknowledgedResponse newResponse(boolean acknowledged) {
71+
return AcknowledgedResponse.of(acknowledged);
7272
}
7373

7474
/**

‎server/src/main/java/org/elasticsearch/cluster/metadata/MetadataCreateDataStreamService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public void createDataStream(CreateDataStreamClusterStateUpdateRequest request,
8888
finalListener::onFailure
8989
);
9090
clusterService.submitStateUpdateTask("create-data-stream [" + request.name + "]",
91-
new AckedClusterStateUpdateTask<>(Priority.HIGH, request, listener) {
91+
new AckedClusterStateUpdateTask(Priority.HIGH, request, listener) {
9292
@Override
9393
public ClusterState execute(ClusterState currentState) throws Exception {
9494
ClusterState clusterState = createDataStream(metadataCreateIndexService, currentState, request);

‎server/src/main/java/org/elasticsearch/cluster/metadata/MetadataCreateIndexService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ private void onlyCreateIndex(final CreateIndexClusterStateUpdateRequest request,
292292
normalizeRequestSetting(request);
293293
clusterService.submitStateUpdateTask(
294294
"create-index [" + request.index() + "], cause [" + request.cause() + "]",
295-
new AckedClusterStateUpdateTask<>(Priority.URGENT, request, listener) {
295+
new AckedClusterStateUpdateTask(Priority.URGENT, request, listener) {
296296

297297
@Override
298298
public ClusterState execute(ClusterState currentState) throws Exception {

‎server/src/main/java/org/elasticsearch/cluster/metadata/MetadataDeleteIndexService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public void deleteIndices(final DeleteIndexClusterStateUpdateRequest request, fi
7272
}
7373

7474
clusterService.submitStateUpdateTask("delete-index " + Arrays.toString(request.indices()),
75-
new AckedClusterStateUpdateTask<>(Priority.URGENT, request, listener) {
75+
new AckedClusterStateUpdateTask(Priority.URGENT, request, listener) {
7676
@Override
7777
public ClusterState execute(final ClusterState currentState) {
7878
return deleteIndices(currentState, Sets.newHashSet(request.indices()));

‎server/src/main/java/org/elasticsearch/cluster/metadata/MetadataIndexAliasesService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public MetadataIndexAliasesService(ClusterService clusterService, IndicesService
7777
public void indicesAliases(final IndicesAliasesClusterStateUpdateRequest request,
7878
final ActionListener<AcknowledgedResponse> listener) {
7979
clusterService.submitStateUpdateTask("index-aliases",
80-
new AckedClusterStateUpdateTask<>(Priority.URGENT, request, listener) {
80+
new AckedClusterStateUpdateTask(Priority.URGENT, request, listener) {
8181
@Override
8282
public ClusterState execute(ClusterState currentState) {
8383
return applyAliasActions(currentState, request.actions());

‎server/src/main/java/org/elasticsearch/cluster/metadata/MetadataIndexStateService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -803,7 +803,7 @@ private void onlyOpenIndex(final OpenIndexClusterStateUpdateRequest request,
803803

804804
final String indicesAsString = Arrays.toString(request.indices());
805805
clusterService.submitStateUpdateTask("open-indices " + indicesAsString,
806-
new AckedClusterStateUpdateTask<>(Priority.URGENT, request, listener) {
806+
new AckedClusterStateUpdateTask(Priority.URGENT, request, listener) {
807807
@Override
808808
public ClusterState execute(final ClusterState currentState) {
809809
final ClusterState updatedState = openIndices(request.indices(), currentState);

‎server/src/main/java/org/elasticsearch/cluster/metadata/MetadataMigrateToDataStreamService.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.elasticsearch.cluster.AckedClusterStateUpdateTask;
3030
import org.elasticsearch.cluster.ClusterState;
3131
import org.elasticsearch.cluster.ack.ClusterStateUpdateRequest;
32-
import org.elasticsearch.cluster.ack.ClusterStateUpdateResponse;
3332
import org.elasticsearch.cluster.service.ClusterService;
3433
import org.elasticsearch.common.Priority;
3534
import org.elasticsearch.common.Strings;
@@ -69,7 +68,7 @@ public MetadataMigrateToDataStreamService(ThreadPool threadPool,
6968
public void migrateToDataStream(MigrateToDataStreamClusterStateUpdateRequest request,
7069
ActionListener<AcknowledgedResponse> finalListener) {
7170
AtomicReference<String> writeIndexRef = new AtomicReference<>();
72-
ActionListener<ClusterStateUpdateResponse> listener = ActionListener.wrap(
71+
ActionListener<AcknowledgedResponse> listener = ActionListener.wrap(
7372
response -> {
7473
if (response.isAcknowledged()) {
7574
String writeIndexName = writeIndexRef.get();
@@ -89,7 +88,7 @@ public void migrateToDataStream(MigrateToDataStreamClusterStateUpdateRequest req
8988
finalListener::onFailure
9089
);
9190
clusterService.submitStateUpdateTask("migrate-to-data-stream [" + request.aliasName + "]",
92-
new AckedClusterStateUpdateTask<>(Priority.HIGH, request, listener) {
91+
new AckedClusterStateUpdateTask(Priority.HIGH, request, listener) {
9392

9493
@Override
9594
public ClusterState execute(ClusterState currentState) throws Exception {
@@ -106,11 +105,6 @@ public ClusterState execute(ClusterState currentState) throws Exception {
106105
writeIndexRef.set(clusterState.metadata().dataStreams().get(request.aliasName).getWriteIndex().getName());
107106
return clusterState;
108107
}
109-
110-
@Override
111-
protected ClusterStateUpdateResponse newResponse(boolean acknowledged) {
112-
return new ClusterStateUpdateResponse(acknowledged);
113-
}
114108
});
115109
}
116110

‎server/src/main/java/org/elasticsearch/cluster/metadata/MetadataUpdateSettingsService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public void updateSettings(final UpdateSettingsClusterStateUpdateRequest request
116116
final boolean preserveExisting = request.isPreserveExisting();
117117

118118
clusterService.submitStateUpdateTask("update-settings " + Arrays.toString(request.indices()),
119-
new AckedClusterStateUpdateTask<>(Priority.URGENT, request,
119+
new AckedClusterStateUpdateTask(Priority.URGENT, request,
120120
wrapPreservingContext(listener, threadPool.getThreadContext())) {
121121

122122
@Override
@@ -321,7 +321,7 @@ private static boolean maybeUpdateClusterBlock(String[] actualIndices, ClusterBl
321321
public void upgradeIndexSettings(final UpgradeSettingsClusterStateUpdateRequest request,
322322
final ActionListener<AcknowledgedResponse> listener) {
323323
clusterService.submitStateUpdateTask("update-index-compatibility-versions",
324-
new AckedClusterStateUpdateTask<>(Priority.URGENT, request, wrapPreservingContext(listener, threadPool.getThreadContext())) {
324+
new AckedClusterStateUpdateTask(Priority.URGENT, request, wrapPreservingContext(listener, threadPool.getThreadContext())) {
325325

326326
@Override
327327
public ClusterState execute(ClusterState currentState) {

‎server/src/main/java/org/elasticsearch/ingest/IngestService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ public ScriptService getScriptService() {
248248
*/
249249
public void delete(DeletePipelineRequest request, ActionListener<AcknowledgedResponse> listener) {
250250
clusterService.submitStateUpdateTask("delete-pipeline-" + request.getId(),
251-
new AckedClusterStateUpdateTask<>(request, listener) {
251+
new AckedClusterStateUpdateTask(request, listener) {
252252
@Override
253253
public ClusterState execute(ClusterState currentState) {
254254
return innerDelete(request, currentState);
@@ -331,7 +331,7 @@ public void putPipeline(Map<DiscoveryNode, IngestInfo> ingestInfos, PutPipelineR
331331
// validates the pipeline and processor configuration before submitting a cluster update task:
332332
validatePipeline(ingestInfos, request);
333333
clusterService.submitStateUpdateTask("put-pipeline-" + request.getId(),
334-
new AckedClusterStateUpdateTask<>(request, listener) {
334+
new AckedClusterStateUpdateTask(request, listener) {
335335
@Override
336336
public ClusterState execute(ClusterState currentState) {
337337
return innerPut(request, currentState);

‎server/src/main/java/org/elasticsearch/repositories/RepositoriesService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ public void registerRepository(final PutRepositoryRequest request, final ActionL
150150
}
151151

152152
clusterService.submitStateUpdateTask("put_repository [" + request.name() + "]",
153-
new AckedClusterStateUpdateTask<>(request, registrationListener) {
153+
new AckedClusterStateUpdateTask(request, registrationListener) {
154154

155155
@Override
156156
public ClusterState execute(ClusterState currentState) {
@@ -214,7 +214,7 @@ public boolean mustAck(DiscoveryNode discoveryNode) {
214214
*/
215215
public void unregisterRepository(final DeleteRepositoryRequest request, final ActionListener<AcknowledgedResponse> listener) {
216216
clusterService.submitStateUpdateTask("delete_repository [" + request.name() + "]",
217-
new AckedClusterStateUpdateTask<>(request, listener) {
217+
new AckedClusterStateUpdateTask(request, listener) {
218218

219219
@Override
220220
public ClusterState execute(ClusterState currentState) {

‎server/src/main/java/org/elasticsearch/script/ScriptService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ public void putStoredScript(ClusterService clusterService, PutStoredScriptReques
421421
throw new IllegalArgumentException("failed to parse/compile stored script [" + request.id() + "]", exception);
422422
}
423423

424-
clusterService.submitStateUpdateTask("put-script-" + request.id(), new AckedClusterStateUpdateTask<>(request, listener) {
424+
clusterService.submitStateUpdateTask("put-script-" + request.id(), new AckedClusterStateUpdateTask(request, listener) {
425425
@Override
426426
public ClusterState execute(ClusterState currentState) {
427427
ScriptMetadata smd = currentState.metadata().custom(ScriptMetadata.TYPE);
@@ -436,7 +436,7 @@ public ClusterState execute(ClusterState currentState) {
436436
public void deleteStoredScript(ClusterService clusterService, DeleteStoredScriptRequest request,
437437
ActionListener<AcknowledgedResponse> listener) {
438438
clusterService.submitStateUpdateTask("delete-script-" + request.id(),
439-
new AckedClusterStateUpdateTask<>(request, listener) {
439+
new AckedClusterStateUpdateTask(request, listener) {
440440
@Override
441441
public ClusterState execute(ClusterState currentState) {
442442
ScriptMetadata smd = currentState.metadata().custom(ScriptMetadata.TYPE);

‎server/src/test/java/org/elasticsearch/cluster/service/MasterServiceTests.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ public void testThreadContext() throws InterruptedException {
191191
final TimeValue ackTimeout = randomBoolean() ? TimeValue.ZERO : TimeValue.timeValueMillis(randomInt(10000));
192192
final TimeValue masterTimeout = randomBoolean() ? TimeValue.ZERO : TimeValue.timeValueMillis(randomInt(10000));
193193

194-
master.submitStateUpdateTask("test", new AckedClusterStateUpdateTask<>(ackedRequest(ackTimeout, masterTimeout), null) {
194+
master.submitStateUpdateTask("test", new AckedClusterStateUpdateTask(ackedRequest(ackTimeout, masterTimeout), null) {
195195
@Override
196196
public ClusterState execute(ClusterState currentState) {
197197
assertTrue(threadPool.getThreadContext().isSystemContext());
@@ -915,8 +915,7 @@ public void testAcking() throws InterruptedException {
915915
publisherRef.set((clusterChangedEvent, publishListener, ackListener) ->
916916
publishListener.onFailure(new FailedToCommitClusterStateException("mock exception")));
917917

918-
masterService.submitStateUpdateTask("test2", new AckedClusterStateUpdateTask<>(
919-
ackedRequest(TimeValue.ZERO, null), null) {
918+
masterService.submitStateUpdateTask("test2", new AckedClusterStateUpdateTask(ackedRequest(TimeValue.ZERO, null), null) {
920919
@Override
921920
public ClusterState execute(ClusterState currentState) {
922921
return ClusterState.builder(currentState).build();
@@ -961,8 +960,7 @@ public void onAckTimeout() {
961960
ackListener.onNodeAck(node3, null);
962961
});
963962

964-
masterService.submitStateUpdateTask(
965-
"test2", new AckedClusterStateUpdateTask<>(ackedRequest(ackTimeout, null), null) {
963+
masterService.submitStateUpdateTask("test2", new AckedClusterStateUpdateTask(ackedRequest(ackTimeout, null), null) {
966964
@Override
967965
public ClusterState execute(ClusterState currentState) {
968966
return ClusterState.builder(currentState).build();

‎x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/action/TransportDeleteAutoscalingPolicyAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ protected void masterOperation(
6161
final ClusterState state,
6262
final ActionListener<AcknowledgedResponse> listener
6363
) {
64-
clusterService.submitStateUpdateTask("delete-autoscaling-policy", new AckedClusterStateUpdateTask<>(request, listener) {
64+
clusterService.submitStateUpdateTask("delete-autoscaling-policy", new AckedClusterStateUpdateTask(request, listener) {
6565
@Override
6666
public ClusterState execute(final ClusterState currentState) {
6767
return deleteAutoscalingPolicy(currentState, request.name(), logger);

0 commit comments

Comments
 (0)