diff --git a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/XPathRouterParser.java b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/XPathRouterParser.java index f1bd243458..732b03b0a9 100644 --- a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/XPathRouterParser.java +++ b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/XPathRouterParser.java @@ -48,7 +48,6 @@ public class XPathRouterParser extends AbstractSingleBeanDefinitionParser { @Override protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) { boolean multiChannel = Boolean.parseBoolean(element.getAttribute("multi-channel")); - boolean resolutionRequired = Boolean.parseBoolean(element.getAttribute("resolution-required")); String xPathExpression = element.getAttribute("xpath-expression"); String xPathExpressionRef = element.getAttribute("xpath-expression-ref"); if ((StringUtils.hasText(xPathExpression) && StringUtils.hasText(xPathExpressionRef)) @@ -75,7 +74,6 @@ public class XPathRouterParser extends AbstractSingleBeanDefinitionParser { else { resolverDefinitionBuilder.addConstructorArgReference(xPathExpressionRef); } - builder.addPropertyValue("resolutionRequired", resolutionRequired); builder.addPropertyValue("channelNameResolver", resolverDefinitionBuilder.getBeanDefinition()); } diff --git a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/spring-integration-xml-1.0.xsd b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/spring-integration-xml-1.0.xsd index 1c7b60e2cb..925b97325a 100644 --- a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/spring-integration-xml-1.0.xsd +++ b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/spring-integration-xml-1.0.xsd @@ -89,10 +89,7 @@ use="optional" /> - - \ No newline at end of file diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XPathRouterParserTests.java b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XPathRouterParserTests.java index 713f5a8e56..b252f5a77d 100644 --- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XPathRouterParserTests.java +++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XPathRouterParserTests.java @@ -59,7 +59,7 @@ public class XPathRouterParserTests extends AbstractJUnit4SpringContextTests{ GenericMessage docMessage = new GenericMessage(doc); inputOne.send(docMessage); GenericMessage received = (GenericMessage) outputOne.receive(1000); - assertNotNull("Did not recevie message from outputOne", received); + assertNotNull("Did not receive message from outputOne", received); } @SuppressWarnings("unchecked") @@ -69,7 +69,7 @@ public class XPathRouterParserTests extends AbstractJUnit4SpringContextTests{ GenericMessage docMessage = new GenericMessage(doc); inputOne.send(docMessage); GenericMessage received = (GenericMessage) outputTwo.receive(1000); - assertNotNull("Did not recevie message from two", received); + assertNotNull("Did not receive message from two", received); } @SuppressWarnings("unchecked") @@ -79,7 +79,7 @@ public class XPathRouterParserTests extends AbstractJUnit4SpringContextTests{ GenericMessage docMessage = new GenericMessage(doc); inputOne.send(docMessage); GenericMessage received = (GenericMessage) errorChannel.receive(1000); - assertNotNull("Did not recevie message on errors", received); + assertNotNull("Did not receive message on errors", received); } @@ -90,7 +90,7 @@ public class XPathRouterParserTests extends AbstractJUnit4SpringContextTests{ GenericMessage docMessage = new GenericMessage(doc); inputTwo.send(docMessage); GenericMessage received = (GenericMessage) outputOne.receive(1000); - assertNotNull("Did not recevie message from outputOne", received); + assertNotNull("Did not receive message from outputOne", received); } @SuppressWarnings("unchecked") @@ -100,7 +100,7 @@ public class XPathRouterParserTests extends AbstractJUnit4SpringContextTests{ GenericMessage docMessage = new GenericMessage(doc); inputTwo.send(docMessage); GenericMessage received = (GenericMessage) outputTwo.receive(1000); - assertNotNull("Did not recevie message from two", received); + assertNotNull("Did not receive message from two", received); } @SuppressWarnings("unchecked") @@ -110,7 +110,7 @@ public class XPathRouterParserTests extends AbstractJUnit4SpringContextTests{ GenericMessage docMessage = new GenericMessage(doc); inputTwo.send(docMessage); GenericMessage received = (GenericMessage) errorChannel.receive(1000); - assertNotNull("Did not recevie message on errors", received); + assertNotNull("Did not receive message on errors", received); } }