From e14bbbe21d7ca36f8b40862e39d461f3a7fb88ea Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Wed, 10 Nov 2010 16:24:41 -0500 Subject: [PATCH] INT-1562 restructured packages: inbound, outbound, session --- .../config/SftpMessageSendingConsumerFactoryBean.java | 6 +++--- ...ileSystemSynchronizingMessageSourceFactoryBean.java | 10 +++++----- .../integration/sftp/config/SftpSessionUtils.java | 2 +- .../SftpPatternMatchingFileListFilter.java | 2 +- .../SftpInboundRemoteFileSystemSynchronizer.java | 8 ++++---- ...oundRemoteFileSystemSynchronizingMessageSource.java | 6 +++--- .../sftp/{ => outbound}/SftpSendingMessageHandler.java | 5 ++++- .../sftp/{ => session}/QueuedSftpSessionPool.java | 2 +- .../integration/sftp/{ => session}/SftpSession.java | 2 +- .../sftp/{ => session}/SftpSessionFactory.java | 2 +- .../sftp/{ => session}/SftpSessionPool.java | 2 +- .../SftpInboundRemoteFileSystemSynchronizerTests.java | 3 ++- 12 files changed, 27 insertions(+), 23 deletions(-) rename spring-integration-sftp/src/main/java/org/springframework/integration/sftp/{ => filters}/SftpPatternMatchingFileListFilter.java (95%) rename spring-integration-sftp/src/main/java/org/springframework/integration/sftp/{impl => inbound}/SftpInboundRemoteFileSystemSynchronizer.java (94%) rename spring-integration-sftp/src/main/java/org/springframework/integration/sftp/{impl => inbound}/SftpInboundRemoteFileSystemSynchronizingMessageSource.java (94%) rename spring-integration-sftp/src/main/java/org/springframework/integration/sftp/{ => outbound}/SftpSendingMessageHandler.java (96%) rename spring-integration-sftp/src/main/java/org/springframework/integration/sftp/{ => session}/QueuedSftpSessionPool.java (98%) rename spring-integration-sftp/src/main/java/org/springframework/integration/sftp/{ => session}/SftpSession.java (99%) rename spring-integration-sftp/src/main/java/org/springframework/integration/sftp/{ => session}/SftpSessionFactory.java (98%) rename spring-integration-sftp/src/main/java/org/springframework/integration/sftp/{ => session}/SftpSessionPool.java (95%) diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/SftpMessageSendingConsumerFactoryBean.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/SftpMessageSendingConsumerFactoryBean.java index 9092020559..a28c45bdb2 100644 --- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/SftpMessageSendingConsumerFactoryBean.java +++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/SftpMessageSendingConsumerFactoryBean.java @@ -17,9 +17,9 @@ package org.springframework.integration.sftp.config; import org.springframework.beans.factory.FactoryBean; -import org.springframework.integration.sftp.QueuedSftpSessionPool; -import org.springframework.integration.sftp.SftpSendingMessageHandler; -import org.springframework.integration.sftp.SftpSessionFactory; +import org.springframework.integration.sftp.outbound.SftpSendingMessageHandler; +import org.springframework.integration.sftp.session.QueuedSftpSessionPool; +import org.springframework.integration.sftp.session.SftpSessionFactory; /** * Supports the construction of a MessagHandler that knows how to take inbound File objects diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/SftpRemoteFileSystemSynchronizingMessageSourceFactoryBean.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/SftpRemoteFileSystemSynchronizingMessageSourceFactoryBean.java index 5aa5e9142d..d5234eb575 100644 --- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/SftpRemoteFileSystemSynchronizingMessageSourceFactoryBean.java +++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/SftpRemoteFileSystemSynchronizingMessageSourceFactoryBean.java @@ -27,11 +27,11 @@ import org.springframework.core.io.ResourceEditor; import org.springframework.core.io.ResourceLoader; import org.springframework.integration.file.filters.CompositeFileListFilter; import org.springframework.integration.file.filters.FileListFilter; -import org.springframework.integration.sftp.QueuedSftpSessionPool; -import org.springframework.integration.sftp.SftpPatternMatchingFileListFilter; -import org.springframework.integration.sftp.SftpSessionFactory; -import org.springframework.integration.sftp.impl.SftpInboundRemoteFileSystemSynchronizer; -import org.springframework.integration.sftp.impl.SftpInboundRemoteFileSystemSynchronizingMessageSource; +import org.springframework.integration.sftp.filters.SftpPatternMatchingFileListFilter; +import org.springframework.integration.sftp.inbound.SftpInboundRemoteFileSystemSynchronizer; +import org.springframework.integration.sftp.inbound.SftpInboundRemoteFileSystemSynchronizingMessageSource; +import org.springframework.integration.sftp.session.QueuedSftpSessionPool; +import org.springframework.integration.sftp.session.SftpSessionFactory; import org.springframework.util.StringUtils; import com.jcraft.jsch.ChannelSftp; diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/SftpSessionUtils.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/SftpSessionUtils.java index d9aaeae580..eaa527bd78 100644 --- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/SftpSessionUtils.java +++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/SftpSessionUtils.java @@ -16,7 +16,7 @@ package org.springframework.integration.sftp.config; -import org.springframework.integration.sftp.SftpSessionFactory; +import org.springframework.integration.sftp.session.SftpSessionFactory; /** * Utility methods for SFTP Session management. diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/SftpPatternMatchingFileListFilter.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/filters/SftpPatternMatchingFileListFilter.java similarity index 95% rename from spring-integration-sftp/src/main/java/org/springframework/integration/sftp/SftpPatternMatchingFileListFilter.java rename to spring-integration-sftp/src/main/java/org/springframework/integration/sftp/filters/SftpPatternMatchingFileListFilter.java index 41eac3a7ff..1ed85366aa 100644 --- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/SftpPatternMatchingFileListFilter.java +++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/filters/SftpPatternMatchingFileListFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.sftp; +package org.springframework.integration.sftp.filters; import java.util.regex.Pattern; diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/impl/SftpInboundRemoteFileSystemSynchronizer.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/inbound/SftpInboundRemoteFileSystemSynchronizer.java similarity index 94% rename from spring-integration-sftp/src/main/java/org/springframework/integration/sftp/impl/SftpInboundRemoteFileSystemSynchronizer.java rename to spring-integration-sftp/src/main/java/org/springframework/integration/sftp/inbound/SftpInboundRemoteFileSystemSynchronizer.java index 5aaa661441..4c8f77622c 100644 --- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/impl/SftpInboundRemoteFileSystemSynchronizer.java +++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/inbound/SftpInboundRemoteFileSystemSynchronizer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.sftp.impl; +package org.springframework.integration.sftp.inbound; import com.jcraft.jsch.ChannelSftp; import org.apache.commons.io.IOUtils; @@ -23,8 +23,8 @@ import org.springframework.core.io.Resource; import org.springframework.integration.MessagingException; import org.springframework.integration.file.synchronization.AbstractInboundRemoteFileSystemSychronizer; import org.springframework.integration.file.synchronization.AbstractInboundRemoteFileSystemSynchronizingMessageSource; -import org.springframework.integration.sftp.SftpSession; -import org.springframework.integration.sftp.SftpSessionPool; +import org.springframework.integration.sftp.session.SftpSession; +import org.springframework.integration.sftp.session.SftpSessionPool; import org.springframework.scheduling.Trigger; import org.springframework.scheduling.support.PeriodicTrigger; import org.springframework.util.Assert; @@ -48,7 +48,7 @@ public class SftpInboundRemoteFileSystemSynchronizer extends AbstractInboundRemo private volatile String remotePath; /** - * the pool of {@link org.springframework.integration.sftp.SftpSessionPool} SFTP sessions + * the pool of {@link org.springframework.integration.sftp.session.SftpSessionPool} SFTP sessions */ private volatile SftpSessionPool clientPool; diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/impl/SftpInboundRemoteFileSystemSynchronizingMessageSource.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/inbound/SftpInboundRemoteFileSystemSynchronizingMessageSource.java similarity index 94% rename from spring-integration-sftp/src/main/java/org/springframework/integration/sftp/impl/SftpInboundRemoteFileSystemSynchronizingMessageSource.java rename to spring-integration-sftp/src/main/java/org/springframework/integration/sftp/inbound/SftpInboundRemoteFileSystemSynchronizingMessageSource.java index 180f5ba07f..cc39dbd0f5 100644 --- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/impl/SftpInboundRemoteFileSystemSynchronizingMessageSource.java +++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/inbound/SftpInboundRemoteFileSystemSynchronizingMessageSource.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.sftp.impl; +package org.springframework.integration.sftp.inbound; import com.jcraft.jsch.ChannelSftp; import com.jcraft.jsch.SftpATTRS; import org.springframework.integration.file.synchronization.AbstractInboundRemoteFileSystemSynchronizingMessageSource; -import org.springframework.integration.sftp.SftpSession; -import org.springframework.integration.sftp.SftpSessionPool; +import org.springframework.integration.sftp.session.SftpSession; +import org.springframework.integration.sftp.session.SftpSessionPool; import org.springframework.util.Assert; diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/SftpSendingMessageHandler.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/outbound/SftpSendingMessageHandler.java similarity index 96% rename from spring-integration-sftp/src/main/java/org/springframework/integration/sftp/SftpSendingMessageHandler.java rename to spring-integration-sftp/src/main/java/org/springframework/integration/sftp/outbound/SftpSendingMessageHandler.java index b369622276..cefcb5ae1c 100644 --- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/SftpSendingMessageHandler.java +++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/outbound/SftpSendingMessageHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.sftp; +package org.springframework.integration.sftp.outbound; import java.io.File; import java.io.FileInputStream; @@ -38,6 +38,9 @@ import org.springframework.integration.MessagingException; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.file.DefaultFileNameGenerator; import org.springframework.integration.file.FileNameGenerator; +import org.springframework.integration.sftp.SftpHeaders; +import org.springframework.integration.sftp.session.SftpSession; +import org.springframework.integration.sftp.session.SftpSessionPool; import org.springframework.util.Assert; import org.springframework.util.FileCopyUtils; diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/QueuedSftpSessionPool.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/QueuedSftpSessionPool.java similarity index 98% rename from spring-integration-sftp/src/main/java/org/springframework/integration/sftp/QueuedSftpSessionPool.java rename to spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/QueuedSftpSessionPool.java index d22d8ca7c5..ec4664f77c 100644 --- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/QueuedSftpSessionPool.java +++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/QueuedSftpSessionPool.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.sftp; +package org.springframework.integration.sftp.session; import java.util.Queue; import java.util.concurrent.ArrayBlockingQueue; diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/SftpSession.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/SftpSession.java similarity index 99% rename from spring-integration-sftp/src/main/java/org/springframework/integration/sftp/SftpSession.java rename to spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/SftpSession.java index 4a4b8fecec..d006539ff4 100644 --- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/SftpSession.java +++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/SftpSession.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.sftp; +package org.springframework.integration.sftp.session; import com.jcraft.jsch.ChannelSftp; import com.jcraft.jsch.JSch; diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/SftpSessionFactory.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/SftpSessionFactory.java similarity index 98% rename from spring-integration-sftp/src/main/java/org/springframework/integration/sftp/SftpSessionFactory.java rename to spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/SftpSessionFactory.java index e990e9b009..f4c7769dc2 100644 --- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/SftpSessionFactory.java +++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/SftpSessionFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.sftp; +package org.springframework.integration.sftp.session; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/SftpSessionPool.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/SftpSessionPool.java similarity index 95% rename from spring-integration-sftp/src/main/java/org/springframework/integration/sftp/SftpSessionPool.java rename to spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/SftpSessionPool.java index 0767329f46..fc5f6abddf 100644 --- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/SftpSessionPool.java +++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/SftpSessionPool.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.sftp; +package org.springframework.integration.sftp.session; /** * Holds instances of {@link SftpSession} since they are stateful diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/impl/SftpInboundRemoteFileSystemSynchronizerTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/impl/SftpInboundRemoteFileSystemSynchronizerTests.java index 378f3fa6b2..7b9d659c71 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/impl/SftpInboundRemoteFileSystemSynchronizerTests.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/impl/SftpInboundRemoteFileSystemSynchronizerTests.java @@ -26,7 +26,8 @@ import org.junit.Test; import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.Resource; import org.springframework.integration.file.synchronization.AbstractInboundRemoteFileSystemSychronizer.EntryAcknowledgmentStrategy; -import org.springframework.integration.sftp.SftpSession; +import org.springframework.integration.sftp.inbound.SftpInboundRemoteFileSystemSynchronizer; +import org.springframework.integration.sftp.session.SftpSession; import org.springframework.util.ReflectionUtils; import com.jcraft.jsch.ChannelSftp;