[java-opensaml COMMIT] /trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SAMLBindingC...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Apr 29 18:08:01 2014
New Revision: 3827

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3827&view=rev
Log:
Add binding descriptor to context.

Modified:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SAMLBindingContext.java

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SAMLBindingContext.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SAMLBindingContext.java?rev=3827&r1=3826&r2=3827&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SAMLBindingContext.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SAMLBindingContext.java Tue Apr 29 18:08:01 2014
@@ -23,6 +23,7 @@
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.opensaml.messaging.context.BaseContext;
+import org.opensaml.saml.common.binding.BindingDescriptor;
 
 /**
  * Context for holding information related to the SAML binding in use.
@@ -31,6 +32,9 @@
     
     /** The relay state associated with the message. */
     @Nullable @NotEmpty private String relayState;
+    
+    /** The binding descriptor. */
+    @Nullable private BindingDescriptor bindingDescriptor;
     
     /** The binding URI. */
     @Nullable @NotEmpty private String bindingUri;
@@ -66,7 +70,13 @@
      * @return Returns the bindingUri.
      */
     @Nullable @NotEmpty public String getBindingUri() {
-        return bindingUri;
+        if (bindingUri != null) {
+            return bindingUri;
+        } else if (bindingDescriptor != null) {
+            return bindingDescriptor.getId();
+        } else {
+            return null;
+        }
     }
 
     /**
@@ -78,6 +88,24 @@
         bindingUri = StringSupport.trimOrNull(newBindingUri);
     }
 
+    /**
+     * Get the SAML binding descriptor.
+     * 
+     * @return the descriptor
+     */
+    @Nullable public BindingDescriptor getBindingDescriptor() {
+        return bindingDescriptor;
+    }
+
+    /**
+     * Set the SAML binding descriptor.
+     * 
+     * @param descriptor the new binding descriptor
+     */
+    public void setBindingDescriptor(@Nullable final BindingDescriptor descriptor) {
+        bindingDescriptor = descriptor;
+    }
+    
     /**
      * Get the flag indicating whether the message is signed at the binding level.
      *