From 0f6d2da3bba3379456865f10c3ced673969d7264 Mon Sep 17 00:00:00 2001 From: chasegawa Date: Tue, 27 Jul 2021 15:25:02 -0700 Subject: [PATCH] SHIBUI-1992 Removed defaults: metadataresolver.satisfyAnyPredicates:false --- .../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 496b8f1b4..7ffb5b5f7 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 @@ -351,7 +351,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService { sortKey: resolver.sortKey, criterionPredicateRegistryRef: resolver.criterionPredicateRegistryRef, useDefaultPredicateRegistry: resolver.useDefaultPredicateRegistry, - satisfyAnyPredicates: resolver.satisfyAnyPredicates ?: null, + satisfyAnyPredicates: resolver.satisfyAnyPredicates, parserPoolRef: resolver.reloadableMetadataResolverAttributes?.parserPoolRef, minRefreshDelay: resolver.reloadableMetadataResolverAttributes?.minRefreshDelay, @@ -373,7 +373,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService { sortKey: resolver.sortKey, criterionPredicateRegistryRef: resolver.criterionPredicateRegistryRef, useDefaultPredicateRegistry: resolver.useDefaultPredicateRegistry, - satisfyAnyPredicates: resolver.satisfyAnyPredicates ?: null, + satisfyAnyPredicates: resolver.satisfyAnyPredicates, parserPoolRef: resolver.dynamicMetadataResolverAttributes?.parserPoolRef, taskTimerRef: resolver.dynamicMetadataResolverAttributes?.taskTimerRef, refreshDelayFactor: resolver.dynamicMetadataResolverAttributes?.refreshDelayFactor, @@ -454,7 +454,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService { sortKey: resolver.sortKey, criterionPredicateRegistryRef: resolver.criterionPredicateRegistryRef, useDefaultPredicateRegistry: resolver.useDefaultPredicateRegistry, - satisfyAnyPredicates: resolver.satisfyAnyPredicates ?: null, + satisfyAnyPredicates: resolver.satisfyAnyPredicates, parserPoolRef: resolver.reloadableMetadataResolverAttributes?.parserPoolRef, minRefreshDelay: resolver.reloadableMetadataResolverAttributes?.minRefreshDelay, @@ -495,7 +495,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService { sortKey: resolver.sortKey, criterionPredicateRegistryRef: resolver.criterionPredicateRegistryRef, useDefaultPredicateRegistry: resolver.useDefaultPredicateRegistry, - satisfyAnyPredicates: resolver.satisfyAnyPredicates ?: null, + satisfyAnyPredicates: resolver.satisfyAnyPredicates, parserPoolRef: resolver.dynamicMetadataResolverAttributes?.parserPoolRef, taskTimerRef: resolver.dynamicMetadataResolverAttributes?.taskTimerRef, refreshDelayFactor: resolver.dynamicMetadataResolverAttributes?.refreshDelayFactor, 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 c7b91375d..7c212ef74 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 @@ -70,7 +70,7 @@ public class MetadataResolver extends AbstractAuditable { private Boolean useDefaultPredicateRegistry; - private Boolean satisfyAnyPredicates = false; + private Boolean satisfyAnyPredicates; private Boolean doInitialization = true;