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

[noreply at shibboleth.net]

Author: rdw
Date: Sat Feb 22 07:09:00 2014
New Revision: 3637

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3637&view=rev
Log:
JSPT-41 Remove OpenSAML's use of ValidateableComponent

Modified:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/artifact/SAMLArtifactMap.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/StorageServiceSAMLArtifactMap.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/artifact/BasicSAMLArtifactMapTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/artifact/StorageServiceSAMLArtifactMapTest.java
    trunk/opensaml-storage-api/src/main/java/org/opensaml/storage/AbstractStorageService.java
    trunk/opensaml-storage-api/src/main/java/org/opensaml/storage/StorageService.java
    trunk/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/LDAPStorageService.java

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/artifact/SAMLArtifactMap.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/artifact/SAMLArtifactMap.java?rev=3637&r1=3636&r2=3637&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/artifact/SAMLArtifactMap.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/artifact/SAMLArtifactMap.java Sat Feb 22 07:09:00 2014
@@ -26,23 +26,22 @@
 import net.shibboleth.utilities.java.support.component.DestructableComponent;
 import net.shibboleth.utilities.java.support.component.IdentifiableComponent;
 import net.shibboleth.utilities.java.support.component.InitializableComponent;
-import net.shibboleth.utilities.java.support.component.ValidatableComponent;
 
 import org.opensaml.saml.common.SAMLObject;
 
 /**
  * Maps an artifact to a SAML message and back again.
  * 
- * <p>An implementation of this interface MUST ensure that the persisted SAML message is no longer tied to any 
- * parent {@link org.opensaml.core.xml.XMLObject} that may have contained it. This ensures that it can be
- * safely added to another object once retrieved from the map. This might for example be achieved by:
- * 1) cloning the SAMLObject prior to storage, or 2) by serializing it to a string and re-parsing 
- * and unmarshalling it once retrieved from the underlying data store.
- * This requirement may be handled by the SAMLArtifactMap directly, or by the use of of a specific 
- * implementation of {@link SAMLArtifactMapEntryFactory}.</p>
+ * <p>
+ * An implementation of this interface MUST ensure that the persisted SAML message is no longer tied to any parent
+ * {@link org.opensaml.core.xml.XMLObject} that may have contained it. This ensures that it can be safely added to
+ * another object once retrieved from the map. This might for example be achieved by: 1) cloning the SAMLObject prior to
+ * storage, or 2) by serializing it to a string and re-parsing and unmarshalling it once retrieved from the underlying
+ * data store. This requirement may be handled by the SAMLArtifactMap directly, or by the use of of a specific
+ * implementation of {@link SAMLArtifactMapEntryFactory}.
+ * </p>
  */
-public interface SAMLArtifactMap extends InitializableComponent, DestructableComponent,
-    IdentifiableComponent, ValidatableComponent {
+public interface SAMLArtifactMap extends InitializableComponent, DestructableComponent, IdentifiableComponent {
 
     /**
      * Checks if a given artifact has a map entry.
@@ -62,11 +61,10 @@
      * @param issuerId ID of the issuer of the artifact
      * @param samlMessage the SAML message
      * 
-     * @throws IOException  if an error occurs storing the information
+     * @throws IOException if an error occurs storing the information
      */
     public void put(@Nonnull @NotEmpty final String artifact, @Nonnull @NotEmpty final String relyingPartyId,
-            @Nonnull @NotEmpty final String issuerId, @Nonnull final SAMLObject samlMessage)
-            throws IOException;
+            @Nonnull @NotEmpty final String issuerId, @Nonnull final SAMLObject samlMessage) throws IOException;
 
     /**
      * Gets the artifact entry for the given artifact.
@@ -85,9 +83,9 @@
      * @throws IOException if an error occurs retrieving the information
      */
     public void remove(@Nonnull @NotEmpty final String artifact) throws IOException;
-    
+
     /**
-     * Represents a mapping between an artifact and a SAML message with some associated information. 
+     * Represents a mapping between an artifact and a SAML message with some associated information.
      */
     public interface SAMLArtifactMapEntry {
 
@@ -119,13 +117,13 @@
          */
         @Nonnull public SAMLObject getSamlMessage();
     }
-    
+
     /**
-     * A factory for producing SAMLArtifactMapEntry instances based on standard inputs,
-     * and reading/writing them from/to storage.

[... 552 lines stripped ...]