[java-plugin-shibd-oidc] branch dev/JSHIBDOIDC-31-cred-resolver updated: Consistency fixes

[Codeberg]

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

codeberg pushed a commit to branch dev/JSHIBDOIDC-31-cred-resolver
in repository java-plugin-shibd-oidc.

View the commit online:
https://codeberg.org/Shibboleth/java-plugin-shibd-oidc/commit/e60da3fad0087ccd4b359bbde109822ca15d4792

The following commit(s) were added to refs/heads/dev/JSHIBDOIDC-31-cred-resolver by this push:
     new e60da3f  Consistency fixes
e60da3f is described below

commit e60da3fad0087ccd4b359bbde109822ca15d4792
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Thu Oct 15 18:24:16 2026 +0100

    Consistency fixes
---
 .../credential/impl/ClientSecretStorageServiceResolver.java  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sp-oidc-impl/src/main/java/net/shibboleth/sp/jose/credential/impl/ClientSecretStorageServiceResolver.java b/sp-oidc-impl/src/main/java/net/shibboleth/sp/jose/credential/impl/ClientSecretStorageServiceResolver.java
index a0d0e85..971b826 100644
--- a/sp-oidc-impl/src/main/java/net/shibboleth/sp/jose/credential/impl/ClientSecretStorageServiceResolver.java
+++ b/sp-oidc-impl/src/main/java/net/shibboleth/sp/jose/credential/impl/ClientSecretStorageServiceResolver.java
@@ -78,7 +78,7 @@ public class ClientSecretStorageServiceResolver extends AbstractStorageServiceCr
         checkSetterPreconditions();
         
         clientSecretTemplateString = Constraint.isNotNull(StringSupport.trimOrNull(template),
-                "JSON Web Key template cannot be null or empty");
+                "Client secret template cannot be null or empty");
     }
 	
     /** {@inheritDoc} */
@@ -103,9 +103,9 @@ public class ClientSecretStorageServiceResolver extends AbstractStorageServiceCr
 		final StorageRecord<String> secretData;
 
         try {        	
-            final String keyStorageKey = clientSecretTemplate.merge(velocityContext);            
-	        log.debug("CredentialResolver {}: Resolved storage key ({})", getId(), keyStorageKey);            
-	        secretData = getStorageService().read(storageContext, keyStorageKey);  
+            final String secretStorageKey = clientSecretTemplate.merge(velocityContext);            
+	        log.debug("CredentialResolver {}: Resolved storage key ({})", getId(), secretStorageKey);            
+	        secretData = getStorageService().read(storageContext, secretStorageKey);  
             
         } catch (final VelocityException e) {
             throw new ResolverException("Error executing storage key template", e);
@@ -114,7 +114,7 @@ public class ClientSecretStorageServiceResolver extends AbstractStorageServiceCr
         }
         
         if (secretData == null) {
-            log.debug("Credential Resolver {}: No client secret resolved", getId());
+            log.debug("CredentialResolver {}: No client secret resolved", getId());
             return CollectionSupport.emptyList();
         }
         
@@ -187,7 +187,7 @@ public class ClientSecretStorageServiceResolver extends AbstractStorageServiceCr
     @Nullable protected Credential deriveClientSecretCredential(@Nonnull final ClientSecretCredential secretCred, 
             @Nonnull final CriteriaSet criteriaSet) throws ResolverException {
         
-    	// Already verified that the criterion exist
+    	// Already verified that the required criterion exist
         final UsageCriterion usageTypeCriterion = criteriaSet.get(UsageCriterion.class);
         final UsageType usageType = usageTypeCriterion.getUsage();
         

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