[java-support] 10/10: JPAR-85 - Add missing final keyword to for loops.
Tom Zeller
tzeller at dragonacea.biz
Mon May 16 21:19:45 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 e6581a378b08ff62a0df141905e5f234b9b9d83b
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Mon May 16 20:17:17 2016 -0500
JPAR-85 - Add missing final keyword to for loops.
---
.../shibboleth/utilities/java/support/codec/HTMLEncoder.java | 2 +-
.../java/support/collection/ClassToInstanceMultiMap.java | 12 ++++++------
.../utilities/java/support/collection/CollectionSupport.java | 4 ++--
.../java/support/collection/ValueTypeIndexedMap.java | 10 +++++-----
.../utilities/java/support/httpclient/HttpClientBuilder.java | 8 ++++----
.../utilities/java/support/httpclient/TLSSocketFactory.java | 2 +-
.../utilities/java/support/logic/AllMatchPredicate.java | 2 +-
.../utilities/java/support/logic/AnyMatchPredicate.java | 2 +-
.../utilities/java/support/net/CookieBufferingFilter.java | 2 +-
.../net/shibboleth/utilities/java/support/net/IPRange.java | 4 ++--
.../shibboleth/utilities/java/support/net/URISupport.java | 4 ++--
.../utilities/java/support/primitive/ObjectSupport.java | 2 +-
.../utilities/java/support/resolver/CriteriaSet.java | 2 +-
.../utilities/java/support/xml/BasicParserPool.java | 4 ++--
.../utilities/java/support/xml/SerializeSupport.java | 2 +-
.../utilities/java/support/xml/SimpleNamespaceContext.java | 2 +-
16 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/src/main/java/net/shibboleth/utilities/java/support/codec/HTMLEncoder.java b/src/main/java/net/shibboleth/utilities/java/support/codec/HTMLEncoder.java
index 9368bfc..17ad6d9 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/codec/HTMLEncoder.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/codec/HTMLEncoder.java
@@ -201,7 +201,7 @@ public final class HTMLEncoder {
* @return whether or not the array contains the char
*/
private static boolean containsCharacter(@Nonnull final char c, @Nonnull final char[] array) {
- for (char ch : array) {
+ for (final char ch : array) {
if (c == ch) {
return true;
}
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 c528263..4427aa9 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
@@ -165,7 +165,7 @@ public class ClassToInstanceMultiMap<B> {
}
List<B> indexValues;
- for (Class<?> indexKey : getIndexTypes(value)) {
+ for (final Class<?> indexKey : getIndexTypes(value)) {
indexValues = backingMap.get(indexKey);
if (indexValues == null) {
@@ -191,7 +191,7 @@ public class ClassToInstanceMultiMap<B> {
return;
}
- for (B value : newValues) {
+ for (final B value : newValues) {
put(value);
}
}
@@ -231,7 +231,7 @@ public class ClassToInstanceMultiMap<B> {
values.remove(value);
List<B> indexValues;
- for (Class<?> indexKey : getIndexTypes(value)) {
+ for (final Class<?> indexKey : getIndexTypes(value)) {
indexValues = backingMap.get(indexKey);
if (indexValues != null) {
indexValues.remove(value);
@@ -257,7 +257,7 @@ public class ClassToInstanceMultiMap<B> {
return;
}
- for (B value : removeValues) {
+ for (final B value : removeValues) {
remove(value);
}
}
@@ -303,7 +303,7 @@ public class ClassToInstanceMultiMap<B> {
final List<B> indexValues = backingMap.remove(type);
if (indexValues != null) {
- for (B value : indexValues) {
+ for (final B value : indexValues) {
remove(value);
}
}
@@ -353,7 +353,7 @@ public class ClassToInstanceMultiMap<B> {
final Class<?>[] interfaces = clazz.getInterfaces();
if (interfaces.length > 0) {
- for (Class<?> iface : interfaces) {
+ for (final Class<?> iface : interfaces) {
accumulator.add(iface);
getSuperTypes(iface, accumulator);
}
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 78a0e26..72d687f 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
@@ -114,7 +114,7 @@ public final class CollectionSupport {
}
boolean targetedUpdated = false;
- for (T element : elements) {
+ for (final T element : elements) {
if (addIf(target, element, predicate, elementPreprocessor)) {
targetedUpdated = true;
}
@@ -203,7 +203,7 @@ public final class CollectionSupport {
}
boolean targetedUpdated = false;
- for (T element : elements) {
+ for (final T element : elements) {
if (removeIf(target, element, predicate, elementPreprocessor)) {
targetedUpdated = true;
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/collection/ValueTypeIndexedMap.java b/src/main/java/net/shibboleth/utilities/java/support/collection/ValueTypeIndexedMap.java
index 25f0f7b..f3b5406 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/collection/ValueTypeIndexedMap.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/collection/ValueTypeIndexedMap.java
@@ -134,7 +134,7 @@ public class ValueTypeIndexedMap<KeyType, ValueType> implements Map<KeyType, Val
public ValueType put(final KeyType key, final ValueType value) {
final ValueType oldValue = map.put(key, value);
- for (Class<?> clazz : index.keySet()) {
+ for (final Class<?> clazz : index.keySet()) {
final Class<?> type;
if (clazz == null) {
type = NullValue.class;
@@ -155,7 +155,7 @@ public class ValueTypeIndexedMap<KeyType, ValueType> implements Map<KeyType, Val
/** {@inheritDoc} */
public void putAll(final Map<? extends KeyType, ? extends ValueType> t) {
// this is probably not the most efficient way to do this
- for (KeyType key : t.keySet()) {
+ for (final KeyType key : t.keySet()) {
put(key, t.get(key));
}
}
@@ -167,7 +167,7 @@ public class ValueTypeIndexedMap<KeyType, ValueType> implements Map<KeyType, Val
index.clear();
ValueType value;
- for (Class<?> clazz : types) {
+ for (final Class<?> clazz : types) {
final Class<?> type;
if (clazz == null) {
type = NullValue.class;
@@ -176,7 +176,7 @@ public class ValueTypeIndexedMap<KeyType, ValueType> implements Map<KeyType, Val
}
index.put(type, new HashMap<KeyType, ValueType>());
- for (KeyType key : map.keySet()) {
+ for (final KeyType key : map.keySet()) {
value = map.get(key);
if (matchType(type, value)) {
index.get(type).put(key, value);
@@ -189,7 +189,7 @@ public class ValueTypeIndexedMap<KeyType, ValueType> implements Map<KeyType, Val
public ValueType remove(final Object key) {
final ValueType value = map.remove(key);
- for (Class<?> type : index.keySet()) {
+ for (final Class<?> type : index.keySet()) {
if (type.isInstance(value)) {
index.get(type).remove(key);
}
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 3e62ea2..5de61e0 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
@@ -899,25 +899,25 @@ public class HttpClientBuilder {
}
if (getFirstRequestInterceptors() != null) {
- for (HttpRequestInterceptor interceptor : getFirstRequestInterceptors()) {
+ for (final HttpRequestInterceptor interceptor : getFirstRequestInterceptors()) {
builder.addInterceptorFirst(interceptor);
}
}
if (getLastRequestInterceptors() != null) {
- for (HttpRequestInterceptor interceptor : getLastRequestInterceptors()) {
+ for (final HttpRequestInterceptor interceptor : getLastRequestInterceptors()) {
builder.addInterceptorLast(interceptor);
}
}
if (getFirstResponseInterceptors() != null) {
- for (HttpResponseInterceptor interceptor : getFirstResponseInterceptors()) {
+ for (final HttpResponseInterceptor interceptor : getFirstResponseInterceptors()) {
builder.addInterceptorFirst(interceptor);
}
}
if (getLastResponseInterceptors() != null) {
- for (HttpResponseInterceptor interceptor : getLastResponseInterceptors()) {
+ for (final HttpResponseInterceptor interceptor : getLastResponseInterceptors()) {
builder.addInterceptorLast(interceptor);
}
}
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 b48f84f..b09648a 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
@@ -305,7 +305,7 @@ public class TLSSocketFactory implements LayeredConnectionSocketFactory {
// If supported protocols are not explicitly set, remove all SSL protocol versions
final String[] allProtocols = sslsock.getSupportedProtocols();
final List<String> enabledProtocols = new ArrayList<>(allProtocols.length);
- for (String protocol: allProtocols) {
+ for (final String protocol: allProtocols) {
if (!protocol.startsWith("SSL")) {
enabledProtocols.add(protocol);
}
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 4bbdc3e..8ca3a1a 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
@@ -52,7 +52,7 @@ public class AllMatchPredicate<T> implements Predicate<Iterable<T>> {
}
boolean matchedAll = false;
- for (T input : inputs) {
+ for (final T input : inputs) {
if (!predicate.apply(input)) {
return false;
} else {
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 d0bb7fa..98eded2 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
@@ -51,7 +51,7 @@ public class AnyMatchPredicate<T> implements Predicate<Iterable<T>> {
return false;
}
- for (T input : inputs) {
+ for (final T input : inputs) {
if (predicate.apply(input)) {
return true;
}
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 8a20c89..100d9fa 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
@@ -142,7 +142,7 @@ public class CookieBufferingFilter implements Filter {
* Transfer cookies added into the real response.
*/
protected void dumpCookies() {
- for (Cookie cookie : cookieMap.values()) {
+ for (final Cookie cookie : cookieMap.values()) {
((HttpServletResponse) getResponse()).addCookie(cookie);
}
cookieMap.clear();
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 b496b0d..c5d091b 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
@@ -113,7 +113,7 @@ public class IPRange {
if (components.length != 4) {
throw new IllegalArgumentException("IPv4 address should have four components");
}
- for (String component : components) {
+ for (final String component : components) {
final int value = Integer.parseInt(component, 10);
if (value < 0 || (value > 255)) {
throw new IllegalArgumentException("IPv4 component range error: " + component);
@@ -133,7 +133,7 @@ public class IPRange {
*/
private static void validateV6Address(final String address) {
final String[] components = address.split(":");
- for (String component : components) {
+ for (final String component : components) {
if (component.length() != 0) {
final int value = Integer.parseInt(component, 16);
if (value < 0 || (value > 0xFFFF)) {
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 cac8672..2e7656f 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
@@ -213,7 +213,7 @@ public final class URISupport {
final StringBuilder builder = new StringBuilder();
boolean firstParam = true;
- for (Pair<String, String> parameter : parameters) {
+ for (final Pair<String, String> parameter : parameters) {
if (firstParam) {
firstParam = false;
} else {
@@ -279,7 +279,7 @@ public final class URISupport {
final ArrayList<Pair<String, String>> queryParams = new ArrayList<>();
final String[] paramPairs = trimmedQuery.split("&");
String[] param;
- for (String paramPair : paramPairs) {
+ for (final String paramPair : paramPairs) {
param = paramPair.split("=");
if (param.length == 1) {
queryParams.add(new Pair(doURLDecode(param[0]), null));
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 bfe1bc5..b50f550 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
@@ -63,7 +63,7 @@ public final class ObjectSupport {
if (objects == null) {
return null;
} else {
- for (T obj : objects) {
+ for (final T obj : objects) {
if (obj != null) {
return obj;
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/resolver/CriteriaSet.java b/src/main/java/net/shibboleth/utilities/java/support/resolver/CriteriaSet.java
index c39aecd..55f9586 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/resolver/CriteriaSet.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/resolver/CriteriaSet.java
@@ -41,7 +41,7 @@ public class CriteriaSet extends ClassIndexedSet<Criterion> implements Criterion
return;
}
- for (Criterion criterion : criteria) {
+ for (final Criterion criterion : criteria) {
if (criterion == null) {
continue;
}
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 17ae370..036b6f9 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
@@ -604,11 +604,11 @@ public class BasicParserPool extends AbstractInitializableComponent implements P
try {
final DocumentBuilderFactory newFactory = DocumentBuilderFactory.newInstance();
- for (Map.Entry<String, Object> attribute : builderAttributes.entrySet()) {
+ for (final Map.Entry<String, Object> attribute : builderAttributes.entrySet()) {
newFactory.setAttribute(attribute.getKey(), attribute.getValue());
}
- for (Map.Entry<String, Boolean> feature : builderFeatures.entrySet()) {
+ for (final Map.Entry<String, Boolean> feature : builderFeatures.entrySet()) {
if (feature.getKey() != null) {
newFactory.setFeature(feature.getKey(), feature.getValue().booleanValue());
}
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 c1569c6..352662d 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
@@ -171,7 +171,7 @@ public final class SerializeSupport {
if (serializerParams != null) {
final DOMConfiguration serializerDOMConfig = serializer.getDomConfig();
- for (String key : serializerParams.keySet()) {
+ for (final String key : serializerParams.keySet()) {
serializerDOMConfig.setParameter(key, serializerParams.get(key));
}
}
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 7cf7cd3..f77f981 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
@@ -63,7 +63,7 @@ public class SimpleNamespaceContext implements NamespaceContext {
String trimmedPrefix;
String trimmedUri;
- for (String key : prefixToUriMappings.keySet()) {
+ for (final String key : prefixToUriMappings.keySet()) {
trimmedPrefix = StringSupport.trimOrNull(key);
if (trimmedPrefix == null) {
continue;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list