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

INT-1614 synchronize method now accepts the loacl directory as an argument rather than having its own direct reference

Browse Source
This commit is contained in:
Mark Fisher
2010-11-19 09:10:31 -05:00
parent e177797aef
commit 2c2d2fd38a
8 changed files with 13 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpInboundSynchronizingMessageSourceFactoryBean.java
View File

@@ -128,7 +128,6 @@ class FtpInboundSynchronizingMessageSourceFactoryBean
QueuedFtpClientPool queuedFtpClientPool = new QueuedFtpClientPool(15, this.clientFactory);
FtpInboundRemoteFileSystemSynchronizer synchronizer = new FtpInboundRemoteFileSystemSynchronizer();
synchronizer.setClientPool(queuedFtpClientPool);
synchronizer.setLocalDirectory(this.localDirectoryResource);
synchronizer.setShouldDeleteSourceFile(ackRemoteDir);
synchronizer.setFilter(compositeFilter);
messageSource.setRemotePredicate(compositeFilter);

4
spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizer.java
View File

@@ -62,7 +62,7 @@ public class FtpInboundRemoteFileSystemSynchronizer extends AbstractInboundRemot
}
@Override
protected void syncRemoteToLocalFileSystem() {
protected void syncRemoteToLocalFileSystem(Resource localDirectory) {
try {
FTPClient client = this.clientPool.getClient();
Assert.state(client != null,
@@ -73,7 +73,7 @@ public class FtpInboundRemoteFileSystemSynchronizer extends AbstractInboundRemot
try {
for (FTPFile ftpFile : fileList) {
if ((ftpFile != null) && ftpFile.isFile()) {
copyFileToLocalDirectory(client, ftpFile, this.getLocalDirectory());
copyFileToLocalDirectory(client, ftpFile, localDirectory);
}
}
}

6
spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizerTest.java
View File

@@ -29,6 +29,7 @@ import org.junit.Test;
import org.mockito.Mockito;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.io.Resource;
import org.springframework.integration.file.filters.FileListFilter;
import org.springframework.integration.ftp.client.DefaultFtpClientFactory;
import org.springframework.integration.ftp.client.QueuedFtpClientPool;
@@ -48,9 +49,7 @@ public class FtpInboundRemoteFileSystemSynchronizerTest {
file.delete();
}
FtpInboundRemoteFileSystemSynchronizer syncronizer = new FtpInboundRemoteFileSystemSynchronizer();
syncronizer.setLocalDirectory(new FileSystemResource(System.getProperty("java.io.tmpdir")));
FileListFilter filter = new FtpPatternMatchingFileListFilter("foo.txt");
//
syncronizer.setFilter(filter);
DefaultFtpClientFactory factory = mock(DefaultFtpClientFactory.class);
@@ -71,7 +70,8 @@ public class FtpInboundRemoteFileSystemSynchronizerTest {
syncronizer.setShouldDeleteSourceFile(true);
syncronizer.afterPropertiesSet();
syncronizer.syncRemoteToLocalFileSystem();
Resource localDirectory = new FileSystemResource(System.getProperty("java.io.tmpdir"));
syncronizer.syncRemoteToLocalFileSystem(localDirectory);
verify(ftpClient, times(1)).retrieveFile(Mockito.anyString(), Mockito.any(OutputStream.class));
verify(ftpClient, times(1)).deleteFile(Mockito.anyString());