From 7d1e14d9fa26dd08263ac185a74d180133e3d914 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Fri, 30 Jul 2010 10:22:34 +0000 Subject: [PATCH] formatting --- .../handler/AbstractMessageHandler.java | 116 +++++++++--------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java index 4b2261b1c3..f6374314a6 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java @@ -18,6 +18,7 @@ package org.springframework.integration.handler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.springframework.core.Ordered; import org.springframework.integration.Message; import org.springframework.integration.MessageHandlingException; @@ -30,77 +31,76 @@ import org.springframework.integration.core.MessageHandler; import org.springframework.util.Assert; /** - * Base class for MessageHandler implementations that provides basic - * validation and error handling capabilities. Asserts that the incoming - * Message is not null and that it does not contain a null payload. Converts - * checked exceptions into runtime {@link MessagingException}s. - * + * Base class for MessageHandler implementations that provides basic validation + * and error handling capabilities. Asserts that the incoming Message is not + * null and that it does not contain a null payload. Converts checked exceptions + * into runtime {@link MessagingException}s. + * * @author Mark Fisher * @author Oleg Zhurakousky */ public abstract class AbstractMessageHandler extends IntegrationObjectSupport implements MessageHandler, Ordered { - protected final Log logger = LogFactory.getLog(this.getClass()); + protected final Log logger = LogFactory.getLog(this.getClass()); - private volatile int order = Ordered.LOWEST_PRECEDENCE; + private volatile int order = Ordered.LOWEST_PRECEDENCE; - public void setOrder(int order) { - this.order = order; - } + public void setOrder(int order) { + this.order = order; + } - public int getOrder() { - return this.order; - } - - @Override + public int getOrder() { + return this.order; + } + + @Override public String getComponentType() { return "message-handler"; } - public final void handleMessage(Message message) { - Assert.notNull(message, "Message must not be null"); - Assert.notNull(message.getPayload(), "Message payload must not be null"); - if (this.logger.isDebugEnabled()) { - this.logger.debug(this + " received message: " + message); - } - try { - this.handleMessageInternal(message); - } - catch (Exception e) { - if (e instanceof MessagingException) { - throw (MessagingException) e; - } - throw new MessageHandlingException(message, - "error occurred in message handler [" + this + "]", e); - } - } + public final void handleMessage(Message message) { + Assert.notNull(message, "Message must not be null"); + Assert.notNull(message.getPayload(), "Message payload must not be null"); + if (this.logger.isDebugEnabled()) { + this.logger.debug(this + " received message: " + message); + } + try { + this.handleMessageInternal(message); + } + catch (Exception e) { + if (e instanceof MessagingException) { + throw (MessagingException) e; + } + throw new MessageHandlingException(message, "error occurred in message handler [" + this + "]", e); + } + } - protected abstract void handleMessageInternal(Message message) throws Exception; + protected abstract void handleMessageInternal(Message message) throws Exception; + + protected final MessageChannel resolveReplyChannel(Message requestMessage, MessageChannel defaultOutputChannel) { + ChannelResolver channelResolver = this.getChannelResolver(); + MessageChannel replyChannel = defaultOutputChannel; + if (replyChannel == null) { + Object replyChannelHeader = requestMessage.getHeaders().getReplyChannel(); + if (replyChannelHeader instanceof MessageChannel) { + replyChannel = (MessageChannel) replyChannelHeader; + } + else if (replyChannelHeader instanceof String) { + Assert.state(channelResolver != null, + "ChannelResolver is required for resolving a reply channel by name"); + replyChannel = channelResolver.resolveChannelName((String) replyChannelHeader); + } + else if (replyChannelHeader != null) { + throw new ChannelResolutionException( + "expected a MessageChannel or String for 'replyChannel' header, " + + "but type is [" + replyChannelHeader.getClass() + "]"); + } + } + if (replyChannel == null) { + throw new ChannelResolutionException("unable to resolve reply channel for message: " + requestMessage); + } + return replyChannel; + } - protected final MessageChannel resolveReplyChannel(Message requestMessage, - MessageChannel defaultOutputChannel) { - ChannelResolver channelResolver = this.getChannelResolver(); - MessageChannel replyChannel = defaultOutputChannel; - if (replyChannel == null) { - Object replyChannelHeader = requestMessage.getHeaders().getReplyChannel(); - if (replyChannelHeader != null) { - if (replyChannelHeader instanceof MessageChannel) { - replyChannel = (MessageChannel) replyChannelHeader; - } else if (replyChannelHeader instanceof String) { - Assert.state(channelResolver != null, - "ChannelResolver is required for resolving a reply channel by name"); - replyChannel = channelResolver.resolveChannelName((String) replyChannelHeader); - } else { - throw new ChannelResolutionException("expected a MessageChannel or String for 'replyChannel', but type is [" - + replyChannelHeader.getClass() + "]"); - } - } - } - if (replyChannel == null) { - throw new ChannelResolutionException( - "unable to resolve reply channel for message: " + requestMessage); - } - return replyChannel; - } }