[utilities COMMIT] in /spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util: BaseSpringNamespaceHandl...

[noreply at shibboleth.net]

Author: rdw
Date: Thu Dec 11 11:47:59 2014
New Revision: 704

URL: http://svn.shibboleth.net/view/utilities?rev=704&view=rev
Log:
JSE-10 Stop using deprecated constructor

Modified:
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/BaseSpringNamespaceHandler.java
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/SchemaTypeAwareBeanDefinitionDocumentReader.java
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/SchemaTypeAwareBeanDefinitionParserDelegate.java

Modified: spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/BaseSpringNamespaceHandler.java
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/BaseSpringNamespaceHandler.java?rev=704&r1=703&r2=704&view=diff
==============================================================================
--- spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/BaseSpringNamespaceHandler.java (original)
+++ spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/BaseSpringNamespaceHandler.java Thu Dec 11 11:47:59 2014
@@ -37,7 +37,6 @@
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
-//TODO incomplete port from v2
 /**
  * A base class for {@link NamespaceHandler} implementations.
  * 
@@ -78,6 +77,7 @@
      * 
      * @return the decorated bean definition
      */
+    @Override
     public BeanDefinitionHolder decorate(Node node, BeanDefinitionHolder definition, ParserContext parserContext) {
         return findDecoratorForNode(node).decorate(node, definition, parserContext);
     }
@@ -91,6 +91,7 @@
      * 
      * @return the bean definition created from the given element
      */
+    @Override
     public BeanDefinition parse(Element element, ParserContext parserContext) {
         return findParserForElement(element).parse(element, parserContext);
     }

Modified: spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/SchemaTypeAwareBeanDefinitionDocumentReader.java
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/SchemaTypeAwareBeanDefinitionDocumentReader.java?rev=704&r1=703&r2=704&view=diff
==============================================================================
--- spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/SchemaTypeAwareBeanDefinitionDocumentReader.java (original)
+++ spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/SchemaTypeAwareBeanDefinitionDocumentReader.java Thu Dec 11 11:47:59 2014
@@ -20,7 +20,6 @@
 import org.springframework.beans.factory.xml.BeanDefinitionParserDelegate;
 import org.springframework.beans.factory.xml.DefaultBeanDefinitionDocumentReader;
 import org.springframework.beans.factory.xml.XmlReaderContext;
-import org.springframework.core.env.StandardEnvironment;
 import org.w3c.dom.Element;
 
 /**
@@ -34,7 +33,7 @@
     protected BeanDefinitionParserDelegate createDelegate(XmlReaderContext readerContext, Element root,
             BeanDefinitionParserDelegate parentDelegate) {
         BeanDefinitionParserDelegate delegate =
-                new SchemaTypeAwareBeanDefinitionParserDelegate(readerContext, new StandardEnvironment());
+                new SchemaTypeAwareBeanDefinitionParserDelegate(readerContext);
         delegate.initDefaults(root, parentDelegate);
         return delegate;
     }

Modified: spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/SchemaTypeAwareBeanDefinitionParserDelegate.java
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/SchemaTypeAwareBeanDefinitionParserDelegate.java?rev=704&r1=703&r2=704&view=diff
==============================================================================
--- spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/SchemaTypeAwareBeanDefinitionParserDelegate.java (original)
+++ spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/SchemaTypeAwareBeanDefinitionParserDelegate.java Thu Dec 11 11:47:59 2014
@@ -24,7 +24,6 @@
 import org.springframework.beans.factory.xml.NamespaceHandler;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.beans.factory.xml.XmlReaderContext;
-import org.springframework.core.env.Environment;
 import org.w3c.dom.Element;
 
 /**
@@ -39,18 +38,19 @@
      * Constructor.
      * 
      * @param readerContext current XML reader context
-     * @param environment current environment
      */
-    public SchemaTypeAwareBeanDefinitionParserDelegate(XmlReaderContext readerContext, Environment environment) {
-        super(readerContext, environment);
+    public SchemaTypeAwareBeanDefinitionParserDelegate(XmlReaderContext readerContext) {
+        super(readerContext);
     }
 
     /** {@inheritDoc} */
+    @Override
     public BeanDefinition parseCustomElement(Element element) {
         return parseCustomElement(element, null);
     }
 
     /** {@inheritDoc} */
+    @Override

[... 4 lines stripped ...]