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

[noreply at shibboleth.net]

Author: putmanb
Date: Mon Oct 24 20:57:45 2016
New Revision: 4554

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4554&view=rev
Log:
Adjust/add local dynamic resolver ctors.

Be consistent with other resolvers as to position of optional Timer arg,
and so allow to work with IdP schema parser assumptions re: arg types and order. 

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/LocalDynamicMetadataResolver.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/LocalDynamicMetadataResolverTest.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=4554&r1=4553&r2=4554&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 20:57:45 2016
@@ -56,10 +56,21 @@
      * with all default parameters.
      * </p>
      *
-     * @param manager load save manager
+     * @param manager the manager for the local source of metadata
      */
     public LocalDynamicMetadataResolver(@Nonnull final XMLObjectLoadSaveManager<XMLObject> manager) {
-        this(manager, null, null);
+        this(null, manager, null);
+    }
+    
+    /**
+     * Constructor.
+     *
+     * @param manager the manager for the local source of metadata
+     * @param keyGenerator  the source key generator function
+     */
+    public LocalDynamicMetadataResolver(@Nonnull final XMLObjectLoadSaveManager<XMLObject> manager,
+            @Nullable final Function<CriteriaSet, String> keyGenerator) {
+        this(null, manager, keyGenerator);
     }
     
     /**
@@ -69,14 +80,13 @@
      * If the supplied source key generator is null, an internal instance of {@link EntityIDDigestGenerator}
      * will be used, with all default parameters.
      * </p>
-     * 
+     * @param backgroundTaskTimer timer for management of background tasks
      * @param manager the manager for the local source of metadata
      * @param keyGenerator the source key generator function
-     * @param backgroundTaskTimer timer for management of background tasks
      */
-    public LocalDynamicMetadataResolver(@Nonnull final XMLObjectLoadSaveManager<XMLObject> manager, 
-            @Nullable final Function<CriteriaSet, String> keyGenerator,
-            @Nullable final Timer backgroundTaskTimer) {
+    public LocalDynamicMetadataResolver(@Nullable final Timer backgroundTaskTimer, 
+            @Nonnull final XMLObjectLoadSaveManager<XMLObject> manager,
+            @Nullable final Function<CriteriaSet, String> keyGenerator) {
         
         super(backgroundTaskTimer);
         
@@ -87,7 +97,7 @@
             sourceKeyGenerator = new EntityIDDigestGenerator();
         }
     }
-
+    
     /** {@inheritDoc} */
     @Override
     protected XMLObject fetchFromOriginSource(final CriteriaSet criteria) throws IOException {

Modified: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/LocalDynamicMetadataResolverTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/LocalDynamicMetadataResolverTest.java?rev=4554&r1=4553&r2=4554&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/LocalDynamicMetadataResolverTest.java	(original)
+++ trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/LocalDynamicMetadataResolverTest.java	Mon Oct 24 20:57:45 2016
@@ -106,7 +106,7 @@
     
     @Test
     public void testCtorSourceKeyGenerator() throws ComponentInitializationException, IOException, ResolverException {
-        resolver = new LocalDynamicMetadataResolver(sourceManager, new IdentityEntityIDGenerator(), null);
+        resolver = new LocalDynamicMetadataResolver(null, sourceManager, new IdentityEntityIDGenerator());
         resolver.setId("abc123");
         resolver.setParserPool(parserPool);
         resolver.initialize();