[java-identity-provider COMMIT] in /trunk: idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relying...

[noreply at shibboleth.net]

Author: rdw
Date: Wed Feb 15 05:50:22 2017
New Revision: 8621

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8621&view=rev
Log:
IDP-693 revert previous.  We'll fix this completely in V4 and a comaptible manner.

https://issues.shibboleth.net/jira/browse/IDP-693

Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/RequiredValidUntilFactoryBean.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/RequiredValidUntilParser.java
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/requiredValidUntilParam.xml
    trunk/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/RequiredValidUntilFactoryBean.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/RequiredValidUntilFactoryBean.java?rev=8621&r1=8620&r2=8621&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/RequiredValidUntilFactoryBean.java	(original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/RequiredValidUntilFactoryBean.java	Wed Feb 15 05:50:22 2017
@@ -19,7 +19,6 @@
 
 import javax.annotation.Nullable;
 
-import net.shibboleth.utilities.java.support.annotation.Duration;
 import net.shibboleth.utilities.java.support.xml.DOMTypeSupport;
 
 import org.opensaml.saml.metadata.resolver.filter.impl.RequiredValidUntilFilter;
@@ -36,9 +35,6 @@
     /** Where the (property replaced) value of maxValidityInterval goes. */
     @Nullable private String maxValidityIntervalDuration;
     
-    /** The maxmimum validity.  */
-    @Nullable @Duration private Long maxValidity;
-
     /** Logger. */
     private final Logger log = LoggerFactory.getLogger(RequiredValidUntilFactoryBean.class);
 
@@ -52,12 +48,6 @@
         maxValidityIntervalDuration = s;
     }
     
-    /** Set the maxmimum validity as a {@Duration}
-     * @param max what to set.
-     */
-    @Duration public void setMaxValidity(@Duration final long max) {
-        maxValidity = max;
-    }
 
     /** {@inheritDoc} */
     @Override public Class<RequiredValidUntilFilter> getObjectType() {
@@ -68,9 +58,7 @@
     @Override protected RequiredValidUntilFilter createInstance() throws Exception {
         final RequiredValidUntilFilter value = new RequiredValidUntilFilter();
 
-        if (null != maxValidity) {
-            value.setMaxValidityInterval(maxValidity);
-        } else if (null != maxValidityIntervalDuration) {
+        if (null != maxValidityIntervalDuration) {
             if (maxValidityIntervalDuration.startsWith("P")) {
                 value.setMaxValidityInterval(DOMTypeSupport.durationToLong(maxValidityIntervalDuration));
             } else if (maxValidityIntervalDuration.startsWith("-P")) {

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/RequiredValidUntilParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/RequiredValidUntilParser.java?rev=8621&r1=8620&r2=8621&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/RequiredValidUntilParser.java	(original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/RequiredValidUntilParser.java	Wed Feb 15 05:50:22 2017
@@ -50,18 +50,11 @@
     /** {@inheritDoc} */
     @Override protected void doParse(final Element element, final ParserContext parserContext,
             final BeanDefinitionBuilder builder) {
-        if (element.hasAttributeNS(null, "maxValidity")) {
-            if (element.hasAttributeNS(null, "maxValidityInterval")) {
-                log.warn("Only one of maxValidity and maxValidityInterval can be supplied");
-            }
-            builder.addPropertyValue("maxValidity",
-                    StringSupport.trimOrNull(element.getAttributeNS(null, "maxValidity")));
-        } else if (element.hasAttributeNS(null, "maxValidityInterval")) {
-            log.warn("maxValidityInterval is deprecated, used maxValidity");
+        if (element.hasAttributeNS(null, "maxValidityInterval")) {
             builder.addPropertyValue("maxValidityInterval",
                     StringSupport.trimOrNull(element.getAttributeNS(null, "maxValidityInterval")));
         } else {
-            log.warn("Metadata filter " + TYPE_NAME.getLocalPart() + " without maxValdity is a no-op.");

[... 43 lines stripped ...]