From ae7bc5d4f758befcbcc98889de1c163bd0ba5ac2 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Fri, 11 Oct 2013 16:35:27 -0400 Subject: [PATCH 1/8] INT-3091 Fix Concurrent (S)FTP Transfers byte[] and String payloads were written to a temporary file. If the same message is transferred to two different destinations concurrently, one of the adapters could remove the temporary file while the other was using it. Don't use a temporary file for these payloads, simply use the payload byte[] [or a String.getBytes()] as the InputStream passed to the Session.write() method. Polishing Polishing - Add WARN For Missing File + Test JIRA: https://jira.springsource.org/browse/INT-3091 --- .../FileTransferringMessageHandler.java | 98 ++++++++++++------- .../AbstractInboundFileSynchronizer.java | 3 - .../FtpOutboundChannelAdapterParserTests.java | 6 +- ...FtpsOutboundChannelAdapterParserTests.java | 2 - .../ftp/outbound/FtpOutboundTests.java | 53 +++++++++- .../OutboundChannelAdapterParserTests.java | 7 +- .../sftp/outbound/SftpOutboundTests.java | 10 +- 7 files changed, 128 insertions(+), 51 deletions(-) diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/handler/FileTransferringMessageHandler.java b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/handler/FileTransferringMessageHandler.java index b314c5d812..c266c1bbd7 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/handler/FileTransferringMessageHandler.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/handler/FileTransferringMessageHandler.java @@ -16,10 +16,13 @@ package org.springframework.integration.file.remote.handler; +import java.io.BufferedInputStream; +import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; +import java.io.InputStream; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; @@ -35,7 +38,6 @@ import org.springframework.integration.file.remote.session.SessionFactory; import org.springframework.integration.handler.AbstractMessageHandler; import org.springframework.integration.handler.ExpressionEvaluatingMessageProcessor; import org.springframework.util.Assert; -import org.springframework.util.FileCopyUtils; import org.springframework.util.StringUtils; /** @@ -67,8 +69,6 @@ public class FileTransferringMessageHandler extends AbstractMessageHandler { private volatile boolean fileNameGeneratorSet; - private volatile File temporaryDirectory = new File(System.getProperty("java.io.tmpdir")); - private volatile String charset = "UTF-8"; private volatile String remoteFileSeparator = "/"; @@ -105,9 +105,11 @@ public class FileTransferringMessageHandler extends AbstractMessageHandler { return this.temporaryFileSuffix; } + /** + * @deprecated This property is no longer used; byte[] and String payloads are written directly + */ + @Deprecated public void setTemporaryDirectory(File temporaryDirectory) { - Assert.notNull(temporaryDirectory, "temporaryDirectory must not be null"); - this.temporaryDirectory = temporaryDirectory; } protected boolean isUseTemporaryFileName() { @@ -158,81 +160,87 @@ public class FileTransferringMessageHandler extends AbstractMessageHandler { @Override protected void handleMessageInternal(Message message) throws Exception { - File file = this.redeemForStorableFile(message); - if (file != null && file.exists()) { + StreamHolder inputStreamHolder = this.payloadToInputStream(message); + if (inputStreamHolder != null) { Session session = this.sessionFactory.getSession(); + String fileName = inputStreamHolder.getName(); try { String remoteDirectory = this.directoryExpressionProcessor.processMessage(message); String temporaryRemoteDirectory = remoteDirectory; if (this.temporaryDirectoryExpressionProcessor != null){ temporaryRemoteDirectory = this.temporaryDirectoryExpressionProcessor.processMessage(message); } - String fileName = this.fileNameGenerator.generateFileName(message); - this.sendFileToRemoteDirectory(file, temporaryRemoteDirectory, remoteDirectory, fileName, session); + fileName = this.fileNameGenerator.generateFileName(message); + this.sendFileToRemoteDirectory(inputStreamHolder.getStream(), temporaryRemoteDirectory, remoteDirectory, fileName, session); } catch (FileNotFoundException e) { throw new MessageDeliveryException(message, - "File [" + file + "] not found in local working directory; it was moved or deleted unexpectedly.", e); + "File [" + inputStreamHolder.getName() + "] not found in local working directory; it was moved or deleted unexpectedly.", e); } catch (IOException e) { throw new MessageDeliveryException(message, - "Failed to transfer file [" + file + "] from local working directory to remote FTP directory.", e); + "Failed to transfer file [" + inputStreamHolder.getName() + " -> " + fileName + "] from local directory to remote directory.", e); } catch (Exception e) { throw new MessageDeliveryException(message, - "Error handling message for file [" + file + "]", e); + "Error handling message for file [" + inputStreamHolder.getName() + " -> " + fileName + "]", e); } finally { - if (!(message.getPayload() instanceof File)) { - // we created the File, so we need to delete it - if (file.exists()) { - try { - file.delete(); - } - catch (Throwable t) { - // ignore - } - } - } if (session != null) { session.close(); } } } + else { + // A null holder means a File payload that does not exist. + if (logger.isWarnEnabled()) { + logger.warn("File " + message.getPayload() + " does not exist"); + } + } } - private File redeemForStorableFile(Message message) throws MessageDeliveryException { + private StreamHolder payloadToInputStream(Message message) throws MessageDeliveryException { try { Object payload = message.getPayload(); - File sendableFile = null; + InputStream dataInputStream = null; + String name = null; if (payload instanceof File) { - sendableFile = (File) payload; + File inputFile = (File) payload; + if (inputFile.exists()) { + dataInputStream = new BufferedInputStream(new FileInputStream(inputFile)); + name = inputFile.getAbsolutePath(); + } } else if (payload instanceof byte[] || payload instanceof String) { - String tempFileName = this.fileNameGenerator.generateFileName(message) + ".tmp"; - sendableFile = new File(this.temporaryDirectory, tempFileName); // will only create temp file for String/byte[] byte[] bytes = null; if (payload instanceof String) { bytes = ((String) payload).getBytes(this.charset); + name = "String payload"; } else { bytes = (byte[]) payload; + name = "byte[] payload"; } - FileCopyUtils.copy(bytes, sendableFile); + dataInputStream = new ByteArrayInputStream(bytes); } else { throw new IllegalArgumentException("Unsupported payload type. The only supported payloads are " + "java.io.File, java.lang.String, and byte[]"); } - return sendableFile; + if (dataInputStream == null) { + return null; + } + else { + return new StreamHolder(dataInputStream, name); + } } catch (Exception e) { throw new MessageDeliveryException(message, "Failed to create sendable file.", e); } } - private void sendFileToRemoteDirectory(File file, String temporaryRemoteDirectory, String remoteDirectory, String fileName, Session session) - throws FileNotFoundException, IOException { + private void sendFileToRemoteDirectory(InputStream inputStream, String temporaryRemoteDirectory, + String remoteDirectory, String fileName, Session session) throws FileNotFoundException, IOException { remoteDirectory = this.normalizeDirectoryPath(remoteDirectory); temporaryRemoteDirectory = this.normalizeDirectoryPath(temporaryRemoteDirectory); @@ -253,9 +261,8 @@ public class FileTransferringMessageHandler extends AbstractMessageHandler { } } - FileInputStream fileInputStream = new FileInputStream(file); try { - session.write(fileInputStream, tempFilePath); + session.write(inputStream, tempFilePath); // then rename it to its final name if necessary if (useTemporaryFileName){ session.rename(tempFilePath, remoteFilePath); @@ -265,7 +272,7 @@ public class FileTransferringMessageHandler extends AbstractMessageHandler { throw new MessagingException("Failed to write to '" + tempFilePath + "' while uploading the file", e); } finally { - fileInputStream.close(); + inputStream.close(); } } @@ -279,4 +286,25 @@ public class FileTransferringMessageHandler extends AbstractMessageHandler { return directoryPath; } + private class StreamHolder { + + private final InputStream stream; + + private final String name; + + private StreamHolder(InputStream stream, String name) { + this.stream = stream; + this.name = name; + } + + public InputStream getStream() { + return stream; + } + + public String getName() { + return name; + } + + } + } diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/synchronizer/AbstractInboundFileSynchronizer.java b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/synchronizer/AbstractInboundFileSynchronizer.java index b2bcab056b..cb42377025 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/synchronizer/AbstractInboundFileSynchronizer.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/synchronizer/AbstractInboundFileSynchronizer.java @@ -27,7 +27,6 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.InitializingBean; import org.springframework.expression.EvaluationContext; import org.springframework.expression.Expression; @@ -90,8 +89,6 @@ public abstract class AbstractInboundFileSynchronizer implements InboundFileS */ private volatile boolean deleteRemoteFiles; - private volatile BeanFactory beanFactory; - /** * Create a synchronizer with the {@link SessionFactory} used to acquire {@link Session} instances. */ diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterParserTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterParserTests.java index 8556c99042..d6b2f8e98a 100644 --- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterParserTests.java +++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterParserTests.java @@ -17,15 +17,16 @@ package org.springframework.integration.ftp.config; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; import java.util.Iterator; import java.util.Set; import org.junit.Test; + import org.springframework.beans.factory.BeanCreationException; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -71,7 +72,6 @@ public class FtpOutboundChannelAdapterParserTests { assertEquals("UTF-8", TestUtils.getPropertyValue(handler, "charset")); assertNotNull(TestUtils.getPropertyValue(handler, "directoryExpressionProcessor")); assertNotNull(TestUtils.getPropertyValue(handler, "temporaryDirectoryExpressionProcessor")); - assertNotNull(TestUtils.getPropertyValue(handler, "temporaryDirectory")); Object sfProperty = TestUtils.getPropertyValue(handler, "sessionFactory"); assertEquals(DefaultFtpSessionFactory.class, sfProperty.getClass()); DefaultFtpSessionFactory sessionFactory = (DefaultFtpSessionFactory) sfProperty; diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsOutboundChannelAdapterParserTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsOutboundChannelAdapterParserTests.java index 42dfc9bc37..7611b69cb9 100644 --- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsOutboundChannelAdapterParserTests.java +++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsOutboundChannelAdapterParserTests.java @@ -17,7 +17,6 @@ package org.springframework.integration.ftp.config; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import org.junit.Test; @@ -47,7 +46,6 @@ public class FtpsOutboundChannelAdapterParserTests { FileTransferringMessageHandler handler = TestUtils.getPropertyValue(consumer, "handler", FileTransferringMessageHandler.class); assertEquals(ac.getBean("fileNameGenerator"), TestUtils.getPropertyValue(handler, "fileNameGenerator")); assertEquals("UTF-8", TestUtils.getPropertyValue(handler, "charset")); - assertNotNull(TestUtils.getPropertyValue(handler, "temporaryDirectory")); DefaultFtpsSessionFactory sf = TestUtils.getPropertyValue(handler, "sessionFactory", DefaultFtpsSessionFactory.class); assertEquals("localhost", TestUtils.getPropertyValue(sf, "host")); assertEquals(22, TestUtils.getPropertyValue(sf, "port")); 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 cb088f65da..9514d21cc1 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 @@ -18,8 +18,11 @@ package org.springframework.integration.ftp.outbound; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import java.io.File; @@ -31,7 +34,10 @@ import java.util.Arrays; import java.util.Calendar; import java.util.Collection; import java.util.List; +import java.util.UUID; +import java.util.concurrent.atomic.AtomicReference; +import org.apache.commons.logging.Log; import org.apache.commons.net.ftp.FTPClient; import org.apache.commons.net.ftp.FTPFile; import org.junit.Before; @@ -40,6 +46,7 @@ import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; +import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.BeanFactory; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -53,6 +60,7 @@ import org.springframework.integration.file.remote.handler.FileTransferringMessa import org.springframework.integration.ftp.session.AbstractFtpSessionFactory; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; +import org.springframework.integration.test.util.TestUtils; import org.springframework.util.FileCopyUtils; /** @@ -92,8 +100,11 @@ public class FtpOutboundTests { }); handler.setBeanFactory(mock(BeanFactory.class)); handler.afterPropertiesSet(); - handler.handleMessage(new GenericMessage("hello")); + handler.handleMessage(new GenericMessage("String data")); assertTrue(file.exists()); + byte[] inFile = FileCopyUtils.copyToByteArray(file); + assertEquals("String data", new String(inFile)); + file.delete(); } @Test @@ -112,8 +123,11 @@ public class FtpOutboundTests { }); handler.setBeanFactory(mock(BeanFactory.class)); handler.afterPropertiesSet(); - handler.handleMessage(new GenericMessage("hello".getBytes())); + handler.handleMessage(new GenericMessage("byte[] data".getBytes())); assertTrue(file.exists()); + byte[] inFile = FileCopyUtils.copyToByteArray(file); + assertEquals("byte[] data", new String(inFile)); + file.delete(); } @Test @@ -141,6 +155,41 @@ public class FtpOutboundTests { assertTrue("destination file was not created", destFile.exists()); } + @Test + public void testHandleMissingFileMessage() throws Exception { + File targetDir = new File("remote-target-dir"); + assertTrue("target directory does not exist: " + targetDir.getName(), targetDir.exists()); + + FileTransferringMessageHandler handler = new FileTransferringMessageHandler(sessionFactory); + handler.setRemoteDirectoryExpression(new LiteralExpression(targetDir.getName())); + handler.setFileNameGenerator(new FileNameGenerator() { + public String generateFileName(Message message) { + return ((File)message.getPayload()).getName() + ".test"; + } + }); + handler.setBeanFactory(mock(BeanFactory.class)); + handler.afterPropertiesSet(); + + File srcFile = new File(UUID.randomUUID() + ".txt"); + + Log logger = spy(TestUtils.getPropertyValue(handler, "logger", Log.class)); + when(logger.isWarnEnabled()).thenReturn(true); + final AtomicReference logged = new AtomicReference(); + doAnswer(new Answer(){ + + @Override + public Object answer(InvocationOnMock invocation) throws Throwable { + logged.set((String) invocation.getArguments()[0]); + invocation.callRealMethod(); + return null; + } + }).when(logger).warn(Mockito.anyString()); + new DirectFieldAccessor(handler).setPropertyValue("logger", logger); + handler.handleMessage(new GenericMessage(srcFile)); + assertNotNull(logged.get()); + assertEquals("File " + srcFile.toString() + " does not exist", logged.get()); + } + @Test //INT-2275 public void testFtpOutboundChannelAdapterInsideChain() throws Exception { File targetDir = new File("remote-target-dir"); diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/OutboundChannelAdapterParserTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/OutboundChannelAdapterParserTests.java index 0e937b0da6..c9c90a5bbd 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/OutboundChannelAdapterParserTests.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/OutboundChannelAdapterParserTests.java @@ -17,16 +17,17 @@ package org.springframework.integration.sftp.config; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; import java.util.Iterator; import java.util.Set; import org.junit.Test; + import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -75,7 +76,6 @@ public class OutboundChannelAdapterParserTests { assertNotNull(TestUtils.getPropertyValue(handler, "temporaryDirectoryExpressionProcessor")); assertEquals(context.getBean("fileNameGenerator"), TestUtils.getPropertyValue(handler, "fileNameGenerator")); assertEquals("UTF-8", TestUtils.getPropertyValue(handler, "charset")); - assertNotNull(TestUtils.getPropertyValue(handler, "temporaryDirectory")); CachingSessionFactory sessionFactory = TestUtils.getPropertyValue(handler, "sessionFactory", CachingSessionFactory.class); DefaultSftpSessionFactory clientFactory = TestUtils.getPropertyValue(sessionFactory, "sessionFactory", DefaultSftpSessionFactory.class); assertEquals("localhost", TestUtils.getPropertyValue(clientFactory, "host")); @@ -108,7 +108,6 @@ public class OutboundChannelAdapterParserTests { String fileNameGeneratorExpression = (String) TestUtils.getPropertyValue(generator, "expression"); assertEquals("payload.getName() + '-foo'", fileNameGeneratorExpression); assertEquals("UTF-8", TestUtils.getPropertyValue(handler, "charset")); - assertNotNull(TestUtils.getPropertyValue(handler, "temporaryDirectory")); assertNull(TestUtils.getPropertyValue(handler, "temporaryDirectoryExpressionProcessor")); } 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 8e1b8ec108..aa3f584584 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 @@ -108,8 +108,11 @@ public class SftpOutboundTests { handler.setBeanFactory(mock(BeanFactory.class)); handler.afterPropertiesSet(); - handler.handleMessage(new GenericMessage("hello")); + handler.handleMessage(new GenericMessage("String data")); assertTrue(new File("remote-target-dir", "foo.txt").exists()); + byte[] inFile = FileCopyUtils.copyToByteArray(file); + assertEquals("String data", new String(inFile)); + file.delete(); } @Test @@ -128,8 +131,11 @@ public class SftpOutboundTests { handler.setBeanFactory(mock(BeanFactory.class)); handler.afterPropertiesSet(); - handler.handleMessage(new GenericMessage("hello".getBytes())); + handler.handleMessage(new GenericMessage("byte[] data".getBytes())); assertTrue(new File("remote-target-dir", "foo.txt").exists()); + byte[] inFile = FileCopyUtils.copyToByteArray(file); + assertEquals("byte[] data", new String(inFile)); + file.delete(); } @Test //INT-2275 From 08a232180b2ccb15dbbc4ff0ce21c0ddc0b11802 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Sat, 12 Oct 2013 11:43:41 +0300 Subject: [PATCH 2/8] INT-3074: JDBC: Make generateSql as UP-TO-DATE * remove `overwrite: 'true'` from `generateSql` task * add `cleanSql` task JIRA: https://jira.springsource.org/browse/INT-3074 --- spring-integration-jdbc/build.gradle | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/spring-integration-jdbc/build.gradle b/spring-integration-jdbc/build.gradle index 88049c8b29..e0d6a7227b 100644 --- a/spring-integration-jdbc/build.gradle +++ b/spring-integration-jdbc/build.gradle @@ -26,7 +26,7 @@ task generateSql { doLast { ['hsqldb', 'h2', 'db2', 'derby', 'mysql', 'mysql-5_6_4', 'oracle10g', 'postgresql', 'sqlserver', 'sybase'].each { dbType -> - ant.vppcopy(todir: generatedResourcesDir, overwrite: 'true') { + ant.vppcopy(todir: generatedResourcesDir) { config { context { property key: 'includes', value: 'src/main/sql' @@ -45,3 +45,7 @@ task generateSql { // tie schema generation to the build lifecycle compileJava.dependsOn generateSql + +task cleanSql (type: Delete) { + delete fileTree(dir: 'src/main/resources/org/springframework/integration/jdbc').include('*.sql').exclude('config', 'store/channel') +} From 473a2282e9e931ac1a59334ca10c0a8e2ea3a7cd Mon Sep 17 00:00:00 2001 From: Kris Jacyna Date: Sun, 13 Oct 2013 20:35:54 +0100 Subject: [PATCH 3/8] INT-3170 Update Project Repo in Root Files s/SpringSource/spring-projects/ --- CONTRIBUTING.md | 6 +++--- README.md | 2 +- build.gradle | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d7a9887ad0..f0cbc4ccfd 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -28,7 +28,7 @@ Once you've completed the web form, simply add the following in a comment on you ## Fork the Repository -1. Go to [https://github.com/SpringSource/spring-integration](https://github.com/SpringSource/spring-integration) +1. Go to [https://github.com/spring-projects/spring-integration](https://github.com/spring-projects/spring-integration) 2. Hit the "fork" button and choose your own github account as the target 3. For more detail see [http://help.github.com/fork-a-repo/](http://help.github.com/fork-a-repo/) @@ -38,7 +38,7 @@ Once you've completed the web form, simply add the following in a comment on you 2. `cd spring-integration` 3. `git remote show` _you should see only 'origin' - which is the fork you created for your own github account_ -4. `git remote add upstream git@github.com:SpringSource/spring-integration.git` +4. `git remote add upstream git@github.com:spring-projects/spring-integration.git` 5. `git remote show` _you should now see 'upstream' in addition to 'origin' where 'upstream' is the SpringSource repository from which releases are built_ 6. `git fetch --all` @@ -233,4 +233,4 @@ Add a JIRA issue link to your first commit comment of the pull request on the la [help documentation]: http://help.github.com/send-pull-requests [JIRA issue tracker]: https://jira.springsource.org/browse/INT -[checking out and building]: https://github.com/SpringSource/spring-integration#checking-out-and-building +[checking out and building]: https://github.com/spring-projects/spring-integration#checking-out-and-building diff --git a/README.md b/README.md index bc6305a242..44218f8e5a 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Spring Integration To check out the project and build from source, do the following: - git clone git://github.com/SpringSource/spring-integration.git + git clone git://github.com/spring-projects/spring-integration.git cd spring-integration ./gradlew build diff --git a/build.gradle b/build.gradle index 45c8df665d..0ed1ca7f8f 100644 --- a/build.gradle +++ b/build.gradle @@ -16,9 +16,9 @@ ext { linkHomepage = 'http://www.springintegration.org/' linkCi = 'https://build.springsource.org/browse/INT' linkIssue = 'https://jira.springsource.org/browse/INT' - linkScmUrl = 'https://github.com/SpringSource/spring-integration' - linkScmConnection = 'git://github.com/SpringSource/spring-integration.git' - linkScmDevConnection = 'git@github.com:SpringSource/spring-integration.git' + linkScmUrl = 'https://github.com/spring-projects/spring-integration' + linkScmConnection = 'git://github.com/spring-projects/spring-integration.git' + linkScmDevConnection = 'git@github.com:spring-projects/spring-integration.git' } allprojects { From 06979d7678143c85ce59607920b9c60dc7ba88cc Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Mon, 14 Oct 2013 17:56:25 +0300 Subject: [PATCH 4/8] INT-3171: Polishing Aggregator tests * Increase waiting timeouts * Get rid of `Thread.sleep` when it's dangerous JIRA: https://jira.springsource.org/browse/INT-3171 --- .../aggregator/AggregatorTests.java | 59 +++++++------- .../aggregator/ConcurrentAggregatorTests.java | 77 +++++++++++-------- .../CorrelatingMessageHandlerTests.java | 24 +++--- ...regatorWithCustomReleaseStrategyTests.java | 16 ++-- 4 files changed, 92 insertions(+), 84 deletions(-) diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/AggregatorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/AggregatorTests.java index 73d7f19cb1..87ca0abc80 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/AggregatorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/AggregatorTests.java @@ -1,11 +1,11 @@ /* - * Copyright 2002-2011 the original author or authors. - * + * Copyright 2002-2013 the original author or authors. + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -19,9 +19,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThat; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; - import org.junit.Before; import org.junit.Ignore; import org.junit.Test; @@ -59,12 +56,12 @@ public class AggregatorTests { Message message1 = createMessage(3, "ABC", 3, 1, replyChannel, null); Message message2 = createMessage(5, "ABC", 3, 2, replyChannel, null); Message message3 = createMessage(7, "ABC", 3, 3, replyChannel, null); - CountDownLatch latch = new CountDownLatch(3); + this.aggregator.handleMessage(message1); this.aggregator.handleMessage(message2); this.aggregator.handleMessage(message3); - latch.await(1000, TimeUnit.MILLISECONDS); - Message reply = replyChannel.receive(2000); + + Message reply = replyChannel.receive(10000); assertNotNull(reply); assertEquals(reply.getPayload(), 105); } @@ -77,7 +74,7 @@ public class AggregatorTests { Message message = createMessage(3, "ABC", 2, 1, replyChannel, null); this.aggregator.handleMessage(message); this.store.expireMessageGroups(-10000); - Message reply = replyChannel.receive(100); + Message reply = replyChannel.receive(1000); assertNull("No message should have been sent normally", reply); Message discardedMessage = discardChannel.receive(1000); assertNotNull("A message should have been discarded", discardedMessage); @@ -93,7 +90,7 @@ public class AggregatorTests { this.aggregator.handleMessage(message1); this.aggregator.handleMessage(message2); this.store.expireMessageGroups(-10000); - Message reply = replyChannel.receive(0); + Message reply = replyChannel.receive(1000); assertNotNull("A reply message should have been received", reply); assertEquals(15, reply.getPayload()); } @@ -115,11 +112,11 @@ public class AggregatorTests { aggregator.handleMessage(message4); aggregator.handleMessage(message2); @SuppressWarnings("unchecked") - Message reply1 = (Message) replyChannel1.receive(500); + Message reply1 = (Message) replyChannel1.receive(1000); assertNotNull(reply1); assertThat(reply1.getPayload(), is(105)); @SuppressWarnings("unchecked") - Message reply2 = (Message) replyChannel2.receive(500); + Message reply2 = (Message) replyChannel2.receive(1000); assertNotNull(reply2); assertThat(reply2.getPayload(), is(2431)); } @@ -133,14 +130,14 @@ public class AggregatorTests { this.aggregator.setDiscardChannel(discardChannel); this.aggregator.handleMessage(createMessage(1, 1, 1, 1, replyChannel, null)); - assertEquals(1, replyChannel.receive(100).getPayload()); + assertEquals(1, replyChannel.receive(1000).getPayload()); this.aggregator.handleMessage(createMessage(3, 2, 1, 1, replyChannel, null)); - assertEquals(3, replyChannel.receive(100).getPayload()); + assertEquals(3, replyChannel.receive(1000).getPayload()); this.aggregator.handleMessage(createMessage(4, 3, 1, 1, replyChannel, null)); - assertEquals(4, replyChannel.receive(100).getPayload()); + assertEquals(4, replyChannel.receive(1000).getPayload()); // next message with same correllation ID is discarded this.aggregator.handleMessage(createMessage(2, 1, 1, 1, replyChannel, null)); - assertEquals(2, discardChannel.receive(100).getPayload()); + assertEquals(2, discardChannel.receive(1000).getPayload()); } @Test @@ -152,15 +149,15 @@ public class AggregatorTests { this.aggregator.setDiscardChannel(discardChannel); this.aggregator.handleMessage(createMessage(1, 1, 1, 1, replyChannel, null)); - assertEquals(1, replyChannel.receive(100).getPayload()); + assertEquals(1, replyChannel.receive(1000).getPayload()); this.aggregator.handleMessage(createMessage(2, 2, 1, 1, replyChannel, null)); - assertEquals(2, replyChannel.receive(100).getPayload()); + assertEquals(2, replyChannel.receive(1000).getPayload()); this.aggregator.handleMessage(createMessage(3, 3, 1, 1, replyChannel, null)); - assertEquals(3, replyChannel.receive(100).getPayload()); + assertEquals(3, replyChannel.receive(1000).getPayload()); this.aggregator.handleMessage(createMessage(4, 4, 1, 1, replyChannel, null)); - assertEquals(4, replyChannel.receive(100).getPayload()); + assertEquals(4, replyChannel.receive(1000).getPayload()); this.aggregator.handleMessage(createMessage(5, 1, 1, 1, replyChannel, null)); - assertEquals(5, replyChannel.receive(100).getPayload()); + assertEquals(5, replyChannel.receive(1000).getPayload()); assertNull(discardChannel.receive(0)); } @@ -177,15 +174,13 @@ public class AggregatorTests { Message message2 = createMessage(5, "ABC", 3, 2, replyChannel, null); Message message3 = createMessage(7, "ABC", 3, 3, replyChannel, null); Message message4 = createMessage(7, "ABC", 3, 3, replyChannel, null); - CountDownLatch latch = new CountDownLatch(4); + this.aggregator.handleMessage(message1); this.aggregator.handleMessage(message2); this.aggregator.handleMessage(message3); this.aggregator.handleMessage(message4); - latch.await(1000, TimeUnit.MILLISECONDS); - // small wait to make sure the fourth message is received - Thread.sleep(10); - Message reply = replyChannel.receive(0); + + Message reply = replyChannel.receive(10000); assertNotNull("A message should be aggregated", reply); assertThat(((Integer) reply.getPayload()), is(105)); } @@ -197,14 +192,14 @@ public class AggregatorTests { Message message2 = createMessage(5, "ABC", 3, 2, replyChannel, null); Message message3 = createMessage(7, "ABC", 3, 3, replyChannel, null); Message message4 = createMessage(7, "ABC", 3, 3, replyChannel, null); - CountDownLatch latch = new CountDownLatch(4); + this.aggregator.handleMessage(message1); this.aggregator.handleMessage(message3); // duplicated sequence number, either message3 or message4 should be rejected this.aggregator.handleMessage(message4); this.aggregator.handleMessage(message2); - latch.await(1000, TimeUnit.MILLISECONDS); - Message reply = replyChannel.receive(0); + + Message reply = replyChannel.receive(10000); assertNotNull("A message should be aggregated", reply); assertThat(((Integer) reply.getPayload()), is(105)); } @@ -219,7 +214,7 @@ public class AggregatorTests { this.aggregator.handleMessage(message1); this.aggregator.handleMessage(message2); this.aggregator.handleMessage(message3); - Message reply = replyChannel.receive(500); + Message reply = replyChannel.receive(1000); assertNull(reply); } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ConcurrentAggregatorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ConcurrentAggregatorTests.java index bc85fb573c..4e28e136bc 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ConcurrentAggregatorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ConcurrentAggregatorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2013 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,12 +16,20 @@ package org.springframework.integration.aggregator; +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; + import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; + import org.springframework.core.task.SimpleAsyncTaskExecutor; import org.springframework.core.task.TaskExecutor; import org.springframework.integration.Message; @@ -35,13 +43,6 @@ import org.springframework.integration.store.MessageGroupStore; import org.springframework.integration.store.SimpleMessageStore; import org.springframework.integration.support.MessageBuilder; -import static org.hamcrest.CoreMatchers.is; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThat; - /** * @author Mark Fisher * @author Marius Bogoevici @@ -76,7 +77,9 @@ public class ConcurrentAggregatorTests { message2, latch)); this.taskExecutor.execute(new AggregatorTestTask(this.aggregator, message3, latch)); - latch.await(10000, TimeUnit.MILLISECONDS); + + assertTrue(latch.await(10, TimeUnit.SECONDS)); + assertThat(latch.getCount(), is(0l)); Message reply = replyChannel.receive(2000); assertNotNull(reply); @@ -101,7 +104,7 @@ public class ConcurrentAggregatorTests { new AggregatorTestTask(this.aggregator, message1, latch).run(); new AggregatorTestTask(this.aggregator, message2, latch).run(); new AggregatorTestTask(this.aggregator, message3, latch).run(); - Message reply = replyChannel.receive(500); + Message reply = replyChannel.receive(1000); assertNotNull(reply); assertEquals("123456789", reply.getPayload()); } @@ -117,13 +120,15 @@ public class ConcurrentAggregatorTests { AggregatorTestTask task = new AggregatorTestTask(this.aggregator, message, latch); this.taskExecutor.execute(task); - latch.await(200, TimeUnit.MILLISECONDS); + + assertTrue(latch.await(10, TimeUnit.SECONDS)); + assertEquals("Task should have completed within timeout", 0, latch .getCount()); - Message reply = replyChannel.receive(100); + Message reply = replyChannel.receive(1000); assertNull("No message should have been sent normally", reply); this.store.expireMessageGroups(-10000); - Message discardedMessage = discardChannel.receive(100); + Message discardedMessage = discardChannel.receive(1000); assertNotNull("A message should have been discarded", discardedMessage); assertEquals(message, discardedMessage); } @@ -142,11 +147,13 @@ public class ConcurrentAggregatorTests { message2, latch); this.taskExecutor.execute(task1); this.taskExecutor.execute(task2); - latch.await(300, TimeUnit.MILLISECONDS); + + assertTrue(latch.await(10, TimeUnit.SECONDS)); + assertEquals("handlers should have been invoked within time limit", 0, latch.getCount()); this.store.expireMessageGroups(-10000); - Message reply = replyChannel.receive(100); + Message reply = replyChannel.receive(1000); assertNotNull("A reply message should have been received", reply); assertEquals(15, reply.getPayload()); assertNull(task1.getException()); @@ -179,13 +186,15 @@ public class ConcurrentAggregatorTests { message3, latch)); this.taskExecutor.execute(new AggregatorTestTask(this.aggregator, message4, latch)); - latch.await(1000, TimeUnit.MILLISECONDS); + + assertTrue(latch.await(10, TimeUnit.SECONDS)); + @SuppressWarnings("unchecked") - Message reply1 = (Message) replyChannel1.receive(500); + Message reply1 = (Message) replyChannel1.receive(1000); assertNotNull(reply1); assertThat(reply1.getPayload(), is(105)); @SuppressWarnings("unchecked") - Message reply2 = (Message) replyChannel2.receive(500); + Message reply2 = (Message) replyChannel2.receive(1000); assertNotNull(reply2); assertThat(reply2.getPayload(), is(2431)); } @@ -201,17 +210,17 @@ public class ConcurrentAggregatorTests { this.aggregator.setDiscardChannel(discardChannel); this.aggregator.handleMessage(createMessage(1, 1, 1, 1, replyChannel, null)); - assertEquals(1, replyChannel.receive(100).getPayload()); + assertEquals(1, replyChannel.receive(1000).getPayload()); this.aggregator.handleMessage(createMessage(3, 2, 1, 1, replyChannel, null)); - assertEquals(3, replyChannel.receive(100).getPayload()); + assertEquals(3, replyChannel.receive(1000).getPayload()); this.aggregator.handleMessage(createMessage(4, 3, 1, 1, replyChannel, null)); - assertEquals(4, replyChannel.receive(100).getPayload()); + assertEquals(4, replyChannel.receive(1000).getPayload()); // next message with same correlation ID is discarded this.aggregator.handleMessage(createMessage(2, 1, 1, 1, replyChannel, null)); - assertEquals(2, discardChannel.receive(100).getPayload()); + assertEquals(2, discardChannel.receive(1000).getPayload()); } @Test @@ -225,19 +234,19 @@ public class ConcurrentAggregatorTests { this.aggregator.setDiscardChannel(discardChannel); this.aggregator.handleMessage(createMessage(1, 1, 1, 1, replyChannel, null)); - assertEquals(1, replyChannel.receive(100).getPayload()); + assertEquals(1, replyChannel.receive(1000).getPayload()); this.aggregator.handleMessage(createMessage(2, 2, 1, 1, replyChannel, null)); - assertEquals(2, replyChannel.receive(100).getPayload()); + assertEquals(2, replyChannel.receive(1000).getPayload()); this.aggregator.handleMessage(createMessage(3, 3, 1, 1, replyChannel, null)); - assertEquals(3, replyChannel.receive(100).getPayload()); + assertEquals(3, replyChannel.receive(1000).getPayload()); this.aggregator.handleMessage(createMessage(4, 4, 1, 1, replyChannel, null)); - assertEquals(4, replyChannel.receive(100).getPayload()); + assertEquals(4, replyChannel.receive(1000).getPayload()); this.aggregator.handleMessage(createMessage(5, 1, 1, 1, replyChannel, null)); - assertEquals(5, replyChannel.receive(100).getPayload()); + assertEquals(5, replyChannel.receive(1000).getPayload()); assertNull(discardChannel.receive(0)); } @@ -266,8 +275,10 @@ public class ConcurrentAggregatorTests { message3, latch)); this.taskExecutor.execute(new AggregatorTestTask(this.aggregator, message4, latch)); - latch.await(1000, TimeUnit.MILLISECONDS); - Message reply = replyChannel.receive(100); + + assertTrue(latch.await(10, TimeUnit.SECONDS)); + + Message reply = replyChannel.receive(1000); assertNotNull("A message should be aggregated", reply); assertThat(((Integer) reply.getPayload()), is(105)); } @@ -290,11 +301,13 @@ public class ConcurrentAggregatorTests { AggregatorTestTask task3 = new AggregatorTestTask(aggregator, message3, latch); this.taskExecutor.execute(task3); - latch.await(1000, TimeUnit.MILLISECONDS); + + assertTrue(latch.await(10, TimeUnit.SECONDS)); + assertNull(task1.getException()); assertNull(task2.getException()); assertNull(task3.getException()); - Message reply = replyChannel.receive(500); + Message reply = replyChannel.receive(1000); assertNull(reply); } @@ -364,4 +377,4 @@ public class ConcurrentAggregatorTests { } } -} \ No newline at end of file +} diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageHandlerTests.java index 037c096ddf..8d20b2d71a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageHandlerTests.java @@ -16,10 +16,19 @@ package org.springframework.integration.aggregator; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.mockito.Matchers.isA; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + import java.util.ArrayList; import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; import org.junit.Before; import org.junit.Test; @@ -36,14 +45,6 @@ import org.springframework.integration.store.SimpleMessageGroup; import org.springframework.integration.store.SimpleMessageStore; import org.springframework.integration.support.MessageBuilder; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - -import static org.mockito.Matchers.isA; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - /** * @author Iwein Fuld * @author Dave Syer @@ -104,7 +105,7 @@ public class CorrelatingMessageHandlerTests { when(correlationStrategy.getCorrelationKey(isA(Message.class))).thenReturn(correlationKey); handler.setExpireGroupsUponCompletion(true); - + handler.handleMessage(message1); try { @@ -147,10 +148,9 @@ public class CorrelatingMessageHandlerTests { } }); - Thread.sleep(20); - assertEquals(0, store.expireMessageGroups(10000)); + assertTrue(bothMessagesHandled.await(10, TimeUnit.SECONDS)); - bothMessagesHandled.await(); + assertEquals(0, store.expireMessageGroups(10000)); } @Test diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregatorWithCustomReleaseStrategyTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregatorWithCustomReleaseStrategyTests.java index 0f459f5d26..cf2d455567 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregatorWithCustomReleaseStrategyTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregatorWithCustomReleaseStrategyTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2013 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -12,6 +12,9 @@ */ package org.springframework.integration.aggregator.scenarios; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -24,9 +27,6 @@ import org.springframework.integration.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.support.MessageBuilder; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - /** * @author Oleg Zhurakousky * @@ -79,11 +79,11 @@ public class AggregatorWithCustomReleaseStrategyTests { assertTrue("Sends failed to complete", latch.await(10, TimeUnit.SECONDS)); - Message message = resultChannel.receive(10); + Message message = resultChannel.receive(1000); int counter = 0; while(message != null){ counter++; - message = resultChannel.receive(10); + message = resultChannel.receive(1000); } assertEquals(600, counter); } @@ -119,10 +119,10 @@ public class AggregatorWithCustomReleaseStrategyTests { assertTrue("Sends failed to complete", latch.await(10, TimeUnit.SECONDS)); - Message message = resultChannel.receive(10); + Message message = resultChannel.receive(1000); int counter = 0; while(message != null && ++counter < 7200){ - message = resultChannel.receive(10); + message = resultChannel.receive(1000); } assertEquals(7200, counter); } From dd479a3ce7a12c971d95034e201a22631a6fc492 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 15 Oct 2013 18:03:22 +0300 Subject: [PATCH 5/8] INT-2866: Add (S)FTP `local-directory-expression` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add `local-directory-expression` to (S)FTP Outbound Gateways * Add `FtpServerRule` to Apache Mina embedded FtpServer * Add tests for (M)GET and `local-directory-expression`: FTP tests uses `FtpServerRule`, SFTP tests need testing on real SFTP server JIRA: https://jira.springsource.org/browse/INT-2866 INT-2866: Documentation INT-2866 Polishing - Remove leading / - Change \ to / in invalid test - Clean up after sftp Tested with real SSH. INT-2866 Polishing - Add Mock SFTP Test Run with -Dspring-profiles-active=realSSH to run with a real SSH server. Assumes ftptest/ftptest account on localhost with the following directory tree in the user's root... $ tree sftpSource/ sftpSource/ ├── sftpSource1.txt ├── sftpSource2.txt └── subSftpSource └── subSftpSource1.txt INT-2866: Polishing INT-2866: change `remotePath` to `remoteDirectory` Doc Polishing. --- build.gradle | 2 + ...stractRemoteFileOutboundGatewayParser.java | 8 +- .../AbstractRemoteFileOutboundGateway.java | 127 +++++----- .../ftp/config/spring-integration-ftp-3.0.xsd | 17 ++ .../integration/ftp/FtpServerRule.java | 217 ++++++++++++++++++ .../config/FtpOutboundGatewayParserTests.java | 4 +- .../FtpServerOutboundTests-context.xml | 54 +++++ .../ftp/outbound/FtpServerOutboundTests.java | 133 +++++++++++ .../config/spring-integration-sftp-3.0.xsd | 17 ++ .../SftpOutboundGatewayParserTests.java | 4 +- .../SftpServerOutboundTests-context.xml | 57 +++++ .../outbound/SftpServerOutboundTests.java | 206 +++++++++++++++++ src/reference/docbook/ftp.xml | 11 +- src/reference/docbook/sftp.xml | 9 + src/reference/docbook/whats-new.xml | 10 +- 15 files changed, 816 insertions(+), 60 deletions(-) create mode 100644 spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpServerRule.java create mode 100644 spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpServerOutboundTests-context.xml create mode 100644 spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpServerOutboundTests.java create mode 100644 spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpServerOutboundTests-context.xml create mode 100644 spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpServerOutboundTests.java diff --git a/build.gradle b/build.gradle index 0ed1ca7f8f..ad03a9d974 100644 --- a/build.gradle +++ b/build.gradle @@ -57,6 +57,7 @@ subprojects { subproject -> log4jVersion = '1.2.12' mockitoVersion = '1.9.5' eaioUUIDVersion = '3.2' + ftpServerVersion = '1.0.6' springVersionDefault = '3.1.4.RELEASE' springVersion = project.hasProperty('springVersion') ? getProperty('springVersion') : springVersionDefault @@ -239,6 +240,7 @@ project('spring-integration-ftp') { compile "org.springframework:spring-context-support:$springVersion" compile("javax.activation:activation:$javaxActivationVersion", optional) testCompile project(":spring-integration-test") + testCompile "org.apache.ftpserver:ftpserver-core:$ftpServerVersion" } } diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/config/AbstractRemoteFileOutboundGatewayParser.java b/spring-integration-file/src/main/java/org/springframework/integration/file/config/AbstractRemoteFileOutboundGatewayParser.java index fbd4442b3b..8fc19e0bc2 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/config/AbstractRemoteFileOutboundGatewayParser.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/config/AbstractRemoteFileOutboundGatewayParser.java @@ -17,6 +17,7 @@ package org.springframework.integration.file.config; import org.w3c.dom.Element; +import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.integration.config.ExpressionFactoryBean; @@ -53,7 +54,12 @@ public abstract class AbstractRemoteFileOutboundGatewayParser extends AbstractCo IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "reply-channel", "outputChannel"); this.configureFilter(builder, element, parserContext); IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "remote-file-separator"); - IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "local-directory"); + + BeanDefinition localDirExpressionDef = IntegrationNamespaceUtils + .createExpressionDefinitionFromValueOrExpression("local-directory", "local-directory-expression", + parserContext, element, false); + builder.addPropertyValue("localDirectoryExpression", localDirExpressionDef); + IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "auto-create-local-directory"); IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "order"); IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "rename-expression"); diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/gateway/AbstractRemoteFileOutboundGateway.java b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/gateway/AbstractRemoteFileOutboundGateway.java index 194e18b104..a5c182c4ab 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/gateway/AbstractRemoteFileOutboundGateway.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/gateway/AbstractRemoteFileOutboundGateway.java @@ -31,6 +31,7 @@ import java.util.Set; import org.springframework.expression.EvaluationContext; import org.springframework.expression.Expression; +import org.springframework.expression.common.LiteralExpression; import org.springframework.expression.spel.standard.SpelExpressionParser; import org.springframework.integration.Message; import org.springframework.integration.MessagingException; @@ -170,7 +171,7 @@ public abstract class AbstractRemoteFileOutboundGateway extends AbstractReply private volatile String remoteFileSeparator = "/"; - private volatile File localDirectory; + private volatile Expression localDirectoryExpression; private volatile boolean autoCreateLocalDirectory = true; @@ -225,7 +226,13 @@ public abstract class AbstractRemoteFileOutboundGateway extends AbstractReply * @param localDirectory the localDirectory to set */ public void setLocalDirectory(File localDirectory) { - this.localDirectory = localDirectory; + if (localDirectory != null) { + this.localDirectoryExpression = new LiteralExpression(localDirectory.getAbsolutePath()); + } + } + + public void setLocalDirectoryExpression(Expression localDirectoryExpression) { + this.localDirectoryExpression = localDirectoryExpression; } /** @@ -271,28 +278,31 @@ public abstract class AbstractRemoteFileOutboundGateway extends AbstractReply } if (Command.GET.equals(this.command) || Command.MGET.equals(this.command)) { - Assert.notNull(this.localDirectory, "localDirectory must not be null"); - try { - if (!this.localDirectory.exists()) { - if (this.autoCreateLocalDirectory) { - if (logger.isDebugEnabled()) { - logger.debug("The '" + this.localDirectory + "' directory doesn't exist; Will create."); + Assert.notNull(this.localDirectoryExpression, "localDirectory must not be null"); + if (this.localDirectoryExpression instanceof LiteralExpression) { + File localDirectory = new File(this.localDirectoryExpression.getExpressionString()); + try { + if (!localDirectory.exists()) { + if (this.autoCreateLocalDirectory) { + if (logger.isDebugEnabled()) { + logger.debug("The '" + localDirectory + "' directory doesn't exist; Will create."); + } + if (!localDirectory.mkdirs()) { + throw new IOException("Failed to make local directory: " + localDirectory); + } } - if (!this.localDirectory.mkdirs()) { - throw new IOException("Failed to make local directory: " + this.localDirectory); + else { + throw new FileNotFoundException(localDirectory.getName()); } } - else { - throw new FileNotFoundException(this.localDirectory.getName()); - } } - } - catch (RuntimeException e) { - throw e; - } - catch (Exception e) { - throw new MessagingException( - "Failure during initialization of: " + this.getComponentType(), e); + catch (RuntimeException e) { + throw e; + } + catch (Exception e) { + throw new MessagingException( + "Failure during initialization of: " + this.getComponentType(), e); + } } } if (this.getBeanFactory() != null) { @@ -341,12 +351,9 @@ public abstract class AbstractRemoteFileOutboundGateway extends AbstractReply private Object doGet(Message requestMessage, Session session) throws IOException { String remoteFilePath = this.fileNameProcessor.processMessage(requestMessage); - String remoteFilename = getRemoteFilename(remoteFilePath); - String remoteDir = remoteFilePath.substring(0, remoteFilePath.indexOf(remoteFilename)); - if (remoteDir.length() == 0) { - remoteDir = this.remoteFileSeparator; - } - File payload = get(requestMessage, session, remoteFilePath, remoteFilename, true); + String remoteFilename = this.getRemoteFilename(remoteFilePath); + String remoteDir = this.getRemoteDirectory(remoteFilePath, remoteFilename); + File payload = this.get(requestMessage, session, remoteDir, remoteFilePath, remoteFilename, true); return MessageBuilder.withPayload(payload) .setHeader(FileHeaders.REMOTE_DIRECTORY, remoteDir) .setHeader(FileHeaders.REMOTE_FILE, remoteFilename) @@ -355,12 +362,9 @@ public abstract class AbstractRemoteFileOutboundGateway extends AbstractReply private Object doMget(Message requestMessage, Session session) throws IOException { String remoteFilePath = this.fileNameProcessor.processMessage(requestMessage); - String remoteFilename = getRemoteFilename(remoteFilePath); - String remoteDir = remoteFilePath.substring(0, remoteFilePath.indexOf(remoteFilename)); - if (remoteDir.length() == 0) { - remoteDir = this.remoteFileSeparator; - } - List payload = mGet(requestMessage, session, remoteDir, remoteFilename); + String remoteFilename = this.getRemoteFilename(remoteFilePath); + String remoteDir = this.getRemoteDirectory(remoteFilePath, remoteFilename); + List payload = this.mGet(requestMessage, session, remoteDir, remoteFilename); return MessageBuilder.withPayload(payload) .setHeader(FileHeaders.REMOTE_DIRECTORY, remoteDir) .setHeader(FileHeaders.REMOTE_FILE, remoteFilename) @@ -369,12 +373,9 @@ public abstract class AbstractRemoteFileOutboundGateway extends AbstractReply private Object doRm(Message requestMessage, Session session) throws IOException { String remoteFilePath = this.fileNameProcessor.processMessage(requestMessage); - String remoteFilename = getRemoteFilename(remoteFilePath); - String remoteDir = remoteFilePath.substring(0, remoteFilePath.indexOf(remoteFilename)); - if (remoteDir.length() == 0) { - remoteDir = this.remoteFileSeparator; - } - boolean payload = rm(session, remoteFilePath); + String remoteFilename = this.getRemoteFilename(remoteFilePath); + String remoteDir = this.getRemoteDirectory(remoteFilePath, remoteFilename); + boolean payload = this.rm(session, remoteFilePath); return MessageBuilder.withPayload(payload) .setHeader(FileHeaders.REMOTE_DIRECTORY, remoteDir) .setHeader(FileHeaders.REMOTE_FILE, remoteFilename) @@ -383,14 +384,12 @@ public abstract class AbstractRemoteFileOutboundGateway extends AbstractReply private Object doMv(Message requestMessage, Session session) throws IOException { String remoteFilePath = this.fileNameProcessor.processMessage(requestMessage); - String remoteFilename = getRemoteFilename(remoteFilePath); - String remoteDir = remoteFilePath.substring(0, remoteFilePath.indexOf(remoteFilename)); + String remoteFilename = this.getRemoteFilename(remoteFilePath); + String remoteDir = this.getRemoteDirectory(remoteFilePath, remoteFilename); String remoteFileNewPath = this.renameProcessor.processMessage(requestMessage); Assert.hasLength(remoteFileNewPath, "New filename cannot be empty"); - if (remoteDir.length() == 0) { - remoteDir = this.remoteFileSeparator; - } - mv(session, remoteFilePath, remoteFileNewPath); + + this.mv(session, remoteFilePath, remoteFileNewPath); return MessageBuilder.withPayload(Boolean.TRUE) .setHeader(FileHeaders.REMOTE_DIRECTORY, remoteDir) .setHeader(FileHeaders.REMOTE_FILE, remoteFilename) @@ -405,7 +404,7 @@ public abstract class AbstractRemoteFileOutboundGateway extends AbstractReply Collection filteredFiles = this.filterFiles(files); for (F file : filteredFiles) { if (file != null) { - if (this.options.contains(Option.SUBDIRS) || !isDirectory(file)) { + if (this.options.contains(Option.SUBDIRS) || !this.isDirectory(file)) { lsFiles.add(file); } } @@ -467,21 +466,25 @@ public abstract class AbstractRemoteFileOutboundGateway extends AbstractReply /** * Copy a remote file to the configured local directory. * + * * @param message * @param session - * @param remoteFilePath - * @throws IOException + * @param remoteDir + *@param remoteFilePath @throws IOException */ - protected File get(Message message, Session session, String remoteFilePath, String remoteFilename, boolean lsFirst) + protected File get(Message message, Session session, String remoteDir, String remoteFilePath, String remoteFilename, boolean lsFirst) throws IOException { F[] files = null; if (lsFirst) { files = session.list(remoteFilePath); + if (files == null) { + throw new MessagingException("Session returned null when listing " + remoteFilePath); + } if (files.length != 1 || isDirectory(files[0]) || isLink(files[0])) { throw new MessagingException(remoteFilePath + " is not a file"); } } - File localFile = new File(this.localDirectory, this.generateLocalFileName(message, remoteFilename)); + File localFile = new File(this.generateLocalDirectory(message, remoteDir), this.generateLocalFileName(message, remoteFilename)); if (!localFile.exists()) { String tempFileName = localFile.getAbsolutePath() + this.temporaryFileSuffix; File tempFile = new File(tempFileName); @@ -520,7 +523,7 @@ public abstract class AbstractRemoteFileOutboundGateway extends AbstractReply protected List mGet(Message message, Session session, String remoteDirectory, String remoteFilename) throws IOException { - String path = generateFullPath(remoteDirectory, remoteFilename); + String path = this.generateFullPath(remoteDirectory, remoteFilename); String[] fileNames = session.listNames(path); if (fileNames == null) { fileNames = new String[0]; @@ -534,17 +537,26 @@ public abstract class AbstractRemoteFileOutboundGateway extends AbstractReply File file; if (fileName.contains(this.remoteFileSeparator) && fileName.startsWith(remoteDirectory)) { // the server returned the full path - file = this.get(message, session, fileName, + file = this.get(message, session, remoteDirectory, fileName, fileName.substring(fileName.lastIndexOf(this.remoteFileSeparator)), false); } else { - file = this.get(message, session, generateFullPath(remoteDirectory, fileName), fileName, false); + file = this.get(message, session, remoteDirectory, + this.generateFullPath(remoteDirectory, fileName), fileName, false); } files.add(file); } return files; } + private String getRemoteDirectory(String remoteFilePath, String remoteFilename) { + String remoteDir = remoteFilePath.substring(0, remoteFilePath.lastIndexOf(remoteFilename)); + if (remoteDir.length() == 0) { + remoteDir = this.remoteFileSeparator; + } + return remoteDir; + } + private String generateFullPath(String remoteDirectory, String remoteFilename) { String path; if (this.remoteFileSeparator.equals(remoteDirectory)) { @@ -588,6 +600,17 @@ public abstract class AbstractRemoteFileOutboundGateway extends AbstractReply session.rename(remoteFilePath, remoteFileNewPath); } + private File generateLocalDirectory(Message message, String remoteDirectory) { + EvaluationContext evaluationContext = ExpressionUtils.createStandardEvaluationContext(this.getBeanFactory()); + evaluationContext.setVariable("remoteDirectory", remoteDirectory); + // TODO Change 'desiredResultType' as 'File.class' after fix of SPR-10953. + File localDir = new File(this.localDirectoryExpression.getValue(evaluationContext, message, String.class)); + if (!localDir.exists()) { + Assert.isTrue(localDir.mkdirs(), "Failed to make local directory: " + localDir); + } + return localDir; + } + private String generateLocalFileName(Message message, String remoteFileName){ if (this.localFilenameGeneratorExpression != null){ EvaluationContext evaluationContext = ExpressionUtils.createStandardEvaluationContext(this.getBeanFactory()); diff --git a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-3.0.xsd b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-3.0.xsd index 48945cdabf..bfd362abb3 100644 --- a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-3.0.xsd +++ b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-3.0.xsd @@ -415,6 +415,23 @@ Identifies directory path (e.g., "/local/mytransfers") where file will be transferred TO. + This attribute is mutually exclusive with 'local-directory-expression'. + + + + + + + Specifies SpEL expression to + generate the directory path where file will be + transferred TO, when using 'get' and 'mget' commands. + The root object of the SpEL evaluation is the request Message, + but the name of the source + remote directory is also provided as the 'remoteDirectory' variable. + For example, a valid expression might be: + "'/local/' + #remoteDirectory.toUpperCase() + headers.foo". + Only used with 'get' and 'mget' commands. + This attribute is mutually exclusive with 'local-directory'. diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpServerRule.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpServerRule.java new file mode 100644 index 0000000000..260d34d3c2 --- /dev/null +++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpServerRule.java @@ -0,0 +1,217 @@ +/* + * Copyright 2013 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.integration.ftp; + +import java.io.File; +import java.io.IOException; +import java.util.Arrays; + +import org.apache.ftpserver.FtpServer; +import org.apache.ftpserver.FtpServerFactory; +import org.apache.ftpserver.ftplet.Authentication; +import org.apache.ftpserver.ftplet.AuthenticationFailedException; +import org.apache.ftpserver.ftplet.FtpException; +import org.apache.ftpserver.ftplet.User; +import org.apache.ftpserver.ftplet.UserManager; +import org.apache.ftpserver.listener.ListenerFactory; +import org.apache.ftpserver.usermanager.impl.BaseUser; +import org.apache.ftpserver.usermanager.impl.ConcurrentLoginPermission; +import org.apache.ftpserver.usermanager.impl.TransferRatePermission; +import org.apache.ftpserver.usermanager.impl.WritePermission; +import org.junit.rules.ExternalResource; +import org.junit.rules.TemporaryFolder; + +import org.springframework.integration.test.util.SocketUtils; + +/** + * @author Artem Bilan + * @since 3.0 + */ +public class FtpServerRule extends ExternalResource { + + public static int FTP_PORT = SocketUtils.findAvailableServerSocket(); + + private final TemporaryFolder ftpFolder; + + private final TemporaryFolder localFolder; + + private volatile File ftpRootFolder; + + private volatile File sourceFtpDirectory; + + private volatile File targetFtpDirectory; + + private volatile File sourceLocalDirectory; + + private volatile File targetLocalDirectory; + + private volatile FtpServer server; + + public FtpServerRule(final String root) { + this.ftpFolder = new TemporaryFolder() { + + @Override + public void create() throws IOException { + super.create(); + ftpRootFolder = this.newFolder(root); + sourceFtpDirectory = new File(ftpRootFolder, "ftpSource"); + sourceFtpDirectory.mkdir(); + File file = new File(sourceFtpDirectory, "ftpSource1.txt"); + file.createNewFile(); + file = new File(sourceFtpDirectory, "ftpSource2.txt"); + file.createNewFile(); + + File subSourceFtpDirectory = new File(sourceFtpDirectory, "subFtpSource"); + subSourceFtpDirectory.mkdir(); + file = new File(subSourceFtpDirectory, "subFtpSource1.txt"); + file.createNewFile(); + + targetFtpDirectory = new File(ftpRootFolder, "ftpTarget"); + targetFtpDirectory.mkdirs(); + } + }; + this.localFolder = new TemporaryFolder() { + + @Override + public void create() throws IOException { + super.create(); + File rootFolder = this.newFolder(root); + sourceLocalDirectory = new File(rootFolder, "localSource"); + sourceLocalDirectory.mkdirs(); + File file = new File(sourceLocalDirectory, "localSource1.txt"); + file.createNewFile(); + file = new File(sourceLocalDirectory, "localSource2.txt"); + file.createNewFile(); + + File subSourceLocalDirectory = new File(sourceLocalDirectory, "subLocalSource"); + subSourceLocalDirectory.mkdir(); + file = new File(subSourceLocalDirectory, "subLocalSource1.txt"); + file.createNewFile(); + + targetLocalDirectory = new File(rootFolder, "localTarget"); + targetLocalDirectory.mkdirs(); + } + }; + } + + public File getSourceFtpDirectory() { + return sourceFtpDirectory; + } + + public File getTargetFtpDirectory() { + return targetFtpDirectory; + } + + public File getSourceLocalDirectory() { + return sourceLocalDirectory; + } + + public File getTargetLocalDirectory() { + return targetLocalDirectory; + } + + @Override + protected void before() throws Throwable { + this.ftpFolder.create(); + this.localFolder.create(); + + FtpServerFactory serverFactory = new FtpServerFactory(); + serverFactory.setUserManager(new TestUserManager(this.ftpRootFolder.getAbsolutePath())); + + ListenerFactory factory = new ListenerFactory(); + factory.setPort(FTP_PORT); + serverFactory.addListener("default", factory.createListener()); + + server = serverFactory.createServer(); + server.start(); + } + + + @Override + protected void after() { + this.server.stop(); + this.ftpFolder.delete(); + this.localFolder.delete(); + } + + + public static void recursiveDelete(File file) { + File[] files = file.listFiles(); + if (files != null) { + for (File each : files) { + recursiveDelete(each); + } + } + file.delete(); + } + + + private class TestUserManager implements UserManager { + + private final BaseUser testUser; + + private TestUserManager(String homeDirectory) { + this.testUser = new BaseUser(); + this.testUser.setAuthorities(Arrays.asList(new ConcurrentLoginPermission(1024, 1024), + new WritePermission(), + new TransferRatePermission(1024, 1024))); + this.testUser.setHomeDirectory(homeDirectory); + this.testUser.setName("TEST_USER"); + } + + + @Override + public User getUserByName(String s) throws FtpException { + return this.testUser; + } + + @Override + public String[] getAllUserNames() throws FtpException { + return new String[]{"TEST_USER"}; + } + + @Override + public void delete(String s) throws FtpException { + } + + @Override + public void save(User user) throws FtpException { + } + + @Override + public boolean doesExist(String s) throws FtpException { + return true; + } + + @Override + public User authenticate(Authentication authentication) throws AuthenticationFailedException { + return this.testUser; + } + + @Override + public String getAdminName() throws FtpException { + return "admin"; + } + + @Override + public boolean isAdmin(String s) throws FtpException { + return s.equals("admin"); + } + + } + +} diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundGatewayParserTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundGatewayParserTests.java index 73c8f1c18e..4c28c196f4 100644 --- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundGatewayParserTests.java +++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundGatewayParserTests.java @@ -77,7 +77,7 @@ public class FtpOutboundGatewayParserTests { assertEquals("X", TestUtils.getPropertyValue(gateway, "remoteFileSeparator")); assertNotNull(TestUtils.getPropertyValue(gateway, "sessionFactory")); assertNotNull(TestUtils.getPropertyValue(gateway, "outputChannel")); - assertEquals(new File("local-test-dir"), TestUtils.getPropertyValue(gateway, "localDirectory")); + assertEquals("local-test-dir", TestUtils.getPropertyValue(gateway, "localDirectoryExpression.literalValue")); assertFalse((Boolean) TestUtils.getPropertyValue(gateway, "autoCreateLocalDirectory")); assertNotNull(TestUtils.getPropertyValue(gateway, "filter")); assertEquals(Command.LS, TestUtils.getPropertyValue(gateway, "command")); @@ -100,7 +100,7 @@ public class FtpOutboundGatewayParserTests { assertNotNull(TestUtils.getPropertyValue(gateway, "sessionFactory")); assertTrue(TestUtils.getPropertyValue(gateway, "sessionFactory") instanceof CachingSessionFactory); assertNotNull(TestUtils.getPropertyValue(gateway, "outputChannel")); - assertEquals(new File("local-test-dir"), TestUtils.getPropertyValue(gateway, "localDirectory")); + assertEquals("local-test-dir", TestUtils.getPropertyValue(gateway, "localDirectoryExpression.literalValue")); assertFalse((Boolean) TestUtils.getPropertyValue(gateway, "autoCreateLocalDirectory")); assertEquals(Command.GET, TestUtils.getPropertyValue(gateway, "command")); @SuppressWarnings("unchecked") diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpServerOutboundTests-context.xml b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpServerOutboundTests-context.xml new file mode 100644 index 0000000000..91feb884b4 --- /dev/null +++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpServerOutboundTests-context.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpServerOutboundTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpServerOutboundTests.java new file mode 100644 index 0000000000..61fec74f09 --- /dev/null +++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpServerOutboundTests.java @@ -0,0 +1,133 @@ +/* + * Copyright 2013 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.integration.ftp.outbound; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.fail; + +import java.io.File; +import java.util.List; + +import org.hamcrest.Matchers; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.Test; +import org.junit.runner.RunWith; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.integration.Message; +import org.springframework.integration.channel.DirectChannel; +import org.springframework.integration.core.PollableChannel; +import org.springframework.integration.ftp.FtpServerRule; +import org.springframework.integration.message.GenericMessage; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +/** + * @author Artem Bilan + * @since 3.0 + */ +@ContextConfiguration +@RunWith(SpringJUnit4ClassRunner.class) +public class FtpServerOutboundTests { + + @ClassRule + public static final FtpServerRule FTP_SERVER = new FtpServerRule(FtpServerOutboundTests.class.getSimpleName()); + + @Autowired + private PollableChannel output; + + @Autowired + private DirectChannel inboundGet; + + @Autowired + private DirectChannel invalidDirExpression; + + @Autowired + private DirectChannel inboundMGet; + + @Before + public void setup() { + FtpServerRule.recursiveDelete(FTP_SERVER.getTargetLocalDirectory()); + FtpServerRule.recursiveDelete(FTP_SERVER.getTargetFtpDirectory()); + } + + @Test + public void testInt2866LocalDirectoryExpressionGET() { + String dir = "ftpSource/"; + this.inboundGet.send(new GenericMessage(dir + "ftpSource1.txt")); + Message result = this.output.receive(1000); + assertNotNull(result); + File localFile = (File) result.getPayload(); + assertThat(localFile.getPath().replaceAll(java.util.regex.Matcher.quoteReplacement(File.separator), "/"), + Matchers.containsString(dir.toUpperCase())); + + dir = "ftpSource/subFtpSource/"; + this.inboundGet.send(new GenericMessage(dir + "subFtpSource1.txt")); + result = this.output.receive(1000); + assertNotNull(result); + localFile = (File) result.getPayload(); + assertThat(localFile.getPath().replaceAll(java.util.regex.Matcher.quoteReplacement(File.separator), "/"), + Matchers.containsString(dir.toUpperCase())); + } + + @Test + public void testInt2866InvalidLocalDirectoryExpression() { + try { + this.invalidDirExpression.send(new GenericMessage("/ftpSource/ftpSource1.txt")); + fail("Exception expected."); + } + catch (Exception e) { + Throwable cause = e.getCause(); + assertThat(cause, Matchers.instanceOf(IllegalArgumentException.class)); + assertThat(cause.getMessage(), Matchers.startsWith("Failed to make local directory")); + } + } + + @Test + @SuppressWarnings("unchecked") + public void testInt2866LocalDirectoryExpressionMGET() { + String dir = "ftpSource/"; + this.inboundMGet.send(new GenericMessage(dir + "*.txt")); + Message result = this.output.receive(1000); + assertNotNull(result); + List localFiles = (List) result.getPayload(); + + for (File file : localFiles) { + assertThat(file.getPath().replaceAll(java.util.regex.Matcher.quoteReplacement(File.separator), "/"), + Matchers.containsString(dir)); + } + + dir = "ftpSource/subFtpSource/"; + this.inboundMGet.send(new GenericMessage(dir + "*.txt")); + result = this.output.receive(1000); + assertNotNull(result); + localFiles = (List) result.getPayload(); + + for (File file : localFiles) { + assertThat(file.getPath().replaceAll(java.util.regex.Matcher.quoteReplacement(File.separator), "/"), + Matchers.containsString(dir)); + } + } + + public static String localDirectory() { + return FTP_SERVER.getTargetLocalDirectory().getAbsolutePath() + File.separator; + } + + +} diff --git a/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-3.0.xsd b/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-3.0.xsd index 543833b594..15d09c624f 100644 --- a/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-3.0.xsd +++ b/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-3.0.xsd @@ -414,6 +414,23 @@ Identifies directory path (e.g., "/local/mytransfers") where file will be transferred TO. + This attribute is mutually exclusive with 'local-directory-expression'. + + + + + + + Specifies SpEL expression to + generate the directory path where file will be + transferred TO, when using 'get' and 'mget' commands. + The root object of the SpEL evaluation is the request Message, + but the name of the source + remote directory is also provided as the 'remoteDirectory' variable. + For example, a valid expression might be: + "'/local/' + #remoteDirectory.toUpperCase() + headers.foo". + Only used with 'get' and 'mget' commands. + This attribute is mutually exclusive with 'local-directory'. diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpOutboundGatewayParserTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpOutboundGatewayParserTests.java index 9c50707a99..c1b69f1712 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpOutboundGatewayParserTests.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpOutboundGatewayParserTests.java @@ -75,7 +75,7 @@ public class SftpOutboundGatewayParserTests { assertEquals("X", TestUtils.getPropertyValue(gateway, "remoteFileSeparator")); assertNotNull(TestUtils.getPropertyValue(gateway, "sessionFactory")); assertNotNull(TestUtils.getPropertyValue(gateway, "outputChannel")); - assertEquals(new File("local-test-dir"), TestUtils.getPropertyValue(gateway, "localDirectory")); + assertEquals("local-test-dir", TestUtils.getPropertyValue(gateway, "localDirectoryExpression.literalValue")); assertFalse((Boolean) TestUtils.getPropertyValue(gateway, "autoCreateLocalDirectory")); assertTrue(TestUtils.getPropertyValue(gateway, "requiresReply", Boolean.class)); assertNotNull(TestUtils.getPropertyValue(gateway, "filter")); @@ -97,7 +97,7 @@ public class SftpOutboundGatewayParserTests { assertNotNull(TestUtils.getPropertyValue(gateway, "sessionFactory")); assertTrue(TestUtils.getPropertyValue(gateway, "sessionFactory") instanceof CachingSessionFactory); assertNotNull(TestUtils.getPropertyValue(gateway, "outputChannel")); - assertEquals(new File("local-test-dir"), TestUtils.getPropertyValue(gateway, "localDirectory")); + assertEquals("local-test-dir", TestUtils.getPropertyValue(gateway, "localDirectoryExpression.literalValue")); assertFalse((Boolean) TestUtils.getPropertyValue(gateway, "autoCreateLocalDirectory")); assertEquals(Command.GET, TestUtils.getPropertyValue(gateway, "command")); assertFalse(TestUtils.getPropertyValue(gateway, "requiresReply", Boolean.class)); diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpServerOutboundTests-context.xml b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpServerOutboundTests-context.xml new file mode 100644 index 0000000000..5c259ebbcf --- /dev/null +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpServerOutboundTests-context.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpServerOutboundTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpServerOutboundTests.java new file mode 100644 index 0000000000..0a964c5de0 --- /dev/null +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpServerOutboundTests.java @@ -0,0 +1,206 @@ +/* + * Copyright 2013 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.integration.sftp.outbound; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.fail; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.io.File; +import java.io.IOException; +import java.util.List; + +import org.hamcrest.Matchers; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.integration.Message; +import org.springframework.integration.channel.DirectChannel; +import org.springframework.integration.core.PollableChannel; +import org.springframework.integration.file.remote.session.Session; +import org.springframework.integration.file.remote.session.SessionFactory; +import org.springframework.integration.message.GenericMessage; +import org.springframework.integration.sftp.session.SftpFileInfo; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +import com.jcraft.jsch.ChannelSftp.LsEntry; +import com.jcraft.jsch.SftpATTRS; + +/** + * Run with -Dspring-profiles-active=realSSH to run with a real SSH server. + * + * Assumes ftptest account on localhost with the following directory tree in the user's root... + * + * 
+ *  $ tree sftpSource/
+ *  sftpSource/
+ *  ├── sftpSource1.txt
+ *  ├── sftpSource2.txt
+ *  └── subSftpSource
+ *      └── subSftpSource1.txt
+ *
+ * + * @author Artem Bilan + * @author Gary Russell + * @since 3.0 + */ +@ContextConfiguration +@RunWith(SpringJUnit4ClassRunner.class) +public class SftpServerOutboundTests { + + @Autowired + private PollableChannel output; + + @Autowired + private DirectChannel inboundGet; + + @Autowired + private DirectChannel invalidDirExpression; + + @Autowired + private DirectChannel inboundMGet; + + @Autowired + private SessionFactory sessionFactory; + + @Before + public void setup() throws Exception { + purge(); + setUpMocksIfNeeded(); + } + + @SuppressWarnings({ "rawtypes", "unchecked" }) + private void setUpMocksIfNeeded() throws IOException { + if (sessionFactory.toString().startsWith("Mock for")) { + Session session = mock(Session.class); + when(sessionFactory.getSession()).thenReturn(session); + LsEntry entry1 = mock(LsEntry.class); + SftpATTRS attrs1 = mock(SftpATTRS.class); + when(entry1.getAttrs()).thenReturn(attrs1); + when(entry1.getFilename()).thenReturn("sftpSource1.txt"); + LsEntry entry2 = mock(LsEntry.class); + SftpATTRS attrs2 = mock(SftpATTRS.class); + when(entry2.getAttrs()).thenReturn(attrs2); + when(entry2.getFilename()).thenReturn("sftpSource2.txt"); + LsEntry entry3 = mock(LsEntry.class); + when(entry3.getFilename()).thenReturn("subSftpSource"); + SftpATTRS attrs3 = mock(SftpATTRS.class); + when(entry3.getAttrs()).thenReturn(attrs3); + when(attrs3.isDir()).thenReturn(true); + LsEntry entry4 = mock(LsEntry.class); + SftpATTRS attrs4 = mock(SftpATTRS.class); + when(entry4.getAttrs()).thenReturn(attrs4); + when(entry4.getFilename()).thenReturn("subSftpSource1.txt"); + when(session.list("sftpSource/sftpSource1.txt")).thenReturn(new LsEntry[] { + entry1 + }); + when(session.list("sftpSource/")).thenReturn(new LsEntry[] { + entry1, entry2, entry3 + }); + when(session.list("sftpSource/subSftpSource/")).thenReturn(new LsEntry[] { + entry4 + }); + when(session.list("sftpSource/subSftpSource/subSftpSource1.txt")).thenReturn(new LsEntry[] { + entry4 + }); + } + } + + @After + public void purge() { + File local = new File("/tmp/sftpOutboundTests/"); + purge(local); + local.delete(); + } + + private void purge(File local) { + File[] files = local.listFiles(); + if (files != null) { + for (File file : files) { + if (file.isDirectory()) { + this.purge(file); + } + file.delete(); + } + } + } + + @Test + public void testInt2866LocalDirectoryExpressionGET() { + String dir = "sftpSource/"; + this.inboundGet.send(new GenericMessage(dir + "sftpSource1.txt")); + Message result = this.output.receive(1000); + assertNotNull(result); + File localFile = (File) result.getPayload(); + assertThat(localFile.getPath().replaceAll(java.util.regex.Matcher.quoteReplacement(File.separator), "/"), + Matchers.containsString(dir.toUpperCase())); + + dir = "sftpSource/subSftpSource/"; + this.inboundGet.send(new GenericMessage(dir + "subSftpSource1.txt")); + result = this.output.receive(1000); + assertNotNull(result); + localFile = (File) result.getPayload(); + assertThat(localFile.getPath().replaceAll(java.util.regex.Matcher.quoteReplacement(File.separator), "/"), + Matchers.containsString(dir.toUpperCase())); + } + + @Test + public void testInt2866InvalidLocalDirectoryExpression() { + try { + this.invalidDirExpression.send(new GenericMessage("sftpSource/sftpSource1.txt")); + fail("Exception expected."); + } + catch (Exception e) { + Throwable cause = e.getCause(); + assertThat(cause, Matchers.instanceOf(IllegalArgumentException.class)); + assertThat(cause.getMessage(), Matchers.startsWith("Failed to make local directory")); + } + } + + @Test + @SuppressWarnings("unchecked") + public void testInt2866LocalDirectoryExpressionMGET() { + String dir = "sftpSource/"; + this.inboundMGet.send(new GenericMessage(dir + "*.txt")); + Message result = this.output.receive(1000); + assertNotNull(result); + List localFiles = (List) result.getPayload(); + + for (File file : localFiles) { + assertThat(file.getPath().replaceAll(java.util.regex.Matcher.quoteReplacement(File.separator), "/"), + Matchers.containsString(dir)); + } + + dir = "sftpSource/subSftpSource/"; + this.inboundMGet.send(new GenericMessage(dir + "*.txt")); + result = this.output.receive(1000); + assertNotNull(result); + localFiles = (List) result.getPayload(); + + for (File file : localFiles) { + assertThat(file.getPath().replaceAll(java.util.regex.Matcher.quoteReplacement(File.separator), "/"), + Matchers.containsString(dir)); + } + } + +} diff --git a/src/reference/docbook/ftp.xml b/src/reference/docbook/ftp.xml index 8e4b88078e..213865becf 100644 --- a/src/reference/docbook/ftp.xml +++ b/src/reference/docbook/ftp.xml @@ -433,7 +433,16 @@ protected void postProcessClientBeforeConnect(T client) throws IOException { defines a SpEL expression to generate the name of local file(s) during the transfer. The root object of the evaluation context is the request Message but, in addition, the remoteFileName variable is also available, which is particularly useful for mget, for - example: local-filename-generator-expression="#remoteFileName.toUpperCase() + headers.foo" + example: local-filename-generator-expression="#remoteFileName.toUpperCase() + headers.foo". + + + The get and mget commands support + the local-directory-expression attribute. It + defines a SpEL expression to generate the name of local directory(ies) during the transfer. + The root object of the evaluation context is the request Message but, in addition, the remoteDirectory + variable is also available, which is particularly useful for mget, for + example: local-directory-expression="'/tmp/local/' + #remoteDirectory.toUpperCase() + headers.foo". + This attribute is mutually exclusive with local-directory attribute. For all commands, the PATH that the command acts on is provided by the 'expression' diff --git a/src/reference/docbook/sftp.xml b/src/reference/docbook/sftp.xml index 096ae9248d..163c73b664 100644 --- a/src/reference/docbook/sftp.xml +++ b/src/reference/docbook/sftp.xml @@ -471,6 +471,15 @@ xsi:schemaLocation="http://www.springframework.org/schema/integration/sftp variable is also available, which is particularly useful for mget, for example: local-filename-generator-expression="#remoteFileName.toUpperCase() + headers.foo" + + The get and mget commands support + the local-directory-expression attribute. It + defines a SpEL expression to generate the name of local directory(ies) during the transfer. + The root object of the evaluation context is the request Message but, in addition, the remoteDirectory + variable is also available, which is particularly useful for mget, for + example: local-directory-expression="'/tmp/local/' + #remoteDirectory.toUpperCase() + headers.foo". + This attribute is mutually exclusive with local-directory attribute. + For all commands, the PATH that the command acts on is provided by the 'expression' property of the gateway. For the mget command, the expression might evaluate to '*', meaning diff --git a/src/reference/docbook/whats-new.xml b/src/reference/docbook/whats-new.xml index e6d68b4b5e..e4810384a5 100644 --- a/src/reference/docbook/whats-new.xml +++ b/src/reference/docbook/whats-new.xml @@ -244,8 +244,14 @@ The local-filename-generator-expression attribute is now supported, enabling the naming of local files during transfer. By default, the same - name as the remote file is used. For more information, see - and . + name as the remote file is used. + + + The local-directory-expression attribute is now supported, + enabling the naming of local directories during transfer based on the remote directory. + + + For more information, see and .
From 6d9e48b9aca64ad62aab64c12d8096905634d42a Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Fri, 18 Oct 2013 12:04:55 +0300 Subject: [PATCH 6/8] INT-3172 (S)FTP - Add Recursion Option to LS Cmd When recursing, the returned filenames are relative to the top level directory. INT-3172 (S)FTP - Add Recursion to MGET Command https://jira.springsource.org/browse/INT-3172 INT-3172 Polishing - PR Comments - Add Tests for SFTP (tested with Mock and real SSH) - Enhance test to ensure subdir is in 3rd file retrieved - Exclude "special" directories ('.' and '..') from recursion INT-3172 Make FtpServerRule Safe For Concurrency Previously the port was static. - Make the port an instance variable - Channel the `@ ClassRule` to a `@ Rule` - Register an appropriate DefaultFtpSessionFactory bean declaration INT-3172 Polishing; Docs - Rename FtpServerRule to TestFtpServer - Remove restriction on filters for MGET - Add test for filtered MGET - Reference docs, what's new INT-3172 More Polish - Fix type in reference - Fix error message now that filter is allowed with MGET - Remove test for filter with MGET (now valid) INT-3172: Fix tests and typos INT-3172: this.remoteFileSeparator for recursion --- .../AbstractRemoteFileOutboundGateway.java | 115 ++++++++++++++--- .../RemoteFileOutboundGatewayTests.java | 116 ++++++++++++++---- .../ftp/gateway/FtpOutboundGateway.java | 17 ++- .../{FtpServerRule.java => TesFtpServer.java} | 42 +++++-- .../FtpServerOutboundTests-context.xml | 35 ++++-- .../ftp/outbound/FtpServerOutboundTests.java | 56 +++++++-- .../sftp/gateway/SftpOutboundGateway.java | 17 ++- .../SftpServerOutboundTests-context.xml | 23 ++++ .../outbound/SftpServerOutboundTests.java | 51 +++++++- src/reference/docbook/ftp.xml | 29 +++++ src/reference/docbook/sftp.xml | 29 +++++ src/reference/docbook/whats-new.xml | 30 +++-- 12 files changed, 478 insertions(+), 82 deletions(-) rename spring-integration-ftp/src/test/java/org/springframework/integration/ftp/{FtpServerRule.java => TesFtpServer.java} (84%) diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/gateway/AbstractRemoteFileOutboundGateway.java b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/gateway/AbstractRemoteFileOutboundGateway.java index a5c182c4ab..a67874d05b 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/gateway/AbstractRemoteFileOutboundGateway.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/gateway/AbstractRemoteFileOutboundGateway.java @@ -66,22 +66,27 @@ public abstract class AbstractRemoteFileOutboundGateway extends AbstractReply * Enumeration of commands supported by the gateways. */ public static enum Command { + /** * List remote files. */ LS("ls"), + /** * Retrieve a remote file. */ GET("get"), + /** * Remove a remote file (path - including wildcards). */ RM("rm"), + /** * Retrieve multiple files matching a wildcard path. */ MGET("mget"), + /** * Move (rename) a remote file. */ @@ -112,34 +117,46 @@ public abstract class AbstractRemoteFileOutboundGateway extends AbstractReply * */ public static enum Option { + /** * Don't return full file information; just the name (ls). */ NAME_ONLY("-1"), + /** - * Include directories {@code .} and {@code ..} in the results (ls). + * Include files beginning with {@code .}, including directories {@code .} and {@code ..} in the results (ls). */ ALL("-a"), + /** * Do not sort the results (ls with NAME_ONLY). */ NOSORT("-f"), + /** * Include directories in the results (ls). */ SUBDIRS("-dirs"), + /** * Include links in the results (ls). */ LINKS("-links"), + /** * Preserve the server timestamp (get, mget). */ PRESERVE_TIMESTAMP("-P"), + /** * Throw an exception if no files returned (mget). */ - EXCEPTION_WHEN_EMPTY("-x"); + EXCEPTION_WHEN_EMPTY("-x"), + + /** + * Recursive (ls, mget) + */ + RECURSIVE("-R"); private String option; @@ -272,9 +289,9 @@ public abstract class AbstractRemoteFileOutboundGateway extends AbstractReply protected void onInit() { super.onInit(); Assert.notNull(this.command, "command must not be null"); - if (Command.RM.equals(this.command) || Command.MGET.equals(this.command) || + if (Command.RM.equals(this.command) || Command.GET.equals(this.command)) { - Assert.isNull(this.filter, "Filters are not supported with the rm, get, and mget commands"); + Assert.isNull(this.filter, "Filters are not supported with the rm and get commands"); } if (Command.GET.equals(this.command) || Command.MGET.equals(this.command)) { @@ -305,6 +322,11 @@ public abstract class AbstractRemoteFileOutboundGateway extends AbstractReply } } } + if (Command.MGET.equals(this.command)) { + Assert.isTrue(!(this.options.contains(Option.SUBDIRS)), + "Cannot use " + Option.SUBDIRS.toString() + " when using 'mget' use " + Option.RECURSIVE.toString() + + " to obtain files in subdirectories"); + } if (this.getBeanFactory() != null) { this.fileNameProcessor.setBeanFactory(this.getBeanFactory()); this.renameProcessor.setBeanFactory(this.getBeanFactory()); @@ -398,21 +420,7 @@ public abstract class AbstractRemoteFileOutboundGateway extends AbstractReply } protected List ls(Session session, String dir) throws IOException { - List lsFiles = new ArrayList(); - F[] files = session.list(dir); - if (!ObjectUtils.isEmpty(files)) { - Collection filteredFiles = this.filterFiles(files); - for (F file : filteredFiles) { - if (file != null) { - if (this.options.contains(Option.SUBDIRS) || !this.isDirectory(file)) { - lsFiles.add(file); - } - } - } - } - else { - return lsFiles; - } + List lsFiles = listFilesInRemoteDir(session, dir, ""); if (!this.options.contains(Option.LINKS)) { purgeLinks(lsFiles); } @@ -441,6 +449,32 @@ public abstract class AbstractRemoteFileOutboundGateway extends AbstractReply } } + private List listFilesInRemoteDir(Session session, String directory, String subDirectory) throws IOException { + List lsFiles = new ArrayList(); + F[] files = session.list(directory + subDirectory); + boolean recursion = this.options.contains(Option.RECURSIVE); + if (!ObjectUtils.isEmpty(files)) { + Collection filteredFiles = this.filterFiles(files); + for (F file : filteredFiles) { + String fileName = this.getFilename(file); + if (file != null) { + if (this.options.contains(Option.SUBDIRS) || !this.isDirectory(file)) { + if (recursion && StringUtils.hasText(subDirectory)) { + lsFiles.add(enhanceNameWithSubDirectory(file, subDirectory)); + } + else { + lsFiles.add(file); + } + } + if (recursion && this.isDirectory(file) && !(".".equals(fileName)) && !("..".equals(fileName))) { + lsFiles.addAll(listFilesInRemoteDir(session, directory, subDirectory + fileName + this.remoteFileSeparator)); + } + } + } + } + return lsFiles; + } + protected final List filterFiles(F[] files) { return (this.filter != null) ? this.filter.filterFiles(files) : Arrays.asList(files); } @@ -523,6 +557,22 @@ public abstract class AbstractRemoteFileOutboundGateway extends AbstractReply protected List mGet(Message message, Session session, String remoteDirectory, String remoteFilename) throws IOException { + if (this.options.contains(Option.RECURSIVE)) { + if (logger.isWarnEnabled() && !("*".equals(remoteFilename))) { + logger.warn("File name pattern must be '*' when using recursion"); + } + if (this.options.contains(Option.NAME_ONLY)) { + this.options.remove(Option.NAME_ONLY); + } + return mGetWithRecursion(message, session, remoteDirectory, remoteFilename); + } + else { + return mGetWithoutRecursion(message, session, remoteDirectory, remoteFilename); + } + } + + private List mGetWithoutRecursion(Message message, Session session, String remoteDirectory, + String remoteFilename) throws IOException { String path = this.generateFullPath(remoteDirectory, remoteFilename); String[] fileNames = session.listNames(path); if (fileNames == null) { @@ -549,6 +599,30 @@ public abstract class AbstractRemoteFileOutboundGateway extends AbstractReply return files; } + private List mGetWithRecursion(Message message, Session session, String remoteDirectory, + String remoteFilename) throws IOException { + List files = new ArrayList(); + @SuppressWarnings("unchecked") + List> fileNames = (List>) this.ls(session, remoteDirectory); + if (fileNames.size() == 0 && this.options.contains(Option.EXCEPTION_WHEN_EMPTY)) { + throw new MessagingException("No files found at " + remoteDirectory + + " with pattern " + remoteFilename); + } + for (AbstractFileInfo lsEntry : fileNames) { + String fullFileName = remoteDirectory + this.getFilename(lsEntry); + /* + * With recursion, the filename might contain subdirectory information + * normalize each file separately. + */ + String fileName = this.getRemoteFilename(fullFileName); + String actualRemoteDirectory = this.getRemoteDirectory(fullFileName, fileName); + File file = this.get(message, session, actualRemoteDirectory, + fullFileName, fileName, false); + files.add(file); + } + return files; + } + private String getRemoteDirectory(String remoteFilePath, String remoteFilename) { String remoteDir = remoteFilePath.substring(0, remoteFilePath.lastIndexOf(remoteFilename)); if (remoteDir.length() == 0) { @@ -626,8 +700,11 @@ public abstract class AbstractRemoteFileOutboundGateway extends AbstractReply abstract protected String getFilename(F file); + abstract protected String getFilename(AbstractFileInfo file); + abstract protected long getModified(F file); abstract protected List> asFileInfoList(Collection files); + abstract protected F enhanceNameWithSubDirectory(F file, String directory); } 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 80213429b7..eca3f97fa3 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 @@ -86,21 +86,6 @@ public class RemoteFileOutboundGatewayTests { } } - @Test - public void testBadFilterMGet() throws Exception { - SessionFactory sessionFactory = mock(SessionFactory.class); - TestRemoteFileOutboundGateway gw = new TestRemoteFileOutboundGateway - (sessionFactory, "mget", "payload"); - gw.setFilter(new TestPatternFilter("")); - try { - gw.onInit(); - fail("Exception expected"); - } - catch (IllegalArgumentException e) { - assertTrue(e.getMessage().startsWith("Filters are not supported")); - } - } - @Test public void testBadFilterRm() throws Exception { SessionFactory sessionFactory = mock(SessionFactory.class); @@ -389,9 +374,6 @@ public class RemoteFileOutboundGatewayTests { assertEquals("foo/bar", madeDirs.get(1)); } - /** - * @return - */ public TestLsEntry[] fileList() { TestLsEntry[] files = new TestLsEntry[6]; files[0] = new TestLsEntry("f2", 123, false, false, 1234, "-r--r--r--"); @@ -424,6 +406,83 @@ public class RemoteFileOutboundGatewayTests { out.getHeaders().get(FileHeaders.REMOTE_DIRECTORY)); } + public TestLsEntry[] level1List() { + return new TestLsEntry[] { + new TestLsEntry("f1", 123, false, false, 1234, "-r--r--r--"), + new TestLsEntry("d1", 0, true, false, 12345, "drw-r--r--"), + new TestLsEntry("f2", 12345, false, false, 123456, "-rw-r--r--") + }; + } + + public TestLsEntry[] level2List() { + return new TestLsEntry[] { + new TestLsEntry("d2", 0, true, false, 12345, "drw-r--r--"), + new TestLsEntry("f3", 12345, false, false, 123456, "-rw-r--r--") + }; + } + + public TestLsEntry[] level3List() { + return new TestLsEntry[] { + new TestLsEntry("f4", 12345, false, false, 123456, "-rw-r--r--") + }; + } + + @Test + public void testLs_f_R() throws Exception { + SessionFactory sessionFactory = mock(SessionFactory.class); + Session session = mock(Session.class); + TestRemoteFileOutboundGateway gw = new TestRemoteFileOutboundGateway + (sessionFactory, "ls", "payload"); + gw.setOptions("-f -R"); + gw.afterPropertiesSet(); + when(sessionFactory.getSession()).thenReturn(session); + TestLsEntry[] level1 = level1List(); + TestLsEntry[] level2 = level2List(); + TestLsEntry[] level3 = level3List(); + when(session.list("testremote/x/")).thenReturn(level1); + when(session.list("testremote/x/d1/")).thenReturn(level2); + when(session.list("testremote/x/d1/d2/")).thenReturn(level3); + @SuppressWarnings("unchecked") + Message> out = (Message>) gw + .handleRequestMessage(new GenericMessage("testremote/x")); + assertEquals(4, out.getPayload().size()); + assertEquals("f1", out.getPayload().get(0).getFilename()); + assertEquals("d1/d2/f4", out.getPayload().get(1).getFilename()); + assertEquals("d1/f3", out.getPayload().get(2).getFilename()); + assertEquals("f2", out.getPayload().get(3).getFilename()); + assertEquals("testremote/x/", + out.getHeaders().get(FileHeaders.REMOTE_DIRECTORY)); + } + + @Test + public void testLs_f_R_dirs() throws Exception { + SessionFactory sessionFactory = mock(SessionFactory.class); + Session session = mock(Session.class); + TestRemoteFileOutboundGateway gw = new TestRemoteFileOutboundGateway + (sessionFactory, "ls", "payload"); + gw.setOptions("-f -R -dirs"); + gw.afterPropertiesSet(); + when(sessionFactory.getSession()).thenReturn(session); + TestLsEntry[] level1 = level1List(); + TestLsEntry[] level2 = level2List(); + TestLsEntry[] level3 = level3List(); + when(session.list("testremote/x/")).thenReturn(level1); + when(session.list("testremote/x/d1/")).thenReturn(level2); + when(session.list("testremote/x/d1/d2/")).thenReturn(level3); + @SuppressWarnings("unchecked") + Message> out = (Message>) gw + .handleRequestMessage(new GenericMessage("testremote/x")); + assertEquals(6, out.getPayload().size()); + assertEquals("f1", out.getPayload().get(0).getFilename()); + assertEquals("d1", out.getPayload().get(1).getFilename()); + assertEquals("d1/d2", out.getPayload().get(2).getFilename()); + assertEquals("d1/d2/f4", out.getPayload().get(3).getFilename()); + assertEquals("d1/f3", out.getPayload().get(4).getFilename()); + assertEquals("f2", out.getPayload().get(5).getFilename()); + assertEquals("testremote/x/", + out.getHeaders().get(FileHeaders.REMOTE_DIRECTORY)); + } + @Test public void testLs_None() throws Exception { SessionFactory sessionFactory = mock(SessionFactory.class); @@ -775,6 +834,11 @@ class TestRemoteFileOutboundGateway extends AbstractRemoteFileOutboundGateway file) { + return file.getFilename(); + } + @Override protected long getModified(TestLsEntry file) { return file.getModified(); @@ -786,18 +850,24 @@ class TestRemoteFileOutboundGateway extends AbstractRemoteFileOutboundGateway>(files); } + @Override + protected TestLsEntry enhanceNameWithSubDirectory(TestLsEntry file, String directory) { + file.setFilename(directory + file.getFilename()); + return file; + } + } class TestLsEntry extends AbstractFileInfo { - private final String filename; - private final int size; + private volatile String filename; + private final long size; private final boolean dir; private final boolean link; private final long modified; private final String permissions; - public TestLsEntry(String filename, int size, boolean dir, boolean link, + public TestLsEntry(String filename, long size, boolean dir, boolean link, long modified, String permissions) { this.filename = filename; this.size = size; @@ -835,6 +905,10 @@ class TestLsEntry extends AbstractFileInfo { return this; } + public void setFilename(String filename) { + this.filename = filename; + } + } class TestPatternFilter extends AbstractSimplePatternFileListFilter{ diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/gateway/FtpOutboundGateway.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/gateway/FtpOutboundGateway.java index 75a1f8f870..b55c612f5e 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/gateway/FtpOutboundGateway.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/gateway/FtpOutboundGateway.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2013 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,6 +21,7 @@ import java.util.Collection; import java.util.List; import org.apache.commons.net.ftp.FTPFile; + import org.springframework.integration.file.remote.AbstractFileInfo; import org.springframework.integration.file.remote.gateway.AbstractRemoteFileOutboundGateway; import org.springframework.integration.file.remote.session.SessionFactory; @@ -28,7 +29,7 @@ import org.springframework.integration.ftp.session.FtpFileInfo; /** * Outbound Gateway for performing remote file operations via FTP/FTPS. - * + * * @author Gary Russell * @since 2.1 */ @@ -54,6 +55,11 @@ public class FtpOutboundGateway extends AbstractRemoteFileOutboundGateway file) { + return file.getFilename(); + } + @Override protected long getModified(FTPFile file) { return file.getTimestamp().getTimeInMillis(); @@ -69,4 +75,11 @@ public class FtpOutboundGateway extends AbstractRemoteFileOutboundGateway - - - - - + + - - @@ -27,7 +22,7 @@ request-channel="inboundGet" command="get" expression="payload" - local-directory-expression="#localDir() + #remoteDirectory.toUpperCase()" + local-directory-expression="@ftpServer.targetLocalDirectoryName + #remoteDirectory.toUpperCase()" local-filename-generator-expression="#remoteFileName.replaceFirst('ftpSource', 'localTarget')" reply-channel="output"/> @@ -46,9 +41,31 @@ request-channel="inboundMGet" command="mget" expression="payload" - local-directory-expression="#localDir() + #remoteDirectory" + local-directory-expression="@ftpServer.targetLocalDirectoryName + #remoteDirectory" local-filename-generator-expression="#remoteFileName.replaceFirst('ftpSource', 'localTarget')" reply-channel="output"/> + + + + + + + diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpServerOutboundTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpServerOutboundTests.java index 61fec74f09..a5c9275949 100644 --- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpServerOutboundTests.java +++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpServerOutboundTests.java @@ -16,6 +16,7 @@ package org.springframework.integration.ftp.outbound; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; @@ -25,7 +26,6 @@ import java.util.List; import org.hamcrest.Matchers; import org.junit.Before; -import org.junit.ClassRule; import org.junit.Test; import org.junit.runner.RunWith; @@ -33,7 +33,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.integration.Message; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.core.PollableChannel; -import org.springframework.integration.ftp.FtpServerRule; +import org.springframework.integration.ftp.TesFtpServer; import org.springframework.integration.message.GenericMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -46,8 +46,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class) public class FtpServerOutboundTests { - @ClassRule - public static final FtpServerRule FTP_SERVER = new FtpServerRule(FtpServerOutboundTests.class.getSimpleName()); + @Autowired + public TesFtpServer ftpServer; @Autowired private PollableChannel output; @@ -61,10 +61,16 @@ public class FtpServerOutboundTests { @Autowired private DirectChannel inboundMGet; + @Autowired + private DirectChannel inboundMGetRecursive; + + @Autowired + private DirectChannel inboundMGetRecursiveFiltered; + @Before public void setup() { - FtpServerRule.recursiveDelete(FTP_SERVER.getTargetLocalDirectory()); - FtpServerRule.recursiveDelete(FTP_SERVER.getTargetFtpDirectory()); + TesFtpServer.recursiveDelete(ftpServer.getTargetLocalDirectory()); + TesFtpServer.recursiveDelete(ftpServer.getTargetFtpDirectory()); } @Test @@ -125,9 +131,43 @@ public class FtpServerOutboundTests { } } - public static String localDirectory() { - return FTP_SERVER.getTargetLocalDirectory().getAbsolutePath() + File.separator; + @Test + @SuppressWarnings("unchecked") + public void testInt3172LocalDirectoryExpressionMGETRecursive() { + String dir = "ftpSource/"; + this.inboundMGetRecursive.send(new GenericMessage(dir + "*")); + Message result = this.output.receive(1000); + assertNotNull(result); + List localFiles = (List) result.getPayload(); + assertEquals(3, localFiles.size()); + + for (File file : localFiles) { + assertThat(file.getPath().replaceAll(java.util.regex.Matcher.quoteReplacement(File.separator), "/"), + Matchers.containsString(dir)); + } + assertThat(localFiles.get(2).getPath().replaceAll(java.util.regex.Matcher.quoteReplacement(File.separator), "/"), + Matchers.containsString(dir + "subFtpSource")); + } + @Test + @SuppressWarnings("unchecked") + public void testInt3172LocalDirectoryExpressionMGETRecursiveFiltered() { + String dir = "ftpSource/"; + this.inboundMGetRecursiveFiltered.send(new GenericMessage(dir + "*")); + Message result = this.output.receive(1000); + assertNotNull(result); + List localFiles = (List) result.getPayload(); + // should have filtered ftpSource2.txt + assertEquals(2, localFiles.size()); + + for (File file : localFiles) { + assertThat(file.getPath().replaceAll(java.util.regex.Matcher.quoteReplacement(File.separator), "/"), + Matchers.containsString(dir)); + } + assertThat(localFiles.get(1).getPath().replaceAll(java.util.regex.Matcher.quoteReplacement(File.separator), "/"), + Matchers.containsString(dir + "subFtpSource")); + + } } diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/gateway/SftpOutboundGateway.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/gateway/SftpOutboundGateway.java index cdb3755be9..72c7db4750 100644 --- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/gateway/SftpOutboundGateway.java +++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/gateway/SftpOutboundGateway.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2013 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; +import org.springframework.beans.DirectFieldAccessor; import org.springframework.integration.file.remote.AbstractFileInfo; import org.springframework.integration.file.remote.gateway.AbstractRemoteFileOutboundGateway; import org.springframework.integration.file.remote.session.SessionFactory; @@ -29,7 +30,7 @@ import com.jcraft.jsch.ChannelSftp.LsEntry; /** * Outbound Gateway for performing remote file operations via SFTP. - * + * * @author Gary Russell * @since 2.1 */ @@ -59,6 +60,11 @@ public class SftpOutboundGateway extends AbstractRemoteFileOutboundGateway file) { + return file.getFilename(); + } + @Override protected List> asFileInfoList(Collection files) { List> canonicalFiles = new ArrayList>(); @@ -73,4 +79,11 @@ public class SftpOutboundGateway extends AbstractRemoteFileOutboundGateway + + + + + + + + diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpServerOutboundTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpServerOutboundTests.java index 0a964c5de0..dcccb049c5 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpServerOutboundTests.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpServerOutboundTests.java @@ -16,6 +16,7 @@ package org.springframework.integration.sftp.outbound; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; @@ -32,6 +33,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.integration.Message; import org.springframework.integration.channel.DirectChannel; @@ -80,6 +82,12 @@ public class SftpServerOutboundTests { @Autowired private DirectChannel inboundMGet; + @Autowired + private DirectChannel inboundMGetRecursive; + + @Autowired + private DirectChannel inboundMGetRecursiveFiltered; + @Autowired private SessionFactory sessionFactory; @@ -110,7 +118,9 @@ public class SftpServerOutboundTests { LsEntry entry4 = mock(LsEntry.class); SftpATTRS attrs4 = mock(SftpATTRS.class); when(entry4.getAttrs()).thenReturn(attrs4); - when(entry4.getFilename()).thenReturn("subSftpSource1.txt"); + // recursion uses a DFA to update the filename to include the subdirectory + new DirectFieldAccessor(entry4).setPropertyValue("filename", "subSftpSource1.txt"); + when(entry4.getFilename()).thenCallRealMethod(); when(session.list("sftpSource/sftpSource1.txt")).thenReturn(new LsEntry[] { entry1 }); @@ -203,4 +213,43 @@ public class SftpServerOutboundTests { } } + @Test + @SuppressWarnings("unchecked") + public void testInt3172LocalDirectoryExpressionMGETRecursive() { + String dir = "sftpSource/"; + this.inboundMGetRecursive.send(new GenericMessage(dir + "*")); + Message result = this.output.receive(1000); + assertNotNull(result); + List localFiles = (List) result.getPayload(); + assertEquals(3, localFiles.size()); + + for (File file : localFiles) { + assertThat(file.getPath().replaceAll(java.util.regex.Matcher.quoteReplacement(File.separator), "/"), + Matchers.containsString(dir)); + } + assertThat(localFiles.get(2).getPath().replaceAll(java.util.regex.Matcher.quoteReplacement(File.separator), "/"), + Matchers.containsString(dir + "subSftpSource")); + + } + + @Test + @SuppressWarnings("unchecked") + public void testInt3172LocalDirectoryExpressionMGETRecursiveFiltered() { + String dir = "sftpSource/"; + this.inboundMGetRecursiveFiltered.send(new GenericMessage(dir + "*")); + Message result = this.output.receive(1000); + assertNotNull(result); + List localFiles = (List) result.getPayload(); + // should have filtered sftpSource2.txt + assertEquals(2, localFiles.size()); + + for (File file : localFiles) { + assertThat(file.getPath().replaceAll(java.util.regex.Matcher.quoteReplacement(File.separator), "/"), + Matchers.containsString(dir)); + } + assertThat(localFiles.get(1).getPath().replaceAll(java.util.regex.Matcher.quoteReplacement(File.separator), "/"), + Matchers.containsString(dir + "subSftpSource")); + + } + } diff --git a/src/reference/docbook/ftp.xml b/src/reference/docbook/ftp.xml index 213865becf..967934adc8 100644 --- a/src/reference/docbook/ftp.xml +++ b/src/reference/docbook/ftp.xml @@ -351,6 +351,7 @@ protected void postProcessClientBeforeConnect(T client) throws IOException { -f - do not sort the list -dirs - include directories (excluded by default) -links - include symbolic links (excluded by default) + -R - list the remote directory recursively @@ -366,6 +367,13 @@ protected void postProcessClientBeforeConnect(T client) throws IOException { The remote directory that the ls command acted on is provided in the file_remoteDirectory header. + + When using the recursive option (-R), the fileName includes any subdirectory + elements, representing a relative path to the file (relative to the remote directory). If the -dirs + option is included, each recursive directory is also returned as an element in the list. In this case, + it is recommended that the -1 is not used because you would not be able to determine files Vs. + directories, which is achievable using the FileInfo objects. + get get retrieves a remote file and supports the following option: @@ -399,6 +407,27 @@ protected void postProcessClientBeforeConnect(T client) throws IOException { for the filenames is provided in the file_remoteFile header. + + Notes for when using recursion (<code>-R</code>) + + The pattern is ignored, and * is assumed. By + default, the entire remote tree is retrieved. However, files in the tree can be filtered, by providing a + FileListFilter; directories in the tree can also be filtered this way. + A FileListFilter can be provided by reference or by filename-pattern + or filename-regex attributes. For example, + filename-regex="(subDir|.*1.txt)" will retrieve all files ending with 1.txt in the + remote directory and the subdirectory subDir. If a subdirectory is filtered, no additional + traversal of that subdirectory is performed. + + + The -dirs option is not allowed (the recursive mget uses the recursive ls to + obtain the directory tree and the directories themselves cannot be included in the list). + + + Typically, you would use the #remoteDirectory variable in the local-directory-expression + so that the remote directory structure is retained locally. + + rm The rm command has no options. diff --git a/src/reference/docbook/sftp.xml b/src/reference/docbook/sftp.xml index 163c73b664..a73cf9c6d6 100644 --- a/src/reference/docbook/sftp.xml +++ b/src/reference/docbook/sftp.xml @@ -387,6 +387,7 @@ xsi:schemaLocation="http://www.springframework.org/schema/integration/sftp -f - do not sort the list -dirs - include directories (excluded by default) -links - include symbolic links (excluded by default) + -R - list the remote directory recursively @@ -402,6 +403,13 @@ xsi:schemaLocation="http://www.springframework.org/schema/integration/sftp The remote directory that the ls command acted on is provided in the file_remoteDirectory header. + + When using the recursive option (-R), the fileName includes any subdirectory + elements, representing a relative path to the file (relative to the remote directory). If the -dirs + option is included, each recursive directory is also returned as an element in the list. In this case, + it is recommended that the -1 is not used because you would not be able to determine files Vs. + directories, which is achievable using the FileInfo objects. + get get retrieves a remote file and supports the following option: @@ -435,6 +443,27 @@ xsi:schemaLocation="http://www.springframework.org/schema/integration/sftp for the filenames is provided in the file_remoteFile header. + + Notes for when using recursion (<code>-R</code>) + + The pattern is ignored, and * is assumed. By + default, the entire remote tree is retrieved. However, files in the tree can be filtered, by providing a + FileListFilter; directories in the tree can also be filtered this way. + A FileListFilter can be provided by reference or by filename-pattern + or filename-regex attributes. For example, + filename-regex="(subDir|.*1.txt)" will retrieve all files ending with 1.txt in the + remote directory and the subdirectory subDir. If a subdirectory is filtered, no additional + traversal of that subdirectory is performed. + + + The -dirs option is not allowed (the recursive mget uses the recursive ls to + obtain the directory tree and the directories themselves cannot be included in the list). + + + Typically, you would use the #remoteDirectory variable in the local-directory-expression + so that the remote directory structure is retained locally. + + rm The rm command has no options. diff --git a/src/reference/docbook/whats-new.xml b/src/reference/docbook/whats-new.xml index e4810384a5..e14ed1ffd3 100644 --- a/src/reference/docbook/whats-new.xml +++ b/src/reference/docbook/whats-new.xml @@ -238,17 +238,25 @@
FTP, SFTP and FTPS Gateways - The gateways now support the mv command, enabling the renaming of remote - files. - - - The local-filename-generator-expression attribute is now supported, - enabling the naming of local files during transfer. By default, the same - name as the remote file is used. - - - The local-directory-expression attribute is now supported, - enabling the naming of local directories during transfer based on the remote directory. + + + The gateways now support the mv command, enabling the renaming of remote + files. + + + The gateways now support recursive ls and mget commands, enabling + the retrieval of a remote file tree. + + + The local-filename-generator-expression attribute is now supported, + enabling the naming of local files during transfer. By default, the same + name as the remote file is used. + + + The local-directory-expression attribute is now supported, + enabling the naming of local directories during transfer based on the remote directory. + + For more information, see and . From 36795e5ee85ec5d9ae95d3dbd58a8b125492a0c4 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Wed, 23 Oct 2013 19:34:10 +0300 Subject: [PATCH 7/8] INT-3069 Add Global Gateway Method Metadata https://jira.springsource.org/browse/INT-3069 Provide a mechanism to specify headers and payload-expression that can be applied to all methods in the gateway. - Headers defined as 'default' are globally applied to all gateway methods. - Also supports 'default-payload-expression'. - Headers defined on a specific method override the global settings. - An `@Header` in the interface is overridden by a specific
for that method (current behavior) - An `@Header` in the interface is NOT overridden by a - Add 3 new SpEL variables: -- #methodName (synonym for #method - deprecated) -- #methodString (a string representation of the method showing return type and arg types) -- #methodObject (the Method object) INT-3069 Polishing - PR Comments - Remove extra 'method' variables, just provide `gatewayMethod`. - Parser improvements - Schema now enforces default-header elements to precede method elements - Doc polishing --- .gitignore | 1 + .../integration/config/xml/GatewayParser.java | 28 ++++- .../GatewayMethodInboundMessageMapper.java | 38 ++++-- .../gateway/GatewayProxyFactoryBean.java | 16 ++- .../config/xml/spring-integration-3.0.xsd | 25 +++- .../gateway/GatewayInterfaceTests-context.xml | 15 ++- .../gateway/GatewayInterfaceTests.java | 116 +++++++++++++++--- .../GatewayInterfaceTests2-context.xml | 23 ++++ src/reference/docbook/gateway.xml | 44 ++++++- src/reference/docbook/whats-new.xml | 14 +++ 10 files changed, 281 insertions(+), 39 deletions(-) create mode 100644 spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInterfaceTests2-context.xml diff --git a/.gitignore b/.gitignore index 93179d40cb..2950dab738 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ spring-integration-jms/activemq-data/ spring-integration-samples/loanshark/application.log* target vf.gf.dmn-* +/atlassian-ide-plugin.xml diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/GatewayParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/GatewayParser.java index bdfd72e9e4..dea4f53dac 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/GatewayParser.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/GatewayParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2013 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,6 +27,7 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.ManagedMap; import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.beans.factory.xml.AbstractSimpleBeanDefinitionParser; +import org.springframework.integration.gateway.GatewayProxyFactoryBean; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; @@ -34,9 +35,10 @@ import org.springframework.util.xml.DomUtils; /** * Parser for the <gateway/> element. - * + * * @author Mark Fisher * @author Oleg Zhurakousky + * @author Gary Russell */ public class GatewayParser extends AbstractSimpleBeanDefinitionParser { @@ -51,9 +53,10 @@ public class GatewayParser extends AbstractSimpleBeanDefinitionParser { @Override protected String getBeanClassName(Element element) { - return IntegrationNamespaceUtils.BASE_PACKAGE + ".gateway.GatewayProxyFactoryBean"; + return GatewayProxyFactoryBean.class.getName(); } - + + @Override protected boolean shouldGenerateIdAsFallback() { return true; } @@ -62,6 +65,7 @@ public class GatewayParser extends AbstractSimpleBeanDefinitionParser { protected boolean isEligibleAttribute(String attributeName) { return !ObjectUtils.containsElement(referenceAttributes, attributeName) && !ObjectUtils.containsElement(innerAttributes, attributeName) + && !("default-payload-expression".equals(attributeName)) && super.isEligibleAttribute(attributeName); } @@ -79,7 +83,7 @@ public class GatewayParser extends AbstractSimpleBeanDefinitionParser { IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "request-channel", "defaultRequestChannel"); IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "reply-channel", "defaultReplyChannel"); IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "request-timeout", "defaultRequestTimeout"); - IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "reply-timeout", "defaultReplyTimeout"); + IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "reply-timeout", "defaultReplyTimeout"); IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "error-channel"); IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "async-executor"); } @@ -88,6 +92,18 @@ public class GatewayParser extends AbstractSimpleBeanDefinitionParser { for (String attributeName : referenceAttributes) { IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, attributeName); } + + List invocationHeaders = DomUtils.getChildElementsByTagName(element, "default-header"); + if (!CollectionUtils.isEmpty(invocationHeaders) + || StringUtils.hasText(element.getAttribute("default-payload-expression"))) { + BeanDefinitionBuilder methodMetadataBuilder = BeanDefinitionBuilder.genericBeanDefinition( + "org.springframework.integration.gateway.GatewayMethodMetadata"); + this.setMethodInvocationHeaders(methodMetadataBuilder, invocationHeaders); + IntegrationNamespaceUtils.setValueIfAttributeDefined(methodMetadataBuilder, element, + "default-payload-expression", "payloadExpression"); + builder.addPropertyValue("globalMethodMetadata", methodMetadataBuilder.getBeanDefinition()); + } + List elements = DomUtils.getChildElementsByTagName(element, "method"); ManagedMap methodMetadataMap = null; if (elements != null && elements.size() > 0) { @@ -102,7 +118,7 @@ public class GatewayParser extends AbstractSimpleBeanDefinitionParser { methodMetadataBuilder.addPropertyValue("requestTimeout", methodElement.getAttribute("request-timeout")); methodMetadataBuilder.addPropertyValue("replyTimeout", methodElement.getAttribute("reply-timeout")); IntegrationNamespaceUtils.setValueIfAttributeDefined(methodMetadataBuilder, methodElement, "payload-expression"); - List invocationHeaders = DomUtils.getChildElementsByTagName(methodElement, "header"); + invocationHeaders = DomUtils.getChildElementsByTagName(methodElement, "header"); if (!CollectionUtils.isEmpty(invocationHeaders)) { this.setMethodInvocationHeaders(methodMetadataBuilder, invocationHeaders); } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayMethodInboundMessageMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayMethodInboundMessageMapper.java index 074cb4c675..7ec9dd3fe3 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayMethodInboundMessageMapper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayMethodInboundMessageMapper.java @@ -68,6 +68,7 @@ import org.springframework.util.StringUtils; * @author Mark Fisher * @author Iwein Fuld * @author Oleg Zhurakousky + * @author Gary Russell * @since 2.0 */ class GatewayMethodInboundMessageMapper implements InboundMessageMapper, BeanFactoryAware { @@ -80,6 +81,8 @@ class GatewayMethodInboundMessageMapper implements InboundMessageMapper headerExpressions; + private final Map globalHeaderExpressions; + private final List parameterList; private volatile Expression payloadExpression; @@ -96,9 +99,15 @@ class GatewayMethodInboundMessageMapper implements InboundMessageMapper headerExpressions) { + this(method, headerExpressions, null); + } + + public GatewayMethodInboundMessageMapper(Method method, Map headerExpressions, + Map globalHeaderExpressions) { Assert.notNull(method, "method must not be null"); this.method = method; this.headerExpressions = headerExpressions; + this.globalHeaderExpressions = globalHeaderExpressions; this.parameterList = getMethodParameterList(method); this.payloadExpression = parsePayloadExpression(method); } @@ -194,23 +203,38 @@ class GatewayMethodInboundMessageMapper implements InboundMessageMapper) messageOrPayload) : MessageBuilder.withPayload(messageOrPayload); builder.copyHeadersIfAbsent(headers); + // Explicit headers in XML override any @Header annotations... if (!CollectionUtils.isEmpty(this.headerExpressions)) { - Map evaluatedHeaders = new HashMap(); - for (Map.Entry entry : this.headerExpressions.entrySet()) { - Object value = entry.getValue().getValue(methodInvocationEvaluationContext); - if (value != null) { - evaluatedHeaders.put(entry.getKey(), value); - } - } + Map evaluatedHeaders = evaluateHeaders(methodInvocationEvaluationContext, this.headerExpressions); builder.copyHeaders(evaluatedHeaders); } + // ...whereas global (default) headers do not... + if (!CollectionUtils.isEmpty(this.globalHeaderExpressions)) { + Map evaluatedHeaders = evaluateHeaders(methodInvocationEvaluationContext, this.globalHeaderExpressions); + builder.copyHeadersIfAbsent(evaluatedHeaders); + } return builder.build(); } + private Map evaluateHeaders(EvaluationContext methodInvocationEvaluationContext, Map headerExpressions) { + Map evaluatedHeaders = new HashMap(); + for (Map.Entry entry : headerExpressions.entrySet()) { + Object value = entry.getValue().getValue(methodInvocationEvaluationContext); + if (value != null) { + evaluatedHeaders.put(entry.getKey(), value); + } + } + return evaluatedHeaders; + } + private StandardEvaluationContext createMethodInvocationEvaluationContext(Object[] arguments) { StandardEvaluationContext context = ExpressionUtils.createStandardEvaluationContext(this.beanFactory); context.setVariable("args", arguments); + + // TODO deprecated in 3.0/4.0 - retained for backwards compatibility context.setVariable("method", this.method.getName()); + + context.setVariable("gatewayMethod", this.method); return context; } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java index 5a36590be8..a2b7983061 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2013 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,6 +28,7 @@ import java.util.concurrent.Future; import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; + import org.springframework.aop.framework.ProxyFactory; import org.springframework.aop.support.AopUtils; import org.springframework.beans.SimpleTypeConverter; @@ -100,8 +101,9 @@ public class GatewayProxyFactoryBean extends AbstractEndpoint implements Trackab private final Object initializationMonitor = new Object(); - private Map methodMetadataMap; + private volatile Map methodMetadataMap; + private volatile GatewayMethodMetadata globalMethodMetadata; /** * Create a Factory whose service interface type can be configured by setter injection. @@ -204,6 +206,10 @@ public class GatewayProxyFactoryBean extends AbstractEndpoint implements Trackab this.methodMetadataMap = methodMetadataMap; } + public void setGlobalMethodMetadata(GatewayMethodMetadata globalMethodMetadata) { + this.globalMethodMetadata = globalMethodMetadata; + } + public void setBeanClassLoader(ClassLoader beanClassLoader) { this.beanClassLoader = beanClassLoader; } @@ -339,7 +345,8 @@ public class GatewayProxyFactoryBean extends AbstractEndpoint implements Trackab MessageChannel replyChannel = this.defaultReplyChannel; Long requestTimeout = this.defaultRequestTimeout; Long replyTimeout = this.defaultReplyTimeout; - String payloadExpression = null; + String payloadExpression = this.globalMethodMetadata != null ? this.globalMethodMetadata.getPayloadExpression() + : null; Map headerExpressions = null; if (gatewayAnnotation != null) { String requestChannelName = gatewayAnnotation.requestChannel(); @@ -387,7 +394,8 @@ public class GatewayProxyFactoryBean extends AbstractEndpoint implements Trackab } } } - GatewayMethodInboundMessageMapper messageMapper = new GatewayMethodInboundMessageMapper(method, headerExpressions); + GatewayMethodInboundMessageMapper messageMapper = new GatewayMethodInboundMessageMapper(method, headerExpressions, + this.globalMethodMetadata != null ? this.globalMethodMetadata.getHeaderExpressions() : null); if (StringUtils.hasText(payloadExpression)) { messageMapper.setPayloadExpression(payloadExpression); } diff --git a/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-3.0.xsd b/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-3.0.xsd index ed596cf9e7..2cd4802b3e 100644 --- a/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-3.0.xsd +++ b/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-3.0.xsd @@ -515,7 +515,17 @@ - + + + + + + + + @@ -530,7 +540,7 @@ @@ -621,6 +631,17 @@ + + + + + + + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInterfaceTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInterfaceTests-context.xml index 217e18539a..788bd10290 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInterfaceTests-context.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInterfaceTests-context.xml @@ -5,10 +5,17 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd"> - - + + + + + + + + + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInterfaceTests.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInterfaceTests.java index 2230838492..69242b4597 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInterfaceTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInterfaceTests.java @@ -16,13 +16,18 @@ package org.springframework.integration.gateway; +import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; +import java.lang.reflect.Method; +import java.util.concurrent.atomic.AtomicBoolean; + import org.junit.Test; import org.mockito.Mockito; @@ -30,29 +35,71 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.Message; +import org.springframework.integration.MessagingException; import org.springframework.integration.annotation.Gateway; +import org.springframework.integration.annotation.Header; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.core.MessageHandler; /** * @author Oleg Zhurakousky * @author Gunnar Hillert + * @author Gary Russell */ public class GatewayInterfaceTests { @Test - public void testWithServiceSuperclassAnnotatedMethod(){ + public void testWithServiceSuperclassAnnotatedMethod() throws Exception { ApplicationContext ac = new ClassPathXmlApplicationContext("GatewayInterfaceTests-context.xml", this.getClass()); DirectChannel channel = ac.getBean("requestChannelFoo", DirectChannel.class); - MessageHandler handler = mock(MessageHandler.class); + final Method fooMethod = Foo.class.getMethod("foo", String.class); + final AtomicBoolean called = new AtomicBoolean(); + MessageHandler handler = new MessageHandler() { + + @Override + public void handleMessage(Message message) throws MessagingException { + assertThat((String) message.getHeaders().get("name"), equalTo("foo")); + assertThat( + (String) message.getHeaders().get("string"), + equalTo("public abstract void org.springframework.integration.gateway.GatewayInterfaceTests$Foo.foo(java.lang.String)")); + assertThat((Method) message.getHeaders().get("object"), equalTo(fooMethod)); + assertThat((String) message.getPayload(), equalTo("hello")); + called.set(true); + } + }; channel.subscribe(handler); Bar bar = ac.getBean(Bar.class); bar.foo("hello"); - verify(handler, times(1)).handleMessage(Mockito.any(Message.class)); + assertTrue(called.get()); } @Test - public void testWithServiceAnnotatedMethod(){ + public void testWithServiceSuperclassAnnotatedMethodOverridePE() throws Exception { + ApplicationContext ac = new ClassPathXmlApplicationContext("GatewayInterfaceTests2-context.xml", this.getClass()); + DirectChannel channel = ac.getBean("requestChannelFoo", DirectChannel.class); + final Method fooMethod = Foo.class.getMethod("foo", String.class); + final AtomicBoolean called = new AtomicBoolean(); + MessageHandler handler = new MessageHandler() { + + @Override + public void handleMessage(Message message) throws MessagingException { + assertThat((String) message.getHeaders().get("name"), equalTo("foo")); + assertThat( + (String) message.getHeaders().get("string"), + equalTo("public abstract void org.springframework.integration.gateway.GatewayInterfaceTests$Foo.foo(java.lang.String)")); + assertThat((Method) message.getHeaders().get("object"), equalTo(fooMethod)); + assertThat((String) message.getPayload(), equalTo("foo")); + called.set(true); + } + }; + channel.subscribe(handler); + Bar bar = ac.getBean(Bar.class); + bar.foo("hello"); + assertTrue(called.get()); + } + + @Test + public void testWithServiceAnnotatedMethod() { ApplicationContext ac = new ClassPathXmlApplicationContext("GatewayInterfaceTests-context.xml", this.getClass()); DirectChannel channel = ac.getBean("requestChannelBar", DirectChannel.class); MessageHandler handler = mock(MessageHandler.class); @@ -63,18 +110,57 @@ public class GatewayInterfaceTests { } @Test - public void testWithServiceSuperclassUnAnnotatedMethod(){ + public void testWithServiceSuperclassUnAnnotatedMethod() throws Exception { ApplicationContext ac = new ClassPathXmlApplicationContext("GatewayInterfaceTests-context.xml", this.getClass()); DirectChannel channel = ac.getBean("requestChannelBaz", DirectChannel.class); - MessageHandler handler = mock(MessageHandler.class); + final Method bazMethod = Foo.class.getMethod("baz", String.class); + final AtomicBoolean called = new AtomicBoolean(); + MessageHandler handler = new MessageHandler() { + + @Override + public void handleMessage(Message message) throws MessagingException { + assertThat((String) message.getHeaders().get("name"), equalTo("overrideGlobal")); + assertThat( + (String) message.getHeaders().get("string"), + equalTo("public abstract void org.springframework.integration.gateway.GatewayInterfaceTests$Foo.baz(java.lang.String)")); + assertThat((Method) message.getHeaders().get("object"), equalTo(bazMethod)); + assertThat((String) message.getPayload(), equalTo("hello")); + called.set(true); + } + }; channel.subscribe(handler); Bar bar = ac.getBean(Bar.class); bar.baz("hello"); - verify(handler, times(1)).handleMessage(Mockito.any(Message.class)); + assertTrue(called.get()); } @Test - public void testWithServiceCastAsSuperclassAnnotatedMethod(){ + public void testWithServiceUnAnnotatedMethodGlobalHeaderDoesntOverride() throws Exception { + ApplicationContext ac = new ClassPathXmlApplicationContext("GatewayInterfaceTests-context.xml", this.getClass()); + DirectChannel channel = ac.getBean("requestChannelBaz", DirectChannel.class); + final Method quxMethod = Bar.class.getMethod("qux", String.class, String.class); + final AtomicBoolean called = new AtomicBoolean(); + MessageHandler handler = new MessageHandler() { + + @Override + public void handleMessage(Message message) throws MessagingException { + assertThat((String) message.getHeaders().get("name"), equalTo("arg1")); + assertThat( + (String) message.getHeaders().get("string"), + equalTo("public abstract void org.springframework.integration.gateway.GatewayInterfaceTests$Bar.qux(java.lang.String,java.lang.String)")); + assertThat((Method) message.getHeaders().get("object"), equalTo(quxMethod)); + assertThat((String) message.getPayload(), equalTo("hello")); + called.set(true); + } + }; + channel.subscribe(handler); + Bar bar = ac.getBean(Bar.class); + bar.qux("hello", "arg1"); + assertTrue(called.get()); + } + + @Test + public void testWithServiceCastAsSuperclassAnnotatedMethod() { ApplicationContext ac = new ClassPathXmlApplicationContext("GatewayInterfaceTests-context.xml", this.getClass()); DirectChannel channel = ac.getBean("requestChannelFoo", DirectChannel.class); MessageHandler handler = mock(MessageHandler.class); @@ -85,7 +171,7 @@ public class GatewayInterfaceTests { } @Test - public void testWithServiceCastAsSuperclassUnAnnotatedMethod(){ + public void testWithServiceCastAsSuperclassUnAnnotatedMethod() { ApplicationContext ac = new ClassPathXmlApplicationContext("GatewayInterfaceTests-context.xml", this.getClass()); DirectChannel channel = ac.getBean("requestChannelBaz", DirectChannel.class); MessageHandler handler = mock(MessageHandler.class); @@ -96,7 +182,7 @@ public class GatewayInterfaceTests { } @Test - public void testWithServiceHashcode() throws Exception{ + public void testWithServiceHashcode() throws Exception { ApplicationContext ac = new ClassPathXmlApplicationContext("GatewayInterfaceTests-context.xml", this.getClass()); DirectChannel channel = ac.getBean("requestChannelBaz", DirectChannel.class); MessageHandler handler = mock(MessageHandler.class); @@ -107,7 +193,7 @@ public class GatewayInterfaceTests { } @Test - public void testWithServiceToString(){ + public void testWithServiceToString() { ApplicationContext ac = new ClassPathXmlApplicationContext("GatewayInterfaceTests-context.xml", this.getClass()); DirectChannel channel = ac.getBean("requestChannelBaz", DirectChannel.class); MessageHandler handler = mock(MessageHandler.class); @@ -118,7 +204,7 @@ public class GatewayInterfaceTests { } @Test - public void testWithServiceEquals() throws Exception{ + public void testWithServiceEquals() throws Exception { ApplicationContext ac = new ClassPathXmlApplicationContext("GatewayInterfaceTests-context.xml", this.getClass()); DirectChannel channel = ac.getBean("requestChannelBaz", DirectChannel.class); MessageHandler handler = mock(MessageHandler.class); @@ -137,7 +223,7 @@ public class GatewayInterfaceTests { } @Test - public void testWithServiceGetClass(){ + public void testWithServiceGetClass() { ApplicationContext ac = new ClassPathXmlApplicationContext("GatewayInterfaceTests-context.xml", this.getClass()); DirectChannel channel = ac.getBean("requestChannelBaz", DirectChannel.class); MessageHandler handler = mock(MessageHandler.class); @@ -160,9 +246,11 @@ public class GatewayInterfaceTests { public void baz(String payload); } - public static interface Bar extends Foo{ + public static interface Bar extends Foo { @Gateway(requestChannel="requestChannelBar") public void bar(String payload); + + public void qux(String payload, @Header("name") String nameHeader); } public static class NotAnInterface { diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInterfaceTests2-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInterfaceTests2-context.xml new file mode 100644 index 0000000000..96e1740401 --- /dev/null +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInterfaceTests2-context.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + diff --git a/src/reference/docbook/gateway.xml b/src/reference/docbook/gateway.xml index f4ed93d69f..e0f12db1be 100644 --- a/src/reference/docbook/gateway.xml +++ b/src/reference/docbook/gateway.xml @@ -116,9 +116,10 @@ public interface Cafe { + - - + + ]]> @@ -145,6 +146,45 @@ public interface Cafe { In the above case you can clearly see how a different value will be set for the 'RESPONSE_TYPE' header based on the gateway's method. + Expressions and "Global" Headers + + The <header/> element supports expression as an alternative to + value. The SpEL expression is evaluated to determine the value of the header. There is no + #root object but the following variables are available: + + + #args - an Object[] containing the method arguments + + + #gatewayMethod - the java.reflect.Method object representing the method in the + service-interface that was invoked. A header containing this variable can be used + later in the flow, for example, for routing. For example, if you wish to route on the simple method + name, you might add a header, with expression #gatewayMethod.name. + + The java.reflect.Method is not serializable; a header with expression + #gatewayMethod will be lost if you later serialize the message. So, you may wish + to use #gatewayMethod.name or #gatewayMethod.toString() in those cases; + the toString() method provides a String representation of the method, including + parameter and return types. + + + Prior to 3.0, the #method variable was available, representing the method name only. + This is still available, but deprecated; use #gatewayMethod.name instead. + + + + + + Since 3.0, <default-header/>s can be defined to add headers to all messages produced + by the gateway, regardless of the method invoked. Specific headers defined for a method take precedence + over default headers. Specific headers defined for a method here will override any @Header annotations + in the service interface. However, default headers will NOT override any @Header annotations + in the service interface. + + + The gateway now also supports a default-payload-expression which will be applied for all methods + (unless overridden). +
diff --git a/src/reference/docbook/whats-new.xml b/src/reference/docbook/whats-new.xml index e14ed1ffd3..6d3f2ab7b4 100644 --- a/src/reference/docbook/whats-new.xml +++ b/src/reference/docbook/whats-new.xml @@ -155,6 +155,20 @@
General Changes +
+ <gateway> Changes + + + + It is now possible to set common headers across all gateway methods, and more options + are provided for adding, to the message, information about which method was invoked. + + + + + For more information see . + +
Aggregator 'empty-group-min-timeout' property AbstractCorrelatingMessageHandler provides a new property From 9367928fd7aeaa0091ac5de6b5ed7e9fc040b272 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Thu, 10 Oct 2013 00:20:26 +0300 Subject: [PATCH 8/8] INT-3113: Use Lettuce Redis Client * Ensure close connections after tests * Remove `Thread.sleep` where it is possible JIRA: https://jira.springsource.org/browse/INT-3113 INT-3113: Improve `RedisAvailableRule` * Upgrade to Spring-Data-Redis-1.1.0 * Change Redis port to default one - 6379 Polish - add smart delay to SubscribableRedisChannelTests.pubSubChannelTest --- build.gradle | 6 +- spring-integration-redis/jredis.log | 556 ------------------ .../SubscribableRedisChannelTests.java | 47 +- .../RedisChannelParserTests-context.xml | 4 +- .../redis/config/RedisChannelParserTests.java | 24 +- ...boundChannelAdapterParserTests-context.xml | 8 +- ...RedisInboundChannelAdapterParserTests.java | 17 +- ...boundChannelAdapterParserTests-context.xml | 6 +- .../redis/config/inbound-template-cf-fail.xml | 5 +- .../RedisInboundChannelAdapterTests.java | 22 +- ...InboundChannelAdapterIntegrationTests.java | 36 +- .../redis/inbound/list-inbound-adapter.xml | 18 +- .../redis/inbound/zset-inbound-adapter.xml | 15 +- .../RedisPublishingMessageHandlerTests.java | 20 +- ...utboundChannelAdapterIntegrationTests.java | 42 +- .../RedisStoreWritingMessageHandlerTests.java | 35 +- .../redis/outbound/store-outbound-adapter.xml | 4 +- .../redis/rules/RedisAvailableRule.java | 70 ++- .../redis/rules/RedisAvailableTests.java | 28 +- ...dlerRescheduleIntegrationTests-context.xml | 6 +- ...ayerHandlerRescheduleIntegrationTests.java | 16 + .../store/RedisMessageGroupStoreTests.java | 34 +- .../redis/store/RedisMessageStoreTests.java | 72 +-- .../metadata/RedisMetadataStoreTests.java | 19 +- .../redis/store/redis-aggregator-config.xml | 12 +- ...ingMessageSourceWithRedisTests-context.xml | 3 +- 26 files changed, 312 insertions(+), 813 deletions(-) delete mode 100644 spring-integration-redis/jredis.log diff --git a/build.gradle b/build.gradle index ad03a9d974..1af9cd8564 100644 --- a/build.gradle +++ b/build.gradle @@ -59,12 +59,14 @@ subprojects { subproject -> eaioUUIDVersion = '3.2' ftpServerVersion = '1.0.6' + springVersionDefault = '3.1.4.RELEASE' springVersion = project.hasProperty('springVersion') ? getProperty('springVersion') : springVersionDefault springAmqpVersion = '1.2.0.RELEASE' springDataMongoVersion = '1.1.1.RELEASE' - springDataRedisVersion = '1.0.5.RELEASE' + springDataRedisVersion = '1.1.0.RELEASE' + lettuceVersion = '2.3.3' springGemfireVersion = '1.3.1.RELEASE' springSecurityVersion = '3.1.3.RELEASE' springSocialTwitterVersion = '1.0.5.RELEASE' @@ -437,6 +439,7 @@ project('spring-integration-redis') { exclude group: 'org.springframework', module: 'spring-tx' } testCompile project(":spring-integration-test") + testCompile "com.lambdaworks:lettuce:$lettuceVersion" } } @@ -539,6 +542,7 @@ project('spring-integration-twitter') { testCompile project(":spring-integration-test") testCompile project(":spring-integration-redis") testCompile project(":spring-integration-redis").sourceSets.test.output + testCompile "com.lambdaworks:lettuce:$lettuceVersion" } } diff --git a/spring-integration-redis/jredis.log b/spring-integration-redis/jredis.log deleted file mode 100644 index 2412d1df46..0000000000 --- a/spring-integration-redis/jredis.log +++ /dev/null @@ -1,556 +0,0 @@ -2011-07-19 16:08:49,351 DEBUG [org.springframework.test.context.junit4.SpringJUnit4ClassRunner] - SpringJUnit4ClassRunner constructor called with [class org.springframework.integration.redis.config.RedisInboundChannelAdapterParserTests]. -2011-07-19 16:08:49,377 INFO [org.springframework.test.context.TestContextManager] - @TestExecutionListeners is not present for class [class org.springframework.integration.redis.config.RedisInboundChannelAdapterParserTests]: using defaults. -2011-07-19 16:08:49,394 DEBUG [org.springframework.test.context.junit4.SpringJUnit4ClassRunner] - SpringJUnit4ClassRunner constructor called with [class org.springframework.integration.redis.config.RedisOutboundChannelAdapterParserTests]. -2011-07-19 16:08:49,394 INFO [org.springframework.test.context.TestContextManager] - @TestExecutionListeners is not present for class [class org.springframework.integration.redis.config.RedisOutboundChannelAdapterParserTests]: using defaults. -2011-07-19 16:08:49,705 DEBUG [org.springframework.data.keyvalue.redis.listener.RedisMessageListenerContainer] - Postpone listening for Redis messages until actual listeners are added -2011-07-19 16:08:54,705 DEBUG [org.springframework.data.keyvalue.redis.listener.RedisMessageListenerContainer] - Started RedisMessageListenerContainer -2011-07-19 16:08:54,728 DEBUG [org.springframework.test.annotation.ProfileValueUtils] - Retrieved @ProfileValueSourceConfiguration [null] for test class [org.springframework.integration.redis.config.RedisOutboundChannelAdapterParserTests] -2011-07-19 16:08:54,729 DEBUG [org.springframework.test.annotation.ProfileValueUtils] - Retrieved ProfileValueSource type [class org.springframework.test.annotation.SystemProfileValueSource] for class [org.springframework.integration.redis.config.RedisOutboundChannelAdapterParserTests] -2011-07-19 16:08:54,729 DEBUG [org.springframework.test.annotation.ProfileValueUtils] - Retrieved @ProfileValueSourceConfiguration [null] for test class [org.springframework.integration.redis.config.RedisOutboundChannelAdapterParserTests] -2011-07-19 16:08:54,729 DEBUG [org.springframework.test.annotation.ProfileValueUtils] - Retrieved ProfileValueSource type [class org.springframework.test.annotation.SystemProfileValueSource] for class [org.springframework.integration.redis.config.RedisOutboundChannelAdapterParserTests] -2011-07-19 16:08:54,730 DEBUG [org.springframework.test.annotation.ProfileValueUtils] - Retrieved @ProfileValueSourceConfiguration [null] for test class [org.springframework.integration.redis.config.RedisOutboundChannelAdapterParserTests] -2011-07-19 16:08:54,730 DEBUG [org.springframework.test.annotation.ProfileValueUtils] - Retrieved ProfileValueSource type [class org.springframework.test.annotation.SystemProfileValueSource] for class [org.springframework.integration.redis.config.RedisOutboundChannelAdapterParserTests] -2011-07-19 16:08:54,735 DEBUG [org.springframework.test.context.support.DependencyInjectionTestExecutionListener] - Performing dependency injection for test context [[TestContext@d78ec testClass = RedisOutboundChannelAdapterParserTests, locations = array['classpath:/org/springframework/integration/redis/config/RedisOutboundChannelAdapterParserTests-context.xml'], testInstance = org.springframework.integration.redis.config.RedisOutboundChannelAdapterParserTests@7df472, testMethod = [null], testException = [null]]]. -2011-07-19 16:08:54,736 DEBUG [org.springframework.test.context.support.AbstractGenericContextLoader] - Loading ApplicationContext for locations [classpath:/org/springframework/integration/redis/config/RedisOutboundChannelAdapterParserTests-context.xml]. -2011-07-19 16:08:54,839 INFO [org.springframework.beans.factory.xml.XmlBeanDefinitionReader] - Loading XML bean definitions from class path resource [org/springframework/integration/redis/config/RedisOutboundChannelAdapterParserTests-context.xml] -2011-07-19 16:08:54,865 DEBUG [org.springframework.beans.factory.xml.DefaultDocumentLoader] - Using JAXP provider [com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl] -2011-07-19 16:08:54,902 DEBUG [org.springframework.beans.factory.xml.PluggableSchemaResolver] - Loading schema mappings from [META-INF/spring.schemas] -2011-07-19 16:08:54,904 DEBUG [org.springframework.beans.factory.xml.PluggableSchemaResolver] - Loaded schema mappings: {http://www.springframework.org/schema/redis/spring-redis-1.0.xsd=org/springframework/data/keyvalue/redis/config/spring-redis-1.0.xsd, http://www.springframework.org/schema/oxm/spring-oxm-3.0.xsd=org/springframework/oxm/config/spring-oxm-3.0.xsd, http://www.springframework.org/schema/util/spring-util.xsd=org/springframework/beans/factory/xml/spring-util-3.0.xsd, http://www.springframework.org/schema/integration/redis/spring-integration-redis.xsd=org/springframework/integration/redis/config/spring-integration-redis-2.0.xsd, http://www.springframework.org/schema/task/spring-task.xsd=org/springframework/scheduling/config/spring-task-3.0.xsd, http://www.springframework.org/schema/aop/spring-aop-3.0.xsd=org/springframework/aop/config/spring-aop-3.0.xsd, http://www.springframework.org/schema/aop/spring-aop-2.0.xsd=org/springframework/aop/config/spring-aop-2.0.xsd, http://www.springframework.org/schema/oxm/spring-oxm.xsd=org/springframework/oxm/config/spring-oxm-3.0.xsd, http://www.springframework.org/schema/tool/spring-tool-2.5.xsd=org/springframework/beans/factory/xml/spring-tool-2.5.xsd, http://www.springframework.org/schema/integration/spring-integration.xsd=org/springframework/integration/config/xml/spring-integration-2.0.xsd, http://www.springframework.org/schema/beans/spring-beans.xsd=org/springframework/beans/factory/xml/spring-beans-3.0.xsd, http://www.springframework.org/schema/jee/spring-jee-2.5.xsd=org/springframework/ejb/config/spring-jee-2.5.xsd, http://www.springframework.org/schema/redis/spring-redis.xsd=org/springframework/data/keyvalue/redis/config/spring-redis-1.0.xsd, http://www.springframework.org/schema/aop/spring-aop.xsd=org/springframework/aop/config/spring-aop-3.0.xsd, http://www.springframework.org/schema/beans/spring-beans-2.0.xsd=org/springframework/beans/factory/xml/spring-beans-2.0.xsd, http://www.springframework.org/schema/beans/spring-beans-3.0.xsd=org/springframework/beans/factory/xml/spring-beans-3.0.xsd, http://www.springframework.org/schema/task/spring-task-3.0.xsd=org/springframework/scheduling/config/spring-task-3.0.xsd, http://www.springframework.org/schema/tx/spring-tx-2.5.xsd=org/springframework/transaction/config/spring-tx-2.5.xsd, http://www.springframework.org/schema/context/spring-context-2.5.xsd=org/springframework/context/config/spring-context-2.5.xsd, http://www.springframework.org/schema/tool/spring-tool-3.0.xsd=org/springframework/beans/factory/xml/spring-tool-3.0.xsd, http://www.springframework.org/schema/tx/spring-tx.xsd=org/springframework/transaction/config/spring-tx-3.0.xsd, http://www.springframework.org/schema/tool/spring-tool-2.0.xsd=org/springframework/beans/factory/xml/spring-tool-2.0.xsd, http://www.springframework.org/schema/util/spring-util-2.5.xsd=org/springframework/beans/factory/xml/spring-util-2.5.xsd, http://www.springframework.org/schema/lang/spring-lang.xsd=org/springframework/scripting/config/spring-lang-3.0.xsd, http://www.springframework.org/schema/lang/spring-lang-2.5.xsd=org/springframework/scripting/config/spring-lang-2.5.xsd, http://www.springframework.org/schema/integration/spring-integration-1.0.xsd=org/springframework/integration/config/xml/spring-integration-1.0.xsd, http://www.springframework.org/schema/integration/spring-integration-2.0.xsd=org/springframework/integration/config/xml/spring-integration-2.0.xsd, http://www.springframework.org/schema/jee/spring-jee-3.0.xsd=org/springframework/ejb/config/spring-jee-3.0.xsd, http://www.springframework.org/schema/jee/spring-jee-2.0.xsd=org/springframework/ejb/config/spring-jee-2.0.xsd, http://www.springframework.org/schema/context/spring-context.xsd=org/springframework/context/config/spring-context-3.0.xsd, http://www.springframework.org/schema/jee/spring-jee.xsd=org/springframework/ejb/config/spring-jee-3.0.xsd, http://www.springframework.org/schema/integration/redis/spring-integration-redis-2.0.xsd=org/springframework/integration/redis/config/spring-integration-redis-2.0.xsd, http://www.springframework.org/schema/aop/spring-aop-2.5.xsd=org/springframework/aop/config/spring-aop-2.5.xsd, http://www.springframework.org/schema/tx/spring-tx-2.0.xsd=org/springframework/transaction/config/spring-tx-2.0.xsd, http://www.springframework.org/schema/tx/spring-tx-3.0.xsd=org/springframework/transaction/config/spring-tx-3.0.xsd, http://www.springframework.org/schema/context/spring-context-3.0.xsd=org/springframework/context/config/spring-context-3.0.xsd, http://www.springframework.org/schema/tool/spring-tool.xsd=org/springframework/beans/factory/xml/spring-tool-3.0.xsd, http://www.springframework.org/schema/util/spring-util-3.0.xsd=org/springframework/beans/factory/xml/spring-util-3.0.xsd, http://www.springframework.org/schema/lang/spring-lang-3.0.xsd=org/springframework/scripting/config/spring-lang-3.0.xsd, http://www.springframework.org/schema/util/spring-util-2.0.xsd=org/springframework/beans/factory/xml/spring-util-2.0.xsd, http://www.springframework.org/schema/lang/spring-lang-2.0.xsd=org/springframework/scripting/config/spring-lang-2.0.xsd, http://www.springframework.org/schema/beans/spring-beans-2.5.xsd=org/springframework/beans/factory/xml/spring-beans-2.5.xsd} -2011-07-19 16:08:54,908 DEBUG [org.springframework.beans.factory.xml.PluggableSchemaResolver] - Found XML schema [http://www.springframework.org/schema/beans/spring-beans.xsd] in classpath: org/springframework/beans/factory/xml/spring-beans-3.0.xsd -2011-07-19 16:08:55,000 DEBUG [org.springframework.beans.factory.xml.PluggableSchemaResolver] - Found XML schema [http://www.springframework.org/schema/integration/spring-integration-2.0.xsd] in classpath: org/springframework/integration/config/xml/spring-integration-2.0.xsd -2011-07-19 16:08:55,088 DEBUG [org.springframework.beans.factory.xml.PluggableSchemaResolver] - Found XML schema [http://www.springframework.org/schema/integration/redis/spring-integration-redis-2.0.xsd] in classpath: org/springframework/integration/redis/config/spring-integration-redis-2.0.xsd -2011-07-19 16:08:55,117 DEBUG [org.springframework.beans.factory.xml.DefaultBeanDefinitionDocumentReader] - Loading bean definitions -2011-07-19 16:08:55,134 DEBUG [org.springframework.beans.factory.xml.DefaultNamespaceHandlerResolver] - Loaded NamespaceHandler mappings: {http://www.springframework.org/schema/p=org.springframework.beans.factory.xml.SimplePropertyNamespaceHandler, http://www.springframework.org/schema/util=org.springframework.beans.factory.xml.UtilNamespaceHandler, http://www.springframework.org/schema/jee=org.springframework.ejb.config.JeeNamespaceHandler, http://www.springframework.org/schema/aop=org.springframework.aop.config.AopNamespaceHandler, http://www.springframework.org/schema/oxm=org.springframework.oxm.config.OxmNamespaceHandler, http://www.springframework.org/schema/redis=org.springframework.data.keyvalue.redis.config.RedisNamespaceHandler, http://www.springframework.org/schema/integration/redis=org.springframework.integration.redis.config.RedisNamespaceHandler, http://www.springframework.org/schema/tx=org.springframework.transaction.config.TxNamespaceHandler, http://www.springframework.org/schema/integration=org.springframework.integration.config.xml.IntegrationNamespaceHandler, http://www.springframework.org/schema/task=org.springframework.scheduling.config.TaskNamespaceHandler, http://www.springframework.org/schema/lang=org.springframework.scripting.config.LangNamespaceHandler, http://www.springframework.org/schema/context=org.springframework.context.config.ContextNamespaceHandler} -2011-07-19 16:08:55,193 DEBUG [org.springframework.beans.factory.xml.XmlBeanDefinitionReader] - Loaded 8 bean definitions from location pattern [classpath:/org/springframework/integration/redis/config/RedisOutboundChannelAdapterParserTests-context.xml] -2011-07-19 16:08:55,213 INFO [org.springframework.context.support.GenericApplicationContext] - Refreshing org.springframework.context.support.GenericApplicationContext@9a5d54: startup date [Tue Jul 19 16:08:55 EDT 2011]; root of context hierarchy -2011-07-19 16:08:55,214 DEBUG [org.springframework.context.support.GenericApplicationContext] - Bean factory for org.springframework.context.support.GenericApplicationContext@9a5d54: org.springframework.beans.factory.support.DefaultListableBeanFactory@549f0e: defining beans [org.springframework.integration.internalDefaultConfiguringBeanFactoryPostProcessor,sendChannel,org.springframework.integration.redis.outbound.RedisPublishingMessageHandler#0,outboundAdapter,org.springframework.integration.redis.inbound.RedisInboundChannelAdapter#0,receiveChannel,redisConnectionFactory,testConverter,org.springframework.context.annotation.internalConfigurationAnnotationProcessor,org.springframework.context.annotation.internalAutowiredAnnotationProcessor,org.springframework.context.annotation.internalRequiredAnnotationProcessor]; root of factory hierarchy -2011-07-19 16:08:55,255 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating shared instance of singleton bean 'org.springframework.context.annotation.internalConfigurationAnnotationProcessor' -2011-07-19 16:08:55,255 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating instance of bean 'org.springframework.context.annotation.internalConfigurationAnnotationProcessor' -2011-07-19 16:08:55,282 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Eagerly caching bean 'org.springframework.context.annotation.internalConfigurationAnnotationProcessor' to allow for resolving potential circular references -2011-07-19 16:08:55,283 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Finished creating instance of bean 'org.springframework.context.annotation.internalConfigurationAnnotationProcessor' -2011-07-19 16:08:55,340 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating shared instance of singleton bean 'org.springframework.integration.internalDefaultConfiguringBeanFactoryPostProcessor' -2011-07-19 16:08:55,341 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating instance of bean 'org.springframework.integration.internalDefaultConfiguringBeanFactoryPostProcessor' -2011-07-19 16:08:55,341 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Eagerly caching bean 'org.springframework.integration.internalDefaultConfiguringBeanFactoryPostProcessor' to allow for resolving potential circular references -2011-07-19 16:08:55,341 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Finished creating instance of bean 'org.springframework.integration.internalDefaultConfiguringBeanFactoryPostProcessor' -2011-07-19 16:08:55,341 INFO [org.springframework.integration.config.xml.DefaultConfiguringBeanFactoryPostProcessor] - No bean named 'errorChannel' has been explicitly defined. Therefore, a default PublishSubscribeChannel will be created. -2011-07-19 16:08:55,342 INFO [org.springframework.integration.config.xml.DefaultConfiguringBeanFactoryPostProcessor] - No bean named 'taskScheduler' has been explicitly defined. Therefore, a default ThreadPoolTaskScheduler will be created. -2011-07-19 16:08:55,348 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating shared instance of singleton bean 'org.springframework.context.annotation.internalAutowiredAnnotationProcessor' -2011-07-19 16:08:55,348 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating instance of bean 'org.springframework.context.annotation.internalAutowiredAnnotationProcessor' -2011-07-19 16:08:55,349 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Eagerly caching bean 'org.springframework.context.annotation.internalAutowiredAnnotationProcessor' to allow for resolving potential circular references -2011-07-19 16:08:55,349 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Finished creating instance of bean 'org.springframework.context.annotation.internalAutowiredAnnotationProcessor' -2011-07-19 16:08:55,349 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating shared instance of singleton bean 'org.springframework.context.annotation.internalRequiredAnnotationProcessor' -2011-07-19 16:08:55,349 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating instance of bean 'org.springframework.context.annotation.internalRequiredAnnotationProcessor' -2011-07-19 16:08:55,350 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Eagerly caching bean 'org.springframework.context.annotation.internalRequiredAnnotationProcessor' to allow for resolving potential circular references -2011-07-19 16:08:55,350 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Finished creating instance of bean 'org.springframework.context.annotation.internalRequiredAnnotationProcessor' -2011-07-19 16:08:55,352 DEBUG [org.springframework.context.support.GenericApplicationContext] - Unable to locate MessageSource with name 'messageSource': using default [org.springframework.context.support.DelegatingMessageSource@125fac] -2011-07-19 16:08:55,356 DEBUG [org.springframework.context.support.GenericApplicationContext] - Unable to locate ApplicationEventMulticaster with name 'applicationEventMulticaster': using default [org.springframework.context.event.SimpleApplicationEventMulticaster@158bbe] -2011-07-19 16:08:55,357 INFO [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Pre-instantiating singletons in org.springframework.beans.factory.support.DefaultListableBeanFactory@549f0e: defining beans [org.springframework.integration.internalDefaultConfiguringBeanFactoryPostProcessor,sendChannel,org.springframework.integration.redis.outbound.RedisPublishingMessageHandler#0,outboundAdapter,org.springframework.integration.redis.inbound.RedisInboundChannelAdapter#0,receiveChannel,redisConnectionFactory,testConverter,org.springframework.context.annotation.internalConfigurationAnnotationProcessor,org.springframework.context.annotation.internalAutowiredAnnotationProcessor,org.springframework.context.annotation.internalRequiredAnnotationProcessor,nullChannel,errorChannel,_org.springframework.integration.errorLogger,taskScheduler]; root of factory hierarchy -2011-07-19 16:08:55,357 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Returning cached instance of singleton bean 'org.springframework.integration.internalDefaultConfiguringBeanFactoryPostProcessor' -2011-07-19 16:08:55,358 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating shared instance of singleton bean 'sendChannel' -2011-07-19 16:08:55,358 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating instance of bean 'sendChannel' -2011-07-19 16:08:55,361 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Eagerly caching bean 'sendChannel' to allow for resolving potential circular references -2011-07-19 16:08:55,383 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Invoking afterPropertiesSet() on bean with name 'sendChannel' -2011-07-19 16:08:55,383 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Finished creating instance of bean 'sendChannel' -2011-07-19 16:08:55,383 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating shared instance of singleton bean 'org.springframework.integration.redis.outbound.RedisPublishingMessageHandler#0' -2011-07-19 16:08:55,383 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating instance of bean 'org.springframework.integration.redis.outbound.RedisPublishingMessageHandler#0' -2011-07-19 16:08:55,407 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating shared instance of singleton bean 'redisConnectionFactory' -2011-07-19 16:08:55,407 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating instance of bean 'redisConnectionFactory' -2011-07-19 16:08:55,421 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Eagerly caching bean 'redisConnectionFactory' to allow for resolving potential circular references -2011-07-19 16:08:55,426 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Invoking afterPropertiesSet() on bean with name 'redisConnectionFactory' -2011-07-19 16:08:55,428 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Finished creating instance of bean 'redisConnectionFactory' -2011-07-19 16:08:55,434 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Eagerly caching bean 'org.springframework.integration.redis.outbound.RedisPublishingMessageHandler#0' to allow for resolving potential circular references -2011-07-19 16:08:55,437 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating shared instance of singleton bean 'testConverter' -2011-07-19 16:08:55,437 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating instance of bean 'testConverter' -2011-07-19 16:08:55,437 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Eagerly caching bean 'testConverter' to allow for resolving potential circular references -2011-07-19 16:08:55,442 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Finished creating instance of bean 'testConverter' -2011-07-19 16:08:55,442 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Finished creating instance of bean 'org.springframework.integration.redis.outbound.RedisPublishingMessageHandler#0' -2011-07-19 16:08:55,442 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating shared instance of singleton bean 'outboundAdapter' -2011-07-19 16:08:55,443 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating instance of bean 'outboundAdapter' -2011-07-19 16:08:55,446 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Eagerly caching bean 'outboundAdapter' to allow for resolving potential circular references -2011-07-19 16:08:55,450 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Returning cached instance of singleton bean 'org.springframework.integration.redis.outbound.RedisPublishingMessageHandler#0' -2011-07-19 16:08:55,460 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Invoking afterPropertiesSet() on bean with name 'outboundAdapter' -2011-07-19 16:08:55,460 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Returning cached instance of singleton bean 'sendChannel' -2011-07-19 16:08:55,461 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Finished creating instance of bean 'outboundAdapter' -2011-07-19 16:08:55,462 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating shared instance of singleton bean 'org.springframework.integration.redis.inbound.RedisInboundChannelAdapter#0' -2011-07-19 16:08:55,462 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating instance of bean 'org.springframework.integration.redis.inbound.RedisInboundChannelAdapter#0' -2011-07-19 16:08:55,462 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Returning cached instance of singleton bean 'redisConnectionFactory' -2011-07-19 16:08:55,464 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Eagerly caching bean 'org.springframework.integration.redis.inbound.RedisInboundChannelAdapter#0' to allow for resolving potential circular references -2011-07-19 16:08:55,474 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating shared instance of singleton bean 'receiveChannel' -2011-07-19 16:08:55,474 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating instance of bean 'receiveChannel' -2011-07-19 16:08:55,475 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Eagerly caching bean 'receiveChannel' to allow for resolving potential circular references -2011-07-19 16:08:55,482 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Invoking afterPropertiesSet() on bean with name 'receiveChannel' -2011-07-19 16:08:55,482 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Finished creating instance of bean 'receiveChannel' -2011-07-19 16:08:55,482 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Invoking afterPropertiesSet() on bean with name 'org.springframework.integration.redis.inbound.RedisInboundChannelAdapter#0' -2011-07-19 16:08:55,485 INFO [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Destroying singletons in org.springframework.beans.factory.support.DefaultListableBeanFactory@549f0e: defining beans [org.springframework.integration.internalDefaultConfiguringBeanFactoryPostProcessor,sendChannel,org.springframework.integration.redis.outbound.RedisPublishingMessageHandler#0,outboundAdapter,org.springframework.integration.redis.inbound.RedisInboundChannelAdapter#0,receiveChannel,redisConnectionFactory,testConverter,org.springframework.context.annotation.internalConfigurationAnnotationProcessor,org.springframework.context.annotation.internalAutowiredAnnotationProcessor,org.springframework.context.annotation.internalRequiredAnnotationProcessor,nullChannel,errorChannel,_org.springframework.integration.errorLogger,taskScheduler]; root of factory hierarchy -2011-07-19 16:08:55,486 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Retrieved dependent beans for bean 'redisConnectionFactory': [org.springframework.integration.redis.outbound.RedisPublishingMessageHandler#0] -2011-07-19 16:08:55,486 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Retrieved dependent beans for bean 'org.springframework.integration.redis.outbound.RedisPublishingMessageHandler#0': [outboundAdapter] -2011-07-19 16:08:55,486 DEBUG [org.springframework.beans.factory.support.DisposableBeanAdapter] - Invoking destroy() on bean with name 'redisConnectionFactory' -2011-07-19 16:08:55,489 ERROR [org.springframework.test.context.TestContextManager] - Caught exception while allowing TestExecutionListener [org.springframework.test.context.support.DependencyInjectionTestExecutionListener@2bc418] to prepare test instance [org.springframework.integration.redis.config.RedisOutboundChannelAdapterParserTests@7df472] -java.lang.IllegalStateException: Failed to load ApplicationContext - at org.springframework.test.context.TestContext.getApplicationContext(TestContext.java:308) - at org.springframework.test.context.support.DependencyInjectionTestExecutionListener.injectDependencies(DependencyInjectionTestExecutionListener.java:109) - at org.springframework.test.context.support.DependencyInjectionTestExecutionListener.prepareTestInstance(DependencyInjectionTestExecutionListener.java:75) - at org.springframework.test.context.TestContextManager.prepareTestInstance(TestContextManager.java:321) - at org.springframework.test.context.junit4.SpringJUnit4ClassRunner.createTest(SpringJUnit4ClassRunner.java:220) - at org.springframework.test.context.junit4.SpringJUnit4ClassRunner$1.runReflectiveCall(SpringJUnit4ClassRunner.java:301) - at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:15) - at org.springframework.test.context.junit4.SpringJUnit4ClassRunner.methodBlock(SpringJUnit4ClassRunner.java:303) - at org.springframework.test.context.junit4.SpringJUnit4ClassRunner.runChild(SpringJUnit4ClassRunner.java:240) - at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:49) - at org.junit.runners.ParentRunner$3.run(ParentRunner.java:193) - at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:52) - at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:191) - at org.junit.runners.ParentRunner.access$000(ParentRunner.java:42) - at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:184) - at org.springframework.test.context.junit4.statements.RunBeforeTestClassCallbacks.evaluate(RunBeforeTestClassCallbacks.java:61) - at org.springframework.test.context.junit4.statements.RunAfterTestClassCallbacks.evaluate(RunAfterTestClassCallbacks.java:70) - at org.junit.runners.ParentRunner.run(ParentRunner.java:236) - at org.springframework.test.context.junit4.SpringJUnit4ClassRunner.run(SpringJUnit4ClassRunner.java:180) - at org.apache.maven.surefire.junit4.JUnit4TestSet.execute(JUnit4TestSet.java:62) - at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.executeTestSet(AbstractDirectoryTestSuite.java:140) - at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.execute(AbstractDirectoryTestSuite.java:127) - at org.apache.maven.surefire.Surefire.run(Surefire.java:177) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) - at java.lang.reflect.Method.invoke(Method.java:585) - at org.apache.maven.surefire.booter.SurefireBooter.runSuitesInProcess(SurefireBooter.java:345) - at org.apache.maven.surefire.booter.SurefireBooter.main(SurefireBooter.java:1009) -Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'org.springframework.integration.redis.inbound.RedisInboundChannelAdapter#0': Invocation of init method failed; nested exception is java.lang.NoSuchMethodError: java.lang.String.getBytes(Ljava/nio/charset/Charset;)[B - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1420) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:519) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:456) - at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:291) - at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:222) - at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:288) - at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:190) - at org.springframework.beans.factory.support.DefaultListableBeanFactory.preInstantiateSingletons(DefaultListableBeanFactory.java:580) - at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:895) - at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:425) - at org.springframework.test.context.support.AbstractGenericContextLoader.loadContext(AbstractGenericContextLoader.java:84) - at org.springframework.test.context.support.AbstractGenericContextLoader.loadContext(AbstractGenericContextLoader.java:1) - at org.springframework.test.context.TestContext.loadApplicationContext(TestContext.java:280) - at org.springframework.test.context.TestContext.getApplicationContext(TestContext.java:304) - ... 28 more -Caused by: java.lang.NoSuchMethodError: java.lang.String.getBytes(Ljava/nio/charset/Charset;)[B - at org.springframework.data.keyvalue.redis.serializer.StringRedisSerializer.serialize(StringRedisSerializer.java:54) - at org.springframework.data.keyvalue.redis.serializer.StringRedisSerializer.serialize(StringRedisSerializer.java:32) - at org.springframework.data.keyvalue.redis.listener.RedisMessageListenerContainer.addListener(RedisMessageListenerContainer.java:451) - at org.springframework.data.keyvalue.redis.listener.RedisMessageListenerContainer.addMessageListener(RedisMessageListenerContainer.java:377) - at org.springframework.integration.redis.inbound.RedisInboundChannelAdapter.onInit(RedisInboundChannelAdapter.java:77) - at org.springframework.integration.context.IntegrationObjectSupport.afterPropertiesSet(IntegrationObjectSupport.java:98) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1477) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1417) - ... 41 more -2011-07-19 16:08:55,495 DEBUG [org.springframework.test.annotation.ProfileValueUtils] - Retrieved @ProfileValueSourceConfiguration [null] for test class [org.springframework.integration.redis.config.RedisOutboundChannelAdapterParserTests] -2011-07-19 16:08:55,495 DEBUG [org.springframework.test.annotation.ProfileValueUtils] - Retrieved ProfileValueSource type [class org.springframework.test.annotation.SystemProfileValueSource] for class [org.springframework.integration.redis.config.RedisOutboundChannelAdapterParserTests] -2011-07-19 16:08:55,495 DEBUG [org.springframework.test.context.support.DependencyInjectionTestExecutionListener] - Performing dependency injection for test context [[TestContext@d78ec testClass = RedisOutboundChannelAdapterParserTests, locations = array['classpath:/org/springframework/integration/redis/config/RedisOutboundChannelAdapterParserTests-context.xml'], testInstance = org.springframework.integration.redis.config.RedisOutboundChannelAdapterParserTests@145315, testMethod = [null], testException = [null]]]. -2011-07-19 16:08:55,495 DEBUG [org.springframework.test.context.support.AbstractGenericContextLoader] - Loading ApplicationContext for locations [classpath:/org/springframework/integration/redis/config/RedisOutboundChannelAdapterParserTests-context.xml]. -2011-07-19 16:08:55,496 INFO [org.springframework.beans.factory.xml.XmlBeanDefinitionReader] - Loading XML bean definitions from class path resource [org/springframework/integration/redis/config/RedisOutboundChannelAdapterParserTests-context.xml] -2011-07-19 16:08:55,498 DEBUG [org.springframework.beans.factory.xml.DefaultDocumentLoader] - Using JAXP provider [com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl] -2011-07-19 16:08:55,501 DEBUG [org.springframework.beans.factory.xml.PluggableSchemaResolver] - Loading schema mappings from [META-INF/spring.schemas] -2011-07-19 16:08:55,503 DEBUG [org.springframework.beans.factory.xml.PluggableSchemaResolver] - Loaded schema mappings: {http://www.springframework.org/schema/redis/spring-redis-1.0.xsd=org/springframework/data/keyvalue/redis/config/spring-redis-1.0.xsd, http://www.springframework.org/schema/oxm/spring-oxm-3.0.xsd=org/springframework/oxm/config/spring-oxm-3.0.xsd, http://www.springframework.org/schema/util/spring-util.xsd=org/springframework/beans/factory/xml/spring-util-3.0.xsd, http://www.springframework.org/schema/integration/redis/spring-integration-redis.xsd=org/springframework/integration/redis/config/spring-integration-redis-2.0.xsd, http://www.springframework.org/schema/task/spring-task.xsd=org/springframework/scheduling/config/spring-task-3.0.xsd, http://www.springframework.org/schema/aop/spring-aop-3.0.xsd=org/springframework/aop/config/spring-aop-3.0.xsd, http://www.springframework.org/schema/aop/spring-aop-2.0.xsd=org/springframework/aop/config/spring-aop-2.0.xsd, http://www.springframework.org/schema/oxm/spring-oxm.xsd=org/springframework/oxm/config/spring-oxm-3.0.xsd, http://www.springframework.org/schema/tool/spring-tool-2.5.xsd=org/springframework/beans/factory/xml/spring-tool-2.5.xsd, http://www.springframework.org/schema/integration/spring-integration.xsd=org/springframework/integration/config/xml/spring-integration-2.0.xsd, http://www.springframework.org/schema/beans/spring-beans.xsd=org/springframework/beans/factory/xml/spring-beans-3.0.xsd, http://www.springframework.org/schema/jee/spring-jee-2.5.xsd=org/springframework/ejb/config/spring-jee-2.5.xsd, http://www.springframework.org/schema/redis/spring-redis.xsd=org/springframework/data/keyvalue/redis/config/spring-redis-1.0.xsd, http://www.springframework.org/schema/aop/spring-aop.xsd=org/springframework/aop/config/spring-aop-3.0.xsd, http://www.springframework.org/schema/beans/spring-beans-2.0.xsd=org/springframework/beans/factory/xml/spring-beans-2.0.xsd, http://www.springframework.org/schema/beans/spring-beans-3.0.xsd=org/springframework/beans/factory/xml/spring-beans-3.0.xsd, http://www.springframework.org/schema/task/spring-task-3.0.xsd=org/springframework/scheduling/config/spring-task-3.0.xsd, http://www.springframework.org/schema/tx/spring-tx-2.5.xsd=org/springframework/transaction/config/spring-tx-2.5.xsd, http://www.springframework.org/schema/context/spring-context-2.5.xsd=org/springframework/context/config/spring-context-2.5.xsd, http://www.springframework.org/schema/tool/spring-tool-3.0.xsd=org/springframework/beans/factory/xml/spring-tool-3.0.xsd, http://www.springframework.org/schema/tx/spring-tx.xsd=org/springframework/transaction/config/spring-tx-3.0.xsd, http://www.springframework.org/schema/tool/spring-tool-2.0.xsd=org/springframework/beans/factory/xml/spring-tool-2.0.xsd, http://www.springframework.org/schema/util/spring-util-2.5.xsd=org/springframework/beans/factory/xml/spring-util-2.5.xsd, http://www.springframework.org/schema/lang/spring-lang.xsd=org/springframework/scripting/config/spring-lang-3.0.xsd, http://www.springframework.org/schema/lang/spring-lang-2.5.xsd=org/springframework/scripting/config/spring-lang-2.5.xsd, http://www.springframework.org/schema/integration/spring-integration-1.0.xsd=org/springframework/integration/config/xml/spring-integration-1.0.xsd, http://www.springframework.org/schema/integration/spring-integration-2.0.xsd=org/springframework/integration/config/xml/spring-integration-2.0.xsd, http://www.springframework.org/schema/jee/spring-jee-3.0.xsd=org/springframework/ejb/config/spring-jee-3.0.xsd, http://www.springframework.org/schema/jee/spring-jee-2.0.xsd=org/springframework/ejb/config/spring-jee-2.0.xsd, http://www.springframework.org/schema/context/spring-context.xsd=org/springframework/context/config/spring-context-3.0.xsd, http://www.springframework.org/schema/jee/spring-jee.xsd=org/springframework/ejb/config/spring-jee-3.0.xsd, http://www.springframework.org/schema/integration/redis/spring-integration-redis-2.0.xsd=org/springframework/integration/redis/config/spring-integration-redis-2.0.xsd, http://www.springframework.org/schema/aop/spring-aop-2.5.xsd=org/springframework/aop/config/spring-aop-2.5.xsd, http://www.springframework.org/schema/tx/spring-tx-2.0.xsd=org/springframework/transaction/config/spring-tx-2.0.xsd, http://www.springframework.org/schema/tx/spring-tx-3.0.xsd=org/springframework/transaction/config/spring-tx-3.0.xsd, http://www.springframework.org/schema/context/spring-context-3.0.xsd=org/springframework/context/config/spring-context-3.0.xsd, http://www.springframework.org/schema/tool/spring-tool.xsd=org/springframework/beans/factory/xml/spring-tool-3.0.xsd, http://www.springframework.org/schema/util/spring-util-3.0.xsd=org/springframework/beans/factory/xml/spring-util-3.0.xsd, http://www.springframework.org/schema/lang/spring-lang-3.0.xsd=org/springframework/scripting/config/spring-lang-3.0.xsd, http://www.springframework.org/schema/util/spring-util-2.0.xsd=org/springframework/beans/factory/xml/spring-util-2.0.xsd, http://www.springframework.org/schema/lang/spring-lang-2.0.xsd=org/springframework/scripting/config/spring-lang-2.0.xsd, http://www.springframework.org/schema/beans/spring-beans-2.5.xsd=org/springframework/beans/factory/xml/spring-beans-2.5.xsd} -2011-07-19 16:08:55,547 DEBUG [org.springframework.beans.factory.xml.PluggableSchemaResolver] - Found XML schema [http://www.springframework.org/schema/beans/spring-beans.xsd] in classpath: org/springframework/beans/factory/xml/spring-beans-3.0.xsd -2011-07-19 16:08:55,582 DEBUG [org.springframework.beans.factory.xml.PluggableSchemaResolver] - Found XML schema [http://www.springframework.org/schema/integration/spring-integration-2.0.xsd] in classpath: org/springframework/integration/config/xml/spring-integration-2.0.xsd -2011-07-19 16:08:55,614 DEBUG [org.springframework.beans.factory.xml.PluggableSchemaResolver] - Found XML schema [http://www.springframework.org/schema/integration/redis/spring-integration-redis-2.0.xsd] in classpath: org/springframework/integration/redis/config/spring-integration-redis-2.0.xsd -2011-07-19 16:08:55,625 DEBUG [org.springframework.beans.factory.xml.DefaultBeanDefinitionDocumentReader] - Loading bean definitions -2011-07-19 16:08:55,627 DEBUG [org.springframework.beans.factory.xml.DefaultNamespaceHandlerResolver] - Loaded NamespaceHandler mappings: {http://www.springframework.org/schema/p=org.springframework.beans.factory.xml.SimplePropertyNamespaceHandler, http://www.springframework.org/schema/util=org.springframework.beans.factory.xml.UtilNamespaceHandler, http://www.springframework.org/schema/jee=org.springframework.ejb.config.JeeNamespaceHandler, http://www.springframework.org/schema/aop=org.springframework.aop.config.AopNamespaceHandler, http://www.springframework.org/schema/oxm=org.springframework.oxm.config.OxmNamespaceHandler, http://www.springframework.org/schema/redis=org.springframework.data.keyvalue.redis.config.RedisNamespaceHandler, http://www.springframework.org/schema/integration/redis=org.springframework.integration.redis.config.RedisNamespaceHandler, http://www.springframework.org/schema/tx=org.springframework.transaction.config.TxNamespaceHandler, http://www.springframework.org/schema/integration=org.springframework.integration.config.xml.IntegrationNamespaceHandler, http://www.springframework.org/schema/task=org.springframework.scheduling.config.TaskNamespaceHandler, http://www.springframework.org/schema/lang=org.springframework.scripting.config.LangNamespaceHandler, http://www.springframework.org/schema/context=org.springframework.context.config.ContextNamespaceHandler} -2011-07-19 16:08:55,629 DEBUG [org.springframework.beans.factory.xml.XmlBeanDefinitionReader] - Loaded 8 bean definitions from location pattern [classpath:/org/springframework/integration/redis/config/RedisOutboundChannelAdapterParserTests-context.xml] -2011-07-19 16:08:55,637 INFO [org.springframework.context.support.GenericApplicationContext] - Refreshing org.springframework.context.support.GenericApplicationContext@5aa997: startup date [Tue Jul 19 16:08:55 EDT 2011]; root of context hierarchy -2011-07-19 16:08:55,637 DEBUG [org.springframework.context.support.GenericApplicationContext] - Bean factory for org.springframework.context.support.GenericApplicationContext@5aa997: org.springframework.beans.factory.support.DefaultListableBeanFactory@e3e4c5: defining beans [org.springframework.integration.internalDefaultConfiguringBeanFactoryPostProcessor,sendChannel,org.springframework.integration.redis.outbound.RedisPublishingMessageHandler#0,outboundAdapter,org.springframework.integration.redis.inbound.RedisInboundChannelAdapter#0,receiveChannel,redisConnectionFactory,testConverter,org.springframework.context.annotation.internalConfigurationAnnotationProcessor,org.springframework.context.annotation.internalAutowiredAnnotationProcessor,org.springframework.context.annotation.internalRequiredAnnotationProcessor]; root of factory hierarchy -2011-07-19 16:08:55,639 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating shared instance of singleton bean 'org.springframework.context.annotation.internalConfigurationAnnotationProcessor' -2011-07-19 16:08:55,639 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating instance of bean 'org.springframework.context.annotation.internalConfigurationAnnotationProcessor' -2011-07-19 16:08:55,639 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Eagerly caching bean 'org.springframework.context.annotation.internalConfigurationAnnotationProcessor' to allow for resolving potential circular references -2011-07-19 16:08:55,639 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Finished creating instance of bean 'org.springframework.context.annotation.internalConfigurationAnnotationProcessor' -2011-07-19 16:08:55,669 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating shared instance of singleton bean 'org.springframework.integration.internalDefaultConfiguringBeanFactoryPostProcessor' -2011-07-19 16:08:55,669 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating instance of bean 'org.springframework.integration.internalDefaultConfiguringBeanFactoryPostProcessor' -2011-07-19 16:08:55,670 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Eagerly caching bean 'org.springframework.integration.internalDefaultConfiguringBeanFactoryPostProcessor' to allow for resolving potential circular references -2011-07-19 16:08:55,670 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Finished creating instance of bean 'org.springframework.integration.internalDefaultConfiguringBeanFactoryPostProcessor' -2011-07-19 16:08:55,670 INFO [org.springframework.integration.config.xml.DefaultConfiguringBeanFactoryPostProcessor] - No bean named 'errorChannel' has been explicitly defined. Therefore, a default PublishSubscribeChannel will be created. -2011-07-19 16:08:55,670 INFO [org.springframework.integration.config.xml.DefaultConfiguringBeanFactoryPostProcessor] - No bean named 'taskScheduler' has been explicitly defined. Therefore, a default ThreadPoolTaskScheduler will be created. -2011-07-19 16:08:55,672 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating shared instance of singleton bean 'org.springframework.context.annotation.internalAutowiredAnnotationProcessor' -2011-07-19 16:08:55,672 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating instance of bean 'org.springframework.context.annotation.internalAutowiredAnnotationProcessor' -2011-07-19 16:08:55,672 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Eagerly caching bean 'org.springframework.context.annotation.internalAutowiredAnnotationProcessor' to allow for resolving potential circular references -2011-07-19 16:08:55,672 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Finished creating instance of bean 'org.springframework.context.annotation.internalAutowiredAnnotationProcessor' -2011-07-19 16:08:55,673 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating shared instance of singleton bean 'org.springframework.context.annotation.internalRequiredAnnotationProcessor' -2011-07-19 16:08:55,673 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating instance of bean 'org.springframework.context.annotation.internalRequiredAnnotationProcessor' -2011-07-19 16:08:55,673 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Eagerly caching bean 'org.springframework.context.annotation.internalRequiredAnnotationProcessor' to allow for resolving potential circular references -2011-07-19 16:08:55,673 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Finished creating instance of bean 'org.springframework.context.annotation.internalRequiredAnnotationProcessor' -2011-07-19 16:08:55,673 DEBUG [org.springframework.context.support.GenericApplicationContext] - Unable to locate MessageSource with name 'messageSource': using default [org.springframework.context.support.DelegatingMessageSource@40c4d5] -2011-07-19 16:08:55,674 DEBUG [org.springframework.context.support.GenericApplicationContext] - Unable to locate ApplicationEventMulticaster with name 'applicationEventMulticaster': using default [org.springframework.context.event.SimpleApplicationEventMulticaster@3aab44] -2011-07-19 16:08:55,675 INFO [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Pre-instantiating singletons in org.springframework.beans.factory.support.DefaultListableBeanFactory@e3e4c5: defining beans [org.springframework.integration.internalDefaultConfiguringBeanFactoryPostProcessor,sendChannel,org.springframework.integration.redis.outbound.RedisPublishingMessageHandler#0,outboundAdapter,org.springframework.integration.redis.inbound.RedisInboundChannelAdapter#0,receiveChannel,redisConnectionFactory,testConverter,org.springframework.context.annotation.internalConfigurationAnnotationProcessor,org.springframework.context.annotation.internalAutowiredAnnotationProcessor,org.springframework.context.annotation.internalRequiredAnnotationProcessor,nullChannel,errorChannel,_org.springframework.integration.errorLogger,taskScheduler]; root of factory hierarchy -2011-07-19 16:08:55,675 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Returning cached instance of singleton bean 'org.springframework.integration.internalDefaultConfiguringBeanFactoryPostProcessor' -2011-07-19 16:08:55,675 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating shared instance of singleton bean 'sendChannel' -2011-07-19 16:08:55,675 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating instance of bean 'sendChannel' -2011-07-19 16:08:55,676 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Eagerly caching bean 'sendChannel' to allow for resolving potential circular references -2011-07-19 16:08:55,677 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Invoking afterPropertiesSet() on bean with name 'sendChannel' -2011-07-19 16:08:55,677 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Finished creating instance of bean 'sendChannel' -2011-07-19 16:08:55,677 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating shared instance of singleton bean 'org.springframework.integration.redis.outbound.RedisPublishingMessageHandler#0' -2011-07-19 16:08:55,677 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating instance of bean 'org.springframework.integration.redis.outbound.RedisPublishingMessageHandler#0' -2011-07-19 16:08:55,677 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating shared instance of singleton bean 'redisConnectionFactory' -2011-07-19 16:08:55,677 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating instance of bean 'redisConnectionFactory' -2011-07-19 16:08:55,678 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Eagerly caching bean 'redisConnectionFactory' to allow for resolving potential circular references -2011-07-19 16:08:55,678 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Invoking afterPropertiesSet() on bean with name 'redisConnectionFactory' -2011-07-19 16:08:55,678 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Finished creating instance of bean 'redisConnectionFactory' -2011-07-19 16:08:55,680 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Eagerly caching bean 'org.springframework.integration.redis.outbound.RedisPublishingMessageHandler#0' to allow for resolving potential circular references -2011-07-19 16:08:55,681 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating shared instance of singleton bean 'testConverter' -2011-07-19 16:08:55,681 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating instance of bean 'testConverter' -2011-07-19 16:08:55,682 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Eagerly caching bean 'testConverter' to allow for resolving potential circular references -2011-07-19 16:08:55,682 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Finished creating instance of bean 'testConverter' -2011-07-19 16:08:55,682 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Finished creating instance of bean 'org.springframework.integration.redis.outbound.RedisPublishingMessageHandler#0' -2011-07-19 16:08:55,682 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating shared instance of singleton bean 'outboundAdapter' -2011-07-19 16:08:55,682 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating instance of bean 'outboundAdapter' -2011-07-19 16:08:55,683 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Eagerly caching bean 'outboundAdapter' to allow for resolving potential circular references -2011-07-19 16:08:55,683 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Returning cached instance of singleton bean 'org.springframework.integration.redis.outbound.RedisPublishingMessageHandler#0' -2011-07-19 16:08:55,684 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Invoking afterPropertiesSet() on bean with name 'outboundAdapter' -2011-07-19 16:08:55,684 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Returning cached instance of singleton bean 'sendChannel' -2011-07-19 16:08:55,684 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Finished creating instance of bean 'outboundAdapter' -2011-07-19 16:08:55,684 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating shared instance of singleton bean 'org.springframework.integration.redis.inbound.RedisInboundChannelAdapter#0' -2011-07-19 16:08:55,684 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating instance of bean 'org.springframework.integration.redis.inbound.RedisInboundChannelAdapter#0' -2011-07-19 16:08:55,684 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Returning cached instance of singleton bean 'redisConnectionFactory' -2011-07-19 16:08:55,686 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Eagerly caching bean 'org.springframework.integration.redis.inbound.RedisInboundChannelAdapter#0' to allow for resolving potential circular references -2011-07-19 16:08:55,686 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating shared instance of singleton bean 'receiveChannel' -2011-07-19 16:08:55,686 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating instance of bean 'receiveChannel' -2011-07-19 16:08:55,687 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Eagerly caching bean 'receiveChannel' to allow for resolving potential circular references -2011-07-19 16:08:55,687 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Invoking afterPropertiesSet() on bean with name 'receiveChannel' -2011-07-19 16:08:55,687 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Finished creating instance of bean 'receiveChannel' -2011-07-19 16:08:55,688 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Invoking afterPropertiesSet() on bean with name 'org.springframework.integration.redis.inbound.RedisInboundChannelAdapter#0' -2011-07-19 16:08:55,688 INFO [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Destroying singletons in org.springframework.beans.factory.support.DefaultListableBeanFactory@e3e4c5: defining beans [org.springframework.integration.internalDefaultConfiguringBeanFactoryPostProcessor,sendChannel,org.springframework.integration.redis.outbound.RedisPublishingMessageHandler#0,outboundAdapter,org.springframework.integration.redis.inbound.RedisInboundChannelAdapter#0,receiveChannel,redisConnectionFactory,testConverter,org.springframework.context.annotation.internalConfigurationAnnotationProcessor,org.springframework.context.annotation.internalAutowiredAnnotationProcessor,org.springframework.context.annotation.internalRequiredAnnotationProcessor,nullChannel,errorChannel,_org.springframework.integration.errorLogger,taskScheduler]; root of factory hierarchy -2011-07-19 16:08:55,688 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Retrieved dependent beans for bean 'redisConnectionFactory': [org.springframework.integration.redis.outbound.RedisPublishingMessageHandler#0] -2011-07-19 16:08:55,688 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Retrieved dependent beans for bean 'org.springframework.integration.redis.outbound.RedisPublishingMessageHandler#0': [outboundAdapter] -2011-07-19 16:08:55,688 DEBUG [org.springframework.beans.factory.support.DisposableBeanAdapter] - Invoking destroy() on bean with name 'redisConnectionFactory' -2011-07-19 16:08:55,688 ERROR [org.springframework.test.context.TestContextManager] - Caught exception while allowing TestExecutionListener [org.springframework.test.context.support.DependencyInjectionTestExecutionListener@2bc418] to prepare test instance [org.springframework.integration.redis.config.RedisOutboundChannelAdapterParserTests@145315] -java.lang.IllegalStateException: Failed to load ApplicationContext - at org.springframework.test.context.TestContext.getApplicationContext(TestContext.java:308) - at org.springframework.test.context.support.DependencyInjectionTestExecutionListener.injectDependencies(DependencyInjectionTestExecutionListener.java:109) - at org.springframework.test.context.support.DependencyInjectionTestExecutionListener.prepareTestInstance(DependencyInjectionTestExecutionListener.java:75) - at org.springframework.test.context.TestContextManager.prepareTestInstance(TestContextManager.java:321) - at org.springframework.test.context.junit4.SpringJUnit4ClassRunner.createTest(SpringJUnit4ClassRunner.java:220) - at org.springframework.test.context.junit4.SpringJUnit4ClassRunner$1.runReflectiveCall(SpringJUnit4ClassRunner.java:301) - at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:15) - at org.springframework.test.context.junit4.SpringJUnit4ClassRunner.methodBlock(SpringJUnit4ClassRunner.java:303) - at org.springframework.test.context.junit4.SpringJUnit4ClassRunner.runChild(SpringJUnit4ClassRunner.java:240) - at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:49) - at org.junit.runners.ParentRunner$3.run(ParentRunner.java:193) - at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:52) - at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:191) - at org.junit.runners.ParentRunner.access$000(ParentRunner.java:42) - at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:184) - at org.springframework.test.context.junit4.statements.RunBeforeTestClassCallbacks.evaluate(RunBeforeTestClassCallbacks.java:61) - at org.springframework.test.context.junit4.statements.RunAfterTestClassCallbacks.evaluate(RunAfterTestClassCallbacks.java:70) - at org.junit.runners.ParentRunner.run(ParentRunner.java:236) - at org.springframework.test.context.junit4.SpringJUnit4ClassRunner.run(SpringJUnit4ClassRunner.java:180) - at org.apache.maven.surefire.junit4.JUnit4TestSet.execute(JUnit4TestSet.java:62) - at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.executeTestSet(AbstractDirectoryTestSuite.java:140) - at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.execute(AbstractDirectoryTestSuite.java:127) - at org.apache.maven.surefire.Surefire.run(Surefire.java:177) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) - at java.lang.reflect.Method.invoke(Method.java:585) - at org.apache.maven.surefire.booter.SurefireBooter.runSuitesInProcess(SurefireBooter.java:345) - at org.apache.maven.surefire.booter.SurefireBooter.main(SurefireBooter.java:1009) -Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'org.springframework.integration.redis.inbound.RedisInboundChannelAdapter#0': Invocation of init method failed; nested exception is java.lang.NoSuchMethodError: java.lang.String.getBytes(Ljava/nio/charset/Charset;)[B - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1420) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:519) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:456) - at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:291) - at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:222) - at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:288) - at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:190) - at org.springframework.beans.factory.support.DefaultListableBeanFactory.preInstantiateSingletons(DefaultListableBeanFactory.java:580) - at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:895) - at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:425) - at org.springframework.test.context.support.AbstractGenericContextLoader.loadContext(AbstractGenericContextLoader.java:84) - at org.springframework.test.context.support.AbstractGenericContextLoader.loadContext(AbstractGenericContextLoader.java:1) - at org.springframework.test.context.TestContext.loadApplicationContext(TestContext.java:280) - at org.springframework.test.context.TestContext.getApplicationContext(TestContext.java:304) - ... 28 more -Caused by: java.lang.NoSuchMethodError: java.lang.String.getBytes(Ljava/nio/charset/Charset;)[B - at org.springframework.data.keyvalue.redis.serializer.StringRedisSerializer.serialize(StringRedisSerializer.java:54) - at org.springframework.data.keyvalue.redis.serializer.StringRedisSerializer.serialize(StringRedisSerializer.java:32) - at org.springframework.data.keyvalue.redis.listener.RedisMessageListenerContainer.addListener(RedisMessageListenerContainer.java:451) - at org.springframework.data.keyvalue.redis.listener.RedisMessageListenerContainer.addMessageListener(RedisMessageListenerContainer.java:377) - at org.springframework.integration.redis.inbound.RedisInboundChannelAdapter.onInit(RedisInboundChannelAdapter.java:77) - at org.springframework.integration.context.IntegrationObjectSupport.afterPropertiesSet(IntegrationObjectSupport.java:98) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1477) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1417) - ... 41 more -2011-07-19 16:08:55,698 DEBUG [org.springframework.test.context.support.DirtiesContextTestExecutionListener] - After test class: context [[TestContext@d78ec testClass = RedisOutboundChannelAdapterParserTests, locations = array['classpath:/org/springframework/integration/redis/config/RedisOutboundChannelAdapterParserTests-context.xml'], testInstance = [null], testMethod = [null], testException = [null]]], dirtiesContext [false]. -2011-07-19 16:08:55,704 DEBUG [org.springframework.test.annotation.ProfileValueUtils] - Retrieved @ProfileValueSourceConfiguration [null] for test class [org.springframework.integration.redis.config.RedisInboundChannelAdapterParserTests] -2011-07-19 16:08:55,705 DEBUG [org.springframework.test.annotation.ProfileValueUtils] - Retrieved ProfileValueSource type [class org.springframework.test.annotation.SystemProfileValueSource] for class [org.springframework.integration.redis.config.RedisInboundChannelAdapterParserTests] -2011-07-19 16:08:55,705 DEBUG [org.springframework.test.annotation.ProfileValueUtils] - Retrieved @ProfileValueSourceConfiguration [null] for test class [org.springframework.integration.redis.config.RedisInboundChannelAdapterParserTests] -2011-07-19 16:08:55,705 DEBUG [org.springframework.test.annotation.ProfileValueUtils] - Retrieved ProfileValueSource type [class org.springframework.test.annotation.SystemProfileValueSource] for class [org.springframework.integration.redis.config.RedisInboundChannelAdapterParserTests] -2011-07-19 16:08:55,706 DEBUG [org.springframework.test.annotation.ProfileValueUtils] - Retrieved @ProfileValueSourceConfiguration [null] for test class [org.springframework.integration.redis.config.RedisInboundChannelAdapterParserTests] -2011-07-19 16:08:55,707 DEBUG [org.springframework.test.annotation.ProfileValueUtils] - Retrieved ProfileValueSource type [class org.springframework.test.annotation.SystemProfileValueSource] for class [org.springframework.integration.redis.config.RedisInboundChannelAdapterParserTests] -2011-07-19 16:08:55,707 DEBUG [org.springframework.test.context.support.DependencyInjectionTestExecutionListener] - Performing dependency injection for test context [[TestContext@932892 testClass = RedisInboundChannelAdapterParserTests, locations = array['classpath:/org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests-context.xml'], testInstance = org.springframework.integration.redis.config.RedisInboundChannelAdapterParserTests@4cab63, testMethod = [null], testException = [null]]]. -2011-07-19 16:08:55,707 DEBUG [org.springframework.test.context.support.AbstractGenericContextLoader] - Loading ApplicationContext for locations [classpath:/org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests-context.xml]. -2011-07-19 16:08:55,710 INFO [org.springframework.beans.factory.xml.XmlBeanDefinitionReader] - Loading XML bean definitions from class path resource [org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests-context.xml] -2011-07-19 16:08:55,712 DEBUG [org.springframework.beans.factory.xml.DefaultDocumentLoader] - Using JAXP provider [com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl] -2011-07-19 16:08:55,713 DEBUG [org.springframework.beans.factory.xml.PluggableSchemaResolver] - Loading schema mappings from [META-INF/spring.schemas] -2011-07-19 16:08:55,763 DEBUG [org.springframework.beans.factory.xml.PluggableSchemaResolver] - Loaded schema mappings: {http://www.springframework.org/schema/redis/spring-redis-1.0.xsd=org/springframework/data/keyvalue/redis/config/spring-redis-1.0.xsd, http://www.springframework.org/schema/oxm/spring-oxm-3.0.xsd=org/springframework/oxm/config/spring-oxm-3.0.xsd, http://www.springframework.org/schema/util/spring-util.xsd=org/springframework/beans/factory/xml/spring-util-3.0.xsd, http://www.springframework.org/schema/integration/redis/spring-integration-redis.xsd=org/springframework/integration/redis/config/spring-integration-redis-2.0.xsd, http://www.springframework.org/schema/task/spring-task.xsd=org/springframework/scheduling/config/spring-task-3.0.xsd, http://www.springframework.org/schema/aop/spring-aop-3.0.xsd=org/springframework/aop/config/spring-aop-3.0.xsd, http://www.springframework.org/schema/aop/spring-aop-2.0.xsd=org/springframework/aop/config/spring-aop-2.0.xsd, http://www.springframework.org/schema/oxm/spring-oxm.xsd=org/springframework/oxm/config/spring-oxm-3.0.xsd, http://www.springframework.org/schema/tool/spring-tool-2.5.xsd=org/springframework/beans/factory/xml/spring-tool-2.5.xsd, http://www.springframework.org/schema/integration/spring-integration.xsd=org/springframework/integration/config/xml/spring-integration-2.0.xsd, http://www.springframework.org/schema/beans/spring-beans.xsd=org/springframework/beans/factory/xml/spring-beans-3.0.xsd, http://www.springframework.org/schema/jee/spring-jee-2.5.xsd=org/springframework/ejb/config/spring-jee-2.5.xsd, http://www.springframework.org/schema/redis/spring-redis.xsd=org/springframework/data/keyvalue/redis/config/spring-redis-1.0.xsd, http://www.springframework.org/schema/aop/spring-aop.xsd=org/springframework/aop/config/spring-aop-3.0.xsd, http://www.springframework.org/schema/beans/spring-beans-2.0.xsd=org/springframework/beans/factory/xml/spring-beans-2.0.xsd, http://www.springframework.org/schema/beans/spring-beans-3.0.xsd=org/springframework/beans/factory/xml/spring-beans-3.0.xsd, http://www.springframework.org/schema/task/spring-task-3.0.xsd=org/springframework/scheduling/config/spring-task-3.0.xsd, http://www.springframework.org/schema/tx/spring-tx-2.5.xsd=org/springframework/transaction/config/spring-tx-2.5.xsd, http://www.springframework.org/schema/context/spring-context-2.5.xsd=org/springframework/context/config/spring-context-2.5.xsd, http://www.springframework.org/schema/tool/spring-tool-3.0.xsd=org/springframework/beans/factory/xml/spring-tool-3.0.xsd, http://www.springframework.org/schema/tx/spring-tx.xsd=org/springframework/transaction/config/spring-tx-3.0.xsd, http://www.springframework.org/schema/tool/spring-tool-2.0.xsd=org/springframework/beans/factory/xml/spring-tool-2.0.xsd, http://www.springframework.org/schema/util/spring-util-2.5.xsd=org/springframework/beans/factory/xml/spring-util-2.5.xsd, http://www.springframework.org/schema/lang/spring-lang.xsd=org/springframework/scripting/config/spring-lang-3.0.xsd, http://www.springframework.org/schema/lang/spring-lang-2.5.xsd=org/springframework/scripting/config/spring-lang-2.5.xsd, http://www.springframework.org/schema/integration/spring-integration-1.0.xsd=org/springframework/integration/config/xml/spring-integration-1.0.xsd, http://www.springframework.org/schema/integration/spring-integration-2.0.xsd=org/springframework/integration/config/xml/spring-integration-2.0.xsd, http://www.springframework.org/schema/jee/spring-jee-3.0.xsd=org/springframework/ejb/config/spring-jee-3.0.xsd, http://www.springframework.org/schema/jee/spring-jee-2.0.xsd=org/springframework/ejb/config/spring-jee-2.0.xsd, http://www.springframework.org/schema/context/spring-context.xsd=org/springframework/context/config/spring-context-3.0.xsd, http://www.springframework.org/schema/jee/spring-jee.xsd=org/springframework/ejb/config/spring-jee-3.0.xsd, http://www.springframework.org/schema/integration/redis/spring-integration-redis-2.0.xsd=org/springframework/integration/redis/config/spring-integration-redis-2.0.xsd, http://www.springframework.org/schema/aop/spring-aop-2.5.xsd=org/springframework/aop/config/spring-aop-2.5.xsd, http://www.springframework.org/schema/tx/spring-tx-2.0.xsd=org/springframework/transaction/config/spring-tx-2.0.xsd, http://www.springframework.org/schema/tx/spring-tx-3.0.xsd=org/springframework/transaction/config/spring-tx-3.0.xsd, http://www.springframework.org/schema/context/spring-context-3.0.xsd=org/springframework/context/config/spring-context-3.0.xsd, http://www.springframework.org/schema/tool/spring-tool.xsd=org/springframework/beans/factory/xml/spring-tool-3.0.xsd, http://www.springframework.org/schema/util/spring-util-3.0.xsd=org/springframework/beans/factory/xml/spring-util-3.0.xsd, http://www.springframework.org/schema/lang/spring-lang-3.0.xsd=org/springframework/scripting/config/spring-lang-3.0.xsd, http://www.springframework.org/schema/util/spring-util-2.0.xsd=org/springframework/beans/factory/xml/spring-util-2.0.xsd, http://www.springframework.org/schema/lang/spring-lang-2.0.xsd=org/springframework/scripting/config/spring-lang-2.0.xsd, http://www.springframework.org/schema/beans/spring-beans-2.5.xsd=org/springframework/beans/factory/xml/spring-beans-2.5.xsd} -2011-07-19 16:08:55,764 DEBUG [org.springframework.beans.factory.xml.PluggableSchemaResolver] - Found XML schema [http://www.springframework.org/schema/beans/spring-beans.xsd] in classpath: org/springframework/beans/factory/xml/spring-beans-3.0.xsd -2011-07-19 16:08:55,784 DEBUG [org.springframework.beans.factory.xml.PluggableSchemaResolver] - Found XML schema [http://www.springframework.org/schema/integration/redis/spring-integration-redis-2.0.xsd] in classpath: org/springframework/integration/redis/config/spring-integration-redis-2.0.xsd -2011-07-19 16:08:55,787 DEBUG [org.springframework.beans.factory.xml.PluggableSchemaResolver] - Found XML schema [http://www.springframework.org/schema/integration/spring-integration-2.0.xsd] in classpath: org/springframework/integration/config/xml/spring-integration-2.0.xsd -2011-07-19 16:08:55,826 DEBUG [org.springframework.beans.factory.xml.DefaultBeanDefinitionDocumentReader] - Loading bean definitions -2011-07-19 16:08:55,830 DEBUG [org.springframework.beans.factory.xml.DefaultNamespaceHandlerResolver] - Loaded NamespaceHandler mappings: {http://www.springframework.org/schema/p=org.springframework.beans.factory.xml.SimplePropertyNamespaceHandler, http://www.springframework.org/schema/util=org.springframework.beans.factory.xml.UtilNamespaceHandler, http://www.springframework.org/schema/jee=org.springframework.ejb.config.JeeNamespaceHandler, http://www.springframework.org/schema/aop=org.springframework.aop.config.AopNamespaceHandler, http://www.springframework.org/schema/oxm=org.springframework.oxm.config.OxmNamespaceHandler, http://www.springframework.org/schema/redis=org.springframework.data.keyvalue.redis.config.RedisNamespaceHandler, http://www.springframework.org/schema/integration/redis=org.springframework.integration.redis.config.RedisNamespaceHandler, http://www.springframework.org/schema/tx=org.springframework.transaction.config.TxNamespaceHandler, http://www.springframework.org/schema/integration=org.springframework.integration.config.xml.IntegrationNamespaceHandler, http://www.springframework.org/schema/task=org.springframework.scheduling.config.TaskNamespaceHandler, http://www.springframework.org/schema/lang=org.springframework.scripting.config.LangNamespaceHandler, http://www.springframework.org/schema/context=org.springframework.context.config.ContextNamespaceHandler} -2011-07-19 16:08:55,831 DEBUG [org.springframework.beans.factory.xml.XmlBeanDefinitionReader] - Loaded 6 bean definitions from location pattern [classpath:/org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests-context.xml] -2011-07-19 16:08:55,832 INFO [org.springframework.context.support.GenericApplicationContext] - Refreshing org.springframework.context.support.GenericApplicationContext@881734: startup date [Tue Jul 19 16:08:55 EDT 2011]; root of context hierarchy -2011-07-19 16:08:55,832 DEBUG [org.springframework.context.support.GenericApplicationContext] - Bean factory for org.springframework.context.support.GenericApplicationContext@881734: org.springframework.beans.factory.support.DefaultListableBeanFactory@61daf0: defining beans [org.springframework.integration.internalDefaultConfiguringBeanFactoryPostProcessor,adapter,receiveChannel,testErrorChannel,redisConnectionFactory,testConverter,org.springframework.context.annotation.internalConfigurationAnnotationProcessor,org.springframework.context.annotation.internalAutowiredAnnotationProcessor,org.springframework.context.annotation.internalRequiredAnnotationProcessor]; root of factory hierarchy -2011-07-19 16:08:55,833 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating shared instance of singleton bean 'org.springframework.context.annotation.internalConfigurationAnnotationProcessor' -2011-07-19 16:08:55,834 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating instance of bean 'org.springframework.context.annotation.internalConfigurationAnnotationProcessor' -2011-07-19 16:08:55,834 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Eagerly caching bean 'org.springframework.context.annotation.internalConfigurationAnnotationProcessor' to allow for resolving potential circular references -2011-07-19 16:08:55,835 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Finished creating instance of bean 'org.springframework.context.annotation.internalConfigurationAnnotationProcessor' -2011-07-19 16:08:55,841 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating shared instance of singleton bean 'org.springframework.integration.internalDefaultConfiguringBeanFactoryPostProcessor' -2011-07-19 16:08:55,841 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating instance of bean 'org.springframework.integration.internalDefaultConfiguringBeanFactoryPostProcessor' -2011-07-19 16:08:55,842 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Eagerly caching bean 'org.springframework.integration.internalDefaultConfiguringBeanFactoryPostProcessor' to allow for resolving potential circular references -2011-07-19 16:08:55,842 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Finished creating instance of bean 'org.springframework.integration.internalDefaultConfiguringBeanFactoryPostProcessor' -2011-07-19 16:08:55,842 INFO [org.springframework.integration.config.xml.DefaultConfiguringBeanFactoryPostProcessor] - No bean named 'errorChannel' has been explicitly defined. Therefore, a default PublishSubscribeChannel will be created. -2011-07-19 16:08:55,842 INFO [org.springframework.integration.config.xml.DefaultConfiguringBeanFactoryPostProcessor] - No bean named 'taskScheduler' has been explicitly defined. Therefore, a default ThreadPoolTaskScheduler will be created. -2011-07-19 16:08:55,844 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating shared instance of singleton bean 'org.springframework.context.annotation.internalAutowiredAnnotationProcessor' -2011-07-19 16:08:55,844 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating instance of bean 'org.springframework.context.annotation.internalAutowiredAnnotationProcessor' -2011-07-19 16:08:55,844 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Eagerly caching bean 'org.springframework.context.annotation.internalAutowiredAnnotationProcessor' to allow for resolving potential circular references -2011-07-19 16:08:55,844 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Finished creating instance of bean 'org.springframework.context.annotation.internalAutowiredAnnotationProcessor' -2011-07-19 16:08:55,845 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating shared instance of singleton bean 'org.springframework.context.annotation.internalRequiredAnnotationProcessor' -2011-07-19 16:08:55,845 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating instance of bean 'org.springframework.context.annotation.internalRequiredAnnotationProcessor' -2011-07-19 16:08:55,845 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Eagerly caching bean 'org.springframework.context.annotation.internalRequiredAnnotationProcessor' to allow for resolving potential circular references -2011-07-19 16:08:55,845 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Finished creating instance of bean 'org.springframework.context.annotation.internalRequiredAnnotationProcessor' -2011-07-19 16:08:55,845 DEBUG [org.springframework.context.support.GenericApplicationContext] - Unable to locate MessageSource with name 'messageSource': using default [org.springframework.context.support.DelegatingMessageSource@da7b85] -2011-07-19 16:08:55,845 DEBUG [org.springframework.context.support.GenericApplicationContext] - Unable to locate ApplicationEventMulticaster with name 'applicationEventMulticaster': using default [org.springframework.context.event.SimpleApplicationEventMulticaster@e373de] -2011-07-19 16:08:55,846 INFO [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Pre-instantiating singletons in org.springframework.beans.factory.support.DefaultListableBeanFactory@61daf0: defining beans [org.springframework.integration.internalDefaultConfiguringBeanFactoryPostProcessor,adapter,receiveChannel,testErrorChannel,redisConnectionFactory,testConverter,org.springframework.context.annotation.internalConfigurationAnnotationProcessor,org.springframework.context.annotation.internalAutowiredAnnotationProcessor,org.springframework.context.annotation.internalRequiredAnnotationProcessor,nullChannel,errorChannel,_org.springframework.integration.errorLogger,taskScheduler]; root of factory hierarchy -2011-07-19 16:08:55,847 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Returning cached instance of singleton bean 'org.springframework.integration.internalDefaultConfiguringBeanFactoryPostProcessor' -2011-07-19 16:08:55,847 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating shared instance of singleton bean 'adapter' -2011-07-19 16:08:55,847 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating instance of bean 'adapter' -2011-07-19 16:08:55,847 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating shared instance of singleton bean 'redisConnectionFactory' -2011-07-19 16:08:55,847 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating instance of bean 'redisConnectionFactory' -2011-07-19 16:08:55,848 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Eagerly caching bean 'redisConnectionFactory' to allow for resolving potential circular references -2011-07-19 16:08:55,848 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Invoking afterPropertiesSet() on bean with name 'redisConnectionFactory' -2011-07-19 16:08:55,848 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Finished creating instance of bean 'redisConnectionFactory' -2011-07-19 16:08:55,850 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Eagerly caching bean 'adapter' to allow for resolving potential circular references -2011-07-19 16:08:55,851 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating shared instance of singleton bean 'receiveChannel' -2011-07-19 16:08:55,851 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating instance of bean 'receiveChannel' -2011-07-19 16:08:55,852 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Eagerly caching bean 'receiveChannel' to allow for resolving potential circular references -2011-07-19 16:08:55,852 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Invoking afterPropertiesSet() on bean with name 'receiveChannel' -2011-07-19 16:08:55,852 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Finished creating instance of bean 'receiveChannel' -2011-07-19 16:08:55,853 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating shared instance of singleton bean 'testErrorChannel' -2011-07-19 16:08:55,853 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating instance of bean 'testErrorChannel' -2011-07-19 16:08:55,853 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Eagerly caching bean 'testErrorChannel' to allow for resolving potential circular references -2011-07-19 16:08:55,854 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Invoking afterPropertiesSet() on bean with name 'testErrorChannel' -2011-07-19 16:08:55,854 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Finished creating instance of bean 'testErrorChannel' -2011-07-19 16:08:55,854 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating shared instance of singleton bean 'testConverter' -2011-07-19 16:08:55,855 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating instance of bean 'testConverter' -2011-07-19 16:08:55,855 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Eagerly caching bean 'testConverter' to allow for resolving potential circular references -2011-07-19 16:08:55,859 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Finished creating instance of bean 'testConverter' -2011-07-19 16:08:55,859 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Invoking afterPropertiesSet() on bean with name 'adapter' -2011-07-19 16:08:55,860 INFO [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Destroying singletons in org.springframework.beans.factory.support.DefaultListableBeanFactory@61daf0: defining beans [org.springframework.integration.internalDefaultConfiguringBeanFactoryPostProcessor,adapter,receiveChannel,testErrorChannel,redisConnectionFactory,testConverter,org.springframework.context.annotation.internalConfigurationAnnotationProcessor,org.springframework.context.annotation.internalAutowiredAnnotationProcessor,org.springframework.context.annotation.internalRequiredAnnotationProcessor,nullChannel,errorChannel,_org.springframework.integration.errorLogger,taskScheduler]; root of factory hierarchy -2011-07-19 16:08:55,860 DEBUG [org.springframework.beans.factory.support.DisposableBeanAdapter] - Invoking destroy() on bean with name 'redisConnectionFactory' -2011-07-19 16:08:55,860 ERROR [org.springframework.test.context.TestContextManager] - Caught exception while allowing TestExecutionListener [org.springframework.test.context.support.DependencyInjectionTestExecutionListener@1c9ca1] to prepare test instance [org.springframework.integration.redis.config.RedisInboundChannelAdapterParserTests@4cab63] -java.lang.IllegalStateException: Failed to load ApplicationContext - at org.springframework.test.context.TestContext.getApplicationContext(TestContext.java:308) - at org.springframework.test.context.support.DependencyInjectionTestExecutionListener.injectDependencies(DependencyInjectionTestExecutionListener.java:109) - at org.springframework.test.context.support.DependencyInjectionTestExecutionListener.prepareTestInstance(DependencyInjectionTestExecutionListener.java:75) - at org.springframework.test.context.TestContextManager.prepareTestInstance(TestContextManager.java:321) - at org.springframework.test.context.junit4.SpringJUnit4ClassRunner.createTest(SpringJUnit4ClassRunner.java:220) - at org.springframework.test.context.junit4.SpringJUnit4ClassRunner$1.runReflectiveCall(SpringJUnit4ClassRunner.java:301) - at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:15) - at org.springframework.test.context.junit4.SpringJUnit4ClassRunner.methodBlock(SpringJUnit4ClassRunner.java:303) - at org.springframework.test.context.junit4.SpringJUnit4ClassRunner.runChild(SpringJUnit4ClassRunner.java:240) - at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:49) - at org.junit.runners.ParentRunner$3.run(ParentRunner.java:193) - at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:52) - at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:191) - at org.junit.runners.ParentRunner.access$000(ParentRunner.java:42) - at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:184) - at org.springframework.test.context.junit4.statements.RunBeforeTestClassCallbacks.evaluate(RunBeforeTestClassCallbacks.java:61) - at org.springframework.test.context.junit4.statements.RunAfterTestClassCallbacks.evaluate(RunAfterTestClassCallbacks.java:70) - at org.junit.runners.ParentRunner.run(ParentRunner.java:236) - at org.springframework.test.context.junit4.SpringJUnit4ClassRunner.run(SpringJUnit4ClassRunner.java:180) - at org.apache.maven.surefire.junit4.JUnit4TestSet.execute(JUnit4TestSet.java:62) - at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.executeTestSet(AbstractDirectoryTestSuite.java:140) - at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.execute(AbstractDirectoryTestSuite.java:127) - at org.apache.maven.surefire.Surefire.run(Surefire.java:177) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) - at java.lang.reflect.Method.invoke(Method.java:585) - at org.apache.maven.surefire.booter.SurefireBooter.runSuitesInProcess(SurefireBooter.java:345) - at org.apache.maven.surefire.booter.SurefireBooter.main(SurefireBooter.java:1009) -Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'adapter': Invocation of init method failed; nested exception is java.lang.NoSuchMethodError: java.lang.String.getBytes(Ljava/nio/charset/Charset;)[B - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1420) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:519) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:456) - at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:291) - at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:222) - at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:288) - at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:190) - at org.springframework.beans.factory.support.DefaultListableBeanFactory.preInstantiateSingletons(DefaultListableBeanFactory.java:580) - at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:895) - at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:425) - at org.springframework.test.context.support.AbstractGenericContextLoader.loadContext(AbstractGenericContextLoader.java:84) - at org.springframework.test.context.support.AbstractGenericContextLoader.loadContext(AbstractGenericContextLoader.java:1) - at org.springframework.test.context.TestContext.loadApplicationContext(TestContext.java:280) - at org.springframework.test.context.TestContext.getApplicationContext(TestContext.java:304) - ... 28 more -Caused by: java.lang.NoSuchMethodError: java.lang.String.getBytes(Ljava/nio/charset/Charset;)[B - at org.springframework.data.keyvalue.redis.serializer.StringRedisSerializer.serialize(StringRedisSerializer.java:54) - at org.springframework.data.keyvalue.redis.serializer.StringRedisSerializer.serialize(StringRedisSerializer.java:32) - at org.springframework.data.keyvalue.redis.listener.RedisMessageListenerContainer.addListener(RedisMessageListenerContainer.java:451) - at org.springframework.data.keyvalue.redis.listener.RedisMessageListenerContainer.addMessageListener(RedisMessageListenerContainer.java:377) - at org.springframework.integration.redis.inbound.RedisInboundChannelAdapter.onInit(RedisInboundChannelAdapter.java:77) - at org.springframework.integration.context.IntegrationObjectSupport.afterPropertiesSet(IntegrationObjectSupport.java:98) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1477) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1417) - ... 41 more -2011-07-19 16:08:55,865 DEBUG [org.springframework.test.annotation.ProfileValueUtils] - Retrieved @ProfileValueSourceConfiguration [null] for test class [org.springframework.integration.redis.config.RedisInboundChannelAdapterParserTests] -2011-07-19 16:08:55,865 DEBUG [org.springframework.test.annotation.ProfileValueUtils] - Retrieved ProfileValueSource type [class org.springframework.test.annotation.SystemProfileValueSource] for class [org.springframework.integration.redis.config.RedisInboundChannelAdapterParserTests] -2011-07-19 16:08:55,865 DEBUG [org.springframework.test.context.support.DependencyInjectionTestExecutionListener] - Performing dependency injection for test context [[TestContext@932892 testClass = RedisInboundChannelAdapterParserTests, locations = array['classpath:/org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests-context.xml'], testInstance = org.springframework.integration.redis.config.RedisInboundChannelAdapterParserTests@6f29c8, testMethod = [null], testException = [null]]]. -2011-07-19 16:08:55,865 DEBUG [org.springframework.test.context.support.AbstractGenericContextLoader] - Loading ApplicationContext for locations [classpath:/org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests-context.xml]. -2011-07-19 16:08:55,866 INFO [org.springframework.beans.factory.xml.XmlBeanDefinitionReader] - Loading XML bean definitions from class path resource [org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests-context.xml] -2011-07-19 16:08:55,867 DEBUG [org.springframework.beans.factory.xml.DefaultDocumentLoader] - Using JAXP provider [com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl] -2011-07-19 16:08:55,870 DEBUG [org.springframework.beans.factory.xml.PluggableSchemaResolver] - Loading schema mappings from [META-INF/spring.schemas] -2011-07-19 16:08:55,871 DEBUG [org.springframework.beans.factory.xml.PluggableSchemaResolver] - Loaded schema mappings: {http://www.springframework.org/schema/redis/spring-redis-1.0.xsd=org/springframework/data/keyvalue/redis/config/spring-redis-1.0.xsd, http://www.springframework.org/schema/oxm/spring-oxm-3.0.xsd=org/springframework/oxm/config/spring-oxm-3.0.xsd, http://www.springframework.org/schema/util/spring-util.xsd=org/springframework/beans/factory/xml/spring-util-3.0.xsd, http://www.springframework.org/schema/integration/redis/spring-integration-redis.xsd=org/springframework/integration/redis/config/spring-integration-redis-2.0.xsd, http://www.springframework.org/schema/task/spring-task.xsd=org/springframework/scheduling/config/spring-task-3.0.xsd, http://www.springframework.org/schema/aop/spring-aop-3.0.xsd=org/springframework/aop/config/spring-aop-3.0.xsd, http://www.springframework.org/schema/aop/spring-aop-2.0.xsd=org/springframework/aop/config/spring-aop-2.0.xsd, http://www.springframework.org/schema/oxm/spring-oxm.xsd=org/springframework/oxm/config/spring-oxm-3.0.xsd, http://www.springframework.org/schema/tool/spring-tool-2.5.xsd=org/springframework/beans/factory/xml/spring-tool-2.5.xsd, http://www.springframework.org/schema/integration/spring-integration.xsd=org/springframework/integration/config/xml/spring-integration-2.0.xsd, http://www.springframework.org/schema/beans/spring-beans.xsd=org/springframework/beans/factory/xml/spring-beans-3.0.xsd, http://www.springframework.org/schema/jee/spring-jee-2.5.xsd=org/springframework/ejb/config/spring-jee-2.5.xsd, http://www.springframework.org/schema/redis/spring-redis.xsd=org/springframework/data/keyvalue/redis/config/spring-redis-1.0.xsd, http://www.springframework.org/schema/aop/spring-aop.xsd=org/springframework/aop/config/spring-aop-3.0.xsd, http://www.springframework.org/schema/beans/spring-beans-2.0.xsd=org/springframework/beans/factory/xml/spring-beans-2.0.xsd, http://www.springframework.org/schema/beans/spring-beans-3.0.xsd=org/springframework/beans/factory/xml/spring-beans-3.0.xsd, http://www.springframework.org/schema/task/spring-task-3.0.xsd=org/springframework/scheduling/config/spring-task-3.0.xsd, http://www.springframework.org/schema/tx/spring-tx-2.5.xsd=org/springframework/transaction/config/spring-tx-2.5.xsd, http://www.springframework.org/schema/context/spring-context-2.5.xsd=org/springframework/context/config/spring-context-2.5.xsd, http://www.springframework.org/schema/tool/spring-tool-3.0.xsd=org/springframework/beans/factory/xml/spring-tool-3.0.xsd, http://www.springframework.org/schema/tx/spring-tx.xsd=org/springframework/transaction/config/spring-tx-3.0.xsd, http://www.springframework.org/schema/tool/spring-tool-2.0.xsd=org/springframework/beans/factory/xml/spring-tool-2.0.xsd, http://www.springframework.org/schema/util/spring-util-2.5.xsd=org/springframework/beans/factory/xml/spring-util-2.5.xsd, http://www.springframework.org/schema/lang/spring-lang.xsd=org/springframework/scripting/config/spring-lang-3.0.xsd, http://www.springframework.org/schema/lang/spring-lang-2.5.xsd=org/springframework/scripting/config/spring-lang-2.5.xsd, http://www.springframework.org/schema/integration/spring-integration-1.0.xsd=org/springframework/integration/config/xml/spring-integration-1.0.xsd, http://www.springframework.org/schema/integration/spring-integration-2.0.xsd=org/springframework/integration/config/xml/spring-integration-2.0.xsd, http://www.springframework.org/schema/jee/spring-jee-3.0.xsd=org/springframework/ejb/config/spring-jee-3.0.xsd, http://www.springframework.org/schema/jee/spring-jee-2.0.xsd=org/springframework/ejb/config/spring-jee-2.0.xsd, http://www.springframework.org/schema/context/spring-context.xsd=org/springframework/context/config/spring-context-3.0.xsd, http://www.springframework.org/schema/jee/spring-jee.xsd=org/springframework/ejb/config/spring-jee-3.0.xsd, http://www.springframework.org/schema/integration/redis/spring-integration-redis-2.0.xsd=org/springframework/integration/redis/config/spring-integration-redis-2.0.xsd, http://www.springframework.org/schema/aop/spring-aop-2.5.xsd=org/springframework/aop/config/spring-aop-2.5.xsd, http://www.springframework.org/schema/tx/spring-tx-2.0.xsd=org/springframework/transaction/config/spring-tx-2.0.xsd, http://www.springframework.org/schema/tx/spring-tx-3.0.xsd=org/springframework/transaction/config/spring-tx-3.0.xsd, http://www.springframework.org/schema/context/spring-context-3.0.xsd=org/springframework/context/config/spring-context-3.0.xsd, http://www.springframework.org/schema/tool/spring-tool.xsd=org/springframework/beans/factory/xml/spring-tool-3.0.xsd, http://www.springframework.org/schema/util/spring-util-3.0.xsd=org/springframework/beans/factory/xml/spring-util-3.0.xsd, http://www.springframework.org/schema/lang/spring-lang-3.0.xsd=org/springframework/scripting/config/spring-lang-3.0.xsd, http://www.springframework.org/schema/util/spring-util-2.0.xsd=org/springframework/beans/factory/xml/spring-util-2.0.xsd, http://www.springframework.org/schema/lang/spring-lang-2.0.xsd=org/springframework/scripting/config/spring-lang-2.0.xsd, http://www.springframework.org/schema/beans/spring-beans-2.5.xsd=org/springframework/beans/factory/xml/spring-beans-2.5.xsd} -2011-07-19 16:08:55,873 DEBUG [org.springframework.beans.factory.xml.PluggableSchemaResolver] - Found XML schema [http://www.springframework.org/schema/beans/spring-beans.xsd] in classpath: org/springframework/beans/factory/xml/spring-beans-3.0.xsd -2011-07-19 16:08:55,933 DEBUG [org.springframework.beans.factory.xml.PluggableSchemaResolver] - Found XML schema [http://www.springframework.org/schema/integration/redis/spring-integration-redis-2.0.xsd] in classpath: org/springframework/integration/redis/config/spring-integration-redis-2.0.xsd -2011-07-19 16:08:55,935 DEBUG [org.springframework.beans.factory.xml.PluggableSchemaResolver] - Found XML schema [http://www.springframework.org/schema/integration/spring-integration-2.0.xsd] in classpath: org/springframework/integration/config/xml/spring-integration-2.0.xsd -2011-07-19 16:08:55,966 DEBUG [org.springframework.beans.factory.xml.DefaultBeanDefinitionDocumentReader] - Loading bean definitions -2011-07-19 16:08:55,968 DEBUG [org.springframework.beans.factory.xml.DefaultNamespaceHandlerResolver] - Loaded NamespaceHandler mappings: {http://www.springframework.org/schema/p=org.springframework.beans.factory.xml.SimplePropertyNamespaceHandler, http://www.springframework.org/schema/util=org.springframework.beans.factory.xml.UtilNamespaceHandler, http://www.springframework.org/schema/jee=org.springframework.ejb.config.JeeNamespaceHandler, http://www.springframework.org/schema/aop=org.springframework.aop.config.AopNamespaceHandler, http://www.springframework.org/schema/oxm=org.springframework.oxm.config.OxmNamespaceHandler, http://www.springframework.org/schema/redis=org.springframework.data.keyvalue.redis.config.RedisNamespaceHandler, http://www.springframework.org/schema/integration/redis=org.springframework.integration.redis.config.RedisNamespaceHandler, http://www.springframework.org/schema/tx=org.springframework.transaction.config.TxNamespaceHandler, http://www.springframework.org/schema/integration=org.springframework.integration.config.xml.IntegrationNamespaceHandler, http://www.springframework.org/schema/task=org.springframework.scheduling.config.TaskNamespaceHandler, http://www.springframework.org/schema/lang=org.springframework.scripting.config.LangNamespaceHandler, http://www.springframework.org/schema/context=org.springframework.context.config.ContextNamespaceHandler} -2011-07-19 16:08:55,970 DEBUG [org.springframework.beans.factory.xml.XmlBeanDefinitionReader] - Loaded 6 bean definitions from location pattern [classpath:/org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests-context.xml] -2011-07-19 16:08:55,971 INFO [org.springframework.context.support.GenericApplicationContext] - Refreshing org.springframework.context.support.GenericApplicationContext@2011e5: startup date [Tue Jul 19 16:08:55 EDT 2011]; root of context hierarchy -2011-07-19 16:08:55,971 DEBUG [org.springframework.context.support.GenericApplicationContext] - Bean factory for org.springframework.context.support.GenericApplicationContext@2011e5: org.springframework.beans.factory.support.DefaultListableBeanFactory@fd4bba: defining beans [org.springframework.integration.internalDefaultConfiguringBeanFactoryPostProcessor,adapter,receiveChannel,testErrorChannel,redisConnectionFactory,testConverter,org.springframework.context.annotation.internalConfigurationAnnotationProcessor,org.springframework.context.annotation.internalAutowiredAnnotationProcessor,org.springframework.context.annotation.internalRequiredAnnotationProcessor]; root of factory hierarchy -2011-07-19 16:08:55,972 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating shared instance of singleton bean 'org.springframework.context.annotation.internalConfigurationAnnotationProcessor' -2011-07-19 16:08:55,972 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating instance of bean 'org.springframework.context.annotation.internalConfigurationAnnotationProcessor' -2011-07-19 16:08:55,972 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Eagerly caching bean 'org.springframework.context.annotation.internalConfigurationAnnotationProcessor' to allow for resolving potential circular references -2011-07-19 16:08:55,972 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Finished creating instance of bean 'org.springframework.context.annotation.internalConfigurationAnnotationProcessor' -2011-07-19 16:08:55,976 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating shared instance of singleton bean 'org.springframework.integration.internalDefaultConfiguringBeanFactoryPostProcessor' -2011-07-19 16:08:55,977 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating instance of bean 'org.springframework.integration.internalDefaultConfiguringBeanFactoryPostProcessor' -2011-07-19 16:08:55,977 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Eagerly caching bean 'org.springframework.integration.internalDefaultConfiguringBeanFactoryPostProcessor' to allow for resolving potential circular references -2011-07-19 16:08:55,977 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Finished creating instance of bean 'org.springframework.integration.internalDefaultConfiguringBeanFactoryPostProcessor' -2011-07-19 16:08:55,977 INFO [org.springframework.integration.config.xml.DefaultConfiguringBeanFactoryPostProcessor] - No bean named 'errorChannel' has been explicitly defined. Therefore, a default PublishSubscribeChannel will be created. -2011-07-19 16:08:55,977 INFO [org.springframework.integration.config.xml.DefaultConfiguringBeanFactoryPostProcessor] - No bean named 'taskScheduler' has been explicitly defined. Therefore, a default ThreadPoolTaskScheduler will be created. -2011-07-19 16:08:55,980 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating shared instance of singleton bean 'org.springframework.context.annotation.internalAutowiredAnnotationProcessor' -2011-07-19 16:08:55,980 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating instance of bean 'org.springframework.context.annotation.internalAutowiredAnnotationProcessor' -2011-07-19 16:08:55,980 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Eagerly caching bean 'org.springframework.context.annotation.internalAutowiredAnnotationProcessor' to allow for resolving potential circular references -2011-07-19 16:08:55,981 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Finished creating instance of bean 'org.springframework.context.annotation.internalAutowiredAnnotationProcessor' -2011-07-19 16:08:55,981 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating shared instance of singleton bean 'org.springframework.context.annotation.internalRequiredAnnotationProcessor' -2011-07-19 16:08:55,981 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating instance of bean 'org.springframework.context.annotation.internalRequiredAnnotationProcessor' -2011-07-19 16:08:55,981 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Eagerly caching bean 'org.springframework.context.annotation.internalRequiredAnnotationProcessor' to allow for resolving potential circular references -2011-07-19 16:08:55,981 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Finished creating instance of bean 'org.springframework.context.annotation.internalRequiredAnnotationProcessor' -2011-07-19 16:08:55,981 DEBUG [org.springframework.context.support.GenericApplicationContext] - Unable to locate MessageSource with name 'messageSource': using default [org.springframework.context.support.DelegatingMessageSource@bf8785] -2011-07-19 16:08:55,981 DEBUG [org.springframework.context.support.GenericApplicationContext] - Unable to locate ApplicationEventMulticaster with name 'applicationEventMulticaster': using default [org.springframework.context.event.SimpleApplicationEventMulticaster@5a5ee5] -2011-07-19 16:08:55,982 INFO [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Pre-instantiating singletons in org.springframework.beans.factory.support.DefaultListableBeanFactory@fd4bba: defining beans [org.springframework.integration.internalDefaultConfiguringBeanFactoryPostProcessor,adapter,receiveChannel,testErrorChannel,redisConnectionFactory,testConverter,org.springframework.context.annotation.internalConfigurationAnnotationProcessor,org.springframework.context.annotation.internalAutowiredAnnotationProcessor,org.springframework.context.annotation.internalRequiredAnnotationProcessor,nullChannel,errorChannel,_org.springframework.integration.errorLogger,taskScheduler]; root of factory hierarchy -2011-07-19 16:08:55,983 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Returning cached instance of singleton bean 'org.springframework.integration.internalDefaultConfiguringBeanFactoryPostProcessor' -2011-07-19 16:08:55,983 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating shared instance of singleton bean 'adapter' -2011-07-19 16:08:55,983 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating instance of bean 'adapter' -2011-07-19 16:08:55,983 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating shared instance of singleton bean 'redisConnectionFactory' -2011-07-19 16:08:55,983 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating instance of bean 'redisConnectionFactory' -2011-07-19 16:08:55,984 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Eagerly caching bean 'redisConnectionFactory' to allow for resolving potential circular references -2011-07-19 16:08:55,984 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Invoking afterPropertiesSet() on bean with name 'redisConnectionFactory' -2011-07-19 16:08:55,984 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Finished creating instance of bean 'redisConnectionFactory' -2011-07-19 16:08:55,986 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Eagerly caching bean 'adapter' to allow for resolving potential circular references -2011-07-19 16:08:55,987 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating shared instance of singleton bean 'receiveChannel' -2011-07-19 16:08:55,987 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating instance of bean 'receiveChannel' -2011-07-19 16:08:55,987 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Eagerly caching bean 'receiveChannel' to allow for resolving potential circular references -2011-07-19 16:08:55,987 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Invoking afterPropertiesSet() on bean with name 'receiveChannel' -2011-07-19 16:08:55,988 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Finished creating instance of bean 'receiveChannel' -2011-07-19 16:08:55,988 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating shared instance of singleton bean 'testErrorChannel' -2011-07-19 16:08:55,988 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating instance of bean 'testErrorChannel' -2011-07-19 16:08:55,988 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Eagerly caching bean 'testErrorChannel' to allow for resolving potential circular references -2011-07-19 16:08:55,989 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Invoking afterPropertiesSet() on bean with name 'testErrorChannel' -2011-07-19 16:08:55,989 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Finished creating instance of bean 'testErrorChannel' -2011-07-19 16:08:55,989 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating shared instance of singleton bean 'testConverter' -2011-07-19 16:08:55,989 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating instance of bean 'testConverter' -2011-07-19 16:08:55,989 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Eagerly caching bean 'testConverter' to allow for resolving potential circular references -2011-07-19 16:08:55,990 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Finished creating instance of bean 'testConverter' -2011-07-19 16:08:55,990 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Invoking afterPropertiesSet() on bean with name 'adapter' -2011-07-19 16:08:55,990 INFO [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Destroying singletons in org.springframework.beans.factory.support.DefaultListableBeanFactory@fd4bba: defining beans [org.springframework.integration.internalDefaultConfiguringBeanFactoryPostProcessor,adapter,receiveChannel,testErrorChannel,redisConnectionFactory,testConverter,org.springframework.context.annotation.internalConfigurationAnnotationProcessor,org.springframework.context.annotation.internalAutowiredAnnotationProcessor,org.springframework.context.annotation.internalRequiredAnnotationProcessor,nullChannel,errorChannel,_org.springframework.integration.errorLogger,taskScheduler]; root of factory hierarchy -2011-07-19 16:08:55,990 DEBUG [org.springframework.beans.factory.support.DisposableBeanAdapter] - Invoking destroy() on bean with name 'redisConnectionFactory' -2011-07-19 16:08:55,990 ERROR [org.springframework.test.context.TestContextManager] - Caught exception while allowing TestExecutionListener [org.springframework.test.context.support.DependencyInjectionTestExecutionListener@1c9ca1] to prepare test instance [org.springframework.integration.redis.config.RedisInboundChannelAdapterParserTests@6f29c8] -java.lang.IllegalStateException: Failed to load ApplicationContext - at org.springframework.test.context.TestContext.getApplicationContext(TestContext.java:308) - at org.springframework.test.context.support.DependencyInjectionTestExecutionListener.injectDependencies(DependencyInjectionTestExecutionListener.java:109) - at org.springframework.test.context.support.DependencyInjectionTestExecutionListener.prepareTestInstance(DependencyInjectionTestExecutionListener.java:75) - at org.springframework.test.context.TestContextManager.prepareTestInstance(TestContextManager.java:321) - at org.springframework.test.context.junit4.SpringJUnit4ClassRunner.createTest(SpringJUnit4ClassRunner.java:220) - at org.springframework.test.context.junit4.SpringJUnit4ClassRunner$1.runReflectiveCall(SpringJUnit4ClassRunner.java:301) - at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:15) - at org.springframework.test.context.junit4.SpringJUnit4ClassRunner.methodBlock(SpringJUnit4ClassRunner.java:303) - at org.springframework.test.context.junit4.SpringJUnit4ClassRunner.runChild(SpringJUnit4ClassRunner.java:240) - at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:49) - at org.junit.runners.ParentRunner$3.run(ParentRunner.java:193) - at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:52) - at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:191) - at org.junit.runners.ParentRunner.access$000(ParentRunner.java:42) - at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:184) - at org.springframework.test.context.junit4.statements.RunBeforeTestClassCallbacks.evaluate(RunBeforeTestClassCallbacks.java:61) - at org.springframework.test.context.junit4.statements.RunAfterTestClassCallbacks.evaluate(RunAfterTestClassCallbacks.java:70) - at org.junit.runners.ParentRunner.run(ParentRunner.java:236) - at org.springframework.test.context.junit4.SpringJUnit4ClassRunner.run(SpringJUnit4ClassRunner.java:180) - at org.apache.maven.surefire.junit4.JUnit4TestSet.execute(JUnit4TestSet.java:62) - at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.executeTestSet(AbstractDirectoryTestSuite.java:140) - at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.execute(AbstractDirectoryTestSuite.java:127) - at org.apache.maven.surefire.Surefire.run(Surefire.java:177) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) - at java.lang.reflect.Method.invoke(Method.java:585) - at org.apache.maven.surefire.booter.SurefireBooter.runSuitesInProcess(SurefireBooter.java:345) - at org.apache.maven.surefire.booter.SurefireBooter.main(SurefireBooter.java:1009) -Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'adapter': Invocation of init method failed; nested exception is java.lang.NoSuchMethodError: java.lang.String.getBytes(Ljava/nio/charset/Charset;)[B - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1420) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:519) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:456) - at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:291) - at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:222) - at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:288) - at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:190) - at org.springframework.beans.factory.support.DefaultListableBeanFactory.preInstantiateSingletons(DefaultListableBeanFactory.java:580) - at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:895) - at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:425) - at org.springframework.test.context.support.AbstractGenericContextLoader.loadContext(AbstractGenericContextLoader.java:84) - at org.springframework.test.context.support.AbstractGenericContextLoader.loadContext(AbstractGenericContextLoader.java:1) - at org.springframework.test.context.TestContext.loadApplicationContext(TestContext.java:280) - at org.springframework.test.context.TestContext.getApplicationContext(TestContext.java:304) - ... 28 more -Caused by: java.lang.NoSuchMethodError: java.lang.String.getBytes(Ljava/nio/charset/Charset;)[B - at org.springframework.data.keyvalue.redis.serializer.StringRedisSerializer.serialize(StringRedisSerializer.java:54) - at org.springframework.data.keyvalue.redis.serializer.StringRedisSerializer.serialize(StringRedisSerializer.java:32) - at org.springframework.data.keyvalue.redis.listener.RedisMessageListenerContainer.addListener(RedisMessageListenerContainer.java:451) - at org.springframework.data.keyvalue.redis.listener.RedisMessageListenerContainer.addMessageListener(RedisMessageListenerContainer.java:377) - at org.springframework.integration.redis.inbound.RedisInboundChannelAdapter.onInit(RedisInboundChannelAdapter.java:77) - at org.springframework.integration.context.IntegrationObjectSupport.afterPropertiesSet(IntegrationObjectSupport.java:98) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1477) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1417) - ... 41 more -2011-07-19 16:08:55,998 DEBUG [org.springframework.test.context.support.DirtiesContextTestExecutionListener] - After test class: context [[TestContext@932892 testClass = RedisInboundChannelAdapterParserTests, locations = array['classpath:/org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests-context.xml'], testInstance = [null], testMethod = [null], testException = [null]]], dirtiesContext [false]. -2011-07-19 16:08:56,008 INFO [org.springframework.context.support.ClassPathXmlApplicationContext] - Refreshing org.springframework.context.support.ClassPathXmlApplicationContext@cf6930: startup date [Tue Jul 19 16:08:56 EDT 2011]; root of context hierarchy -2011-07-19 16:08:56,009 INFO [org.springframework.beans.factory.xml.XmlBeanDefinitionReader] - Loading XML bean definitions from class path resource [org/springframework/integration/redis/config/RedisChannelParserTests-context.xml] -2011-07-19 16:08:56,011 DEBUG [org.springframework.beans.factory.xml.DefaultDocumentLoader] - Using JAXP provider [com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl] -2011-07-19 16:08:56,012 DEBUG [org.springframework.beans.factory.xml.PluggableSchemaResolver] - Loading schema mappings from [META-INF/spring.schemas] -2011-07-19 16:08:56,015 DEBUG [org.springframework.beans.factory.xml.PluggableSchemaResolver] - Loaded schema mappings: {http://www.springframework.org/schema/redis/spring-redis-1.0.xsd=org/springframework/data/keyvalue/redis/config/spring-redis-1.0.xsd, http://www.springframework.org/schema/oxm/spring-oxm-3.0.xsd=org/springframework/oxm/config/spring-oxm-3.0.xsd, http://www.springframework.org/schema/util/spring-util.xsd=org/springframework/beans/factory/xml/spring-util-3.0.xsd, http://www.springframework.org/schema/integration/redis/spring-integration-redis.xsd=org/springframework/integration/redis/config/spring-integration-redis-2.0.xsd, http://www.springframework.org/schema/task/spring-task.xsd=org/springframework/scheduling/config/spring-task-3.0.xsd, http://www.springframework.org/schema/aop/spring-aop-3.0.xsd=org/springframework/aop/config/spring-aop-3.0.xsd, http://www.springframework.org/schema/aop/spring-aop-2.0.xsd=org/springframework/aop/config/spring-aop-2.0.xsd, http://www.springframework.org/schema/oxm/spring-oxm.xsd=org/springframework/oxm/config/spring-oxm-3.0.xsd, http://www.springframework.org/schema/tool/spring-tool-2.5.xsd=org/springframework/beans/factory/xml/spring-tool-2.5.xsd, http://www.springframework.org/schema/integration/spring-integration.xsd=org/springframework/integration/config/xml/spring-integration-2.0.xsd, http://www.springframework.org/schema/beans/spring-beans.xsd=org/springframework/beans/factory/xml/spring-beans-3.0.xsd, http://www.springframework.org/schema/jee/spring-jee-2.5.xsd=org/springframework/ejb/config/spring-jee-2.5.xsd, http://www.springframework.org/schema/redis/spring-redis.xsd=org/springframework/data/keyvalue/redis/config/spring-redis-1.0.xsd, http://www.springframework.org/schema/aop/spring-aop.xsd=org/springframework/aop/config/spring-aop-3.0.xsd, http://www.springframework.org/schema/beans/spring-beans-2.0.xsd=org/springframework/beans/factory/xml/spring-beans-2.0.xsd, http://www.springframework.org/schema/beans/spring-beans-3.0.xsd=org/springframework/beans/factory/xml/spring-beans-3.0.xsd, http://www.springframework.org/schema/task/spring-task-3.0.xsd=org/springframework/scheduling/config/spring-task-3.0.xsd, http://www.springframework.org/schema/tx/spring-tx-2.5.xsd=org/springframework/transaction/config/spring-tx-2.5.xsd, http://www.springframework.org/schema/context/spring-context-2.5.xsd=org/springframework/context/config/spring-context-2.5.xsd, http://www.springframework.org/schema/tool/spring-tool-3.0.xsd=org/springframework/beans/factory/xml/spring-tool-3.0.xsd, http://www.springframework.org/schema/tx/spring-tx.xsd=org/springframework/transaction/config/spring-tx-3.0.xsd, http://www.springframework.org/schema/tool/spring-tool-2.0.xsd=org/springframework/beans/factory/xml/spring-tool-2.0.xsd, http://www.springframework.org/schema/util/spring-util-2.5.xsd=org/springframework/beans/factory/xml/spring-util-2.5.xsd, http://www.springframework.org/schema/lang/spring-lang.xsd=org/springframework/scripting/config/spring-lang-3.0.xsd, http://www.springframework.org/schema/lang/spring-lang-2.5.xsd=org/springframework/scripting/config/spring-lang-2.5.xsd, http://www.springframework.org/schema/integration/spring-integration-1.0.xsd=org/springframework/integration/config/xml/spring-integration-1.0.xsd, http://www.springframework.org/schema/integration/spring-integration-2.0.xsd=org/springframework/integration/config/xml/spring-integration-2.0.xsd, http://www.springframework.org/schema/jee/spring-jee-3.0.xsd=org/springframework/ejb/config/spring-jee-3.0.xsd, http://www.springframework.org/schema/jee/spring-jee-2.0.xsd=org/springframework/ejb/config/spring-jee-2.0.xsd, http://www.springframework.org/schema/context/spring-context.xsd=org/springframework/context/config/spring-context-3.0.xsd, http://www.springframework.org/schema/jee/spring-jee.xsd=org/springframework/ejb/config/spring-jee-3.0.xsd, http://www.springframework.org/schema/integration/redis/spring-integration-redis-2.0.xsd=org/springframework/integration/redis/config/spring-integration-redis-2.0.xsd, http://www.springframework.org/schema/aop/spring-aop-2.5.xsd=org/springframework/aop/config/spring-aop-2.5.xsd, http://www.springframework.org/schema/tx/spring-tx-2.0.xsd=org/springframework/transaction/config/spring-tx-2.0.xsd, http://www.springframework.org/schema/tx/spring-tx-3.0.xsd=org/springframework/transaction/config/spring-tx-3.0.xsd, http://www.springframework.org/schema/context/spring-context-3.0.xsd=org/springframework/context/config/spring-context-3.0.xsd, http://www.springframework.org/schema/tool/spring-tool.xsd=org/springframework/beans/factory/xml/spring-tool-3.0.xsd, http://www.springframework.org/schema/util/spring-util-3.0.xsd=org/springframework/beans/factory/xml/spring-util-3.0.xsd, http://www.springframework.org/schema/lang/spring-lang-3.0.xsd=org/springframework/scripting/config/spring-lang-3.0.xsd, http://www.springframework.org/schema/util/spring-util-2.0.xsd=org/springframework/beans/factory/xml/spring-util-2.0.xsd, http://www.springframework.org/schema/lang/spring-lang-2.0.xsd=org/springframework/scripting/config/spring-lang-2.0.xsd, http://www.springframework.org/schema/beans/spring-beans-2.5.xsd=org/springframework/beans/factory/xml/spring-beans-2.5.xsd} -2011-07-19 16:08:56,016 DEBUG [org.springframework.beans.factory.xml.PluggableSchemaResolver] - Found XML schema [http://www.springframework.org/schema/beans/spring-beans.xsd] in classpath: org/springframework/beans/factory/xml/spring-beans-3.0.xsd -2011-07-19 16:08:56,068 DEBUG [org.springframework.beans.factory.xml.PluggableSchemaResolver] - Found XML schema [http://www.springframework.org/schema/integration/redis/spring-integration-redis-2.0.xsd] in classpath: org/springframework/integration/redis/config/spring-integration-redis-2.0.xsd -2011-07-19 16:08:56,071 DEBUG [org.springframework.beans.factory.xml.PluggableSchemaResolver] - Found XML schema [http://www.springframework.org/schema/integration/spring-integration-2.0.xsd] in classpath: org/springframework/integration/config/xml/spring-integration-2.0.xsd -2011-07-19 16:08:56,097 DEBUG [org.springframework.beans.factory.xml.DefaultBeanDefinitionDocumentReader] - Loading bean definitions -2011-07-19 16:08:56,100 DEBUG [org.springframework.beans.factory.xml.DefaultNamespaceHandlerResolver] - Loaded NamespaceHandler mappings: {http://www.springframework.org/schema/p=org.springframework.beans.factory.xml.SimplePropertyNamespaceHandler, http://www.springframework.org/schema/util=org.springframework.beans.factory.xml.UtilNamespaceHandler, http://www.springframework.org/schema/jee=org.springframework.ejb.config.JeeNamespaceHandler, http://www.springframework.org/schema/aop=org.springframework.aop.config.AopNamespaceHandler, http://www.springframework.org/schema/oxm=org.springframework.oxm.config.OxmNamespaceHandler, http://www.springframework.org/schema/redis=org.springframework.data.keyvalue.redis.config.RedisNamespaceHandler, http://www.springframework.org/schema/integration/redis=org.springframework.integration.redis.config.RedisNamespaceHandler, http://www.springframework.org/schema/tx=org.springframework.transaction.config.TxNamespaceHandler, http://www.springframework.org/schema/integration=org.springframework.integration.config.xml.IntegrationNamespaceHandler, http://www.springframework.org/schema/task=org.springframework.scheduling.config.TaskNamespaceHandler, http://www.springframework.org/schema/lang=org.springframework.scripting.config.LangNamespaceHandler, http://www.springframework.org/schema/context=org.springframework.context.config.ContextNamespaceHandler} -2011-07-19 16:08:56,101 DEBUG [org.springframework.context.support.ClassPathXmlApplicationContext] - Bean factory for org.springframework.context.support.ClassPathXmlApplicationContext@cf6930: org.springframework.beans.factory.support.DefaultListableBeanFactory@4145b1: defining beans [org.springframework.integration.internalDefaultConfiguringBeanFactoryPostProcessor,redisChannel,redisConnectionFactory]; root of factory hierarchy -2011-07-19 16:08:56,103 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating shared instance of singleton bean 'org.springframework.integration.internalDefaultConfiguringBeanFactoryPostProcessor' -2011-07-19 16:08:56,103 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating instance of bean 'org.springframework.integration.internalDefaultConfiguringBeanFactoryPostProcessor' -2011-07-19 16:08:56,103 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Eagerly caching bean 'org.springframework.integration.internalDefaultConfiguringBeanFactoryPostProcessor' to allow for resolving potential circular references -2011-07-19 16:08:56,103 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Finished creating instance of bean 'org.springframework.integration.internalDefaultConfiguringBeanFactoryPostProcessor' -2011-07-19 16:08:56,103 INFO [org.springframework.integration.config.xml.DefaultConfiguringBeanFactoryPostProcessor] - No bean named 'errorChannel' has been explicitly defined. Therefore, a default PublishSubscribeChannel will be created. -2011-07-19 16:08:56,103 INFO [org.springframework.integration.config.xml.DefaultConfiguringBeanFactoryPostProcessor] - No bean named 'taskScheduler' has been explicitly defined. Therefore, a default ThreadPoolTaskScheduler will be created. -2011-07-19 16:08:56,104 DEBUG [org.springframework.context.support.ClassPathXmlApplicationContext] - Unable to locate MessageSource with name 'messageSource': using default [org.springframework.context.support.DelegatingMessageSource@fdf894] -2011-07-19 16:08:56,104 DEBUG [org.springframework.context.support.ClassPathXmlApplicationContext] - Unable to locate ApplicationEventMulticaster with name 'applicationEventMulticaster': using default [org.springframework.context.event.SimpleApplicationEventMulticaster@cac7d3] -2011-07-19 16:08:56,105 INFO [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Pre-instantiating singletons in org.springframework.beans.factory.support.DefaultListableBeanFactory@4145b1: defining beans [org.springframework.integration.internalDefaultConfiguringBeanFactoryPostProcessor,redisChannel,redisConnectionFactory,nullChannel,errorChannel,_org.springframework.integration.errorLogger,taskScheduler]; root of factory hierarchy -2011-07-19 16:08:56,105 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Returning cached instance of singleton bean 'org.springframework.integration.internalDefaultConfiguringBeanFactoryPostProcessor' -2011-07-19 16:08:56,105 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating shared instance of singleton bean 'redisChannel' -2011-07-19 16:08:56,105 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating instance of bean 'redisChannel' -2011-07-19 16:08:56,106 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating shared instance of singleton bean 'redisConnectionFactory' -2011-07-19 16:08:56,106 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Creating instance of bean 'redisConnectionFactory' -2011-07-19 16:08:56,106 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Eagerly caching bean 'redisConnectionFactory' to allow for resolving potential circular references -2011-07-19 16:08:56,106 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Invoking afterPropertiesSet() on bean with name 'redisConnectionFactory' -2011-07-19 16:08:56,106 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Finished creating instance of bean 'redisConnectionFactory' -2011-07-19 16:08:56,108 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Eagerly caching bean 'redisChannel' to allow for resolving potential circular references -2011-07-19 16:08:56,114 DEBUG [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Invoking afterPropertiesSet() on bean with name 'redisChannel' -2011-07-19 16:08:56,115 INFO [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Destroying singletons in org.springframework.beans.factory.support.DefaultListableBeanFactory@4145b1: defining beans [org.springframework.integration.internalDefaultConfiguringBeanFactoryPostProcessor,redisChannel,redisConnectionFactory,nullChannel,errorChannel,_org.springframework.integration.errorLogger,taskScheduler]; root of factory hierarchy -2011-07-19 16:08:56,115 DEBUG [org.springframework.beans.factory.support.DisposableBeanAdapter] - Invoking destroy() on bean with name 'redisConnectionFactory' diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/channel/SubscribableRedisChannelTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/channel/SubscribableRedisChannelTests.java index 51dfb65487..64b7947234 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/channel/SubscribableRedisChannelTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/channel/SubscribableRedisChannelTests.java @@ -17,22 +17,25 @@ package org.springframework.integration.redis.channel; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; import java.lang.reflect.InvocationTargetException; import java.util.Map; import java.util.Set; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; import org.junit.Test; -import org.mockito.Mockito; + import org.springframework.beans.factory.BeanFactory; -import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; +import org.springframework.data.redis.connection.RedisConnection; +import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.listener.RedisMessageListenerContainer; import org.springframework.data.redis.listener.adapter.MessageListenerAdapter; import org.springframework.integration.Message; +import org.springframework.integration.MessagingException; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.redis.rules.RedisAvailable; @@ -42,39 +45,51 @@ import org.springframework.util.ReflectionUtils; /** * @author Oleg Zhurakousky * @author Gary Russell + * @author Artem Bilan * @since 2.0 */ -public class SubscribableRedisChannelTests extends RedisAvailableTests{ +public class SubscribableRedisChannelTests extends RedisAvailableTests { @Test @RedisAvailable - public void pubSubChanneTest() throws Exception{ - JedisConnectionFactory connectionFactory = new JedisConnectionFactory(); - connectionFactory.setPort(7379); - connectionFactory.afterPropertiesSet(); + public void pubSubChannelTest() throws Exception{ + RedisConnectionFactory connectionFactory = this.getConnectionFactoryForTest(); SubscribableRedisChannel channel = new SubscribableRedisChannel(connectionFactory, "si.test.channel"); channel.setBeanFactory(mock(BeanFactory.class)); channel.afterPropertiesSet(); channel.start(); - MessageHandler handler = mock(MessageHandler.class); + + RedisConnection connection = TestUtils.getPropertyValue(channel, "container.subscriptionTask.connection", + RedisConnection.class); + + int n = 0; + while (n++ < 100 && !connection.isSubscribed()) { + Thread.sleep(100); + } + assertTrue(n < 100); + + final CountDownLatch latch = new CountDownLatch(3); + MessageHandler handler = new MessageHandler() { + + @Override + public void handleMessage(Message message) throws MessagingException { + latch.countDown(); + } + }; channel.subscribe(handler); channel.send(new GenericMessage("1")); channel.send(new GenericMessage("2")); channel.send(new GenericMessage("3")); - Thread.sleep(1000); - verify(handler, times(3)).handleMessage(Mockito.any(Message.class)); - channel.stop(); + assertTrue(latch.await(5, TimeUnit.SECONDS)); } @Test @RedisAvailable public void dispatcherHasNoSubscribersTest() throws Exception{ - JedisConnectionFactory connectionFactory = new JedisConnectionFactory(); - connectionFactory.setPort(7379); - connectionFactory.afterPropertiesSet(); + RedisConnectionFactory connectionFactory = this.getConnectionFactoryForTest(); SubscribableRedisChannel channel = new SubscribableRedisChannel(connectionFactory, "si.test.channel.no.subs"); channel.setBeanName("dhnsChannel"); diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisChannelParserTests-context.xml b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisChannelParserTests-context.xml index ea85de380e..d41fce59a4 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisChannelParserTests-context.xml +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisChannelParserTests-context.xml @@ -12,8 +12,8 @@ - - + + diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisChannelParserTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisChannelParserTests.java index 8b7464ba5a..022eaa19ea 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisChannelParserTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisChannelParserTests.java @@ -17,11 +17,15 @@ package org.springframework.integration.redis.config; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; import org.junit.Test; -import org.mockito.Mockito; + import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; +import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.serializer.RedisSerializer; import org.springframework.integration.Message; import org.springframework.integration.MessagingException; @@ -36,6 +40,7 @@ import org.springframework.integration.test.util.TestUtils; * @author Oleg Zhurakousky * @author Gary Russell * @author Gunnar Hillert + * @author Artem Bilan */ public class RedisChannelParserTests extends RedisAvailableTests{ @@ -44,8 +49,8 @@ public class RedisChannelParserTests extends RedisAvailableTests{ public void testPubSubChannelConfig(){ ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("RedisChannelParserTests-context.xml", this.getClass()); SubscribableChannel redisChannel = context.getBean("redisChannel", SubscribableChannel.class); - JedisConnectionFactory connectionFactory = - TestUtils.getPropertyValue(redisChannel, "connectionFactory", JedisConnectionFactory.class); + RedisConnectionFactory connectionFactory = + TestUtils.getPropertyValue(redisChannel, "connectionFactory", RedisConnectionFactory.class); RedisSerializer redisSerializer = TestUtils.getPropertyValue(redisChannel, "serializer", RedisSerializer.class); assertEquals(connectionFactory, context.getBean("redisConnectionFactory")); assertEquals(redisSerializer, context.getBean("redisSerializer")); @@ -65,20 +70,17 @@ public class RedisChannelParserTests extends RedisAvailableTests{ SubscribableChannel redisChannel = context.getBean("redisChannel", SubscribableChannel.class); final Message m = new GenericMessage("Hello Redis"); - final Marker marker = Mockito.mock(Marker.class); + final CountDownLatch latch = new CountDownLatch(1); redisChannel.subscribe(new MessageHandler() { public void handleMessage(Message message) throws MessagingException { assertEquals(m.getPayload(), message.getPayload()); - marker.mark(); + latch.countDown(); } }); redisChannel.send(m); - Thread.sleep(1000); - Mockito.verify(marker, Mockito.times(1)).mark(); + + assertTrue(latch.await(2, TimeUnit.SECONDS)); context.stop(); } - interface Marker { - void mark(); - } } diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests-context.xml b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests-context.xml index 8e6c72c56a..832b822114 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests-context.xml +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests-context.xml @@ -8,7 +8,7 @@ @@ -17,8 +17,8 @@ - - + + - + diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests.java index 7f645041fa..e9bbe29fdc 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests.java @@ -25,7 +25,7 @@ import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.ApplicationContext; -import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; +import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.integration.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.redis.inbound.RedisInboundChannelAdapter; @@ -44,7 +44,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; */ @ContextConfiguration @RunWith(SpringJUnit4ClassRunner.class) -public class RedisInboundChannelAdapterParserTests extends RedisAvailableTests{ +public class RedisInboundChannelAdapterParserTests extends RedisAvailableTests { @Autowired private ApplicationContext context; @@ -71,16 +71,15 @@ public class RedisInboundChannelAdapterParserTests extends RedisAvailableTests{ @Test @RedisAvailable - public void testInboundChannelAdapterMessaging() throws Exception{ - JedisConnectionFactory connectionFactory = new JedisConnectionFactory(); - connectionFactory.setPort(7379); - connectionFactory.afterPropertiesSet(); + public void testInboundChannelAdapterMessaging() throws Exception { + RedisConnectionFactory connectionFactory = this.getConnectionFactoryForTest(); + connectionFactory.getConnection().publish("foo".getBytes(), "Hello Redis from foo".getBytes()); - Thread.sleep(1000); + QueueChannel receiveChannel = context.getBean("receiveChannel", QueueChannel.class); - assertEquals("Hello Redis from foo", receiveChannel.receive(1000).getPayload()); + assertEquals("Hello Redis from foo", receiveChannel.receive(2000).getPayload()); connectionFactory.getConnection().publish("bar".getBytes(), "Hello Redis from bar".getBytes()); - assertEquals("Hello Redis from bar", receiveChannel.receive(1000).getPayload()); + assertEquals("Hello Redis from bar", receiveChannel.receive(2000).getPayload()); } @Test diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisOutboundChannelAdapterParserTests-context.xml b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisOutboundChannelAdapterParserTests-context.xml index dcac318cea..b5126265a3 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisOutboundChannelAdapterParserTests-context.xml +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisOutboundChannelAdapterParserTests-context.xml @@ -21,8 +21,8 @@ - - + + @@ -30,7 +30,7 @@ - + diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/inbound-template-cf-fail.xml b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/inbound-template-cf-fail.xml index 0e96584499..ef149a9974 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/inbound-template-cf-fail.xml +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/inbound-template-cf-fail.xml @@ -16,9 +16,8 @@ - - + + diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisInboundChannelAdapterTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisInboundChannelAdapterTests.java index fb8cf9bb7f..a94c429741 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisInboundChannelAdapterTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisInboundChannelAdapterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2007-2011 the original author or authors + * Copyright 2007-2013 the original author or authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,17 @@ package org.springframework.integration.redis.inbound; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Test; + import org.springframework.data.redis.connection.RedisConnection; -import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; +import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.listener.RedisMessageListenerContainer; import org.springframework.integration.Message; @@ -29,11 +35,6 @@ import org.springframework.integration.redis.rules.RedisAvailable; import org.springframework.integration.redis.rules.RedisAvailableTests; import org.springframework.integration.test.util.TestUtils; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - /** * @author Mark Fisher * @since 2.1 @@ -42,7 +43,7 @@ public class RedisInboundChannelAdapterTests extends RedisAvailableTests{ private final Log logger = LogFactory.getLog(this.getClass()); - @Test + @Test @RedisAvailable public void testRedisInboundChannelAdapter() throws Exception { for (int iteration = 0; iteration < 10; iteration ++) { @@ -55,9 +56,7 @@ public class RedisInboundChannelAdapterTests extends RedisAvailableTests{ String redisChannelName = "testRedisInboundChannelAdapterChannel"; QueueChannel channel = new QueueChannel(); - JedisConnectionFactory connectionFactory = new JedisConnectionFactory(); - connectionFactory.setPort(7379); - connectionFactory.afterPropertiesSet(); + RedisConnectionFactory connectionFactory = this.getConnectionFactoryForTest(); RedisInboundChannelAdapter adapter = new RedisInboundChannelAdapter(connectionFactory); adapter.setTopics("testRedisInboundChannelAdapterChannel"); @@ -87,7 +86,6 @@ public class RedisInboundChannelAdapterTests extends RedisAvailableTests{ assertEquals(numToTest, counter); adapter.stop(); container.stop(); - connectionFactory.destroy(); } /** diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisStoreInboundChannelAdapterIntegrationTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisStoreInboundChannelAdapterIntegrationTests.java index 3fffaaad4e..2a08b908ee 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisStoreInboundChannelAdapterIntegrationTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisStoreInboundChannelAdapterIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2013 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,11 +19,12 @@ package org.springframework.integration.redis.inbound; 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 org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; +import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.support.collections.RedisList; import org.springframework.data.redis.support.collections.RedisZSet; import org.springframework.integration.Message; @@ -34,6 +35,7 @@ import org.springframework.integration.redis.rules.RedisAvailableTests; /** * @author Oleg Zhurakousky + * @author Artem Bilan * @since 2.2 */ public class RedisStoreInboundChannelAdapterIntegrationTests extends RedisAvailableTests{ @@ -42,7 +44,7 @@ public class RedisStoreInboundChannelAdapterIntegrationTests extends RedisAvaila @RedisAvailable @SuppressWarnings("unchecked") public void testListInboundConfiguration() throws Exception{ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); this.prepareList(jcf); ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("list-inbound-adapter.xml", this.getClass()); SourcePollingChannelAdapter spca = context.getBean("listAdapter", SourcePollingChannelAdapter.class); @@ -64,7 +66,7 @@ public class RedisStoreInboundChannelAdapterIntegrationTests extends RedisAvaila @RedisAvailable @SuppressWarnings("unchecked") public void testListInboundConfigurationWithSynchronization() throws Exception{ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); this.prepareList(jcf); ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("list-inbound-adapter.xml", this.getClass()); SourcePollingChannelAdapter spca = context.getBean("listAdapterWithSynchronization", SourcePollingChannelAdapter.class); @@ -87,7 +89,7 @@ public class RedisStoreInboundChannelAdapterIntegrationTests extends RedisAvaila @RedisAvailable @SuppressWarnings("unchecked") public void testListInboundConfigurationWithSynchronizationAndTemplate() throws Exception{ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); this.prepareList(jcf); ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("list-inbound-adapter.xml", this.getClass()); SourcePollingChannelAdapter spca = context.getBean("listAdapterWithSynchronizationAndRedisTemplate", SourcePollingChannelAdapter.class); @@ -110,7 +112,7 @@ public class RedisStoreInboundChannelAdapterIntegrationTests extends RedisAvaila @RedisAvailable @SuppressWarnings("unchecked") public void testZsetInboundConfiguration(){ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); this.prepareZset(jcf); ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("zset-inbound-adapter.xml", this.getClass()); SourcePollingChannelAdapter zsetAdapterNoScore = @@ -136,7 +138,7 @@ public class RedisStoreInboundChannelAdapterIntegrationTests extends RedisAvaila @RedisAvailable @SuppressWarnings("unchecked") public void testZsetInboundConfigurationWithScoreRange(){ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); this.prepareZset(jcf); ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("zset-inbound-adapter.xml", this.getClass()); SourcePollingChannelAdapter zsetAdapterWithScoreRange = @@ -162,7 +164,7 @@ public class RedisStoreInboundChannelAdapterIntegrationTests extends RedisAvaila @RedisAvailable @SuppressWarnings("unchecked") public void testZsetInboundConfigurationWithSingleScore(){ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); this.prepareZset(jcf); ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("zset-inbound-adapter.xml", this.getClass()); SourcePollingChannelAdapter zsetAdapterWithSingleScore = @@ -188,7 +190,7 @@ public class RedisStoreInboundChannelAdapterIntegrationTests extends RedisAvaila @RedisAvailable @SuppressWarnings("unchecked") public void testZsetInboundConfigurationWithSingleScoreAndSynchronization() throws Exception{ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); this.prepareZset(jcf); ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("zset-inbound-adapter.xml", this.getClass()); SourcePollingChannelAdapter zsetAdapterWithSingleScoreAndSynchronization = @@ -199,31 +201,33 @@ public class RedisStoreInboundChannelAdapterIntegrationTests extends RedisAvaila QueueChannel redisChannel = context.getBean("redisChannel", QueueChannel.class); QueueChannel otherRedisChannel = context.getBean("otherRedisChannel", QueueChannel.class); + // get all 13 presidents zsetAdapterNoScore.start(); - Message> message = (Message>) redisChannel.receive(1000); assertNotNull(message); assertEquals(13, message.getPayload().size()); - zsetAdapterNoScore.stop(); - Thread.sleep(1000); + // get only presidents for 18th century zsetAdapterWithSingleScoreAndSynchronization.start(); - message = (Message>) otherRedisChannel.receive(1000); assertNotNull(message); assertEquals(2, message.getPayload().rangeByScore(18, 18).size()); - zsetAdapterWithSingleScoreAndSynchronization.stop(); - Thread.sleep(1000); // ... however other elements are still available 13-2=11 zsetAdapterNoScore.start(); message = (Message>) redisChannel.receive(1000); assertNotNull(message); - assertEquals(11, message.getPayload().size()); + + int n = 0; + while(n++ < 100 && message.getPayload().size() != 11) { + Thread.sleep(100); + } + assertTrue(n < 100); zsetAdapterNoScore.stop(); + context.close(); } diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/list-inbound-adapter.xml b/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/list-inbound-adapter.xml index 644444be30..b40c91700f 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/list-inbound-adapter.xml +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/list-inbound-adapter.xml @@ -25,7 +25,7 @@ - + - + - + - + - + - + @@ -85,10 +85,10 @@ - - + + - + diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/zset-inbound-adapter.xml b/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/zset-inbound-adapter.xml index 5b2e28e8a4..3e54052054 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/zset-inbound-adapter.xml +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/zset-inbound-adapter.xml @@ -13,7 +13,7 @@ channel="redisChannel" auto-startup="false" collection-type="ZSET"> - + - + - + - + @@ -57,10 +57,11 @@ - - + + - + diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisPublishingMessageHandlerTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisPublishingMessageHandlerTests.java index 2e0a00b94a..71f4b97f77 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisPublishingMessageHandlerTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisPublishingMessageHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2007-2011 the original author or authors + * Copyright 2007-2013 the original author or authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,12 +16,15 @@ package org.springframework.integration.redis.outbound; +import static org.junit.Assert.assertTrue; + import java.util.Collections; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import org.junit.Test; -import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; + +import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.listener.ChannelTopic; import org.springframework.data.redis.listener.RedisMessageListenerContainer; import org.springframework.data.redis.listener.Topic; @@ -31,24 +34,20 @@ import org.springframework.integration.redis.rules.RedisAvailable; import org.springframework.integration.redis.rules.RedisAvailableTests; import org.springframework.integration.support.MessageBuilder; -import static org.junit.Assert.assertEquals; - /** * @author Mark Fisher * @since 2.1 */ -public class RedisPublishingMessageHandlerTests extends RedisAvailableTests{ +public class RedisPublishingMessageHandlerTests extends RedisAvailableTests { - @Test + @Test @RedisAvailable public void testRedisPublishingMessageHandler() throws Exception { int numToTest = 10; String topic = "si.test.channel"; final CountDownLatch latch = new CountDownLatch(numToTest); - JedisConnectionFactory connectionFactory = new JedisConnectionFactory(); - connectionFactory.setPort(7379); - connectionFactory.afterPropertiesSet(); + RedisConnectionFactory connectionFactory = this.getConnectionFactoryForTest(); MessageListenerAdapter listener = new MessageListenerAdapter(); listener.setDelegate(new Listener(latch)); @@ -67,8 +66,7 @@ public class RedisPublishingMessageHandlerTests extends RedisAvailableTests{ for (int i = 0; i < numToTest; i++) { handler.handleMessage(MessageBuilder.withPayload("test-" + i).build()); } - latch.await(3, TimeUnit.SECONDS); - assertEquals(0, latch.getCount()); + assertTrue(latch.await(3, TimeUnit.SECONDS)); container.stop(); } diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisStoreOutboundChannelAdapterIntegrationTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisStoreOutboundChannelAdapterIntegrationTests.java index 457c1c9e5a..33646a2153 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisStoreOutboundChannelAdapterIntegrationTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisStoreOutboundChannelAdapterIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2007-2012 the original author or authors + * Copyright 2007-2013 the original author or authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,9 +27,9 @@ import java.util.Properties; import java.util.Set; import org.junit.Test; + import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.data.redis.connection.RedisConnectionFactory; -import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.serializer.StringRedisSerializer; @@ -63,7 +63,7 @@ public class RedisStoreOutboundChannelAdapterIntegrationTests extends RedisAvail @Test @RedisAvailable public void testListWithKeyAsHeader(){ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); RedisList redisList = new DefaultRedisList("pepboys", this.initTemplate(jcf, new StringRedisTemplate())); @@ -84,7 +84,7 @@ public class RedisStoreOutboundChannelAdapterIntegrationTests extends RedisAvail @Test @RedisAvailable public void testListWithKeyAsHeaderSimple(){ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); StringRedisTemplate redisTemplate = new StringRedisTemplate(); RedisList redisList = @@ -103,7 +103,7 @@ public class RedisStoreOutboundChannelAdapterIntegrationTests extends RedisAvail @Test @RedisAvailable public void testListWithProvidedKey(){ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); RedisList redisList = new DefaultRedisList("pepboys", this.initTemplate(jcf, new StringRedisTemplate())); assertEquals(0, redisList.size()); @@ -123,7 +123,7 @@ public class RedisStoreOutboundChannelAdapterIntegrationTests extends RedisAvail @Test @RedisAvailable public void testZsetSimplePayloadIncrement(){ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); StringRedisTemplate redisTemplate = new StringRedisTemplate(); RedisZSet redisZSet = @@ -148,7 +148,7 @@ public class RedisStoreOutboundChannelAdapterIntegrationTests extends RedisAvail @Test @RedisAvailable public void testZsetSimplePayloadOverwrite(){ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); StringRedisTemplate redisTemplate = new StringRedisTemplate(); RedisZSet redisZSet = @@ -176,7 +176,7 @@ public class RedisStoreOutboundChannelAdapterIntegrationTests extends RedisAvail @Test @RedisAvailable public void testZsetSimplePayloadIncrementBy2(){ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); StringRedisTemplate redisTemplate = new StringRedisTemplate(); RedisZSet redisZSet = @@ -204,7 +204,7 @@ public class RedisStoreOutboundChannelAdapterIntegrationTests extends RedisAvail @Test @RedisAvailable public void testZsetSimplePayloadOverwriteWithHeaderScore(){ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); StringRedisTemplate redisTemplate = new StringRedisTemplate(); RedisZSet redisZSet = @@ -233,7 +233,7 @@ public class RedisStoreOutboundChannelAdapterIntegrationTests extends RedisAvail @Test @RedisAvailable public void testMapToZsetWithProvidedKey(){ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); RedisZSet redisZset = new DefaultRedisZSet("presidents", this.initTemplate(jcf, new StringRedisTemplate())); assertEquals(0, redisZset.size()); @@ -279,7 +279,7 @@ public class RedisStoreOutboundChannelAdapterIntegrationTests extends RedisAvail @Test @RedisAvailable public void testMapToMapWithProvidedKey(){ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); RedisMap redisMap = new DefaultRedisMap("pepboys", this.initTemplate(jcf, new StringRedisTemplate())); @@ -308,7 +308,7 @@ public class RedisStoreOutboundChannelAdapterIntegrationTests extends RedisAvail @Test(expected=MessageHandlingException.class) // map key is not provided @RedisAvailable public void testMapToMapAsSingleEntryWithKeyAsHeaderFail(){ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); RedisMap> redisMap = new DefaultRedisMap>("pepboys", this.initTemplate(jcf, new RedisTemplate>>())); @@ -330,7 +330,7 @@ public class RedisStoreOutboundChannelAdapterIntegrationTests extends RedisAvail @Test(expected=MessageHandlingException.class) // key is not provided @RedisAvailable public void testMapToMapNoKey(){ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); RedisTemplate>> redisTemplate = new RedisTemplate>>(); redisTemplate.setKeySerializer(new StringRedisSerializer()); redisTemplate.setHashKeySerializer(new StringRedisSerializer()); @@ -354,7 +354,7 @@ public class RedisStoreOutboundChannelAdapterIntegrationTests extends RedisAvail @Test @RedisAvailable public void testMapToMapAsSingleEntryWithKeyAsHeader(){ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); RedisTemplate>> redisTemplate = new RedisTemplate>>(); redisTemplate.setKeySerializer(new StringRedisSerializer()); redisTemplate.setHashKeySerializer(new StringRedisSerializer()); @@ -384,7 +384,7 @@ public class RedisStoreOutboundChannelAdapterIntegrationTests extends RedisAvail @Test @RedisAvailable public void testStoreSimpleStringInMap(){ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); StringRedisTemplate redisTemplate = new StringRedisTemplate(); RedisMap redisMap = new DefaultRedisMap("bar", @@ -406,7 +406,7 @@ public class RedisStoreOutboundChannelAdapterIntegrationTests extends RedisAvail @Test @RedisAvailable public void testSetWithKeyAsHeader(){ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); RedisSet redisSet = new DefaultRedisSet("pepboys", this.initTemplate(jcf, new StringRedisTemplate())); assertEquals(0, redisSet.size()); @@ -426,7 +426,7 @@ public class RedisStoreOutboundChannelAdapterIntegrationTests extends RedisAvail @Test @RedisAvailable public void testSetWithKeyAsHeaderSimple(){ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); StringRedisTemplate redisTemplate = new StringRedisTemplate(); RedisSet redisSet = new DefaultRedisSet("foo", this.initTemplate(jcf, redisTemplate)); @@ -445,7 +445,7 @@ public class RedisStoreOutboundChannelAdapterIntegrationTests extends RedisAvail @Test @RedisAvailable public void testSetWithKeyAsHeaderNotParsed(){ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); RedisTemplate redisTemplate = new RedisTemplate(); redisTemplate.setKeySerializer(new StringRedisSerializer()); redisTemplate.setHashKeySerializer(new StringRedisSerializer()); @@ -468,7 +468,7 @@ public class RedisStoreOutboundChannelAdapterIntegrationTests extends RedisAvail @Test @RedisAvailable public void testPojoIntoSet(){ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); RedisSet redisSet = new DefaultRedisSet("pepboys", this.initTemplate(jcf, new StringRedisTemplate())); assertEquals(0, redisSet.size()); @@ -485,7 +485,7 @@ public class RedisStoreOutboundChannelAdapterIntegrationTests extends RedisAvail @Test @RedisAvailable public void testProperties(){ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); RedisProperties redisProperties = new RedisProperties("pepboys", this.initTemplate(jcf, new StringRedisTemplate())); @@ -508,7 +508,7 @@ public class RedisStoreOutboundChannelAdapterIntegrationTests extends RedisAvail @Test @RedisAvailable public void testPropertiesSimple(){ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); StringRedisTemplate redisTemplate = new StringRedisTemplate(); RedisProperties redisProperties = new RedisProperties("foo", this.initTemplate(jcf, redisTemplate)); diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisStoreWritingMessageHandlerTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisStoreWritingMessageHandlerTests.java index bf8ce58bbe..c805f02ecd 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisStoreWritingMessageHandlerTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisStoreWritingMessageHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2013 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,7 +30,6 @@ import java.util.Set; import org.junit.Test; import org.springframework.data.redis.connection.RedisConnectionFactory; -import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.ZSetOperations.TypedTuple; @@ -58,7 +57,7 @@ public class RedisStoreWritingMessageHandlerTests extends RedisAvailableTests{ @Test @RedisAvailable public void testListWithListPayloadParsedAndProvidedKey() { - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); String key = "foo"; RedisList redisList = new DefaultRedisList(key, this.initTemplate(jcf, new StringRedisTemplate())); @@ -86,7 +85,7 @@ public class RedisStoreWritingMessageHandlerTests extends RedisAvailableTests{ @Test @RedisAvailable public void testListWithListPayloadParsedAndProvidedKeyAsHeader() { - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); String key = "foo"; RedisList redisList = new DefaultRedisList(key, this.initTemplate(jcf, new StringRedisTemplate())); @@ -114,7 +113,7 @@ public class RedisStoreWritingMessageHandlerTests extends RedisAvailableTests{ @RedisAvailable @Test(expected=MessageHandlingException.class) public void testListWithListPayloadParsedAndNoKey() { - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); String key = "foo"; RedisList redisList = new DefaultRedisList(key, this.initTemplate(jcf, new RedisTemplate())); @@ -136,7 +135,7 @@ public class RedisStoreWritingMessageHandlerTests extends RedisAvailableTests{ @Test @RedisAvailable public void testListWithListPayloadAsSingleEntry() { - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); String key = "foo"; RedisList> redisList = new DefaultRedisList>(key, this.initTemplate(jcf, new RedisTemplate>())); @@ -167,7 +166,7 @@ public class RedisStoreWritingMessageHandlerTests extends RedisAvailableTests{ @Test @RedisAvailable public void testZsetWithListPayloadParsedAndProvidedKeyDefault() { - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); String key = "foo"; RedisZSet redisZset = new DefaultRedisZSet(key, this.initTemplate(jcf, new StringRedisTemplate())); @@ -205,7 +204,7 @@ public class RedisStoreWritingMessageHandlerTests extends RedisAvailableTests{ @Test @RedisAvailable public void testZsetWithListPayloadParsedAndProvidedKeyScoreIncrement() { - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); String key = "foo"; RedisZSet redisZset = new DefaultRedisZSet(key, this.initTemplate(jcf, new StringRedisTemplate())); @@ -246,7 +245,7 @@ public class RedisStoreWritingMessageHandlerTests extends RedisAvailableTests{ @Test @RedisAvailable public void testZsetWithListPayloadParsedAndProvidedKeyScoreIncrementAsStringHeader() {// see INT-2775 - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); String key = "foo"; RedisZSet redisZset = new DefaultRedisZSet(key, this.initTemplate(jcf, new StringRedisTemplate())); @@ -287,7 +286,7 @@ public class RedisStoreWritingMessageHandlerTests extends RedisAvailableTests{ @Test @RedisAvailable public void testZsetWithListPayloadAsSingleEntryAndHeaderKeyHeaderScore() { - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); String key = "foo"; RedisZSet> redisZset = new DefaultRedisZSet>(key, this.initTemplate(jcf, new RedisTemplate>())); @@ -320,7 +319,7 @@ public class RedisStoreWritingMessageHandlerTests extends RedisAvailableTests{ @Test @RedisAvailable public void testZsetWithMapPayloadParsedHeaderKey() { - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); String key = "presidents"; RedisZSet redisZset = new DefaultRedisZSet(key, this.initTemplate(jcf, new StringRedisTemplate())); @@ -362,7 +361,7 @@ public class RedisStoreWritingMessageHandlerTests extends RedisAvailableTests{ @Test @RedisAvailable public void testZsetWithMapPayloadPojoParsedHeaderKey() { - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); String key = "presidents"; RedisZSet redisZset = new DefaultRedisZSet(key, this.initTemplate(jcf, new RedisTemplate())); @@ -405,7 +404,7 @@ public class RedisStoreWritingMessageHandlerTests extends RedisAvailableTests{ @Test @RedisAvailable public void testZsetWithMapPayloadPojoAsSingleEntryHeaderKey() { - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); String key = "presidents"; RedisZSet> redisZset = new DefaultRedisZSet>(key, this.initTemplate(jcf, new RedisTemplate>())); @@ -435,7 +434,7 @@ public class RedisStoreWritingMessageHandlerTests extends RedisAvailableTests{ @Test(expected=IllegalStateException.class) @RedisAvailable public void testListWithMapKeyExpression() { - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); String key = "foo"; RedisStoreWritingMessageHandler handler = new RedisStoreWritingMessageHandler(jcf); @@ -447,7 +446,7 @@ public class RedisStoreWritingMessageHandlerTests extends RedisAvailableTests{ @Test(expected=IllegalStateException.class) @RedisAvailable public void testSetWithMapKeyExpression() { - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); String key = "foo"; RedisStoreWritingMessageHandler handler = new RedisStoreWritingMessageHandler(jcf); @@ -460,7 +459,7 @@ public class RedisStoreWritingMessageHandlerTests extends RedisAvailableTests{ @Test(expected=IllegalStateException.class) @RedisAvailable public void testZsetWithMapKeyExpression() { - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); String key = "foo"; RedisStoreWritingMessageHandler handler = new RedisStoreWritingMessageHandler(jcf); @@ -473,7 +472,7 @@ public class RedisStoreWritingMessageHandlerTests extends RedisAvailableTests{ @Test @RedisAvailable public void testMapWithMapKeyExpression() { - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); String key = "foo"; RedisStoreWritingMessageHandler handler = new RedisStoreWritingMessageHandler(jcf); @@ -491,7 +490,7 @@ public class RedisStoreWritingMessageHandlerTests extends RedisAvailableTests{ @Test @RedisAvailable public void testPropertiesWithMapKeyExpression() { - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); String key = "foo"; RedisStoreWritingMessageHandler handler = new RedisStoreWritingMessageHandler(jcf); diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/store-outbound-adapter.xml b/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/store-outbound-adapter.xml index d7f91458d4..2599b28c2b 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/store-outbound-adapter.xml +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/store-outbound-adapter.xml @@ -61,8 +61,8 @@ map-key-expression="headers['baz']" collection-type="PROPERTIES"/> - - + + diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/rules/RedisAvailableRule.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/rules/RedisAvailableRule.java index 8abd67ecd7..a3b6c6a6e3 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/rules/RedisAvailableRule.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/rules/RedisAvailableRule.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2013 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,49 +15,71 @@ */ package org.springframework.integration.redis.rules; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.junit.Assume; import org.junit.rules.MethodRule; import org.junit.runners.model.FrameworkMethod; import org.junit.runners.model.Statement; -import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; + +import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; /** * @author Oleg Zhurakousky * @author Gunnar Hillert - * + * @author Artem Bilan */ -public final class RedisAvailableRule implements MethodRule{ +public final class RedisAvailableRule implements MethodRule { - private static final Log logger = LogFactory.getLog(RedisAvailableRule.class); + public static final int REDIS_PORT = 6379; - public static final int REDIS_PORT = 7379; + static ThreadLocal connectionFactoryResource = new ThreadLocal(); public Statement apply(final Statement base, final FrameworkMethod method, Object target) { - return new Statement(){ + RedisAvailable redisAvailable = method.getAnnotation(RedisAvailable.class); + if (redisAvailable != null) { + LettuceConnectionFactory connectionFactory = null; + try { + connectionFactory = new LettuceConnectionFactory(); + connectionFactory.setPort(REDIS_PORT); + connectionFactory.afterPropertiesSet(); + connectionFactory.getConnection(); + connectionFactoryResource.set(connectionFactory); + } + catch (Exception e) { + if (connectionFactory != null) { + connectionFactory.destroy(); + } + return new Statement() { + @Override + public void evaluate() throws Throwable { + Assume.assumeTrue("Skipping test due to Redis not being available on port: " + REDIS_PORT, false); + } + }; + } - @Override - public void evaluate() throws Throwable { - RedisAvailable redisAvailable = method.getAnnotation(RedisAvailable.class); - if (redisAvailable != null){ + return new Statement() { + @Override + public void evaluate() throws Throwable { try { - - JedisConnectionFactory connectionFactory = new JedisConnectionFactory(); - connectionFactory.setPort(REDIS_PORT); - connectionFactory.afterPropertiesSet(); - connectionFactory.getConnection(); - } catch (Exception e) { - if (logger.isWarnEnabled()) { - logger.warn(String.format("Redis is not available on " + - "port '%s'. Skipping the test.", REDIS_PORT)); + base.evaluate(); + } + finally { + LettuceConnectionFactory connectionFactory = connectionFactoryResource.get(); + connectionFactoryResource.remove(); + if (connectionFactory != null) { + connectionFactory.destroy(); } - return; } } + }; + } + + return new Statement() { + @Override + public void evaluate() throws Throwable { base.evaluate(); } }; - } } + diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/rules/RedisAvailableTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/rules/RedisAvailableTests.java index 3eb1d0bcb5..064f5cf3d7 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/rules/RedisAvailableTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/rules/RedisAvailableTests.java @@ -21,7 +21,8 @@ import org.junit.Rule; import org.springframework.dao.DataAccessException; import org.springframework.data.redis.connection.RedisConnection; -import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; +import org.springframework.data.redis.connection.RedisConnectionFactory; +import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; import org.springframework.data.redis.core.BoundListOperations; import org.springframework.data.redis.core.BoundZSetOperations; import org.springframework.data.redis.core.RedisCallback; @@ -31,21 +32,20 @@ import org.springframework.data.redis.core.StringRedisTemplate; /** * @author Oleg Zhurakousky * @author Gary Russell + * @author Artem Bilan * */ public class RedisAvailableTests { + @Rule public RedisAvailableRule redisAvailableRule = new RedisAvailableRule(); - @SuppressWarnings({ "rawtypes", "unchecked" }) - public JedisConnectionFactory getConnectionFactoryForTest(){ - JedisConnectionFactory jcf = new JedisConnectionFactory(); - jcf.setPort(7379); - jcf.afterPropertiesSet(); - RedisTemplate rt = new RedisTemplate(); - rt.setConnectionFactory(jcf); + public RedisConnectionFactory getConnectionFactoryForTest(){ + LettuceConnectionFactory connectionFactory = RedisAvailableRule.connectionFactoryResource.get(); + RedisTemplate rt = new RedisTemplate(); + rt.setConnectionFactory(connectionFactory); rt.afterPropertiesSet(); - rt.execute(new RedisCallback() { + rt.execute(new RedisCallback() { public Object doInRedis(RedisConnection connection) throws DataAccessException { @@ -53,13 +53,13 @@ public class RedisAvailableTests { return null; } }); - return jcf; + return connectionFactory; } - protected void prepareList(JedisConnectionFactory jcf){ + protected void prepareList(RedisConnectionFactory connectionFactory){ StringRedisTemplate redisTemplate = new StringRedisTemplate(); - redisTemplate.setConnectionFactory(jcf); + redisTemplate.setConnectionFactory(connectionFactory); redisTemplate.afterPropertiesSet(); BoundListOperations ops = redisTemplate.boundListOps("presidents"); @@ -80,10 +80,10 @@ public class RedisAvailableTests { ops.rightPush("George Washington"); } - protected void prepareZset(JedisConnectionFactory jcf){ + protected void prepareZset(RedisConnectionFactory connectionFactory){ StringRedisTemplate redisTemplate = new StringRedisTemplate(); - redisTemplate.setConnectionFactory(jcf); + redisTemplate.setConnectionFactory(connectionFactory); redisTemplate.afterPropertiesSet(); BoundZSetOperations ops = redisTemplate.boundZSetOps("presidents"); diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/DelayerHandlerRescheduleIntegrationTests-context.xml b/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/DelayerHandlerRescheduleIntegrationTests-context.xml index 00494293a3..a8c3317e1d 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/DelayerHandlerRescheduleIntegrationTests-context.xml +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/DelayerHandlerRescheduleIntegrationTests-context.xml @@ -5,12 +5,8 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd"> - - - - - + diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/DelayerHandlerRescheduleIntegrationTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/DelayerHandlerRescheduleIntegrationTests.java index ad4d9123a1..7dcd7483e2 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/DelayerHandlerRescheduleIntegrationTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/DelayerHandlerRescheduleIntegrationTests.java @@ -21,17 +21,20 @@ import static org.junit.Assert.fail; import java.util.concurrent.TimeUnit; +import org.junit.BeforeClass; import org.junit.Rule; import org.junit.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; +import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; import org.springframework.integration.Message; import org.springframework.integration.MessageChannel; import org.springframework.integration.context.IntegrationContextUtils; import org.springframework.integration.core.PollableChannel; import org.springframework.integration.handler.DelayHandler; import org.springframework.integration.redis.rules.RedisAvailable; +import org.springframework.integration.redis.rules.RedisAvailableRule; import org.springframework.integration.redis.rules.RedisAvailableTests; import org.springframework.integration.store.MessageGroup; import org.springframework.integration.store.MessageGroupStore; @@ -47,9 +50,22 @@ public class DelayerHandlerRescheduleIntegrationTests extends RedisAvailableTest public static final String DELAYER_ID = "delayerWithRedisMS"; + public static LettuceConnectionFactory connectionFactory; + @Rule public LongRunningIntegrationTest longTests = new LongRunningIntegrationTest(); + @BeforeClass + public static void setup() { + connectionFactory = new LettuceConnectionFactory(); + connectionFactory.setPort(RedisAvailableRule.REDIS_PORT); + connectionFactory.afterPropertiesSet(); + } + + public static void tearDown() { + connectionFactory.destroy(); + } + @Test @RedisAvailable public void testDelayerHandlerRescheduleWithRedisMessageStore() throws Exception { diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/RedisMessageGroupStoreTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/RedisMessageGroupStoreTests.java index 99e2ee90c4..745ad1b646 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/RedisMessageGroupStoreTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/RedisMessageGroupStoreTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2007-2012 the original author or authors + * Copyright 2007-2013 the original author or authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,13 +29,11 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import junit.framework.AssertionFailedError; - import org.junit.Ignore; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; +import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.integration.Message; import org.springframework.integration.MessageChannel; import org.springframework.integration.channel.DirectChannel; @@ -48,6 +46,8 @@ import org.springframework.integration.store.MessageGroup; import org.springframework.integration.store.SimpleMessageGroup; import org.springframework.integration.support.MessageBuilder; +import junit.framework.AssertionFailedError; + /** * @author Oleg Zhurakousky * @@ -57,7 +57,7 @@ public class RedisMessageGroupStoreTests extends RedisAvailableTests { @Test @RedisAvailable public void testNonExistingEmptyMessageGroup() throws Exception{ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); RedisMessageStore store = new RedisMessageStore(jcf); MessageGroup messageGroup = store.getMessageGroup(1); @@ -69,7 +69,7 @@ public class RedisMessageGroupStoreTests extends RedisAvailableTests { @Test @RedisAvailable public void testMessageGroupUpdatedDateChangesWithEachAddedMessage() throws Exception{ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); RedisMessageStore store = new RedisMessageStore(jcf); MessageGroup messageGroup = store.getMessageGroup(1); @@ -96,7 +96,7 @@ public class RedisMessageGroupStoreTests extends RedisAvailableTests { @Test @RedisAvailable public void testMessageGroupWithAddedMessage() throws Exception{ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); RedisMessageStore store = new RedisMessageStore(jcf); MessageGroup messageGroup = store.getMessageGroup(1); @@ -114,7 +114,7 @@ public class RedisMessageGroupStoreTests extends RedisAvailableTests { @Test @RedisAvailable public void testRemoveMessageGroup() throws Exception{ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); RedisMessageStore store = new RedisMessageStore(jcf); MessageGroup messageGroup = store.getMessageGroup(1); @@ -141,7 +141,7 @@ public class RedisMessageGroupStoreTests extends RedisAvailableTests { @Test @RedisAvailable public void testCompleteMessageGroup() throws Exception{ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); RedisMessageStore store = new RedisMessageStore(jcf); MessageGroup messageGroup = store.getMessageGroup(1); @@ -155,7 +155,7 @@ public class RedisMessageGroupStoreTests extends RedisAvailableTests { @Test @RedisAvailable public void testLastReleasedSequenceNumber() throws Exception{ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); RedisMessageStore store = new RedisMessageStore(jcf); MessageGroup messageGroup = store.getMessageGroup(1); @@ -169,7 +169,7 @@ public class RedisMessageGroupStoreTests extends RedisAvailableTests { @Test @RedisAvailable public void testRemoveMessageFromTheGroup() throws Exception{ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); RedisMessageStore store = new RedisMessageStore(jcf); MessageGroup messageGroup = store.getMessageGroup(1); @@ -192,7 +192,7 @@ public class RedisMessageGroupStoreTests extends RedisAvailableTests { @Test @RedisAvailable public void testWithMessageHistory() throws Exception{ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); RedisMessageStore store = new RedisMessageStore(jcf); store.getMessageGroup(1); @@ -219,7 +219,7 @@ public class RedisMessageGroupStoreTests extends RedisAvailableTests { @Test @RedisAvailable public void testRemoveNonExistingMessageFromTheGroup() throws Exception{ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); RedisMessageStore store = new RedisMessageStore(jcf); MessageGroup messageGroup = store.getMessageGroup(1); @@ -230,7 +230,7 @@ public class RedisMessageGroupStoreTests extends RedisAvailableTests { @Test @RedisAvailable public void testRemoveNonExistingMessageFromNonExistingTheGroup() throws Exception{ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); RedisMessageStore store = new RedisMessageStore(jcf); store.removeMessageFromGroup(1, new GenericMessage("2")); } @@ -240,7 +240,7 @@ public class RedisMessageGroupStoreTests extends RedisAvailableTests { @Test @RedisAvailable public void testMultipleInstancesOfGroupStore() throws Exception{ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); RedisMessageStore store1 = new RedisMessageStore(jcf); RedisMessageStore store2 = new RedisMessageStore(jcf); @@ -261,7 +261,7 @@ public class RedisMessageGroupStoreTests extends RedisAvailableTests { @Test @RedisAvailable public void testIteratorOfMessageGroups() throws Exception{ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); RedisMessageStore store1 = new RedisMessageStore(jcf); RedisMessageStore store2 = new RedisMessageStore(jcf); @@ -303,7 +303,7 @@ public class RedisMessageGroupStoreTests extends RedisAvailableTests { @Test @RedisAvailable @Ignore public void testConcurrentModifications() throws Exception{ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); final RedisMessageStore store1 = new RedisMessageStore(jcf); final RedisMessageStore store2 = new RedisMessageStore(jcf); diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/RedisMessageStoreTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/RedisMessageStoreTests.java index a8b76609af..22c3ee8959 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/RedisMessageStoreTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/RedisMessageStoreTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2007-2011 the original author or authors + * Copyright 2007-2013 the original author or authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,13 +15,18 @@ */ package org.springframework.integration.redis.store; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertNull; + import java.io.Serializable; import java.util.Properties; import java.util.UUID; import org.junit.Test; -import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; +import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.integration.Message; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.history.MessageHistory; @@ -29,11 +34,6 @@ import org.springframework.integration.message.GenericMessage; import org.springframework.integration.redis.rules.RedisAvailable; import org.springframework.integration.redis.rules.RedisAvailableTests; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertNull; - /** * @author Oleg Zhurakousky * @@ -42,62 +42,62 @@ public class RedisMessageStoreTests extends RedisAvailableTests { @Test @RedisAvailable - public void testGetNonExistingMessage(){ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + public void testGetNonExistingMessage(){ + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); RedisMessageStore store = new RedisMessageStore(jcf); Message message = store.getMessage(UUID.randomUUID()); assertNull(message); } - + @Test @RedisAvailable - public void testGetMessageCountWhenEmpty(){ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + public void testGetMessageCountWhenEmpty(){ + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); RedisMessageStore store = new RedisMessageStore(jcf); assertEquals(0, store.getMessageCount()); } - + @Test @RedisAvailable - public void testAddStringMessage(){ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + public void testAddStringMessage(){ + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); RedisMessageStore store = new RedisMessageStore(jcf); Message stringMessage = new GenericMessage("Hello Redis"); Message storedMessage = store.addMessage(stringMessage); assertNotSame(stringMessage, storedMessage); assertEquals("Hello Redis", storedMessage.getPayload()); } - + @Test @RedisAvailable - public void testAddSerializableObjectMessage(){ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + public void testAddSerializableObjectMessage(){ + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); RedisMessageStore store = new RedisMessageStore(jcf); Address address = new Address(); address.setAddress("1600 Pennsylvania Av, Washington, DC"); Person person = new Person(address, "Barak Obama"); - + Message objectMessage = new GenericMessage(person); Message storedMessage = store.addMessage(objectMessage); assertNotSame(objectMessage, storedMessage); assertEquals("Barak Obama", storedMessage.getPayload().getName()); } - + @Test(expected=IllegalArgumentException.class) @RedisAvailable - public void testAddNonSerializableObjectMessage(){ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + public void testAddNonSerializableObjectMessage(){ + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); RedisMessageStore store = new RedisMessageStore(jcf); - + Message objectMessage = new GenericMessage(new Foo()); store.addMessage(objectMessage); } - + @SuppressWarnings("unchecked") @Test @RedisAvailable - public void testAddAndGetStringMessage(){ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + public void testAddAndGetStringMessage(){ + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); RedisMessageStore store = new RedisMessageStore(jcf); Message stringMessage = new GenericMessage("Hello Redis"); store.addMessage(stringMessage); @@ -108,8 +108,8 @@ public class RedisMessageStoreTests extends RedisAvailableTests { @SuppressWarnings("unchecked") @Test @RedisAvailable - public void testAddAndRemoveStringMessage(){ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + public void testAddAndRemoveStringMessage(){ + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); RedisMessageStore store = new RedisMessageStore(jcf); Message stringMessage = new GenericMessage("Hello Redis"); store.addMessage(stringMessage); @@ -118,19 +118,19 @@ public class RedisMessageStoreTests extends RedisAvailableTests { assertEquals("Hello Redis", retrievedMessage.getPayload()); assertNull(store.getMessage(stringMessage.getHeaders().getId())); } - + @Test @RedisAvailable - public void testWithMessageHistory() throws Exception{ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + public void testWithMessageHistory() throws Exception{ + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); RedisMessageStore store = new RedisMessageStore(jcf); - + Message message = new GenericMessage("Hello"); DirectChannel fooChannel = new DirectChannel(); fooChannel.setBeanName("fooChannel"); DirectChannel barChannel = new DirectChannel(); barChannel.setBeanName("barChannel"); - + message = MessageHistory.write(message, fooChannel); message = MessageHistory.write(message, barChannel); store.addMessage(message); @@ -142,7 +142,7 @@ public class RedisMessageStoreTests extends RedisAvailableTests { assertEquals("fooChannel", fooChannelHistory.get("name")); assertEquals("channel", fooChannelHistory.get("type")); } - + @SuppressWarnings("serial") public static class Person implements Serializable{ private Address address; @@ -176,8 +176,8 @@ public class RedisMessageStoreTests extends RedisAvailableTests { this.address = address; } } - + public static class Foo{ - + } } diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/metadata/RedisMetadataStoreTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/metadata/RedisMetadataStoreTests.java index c19191bdb1..2e57b9c1b2 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/metadata/RedisMetadataStoreTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/metadata/RedisMetadataStoreTests.java @@ -20,7 +20,8 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; import org.junit.Test; -import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; + +import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.core.BoundValueOperations; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.integration.redis.rules.RedisAvailable; @@ -36,7 +37,7 @@ public class RedisMetadataStoreTests extends RedisAvailableTests { @Test @RedisAvailable public void testGetNonExistingKeyValue(){ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); RedisMetadataStore metadataStore = new RedisMetadataStore(jcf); String retrievedValue = metadataStore.get("does-not-exist"); assertNull(retrievedValue); @@ -45,7 +46,7 @@ public class RedisMetadataStoreTests extends RedisAvailableTests { @Test @RedisAvailable public void testPersistKeyValue(){ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); RedisMetadataStore metadataStore = new RedisMetadataStore(jcf); metadataStore.put("RedisMetadataStoreTests-Spring", "Integration"); @@ -59,7 +60,7 @@ public class RedisMetadataStoreTests extends RedisAvailableTests { @RedisAvailable public void testGetValueFromMetadataStore(){ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); RedisMetadataStore metadataStore = new RedisMetadataStore(jcf); metadataStore.put("RedisMetadataStoreTests-GetValue", "Hello Redis"); @@ -71,7 +72,7 @@ public class RedisMetadataStoreTests extends RedisAvailableTests { @RedisAvailable public void testPersistEmptyStringToMetadataStore(){ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); RedisMetadataStore metadataStore = new RedisMetadataStore(jcf); metadataStore.put("RedisMetadataStoreTests-PersistEmpty", ""); @@ -83,7 +84,7 @@ public class RedisMetadataStoreTests extends RedisAvailableTests { @RedisAvailable public void testPersistNullStringToMetadataStore(){ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); RedisMetadataStore metadataStore = new RedisMetadataStore(jcf); try { @@ -101,7 +102,7 @@ public class RedisMetadataStoreTests extends RedisAvailableTests { @Test @RedisAvailable public void testPersistWithEmptyKeyToMetadataStore(){ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); RedisMetadataStore metadataStore = new RedisMetadataStore(jcf); metadataStore.put("", "PersistWithEmptyKey"); @@ -112,7 +113,7 @@ public class RedisMetadataStoreTests extends RedisAvailableTests { @Test @RedisAvailable public void testPersistWithNullKeyToMetadataStore(){ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); RedisMetadataStore metadataStore = new RedisMetadataStore(jcf); try { @@ -129,7 +130,7 @@ public class RedisMetadataStoreTests extends RedisAvailableTests { @Test @RedisAvailable public void testGetValueWithNullKeyFromMetadataStore(){ - JedisConnectionFactory jcf = this.getConnectionFactoryForTest(); + RedisConnectionFactory jcf = this.getConnectionFactoryForTest(); RedisMetadataStore metadataStore = new RedisMetadataStore(jcf); try { diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/redis-aggregator-config.xml b/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/redis-aggregator-config.xml index dd653cc2d5..f6a57d6ca3 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/redis-aggregator-config.xml +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/redis-aggregator-config.xml @@ -4,19 +4,19 @@ xmlns:int="http://www.springframework.org/schema/integration" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd"> - + - + - + - - - + + + diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceWithRedisTests-context.xml b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceWithRedisTests-context.xml index ff71c8a29a..1dcc01831e 100644 --- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceWithRedisTests-context.xml +++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceWithRedisTests-context.xml @@ -25,9 +25,10 @@ - + +