diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/channel/DispatcherHasNoSubscribersTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/channel/DispatcherHasNoSubscribersTests.java index 2b058eff3d..59c18bebcd 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/channel/DispatcherHasNoSubscribersTests.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/channel/DispatcherHasNoSubscribersTests.java @@ -128,7 +128,7 @@ public class DispatcherHasNoSubscribersTests { Log logger = mock(Log.class); final ArrayList logList = new ArrayList(); doAnswer(invocation -> { - String message = (String) invocation.getArguments()[0]; + String message = invocation.getArgumentAt(0, String.class); if (message.startsWith("Dispatcher has no subscribers")) { logList.add(message); } diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/InboundEndpointTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/InboundEndpointTests.java index 8b4a5fe96a..29aefb6c15 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/InboundEndpointTests.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/InboundEndpointTests.java @@ -167,7 +167,7 @@ public class InboundEndpointTests { Mockito.doAnswer(invocation -> { org.springframework.amqp.core.Message message = - (org.springframework.amqp.core.Message) invocation.getArguments()[2]; + invocation.getArgumentAt(2, org.springframework.amqp.core.Message.class); Map headers = message.getMessageProperties().getHeaders(); assertTrue(headers.containsKey(JsonHeaders.TYPE_ID.replaceFirst(JsonHeaders.PREFIX, ""))); assertNotEquals("foo", headers.get(JsonHeaders.TYPE_ID.replaceFirst(JsonHeaders.PREFIX, ""))); diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/OutboundEndpointTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/OutboundEndpointTests.java index c441c46ac8..f7da1d5967 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/OutboundEndpointTests.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/OutboundEndpointTests.java @@ -120,7 +120,7 @@ public class OutboundEndpointTests { final AtomicReference amqpMessage = new AtomicReference(); willAnswer(invocation -> { - amqpMessage.set((Message) invocation.getArguments()[2]); + amqpMessage.set(invocation.getArgumentAt(2, Message.class)); return null; }).given(amqpTemplate).send(anyString(), anyString(), any(Message.class), any(CorrelationData.class)); @@ -144,7 +144,7 @@ public class OutboundEndpointTests { final AtomicReference amqpMessage = new AtomicReference(); willAnswer(invocation -> { - amqpMessage.set((Message) invocation.getArguments()[2]); + amqpMessage.set(invocation.getArgumentAt(2, Message.class)); return null; }).given(amqpTemplate) .doSendAndReceiveWithTemporary(anyString(), anyString(), any(Message.class), any(CorrelationData.class)); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/P2pChannelTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/P2pChannelTests.java index 02eb1d4607..5eb31f2482 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/P2pChannelTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/P2pChannelTests.java @@ -75,7 +75,7 @@ public class P2pChannelTests { when(logger.isInfoEnabled()).thenReturn(true); final List logs = new ArrayList(); doAnswer(invocation -> { - logs.add((String) invocation.getArguments()[0]); + logs.add(invocation.getArgumentAt(0, String.class)); return null; }).when(logger).info(Mockito.anyString()); ReflectionUtils.doWithFields(AbstractMessageChannel.class, field -> { diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserTests.java index aefb62ecfc..7ec4db90b8 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserTests.java @@ -309,7 +309,7 @@ public class ChainParserTests { final AtomicReference log = new AtomicReference(); when(logger.isWarnEnabled()).thenReturn(true); doAnswer(invocation -> { - log.set((String) invocation.getArguments()[0]); + log.set(invocation.getArgumentAt(0, String.class)); return null; }).when(logger).warn(any()); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/BroadcastingDispatcherTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/BroadcastingDispatcherTests.java index aa5925030c..cf4baa8cea 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/BroadcastingDispatcherTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/BroadcastingDispatcherTests.java @@ -276,7 +276,7 @@ public class BroadcastingDispatcherTests { private void defaultTaskExecutorMock() { Mockito.doAnswer(invocation -> { - ((Runnable) invocation.getArguments()[0]).run(); + (invocation.getArgumentAt(0, Runnable.class)).run(); return null; }).when(taskExecutorMock).execute(Mockito.any(Runnable.class)); } @@ -288,7 +288,7 @@ public class BroadcastingDispatcherTests { final AtomicInteger count = new AtomicInteger(); Mockito.doAnswer(invocation -> { if (passes[count.getAndIncrement()]) { - ((Runnable) invocation.getArguments()[0]).run(); + (invocation.getArgumentAt(0, Runnable.class)).run(); } return null; }).when(taskExecutorMock).execute(Mockito.any(Runnable.class)); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/AsyncHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/AsyncHandlerTests.java index bcd2666135..3fbeb27b2d 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/AsyncHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/AsyncHandlerTests.java @@ -111,8 +111,8 @@ public class AsyncHandlerTests { Log logger = spy(TestUtils.getPropertyValue(this.handler, "logger", Log.class)); new DirectFieldAccessor(this.handler).setPropertyValue("logger", logger); doAnswer(invocation -> { - failedCallbackMessage = (String) invocation.getArguments()[0]; - failedCallbackException = (Exception) invocation.getArguments()[1]; + failedCallbackMessage = invocation.getArgumentAt(0, String.class); + failedCallbackException = invocation.getArgumentAt(1, Exception.class); exceptionLatch.countDown(); return null; }).when(logger).error(anyString(), any(Throwable.class)); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/advice/AdvisedMessageHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/advice/AdvisedMessageHandlerTests.java index 3ba7233459..00b3b72635 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/advice/AdvisedMessageHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/advice/AdvisedMessageHandlerTests.java @@ -897,7 +897,7 @@ public class AdvisedMessageHandlerTests { when(logger.isWarnEnabled()).thenReturn(Boolean.TRUE); final AtomicReference logMessage = new AtomicReference(); doAnswer(invocation -> { - logMessage.set((String) invocation.getArguments()[0]); + logMessage.set(invocation.getArgumentAt(0, String.class)); return null; }).when(logger).warn(Mockito.anyString()); DirectFieldAccessor accessor = new DirectFieldAccessor(advice); diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/remote/gateway/RemoteFileOutboundGatewayTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/remote/gateway/RemoteFileOutboundGatewayTests.java index 9e35585985..c9c1a9bbe4 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/remote/gateway/RemoteFileOutboundGatewayTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/remote/gateway/RemoteFileOutboundGatewayTests.java @@ -309,7 +309,7 @@ public class RemoteFileOutboundGatewayTests { }).when(session).rename(anyString(), anyString()); final List madeDirs = new ArrayList(); doAnswer(invocation -> { - madeDirs.add((String) invocation.getArguments()[0]); + madeDirs.add(invocation.getArgumentAt(0, String.class)); return null; }).when(session).mkdir(anyString()); when(sessionFactory.getSession()).thenReturn(session); @@ -909,7 +909,7 @@ public class RemoteFileOutboundGatewayTests { when(sessionFactory.getSession()).thenReturn(session); final AtomicReference written = new AtomicReference(); doAnswer(invocation -> { - written.set((String) invocation.getArguments()[1]); + written.set(invocation.getArgumentAt(1, String.class)); return null; }).when(session).write(any(InputStream.class), anyString()); tempFolder.newFile("baz.txt"); @@ -943,7 +943,7 @@ public class RemoteFileOutboundGatewayTests { when(sessionFactory.getSession()).thenReturn(session); final AtomicReference written = new AtomicReference(); doAnswer(invocation -> { - written.set((String) invocation.getArguments()[1]); + written.set(invocation.getArgumentAt(1, String.class)); return null; }).when(session).write(any(InputStream.class), anyString()); tempFolder.newFile("baz.txt"); diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/remote/handler/FileTransferringMessageHandlerTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/remote/handler/FileTransferringMessageHandlerTests.java index 60eb4767b0..84ff4ad642 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/remote/handler/FileTransferringMessageHandlerTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/remote/handler/FileTransferringMessageHandlerTests.java @@ -64,7 +64,7 @@ public class FileTransferringMessageHandlerTests { when(sf.getSession()).thenReturn(session); doAnswer(invocation -> { - String path = (String) invocation.getArguments()[1]; + String path = invocation.getArgumentAt(1, String.class); assertFalse(path.startsWith("/")); return null; }).when(session).rename(Mockito.anyString(), Mockito.anyString()); @@ -87,8 +87,8 @@ public class FileTransferringMessageHandlerTests { final AtomicReference finalPath = new AtomicReference(); when(sf.getSession()).thenReturn(session); doAnswer(invocation -> { - temporaryPath.set((String) invocation.getArguments()[0]); - finalPath.set((String) invocation.getArguments()[1]); + temporaryPath.set(invocation.getArgumentAt(0, String.class)); + finalPath.set(invocation.getArgumentAt(1, String.class)); return null; }).when(session).rename(Mockito.anyString(), Mockito.anyString()); FileTransferringMessageHandler handler = new FileTransferringMessageHandler(sf); @@ -110,7 +110,7 @@ public class FileTransferringMessageHandlerTests { when(sf.getSession()).thenReturn(session); doAnswer(invocation -> { - String path = (String) invocation.getArguments()[1]; + String path = invocation.getArgumentAt(1, String.class); assertFalse(path.startsWith("/")); return null; }).when(session).rename(Mockito.anyString(), Mockito.anyString()); diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpOutboundTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpOutboundTests.java index cf8468fca8..39e6423b1a 100644 --- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpOutboundTests.java +++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpOutboundTests.java @@ -161,7 +161,7 @@ public class FtpOutboundTests { when(logger.isWarnEnabled()).thenReturn(true); final AtomicReference logged = new AtomicReference(); doAnswer(invocation -> { - logged.set((String) invocation.getArguments()[0]); + logged.set(invocation.getArgumentAt(0, String.class)); invocation.callRealMethod(); return null; }).when(logger).warn(Mockito.anyString()); @@ -231,8 +231,8 @@ public class FtpOutboundTests { when(ftpClient.storeFile(Mockito.anyString(), any(InputStream.class))).thenAnswer(new Answer() { @Override public Boolean answer(InvocationOnMock invocation) throws Throwable { - String fileName = (String) invocation.getArguments()[0]; - InputStream fis = (InputStream) invocation.getArguments()[1]; + String fileName = invocation.getArgumentAt(0, String.class); + InputStream fis = invocation.getArgumentAt(1, InputStream.class); FileCopyUtils.copy(fis, new FileOutputStream(fileName)); return true; } @@ -241,8 +241,8 @@ public class FtpOutboundTests { @Override public Boolean answer(InvocationOnMock invocation) throws Throwable { - File file = new File((String) invocation.getArguments()[0]); - File renameToFile = new File((String) invocation.getArguments()[1]); + File file = new File(invocation.getArgumentAt(0, String.class)); + File renameToFile = new File(invocation.getArgumentAt(1, String.class)); file.renameTo(renameToFile); return true; } diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/HttpProxyScenarioTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/HttpProxyScenarioTests.java index 6521e8a99e..b93bcf9cbb 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/HttpProxyScenarioTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/HttpProxyScenarioTests.java @@ -120,7 +120,7 @@ public class HttpProxyScenarioTests { final String contentDispositionValue = "attachment; filename=\"test.txt\""; Mockito.doAnswer(invocation -> { - URI uri = (URI) invocation.getArguments()[0]; + URI uri = invocation.getArgumentAt(0, URI.class); assertEquals(new URI("http://testServer/test?foo=bar&FOO=BAR"), uri); HttpEntity httpEntity = (HttpEntity) invocation.getArguments()[2]; HttpHeaders httpHeaders = httpEntity.getHeaders(); @@ -173,7 +173,7 @@ public class HttpProxyScenarioTests { RestTemplate template = Mockito.spy(new RestTemplate()); Mockito.doAnswer(invocation -> { - URI uri = (URI) invocation.getArguments()[0]; + URI uri = invocation.getArgumentAt(0, URI.class); assertEquals(new URI("http://testServer/testmp"), uri); HttpEntity httpEntity = (HttpEntity) invocation.getArguments()[2]; HttpHeaders httpHeaders = httpEntity.getHeaders(); diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/MultipartAsRawByteArrayTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/MultipartAsRawByteArrayTests.java index dadcb63572..4da8053a04 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/MultipartAsRawByteArrayTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/MultipartAsRawByteArrayTests.java @@ -73,7 +73,7 @@ public class MultipartAsRawByteArrayTests { @Override public Integer answer(InvocationOnMock invocation) throws Throwable { - byte[] buff = (byte[]) invocation.getArguments()[0]; + byte[] buff = invocation.getArgumentAt(0, byte[].class); buff[0] = 'f'; buff[1] = 'o'; buff[2] = 'o'; diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/CachingClientConnectionFactoryTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/CachingClientConnectionFactoryTests.java index c5754df455..d54bd2d604 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/CachingClientConnectionFactoryTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/CachingClientConnectionFactoryTests.java @@ -776,7 +776,7 @@ public class CachingClientConnectionFactoryTests { @Override public Void answer(InvocationOnMock invocation) throws Throwable { invocation.callRealMethod(); - String log = (String) invocation.getArguments()[0]; + String log = invocation.getArgumentAt(0, String.class); if (log.startsWith("Response")) { Executors.newSingleThreadScheduledExecutor().execute(new Runnable() { diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNioConnectionTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNioConnectionTests.java index b6fb5cbae5..a06184550e 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNioConnectionTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNioConnectionTests.java @@ -303,7 +303,7 @@ public class TcpNioConnectionTests { Socket socket = mock(Socket.class); Mockito.when(channel.socket()).thenReturn(socket); doAnswer(invocation -> { - ByteBuffer buffer = (ByteBuffer) invocation.getArguments()[0]; + ByteBuffer buffer = invocation.getArgumentAt(0, ByteBuffer.class); buffer.position(1); return 1; }).when(channel).read(Mockito.any(ByteBuffer.class)); @@ -343,7 +343,7 @@ public class TcpNioConnectionTests { Socket socket = mock(Socket.class); Mockito.when(channel.socket()).thenReturn(socket); doAnswer(invocation -> { - ByteBuffer buffer = (ByteBuffer) invocation.getArguments()[0]; + ByteBuffer buffer = invocation.getArgumentAt(0, ByteBuffer.class); buffer.position(1025); buffer.put((byte) '\r'); buffer.put((byte) '\n'); @@ -501,7 +501,7 @@ public class TcpNioConnectionTests { @Override public Integer answer(InvocationOnMock invocation) throws Throwable { - ByteBuffer buff = (ByteBuffer) invocation.getArguments()[0]; + ByteBuffer buff = invocation.getArgumentAt(0, ByteBuffer.class); byte[] bytes = written.toByteArray(); buff.put(bytes); return bytes.length; @@ -516,7 +516,7 @@ public class TcpNioConnectionTests { @Override public Object answer(InvocationOnMock invocation) throws Throwable { - ByteBuffer buff = (ByteBuffer) invocation.getArguments()[0]; + ByteBuffer buff = invocation.getArgumentAt(0, ByteBuffer.class); byte[] bytes = new byte[buff.limit()]; buff.get(bytes); written.write(bytes); diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/DefaultJmsHeaderMapperTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/DefaultJmsHeaderMapperTests.java index 13d81694f5..624b6e6d5b 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/DefaultJmsHeaderMapperTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/DefaultJmsHeaderMapperTests.java @@ -533,7 +533,7 @@ public class DefaultJmsHeaderMapperTests { Session session = Mockito.mock(Session.class); - Mockito.doAnswer(invocation -> new StubTextMessage((String) invocation.getArguments()[0])).when(session) + Mockito.doAnswer(invocation -> new StubTextMessage(invocation.getArgumentAt(0, String.class))).when(session) .createTextMessage(Mockito.anyString()); javax.jms.Message request = converter.toMessage(new Foo(), session); diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/SubscribableJmsChannelTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/SubscribableJmsChannelTests.java index 001c233737..d65ff9a1f1 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/SubscribableJmsChannelTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/SubscribableJmsChannelTests.java @@ -318,7 +318,7 @@ public class SubscribableJmsChannelTests { Log logger = mock(Log.class); final ArrayList logList = new ArrayList(); doAnswer(invocation -> { - String message = (String) invocation.getArguments()[0]; + String message = invocation.getArgumentAt(0, String.class); if (message.startsWith("Dispatcher has no subscribers")) { logList.add(message); } diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MessageWithContentTypeTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MessageWithContentTypeTests.java index 043f11879f..9d620a244e 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MessageWithContentTypeTests.java +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MessageWithContentTypeTests.java @@ -85,7 +85,7 @@ public class MessageWithContentTypeTests { doAnswer(new Answer() { @Override public Object answer(InvocationOnMock invocation) throws Throwable { - MimeMessage mimeMessage = (MimeMessage) invocation.getArguments()[0]; + MimeMessage mimeMessage = invocation.getArgumentAt(0, MimeMessage.class); assertEquals("text/html", mimeMessage.getDataHandler().getContentType()); return null; } diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/DownstreamExceptionTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/DownstreamExceptionTests.java index ba68fb565f..8a7a4ddcbf 100644 --- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/DownstreamExceptionTests.java +++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/DownstreamExceptionTests.java @@ -84,7 +84,7 @@ public class DownstreamExceptionTests { @Override public Void answer(InvocationOnMock invocation) throws Throwable { - if (((String) invocation.getArguments()[0]).contains("Unhandled")) { + if ((invocation.getArgumentAt(0, String.class)).contains("Unhandled")) { latch.countDown(); } return null; diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MqttAdapterTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MqttAdapterTests.java index 63fc95adee..f1cad6bd96 100644 --- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MqttAdapterTests.java +++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MqttAdapterTests.java @@ -167,7 +167,7 @@ public class MqttAdapterTests { @Override public MqttToken answer(InvocationOnMock invocation) throws Throwable { - MqttConnectOptions options = (MqttConnectOptions) invocation.getArguments()[0]; + MqttConnectOptions options = invocation.getArgumentAt(0, MqttConnectOptions.class); assertEquals(23, options.getConnectionTimeout()); assertEquals(45, options.getKeepAliveInterval()); assertEquals("pass", new String(options.getPassword())); @@ -190,7 +190,7 @@ public class MqttAdapterTests { @Override public MqttDeliveryToken answer(InvocationOnMock invocation) throws Throwable { assertEquals("mqtt-foo", invocation.getArguments()[0]); - MqttMessage message = (MqttMessage) invocation.getArguments()[1]; + MqttMessage message = invocation.getArgumentAt(1, MqttMessage.class); assertEquals("Hello, world!", new String(message.getPayload())); publishCalled.set(true); return deliveryToken; @@ -246,7 +246,7 @@ public class MqttAdapterTests { waitToFail.await(10, TimeUnit.SECONDS); throw reconnectException; } - MqttConnectOptions options = (MqttConnectOptions) invocation.getArguments()[0]; + MqttConnectOptions options = invocation.getArgumentAt(0, MqttConnectOptions.class); assertEquals(23, options.getConnectionTimeout()); assertEquals(45, options.getKeepAliveInterval()); assertEquals("pass", new String(options.getPassword())); @@ -269,7 +269,7 @@ public class MqttAdapterTests { @Override public Object answer(InvocationOnMock invocation) throws Throwable { - callback.set((MqttCallback) invocation.getArguments()[0]); + callback.set(invocation.getArgumentAt(0, MqttCallback.class)); return null; } }).when(client).setCallback(any(MqttCallback.class)); @@ -290,7 +290,7 @@ public class MqttAdapterTests { @Override public Void answer(InvocationOnMock invocation) throws Throwable { - events.add((MqttIntegrationEvent) invocation.getArguments()[0]); + events.add(invocation.getArgumentAt(0, MqttIntegrationEvent.class)); return null; } }).when(applicationEventPublisher).publishEvent(any(MqttIntegrationEvent.class)); diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpOutboundTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpOutboundTests.java index 45e489947d..8b1c6f29bc 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpOutboundTests.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpOutboundTests.java @@ -209,7 +209,7 @@ public class SftpOutboundTests { handler.afterPropertiesSet(); final List madeDirs = new ArrayList(); doAnswer(invocation -> { - madeDirs.add((String) invocation.getArguments()[0]); + madeDirs.add(invocation.getArgumentAt(0, String.class)); return null; }).when(session).mkdir(anyString()); handler.handleMessage(new GenericMessage("qux")); @@ -356,16 +356,16 @@ public class SftpOutboundTests { ChannelSftp channel = mock(ChannelSftp.class); doAnswer(invocation -> { - File file = new File((String) invocation.getArguments()[1]); + File file = new File(invocation.getArgumentAt(1, String.class)); assertTrue(file.getName().endsWith(".writing")); - FileCopyUtils.copy((InputStream) invocation.getArguments()[0], new FileOutputStream(file)); + FileCopyUtils.copy(invocation.getArgumentAt(0, InputStream.class), new FileOutputStream(file)); return null; }).when(channel).put(Mockito.any(InputStream.class), Mockito.anyString()); doAnswer(invocation -> { - File file = new File((String) invocation.getArguments()[0]); + File file = new File(invocation.getArgumentAt(0, String.class)); assertTrue(file.getName().endsWith(".writing")); - File renameToFile = new File((String) invocation.getArguments()[1]); + File renameToFile = new File(invocation.getArgumentAt(1, String.class)); file.renameTo(renameToFile); return null; }).when(channel).rename(Mockito.anyString(), Mockito.anyString()); diff --git a/spring-integration-syslog/src/test/java/org/springframework/integration/syslog/inbound/SyslogReceivingChannelAdapterTests.java b/spring-integration-syslog/src/test/java/org/springframework/integration/syslog/inbound/SyslogReceivingChannelAdapterTests.java index 117341d087..5141b6c21b 100644 --- a/spring-integration-syslog/src/test/java/org/springframework/integration/syslog/inbound/SyslogReceivingChannelAdapterTests.java +++ b/spring-integration-syslog/src/test/java/org/springframework/integration/syslog/inbound/SyslogReceivingChannelAdapterTests.java @@ -118,7 +118,7 @@ public class SyslogReceivingChannelAdapterTests { @Override public Void answer(InvocationOnMock invocation) throws Throwable { - if (((String) invocation.getArguments()[0]).contains("Error on syslog socket")) { + if ((invocation.getArgumentAt(0, String.class)).contains("Error on syslog socket")) { sawLog.countDown(); } invocation.callRealMethod(); @@ -201,7 +201,7 @@ public class SyslogReceivingChannelAdapterTests { @Override public Void answer(InvocationOnMock invocation) throws Throwable { - if (((String) invocation.getArguments()[0]).contains("Error on syslog socket")) { + if ((invocation.getArgumentAt(0, String.class)).contains("Error on syslog socket")) { sawLog.countDown(); } invocation.callRealMethod(); diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/outbound/TwitterSearchOutboundGatewayTests.java b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/outbound/TwitterSearchOutboundGatewayTests.java index 2ca09099f1..e93fc01ac0 100644 --- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/outbound/TwitterSearchOutboundGatewayTests.java +++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/outbound/TwitterSearchOutboundGatewayTests.java @@ -84,7 +84,7 @@ public class TwitterSearchOutboundGatewayTests { @Override public SearchResults answer(InvocationOnMock invocation) throws Throwable { - SearchParameters searchParameters = (SearchParameters) invocation.getArguments()[0]; + SearchParameters searchParameters = invocation.getArgumentAt(0, SearchParameters.class); assertEquals("foo", searchParameters.getQuery()); assertEquals(Integer.valueOf(20), searchParameters.getCount()); return searchResults; @@ -111,7 +111,7 @@ public class TwitterSearchOutboundGatewayTests { @Override public SearchResults answer(InvocationOnMock invocation) throws Throwable { - SearchParameters searchParameters = (SearchParameters) invocation.getArguments()[0]; + SearchParameters searchParameters = invocation.getArgumentAt(0, SearchParameters.class); assertEquals("foo", searchParameters.getQuery()); assertEquals(Integer.valueOf(30), searchParameters.getCount()); return searchResults; @@ -138,7 +138,7 @@ public class TwitterSearchOutboundGatewayTests { @Override public SearchResults answer(InvocationOnMock invocation) throws Throwable { - SearchParameters searchParameters = (SearchParameters) invocation.getArguments()[0]; + SearchParameters searchParameters = invocation.getArgumentAt(0, SearchParameters.class); assertEquals("bar", searchParameters.getQuery()); assertEquals(Integer.valueOf(1), searchParameters.getCount()); assertEquals(Long.valueOf(2), searchParameters.getSinceId()); @@ -166,7 +166,7 @@ public class TwitterSearchOutboundGatewayTests { @Override public SearchResults answer(InvocationOnMock invocation) throws Throwable { - SearchParameters searchParameters = (SearchParameters) invocation.getArguments()[0]; + SearchParameters searchParameters = invocation.getArgumentAt(0, SearchParameters.class); assertSame(parameters, searchParameters); return searchResults; } @@ -192,7 +192,7 @@ public class TwitterSearchOutboundGatewayTests { @Override public SearchResults answer(InvocationOnMock invocation) throws Throwable { - SearchParameters searchParameters = (SearchParameters) invocation.getArguments()[0]; + SearchParameters searchParameters = invocation.getArgumentAt(0, SearchParameters.class); assertEquals("foobar", searchParameters.getQuery()); assertEquals(Integer.valueOf(5), searchParameters.getCount()); assertEquals(Long.valueOf(11), searchParameters.getSinceId()); @@ -218,7 +218,7 @@ public class TwitterSearchOutboundGatewayTests { @Override public SearchResults answer(InvocationOnMock invocation) throws Throwable { - SearchParameters searchParameters = (SearchParameters) invocation.getArguments()[0]; + SearchParameters searchParameters = invocation.getArgumentAt(0, SearchParameters.class); assertEquals("foo", searchParameters.getQuery()); assertEquals(Integer.valueOf(20), searchParameters.getCount()); return searchResults; diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/UriVariableTests.java b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/UriVariableTests.java index 1398db07d3..ed6f3551b9 100644 --- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/UriVariableTests.java +++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/UriVariableTests.java @@ -119,7 +119,7 @@ public class UriVariableTests { Mockito.doAnswer(new Answer() { @Override public Object answer(InvocationOnMock invocation) throws Throwable { - uri.set((String) invocation.getArguments()[0]); + uri.set(invocation.getArgumentAt(0, String.class)); throw new WebServiceIOException("intentional"); } }).when(webServiceTemplate) diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppHeaderEnricherParserTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppHeaderEnricherParserTests.java index 94684abce3..87d09191ce 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppHeaderEnricherParserTests.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppHeaderEnricherParserTests.java @@ -61,7 +61,7 @@ public class XmppHeaderEnricherParserTests { MessageHandler handler = mock(MessageHandler.class); doAnswer(new Answer() { public Object answer(InvocationOnMock invocation) throws Throwable { - Message message = (Message) invocation.getArguments()[0]; + Message message = invocation.getArgumentAt(0, Message.class); String chatToUser = (String) message.getHeaders().get(XmppHeaders.TO); assertNotNull(chatToUser); assertEquals("test1@example.org", chatToUser); diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/inbound/ChatMessageListeningEndpointTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/inbound/ChatMessageListeningEndpointTests.java index b25fc14017..5bf6962b9d 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/inbound/ChatMessageListeningEndpointTests.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/inbound/ChatMessageListeningEndpointTests.java @@ -85,7 +85,7 @@ public class ChatMessageListeningEndpointTests { @Override public Object answer(InvocationOnMock invocation) throws Throwable { - packetListSet.add((StanzaListener) invocation.getArguments()[0]); + packetListSet.add(invocation.getArgumentAt(0, StanzaListener.class)); return null; } diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/inbound/PresenceListeningEndpointTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/inbound/PresenceListeningEndpointTests.java index 781e45da9b..95bd019f36 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/inbound/PresenceListeningEndpointTests.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/inbound/PresenceListeningEndpointTests.java @@ -70,7 +70,7 @@ public class PresenceListeningEndpointTests { @Override public Object answer(InvocationOnMock invocation) throws Throwable { - rosterSet.add((RosterListener) invocation.getArguments()[0]); + rosterSet.add(invocation.getArgumentAt(0, RosterListener.class)); return null; } @@ -80,7 +80,7 @@ public class PresenceListeningEndpointTests { @Override public Object answer(InvocationOnMock invocation) throws Throwable { - rosterSet.remove((RosterListener) invocation.getArguments()[0]); + rosterSet.remove(invocation.getArgumentAt(0, RosterListener.class)); return null; }