[java-identity-provider] 02/06: IDP-1423 Remove deprecated attribute 'maintainExpiredMetadata'

[Rod Widdowson]

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

rdw 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=e49cb3900682321adaccbd4a00603d79f0937c0c

commit e49cb3900682321adaccbd4a00603d79f0937c0c
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Mar 1 16:32:47 2019 +0000

    IDP-1423 Remove deprecated attribute 'maintainExpiredMetadata'
    
    https://issues.shibboleth.net/jira/browse/IDP-1423
---
 .../impl/FilesystemMetadataProviderParser.java      | 21 +++------------------
 .../metadata/impl/HTTPMetadataProviderParser.java   |  7 -------
 .../main/resources/schema/shibboleth-metadata.xsd   |  5 -----
 3 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/FilesystemMetadataProviderParser.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/FilesystemMetadataProviderParser.java
index 12e246c..30500e3 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/FilesystemMetadataProviderParser.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/FilesystemMetadataProviderParser.java
@@ -19,19 +19,14 @@ package net.shibboleth.idp.profile.spring.relyingparty.metadata.impl;
 
 import javax.xml.namespace.QName;
 
-import net.shibboleth.idp.profile.spring.relyingparty.metadata.AbstractMetadataProviderParser;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
 import org.opensaml.saml.metadata.resolver.impl.FilesystemMetadataResolver;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
-import org.springframework.beans.factory.parsing.Location;
-import org.springframework.beans.factory.parsing.Problem;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.w3c.dom.Element;
 
+import net.shibboleth.idp.profile.spring.relyingparty.metadata.AbstractMetadataProviderParser;
+import net.shibboleth.utilities.java.support.primitive.StringSupport;
+
 /**
  * Parser for a <FilesystemMetadataProvider>.
  */
@@ -41,9 +36,6 @@ public class FilesystemMetadataProviderParser extends AbstractReloadingMetadataP
     public static final QName ELEMENT_NAME =
             new QName(AbstractMetadataProviderParser.METADATA_NAMESPACE, "FilesystemMetadataProvider");
 
-    /** Logger. */
-    private final Logger log = LoggerFactory.getLogger(FilesystemMetadataProviderParser.class);
-
     /** {@inheritDoc} */
     @Override protected Class<FilesystemMetadataResolver> getNativeBeanClass(final Element element) {
         return FilesystemMetadataResolver.class;
@@ -54,13 +46,6 @@ public class FilesystemMetadataProviderParser extends AbstractReloadingMetadataP
             final BeanDefinitionBuilder builder) {
         super.doNativeParse(element, parserContext, builder);
 
-        if (element.hasAttributeNS(null, "maintainExpiredMetadata")) {
-            log.error("{}: maintainExpiredMetadata is not supported", parserContext.getReaderContext().getResource()
-                    .getDescription());
-            throw new BeanDefinitionParsingException(new Problem("maintainExpiredMetadata is not supported",
-                    new Location(parserContext.getReaderContext().getResource())));
-        }
-
         builder.addConstructorArgValue(StringSupport.trimOrNull(element.getAttributeNS(null, "metadataFile")));
     }
 }
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 424b962..b90b6d6 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
@@ -59,13 +59,6 @@ public abstract class HTTPMetadataProviderParser extends AbstractReloadingMetada
                     parserContext.getReaderContext().getResource())));
         }
 
-        if (element.hasAttributeNS(null, "maintainExpiredMetadata")) {
-            log.error("{}: maintainExpiredMetadata is not supported", parserContext.getReaderContext().getResource()
-                    .getDescription());
-            throw new BeanDefinitionParsingException(new Problem("maintainExpiredMetadata is not supported",
-                    new Location(parserContext.getReaderContext().getResource())));
-        }
-
         final String tlsTrustEngineRef = StringSupport.trimOrNull(element.getAttributeNS(null, "tlsTrustEngineRef"));
         final Element tlsTrustEngine = ElementSupport.getFirstChildElement(element,
                 HTTPMetadataProvidersParserSupport.TLS_TRUST_ENGINE_ELEMENT_NAME);
diff --git a/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd b/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd
index 88c1cd0..62609c2 100644
--- a/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd
+++ b/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd
@@ -172,11 +172,6 @@
                         <documentation>Server certificate will be ignored when using an HTTPS source.</documentation>
                     </annotation>
                 </attribute>
-                <attribute name="maintainExpiredMetadata" type="string">
-                    <annotation>
-                        <documentation>This is deprecated, use requireValidMetadata instead.</documentation>
-                    </annotation>
-                </attribute>
                 <attribute name="cacheDuration" type="string">
                     <annotation>
                         <documentation> This is deprecated, use maxRefreshDelay instead.</documentation>

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