[java-opensaml] branch master updated: Checkstyle

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository java-opensaml.

View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=a5b43da07ed438ede34cd6739ff5e2ce6494ac0b

The following commit(s) were added to refs/heads/master by this push:
       new  a5b43da   Checkstyle
a5b43da is described below

commit a5b43da07ed438ede34cd6739ff5e2ce6494ac0b
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Apr 12 16:46:06 2017 -0400

    Checkstyle
---
 .../main/java/org/opensaml/storage/StorageCapabilitiesEx.java |  1 -
 .../storage/impl/memcached/MemcachedStorageService.java       | 11 ++++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/opensaml-storage-api/src/main/java/org/opensaml/storage/StorageCapabilitiesEx.java b/opensaml-storage-api/src/main/java/org/opensaml/storage/StorageCapabilitiesEx.java
index 7505cdf..dae5b22 100644
--- a/opensaml-storage-api/src/main/java/org/opensaml/storage/StorageCapabilitiesEx.java
+++ b/opensaml-storage-api/src/main/java/org/opensaml/storage/StorageCapabilitiesEx.java
@@ -20,7 +20,6 @@ package org.opensaml.storage;
 /**
  * Exposes capabilities of a {@link StorageService} implementation.
  */
- at SuppressWarnings("deprecation")
 public interface StorageCapabilitiesEx extends StorageCapabilities {
     
     /**
diff --git a/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/memcached/MemcachedStorageService.java b/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/memcached/MemcachedStorageService.java
index 43d6b6d..7427486 100644
--- a/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/memcached/MemcachedStorageService.java
+++ b/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/memcached/MemcachedStorageService.java
@@ -375,9 +375,10 @@ public class MemcachedStorageService extends AbstractIdentifiableInitializableCo
         return newVersion;
     }
 
+// Checkstyle: ParameterNumber OFF
     /** {@inheritDoc} */
     @Override
-    public Long updateWithVersion(@Positive final long version,
+    @Nullable public Long updateWithVersion(@Positive final long version,
                                   @Nonnull @NotEmpty final String context,
                                   @Nonnull @NotEmpty final String key,
                                   @Nonnull final Object value,
@@ -388,10 +389,11 @@ public class MemcachedStorageService extends AbstractIdentifiableInitializableCo
         Constraint.isNotNull(serializer, "Serializer cannot be null");
         return updateWithVersion(version, context, key, serializer.serialize(value), expiration);
     }
+// Checkstyle: ParameterNumber ON
 
     /** {@inheritDoc} */
     @Override
-    public Long updateWithVersion(@Positive final long version, @Nonnull final Object value)
+    @Nullable public Long updateWithVersion(@Positive final long version, @Nonnull final Object value)
             throws IOException, VersionMismatchException {
 
         Constraint.isNotNull(value, "Value cannot be null");
@@ -508,6 +510,7 @@ public class MemcachedStorageService extends AbstractIdentifiableInitializableCo
         return;
     }
 
+// Checkstyle: ReturnCount OFF
     /** {@inheritDoc} */
     @Override
     public void updateContextExpiration(@Nonnull @NotEmpty final String context, @Nullable final Long expiration)
@@ -544,6 +547,7 @@ public class MemcachedStorageService extends AbstractIdentifiableInitializableCo
             handleAsyncResult(result);
         }
     }
+// Checkstyle: ReturnCount ON
 
     /** {@inheritDoc} */
     @Override
@@ -558,7 +562,8 @@ public class MemcachedStorageService extends AbstractIdentifiableInitializableCo
         final OperationFuture<Boolean> nsResult = memcacheClient.delete(namespace);
         if (trackContextKeys) {
             final OperationFuture<Boolean> keyListResult = memcacheClient.delete(namespace + CTX_KEY_LIST_SUFFIX);
-            final OperationFuture<Boolean> blackListResult = memcacheClient.delete(namespace + CTX_KEY_BLACKLIST_SUFFIX);
+            final OperationFuture<Boolean> blackListResult =
+                    memcacheClient.delete(namespace + CTX_KEY_BLACKLIST_SUFFIX);
             handleAsyncResult(keyListResult);
             handleAsyncResult(blackListResult);
         }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.