[java-oidc-common] branch main updated: Fix logging, improve JavaDoc

[Phil Smart]

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

philsmart 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=b295209ed714bd13f660e44238c97a67b8ab78f0

The following commit(s) were added to refs/heads/main by this push:
     new b295209  Fix logging, improve JavaDoc
b295209 is described below

commit b295209ed714bd13f660e44238c97a67b8ab78f0
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Mon Jan 9 16:41:49 2023 +0000

    Fix logging, improve JavaDoc
---
 .../credential/impl/ProviderMetadataCredentialResolver.java         | 4 ++++
 .../java/net/shibboleth/oidc/security/impl/EncryptJWTHandler.java   | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/ProviderMetadataCredentialResolver.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/ProviderMetadataCredentialResolver.java
index 99a4a61..6c20c13 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/ProviderMetadataCredentialResolver.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/ProviderMetadataCredentialResolver.java
@@ -123,6 +123,10 @@ public class ProviderMetadataCredentialResolver extends BasicJOSEObjectCredentia
      * Fetch the remote JWK Set from the jwk_uri in the OpenID Provider's metadata. Convert each
      * JWK into a {@link Credential} and return. Only supports EC (key agreement) and RSA (key encryption) keys.
      * 
+     * <p>If a keyId is passed through in the criteria set, it is used as a parameter to the remote JWK cache. This
+     * ensures if the key is not found any cached keyset document, the document is re-fetched irrespective of the
+     * cache entry expiry. </p>
+     * 
      * @param criteriaSet the criteria set
      * @param metadata the OpenID Provider's metadata
      * 
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/EncryptJWTHandler.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/EncryptJWTHandler.java
index eb11c8e..615d8a8 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/EncryptJWTHandler.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/EncryptJWTHandler.java
@@ -274,11 +274,11 @@ public class EncryptJWTHandler extends AbstractMessageHandler {
      * methods.
      * 
      * @param keyID the keyID
-     * @param enc the content encryption algorithm
-     * @param alg the key management algorithm
+     * @param alg the content encryption algorithm
+     * @param enc the key management algorithm
      */
     private void logEncryption(@Nullable final String keyID, 
-            @Nullable final String enc, @Nullable final String alg) {
+            @Nullable final String alg, @Nullable final String enc) {
         log.debug("{} Encrypting '{}' with kid '{}' and params alg: {} enc: {}", 
                 getLogPrefix(), logName, keyID, alg, enc); 
     }

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