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

INT-2039 removed references to deprecated Spring classes. Modified code where needed

Browse Source
This commit is contained in:
Oleg Zhurakousky
2011-08-09 00:19:42 -04:00
parent 935cd01d07
commit 6ecf0ec1e6
18 changed files with 80 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-integration-xml/src/main/java/org/springframework/integration/xml/config/XPathExpressionParser.java
View File

@@ -19,18 +19,18 @@ package org.springframework.integration.xml.config;
import java.util.HashMap;
import java.util.Map;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
import org.springframework.beans.factory.xml.BeanDefinitionParserDelegate;
import org.springframework.beans.factory.xml.ParserContext;
import org.springframework.core.env.StandardEnvironment;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
import org.springframework.xml.xpath.XPathExpressionFactory;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
/**
* Parser for the <xpath-expression> element.
@@ -99,8 +99,8 @@ public class XPathExpressionParser extends AbstractSingleBeanDefinitionParser {
}
protected Map<?,?> parseNamespaceMapElement(Element element, ParserContext parserContext, BeanDefinition parentDefinition) {
BeanDefinitionParserDelegate beanParser = new BeanDefinitionParserDelegate(parserContext.getReaderContext());
beanParser.initDefaults(element.getOwnerDocument().getDocumentElement());
BeanDefinitionParserDelegate beanParser = new BeanDefinitionParserDelegate(parserContext.getReaderContext(), new StandardEnvironment());
beanParser.initDefaults(element.getOwnerDocument().getDocumentElement(), beanParser);
return beanParser.parseMapElement(element, parentDefinition);
}

10
spring-integration-xml/src/main/java/org/springframework/integration/xml/router/XPathRouter.java
View File

@@ -21,9 +21,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.w3c.dom.DOMException;
import org.w3c.dom.Node;
import org.springframework.integration.Message;
import org.springframework.integration.router.AbstractMessageRouter;
import org.springframework.integration.xml.DefaultXmlPayloadConverter;
@@ -32,6 +29,8 @@ import org.springframework.util.Assert;
import org.springframework.xml.xpath.NodeMapper;
import org.springframework.xml.xpath.XPathExpression;
import org.springframework.xml.xpath.XPathExpressionFactory;
import org.w3c.dom.DOMException;
import org.w3c.dom.Node;
/**
* Message Router that uses {@link XPathExpression} evaluation to determine channel names.
@@ -41,7 +40,7 @@ import org.springframework.xml.xpath.XPathExpressionFactory;
*/
public class XPathRouter extends AbstractMessageRouter {
private volatile NodeMapper nodeMapper = new TextContentNodeMapper();
private volatile NodeMapper<Object> nodeMapper = new TextContentNodeMapper();
private final XPathExpression xPathExpression;
@@ -114,7 +113,6 @@ public class XPathRouter extends AbstractMessageRouter {
}
@Override
@SuppressWarnings("unchecked")
protected List<Object> getChannelIdentifiers(Message<?> message) {
Node node = this.converter.convertToNode(message.getPayload());
if (this.evaluateAsString){
@@ -126,7 +124,7 @@ public class XPathRouter extends AbstractMessageRouter {
}
private static class TextContentNodeMapper implements NodeMapper {
private static class TextContentNodeMapper implements NodeMapper<Object> {
public Object mapNode(Node node, int nodeNum) throws DOMException {
return node.getTextContent();

1
spring-integration-xml/src/main/java/org/springframework/integration/xml/splitter/XPathMessageSplitter.java
View File

@@ -132,7 +132,6 @@ public class XPathMessageSplitter extends AbstractMessageSplitter {
return splitStrings;
}
@SuppressWarnings("unchecked")
private List<Node> splitNode(Node node) throws ParserConfigurationException {
List<Node> nodeList = this.xpathExpression.evaluateAsNodeList(node);
if (nodeList.size() == 0) {

4
spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/XPathTransformer.java
View File

@@ -50,7 +50,7 @@ public class XPathTransformer extends AbstractTransformer {
private volatile XPathEvaluationType evaluationType = XPathEvaluationType.STRING_RESULT;
private volatile NodeMapper nodeMapper;
private volatile NodeMapper<?> nodeMapper;
/**
@@ -84,7 +84,7 @@ public class XPathTransformer extends AbstractTransformer {
* but if explicitly set, type determination is the responsibility of the NodeMapper, taking precedence
* over any configured evaluationType.
*/
public void setNodeMapper(NodeMapper nodeMapper) {
public void setNodeMapper(NodeMapper<?> nodeMapper) {
this.nodeMapper = nodeMapper;
}

2
spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathTransformerParserTests.java
View File

@@ -137,7 +137,7 @@ public class XPathTransformerParserTests {
@SuppressWarnings("unused")
private static class TestNodeMapper implements NodeMapper {
private static class TestNodeMapper implements NodeMapper<Object> {
public Object mapNode(Node node, int nodeNum) throws DOMException {
return node.getTextContent() + "-mapped";

2
spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XPathTransformerTests.java
View File

@@ -137,7 +137,7 @@ public class XPathTransformerTests {
}
private static class TestNodeMapper implements NodeMapper {
private static class TestNodeMapper implements NodeMapper<Object> {
public Object mapNode(Node node, int nodeNum) throws DOMException {
return node.getTextContent() + "-mapped";