[java-opensaml] branch master updated: Checkstyle
Scott Cantor
cantor.2 at osu.edu
Wed Apr 12 16:59:31 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=f8636bec4bdec14af39eda94b8756cfa841dbab9
The following commit(s) were added to refs/heads/master by this push:
new f8636be Checkstyle
f8636be is described below
commit f8636bec4bdec14af39eda94b8756cfa841dbab9
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Apr 12 16:59:28 2017 -0400
Checkstyle
---
.../binding/impl/SAMLAddAttributeConsumingServiceHandler.java | 2 ++
.../saml/common/binding/impl/SAMLMetadataLookupHandler.java | 2 ++
.../security/impl/BaseSAMLSimpleSignatureSecurityHandler.java | 4 +++-
.../impl/SAMLProtocolMessageXMLSignatureSecurityHandler.java | 2 ++
.../profile/impl/PopulateSignatureSigningParameters.java | 4 ++--
.../saml/common/profile/impl/VerifyChannelBindings.java | 2 ++
.../saml1/binding/impl/SAML1ArtifactRequestIssuerHandler.java | 2 ++
.../security/impl/ExtractChannelBindingsExtensionsHandler.java | 4 +++-
.../security/impl/SAML2AuthnRequestsSignedSecurityHandler.java | 10 +++++++---
.../impl/WSSecuritySAML20AssertionTokenSecurityHandler.java | 5 +++--
10 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/SAMLAddAttributeConsumingServiceHandler.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/SAMLAddAttributeConsumingServiceHandler.java
index ac066a4..2418ab8 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/SAMLAddAttributeConsumingServiceHandler.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/SAMLAddAttributeConsumingServiceHandler.java
@@ -103,6 +103,7 @@ public class SAMLAddAttributeConsumingServiceHandler extends AbstractMessageHand
return true;
}
+// Checkstyle: ReturnCount OFF
/** {@inheritDoc}*/
@Override protected void doInvoke(@Nonnull final MessageContext messageContext) throws MessageHandlerException {
final SAMLMetadataContext metadataContext = metadataContextLookupStrategy.apply(messageContext);
@@ -138,6 +139,7 @@ public class SAMLAddAttributeConsumingServiceHandler extends AbstractMessageHand
log.debug("{} No AttributeConsumingService selected", getLogPrefix());
}
}
+// Checkstyle: ReturnCount ON
/** Default lookup function that reads from a SAML 2 {@link AuthnRequest}. */
private class AuthnRequestIndexLookup implements Function<MessageContext,Integer> {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/SAMLMetadataLookupHandler.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/SAMLMetadataLookupHandler.java
index abe6c89..87d295f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/SAMLMetadataLookupHandler.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/SAMLMetadataLookupHandler.java
@@ -98,6 +98,7 @@ public class SAMLMetadataLookupHandler extends AbstractMessageHandler {
}
}
+// Checkstyle: ReturnCount OFF
/** {@inheritDoc} */
@Override
protected void doInvoke(@Nonnull final MessageContext messageContext) throws MessageHandlerException {
@@ -147,5 +148,6 @@ public class SAMLMetadataLookupHandler extends AbstractMessageHandler {
log.error("{} ResolverException thrown during metadata lookup", getLogPrefix(), e);
}
}
+// Checkstyle: ReturnCount OFF
}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/BaseSAMLSimpleSignatureSecurityHandler.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/BaseSAMLSimpleSignatureSecurityHandler.java
index fb7c8a8..43a1f0a 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/BaseSAMLSimpleSignatureSecurityHandler.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/BaseSAMLSimpleSignatureSecurityHandler.java
@@ -142,13 +142,14 @@ public abstract class BaseSAMLSimpleSignatureSecurityHandler extends AbstractMes
return true;
}
+// Checkstyle: ReturnCount OFF
/** {@inheritDoc} */
@Override
protected void doInvoke(@Nonnull final MessageContext messageContext) throws MessageHandlerException {
log.debug("{} Evaluating simple signature rule of type: {}", getLogPrefix(), getClass().getName());
if (!ruleHandles(messageContext)) {
- log.debug("{} Handler can not handle this request, skipping processing", getLogPrefix());
+ log.debug("{} Handler can not handle this request, skipping", getLogPrefix());
return;
}
@@ -173,6 +174,7 @@ public abstract class BaseSAMLSimpleSignatureSecurityHandler extends AbstractMes
doEvaluate(signature, signedContent, sigAlg, messageContext);
}
+// Checkstyle: ReturnCount OFF
/**
* Evaluate the simple signature based on information in the request and/or message context.
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/SAMLProtocolMessageXMLSignatureSecurityHandler.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/SAMLProtocolMessageXMLSignatureSecurityHandler.java
index fb2e972..668d359 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/SAMLProtocolMessageXMLSignatureSecurityHandler.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/SAMLProtocolMessageXMLSignatureSecurityHandler.java
@@ -87,6 +87,7 @@ public class SAMLProtocolMessageXMLSignatureSecurityHandler extends BaseSAMLXMLS
signaturePrevalidator = validator;
}
+// Checkstyle: ReturnCount OFF
/** {@inheritDoc} */
@Override
public void doInvoke(@Nonnull final MessageContext messageContext) throws MessageHandlerException {
@@ -108,6 +109,7 @@ public class SAMLProtocolMessageXMLSignatureSecurityHandler extends BaseSAMLXMLS
doEvaluate(signature, signableObject, messageContext);
}
+// Checkstyle: ReturnCount OFF
/**
* Perform cryptographic validation and trust evaluation on the Signature token using the configured Signature
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/PopulateSignatureSigningParameters.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/PopulateSignatureSigningParameters.java
index 4e1fa5c..7ee5393 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/PopulateSignatureSigningParameters.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/PopulateSignatureSigningParameters.java
@@ -189,7 +189,7 @@ public class PopulateSignatureSigningParameters extends AbstractConditionalProfi
}
}
-// Checkstyle: CyclomaticComplexity OFF
+// Checkstyle: CyclomaticComplexity|ReturnCount OFF
/** {@inheritDoc} */
@Override
protected void doExecute(@Nonnull final ProfileRequestContext profileRequestContext) {
@@ -241,6 +241,6 @@ public class PopulateSignatureSigningParameters extends AbstractConditionalProfi
ActionSupport.buildEvent(profileRequestContext, EventIds.INVALID_SEC_CFG);
}
}
-// Checkstyle: CyclomaticComplexity ON
+// Checkstyle: CyclomaticComplexity|ReturnCount ON
}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/VerifyChannelBindings.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/VerifyChannelBindings.java
index f06dbb8..a4c5b05 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/VerifyChannelBindings.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/VerifyChannelBindings.java
@@ -158,6 +158,7 @@ public class VerifyChannelBindings extends AbstractProfileAction {
return true;
}
+// Checkstyle: ReturnCount OFF
/** {@inheritDoc} */
@Override
protected void doExecute(@Nonnull final ProfileRequestContext profileRequestContext) {
@@ -202,5 +203,6 @@ public class VerifyChannelBindings extends AbstractProfileAction {
ActionSupport.buildEvent(profileRequestContext, SAMLEventIds.CHANNEL_BINDINGS_ERROR);
}
}
+// Checkstyle: ReturnCount ON
}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/impl/SAML1ArtifactRequestIssuerHandler.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/impl/SAML1ArtifactRequestIssuerHandler.java
index ee8efcf..d26b904 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/impl/SAML1ArtifactRequestIssuerHandler.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/impl/SAML1ArtifactRequestIssuerHandler.java
@@ -70,6 +70,7 @@ public class SAML1ArtifactRequestIssuerHandler extends AbstractMessageHandler {
}
}
+// Checkstyle: ReturnCount OFF
/** {@inheritDoc} */
@Override
protected void doInvoke(@Nonnull final MessageContext messageContext) throws MessageHandlerException {
@@ -100,5 +101,6 @@ public class SAML1ArtifactRequestIssuerHandler extends AbstractMessageHandler {
log.error("{} Error resolving first artifact in request: {}", getLogPrefix(), artifact, e);
}
}
+// Checkstyle: ReturnCount ON
}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/security/impl/ExtractChannelBindingsExtensionsHandler.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/security/impl/ExtractChannelBindingsExtensionsHandler.java
index 75d97d7..8160237 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/security/impl/ExtractChannelBindingsExtensionsHandler.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/security/impl/ExtractChannelBindingsExtensionsHandler.java
@@ -58,6 +58,7 @@ public class ExtractChannelBindingsExtensionsHandler extends AbstractMessageHand
return true;
}
+// Checkstyle: ReturnCount OFF
/** {@inheritDoc} */
@Override
protected void doInvoke(@Nonnull final MessageContext messageContext) throws MessageHandlerException {
@@ -90,5 +91,6 @@ public class ExtractChannelBindingsExtensionsHandler extends AbstractMessageHand
log.debug("{} {} ChannelBindings extension(s) found", getLogPrefix(), channelBindings.size());
}
-
+// Checkstyle: ReturnCount ON
+
}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/security/impl/SAML2AuthnRequestsSignedSecurityHandler.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/security/impl/SAML2AuthnRequestsSignedSecurityHandler.java
index f6a44a4..40c6c55 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/security/impl/SAML2AuthnRequestsSignedSecurityHandler.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/security/impl/SAML2AuthnRequestsSignedSecurityHandler.java
@@ -17,6 +17,8 @@
package org.opensaml.saml.saml2.binding.security.impl;
+import javax.annotation.Nonnull;
+
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.handler.AbstractMessageHandler;
import org.opensaml.messaging.handler.MessageHandlerException;
@@ -38,10 +40,11 @@ import com.google.common.base.Strings;
public class SAML2AuthnRequestsSignedSecurityHandler extends AbstractMessageHandler<SAMLObject>{
/** Logger. */
- private final Logger log = LoggerFactory.getLogger(SAML2AuthnRequestsSignedSecurityHandler.class);
+ @Nonnull private final Logger log = LoggerFactory.getLogger(SAML2AuthnRequestsSignedSecurityHandler.class);
+// Checkstyle: ReturnCount OFF
/** {@inheritDoc} */
- public void doInvoke(MessageContext<SAMLObject> messageContext) throws MessageHandlerException {
+ public void doInvoke(@Nonnull final MessageContext<SAMLObject> messageContext) throws MessageHandlerException {
SAMLObject samlMessage = messageContext.getMessage();
if (! (samlMessage instanceof AuthnRequest) ) {
log.debug("Inbound message is not an instance of AuthnRequest, skipping evaluation...");
@@ -81,6 +84,7 @@ public class SAML2AuthnRequestsSignedSecurityHandler extends AbstractMessageHand
}
}
+// Checkstyle: ReturnCount ON
/**
* Determine whether the inbound message is signed.
@@ -88,7 +92,7 @@ public class SAML2AuthnRequestsSignedSecurityHandler extends AbstractMessageHand
* @param messageContext the message context being evaluated
* @return true if the inbound message is signed, otherwise false
*/
- protected boolean isMessageSigned(MessageContext<SAMLObject> messageContext) {
+ protected boolean isMessageSigned(@Nonnull final MessageContext<SAMLObject> messageContext) {
return SAMLBindingSupport.isMessageSigned(messageContext);
}
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/WSSecuritySAML20AssertionTokenSecurityHandler.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/WSSecuritySAML20AssertionTokenSecurityHandler.java
index 441c78e..a151b32 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/WSSecuritySAML20AssertionTokenSecurityHandler.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/WSSecuritySAML20AssertionTokenSecurityHandler.java
@@ -63,7 +63,7 @@ import com.google.common.base.Strings;
public class WSSecuritySAML20AssertionTokenSecurityHandler extends AbstractMessageHandler {
/** Class logger. */
- private final Logger log = LoggerFactory.getLogger(WSSecuritySAML20AssertionTokenSecurityHandler.class);
+ @Nonnull private final Logger log = LoggerFactory.getLogger(WSSecuritySAML20AssertionTokenSecurityHandler.class);
/** The HttpServletRequest being processed. */
@NonnullAfterInit private HttpServletRequest httpServletRequest;
@@ -238,6 +238,7 @@ public class WSSecuritySAML20AssertionTokenSecurityHandler extends AbstractMessa
super.doDestroy();
}
+// Checkstyle: ReturnCount OFF
/** {@inheritDoc} */
protected void doInvoke(@Nonnull final MessageContext messageContext) throws MessageHandlerException {
if (!SOAPMessagingSupport.isSOAPMessage(messageContext)) {
@@ -276,8 +277,8 @@ public class WSSecuritySAML20AssertionTokenSecurityHandler extends AbstractMessa
throw new MessageHandlerException("Error determining SAML 2.0 Assertion validity", e);
}
}
-
}
+// Checkstyle: ReturnCount ON
/**
* Process the result of the token validation.
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list