SHIBUI-1992

Removed defaults: metadataresolver.satisfyAnyPredicates:false
TIER · Jul 27, 2021 · 0f6d2da · 0f6d2da
1 parent 5ad135b
commit 0f6d2da
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
@@ -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/...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
@@ -70,7 +70,7 @@ public class MetadataResolver extends AbstractAuditable {
 
     private Boolean useDefaultPredicateRegistry;
 
-    private Boolean satisfyAnyPredicates = false;
+    private Boolean satisfyAnyPredicates;
 
     private Boolean doInitialization = true;