[java-opensaml COMMIT] in /trunk: opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/criteria/ opensaml-saml-...

[noreply at shibboleth.net]

Author: putmanb
Date: Sun Jun  5 20:12:24 2016
New Revision: 4462

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4462&view=rev
Log:
OSJ-134: Add MetadataResolver support for filtering based on predicate criteria

Added:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/criteria/
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/criteria/entity/
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/criteria/entity/EvaluableEntityDescriptorCriterion.java   (with props)
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/criteria/role/
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/criteria/role/EvaluableRoleDescriptorCriterion.java   (with props)
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/criteria/
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/criteria/entity/
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/criteria/entity/impl/
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/criteria/entity/impl/EntityDescriptorCriterionPredicateRegistry.java   (with props)
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/criteria/entity/impl/EvaluableEntityRoleEntityDescriptorCriterion.java   (with props)
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/criteria/role/
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/criteria/role/impl/
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/criteria/role/impl/RoleDescriptorCriterionPredicateRegistry.java   (with props)
    trunk/opensaml-saml-impl/src/main/resources/entitydescriptor-criterion-predicate-registry.properties   (with props)
    trunk/opensaml-saml-impl/src/main/resources/roledescriptor-criterion-predicate-registry.properties   (with props)
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/PredicateFilteringTest.java   (with props)
Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractBatchMetadataResolver.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetadataResolver.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexManager.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexManagerTest.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractBatchMetadataResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractBatchMetadataResolver.java?rev=4462&r1=4461&r2=4462&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractBatchMetadataResolver.java	(original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractBatchMetadataResolver.java	Sun Jun  5 20:12:24 2016
@@ -25,14 +25,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
-import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.component.ComponentSupport;
-import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
-import net.shibboleth.utilities.java.support.resolver.ResolverException;
-
 import org.opensaml.core.criterion.EntityIdCriterion;
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.saml.metadata.IterableMetadataSource;
@@ -45,9 +37,19 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.base.Optional;
 import com.google.common.base.Predicates;
 import com.google.common.collect.Collections2;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
+
+import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
+import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
+import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.component.ComponentSupport;
+import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
+import net.shibboleth.utilities.java.support.resolver.ResolverException;
 
 /**
  * Abstract subclass for metadata resolvers that process and resolve metadata at a given point 
@@ -65,6 +67,10 @@
     /** The set of indexes configured. */

[... 698 lines stripped ...]