From 6daca66af0dafda7509503df3e37d0a073e40c47 Mon Sep 17 00:00:00 2001 From: chasegawa Date: Tue, 27 Jul 2021 14:56:41 -0700 Subject: [PATCH] SHIBUI-1992 Removed defaults: metadataresolver.requireValidMetadata:true --- .../ui/service/JPAMetadataResolverServiceImpl.groovy | 8 ++++---- .../admin/ui/domain/resolvers/MetadataResolver.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy index eab25d04e..b7ba6af5a 100644 --- a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy +++ b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy @@ -346,7 +346,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService { 'xsi:type': 'FilesystemMetadataProvider', metadataFile: resolver.metadataFile, - requireValidMetadata: !resolver.requireValidMetadata ?: null, + requireValidMetadata: resolver.requireValidMetadata, failFastInitialization: !resolver.failFastInitialization ?: null, sortKey: resolver.sortKey, criterionPredicateRegistryRef: resolver.criterionPredicateRegistryRef, @@ -368,7 +368,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService { void constructXmlNodeForResolver(DynamicHttpMetadataResolver resolver, def markupBuilderDelegate, Closure childNodes) { markupBuilderDelegate.MetadataProvider(id: resolver.xmlId, 'xsi:type': 'DynamicHTTPMetadataProvider', - requireValidMetadata: !resolver.requireValidMetadata ?: null, + requireValidMetadata: resolver.requireValidMetadata, failFastInitialization: !resolver.failFastInitialization ?: null, sortKey: resolver.sortKey, criterionPredicateRegistryRef: resolver.criterionPredicateRegistryRef, @@ -449,7 +449,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService { metadataURL: resolver.metadataURL, initializeFromBackupFile: resolver.initializeFromBackupFile, backupFileInitNextRefreshDelay: resolver.backupFileInitNextRefreshDelay, - requireValidMetadata: !resolver.requireValidMetadata ?: null, + requireValidMetadata: resolver.requireValidMetadata, failFastInitialization: !resolver.failFastInitialization ?: null, sortKey: resolver.sortKey, criterionPredicateRegistryRef: resolver.criterionPredicateRegistryRef, @@ -490,7 +490,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService { id: resolver.xmlId, 'xsi:type': 'LocalDynamicMetadataProvider', - requireValidMetadata: !resolver.requireValidMetadata ?: null, + requireValidMetadata: resolver.requireValidMetadata, failFastInitialization: !resolver.failFastInitialization ?: null, sortKey: resolver.sortKey, criterionPredicateRegistryRef: resolver.criterionPredicateRegistryRef, diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolver.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolver.java index a6d5950ec..74a384345 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolver.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolver.java @@ -60,7 +60,7 @@ public class MetadataResolver extends AbstractAuditable { private Boolean enabled; - private Boolean requireValidMetadata = true; + private Boolean requireValidMetadata; private Boolean failFastInitialization = true;