[java-opensaml COMMIT] /trunk/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/memcached/MemcachedStorag...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Sep  7 10:44:01 2016
New Revision: 4482

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4482&view=rev
Log:
Revert change to c'tor argument names by changing field names.

Modified:
    trunk/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/memcached/MemcachedStorageService.java

Modified: trunk/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/memcached/MemcachedStorageService.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/memcached/MemcachedStorageService.java?rev=4482&r1=4481&r2=4482&view=diff
==============================================================================
--- trunk/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/memcached/MemcachedStorageService.java	(original)
+++ trunk/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/memcached/MemcachedStorageService.java	Wed Sep  7 10:44:01 2016
@@ -113,15 +113,15 @@
 
     /** Invariant storage capabilities. */
     @Nonnull
-    private MemcachedStorageCapabilities capabilities = new MemcachedStorageCapabilities();
+    private MemcachedStorageCapabilities storageCapabilities;
 
     /** Memcached client instance. */
     @Nonnull
-    private final MemcachedClient client;
+    private final MemcachedClient memcacheClient;
 
     /** Memcached asynchronous operation timeout in seconds. */
     @Positive
-    private int timeout;
+    private int operationTimeout;
 
     /** Flag that controls context key tracking. */
     private boolean trackContextKeys;
@@ -129,42 +129,48 @@
     /**
      * Creates a new instance.
      *
-     * @param c Memcached client object. The client MUST be configured to use the binary memcached protocol,
+     * @param client Memcached client object. The client MUST be configured to use the binary memcached protocol,
      *               i.e. {@link net.spy.memcached.BinaryConnectionFactory}, in order for
      *               {@link #deleteWithVersion(long, String, String)} and {@link #deleteWithVersion(long, Object)}
      *               to work correctly. The binary protocol is recommended for efficiency as well.
-     * @param t Memcached operation timeout in seconds.
+     * @param timeout Memcached operation timeout in seconds.
      */
-    public MemcachedStorageService(@Nonnull final MemcachedClient c, @Positive final int t) {
-        this(c, t, false);
+    public MemcachedStorageService(@Nonnull final MemcachedClient client, @Positive final int timeout) {
+        this(client, timeout, false);
     }
 
 
     /**
      * Creates a new instance with optional context key tracking.
      *
-     * @param c Memcached client object. The client MUST be configured to use the binary memcached protocol,
+     * @param client Memcached client object. The client MUST be configured to use the binary memcached protocol,
      *               i.e. {@link net.spy.memcached.BinaryConnectionFactory}, in order for
      *               {@link #deleteWithVersion(long, String, String)} and {@link #deleteWithVersion(long, Object)}
      *               to work correctly. The binary protocol is recommended for efficiency as well.
-     * @param t Memcached operation timeout in seconds.
+     * @param timeout Memcached operation timeout in seconds.
      * @param enableContextKeyTracking True to enable context key tracking, false otherwise. <strong>NOTE</strong>
      *                                 this flag must be set to <code>true</code> in order for
      *                                 {@link #updateContextExpiration(String, Long)} to work. If that capability is
      *                                 not needed, the flag should be set to <code>false</code> for better
      *                                 performance. The feature is disabled by default.
      */
-    public MemcachedStorageService(@Nonnull final MemcachedClient c, @Positive final int t,
+    public MemcachedStorageService(
+            @Nonnull final MemcachedClient client,
+            @Positive final int timeout,
             final boolean enableContextKeyTracking) {
-        client = Constraint.isNotNull(c, "Client cannot be null");
-        timeout = (int) Constraint.isGreaterThan(0, t, "Operation timeout must be positive");
+        Constraint.isNotNull(client, "Client cannot be null");
+        Constraint.isGreaterThan(0, timeout, "Operation timeout must be positive");
+        memcacheClient = client;
+        operationTimeout = timeout;
         trackContextKeys = enableContextKeyTracking;
-    }
-
+        storageCapabilities = new MemcachedStorageCapabilities();
+    }
+
+    /** {@inheritDoc} */
     @Override
     @Nonnull
     public StorageCapabilities getCapabilities() {
-        return capabilities;
+        return storageCapabilities;
     }
 
     /**
@@ -172,12 +178,14 @@
      * the {@link edu.vt.middleware.idp.storage.MemcachedStorageCapabilities#valueSize} should be set equal to the
      * chosen slab size.
      *
-     * @param caps Memcached storage capabilities.

[... 423 lines stripped ...]