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

Using the parser context error handling capabilities rather than throwing Exceptions or using assertions. This facilitates proper tooling support (INT-114).

Browse Source
This commit is contained in:
Mark Fisher
2008-12-12 13:59:11 +00:00
parent 69fc0a0cb3
commit ca8155ba5b
2 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
org.springframework.integration/src/main/java/org/springframework/integration/config/xml/ChannelInterceptorParser.java
View File

@@ -23,10 +23,11 @@ import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.springframework.beans.factory.config.BeanDefinitionHolder;
import org.springframework.beans.factory.config.RuntimeBeanReference;
import org.springframework.beans.factory.parsing.BeanComponentDefinition;
import org.springframework.beans.factory.support.ManagedList;
import org.springframework.beans.factory.xml.ParserContext;
import org.springframework.util.Assert;
/**
* A helper class for parsing the sub-elements of a channel's
@@ -55,8 +56,9 @@ public class ChannelInterceptorParser {
Element childElement = (Element) child;
String localName = child.getLocalName();
if ("bean".equals(localName)) {
interceptors.add(new RuntimeBeanReference(
IntegrationNamespaceUtils.parseBeanDefinitionElement(childElement, parserContext)));
BeanDefinitionHolder holder = parserContext.getDelegate().parseBeanDefinitionElement(childElement);
parserContext.registerBeanComponent(new BeanComponentDefinition(holder));
interceptors.add(new RuntimeBeanReference(holder.getBeanName()));
}
else if ("ref".equals(localName)) {
String ref = childElement.getAttribute("bean");
@@ -64,7 +66,10 @@ public class ChannelInterceptorParser {
}
else {
BeanDefinitionRegisteringParser parser = this.parsers.get(localName);
Assert.notNull(parser, "unsupported interceptor element '" + localName + "'");
if (parser == null) {
parserContext.getReaderContext().error(
"unsupported interceptor element '" + localName + "'", childElement);
}
String interceptorBeanName = parser.parse(childElement, parserContext);
interceptors.add(new RuntimeBeanReference(interceptorBeanName));
}

35
org.springframework.integration/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceUtils.java
View File

@@ -20,14 +20,10 @@ import org.w3c.dom.Element;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.BeanDefinitionHolder;
import org.springframework.beans.factory.parsing.BeanComponentDefinition;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
import org.springframework.beans.factory.xml.BeanDefinitionParserDelegate;
import org.springframework.beans.factory.xml.ParserContext;
import org.springframework.core.Conventions;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
/**
@@ -126,15 +122,6 @@ public abstract class IntegrationNamespaceUtils {
Conventions.attributeNameToPropertyName(attributeName));
}
public static String parseBeanDefinitionElement(Element element, ParserContext parserContext) {
BeanDefinitionParserDelegate beanParser =
new BeanDefinitionParserDelegate(parserContext.getReaderContext());
beanParser.initDefaults(element.getOwnerDocument().getDocumentElement());
BeanDefinitionHolder beanDefinitionHolder = beanParser.parseBeanDefinitionElement(element);
parserContext.registerBeanComponent(new BeanComponentDefinition(beanDefinitionHolder));
return beanDefinitionHolder.getBeanName();
}
/**
* Parse a "poller" element to provide a reference for the target
* BeanDefinitionBuilder. If the poller element does not contain a "ref"
@@ -148,19 +135,25 @@ public abstract class IntegrationNamespaceUtils {
public static void configurePollerMetadata(Element pollerElement, BeanDefinitionBuilder targetBuilder, ParserContext parserContext) {
String pollerMetadataRef = null;
if (pollerElement.hasAttribute("ref")) {
Assert.isTrue(pollerElement.getAttributes().getLength() == 1,
"a 'poller' element that provides a 'ref' must have no other attributes");
Assert.isTrue(pollerElement.getChildNodes().getLength() == 0,
"a 'poller' element that provides a 'ref' must have no child elements");
if (pollerElement.getAttributes().getLength() != 1) {
parserContext.getReaderContext().error(
"A 'poller' element that provides a 'ref' must have no other attributes.", pollerElement);
}
if (pollerElement.getChildNodes().getLength() != 0) {
parserContext.getReaderContext().error(
"A 'poller' element that provides a 'ref' must have no child elements.", pollerElement);
}
pollerMetadataRef = pollerElement.getAttribute("ref");
}
else {
BeanDefinition beanDefinition = parserContext.getDelegate().parseCustomElement(
pollerElement, targetBuilder.getBeanDefinition());
Assert.notNull(beanDefinition, "BeanDefinition must not be null");
Assert.isInstanceOf(AbstractBeanDefinition.class, beanDefinition);
pollerMetadataRef = BeanDefinitionReaderUtils.registerWithGeneratedName(
(AbstractBeanDefinition) beanDefinition, parserContext.getRegistry());
if (beanDefinition == null) {
parserContext.getReaderContext().error("BeanDefinition must not be null", pollerElement);
}
pollerMetadataRef = BeanDefinitionReaderUtils.generateBeanName(beanDefinition, parserContext.getRegistry());
BeanDefinitionHolder holder = new BeanDefinitionHolder(beanDefinition, pollerMetadataRef);
BeanDefinitionReaderUtils.registerBeanDefinition(holder, parserContext.getRegistry());
}
targetBuilder.addPropertyReference("pollerMetadata", pollerMetadataRef);
}