From 1badf3d87309b157e8437a720b3c661e5e1d7fbd Mon Sep 17 00:00:00 2001 From: chasegawa Date: Tue, 27 Jul 2021 15:08:24 -0700 Subject: [PATCH] SHIBUI-1992 Removed defaults: metadataresolver.failFastInitialization: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 b7ba6af5a..8e5015a0d 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 @@ -347,7 +347,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService { metadataFile: resolver.metadataFile, requireValidMetadata: resolver.requireValidMetadata, - failFastInitialization: !resolver.failFastInitialization ?: null, + failFastInitialization: resolver.failFastInitialization, sortKey: resolver.sortKey, criterionPredicateRegistryRef: resolver.criterionPredicateRegistryRef, useDefaultPredicateRegistry: !resolver.useDefaultPredicateRegistry ?: null, @@ -369,7 +369,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService { markupBuilderDelegate.MetadataProvider(id: resolver.xmlId, 'xsi:type': 'DynamicHTTPMetadataProvider', requireValidMetadata: resolver.requireValidMetadata, - failFastInitialization: !resolver.failFastInitialization ?: null, + failFastInitialization: resolver.failFastInitialization, sortKey: resolver.sortKey, criterionPredicateRegistryRef: resolver.criterionPredicateRegistryRef, useDefaultPredicateRegistry: !resolver.useDefaultPredicateRegistry ?: null, @@ -450,7 +450,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService { initializeFromBackupFile: resolver.initializeFromBackupFile, backupFileInitNextRefreshDelay: resolver.backupFileInitNextRefreshDelay, requireValidMetadata: resolver.requireValidMetadata, - failFastInitialization: !resolver.failFastInitialization ?: null, + failFastInitialization: resolver.failFastInitialization, sortKey: resolver.sortKey, criterionPredicateRegistryRef: resolver.criterionPredicateRegistryRef, useDefaultPredicateRegistry: !resolver.useDefaultPredicateRegistry ?: null, @@ -491,7 +491,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService { id: resolver.xmlId, 'xsi:type': 'LocalDynamicMetadataProvider', requireValidMetadata: resolver.requireValidMetadata, - failFastInitialization: !resolver.failFastInitialization ?: null, + failFastInitialization: resolver.failFastInitialization, sortKey: resolver.sortKey, criterionPredicateRegistryRef: resolver.criterionPredicateRegistryRef, useDefaultPredicateRegistry: !resolver.useDefaultPredicateRegistry ?: null, 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 74a384345..45324c61f 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 @@ -62,7 +62,7 @@ public class MetadataResolver extends AbstractAuditable { private Boolean requireValidMetadata; - private Boolean failFastInitialization = true; + private Boolean failFastInitialization; private Integer sortKey;