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

INT-2497

Browse Source 
changed warning message to error in AbstractCorrelatingMessageHandlerParser when both beanRef and expression are present, re-enabled commented out test to verify the error
This commit is contained in:
Oleg Zhurakousky
2012-05-08 13:19:22 -04:00
committed by Gary Russell
parent 582817de29
commit e1274f3bb4
2 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2011 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. You may obtain a copy of the License at
@@ -12,6 +12,8 @@
*/
package org.springframework.integration.config.xml;
import org.w3c.dom.Element;
import org.springframework.beans.BeanMetadataElement;
import org.springframework.beans.factory.config.RuntimeBeanReference;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
@@ -19,10 +21,6 @@ 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;
/**
* Base class for parsers that create an instance of {@link AbstractCorrelatingMessageHandler}
*
@@ -32,8 +30,6 @@ 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";
@@ -72,11 +68,8 @@ public abstract class AbstractCorrelatingMessageHandlerParser extends AbstractCo
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");
parserContext.getReaderContext().error("Exactly one of the '" + beanRefAttribute + "' or '" + expressionAttribute +
"' attribute is allowed.", element);
}
BeanMetadataElement adapter = null;

10
spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorParserTests.java
View File

@@ -27,6 +27,7 @@ import org.junit.Test;
import org.springframework.beans.DirectFieldAccessor;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.integration.Message;
@@ -236,11 +237,10 @@ public class AggregatorParserTests {
assertTrue(ExpressionEvaluatingCorrelationStrategy.class.equals(correlationStrategy.getClass()));
}
// should be re-enabled for INT-2497
// @Test(expected=BeanDefinitionParsingException.class)
// public void testAggregatorFailureIfMutuallyExclusivityPresent() {
// this.context = new ClassPathXmlApplicationContext("aggregatorParserFailTests.xml", this.getClass());
// }
@Test(expected=BeanDefinitionParsingException.class)
public void testAggregatorFailureIfMutuallyExclusivityPresent() {
this.context = new ClassPathXmlApplicationContext("aggregatorParserFailTests.xml", this.getClass());
}
private static <T> Message<T> createMessage(T payload, Object correlationId, int sequenceSize, int sequenceNumber,
MessageChannel outputChannel) {