diff --git a/spring-integration-sftp/.springBeans b/spring-integration-sftp/.springBeans new file mode 100644 index 0000000000..a4eac2981f --- /dev/null +++ b/spring-integration-sftp/.springBeans @@ -0,0 +1,14 @@ + + + 1 + + + + + + + src/test/java/org/springframework/integration/sftp/config/OutboundChannelAdapaterParserTests-context.xml + + + + diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/SftpInboundRemoteFileSystemSynchronizingMessageSourceFactoryBean.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/SftpInboundSynchronizingMessageSourceFactoryBean.java similarity index 97% rename from spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/SftpInboundRemoteFileSystemSynchronizingMessageSourceFactoryBean.java rename to spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/SftpInboundSynchronizingMessageSourceFactoryBean.java index b5b46080a7..b029530b39 100644 --- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/SftpInboundRemoteFileSystemSynchronizingMessageSourceFactoryBean.java +++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/SftpInboundSynchronizingMessageSourceFactoryBean.java @@ -43,7 +43,7 @@ import com.jcraft.jsch.ChannelSftp; * @author Oleg Zhurakousky * @since 2.0 */ -class SftpInboundRemoteFileSystemSynchronizingMessageSourceFactoryBean +class SftpInboundSynchronizingMessageSourceFactoryBean extends AbstractFactoryBean implements ResourceLoaderAware { private volatile ResourceLoader resourceLoader; @@ -118,7 +118,7 @@ class SftpInboundRemoteFileSystemSynchronizingMessageSourceFactoryBean */ @Override public Class getObjectType() { - return SftpInboundRemoteFileSystemSynchronizingMessageSourceFactoryBean.class; + return SftpInboundSynchronizingMessageSourceFactoryBean.class; } /** diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/SftpNamespaceHandler.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/SftpNamespaceHandler.java index db78196987..be93425eb1 100644 --- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/SftpNamespaceHandler.java +++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/SftpNamespaceHandler.java @@ -34,6 +34,7 @@ import org.springframework.util.StringUtils; * * @author Josh Long * @author Mark Fisher + * @author Oleg ZHurakousky * @since 2.0 */ public class SftpNamespaceHandler extends AbstractIntegrationNamespaceHandler { @@ -51,7 +52,8 @@ public class SftpNamespaceHandler extends AbstractIntegrationNamespaceHandler { @Override protected BeanMetadataElement parseSource(Element element, ParserContext parserContext) { - BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(SftpInboundRemoteFileSystemSynchronizingMessageSourceFactoryBean.class.getName()); + BeanDefinitionBuilder builder = + BeanDefinitionBuilder.genericBeanDefinition("org.springframework.integration.sftp.config.SftpInboundSynchronizingMessageSourceFactoryBean"); IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "filter"); for (String p : "auto-startup,filename-pattern,auto-create-directories,remote-directory,local-directory-path,auto-delete-remote-files-on-sync".split(",")) { IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, p); @@ -69,8 +71,9 @@ public class SftpNamespaceHandler extends AbstractIntegrationNamespaceHandler { @Override protected AbstractBeanDefinition parseConsumer(Element element, ParserContext parserContext) { - BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(SftpSendingMessageHandlerFactoryBean.class.getName()); - for (String p : "auto-create-directories,charset".split(",")) { + BeanDefinitionBuilder builder = + BeanDefinitionBuilder.genericBeanDefinition("org.springframework.integration.sftp.config.SftpSendingMessageHandlerFactoryBean"); + for (String p : "charset".split(",")) { IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, p); } String remoteDirectory = element.getAttribute("remote-directory"); diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/SftpSendingMessageHandlerFactoryBean.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/SftpSendingMessageHandlerFactoryBean.java index 8e93e77d74..804f8b6f4c 100644 --- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/SftpSendingMessageHandlerFactoryBean.java +++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/SftpSendingMessageHandlerFactoryBean.java @@ -36,14 +36,13 @@ class SftpSendingMessageHandlerFactoryBean implements FactoryBean - + diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpParserTests-inbound-all-fail.xml b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapaterParserTests-context-fail.xml similarity index 100% rename from spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpParserTests-inbound-all-fail.xml rename to spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapaterParserTests-context-fail.xml diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpParserTests-inbound-all.xml b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapaterParserTests-context.xml similarity index 100% rename from spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpParserTests-inbound-all.xml rename to spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapaterParserTests-context.xml diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpParserTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapaterParserTests.java similarity index 82% rename from spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpParserTests.java rename to spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapaterParserTests.java index 5726462b00..fa3dae5344 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpParserTests.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapaterParserTests.java @@ -30,7 +30,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; /** * @author Oleg Zhurakousky */ -public class SftpParserTests { +public class InboundChannelAdapaterParserTests { @Before public void prepare(){ @@ -40,7 +40,7 @@ public class SftpParserTests { @Test public void testLocalFilesAutoCreationTrue() throws Exception{ assertTrue(!new File("target/foo").exists()); - new ClassPathXmlApplicationContext("SftpParserTests-inbound-all.xml", this.getClass()); + new ClassPathXmlApplicationContext("InboundChannelAdapaterParserTests-context.xml", this.getClass()); assertTrue(new File("target/foo").exists()); assertTrue(!new File("target/bar").exists()); } @@ -48,13 +48,13 @@ public class SftpParserTests { @Test(expected=BeanCreationException.class) public void testLocalFilesAutoCreationFalse() throws Exception{ assertTrue(!new File("target/bar").exists()); - new ClassPathXmlApplicationContext("SftpParserTests-inbound-all-fail.xml", this.getClass()); + new ClassPathXmlApplicationContext("InboundChannelAdapaterParserTests-context-fail.xml", this.getClass()); } @Test public void testLocalFilesAreFound() throws Exception{ assertTrue(new File("target").exists()); - new ClassPathXmlApplicationContext("SftpParserTests-inbound-all.xml", this.getClass()); + new ClassPathXmlApplicationContext("InboundChannelAdapaterParserTests-context.xml", this.getClass()); assertTrue(new File("target").exists()); } diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/OutboundChannelAdapaterParserTests-context.xml b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/OutboundChannelAdapaterParserTests-context.xml new file mode 100644 index 0000000000..234951e89d --- /dev/null +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/OutboundChannelAdapaterParserTests-context.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/OutboundChannelAdapaterParserTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/OutboundChannelAdapaterParserTests.java new file mode 100644 index 0000000000..92b6b11084 --- /dev/null +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/OutboundChannelAdapaterParserTests.java @@ -0,0 +1,22 @@ +/** + * + */ +package org.springframework.integration.sftp.config; + +import org.junit.Test; + +import org.springframework.context.ApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +/** + * @author ozhurakousky + * + */ +public class OutboundChannelAdapaterParserTests { + + @Test + public void test(){ + ApplicationContext context = + new ClassPathXmlApplicationContext("OutboundChannelAdapaterParserTests-context.xml", this.getClass()); + } +}