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

[noreply at shibboleth.net]

Author: scantor
Date: Fri Dec 20 16:03:35 2013
New Revision: 5070

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5070&view=rev
Log:
Move serializer implementations out of -api

Added:
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/DefaultAuthenticationResultSerializer.java
      - copied, changed from r5068, trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/DefaultAuthenticationResultSerializer.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/principal/GenericPrincipalSerializer.java
      - copied, changed from r5068, trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/principal/GenericPrincipalSerializer.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/principal/UsernamePrincipalSerializer.java
      - copied, changed from r5068, trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/principal/UsernamePrincipalSerializer.java
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/AuthenticationResult.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/principal/CloneablePrincipal.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/principal/GenericPrincipalSerializer.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/principal/PrincipalEvalPredicate.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/principal/PrincipalEvalPredicateFactory.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/principal/PrincipalEvalPredicateFactoryRegistry.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/principal/PrincipalSerializer.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/principal/PrincipalSupportingComponent.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/principal/UsernamePrincipal.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/principal/UsernamePrincipalSerializer.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/principal/LdapPrincipalSerializer.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=5070&r1=5069&r2=5070&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 Fri Dec 20 16:03:35 2013
@@ -62,9 +62,6 @@
 
     /** Default subflow for subject canonicalization. */
     @Nonnull @NotEmpty public static final String DEFAULT_SUBJECT_C14N_FLOWID;
-
-    /** Default serializer for result objects. */
-    @Nonnull private static final StorageSerializer<AuthenticationResult> DEFAULT_SERIALIZER;
         
     /** Whether this flow supports passive authentication. */
     private boolean supportsPassive;
@@ -280,15 +277,23 @@
                 "Subject Canonicalization Flow ID cannot be null or empty");
     }
     
+    
+    
+    /** {@inheritDoc} */
+    @Override
+    protected void doInitialize() throws ComponentInitializationException {
+        super.doInitialize();
+        
+        if (resultSerializer == null) {
+            throw new ComponentInitializationException("AuthenticationResult serializer cannot be null");
+        }
+    }
+
     /** {@inheritDoc} */
     @Nonnull @NotEmpty public String serialize(@Nonnull final AuthenticationResult instance) throws IOException {
         ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
         
-        if (resultSerializer != null) {
-            return resultSerializer.serialize(instance);
-        } else {
-            return DEFAULT_SERIALIZER.serialize(instance);
-        }
+        return resultSerializer.serialize(instance);
     }
 
     /** {@inheritDoc} */
@@ -298,13 +303,8 @@
         ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
         
         // Back the expiration off by the inactivity timeout to recover the last activity time.
-        if (resultSerializer != null) {
-            return resultSerializer.deserialize(version, context, key, value,
-                    (expiration != null) ? expiration - inactivityTimeout - STORAGE_EXPIRATION_OFFSET : null);
-        } else {
-            return DEFAULT_SERIALIZER.deserialize(version, context, key, value,
-                    (expiration != null) ? expiration - inactivityTimeout - STORAGE_EXPIRATION_OFFSET : null);
-        }
+        return resultSerializer.deserialize(version, context, key, value,

[... 387 lines stripped ...]