[java-opensaml COMMIT] in /trunk: opensaml-messaging-api/src/main/java/org/opensaml/messaging/decoder/servlet/BaseHtt...

[noreply at shibboleth.net]

Author: putmanb
Date: Wed Jan 30 18:44:48 2013
New Revision: 3188

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3188&view=rev
Log:
Adjust base class PROTOCOL_MESSAGE logger behavior so that SOAP encoders and decoders log the whole SOAP Envelope, not just the payload.

Modified:
    trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/decoder/servlet/BaseHttpServletRequestXmlMessageDecoder.java
    trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/encoder/servlet/BaseHttpServletResponseXmlMessageEncoder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/decoding/HTTPSOAP11Decoder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/encoding/HTTPSOAP11Encoder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/HTTPSOAP11Decoder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/HTTPSOAP11Encoder.java
    trunk/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/decoder/http/HTTPSOAP11Decoder.java
    trunk/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/encoder/http/HTTPSOAP11Encoder.java

Modified: trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/decoder/servlet/BaseHttpServletRequestXmlMessageDecoder.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/decoder/servlet/BaseHttpServletRequestXmlMessageDecoder.java?rev=3188&r1=3187&r2=3188&view=diff
==============================================================================
--- trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/decoder/servlet/BaseHttpServletRequestXmlMessageDecoder.java (original)
+++ trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/decoder/servlet/BaseHttpServletRequestXmlMessageDecoder.java Wed Jan 30 18:44:48 2013
@@ -20,6 +20,7 @@
 import java.io.InputStream;
 
 import javax.annotation.Nonnull;
+import javax.servlet.http.HttpServletRequest;
 
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.logic.Constraint;
@@ -32,7 +33,6 @@
 import org.opensaml.core.xml.io.MarshallingException;
 import org.opensaml.core.xml.io.UnmarshallingException;
 import org.opensaml.core.xml.util.XMLObjectSupport;
-import org.opensaml.messaging.context.MessageContext;
 import org.opensaml.messaging.decoder.MessageDecodingException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -111,18 +111,12 @@
      */
     protected void logDecodedMessage() {
         if (protocolMessageLog.isDebugEnabled() ){
-            MessageContext messageContext = getMessageContext();
-            if (messageContext.getMessage() == null) {
+            XMLObject message = getMessageToLog();
+            if (message == null) {
                 log.warn("Decoded message was null, nothing to log");
-                return;
-            } else if (!(messageContext.getMessage() instanceof XMLObject)) {
-                log.warn("Decoded message was not an instance of XMLObject, was a: {}", 
-                        messageContext.getMessage().getClass().getName());
                 return;
             }
             
-            XMLObject message = (XMLObject) messageContext.getMessage();
-        
             try {
                 Element dom = XMLObjectSupport.marshall(message);
                 protocolMessageLog.debug("\n" + SerializeSupport.prettyPrintXML(dom));
@@ -132,6 +126,15 @@
         }
     }
     
+    /**
+     * Get the XMLObject which will be logged as the protocol message.
+     * 
+     * @return the XMLObject message considered to be the protocol message for logging purposes
+     */
+    protected XMLObject getMessageToLog() {
+        return getMessageContext().getMessage();
+    }
+
     /**
      * Helper method that deserializes and unmarshalls the message from the given stream.
      * 

Modified: trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/encoder/servlet/BaseHttpServletResponseXmlMessageEncoder.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/encoder/servlet/BaseHttpServletResponseXmlMessageEncoder.java?rev=3188&r1=3187&r2=3188&view=diff
==============================================================================
--- trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/encoder/servlet/BaseHttpServletResponseXmlMessageEncoder.java (original)
+++ trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/encoder/servlet/BaseHttpServletResponseXmlMessageEncoder.java Wed Jan 30 18:44:48 2013
@@ -60,18 +60,12 @@
      */
     protected void logEncodedMessage() {
         if (protocolMessageLog.isDebugEnabled() ){
-            MessageContext messageContext = getMessageContext();
-            if (messageContext.getMessage() == null) {
+            XMLObject message = getMessageToLog();
+            if (message == null) {

[... 146 lines stripped ...]