[java-opensaml COMMIT] in /trunk: opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/Bas...

[noreply at shibboleth.net]

Author: rdw
Date: Sun Jul 10 09:13:36 2016
New Revision: 4471

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4471&view=rev
Log:
IDP-1004 Add @Duration to appropriate methods

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

Add @Duration to all appropriate setters as well as their associated
getters.  Leave the @Duration on the setter parameter for readability.


Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/BasicSAMLArtifactMap.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/StorageServiceSAMLArtifactMap.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/MessageLifetimeSecurityHandler.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/MessageReplaySecurityHandler.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/AddNotOnOrAfterConditionToAssertions.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/RequiredValidUntilFilter.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractReloadingMetadataResolver.java
    trunk/opensaml-storage-api/src/main/java/org/opensaml/storage/AbstractStorageService.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/BasicSAMLArtifactMap.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/BasicSAMLArtifactMap.java?rev=4471&r1=4470&r2=4471&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/BasicSAMLArtifactMap.java	(original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/BasicSAMLArtifactMap.java	Sun Jul 10 09:13:36 2016
@@ -122,7 +122,7 @@
      * 
      * @param lifetime artifact entry lifetime in milliseconds
      */
-    public void setArtifactLifetime(@Duration @Positive final long lifetime) {
+    @Duration public void setArtifactLifetime(@Duration @Positive final long lifetime) {
         artifactLifetime = Constraint.isGreaterThan(0, lifetime, "Artifact lifetime must be greater than zero");
     }
 
@@ -131,7 +131,7 @@
      * 
      * @param interval  cleanup interval in milliseconds
      */
-    public void setCleanupInterval(@Duration @NonNegative final long interval) {
+    @Duration public void setCleanupInterval(@Duration @NonNegative final long interval) {
         cleanupInterval = Constraint.isGreaterThanOrEqual(0, interval, "Cleanup interval must be non-negative");
     }
     
@@ -152,7 +152,7 @@
     /** {@inheritDoc} */
     @Override @Nullable public SAMLArtifactMapEntry get(@Nonnull @NotEmpty final String artifact) throws IOException {
         log.debug("Attempting to retrieve entry for artifact: {}", artifact);
-        ExpiringSAMLArtifactMapEntry entry = artifactStore.get(artifact);
+        final ExpiringSAMLArtifactMapEntry entry = artifactStore.get(artifact);
 
         if (entry == null) {
             log.debug("No entry found for artifact: {}", artifact);
@@ -173,7 +173,7 @@
     @Override public void put(@Nonnull @NotEmpty final String artifact, @Nonnull @NotEmpty final String relyingPartyId,
             @Nonnull @NotEmpty final String issuerId, @Nonnull final SAMLObject samlMessage) throws IOException {
 
-        ExpiringSAMLArtifactMapEntry artifactEntry =
+        final ExpiringSAMLArtifactMapEntry artifactEntry =
                 (ExpiringSAMLArtifactMapEntry) entryFactory.newEntry(artifact, issuerId, relyingPartyId, samlMessage);
         artifactEntry.setExpiration(System.currentTimeMillis() + getArtifactLifetime());
 
@@ -203,7 +203,7 @@
 
             final Long now = System.currentTimeMillis();
 
-            Iterator<Map.Entry<String, ExpiringSAMLArtifactMapEntry>> i = artifactStore.entrySet().iterator();
+            final Iterator<Map.Entry<String, ExpiringSAMLArtifactMapEntry>> i = artifactStore.entrySet().iterator();
             while (i.hasNext()) {
                 final Map.Entry<String, ExpiringSAMLArtifactMapEntry> entry = i.next();
                 if (!entry.getValue().isValid(now)) {

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/StorageServiceSAMLArtifactMap.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/StorageServiceSAMLArtifactMap.java?rev=4471&r1=4470&r2=4471&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/StorageServiceSAMLArtifactMap.java	(original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/StorageServiceSAMLArtifactMap.java	Sun Jul 10 09:13:36 2016
@@ -92,7 +92,7 @@
      * 

[... 419 lines stripped ...]