SHIBUI-1992

Removed defaults: metadataresolver.requireValidMetadata:true
TIER · Jul 27, 2021 · 6daca66 · 6daca66
1 parent 2d94f33
commit 6daca66
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/...oovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy b/...oovy/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/...c/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolver.java b/...c/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;