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

[noreply at shibboleth.net]

Author: rdw
Date: Sat Feb 22 07:35:31 2014
New Revision: 3638

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3638&view=rev
Log:
JSPT-41 More ValidatableComponent changes.  Strip out the soon to be defunct ComponentValidationException from the IDP and OpenSAML

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/BasicSAMLArtifactMap.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/BasicSAMLArtifactMap.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/BasicSAMLArtifactMap.java?rev=3638&r1=3637&r2=3638&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/BasicSAMLArtifactMap.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/BasicSAMLArtifactMap.java Sat Feb 22 07:35:31 2014
@@ -31,7 +31,6 @@
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.component.AbstractDestructableIdentifiableInitializableComponent;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.component.ComponentValidationException;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
 import org.joda.time.DateTime;
@@ -40,8 +39,8 @@
 import org.slf4j.LoggerFactory;
 
 /** Basic artifact map implementation. */
-public class BasicSAMLArtifactMap extends AbstractDestructableIdentifiableInitializableComponent
-    implements SAMLArtifactMap {
+public class BasicSAMLArtifactMap extends AbstractDestructableIdentifiableInitializableComponent implements
+        SAMLArtifactMap {
 
     /** Class Logger. */
     private final Logger log = LoggerFactory.getLogger(BasicSAMLArtifactMap.class);
@@ -71,19 +70,14 @@
         cleanupInterval = 300;
         entryFactory = new ExpiringSAMLArtifactMapEntryFactory();
     }
-    
-    /** {@inheritDoc} */
-    public synchronized void setId(@Nonnull @NotEmpty final String componentId) {
+
+    /** {@inheritDoc} */
+    @Override public synchronized void setId(@Nonnull @NotEmpty final String componentId) {
         super.setId(componentId);
     }
-    
-    /** {@inheritDoc} */
-    public void validate() throws ComponentValidationException {
-
-    }
-
-    /** {@inheritDoc} */
-    protected void doInitialize() throws ComponentInitializationException {
+
+    /** {@inheritDoc} */
+    @Override protected void doInitialize() throws ComponentInitializationException {
         super.doInitialize();
         artifactStore = new ConcurrentHashMap<String, ExpiringSAMLArtifactMapEntry>();
 
@@ -93,9 +87,9 @@
             cleanupTaskTimer.schedule(cleanupTask, cleanupInterval * 1000, cleanupInterval * 1000);
         }
     }
-    
-    /** {@inheritDoc} */
-    protected void doDestroy() {
+
+    /** {@inheritDoc} */
+    @Override protected void doDestroy() {
         if (cleanupTask != null) {
             cleanupTask.cancel();
             cleanupTask = null;
@@ -103,7 +97,7 @@
         }
         super.doDestroy();
     }
-    
+
     /**
      * Get the artifact entry lifetime in milliseconds.
      * 
@@ -112,7 +106,7 @@
     public long getArtifactLifetime() {
         return artifactLifetime;
     }
-    
+
     /**
      * Get the map entry factory.
      * 
@@ -121,7 +115,7 @@
     @Nonnull public SAMLArtifactMapEntryFactory getEntryFactory() {
         return entryFactory;
     }
-    
+
     /**
      * Set the artifact entry lifetime in milliseconds.
      * 
@@ -130,7 +124,7 @@
     public void setArtifactLifetime(long lifetime) {
         artifactLifetime = lifetime;
     }
-    
+
     /**
      * Set the map entry factory.
      * 
@@ -139,14 +133,14 @@
     public void setEntryFactory(@Nonnull final SAMLArtifactMapEntryFactory factory) {
         entryFactory = Constraint.isNotNull(factory, "SAMLArtifactMapEntryFactory cannot be null");
     }
-    
-    /** {@inheritDoc} */
-    public boolean contains(@Nonnull @NotEmpty final String artifact) throws IOException {
+
+    /** {@inheritDoc} */
+    @Override public boolean contains(@Nonnull @NotEmpty final String artifact) throws IOException {
         return artifactStore.containsKey(artifact);
     }
 
     /** {@inheritDoc} */
-    @Nullable public SAMLArtifactMapEntry get(@Nonnull @NotEmpty final String artifact) throws IOException {
+    @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);
 
@@ -166,9 +160,8 @@
     }
 
     /** {@inheritDoc} */
-    public void put(@Nonnull @NotEmpty final String artifact, @Nonnull @NotEmpty final String relyingPartyId,

[... 50 lines stripped ...]