Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-975 CorrelatingMessageHandler now implements the MessageProducer interface.

Browse Source
This commit is contained in:
Mark Fisher
2010-03-09 20:59:36 +00:00
parent 221221aae7
commit 3cb0b360ca
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
org.springframework.integration/src/main/java/org/springframework/integration/aggregator/CorrelatingMessageHandler.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2009 the original author or authors.
* 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.
@@ -28,6 +28,7 @@ import org.springframework.integration.context.IntegrationContextUtils;
import org.springframework.integration.core.Message;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.core.MessageHeaders;
import org.springframework.integration.core.MessageProducer;
import org.springframework.integration.handler.AbstractMessageHandler;
import org.springframework.integration.message.MessageBuilder;
import org.springframework.integration.store.MessageStore;
@@ -45,16 +46,19 @@ import java.util.concurrent.locks.ReentrantLock;
* groups of messages that can be completed in batches. It is useful for aggregating, resequencing, or custom
* implementations requiring correlation.
* <p/>
* To customize this handler inject {@link org.springframework.integration.aggregator.CorrelationStrategy}, {@link
* org.springframework.integration.aggregator.CompletionStrategy} and {@link org.springframework.integration.aggregator.MessageGroupProcessor}
* implementations as you require.
* To customize this handler inject {@link org.springframework.integration.aggregator.CorrelationStrategy},
* {@link org.springframework.integration.aggregator.CompletionStrategy}, and
* {@link org.springframework.integration.aggregator.MessageGroupProcessor} implementations as you require.
* <p/>
* By default the CorrelationStrategy will be a HeaderAttributeCorrelationStrategy and the CompletionStrategy will be a
* SequenceSizeCompletionStrategy.
*
* @author Iwein Fuld
* @since 2.0
*/
public class CorrelatingMessageHandler extends AbstractMessageHandler implements Lifecycle, BeanFactoryAware {
public class CorrelatingMessageHandler extends AbstractMessageHandler
implements MessageProducer, Lifecycle, BeanFactoryAware {
private static final Log logger = LogFactory.getLog(CorrelatingMessageHandler.class);
public static final String COMPONENT_TYPE_LABEL = "aggregator";

3
org.springframework.integration/src/main/java/org/springframework/integration/handler/MessageHandlerChain.java
View File

@@ -133,9 +133,8 @@ public class MessageHandlerChain implements MessageHandler, MessageProducer, Ord
private void configureChain() {
List<MessageHandler> handlers = this.handlers;
for (int i = 0; i < handlers.size(); i++) {
boolean last = (i == handlers.size() - 1);
MessageHandler handler = handlers.get(i);
if (!last) {
if (i < handlers.size() - 1) { // not the last handler
Assert.isTrue(handler instanceof MessageProducer, "All handlers except for " +
"the last one in the chain must implement the MessageProducer interface.");
final MessageHandler nextHandler = handlers.get(i + 1);