Skip to content

Commit 644bc1c

Browse files
committed
Remove redundant response parameter to onResponseSent() (elastic#125326)
Nobody uses this parameter (except some tests that simply verify the otherwise-unused plumbing is connected). This commit removes it. Relates elastic#125163
1 parent d08ecfc commit 644bc1c

File tree

5 files changed

+13
-29
lines changed

5 files changed

+13
-29
lines changed

server/src/main/java/org/elasticsearch/transport/OutboundHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ void sendResponse(
153153
try {
154154
sendMessage(channel, message, responseStatsConsumer, () -> {
155155
try {
156-
messageListener.onResponseSent(requestId, action, response);
156+
messageListener.onResponseSent(requestId, action);
157157
} finally {
158158
response.decRef();
159159
}

server/src/main/java/org/elasticsearch/transport/TransportMessageListener.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,8 @@ default void onRequestReceived(long requestId, String action) {}
2727
* Called for every action response sent after the response has been passed to the underlying network implementation.
2828
* @param requestId the request ID (unique per client)
2929
* @param action the request action
30-
* @param response the response send
3130
*/
32-
default void onResponseSent(long requestId, String action, TransportResponse response) {}
31+
default void onResponseSent(long requestId, String action) {}
3332

3433
/***
3534
* Called for every failed action response after the response has been passed to the underlying network implementation.

server/src/main/java/org/elasticsearch/transport/TransportService.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1303,11 +1303,11 @@ public void onResponseReceived(long requestId, Transport.ResponseContext holder)
13031303

13041304
/** called by the {@link Transport} implementation once a response was sent to calling node */
13051305
@Override
1306-
public void onResponseSent(long requestId, String action, TransportResponse response) {
1306+
public void onResponseSent(long requestId, String action) {
13071307
if (tracerLog.isTraceEnabled() && shouldTraceAction(action)) {
13081308
tracerLog.trace("[{}][{}] sent response", requestId, action);
13091309
}
1310-
messageListener.onResponseSent(requestId, action, response);
1310+
messageListener.onResponseSent(requestId, action);
13111311
}
13121312

13131313
/** called by the {@link Transport} implementation after an exception was sent as a response to an incoming request */
@@ -1555,7 +1555,7 @@ public String getProfileName() {
15551555

15561556
@Override
15571557
public void sendResponse(TransportResponse response) {
1558-
service.onResponseSent(requestId, action, response);
1558+
service.onResponseSent(requestId, action);
15591559
try (var shutdownBlock = service.pendingDirectHandlers.withRef()) {
15601560
if (shutdownBlock == null) {
15611561
// already shutting down, the handler will be completed by sendRequestInternal or doStop
@@ -1679,9 +1679,9 @@ public void onRequestReceived(long requestId, String action) {
16791679
}
16801680

16811681
@Override
1682-
public void onResponseSent(long requestId, String action, TransportResponse response) {
1682+
public void onResponseSent(long requestId, String action) {
16831683
for (TransportMessageListener listener : listeners) {
1684-
listener.onResponseSent(requestId, action, response);
1684+
listener.onResponseSent(requestId, action);
16851685
}
16861686
}
16871687

server/src/test/java/org/elasticsearch/transport/OutboundHandlerTests.java

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -221,13 +221,11 @@ public void testSendResponse() throws IOException {
221221

222222
AtomicLong requestIdRef = new AtomicLong();
223223
AtomicReference<String> actionRef = new AtomicReference<>();
224-
AtomicReference<TransportResponse> responseRef = new AtomicReference<>();
225224
handler.setMessageListener(new TransportMessageListener() {
226225
@Override
227-
public void onResponseSent(long requestId, String action, TransportResponse response) {
226+
public void onResponseSent(long requestId, String action) {
228227
requestIdRef.set(requestId);
229228
actionRef.set(action);
230-
responseRef.set(response);
231229
}
232230
});
233231
if (compress) {
@@ -245,7 +243,6 @@ public void onResponseSent(long requestId, String action, TransportResponse resp
245243
}
246244
assertEquals(requestId, requestIdRef.get());
247245
assertEquals(action, actionRef.get());
248-
assertEquals(response, responseRef.get());
249246

250247
pipeline.handleBytes(channel, new ReleasableBytesReference(reference, () -> {}));
251248
final Tuple<Header, BytesReference> tuple = message.get();
@@ -339,18 +336,15 @@ public void writeTo(StreamOutput out) {
339336

340337
AtomicLong requestIdRef = new AtomicLong();
341338
AtomicReference<String> actionRef = new AtomicReference<>();
342-
AtomicReference<TransportResponse> responseRef = new AtomicReference<>();
343339
AtomicReference<Exception> exceptionRef = new AtomicReference<>();
344340
handler.setMessageListener(new TransportMessageListener() {
345341
@Override
346-
public void onResponseSent(long requestId, String action, TransportResponse response) {
342+
public void onResponseSent(long requestId, String action) {
347343
assertNull(channel.getMessageCaptor().get());
348344
assertThat(requestIdRef.get(), equalTo(0L));
349345
requestIdRef.set(requestId);
350346
assertNull(actionRef.get());
351347
actionRef.set(action);
352-
assertNull(responseRef.get());
353-
responseRef.set(response);
354348
}
355349

356350
@Override
@@ -375,7 +369,6 @@ public void onResponseSent(long requestId, String action, Exception error) {
375369
}
376370
assertEquals(requestId, requestIdRef.get());
377371
assertEquals(action, actionRef.get());
378-
assertEquals(response, responseRef.get());
379372
assertThat(exceptionRef.get().getMessage(), equalTo("simulated cbe"));
380373
assertTrue(response.released.get());
381374
BytesReference reference = channel.getMessageCaptor().get();
@@ -401,18 +394,15 @@ public void sendMessage(BytesReference reference, ActionListener<Void> listener)
401394
long requestId = randomLongBetween(0, 300);
402395
AtomicLong requestIdRef = new AtomicLong();
403396
AtomicReference<String> actionRef = new AtomicReference<>();
404-
AtomicReference<TransportResponse> responseRef = new AtomicReference<>();
405397
AtomicReference<Exception> exceptionRef = new AtomicReference<>();
406398
handler.setMessageListener(new TransportMessageListener() {
407399
@Override
408-
public void onResponseSent(long requestId, String action, TransportResponse response) {
400+
public void onResponseSent(long requestId, String action) {
409401
assertNull(channel.getMessageCaptor().get());
410402
assertThat(requestIdRef.get(), equalTo(0L));
411403
requestIdRef.set(requestId);
412404
assertNull(actionRef.get());
413405
actionRef.set(action);
414-
assertNull(responseRef.get());
415-
responseRef.set(response);
416406
}
417407

418408
@Override
@@ -437,7 +427,6 @@ public void writeTo(StreamOutput out) {
437427
}
438428
assertEquals(requestId, requestIdRef.get());
439429
assertEquals(action, actionRef.get());
440-
assertEquals(response, responseRef.get());
441430
assertThat(exceptionRef.get().getMessage(), equalTo("simulated cbe"));
442431
assertTrue(response.released.get());
443432
assertNull(channel.getMessageCaptor().get());
@@ -458,17 +447,14 @@ public void writeTo(StreamOutput out) {
458447

459448
AtomicLong requestIdRef = new AtomicLong();
460449
AtomicReference<String> actionRef = new AtomicReference<>();
461-
AtomicReference<TransportResponse> responseRef = new AtomicReference<>();
462450
handler.setMessageListener(new TransportMessageListener() {
463451
@Override
464-
public void onResponseSent(long requestId, String action, TransportResponse response) {
452+
public void onResponseSent(long requestId, String action) {
465453
assertNull(channel.getMessageCaptor().get());
466454
assertThat(requestIdRef.get(), equalTo(0L));
467455
requestIdRef.set(requestId);
468456
assertNull(actionRef.get());
469457
actionRef.set(action);
470-
assertNull(responseRef.get());
471-
responseRef.set(response);
472458
}
473459

474460
@Override
@@ -486,7 +472,6 @@ public void onResponseSent(long requestId, String action, Exception error) {
486472
assertNull(channel.getListenerCaptor().get());
487473
assertEquals(requestId, requestIdRef.get());
488474
assertEquals(action, actionRef.get());
489-
assertEquals(response, responseRef.get());
490475
assertTrue(response.released.get());
491476
assertFalse(channel.isOpen());
492477
}
@@ -508,7 +493,7 @@ public void sendMessage(BytesReference reference, ActionListener<Void> listener)
508493
AtomicReference<Exception> exceptionRef = new AtomicReference<>();
509494
handler.setMessageListener(new TransportMessageListener() {
510495
@Override
511-
public void onResponseSent(long requestId, String action, TransportResponse response) {
496+
public void onResponseSent(long requestId, String action) {
512497
throw new AssertionError("must not be called");
513498
}
514499

test/framework/src/main/java/org/elasticsearch/transport/AbstractSimpleTransportTestCase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,7 @@ public void onRequestReceived(long requestId, String action) {
545545
}
546546

547547
@Override
548-
public void onResponseSent(long requestId, String action, TransportResponse response) {
548+
public void onResponseSent(long requestId, String action) {
549549
if (action.equals(ACTION)) {
550550
responseSent.incrementAndGet();
551551
}

0 commit comments

Comments
 (0)