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

[noreply at shibboleth.net]

Author: lajoie
Date: Mon Aug 22 20:20:46 2011
New Revision: 4027

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4027&view=rev
Log:
Finish up new session APIs

Added:
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/session/IdPSessionSubcontext.java   (with props)
Modified:
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/session/BasicSessionFactory.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/session/IdPSession.java

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/session/BasicSessionFactory.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/session/BasicSessionFactory.java?rev=4027&r1=4026&r2=4027&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/session/BasicSessionFactory.java (original)
+++ trunk/idp-authn-api/src/main/java/net/shibboleth/idp/session/BasicSessionFactory.java Mon Aug 22 20:20:46 2011
@@ -18,14 +18,11 @@
 package net.shibboleth.idp.session;
 
 import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.HashMap;
 
 import edu.vt.middleware.crypt.util.HexConverter;
 
 /**
- * A basic {@link SessionFactory} that generates a the session ID and session secret using a
- * {@link SecureRandom} PRNG.
+ * A basic {@link SessionFactory} that generates a the session ID and session secret using a {@link SecureRandom} PRNG.
  */
 public class BasicSessionFactory implements SessionFactory {
 
@@ -55,15 +52,10 @@
         final byte[] sessionSecret = new byte[16];
         prng.nextBytes(sessionSecret);
 
-        long now = System.currentTimeMillis();
         IdPSession session = new IdPSession();
-        session.setActivityInstant(now);
-        session.setAuthenticationEvents(new ArrayList<AuthenticationEvent>());
-        session.setCreationInstant(now);
         session.setId(sessionId);
         session.setSecret(sessionSecret);
-        session.setServiceSessions(new HashMap<String, ServiceSession>());
 
         return session;
     }
-}
+}

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/session/IdPSession.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/session/IdPSession.java?rev=4027&r1=4026&r2=4027&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/session/IdPSession.java (original)
+++ trunk/idp-authn-api/src/main/java/net/shibboleth/idp/session/IdPSession.java Mon Aug 22 20:20:46 2011
@@ -21,6 +21,8 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
+import java.util.Vector;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.opensaml.messaging.context.AbstractSubcontextContainer;
 import org.opensaml.util.Assert;
@@ -54,6 +56,21 @@
     private Map<String, ServiceSession> serviceSessions;
 
     /**
+     * Constructor.
+     * 
+     * Creation and last activity instant are initialized to now. Authentication events collection is initialized to an
+     * empty {@link Vector}. Service session collection is initialized to an empty {@link ConcurrentHashMap}.
+     */
+    public IdPSession() {
+        super();
+
+        creationInstant = System.currentTimeMillis();
+        lastActivityInstant = creationInstant;
+        authnEvents = new Vector<AuthenticationEvent>();
+        serviceSessions = new ConcurrentHashMap<String, ServiceSession>();
+    }
+
+    /**
      * Gets the unique identifier for this session.
      * 
      * @return unique identifier for this session, never null or empty