[java-oidc-common] branch main updated: Convert token auth method setting to a Set.

[Scott Cantor]

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

scantor 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=f991fb9c4e1066c64067cac684f78320dd2bd2e9

The following commit(s) were added to refs/heads/main by this push:
     new f991fb9  Convert token auth method setting to a Set.
f991fb9 is described below

commit f991fb9c4e1066c64067cac684f78320dd2bd2e9
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Dec 14 14:30:39 2021 -0500

    Convert token auth method setting to a Set.
---
 .../navigate/TokenEndpointAuthMethodLookupFunction.java  | 13 ++++++-------
 ...actOAuth2ClientAuthenticableProfileConfiguration.java | 16 ++++++++--------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/TokenEndpointAuthMethodLookupFunction.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/TokenEndpointAuthMethodLookupFunction.java
index cc8441d..0e9bfb1 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/TokenEndpointAuthMethodLookupFunction.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/TokenEndpointAuthMethodLookupFunction.java
@@ -17,8 +17,7 @@
 
 package net.shibboleth.oidc.profile.config.navigate;
 
-import java.util.Collection;
-import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import javax.annotation.Nullable;
@@ -41,22 +40,22 @@ import net.shibboleth.oidc.profile.oauth2.config.AbstractOAuth2ClientAuthenticab
  * 
  * <p>If a specific setting is unavailable, a null value is returned.</p>
  */
-public class TokenEndpointAuthMethodLookupFunction 
-    extends AbstractRelyingPartyLookupFunction<List<ClientAuthenticationMethod>> {
+public class TokenEndpointAuthMethodLookupFunction
+        extends AbstractRelyingPartyLookupFunction<Set<ClientAuthenticationMethod>> {
 
     /** {@inheritDoc} */
-    @Nullable public List<ClientAuthenticationMethod> apply(@Nullable final ProfileRequestContext input) {
+    @Nullable public Set<ClientAuthenticationMethod> apply(@Nullable final ProfileRequestContext input) {
         final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
         if (rpc != null) {
             final ProfileConfiguration pc = rpc.getProfileConfig();
             if (pc instanceof AbstractOAuth2ClientAuthenticableProfileConfiguration) {
-                final Collection<String> methods =
+                final Set<String> methods =
                         ((AbstractOAuth2ClientAuthenticableProfileConfiguration)pc).getTokenEndpointAuthMethods(input);
                 if (methods != null) {
                     return methods
                             .stream()
                             .map(ClientAuthenticationMethod::new)
-                            .collect(Collectors.toUnmodifiableList());
+                            .collect(Collectors.toUnmodifiableSet());
                 }
             }
         }
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/AbstractOAuth2ClientAuthenticableProfileConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/AbstractOAuth2ClientAuthenticableProfileConfiguration.java
index d26fcc8..8be3087 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/AbstractOAuth2ClientAuthenticableProfileConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/AbstractOAuth2ClientAuthenticableProfileConfiguration.java
@@ -19,7 +19,7 @@ package net.shibboleth.oidc.profile.oauth2.config;
 
 import java.util.Collection;
 import java.util.Collections;
-import java.util.List;
+import java.util.Set;
 import java.util.function.Function;
 
 import javax.annotation.Nonnull;
@@ -45,7 +45,7 @@ public abstract class AbstractOAuth2ClientAuthenticableProfileConfiguration
         extends AbstractConditionalProfileConfiguration implements OAuth2ProfileConfiguration {
 
     /** Enabled token endpoint authentication methods. */
-    @Nonnull private Function<ProfileRequestContext,Collection<String>> tokenEndpointAuthMethodsLookupStrategy;
+    @Nonnull private Function<ProfileRequestContext,Set<String>> tokenEndpointAuthMethodsLookupStrategy;
 
     /**
      * Constructor.
@@ -56,7 +56,7 @@ public abstract class AbstractOAuth2ClientAuthenticableProfileConfiguration
         super(profileId);
         
         setTokenEndpointAuthMethods(
-                List.of(
+                Set.of(
                         ClientAuthenticationMethod.CLIENT_SECRET_BASIC.toString(),
                         ClientAuthenticationMethod.CLIENT_SECRET_POST.toString(),
                         ClientAuthenticationMethod.CLIENT_SECRET_JWT.toString(),
@@ -70,14 +70,14 @@ public abstract class AbstractOAuth2ClientAuthenticableProfileConfiguration
      * 
      * @return enabled token endpoint authentication methods
      */
-    @Nonnull @NonnullElements @NotLive @Unmodifiable public List<String> getTokenEndpointAuthMethods(
+    @Nonnull @NonnullElements @NotLive @Unmodifiable public Set<String> getTokenEndpointAuthMethods(
             @Nullable final ProfileRequestContext profileRequestContext) {
         
         final Collection<String> methods = tokenEndpointAuthMethodsLookupStrategy.apply(profileRequestContext);
         if (methods != null) {
-            return List.copyOf(methods);
+            return Set.copyOf(methods);
         }
-        return Collections.emptyList();
+        return Collections.emptySet();
     }
 
     /**
@@ -90,7 +90,7 @@ public abstract class AbstractOAuth2ClientAuthenticableProfileConfiguration
 
         if (methods != null) {
             tokenEndpointAuthMethodsLookupStrategy =
-                    FunctionSupport.constant(List.copyOf(StringSupport.normalizeStringCollection(methods)));
+                    FunctionSupport.constant(Set.copyOf(StringSupport.normalizeStringCollection(methods)));
         } else {
             tokenEndpointAuthMethodsLookupStrategy = FunctionSupport.constant(null);
         }
@@ -102,7 +102,7 @@ public abstract class AbstractOAuth2ClientAuthenticableProfileConfiguration
      * @param strategy  lookup strategy
      */
     public void setTokenEndpointAuthMethodsLookupStrategy(
-            @Nonnull final Function<ProfileRequestContext,Collection<String>> strategy) {
+            @Nonnull final Function<ProfileRequestContext,Set<String>> strategy) {
         tokenEndpointAuthMethodsLookupStrategy = Constraint.isNotNull(strategy, "Lookup strategy cannot be null");
     }
 

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