From ba665734fbc5cf245d5d3d2225d3e7a28603f85e Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Fri, 12 Nov 2010 08:52:44 -0500 Subject: [PATCH] INT-1562 naming consistencies, package-protected FactoryBeans --- .../ftp/config/FtpInboundChannelAdapterParser.java | 2 +- ...emoteFileSystemSynchronizingMessageSourceFactoryBean.java} | 2 +- .../ftp/config/FtpSendingMessageHandlerFactoryBean.java | 2 +- .../ftp/config/FtpsInboundChannelAdapterParser.java | 2 +- ...emoteFileSystemSynchronizingMessageSourceFactoryBean.java} | 4 ++-- .../ftp/config/FtpsSendingMessageHandlerFactoryBean.java | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) rename spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/{FtpRemoteFileSystemSynchronizingMessageSourceFactoryBean.java => FtpInboundRemoteFileSystemSynchronizingMessageSourceFactoryBean.java} (99%) rename spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/{FtpsRemoteFileSystemSynchronizingMessageSourceFactoryBean.java => FtpsInboundRemoteFileSystemSynchronizingMessageSourceFactoryBean.java} (94%) diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParser.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParser.java index 5f08c7c229..bcaa3b1937 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParser.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParser.java @@ -43,7 +43,7 @@ public class FtpInboundChannelAdapterParser extends AbstractPollingInboundChanne @Override protected BeanMetadataElement parseSource(Element element, ParserContext parserContext) { BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition( - FtpRemoteFileSystemSynchronizingMessageSourceFactoryBean.class.getName()); + FtpInboundRemoteFileSystemSynchronizingMessageSourceFactoryBean.class.getName()); IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "filter"); for (String a : receiveAttrs) { IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, a); diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpRemoteFileSystemSynchronizingMessageSourceFactoryBean.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpInboundRemoteFileSystemSynchronizingMessageSourceFactoryBean.java similarity index 99% rename from spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpRemoteFileSystemSynchronizingMessageSourceFactoryBean.java rename to spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpInboundRemoteFileSystemSynchronizingMessageSourceFactoryBean.java index 870f2aa7b2..a0a9dea9ba 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpRemoteFileSystemSynchronizingMessageSourceFactoryBean.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpInboundRemoteFileSystemSynchronizingMessageSourceFactoryBean.java @@ -44,7 +44,7 @@ import org.springframework.util.StringUtils; * @author Iwein Fuld * @author Josh Long */ -public class FtpRemoteFileSystemSynchronizingMessageSourceFactoryBean +class FtpInboundRemoteFileSystemSynchronizingMessageSourceFactoryBean extends AbstractFactoryBean implements ResourceLoaderAware { private volatile String autoCreateDirectories; diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpSendingMessageHandlerFactoryBean.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpSendingMessageHandlerFactoryBean.java index a215b61546..5da6909161 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpSendingMessageHandlerFactoryBean.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpSendingMessageHandlerFactoryBean.java @@ -31,7 +31,7 @@ import org.springframework.integration.ftp.outbound.FtpSendingMessageHandler; * @author Iwein Fuld * @author Josh Long */ -public class FtpSendingMessageHandlerFactoryBean extends AbstractFactoryBean { +class FtpSendingMessageHandlerFactoryBean extends AbstractFactoryBean { protected int port; diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpsInboundChannelAdapterParser.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpsInboundChannelAdapterParser.java index aa1ad1d787..82a11d7f93 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpsInboundChannelAdapterParser.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpsInboundChannelAdapterParser.java @@ -41,7 +41,7 @@ public class FtpsInboundChannelAdapterParser extends AbstractPollingInboundChann @Override protected BeanMetadataElement parseSource(Element element, ParserContext parserContext) { BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition( - FtpsRemoteFileSystemSynchronizingMessageSourceFactoryBean.class.getName()); + FtpsInboundRemoteFileSystemSynchronizingMessageSourceFactoryBean.class.getName()); IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "filter"); for (String a : receiveAttrs) { IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, a); diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpsRemoteFileSystemSynchronizingMessageSourceFactoryBean.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpsInboundRemoteFileSystemSynchronizingMessageSourceFactoryBean.java similarity index 94% rename from spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpsRemoteFileSystemSynchronizingMessageSourceFactoryBean.java rename to spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpsInboundRemoteFileSystemSynchronizingMessageSourceFactoryBean.java index b931a84cdb..f39a4d90e4 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpsRemoteFileSystemSynchronizingMessageSourceFactoryBean.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpsInboundRemoteFileSystemSynchronizingMessageSourceFactoryBean.java @@ -30,7 +30,7 @@ import javax.net.ssl.TrustManager; * * @author Josh Long */ -public class FtpsRemoteFileSystemSynchronizingMessageSourceFactoryBean extends FtpRemoteFileSystemSynchronizingMessageSourceFactoryBean { +class FtpsInboundRemoteFileSystemSynchronizingMessageSourceFactoryBean extends FtpInboundRemoteFileSystemSynchronizingMessageSourceFactoryBean { /** * Sets whether the connection is implicit. Local testing reveals this to be a good choice. @@ -64,7 +64,7 @@ public class FtpsRemoteFileSystemSynchronizingMessageSourceFactoryBean extends F private String[] cipherSuites; - public FtpsRemoteFileSystemSynchronizingMessageSourceFactoryBean() { + public FtpsInboundRemoteFileSystemSynchronizingMessageSourceFactoryBean() { this.defaultFtpInboundFolderName = "ftpsInbound"; this.clientMode = FTPClient.PASSIVE_LOCAL_DATA_CONNECTION_MODE; } diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpsSendingMessageHandlerFactoryBean.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpsSendingMessageHandlerFactoryBean.java index d6d5d89477..11e7ad9204 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpsSendingMessageHandlerFactoryBean.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpsSendingMessageHandlerFactoryBean.java @@ -29,7 +29,7 @@ import org.springframework.util.StringUtils; * @author Josh Long * @author Iwein Fuld */ -public class FtpsSendingMessageHandlerFactoryBean extends FtpSendingMessageHandlerFactoryBean { +class FtpsSendingMessageHandlerFactoryBean extends FtpSendingMessageHandlerFactoryBean { /** * Sets whether the connection is implicit. Default is FALSE.