From b5a56dbfe004dee9be344454cac2952287ba0034 Mon Sep 17 00:00:00 2001 From: Iwein Fuld Date: Sat, 10 Oct 2009 18:53:29 +0000 Subject: [PATCH] fixed code style violation (spaces to tabs) --- .../AbstractReplyProducingMessageHandler.java | 150 +++++++++--------- ...tractReplyProducingMessageHandlerTest.java | 42 ++--- 2 files changed, 96 insertions(+), 96 deletions(-) diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandler.java index 45b5345f15..a0e5ffbec3 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandler.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandler.java @@ -37,97 +37,97 @@ import org.springframework.util.Assert; */ public abstract class AbstractReplyProducingMessageHandler extends AbstractMessageHandler implements BeanFactoryAware { - public static final long DEFAULT_SEND_TIMEOUT = 1000; + public static final long DEFAULT_SEND_TIMEOUT = 1000; - private MessageChannel outputChannel; + private MessageChannel outputChannel; - private volatile ChannelResolver channelResolver; + private volatile ChannelResolver channelResolver; - private volatile boolean requiresReply = false; + private volatile boolean requiresReply = false; - private final MessageChannelTemplate channelTemplate; + private final MessageChannelTemplate channelTemplate; - public AbstractReplyProducingMessageHandler() { - this.channelTemplate = new MessageChannelTemplate(); - this.channelTemplate.setSendTimeout(DEFAULT_SEND_TIMEOUT); - } + public AbstractReplyProducingMessageHandler() { + this.channelTemplate = new MessageChannelTemplate(); + this.channelTemplate.setSendTimeout(DEFAULT_SEND_TIMEOUT); + } - public void setOutputChannel(MessageChannel outputChannel) { - this.outputChannel = outputChannel; - } + public void setOutputChannel(MessageChannel outputChannel) { + this.outputChannel = outputChannel; + } - protected MessageChannel getOutputChannel() { - return this.outputChannel; - } + protected MessageChannel getOutputChannel() { + return this.outputChannel; + } - /** - * Set the timeout for sending reply Messages. - */ - public void setSendTimeout(long sendTimeout) { - this.channelTemplate.setSendTimeout(sendTimeout); - } + /** + * Set the timeout for sending reply Messages. + */ + public void setSendTimeout(long sendTimeout) { + this.channelTemplate.setSendTimeout(sendTimeout); + } - /** - * Set the ChannelResolver to be used when there is no default output channel. - */ - public void setChannelResolver(ChannelResolver channelResolver) { - Assert.notNull(channelResolver, "'channelResolver' must not be null"); - this.channelResolver = channelResolver; - } + /** + * Set the ChannelResolver to be used when there is no default output channel. + */ + public void setChannelResolver(ChannelResolver channelResolver) { + Assert.notNull(channelResolver, "'channelResolver' must not be null"); + this.channelResolver = channelResolver; + } - /** - * Flag wether reply is required. If true an incoming message MUST result in a reply message being sent. - * If false an incoming message MAY result in a reply message being sent - */ - public void setRequiresReply(boolean requiresReply) { - this.requiresReply = requiresReply; - } + /** + * Flag wether reply is required. If true an incoming message MUST result in a reply message being sent. + * If false an incoming message MAY result in a reply message being sent + */ + public void setRequiresReply(boolean requiresReply) { + this.requiresReply = requiresReply; + } - public void setBeanFactory(BeanFactory beanFactory) { - if (this.channelResolver == null) { - this.channelResolver = new BeanFactoryChannelResolver(beanFactory); - } - } + public void setBeanFactory(BeanFactory beanFactory) { + if (this.channelResolver == null) { + this.channelResolver = new BeanFactoryChannelResolver(beanFactory); + } + } - /** - * {@inheritDoc} - */ - @Override - protected final void handleMessageInternal(Message message) { - ReplyMessageHolder replyMessageHolder = new ReplyMessageHolder(); - this.handleRequestMessage(message, replyMessageHolder); - if (replyMessageHolder.isEmpty()) { - if (this.requiresReply) { - throw new MessageHandlingException(message, "handler '" + this - + "' requires a reply, but no reply was received"); - } - if (logger.isDebugEnabled()) { - logger.debug("handler '" + this + "' produced no reply for request Message: " + message); - } - return; - } - MessageChannel replyChannel = resolveReplyChannel(message, this.outputChannel, this.channelResolver); - MessageHeaders requestHeaders = message.getHeaders(); - for (MessageBuilder builder : replyMessageHolder.builders()) { - builder.copyHeadersIfAbsent(requestHeaders); - Message replyMessage = builder.build(); - if (!this.sendReplyMessage(replyMessage, replyChannel)) { - throw new MessageDeliveryException(replyMessage, - "failed to send reply Message to channel '" + replyChannel + "'"); - } - } - } + /** + * {@inheritDoc} + */ + @Override + protected final void handleMessageInternal(Message message) { + ReplyMessageHolder replyMessageHolder = new ReplyMessageHolder(); + this.handleRequestMessage(message, replyMessageHolder); + if (replyMessageHolder.isEmpty()) { + if (this.requiresReply) { + throw new MessageHandlingException(message, "handler '" + this + + "' requires a reply, but no reply was received"); + } + if (logger.isDebugEnabled()) { + logger.debug("handler '" + this + "' produced no reply for request Message: " + message); + } + return; + } + MessageChannel replyChannel = resolveReplyChannel(message, this.outputChannel, this.channelResolver); + MessageHeaders requestHeaders = message.getHeaders(); + for (MessageBuilder builder : replyMessageHolder.builders()) { + builder.copyHeadersIfAbsent(requestHeaders); + Message replyMessage = builder.build(); + if (!this.sendReplyMessage(replyMessage, replyChannel)) { + throw new MessageDeliveryException(replyMessage, + "failed to send reply Message to channel '" + replyChannel + "'"); + } + } + } - protected abstract void handleRequestMessage(Message requestMessage, ReplyMessageHolder replyMessageHolder); + protected abstract void handleRequestMessage(Message requestMessage, ReplyMessageHolder replyMessageHolder); - protected boolean sendReplyMessage(Message replyMessage, MessageChannel replyChannel) { - if (logger.isDebugEnabled()) { - logger.debug("handler '" + this + "' sending reply Message: " + replyMessage); - } - return this.channelTemplate.send(replyMessage, replyChannel); - } + protected boolean sendReplyMessage(Message replyMessage, MessageChannel replyChannel) { + if (logger.isDebugEnabled()) { + logger.debug("handler '" + this + "' sending reply Message: " + replyMessage); + } + return this.channelTemplate.send(replyMessage, replyChannel); + } } diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandlerTest.java b/org.springframework.integration/src/test/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandlerTest.java index f9c83e401c..1ceaf2d060 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandlerTest.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandlerTest.java @@ -33,26 +33,26 @@ import org.springframework.integration.message.MessageBuilder; @RunWith(org.mockito.runners.MockitoJUnitRunner.class) public class AbstractReplyProducingMessageHandlerTest { - private AbstractReplyProducingMessageHandler handler = new AbstractReplyProducingMessageHandler() { - @Override - protected void handleRequestMessage(Message requestMessage, ReplyMessageHolder replyMessageHolder) { - replyMessageHolder.add(requestMessage); - } - }; - private Message message = MessageBuilder.withPayload("test").build(); - @Mock - private MessageChannel channel=null; + private AbstractReplyProducingMessageHandler handler = new AbstractReplyProducingMessageHandler() { + @Override + protected void handleRequestMessage(Message requestMessage, ReplyMessageHolder replyMessageHolder) { + replyMessageHolder.add(requestMessage); + } + }; + private Message message = MessageBuilder.withPayload("test").build(); + @Mock + private MessageChannel channel = null; - @Test - public void errorMessageShouldContainChannelName() { - handler.setOutputChannel(channel); - when(channel.send(message)).thenReturn(false); - when(channel.toString()).thenReturn("testChannel"); - try { - handler.handleMessage(message); - fail("Expected a MessagingException"); - } catch (MessagingException e) { - assertThat(e.getMessage(), JUnitMatchers.containsString("'testChannel'")); - } - } + @Test + public void errorMessageShouldContainChannelName() { + handler.setOutputChannel(channel); + when(channel.send(message)).thenReturn(false); + when(channel.toString()).thenReturn("testChannel"); + try { + handler.handleMessage(message); + fail("Expected a MessagingException"); + } catch (MessagingException e) { + assertThat(e.getMessage(), JUnitMatchers.containsString("'testChannel'")); + } + } }