[NOJIRA]

If attributes object is null, don't try to set anything. Fixed some more unit test stuff. Ugh.
TIER · Aug 30, 2018 · 208f227 · 208f227
1 parent 457fe6c
commit 208f227
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 31 deletions.
diff --git a/...bboleth/admin/ui/domain/resolvers/opensaml/OpenSamlMetadataResolverConstructorHelper.java b/...bboleth/admin/ui/domain/resolvers/opensaml/OpenSamlMetadataResolverConstructorHelper.java
@@ -82,31 +82,33 @@ public static void updateOpenSamlMetadataResolverFromReloadableMetadataResolverA
                                                                                               ParserPool parserPool) {
         AbstractReloadingMetadataResolver reloadingMetadataResolver = (AbstractReloadingMetadataResolver) metadataResolver;
 
-        if (attributes.getExpirationWarningThreshold() != null) {
-            reloadingMetadataResolver.setExpirationWarningThreshold(toMillis(attributes.getExpirationWarningThreshold()));
-        }
-        if (attributes.getMaxRefreshDelay() != null) {
-            reloadingMetadataResolver.setMaxRefreshDelay(toMillis(attributes.getMaxRefreshDelay()));
-        }
-        if (attributes.getMinRefreshDelay() != null) {
-            reloadingMetadataResolver.setMinRefreshDelay(toMillis(attributes.getMinRefreshDelay()));
-        }
-
-        if (attributes.getResolveViaPredicatesOnly() != null) {
-            reloadingMetadataResolver.setResolveViaPredicatesOnly(attributes.getResolveViaPredicatesOnly());
-        }
-
-        if (attributes.getRefreshDelayFactor() != null) {
-            reloadingMetadataResolver.setRefreshDelayFactor(attributes.getRefreshDelayFactor().floatValue());
-        }
-
-        //TODO: This takes a set of MetadataIndex's. We've got an IndexesRef. How to convert?
-        // reloadingMetadataResolver.setIndexes(); attributes.getIndexesRef();
-
         //TODO: This takes a ParserPool. We've got a ParserPoolRef in attributes.getParserPoolRef(). Should we use it for anything?
         reloadingMetadataResolver.setParserPool(parserPool);
 
-        //TODO: Where does this get used in OpenSAML land?
-        // attributes.getTaskTimerRef();
+        if (attributes != null) {
+            if (attributes.getExpirationWarningThreshold() != null) {
+                reloadingMetadataResolver.setExpirationWarningThreshold(toMillis(attributes.getExpirationWarningThreshold()));
+            }
+            if (attributes.getMaxRefreshDelay() != null) {
+                reloadingMetadataResolver.setMaxRefreshDelay(toMillis(attributes.getMaxRefreshDelay()));
+            }
+            if (attributes.getMinRefreshDelay() != null) {
+                reloadingMetadataResolver.setMinRefreshDelay(toMillis(attributes.getMinRefreshDelay()));
+            }
+
+            if (attributes.getResolveViaPredicatesOnly() != null) {
+                reloadingMetadataResolver.setResolveViaPredicatesOnly(attributes.getResolveViaPredicatesOnly());
+            }
+
+            if (attributes.getRefreshDelayFactor() != null) {
+                reloadingMetadataResolver.setRefreshDelayFactor(attributes.getRefreshDelayFactor().floatValue());
+            }
+
+            //TODO: This takes a set of MetadataIndex's. We've got an IndexesRef. How to convert?
+            // reloadingMetadataResolver.setIndexes(); attributes.getIndexesRef();
+
+            //TODO: Where does this get used in OpenSAML land?
+            // attributes.getTaskTimerRef();
+        }
     }
 }
diff --git a/...nd/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy b/...nd/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy
@@ -443,12 +443,9 @@ class TestObjectGenerator {
         new FilesystemMetadataResolver().with {
             it.name = 'FilesystemMetadata'
             it.xmlId = 'FilesystemMetadata'
-            it.metadataFile = 'metadata.xml'
+            it.metadataFile = 'metadata/metadata.xml'
 
             it.reloadableMetadataResolverAttributes = new ReloadableMetadataResolverAttributes().with {
-                it.minRefreshDelay = 'PT5M'
-                it.maxRefreshDelay = 'PT1H'
-                it.refreshDelayFactor = 0.75
                 it
             }
             it

diff --git a/backend/src/test/resources/conf/520.xml b/backend/src/test/resources/conf/520.xml
@@ -6,9 +6,6 @@
                   xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd urn:mace:shibboleth:2.0:resource http://shibboleth.net/schema/idp/shibboleth-resource.xsd urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd urn:oasis:names:tc:SAML:2.0:assertion http://docs.oasis-open.org/security/saml/v2.0/saml-schema-assertion-2.0.xsd"
                   xsi:type="ChainingMetadataProvider">
     <MetadataProvider id="FilesystemMetadata"
-                      maxRefreshDelay="PT1H"
-                      metadataFile="metadata.xml"
-                      minRefreshDelay="PT5M"
-                      refreshDelayFactor="0.75"
+                      metadataFile="metadata/metadata.xml"
                       xsi:type="FilesystemMetadataProvider"/>
 </MetadataProvider>