From d1e45f79e0e5fb1842c99b3b7085181d9ec8be60 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Sun, 21 Nov 2010 23:24:14 -0500 Subject: [PATCH] INT-1614 removed the 'remotePredicate' from the MessageSource, it is defined on the synchronizer --- ...actInboundFileSynchronizingMessageSource.java | 16 +--------------- .../inbound/SftpInboundFileSynchronizer.java | 2 +- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/synchronizer/AbstractInboundFileSynchronizingMessageSource.java b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/synchronizer/AbstractInboundFileSynchronizingMessageSource.java index 47b7591b7e..25fb8d9f26 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/synchronizer/AbstractInboundFileSynchronizingMessageSource.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/synchronizer/AbstractInboundFileSynchronizingMessageSource.java @@ -75,11 +75,6 @@ public abstract class AbstractInboundFileSynchronizingMessageSource extends M */ protected volatile FileReadingMessageSource fileSource; - /** - * The predicate to use in scanning the remote File system for downloads. - */ - protected FileListFilter remotePredicate; - public void setAutoCreateDirectories(boolean autoCreateDirectories) { this.autoCreateDirectories = autoCreateDirectories; @@ -93,16 +88,9 @@ public abstract class AbstractInboundFileSynchronizingMessageSource extends M this.localDirectory = localDirectory; } - public void setRemotePredicate(FileListFilter remotePredicate) { - this.remotePredicate = remotePredicate; - } - @Override protected void onInit() { try { - if (this.remotePredicate != null) { - this.synchronizer.setFilter(this.remotePredicate); - } if (this.localDirectory != null && !this.localDirectory.exists()) { if (this.autoCreateDirectories) { if (logger.isDebugEnabled()) { @@ -115,9 +103,7 @@ public abstract class AbstractInboundFileSynchronizingMessageSource extends M } } - /** - * Forwards files once they ultimately appear in the {@link #localDirectory}. - */ + // Forwards files once they ultimately appear in the {@link #localDirectory}. this.fileSource = new FileReadingMessageSource(); this.fileSource.setFilter(this.buildFilter()); this.fileSource.setDirectory(this.localDirectory); diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/inbound/SftpInboundFileSynchronizer.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/inbound/SftpInboundFileSynchronizer.java index f6202115eb..25f2e1e4e9 100644 --- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/inbound/SftpInboundFileSynchronizer.java +++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/inbound/SftpInboundFileSynchronizer.java @@ -29,7 +29,7 @@ import com.jcraft.jsch.ChannelSftp.LsEntry; * @author Mark Fisher * @since 2.0 */ -public class SftpInboundFileSynchronizer extends AbstractInboundFileSynchronizer { +class SftpInboundFileSynchronizer extends AbstractInboundFileSynchronizer { public SftpInboundFileSynchronizer(SessionFactory sessionFactory) { super(sessionFactory);