[java-opensaml] 01/04: JPAR-85 - Checkstyle, check final parameters
Tom Zeller
tzeller at dragonacea.biz
Wed Aug 9 22:49:40 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=22d780449ffe40b8d6f74f94c00f758f20f5e685
commit 22d780449ffe40b8d6f74f94c00f758f20f5e685
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Wed Aug 9 21:35:36 2017 -0500
JPAR-85 - Checkstyle, check final parameters
---
.../org/opensaml/security/criteria/KeyAlgorithmCriterion.java | 2 +-
.../org/opensaml/security/criteria/KeyLengthCriterion.java | 2 +-
.../java/org/opensaml/security/criteria/KeyNameCriterion.java | 2 +-
.../org/opensaml/security/criteria/PeerEntityIDCriterion.java | 2 +-
.../org/opensaml/security/criteria/PublicKeyCriterion.java | 2 +-
.../java/org/opensaml/security/criteria/UsageCriterion.java | 2 +-
.../main/java/org/opensaml/security/crypto/SigningUtil.java | 11 ++++++-----
.../security/httpclient/HttpClientSecurityContextHandler.java | 4 ++--
.../security/httpclient/HttpClientSecuritySupport.java | 4 ++--
.../messaging/ClientTLSSecurityParametersContext.java | 2 +-
.../messaging/ServletRequestX509CredentialAdapter.java | 2 +-
.../org/opensaml/security/x509/PKIXValidationOptions.java | 6 +++---
.../org/opensaml/security/x509/TrustedNamesCriterion.java | 2 +-
.../java/org/opensaml/security/x509/X509DigestCriterion.java | 2 +-
.../org/opensaml/security/x509/X509IssuerSerialCriterion.java | 2 +-
.../security/x509/X509SubjectKeyIdentifierCriterion.java | 2 +-
.../org/opensaml/security/x509/X509SubjectNameCriterion.java | 2 +-
.../opensaml/security/x509/tls/CertificateNameOptions.java | 10 +++++-----
.../x509/tls/ClientTLSValidationConfigurationCriterion.java | 6 +++---
19 files changed, 34 insertions(+), 33 deletions(-)
diff --git a/opensaml-security-api/src/main/java/org/opensaml/security/criteria/KeyAlgorithmCriterion.java b/opensaml-security-api/src/main/java/org/opensaml/security/criteria/KeyAlgorithmCriterion.java
index 340fbc7..fa19afb 100644
--- a/opensaml-security-api/src/main/java/org/opensaml/security/criteria/KeyAlgorithmCriterion.java
+++ b/opensaml-security-api/src/main/java/org/opensaml/security/criteria/KeyAlgorithmCriterion.java
@@ -77,7 +77,7 @@ public final class KeyAlgorithmCriterion implements Criterion {
}
/** {@inheritDoc} */
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
diff --git a/opensaml-security-api/src/main/java/org/opensaml/security/criteria/KeyLengthCriterion.java b/opensaml-security-api/src/main/java/org/opensaml/security/criteria/KeyLengthCriterion.java
index 8da88ac..671c4c9 100644
--- a/opensaml-security-api/src/main/java/org/opensaml/security/criteria/KeyLengthCriterion.java
+++ b/opensaml-security-api/src/main/java/org/opensaml/security/criteria/KeyLengthCriterion.java
@@ -74,7 +74,7 @@ public final class KeyLengthCriterion implements Criterion {
}
/** {@inheritDoc} */
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
diff --git a/opensaml-security-api/src/main/java/org/opensaml/security/criteria/KeyNameCriterion.java b/opensaml-security-api/src/main/java/org/opensaml/security/criteria/KeyNameCriterion.java
index f7ccbef..472a2b5 100644
--- a/opensaml-security-api/src/main/java/org/opensaml/security/criteria/KeyNameCriterion.java
+++ b/opensaml-security-api/src/main/java/org/opensaml/security/criteria/KeyNameCriterion.java
@@ -77,7 +77,7 @@ public final class KeyNameCriterion implements Criterion {
}
/** {@inheritDoc} */
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
diff --git a/opensaml-security-api/src/main/java/org/opensaml/security/criteria/PeerEntityIDCriterion.java b/opensaml-security-api/src/main/java/org/opensaml/security/criteria/PeerEntityIDCriterion.java
index 9a43d03..a68982e 100644
--- a/opensaml-security-api/src/main/java/org/opensaml/security/criteria/PeerEntityIDCriterion.java
+++ b/opensaml-security-api/src/main/java/org/opensaml/security/criteria/PeerEntityIDCriterion.java
@@ -82,7 +82,7 @@ public final class PeerEntityIDCriterion implements Criterion {
}
/** {@inheritDoc} */
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
diff --git a/opensaml-security-api/src/main/java/org/opensaml/security/criteria/PublicKeyCriterion.java b/opensaml-security-api/src/main/java/org/opensaml/security/criteria/PublicKeyCriterion.java
index 960641f..7591c4b 100644
--- a/opensaml-security-api/src/main/java/org/opensaml/security/criteria/PublicKeyCriterion.java
+++ b/opensaml-security-api/src/main/java/org/opensaml/security/criteria/PublicKeyCriterion.java
@@ -76,7 +76,7 @@ public final class PublicKeyCriterion implements Criterion {
}
/** {@inheritDoc} */
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
diff --git a/opensaml-security-api/src/main/java/org/opensaml/security/criteria/UsageCriterion.java b/opensaml-security-api/src/main/java/org/opensaml/security/criteria/UsageCriterion.java
index 45f8c0e..dfb830d 100644
--- a/opensaml-security-api/src/main/java/org/opensaml/security/criteria/UsageCriterion.java
+++ b/opensaml-security-api/src/main/java/org/opensaml/security/criteria/UsageCriterion.java
@@ -80,7 +80,7 @@ public final class UsageCriterion implements Criterion {
}
/** {@inheritDoc} */
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
diff --git a/opensaml-security-api/src/main/java/org/opensaml/security/crypto/SigningUtil.java b/opensaml-security-api/src/main/java/org/opensaml/security/crypto/SigningUtil.java
index 92a843c..60b3295 100644
--- a/opensaml-security-api/src/main/java/org/opensaml/security/crypto/SigningUtil.java
+++ b/opensaml-security-api/src/main/java/org/opensaml/security/crypto/SigningUtil.java
@@ -60,7 +60,8 @@ public final class SigningUtil {
* @throws SecurityException throw if the computation process results in an error
*/
@Nonnull public static byte[] sign(@Nonnull final Credential signingCredential,
- @Nonnull final String jcaAlgorithmID, boolean isMAC, @Nonnull final byte[] input) throws SecurityException {
+ @Nonnull final String jcaAlgorithmID, final boolean isMAC, @Nonnull final byte[] input)
+ throws SecurityException {
Logger log = getLogger();
Key signingKey = CredentialSupport.extractSigningKey(signingCredential);
@@ -108,7 +109,7 @@ public final class SigningUtil {
byte[] rawSignature = signature.sign();
log.debug("Computed signature: {}", Hex.encodeHex(rawSignature));
return rawSignature;
- } catch (GeneralSecurityException e) {
+ } catch (final GeneralSecurityException e) {
log.error("Error during signature generation", e);
throw new SecurityException("Error during signature generation", e);
}
@@ -143,7 +144,7 @@ public final class SigningUtil {
byte[] rawMAC = mac.doFinal();
log.debug("Computed MAC: {}", Hex.encodeHexString(rawMAC));
return rawMAC;
- } catch (GeneralSecurityException e) {
+ } catch (final GeneralSecurityException e) {
log.error("Error during MAC generation", e);
throw new SecurityException("Error during MAC generation", e);
}
@@ -165,7 +166,7 @@ public final class SigningUtil {
* @throws SecurityException thrown if the signature computation or verification process results in an error
*/
public static boolean verify(@Nonnull final Credential verificationCredential,
- @Nonnull final String jcaAlgorithmID, boolean isMAC, @Nonnull final byte[] signature,
+ @Nonnull final String jcaAlgorithmID, final boolean isMAC, @Nonnull final byte[] signature,
@Nonnull final byte[] input) throws SecurityException {
Logger log = getLogger();
@@ -215,7 +216,7 @@ public final class SigningUtil {
sig.initVerify(verificationKey);
sig.update(input);
return sig.verify(signature);
- } catch (GeneralSecurityException e) {
+ } catch (final GeneralSecurityException e) {
log.error("Error during signature verification", e);
throw new SecurityException("Error during signature verification", e);
}
diff --git a/opensaml-security-api/src/main/java/org/opensaml/security/httpclient/HttpClientSecurityContextHandler.java b/opensaml-security-api/src/main/java/org/opensaml/security/httpclient/HttpClientSecurityContextHandler.java
index 01cfb18..6571b25 100644
--- a/opensaml-security-api/src/main/java/org/opensaml/security/httpclient/HttpClientSecurityContextHandler.java
+++ b/opensaml-security-api/src/main/java/org/opensaml/security/httpclient/HttpClientSecurityContextHandler.java
@@ -60,7 +60,7 @@ public class HttpClientSecurityContextHandler extends AbstractInitializableCompo
}
/** {@inheritDoc} */
- public void invokeBefore(HttpClientContext context, HttpUriRequest request) throws IOException {
+ public void invokeBefore(final HttpClientContext context, final HttpUriRequest request) throws IOException {
ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
HttpClientSecuritySupport.marshalSecurityParameters(context, httpClientSecurityParameters, false);
@@ -68,7 +68,7 @@ public class HttpClientSecurityContextHandler extends AbstractInitializableCompo
}
/** {@inheritDoc} */
- public void invokeAfter(HttpClientContext context, HttpUriRequest request) throws IOException {
+ public void invokeAfter(final HttpClientContext context, final HttpUriRequest request) throws IOException {
ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
HttpClientSecuritySupport.checkTLSCredentialEvaluated(context, request.getURI().getScheme());
diff --git a/opensaml-security-api/src/main/java/org/opensaml/security/httpclient/HttpClientSecuritySupport.java b/opensaml-security-api/src/main/java/org/opensaml/security/httpclient/HttpClientSecuritySupport.java
index 5b93b4f..383f406 100644
--- a/opensaml-security-api/src/main/java/org/opensaml/security/httpclient/HttpClientSecuritySupport.java
+++ b/opensaml-security-api/src/main/java/org/opensaml/security/httpclient/HttpClientSecuritySupport.java
@@ -124,7 +124,7 @@ public final class HttpClientSecuritySupport {
* @param replace whether a non-null security parameter value should replace an existing context value
*/
public static void marshalSecurityParameters(@Nonnull final HttpClientContext context,
- @Nullable final HttpClientSecurityParameters securityParameters, boolean replace) {
+ @Nullable final HttpClientSecurityParameters securityParameters, final boolean replace) {
if (securityParameters == null) {
return;
}
@@ -165,7 +165,7 @@ public final class HttpClientSecuritySupport {
* @param replace whether a non-null argument value should replace an existing context value
*/
public static void setContextValue(@Nonnull final HttpClientContext context,
- @Nonnull final String attributeName, @Nullable Object attributeValue, boolean replace) {
+ @Nonnull final String attributeName, @Nullable final Object attributeValue, final boolean replace) {
if (attributeValue == null) {
return;
}
diff --git a/opensaml-security-api/src/main/java/org/opensaml/security/messaging/ClientTLSSecurityParametersContext.java b/opensaml-security-api/src/main/java/org/opensaml/security/messaging/ClientTLSSecurityParametersContext.java
index d41035c..6e43af0 100644
--- a/opensaml-security-api/src/main/java/org/opensaml/security/messaging/ClientTLSSecurityParametersContext.java
+++ b/opensaml-security-api/src/main/java/org/opensaml/security/messaging/ClientTLSSecurityParametersContext.java
@@ -52,7 +52,7 @@ public class ClientTLSSecurityParametersContext extends BaseContext {
*
* @param flag true if should evaluate, false otherwise
*/
- public void setEvaluateClientCertificate(boolean flag) {
+ public void setEvaluateClientCertificate(final boolean flag) {
evaluateClientCertificate = flag;
}
diff --git a/opensaml-security-api/src/main/java/org/opensaml/security/messaging/ServletRequestX509CredentialAdapter.java b/opensaml-security-api/src/main/java/org/opensaml/security/messaging/ServletRequestX509CredentialAdapter.java
index 5e90a8a..deddda2 100644
--- a/opensaml-security-api/src/main/java/org/opensaml/security/messaging/ServletRequestX509CredentialAdapter.java
+++ b/opensaml-security-api/src/main/java/org/opensaml/security/messaging/ServletRequestX509CredentialAdapter.java
@@ -54,7 +54,7 @@ public class ServletRequestX509CredentialAdapter extends AbstractCredential impl
* @throws SecurityException if request does not contain an X.509 client certificate in
* request attribute 'javax.servlet.request.X509Certificate'
*/
- public ServletRequestX509CredentialAdapter(ServletRequest request) throws SecurityException {
+ public ServletRequestX509CredentialAdapter(final ServletRequest request) throws SecurityException {
X509Certificate[] chain = (X509Certificate[]) request.getAttribute(X509_CERT_REQUEST_ATTRIBUTE);
if (chain == null || chain.length == 0) {
throw new SecurityException("Servlet request does not contain X.509 certificates in attribute "
diff --git a/opensaml-security-api/src/main/java/org/opensaml/security/x509/PKIXValidationOptions.java b/opensaml-security-api/src/main/java/org/opensaml/security/x509/PKIXValidationOptions.java
index a6c74f0..e8a5a77 100644
--- a/opensaml-security-api/src/main/java/org/opensaml/security/x509/PKIXValidationOptions.java
+++ b/opensaml-security-api/src/main/java/org/opensaml/security/x509/PKIXValidationOptions.java
@@ -65,7 +65,7 @@ public class PKIXValidationOptions {
*
* @param flag whether to process empty CRLs
*/
- public void setProcessEmptyCRLs(boolean flag) {
+ public void setProcessEmptyCRLs(final boolean flag) {
this.processEmptyCRLs = flag;
}
@@ -87,7 +87,7 @@ public class PKIXValidationOptions {
*
* @param flag whether expired CRLs should be processed
*/
- public void setProcessExpiredCRLs(boolean flag) {
+ public void setProcessExpiredCRLs(final boolean flag) {
this.processExpiredCRLs = flag;
}
@@ -109,7 +109,7 @@ public class PKIXValidationOptions {
*
* @param flag whether to process CRLs from an untrusted credential
*/
- public void setProcessCredentialCRLs(boolean flag) {
+ public void setProcessCredentialCRLs(final boolean flag) {
this.processCredentialCRLs = flag;
}
diff --git a/opensaml-security-api/src/main/java/org/opensaml/security/x509/TrustedNamesCriterion.java b/opensaml-security-api/src/main/java/org/opensaml/security/x509/TrustedNamesCriterion.java
index 284e865..5dd94ac 100644
--- a/opensaml-security-api/src/main/java/org/opensaml/security/x509/TrustedNamesCriterion.java
+++ b/opensaml-security-api/src/main/java/org/opensaml/security/x509/TrustedNamesCriterion.java
@@ -91,7 +91,7 @@ public class TrustedNamesCriterion implements Criterion {
}
/** {@inheritDoc} */
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
diff --git a/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509DigestCriterion.java b/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509DigestCriterion.java
index 7c602f1..b832117 100644
--- a/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509DigestCriterion.java
+++ b/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509DigestCriterion.java
@@ -112,7 +112,7 @@ public final class X509DigestCriterion implements Criterion {
}
/** {@inheritDoc} */
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
diff --git a/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509IssuerSerialCriterion.java b/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509IssuerSerialCriterion.java
index 913db5c..931df10 100644
--- a/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509IssuerSerialCriterion.java
+++ b/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509IssuerSerialCriterion.java
@@ -105,7 +105,7 @@ public final class X509IssuerSerialCriterion implements Criterion {
}
/** {@inheritDoc} */
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
diff --git a/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509SubjectKeyIdentifierCriterion.java b/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509SubjectKeyIdentifierCriterion.java
index 0bc9647..14339c1 100644
--- a/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509SubjectKeyIdentifierCriterion.java
+++ b/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509SubjectKeyIdentifierCriterion.java
@@ -77,7 +77,7 @@ public final class X509SubjectKeyIdentifierCriterion implements Criterion {
}
/** {@inheritDoc} */
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
diff --git a/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509SubjectNameCriterion.java b/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509SubjectNameCriterion.java
index ce5dfd8..4c70dac 100644
--- a/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509SubjectNameCriterion.java
+++ b/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509SubjectNameCriterion.java
@@ -75,7 +75,7 @@ public final class X509SubjectNameCriterion implements Criterion {
}
/** {@inheritDoc} */
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
diff --git a/opensaml-security-api/src/main/java/org/opensaml/security/x509/tls/CertificateNameOptions.java b/opensaml-security-api/src/main/java/org/opensaml/security/x509/tls/CertificateNameOptions.java
index 149ea0a..374f9e5 100644
--- a/opensaml-security-api/src/main/java/org/opensaml/security/x509/tls/CertificateNameOptions.java
+++ b/opensaml-security-api/src/main/java/org/opensaml/security/x509/tls/CertificateNameOptions.java
@@ -80,7 +80,7 @@ public class CertificateNameOptions implements Cloneable {
*
* @param flag new new evaluateSubjectCommonName value.
*/
- public void setEvaluateSubjectCommonName(boolean flag) {
+ public void setEvaluateSubjectCommonName(final boolean flag) {
evaluateSubjectCommonName = flag;
}
@@ -98,7 +98,7 @@ public class CertificateNameOptions implements Cloneable {
*
* @param flag the new evaluateSubjectDN value.
*/
- public void setEvaluateSubjectDN(boolean flag) {
+ public void setEvaluateSubjectDN(final boolean flag) {
evaluateSubjectDN = flag;
}
@@ -144,7 +144,7 @@ public class CertificateNameOptions implements Cloneable {
*
* @param handler the new x500DNHandler value.
*/
- public void setX500DNHandler(X500DNHandler handler) {
+ public void setX500DNHandler(final X500DNHandler handler) {
if (handler == null) {
throw new IllegalArgumentException("X500DNHandler may not be null");
}
@@ -165,7 +165,7 @@ public class CertificateNameOptions implements Cloneable {
*
* @param format the new x500SubjectDNFormat value.
*/
- public void setX500SubjectDNFormat(String format) {
+ public void setX500SubjectDNFormat(final String format) {
x500SubjectDNFormat = format;
}
@@ -174,7 +174,7 @@ public class CertificateNameOptions implements Cloneable {
CertificateNameOptions clonedOptions;
try {
clonedOptions = (CertificateNameOptions) super.clone();
- } catch (CloneNotSupportedException e) {
+ } catch (final CloneNotSupportedException e) {
// we know we're cloneable, so this will never happen
return null;
}
diff --git a/opensaml-security-api/src/main/java/org/opensaml/security/x509/tls/ClientTLSValidationConfigurationCriterion.java b/opensaml-security-api/src/main/java/org/opensaml/security/x509/tls/ClientTLSValidationConfigurationCriterion.java
index df2f2d0..3d8dcae 100644
--- a/opensaml-security-api/src/main/java/org/opensaml/security/x509/tls/ClientTLSValidationConfigurationCriterion.java
+++ b/opensaml-security-api/src/main/java/org/opensaml/security/x509/tls/ClientTLSValidationConfigurationCriterion.java
@@ -47,7 +47,7 @@ public class ClientTLSValidationConfigurationCriterion implements Criterion {
*
* @param configurations list of configuration instances
*/
- public ClientTLSValidationConfigurationCriterion(@Nonnull @NonnullElements @NotEmpty
+ public ClientTLSValidationConfigurationCriterion(@Nonnull @NonnullElements @NotEmpty final
List<ClientTLSValidationConfiguration> configurations) {
Constraint.isNotNull(configurations, "List of configurations cannot be null");
configs = new ArrayList<>(Collections2.filter(configurations, Predicates.notNull()));
@@ -60,7 +60,7 @@ public class ClientTLSValidationConfigurationCriterion implements Criterion {
*
* @param configurations varargs array of configuration instances
*/
- public ClientTLSValidationConfigurationCriterion(@Nonnull @NonnullElements @NotEmpty
+ public ClientTLSValidationConfigurationCriterion(@Nonnull @NonnullElements @NotEmpty final
ClientTLSValidationConfiguration... configurations) {
Constraint.isNotNull(configurations, "List of configurations cannot be null");
configs = new ArrayList<>(Collections2.filter(Arrays.asList(configurations), Predicates.notNull()));
@@ -94,7 +94,7 @@ public class ClientTLSValidationConfigurationCriterion implements Criterion {
/** {@inheritDoc} */
@Override
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list