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

[noreply at shibboleth.net]

Author: scantor
Date: Mon Apr 29 12:26:40 2013
New Revision: 3322

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3322&view=rev
Log:
Merge back changes to storage service design/impl.

Added:
    trunk/opensaml-util/src/main/java/org/opensaml/util/storage/StorageService.java
      - copied, changed from r3304, trunk/opensaml-util/src/main/java/org/opensaml/util/storage/StorageServiceWithOptional.java
Modified:
    trunk/opensaml-util/src/main/java/org/opensaml/util/storage/StorageCapabilities.java
    trunk/opensaml-util/src/main/java/org/opensaml/util/storage/StorageRecord.java
    trunk/opensaml-util/src/main/java/org/opensaml/util/storage/StorageServiceNoOptional.java
    trunk/opensaml-util/src/main/java/org/opensaml/util/storage/StorageServiceWithOptional.java
    trunk/opensaml-util/src/main/java/org/opensaml/util/storage/impl/MemoryStorageService.java
    trunk/opensaml-util/src/main/java/org/opensaml/util/storage/impl/MemoryStorageServiceNoOptional.java
    trunk/opensaml-util/src/main/java/org/opensaml/util/storage/impl/MutableStorageRecord.java

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=3322&r1=3321&r2=3322&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 Mon Apr 29 12:26:40 2013
@@ -17,10 +17,6 @@
 
 package org.opensaml.util.storage;
 
-import javax.annotation.Nonnull;
-
-import com.google.common.base.Optional;
-
 /**
  * Exposes capabilities of a {@link StorageService} implementation.
  */
@@ -29,29 +25,29 @@
     /**
      * Gets max size of context labels in characters.
      * 
-     * @return  max size of context labels in characters, if any
+     * @return  max size of context labels in characters
      */
-    @Nonnull public Optional<Integer> getContextSize();
+    public int getContextSize();
 
     /**
      * Gets max size of keys in characters.
      * 
-     * @return  max size of keys in characters, if any
+     * @return  max size of keys in characters
      */
-    @Nonnull public Optional<Integer> getKeySize();
+    public int getKeySize();
 
     /**
      * Gets max size of string values in characters.
      * 
-     * @return  max size of string values in characters, if any
+     * @return  max size of string values in characters
      */
-    @Nonnull public Optional<Integer> getStringSize();
+    public int getStringSize();
     
     /**
      * Gets max size of text values in characters.
      * 
-     * @return  max size of text values in characters, if any
+     * @return  max size of text values in characters
      */
-    @Nonnull public Optional<Long> getTextSize();
+    public long getTextSize();
 
 }

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=3322&r1=3321&r2=3322&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 Mon Apr 29 12:26:40 2013
@@ -18,10 +18,9 @@
 package org.opensaml.util.storage;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-
-import com.google.common.base.Optional;
 
 /**
  * Represents a versioned record in a {@link StorageService}.
@@ -41,12 +40,12 @@
      * Constructor.
      *
      * @param val   value
-     * @param exp   optional expiration
+     * @param exp   expiration, or null if none
      */
-    public StorageRecord(@Nonnull @NotEmpty final String val, @Nonnull final Optional<Long> exp) {
+    public StorageRecord(@Nonnull @NotEmpty final String val, @Nullable final Long exp) {
         version = 1;
         value = val;
-        expiration = exp.orNull();
+        expiration = exp;
     }
     
     /**
@@ -68,12 +67,12 @@
     }
 
     /**
-     * Get the optional record expiration.
+     * Get the record expiration.
      * 
-     * @return  the optional record expiration
+     * @return  the record expiration, or null if none
      */
-    @Nonnull public Optional<Long> getExpiration() {
-        return Optional.fromNullable(expiration);
+    @Nullable public Long getExpiration() {
+        return expiration;
     }
 
     /**
@@ -86,12 +85,12 @@
     }
     
     /**
-     * Set the optional record expiration.
+     * Set the record expiration.
      * 
-     * @param exp   the new record expiration
+     * @param exp   the new record expiration, or null if none
      */
-    protected void setExpiration(@Nonnull Optional<Long> exp) {

[... 896 lines stripped ...]