[java-support] 08/10: JPAR-85 - Add missing final keyword to local variables.
Tom Zeller
tzeller at dragonacea.biz
Mon May 16 21:19:43 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 a177ec6ebb98698a6ca2868b6d298ec038559ffe
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Mon May 16 20:14:29 2016 -0500
JPAR-85 - Add missing final keyword to local variables.
---
.../collection/ClassToInstanceMultiMap.java | 4 ++--
.../support/collection/IndexingObjectStore.java | 24 +++++++++++-----------
.../java/support/collection/IterableSupport.java | 4 ++--
.../httpclient/FileCachingHttpClientBuilder.java | 12 +++++------
.../java/support/httpclient/HttpClientBuilder.java | 6 +++---
.../java/support/httpclient/HttpClientSupport.java | 4 ++--
.../InMemoryCachingHttpClientBuilder.java | 6 +++---
.../java/support/httpclient/TLSSocketFactory.java | 8 ++++----
.../httpclient/TLSSocketFactoryBuilder.java | 4 ++--
.../support/logic/TransformAndCheckFunction.java | 4 ++--
.../utilities/java/support/net/CookieManager.java | 4 ++--
.../java/support/net/HttpServletSupport.java | 6 +++---
.../utilities/java/support/net/IPRange.java | 24 +++++++++++-----------
.../java/support/net/SimpleURLCanonicalizer.java | 12 +++++------
.../utilities/java/support/net/URLBuilder.java | 18 ++++++++--------
.../java/support/primitive/StringSupport.java | 4 ++--
.../java/support/security/DataSealer.java | 10 ++++-----
.../RandomIdentifierGenerationStrategy.java | 2 +-
.../support/service/AbstractReloadableService.java | 2 +-
.../utilities/java/support/velocity/Template.java | 4 ++--
.../java/support/xml/AttributeSupport.java | 4 ++--
.../java/support/xml/BasicParserPool.java | 2 +-
.../java/support/xml/ClasspathResolver.java | 6 +++---
.../utilities/java/support/xml/DOMTypeSupport.java | 6 +++---
.../utilities/java/support/xml/ElementSupport.java | 8 ++++----
.../java/support/xml/NamespaceSupport.java | 4 ++--
.../utilities/java/support/xml/QNameSupport.java | 10 ++++-----
.../java/support/xml/SimpleNamespaceContext.java | 8 ++++----
28 files changed, 105 insertions(+), 105 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 93060c0..c528263 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
@@ -300,7 +300,7 @@ public class ClassToInstanceMultiMap<B> {
return;
}
- List<B> indexValues = backingMap.remove(type);
+ final List<B> indexValues = backingMap.remove(type);
if (indexValues != null) {
for (B value : indexValues) {
@@ -371,7 +371,7 @@ public class ClassToInstanceMultiMap<B> {
return false;
}
if (obj instanceof ClassToInstanceMultiMap<?>) {
- ClassToInstanceMultiMap<?> cast = (ClassToInstanceMultiMap<?>) obj;
+ final ClassToInstanceMultiMap<?> cast = (ClassToInstanceMultiMap<?>) obj;
return backingMap.equals(cast.backingMap) && values.equals(cast.values);
}
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 795cf62..4fc689a 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
@@ -76,7 +76,7 @@ public class IndexingObjectStore<T> {
/** Clears the object store. */
public void clear() {
- Lock writeLock = rwLock.writeLock();
+ final Lock writeLock = rwLock.writeLock();
writeLock.lock();
try {
objectStore.clear();
@@ -95,7 +95,7 @@ public class IndexingObjectStore<T> {
* @return true if an object is associated with the given index, false if not
*/
public boolean containsIndex(final String index) {
- Lock readLock = rwLock.readLock();
+ final Lock readLock = rwLock.readLock();
readLock.lock();
try {
return objectStore.containsKey(index);
@@ -112,10 +112,10 @@ public class IndexingObjectStore<T> {
* @return true if an object instance equal to the specified one is stored, false if not
*/
public boolean containsInstance(final T instance) {
- Lock readLock = rwLock.readLock();
+ final Lock readLock = rwLock.readLock();
readLock.lock();
try {
- Integer index = indexStore.get(instance);
+ final Integer index = indexStore.get(instance);
if (index == null) {
return false;
} else {
@@ -132,7 +132,7 @@ public class IndexingObjectStore<T> {
* @return true if the store is empty, false if not
*/
public boolean isEmpty() {
- Lock readLock = rwLock.readLock();
+ final Lock readLock = rwLock.readLock();
readLock.lock();
try {
return objectStore.isEmpty();
@@ -154,10 +154,10 @@ public class IndexingObjectStore<T> {
return null;
}
- Lock writeLock = rwLock.writeLock();
+ final Lock writeLock = rwLock.writeLock();
writeLock.lock();
try {
- String index = getIndex(object);
+ final String index = getIndex(object);
StoredObjectWrapper objectWrapper = objectStore.get(index);
if (objectWrapper == null) {
@@ -184,10 +184,10 @@ public class IndexingObjectStore<T> {
return null;
}
- Lock readLock = rwLock.readLock();
+ final Lock readLock = rwLock.readLock();
readLock.lock();
try {
- StoredObjectWrapper objectWrapper = objectStore.get(index);
+ final StoredObjectWrapper objectWrapper = objectStore.get(index);
if (objectWrapper != null) {
return objectWrapper.getObject();
}
@@ -210,10 +210,10 @@ public class IndexingObjectStore<T> {
return;
}
- Lock writeLock = rwLock.writeLock();
+ final Lock writeLock = rwLock.writeLock();
writeLock.lock();
try {
- StoredObjectWrapper objectWrapper = objectStore.get(index);
+ final StoredObjectWrapper objectWrapper = objectStore.get(index);
if (objectWrapper != null) {
objectWrapper.decremementReferenceCount();
if (objectWrapper.getReferenceCount() == 0) {
@@ -233,7 +233,7 @@ public class IndexingObjectStore<T> {
* @return number of items in the store
*/
public int size() {
- Lock readLock = rwLock.readLock();
+ final Lock readLock = rwLock.readLock();
readLock.lock();
try {
return objectStore.size();
diff --git a/src/main/java/net/shibboleth/utilities/java/support/collection/IterableSupport.java b/src/main/java/net/shibboleth/utilities/java/support/collection/IterableSupport.java
index 6884e08..1ad73a2 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/collection/IterableSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/collection/IterableSupport.java
@@ -44,8 +44,8 @@ public final class IterableSupport {
Constraint.isNotNull(target, "Target collection can not be null");
Constraint.isNotNull(clazz, "Class can not be null");
- Predicate<Object> instanceOf = Predicates.instanceOf(clazz);
- Optional<?> result = Iterables.tryFind(target, instanceOf);
+ final Predicate<Object> instanceOf = Predicates.instanceOf(clazz);
+ final Optional<?> result = Iterables.tryFind(target, instanceOf);
return result.isPresent();
}
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 86b8c1f..3f43e6b 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
@@ -142,7 +142,7 @@ public class FileCachingHttpClientBuilder extends HttpClientBuilder {
* @param directoryPath filesystem path to the directory
*/
public void setCacheDirectory(@Nonnull @NotEmpty final String directoryPath) {
- String trimmedPath =
+ final String trimmedPath =
Constraint.isNotNull(StringSupport.trimOrNull(directoryPath),
"Cache directory path can not be null or empty");
cacheDir = new File(trimmedPath);
@@ -231,14 +231,14 @@ public class FileCachingHttpClientBuilder extends HttpClientBuilder {
throw new IOException("Cache directory '" + cacheDir.getAbsolutePath() + "' is not writable");
}
- CachingHttpClientBuilder cachingBuilder = (CachingHttpClientBuilder) getApacheBuilder();
+ final CachingHttpClientBuilder cachingBuilder = (CachingHttpClientBuilder) getApacheBuilder();
- CacheConfig.Builder cacheConfigBuilder = CacheConfig.custom();
+ final CacheConfig.Builder cacheConfigBuilder = CacheConfig.custom();
cacheConfigBuilder.setMaxCacheEntries(maxCacheEntries);
cacheConfigBuilder.setMaxObjectSize(maxCacheEntrySize);
cacheConfigBuilder.setHeuristicCachingEnabled(false);
cacheConfigBuilder.setSharedCache(false);
- CacheConfig cacheConfig = cacheConfigBuilder.build();
+ final CacheConfig cacheConfig = cacheConfigBuilder.build();
cachingBuilder.setCacheConfig(cacheConfig);
cachingBuilder.setResourceFactory(new FileResourceFactory(cacheDir));
@@ -250,8 +250,8 @@ public class FileCachingHttpClientBuilder extends HttpClientBuilder {
/** {@inheritDoc} */
public synchronized HttpClient buildClient() throws Exception {
- CloseableHttpClient client = (CloseableHttpClient) super.buildClient();
- ManagedHttpCacheStorage tempStorage = managedStorage;
+ final CloseableHttpClient client = (CloseableHttpClient) super.buildClient();
+ final ManagedHttpCacheStorage tempStorage = managedStorage;
// Null this out so we don't keep a reference, inhibiting garbage collection.
managedStorage = null;
return new StorageManagingHttpClient(client, tempStorage, getMaintentanceTaskInterval());
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 5d35999..3e62ea2 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
@@ -838,7 +838,7 @@ public class HttpClientBuilder {
*/
// Checkstyle: CyclomaticComplexity|MethodLength OFF
protected void decorateApacheBuilder() throws Exception {
- org.apache.http.impl.client.HttpClientBuilder builder = getApacheBuilder();
+ final org.apache.http.impl.client.HttpClientBuilder builder = getApacheBuilder();
if (getTLSSocketFactory() != null) {
builder.setSSLSocketFactory(getTLSSocketFactory());
@@ -924,7 +924,7 @@ public class HttpClientBuilder {
// RequestConfig params
- RequestConfig.Builder requestConfigBuilder = RequestConfig.custom();
+ final RequestConfig.Builder requestConfigBuilder = RequestConfig.custom();
if (socketLocalAddress != null) {
requestConfigBuilder.setLocalAddress(socketLocalAddress);
@@ -955,7 +955,7 @@ public class HttpClientBuilder {
}
// ConnectionConfig params
- ConnectionConfig.Builder connectionConfigBuilder = ConnectionConfig.custom();
+ final ConnectionConfig.Builder connectionConfigBuilder = ConnectionConfig.custom();
connectionConfigBuilder.setBufferSize(socketBufferSize);
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 801a53f..f734261 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
@@ -93,10 +93,10 @@ public final class HttpClientSupport {
*/
@Deprecated
public static SSLConnectionSocketFactory buildNoTrustSSLConnectionSocketFactory() {
- X509TrustManager noTrustManager = buildNoTrustX509TrustManager();
+ final X509TrustManager noTrustManager = buildNoTrustX509TrustManager();
try {
- SSLContext sslcontext = SSLContext.getInstance("TLS");
+ final SSLContext sslcontext = SSLContext.getInstance("TLS");
sslcontext.init(null, new TrustManager[] {noTrustManager}, null);
return new SSLConnectionSocketFactory(sslcontext, SSLConnectionSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
} catch (final NoSuchAlgorithmException e) {
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 6a138d6..83af6b6 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
@@ -133,14 +133,14 @@ public class InMemoryCachingHttpClientBuilder extends HttpClientBuilder {
super.decorateApacheBuilder();
// Note: This cast is safe because of constructor enforcement.
- CachingHttpClientBuilder cachingBuilder = (CachingHttpClientBuilder) getApacheBuilder();
+ final CachingHttpClientBuilder cachingBuilder = (CachingHttpClientBuilder) getApacheBuilder();
- CacheConfig.Builder cacheConfigBuilder = CacheConfig.custom();
+ final CacheConfig.Builder cacheConfigBuilder = CacheConfig.custom();
cacheConfigBuilder.setMaxCacheEntries(maxCacheEntries);
cacheConfigBuilder.setMaxObjectSize(maxCacheEntrySize);
cacheConfigBuilder.setHeuristicCachingEnabled(false);
cacheConfigBuilder.setSharedCache(false);
- CacheConfig cacheConfig = cacheConfigBuilder.build();
+ final CacheConfig cacheConfig = cacheConfigBuilder.build();
cachingBuilder.setCacheConfig(cacheConfig);
cachingBuilder.setResourceFactory(new HeapResourceFactory());
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 9ddc9fe..b48f84f 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
@@ -296,7 +296,7 @@ public class TLSSocketFactory implements LayeredConnectionSocketFactory {
port,
true);
- String[] contextProtocols = getListAttribute(context, CONTEXT_KEY_TLS_PROTOCOLS);
+ final String[] contextProtocols = getListAttribute(context, CONTEXT_KEY_TLS_PROTOCOLS);
if (contextProtocols != null) {
sslsock.setEnabledProtocols(contextProtocols);
} else if (getSupportedProtocols() != null) {
@@ -313,7 +313,7 @@ public class TLSSocketFactory implements LayeredConnectionSocketFactory {
sslsock.setEnabledProtocols(enabledProtocols.toArray(new String[enabledProtocols.size()]));
}
- String[] contextCipherSuites = getListAttribute(context, CONTEXT_KEY_TLS_CIPHER_SUITES);
+ final String[] contextCipherSuites = getListAttribute(context, CONTEXT_KEY_TLS_CIPHER_SUITES);
if (contextCipherSuites != null) {
sslsock.setEnabledCipherSuites(contextCipherSuites);
} else if (getSupportedCipherSuites() != null) {
@@ -333,7 +333,7 @@ public class TLSSocketFactory implements LayeredConnectionSocketFactory {
* @param socket the SSLSocket instance
*/
private void logSocketInfo(final SSLSocket socket) {
- SSLSession session = socket.getSession();
+ final SSLSession session = socket.getSession();
if (log.isDebugEnabled()) {
log.debug("Connected to: {}", socket.getRemoteSocketAddress());
@@ -371,7 +371,7 @@ public class TLSSocketFactory implements LayeredConnectionSocketFactory {
if (context == null) {
return null;
}
- List<String> values = new ArrayList<>(StringSupport.normalizeStringCollection(
+ final List<String> values = new ArrayList<>(StringSupport.normalizeStringCollection(
(List<String>) context.getAttribute(contextKey)));
if (values != null && !values.isEmpty()) {
return values.toArray(new String[values.size()]);
diff --git a/src/main/java/net/shibboleth/utilities/java/support/httpclient/TLSSocketFactoryBuilder.java b/src/main/java/net/shibboleth/utilities/java/support/httpclient/TLSSocketFactoryBuilder.java
index ba82c84..a6727f0 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/httpclient/TLSSocketFactoryBuilder.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/httpclient/TLSSocketFactoryBuilder.java
@@ -292,7 +292,7 @@ public class TLSSocketFactoryBuilder {
verifier = DEFAULT_HOSTNAME_VERIFIER;
}
- SSLContext sslcontext = buildSSLContext();
+ final SSLContext sslcontext = buildSSLContext();
return new TLSSocketFactory(sslcontext,
enabledProtocols != null ? enabledProtocols.toArray(new String[0]) : null,
enabledCipherSuites != null ? enabledCipherSuites.toArray(new String[0]) : null,
@@ -311,7 +311,7 @@ public class TLSSocketFactoryBuilder {
}
try {
- SSLContext sslcontext;
+ final SSLContext sslcontext;
if (sslContextProvider != null) {
sslcontext = SSLContext.getInstance(protocol, sslContextProvider);
} else {
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 c4f4817..04e04ff 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
@@ -63,9 +63,9 @@ public class TransformAndCheckFunction<T> implements Function<T, Optional<? exte
/** {@inheritDoc} */
public Optional<? extends T> apply(final T input) {
- T processedValue = preprocessor.apply(input);
+ final T processedValue = preprocessor.apply(input);
- boolean meetsCriteria = constraint.apply(processedValue);
+ final boolean meetsCriteria = constraint.apply(processedValue);
if (meetsCriteria) {
return Optional.of(processedValue);
diff --git a/src/main/java/net/shibboleth/utilities/java/support/net/CookieManager.java b/src/main/java/net/shibboleth/utilities/java/support/net/CookieManager.java
index a23c7fd..59a7eae 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/net/CookieManager.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/net/CookieManager.java
@@ -158,7 +158,7 @@ public final class CookieManager extends AbstractInitializableComponent {
* @param value value of cookie
*/
@Nullable public void addCookie(@Nonnull @NotEmpty final String name, @Nonnull @NotEmpty final String value) {
- Cookie cookie = new Cookie(name, value);
+ final Cookie cookie = new Cookie(name, value);
cookie.setPath(cookiePath != null ? cookiePath : contextPathToCookiePath());
if (cookieDomain != null) {
cookie.setDomain(cookieDomain);
@@ -176,7 +176,7 @@ public final class CookieManager extends AbstractInitializableComponent {
* @param name name of cookie
*/
@Nullable public void unsetCookie(@Nonnull @NotEmpty final String name) {
- Cookie cookie = new Cookie(name, null);
+ final Cookie cookie = new Cookie(name, null);
cookie.setPath(cookiePath != null ? cookiePath : contextPathToCookiePath());
if (cookieDomain != null) {
cookie.setDomain(cookieDomain);
diff --git a/src/main/java/net/shibboleth/utilities/java/support/net/HttpServletSupport.java b/src/main/java/net/shibboleth/utilities/java/support/net/HttpServletSupport.java
index c57bc15..284c7d9 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/net/HttpServletSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/net/HttpServletSupport.java
@@ -72,7 +72,7 @@ public final class HttpServletSupport {
* @return constructed URI
*/
public static String getRequestPathWithoutContext(final HttpServletRequest request) {
- String servletPath = request.getServletPath();
+ final String servletPath = request.getServletPath();
if (request.getPathInfo() == null) {
return servletPath;
@@ -90,9 +90,9 @@ public final class HttpServletSupport {
* @return URL that was requested to generate this request
*/
public static URI getFullRequestURI(final HttpServletRequest request) {
- StringBuffer requestUrl = request.getRequestURL();
+ final StringBuffer requestUrl = request.getRequestURL();
- String encodedQuery = StringSupport.trimOrNull(request.getQueryString());
+ final String encodedQuery = StringSupport.trimOrNull(request.getQueryString());
if (encodedQuery != null) {
requestUrl.append("?").append(encodedQuery);
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/net/IPRange.java b/src/main/java/net/shibboleth/utilities/java/support/net/IPRange.java
index 0849507..b496b0d 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/net/IPRange.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/net/IPRange.java
@@ -69,7 +69,7 @@ public class IPRange {
mask = new BitSet(addressLength);
mask.set(addressLength - maskSize, addressLength, true);
- BitSet hostAddress = toBitSet(address);
+ final BitSet hostAddress = toBitSet(address);
network = (BitSet)hostAddress.clone();
network.and(mask);
@@ -109,12 +109,12 @@ public class IPRange {
* @param address the address to validate
*/
private static void validateV4Address(final String address) {
- String[] components = address.split("\\.");
+ final String[] components = address.split("\\.");
if (components.length != 4) {
throw new IllegalArgumentException("IPv4 address should have four components");
}
for (String component : components) {
- int value = Integer.parseInt(component, 10);
+ final int value = Integer.parseInt(component, 10);
if (value < 0 || (value > 255)) {
throw new IllegalArgumentException("IPv4 component range error: " + component);
}
@@ -132,10 +132,10 @@ public class IPRange {
* @param address the address to validate
*/
private static void validateV6Address(final String address) {
- String[] components = address.split(":");
+ final String[] components = address.split(":");
for (String component : components) {
if (component.length() != 0) {
- int value = Integer.parseInt(component, 16);
+ final int value = Integer.parseInt(component, 16);
if (value < 0 || (value > 0xFFFF)) {
throw new IllegalArgumentException("IPv6 component range error: " + component);
}
@@ -167,19 +167,19 @@ public class IPRange {
* @return the resultant IP range
*/
public static IPRange parseCIDRBlock(final String cidrBlock) {
- String block = StringSupport.trimOrNull(cidrBlock);
+ final String block = StringSupport.trimOrNull(cidrBlock);
if (block == null) {
throw new IllegalArgumentException("CIDR block definition can not be null or empty");
}
- String[] blockParts = block.split("/");
+ final String[] blockParts = block.split("/");
if (blockParts.length != 2) {
throw new IllegalArgumentException("CIDR block definition is invalid, check for missing or extra slash");
}
try {
validateIPAddress(blockParts[0]);
- InetAddress address = InetAddress.getByName(blockParts[0]);
- int maskSize = Integer.parseInt(blockParts[1]);
+ final InetAddress address = InetAddress.getByName(blockParts[0]);
+ final int maskSize = Integer.parseInt(blockParts[1]);
return new IPRange(address, maskSize);
} catch (final UnknownHostException e) {
throw new IllegalArgumentException("Invalid IP address");
@@ -211,7 +211,7 @@ public class IPRange {
return false;
}
- BitSet addrNetwork = toBitSet(address);
+ final BitSet addrNetwork = toBitSet(address);
addrNetwork.and(mask);
return addrNetwork.equals(network);
@@ -227,7 +227,7 @@ public class IPRange {
* @return the BitSet
*/
protected BitSet toBitSet(final byte[] bytes) {
- BitSet bits = new BitSet(bytes.length * 8);
+ final BitSet bits = new BitSet(bytes.length * 8);
for (int i = 0; i < bytes.length * 8; i++) {
if ((bytes[bytes.length - i / 8 - 1] & (1 << (i % 8))) > 0) {
@@ -247,7 +247,7 @@ public class IPRange {
* @return array of bytes representing the same address
*/
private byte[] toByteArray(final BitSet bits) {
- byte[] bytes = new byte[addressLength / 8];
+ final byte[] bytes = new byte[addressLength / 8];
for (int i = 0; i < addressLength; i++) {
if (bits.get(i)) {
bytes[bytes.length - i / 8 - 1] |= 1 << (i % 8);
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 b15e2e0..eef6bb7 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
@@ -59,7 +59,7 @@ public final class SimpleURLCanonicalizer {
* @param port the default port for that scheme
*/
public static void registerSchemePortMapping(@Nonnull @NotEmpty final String scheme, @Nonnull final Integer port) {
- String trimmedScheme = Constraint.isNotNull(StringSupport.trimOrNull(scheme), "Scheme cannot be null");
+ final String trimmedScheme = Constraint.isNotNull(StringSupport.trimOrNull(scheme), "Scheme cannot be null");
Constraint.isNotNull(port, "Port cannot be null");
schemePortMap.put(trimmedScheme.toLowerCase(), port);
@@ -71,7 +71,7 @@ public final class SimpleURLCanonicalizer {
* @param scheme the scheme to deregister
*/
public static void deregisterSchemePortMapping(@Nonnull final String scheme) {
- String trimmedScheme = Constraint.isNotNull(StringSupport.trimOrNull(scheme), "Scheme cannot be null");
+ final String trimmedScheme = Constraint.isNotNull(StringSupport.trimOrNull(scheme), "Scheme cannot be null");
schemePortMap.remove(trimmedScheme.toLowerCase());
}
@@ -83,7 +83,7 @@ public final class SimpleURLCanonicalizer {
* @return the default port registered for the scheme, or null if none registered
*/
@Nullable public static Integer getRegisteredPort(@Nonnull @NotEmpty final String scheme) {
- String trimmedScheme = Constraint.isNotNull(StringSupport.trimOrNull(scheme), "Scheme cannot be null");
+ final String trimmedScheme = Constraint.isNotNull(StringSupport.trimOrNull(scheme), "Scheme cannot be null");
return schemePortMap.get(trimmedScheme.toLowerCase());
}
@@ -98,7 +98,7 @@ public final class SimpleURLCanonicalizer {
@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);
+ final URLBuilder urlBuilder = new URLBuilder(url);
canonicalize(urlBuilder);
return urlBuilder.buildURL();
}
@@ -112,8 +112,8 @@ public final class SimpleURLCanonicalizer {
if (url.getScheme() != null) {
url.setScheme(url.getScheme().toLowerCase());
- String scheme = url.getScheme();
- Integer port = getRegisteredPort(scheme);
+ final String scheme = url.getScheme();
+ final Integer port = getRegisteredPort(scheme);
if (port != null && port.equals(url.getPort())) {
url.setPort(null);
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/net/URLBuilder.java b/src/main/java/net/shibboleth/utilities/java/support/net/URLBuilder.java
index 901318e..aea5c48 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/net/URLBuilder.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/net/URLBuilder.java
@@ -79,14 +79,14 @@ public class URLBuilder {
*
*/
public URLBuilder(@Nonnull @NotEmpty final String baseURL) throws MalformedURLException {
- URL url = new URL(baseURL);
+ final URL url = new URL(baseURL);
setScheme(url.getProtocol());
- String userInfo = url.getUserInfo();
+ final String userInfo = url.getUserInfo();
if (!Strings.isNullOrEmpty(userInfo)) {
if (userInfo.contains(":")) {
- String[] userInfoComps = userInfo.split(":");
+ final String[] userInfoComps = userInfo.split(":");
setUsername(URISupport.doURLDecode(userInfoComps[0]));
setPassword(URISupport.doURLDecode(userInfoComps[1]));
} else {
@@ -101,9 +101,9 @@ public class URLBuilder {
setPath(url.getPath());
queryParams = new ArrayList<>();
- String queryString = url.getQuery();
+ final String queryString = url.getQuery();
if (!Strings.isNullOrEmpty(queryString)) {
- String[] queryComps = queryString.split("&");
+ final String[] queryComps = queryString.split("&");
String queryComp;
String[] paramComps;
String paramName;
@@ -261,7 +261,7 @@ public class URLBuilder {
}
/**
- * Builds a URL from the given data. The constructured URL may not be valid if sufficient information is not
+ * Builds a URL from the given data. The constructed URL may not be valid if sufficient information is not
* provided. The returned URL will be appropriately encoded using application/x-www-form-urlencoded with appropriate
* encoding of UTF-8 characters.
*
@@ -269,7 +269,7 @@ public class URLBuilder {
*/
// Checkstyle: CyclomaticComplexity OFF
@Nullable public String buildURL() {
- StringBuilder builder = new StringBuilder();
+ final StringBuilder builder = new StringBuilder();
if (!Strings.isNullOrEmpty(scheme)) {
builder.append(scheme);
@@ -301,7 +301,7 @@ public class URLBuilder {
builder.append(path);
}
- String queryString = buildQueryString();
+ final String queryString = buildQueryString();
if (!Strings.isNullOrEmpty(queryString)) {
builder.append("?");
builder.append(queryString);
@@ -326,7 +326,7 @@ public class URLBuilder {
String name;
String value;
- StringBuilder builder = new StringBuilder();
+ final StringBuilder builder = new StringBuilder();
Pair<String, String> param;
for (int i = 0; i < queryParams.size(); i++) {
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 e056ff3..3195089 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
@@ -66,9 +66,9 @@ public final class StringSupport {
charsetDecoder = Charset.defaultCharset().newDecoder();
}
- BufferedReader reader = new BufferedReader(new InputStreamReader(input, charsetDecoder));
+ final BufferedReader reader = new BufferedReader(new InputStreamReader(input, charsetDecoder));
- StringBuilder stringBuffer = new StringBuilder();
+ final StringBuilder stringBuffer = new StringBuilder();
String line = reader.readLine();
while (line != null) {
stringBuffer.append(line).append("\n");
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 ecbf6f3..89ff125 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
@@ -209,9 +209,9 @@ public class DataSealer extends AbstractInitializableComponent {
throws DataSealerException {
try {
- ByteArrayInputStream byteStream = new ByteArrayInputStream(decryptedBytes);
- GZIPInputStream compressedData = new GZIPInputStream(byteStream);
- DataInputStream dataInputStream = new DataInputStream(compressedData);
+ final ByteArrayInputStream byteStream = new ByteArrayInputStream(decryptedBytes);
+ final GZIPInputStream compressedData = new GZIPInputStream(byteStream);
+ final DataInputStream dataInputStream = new DataInputStream(compressedData);
final long decodedExpirationTime = dataInputStream.readLong();
if (System.currentTimeMillis() > decodedExpirationTime) {
@@ -283,7 +283,7 @@ public class DataSealer extends AbstractInitializableComponent {
int count = 0;
int start = 0;
- int dataLength = data.length();
+ final int dataLength = data.length();
while (start < dataLength) {
dataStream.writeUTF(data.substring(start, start + Math.min(dataLength - start, CHUNK_SIZE)));
start += Math.min(dataLength - start, CHUNK_SIZE);
@@ -327,7 +327,7 @@ public class DataSealer extends AbstractInitializableComponent {
*/
private void testEncryption(@Nonnull final SecretKey key) throws DataSealerException {
- String decrypted;
+ final String decrypted;
try {
final GCMBlockCipher cipher = new GCMBlockCipher(new AESEngine());
final byte[] iv = new byte[cipher.getUnderlyingCipher().getBlockSize()];
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 0dc46c6..19a7600 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
@@ -100,7 +100,7 @@ public class RandomIdentifierGenerationStrategy implements IdentifierGenerationS
/** {@inheritDoc} */
public String generateIdentifier(final boolean xmlSafe) {
- byte[] buf = new byte[sizeOfIdentifier];
+ final byte[] buf = new byte[sizeOfIdentifier];
random.nextBytes(buf);
try {
if (xmlSafe) {
diff --git a/src/main/java/net/shibboleth/utilities/java/support/service/AbstractReloadableService.java b/src/main/java/net/shibboleth/utilities/java/support/service/AbstractReloadableService.java
index 9ea5933..bed62d4 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/service/AbstractReloadableService.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/service/AbstractReloadableService.java
@@ -267,7 +267,7 @@ public abstract class AbstractReloadableService<T> extends AbstractIdentifiableI
// local cache of cached entry to allow unsynchronized clearing of per class cache.
String prefix = logPrefix;
if (null == prefix) {
- StringBuilder builder = new StringBuilder("Service '").append(getId()).append("':");
+ final StringBuilder builder = new StringBuilder("Service '").append(getId()).append("':");
prefix = builder.toString();
if (null == logPrefix) {
logPrefix = prefix;
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 285bd9e..df05b46 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
@@ -217,7 +217,7 @@ public final class Template {
* @return the generated output of the template
*/
public String merge(final Context templateContext) {
- StringWriter output = new StringWriter();
+ final StringWriter output = new StringWriter();
merge(templateContext, output);
return output.toString();
}
@@ -253,7 +253,7 @@ public final class Template {
return false;
}
- Template otherTemplate = (Template) obj;
+ final Template otherTemplate = (Template) obj;
return engine.equals(otherTemplate.engine) && templateName.equals(otherTemplate.templateName);
}
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 eecdf5a..ca3f82c 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
@@ -211,7 +211,7 @@ public final class AttributeSupport {
final String trimmedLocalName =
Constraint.isNotNull(StringSupport.trimOrNull(localName), "Attribute local name may not be null or empty");
- String qualifiedName;
+ final String qualifiedName;
final String trimmedPrefix = StringSupport.trimOrNull(prefix);
if (trimmedPrefix != null) {
qualifiedName = trimmedPrefix + ":" + StringSupport.trimOrNull(trimmedLocalName);
@@ -468,7 +468,7 @@ public final class AttributeSupport {
if (null == element) {
return null;
}
- String value = getAttributeValue(element, XMLConstants.XML_SPACE_ATTRIB_NAME);
+ final String value = getAttributeValue(element, XMLConstants.XML_SPACE_ATTRIB_NAME);
if (null == value) {
return null;
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/xml/BasicParserPool.java b/src/main/java/net/shibboleth/utilities/java/support/xml/BasicParserPool.java
index 068b0cf..17ae370 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/xml/BasicParserPool.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/xml/BasicParserPool.java
@@ -665,7 +665,7 @@ public class BasicParserPool extends AbstractInitializableComponent implements P
* @return the default features map
*/
protected Map<String, Boolean> buildDefaultFeatures() {
- HashMap<String, Boolean> features = new HashMap<>();
+ final HashMap<String, Boolean> features = new HashMap<>();
features.put(XMLConstants.FEATURE_SECURE_PROCESSING, true);
features.put("http://apache.org/xml/features/disallow-doctype-decl", true);
return features;
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 9aac901..8568f45 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
@@ -50,9 +50,9 @@ public class ClasspathResolver implements EntityResolver, LSResourceResolver {
/** {@inheritDoc} */
@Override
public InputSource resolveEntity(final String publicId, final String systemId) throws SAXException, IOException {
- InputStream resourceStream = resolver(publicId, systemId);
+ final InputStream resourceStream = resolver(publicId, systemId);
if (resourceStream != null) {
- InputSource is = new InputSource(resourceStream);
+ final InputSource is = new InputSource(resourceStream);
is.setSystemId(systemId);
is.setPublicId(publicId);
return is;
@@ -172,7 +172,7 @@ public class ClasspathResolver implements EntityResolver, LSResourceResolver {
synchronized (buffInput) {
try {
buffInput.reset();
- byte[] input = new byte[buffInput.available()];
+ final byte[] input = new byte[buffInput.available()];
buffInput.read(input);
return new String(input);
} catch (final IOException e) {
diff --git a/src/main/java/net/shibboleth/utilities/java/support/xml/DOMTypeSupport.java b/src/main/java/net/shibboleth/utilities/java/support/xml/DOMTypeSupport.java
index dc1566b..9c815f3 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/xml/DOMTypeSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/xml/DOMTypeSupport.java
@@ -56,10 +56,10 @@ public final class DOMTypeSupport {
* @return the date/time expressed as milliseconds since the epoch
*/
public static long dateTimeToLong(@Nonnull final String dateTime) {
- String trimmedString =
+ final String trimmedString =
Constraint.isNotNull(StringSupport.trimOrNull(dateTime), "Lexical dateTime may not be null or empty");
- XMLGregorianCalendar calendar = dataTypeFactory.newXMLGregorianCalendar(trimmedString);
+ final XMLGregorianCalendar calendar = dataTypeFactory.newXMLGregorianCalendar(trimmedString);
return calendar.toGregorianCalendar().getTimeInMillis();
}
@@ -136,7 +136,7 @@ public final class DOMTypeSupport {
* @return the lexical representation of the date/time
*/
@Nonnull public static String longToDateTime(final long dateTime) {
- GregorianCalendar calendar = new GregorianCalendar();
+ final GregorianCalendar calendar = new GregorianCalendar();
calendar.setTimeZone(TimeZone.getTimeZone("UTC"));
calendar.setTimeInMillis(dateTime);
diff --git a/src/main/java/net/shibboleth/utilities/java/support/xml/ElementSupport.java b/src/main/java/net/shibboleth/utilities/java/support/xml/ElementSupport.java
index 263b17f..091f5ca 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/xml/ElementSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/xml/ElementSupport.java
@@ -129,7 +129,7 @@ public final class ElementSupport {
Constraint
.isNotNull(StringSupport.trimOrNull(localName), "Element local name may not be null or empty");
- String qualifiedName;
+ final String qualifiedName;
final String trimmedPrefix = StringSupport.trimOrNull(prefix);
if (trimmedPrefix != null) {
qualifiedName = trimmedPrefix + ":" + StringSupport.trimOrNull(trimmedLocalName);
@@ -289,7 +289,7 @@ public final class ElementSupport {
if (element == null) {
return "";
}
- StringBuilder builder = new StringBuilder();
+ final StringBuilder builder = new StringBuilder();
Node node = element.getFirstChild();
boolean first = true;
@@ -333,7 +333,7 @@ public final class ElementSupport {
if (element == null) {
return null;
}
- String elementContent = StringSupport.trimOrNull(getElementContentAsString(element));
+ final String elementContent = StringSupport.trimOrNull(getElementContentAsString(element));
if (elementContent == null) {
return null;
@@ -390,7 +390,7 @@ public final class ElementSupport {
Element e = getFirstChildElement(root);
while (e != null) {
- QName qname = QNameSupport.getNodeQName(e);
+ final QName qname = QNameSupport.getNodeQName(e);
List<Element> elements = children.get(qname);
if (elements == null) {
elements = new ArrayList<>();
diff --git a/src/main/java/net/shibboleth/utilities/java/support/xml/NamespaceSupport.java b/src/main/java/net/shibboleth/utilities/java/support/xml/NamespaceSupport.java
index cc10b4f..56a3d18 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/xml/NamespaceSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/xml/NamespaceSupport.java
@@ -53,7 +53,7 @@ public final class NamespaceSupport {
Constraint.isNotNull(nsURI, "namespace may not be null or empty");
- String attributeName;
+ final String attributeName;
if (nsPrefix == null) {
if (null == element.getPrefix()) {
@@ -252,7 +252,7 @@ public final class NamespaceSupport {
}
// Make sure all the attribute URIs are rooted here or have been rooted in an ancestor
- NamedNodeMap attributes = domElement.getAttributes();
+ final NamedNodeMap attributes = domElement.getAttributes();
Node attributeNode;
for (int i = 0; i < attributes.getLength(); i++) {
namespacePrefix = null;
diff --git a/src/main/java/net/shibboleth/utilities/java/support/xml/QNameSupport.java b/src/main/java/net/shibboleth/utilities/java/support/xml/QNameSupport.java
index 55928c7..b553fae 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/xml/QNameSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/xml/QNameSupport.java
@@ -48,10 +48,10 @@ public final class QNameSupport {
@Nonnull public static QName constructQName(@Nonnull final Element owningElement,
@Nonnull @NotEmpty final String qname) {
Constraint.isNotNull(owningElement, "Owning element cannot be null");
- String trimmedName = Constraint.isNotNull(StringSupport.trimOrNull(qname), "QName cannot be null");
+ final String trimmedName = Constraint.isNotNull(StringSupport.trimOrNull(qname), "QName cannot be null");
- String nsPrefix;
- String name;
+ final String nsPrefix;
+ final String name;
if (trimmedName.indexOf(":") > -1) {
final StringTokenizer qnameTokens = new StringTokenizer(trimmedName, ":");
nsPrefix = StringSupport.trim(qnameTokens.nextToken());
@@ -76,9 +76,9 @@ public final class QNameSupport {
*/
@Nonnull public static QName constructQName(@Nullable final String namespaceURI,
@Nonnull @NotEmpty final String localName, @Nullable final String prefix) {
- String trimmedLocalName =
+ final String trimmedLocalName =
Constraint.isNotNull(StringSupport.trimOrNull(localName), "Local name cannot be null or empty");
- String trimmedPrefix = StringSupport.trimOrNull(prefix);
+ final String trimmedPrefix = StringSupport.trimOrNull(prefix);
if (trimmedPrefix == null) {
return new QName(StringSupport.trimOrNull(namespaceURI), trimmedLocalName);
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 3d812c3..7cf7cd3 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
@@ -54,7 +54,7 @@ public class SimpleNamespaceContext implements NamespaceContext {
* @param prefixToUriMappings Maps prefix values to the corresponding namespace URIs.
*/
public SimpleNamespaceContext(@Nullable @NullableElements final Map<String, String> prefixToUriMappings) {
- Builder mappingBuilder = getMappingsBuilder();
+ final Builder mappingBuilder = getMappingsBuilder();
if (prefixToUriMappings == null || prefixToUriMappings.isEmpty()) {
mappings = mappingBuilder.build();
@@ -84,7 +84,7 @@ public class SimpleNamespaceContext implements NamespaceContext {
throw new IllegalArgumentException("Prefix can not be null");
}
- String uri = mappings.get(prefix);
+ final String uri = mappings.get(prefix);
if (uri == null) {
return javax.xml.XMLConstants.NULL_NS_URI;
} else {
@@ -107,7 +107,7 @@ public class SimpleNamespaceContext implements NamespaceContext {
throw new IllegalArgumentException("Namespace URI can not be null");
}
- String prefix = mappings.inverse().get(namespaceURI);
+ final String prefix = mappings.inverse().get(namespaceURI);
if (prefix == null) {
return Collections.<String> emptyList().iterator();
} else {
@@ -121,7 +121,7 @@ public class SimpleNamespaceContext implements NamespaceContext {
* @return initial set of mappings
*/
@Nonnull private Builder<String, String> getMappingsBuilder(){
- Builder mappingBuilder = new Builder<String, String>();
+ final Builder mappingBuilder = new Builder<String, String>();
mappingBuilder.put(XMLConstants.XML_PREFIX, XMLConstants.XML_NS);
mappingBuilder.put(XMLConstants.XMLNS_PREFIX, XMLConstants.XMLNS_NS);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list