From a4f05cef0e5b632d03684fb2a6b6e7394b22ed88 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Mon, 11 Oct 2010 22:05:54 -0400
Subject: [PATCH] INT-1482 charset value is now being set for
 bothFtpSendingMessageHandler and SftpSendingMessageHandler

---
 .../ftp/FtpSendingMessageHandlerFactoryBean.java            | 5 +++--
 .../sftp/config/SftpMessageSendingConsumerFactoryBean.java  | 6 ++++++
 .../integration/sftp/config/SftpNamespaceHandler.java       | 2 +-
 .../integration/sftp/config/spring-integration-sftp-2.0.xsd | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpSendingMessageHandlerFactoryBean.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpSendingMessageHandlerFactoryBean.java
index 017e9b490e..13c6f107bf 100644
--- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpSendingMessageHandlerFactoryBean.java
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpSendingMessageHandlerFactoryBean.java
@@ -71,9 +71,10 @@ public class FtpSendingMessageHandlerFactoryBean extends AbstractFactoryBean<Ftp
                 defaultFtpClientFactory);
 
         FtpSendingMessageHandler ftpSendingMessageHandler = new FtpSendingMessageHandler(queuedFtpClientPool);
-		ftpSendingMessageHandler.setCharset( this.charset);
+        if (this.charset != null) {
+        	ftpSendingMessageHandler.setCharset(this.charset);
+        }
         ftpSendingMessageHandler.afterPropertiesSet();
-
         return ftpSendingMessageHandler;
     }
 
diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/SftpMessageSendingConsumerFactoryBean.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/SftpMessageSendingConsumerFactoryBean.java
index e964e4b026..56a092ace0 100644
--- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/SftpMessageSendingConsumerFactoryBean.java
+++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/SftpMessageSendingConsumerFactoryBean.java
@@ -36,6 +36,7 @@ public class SftpMessageSendingConsumerFactoryBean implements FactoryBean<SftpSe
 	private String username;
 	private boolean autoCreateDirectories;
 	private int port;
+	private String charset;
 
 	public SftpSendingMessageHandler getObject() throws Exception {
 		SftpSessionFactory sessionFactory = SftpSessionUtils.buildSftpSessionFactory(
@@ -46,6 +47,7 @@ public class SftpMessageSendingConsumerFactoryBean implements FactoryBean<SftpSe
 
 		SftpSendingMessageHandler sftpSendingMessageHandler = new SftpSendingMessageHandler(queuedSFTPSessionPool);
 		sftpSendingMessageHandler.setRemoteDirectory(this.remoteDirectory);
+		sftpSendingMessageHandler.setCharset(this.charset);
 		sftpSendingMessageHandler.afterPropertiesSet();
 
 		return sftpSendingMessageHandler;
@@ -63,6 +65,10 @@ public class SftpMessageSendingConsumerFactoryBean implements FactoryBean<SftpSe
 		this.autoCreateDirectories = autoCreateDirectories;
 	}
 
+	public void setCharset(String charset) {
+		this.charset = charset;
+	}
+
 	public void setHost(final String host) {
 		this.host = host;
 	}
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 bc9448ce58..d087868c1a 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
@@ -48,7 +48,7 @@ public class SftpNamespaceHandler extends NamespaceHandlerSupport {
 		protected AbstractBeanDefinition parseConsumer(Element element, ParserContext parserContext) {
 			BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(SftpMessageSendingConsumerFactoryBean.class.getName());
 
-			for (String p : "auto-create-directories,username,password,host,key-file,key-file-password,remote-directory".split(",")) {
+			for (String p : "auto-create-directories,username,password,host,port,key-file,key-file-password,remote-directory,charset".split(",")) {
 				IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, p);
 			}
 
diff --git a/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-2.0.xsd b/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-2.0.xsd
index 2fc8aa5baa..0e99067556 100644
--- a/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-2.0.xsd
+++ b/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-2.0.xsd
@@ -50,7 +50,6 @@
 				</xsd:annotation>
 			</xsd:attribute>
 
-
 			<xsd:attribute name="username" type="xsd:string" use="required"/>
 			<xsd:attribute name="remote-directory" type="xsd:string" use="required"/>
 			<xsd:attribute name="host" type="xsd:string" use="required"/>
@@ -60,6 +59,7 @@
 			<xsd:attribute name="key-file" type="xsd:string"/>
 			<xsd:attribute name="key-file-password" type="xsd:string"/>
 
+			<xsd:attribute name="charset" type="xsd:string"/>
 			<xsd:attribute name="auto-create-directories" type="xsd:boolean"/>
 		</xsd:complexType>
 	</xsd:element>