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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Sep 24 17:39:23 2013
New Revision: 4795

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4795&view=rev
Log:
More session work in progress, rationalized StorageSerializer parameter set and order.

Added:
    trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/StorageBackedIdPSession.java   (with props)
    trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/StorageBackedIdPSessionSerializer.java   (with props)
    trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/StorageBackedSessionManager.java   (with props)
Modified:
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/BaseAuthenticationResultSerializer.java
    trunk/idp-authn-api/src/test/java/net/shibboleth/idp/authn/BaseAuthenticationResultSerializerTest.java
    trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/AbstractServiceSessionSerializer.java
    trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/BaseIdPSession.java
    trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/IdPSession.java
    trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/SessionManager.java
    trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/SessionResolver.java
    trunk/idp-session-api/src/test/java/net/shibboleth/idp/session/IdPSessionTest.java
    trunk/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/BasicServiceSessionSerializerTest.java

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/BaseAuthenticationResultSerializer.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/BaseAuthenticationResultSerializer.java?rev=4795&r1=4794&r2=4795&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/BaseAuthenticationResultSerializer.java (original)
+++ trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/BaseAuthenticationResultSerializer.java Tue Sep 24 17:39:23 2013
@@ -138,9 +138,9 @@
     }
 
     /** {@inheritDoc} */
-    @Nonnull public AuthenticationResult deserialize(@Nonnull @NotEmpty final String value,
-            @Nullable final String context, @Nullable final String key, @Nullable final Long expiration)
-            throws IOException {
+    @Nonnull public AuthenticationResult deserialize(final int version, @Nonnull @NotEmpty final String context,
+            @Nonnull @NotEmpty final String key, @Nonnull @NotEmpty final String value, @Nullable final Long expiration)
+                    throws IOException {
 
         try {
             JsonReader reader = Json.createReader(new StringReader(value));

Modified: trunk/idp-authn-api/src/test/java/net/shibboleth/idp/authn/BaseAuthenticationResultSerializerTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/test/java/net/shibboleth/idp/authn/BaseAuthenticationResultSerializerTest.java?rev=4795&r1=4794&r2=4795&view=diff
==============================================================================
--- trunk/idp-authn-api/src/test/java/net/shibboleth/idp/authn/BaseAuthenticationResultSerializerTest.java (original)
+++ trunk/idp-authn-api/src/test/java/net/shibboleth/idp/authn/BaseAuthenticationResultSerializerTest.java Tue Sep 24 17:39:23 2013
@@ -37,6 +37,10 @@
 
     private static final String DATAPATH = "/data/net/shibboleth/idp/authn/";
     
+    private static final String CONTEXT = "_context";
+    
+    private static final String KEY = "_key";
+    
     private static final long INSTANT = 1378827849463L;
     
     private static final long ACTIVITY = 1378827556778L;
@@ -49,28 +53,28 @@
 
     @Test public void testInvalid() throws Exception {
         try {
-            serializer.deserialize(fileToString(DATAPATH + "invalid.json"), null, null, null);
+            serializer.deserialize(1, CONTEXT, KEY, fileToString(DATAPATH + "invalid.json"), null);
             Assert.fail();
         } catch (IOException e) {
             
         }
 
         try {
-            serializer.deserialize(fileToString(DATAPATH + "noFlowId.json"), null, null, null);
+            serializer.deserialize(1, CONTEXT, KEY, fileToString(DATAPATH + "noFlowId.json"), null);
             Assert.fail();
         } catch (IOException e) {
             
         }
 
         try {
-            serializer.deserialize(fileToString(DATAPATH + "noInstant.json"), null, null, null);
+            serializer.deserialize(1, CONTEXT, KEY, fileToString(DATAPATH + "noInstant.json"), null);
             Assert.fail();
         } catch (IOException e) {
             
         }
 
         try {
-            serializer.deserialize(fileToString(DATAPATH + "noActivity.json"), null, null, null);
+            serializer.deserialize(1, CONTEXT, KEY, fileToString(DATAPATH + "noActivity.json"), null);
             Assert.fail();
         } catch (IOException e) {
             
@@ -85,7 +89,7 @@

[... 776 lines stripped ...]