Pārlūkot izejas kodu

Remove redundant `response` parameter to `onResponseSent()` (#125326)

Nobody uses this parameter (except some tests that simply verify the
otherwise-unused plumbing is connected). This commit removes it.

Relates #125163
David Turner 6 mēneši atpakaļ
vecāks
revīzija
644bc1c802

+ 1 - 1
server/src/main/java/org/elasticsearch/transport/OutboundHandler.java

@@ -153,7 +153,7 @@ final class OutboundHandler {
         try {
             sendMessage(channel, message, responseStatsConsumer, () -> {
                 try {
-                    messageListener.onResponseSent(requestId, action, response);
+                    messageListener.onResponseSent(requestId, action);
                 } finally {
                     response.decRef();
                 }

+ 1 - 2
server/src/main/java/org/elasticsearch/transport/TransportMessageListener.java

@@ -27,9 +27,8 @@ public interface TransportMessageListener {
      * Called for every action response sent after the response has been passed to the underlying network implementation.
      * @param requestId the request ID (unique per client)
      * @param action the request action
-     * @param response the response send
      */
-    default void onResponseSent(long requestId, String action, TransportResponse response) {}
+    default void onResponseSent(long requestId, String action) {}
 
     /***
      * Called for every failed action response after the response has been passed to the underlying network implementation.

+ 5 - 5
server/src/main/java/org/elasticsearch/transport/TransportService.java

@@ -1303,11 +1303,11 @@ public class TransportService extends AbstractLifecycleComponent
 
     /** called by the {@link Transport} implementation once a response was sent to calling node */
     @Override
-    public void onResponseSent(long requestId, String action, TransportResponse response) {
+    public void onResponseSent(long requestId, String action) {
         if (tracerLog.isTraceEnabled() && shouldTraceAction(action)) {
             tracerLog.trace("[{}][{}] sent response", requestId, action);
         }
-        messageListener.onResponseSent(requestId, action, response);
+        messageListener.onResponseSent(requestId, action);
     }
 
     /** called by the {@link Transport} implementation after an exception was sent as a response to an incoming request */
@@ -1555,7 +1555,7 @@ public class TransportService extends AbstractLifecycleComponent
 
         @Override
         public void sendResponse(TransportResponse response) {
-            service.onResponseSent(requestId, action, response);
+            service.onResponseSent(requestId, action);
             try (var shutdownBlock = service.pendingDirectHandlers.withRef()) {
                 if (shutdownBlock == null) {
                     // already shutting down, the handler will be completed by sendRequestInternal or doStop
@@ -1679,9 +1679,9 @@ public class TransportService extends AbstractLifecycleComponent
         }
 
         @Override
-        public void onResponseSent(long requestId, String action, TransportResponse response) {
+        public void onResponseSent(long requestId, String action) {
             for (TransportMessageListener listener : listeners) {
-                listener.onResponseSent(requestId, action, response);
+                listener.onResponseSent(requestId, action);
             }
         }
 

+ 5 - 20
server/src/test/java/org/elasticsearch/transport/OutboundHandlerTests.java

@@ -221,13 +221,11 @@ public class OutboundHandlerTests extends ESTestCase {
 
         AtomicLong requestIdRef = new AtomicLong();
         AtomicReference<String> actionRef = new AtomicReference<>();
-        AtomicReference<TransportResponse> responseRef = new AtomicReference<>();
         handler.setMessageListener(new TransportMessageListener() {
             @Override
-            public void onResponseSent(long requestId, String action, TransportResponse response) {
+            public void onResponseSent(long requestId, String action) {
                 requestIdRef.set(requestId);
                 actionRef.set(action);
-                responseRef.set(response);
             }
         });
         if (compress) {
@@ -245,7 +243,6 @@ public class OutboundHandlerTests extends ESTestCase {
         }
         assertEquals(requestId, requestIdRef.get());
         assertEquals(action, actionRef.get());
-        assertEquals(response, responseRef.get());
 
         pipeline.handleBytes(channel, new ReleasableBytesReference(reference, () -> {}));
         final Tuple<Header, BytesReference> tuple = message.get();
@@ -339,18 +336,15 @@ public class OutboundHandlerTests extends ESTestCase {
 
         AtomicLong requestIdRef = new AtomicLong();
         AtomicReference<String> actionRef = new AtomicReference<>();
-        AtomicReference<TransportResponse> responseRef = new AtomicReference<>();
         AtomicReference<Exception> exceptionRef = new AtomicReference<>();
         handler.setMessageListener(new TransportMessageListener() {
             @Override
-            public void onResponseSent(long requestId, String action, TransportResponse response) {
+            public void onResponseSent(long requestId, String action) {
                 assertNull(channel.getMessageCaptor().get());
                 assertThat(requestIdRef.get(), equalTo(0L));
                 requestIdRef.set(requestId);
                 assertNull(actionRef.get());
                 actionRef.set(action);
-                assertNull(responseRef.get());
-                responseRef.set(response);
             }
 
             @Override
@@ -375,7 +369,6 @@ public class OutboundHandlerTests extends ESTestCase {
         }
         assertEquals(requestId, requestIdRef.get());
         assertEquals(action, actionRef.get());
-        assertEquals(response, responseRef.get());
         assertThat(exceptionRef.get().getMessage(), equalTo("simulated cbe"));
         assertTrue(response.released.get());
         BytesReference reference = channel.getMessageCaptor().get();
@@ -401,18 +394,15 @@ public class OutboundHandlerTests extends ESTestCase {
         long requestId = randomLongBetween(0, 300);
         AtomicLong requestIdRef = new AtomicLong();
         AtomicReference<String> actionRef = new AtomicReference<>();
-        AtomicReference<TransportResponse> responseRef = new AtomicReference<>();
         AtomicReference<Exception> exceptionRef = new AtomicReference<>();
         handler.setMessageListener(new TransportMessageListener() {
             @Override
-            public void onResponseSent(long requestId, String action, TransportResponse response) {
+            public void onResponseSent(long requestId, String action) {
                 assertNull(channel.getMessageCaptor().get());
                 assertThat(requestIdRef.get(), equalTo(0L));
                 requestIdRef.set(requestId);
                 assertNull(actionRef.get());
                 actionRef.set(action);
-                assertNull(responseRef.get());
-                responseRef.set(response);
             }
 
             @Override
@@ -437,7 +427,6 @@ public class OutboundHandlerTests extends ESTestCase {
         }
         assertEquals(requestId, requestIdRef.get());
         assertEquals(action, actionRef.get());
-        assertEquals(response, responseRef.get());
         assertThat(exceptionRef.get().getMessage(), equalTo("simulated cbe"));
         assertTrue(response.released.get());
         assertNull(channel.getMessageCaptor().get());
@@ -458,17 +447,14 @@ public class OutboundHandlerTests extends ESTestCase {
 
         AtomicLong requestIdRef = new AtomicLong();
         AtomicReference<String> actionRef = new AtomicReference<>();
-        AtomicReference<TransportResponse> responseRef = new AtomicReference<>();
         handler.setMessageListener(new TransportMessageListener() {
             @Override
-            public void onResponseSent(long requestId, String action, TransportResponse response) {
+            public void onResponseSent(long requestId, String action) {
                 assertNull(channel.getMessageCaptor().get());
                 assertThat(requestIdRef.get(), equalTo(0L));
                 requestIdRef.set(requestId);
                 assertNull(actionRef.get());
                 actionRef.set(action);
-                assertNull(responseRef.get());
-                responseRef.set(response);
             }
 
             @Override
@@ -486,7 +472,6 @@ public class OutboundHandlerTests extends ESTestCase {
         assertNull(channel.getListenerCaptor().get());
         assertEquals(requestId, requestIdRef.get());
         assertEquals(action, actionRef.get());
-        assertEquals(response, responseRef.get());
         assertTrue(response.released.get());
         assertFalse(channel.isOpen());
     }
@@ -508,7 +493,7 @@ public class OutboundHandlerTests extends ESTestCase {
         AtomicReference<Exception> exceptionRef = new AtomicReference<>();
         handler.setMessageListener(new TransportMessageListener() {
             @Override
-            public void onResponseSent(long requestId, String action, TransportResponse response) {
+            public void onResponseSent(long requestId, String action) {
                 throw new AssertionError("must not be called");
             }
 

+ 1 - 1
test/framework/src/main/java/org/elasticsearch/transport/AbstractSimpleTransportTestCase.java

@@ -545,7 +545,7 @@ public abstract class AbstractSimpleTransportTestCase extends ESTestCase {
             }
 
             @Override
-            public void onResponseSent(long requestId, String action, TransportResponse response) {
+            public void onResponseSent(long requestId, String action) {
                 if (action.equals(ACTION)) {
                     responseSent.incrementAndGet();
                 }