[java-support] branch master updated: Code cleanup for compiler warnings.
Scott Cantor
cantor.2 at osu.edu
Wed Dec 28 19:09:47 EST 2016
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch master
in repository java-support.
View the commit online:
http://git.shibboleth.net/view/?p=java-support.git;a=commit;h=a571f579f49b975554d62b27574fa64003f1206f
The following commit(s) were added to refs/heads/master by this push:
new a571f57 Code cleanup for compiler warnings.
a571f57 is described below
commit a571f579f49b975554d62b27574fa64003f1206f
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Dec 28 19:09:45 2016 -0500
Code cleanup for compiler warnings.
---
.../java/support/httpclient/HttpClientBuilder.java | 11 +++++-----
.../support/logic/StrategyIndirectedPredicate.java | 18 ++++++++++------
.../support/logic/TransformAndCheckFunction.java | 2 +-
.../net/ThreadLocalHttpServletRequestProxy.java | 12 +++++------
.../utilities/java/support/net/URISupport.java | 4 ++--
.../java/support/primitive/StringSupport.java | 19 ++++++++---------
.../resolver/CriterionPredicateRegistry.java | 9 ++++----
.../support/security/BasicKeystoreKeyStrategy.java | 2 +-
.../security/SelfSignedCertificateGenerator.java | 24 +++++++++++-----------
.../java/support/xml/SimpleNamespaceContext.java | 4 ++--
10 files changed, 55 insertions(+), 50 deletions(-)
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 b45f0f2..f46f6cb 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
@@ -869,7 +869,7 @@ public class HttpClientBuilder {
* @param interceptors the list of interceptors, may be null
*/
public void setLastRequestInterceptors(final List<HttpRequestInterceptor> interceptors) {
- requestInterceptorsLast = (List<HttpRequestInterceptor>) normalizeInterceptors(interceptors);
+ requestInterceptorsLast = normalizeInterceptors(interceptors);
}
/**
@@ -887,7 +887,7 @@ public class HttpClientBuilder {
* @param interceptors the list of interceptors, may be null
*/
public void setFirstResponseInterceptors(final List<HttpResponseInterceptor> interceptors) {
- responseInterceptorsFirst = (List<HttpResponseInterceptor>) normalizeInterceptors(interceptors);
+ responseInterceptorsFirst = normalizeInterceptors(interceptors);
}
/**
@@ -905,17 +905,18 @@ public class HttpClientBuilder {
* @param interceptors the list of interceptors, may be null
*/
public void setLastResponseInterceptors(final List<HttpResponseInterceptor> interceptors) {
- responseInterceptorsLast = (List<HttpResponseInterceptor>) normalizeInterceptors(interceptors);
+ responseInterceptorsLast = normalizeInterceptors(interceptors);
}
/**
* Normalize and copy the supplied list of interceptors to remove nulls.
*
+ * @param <T> type of collection to normalize
+ *
* @param interceptors the list of interceptors to normalize
* @return copy of input list without nulls, may be null
*/
- @Nullable private List<? extends Object> normalizeInterceptors(
- @Nullable final List<? extends Object> interceptors) {
+ @Nullable private <T> List<T> normalizeInterceptors(@Nullable final List<T> interceptors) {
if (interceptors == null) {
return null;
} else {
diff --git a/src/main/java/net/shibboleth/utilities/java/support/logic/StrategyIndirectedPredicate.java b/src/main/java/net/shibboleth/utilities/java/support/logic/StrategyIndirectedPredicate.java
index 3903887..c49c2a7 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/logic/StrategyIndirectedPredicate.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/logic/StrategyIndirectedPredicate.java
@@ -75,6 +75,9 @@ public class StrategyIndirectedPredicate<T1,T2> implements Predicate<T1> {
/**
* Factory method for predicate-based constructor.
*
+ * @param <T1> type of object used as the source of the data to compare
+ * @param <T2> type of object being compared
+ *
* @param objectStrategy the lookup strategy for object
* @param pred the predicate to apply
*
@@ -82,14 +85,17 @@ public class StrategyIndirectedPredicate<T1,T2> implements Predicate<T1> {
*
* @since 7.3.0
*/
- @Nonnull public static StrategyIndirectedPredicate forPredicate(@Nonnull final Function objectStrategy,
- @Nonnull final Predicate pred) {
- return new StrategyIndirectedPredicate(objectStrategy, pred);
+ @Nonnull public static <T1,T2> StrategyIndirectedPredicate<T1,T2> forPredicate(
+ @Nonnull final Function<T1,T2> objectStrategy, @Nonnull final Predicate<T2> pred) {
+ return new StrategyIndirectedPredicate<>(objectStrategy, pred);
}
/**
* Factory method for collection-based constructor.
*
+ * @param <T1> type of object used as the source of the data to compare
+ * @param <T2> type of object being compared
+ *
* @param objectStrategy the lookup strategy for object
* @param collection a collection to test for containment
*
@@ -97,9 +103,9 @@ public class StrategyIndirectedPredicate<T1,T2> implements Predicate<T1> {
*
* @since 7.3.0
*/
- @Nonnull public static StrategyIndirectedPredicate forCollection(@Nonnull final Function objectStrategy,
- @Nonnull final Collection collection) {
- return new StrategyIndirectedPredicate(objectStrategy, collection);
+ @Nonnull public static <T1,T2> StrategyIndirectedPredicate<T1,T2> forCollection(
+ @Nonnull final Function<T1,T2> objectStrategy, @Nonnull final Collection<T2> collection) {
+ return new StrategyIndirectedPredicate<>(objectStrategy, collection);
}
}
\ 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 e16aa18..150c4db 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
@@ -89,7 +89,7 @@ public class TransformAndCheckFunction<T> implements Function<T, Optional<? exte
}
if (obj instanceof TransformAndCheckFunction) {
- final TransformAndCheckFunction<T> other = (TransformAndCheckFunction<T>) obj;
+ final TransformAndCheckFunction<?> other = (TransformAndCheckFunction<?>) obj;
return java.util.Objects.equals(preprocessor, other.preprocessor)
&& java.util.Objects.equals(constraint, other.constraint)
&& java.util.Objects.equals(failOnConstraintViolation, other.failOnConstraintViolation);
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 eb3c7a2..d6edb08 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
@@ -54,7 +54,7 @@ public class ThreadLocalHttpServletRequestProxy implements HttpServletRequest {
}
/** {@inheritDoc} */
- public Enumeration getAttributeNames() {
+ public Enumeration<String> getAttributeNames() {
return getCurrent().getAttributeNames();
}
@@ -89,7 +89,7 @@ public class ThreadLocalHttpServletRequestProxy implements HttpServletRequest {
}
/** {@inheritDoc} */
- public Enumeration getParameterNames() {
+ public Enumeration<String> getParameterNames() {
return getCurrent().getParameterNames();
}
@@ -99,7 +99,7 @@ public class ThreadLocalHttpServletRequestProxy implements HttpServletRequest {
}
/** {@inheritDoc} */
- public Map getParameterMap() {
+ public Map<String,String[]> getParameterMap() {
return getCurrent().getParameterMap();
}
@@ -154,7 +154,7 @@ public class ThreadLocalHttpServletRequestProxy implements HttpServletRequest {
}
/** {@inheritDoc} */
- public Enumeration getLocales() {
+ public Enumeration<Locale> getLocales() {
return getCurrent().getLocales();
}
@@ -215,12 +215,12 @@ public class ThreadLocalHttpServletRequestProxy implements HttpServletRequest {
}
/** {@inheritDoc} */
- public Enumeration getHeaders(final String name) {
+ public Enumeration<String> getHeaders(final String name) {
return getCurrent().getHeaders(name);
}
/** {@inheritDoc} */
- public Enumeration getHeaderNames() {
+ public Enumeration<String> getHeaderNames() {
return getCurrent().getHeaderNames();
}
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 80c39a4..3b94ecf 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
@@ -282,9 +282,9 @@ public final class URISupport {
for (final String paramPair : paramPairs) {
param = paramPair.split("=");
if (param.length == 1) {
- queryParams.add(new Pair(doURLDecode(param[0]), null));
+ queryParams.add(new Pair<>(doURLDecode(param[0]), (String) null));
} else {
- queryParams.add(new Pair(doURLDecode(param[0]), doURLDecode(param[1])));
+ queryParams.add(new Pair<>(doURLDecode(param[0]), doURLDecode(param[1])));
}
}
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 39f2110..98f2102 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,18 +66,15 @@ public final class StringSupport {
charsetDecoder = Charset.defaultCharset().newDecoder();
}
- final BufferedReader reader = new BufferedReader(new InputStreamReader(input, charsetDecoder));
-
- final StringBuilder stringBuffer = new StringBuilder();
- String line = reader.readLine();
- while (line != null) {
- stringBuffer.append(line).append("\n");
- line = reader.readLine();
+ try (final BufferedReader reader = new BufferedReader(new InputStreamReader(input, charsetDecoder))) {
+ final StringBuilder stringBuffer = new StringBuilder();
+ String line = reader.readLine();
+ while (line != null) {
+ stringBuffer.append(line).append("\n");
+ line = reader.readLine();
+ }
+ return stringBuffer.toString();
}
-
- reader.close();
-
- return stringBuffer.toString();
}
/**
diff --git a/src/main/java/net/shibboleth/utilities/java/support/resolver/CriterionPredicateRegistry.java b/src/main/java/net/shibboleth/utilities/java/support/resolver/CriterionPredicateRegistry.java
index a27cc56..493d3ad 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/resolver/CriterionPredicateRegistry.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/resolver/CriterionPredicateRegistry.java
@@ -188,17 +188,18 @@ public class CriterionPredicateRegistry<T> {
final String predicateName = mappings.getProperty(criterionName);
final ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
- Class criterionClass = null;
+ Class<? extends Criterion> criterionClass = null;
try {
- criterionClass = classLoader.loadClass(criterionName);
+ criterionClass = classLoader.loadClass(criterionName).asSubclass(Criterion.class);
} catch (final ClassNotFoundException e) {
log.error("Could not find Criterion class '{}', skipping registration", criterionName);
continue;
}
- Class predicateClass = null;
+ Class<? extends Predicate<T>> predicateClass = null;
try {
- predicateClass = classLoader.loadClass(predicateName);
+ predicateClass = (Class<? extends Predicate<T>>) classLoader.loadClass(
+ predicateName).asSubclass(Predicate.class);
} catch (final ClassNotFoundException e) {
log.error("Could not find Predicate class '{}', skipping registration", criterionName);
continue;
diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategy.java b/src/main/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategy.java
index 7843e3f..21f4dca 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategy.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategy.java
@@ -266,7 +266,7 @@ public class BasicKeystoreKeyStrategy extends AbstractInitializableComponent imp
ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
synchronized(this) {
- return new Pair(currentAlias, defaultKey);
+ return new Pair<>(currentAlias, defaultKey);
}
}
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 cd32649..eada6fd 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
@@ -228,17 +228,17 @@ public class SelfSignedCertificateGenerator {
// Write the requested files.
if (args.privateKeyFile != null) {
- final JcaPEMWriter keyOut = new JcaPEMWriter(new FileWriter(args.privateKeyFile));
- keyOut.writeObject(keypair.getPrivate());
- keyOut.flush();
- keyOut.close();
+ try (final JcaPEMWriter keyOut = new JcaPEMWriter(new FileWriter(args.privateKeyFile))) {
+ keyOut.writeObject(keypair.getPrivate());
+ keyOut.flush();
+ }
}
if (args.certificateFile != null) {
- final JcaPEMWriter certOut = new JcaPEMWriter(new FileWriter(args.certificateFile));
- certOut.writeObject(certificate);
- certOut.flush();
- certOut.close();
+ try (final JcaPEMWriter certOut = new JcaPEMWriter(new FileWriter(args.certificateFile))) {
+ certOut.writeObject(certificate);
+ certOut.flush();
+ }
}
if (args.keystoreFile != null) {
@@ -247,10 +247,10 @@ public class SelfSignedCertificateGenerator {
store.setKeyEntry(args.hostname, keypair.getPrivate(), args.keystorePassword.toCharArray(),
new X509Certificate[] {certificate});
- final FileOutputStream keystoreOut = new FileOutputStream(args.keystoreFile);
- store.store(keystoreOut, args.keystorePassword.toCharArray());
- keystoreOut.flush();
- keystoreOut.close();
+ try (final FileOutputStream keystoreOut = new FileOutputStream(args.keystoreFile)) {
+ store.store(keystoreOut, args.keystorePassword.toCharArray());
+ keystoreOut.flush();
+ }
}
}
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 a384e60..5b5d58f 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) {
- final Builder mappingBuilder = getMappingsBuilder();
+ final Builder<String,String> mappingBuilder = getMappingsBuilder();
if (prefixToUriMappings == null || prefixToUriMappings.isEmpty()) {
mappings = mappingBuilder.build();
@@ -121,7 +121,7 @@ public class SimpleNamespaceContext implements NamespaceContext {
* @return initial set of mappings
*/
@Nonnull private Builder<String, String> getMappingsBuilder(){
- final Builder mappingBuilder = new Builder<String, String>();
+ final Builder<String,String> mappingBuilder = new Builder<>();
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