[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: Mon Feb 13 05:15:57 2017
New Revision: 8618

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8618&view=rev
Log:
IDP-693 Start to untangle the ValidUntil Filter Mess

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

Introduce a new attribute "maxValidity" which is an @Duration.  This means
that if is set as an integer the value is interpreted as a count of
ms.  Deprecate "maxValidityInterval" which defaulted back to seconds.

The default value is still 0s.  This will need to wait fot V4

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=8618&r1=8617&r2=8618&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	Mon Feb 13 05:15:57 2017
@@ -19,6 +19,7 @@
 
 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;
@@ -34,17 +35,28 @@
 
     /** 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);
 
     /**
-     * setter for {@link #maxValidityIntervalDuration}.
+     * Setter for {@link #maxValidityIntervalDuration}.
      * 
      * @param s what to set.
+     * @deprecated use {@link RequiredValidUntilFactoryBean#setMaxValidity(long)}.
      */
-    public void setMaxValidityInterval(final String s) {
+    @Deprecated public void setMaxValidityInterval(final String s) {
         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} */
@@ -56,7 +68,9 @@
     @Override protected RequiredValidUntilFilter createInstance() throws Exception {
         final RequiredValidUntilFilter value = new RequiredValidUntilFilter();
 
-        if (null != maxValidityIntervalDuration) {
+        if (null != maxValidity) {
+            value.setMaxValidityInterval(maxValidity);
+        } else 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=8618&r1=8617&r2=8618&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	Mon Feb 13 05:15:57 2017
@@ -22,6 +22,8 @@
 import net.shibboleth.idp.profile.spring.relyingparty.metadata.AbstractMetadataProviderParser;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
@@ -35,19 +37,31 @@
     /** Element name. */

[... 73 lines stripped ...]