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

[noreply at shibboleth.net]

Author: scantor
Date: Mon Feb 24 21:47:13 2014
New Revision: 3650

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3650&view=rev
Log:
IDP-135 - Remove dep. on BasicMessageMetadataContext, this is SAML only anyway

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/AddInResponseToToResponse.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddInResponseToToResponseTest.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/AddInResponseToToResponse.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/AddInResponseToToResponse.java?rev=3650&r1=3649&r2=3650&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/AddInResponseToToResponse.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/AddInResponseToToResponse.java Mon Feb 24 21:47:13 2014
@@ -30,10 +30,10 @@
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
-import org.opensaml.messaging.context.BasicMessageMetadataContext;
 import org.opensaml.messaging.context.MessageContext;
 import org.opensaml.messaging.context.navigate.MessageLookup;
 import org.opensaml.saml.common.SAMLObject;
+import org.opensaml.saml.common.messaging.context.SAMLMessageInfoContext;
 import org.opensaml.saml.saml1.core.Response;
 import org.opensaml.saml.saml1.core.ResponseAbstractType;
 import org.opensaml.saml.saml2.core.StatusResponseType;
@@ -44,7 +44,7 @@
 import com.google.common.base.Functions;
 
 /**
- * Action that adds the <code>InResponseTo</code> attribute to a response message if a message ID is set on
+ * Action that adds the <code>InResponseTo</code> attribute to a response message if a SAML message ID is set on
  * the inbound message context.
  * 
  * <p>Supports all of the abstract types in SAML that carry this attribute.</p>
@@ -134,13 +134,13 @@
             return null;
         }
 
-        final BasicMessageMetadataContext inMsgMetadataCtx = inMsgCtx.getSubcontext(BasicMessageMetadataContext.class);
-        if (inMsgMetadataCtx == null) {
-            log.debug("{} No inbound message metadata context available", getLogPrefix());
+        final SAMLMessageInfoContext infoCtx = inMsgCtx.getSubcontext(SAMLMessageInfoContext.class);
+        if (infoCtx == null) {
+            log.debug("{} No inbound SAMLMessageInfoContext available", getLogPrefix());
             return null;
         }
 
-        return inMsgMetadataCtx.getMessageId();
+        return infoCtx.getMessageId();
     }
     
 }

Modified: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddInResponseToToResponseTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddInResponseToToResponseTest.java?rev=3650&r1=3649&r2=3650&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddInResponseToToResponseTest.java (original)
+++ trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddInResponseToToResponseTest.java Mon Feb 24 21:47:13 2014
@@ -20,12 +20,12 @@
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 
 import org.opensaml.core.OpenSAMLInitBaseTestCase;
-import org.opensaml.messaging.context.BasicMessageMetadataContext;
 import org.opensaml.profile.ProfileException;
 import org.opensaml.profile.RequestContextBuilder;
 import org.opensaml.profile.action.ActionTestingSupport;
 import org.opensaml.profile.action.EventIds;
 import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.saml.common.messaging.context.SAMLMessageInfoContext;
 import org.opensaml.saml.saml1.core.Response;
 import org.opensaml.saml.saml1.profile.SAML1ActionTestingSupport;
 import org.opensaml.saml.saml2.core.LogoutResponse;
@@ -43,7 +43,7 @@
     public void setUp() {
         prc = new RequestContextBuilder().setInboundMessage(
                 SAML1ActionTestingSupport.buildAttributeQueryRequest(null)).buildProfileRequestContext();
-        prc.getInboundMessageContext().getSubcontext(BasicMessageMetadataContext.class, true).setMessageId(
+        prc.getInboundMessageContext().getSubcontext(SAMLMessageInfoContext.class, true).setMessageId(
                 SAML1ActionTestingSupport.REQUEST_ID);
     }
 
@@ -61,7 +61,7 @@
     /** Test that action proceeds properly if there is no request ID. */
     @Test
     public void testNoRequestID() throws Exception {
-        prc.getInboundMessageContext().removeSubcontext(BasicMessageMetadataContext.class);
+        prc.getInboundMessageContext().removeSubcontext(SAMLMessageInfoContext.class);
         

[... 3 lines stripped ...]