diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/StubRabbitConnectionFactory.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/StubRabbitConnectionFactory.java index d1b3193daa..eec2111aec 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/StubRabbitConnectionFactory.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/StubRabbitConnectionFactory.java @@ -84,8 +84,7 @@ public class StubRabbitConnectionFactory implements ConnectionFactory { return false; } } - - + private static class StubChannel implements Channel { public void addShutdownListener(ShutdownListener listener) { @@ -327,7 +326,8 @@ public class StubRabbitConnectionFactory implements ConnectionFactory { public RecoverOk basicRecover(boolean requeue) throws IOException { return null; } - + + @Deprecated public void basicRecoverAsync(boolean requeue) throws IOException { } 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 2481f7973b..758bb17285 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 @@ -47,10 +47,12 @@ import org.springframework.integration.message.GenericMessage; * @since 2.1 * */ +@SuppressWarnings("rawtypes") public class RemoteFileOutboundGatewayTests { private String tmpDir = System.getProperty("java.io.tmpdir"); + @Test public void testLs() throws Exception { SessionFactory sessionFactory = mock(SessionFactory.class); @@ -247,7 +249,7 @@ public class RemoteFileOutboundGatewayTests { public boolean remove(String path) throws IOException { return false; } - @SuppressWarnings("unchecked") + public TestLsEntry[] list(String path) throws IOException { return new TestLsEntry[] { new TestLsEntry("f1", 1234, false, false, 12345, "-rw-r--r--") @@ -301,7 +303,7 @@ public class RemoteFileOutboundGatewayTests { public boolean remove(String path) throws IOException { return false; } - @SuppressWarnings("unchecked") + public TestLsEntry[] list(String path) throws IOException { return new TestLsEntry[] { new TestLsEntry("f1", 1234, false, false, modified.getTime(), "-rw-r--r--") @@ -353,7 +355,7 @@ public class RemoteFileOutboundGatewayTests { public boolean remove(String path) throws IOException { return false; } - @SuppressWarnings("unchecked") + public TestLsEntry[] list(String path) throws IOException { return new TestLsEntry[] { new TestLsEntry("f1", 1234, false, false, 12345, "-rw-r--r--") @@ -407,6 +409,7 @@ public class RemoteFileOutboundGatewayTests { class TestRemoteFileOutboundGateway extends AbstractRemoteFileOutboundGateway { + @SuppressWarnings({ "rawtypes", "unchecked" }) public TestRemoteFileOutboundGateway(SessionFactory sessionFactory, String command, String expression) { super(sessionFactory, command, expression); diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/AbstractFtpSessionFactory.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/AbstractFtpSessionFactory.java index b9524649dd..68e2bbc406 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/AbstractFtpSessionFactory.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/AbstractFtpSessionFactory.java @@ -23,6 +23,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.commons.net.ftp.FTP; import org.apache.commons.net.ftp.FTPClient; import org.apache.commons.net.ftp.FTPClientConfig; +import org.apache.commons.net.ftp.FTPFile; import org.apache.commons.net.ftp.FTPReply; import org.springframework.integration.MessagingException; @@ -38,7 +39,7 @@ import org.springframework.util.Assert; * @author Oleg Zhurakousky * @since 2.0 */ -public abstract class AbstractFtpSessionFactory implements SessionFactory { +public abstract class AbstractFtpSessionFactory implements SessionFactory { public static final String DEFAULT_REMOTE_WORKING_DIRECTORY = "/"; @@ -123,7 +124,7 @@ public abstract class AbstractFtpSessionFactory implements this.clientMode = clientMode; } - public Session getSession() { + public Session getSession() { try { T client = this.createClient(); if (client == null) { diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParserTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParserTests.java index 4d747a6a14..886032a641 100644 --- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParserTests.java +++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParserTests.java @@ -108,6 +108,7 @@ public class FtpInboundChannelAdapterParserTests { public static class TestSessionFactoryBean implements FactoryBean { + @SuppressWarnings({ "rawtypes", "unchecked" }) public DefaultFtpSessionFactory getObject() throws Exception { DefaultFtpSessionFactory factory = mock(DefaultFtpSessionFactory.class); Session session = mock(Session.class); diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizerTest.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizerTest.java index aa2485a699..db3f689522 100644 --- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizerTest.java +++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizerTest.java @@ -26,6 +26,7 @@ import org.apache.commons.net.ftp.FTPFile; import org.junit.After; import org.junit.Test; import org.mockito.Mockito; + import org.springframework.expression.Expression; import org.springframework.expression.ExpressionParser; import org.springframework.expression.spel.SpelParserConfiguration; @@ -74,7 +75,6 @@ public class FtpInboundRemoteFileSystemSynchronizerTest { ftpSessionFactory.setUsername("kermit"); ftpSessionFactory.setPassword("frog"); ftpSessionFactory.setHost("foo.com"); - FtpInboundFileSynchronizer synchronizer = spy(new FtpInboundFileSynchronizer(ftpSessionFactory)); synchronizer.setDeleteRemoteFiles(true); synchronizer.setRemoteDirectory("remote-test-dir"); diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/session/SessionFactoryTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/session/SessionFactoryTests.java index e8911cfddb..f765be91fd 100644 --- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/session/SessionFactoryTests.java +++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/session/SessionFactoryTests.java @@ -39,6 +39,7 @@ import static org.junit.Assert.assertEquals; * @author Oleg Zhurakousky * */ +@SuppressWarnings({"rawtypes","unchecked"}) public class SessionFactoryTests { @Test @@ -63,6 +64,7 @@ public class SessionFactoryTests { } } + @Test public void testStaleConnection() throws Exception{ SessionFactory sessionFactory = Mockito.mock(SessionFactory.class); diff --git a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/fork/CacheServerProcess.java b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/fork/CacheServerProcess.java index d862425ad4..eaea33a99f 100644 --- a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/fork/CacheServerProcess.java +++ b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/fork/CacheServerProcess.java @@ -38,6 +38,7 @@ import com.gemstone.gemfire.distributed.DistributedSystem; */ public class CacheServerProcess { + @SuppressWarnings({ "deprecation", "rawtypes", "unchecked" }) public static void main(String[] args) throws Exception { Properties props = new Properties(); @@ -45,6 +46,7 @@ public class CacheServerProcess { props.setProperty("log-level", "info"); System.out.println("\nConnecting to the distributed system and creating the cache."); + DistributedSystem ds = DistributedSystem.connect(props); Cache cache = CacheFactory.create(ds); diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpInboundChannelAdapterParserTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpInboundChannelAdapterParserTests.java index b0ab0b912c..79dba5ae36 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpInboundChannelAdapterParserTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpInboundChannelAdapterParserTests.java @@ -121,7 +121,7 @@ public class HttpInboundChannelAdapterParserTests { headers.set("foo", "foo"); headers.set("bar", "bar"); headers.set("baz", "baz"); - Map map = (Map) headerMapper.toHeaders(headers); + Map map = headerMapper.toHeaders(headers); assertTrue(map.size() == 2); assertEquals("foo", map.get("foo")); assertEquals("bar", map.get("bar")); diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpInboundGatewayParserTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpInboundGatewayParserTests.java index d0f4075d42..5da7a2ad41 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpInboundGatewayParserTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpInboundGatewayParserTests.java @@ -121,7 +121,7 @@ public class HttpInboundGatewayParserTests { headers.set("foo", "foo"); headers.set("bar", "bar"); headers.set("baz", "baz"); - Map map = (Map) headerMapper.toHeaders(headers); + Map map = headerMapper.toHeaders(headers); assertTrue(map.size() == 2); assertEquals("foo", map.get("foo")); assertEquals("bar", map.get("bar")); @@ -145,7 +145,7 @@ public class HttpInboundGatewayParserTests { headers.set("foo", "foo"); headers.set("bar", "bar"); headers.set("baz", "baz"); - Map map = (Map) headerMapper.toHeaders(headers); + Map map = headerMapper.toHeaders(headers); assertTrue(map.size() == 2); assertEquals("foo", map.get("foo")); assertEquals("bar", map.get("bar")); diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithNamespaceIntegrationTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithNamespaceIntegrationTests.java index 940f8fbbd3..56ffe96fc9 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithNamespaceIntegrationTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithNamespaceIntegrationTests.java @@ -55,22 +55,22 @@ public class StoredProcOutboundGatewayWithNamespaceIntegrationTests { @Autowired CreateUser createUser; - @Test + @Test public void test() throws Exception { createUser.createUser(new User("myUsername", "myPassword", "myEmail")); - List> received = new ArrayList>(); + List>> received = new ArrayList>>(); received.add(consumer.poll(2000)); - Message message = received.get(0); + Message> message = received.get(0); context.stop(); assertNotNull(message); assertNotNull(message.getPayload()); assertNotNull(message.getPayload() instanceof Collection); - Collection allUsers = (Collection) message.getPayload(); + Collection allUsers = message.getPayload(); assertTrue(allUsers.size() == 1); @@ -98,14 +98,14 @@ public class StoredProcOutboundGatewayWithNamespaceIntegrationTests { static class Consumer { - private final BlockingQueue> messages = new LinkedBlockingQueue>(); + private final BlockingQueue>> messages = new LinkedBlockingQueue>>(); @ServiceActivator - public void receive(Messagemessage) { + public void receive(Message> message) { messages.add(message); } - Message poll(long timeoutInMillis) throws InterruptedException { + Message> poll(long timeoutInMillis) throws InterruptedException { return messages.poll(timeoutInMillis, TimeUnit.MILLISECONDS); } } diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithSpringContextIntegrationTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithSpringContextIntegrationTests.java index 7e616549ae..4d529b3b34 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithSpringContextIntegrationTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithSpringContextIntegrationTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.jdbc; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -27,11 +24,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import javax.sql.DataSource; - -import org.apache.log4j.Logger; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.integration.Message; @@ -41,6 +36,9 @@ import org.springframework.integration.jdbc.storedproc.User; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + /** * @author Gunnar Hillert */ @@ -48,11 +46,6 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class) public class StoredProcOutboundGatewayWithSpringContextIntegrationTests { - private static Logger logger = Logger.getLogger(StoredProcOutboundGatewayWithSpringContextIntegrationTests.class); - - @Autowired - private DataSource datasource; - @Autowired private AbstractApplicationContext context; @@ -62,22 +55,22 @@ public class StoredProcOutboundGatewayWithSpringContextIntegrationTests { @Autowired CreateUser createUser; - @Test + @Test public void test() throws Exception { createUser.createUser(new User("myUsername", "myPassword", "myEmail")); - List> received = new ArrayList>(); + List>> received = new ArrayList>>(); received.add(consumer.poll(2000)); - Message message = received.get(0); + Message> message = received.get(0); context.stop(); assertNotNull(message); assertNotNull(message.getPayload()); assertNotNull(message.getPayload() instanceof Collection); - Collection allUsers = (Collection) message.getPayload(); + Collection allUsers = message.getPayload(); assertTrue(allUsers.size() == 1); @@ -99,14 +92,14 @@ public class StoredProcOutboundGatewayWithSpringContextIntegrationTests { static class Consumer { - private final BlockingQueue> messages = new LinkedBlockingQueue>(); + private final BlockingQueue>> messages = new LinkedBlockingQueue>>(); @ServiceActivator - public void receive(Messagemessage) { + public void receive(Message> message) { messages.add(message); } - Message poll(long timeoutInMillis) throws InterruptedException { + Message> poll(long timeoutInMillis) throws InterruptedException { return messages.poll(timeoutInMillis, TimeUnit.MILLISECONDS); } } diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapterWithNamespace2IntegrationTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapterWithNamespace2IntegrationTests.java index 1b2b13616b..1f08377605 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapterWithNamespace2IntegrationTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapterWithNamespace2IntegrationTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.jdbc; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - import java.util.ArrayList; import java.util.List; import java.util.concurrent.BlockingQueue; @@ -26,9 +23,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.log4j.Logger; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.integration.Message; @@ -36,6 +33,9 @@ import org.springframework.integration.annotation.ServiceActivator; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + /** * @author Gunnar Hillert */ @@ -43,27 +43,26 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class) public class StoredProcPollingChannelAdapterWithNamespace2IntegrationTests { - private static Logger logger = Logger.getLogger(StoredProcPollingChannelAdapterWithNamespace2IntegrationTests.class); - @Autowired private AbstractApplicationContext context; @Autowired private Consumer consumer; - @Test + + @Test public void pollH2DatabaseUsingStoredProcedureCall() throws Exception { - List> received = new ArrayList>(); + List>> received = new ArrayList>>(); received.add(consumer.poll(60000)); - Message message = received.get(0); + Message> message = received.get(0); context.stop(); assertNotNull(message); assertNotNull(message.getPayload()); assertTrue(message.getPayload() instanceof List); - List resultList = (List) message.getPayload(); + List resultList = message.getPayload(); assertTrue(resultList.size() == 1); @@ -85,14 +84,14 @@ public class StoredProcPollingChannelAdapterWithNamespace2IntegrationTests { static class Consumer { - private final BlockingQueue> messages = new LinkedBlockingQueue>(); + private final BlockingQueue>> messages = new LinkedBlockingQueue>>(); @ServiceActivator - public void receive(Messagemessage) { + public void receive(Message>message) { messages.add(message); } - Message poll(long timeoutInMillis) throws InterruptedException { + Message> poll(long timeoutInMillis) throws InterruptedException { return messages.poll(timeoutInMillis, TimeUnit.MILLISECONDS); } } diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapterWithNamespaceIntegrationTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapterWithNamespaceIntegrationTests.java index ecfd0f50cb..793c5d7674 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapterWithNamespaceIntegrationTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapterWithNamespaceIntegrationTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.jdbc; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -27,9 +24,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.log4j.Logger; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.integration.Message; @@ -37,6 +34,9 @@ import org.springframework.integration.annotation.ServiceActivator; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + /** * @author Gunnar Hillert */ @@ -44,15 +44,14 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class) public class StoredProcPollingChannelAdapterWithNamespaceIntegrationTests { - private static Logger logger = Logger.getLogger(StoredProcPollingChannelAdapterWithNamespaceIntegrationTests.class); - @Autowired private AbstractApplicationContext context; @Autowired private Consumer consumer; - @Test + @SuppressWarnings("unchecked") + @Test public void pollH2DatabaseUsingStoredProcedureCall() throws Exception { List> received = new ArrayList>(); diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapterWithSpringContextIntegrationTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapterWithSpringContextIntegrationTests.java index 67f12156fd..1c18c7184e 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapterWithSpringContextIntegrationTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapterWithSpringContextIntegrationTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.jdbc; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -27,11 +24,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import javax.sql.DataSource; - -import org.apache.log4j.Logger; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.integration.Message; @@ -39,6 +34,9 @@ import org.springframework.integration.annotation.ServiceActivator; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + /** * @author Gunnar Hillert */ @@ -46,30 +44,25 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class) public class StoredProcPollingChannelAdapterWithSpringContextIntegrationTests { - private static Logger logger = Logger.getLogger(StoredProcPollingChannelAdapterWithSpringContextIntegrationTests.class); - - @Autowired - private DataSource datasource; - @Autowired private AbstractApplicationContext context; @Autowired private Consumer consumer; - @Test + @Test public void test() throws Exception { - List> received = new ArrayList>(); + List>> received = new ArrayList>>(); received.add(consumer.poll(2000)); - Message message = received.get(0); + Message> message = received.get(0); context.stop(); assertNotNull(message); assertNotNull(message.getPayload()); assertNotNull(message.getPayload() instanceof Collection); - Collection primeNumbers = (Collection) message.getPayload(); + Collection primeNumbers = message.getPayload(); assertTrue(primeNumbers.size() == 4); @@ -91,14 +84,14 @@ public class StoredProcPollingChannelAdapterWithSpringContextIntegrationTests { static class Consumer { - private final BlockingQueue> messages = new LinkedBlockingQueue>(); + private final BlockingQueue>> messages = new LinkedBlockingQueue>>(); @ServiceActivator - public void receive(Messagemessage) { + public void receive(Message>message) { messages.add(message); } - Message poll(long timeoutInMillis) throws InterruptedException { + Message> poll(long timeoutInMillis) throws InterruptedException { return messages.poll(timeoutInMillis, TimeUnit.MILLISECONDS); } } diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcMessageHandlerParserTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcMessageHandlerParserTests.java index 97001acfda..a01b381b21 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcMessageHandlerParserTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcMessageHandlerParserTests.java @@ -58,7 +58,8 @@ public class StoredProcMessageHandlerParserTests { assertEquals("Resolution Required should be 'testProcedure1' but was " + testProcedure1, "testProcedure1", testProcedure1); } - @Test + @SuppressWarnings("unchecked") + @Test public void testProcedurepParametersAreSet() throws Exception { setUp("basicStoredProcOutboundChannelAdapterTest.xml", getClass()); @@ -99,7 +100,8 @@ public class StoredProcMessageHandlerParserTests { } - @Test + @SuppressWarnings("unchecked") + @Test public void testSqlParametersAreSet() throws Exception { setUp("basicStoredProcOutboundChannelAdapterTest.xml", getClass()); diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcOutboundGatewayParserTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcOutboundGatewayParserTests.java index 6344f83d71..b03fb23012 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcOutboundGatewayParserTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcOutboundGatewayParserTests.java @@ -94,7 +94,8 @@ public class StoredProcOutboundGatewayParserTests { assertFalse(skipUndeclaredResults); } - @Test + @SuppressWarnings("unchecked") + @Test public void testProcedurepParametersAreSet() throws Exception { setUp("storedProcOutboundGatewayParserTest.xml", getClass()); @@ -133,7 +134,8 @@ public class StoredProcOutboundGatewayParserTests { } - @Test + @SuppressWarnings("unchecked") + @Test public void testReturningResultSetRowMappersAreSet() throws Exception { setUp("storedProcOutboundGatewayParserTest.xml", getClass()); @@ -158,7 +160,8 @@ public class StoredProcOutboundGatewayParserTests { } - @Test + @SuppressWarnings("unchecked") + @Test public void testSqlParametersAreSet() throws Exception { setUp("storedProcOutboundGatewayParserTest.xml", getClass()); diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcPollingChannelAdapterParserTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcPollingChannelAdapterParserTests.java index f6c98ce8a7..4743a021bb 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcPollingChannelAdapterParserTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcPollingChannelAdapterParserTests.java @@ -13,11 +13,6 @@ package org.springframework.integration.jdbc.config; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - import java.sql.Types; import java.util.List; import java.util.Map; @@ -25,6 +20,7 @@ import java.util.Map.Entry; import org.junit.After; import org.junit.Test; + import org.springframework.beans.DirectFieldAccessor; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -36,6 +32,11 @@ import org.springframework.jdbc.core.SqlInOutParameter; import org.springframework.jdbc.core.SqlOutParameter; import org.springframework.jdbc.core.SqlParameter; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + /** * @author Gunnar Hillert * @since 2.1 @@ -73,7 +74,8 @@ public class StoredProcPollingChannelAdapterParserTests { assertTrue("skipUndeclaredResults was not set and should default to 'true'", skipUndeclaredResults); } - @Test + @SuppressWarnings("unchecked") + @Test public void testProcedurepParametersAreSet() throws Exception { setUp("storedProcPollingChannelAdapterParserTest.xml", getClass()); @@ -112,7 +114,8 @@ public class StoredProcPollingChannelAdapterParserTests { } - @Test + @SuppressWarnings("unchecked") + @Test public void testReturningResultSetRowMappersAreSet() throws Exception { setUp("storedProcPollingChannelAdapterParserTest.xml", getClass()); @@ -137,7 +140,8 @@ public class StoredProcPollingChannelAdapterParserTests { } - @Test + @SuppressWarnings("unchecked") + @Test public void testSqlParametersAreSet() throws Exception { setUp("storedProcPollingChannelAdapterParserTest.xml", getClass()); diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/DefaultSftpSessionFactory.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/DefaultSftpSessionFactory.java index 6a356d9467..e89c18f6e0 100644 --- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/DefaultSftpSessionFactory.java +++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/DefaultSftpSessionFactory.java @@ -25,6 +25,7 @@ import org.springframework.integration.file.remote.session.SessionFactory; import org.springframework.util.Assert; import org.springframework.util.StringUtils; +import com.jcraft.jsch.ChannelSftp.LsEntry; import com.jcraft.jsch.JSch; import com.jcraft.jsch.Proxy; import com.jcraft.jsch.SocketFactory; @@ -38,7 +39,7 @@ import com.jcraft.jsch.UserInfo; * @author Oleg Zhurakousky * @since 2.0 */ -public class DefaultSftpSessionFactory implements SessionFactory { +public class DefaultSftpSessionFactory implements SessionFactory { private volatile String host; @@ -141,7 +142,7 @@ public class DefaultSftpSessionFactory implements SessionFactory { } - public Session getSession() { + public Session getSession() { Assert.hasText(this.host, "host must not be empty"); Assert.hasText(this.user, "user must not be empty"); Assert.isTrue(this.port >= 0, "port must be a positive number"); diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/inbound/SftpInboundRemoteFileSystemSynchronizerTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/inbound/SftpInboundRemoteFileSystemSynchronizerTests.java index ce4b8fab5e..e0d7294ae9 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/inbound/SftpInboundRemoteFileSystemSynchronizerTests.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/inbound/SftpInboundRemoteFileSystemSynchronizerTests.java @@ -16,17 +16,6 @@ package org.springframework.integration.sftp.inbound; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertNotNull; -import static junit.framework.Assert.assertNull; -import static junit.framework.Assert.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import java.io.File; import java.io.FileInputStream; import java.util.Vector; @@ -44,6 +33,17 @@ import com.jcraft.jsch.ChannelSftp; import com.jcraft.jsch.ChannelSftp.LsEntry; import com.jcraft.jsch.SftpATTRS; +import static junit.framework.Assert.assertEquals; +import static junit.framework.Assert.assertFalse; +import static junit.framework.Assert.assertNotNull; +import static junit.framework.Assert.assertNull; +import static junit.framework.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + /** * @author Oleg Zhurakousky * @since 2.0 @@ -75,6 +75,7 @@ public class SftpInboundRemoteFileSystemSynchronizerTests { ftpSessionFactory.setPassword("frog"); ftpSessionFactory.setHost("foo.com"); + SftpInboundFileSynchronizer synchronizer = spy(new SftpInboundFileSynchronizer(ftpSessionFactory)); synchronizer.setDeleteRemoteFiles(true); synchronizer.setRemoteDirectory("remote-test-dir"); @@ -103,7 +104,9 @@ public class SftpInboundRemoteFileSystemSynchronizerTests { public static class TestSftpSessionFactory extends DefaultSftpSessionFactory { - public Session getSession() { + + @Override + public Session getSession() { try { ChannelSftp channel = mock(ChannelSftp.class); diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpSendingMessageHandlerTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpSendingMessageHandlerTests.java index 54020a8055..260e9b0ac4 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpSendingMessageHandlerTests.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpSendingMessageHandlerTests.java @@ -41,6 +41,7 @@ import org.springframework.integration.sftp.session.SftpTestSessionFactory; import org.springframework.util.FileCopyUtils; import com.jcraft.jsch.ChannelSftp; +import com.jcraft.jsch.ChannelSftp.LsEntry; /** * @author Oleg Zhurakousky @@ -55,7 +56,7 @@ public class SftpSendingMessageHandlerTests { if (file.exists()){ file.delete(); } - SessionFactory sessionFactory = new TestSftpSessionFactory(); + SessionFactory sessionFactory = new TestSftpSessionFactory(); FileTransferringMessageHandler handler = new FileTransferringMessageHandler(sessionFactory); DefaultFileNameGenerator fGenerator = new DefaultFileNameGenerator(); fGenerator.setExpression("payload + '.test'"); @@ -66,21 +67,20 @@ public class SftpSendingMessageHandlerTests { assertTrue(new File("remote-target-dir", "template.mf.test").exists()); } - @SuppressWarnings({ "unchecked", "rawtypes" }) @Test public void testHandleStringMessage() throws Exception { File file = new File("remote-target-dir", "foo.txt"); if (file.exists()){ file.delete(); } - SessionFactory sessionFactory = new TestSftpSessionFactory(); + SessionFactory sessionFactory = new TestSftpSessionFactory(); FileTransferringMessageHandler handler = new FileTransferringMessageHandler(sessionFactory); DefaultFileNameGenerator fGenerator = new DefaultFileNameGenerator(); fGenerator.setExpression("'foo.txt'"); handler.setFileNameGenerator(fGenerator); handler.setRemoteDirectoryExpression(new LiteralExpression("remote-target-dir")); - handler.handleMessage(new GenericMessage("hello")); + handler.handleMessage(new GenericMessage("hello")); assertTrue(new File("remote-target-dir", "foo.txt").exists()); } @@ -104,12 +104,12 @@ public class SftpSendingMessageHandlerTests { public static class TestSftpSessionFactory extends DefaultSftpSessionFactory { - @SuppressWarnings("rawtypes") - public Session getSession() { + @Override + public Session getSession() { try { ChannelSftp channel = mock(ChannelSftp.class); - doAnswer(new Answer() { + doAnswer(new Answer() { public Object answer(InvocationOnMock invocation) throws Throwable { File file = new File((String)invocation.getArguments()[1]); @@ -120,7 +120,7 @@ public class SftpSendingMessageHandlerTests { }).when(channel).put(Mockito.any(InputStream.class), Mockito.anyString()); - doAnswer(new Answer() { + doAnswer(new Answer() { public Object answer(InvocationOnMock invocation) throws Throwable { File file = new File((String) invocation.getArguments()[0]); diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/SftpTestSessionFactory.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/SftpTestSessionFactory.java index 4debabd518..5d7ee952c1 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/SftpTestSessionFactory.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/SftpTestSessionFactory.java @@ -17,13 +17,15 @@ package org.springframework.integration.sftp.session; import org.springframework.integration.file.remote.session.Session; +import com.jcraft.jsch.ChannelSftp.LsEntry; + /** * @author Oleg Zhurakousky * */ public class SftpTestSessionFactory { - public static Session createSftpSession(com.jcraft.jsch.Session jschSession) { + public static Session createSftpSession(com.jcraft.jsch.Session jschSession) { SftpSession sftpSession = new SftpSession(jschSession); sftpSession.connect(); return sftpSession; 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 7fc0833f7e..d9646f31ab 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 { doAnswer(new Answer() { public Object answer(InvocationOnMock invocation) throws Throwable { Message message = (Message) invocation.getArguments()[0]; - String chatToUser = (String) message.getHeaders().get(XmppHeaders.CHAT_TO); + String chatToUser = (String) message.getHeaders().get(XmppHeaders.TO); assertNotNull(chatToUser); assertEquals("test1@example.org", chatToUser); return null; diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/XmppMessageProducer.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/XmppMessageProducer.java index 5828628917..0852c05e72 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/XmppMessageProducer.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/XmppMessageProducer.java @@ -55,7 +55,7 @@ public class XmppMessageProducer implements MessageSource { logger.info("sending message to recipient " + recipient); - return MessageBuilder.withPayload(msg).setHeader(XmppHeaders.CHAT_TO, recipient).build(); + return MessageBuilder.withPayload(msg).setHeader(XmppHeaders.TO, recipient).build(); } catch (InterruptedException e) { logger.debug("exception thrown when trying to receive a message", e); diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/outbound/ChatMessageSendingMessageHandlerTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/outbound/ChatMessageSendingMessageHandlerTests.java index 7f4e889f41..83ea4a0510 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/outbound/ChatMessageSendingMessageHandlerTests.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/outbound/ChatMessageSendingMessageHandlerTests.java @@ -49,7 +49,7 @@ public class ChatMessageSendingMessageHandlerTests { ChatMessageSendingMessageHandler handler = new ChatMessageSendingMessageHandler(connection); handler.afterPropertiesSet(); Message message = MessageBuilder.withPayload("Test Message"). - setHeader(XmppHeaders.CHAT_TO, "kermit@frog.com"). + setHeader(XmppHeaders.TO, "kermit@frog.com"). build(); // first Message new handler.handleMessage(message); @@ -67,8 +67,8 @@ public class ChatMessageSendingMessageHandlerTests { // assuming we know thread ID although currently we do not provide this capability message = MessageBuilder.withPayload("Hello Kitty"). - setHeader(XmppHeaders.CHAT_TO, "kermit@frog.com"). - setHeader(XmppHeaders.CHAT_THREAD_ID, "123"). + setHeader(XmppHeaders.TO, "kermit@frog.com"). + setHeader(XmppHeaders.THREAD, "123"). build(); class EqualSmackMessageWithThreadId extends ArgumentMatcher {