From d54c9347cda3576ddbcc67647919977495ded328 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Thu, 3 Apr 2008 01:17:40 +0000
Subject: [PATCH] Added optional 'charsetName' arguments for the stdout and
 stderr adapter factory methods.

---
 .../stream/CharacterStreamTargetAdapter.java  | 47 +++++++++++++++++--
 1 file changed, 43 insertions(+), 4 deletions(-)

diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/stream/CharacterStreamTargetAdapter.java b/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/stream/CharacterStreamTargetAdapter.java
index f3ec152eb5..45ed087487 100644
--- a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/stream/CharacterStreamTargetAdapter.java
+++ b/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/stream/CharacterStreamTargetAdapter.java
@@ -18,9 +18,12 @@ package org.springframework.integration.adapter.stream;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.io.OutputStreamWriter;
+import java.io.UnsupportedEncodingException;
 import java.io.Writer;
 
+import org.springframework.integration.MessagingConfigurationException;
 import org.springframework.integration.adapter.AbstractTargetAdapter;
 import org.springframework.integration.message.MessageHandlingException;
 import org.springframework.util.Assert;
@@ -61,17 +64,47 @@ public class CharacterStreamTargetAdapter extends AbstractTargetAdapter {
 
 
 	/**
-	 * Factory method that creates an adapter for stdout (System.out).
+	 * Factory method that creates an adapter for stdout (System.out) with the
+	 * default charset encoding.
 	 */
 	public static CharacterStreamTargetAdapter stdoutAdapter() {
-		return new CharacterStreamTargetAdapter(new OutputStreamWriter(System.out));
+		return stdoutAdapter(null);
 	}
 
 	/**
-	 * Factory method that creates an adapter for stderr (System.err).
+	 * Factory method that creates an adapter for stdout (System.out) with the
+	 * specified charset encoding.
+	 */
+	public static CharacterStreamTargetAdapter stdoutAdapter(String charsetName) {
+		return createAdapterForStream(System.out, charsetName);
+	}
+
+	/**
+	 * Factory method that creates an adapter for stderr (System.err) with the
+	 * default charset encoding.
 	 */
 	public static CharacterStreamTargetAdapter stderrAdapter() {
-		return new CharacterStreamTargetAdapter(new OutputStreamWriter(System.err));
+		return stderrAdapter(null);
+	}
+
+	/**
+	 * Factory method that creates an adapter for stderr (System.err) with the
+	 * specified charset encoding.
+	 */	
+	public static CharacterStreamTargetAdapter stderrAdapter(String charsetName) {
+		return createAdapterForStream(System.err, charsetName);
+	}
+
+	private static CharacterStreamTargetAdapter createAdapterForStream(OutputStream stream, String charsetName) {
+		if (charsetName == null) {
+			return new CharacterStreamTargetAdapter(new OutputStreamWriter(stream));
+		}
+		try {
+			return new CharacterStreamTargetAdapter(new OutputStreamWriter(stream, charsetName));
+		}
+		catch (UnsupportedEncodingException e) {
+			throw new MessagingConfigurationException("unsupported encoding: " + charsetName, e);
+		}
 	}
 
 
@@ -91,6 +124,12 @@ public class CharacterStreamTargetAdapter extends AbstractTargetAdapter {
 			if (object instanceof String) {
 				writer.write((String) object);
 			}
+			else if (object instanceof char[]) {
+				this.writer.write((char[]) object);
+			}
+			else if (object instanceof byte[]) {
+				this.writer.write(new String((byte[]) object));
+			}
 			else {
 				writer.write(object.toString());
 			}