From a70ad276dbeb92fdc9cfa2fad07f4b9991915ac1 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Sun, 25 Apr 2010 16:06:41 +0000 Subject: [PATCH] INT-1095 Aggregator now properly handles the resolution of replyChannel by name. --- .../aggregator/CorrelatingMessageHandler.java | 9 +- .../handler/AbstractMessageHandler.java | 4 +- .../AbstractReplyProducingMessageHandler.java | 2 +- .../AggregatorReplyChannelTests-context.xml | 18 ++++ .../AggregatorReplyChannelTests.java | 87 +++++++++++++++++++ 5 files changed, 111 insertions(+), 9 deletions(-) create mode 100644 org.springframework.integration/src/test/java/org/springframework/integration/aggregator/AggregatorReplyChannelTests-context.xml create mode 100644 org.springframework.integration/src/test/java/org/springframework/integration/aggregator/AggregatorReplyChannelTests.java diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/CorrelatingMessageHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/CorrelatingMessageHandler.java index bd744a8da3..1deedb189f 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/CorrelatingMessageHandler.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/CorrelatingMessageHandler.java @@ -84,8 +84,6 @@ public class CorrelatingMessageHandler extends AbstractMessageHandler implements private volatile MessageChannel discardChannel = new NullChannel(); - private volatile ChannelResolver channelResolver; - private final IdTracker tracker = new IdTracker(); private final BlockingQueue keysInBuffer = new DelayQueue(); @@ -153,7 +151,7 @@ public class CorrelatingMessageHandler extends AbstractMessageHandler implements } public void setChannelResolver(ChannelResolver channelResolver) { - this.channelResolver = channelResolver; + super.setChannelResolver(channelResolver); } public void setDiscardChannel(MessageChannel discardChannel) { @@ -192,7 +190,7 @@ public class CorrelatingMessageHandler extends AbstractMessageHandler implements logger.debug("Completing group with correlationKey [" + correlationKey + "]"); } outputProcessor.processAndSend(group, channelTemplate, - this.resolveReplyChannel(message, this.outputChannel, this.channelResolver)); + this.resolveReplyChannel(message, this.outputChannel)); } } else { @@ -292,8 +290,7 @@ public class CorrelatingMessageHandler extends AbstractMessageHandler implements MessageGroup group = new MessageGroup(all, completionStrategy, key, deleteOrTrackCallback()); if (all.size() > 0) { // last chance for normal completion - MessageChannel outputChannel = resolveReplyChannel( - all.get(0), this.outputChannel, this.channelResolver); + MessageChannel outputChannel = resolveReplyChannel(all.get(0), this.outputChannel); boolean processed = false; if (group.isComplete()) { outputProcessor.processAndSend(group, channelTemplate, outputChannel); diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java index 796bec5276..570c76325e 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java @@ -74,8 +74,8 @@ public abstract class AbstractMessageHandler extends IntegrationObjectSupport im protected abstract void handleMessageInternal(Message message) throws Exception; protected final MessageChannel resolveReplyChannel(Message requestMessage, - MessageChannel defaultOutputChannel, - ChannelResolver channelResolver) { + MessageChannel defaultOutputChannel) { + ChannelResolver channelResolver = this.getChannelResolver(); MessageChannel replyChannel = defaultOutputChannel; if (replyChannel == null) { Object replyChannelHeader = requestMessage.getHeaders().getReplyChannel(); 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 1eae2ff6a2..98a6d4af7c 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 @@ -99,7 +99,7 @@ public abstract class AbstractReplyProducingMessageHandler extends AbstractMessa } return; } - MessageChannel replyChannel = resolveReplyChannel(message, this.outputChannel, this.getChannelResolver()); + MessageChannel replyChannel = resolveReplyChannel(message, this.outputChannel); MessageHeaders requestHeaders = message.getHeaders(); this.handleResult(result, requestHeaders, replyChannel); } diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/AggregatorReplyChannelTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/AggregatorReplyChannelTests-context.xml new file mode 100644 index 0000000000..8eb48a0598 --- /dev/null +++ b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/AggregatorReplyChannelTests-context.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/AggregatorReplyChannelTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/AggregatorReplyChannelTests.java new file mode 100644 index 0000000000..e404d74589 --- /dev/null +++ b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/AggregatorReplyChannelTests.java @@ -0,0 +1,87 @@ +/* + * Copyright 2002-2010 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.integration.aggregator; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +import java.util.ArrayList; +import java.util.List; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.integration.channel.PollableChannel; +import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; +import org.springframework.integration.message.MessageBuilder; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +/** + * @author Mark Fisher + * @since 2.0 + */ +@ContextConfiguration +@RunWith(SpringJUnit4ClassRunner.class) +public class AggregatorReplyChannelTests { + + @Autowired + private volatile MessageChannel input; + + @Autowired + private volatile PollableChannel output; + + private final List list = new ArrayList(); + + + @Before + public void setupList() { + list.add("foo"); + list.add("bar"); + } + + + @Test + public void replyChannelHeader() { + this.verifyReply(MessageBuilder.withPayload(list).setReplyChannel(output).build()); + } + + @Test // INT-1095 + public void replyChannelNameHeader() { + this.verifyReply(MessageBuilder.withPayload(list).setReplyChannelName("output").build()); + } + + + @SuppressWarnings("unchecked") + private void verifyReply(Message message) { + assertNull(output.receive(0)); + input.send(message); + Message result = output.receive(0); + assertNotNull(result); + assertTrue(result.getPayload() instanceof List); + List resultList = (List) result.getPayload(); + assertEquals(2, resultList.size()); + assertTrue(resultList.contains("foo")); + assertTrue(resultList.contains("bar")); + } + +}