[java-identity-provider COMMIT] in /trunk/idp-session-impl/src: main/java/net/shibboleth/idp/session/impl/StorageBack...

[noreply at shibboleth.net]

Author: rdw
Date: Tue Dec 31 04:37:25 2013
New Revision: 5115

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5115&view=rev
Log:
Add missing setId method to The storage BackedSessionManager and set it in the test.

Modified:
    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/SessionManagerBaseTestCase.java

Modified: trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/StorageBackedSessionManager.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/StorageBackedSessionManager.java?rev=5115&r1=5114&r2=5115&view=diff
==============================================================================
--- trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/StorageBackedSessionManager.java (original)
+++ trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/StorageBackedSessionManager.java Tue Dec 31 04:37:25 2013
@@ -27,18 +27,6 @@
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
-import org.opensaml.storage.RequestScopedStorageService;
-import org.opensaml.storage.StorageRecord;
-import org.opensaml.storage.StorageSerializer;
-import org.opensaml.storage.StorageService;
-import org.opensaml.storage.VersionMismatchException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Predicates;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Iterables;
 
 import net.shibboleth.idp.authn.AuthenticationFlowDescriptor;
 import net.shibboleth.idp.session.IdPSession;
@@ -66,6 +54,18 @@
 import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
 import net.shibboleth.utilities.java.support.resolver.ResolverException;
 import net.shibboleth.utilities.java.support.security.IdentifierGenerationStrategy;
+
+import org.opensaml.storage.RequestScopedStorageService;
+import org.opensaml.storage.StorageRecord;
+import org.opensaml.storage.StorageSerializer;
+import org.opensaml.storage.StorageService;
+import org.opensaml.storage.VersionMismatchException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Predicates;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterables;
 
 /**
  * Implementation of {@link SessionManager} and {@link SessionResolver} interfaces that relies on
@@ -167,6 +167,13 @@
         consistentAddress = true;
         cookieName = DEFAULT_COOKIE_NAME;
     }
+    
+    /** Make setId visible.
+     * @param componentId the id */
+    @Override public void setId(@Nonnull @NotEmpty String componentId) {
+        super.setId(componentId);
+    }
+    
 
     /**
      * Get the servlet request to read from.

Modified: trunk/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/SessionManagerBaseTestCase.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/SessionManagerBaseTestCase.java?rev=5115&r1=5114&r2=5115&view=diff
==============================================================================
--- trunk/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/SessionManagerBaseTestCase.java (original)
+++ trunk/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/SessionManagerBaseTestCase.java Tue Dec 31 04:37:25 2013
@@ -51,6 +51,7 @@
         responseProxy = new ThreadLocalHttpServletResponseProxy();
         
         storageService = new MemoryStorageService();
+        storageService.setId("TestStorageService");
 
         CookieManager cookieManager = new CookieManager();
         cookieManager.setHttpServletRequest(requestProxy);
@@ -63,6 +64,8 @@
         sessionManager.setHttpServletRequest(requestProxy);
         sessionManager.setHttpServletResponse(responseProxy);
         sessionManager.setCookieManager(cookieManager);
+        sessionManager.setId("Test Session Manager");
+
 
         adjustProperties();