[java-opensaml] branch master updated: Checkstyle
Scott Cantor
cantor.2 at osu.edu
Wed Apr 12 16:51:09 EDT 2017
This is an automated email from the git hooks/post-receive script.
scantor 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=639271617da43ab9cc0cafc7becbdda02982cc15
The following commit(s) were added to refs/heads/master by this push:
new 6392716 Checkstyle
6392716 is described below
commit 639271617da43ab9cc0cafc7becbdda02982cc15
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Apr 12 16:51:06 2017 -0400
Checkstyle
---
.../opensaml/xmlsec/impl/AbstractSecurityParametersResolver.java | 2 ++
.../signature/support/impl/SignatureAlgorithmValidator.java | 9 ++++++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/AbstractSecurityParametersResolver.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/AbstractSecurityParametersResolver.java
index 87c21e4..b203267 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/AbstractSecurityParametersResolver.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/AbstractSecurityParametersResolver.java
@@ -87,6 +87,7 @@ public abstract class AbstractSecurityParametersResolver<ProductType>
return KeyInfoSupport.getKeyInfoGenerator(credential, manager, keyInfoProfileName);
}
+// Checkstyle: ReturnCount OFF
/**
* Resolve and populate the effective whitelist or blacklist on the supplied instance of
* {@link WhitelistBlacklistParameters}.
@@ -139,6 +140,7 @@ public abstract class AbstractSecurityParametersResolver<ProductType>
}
}
+// Checkstyle: ReturnCount ON
/**
* Get a predicate which operates according to the effective configured whitelist and blacklist policy.
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/SignatureAlgorithmValidator.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/SignatureAlgorithmValidator.java
index 609da31..4fe009c 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/SignatureAlgorithmValidator.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/SignatureAlgorithmValidator.java
@@ -81,7 +81,8 @@ public class SignatureAlgorithmValidator {
*
* @param params signature validation parameters containing the whitelist and blacklist
*/
- public SignatureAlgorithmValidator(@Nonnull @ParameterName(name="params") final SignatureValidationParameters params) {
+ public SignatureAlgorithmValidator(
+ @Nonnull @ParameterName(name="params") final SignatureValidationParameters params) {
Constraint.isNotNull(params, "SignatureValidationParameters may not be null");
whitelistedAlgorithmURIs = params.getWhitelistedAlgorithms();
blacklistedAlgorithmURIs = params.getBlacklistedAlgorithms();
@@ -93,7 +94,8 @@ public class SignatureAlgorithmValidator {
* @param whitelistAlgos the algorithm whitelist
* @param blacklistAlgos the algorithm blacklist
*/
- public SignatureAlgorithmValidator(@Nullable @ParameterName(name="whitelistAlgos") final Collection<String> whitelistAlgos,
+ public SignatureAlgorithmValidator(
+ @Nullable @ParameterName(name="whitelistAlgos") final Collection<String> whitelistAlgos,
@Nullable @ParameterName(name="blacklistAlgos") final Collection<String> blacklistAlgos) {
whitelistedAlgorithmURIs = whitelistAlgos;
blacklistedAlgorithmURIs = blacklistAlgos;
@@ -163,7 +165,8 @@ public class SignatureAlgorithmValidator {
* @return list of algorithm URIs
* @throws SignatureException if a DigestMethod is found to have a null or empty Algorithm attribute
*/
- @Nonnull protected List<String> getDigestMethods(@Nonnull final Signature signatureXMLObject) throws SignatureException {
+ @Nonnull protected List<String> getDigestMethods(
+ @Nonnull final Signature signatureXMLObject) throws SignatureException {
final ArrayList<String> digestMethodAlgorithms = new ArrayList<>();
final Element signature = signatureXMLObject.getDOM();
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list