From d43bbc8eda2f2d11e535ee8171a3f7bb5efc4501 Mon Sep 17 00:00:00 2001 From: Soby Chacko Date: Tue, 5 Mar 2013 00:45:26 -0500 Subject: [PATCH] INT-2531: Remove deprecations in XML Adapter after upgrade to Spring 3.1.1 * BeanDefinitionParserDelegate constructor now prefers an Environment. Circumvent this preference by directly getting BeanDefinitionParserDelegate from the associated ParserContext --- .../integration/xml/config/XPathExpressionParser.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/config/XPathExpressionParser.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/config/XPathExpressionParser.java index 6b92483640..85263f6f83 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/config/XPathExpressionParser.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/config/XPathExpressionParser.java @@ -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"); * 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. * * @author Jonas Partner + * @author Soby Chacko */ 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) { - BeanDefinitionParserDelegate beanParser = new BeanDefinitionParserDelegate(parserContext.getReaderContext()); - beanParser.initDefaults(element.getOwnerDocument().getDocumentElement()); + BeanDefinitionParserDelegate beanParser = parserContext.getDelegate(); + beanParser.initDefaults(element.getOwnerDocument().getDocumentElement(), beanParser); return beanParser.parseMapElement(element, parentDefinition); }