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

Removed the 'resolution-required' attribute for xpath-router (it is being refactored as a responsibility of the RouterEndpoint rather than individual Router implementations).

Browse Source
This commit is contained in:
Mark Fisher
2008-08-28 18:22:04 +00:00
parent c6f4bd910d
commit 023bf6cbd8
3 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/XPathRouterParser.java
View File

@@ -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());
}

3
org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/spring-integration-xml-1.0.xsd
View File

@@ -89,10 +89,7 @@
use="optional" />
<xsd:attribute name="multi-channel" type="xsd:boolean"
default="false" />
<xsd:attribute name="resolution-required" type="xsd:boolean"
default="true" />
</xsd:complexType>
</xsd:element>
</xsd:schema>

12
org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XPathRouterParserTests.java
View File

@@ -59,7 +59,7 @@ public class XPathRouterParserTests extends AbstractJUnit4SpringContextTests{
GenericMessage<Document> docMessage = new GenericMessage<Document>(doc);
inputOne.send(docMessage);
GenericMessage<Document> received = (GenericMessage<Document>) 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<Document> docMessage = new GenericMessage<Document>(doc);
inputOne.send(docMessage);
GenericMessage<Document> received = (GenericMessage<Document>) 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<Document> docMessage = new GenericMessage<Document>(doc);
inputOne.send(docMessage);
GenericMessage<Document> received = (GenericMessage<Document>) 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<Document> docMessage = new GenericMessage<Document>(doc);
inputTwo.send(docMessage);
GenericMessage<Document> received = (GenericMessage<Document>) 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<Document> docMessage = new GenericMessage<Document>(doc);
inputTwo.send(docMessage);
GenericMessage<Document> received = (GenericMessage<Document>) 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<Document> docMessage = new GenericMessage<Document>(doc);
inputTwo.send(docMessage);
GenericMessage<Document> received = (GenericMessage<Document>) errorChannel.receive(1000);
assertNotNull("Did not recevie message on errors", received);
assertNotNull("Did not receive message on errors", received);
}
}