From b0f336cf6e82d2be35c3420dac4a15a16a8ae2a8 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Mon, 3 Nov 2008 15:37:03 +0000 Subject: [PATCH] Renamed PollableFileSource to FileReadingMessageSource. --- .../integration/file/AcceptOnceFileListFilter.java | 2 +- ...{PollableFileSource.java => FileReadingMessageSource.java} | 4 ++-- .../file/config/FileInboundChannelAdapterParser.java | 4 ++-- .../file/PollableFileSourceIntegrationTests-context.xml | 2 +- .../integration/file/PollableFileSourceIntegrationTests.java | 2 +- .../integration/file/PollableFileSourceTests.java | 4 ++-- .../file/config/FileInboundChannelAdapterParserTests.java | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) rename org.springframework.integration.file/src/main/java/org/springframework/integration/file/{PollableFileSource.java => FileReadingMessageSource.java} (96%) diff --git a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/AcceptOnceFileListFilter.java b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/AcceptOnceFileListFilter.java index 04b87b9364..ec2afba1f1 100644 --- a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/AcceptOnceFileListFilter.java +++ b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/AcceptOnceFileListFilter.java @@ -23,7 +23,7 @@ import java.util.concurrent.LinkedBlockingQueue; /** * {@link FileListFilter} that passes files only one time. This can * conveniently be used to prevent duplication of files, as is done in - * {@link PollableFileSource}. + * {@link FileReadingMessageSource}. * * @author Iwein Fuld */ diff --git a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/PollableFileSource.java b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/FileReadingMessageSource.java similarity index 96% rename from org.springframework.integration.file/src/main/java/org/springframework/integration/file/PollableFileSource.java rename to org.springframework.integration.file/src/main/java/org/springframework/integration/file/FileReadingMessageSource.java index 1390985096..e0f38ab5c0 100644 --- a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/PollableFileSource.java +++ b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/FileReadingMessageSource.java @@ -52,9 +52,9 @@ import org.springframework.util.Assert; * * @author Iwein Fuld */ -public class PollableFileSource implements MessageSource, MessageDeliveryAware { +public class FileReadingMessageSource implements MessageSource, MessageDeliveryAware { - private static final Log logger = LogFactory.getLog(PollableFileSource.class); + private static final Log logger = LogFactory.getLog(FileReadingMessageSource.class); private volatile File inputDirectory; diff --git a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/FileInboundChannelAdapterParser.java b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/FileInboundChannelAdapterParser.java index 9d21852a3c..0f2426bb73 100644 --- a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/FileInboundChannelAdapterParser.java +++ b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/FileInboundChannelAdapterParser.java @@ -27,7 +27,7 @@ import org.springframework.integration.config.xml.AbstractPollingInboundChannelA import org.springframework.integration.file.AcceptOnceFileListFilter; import org.springframework.integration.file.CompositeFileListFilter; import org.springframework.integration.file.PatternMatchingFileListFilter; -import org.springframework.integration.file.PollableFileSource; +import org.springframework.integration.file.FileReadingMessageSource; import org.springframework.util.Assert; import org.springframework.util.StringUtils; @@ -41,7 +41,7 @@ public class FileInboundChannelAdapterParser extends AbstractPollingInboundChann @Override protected String parseSource(Element element, ParserContext parserContext) { - BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(PollableFileSource.class); + BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(FileReadingMessageSource.class); String directory = element.getAttribute("directory"); if (StringUtils.hasText(directory)) { builder.addPropertyValue("inputDirectory", directory); diff --git a/org.springframework.integration.file/src/test/java/org/springframework/integration/file/PollableFileSourceIntegrationTests-context.xml b/org.springframework.integration.file/src/test/java/org/springframework/integration/file/PollableFileSourceIntegrationTests-context.xml index 2c83ef37bb..1f39e526bc 100644 --- a/org.springframework.integration.file/src/test/java/org/springframework/integration/file/PollableFileSourceIntegrationTests-context.xml +++ b/org.springframework.integration.file/src/test/java/org/springframework/integration/file/PollableFileSourceIntegrationTests-context.xml @@ -6,7 +6,7 @@ http://www.springframework.org/schema/beans/spring-beans.xsd"> - diff --git a/org.springframework.integration.file/src/test/java/org/springframework/integration/file/PollableFileSourceIntegrationTests.java b/org.springframework.integration.file/src/test/java/org/springframework/integration/file/PollableFileSourceIntegrationTests.java index 914533a488..56e16f37d2 100644 --- a/org.springframework.integration.file/src/test/java/org/springframework/integration/file/PollableFileSourceIntegrationTests.java +++ b/org.springframework.integration.file/src/test/java/org/springframework/integration/file/PollableFileSourceIntegrationTests.java @@ -46,7 +46,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; public class PollableFileSourceIntegrationTests { @Autowired - PollableFileSource pollableFileSource; + FileReadingMessageSource pollableFileSource; private static File inputDir; diff --git a/org.springframework.integration.file/src/test/java/org/springframework/integration/file/PollableFileSourceTests.java b/org.springframework.integration.file/src/test/java/org/springframework/integration/file/PollableFileSourceTests.java index b961bd1916..2c3648fa26 100644 --- a/org.springframework.integration.file/src/test/java/org/springframework/integration/file/PollableFileSourceTests.java +++ b/org.springframework.integration.file/src/test/java/org/springframework/integration/file/PollableFileSourceTests.java @@ -33,7 +33,7 @@ import org.springframework.integration.core.Message; @SuppressWarnings("unchecked") public class PollableFileSourceTests { - private PollableFileSource pollableFileSource; + private FileReadingMessageSource pollableFileSource; private File inputDirectoryMock = createMock(File.class); @@ -53,7 +53,7 @@ public class PollableFileSourceTests { @Before public void initialize() throws Exception { prepResource(); - this.pollableFileSource = new PollableFileSource(); + this.pollableFileSource = new FileReadingMessageSource(); pollableFileSource.setInputDirectory(inputDirectoryResourceMock); reset(allMocks); } diff --git a/org.springframework.integration.file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterParserTests.java b/org.springframework.integration.file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterParserTests.java index f6bfc99bb2..3e3402420b 100644 --- a/org.springframework.integration.file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterParserTests.java +++ b/org.springframework.integration.file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterParserTests.java @@ -28,7 +28,7 @@ import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.file.CompositeFileListFilter; -import org.springframework.integration.file.PollableFileSource; +import org.springframework.integration.file.FileReadingMessageSource; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -43,7 +43,7 @@ public class FileInboundChannelAdapterParserTests { MessageChannel channel; @Autowired(required=true) - PollableFileSource source; + FileReadingMessageSource source; DirectFieldAccessor accessor;