[java-opensaml COMMIT] /trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynam...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Nov 14 20:27:26 2014
New Revision: 4146

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4146&view=rev
Log:
Add @Duration and @Positive annotations to the dynamic metadata resolver fields as appropriate. 

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java?rev=4146&r1=4145&r2=4146&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java Fri Nov 14 20:27:26 2014
@@ -31,8 +31,10 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import net.shibboleth.utilities.java.support.annotation.Duration;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
+import net.shibboleth.utilities.java.support.annotation.constraint.Positive;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
@@ -69,23 +71,23 @@
     private boolean createdOwnTaskTimer;
     
     /** Minimum cache duration. */
-    private Long minCacheDuration;
+    @Duration @Positive private Long minCacheDuration;
     
     /** Maximum cache duration. */
-    private Long maxCacheDuration;
+    @Duration @Positive private Long maxCacheDuration;
     
     /** Factor used to compute when the next refresh interval will occur. Default value: 0.75 */
-    private Float refreshDelayFactor = 0.75f;
+    @Positive private Float refreshDelayFactor = 0.75f;
     
     /** The maximum idle time in milliseconds for which the resolver will keep data for a given entityID, 
      * before it is removed. */
-    private Long maxIdleEntityData;
+    @Duration @Positive private Long maxIdleEntityData;
     
     /** Flag indicating whether idle entity data should be removed. */
     private boolean removeIdleEntityData;
     
     /** The interval in milliseconds at which the cleanup task should run. */
-    private Long cleanupTaskInterval;
+    @Duration @Positive private Long cleanupTaskInterval;
     
     /** The backing store cleanup sweeper background task. */
     private BackingStoreCleanupSweeper cleanupTask;