JCL-366: Address miscellaneous sonar warnings (#488)

Author: acoburn

caffeine/src/main/java/com/inrupt/client/caffeine/CaffeineCache.java

@@ -33,6 +33,10 @@
  */
 public class CaffeineCache<T, U> implements ClientCache<T, U> {
 
+    private static final String CACHE_NOT_NULL = "cache may not be null!";
+    private static final String KEY_NOT_NULL = "cache key may not be null!";
+    private static final String VALUE_NOT_NULL = "cache value may not be null!";
+
     private final Cache<T, U> cache;
 
     /**
@@ -41,25 +45,25 @@ public class CaffeineCache<T, U> implements ClientCache<T, U> {
      * @param cache the caffeine cache
      */
     public CaffeineCache(final Cache<T, U> cache) {
-        this.cache = Objects.requireNonNull(cache, "cache may not be null!");
+        this.cache = Objects.requireNonNull(cache, CACHE_NOT_NULL);
     }
 
     @Override
     public U get(final T key) {
-        Objects.requireNonNull(key, "cache key may not be null!");
+        Objects.requireNonNull(key, KEY_NOT_NULL);
         return cache.getIfPresent(key);
     }
 
     @Override
     public void put(final T key, final U value) {
-        Objects.requireNonNull(key, "cache key may not be null!");
-        Objects.requireNonNull(value, "cache value may not be null!");
+        Objects.requireNonNull(key, KEY_NOT_NULL);
+        Objects.requireNonNull(value, VALUE_NOT_NULL);
         cache.put(key, value);
     }
 
     @Override
     public void invalidate(final T key) {
-        Objects.requireNonNull(key, "cache key may not be null!");
+        Objects.requireNonNull(key, KEY_NOT_NULL);
         cache.invalidate(key);
     }
 

guava/src/main/java/com/inrupt/client/guava/GuavaCache.java

@@ -33,6 +33,7 @@
  */
 public class GuavaCache<T, U> implements ClientCache<T, U> {
 
+    private static final String CACHE_NOT_NULL = "cache may not be null!";
     private static final String KEY_NOT_NULL = "cache key may not be null!";
     private static final String VALUE_NOT_NULL = "cache value may not be null!";
 
@@ -44,7 +45,7 @@ public class GuavaCache<T, U> implements ClientCache<T, U> {
      * @param cache the guava cache
      */
     public GuavaCache(final Cache<T, U> cache) {
-        this.cache = Objects.requireNonNull(cache, KEY_NOT_NULL);
+        this.cache = Objects.requireNonNull(cache, CACHE_NOT_NULL);
     }
 
     @Override

openid/src/main/java/com/inrupt/client/openid/OpenIdSession.java

@@ -239,12 +239,12 @@ public void reset() {
     @Override
     public CompletionStage<Optional<Credential>> authenticate(final Authenticator auth,
             final Request request, final Set<String> algorithms) {
-        final Optional<Credential> credential = getCredential(ID_TOKEN, null);
-        if (credential.isPresent() && request != null) {
+        final Optional<Credential> cred = getCredential(ID_TOKEN, null);
+        if (cred.isPresent() && request != null) {
             LOGGER.debug("Setting cache entry for request: {}", request.uri());
             requestCache.put(request.uri(), Boolean.TRUE);
         }
-        return CompletableFuture.completedFuture(credential);
+        return CompletableFuture.completedFuture(cred);
     }
 
     /* deprecated */

webid/src/main/java/com/inrupt/client/webid/WebIdProfile.java

@@ -68,7 +68,7 @@ public WebIdProfile(final URI identifier, final Dataset dataset) {
      * @return the {@code rdf:type} values
      * @deprecated use the {@link #getTypes} method
      */
-    @Deprecated
+    @Deprecated(since = "1.0.0.Beta3", forRemoval = true)
     public Set<URI> getType() {
         return getTypes();
     }
@@ -88,7 +88,7 @@ public Set<URI> getTypes() {
      * @return the {@code solid:oidcIssuer} values
      * @deprecated use the {@link #getOidcIssuers} method
      */
-    @Deprecated
+    @Deprecated(since = "1.0.0.Beta3", forRemoval = true)
     public Set<URI> getOidcIssuer() {
         return getOidcIssuers();
     }
@@ -108,7 +108,7 @@ public Set<URI> getOidcIssuers() {
      * @return the {@code rdfs:seeAlso} values
      * @deprecated use the {@link #getRelatedResources} method
      */
-    @Deprecated
+    @Deprecated(since = "1.0.0.Beta3", forRemoval = true)
     public Set<URI> getSeeAlso() {
         return getRelatedResources();
     }
@@ -128,7 +128,7 @@ public Set<URI> getRelatedResources() {
      * @return the {@code pim:storage} values
      * @deprecated use the {@link #getStorages} method
      */
-    @Deprecated
+    @Deprecated(since = "1.0.0.Beta3", forRemoval = true)
     public Set<URI> getStorage() {
         return getStorages();
     }