[java-opensaml COMMIT] in /trunk/opensaml-util: pom.xml src/main/java/org/opensaml/util/storage/ClientStorageService....

[noreply at shibboleth.net]

Author: scantor
Date: Sun Feb 10 22:15:06 2013
New Revision: 3220

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3220&view=rev
Log:
IDP-237: in-memory storage service

Added:
    trunk/opensaml-util/src/main/java/org/opensaml/util/storage/ClientStorageService.java   (with props)
    trunk/opensaml-util/src/main/java/org/opensaml/util/storage/impl/
    trunk/opensaml-util/src/main/java/org/opensaml/util/storage/impl/MemoryStorageService.java   (with props)
    trunk/opensaml-util/src/main/java/org/opensaml/util/storage/impl/MutableStorageRecord.java   (with props)
    trunk/opensaml-util/src/main/java/org/opensaml/util/storage/impl/package-info.java   (with props)
Modified:
    trunk/opensaml-util/pom.xml
    trunk/opensaml-util/src/main/java/org/opensaml/util/storage/StorageCapabilities.java
    trunk/opensaml-util/src/main/java/org/opensaml/util/storage/StorageRecord.java

Modified: trunk/opensaml-util/pom.xml
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-util/pom.xml?rev=3220&r1=3219&r2=3220&view=diff
==============================================================================
--- trunk/opensaml-util/pom.xml (original)
+++ trunk/opensaml-util/pom.xml Sun Feb 10 22:15:06 2013
@@ -28,6 +28,10 @@
 
         <!-- Test Dependencies -->
 
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+        </dependency>
     </dependencies>
     
 </project>

Modified: trunk/opensaml-util/src/main/java/org/opensaml/util/storage/StorageCapabilities.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-util/src/main/java/org/opensaml/util/storage/StorageCapabilities.java?rev=3220&r1=3219&r2=3220&view=diff
==============================================================================
--- trunk/opensaml-util/src/main/java/org/opensaml/util/storage/StorageCapabilities.java (original)
+++ trunk/opensaml-util/src/main/java/org/opensaml/util/storage/StorageCapabilities.java Sun Feb 10 22:15:06 2013
@@ -51,11 +51,5 @@
      * @return  max size of text values in characters, if any
      */
     public Optional<Long> getTextSize();
-    
-    /**
-     * Indicates whether the entire store content can be serialized.
-     * 
-     * @return  true iff the store supports serialization
-     */
-    public boolean canSerialize();
+
 }

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=3220&r1=3219&r2=3220&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 Sun Feb 10 22:15:06 2013
@@ -29,41 +29,28 @@
 public class StorageRecord {
 
     /** Version field. */
-    private final int version;
+    private int version;
     
     /** Value field. */
-    private final String value;
+    private String value;
     
     /** Expiration field. */
-    private final Long expiration;
+    private Long expiration;
     
     /**
      * Constructor.
      *
-     * @param ver   version
      * @param val   value
      * @param exp   optional expiration
      */
-    public StorageRecord(int ver, @Nonnull @NotEmpty final String val, @Nonnull final Optional<Long> exp) {
-        version = ver;
+    public StorageRecord(@Nonnull @NotEmpty final String val, @Nonnull final Optional<Long> exp) {
+        version = 1;
         value = val;
-        expiration = exp.orNull();
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param ver   version
-     * @param exp   optional expiration
-     */
-    public StorageRecord(int ver, @Nonnull final Optional<Long> exp) {
-        version = ver;
-        value = null;
         expiration = exp.orNull();
     }
     
     /**
-     * Gets the record version.
+     * Get the record version.
      * 
      * @return  the record version
      */
@@ -72,7 +59,7 @@
     }
 
     /**
-     * Gets the record value.
+     * Get the record value.
      * 
      * @return  the record value
      */
@@ -81,7 +68,7 @@
     }
 
     /**
-     * Gets the optional record expiration.
+     * Get the optional record expiration.
      * 
      * @return  the optional record expiration
      */
@@ -89,4 +76,31 @@
         return Optional.fromNullable(expiration);
     }
 
+    /**
+     * Set the record value.
+     * 
+     * @param val   the new record value
+     */
+    protected void setValue(@Nonnull @NotEmpty final String val) {
+        value = val;
+    }
+    
+    /**
+     * Set the optional record expiration.
+     * 
+     * @param exp   the new record expiration
+     */
+    protected void setExpiration(@Nonnull Optional<Long> exp) {
+        expiration = exp.orNull();
+    }
+    
+    /**
+     * Increment the record version and returns the new value.
+     * 
+     * @return  the updated version
+     */

[... 6 lines stripped ...]