Skip to content

Commit cedcb5c

Browse files
DaveCTurnerDaveCTurner
authored
Replace TransportResponse.Empty with ActionResponse.Empty (#126400)
No need to distinguish these things any more, we can just use `ActionResponse.Empty` everywhere.
1 parent bead858 commit cedcb5c

File tree

31 files changed

+142
-150
lines changed

31 files changed

+142
-150
lines changed

‎server/src/internalClusterTest/java/org/elasticsearch/common/network/ThreadWatchdogIT.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
import org.apache.logging.log4j.Level;
1313
import org.elasticsearch.action.ActionListenerResponseHandler;
14+
import org.elasticsearch.action.ActionResponse;
1415
import org.elasticsearch.action.support.SubscribableListener;
1516
import org.elasticsearch.client.Request;
1617
import org.elasticsearch.client.internal.node.NodeClient;
@@ -137,7 +138,7 @@ public void testThreadWatchdogTransportLogging() {
137138
EmptyRequest::new,
138139
(request, channel, task) -> {
139140
blockAndWaitForWatchdogLogs();
140-
channel.sendResponse(TransportResponse.Empty.INSTANCE);
141+
channel.sendResponse(ActionResponse.Empty.INSTANCE);
141142
}
142143
);
143144

@@ -149,7 +150,7 @@ public void testThreadWatchdogTransportLogging() {
149150
new EmptyRequest(),
150151
new ActionListenerResponseHandler<TransportResponse>(
151152
l,
152-
in -> TransportResponse.Empty.INSTANCE,
153+
in -> ActionResponse.Empty.INSTANCE,
153154
EsExecutors.DIRECT_EXECUTOR_SERVICE
154155
)
155156
)

‎server/src/main/java/org/elasticsearch/action/search/SearchTransportService.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import org.apache.logging.log4j.Logger;
1414
import org.elasticsearch.action.ActionListener;
1515
import org.elasticsearch.action.ActionListenerResponseHandler;
16+
import org.elasticsearch.action.ActionResponse;
1617
import org.elasticsearch.action.OriginalIndices;
1718
import org.elasticsearch.action.admin.cluster.node.tasks.cancel.CancelTasksRequest;
1819
import org.elasticsearch.action.admin.cluster.node.tasks.get.TransportGetTaskAction;
@@ -161,7 +162,7 @@ public void sendClearAllScrollContexts(Transport.Connection connection, final Ac
161162
CLEAR_SCROLL_CONTEXTS_ACTION_NAME,
162163
new ClearScrollContextsRequest(),
163164
TransportRequestOptions.EMPTY,
164-
new ActionListenerResponseHandler<>(listener, in -> TransportResponse.Empty.INSTANCE, TransportResponseHandler.TRANSPORT_WORKER)
165+
new ActionListenerResponseHandler<>(listener, in -> ActionResponse.Empty.INSTANCE, TransportResponseHandler.TRANSPORT_WORKER)
165166
);
166167
}
167168

@@ -418,14 +419,14 @@ public static void registerRequestHandler(TransportService transportService, Sea
418419
ClearScrollContextsRequest::new,
419420
(request, channel, task) -> {
420421
searchService.freeAllScrollContexts();
421-
channel.sendResponse(TransportResponse.Empty.INSTANCE);
422+
channel.sendResponse(ActionResponse.Empty.INSTANCE);
422423
}
423424
);
424425
TransportActionProxy.registerProxyAction(
425426
transportService,
426427
CLEAR_SCROLL_CONTEXTS_ACTION_NAME,
427428
false,
428-
(in) -> TransportResponse.Empty.INSTANCE
429+
(in) -> ActionResponse.Empty.INSTANCE
429430
);
430431

