[java-identity-provider] branch master updated: IDP-1243 - Deprecate HTTPMetadataProvider type

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=5832626fdf1ab41e171418167dd7e7dc1bfa5d7d

The following commit(s) were added to refs/heads/master by this push:
       new  5832626   IDP-1243 - Deprecate HTTPMetadataProvider type
5832626 is described below

commit 5832626fdf1ab41e171418167dd7e7dc1bfa5d7d
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Fri Jan 19 19:05:55 2018 -0500

    IDP-1243 - Deprecate HTTPMetadataProvider type
    
    https://issues.shibboleth.net/jira/browse/IDP-1243
---
 .../relyingparty/metadata/impl/HTTPMetadataProviderParser.java | 10 ++++++++++
 .../relyingparty/metadata/impl/MetadataNamespaceHandler.java   |  5 ++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/HTTPMetadataProviderParser.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/HTTPMetadataProviderParser.java
index 798a3c2..d8ac04b 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/HTTPMetadataProviderParser.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/HTTPMetadataProviderParser.java
@@ -23,7 +23,10 @@ import javax.xml.namespace.QName;
 
 import net.shibboleth.idp.profile.spring.relyingparty.metadata.AbstractMetadataProviderParser;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+import net.shibboleth.utilities.java.support.xml.DOMTypeSupport;
 import net.shibboleth.utilities.java.support.xml.ElementSupport;
 
 import org.opensaml.saml.metadata.resolver.impl.HTTPMetadataResolver;
@@ -61,6 +64,13 @@ public class HTTPMetadataProviderParser extends AbstractReloadingMetadataProvide
     /** {@inheritDoc} */
     @Override protected void doNativeParse(final Element element, final ParserContext parserContext,
             final BeanDefinitionBuilder builder) {
+        
+        if (ELEMENT_NAME.equals(DOMTypeSupport.getXSIType(element))) {
+            DeprecationSupport.warn(ObjectType.XSITYPE, ELEMENT_NAME.toString(),
+                    parserContext.getReaderContext().getResource().getDescription(),
+                    FileBackedHTTPMetadataProviderParser.ELEMENT_NAME.toString());
+        } 
+        
         super.doNativeParse(element, parserContext, builder);
 
         if (element.hasAttributeNS(null, "cacheDuration")) {
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/MetadataNamespaceHandler.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/MetadataNamespaceHandler.java
index 172c955..be432a6 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/MetadataNamespaceHandler.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/MetadataNamespaceHandler.java
@@ -54,7 +54,6 @@ public class MetadataNamespaceHandler extends BaseSpringNamespaceHandler {
         registerBeanDefinitionParser(InlineMetadataProviderParser.ELEMENT_NAME, new InlineMetadataProviderParser());
         registerBeanDefinitionParser(FilesystemMetadataProviderParser.ELEMENT_NAME,
                 new FilesystemMetadataProviderParser());
-        registerBeanDefinitionParser(HTTPMetadataProviderParser.ELEMENT_NAME, new HTTPMetadataProviderParser());
         registerBeanDefinitionParser(FileBackedHTTPMetadataProviderParser.ELEMENT_NAME,
                 new FileBackedHTTPMetadataProviderParser());
         registerBeanDefinitionParser(ResourceBackedMetadataProviderParser.ELEMENT_NAME,
@@ -64,6 +63,10 @@ public class MetadataNamespaceHandler extends BaseSpringNamespaceHandler {
         registerBeanDefinitionParser(LocalDynamicMetadataProviderParser.ELEMENT_NAME,
                 new LocalDynamicMetadataProviderParser());
 
+        // TODO: deprecated, remove in 4.0
+        registerBeanDefinitionParser(HTTPMetadataProviderParser.ELEMENT_NAME, new HTTPMetadataProviderParser());
+        
+
         // Resources
         registerBeanDefinitionParser(ClasspathResourceParser.ELEMENT_NAME, new ClasspathResourceParser());
         registerBeanDefinitionParser(SVNResourceParser.ELEMENT_NAME, new SVNResourceParser());

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.