[java-oidc-common] 01/02: Switched criteriaSet to use lookup strategy.

[Henri Mikkonen]

This is an automated email from the git hooks/post-receive script.

hjmikkon pushed a commit to branch main
in repository java-oidc-common.

View the commit online:
http://git.shibboleth.net/view/?p=java-oidc-common.git;a=commit;h=074423f57b24b94b3be8f1f68036aff07bce3656

commit 074423f57b24b94b3be8f1f68036aff07bce3656
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Fri Feb 4 14:44:16 2022 +0200

    Switched criteriaSet to use lookup strategy.
---
 ...lverBasedRegistrationMetadataPolicyLookupFunction.java | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/ResolverBasedRegistrationMetadataPolicyLookupFunction.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/ResolverBasedRegistrationMetadataPolicyLookupFunction.java
index c8310ad..6508b2e 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/ResolverBasedRegistrationMetadataPolicyLookupFunction.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/ResolverBasedRegistrationMetadataPolicyLookupFunction.java
@@ -18,6 +18,7 @@
 package net.shibboleth.oidc.profile.config.navigate;
 
 import java.util.Map;
+import java.util.function.Function;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -46,8 +47,8 @@ public class ResolverBasedRegistrationMetadataPolicyLookupFunction
     /** The metadata policy resolver. */
     @Nullable private MetadataPolicyResolver metadataPolicyResolver;
 
-    /** The criteria set used for the metadata policy resolver. */
-    @Nullable private CriteriaSet criteriaSet;
+    /** The lookup strategy for the criteria set used for the metadata policy resolver. */
+    @Nullable private Function<ProfileRequestContext, CriteriaSet> criteriaSetLookupStrategy;
     
     /**
      * Set the metadata policy resolver.
@@ -58,11 +59,11 @@ public class ResolverBasedRegistrationMetadataPolicyLookupFunction
     }
     
     /**
-     * Set the criteria set used for the metadata policy resolver.
-     * @param criteria What to set.
+     * Set the lookup strategy for the criteria set used for the metadata policy resolver
+     * @param strategy What to set.
      */
-    public void setCriteriaSet(@Nullable final CriteriaSet criteria) {
-        criteriaSet = criteria;
+    public void setCriteriaSetLookupStrategy(@Nullable final Function<ProfileRequestContext, CriteriaSet> strategy) {
+        criteriaSetLookupStrategy = strategy;
     }
     
     /** {@inheritDoc} */
@@ -71,6 +72,8 @@ public class ResolverBasedRegistrationMetadataPolicyLookupFunction
             log.debug("No metadata policy resolver configured, returning null");
             return null;
         }
+        final CriteriaSet criteriaSet =
+                criteriaSetLookupStrategy == null ? null : criteriaSetLookupStrategy.apply(input);
         log.debug("Starting to resolve single metadata policy");
         try {
             return metadataPolicyResolver.resolveSingle(criteriaSet == null ? new CriteriaSet() : criteriaSet);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.