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

INT-2531: Remove deprecations in XML Adapter after upgrade to Spring 3.1.1

Browse Source 
* BeanDefinitionParserDelegate constructor now prefers an Environment. Circumvent this
preference by directly getting BeanDefinitionParserDelegate from the associated ParserContext
This commit is contained in:
Soby Chacko
2013-03-05 00:45:26 -05:00
committed by Gunnar Hillert
parent 0fc21de170
commit d43bbc8eda
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2011 the original author or authors. * Copyright 2002-2013 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -35,6 +35,7 @@ import org.w3c.dom.Element;
* Parser for the <xpath-expression> element. * Parser for the <xpath-expression> element.
* *
* @author Jonas Partner * @author Jonas Partner
* @author Soby Chacko
*/ */
public class XPathExpressionParser extends AbstractSingleBeanDefinitionParser { public class XPathExpressionParser extends AbstractSingleBeanDefinitionParser {
@@ -98,10 +99,9 @@ public class XPathExpressionParser extends AbstractSingleBeanDefinitionParser {
} }
} }
@SuppressWarnings("deprecation")
protected Map<?,?> parseNamespaceMapElement(Element element, ParserContext parserContext, BeanDefinition parentDefinition) { protected Map<?,?> parseNamespaceMapElement(Element element, ParserContext parserContext, BeanDefinition parentDefinition) {
BeanDefinitionParserDelegate beanParser = new BeanDefinitionParserDelegate(parserContext.getReaderContext()); BeanDefinitionParserDelegate beanParser = parserContext.getDelegate();
beanParser.initDefaults(element.getOwnerDocument().getDocumentElement()); beanParser.initDefaults(element.getOwnerDocument().getDocumentElement(), beanParser);
return beanParser.parseMapElement(element, parentDefinition); return beanParser.parseMapElement(element, parentDefinition);
} }