Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-1614 naming consistency

Browse Source
This commit is contained in:
Mark Fisher
2010-11-19 12:30:58 -05:00
parent 46b4d8a595
commit 0bdb0a2ef2
7 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParser.java
View File

@@ -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";
}
}

18
spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpInboundSynchronizingMessageSourceFactoryBean.java → spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpInboundFileSynchronizingMessageSourceFactoryBean.java
View File

@@ -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<FtpInboundRemoteFileSystemSynchronizingMessageSource> implements ResourceLoaderAware {
class FtpInboundFileSynchronizingMessageSourceFactoryBean
extends AbstractFactoryBean<FtpInboundFileSystemSynchronizingMessageSource> 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);

2
spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizer.java → spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundFileSystemSynchronizer.java
View File

@@ -40,7 +40,7 @@ import org.springframework.util.Assert;
* @author Iwein Fuld
* @author Josh Long
*/
public class FtpInboundRemoteFileSystemSynchronizer extends AbstractInboundFileSynchronizer<FTPFile> {
public class FtpInboundFileSystemSynchronizer extends AbstractInboundFileSynchronizer<FTPFile> {
private volatile FtpClientPool clientPool;

2
spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizingMessageSource.java → spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundFileSystemSynchronizingMessageSource.java
View File

@@ -27,7 +27,7 @@ import org.springframework.integration.file.synchronizer.AbstractInboundFileSync
* @author Iwein Fuld
* @author Josh Long
*/
public class FtpInboundRemoteFileSystemSynchronizingMessageSource extends AbstractInboundFileSynchronizingMessageSource<FTPFile> {
public class FtpInboundFileSystemSynchronizingMessageSource extends AbstractInboundFileSynchronizingMessageSource<FTPFile> {
public String getComponentType() {
return "ftp:inbound-channel-adapter";

12
spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParserTests.java
View File

@@ -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());

12
spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsInboundChannelAdapterParserTests.java
View File

@@ -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());

2
spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizerTest.java
View File

@@ -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);