[java-opensaml COMMIT] /trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/Metadat...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Sep 30 18:47:46 2016
New Revision: 4507

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4507&view=rev
Log:
Fix some missing generic params.  Reduce visibility of a method.

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexManager.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexManager.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexManager.java?rev=4507&r1=4506&r2=4507&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexManager.java	(original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexManager.java	Fri Sep 30 18:47:46 2016
@@ -102,7 +102,7 @@
      * @return the index store for the index, may be null if index was not initialized 
      *         for this manager instance
      */
-    @Nullable public MetadataIndexStore getStore(@Nonnull MetadataIndex index) {
+    @Nullable protected MetadataIndexStore<T> getStore(@Nonnull MetadataIndex index) {
         Constraint.isNotNull(index, "MetadataIndex was null");
         return indexes.get(index);
     }
@@ -125,7 +125,7 @@
             Set<MetadataIndexKey> keys = index.generateKeys(criteria);
             if (keys != null && !keys.isEmpty()) {
                 LazySet<T> indexResult = new LazySet<>();
-                MetadataIndexStore<T> indexStore = indexes.get(index);
+                MetadataIndexStore<T> indexStore = getStore(index);
                 for (MetadataIndexKey key : keys) {
                     indexResult.addAll(indexStore.lookup(key));
                 }
@@ -168,7 +168,7 @@
             if (keys != null && !keys.isEmpty()) {
                 T item = entityDescriptorFunction.apply(descriptor);
                 if (item != null) {
-                    MetadataIndexStore<T> store = indexes.get(index);
+                    MetadataIndexStore<T> store = getStore(index);
                     for (MetadataIndexKey key : keys) {
                         log.trace("Indexing metadata: index '{}', key '{}', data item '{}'", 
                                 index, key, item);