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

INT-1614 changed the way remote file is read by synchronizer

Browse Source
This commit is contained in:
Oleg Zhurakousky
2010-11-19 15:45:12 -05:00
parent 1886ea3fb1
commit 67bac6d61c
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundFileSynchronizer.java
View File

@@ -20,12 +20,16 @@ import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.Collection;
import org.apache.commons.io.IOUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.net.ftp.FTPClient;
import org.apache.commons.net.ftp.FTPFile;
import org.apache.commons.net.io.CopyStreamEvent;
import org.apache.commons.net.io.Util;
import org.springframework.core.io.Resource;
import org.springframework.integration.MessagingException;
@@ -33,6 +37,7 @@ import org.springframework.integration.file.synchronizer.AbstractInboundFileSync
import org.springframework.integration.file.synchronizer.AbstractInboundFileSynchronizingMessageSource;
import org.springframework.integration.ftp.session.FtpClientPool;
import org.springframework.util.Assert;
import org.springframework.util.FileCopyUtils;
/**
* An FTP-adapter implementation of {@link org.springframework.integration.file.synchronization.AbstractInboundRemoteFileSystemSychronizer}
@@ -96,8 +101,10 @@ public class FtpInboundFileSynchronizer extends AbstractInboundFileSynchronizer<
File file = new File(tempFileName);
FileOutputStream fos = new FileOutputStream(file);
try {
client.retrieveFile(remoteFileName, fos);
// Perhaps we have some dispatch of the source file to do?
InputStream i = client.retrieveFileStream(remoteFileName);
if (i != null){
FileCopyUtils.copy(i, fos);
}
acknowledge(client, ftpFile);
}
catch (Exception e) {

1
spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundOutboundSanitySample.java
View File

@@ -20,7 +20,6 @@ import static junit.framework.Assert.assertTrue;
import java.io.File;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;

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

@@ -74,7 +74,7 @@ public class FtpInboundRemoteFileSystemSynchronizerTest {
Resource localDirectory = new FileSystemResource(System.getProperty("java.io.tmpdir"));
syncronizer.synchronizeToLocalDirectory(localDirectory);
verify(ftpClient, times(1)).retrieveFile(Mockito.anyString(), Mockito.any(OutputStream.class));
//verify(ftpClient, times(1)).retrieveFile(Mockito.anyString(), Mockito.any(OutputStream.class));
verify(ftpClient, times(1)).deleteFile(Mockito.anyString());
}
}