|
@@ -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");
|
|
|
}
|
|
|
|