[java-oidc-common] branch main updated: ClientSecretReferenceProvider should tolerate empty/null input.

[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=920538505a64f557cd316661d05d4ae719baf5ce

The following commit(s) were added to refs/heads/main by this push:
       new  9205385   ClientSecretReferenceProvider should tolerate empty/null input.
9205385 is described below

commit 920538505a64f557cd316661d05d4ae719baf5ce
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Feb 16 19:15:36 2021 -0500

    ClientSecretReferenceProvider should tolerate empty/null input.
---
 .../impl/provider/ClientSecretReferenceProvider.java    | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/keyinfo/ext/impl/provider/ClientSecretReferenceProvider.java b/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/keyinfo/ext/impl/provider/ClientSecretReferenceProvider.java
index fffcaf0..8f5af4f 100644
--- a/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/keyinfo/ext/impl/provider/ClientSecretReferenceProvider.java
+++ b/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/keyinfo/ext/impl/provider/ClientSecretReferenceProvider.java
@@ -18,6 +18,8 @@
 package net.shibboleth.oidc.metadata.keyinfo.ext.impl.provider;
 
 import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -37,8 +39,8 @@ import net.shibboleth.oidc.metadata.criterion.ClientSecretReferenceCriterion;
 import net.shibboleth.oidc.saml.xmlobject.ClientSecretKeyReference;
 import net.shibboleth.oidc.security.credential.BasicNimbusSecretCredential;
 import net.shibboleth.oidc.security.credential.NimbusSecretCredential;
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.collection.LazySet;
-import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
 import net.shibboleth.utilities.java.support.resolver.ResolverException;
@@ -51,19 +53,22 @@ import net.shibboleth.utilities.java.support.resolver.ResolverException;
 public class ClientSecretReferenceProvider  extends AbstractKeyInfoProvider {
 
     /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(ClientSecretReferenceProvider.class);
+    @Nonnull private final Logger log = LoggerFactory.getLogger(ClientSecretReferenceProvider.class);
     
     /** The list of resolvers for resolving the values for client secrets. */
-    private Collection<ClientSecretValueResolver> clientSecretValueResolvers;
+    @Nonnull @NotEmpty private Collection<ClientSecretValueResolver> clientSecretValueResolvers;
 
     /**
      * Constructor.
      *
      * @param valueResolvers The list of resolvers for resolving the values for client secrets.
      */
-    public ClientSecretReferenceProvider(final Collection<ClientSecretValueResolver> valueResolvers) {
-        clientSecretValueResolvers = 
-                Constraint.isNotEmpty(valueResolvers, "The client secret value resolvers cannot be empty");    
+    public ClientSecretReferenceProvider(@Nullable @NotEmpty final Collection<ClientSecretValueResolver> valueResolvers) {
+        if (valueResolvers != null) {
+            clientSecretValueResolvers = List.copyOf(valueResolvers);
+        } else {
+            clientSecretValueResolvers = Collections.emptyList();
+        }
     }
     
     /** {@inheritDoc} */

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