From 5ad135b784c182094e1b2290c32ddc80dfae763c Mon Sep 17 00:00:00 2001 From: chasegawa Date: Tue, 27 Jul 2021 15:18:27 -0700 Subject: [PATCH] SHIBUI-1992 Removed defaults: metadataresolver.useDefaultPredicateRegistry: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 8e5015a0d..496b8f1b4 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 @@ -350,7 +350,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService { failFastInitialization: resolver.failFastInitialization, sortKey: resolver.sortKey, criterionPredicateRegistryRef: resolver.criterionPredicateRegistryRef, - useDefaultPredicateRegistry: !resolver.useDefaultPredicateRegistry ?: null, + useDefaultPredicateRegistry: resolver.useDefaultPredicateRegistry, satisfyAnyPredicates: resolver.satisfyAnyPredicates ?: null, parserPoolRef: resolver.reloadableMetadataResolverAttributes?.parserPoolRef, @@ -372,7 +372,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService { failFastInitialization: resolver.failFastInitialization, sortKey: resolver.sortKey, criterionPredicateRegistryRef: resolver.criterionPredicateRegistryRef, - useDefaultPredicateRegistry: !resolver.useDefaultPredicateRegistry ?: null, + useDefaultPredicateRegistry: resolver.useDefaultPredicateRegistry, satisfyAnyPredicates: resolver.satisfyAnyPredicates ?: null, parserPoolRef: resolver.dynamicMetadataResolverAttributes?.parserPoolRef, taskTimerRef: resolver.dynamicMetadataResolverAttributes?.taskTimerRef, @@ -453,7 +453,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService { failFastInitialization: resolver.failFastInitialization, sortKey: resolver.sortKey, criterionPredicateRegistryRef: resolver.criterionPredicateRegistryRef, - useDefaultPredicateRegistry: !resolver.useDefaultPredicateRegistry ?: null, + useDefaultPredicateRegistry: resolver.useDefaultPredicateRegistry, satisfyAnyPredicates: resolver.satisfyAnyPredicates ?: null, parserPoolRef: resolver.reloadableMetadataResolverAttributes?.parserPoolRef, @@ -494,7 +494,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService { failFastInitialization: resolver.failFastInitialization, sortKey: resolver.sortKey, criterionPredicateRegistryRef: resolver.criterionPredicateRegistryRef, - useDefaultPredicateRegistry: !resolver.useDefaultPredicateRegistry ?: null, + useDefaultPredicateRegistry: resolver.useDefaultPredicateRegistry, satisfyAnyPredicates: resolver.satisfyAnyPredicates ?: null, parserPoolRef: resolver.dynamicMetadataResolverAttributes?.parserPoolRef, taskTimerRef: resolver.dynamicMetadataResolverAttributes?.taskTimerRef, 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 45324c61f..c7b91375d 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 @@ -68,7 +68,7 @@ public class MetadataResolver extends AbstractAuditable { private String criterionPredicateRegistryRef; - private Boolean useDefaultPredicateRegistry = true; + private Boolean useDefaultPredicateRegistry; private Boolean satisfyAnyPredicates = false;