[java-identity-provider COMMIT] in /trunk: idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationFlowDes...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Dec 19 12:09:45 2013
New Revision: 5064

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5064&view=rev
Log:
- Make StorageSerializer interface an initializable component
- Propagate initialization changes through authn/session classes

Modified:
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationFlowDescriptor.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/DefaultAuthenticationResultSerializer.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/GenericPrincipalSerializer.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/LdapPrincipalSerializer.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/PrincipalSerializer.java
    trunk/idp-authn-api/src/test/java/net/shibboleth/idp/authn/DefaultAuthenticationResultSerializerTest.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/session/SAML2SPSessionSerializer.java
    trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/AbstractSPSessionSerializer.java
    trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/SPSessionSerializerRegistry.java
    trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/BasicSPSessionSerializer.java
    trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/StorageBackedIdPSessionSerializer.java
    trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/StorageBackedSessionManager.java
    trunk/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/BasicSPSessionSerializerTest.java
    trunk/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/SessionManagerBaseTestCase.java
    trunk/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/StorageBackedIdPSessionSerializerTest.java
    trunk/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/StorageBackedSessionManagerTest.java
    trunk/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/UpdateSessionWithAuthenticationResultTest.java

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationFlowDescriptor.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationFlowDescriptor.java?rev=5064&r1=5063&r2=5064&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationFlowDescriptor.java (original)
+++ trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationFlowDescriptor.java Thu Dec 19 12:09:45 2013
@@ -38,6 +38,8 @@
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.annotation.constraint.Positive;
 import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
+import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
+import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.component.IdentifiableComponent;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
@@ -50,8 +52,8 @@
  * directly exposed as properties of the flow, and others can be found by examining the list
  * of extended {@link Principal}s that the flow exposes.</p>
  */
-public class AuthenticationFlowDescriptor implements IdentifiableComponent, PrincipalSupportingComponent,
-        StorageSerializer<AuthenticationResult> {
+public class AuthenticationFlowDescriptor extends AbstractIdentifiableInitializableComponent
+        implements IdentifiableComponent, PrincipalSupportingComponent, StorageSerializer<AuthenticationResult> {
 
     /** Additional allowance for storage of result records to avoid race conditions during use. */
     public static final long STORAGE_EXPIRATION_OFFSET;
@@ -62,9 +64,6 @@
     /** Default serializer for result objects. */
     @Nonnull private static final StorageSerializer<AuthenticationResult> DEFAULT_SERIALIZER;
         
-    /** The unique identifier of the authentication flow. */
-    @Nonnull @NotEmpty private final String flowId;
-
     /** Whether this flow supports passive authentication. */
     private boolean supportsPassive;
 
@@ -96,15 +95,16 @@
      * @param id unique ID of this flow, can not be null or empty
      */
     public AuthenticationFlowDescriptor(@Nonnull @NotEmpty final String id) {
-        flowId = Constraint.isNotNull(StringSupport.trimOrNull(id), "Workflow ID cannot be null or empty");
+        super.setId(id);
         supportedPrincipals = new Subject();
         inactivityTimeout = 30 * 60 * 1000;
         subjectCanonicalizationFlowId = DEFAULT_SUBJECT_C14N_FLOWID;
     }
-
-    /** {@inheritDoc} */
-    @Nonnull @NotEmpty public String getId() {
-        return flowId;
+    
+    /** {@inheritDoc} */
+    @Override
+    public void setId(@Nonnull @NotEmpty final String id) {
+        super.setId(id);

[... 730 lines stripped ...]