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

Downgrade to Reactor-3.1.0.M1

Browse Source 
https://build.spring.io/browse/INT-MASTER-675/

Since SF is still based on the `Bismuth-M1`,
we can't afford ourselves to go to `BUILD-SNAPSHOT` yet

Also fix `FileTests` do not poll the same file again for `splitter` case
This commit is contained in:
Artem Bilan
2017-05-23 11:08:42 -04:00
parent 94e5271a57
commit c8aafde20b
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -125,7 +125,7 @@ subprojects { subproject ->
pahoMqttClientVersion = '1.1.1'
postgresVersion = '42.0.0'
reactorNettyVersion = '0.6.3.RELEASE'
reactorVersion = '3.1.0.BUILD-SNAPSHOT'
reactorVersion = '3.1.0.M1'
romeToolsVersion = '1.7.2'
servletApiVersion = '3.1.0'
slf4jVersion = "1.7.25"

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

@@ -65,9 +65,13 @@ import org.springframework.integration.dsl.IntegrationFlows;
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.DefaultFileNameGenerator;
import org.springframework.integration.file.FileHeaders;
import org.springframework.integration.file.FileReadingMessageSource;
import org.springframework.integration.file.filters.AcceptOnceFileListFilter;
import org.springframework.integration.file.filters.ChainFileListFilter;
import org.springframework.integration.file.filters.ExpressionFileListFilter;
import org.springframework.integration.file.splitter.FileSplitter;
import org.springframework.integration.file.support.FileExistsMode;
import org.springframework.integration.file.tail.ApacheCommonsFileTailingMessageProducer;
@@ -395,7 +399,10 @@ public class FileTests {
public IntegrationFlow fileSplitterFlow() {
return IntegrationFlows
.from(Files.inboundAdapter(tmpDir.getRoot())
.filterFunction(f -> "foo.tmp".equals(f.getName())),
.filter(new ChainFileListFilter<File>()
.addFilter(new AcceptOnceFileListFilter<>())
.addFilter(new ExpressionFileListFilter<>(
new FunctionExpression<File>(f -> "foo.tmp".equals(f.getName()))))),
e -> e.poller(p -> p.fixedDelay(100)))
.split(Files.splitter()
.markers()