[java-opensaml COMMIT] in /trunk/opensaml-saml-impl/src: main/java/org/opensaml/saml/metadata/resolver/impl/EntityIDD...

[noreply at shibboleth.net]

Author: putmanb
Date: Mon Oct 24 18:43:36 2016
New Revision: 4552

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4552&view=rev
Log:
OSJ-179: Local dynamic metadata resolver

Finish out impl, add unit tests.

Added:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/EntityIDDigestGenerator.java   (with props)
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/IdentityEntityIDGenerator.java   (with props)
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/EntityIDDigestGeneratorTest.java   (with props)
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/LocalDynamicMetadataResolverTest.java   (with props)
Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/LocalDynamicMetadataResolver.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/LocalDynamicMetadataResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/LocalDynamicMetadataResolver.java?rev=4552&r1=4551&r2=4552&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/LocalDynamicMetadataResolver.java	(original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/LocalDynamicMetadataResolver.java	Mon Oct 24 18:43:36 2016
@@ -23,15 +23,15 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
-
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.persist.XMLObjectLoadSaveManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Function;
+
+import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
 
 /**
  * Resolver which dynamically resolves metadata from a local source managed by an instance
@@ -50,6 +50,11 @@
 
     /**
      * Constructor.
+     * 
+     * <p>
+     * Source key generator will be an internal instance of {@link EntityIDDigestGenerator},
+     * with all default parameters.
+     * </p>
      *
      * @param manager load save manager
      */
@@ -60,6 +65,11 @@
     /**
      * Constructor.
      *
+     * <p>
+     * If supplied source key generator is null, an internal instance of {@link EntityIDDigestGenerator} will be used,
+     * with all default parameters.
+     * </p>
+     * 
      * @param manager load save manager
      * @param keyGenerator key generator function
      * @param backgroundTaskTimer timer for management of background tasks
@@ -74,7 +84,7 @@
         
         sourceKeyGenerator = keyGenerator;
         if (sourceKeyGenerator == null) {
-            sourceKeyGenerator = new DefaultSourceKeyGenerator();
+            sourceKeyGenerator = new EntityIDDigestGenerator();
         }
     }
 
@@ -98,18 +108,4 @@
         }
     }
     
-    /**
-     * Default strategy for generating source keys from input criteria.
-     */
-    public static class DefaultSourceKeyGenerator implements Function<CriteriaSet, String> {
-
-        /** {@inheritDoc} */
-        @Override
-        public String apply(final CriteriaSet input) {
-            // TODO Auto-generated method stub
-            return null;
-        }
-        
-    }
-    
 }