[java-opensaml] branch master updated: Extend MetadataSource filter context data with resolver ID.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository java-opensaml.

View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=4b8483a77fb4be0e721f1fb8b7e76cd3814ab10a

The following commit(s) were added to refs/heads/master by this push:
       new  4b8483a   Extend MetadataSource filter context data with resolver ID.
4b8483a is described below

commit 4b8483a77fb4be0e721f1fb8b7e76cd3814ab10a
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Fri Oct 18 15:17:22 2019 -0400

    Extend MetadataSource filter context data with resolver ID.
---
 .../resolver/filter/data/impl/MetadataSource.java  | 27 +++++++++++++++++++++-
 .../resolver/impl/AbstractMetadataResolver.java    | 10 +++++++-
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/data/impl/MetadataSource.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/data/impl/MetadataSource.java
index ac0ad2d..5800052 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/data/impl/MetadataSource.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/data/impl/MetadataSource.java
@@ -17,17 +17,42 @@
 
 package org.opensaml.saml.metadata.resolver.filter.data.impl;
 
+import javax.annotation.Nullable;
+
 import org.opensaml.saml.metadata.resolver.filter.MetadataFilterContext;
 import org.opensaml.saml.metadata.resolver.filter.MetadataFilterContext.Data;
 
 /**
  * Data object for {@link MetadataFilterContext} intended to hold information about the source of the
  * metadata currently being processed.
+ * 
+ * @since 4.0.0
  */
 public class MetadataSource implements Data {
 
+    /** An identifier for the source of the metadata, typically the resolver ID. */
+    @Nullable private String sourceId;
+
     /** Flag indicating whether the metadata source is trusted. */
     private boolean trusted;
+    
+    /**
+     * Get identifier of the metadata source.
+     * 
+     * @return source identifier
+     */
+    @Nullable public String getSourceId() {
+        return sourceId;
+    }
+    
+    /**
+     * Set identifier of the metadata source. 
+     * 
+     * @param id source identifier
+     */
+    public void setSourceId(@Nullable final String id) {
+        sourceId = id;
+    }
 
     /**
      * Get whether the metadata source is trusted.
@@ -47,4 +72,4 @@ public class MetadataSource implements Data {
         this.trusted = flag;
     }
 
-}
+}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetadataResolver.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetadataResolver.java
index dd86e26..d4af34e 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetadataResolver.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetadataResolver.java
@@ -58,6 +58,7 @@ import org.opensaml.saml.metadata.resolver.MetadataResolver;
 import org.opensaml.saml.metadata.resolver.filter.FilterException;
 import org.opensaml.saml.metadata.resolver.filter.MetadataFilter;
 import org.opensaml.saml.metadata.resolver.filter.MetadataFilterContext;
+import org.opensaml.saml.metadata.resolver.filter.data.impl.MetadataSource;
 import org.opensaml.saml.saml2.common.SAML2Support;
 import org.opensaml.saml.saml2.metadata.EntitiesDescriptor;
 import org.opensaml.saml.saml2.metadata.EntityDescriptor;
@@ -390,7 +391,14 @@ public abstract class AbstractMetadataResolver extends AbstractIdentifiableIniti
      * @return the new filter context instance
      */
     @Nonnull protected MetadataFilterContext newFilterContext() {
-        return new MetadataFilterContext();
+        
+        final MetadataSource source = new MetadataSource();
+        source.setSourceId(getId());
+
+        final MetadataFilterContext context = new MetadataFilterContext();
+        context.add(source);
+        
+        return context;
     }
 
     /**

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.