Refactored MessageConsumer with onMessage to MessageHandler with handleMessage.

org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/ByteStreamWritingMessageHandler.java

@@ -25,25 +25,25 @@ import org.apache.commons.logging.LogFactory;
 
 import org.springframework.integration.core.Message;
 import org.springframework.integration.core.MessagingException;
-import org.springframework.integration.message.MessageConsumer;
+import org.springframework.integration.message.MessageHandler;
 
 /**
- * A {@link MessageConsumer} that writes a byte array to an {@link OutputStream}.
+ * A {@link MessageHandler} that writes a byte array to an {@link OutputStream}.
  * 
  * @author Mark Fisher
  */
-public class ByteStreamWritingMessageConsumer implements MessageConsumer {
+public class ByteStreamWritingMessageHandler implements MessageHandler {
 
 	private final Log logger = LogFactory.getLog(this.getClass());
 
 	private final BufferedOutputStream stream;
 
 
-	public ByteStreamWritingMessageConsumer(OutputStream stream) {
+	public ByteStreamWritingMessageHandler(OutputStream stream) {
 		this(stream, -1);
 	}
 
-	public ByteStreamWritingMessageConsumer(OutputStream stream, int bufferSize) {
+	public ByteStreamWritingMessageHandler(OutputStream stream, int bufferSize) {
 		if (bufferSize > 0) {
 			this.stream = new BufferedOutputStream(stream, bufferSize);
 		}
@@ -53,7 +53,7 @@ public class ByteStreamWritingMessageConsumer implements MessageConsumer {
 	}
 
 
-	public void onMessage(Message<?> message) {
+	public void handleMessage(Message<?> message) {
 		Object payload = message.getPayload();
 		if (payload == null) {
 			if (logger.isWarnEnabled()) {

org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/CharacterStreamWritingMessageHandler.java

@@ -28,11 +28,11 @@ import org.apache.commons.logging.LogFactory;
 
 import org.springframework.integration.core.Message;
 import org.springframework.integration.core.MessagingException;
-import org.springframework.integration.message.MessageConsumer;
+import org.springframework.integration.message.MessageHandler;
 import org.springframework.util.Assert;
 
 /**
- * A {@link MessageConsumer} that writes characters to a {@link Writer}.
+ * A {@link MessageHandler} that writes characters to a {@link Writer}.
  * String, character array, and byte array payloads will be written directly,
  * but for other payload types, the result of the object's {@link #toString()}
  * method will be written. To append a new-line after each write, set the
@@ -40,7 +40,7 @@ import org.springframework.util.Assert;
  * 
  * @author Mark Fisher
  */
-public class CharacterStreamWritingMessageConsumer implements MessageConsumer {
+public class CharacterStreamWritingMessageHandler implements MessageHandler {
 
 	private final Log logger = LogFactory.getLog(this.getClass());
 
@@ -49,11 +49,11 @@ public class CharacterStreamWritingMessageConsumer implements MessageConsumer {
 	private volatile boolean shouldAppendNewLine = false;
 
 
-	public CharacterStreamWritingMessageConsumer(Writer writer) {
+	public CharacterStreamWritingMessageHandler(Writer writer) {
 		this(writer, -1);
 	}
 
-	public CharacterStreamWritingMessageConsumer(Writer writer, int bufferSize) {
+	public CharacterStreamWritingMessageHandler(Writer writer, int bufferSize) {
 		Assert.notNull(writer, "writer must not be null");
 		if (writer instanceof BufferedWriter) {
 			this.writer = (BufferedWriter) writer;
@@ -71,7 +71,7 @@ public class CharacterStreamWritingMessageConsumer implements MessageConsumer {
 	 * Factory method that creates a target for stdout (System.out) with the
 	 * default charset encoding.
 	 */
-	public static CharacterStreamWritingMessageConsumer stdout() {
+	public static CharacterStreamWritingMessageHandler stdout() {
 		return stdout(null);
 	}
 
@@ -79,7 +79,7 @@ public class CharacterStreamWritingMessageConsumer implements MessageConsumer {
 	 * Factory method that creates a target for stdout (System.out) with the
 	 * specified charset encoding.
 	 */
-	public static CharacterStreamWritingMessageConsumer stdout(String charsetName) {
+	public static CharacterStreamWritingMessageHandler stdout(String charsetName) {
 		return createTargetForStream(System.out, charsetName);
 	}
 
@@ -87,7 +87,7 @@ public class CharacterStreamWritingMessageConsumer implements MessageConsumer {
 	 * Factory method that creates a target for stderr (System.err) with the
 	 * default charset encoding.
 	 */
-	public static CharacterStreamWritingMessageConsumer stderr() {
+	public static CharacterStreamWritingMessageHandler stderr() {
 		return stderr(null);
 	}
 
@@ -95,16 +95,16 @@ public class CharacterStreamWritingMessageConsumer implements MessageConsumer {
 	 * Factory method that creates a target for stderr (System.err) with the
 	 * specified charset encoding.
 	 */	
-	public static CharacterStreamWritingMessageConsumer stderr(String charsetName) {
+	public static CharacterStreamWritingMessageHandler stderr(String charsetName) {
 		return createTargetForStream(System.err, charsetName);
 	}
 
-	private static CharacterStreamWritingMessageConsumer createTargetForStream(OutputStream stream, String charsetName) {
+	private static CharacterStreamWritingMessageHandler createTargetForStream(OutputStream stream, String charsetName) {
 		if (charsetName == null) {
-			return new CharacterStreamWritingMessageConsumer(new OutputStreamWriter(stream));
+			return new CharacterStreamWritingMessageHandler(new OutputStreamWriter(stream));
 		}
 		try {
-			return new CharacterStreamWritingMessageConsumer(new OutputStreamWriter(stream, charsetName));
+			return new CharacterStreamWritingMessageHandler(new OutputStreamWriter(stream, charsetName));
 		}
 		catch (UnsupportedEncodingException e) {
 			throw new IllegalArgumentException("unsupported encoding: " + charsetName, e);
@@ -116,7 +116,7 @@ public class CharacterStreamWritingMessageConsumer implements MessageConsumer {
 		this.shouldAppendNewLine = shouldAppendNewLine;
 	}
 
-	public void onMessage(Message<?> message) {
+	public void handleMessage(Message<?> message) {
 		Object payload = message.getPayload();
 		if (payload == null) {
 			if (logger.isWarnEnabled()) {

org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/config/ConsoleOutboundChannelAdapterParser.java

@@ -22,7 +22,7 @@ import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.integration.config.xml.AbstractOutboundChannelAdapterParser;
-import org.springframework.integration.stream.CharacterStreamWritingMessageConsumer;
+import org.springframework.integration.stream.CharacterStreamWritingMessageHandler;
 import org.springframework.util.StringUtils;
 
 /**
@@ -35,7 +35,7 @@ public class ConsoleOutboundChannelAdapterParser extends AbstractOutboundChannel
 	@Override
 	protected AbstractBeanDefinition parseConsumer(Element element, ParserContext parserContext) {
 		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(
-				CharacterStreamWritingMessageConsumer.class);
+				CharacterStreamWritingMessageHandler.class);
 		if (element.getLocalName().startsWith("stderr")) {
 			builder.setFactoryMethod("stderr");
 		}