Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-152: Scanner & filters are mutually exclusive

Browse Source 
Fix spring-projects/spring-integration-java-dsl#152

* Add Logic to the `FileInboundChannelAdapterSpec` do not populate
`FileListFilterFactoryBean` to the `FileReadingMessageSource`
when the `scanner` is provided.
Otherwise call the `FileReadingMessageSource` and rely on its logic to
refuse mutually exclusive `scanner` and `filter/locker` options
This commit is contained in:
Artem Bilan
2017-07-31 10:52:29 -04:00
parent 0f78d4b2ec
commit f00eafb4f8
2 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-integration-file/src/test/java/org/springframework/integration/file/dsl/FileTests.java
View File

@@ -47,6 +47,7 @@ import org.junit.runner.RunWith;
import org.springframework.aop.TargetSource;
import org.springframework.aop.framework.Advised;
import org.springframework.beans.DirectFieldAccessor;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.ListableBeanFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -67,6 +68,7 @@ import org.springframework.integration.dsl.Pollers;
import org.springframework.integration.dsl.StandardIntegrationFlow;
import org.springframework.integration.dsl.channel.MessageChannels;
import org.springframework.integration.expression.FunctionExpression;
import org.springframework.integration.file.DefaultDirectoryScanner;
import org.springframework.integration.file.DefaultFileNameGenerator;
import org.springframework.integration.file.FileHeaders;
import org.springframework.integration.file.FileReadingMessageSource;
@@ -403,13 +405,16 @@ public class FileTests {
@Bean
public IntegrationFlow fileSplitterFlow() {
public IntegrationFlow fileSplitterFlow(BeanFactory beanFactory) {
ExpressionFileListFilter<File> fileExpressionFileListFilter =
new ExpressionFileListFilter<>(new FunctionExpression<File>(f -> "foo.tmp".equals(f.getName())));
fileExpressionFileListFilter.setBeanFactory(beanFactory);
return IntegrationFlows
.from(Files.inboundAdapter(tmpDir.getRoot())
.filter(new ChainFileListFilter<File>()
.addFilter(new AcceptOnceFileListFilter<>())
.addFilter(new ExpressionFileListFilter<>(
new FunctionExpression<File>(f -> "foo.tmp".equals(f.getName()))))),
.addFilter(fileExpressionFileListFilter)),
e -> e.poller(p -> p.fixedDelay(100)))
.split(Files.splitter()
.markers()
@@ -440,7 +445,8 @@ public class FileTests {
void pollDirectories(File... directories) {
for (File directory : directories) {
StandardIntegrationFlow integrationFlow = IntegrationFlows
.from(Files.inboundAdapter(directory),
.from(Files.inboundAdapter(directory)
.scanner(new DefaultDirectoryScanner()),
e -> e.poller(p -> p.fixedDelay(1000))
.id(directory.getName() + ".adapter"))
.transform(Files.toStringTransformer(),