431432
transportService.registerRequestHandler(

‎server/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import org.elasticsearch.TransportVersion;
1717
import org.elasticsearch.TransportVersions;
1818
import org.elasticsearch.action.ActionListener;
19+
import org.elasticsearch.action.ActionResponse;
1920
import org.elasticsearch.action.ResultDeduplicator;
2021
import org.elasticsearch.action.support.ChannelActionListener;
2122
import org.elasticsearch.cluster.ClusterState;
@@ -57,7 +58,6 @@
5758
import org.elasticsearch.transport.TransportChannel;
5859
import org.elasticsearch.transport.TransportRequest;
5960
import org.elasticsearch.transport.TransportRequestHandler;
60-
import org.elasticsearch.transport.TransportResponse;
6161
import org.elasticsearch.transport.TransportResponseHandler;
6262
import org.elasticsearch.transport.TransportService;
6363

@@ -291,7 +291,7 @@ public void messageReceived(FailedShardEntry request, TransportChannel channel,
291291
logger.debug(() -> format("%s received shard failed for [%s]", request.getShardId(), request), request.failure);
292292
taskQueue.submitTask(
293293
"shard-failed " + request.toStringNoFailureStackTrace(),
294-
new FailedShardUpdateTask(request, new ChannelActionListener<>(channel).map(ignored -> TransportResponse.Empty.INSTANCE)),
294+
new FailedShardUpdateTask(request, new ChannelActionListener<>(channel).map(ignored -> ActionResponse.Empty.INSTANCE)),
295295
null
296296
);
297297
}
@@ -602,7 +602,7 @@ public void messageReceived(StartedShardEntry request, TransportChannel channel,
602602
logger.debug("{} received shard started for [{}]", request.shardId, request);
603603
taskQueue.submitTask(
604604
"shard-started " + request,
605-
new StartedShardUpdateTask(request, new ChannelActionListener<>(channel).map(ignored -> TransportResponse.Empty.INSTANCE)),
605+
new StartedShardUpdateTask(request, new ChannelActionListener<>(channel).map(ignored -> ActionResponse.Empty.INSTANCE)),
606606
null
607607
);
608608
}

‎server/src/main/java/org/elasticsearch/cluster/coordination/Coordinator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import org.apache.logging.log4j.Logger;
1414
import org.apache.lucene.util.SetOnce;
1515
import org.elasticsearch.action.ActionListener;
16+
import org.elasticsearch.action.ActionResponse.Empty;
1617
import org.elasticsearch.action.support.ChannelActionListener;
1718
import org.elasticsearch.action.support.RefCountingListener;
1819
import org.elasticsearch.action.support.SubscribableListener;
@@ -77,7 +78,6 @@
7778
import org.elasticsearch.threadpool.ThreadPool.Names;
7879
import org.elasticsearch.transport.NodeDisconnectedException;
7980
import org.elasticsearch.transport.TransportRequestOptions;
80-
import org.elasticsearch.transport.TransportResponse.Empty;
8181
import org.elasticsearch.transport.TransportResponseHandler;
8282
import org.elasticsearch.transport.TransportService;
8383
import org.elasticsearch.transport.Transports;

‎server/src/main/java/org/elasticsearch/cluster/coordination/FollowersChecker.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import org.apache.logging.log4j.LogManager;
1313
import org.apache.logging.log4j.Logger;
1414
import org.elasticsearch.action.ActionListener;
15+
import org.elasticsearch.action.ActionResponse.Empty;
1516
import org.elasticsearch.action.ActionRunnable;
1617
import org.elasticsearch.action.support.ChannelActionListener;
1718
import org.elasticsearch.cluster.coordination.Coordinator.Mode;
@@ -37,7 +38,6 @@
3738
import org.elasticsearch.transport.TransportRequest;
3839
import org.elasticsearch.transport.TransportRequestOptions;
3940
import org.elasticsearch.transport.TransportRequestOptions.Type;
40-
import org.elasticsearch.transport.TransportResponse.Empty;
4141
import org.elasticsearch.transport.TransportResponseHandler;
4242
import org.elasticsearch.transport.TransportService;
4343

‎server/src/main/java/org/elasticsearch/cluster/coordination/JoinHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import org.apache.logging.log4j.Logger;
1414
import org.elasticsearch.ElasticsearchException;
1515
import org.elasticsearch.action.ActionListener;
16+
import org.elasticsearch.action.ActionResponse.Empty;
1617
import org.elasticsearch.action.support.ChannelActionListener;
1718
import org.elasticsearch.cluster.ClusterState;
1819
import org.elasticsearch.cluster.coordination.Coordinator.Mode;
@@ -45,7 +46,6 @@
4546
import org.elasticsearch.transport.TransportException;
4647
import org.elasticsearch.transport.TransportRequest;
4748
import org.elasticsearch.transport.TransportRequestOptions;
48-
import org.elasticsearch.transport.TransportResponse.Empty;
4949
import org.elasticsearch.transport.TransportResponseHandler;
5050
import org.elasticsearch.transport.TransportService;
5151

‎server/src/main/java/org/elasticsearch/cluster/coordination/JoinValidationService.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import org.elasticsearch.ElasticsearchException;
1515
import org.elasticsearch.TransportVersion;
1616
import org.elasticsearch.action.ActionListener;
17+
import org.elasticsearch.action.ActionResponse;
1718
import org.elasticsearch.action.ActionRunnable;
1819
import org.elasticsearch.cluster.ClusterState;
1920
import org.elasticsearch.cluster.metadata.Metadata;
@@ -39,7 +40,6 @@
3940
import org.elasticsearch.transport.NodeNotConnectedException;
4041
import org.elasticsearch.transport.Transport;
4142
import org.elasticsearch.transport.TransportRequestOptions;
42-
import org.elasticsearch.transport.TransportResponse;
4343
import org.elasticsearch.transport.TransportResponseHandler;
4444
import org.elasticsearch.transport.TransportService;
4545

@@ -143,7 +143,7 @@ public JoinValidationService(
143143
);
144144
}
145145
joinValidators.forEach(joinValidator -> joinValidator.accept(transportService.getLocalNode(), remoteState));
146-
channel.sendResponse(TransportResponse.Empty.INSTANCE);
146+
channel.sendResponse(ActionResponse.Empty.INSTANCE);
147147
}
148148
);
149149
}
@@ -343,7 +343,7 @@ protected void doRun() {
343343
REQUEST_OPTIONS,
344344
new CleanableResponseHandler<>(
345345
listener.map(ignored -> null),
346-
in -> TransportResponse.Empty.INSTANCE,
346+
in -> ActionResponse.Empty.INSTANCE,
347347
responseExecutor,
348348
bytes::decRef
349349
)

‎server/src/main/java/org/elasticsearch/cluster/coordination/LeaderChecker.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import org.apache.logging.log4j.LogManager;
1313
import org.apache.logging.log4j.Logger;
1414
import org.elasticsearch.ExceptionsHelper;
15+
import org.elasticsearch.action.ActionResponse.Empty;
1516
import org.elasticsearch.cluster.node.DiscoveryNode;
1617
import org.elasticsearch.cluster.node.DiscoveryNodes;
1718
import org.elasticsearch.common.io.stream.StreamInput;
@@ -36,7 +37,6 @@
3637
import org.elasticsearch.transport.TransportRequest;
3738
import org.elasticsearch.transport.TransportRequestOptions;
3839
import org.elasticsearch.transport.TransportRequestOptions.Type;
39-
import org.elasticsearch.transport.TransportResponse.Empty;
4040
import org.elasticsearch.transport.TransportResponseHandler;
4141
import org.elasticsearch.transport.TransportService;
4242

‎server/src/main/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ public void messageReceived(final RecoveryHandoffPrimaryContextRequest request,
565565
.handoffPrimaryContext(
566566
request.primaryContext(),
567567
ActionListener.runBefore(
568-
new ChannelActionListener<>(channel).map(v -> TransportResponse.Empty.INSTANCE),
568+
new ChannelActionListener<>(channel).map(v -> ActionResponse.Empty.INSTANCE),
569569
recoveryRef::close
570570
)
571571
);
@@ -688,7 +688,7 @@ public final void messageReceived(final T request, TransportChannel channel, Tas
688688
}
689689

690690
protected CheckedFunction<Void, TransportResponse, Exception> responseMapping(RecoveryTarget recoveryTarget) {
691-
return v -> TransportResponse.Empty.INSTANCE;
691+
return v -> ActionResponse.Empty.INSTANCE;
692692
}
693693

694694
protected abstract void handleRequest(T request, RecoveryTarget target, ActionListener<Void> listener) throws IOException;

‎server/src/main/java/org/elasticsearch/indices/recovery/RemoteRecoveryTargetHandler.java

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import org.elasticsearch.ExceptionsHelper;
1818
import org.elasticsearch.action.ActionListener;
1919
import org.elasticsearch.action.ActionListenerResponseHandler;
20+
import org.elasticsearch.action.ActionResponse;
2021
import org.elasticsearch.action.ActionRunnable;
2122
import org.elasticsearch.action.support.RetryableAction;
2223
import org.elasticsearch.cluster.node.DiscoveryNode;
@@ -116,7 +117,7 @@ public void prepareForTranslogOperations(int totalTranslogOps, ActionListener<Vo
116117
shardId,
117118
totalTranslogOps
118119
);
119-
final Writeable.Reader<TransportResponse.Empty> reader = in -> TransportResponse.Empty.INSTANCE;
120+
final Writeable.Reader<ActionResponse.Empty> reader = in -> ActionResponse.Empty.INSTANCE;
120121
executeRetryableAction(action, request, standardTimeoutRequestOptions, listener.map(r -> null), reader);
121122
}
122123

@@ -131,7 +132,7 @@ public void finalizeRecovery(final long globalCheckpoint, final long trimAboveSe
131132
globalCheckpoint,
132133
trimAboveSeqNo
133134
);
134-
final Writeable.Reader<TransportResponse.Empty> reader = in -> TransportResponse.Empty.INSTANCE;
135+
final Writeable.Reader<ActionResponse.Empty> reader = in -> ActionResponse.Empty.INSTANCE;
135136
executeRetryableAction(
136137
action,
137138
request,
@@ -148,7 +149,7 @@ public void handoffPrimaryContext(final ReplicationTracker.PrimaryContext primar
148149
PeerRecoveryTargetService.Actions.HANDOFF_PRIMARY_CONTEXT,
149150
new RecoveryHandoffPrimaryContextRequest(recoveryId, shardId, primaryContext),
150151
standardTimeoutRequestOptions,
151-
new ActionListenerResponseHandler<>(listener.map(r -> null), in -> TransportResponse.Empty.INSTANCE, threadPool.generic())
152+
new ActionListenerResponseHandler<>(listener.map(r -> null), in -> ActionResponse.Empty.INSTANCE, threadPool.generic())
152153
);
153154
}
154155

@@ -200,7 +201,7 @@ public void receiveFileInfo(
200201
phase1ExistingFileSizes,
201202
totalTranslogOps
202203
);
203-
final Writeable.Reader<TransportResponse.Empty> reader = in -> TransportResponse.Empty.INSTANCE;
204+
final Writeable.Reader<ActionResponse.Empty> reader = in -> ActionResponse.Empty.INSTANCE;
204205
executeRetryableAction(action, request, standardTimeoutRequestOptions, listener.map(r -> null), reader);
205206
}
206207

