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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Mar  1 15:29:32 2016
New Revision: 4428

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4428&view=rev
Log:
IDP-934 - Support for short identifiers for bindings for logging

https://issues.shibboleth.net/jira/browse/IDP-934

Option to extract short name from binding context in lookup function.

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

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/navigate/SAMLBindingContextBindingFunction.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/navigate/SAMLBindingContextBindingFunction.java?rev=4428&r1=4427&r2=4428&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/navigate/SAMLBindingContextBindingFunction.java	(original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/navigate/SAMLBindingContextBindingFunction.java	Tue Mar  1 15:29:32 2016
@@ -20,15 +20,34 @@
 import javax.annotation.Nullable;
 
 import org.opensaml.messaging.context.navigate.ContextDataLookupFunction;
+import org.opensaml.saml.common.binding.BindingDescriptor;
 import org.opensaml.saml.common.messaging.context.SAMLBindingContext;
 
 /** {@link ContextDataLookupFunction} that returns the SAML binding from a {@link SAMLBindingContext}. */
 public class SAMLBindingContextBindingFunction implements ContextDataLookupFunction<SAMLBindingContext,String> {
 
+    /** Whether to extract the "short" name for the binding, if possible. */
+    private boolean useShortName;
+    
+    /**
+     * Set whether to extract the short name for binding, if available.
+     * 
+     * @param flag flag to set
+     */
+    public void setUseShortName(final boolean flag) {
+        useShortName = flag;
+    }
+    
     /** {@inheritDoc} */
     @Override
     @Nullable public String apply(@Nullable final SAMLBindingContext input) {
         if (input != null) {
+            if (useShortName) {
+                final BindingDescriptor descriptor = input.getBindingDescriptor();
+                if (descriptor != null && descriptor.getShortName() != null) {
+                    return descriptor.getShortName();
+                }
+            }
             return input.getBindingUri();
         } else {
             return null;