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

Added namespace support for a MessageSelectorChain's Strategy (ALL, ANY, AT_LEAST_HALF, MORE_THAN_HALF), and added support for nesting <selector-chain/> elements (INT-308).

Browse Source
This commit is contained in:
Mark Fisher
2008-10-14 17:39:14 +00:00
parent 0a72a7fa0e
commit 21eefa90dc
5 changed files with 145 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
org.springframework.integration/src/main/java/org/springframework/integration/config/xml/SelectorChainParser.java
View File

@@ -22,9 +22,14 @@ import org.w3c.dom.NodeList;
import org.springframework.beans.factory.config.RuntimeBeanReference;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
import org.springframework.beans.factory.support.ManagedList;
import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
import org.springframework.beans.factory.xml.ParserContext;
import org.springframework.integration.selector.MessageSelectorChain;
import org.springframework.integration.selector.MessageSelectorChain.Strategy;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
/**
* Parser for the &lt;selector-chain/&gt; element.
@@ -38,14 +43,35 @@ public class SelectorChainParser extends AbstractSingleBeanDefinitionParser {
return MessageSelectorChain.class;
}
public void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
Assert.hasText(element.getAttribute("id"), "id is required");
this.parseSelectorChain(builder, element, parserContext);
}
@SuppressWarnings("unchecked")
public void doParse(Element element, BeanDefinitionBuilder builder) {
private void parseSelectorChain(BeanDefinitionBuilder builder, Element element, ParserContext parserContext) {
String strategy = element.getAttribute("strategy");
if (StringUtils.hasText(strategy)) {
builder.addPropertyValue("strategy", Strategy.valueOf(strategy));
}
ManagedList selectors = new ManagedList();
NodeList childNodes = element.getChildNodes();
for (int i = 0; i < childNodes.getLength(); i++) {
Node child = childNodes.item(i);
if (child.getNodeType() == Node.ELEMENT_NODE && "selector".equals(child.getLocalName())) {
selectors.add(new RuntimeBeanReference(((Element) child).getAttribute("ref")));
if (child.getNodeType() == Node.ELEMENT_NODE) {
String nodeName = child.getLocalName();
if ("selector".equals(nodeName)) {
String ref = ((Element) child).getAttribute("ref");
selectors.add(new RuntimeBeanReference(ref));
}
else if ("selector-chain".equals(nodeName)) {
BeanDefinitionBuilder nestedBuilder =
BeanDefinitionBuilder.genericBeanDefinition(MessageSelectorChain.class);
this.parseSelectorChain(nestedBuilder, (Element) child, parserContext);
String nestedBeanName = BeanDefinitionReaderUtils.registerWithGeneratedName(
nestedBuilder.getBeanDefinition(), parserContext.getRegistry());
selectors.add(new RuntimeBeanReference(nestedBeanName));
}
}
}
builder.addPropertyValue("selectors", selectors);

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

@@ -146,7 +146,7 @@
<xsd:attribute name="id" type="xsd:ID" use="required"/>
<xsd:attribute name="service-interface" type="xsd:string" use="required"/>
<xsd:attribute name="default-request-channel" type="xsd:string"/>
<xsd:attribute name="default-reply-channel" type="xsd:string" use="optional"/>
<xsd:attribute name="default-reply-channel" type="xsd:string"/>
<xsd:attribute name="default-request-timeout" type="xsd:long"/>
<xsd:attribute name="default-reply-timeout" type="xsd:long"/>
</xsd:complexType>
@@ -192,8 +192,8 @@
<xsd:complexType name="inputOutputEndpointType">
<xsd:annotation>
<xsd:documentation>
Base type for handler endpoint elements that accept Messages from an input-channel
and also produce Messages to be sent to an output-channel.
Base type for Message Endpoint elements that accept Messages from an input-channel
and also may produce reply Messages to be sent to an output-channel.
</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
@@ -206,7 +206,7 @@
<xsd:complexType name="inputEndpointType">
<xsd:annotation>
<xsd:documentation>
Base type for handler endpoint elements that accept Messages from an input-channel.
Base type for Message Endpoint elements that accept Messages from an input-channel.
</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
@@ -214,7 +214,7 @@
<xsd:all>
<xsd:element ref="poller" minOccurs="0" maxOccurs="1"/>
</xsd:all>
<xsd:attribute name="input-channel" type="xsd:string" use="required"/>
<xsd:attribute name="input-channel" type="xsd:string"/>
<xsd:attribute name="ref" type="xsd:string"/>
<xsd:attribute name="method" type="xsd:string"/>
<xsd:attribute name="selector" type="xsd:string"/>
@@ -290,10 +290,26 @@
Defines a MessageSelector chain.
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element ref="selector" minOccurs="1" maxOccurs="unbounded"/>
</xsd:sequence>
<xsd:attribute name="id" type="xsd:ID" use="required"/>
<xsd:choice minOccurs="0" maxOccurs="unbounded">
<xsd:element ref="selector"/>
<xsd:element ref="selector-chain"/>
</xsd:choice>
<xsd:attribute name="id" type="xsd:ID"/>
<xsd:attribute name="strategy" default="ALL">
<xsd:annotation>
<xsd:documentation><![CDATA[
Enumeration with values that match the MessageSelectorChain.Strategy enum.
]]></xsd:documentation>
</xsd:annotation>
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:enumeration value="ALL"/>
<xsd:enumeration value="ANY"/>
<xsd:enumeration value="AT_LEAST_HALF"/>
<xsd:enumeration value="MORE_THAN_HALF"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:attribute>
</xsd:complexType>
</xsd:element>