From 315bad34a73b6cd22c37f288de273b4d80fcb396 Mon Sep 17 00:00:00 2001 From: Jj! Date: Tue, 28 Aug 2018 19:42:09 -0500 Subject: [PATCH] [NOISSUE] update test override refresh --- .../opensaml/OpenSamlChainingMetadataResolver.java | 10 ++++++++++ .../admin/ui/domain/EntityDescriptorTest.groovy | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlChainingMetadataResolver.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlChainingMetadataResolver.java index 124af1bf4..aa5f45745 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlChainingMetadataResolver.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlChainingMetadataResolver.java @@ -7,6 +7,7 @@ import net.shibboleth.utilities.java.support.resolver.ResolverException; import org.opensaml.saml.metadata.resolver.ChainingMetadataResolver; import org.opensaml.saml.metadata.resolver.MetadataResolver; +import org.opensaml.saml.metadata.resolver.RefreshableMetadataResolver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -56,4 +57,13 @@ protected void doInitialize() throws ComponentInitializationException { mutableResolvers = Collections.emptyList(); } } + + @Override + public void refresh() throws ResolverException { + for (final MetadataResolver resolver : this.mutableResolvers) { + if (resolver instanceof RefreshableMetadataResolver) { + ((RefreshableMetadataResolver) resolver).refresh(); + } + } + } } diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/EntityDescriptorTest.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/EntityDescriptorTest.groovy index 12f2fb9e2..f743151fd 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/EntityDescriptorTest.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/EntityDescriptorTest.groovy @@ -5,6 +5,7 @@ import edu.internet2.tier.shibboleth.admin.ui.configuration.Internationalization import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration import edu.internet2.tier.shibboleth.admin.ui.configuration.TestConfiguration import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.FileBackedHttpMetadataResolver +import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.HttpMetadataResolverAttributes import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.ReloadableMetadataResolverAttributes import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.opensaml.OpenSamlChainingMetadataResolver import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.opensaml.OpenSamlFileBackedHTTPMetadataResolver @@ -65,7 +66,8 @@ class EntityDescriptorTest extends Specification { new FileBackedHttpMetadataResolver( metadataURL: 'https://idp.unicon.net/idp/shibboleth', backingFile: '/x.xml', - reloadableMetadataResolverAttributes: new ReloadableMetadataResolverAttributes() + reloadableMetadataResolverAttributes: new ReloadableMetadataResolverAttributes(), + httpMetadataResolverAttributes: new HttpMetadataResolverAttributes() ) ) )