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

The MessageEndpointAnnotationPostProcessor now checks for a null handler after processing and provides a MessageHandler implementation that passes the Message as-is. The @DefaultOutput no longer triggers the creation of a separate endpoint - rather the resulting "adapter" will be added to the end of the MessageHandlerChain (or configured as the sole handler if no MessageHandler had been previously created when processing annotated methods).

Browse Source
This commit is contained in:
Mark Fisher
2008-02-25 16:40:33 +00:00
parent 7cb5c918c5
commit b7aa312c48
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
spring-integration-core/src/main/java/org/springframework/integration/config/MessageEndpointAnnotationPostProcessor.java
View File

@@ -52,6 +52,7 @@ import org.springframework.integration.handler.MessageHandler;
import org.springframework.integration.handler.MessageHandlerChain;
import org.springframework.integration.handler.config.DefaultMessageHandlerCreator;
import org.springframework.integration.handler.config.MessageHandlerCreator;
import org.springframework.integration.message.Message;
import org.springframework.integration.router.config.RouterMessageHandlerCreator;
import org.springframework.integration.router.config.SplitterMessageHandlerCreator;
import org.springframework.integration.scheduling.PollingSchedule;
@@ -115,6 +116,13 @@ public class MessageEndpointAnnotationPostProcessor implements BeanPostProcessor
DefaultMessageEndpoint endpoint = new DefaultMessageEndpoint(handlerChain);
this.configureInput(bean, beanName, endpointAnnotation, endpoint);
this.configureDefaultOutput(bean, beanName, endpointAnnotation, endpoint);
if (endpoint.getHandler() == null) {
endpoint.setHandler(new MessageHandler() {
public Message<?> handle(Message<?> message) {
return message;
}
});
}
this.messageBus.registerEndpoint(beanName + "-endpoint", endpoint);
return bean;
}
@@ -178,12 +186,18 @@ public class MessageEndpointAnnotationPostProcessor implements BeanPostProcessor
target.setMethod(method.getName());
target.afterPropertiesSet();
DefaultTargetAdapter adapter = new DefaultTargetAdapter(target);
SimpleChannel channel = new SimpleChannel();
String channelName = beanName + "-defaultOutputChannel";
Subscription subscription = new Subscription(channel);
messageBus.registerChannel(channelName, channel);
messageBus.registerHandler(beanName + "-targetAdapter", adapter, subscription);
endpoint.setDefaultOutputChannelName(channelName);
MessageHandler handler = endpoint.getHandler();
if (handler == null) {
endpoint.setHandler(adapter);
}
else if (handler instanceof MessageHandlerChain) {
((MessageHandlerChain) handler).add(adapter);
}
else {
MessageHandlerChain chain = new MessageHandlerChain();
chain.add(handler);
chain.add(adapter);
}
foundDefaultOutput = true;
return;
}