[java-support] 02/10: JPAR-85 - Add missing final parameters to methods.
Tom Zeller
tzeller at dragonacea.biz
Mon May 16 21:19:37 EDT 2016
This is an automated email from the git hooks/post-receive script.
tzeller pushed a commit to branch JPAR-85
in repository java-support.
commit 6ae7ca06a0b00b354da0fa6a29717810fb4f8a86
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Mon May 16 19:55:50 2016 -0500
JPAR-85 - Add missing final parameters to methods.
---
.../collection/ClassToInstanceMultiMap.java | 2 +-
.../java/support/collection/CollectionSupport.java | 16 ++++----
.../support/collection/IndexingObjectStore.java | 14 +++----
.../java/support/collection/LazyList.java | 2 +-
.../java/support/component/ComponentSupport.java | 8 ++--
.../httpclient/FileCachingHttpClientBuilder.java | 13 +++---
.../java/support/httpclient/HttpClientBuilder.java | 22 +++++-----
.../java/support/httpclient/HttpClientSupport.java | 6 ++-
.../InMemoryCachingHttpClientBuilder.java | 4 +-
.../support/httpclient/RequestConnectionClose.java | 2 +-
.../java/support/httpclient/TLSSocketFactory.java | 5 ++-
.../support/logic/AbstractTriStatePredicate.java | 4 +-
.../java/support/logic/AllMatchPredicate.java | 2 +-
.../java/support/logic/AnyMatchPredicate.java | 2 +-
.../logic/CaseInsensitiveStringMatchPredicate.java | 2 +-
.../java/support/logic/PredicateSupport.java | 6 +--
.../support/logic/TransformAndCheckFunction.java | 4 +-
.../support/logic/TrimOrNullStringFunction.java | 4 +-
.../java/support/net/BasicURLComparator.java | 2 +-
.../java/support/net/CookieBufferingFilter.java | 13 +++---
.../support/net/RequestResponseContextFilter.java | 5 ++-
.../java/support/net/SimpleURLCanonicalizer.java | 3 +-
.../net/ThreadLocalHttpServletRequestProxy.java | 36 ++++++++--------
.../net/ThreadLocalHttpServletResponseProxy.java | 48 +++++++++++-----------
.../utilities/java/support/net/URISupport.java | 2 +-
.../java/support/primitive/ObjectSupport.java | 2 +-
.../java/support/primitive/StringSupport.java | 2 +-
.../security/BasicAccessControlService.java | 2 +-
.../security/BasicKeystoreKeyStrategyTool.java | 2 +-
.../java/support/security/DataSealer.java | 4 +-
.../support/security/IPRangeAccessControl.java | 2 +-
.../RandomIdentifierGenerationStrategy.java | 2 +-
.../security/SelfSignedCertificateGenerator.java | 2 +-
.../Type4UUIDIdentifierGenerationStrategy.java | 2 +-
.../java/support/velocity/SLF4JLogChute.java | 8 ++--
.../utilities/java/support/velocity/Template.java | 21 ++++++----
.../java/support/xml/AttributeSupport.java | 4 +-
.../java/support/xml/ClasspathResolver.java | 23 ++++++-----
.../utilities/java/support/xml/SchemaBuilder.java | 2 +-
.../java/support/xml/SerializeSupport.java | 2 +-
.../java/support/xml/SimpleNamespaceContext.java | 6 +--
41 files changed, 163 insertions(+), 150 deletions(-)
diff --git a/src/main/java/net/shibboleth/utilities/java/support/collection/ClassToInstanceMultiMap.java b/src/main/java/net/shibboleth/utilities/java/support/collection/ClassToInstanceMultiMap.java
index 40ab53d..93060c0 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/collection/ClassToInstanceMultiMap.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/collection/ClassToInstanceMultiMap.java
@@ -366,7 +366,7 @@ public class ClassToInstanceMultiMap<B> {
}
/** {@inheritDoc} */
- @Override public boolean equals(Object obj) {
+ @Override public boolean equals(final Object obj) {
if (null == obj) {
return false;
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/collection/CollectionSupport.java b/src/main/java/net/shibboleth/utilities/java/support/collection/CollectionSupport.java
index f20d63b..78a0e26 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/collection/CollectionSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/collection/CollectionSupport.java
@@ -47,7 +47,7 @@ public final class CollectionSupport {
* @return true if the given element was added to the given collection
*/
public static <T> boolean addIf(@Nonnull final Collection<? super T> target, @Nullable final T element,
- @Nonnull Predicate<? super T> predicate) {
+ @Nonnull final Predicate<? super T> predicate) {
return addIf(target, element, predicate, Functions.<T> identity());
}
@@ -64,7 +64,7 @@ public final class CollectionSupport {
* @return true if the given element was added to the given collection
*/
public static <T> boolean addIf(@Nonnull final Collection<? super T> target, @Nullable final T element,
- @Nonnull Predicate<? super T> predicate, @Nonnull Function<? super T, T> elementPreprocessor) {
+ @Nonnull final Predicate<? super T> predicate, @Nonnull final Function<? super T, T> elementPreprocessor) {
Constraint.isNotNull(target, "Target collection can not be null");
Constraint.isNotNull(predicate, "Element predicate can not be null");
@@ -91,7 +91,7 @@ public final class CollectionSupport {
* @return true if the given target had elements added to it
*/
public static <T> boolean addIf(@Nonnull final Collection<? super T> target, @Nullable final Collection<T> elements,
- @Nonnull Predicate<? super T> predicate) {
+ @Nonnull final Predicate<? super T> predicate) {
return addIf(target, elements, predicate, Functions.<T> identity());
}
@@ -108,7 +108,7 @@ public final class CollectionSupport {
* @return true if the given target had elements added to it
*/
public static <T> boolean addIf(@Nonnull final Collection<? super T> target, @Nullable final Collection<T> elements,
- @Nonnull Predicate<? super T> predicate, @Nonnull Function<? super T, T> elementPreprocessor) {
+ @Nonnull final Predicate<? super T> predicate, @Nonnull final Function<? super T, T> elementPreprocessor) {
if (elements == null) {
return false;
}
@@ -134,7 +134,7 @@ public final class CollectionSupport {
* @return true if the given element was removed from the given collection
*/
public static <T> boolean removeIf(@Nonnull final Collection<T> target, @Nullable final T element,
- @Nonnull Predicate<? super T> predicate) {
+ @Nonnull final Predicate<? super T> predicate) {
return removeIf(target, element, predicate, Functions.<T> identity());
}
@@ -151,7 +151,7 @@ public final class CollectionSupport {
* @return true if the given element was added to the given collection
*/
public static <T> boolean removeIf(@Nonnull final Collection<T> target, @Nullable final T element,
- @Nonnull Predicate<? super T> predicate, @Nonnull Function<? super T, T> elementPreprocessor) {
+ @Nonnull final Predicate<? super T> predicate, @Nonnull final Function<? super T, T> elementPreprocessor) {
Constraint.isNotNull(target, "Target collection can not be null");
Constraint.isNotNull(predicate, "Element predicate can not be null");
@@ -179,7 +179,7 @@ public final class CollectionSupport {
* @return true if the given target had elements added to it
*/
public static <T> boolean removeIf(@Nonnull final Collection<T> target, @Nullable final Collection<T> elements,
- @Nonnull Predicate<? super T> predicate) {
+ @Nonnull final Predicate<? super T> predicate) {
return removeIf(target, elements, predicate, Functions.<T> identity());
}
@@ -197,7 +197,7 @@ public final class CollectionSupport {
* @return true if the given target had elements added to it
*/
public static <T> boolean removeIf(@Nonnull final Collection<T> target, @Nullable final Collection<T> elements,
- @Nonnull Predicate<? super T> predicate, @Nonnull Function<? super T, T> elementPreprocessor) {
+ @Nonnull final Predicate<? super T> predicate, @Nonnull final Function<? super T, T> elementPreprocessor) {
if (elements == null) {
return false;
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/collection/IndexingObjectStore.java b/src/main/java/net/shibboleth/utilities/java/support/collection/IndexingObjectStore.java
index d77dd81..ee2688d 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/collection/IndexingObjectStore.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/collection/IndexingObjectStore.java
@@ -94,7 +94,7 @@ public class IndexingObjectStore<T> {
*
* @return true if an object is associated with the given index, false if not
*/
- public boolean containsIndex(String index) {
+ public boolean containsIndex(final String index) {
Lock readLock = rwLock.readLock();
readLock.lock();
try {
@@ -111,7 +111,7 @@ public class IndexingObjectStore<T> {
*
* @return true if an object instance equal to the specified one is stored, false if not
*/
- public boolean containsInstance(T instance) {
+ public boolean containsInstance(final T instance) {
Lock readLock = rwLock.readLock();
readLock.lock();
try {
@@ -149,7 +149,7 @@ public class IndexingObjectStore<T> {
*
* @return the index that may be used to later retrieve the object or null if the object was null
*/
- public String put(T object) {
+ public String put(final T object) {
if (object == null) {
return null;
}
@@ -179,7 +179,7 @@ public class IndexingObjectStore<T> {
*
* @return the registered object or null if no object is registered for that index
*/
- public T get(String index) {
+ public T get(final String index) {
if (index == null) {
return null;
}
@@ -205,7 +205,7 @@ public class IndexingObjectStore<T> {
*
* @param index the index of the object, may be null
*/
- public void remove(String index) {
+ public void remove(final String index) {
if (index == null) {
return;
}
@@ -248,7 +248,7 @@ public class IndexingObjectStore<T> {
* @param object the target object
* @return the object index value
*/
- protected String getIndex(T object) {
+ protected String getIndex(final T object) {
Integer index = indexStore.get(object);
if (index == null) {
index = ++lastIndex;
@@ -262,7 +262,7 @@ public class IndexingObjectStore<T> {
*
* @param object the target index
*/
- protected void removeIndex(T object) {
+ protected void removeIndex(final T object) {
indexStore.remove(object);
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/collection/LazyList.java b/src/main/java/net/shibboleth/utilities/java/support/collection/LazyList.java
index 1a3cb73..ba2368b 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/collection/LazyList.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/collection/LazyList.java
@@ -169,7 +169,7 @@ public class LazyList<ElementType> implements List<ElementType>, Serializable {
}
/** {@inheritDoc} */
- public <T> T[] toArray(T[] type) {
+ public <T> T[] toArray(final T[] type) {
return delegate.toArray(type);
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/component/ComponentSupport.java b/src/main/java/net/shibboleth/utilities/java/support/component/ComponentSupport.java
index 9cd2a46..14cad1f 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/component/ComponentSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/component/ComponentSupport.java
@@ -76,7 +76,7 @@ public final class ComponentSupport {
*
* @param component component to check
*/
- public static void ifDestroyedThrowDestroyedComponentException(@Nonnull DestructableComponent component) {
+ public static void ifDestroyedThrowDestroyedComponentException(@Nonnull final DestructableComponent component) {
Constraint.isNotNull(component, "Component cannot be null");
if (component.isDestroyed()) {
@@ -98,7 +98,8 @@ public final class ComponentSupport {
*
* @param component component to check
*/
- public static void ifNotInitializedThrowUninitializedComponentException(@Nonnull InitializableComponent component) {
+ public static void
+ ifNotInitializedThrowUninitializedComponentException(@Nonnull final InitializableComponent component) {
Constraint.isNotNull(component, "Component cannot be null");
if (!component.isInitialized()) {
@@ -120,7 +121,8 @@ public final class ComponentSupport {
*
* @param component component to check
*/
- public static void ifInitializedThrowUnmodifiabledComponentException(@Nonnull InitializableComponent component) {
+ public static void
+ ifInitializedThrowUnmodifiabledComponentException(@Nonnull final InitializableComponent component) {
Constraint.isNotNull(component, "Component cannot be null");
if (component.isInitialized()) {
diff --git a/src/main/java/net/shibboleth/utilities/java/support/httpclient/FileCachingHttpClientBuilder.java b/src/main/java/net/shibboleth/utilities/java/support/httpclient/FileCachingHttpClientBuilder.java
index bc1e062..96f41a8 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/httpclient/FileCachingHttpClientBuilder.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/httpclient/FileCachingHttpClientBuilder.java
@@ -141,7 +141,7 @@ public class FileCachingHttpClientBuilder extends HttpClientBuilder {
*
* @param directoryPath filesystem path to the directory
*/
- public void setCacheDirectory(@Nonnull @NotEmpty String directoryPath) {
+ public void setCacheDirectory(@Nonnull @NotEmpty final String directoryPath) {
String trimmedPath =
Constraint.isNotNull(StringSupport.trimOrNull(directoryPath),
"Cache directory path can not be null or empty");
@@ -153,7 +153,7 @@ public class FileCachingHttpClientBuilder extends HttpClientBuilder {
*
* @param directory the directory
*/
- public void setCacheDirectory(@Nonnull File directory) {
+ public void setCacheDirectory(@Nonnull final File directory) {
cacheDir = Constraint.isNotNull(directory, "Cache directory can not be null");
}
@@ -171,7 +171,7 @@ public class FileCachingHttpClientBuilder extends HttpClientBuilder {
*
* @param maxEntries maximum number of cached responses, must be greater than zero
*/
- public void setMaxCacheEntries(int maxEntries) {
+ public void setMaxCacheEntries(final int maxEntries) {
maxCacheEntries =
(int) Constraint.isGreaterThan(0, maxEntries, "Maximum number of cache entries must be greater than 0");
}
@@ -190,7 +190,7 @@ public class FileCachingHttpClientBuilder extends HttpClientBuilder {
*
* @param size maximum response body size that will be eligible for caching, must be greater than zero
*/
- public void setMaxCacheEntrySize(long size) {
+ public void setMaxCacheEntrySize(final long size) {
maxCacheEntrySize = (int) Constraint.isGreaterThan(0, size, "Maximum cache entry size must be greater than 0");
}
@@ -208,7 +208,7 @@ public class FileCachingHttpClientBuilder extends HttpClientBuilder {
*
* @param value the new maintenance task interval, in milliseconds
*/
- public void setMaintentanceTaskInterval(long value) {
+ public void setMaintentanceTaskInterval(final long value) {
maintentanceTaskInterval = Constraint.isGreaterThan(0, value,
"Maintenance task interval must be greater than 0");
}
@@ -304,7 +304,8 @@ public class FileCachingHttpClientBuilder extends HttpClientBuilder {
}
/** {@inheritDoc} */
- protected CloseableHttpResponse doExecute(HttpHost target, HttpRequest request, HttpContext context)
+ protected CloseableHttpResponse doExecute(final HttpHost target, final HttpRequest request,
+ final HttpContext context)
throws IOException, ClientProtocolException {
ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
diff --git a/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientBuilder.java b/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientBuilder.java
index 40a0002..bf74ed3 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientBuilder.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientBuilder.java
@@ -415,7 +415,7 @@ public class HttpClientBuilder {
*
* @param close whether to instruct the server to close the connection after it has sent its response
*/
- public void setConnectionCloseAfterResponse(boolean close) {
+ public void setConnectionCloseAfterResponse(final boolean close) {
connectionCloseAfterResponse = close;
}
@@ -618,7 +618,7 @@ public class HttpClientBuilder {
*
* @param flag true if disabled, false if not
*/
- public void setDisableAuthCaching(boolean flag) {
+ public void setDisableAuthCaching(final boolean flag) {
disableAuthCaching = flag;
}
@@ -636,7 +636,7 @@ public class HttpClientBuilder {
*
* @param flag true if disabled, false if not
*/
- public void setDisableAutomaticRetries(boolean flag) {
+ public void setDisableAutomaticRetries(final boolean flag) {
disableAutomaticRetries = flag;
}
@@ -655,7 +655,7 @@ public class HttpClientBuilder {
* @param flag true if disabled, false if not
*/
- public void setDisableConnectionState(boolean flag) {
+ public void setDisableConnectionState(final boolean flag) {
disableConnectionState = flag;
}
@@ -673,7 +673,7 @@ public class HttpClientBuilder {
*
* @param flag true if disabled, false if not
*/
- public void setDisableContentCompression(boolean flag) {
+ public void setDisableContentCompression(final boolean flag) {
disableContentCompression = flag;
}
@@ -691,7 +691,7 @@ public class HttpClientBuilder {
*
* @param flag true if disabled, false if not
*/
- public void setDisableCookieManagement(boolean flag) {
+ public void setDisableCookieManagement(final boolean flag) {
disableCookieManagement = flag;
}
@@ -709,7 +709,7 @@ public class HttpClientBuilder {
*
* @param flag true if disabled, false if not
*/
- public void setDisableRedirectHandling(boolean flag) {
+ public void setDisableRedirectHandling(final boolean flag) {
disableRedirectHandling = flag;
}
@@ -727,7 +727,7 @@ public class HttpClientBuilder {
*
* @param flag true if enabled, false if not
*/
- public void setUseSystemProperties(boolean flag) {
+ public void setUseSystemProperties(final boolean flag) {
useSystemProperties = flag;
}
@@ -763,7 +763,7 @@ public class HttpClientBuilder {
*
* @param interceptors the list of interceptors, may be null
*/
- public void setLastRequestInterceptors(List<HttpRequestInterceptor> interceptors) {
+ public void setLastRequestInterceptors(final List<HttpRequestInterceptor> interceptors) {
requestInterceptorsLast = (List<HttpRequestInterceptor>) normalizeInterceptors(interceptors);
}
@@ -781,7 +781,7 @@ public class HttpClientBuilder {
*
* @param interceptors the list of interceptors, may be null
*/
- public void setFirstResponseInterceptors(List<HttpResponseInterceptor> interceptors) {
+ public void setFirstResponseInterceptors(final List<HttpResponseInterceptor> interceptors) {
responseInterceptorsFirst = (List<HttpResponseInterceptor>) normalizeInterceptors(interceptors);
}
@@ -799,7 +799,7 @@ public class HttpClientBuilder {
*
* @param interceptors the list of interceptors, may be null
*/
- public void setLastResponseInterceptors(List<HttpResponseInterceptor> interceptors) {
+ public void setLastResponseInterceptors(final List<HttpResponseInterceptor> interceptors) {
responseInterceptorsLast = (List<HttpResponseInterceptor>) normalizeInterceptors(interceptors);
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientSupport.java b/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientSupport.java
index 44b05fd..0fa2067 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientSupport.java
@@ -119,11 +119,13 @@ public final class HttpClientSupport {
return null;
}
- public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+ public void checkServerTrusted(final X509Certificate[] chain, final String authType)
+ throws CertificateException {
// accept everything
}
- public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+ public void checkClientTrusted(final X509Certificate[] chain, final String authType)
+ throws CertificateException {
// accept everything
}
};
diff --git a/src/main/java/net/shibboleth/utilities/java/support/httpclient/InMemoryCachingHttpClientBuilder.java b/src/main/java/net/shibboleth/utilities/java/support/httpclient/InMemoryCachingHttpClientBuilder.java
index 3de502c..6a138d6 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/httpclient/InMemoryCachingHttpClientBuilder.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/httpclient/InMemoryCachingHttpClientBuilder.java
@@ -105,7 +105,7 @@ public class InMemoryCachingHttpClientBuilder extends HttpClientBuilder {
*
* @param maxEntries maximum number of cached responses, must be greater than zero
*/
- public void setMaxCacheEntries(int maxEntries) {
+ public void setMaxCacheEntries(final int maxEntries) {
maxCacheEntries =
(int) Constraint.isGreaterThan(0, maxEntries, "Maximum number of cache entries must be greater than 0");
}
@@ -124,7 +124,7 @@ public class InMemoryCachingHttpClientBuilder extends HttpClientBuilder {
*
* @param size maximum response body size that will be eligible for caching, must be greater than zero
*/
- public void setMaxCacheEntrySize(long size) {
+ public void setMaxCacheEntrySize(final long size) {
maxCacheEntrySize = Constraint.isGreaterThan(0, size, "Maximum cache entry size must be greater than 0");
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/httpclient/RequestConnectionClose.java b/src/main/java/net/shibboleth/utilities/java/support/httpclient/RequestConnectionClose.java
index e45f16b..4af05c2 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/httpclient/RequestConnectionClose.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/httpclient/RequestConnectionClose.java
@@ -40,7 +40,7 @@ import org.apache.http.protocol.HttpContext;
public class RequestConnectionClose implements HttpRequestInterceptor {
/** {@inheritDoc} */
- public void process(HttpRequest request, HttpContext context) throws HttpException, IOException {
+ public void process(final HttpRequest request, final HttpContext context) throws HttpException, IOException {
if (HttpVersion.HTTP_1_1.equals(request.getProtocolVersion())) {
request.addHeader(HttpHeaders.CONNECTION, "close");
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/httpclient/TLSSocketFactory.java b/src/main/java/net/shibboleth/utilities/java/support/httpclient/TLSSocketFactory.java
index 46c4f0c..e26abcf 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/httpclient/TLSSocketFactory.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/httpclient/TLSSocketFactory.java
@@ -332,7 +332,7 @@ public class TLSSocketFactory implements LayeredConnectionSocketFactory {
*
* @param socket the SSLSocket instance
*/
- private void logSocketInfo(SSLSocket socket) {
+ private void logSocketInfo(final SSLSocket socket) {
SSLSession session = socket.getSession();
if (log.isDebugEnabled()) {
log.debug("Connected to: {}", socket.getRemoteSocketAddress());
@@ -366,7 +366,8 @@ public class TLSSocketFactory implements LayeredConnectionSocketFactory {
*
* @return a String array, or null
*/
- @Nullable protected String[] getListAttribute(@Nullable final HttpContext context, @Nonnull String contextKey) {
+ @Nullable protected String[] getListAttribute(@Nullable final HttpContext context,
+ @Nonnull final String contextKey) {
if (context == null) {
return null;
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/logic/AbstractTriStatePredicate.java b/src/main/java/net/shibboleth/utilities/java/support/logic/AbstractTriStatePredicate.java
index a87a32b..e59e759 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/logic/AbstractTriStatePredicate.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/logic/AbstractTriStatePredicate.java
@@ -49,7 +49,7 @@ public abstract class AbstractTriStatePredicate<T> implements Predicate<T> {
*
* @param flag true if should satisfy, false otherwise
*/
- public void setNullInputSatisfies(boolean flag) {
+ public void setNullInputSatisfies(final boolean flag) {
nullInputSatisfies = flag;
}
@@ -67,7 +67,7 @@ public abstract class AbstractTriStatePredicate<T> implements Predicate<T> {
*
* @param flag true if should satisfy, false otherwise
*/
- public void setUnevaluableSatisfies(boolean flag) {
+ public void setUnevaluableSatisfies(final boolean flag) {
unevaluableSatisfies = flag;
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/logic/AllMatchPredicate.java b/src/main/java/net/shibboleth/utilities/java/support/logic/AllMatchPredicate.java
index bb71afb..4bbdc3e 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/logic/AllMatchPredicate.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/logic/AllMatchPredicate.java
@@ -46,7 +46,7 @@ public class AllMatchPredicate<T> implements Predicate<Iterable<T>> {
}
/** {@inheritDoc} */
- public boolean apply(@Nullable Iterable<T> inputs) {
+ public boolean apply(@Nullable final Iterable<T> inputs) {
if (inputs == null) {
return false;
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/logic/AnyMatchPredicate.java b/src/main/java/net/shibboleth/utilities/java/support/logic/AnyMatchPredicate.java
index 3f27f62..d0bb7fa 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/logic/AnyMatchPredicate.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/logic/AnyMatchPredicate.java
@@ -46,7 +46,7 @@ public class AnyMatchPredicate<T> implements Predicate<Iterable<T>> {
}
/** {@inheritDoc} */
- public boolean apply(@Nullable Iterable<T> inputs) {
+ public boolean apply(@Nullable final Iterable<T> inputs) {
if (inputs == null) {
return false;
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/logic/CaseInsensitiveStringMatchPredicate.java b/src/main/java/net/shibboleth/utilities/java/support/logic/CaseInsensitiveStringMatchPredicate.java
index 311d52e..46d34c9 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/logic/CaseInsensitiveStringMatchPredicate.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/logic/CaseInsensitiveStringMatchPredicate.java
@@ -40,7 +40,7 @@ public class CaseInsensitiveStringMatchPredicate implements Predicate<CharSequen
}
/** {@inheritDoc} */
- public boolean apply(CharSequence input) {
+ public boolean apply(final CharSequence input) {
if (input == null) {
return false;
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/logic/PredicateSupport.java b/src/main/java/net/shibboleth/utilities/java/support/logic/PredicateSupport.java
index a16b245..90510ed 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/logic/PredicateSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/logic/PredicateSupport.java
@@ -39,7 +39,7 @@ public final class PredicateSupport {
*
* @return the constructed predicate
*/
- @Nonnull public static <T> Predicate<Iterable<T>> allMatch(@Nonnull Predicate<T> target) {
+ @Nonnull public static <T> Predicate<Iterable<T>> allMatch(@Nonnull final Predicate<T> target) {
return new AllMatchPredicate<>(target);
}
@@ -51,7 +51,7 @@ public final class PredicateSupport {
*
* @return the constructed predicate
*/
- @Nonnull public static <T> Predicate<Iterable<T>> anyMatch(@Nonnull Predicate<T> target) {
+ @Nonnull public static <T> Predicate<Iterable<T>> anyMatch(@Nonnull final Predicate<T> target) {
return new AnyMatchPredicate<>(target);
}
@@ -62,7 +62,7 @@ public final class PredicateSupport {
*
* @return the constructed predicate
*/
- @Nonnull public static Predicate<CharSequence> caseInsensitiveMatch(@Nonnull String target) {
+ @Nonnull public static Predicate<CharSequence> caseInsensitiveMatch(@Nonnull final String target) {
return new CaseInsensitiveStringMatchPredicate(target);
}
}
\ No newline at end of file
diff --git a/src/main/java/net/shibboleth/utilities/java/support/logic/TransformAndCheckFunction.java b/src/main/java/net/shibboleth/utilities/java/support/logic/TransformAndCheckFunction.java
index 428cf39..432842f 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/logic/TransformAndCheckFunction.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/logic/TransformAndCheckFunction.java
@@ -62,7 +62,7 @@ public class TransformAndCheckFunction<T> implements Function<T, Optional<? exte
}
/** {@inheritDoc} */
- public Optional<? extends T> apply(T input) {
+ public Optional<? extends T> apply(final T input) {
T processedValue = preprocessor.apply(input);
boolean meetsCriteria = constraint.apply(processedValue);
@@ -79,7 +79,7 @@ public class TransformAndCheckFunction<T> implements Function<T, Optional<? exte
}
/** {@inheritDoc} */
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (obj == null) {
return false;
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/logic/TrimOrNullStringFunction.java b/src/main/java/net/shibboleth/utilities/java/support/logic/TrimOrNullStringFunction.java
index 4a931f8..7a8655d 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/logic/TrimOrNullStringFunction.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/logic/TrimOrNullStringFunction.java
@@ -34,12 +34,12 @@ public class TrimOrNullStringFunction implements Function<String, String> {
public static final TrimOrNullStringFunction INSTANCE = new TrimOrNullStringFunction();
/** {@inheritDoc} */
- @Nullable @NotEmpty public String apply(@Nullable String input) {
+ @Nullable @NotEmpty public String apply(@Nullable final String input) {
return StringSupport.trimOrNull(input);
}
/** {@inheritDoc} */
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (obj == null) {
return false;
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/net/BasicURLComparator.java b/src/main/java/net/shibboleth/utilities/java/support/net/BasicURLComparator.java
index c7b3e84..e78c927 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/net/BasicURLComparator.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/net/BasicURLComparator.java
@@ -46,7 +46,7 @@ public class BasicURLComparator implements URIComparator {
* Set the case-insensitivity flag value.
* @param flag The caseInsensitive to set.
*/
- public void setCaseInsensitive(boolean flag) {
+ public void setCaseInsensitive(final boolean flag) {
caseInsensitive = flag;
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/net/CookieBufferingFilter.java b/src/main/java/net/shibboleth/utilities/java/support/net/CookieBufferingFilter.java
index ae98239..8a20c89 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/net/CookieBufferingFilter.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/net/CookieBufferingFilter.java
@@ -45,7 +45,7 @@ import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElemen
public class CookieBufferingFilter implements Filter {
/** {@inheritDoc} */
- public void init(FilterConfig filterConfig) throws ServletException {
+ public void init(final FilterConfig filterConfig) throws ServletException {
}
/** {@inheritDoc} */
@@ -53,7 +53,8 @@ public class CookieBufferingFilter implements Filter {
}
/** {@inheritDoc} */
- public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException,
+ public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain chain)
+ throws IOException,
ServletException {
if (!(request instanceof HttpServletRequest)) {
@@ -88,7 +89,7 @@ public class CookieBufferingFilter implements Filter {
/** {@inheritDoc} */
@Override
- public void addCookie(Cookie cookie) {
+ public void addCookie(final Cookie cookie) {
// Guarantees any existing cookie by this name is replaced.
cookieMap.put(cookie.getName(), cookie);
}
@@ -118,21 +119,21 @@ public class CookieBufferingFilter implements Filter {
/** {@inheritDoc} */
@Override
- public void sendError(int sc, String msg) throws IOException {
+ public void sendError(final int sc, final String msg) throws IOException {
dumpCookies();
super.sendError(sc, msg);
}
/** {@inheritDoc} */
@Override
- public void sendError(int sc) throws IOException {
+ public void sendError(final int sc) throws IOException {
dumpCookies();
super.sendError(sc);
}
/** {@inheritDoc} */
@Override
- public void sendRedirect(String location) throws IOException {
+ public void sendRedirect(final String location) throws IOException {
dumpCookies();
super.sendRedirect(location);
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/net/RequestResponseContextFilter.java b/src/main/java/net/shibboleth/utilities/java/support/net/RequestResponseContextFilter.java
index f197beb..2f38649 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/net/RequestResponseContextFilter.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/net/RequestResponseContextFilter.java
@@ -36,7 +36,7 @@ import javax.servlet.http.HttpServletResponse;
public class RequestResponseContextFilter implements Filter {
/** {@inheritDoc} */
- public void init(FilterConfig filterConfig) throws ServletException {
+ public void init(final FilterConfig filterConfig) throws ServletException {
}
/** {@inheritDoc} */
@@ -44,7 +44,8 @@ public class RequestResponseContextFilter implements Filter {
}
/** {@inheritDoc} */
- public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException,
+ public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain chain)
+ throws IOException,
ServletException {
if (!(request instanceof HttpServletRequest)) {
diff --git a/src/main/java/net/shibboleth/utilities/java/support/net/SimpleURLCanonicalizer.java b/src/main/java/net/shibboleth/utilities/java/support/net/SimpleURLCanonicalizer.java
index 9457b6d..b15e2e0 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/net/SimpleURLCanonicalizer.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/net/SimpleURLCanonicalizer.java
@@ -95,7 +95,8 @@ public final class SimpleURLCanonicalizer {
* @return the canonicalized URL
* @throws MalformedURLException if the URL is not a valid URL
*/
- @Nonnull @NotEmpty public static String canonicalize(@Nonnull @NotEmpty String url) throws MalformedURLException {
+ @Nonnull @NotEmpty public static String canonicalize(@Nonnull @NotEmpty final String url)
+ throws MalformedURLException {
Constraint.isFalse(Strings.isNullOrEmpty(url), "URL was null or empty");
URLBuilder urlBuilder = new URLBuilder(url);
canonicalize(urlBuilder);
diff --git a/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletRequestProxy.java b/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletRequestProxy.java
index 5210a48..2b93fbe 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletRequestProxy.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletRequestProxy.java
@@ -49,7 +49,7 @@ import net.shibboleth.utilities.java.support.logic.Constraint;
public class ThreadLocalHttpServletRequestProxy implements HttpServletRequest {
/** {@inheritDoc} */
- public Object getAttribute(String name) {
+ public Object getAttribute(final String name) {
return getCurrent().getAttribute(name);
}
@@ -64,7 +64,7 @@ public class ThreadLocalHttpServletRequestProxy implements HttpServletRequest {
}
/** {@inheritDoc} */
- public void setCharacterEncoding(String env) throws UnsupportedEncodingException {
+ public void setCharacterEncoding(final String env) throws UnsupportedEncodingException {
getCurrent().setCharacterEncoding(env);
}
@@ -84,7 +84,7 @@ public class ThreadLocalHttpServletRequestProxy implements HttpServletRequest {
}
/** {@inheritDoc} */
- public String getParameter(String name) {
+ public String getParameter(final String name) {
return getCurrent().getParameter(name);
}
@@ -94,7 +94,7 @@ public class ThreadLocalHttpServletRequestProxy implements HttpServletRequest {
}
/** {@inheritDoc} */
- public String[] getParameterValues(String name) {
+ public String[] getParameterValues(final String name) {
return getCurrent().getParameterValues(name);
}
@@ -139,12 +139,12 @@ public class ThreadLocalHttpServletRequestProxy implements HttpServletRequest {
}
/** {@inheritDoc} */
- public void setAttribute(String name, Object o) {
+ public void setAttribute(final String name, final Object o) {
getCurrent().setAttribute(name, o);
}
/** {@inheritDoc} */
- public void removeAttribute(String name) {
+ public void removeAttribute(final String name) {
getCurrent().removeAttribute(name);
}
@@ -164,13 +164,13 @@ public class ThreadLocalHttpServletRequestProxy implements HttpServletRequest {
}
/** {@inheritDoc} */
- public RequestDispatcher getRequestDispatcher(String path) {
+ public RequestDispatcher getRequestDispatcher(final String path) {
return getCurrent().getRequestDispatcher(path);
}
/** {@inheritDoc} */
@SuppressWarnings("deprecation")
- public String getRealPath(String path) {
+ public String getRealPath(final String path) {
return getCurrent().getRealPath(path);
}
@@ -205,17 +205,17 @@ public class ThreadLocalHttpServletRequestProxy implements HttpServletRequest {
}
/** {@inheritDoc} */
- public long getDateHeader(String name) {
+ public long getDateHeader(final String name) {
return getCurrent().getDateHeader(name);
}
/** {@inheritDoc} */
- public String getHeader(String name) {
+ public String getHeader(final String name) {
return getCurrent().getHeader(name);
}
/** {@inheritDoc} */
- public Enumeration getHeaders(String name) {
+ public Enumeration getHeaders(final String name) {
return getCurrent().getHeaders(name);
}
@@ -225,7 +225,7 @@ public class ThreadLocalHttpServletRequestProxy implements HttpServletRequest {
}
/** {@inheritDoc} */
- public int getIntHeader(String name) {
+ public int getIntHeader(final String name) {
return getCurrent().getIntHeader(name);
}
@@ -260,7 +260,7 @@ public class ThreadLocalHttpServletRequestProxy implements HttpServletRequest {
}
/** {@inheritDoc} */
- public boolean isUserInRole(String role) {
+ public boolean isUserInRole(final String role) {
return getCurrent().isUserInRole(role);
}
@@ -290,7 +290,7 @@ public class ThreadLocalHttpServletRequestProxy implements HttpServletRequest {
}
/** {@inheritDoc} */
- public HttpSession getSession(boolean create) {
+ public HttpSession getSession(final boolean create) {
return getCurrent().getSession(create);
}
@@ -331,7 +331,7 @@ public class ThreadLocalHttpServletRequestProxy implements HttpServletRequest {
}
/** {@inheritDoc} */
- public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse) {
+ public AsyncContext startAsync(final ServletRequest servletRequest, final ServletResponse servletResponse) {
return getCurrent().startAsync(servletRequest, servletResponse);
}
@@ -356,12 +356,12 @@ public class ThreadLocalHttpServletRequestProxy implements HttpServletRequest {
}
/** {@inheritDoc} */
- public boolean authenticate(HttpServletResponse response) throws IOException, ServletException {
+ public boolean authenticate(final HttpServletResponse response) throws IOException, ServletException {
return getCurrent().authenticate(response);
}
/** {@inheritDoc} */
- public void login(String username, String password) throws ServletException {
+ public void login(final String username, final String password) throws ServletException {
getCurrent().login(username, password);
}
@@ -376,7 +376,7 @@ public class ThreadLocalHttpServletRequestProxy implements HttpServletRequest {
}
/** {@inheritDoc} */
- public Part getPart(String name) throws IOException, ServletException {
+ public Part getPart(final String name) throws IOException, ServletException {
return getCurrent().getPart(name);
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletResponseProxy.java b/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletResponseProxy.java
index 5336ae3..337c82f 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletResponseProxy.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletResponseProxy.java
@@ -55,22 +55,22 @@ public class ThreadLocalHttpServletResponseProxy implements HttpServletResponse
}
/** {@inheritDoc} */
- public void setCharacterEncoding(String charset) {
+ public void setCharacterEncoding(final String charset) {
getCurrent().setCharacterEncoding(charset);
}
/** {@inheritDoc} */
- public void setContentLength(int len) {
+ public void setContentLength(final int len) {
getCurrent().setContentLength(len);
}
/** {@inheritDoc} */
- public void setContentType(String type) {
+ public void setContentType(final String type) {
getCurrent().setContentType(type);
}
/** {@inheritDoc} */
- public void setBufferSize(int size) {
+ public void setBufferSize(final int size) {
getCurrent().setBufferSize(size);
}
@@ -100,7 +100,7 @@ public class ThreadLocalHttpServletResponseProxy implements HttpServletResponse
}
/** {@inheritDoc} */
- public void setLocale(Locale loc) {
+ public void setLocale(final Locale loc) {
getCurrent().setLocale(loc);
}
@@ -110,90 +110,90 @@ public class ThreadLocalHttpServletResponseProxy implements HttpServletResponse
}
/** {@inheritDoc} */
- public void addCookie(Cookie cookie) {
+ public void addCookie(final Cookie cookie) {
getCurrent().addCookie(cookie);
}
/** {@inheritDoc} */
- public boolean containsHeader(String name) {
+ public boolean containsHeader(final String name) {
return getCurrent().containsHeader(name);
}
/** {@inheritDoc} */
- public String encodeURL(String url) {
+ public String encodeURL(final String url) {
return getCurrent().encodeURL(url);
}
/** {@inheritDoc} */
- public String encodeRedirectURL(String url) {
+ public String encodeRedirectURL(final String url) {
return getCurrent().encodeRedirectURL(url);
}
/** {@inheritDoc} */
@SuppressWarnings("deprecation")
- public String encodeUrl(String url) {
+ public String encodeUrl(final String url) {
return getCurrent().encodeUrl(url);
}
/** {@inheritDoc} */
@SuppressWarnings("deprecation")
- public String encodeRedirectUrl(String url) {
+ public String encodeRedirectUrl(final String url) {
return getCurrent().encodeRedirectUrl(url);
}
/** {@inheritDoc} */
- public void sendError(int sc, String msg) throws IOException {
+ public void sendError(final int sc, final String msg) throws IOException {
getCurrent().sendError(sc, msg);
}
/** {@inheritDoc} */
- public void sendError(int sc) throws IOException {
+ public void sendError(final int sc) throws IOException {
getCurrent().sendError(sc);
}
/** {@inheritDoc} */
- public void sendRedirect(String location) throws IOException {
+ public void sendRedirect(final String location) throws IOException {
getCurrent().sendRedirect(location);
}
/** {@inheritDoc} */
- public void setDateHeader(String name, long date) {
+ public void setDateHeader(final String name, final long date) {
getCurrent().setDateHeader(name, date);
}
/** {@inheritDoc} */
- public void addDateHeader(String name, long date) {
+ public void addDateHeader(final String name, final long date) {
getCurrent().addDateHeader(name, date);
}
/** {@inheritDoc} */
- public void setHeader(String name, String value) {
+ public void setHeader(final String name, final String value) {
getCurrent().setHeader(name, value);
}
/** {@inheritDoc} */
- public void addHeader(String name, String value) {
+ public void addHeader(final String name, final String value) {
getCurrent().addHeader(name, value);
}
/** {@inheritDoc} */
- public void setIntHeader(String name, int value) {
+ public void setIntHeader(final String name, final int value) {
getCurrent().setIntHeader(name, value);
}
/** {@inheritDoc} */
- public void addIntHeader(String name, int value) {
+ public void addIntHeader(final String name, final int value) {
getCurrent().addIntHeader(name, value);
}
/** {@inheritDoc} */
- public void setStatus(int sc) {
+ public void setStatus(final int sc) {
getCurrent().setStatus(sc);
}
/** {@inheritDoc} */
@SuppressWarnings("deprecation")
- public void setStatus(int sc, String sm) {
+ public void setStatus(final int sc, final String sm) {
getCurrent().setStatus(sc, sm);
}
@@ -203,12 +203,12 @@ public class ThreadLocalHttpServletResponseProxy implements HttpServletResponse
}
/** {@inheritDoc} */
- public String getHeader(String name) {
+ public String getHeader(final String name) {
return getCurrent().getHeader(name);
}
/** {@inheritDoc} */
- public Collection<String> getHeaders(String name) {
+ public Collection<String> getHeaders(final String name) {
return getCurrent().getHeaders(name);
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/net/URISupport.java b/src/main/java/net/shibboleth/utilities/java/support/net/URISupport.java
index 6a3458d..759cb82 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/net/URISupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/net/URISupport.java
@@ -187,7 +187,7 @@ public final class URISupport {
* @return a suitable URI
* @throws URISyntaxException if the URI contructor fails
*/
- public static URI fileURIFromAbsolutePath(String path) throws URISyntaxException {
+ public static URI fileURIFromAbsolutePath(final String path) throws URISyntaxException {
final StringBuilder uriPath = new StringBuilder(path.length()+8);
uriPath.append("file://");
diff --git a/src/main/java/net/shibboleth/utilities/java/support/primitive/ObjectSupport.java b/src/main/java/net/shibboleth/utilities/java/support/primitive/ObjectSupport.java
index 3822822..bfe1bc5 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/primitive/ObjectSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/primitive/ObjectSupport.java
@@ -59,7 +59,7 @@ public final class ObjectSupport {
* @return the first non-null argument, or null if all arguments are null
*
*/
- @Nullable public static <T> T firstNonNull(@Nullable T ... objects) {
+ @Nullable public static <T> T firstNonNull(@Nullable final T ... objects) {
if (objects == null) {
return null;
} else {
diff --git a/src/main/java/net/shibboleth/utilities/java/support/primitive/StringSupport.java b/src/main/java/net/shibboleth/utilities/java/support/primitive/StringSupport.java
index 1367f47..e056ff3 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/primitive/StringSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/primitive/StringSupport.java
@@ -178,7 +178,7 @@ public final class StringSupport {
* @return the normalized collection of string values
*/
@Nonnull @NonnullElements public static Collection<String> normalizeStringCollection(
- @Nullable @NullableElements Collection<String> values) {
+ @Nullable @NullableElements final Collection<String> values) {
if (values == null) {
return Collections.emptySet();
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/BasicAccessControlService.java b/src/main/java/net/shibboleth/utilities/java/support/security/BasicAccessControlService.java
index c80fdc3..214ed14 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/BasicAccessControlService.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/BasicAccessControlService.java
@@ -80,7 +80,7 @@ public class BasicAccessControlService extends AbstractIdentifiableInitializable
getId(), name);
return new AccessControl() {
- public boolean checkAccess(ServletRequest request, String operation, String resource) {
+ public boolean checkAccess(final ServletRequest request, final String operation, final String resource) {
return false;
}
};
diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategyTool.java b/src/main/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategyTool.java
index 0d1627d..90b6ab6 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategyTool.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategyTool.java
@@ -240,7 +240,7 @@ public class BasicKeystoreKeyStrategyTool {
}
@Override
- public File convert(String value) {
+ public File convert(final String value) {
return new File(value);
}
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/DataSealer.java b/src/main/java/net/shibboleth/utilities/java/support/security/DataSealer.java
index b206362..658664f 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/DataSealer.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/DataSealer.java
@@ -205,7 +205,7 @@ public class DataSealer extends AbstractInitializableComponent {
* @return the decoded data if it is valid and unexpired
* @throws DataSealerException if the data cannot be unwrapped and verified
*/
- @Nonnull private String extractAndCheckDecryptedData(@Nonnull @NotEmpty byte[] decryptedBytes)
+ @Nonnull private String extractAndCheckDecryptedData(@Nonnull @NotEmpty final byte[] decryptedBytes)
throws DataSealerException {
try {
@@ -257,7 +257,7 @@ public class DataSealer extends AbstractInitializableComponent {
* @return the encoded blob
* @throws DataSealerException if the wrapping operation fails
*/
- @Nonnull public String wrap(@Nonnull @NotEmpty final String data, long exp) throws DataSealerException {
+ @Nonnull public String wrap(@Nonnull @NotEmpty final String data, final long exp) throws DataSealerException {
if (data == null || data.length() == 0) {
throw new IllegalArgumentException("Data must be supplied for the wrapping operation");
diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/IPRangeAccessControl.java b/src/main/java/net/shibboleth/utilities/java/support/security/IPRangeAccessControl.java
index 679d0b4..8649634 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/IPRangeAccessControl.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/IPRangeAccessControl.java
@@ -62,7 +62,7 @@ public class IPRangeAccessControl extends AbstractIdentifiableInitializableCompo
*
* @param ranges ranges to allow
*/
- public void setAllowedRanges(@Nonnull @NonnullElements Collection<IPRange> ranges) {
+ public void setAllowedRanges(@Nonnull @NonnullElements final Collection<IPRange> ranges) {
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
Constraint.isNotNull(ranges, "IPRange collection cannot be null");
diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/RandomIdentifierGenerationStrategy.java b/src/main/java/net/shibboleth/utilities/java/support/security/RandomIdentifierGenerationStrategy.java
index 5143875..a555b58 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/RandomIdentifierGenerationStrategy.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/RandomIdentifierGenerationStrategy.java
@@ -99,7 +99,7 @@ public class RandomIdentifierGenerationStrategy implements IdentifierGenerationS
}
/** {@inheritDoc} */
- public String generateIdentifier(boolean xmlSafe) {
+ public String generateIdentifier(final boolean xmlSafe) {
byte[] buf = new byte[sizeOfIdentifier];
random.nextBytes(buf);
try {
diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/SelfSignedCertificateGenerator.java b/src/main/java/net/shibboleth/utilities/java/support/security/SelfSignedCertificateGenerator.java
index fc46f00..257546e 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/SelfSignedCertificateGenerator.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/SelfSignedCertificateGenerator.java
@@ -389,7 +389,7 @@ public class SelfSignedCertificateGenerator {
}
@Override
- public File convert(String value) {
+ public File convert(final String value) {
return new File(value);
}
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/Type4UUIDIdentifierGenerationStrategy.java b/src/main/java/net/shibboleth/utilities/java/support/security/Type4UUIDIdentifierGenerationStrategy.java
index c5119be..8fd98be 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/Type4UUIDIdentifierGenerationStrategy.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/Type4UUIDIdentifierGenerationStrategy.java
@@ -32,7 +32,7 @@ public class Type4UUIDIdentifierGenerationStrategy implements IdentifierGenerati
}
/** {@inheritDoc} */
- public String generateIdentifier(boolean xmlSafe) {
+ public String generateIdentifier(final boolean xmlSafe) {
if (xmlSafe) {
return "_" + UUID.randomUUID().toString();
} else {
diff --git a/src/main/java/net/shibboleth/utilities/java/support/velocity/SLF4JLogChute.java b/src/main/java/net/shibboleth/utilities/java/support/velocity/SLF4JLogChute.java
index bfe9ccf..a856e2b 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/velocity/SLF4JLogChute.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/velocity/SLF4JLogChute.java
@@ -52,7 +52,7 @@ public class SLF4JLogChute implements LogChute {
private Logger log;
/** {@inheritDoc} */
- public void init(RuntimeServices rs) throws Exception {
+ public void init(final RuntimeServices rs) throws Exception {
String name = (String) rs.getProperty(LOGCHUTE_SLF4J_NAME);
if (name == null) {
name = DEFAULT_LOG_NAME;
@@ -62,7 +62,7 @@ public class SLF4JLogChute implements LogChute {
}
/** {@inheritDoc} */
- public boolean isLevelEnabled(int level) {
+ public boolean isLevelEnabled(final int level) {
switch (level) {
case LogChute.DEBUG_ID:
return log.isDebugEnabled();
@@ -80,7 +80,7 @@ public class SLF4JLogChute implements LogChute {
}
/** {@inheritDoc} */
- public void log(int level, String message) {
+ public void log(final int level, final String message) {
switch (level) {
case LogChute.ERROR_ID:
log.error(message);
@@ -101,7 +101,7 @@ public class SLF4JLogChute implements LogChute {
}
/** {@inheritDoc} */
- public void log(int level, String message, Throwable t) {
+ public void log(final int level, final String message, final Throwable t) {
switch (level) {
case LogChute.ERROR_ID:
log.error(message, t);
diff --git a/src/main/java/net/shibboleth/utilities/java/support/velocity/Template.java b/src/main/java/net/shibboleth/utilities/java/support/velocity/Template.java
index 8093e49..d8f2d0f 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/velocity/Template.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/velocity/Template.java
@@ -96,7 +96,8 @@ public final class Template {
*
* @return an instance of this class that can be used to evaluate the given template using the given engine
*/
- @Nonnull public static Template fromTemplate(@Nonnull VelocityEngine engine, @Nonnull @NotEmpty String template) {
+ @Nonnull public static Template fromTemplate(@Nonnull final VelocityEngine engine,
+ @Nonnull @NotEmpty final String template) {
return fromTemplate(engine, template, Charsets.US_ASCII);
}
@@ -120,8 +121,9 @@ public final class Template {
*
* @return an instance of this class that can be used to evaluate the given template using the given engine
*/
- @Nonnull public static Template fromTemplate(@Nonnull VelocityEngine engine, @Nonnull @NotEmpty String template,
- @Nonnull Charset encoding) {
+ @Nonnull public static Template fromTemplate(@Nonnull final VelocityEngine engine,
+ @Nonnull @NotEmpty final String template,
+ @Nonnull final Charset encoding) {
final String trimmedTemplate =
Constraint.isNotNull(StringSupport.trimOrNull(template), "Velocity template can not be null or empty");
Constraint.isNotNull(encoding, "Template encoding character set can not be null");
@@ -164,7 +166,8 @@ public final class Template {
*
* @return an instance of this class that can be used to evaluate the named template using the given engine
*/
- public static Template fromTemplateName(@Nonnull VelocityEngine engine, @Nonnull @NotEmpty String templateName) {
+ public static Template fromTemplateName(@Nonnull final VelocityEngine engine,
+ @Nonnull @NotEmpty final String templateName) {
return fromTemplateName(engine, templateName, Charsets.US_ASCII);
}
@@ -177,8 +180,8 @@ public final class Template {
*
* @return an instance of this class that can be used to evaluate the named template using the given engine
*/
- public static Template fromTemplateName(@Nonnull VelocityEngine engine, @Nonnull @NotEmpty String name,
- @Nonnull Charset encoding) {
+ public static Template fromTemplateName(@Nonnull final VelocityEngine engine, @Nonnull @NotEmpty final String name,
+ @Nonnull final Charset encoding) {
final String trimmedName =
Constraint.isNotNull(StringSupport.trimOrNull(name), "Velocity template name can not be null or empty");
Constraint.isNotNull(encoding, "Template encoding character set can not be null");
@@ -213,7 +216,7 @@ public final class Template {
*
* @return the generated output of the template
*/
- public String merge(Context templateContext) {
+ public String merge(final Context templateContext) {
StringWriter output = new StringWriter();
merge(templateContext, output);
return output.toString();
@@ -225,7 +228,7 @@ public final class Template {
* @param templateContext current template context
* @param output writer that will receive the template output
*/
- public void merge(Context templateContext, Writer output) {
+ public void merge(final Context templateContext, final Writer output) {
try {
engine.mergeTemplate(templateName, templateEncoding, templateContext, output);
} catch (ResourceNotFoundException e) {
@@ -237,7 +240,7 @@ public final class Template {
}
/** {@inheritDoc} */
- @Override public boolean equals(Object obj) {
+ @Override public boolean equals(final Object obj) {
if (obj == null) {
return false;
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/xml/AttributeSupport.java b/src/main/java/net/shibboleth/utilities/java/support/xml/AttributeSupport.java
index c402fa2..d811072 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/xml/AttributeSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/xml/AttributeSupport.java
@@ -163,7 +163,7 @@ public final class AttributeSupport {
* @param duration duration, in milliseconds, must be greater than 0
*/
public static void appendDateTimeAttribute(@Nonnull final Element element, @Nonnull final QName attributeName,
- long duration) {
+ final long duration) {
appendAttribute(element, attributeName, DOMTypeSupport.longToDateTime(duration));
}
@@ -175,7 +175,7 @@ public final class AttributeSupport {
* @param duration duration, in milliseconds, must be greater than 0
*/
public static void appendDurationAttribute(@Nonnull final Element element, @Nonnull final QName attributeName,
- long duration) {
+ final long duration) {
appendAttribute(element, attributeName, DOMTypeSupport.longToDuration(duration));
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/xml/ClasspathResolver.java b/src/main/java/net/shibboleth/utilities/java/support/xml/ClasspathResolver.java
index 2945ed9..80164fd 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/xml/ClasspathResolver.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/xml/ClasspathResolver.java
@@ -49,7 +49,7 @@ public class ClasspathResolver implements EntityResolver, LSResourceResolver {
/** {@inheritDoc} */
@Override
- public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException {
+ public InputSource resolveEntity(final String publicId, final String systemId) throws SAXException, IOException {
InputStream resourceStream = resolver(publicId, systemId);
if (resourceStream != null) {
InputSource is = new InputSource(resourceStream);
@@ -63,7 +63,8 @@ public class ClasspathResolver implements EntityResolver, LSResourceResolver {
/** {@inheritDoc} */
@Override
- public LSInput resolveResource(String type, String namespaceURI, String publicId, String systemId, String baseURI) {
+ public LSInput resolveResource(final String type, final String namespaceURI, final String publicId,
+ final String systemId, final String baseURI) {
return new LSInputImpl(publicId, systemId, resolver(publicId, systemId));
}
@@ -75,7 +76,7 @@ public class ClasspathResolver implements EntityResolver, LSResourceResolver {
*
* @return resolved resource or null
*/
- protected InputStream resolver(String publicId, String systemId) {
+ protected InputStream resolver(final String publicId, final String systemId) {
String resource = null;
InputStream resourceIns = null;
@@ -188,42 +189,42 @@ public class ClasspathResolver implements EntityResolver, LSResourceResolver {
/** {@inheritDoc} */
@Override
- public void setBaseURI(String uri) {
+ public void setBaseURI(final String uri) {
}
/** {@inheritDoc} */
@Override
- public void setByteStream(InputStream byteStream) {
+ public void setByteStream(final InputStream byteStream) {
}
/** {@inheritDoc} */
@Override
- public void setCertifiedText(boolean isCertifiedText) {
+ public void setCertifiedText(final boolean isCertifiedText) {
}
/** {@inheritDoc} */
@Override
- public void setCharacterStream(Reader characterStream) {
+ public void setCharacterStream(final Reader characterStream) {
}
/** {@inheritDoc} */
@Override
- public void setEncoding(String encoding) {
+ public void setEncoding(final String encoding) {
}
/** {@inheritDoc} */
@Override
- public void setPublicId(String id) {
+ public void setPublicId(final String id) {
}
/** {@inheritDoc} */
@Override
- public void setStringData(String stringData) {
+ public void setStringData(final String stringData) {
}
/** {@inheritDoc} */
@Override
- public void setSystemId(String id) {
+ public void setSystemId(final String id) {
}
}
}
\ No newline at end of file
diff --git a/src/main/java/net/shibboleth/utilities/java/support/xml/SchemaBuilder.java b/src/main/java/net/shibboleth/utilities/java/support/xml/SchemaBuilder.java
index e69f3c4..653d744 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/xml/SchemaBuilder.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/xml/SchemaBuilder.java
@@ -179,7 +179,7 @@ public class SchemaBuilder {
*
* @see SchemaFactory#setProperty(String, Object)
*/
- public void setProperty(@Nonnull @NotEmpty final String name, @Nullable Object object) {
+ public void setProperty(@Nonnull @NotEmpty final String name, @Nullable final Object object) {
properties.put(name, object);
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/xml/SerializeSupport.java b/src/main/java/net/shibboleth/utilities/java/support/xml/SerializeSupport.java
index e474b18..a5dcd9f 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/xml/SerializeSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/xml/SerializeSupport.java
@@ -160,7 +160,7 @@ public final class SerializeSupport {
serializer.setFilter(new LSSerializerFilter() {
- public short acceptNode(Node arg0) {
+ public short acceptNode(final Node arg0) {
return FILTER_ACCEPT;
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/xml/SimpleNamespaceContext.java b/src/main/java/net/shibboleth/utilities/java/support/xml/SimpleNamespaceContext.java
index 403df33..3d812c3 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/xml/SimpleNamespaceContext.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/xml/SimpleNamespaceContext.java
@@ -79,7 +79,7 @@ public class SimpleNamespaceContext implements NamespaceContext {
}
/** {@inheritDoc} */
- @Nullable public String getNamespaceURI(@Nonnull String prefix) {
+ @Nullable public String getNamespaceURI(@Nonnull final String prefix) {
if (prefix == null) {
throw new IllegalArgumentException("Prefix can not be null");
}
@@ -93,7 +93,7 @@ public class SimpleNamespaceContext implements NamespaceContext {
}
/** {@inheritDoc} */
- @Nullable public String getPrefix(@Nonnull String namespaceURI) {
+ @Nullable public String getPrefix(@Nonnull final String namespaceURI) {
if (namespaceURI == null) {
throw new IllegalArgumentException("Namespace URI can not be null");
}
@@ -102,7 +102,7 @@ public class SimpleNamespaceContext implements NamespaceContext {
}
/** {@inheritDoc} */
- @Nonnull public Iterator<String> getPrefixes(String namespaceURI) {
+ @Nonnull public Iterator<String> getPrefixes(final String namespaceURI) {
if (namespaceURI == null) {
throw new IllegalArgumentException("Namespace URI can not be null");
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list