From 8df06ae0cf04bb579476e666e5206f7e768bc12a Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Fri, 19 Nov 2010 12:36:15 -0500 Subject: [PATCH] INT-1614 naming consistency --- ...ileSynchronizingMessageSourceFactoryBean.java | 16 ++++++++-------- ...izer.java => FtpInboundFileSynchronizer.java} | 2 +- ...tpInboundFileSynchronizingMessageSource.java} | 2 +- .../FtpInboundChannelAdapterParserTests.java | 12 ++++++------ .../FtpsInboundChannelAdapterParserTests.java | 12 ++++++------ ...pInboundRemoteFileSystemSynchronizerTest.java | 2 +- 6 files changed, 23 insertions(+), 23 deletions(-) rename spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/{FtpInboundFileSystemSynchronizer.java => FtpInboundFileSynchronizer.java} (97%) rename spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/{FtpInboundFileSystemSynchronizingMessageSource.java => FtpInboundFileSynchronizingMessageSource.java} (91%) diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpInboundFileSynchronizingMessageSourceFactoryBean.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpInboundFileSynchronizingMessageSourceFactoryBean.java index a28155d4a3..c4a672d687 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpInboundFileSynchronizingMessageSourceFactoryBean.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.FtpInboundFileSystemSynchronizer; -import org.springframework.integration.ftp.inbound.FtpInboundFileSystemSynchronizingMessageSource; +import org.springframework.integration.ftp.inbound.FtpInboundFileSynchronizer; +import org.springframework.integration.ftp.inbound.FtpInboundFileSynchronizingMessageSource; import org.springframework.util.StringUtils; /** @@ -45,7 +45,7 @@ import org.springframework.util.StringUtils; * @since 2.0 */ class FtpInboundFileSynchronizingMessageSourceFactoryBean - extends AbstractFactoryBean implements ResourceLoaderAware { + extends AbstractFactoryBean implements ResourceLoaderAware { private volatile String autoCreateDirectories; @@ -95,7 +95,7 @@ class FtpInboundFileSynchronizingMessageSourceFactoryBean @Override public Class getObjectType() { - return FtpInboundFileSystemSynchronizingMessageSource.class; + return FtpInboundFileSynchronizingMessageSource.class; } private Resource resolveResource(String path) { @@ -105,11 +105,11 @@ class FtpInboundFileSynchronizingMessageSourceFactoryBean } @Override - protected FtpInboundFileSystemSynchronizingMessageSource createInstance() throws Exception { + protected FtpInboundFileSynchronizingMessageSource createInstance() throws Exception { boolean autoCreatDirs = Boolean.parseBoolean(this.autoCreateDirectories); boolean ackRemoteDir = Boolean.parseBoolean(this.autoDeleteRemoteFilesOnSync); - FtpInboundFileSystemSynchronizingMessageSource messageSource = - new FtpInboundFileSystemSynchronizingMessageSource(); + FtpInboundFileSynchronizingMessageSource messageSource = + new FtpInboundFileSynchronizingMessageSource(); messageSource.setAutoCreateDirectories(autoCreatDirs); if (!StringUtils.hasText(this.localWorkingDirectory)) { File tmp = new File(SystemUtils.getJavaIoTmpDir(), this.defaultFtpInboundFolderName); @@ -126,7 +126,7 @@ class FtpInboundFileSynchronizingMessageSourceFactoryBean compositeFilter.addFilter(this.filter); } QueuedFtpClientPool queuedFtpClientPool = new QueuedFtpClientPool(15, this.clientFactory); - FtpInboundFileSystemSynchronizer synchronizer = new FtpInboundFileSystemSynchronizer(); + FtpInboundFileSynchronizer synchronizer = new FtpInboundFileSynchronizer(); synchronizer.setClientPool(queuedFtpClientPool); synchronizer.setShouldDeleteSourceFile(ackRemoteDir); synchronizer.setFilter(compositeFilter); diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundFileSystemSynchronizer.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundFileSynchronizer.java similarity index 97% rename from spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundFileSystemSynchronizer.java rename to spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundFileSynchronizer.java index 8bbe778c51..c8e0b19118 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundFileSystemSynchronizer.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundFileSynchronizer.java @@ -40,7 +40,7 @@ import org.springframework.util.Assert; * @author Iwein Fuld * @author Josh Long */ -public class FtpInboundFileSystemSynchronizer extends AbstractInboundFileSynchronizer { +public class FtpInboundFileSynchronizer extends AbstractInboundFileSynchronizer { private volatile FtpClientPool clientPool; diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundFileSystemSynchronizingMessageSource.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundFileSynchronizingMessageSource.java similarity index 91% rename from spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundFileSystemSynchronizingMessageSource.java rename to spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundFileSynchronizingMessageSource.java index 17f94bd7af..193cb5eb80 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundFileSystemSynchronizingMessageSource.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundFileSynchronizingMessageSource.java @@ -27,7 +27,7 @@ import org.springframework.integration.file.synchronizer.AbstractInboundFileSync * @author Iwein Fuld * @author Josh Long */ -public class FtpInboundFileSystemSynchronizingMessageSource extends AbstractInboundFileSynchronizingMessageSource { +public class FtpInboundFileSynchronizingMessageSource 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 661b00642f..558e442302 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.FtpInboundFileSystemSynchronizer; -import org.springframework.integration.ftp.inbound.FtpInboundFileSystemSynchronizingMessageSource; +import org.springframework.integration.ftp.inbound.FtpInboundFileSynchronizer; +import org.springframework.integration.ftp.inbound.FtpInboundFileSynchronizingMessageSource; 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")); - FtpInboundFileSystemSynchronizingMessageSource inbound = - (FtpInboundFileSystemSynchronizingMessageSource) TestUtils.getPropertyValue(adapter, "source"); + FtpInboundFileSynchronizingMessageSource inbound = + (FtpInboundFileSynchronizingMessageSource) TestUtils.getPropertyValue(adapter, "source"); - FtpInboundFileSystemSynchronizer fisync = - (FtpInboundFileSystemSynchronizer) TestUtils.getPropertyValue(inbound, "synchronizer"); + FtpInboundFileSynchronizer fisync = + (FtpInboundFileSynchronizer) 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 138a1fe6a4..06e2697a0c 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.FtpInboundFileSystemSynchronizer; -import org.springframework.integration.ftp.inbound.FtpInboundFileSystemSynchronizingMessageSource; +import org.springframework.integration.ftp.inbound.FtpInboundFileSynchronizer; +import org.springframework.integration.ftp.inbound.FtpInboundFileSynchronizingMessageSource; 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")); - FtpInboundFileSystemSynchronizingMessageSource inbound = - (FtpInboundFileSystemSynchronizingMessageSource) TestUtils.getPropertyValue(adapter, "source"); + FtpInboundFileSynchronizingMessageSource inbound = + (FtpInboundFileSynchronizingMessageSource) TestUtils.getPropertyValue(adapter, "source"); - FtpInboundFileSystemSynchronizer fisync = - (FtpInboundFileSystemSynchronizer) TestUtils.getPropertyValue(inbound, "synchronizer"); + FtpInboundFileSynchronizer fisync = + (FtpInboundFileSynchronizer) 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 a6dbdebd85..3df09f8cac 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(); } - FtpInboundFileSystemSynchronizer syncronizer = new FtpInboundFileSystemSynchronizer(); + FtpInboundFileSynchronizer syncronizer = new FtpInboundFileSynchronizer(); FileListFilter filter = new FtpPatternMatchingFileListFilter("foo.txt"); syncronizer.setFilter(filter);