[java-opensaml COMMIT] in /trunk/opensaml-util/src/main/java/org/opensaml/util/storage: StorageRecord.java StorageSer...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Jun 13 00:11:28 2013
New Revision: 3372

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3372&view=rev
Log:
Expand capability of deserializer method.

Modified:
    trunk/opensaml-util/src/main/java/org/opensaml/util/storage/StorageRecord.java
    trunk/opensaml-util/src/main/java/org/opensaml/util/storage/StorageSerializer.java

Modified: trunk/opensaml-util/src/main/java/org/opensaml/util/storage/StorageRecord.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-util/src/main/java/org/opensaml/util/storage/StorageRecord.java?rev=3372&r1=3371&r2=3372&view=diff
==============================================================================
--- trunk/opensaml-util/src/main/java/org/opensaml/util/storage/StorageRecord.java (original)
+++ trunk/opensaml-util/src/main/java/org/opensaml/util/storage/StorageRecord.java Thu Jun 13 00:11:28 2013
@@ -76,11 +76,14 @@
      * Get the record value, using a custom deserialization process.
      * 
      * @param serializer a custom (de)serialization process to apply
+     * @param context context of record, if available
+     * @param key key of record, if available
      * @return  the record value
      * @throws IOException if deserialization fails
      */
-    @Nonnull public Type getValue(@Nonnull final StorageSerializer<Type> serializer) throws IOException {
-        return serializer.deserialize(value);
+    @Nonnull public Type getValue(@Nonnull final StorageSerializer<Type> serializer, @Nullable final String context,
+            @Nullable final String key) throws IOException {
+        return serializer.deserialize(value, context, key, expiration);
     }
     
     /**

Modified: trunk/opensaml-util/src/main/java/org/opensaml/util/storage/StorageSerializer.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-util/src/main/java/org/opensaml/util/storage/StorageSerializer.java?rev=3372&r1=3371&r2=3372&view=diff
==============================================================================
--- trunk/opensaml-util/src/main/java/org/opensaml/util/storage/StorageSerializer.java (original)
+++ trunk/opensaml-util/src/main/java/org/opensaml/util/storage/StorageSerializer.java Thu Jun 13 00:11:28 2013
@@ -20,6 +20,7 @@
 import java.io.IOException;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
 
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
@@ -45,9 +46,13 @@
     /**
      * Returns an object recovered from a string produced through the {@link #serialize} method.
      * 
-     * @param s data to deserialize
+     * @param value data to deserialize
+     * @param context context of record, if available
+     * @param key key of record, if available
+     * @param expiration expiration of record, if available/set
      * @return a deserialized object
      * @throws IOException if an error occurs during deserialization
      */
-    @Nonnull public Type deserialize(@Nonnull @NotEmpty final String s) throws IOException;
+    @Nonnull public Type deserialize(@Nonnull @NotEmpty final String value, @Nullable final String context,
+            @Nullable final String key, @Nullable Long expiration) throws IOException;
 }