[java-opensaml] 03/04: JPAR-85 - Checkstyle, check final parameters
Tom Zeller
tzeller at dragonacea.biz
Wed Aug 9 22:49:42 EDT 2017
This is an automated email from the git hooks/post-receive script.
tzeller pushed a commit to branch master
in repository java-opensaml.
View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=50f09c6b54fb50dcc0ee32e161633b714b52cbe8
commit 50f09c6b54fb50dcc0ee32e161633b714b52cbe8
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Wed Aug 9 21:39:20 2017 -0500
JPAR-85 - Checkstyle, check final parameters
---
.../impl/EvaluableCredentialCriteriaRegistry.java | 8 ++++----
.../impl/EvaluableEntityIDCredentialCriterion.java | 2 +-
.../EvaluableKeyAlgorithmCredentialCriterion.java | 2 +-
.../impl/EvaluableKeyLengthCredentialCriterion.java | 2 +-
.../impl/EvaluableKeyNameCredentialCriterion.java | 2 +-
.../impl/EvaluablePublicKeyCredentialCriterion.java | 2 +-
.../impl/EvaluableUsageCredentialCriterion.java | 2 +-
...EvaluableX509CertSelectorCredentialCriterion.java | 2 +-
.../impl/EvaluableX509DigestCredentialCriterion.java | 6 +++---
...EvaluableX509IssuerSerialCredentialCriterion.java | 2 +-
...eX509SubjectKeyIdentifierCredentialCriterion.java | 2 +-
.../EvaluableX509SubjectNameCredentialCriterion.java | 2 +-
.../impl/AbstractChainingCredentialResolver.java | 4 ++--
.../credential/impl/AbstractCredentialResolver.java | 2 +-
.../AbstractCriteriaFilteringCredentialResolver.java | 2 +-
.../credential/impl/KeyStoreCredentialResolver.java | 4 ++--
.../impl/SecurityEnhancedTLSSocketFactory.java | 20 +++++++++++---------
.../httpclient/impl/TrustEngineTLSSocketFactory.java | 19 +++++++++++--------
.../security/trust/impl/ExplicitKeyTrustEngine.java | 2 +-
.../impl/ExplicitX509CertificateTrustEngine.java | 2 +-
.../trust/impl/TrustEngineX509TrustManager.java | 4 ++--
.../x509/impl/BasicX509CredentialNameEvaluator.java | 8 ++++----
.../x509/impl/CertPathPKIXTrustEvaluator.java | 6 +++---
.../x509/impl/CertPathPKIXValidationOptions.java | 10 +++++-----
.../x509/impl/PKIXX509CredentialTrustEngine.java | 11 ++++++-----
.../StaticPKIXValidationInformationResolver.java | 2 +-
.../BasicClientTLSValidationParametersResolver.java | 4 ++--
.../tls/impl/StaticX509CredentialKeyManager.java | 16 ++++++++--------
.../impl/ThreadLocalX509CredentialKeyManager.java | 12 ++++++------
29 files changed, 84 insertions(+), 78 deletions(-)
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableCredentialCriteriaRegistry.java b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableCredentialCriteriaRegistry.java
index 30ea4a8..120f4a8 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableCredentialCriteriaRegistry.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableCredentialCriteriaRegistry.java
@@ -87,7 +87,7 @@ public final class EvaluableCredentialCriteriaRegistry {
return constructor.newInstance(new Object[] { criteria });
- } catch (java.lang.SecurityException | InstantiationException | IllegalAccessException
+ } catch (final java.lang.SecurityException | InstantiationException | IllegalAccessException
| IllegalArgumentException | InvocationTargetException | NoSuchMethodException e) {
log.error("Error instantiating new EvaluableCredentialCriterion instance", e);
throw new SecurityException("Could not create new EvaluableCredentialCriterion", e);
@@ -192,7 +192,7 @@ public final class EvaluableCredentialCriteriaRegistry {
final Properties defaultMappings = new Properties();
try {
defaultMappings.load(inStream);
- } catch (IOException e) {
+ } catch (final IOException e) {
log.error("Error loading properties file from resource stream", e);
return;
}
@@ -223,7 +223,7 @@ public final class EvaluableCredentialCriteriaRegistry {
Class criteriaClass = null;
try {
criteriaClass = classLoader.loadClass(criteriaName);
- } catch (ClassNotFoundException e) {
+ } catch (final ClassNotFoundException e) {
log.error("Could not find criteria class '{}', skipping registration", criteriaName);
continue;
}
@@ -231,7 +231,7 @@ public final class EvaluableCredentialCriteriaRegistry {
Class evaluableClass = null;
try {
evaluableClass = classLoader.loadClass(evaluatorName);
- } catch (ClassNotFoundException e) {
+ } catch (final ClassNotFoundException e) {
log.error("Could not find evaluator class '{}', skipping registration", criteriaName);
continue;
}
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableEntityIDCredentialCriterion.java b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableEntityIDCredentialCriterion.java
index 852248a..5ab7d1c 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableEntityIDCredentialCriterion.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableEntityIDCredentialCriterion.java
@@ -91,7 +91,7 @@ public class EvaluableEntityIDCredentialCriterion extends AbstractTriStatePredic
}
/** {@inheritDoc} */
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableKeyAlgorithmCredentialCriterion.java b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableKeyAlgorithmCredentialCriterion.java
index 1ead73d..667f296 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableKeyAlgorithmCredentialCriterion.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableKeyAlgorithmCredentialCriterion.java
@@ -120,7 +120,7 @@ public class EvaluableKeyAlgorithmCredentialCriterion extends AbstractTriStatePr
}
/** {@inheritDoc} */
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableKeyLengthCredentialCriterion.java b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableKeyLengthCredentialCriterion.java
index 236f653..d15b570 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableKeyLengthCredentialCriterion.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableKeyLengthCredentialCriterion.java
@@ -117,7 +117,7 @@ public class EvaluableKeyLengthCredentialCriterion extends AbstractTriStatePredi
}
/** {@inheritDoc} */
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableKeyNameCredentialCriterion.java b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableKeyNameCredentialCriterion.java
index 385b2ae..9015429 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableKeyNameCredentialCriterion.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableKeyNameCredentialCriterion.java
@@ -91,7 +91,7 @@ public class EvaluableKeyNameCredentialCriterion extends AbstractTriStatePredica
}
/** {@inheritDoc} */
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluablePublicKeyCredentialCriterion.java b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluablePublicKeyCredentialCriterion.java
index 26a36bc..3949fd1 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluablePublicKeyCredentialCriterion.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluablePublicKeyCredentialCriterion.java
@@ -92,7 +92,7 @@ public class EvaluablePublicKeyCredentialCriterion extends AbstractTriStatePredi
}
/** {@inheritDoc} */
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableUsageCredentialCriterion.java b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableUsageCredentialCriterion.java
index 249af7f..a6698e9 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableUsageCredentialCriterion.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableUsageCredentialCriterion.java
@@ -104,7 +104,7 @@ public class EvaluableUsageCredentialCriterion extends AbstractTriStatePredicate
}
/** {@inheritDoc} */
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509CertSelectorCredentialCriterion.java b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509CertSelectorCredentialCriterion.java
index 3e42986..4e74786 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509CertSelectorCredentialCriterion.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509CertSelectorCredentialCriterion.java
@@ -88,7 +88,7 @@ public class EvaluableX509CertSelectorCredentialCriterion extends AbstractTriSta
}
/** {@inheritDoc} */
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509DigestCredentialCriterion.java b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509DigestCredentialCriterion.java
index 290905c..1df555c 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509DigestCredentialCriterion.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509DigestCredentialCriterion.java
@@ -98,9 +98,9 @@ public final class EvaluableX509DigestCredentialCriterion extends AbstractTriSta
MessageDigest hasher = MessageDigest.getInstance(algorithm);
byte[] hashed = hasher.digest(entityCert.getEncoded());
return Arrays.equals(hashed, x509digest);
- } catch (CertificateEncodingException e) {
+ } catch (final CertificateEncodingException e) {
log.error("Unable to encode certificate for digest operation", e);
- } catch (NoSuchAlgorithmException e) {
+ } catch (final NoSuchAlgorithmException e) {
log.error("Unable to obtain a digest implementation for algorithm {" + algorithm + "}" , e);
}
@@ -127,7 +127,7 @@ public final class EvaluableX509DigestCredentialCriterion extends AbstractTriSta
}
/** {@inheritDoc} */
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509IssuerSerialCredentialCriterion.java b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509IssuerSerialCredentialCriterion.java
index b138355..f5f1c6c 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509IssuerSerialCredentialCriterion.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509IssuerSerialCredentialCriterion.java
@@ -110,7 +110,7 @@ public class EvaluableX509IssuerSerialCredentialCriterion extends AbstractTriSta
}
/** {@inheritDoc} */
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509SubjectKeyIdentifierCredentialCriterion.java b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509SubjectKeyIdentifierCredentialCriterion.java
index 7bbe404..85b17f9 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509SubjectKeyIdentifierCredentialCriterion.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509SubjectKeyIdentifierCredentialCriterion.java
@@ -106,7 +106,7 @@ public class EvaluableX509SubjectKeyIdentifierCredentialCriterion extends Abstra
}
/** {@inheritDoc} */
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509SubjectNameCredentialCriterion.java b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509SubjectNameCredentialCriterion.java
index efceb5b..6b7ca52 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509SubjectNameCredentialCriterion.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509SubjectNameCredentialCriterion.java
@@ -97,7 +97,7 @@ public class EvaluableX509SubjectNameCredentialCriterion extends AbstractTriStat
}
/** {@inheritDoc} */
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/impl/AbstractChainingCredentialResolver.java b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/impl/AbstractChainingCredentialResolver.java
index 5f40484..b29377c 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/impl/AbstractChainingCredentialResolver.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/impl/AbstractChainingCredentialResolver.java
@@ -77,7 +77,7 @@ public abstract class AbstractChainingCredentialResolver<ResolverType extends Cr
}
/** {@inheritDoc} */
- @Nonnull public Iterable<Credential> resolve(@Nullable CriteriaSet criteriaSet) throws ResolverException {
+ @Nonnull public Iterable<Credential> resolve(@Nullable final CriteriaSet criteriaSet) throws ResolverException {
if (resolvers.isEmpty()) {
log.warn("Chaining credential resolver resolution was attempted with an empty resolver chain");
throw new IllegalStateException("The resolver chain is empty");
@@ -207,7 +207,7 @@ public abstract class AbstractChainingCredentialResolver<ResolverType extends Cr
currentResolver.getClass().toString());
try {
return currentResolver.resolve(critSet).iterator();
- } catch (ResolverException e) {
+ } catch (final ResolverException e) {
log.error(String.format("Error resolving credentials from chaining resolver member '%s'",
currentResolver.getClass().getName()), e);
if (resolverIterator.hasNext()) {
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/impl/AbstractCredentialResolver.java b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/impl/AbstractCredentialResolver.java
index b5c2a96..b4d6f58 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/impl/AbstractCredentialResolver.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/impl/AbstractCredentialResolver.java
@@ -32,7 +32,7 @@ import net.shibboleth.utilities.java.support.resolver.ResolverException;
public abstract class AbstractCredentialResolver implements CredentialResolver {
/** {@inheritDoc} */
- @Nullable public Credential resolveSingle(@Nullable CriteriaSet criteriaSet) throws ResolverException {
+ @Nullable public Credential resolveSingle(@Nullable final CriteriaSet criteriaSet) throws ResolverException {
Iterable<Credential> creds = resolve(criteriaSet);
if (creds.iterator().hasNext()) {
return creds.iterator().next();
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/impl/AbstractCriteriaFilteringCredentialResolver.java b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/impl/AbstractCriteriaFilteringCredentialResolver.java
index f01cb96..f30a039 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/impl/AbstractCriteriaFilteringCredentialResolver.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/impl/AbstractCriteriaFilteringCredentialResolver.java
@@ -126,7 +126,7 @@ public abstract class AbstractCriteriaFilteringCredentialResolver extends Abstra
EvaluableCredentialCriterion evaluableCriteria;
try {
evaluableCriteria = EvaluableCredentialCriteriaRegistry.getEvaluator(criteria);
- } catch (SecurityException e) {
+ } catch (final SecurityException e) {
throw new ResolverException("Exception obtaining EvaluableCredentialCriterion", e);
}
if (evaluableCriteria != null) {
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/impl/KeyStoreCredentialResolver.java b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/impl/KeyStoreCredentialResolver.java
index 093b3d4..f37360a 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/impl/KeyStoreCredentialResolver.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/impl/KeyStoreCredentialResolver.java
@@ -87,7 +87,7 @@ public class KeyStoreCredentialResolver extends AbstractCriteriaFilteringCredent
*
*/
public KeyStoreCredentialResolver(@Nonnull final KeyStore store, @Nonnull final Map<String, String> passwords,
- @Nullable UsageType usage) {
+ @Nullable final UsageType usage) {
super();
keyStore = Constraint.isNotNull(store, "Provided key store cannot be null");
@@ -95,7 +95,7 @@ public class KeyStoreCredentialResolver extends AbstractCriteriaFilteringCredent
try {
store.size();
- } catch (KeyStoreException e) {
+ } catch (final KeyStoreException e) {
throw new IllegalStateException("Keystore has not been initialized.");
}
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/SecurityEnhancedTLSSocketFactory.java b/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/SecurityEnhancedTLSSocketFactory.java
index 2c1969f..64ec5c9 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/SecurityEnhancedTLSSocketFactory.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/SecurityEnhancedTLSSocketFactory.java
@@ -139,7 +139,7 @@ public class SecurityEnhancedTLSSocketFactory implements LayeredConnectionSocket
* for TLS server validation.
*/
public SecurityEnhancedTLSSocketFactory(@Nonnull final LayeredConnectionSocketFactory factory,
- boolean trustEngineRequired) {
+ final boolean trustEngineRequired) {
this(factory, null, trustEngineRequired);
}
@@ -174,7 +174,7 @@ public class SecurityEnhancedTLSSocketFactory implements LayeredConnectionSocket
* for TLS server validation.
*/
public SecurityEnhancedTLSSocketFactory(@Nonnull final LayeredConnectionSocketFactory factory,
- @Nullable final X509HostnameVerifier verifier, boolean trustEngineRequired) {
+ @Nullable final X509HostnameVerifier verifier, final boolean trustEngineRequired) {
wrappedFactory = Constraint.isNotNull(factory, "Socket factory was null");
hostnameVerifier = verifier;
engineRequired = trustEngineRequired;
@@ -192,16 +192,16 @@ public class SecurityEnhancedTLSSocketFactory implements LayeredConnectionSocket
}
/** {@inheritDoc} */
- public Socket createSocket(HttpContext context) throws IOException {
+ public Socket createSocket(final HttpContext context) throws IOException {
log.trace("In createSocket");
return wrappedFactory.createSocket(context);
}
// CheckStyle: ParameterNumber OFF
/** {@inheritDoc} */
- public Socket connectSocket(int connectTimeout, Socket sock, HttpHost host,
- InetSocketAddress remoteAddress, InetSocketAddress localAddress,
- HttpContext context) throws IOException {
+ public Socket connectSocket(final int connectTimeout, final Socket sock, final HttpHost host,
+ final InetSocketAddress remoteAddress, final InetSocketAddress localAddress,
+ final HttpContext context) throws IOException {
log.trace("In connectSocket");
try {
@@ -218,7 +218,8 @@ public class SecurityEnhancedTLSSocketFactory implements LayeredConnectionSocket
// CheckStyle: ParameterNumber ON
/** {@inheritDoc} */
- public Socket createLayeredSocket(Socket socket, String target, int port, HttpContext context) throws IOException {
+ public Socket createLayeredSocket(final Socket socket, final String target, final int port,
+ final HttpContext context) throws IOException {
log.trace("In createLayeredSocket");
try {
setup(context);
@@ -318,7 +319,7 @@ public class SecurityEnhancedTLSSocketFactory implements LayeredConnectionSocket
Boolean.FALSE);
throw new SSLPeerUnverifiedException("Trust engine could not establish trust of server TLS credential");
}
- } catch (SecurityException e) {
+ } catch (final SecurityException e) {
log.error("Trust engine error evaluating credential", e);
throw new IOException("Trust engine error evaluating credential", e);
}
@@ -362,7 +363,8 @@ public class SecurityEnhancedTLSSocketFactory implements LayeredConnectionSocket
* @param context the current HttpClient context instance
* @throws IOException if an I/O error occurs or the verification process fails
*/
- protected void performHostnameVerification(Socket socket, String hostname, HttpContext context) throws IOException {
+ protected void performHostnameVerification(final Socket socket, final String hostname, final HttpContext context)
+ throws IOException {
if (hostnameVerifier != null && socket instanceof SSLSocket) {
hostnameVerifier.verify(hostname, (SSLSocket) socket);
}
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/TrustEngineTLSSocketFactory.java b/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/TrustEngineTLSSocketFactory.java
index 88f34a8..7b24375 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/TrustEngineTLSSocketFactory.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/TrustEngineTLSSocketFactory.java
@@ -100,22 +100,23 @@ public class TrustEngineTLSSocketFactory implements LayeredConnectionSocketFacto
* @param factory the underlying HttpClient socket factory wrapped by this implementation.
* @param verifier the hostname verifier evaluated by this implementation
*/
- public TrustEngineTLSSocketFactory(LayeredConnectionSocketFactory factory, X509HostnameVerifier verifier) {
+ public TrustEngineTLSSocketFactory(final LayeredConnectionSocketFactory factory,
+ final X509HostnameVerifier verifier) {
wrappedFactory = Constraint.isNotNull(factory, "Socket factory was null");
hostnameVerifier = verifier;
}
/** {@inheritDoc} */
- public Socket createSocket(HttpContext context) throws IOException {
+ public Socket createSocket(final HttpContext context) throws IOException {
log.trace("In createSocket");
return wrappedFactory.createSocket(context);
}
// Checkstyle: ParameterNumber OFF
/** {@inheritDoc} */
- public Socket connectSocket(int connectTimeout, Socket sock, HttpHost host,
- InetSocketAddress remoteAddress, InetSocketAddress localAddress,
- HttpContext context) throws IOException {
+ public Socket connectSocket(final int connectTimeout, final Socket sock, final HttpHost host,
+ final InetSocketAddress remoteAddress, final InetSocketAddress localAddress,
+ final HttpContext context) throws IOException {
log.trace("In connectSocket");
Socket socket = wrappedFactory.connectSocket(connectTimeout, sock, host, remoteAddress, localAddress, context);
@@ -127,7 +128,8 @@ public class TrustEngineTLSSocketFactory implements LayeredConnectionSocketFacto
// Checkstyle: ParameterNumber ON
/** {@inheritDoc} */
- public Socket createLayeredSocket(Socket socket, String target, int port, HttpContext context) throws IOException {
+ public Socket createLayeredSocket(final Socket socket, final String target, final int port,
+ final HttpContext context) throws IOException {
log.trace("In createLayeredSocket");
Socket layeredSocket = wrappedFactory.createLayeredSocket(socket, target, port, context);
performTrustEval(layeredSocket, context);
@@ -189,7 +191,7 @@ public class TrustEngineTLSSocketFactory implements LayeredConnectionSocketFacto
Boolean.FALSE);
throw new SSLPeerUnverifiedException("Trust engine could not establish trust of server TLS credential");
}
- } catch (SecurityException e) {
+ } catch (final SecurityException e) {
log.error("Trust engine error evaluating credential", e);
throw new IOException("Trust engine error evaluating credential", e);
}
@@ -233,7 +235,8 @@ public class TrustEngineTLSSocketFactory implements LayeredConnectionSocketFacto
* @param context the current HttpClient context instance
* @throws IOException if an I/O error occurs or the verification process fails
*/
- protected void performHostnameVerification(Socket socket, String hostname, HttpContext context) throws IOException {
+ protected void performHostnameVerification(final Socket socket, final String hostname, final HttpContext context)
+ throws IOException {
if (hostnameVerifier != null && socket instanceof SSLSocket) {
hostnameVerifier.verify(hostname, (SSLSocket) socket);
}
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/ExplicitKeyTrustEngine.java b/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/ExplicitKeyTrustEngine.java
index d31e77c..35908f1 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/ExplicitKeyTrustEngine.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/ExplicitKeyTrustEngine.java
@@ -78,7 +78,7 @@ public class ExplicitKeyTrustEngine implements TrustedCredentialTrustEngine<Cred
try {
Iterable<Credential> trustedCredentials = getCredentialResolver().resolve(trustBasisCriteria);
return trustEvaluator.validate(untrustedCredential, trustedCredentials);
- } catch (ResolverException e) {
+ } catch (final ResolverException e) {
throw new SecurityException("Error resolving trusted credentials", e);
}
}
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/ExplicitX509CertificateTrustEngine.java b/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/ExplicitX509CertificateTrustEngine.java
index 7038aae..97863b1 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/ExplicitX509CertificateTrustEngine.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/ExplicitX509CertificateTrustEngine.java
@@ -80,7 +80,7 @@ public class ExplicitX509CertificateTrustEngine implements TrustedCredentialTrus
try {
Iterable<Credential> trustedCredentials = getCredentialResolver().resolve(trustBasisCriteria);
return trustEvaluator.validate(untrustedCredential, trustedCredentials);
- } catch (ResolverException e) {
+ } catch (final ResolverException e) {
throw new SecurityException("Error resolving trusted credentials", e);
}
}
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/TrustEngineX509TrustManager.java b/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/TrustEngineX509TrustManager.java
index 1ad2e3f..5dcd6bc 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/TrustEngineX509TrustManager.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/TrustEngineX509TrustManager.java
@@ -70,12 +70,12 @@ public class TrustEngineX509TrustManager implements X509TrustManager {
}
/** {@inheritDoc} */
- public void checkClientTrusted(X509Certificate[] arg0, String arg1) throws CertificateException {
+ public void checkClientTrusted(final X509Certificate[] arg0, final String arg1) throws CertificateException {
checkServerTrusted(arg0, arg1);
}
/** {@inheritDoc} */
- public void checkServerTrusted(X509Certificate[] arg0, String arg1) throws CertificateException {
+ public void checkServerTrusted(final X509Certificate[] arg0, final String arg1) throws CertificateException {
if (arg0 == null || arg0.length < 1) {
throw new CertificateException("Peer certificate array was null or empty");
} else if (tlsTrustEngine == null) {
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/BasicX509CredentialNameEvaluator.java b/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/BasicX509CredentialNameEvaluator.java
index c76a1b9..8886685 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/BasicX509CredentialNameEvaluator.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/BasicX509CredentialNameEvaluator.java
@@ -161,7 +161,7 @@ public class BasicX509CredentialNameEvaluator implements X509CredentialNameEvalu
* @param check whether to check the credential's entity certificate subject alt names against the trusted
* key names
*/
- public void setCheckSubjectAltNames(boolean check) {
+ public void setCheckSubjectAltNames(final boolean check) {
checkSubjectAltNames = check;
}
@@ -183,7 +183,7 @@ public class BasicX509CredentialNameEvaluator implements X509CredentialNameEvalu
* @param check whether to check the credential's entity certificate subject DN's CN against the trusted
* key names
*/
- public void setCheckSubjectDNCommonName(boolean check) {
+ public void setCheckSubjectDNCommonName(final boolean check) {
checkSubjectDNCommonName = check;
}
@@ -204,7 +204,7 @@ public class BasicX509CredentialNameEvaluator implements X509CredentialNameEvalu
* @param check whether to check the credential's entity certificate subject DN against the trusted key
* names
*/
- public void setCheckSubjectDN(boolean check) {
+ public void setCheckSubjectDN(final boolean check) {
checkSubjectDN = check;
}
@@ -361,7 +361,7 @@ public class BasicX509CredentialNameEvaluator implements X509CredentialNameEvalu
}
return true;
}
- } catch (IllegalArgumentException e) {
+ } catch (final IllegalArgumentException e) {
// Do nothing, probably wasn't a distinguished name.
// TODO maybe try and match only the "suspected" DN values above
// - maybe match with regex for '='or something
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/CertPathPKIXTrustEvaluator.java b/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/CertPathPKIXTrustEvaluator.java
index 61ddde0..651d240 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/CertPathPKIXTrustEvaluator.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/CertPathPKIXTrustEvaluator.java
@@ -146,7 +146,7 @@ public class CertPathPKIXTrustEvaluator implements PKIXTrustEvaluator {
}
return true;
- } catch (CertPathBuilderException e) {
+ } catch (final CertPathBuilderException e) {
if (log.isTraceEnabled()) {
log.trace("PKIX path construction failed for untrusted credential: "
+ X509Support.getIdentifiersToken(untrustedCredential, getX500DNHandler()), e);
@@ -156,7 +156,7 @@ public class CertPathPKIXTrustEvaluator implements PKIXTrustEvaluator {
+ e.getMessage());
}
return false;
- } catch (GeneralSecurityException e) {
+ } catch (final GeneralSecurityException e) {
log.error("PKIX validation failure", e);
throw new SecurityException("PKIX validation failure", e);
}
@@ -246,7 +246,7 @@ public class CertPathPKIXTrustEvaluator implements PKIXTrustEvaluator {
//Save some cycles and memory: Collection cert store allows null as specifier to return all.
//crls = certStore.getCRLs( new X509CRLSelector() );
crls = certStore.getCRLs(null);
- } catch (CertStoreException e) {
+ } catch (final CertStoreException e) {
log.error("Error examining cert store for CRL's, treating as if no CRL's present", e);
return false;
}
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/CertPathPKIXValidationOptions.java b/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/CertPathPKIXValidationOptions.java
index 930dd88..f36a807 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/CertPathPKIXValidationOptions.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/CertPathPKIXValidationOptions.java
@@ -74,7 +74,7 @@ public class CertPathPKIXValidationOptions extends PKIXValidationOptions {
*
* @param flag whether to force revocation behavior
*/
- public void setForceRevocationEnabled(boolean flag) {
+ public void setForceRevocationEnabled(final boolean flag) {
forceRevocationEnabled = flag;
}
@@ -100,7 +100,7 @@ public class CertPathPKIXValidationOptions extends PKIXValidationOptions {
*
* @param flag whether to force revocation if forcing is enabled
*/
- public void setRevocationEnabled(boolean flag) {
+ public void setRevocationEnabled(final boolean flag) {
revocationEnabled = flag;
}
@@ -121,7 +121,7 @@ public class CertPathPKIXValidationOptions extends PKIXValidationOptions {
*
* @param flag the policyMappingInhibit boolean to set.
*/
- public void setPolicyMappingInhibit(boolean flag) {
+ public void setPolicyMappingInhibit(final boolean flag) {
policyMappingInhibit = flag;
}
@@ -142,7 +142,7 @@ public class CertPathPKIXValidationOptions extends PKIXValidationOptions {
*
* @param flag the anyPolicyInhibit boolean to set.
*/
- public void setAnyPolicyInhibit(boolean flag) {
+ public void setAnyPolicyInhibit(final boolean flag) {
anyPolicyInhibit = flag;
}
@@ -163,7 +163,7 @@ public class CertPathPKIXValidationOptions extends PKIXValidationOptions {
*
* @param newPolicies the initial set of policy identifiers (OID strings)
*/
- public void setInitialPolicies(Set<String> newPolicies) {
+ public void setInitialPolicies(final Set<String> newPolicies) {
initialPolicies = newPolicies;
}
}
\ No newline at end of file
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/PKIXX509CredentialTrustEngine.java b/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/PKIXX509CredentialTrustEngine.java
index 2ddc3f5..40287dc 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/PKIXX509CredentialTrustEngine.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/PKIXX509CredentialTrustEngine.java
@@ -124,7 +124,8 @@ public class PKIXX509CredentialTrustEngine implements PKIXTrustEngine<X509Creden
}
/** {@inheritDoc} */
- public boolean validate(@Nonnull final X509Credential untrustedCredential, @Nullable CriteriaSet trustBasisCriteria)
+ public boolean validate(@Nonnull final X509Credential untrustedCredential,
+ @Nullable final CriteriaSet trustBasisCriteria)
throws SecurityException {
log.debug("Attempting PKIX validation of untrusted credential");
@@ -142,9 +143,9 @@ public class PKIXX509CredentialTrustEngine implements PKIXTrustEngine<X509Creden
if (getPKIXResolver().supportsTrustedNameResolution()) {
try {
trustedNames = pkixResolver.resolveTrustedNames(trustBasisCriteria);
- } catch (UnsupportedOperationException e) {
+ } catch (final UnsupportedOperationException e) {
throw new SecurityException("Error resolving trusted names", e);
- } catch (ResolverException e) {
+ } catch (final ResolverException e) {
throw new SecurityException("Error resolving trusted names", e);
}
} else {
@@ -153,7 +154,7 @@ public class PKIXX509CredentialTrustEngine implements PKIXTrustEngine<X509Creden
try {
return validate(untrustedCredential, trustedNames, pkixResolver.resolve(trustBasisCriteria));
- } catch (ResolverException e) {
+ } catch (final ResolverException e) {
throw new SecurityException("Error resolving trusted credentials", e);
}
}
@@ -187,7 +188,7 @@ public class PKIXX509CredentialTrustEngine implements PKIXTrustEngine<X509Creden
log.debug("Credential trust established via PKIX validation");
return true;
}
- } catch (SecurityException e) {
+ } catch (final SecurityException e) {
// log the operational error, but allow other validation info sets to be tried
log.debug("Error performing PKIX validation on untrusted credential", e);
}
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/StaticPKIXValidationInformationResolver.java b/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/StaticPKIXValidationInformationResolver.java
index e4c02e9..e0abb30 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/StaticPKIXValidationInformationResolver.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/StaticPKIXValidationInformationResolver.java
@@ -73,7 +73,7 @@ public class StaticPKIXValidationInformationResolver implements PKIXValidationIn
* from an instance of {@link TrustedNamesCriterion} in the criteria set
*/
public StaticPKIXValidationInformationResolver(@Nullable final List<PKIXValidationInformation> info,
- @Nullable final Set<String> names, boolean supportDynamicNames) {
+ @Nullable final Set<String> names, final boolean supportDynamicNames) {
if (info != null) {
pkixInfo = new ArrayList<>(info);
} else {
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/x509/tls/impl/BasicClientTLSValidationParametersResolver.java b/opensaml-security-impl/src/main/java/org/opensaml/security/x509/tls/impl/BasicClientTLSValidationParametersResolver.java
index 3d7ab43..4f63a19 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/x509/tls/impl/BasicClientTLSValidationParametersResolver.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/x509/tls/impl/BasicClientTLSValidationParametersResolver.java
@@ -48,7 +48,7 @@ import org.opensaml.security.x509.tls.ClientTLSValidationParametersResolver;
public class BasicClientTLSValidationParametersResolver implements ClientTLSValidationParametersResolver {
/** {@inheritDoc} */
- @Nonnull @NonnullElements public Iterable<ClientTLSValidationParameters> resolve(CriteriaSet criteria)
+ @Nonnull @NonnullElements public Iterable<ClientTLSValidationParameters> resolve(final CriteriaSet criteria)
throws ResolverException {
ClientTLSValidationParameters params = resolveSingle(criteria);
if (params != null) {
@@ -59,7 +59,7 @@ public class BasicClientTLSValidationParametersResolver implements ClientTLSVali
}
/** {@inheritDoc} */
- @Nonnull public ClientTLSValidationParameters resolveSingle(CriteriaSet criteria) throws ResolverException {
+ @Nonnull public ClientTLSValidationParameters resolveSingle(final CriteriaSet criteria) throws ResolverException {
Constraint.isNotNull(criteria, "CriteriaSet was null");
Constraint.isNotNull(criteria.get(ClientTLSValidationConfigurationCriterion.class),
"Resolver requires an instance of ClientTLSValidationConfigurationCriterion");
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/x509/tls/impl/StaticX509CredentialKeyManager.java b/opensaml-security-impl/src/main/java/org/opensaml/security/x509/tls/impl/StaticX509CredentialKeyManager.java
index 866f93e..c20e462 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/x509/tls/impl/StaticX509CredentialKeyManager.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/x509/tls/impl/StaticX509CredentialKeyManager.java
@@ -55,7 +55,7 @@ public class StaticX509CredentialKeyManager implements X509KeyManager {
*
* @param credential the static credential managed by this key manager
*/
- public StaticX509CredentialKeyManager(X509Credential credential) {
+ public StaticX509CredentialKeyManager(final X509Credential credential) {
super();
Constraint.isNotNull(credential, "Credential may not be null");
privateKey = Constraint.isNotNull(credential.getPrivateKey(),
@@ -72,7 +72,7 @@ public class StaticX509CredentialKeyManager implements X509KeyManager {
* @param key the private key managed by this key manager
* @param chain the certificate chain managed by this key manager
*/
- public StaticX509CredentialKeyManager(PrivateKey key, Collection<X509Certificate> chain) {
+ public StaticX509CredentialKeyManager(final PrivateKey key, final Collection<X509Certificate> chain) {
super();
privateKey = Constraint.isNotNull(key, "PrivateKey may not be null");
certificateChain = Constraint.isNotNull(chain,
@@ -81,37 +81,37 @@ public class StaticX509CredentialKeyManager implements X509KeyManager {
}
/** {@inheritDoc} */
- public String chooseClientAlias(String[] arg0, Principal[] arg1, Socket arg2) {
+ public String chooseClientAlias(final String[] arg0, final Principal[] arg1, final Socket arg2) {
log.trace("In chooseClientAlias");
return internalAlias;
}
/** {@inheritDoc} */
- public String[] getClientAliases(String arg0, Principal[] arg1) {
+ public String[] getClientAliases(final String arg0, final Principal[] arg1) {
log.trace("In getClientAliases");
return new String[] {internalAlias};
}
/** {@inheritDoc} */
- public java.security.cert.X509Certificate[] getCertificateChain( String arg0) {
+ public java.security.cert.X509Certificate[] getCertificateChain( final String arg0) {
log.trace("In getCertificateChain");
return internalAlias.equals(arg0) ? certificateChain : null;
}
/** {@inheritDoc} */
- public PrivateKey getPrivateKey(String arg0) {
+ public PrivateKey getPrivateKey(final String arg0) {
log.trace("In getPrivateKey");
return internalAlias.equals(arg0) ? privateKey : null;
}
/** {@inheritDoc} */
- public String chooseServerAlias(String arg0, Principal[] arg1, Socket arg2) {
+ public String chooseServerAlias(final String arg0, final Principal[] arg1, final Socket arg2) {
log.trace("In chooseServerAlias");
return internalAlias;
}
/** {@inheritDoc} */
- public String[] getServerAliases(String arg0, Principal[] arg1) {
+ public String[] getServerAliases(final String arg0, final Principal[] arg1) {
log.trace("In getServerAliases");
return new String[] {internalAlias};
}
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/x509/tls/impl/ThreadLocalX509CredentialKeyManager.java b/opensaml-security-impl/src/main/java/org/opensaml/security/x509/tls/impl/ThreadLocalX509CredentialKeyManager.java
index cf3cf43..db32bb7 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/x509/tls/impl/ThreadLocalX509CredentialKeyManager.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/x509/tls/impl/ThreadLocalX509CredentialKeyManager.java
@@ -40,19 +40,19 @@ public class ThreadLocalX509CredentialKeyManager implements X509KeyManager {
private String internalAlias = "internalAlias-ThreadLocal";
/** {@inheritDoc} */
- public String chooseClientAlias(String[] arg0, Principal[] arg1, Socket arg2) {
+ public String chooseClientAlias(final String[] arg0, final Principal[] arg1, final Socket arg2) {
log.trace("In chooseClientAlias");
return internalAlias;
}
/** {@inheritDoc} */
- public String[] getClientAliases(String arg0, Principal[] arg1) {
+ public String[] getClientAliases(final String arg0, final Principal[] arg1) {
log.trace("In getClientAliases");
return new String[] {internalAlias};
}
/** {@inheritDoc} */
- public X509Certificate[] getCertificateChain(String arg0) {
+ public X509Certificate[] getCertificateChain(final String arg0) {
log.trace("In getCertificateChain");
return internalAlias.equals(arg0) && ThreadLocalX509CredentialContext.haveCurrent()
? ThreadLocalX509CredentialContext.getCredential().getEntityCertificateChain()
@@ -60,20 +60,20 @@ public class ThreadLocalX509CredentialKeyManager implements X509KeyManager {
}
/** {@inheritDoc} */
- public PrivateKey getPrivateKey(String arg0) {
+ public PrivateKey getPrivateKey(final String arg0) {
log.trace("In getPrivateKey");
return internalAlias.equals(arg0) && ThreadLocalX509CredentialContext.haveCurrent()
? ThreadLocalX509CredentialContext.getCredential().getPrivateKey() : null;
}
/** {@inheritDoc} */
- public String chooseServerAlias(String arg0, Principal[] arg1, Socket arg2) {
+ public String chooseServerAlias(final String arg0, final Principal[] arg1, final Socket arg2) {
log.trace("In chooseServerAlias");
return internalAlias;
}
/** {@inheritDoc} */
- public String[] getServerAliases(String arg0, Principal[] arg1) {
+ public String[] getServerAliases(final String arg0, final Principal[] arg1) {
log.trace("In getServerAliases");
return new String[] {internalAlias};
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list