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

[noreply at shibboleth.net]

Author: putmanb
Date: Wed Apr 27 18:29:46 2016
New Revision: 4451

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4451&view=rev
Log:
OSJ-128, OSJ-129, OSJ-130: Re-merge in changes related to metadata indexing.

Executed:
  svn merge --ignore-ancestry --depth=infinity -c 4342-4348 ^/trunk

Added:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/ArtifactSourceIDCriterion.java
      - copied unchanged from r4348, trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/ArtifactSourceIDCriterion.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/resolver/index/
      - copied from r4348, trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/resolver/index/
    trunk/opensaml-saml-api/src/test/java/org/opensaml/saml/metadata/resolver/
      - copied from r4348, trunk/opensaml-saml-api/src/test/java/org/opensaml/saml/metadata/resolver/
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/
      - copied from r4348, trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/
      - copied from r4348, trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/
Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractBatchMetadataResolver.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexingTest.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=4451&r1=4450&r2=4451&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	Wed Apr 27 18:29:46 2016
@@ -18,11 +18,16 @@
 package org.opensaml.saml.metadata.resolver.impl;
 
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.Iterator;
+import java.util.Set;
 
 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;
@@ -33,12 +38,16 @@
 import org.opensaml.saml.metadata.IterableMetadataSource;
 import org.opensaml.saml.metadata.resolver.BatchMetadataResolver;
 import org.opensaml.saml.metadata.resolver.filter.FilterException;
+import org.opensaml.saml.metadata.resolver.index.MetadataIndex;
+import org.opensaml.saml.metadata.resolver.index.impl.MetadataIndexManager;
 import org.opensaml.saml.saml2.metadata.EntitiesDescriptor;
 import org.opensaml.saml.saml2.metadata.EntityDescriptor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Strings;
+import com.google.common.base.Predicates;
+import com.google.common.collect.Collections2;
+import com.google.common.collect.ImmutableSet;
 
 /**
  * Abstract subclass for metadata resolvers that process and resolve metadata at a given point 
@@ -53,9 +62,14 @@
     /** Flag indicating whether to cache the original source metadata document. */
     private boolean cacheSourceMetadata;
     
+    /** The set of indexes configured. */
+    private Set<MetadataIndex> indexes;
+    
     /** Constructor. */
     public AbstractBatchMetadataResolver() {
         super();
+        
+        indexes = Collections.emptySet();
         
         setCacheSourceMetadata(true);
     }
@@ -87,6 +101,29 @@
         cacheSourceMetadata = flag; 
     }
     
+    /**
+     * Get the configured indexes.
+     * 
+     * @return the set of configured indexes
+     */
+    @Nonnull @NonnullElements @Unmodifiable @NotLive public Set<MetadataIndex> getIndexes() {
+        return ImmutableSet.copyOf(indexes);
+    }
+
+    /**
+     * Set the configured indexes.
+     * 
+     * @param newIndexes the new indexes to set
+     */
+    public void setIndexes(@Nullable final Set<MetadataIndex> newIndexes) {
+        ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+        if (newIndexes == null) {
+            indexes = Collections.emptySet();
+        } else {
+            indexes = new HashSet<>(Collections2.filter(newIndexes, Predicates.notNull()));
+        }
+    }
+
     /** {@inheritDoc} */
     @Override

[... 132 lines stripped ...]