From 0bdb0a2ef2bc03f89f1fba8b6826b8eb932ab9f2 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Fri, 19 Nov 2010 12:30:58 -0500 Subject: [PATCH] INT-1614 naming consistency --- .../config/FtpInboundChannelAdapterParser.java | 2 +- ...SynchronizingMessageSourceFactoryBean.java} | 18 +++++++++--------- ...a => FtpInboundFileSystemSynchronizer.java} | 2 +- ...dFileSystemSynchronizingMessageSource.java} | 2 +- .../FtpInboundChannelAdapterParserTests.java | 12 ++++++------ .../FtpsInboundChannelAdapterParserTests.java | 12 ++++++------ ...nboundRemoteFileSystemSynchronizerTest.java | 2 +- 7 files changed, 25 insertions(+), 25 deletions(-) rename spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/{FtpInboundSynchronizingMessageSourceFactoryBean.java => FtpInboundFileSynchronizingMessageSourceFactoryBean.java} (86%) rename spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/{FtpInboundRemoteFileSystemSynchronizer.java => FtpInboundFileSystemSynchronizer.java} (97%) rename spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/{FtpInboundRemoteFileSystemSynchronizingMessageSource.java => FtpInboundFileSystemSynchronizingMessageSource.java} (91%) 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 e078ae1269..070f7baf3e 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 @@ -28,7 +28,7 @@ public class FtpInboundChannelAdapterParser extends AbstractFtpInboundChannelAda @Override protected String getClassName() { - return "org.springframework.integration.ftp.config.FtpInboundSynchronizingMessageSourceFactoryBean"; + return "org.springframework.integration.ftp.config.FtpInboundFileSynchronizingMessageSourceFactoryBean"; } } diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpInboundSynchronizingMessageSourceFactoryBean.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpInboundFileSynchronizingMessageSourceFactoryBean.java similarity index 86% rename from spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpInboundSynchronizingMessageSourceFactoryBean.java rename to spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpInboundFileSynchronizingMessageSourceFactoryBean.java index ad3517cd63..a28155d4a3 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpInboundSynchronizingMessageSourceFactoryBean.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpInboundFileSynchronizingMessageSourceFactoryBean.java @@ -32,8 +32,8 @@ import org.springframework.integration.ftp.client.AbstractFtpClientFactory; import org.springframework.integration.ftp.client.DefaultFtpClientFactory; import org.springframework.integration.ftp.client.QueuedFtpClientPool; import org.springframework.integration.ftp.filters.FtpPatternMatchingFileListFilter; -import org.springframework.integration.ftp.inbound.FtpInboundRemoteFileSystemSynchronizer; -import org.springframework.integration.ftp.inbound.FtpInboundRemoteFileSystemSynchronizingMessageSource; +import org.springframework.integration.ftp.inbound.FtpInboundFileSystemSynchronizer; +import org.springframework.integration.ftp.inbound.FtpInboundFileSystemSynchronizingMessageSource; import org.springframework.util.StringUtils; /** @@ -44,8 +44,8 @@ import org.springframework.util.StringUtils; * @author Oleg Zhurakousky * @since 2.0 */ -class FtpInboundSynchronizingMessageSourceFactoryBean - extends AbstractFactoryBean implements ResourceLoaderAware { +class FtpInboundFileSynchronizingMessageSourceFactoryBean + extends AbstractFactoryBean implements ResourceLoaderAware { private volatile String autoCreateDirectories; @@ -95,7 +95,7 @@ class FtpInboundSynchronizingMessageSourceFactoryBean @Override public Class getObjectType() { - return FtpInboundRemoteFileSystemSynchronizingMessageSource.class; + return FtpInboundFileSystemSynchronizingMessageSource.class; } private Resource resolveResource(String path) { @@ -105,11 +105,11 @@ class FtpInboundSynchronizingMessageSourceFactoryBean } @Override - protected FtpInboundRemoteFileSystemSynchronizingMessageSource createInstance() throws Exception { + protected FtpInboundFileSystemSynchronizingMessageSource createInstance() throws Exception { boolean autoCreatDirs = Boolean.parseBoolean(this.autoCreateDirectories); boolean ackRemoteDir = Boolean.parseBoolean(this.autoDeleteRemoteFilesOnSync); - FtpInboundRemoteFileSystemSynchronizingMessageSource messageSource = - new FtpInboundRemoteFileSystemSynchronizingMessageSource(); + FtpInboundFileSystemSynchronizingMessageSource messageSource = + new FtpInboundFileSystemSynchronizingMessageSource(); messageSource.setAutoCreateDirectories(autoCreatDirs); if (!StringUtils.hasText(this.localWorkingDirectory)) { File tmp = new File(SystemUtils.getJavaIoTmpDir(), this.defaultFtpInboundFolderName); @@ -126,7 +126,7 @@ class FtpInboundSynchronizingMessageSourceFactoryBean compositeFilter.addFilter(this.filter); } QueuedFtpClientPool queuedFtpClientPool = new QueuedFtpClientPool(15, this.clientFactory); - FtpInboundRemoteFileSystemSynchronizer synchronizer = new FtpInboundRemoteFileSystemSynchronizer(); + FtpInboundFileSystemSynchronizer synchronizer = new FtpInboundFileSystemSynchronizer(); synchronizer.setClientPool(queuedFtpClientPool); synchronizer.setShouldDeleteSourceFile(ackRemoteDir); synchronizer.setFilter(compositeFilter); diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizer.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundFileSystemSynchronizer.java similarity index 97% rename from spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizer.java rename to spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundFileSystemSynchronizer.java index 169da302ec..8bbe778c51 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizer.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundFileSystemSynchronizer.java @@ -40,7 +40,7 @@ import org.springframework.util.Assert; * @author Iwein Fuld * @author Josh Long */ -public class FtpInboundRemoteFileSystemSynchronizer extends AbstractInboundFileSynchronizer { +public class FtpInboundFileSystemSynchronizer extends AbstractInboundFileSynchronizer { private volatile FtpClientPool clientPool; diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizingMessageSource.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundFileSystemSynchronizingMessageSource.java similarity index 91% rename from spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizingMessageSource.java rename to spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundFileSystemSynchronizingMessageSource.java index 298dd3a94f..17f94bd7af 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizingMessageSource.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundFileSystemSynchronizingMessageSource.java @@ -27,7 +27,7 @@ import org.springframework.integration.file.synchronizer.AbstractInboundFileSync * @author Iwein Fuld * @author Josh Long */ -public class FtpInboundRemoteFileSystemSynchronizingMessageSource extends AbstractInboundFileSynchronizingMessageSource { +public class FtpInboundFileSystemSynchronizingMessageSource extends AbstractInboundFileSynchronizingMessageSource { public String getComponentType() { return "ftp:inbound-channel-adapter"; diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParserTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParserTests.java index 4e4754e661..661b00642f 100644 --- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParserTests.java +++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParserTests.java @@ -34,8 +34,8 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.endpoint.SourcePollingChannelAdapter; import org.springframework.integration.file.filters.CompositeFileListFilter; import org.springframework.integration.ftp.client.DefaultFtpClientFactory; -import org.springframework.integration.ftp.inbound.FtpInboundRemoteFileSystemSynchronizer; -import org.springframework.integration.ftp.inbound.FtpInboundRemoteFileSystemSynchronizingMessageSource; +import org.springframework.integration.ftp.inbound.FtpInboundFileSystemSynchronizer; +import org.springframework.integration.ftp.inbound.FtpInboundFileSystemSynchronizingMessageSource; import org.springframework.integration.test.util.TestUtils; /** @@ -52,11 +52,11 @@ public class FtpInboundChannelAdapterParserTests { assertEquals("ftp:inbound-channel-adapter", adapter.getComponentType()); assertNotNull(TestUtils.getPropertyValue(adapter, "poller")); assertEquals(ac.getBean("ftpChannel"), TestUtils.getPropertyValue(adapter, "outputChannel")); - FtpInboundRemoteFileSystemSynchronizingMessageSource inbound = - (FtpInboundRemoteFileSystemSynchronizingMessageSource) TestUtils.getPropertyValue(adapter, "source"); + FtpInboundFileSystemSynchronizingMessageSource inbound = + (FtpInboundFileSystemSynchronizingMessageSource) TestUtils.getPropertyValue(adapter, "source"); - FtpInboundRemoteFileSystemSynchronizer fisync = - (FtpInboundRemoteFileSystemSynchronizer) TestUtils.getPropertyValue(inbound, "synchronizer"); + FtpInboundFileSystemSynchronizer fisync = + (FtpInboundFileSystemSynchronizer) TestUtils.getPropertyValue(inbound, "synchronizer"); CompositeFileListFilter filter = (CompositeFileListFilter) TestUtils.getPropertyValue(fisync, "filter"); Set filters = (Set) TestUtils.getPropertyValue(filter, "fileFilters"); assertEquals(2, filters.size()); diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsInboundChannelAdapterParserTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsInboundChannelAdapterParserTests.java index fe2d5fe52b..138a1fe6a4 100644 --- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsInboundChannelAdapterParserTests.java +++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsInboundChannelAdapterParserTests.java @@ -29,8 +29,8 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.endpoint.SourcePollingChannelAdapter; import org.springframework.integration.file.filters.CompositeFileListFilter; -import org.springframework.integration.ftp.inbound.FtpInboundRemoteFileSystemSynchronizer; -import org.springframework.integration.ftp.inbound.FtpInboundRemoteFileSystemSynchronizingMessageSource; +import org.springframework.integration.ftp.inbound.FtpInboundFileSystemSynchronizer; +import org.springframework.integration.ftp.inbound.FtpInboundFileSystemSynchronizingMessageSource; import org.springframework.integration.test.util.TestUtils; /** @@ -48,11 +48,11 @@ public class FtpsInboundChannelAdapterParserTests { assertEquals("ftp:inbound-channel-adapter", adapter.getComponentType()); assertNotNull(TestUtils.getPropertyValue(adapter, "poller")); assertEquals(ac.getBean("ftpChannel"), TestUtils.getPropertyValue(adapter, "outputChannel")); - FtpInboundRemoteFileSystemSynchronizingMessageSource inbound = - (FtpInboundRemoteFileSystemSynchronizingMessageSource) TestUtils.getPropertyValue(adapter, "source"); + FtpInboundFileSystemSynchronizingMessageSource inbound = + (FtpInboundFileSystemSynchronizingMessageSource) TestUtils.getPropertyValue(adapter, "source"); - FtpInboundRemoteFileSystemSynchronizer fisync = - (FtpInboundRemoteFileSystemSynchronizer) TestUtils.getPropertyValue(inbound, "synchronizer"); + FtpInboundFileSystemSynchronizer fisync = + (FtpInboundFileSystemSynchronizer) TestUtils.getPropertyValue(inbound, "synchronizer"); CompositeFileListFilter filter = (CompositeFileListFilter) TestUtils.getPropertyValue(fisync, "filter"); Set filters = (Set) TestUtils.getPropertyValue(filter, "fileFilters"); assertEquals(2, filters.size()); diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizerTest.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizerTest.java index 57ab7bfd58..a6dbdebd85 100644 --- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizerTest.java +++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizerTest.java @@ -49,7 +49,7 @@ public class FtpInboundRemoteFileSystemSynchronizerTest { if (file.exists()){ file.delete(); } - FtpInboundRemoteFileSystemSynchronizer syncronizer = new FtpInboundRemoteFileSystemSynchronizer(); + FtpInboundFileSystemSynchronizer syncronizer = new FtpInboundFileSystemSynchronizer(); FileListFilter filter = new FtpPatternMatchingFileListFilter("foo.txt"); syncronizer.setFilter(filter);