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

Complete - task 6: Create PollableFileSource

Browse Source 
Last review done by Mark and Arjen, modification time concern pushed out.
Added parameter to MessageDeliveryAware
This commit is contained in:
Iwein Fuld
2008-09-11 13:40:12 +00:00
parent 61ed767cdb
commit 0f9dc8c750
10 changed files with 145 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/file/AbstractDirectorySource.java
View File

@@ -37,7 +37,7 @@ import org.springframework.util.Assert;
* @author Marius Bogoevici
* @author Iwein Fuld
*/
public abstract class AbstractDirectorySource<T> implements PollableSource<T>, MessageDeliveryAware {
public abstract class AbstractDirectorySource<T> implements PollableSource<T>, MessageDeliveryAware<T> {
public final static String FILE_INFO_PROPERTY = "file.info";
@@ -99,14 +99,14 @@ public abstract class AbstractDirectorySource<T> implements PollableSource<T>, M
return this.messageCreator.createMessage(retrieveNextPayload());
}
public void onSend(Message<?> message) {
public void onSend(Message<T> message) {
if (logger.isDebugEnabled()) {
logger.debug(message + " processed successfully. Files will be removed from backlog");
}
this.backlog.processed();
}
public void onFailure(Message<?> failedMessage, Throwable exception) {
public void onFailure(Message<T> failedMessage, Throwable exception) {
if (this.logger.isWarnEnabled()) {
this.logger.warn("Failure notification received by [" + this.getClass().getSimpleName() + "] for message: "
+ failedMessage + ". Selected files will be moved back to the backlog.", exception);

4
org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/file/FileSource.java
View File

@@ -35,11 +35,13 @@ import org.springframework.util.Assert;
/**
* A messaging source that polls a directory to retrieve files.
*
* @deprecated Replaced by org.springframework.integration.file.PollableFileSource.
*
* @author Mark Fisher
* @author Marius Bogoevici
* @author Iwein Fuld
*/
public class FileSource extends AbstractDirectorySource<File> implements MessageDeliveryAware {
public class FileSource extends AbstractDirectorySource<File> implements MessageDeliveryAware<File> {
private final File directory;

4
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/ftp/FtpSourceTests.java
View File

@@ -44,6 +44,7 @@ import org.apache.oro.io.Perl5FilenameFilter;
import org.easymock.IAnswer;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.integration.message.GenericMessage;
import org.springframework.integration.message.Message;
@@ -198,6 +199,7 @@ public class FtpSourceTests {
}
@Test(timeout = 6000)
@Ignore //not reliable
public void concurrentPollingSunnyDay() throws Exception {
final CountDownLatch recorded = new CountDownLatch(1);
this.ftpSource.setMaxFilesPerMessage(2);
@@ -263,7 +265,7 @@ public class FtpSourceTests {
new GenericMessage(Arrays.asList(new File("test1")))).times(2);
replay(globalMocks);
Message<List<File>> received = ftpSource.receive();
ftpSource.onFailure(received, new Exception("test failure"));
ftpSource.onFailure(received, new Exception("just a test"));
assertEquals(received, ftpSource.receive());
verify(globalMocks);
}