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

[noreply at shibboleth.net]

Author: scantor
Date: Thu Jul 17 12:15:44 2014
New Revision: 3962

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3962&view=rev
Log:
IDP-414: Use a single CB context below the outbound context.

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/AddChannelBindingsHeaderHandler.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/VerifyChannelBindings.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddChannelBindingsToAssertions.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/AddChannelBindingsHeaderHandlerTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/VerifyChannelBindingsTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddChannelBindingsToAssertionsTest.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/AddChannelBindingsHeaderHandler.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/AddChannelBindingsHeaderHandler.java?rev=3962&r1=3961&r2=3962&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/AddChannelBindingsHeaderHandler.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/AddChannelBindingsHeaderHandler.java Thu Jul 17 12:15:44 2014
@@ -31,14 +31,12 @@
 import org.opensaml.saml.common.SAMLObjectBuilder;
 import org.opensaml.saml.common.messaging.context.ChannelBindingsContext;
 import org.opensaml.saml.ext.saml2cb.ChannelBindings;
-import org.opensaml.soap.messaging.context.SOAP11Context;
 import org.opensaml.soap.soap11.ActorBearing;
 import org.opensaml.soap.util.SOAPSupport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Function;
-import com.google.common.base.Functions;
 
 /**
  * MessageHandler to add {@link ChannelBindings} headers to an outgoing SOAP envelope.
@@ -47,9 +45,6 @@
    
     /** Class logger. */
     @Nonnull private final Logger log = LoggerFactory.getLogger(AddChannelBindingsHeaderHandler.class);
-
-    /** Builder for ChannelBindings header. */
-    @Nonnull private final SAMLObjectBuilder<ChannelBindings> cbBuilder;
     
     /** Strategy used to locate the {@link ChannelBindingsContext} to operate on. */
     @Nonnull private Function<MessageContext,ChannelBindingsContext> channelBindingsContextLookupStrategy;
@@ -59,12 +54,7 @@
     
     /** Constructor. */
     public AddChannelBindingsHeaderHandler() {
-        cbBuilder = (SAMLObjectBuilder<ChannelBindings>)
-                XMLObjectProviderRegistrySupport.getBuilderFactory().<ChannelBindings>getBuilderOrThrow(
-                        ChannelBindings.DEFAULT_ELEMENT_NAME);
-        channelBindingsContextLookupStrategy =
-                Functions.compose(new ChildContextLookup<>(ChannelBindingsContext.class),
-                        new ChildContextLookup<MessageContext,SOAP11Context>(SOAP11Context.class));
+        channelBindingsContextLookupStrategy = new ChildContextLookup<>(ChannelBindingsContext.class);
     }
     
     /**
@@ -101,6 +91,10 @@
     @Override
     protected void doInvoke(@Nonnull final MessageContext messageContext) throws MessageHandlerException {
 
+        final SAMLObjectBuilder<ChannelBindings> cbBuilder = (SAMLObjectBuilder<ChannelBindings>)
+                XMLObjectProviderRegistrySupport.getBuilderFactory().<ChannelBindings>getBuilderOrThrow(
+                        ChannelBindings.DEFAULT_ELEMENT_NAME);
+        
         for (final ChannelBindings cb : channelBindingsContext.getChannelBindings()) {
             final ChannelBindings header = cbBuilder.buildObject();
             header.setType(cb.getType());

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/VerifyChannelBindings.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/VerifyChannelBindings.java?rev=3962&r1=3961&r2=3962&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/VerifyChannelBindings.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/VerifyChannelBindings.java Thu Jul 17 12:15:44 2014
@@ -17,17 +17,13 @@
 
 package org.opensaml.saml.common.profile.impl;
 
-import java.util.Collection;
-
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 

[... 260 lines stripped ...]