[java-opensaml COMMIT] in /trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding: SAMLOutboundDesti...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Dec 30 13:16:57 2013
New Revision: 3533

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3533&view=rev
Log:
Checkstyle warnings/annotations

Added:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/package-info.java   (with props)
Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/SAMLOutboundDestinationHandler.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/SAMLSOAPDecoderBodyHandler.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/SAMLOutboundDestinationHandler.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/SAMLOutboundDestinationHandler.java?rev=3533&r1=3532&r2=3533&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/SAMLOutboundDestinationHandler.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/SAMLOutboundDestinationHandler.java Mon Dec 30 13:16:57 2013
@@ -39,10 +39,11 @@
 public class SAMLOutboundDestinationHandler extends AbstractMessageHandler<SAMLObject> {
     
     /** Logger. */
-    Logger log = LoggerFactory.getLogger(SAMLOutboundDestinationHandler.class);
+    @Nonnull private final Logger log = LoggerFactory.getLogger(SAMLOutboundDestinationHandler.class);
 
     /** {@inheritDoc} */
-    protected void doInvoke(@Nonnull MessageContext<SAMLObject> messageContext) throws MessageHandlerException {
+    @Override
+    protected void doInvoke(@Nonnull final MessageContext<SAMLObject> messageContext) throws MessageHandlerException {
         SAMLObject samlMessage = Constraint.isNotNull(messageContext.getMessage(), 
                 "SAML message was not present in message context");
         
@@ -65,4 +66,4 @@
         
     }
 
-}
+}

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/SAMLSOAPDecoderBodyHandler.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/SAMLSOAPDecoderBodyHandler.java?rev=3533&r1=3532&r2=3533&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/SAMLSOAPDecoderBodyHandler.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/SAMLSOAPDecoderBodyHandler.java Mon Dec 30 13:16:57 2013
@@ -19,6 +19,8 @@
 
 import java.util.List;
 
+import javax.annotation.Nonnull;
+
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
 import org.opensaml.core.xml.XMLObject;
@@ -37,23 +39,26 @@
 public class SAMLSOAPDecoderBodyHandler extends AbstractMessageHandler<SAMLObject> {
     
     /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(SAMLSOAPDecoderBodyHandler.class);
+    @Nonnull private final Logger log = LoggerFactory.getLogger(SAMLSOAPDecoderBodyHandler.class);
 
     /** {@inheritDoc} */
-    protected void doInvoke(MessageContext messageContext) throws MessageHandlerException {
-        SOAP11Context soap11Context = messageContext.getSubcontext(SOAP11Context.class, false);
+    @Override
+    protected void doInvoke(@Nonnull final MessageContext messageContext) throws MessageHandlerException {
+        
+        final SOAP11Context soap11Context = messageContext.getSubcontext(SOAP11Context.class, false);
         Constraint.isNotNull(soap11Context, "SOAP 1.1 context was not present in message context");
-        Envelope soapMessage = soap11Context.getEnvelope();
+        final Envelope soapMessage = soap11Context.getEnvelope();
         Constraint.isNotNull(soapMessage, "SOAP 1.1 envelope was not present in SOAP context");
         
-        List<XMLObject> soapBodyChildren = soapMessage.getBody().getUnknownXMLObjects();
+        final List<XMLObject> soapBodyChildren = soapMessage.getBody().getUnknownXMLObjects();
         if (soapBodyChildren.size() < 1 || soapBodyChildren.size() > 1) {
             log.error("Unexpected number of children in the SOAP body, " + soapBodyChildren.size()
                     + ".  Unable to extract SAML message");
-            throw new MessageHandlerException("Unexpected number of children in the SOAP body, unable to extract SAML message");
+            throw new MessageHandlerException(
+                    "Unexpected number of children in the SOAP body, unable to extract SAML message");
         }
 
-        XMLObject incommingMessage = soapBodyChildren.get(0);
+        final XMLObject incommingMessage = soapBodyChildren.get(0);
         if (!(incommingMessage instanceof SAMLObject)) {
             log.error("Unexpected SOAP body content.  Expected a SAML request but recieved {}", incommingMessage
                     .getElementQName());
@@ -65,4 +70,4 @@
         
     }
 
-}
+}