SHIBUI-1992

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