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

INT-2399 fix processMessage for service-activator

Browse Source 
ServiceActivatorFactoryBean#createMessageProcessingHandler: force 'processMessage' method-name parameter into constructor ServiceActivatingHandler for MessageProcessor
Test for check 'handlerMethods' in ServiceActivatingHandler's MethodInvokingMessageProcessor
Integration test for <service-activator> with invalid Groovy inline script
This commit is contained in:
Artem Bilan
2012-01-15 13:52:02 +02:00
committed by Mark Fisher
parent 3ab14bdd2c
commit 51da77d14d
5 changed files with 108 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-integration-core/src/main/java/org/springframework/integration/handler/ServiceActivatingHandler.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2010 the original author or authors.
* Copyright 2002-2012 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.
@@ -24,10 +24,11 @@ import org.springframework.integration.annotation.ServiceActivator;
/**
* @author Mark Fisher
* @author Artem Bilan
*/
public class ServiceActivatingHandler extends AbstractReplyProducingMessageHandler {
private final AbstractMessageProcessor<Object> processor;
private final MessageProcessor<?> processor;
public ServiceActivatingHandler(final Object object) {
@@ -42,7 +43,7 @@ public class ServiceActivatingHandler extends AbstractReplyProducingMessageHandl
this(new MethodInvokingMessageProcessor<Object>(object, methodName));
}
public ServiceActivatingHandler(AbstractMessageProcessor<Object> processor) {
public <T> ServiceActivatingHandler(MessageProcessor<T> processor) {
this.processor = processor;
}
@@ -55,7 +56,9 @@ public class ServiceActivatingHandler extends AbstractReplyProducingMessageHandl
@Override
public final void onInit() {
super.onInit();
this.processor.setConversionService(this.getConversionService());
if (processor instanceof AbstractMessageProcessor) {
((AbstractMessageProcessor<?>) this.processor).setConversionService(this.getConversionService());
}
}
@Override