@@ -221,8 +222,8 @@ public void cleanFiles(
221222
totalTranslogOps,
222223
globalCheckpoint
223224
);
224-
final Writeable.Reader<TransportResponse.Empty> reader = in -> TransportResponse.Empty.INSTANCE;
225-
final ActionListener<TransportResponse.Empty> responseListener = listener.map(r -> null);
225+
final Writeable.Reader<ActionResponse.Empty> reader = in -> ActionResponse.Empty.INSTANCE;
226+
final ActionListener<ActionResponse.Empty> responseListener = listener.map(r -> null);
226227
executeRetryableAction(action, request, TransportRequestOptions.EMPTY, responseListener, reader);
227228
}
228229

@@ -243,8 +244,8 @@ public void restoreFileFromSnapshot(
243244
indexId,
244245
snapshotFile
245246
);
246-
final Writeable.Reader<TransportResponse.Empty> reader = in -> TransportResponse.Empty.INSTANCE;
247-
final ActionListener<TransportResponse.Empty> responseListener = listener.map(r -> null);
247+
final Writeable.Reader<ActionResponse.Empty> reader = in -> ActionResponse.Empty.INSTANCE;
248+
final ActionListener<ActionResponse.Empty> responseListener = listener.map(r -> null);
248249
executeRetryableAction(action, request, TransportRequestOptions.EMPTY, responseListener, reader);
249250
}
250251

@@ -303,8 +304,8 @@ public void writeFileChunk(
303304
threadPool.generic()
304305
.execute(
305306
ActionRunnable.wrap(
306-
ActionListener.<TransportResponse.Empty>runBefore(listener.map(r -> null), request::decRef),
307-
l -> executeRetryableAction(action, request, fileChunkRequestOptions, l, in -> TransportResponse.Empty.INSTANCE)
307+
ActionListener.<ActionResponse.Empty>runBefore(listener.map(r -> null), request::decRef),
308+
l -> executeRetryableAction(action, request, fileChunkRequestOptions, l, in -> ActionResponse.Empty.INSTANCE)
308309
)
309310
);
310311
}

0 commit comments

Comments
 (0)