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

INT-2396 Fix 'expression' Attribute Parsing

Browse Source 
Ensure that 'expression*' attributes are parsed
by the AggregatorParser when 'ref' is used to
define the actual aggregator

INT-2396 polishing based on PR comments

INT-2396 changed parser error to warning
message as suggested by Mark.
Raised follow up JIRA for 2.2 to fix it back to error
This commit is contained in:
Oleg Zhurakousky
2012-02-02 09:00:01 -05:00
committed by Gary Russell
parent 6bb460d825
commit fc31317aa4
4 changed files with 160 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractCorrelatingMessageHandlerParser.java
View File

@@ -18,6 +18,9 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
import org.springframework.integration.aggregator.AbstractCorrelatingMessageHandler;
import org.springframework.util.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.w3c.dom.Element;
/**
@@ -29,6 +32,8 @@ import org.w3c.dom.Element;
*/
public abstract class AbstractCorrelatingMessageHandlerParser extends AbstractConsumerEndpointParser {
private final Log logger = LogFactory.getLog(this.getClass());
private static final String CORRELATION_STRATEGY_REF_ATTRIBUTE = "correlation-strategy";
private static final String CORRELATION_STRATEGY_METHOD_ATTRIBUTE = "correlation-strategy-method";
@@ -58,23 +63,36 @@ public abstract class AbstractCorrelatingMessageHandlerParser extends AbstractCo
protected void injectPropertyWithAdapter(String beanRefAttribute, String methodRefAttribute,
String expressionAttribute, String beanProperty, String adapterClass, Element element,
BeanDefinitionBuilder builder, BeanMetadataElement processor, ParserContext parserContext) {
final String beanRef = element.getAttribute(beanRefAttribute);
final String beanMethod = element.getAttribute(methodRefAttribute);
final String expression = element.getAttribute(expressionAttribute);
final boolean hasBeanRef = StringUtils.hasText(beanRef);
final boolean hasExpression = StringUtils.hasText(expression);
if (hasBeanRef && hasExpression) {
this.logger.warn("Exactly one of the '" + beanRefAttribute + "' or '" + expressionAttribute +
"' attribute is allowed. The '" + expressionAttribute +
"' is ignored when both are provided." +
"NOTE: This is a warning message only, to avoid a breaking change in a point release and should " +
"be treated as an error. In a future release this condition will result in the actual exception");
}
BeanMetadataElement adapter = null;
if (StringUtils.hasText(beanRef)) {
if (hasBeanRef) {
adapter = this.createAdapter(new RuntimeBeanReference(beanRef), beanMethod, adapterClass, parserContext);
}
else if (processor != null) {
adapter = this.createAdapter(processor, beanMethod, adapterClass, parserContext);
}
else if (StringUtils.hasText(expression)) {
else if (hasExpression) {
BeanDefinitionBuilder adapterBuilder = BeanDefinitionBuilder
.genericBeanDefinition(IntegrationNamespaceUtils.BASE_PACKAGE + ".aggregator.ExpressionEvaluating"
+ adapterClass);
adapterBuilder.addConstructorArgValue(expression);
adapter = adapterBuilder.getBeanDefinition();
}
else if (processor != null) {
adapter = this.createAdapter(processor, beanMethod, adapterClass, parserContext);
}
else {
adapter = this.createAdapter(null, beanMethod, adapterClass, parserContext);
}