[java-idp-oidc] branch main updated: Move off deprecated method.

[Scott Cantor]

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

scantor pushed a commit to branch main
in repository java-idp-oidc.

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

The following commit(s) were added to refs/heads/main by this push:
       new  da795314  Move off deprecated method.
da795314 is described below

commit da795314f63b8acd31a691f1f3bc5d8ec2f263b8
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Nov 24 12:13:01 2020 -0500

    Move off deprecated method.
---
 .../impl/OIDCClientInformationEncryptionParametersResolver.java  | 4 ++--
 .../OIDCClientInformationSignatureSigningParametersResolver.java | 9 +++++----
 ...DCClientInformationSignatureValidationParametersResolver.java | 7 ++++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/security/impl/OIDCClientInformationEncryptionParametersResolver.java b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/security/impl/OIDCClientInformationEncryptionParametersResolver.java
index 758c780f..7454c509 100644
--- a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/security/impl/OIDCClientInformationEncryptionParametersResolver.java
+++ b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/security/impl/OIDCClientInformationEncryptionParametersResolver.java
@@ -110,13 +110,13 @@ public class OIDCClientInformationEncryptionParametersResolver extends BasicEncr
         Constraint.isNotNull(criteria.get(EncryptionConfigurationCriterion.class),
                 "Resolver requires an instance of EncryptionConfigurationCriterion");
 
-        final Predicate<String> whitelistBlacklistPredicate = getWhitelistBlacklistPredicate(criteria);
+        final Predicate<String> includeExcludePredicate = getIncludeExcludePredicate(criteria);
 
         // For decryption we need to list all the located keys and need the extended EncryptionParameters
         final EncryptionParameters params = (target == ParameterType.REQUEST_OBJECT_DECRYPTION)
                 ? new OIDCDecryptionParameters() : new EncryptionParameters();
 
-        resolveAndPopulateCredentialsAndAlgorithms(params, criteria, whitelistBlacklistPredicate);
+        resolveAndPopulateCredentialsAndAlgorithms(params, criteria, includeExcludePredicate);
         
         boolean encryptionOptional = false;
         final EncryptionOptionalCriterion encryptionOptionalCrit = criteria.get(EncryptionOptionalCriterion.class);
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/security/impl/OIDCClientInformationSignatureSigningParametersResolver.java b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/security/impl/OIDCClientInformationSignatureSigningParametersResolver.java
index 61ecfd7b..dd19f2f6 100644
--- a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/security/impl/OIDCClientInformationSignatureSigningParametersResolver.java
+++ b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/security/impl/OIDCClientInformationSignatureSigningParametersResolver.java
@@ -92,10 +92,10 @@ public class OIDCClientInformationSignatureSigningParametersResolver extends Bas
         Constraint.isNotNull(criteria.get(SignatureSigningConfigurationCriterion.class),
                 "Resolver requires an instance of SignatureSigningConfigurationCriterion");
 
-        final Predicate<String> whitelistBlacklistPredicate = getWhitelistBlacklistPredicate(criteria);
+        final Predicate<String> includeExcludePredicate = getIncludeExcludePredicate(criteria);
         final SignatureSigningParameters params = new SignatureSigningParameters();
 
-        resolveAndPopulateCredentialAndSignatureAlgorithm(params, criteria, whitelistBlacklistPredicate);
+        resolveAndPopulateCredentialAndSignatureAlgorithm(params, criteria, includeExcludePredicate);
 
         if (validate(params)) {
             logResult(params);
@@ -126,7 +126,7 @@ public class OIDCClientInformationSignatureSigningParametersResolver extends Bas
         return false;
     }
 
-    // Checkstyle: CyclomaticComplexity|ReturnCount OFF
+// Checkstyle: CyclomaticComplexity|MethodLength OFF
     /** {@inheritDoc} */
     @Override
     protected void resolveAndPopulateCredentialAndSignatureAlgorithm(@Nonnull final SignatureSigningParameters params,
@@ -204,7 +204,8 @@ public class OIDCClientInformationSignatureSigningParametersResolver extends Bas
             super.resolveAndPopulateCredentialAndSignatureAlgorithm(params, criteria, whitelistBlacklistPredicate);
         }
     }
-
+// Checkstyle: CyclomaticComplexity|MethodLength ON
+    
     /** {@inheritDoc} */
     @Override
     protected boolean validate(@Nonnull final SignatureSigningParameters params) {
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/security/impl/OIDCClientInformationSignatureValidationParametersResolver.java b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/security/impl/OIDCClientInformationSignatureValidationParametersResolver.java
index ad3e5569..bb340b9c 100644
--- a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/security/impl/OIDCClientInformationSignatureValidationParametersResolver.java
+++ b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/security/impl/OIDCClientInformationSignatureValidationParametersResolver.java
@@ -99,13 +99,13 @@ public class OIDCClientInformationSignatureValidationParametersResolver
         Constraint.isNotNull(criteria.get(SignatureSigningConfigurationCriterion.class),
                 "Resolver requires an instance of SignatureSigningConfigurationCriterion");
 
-        final Predicate<String> whitelistBlacklistPredicate = getWhitelistBlacklistPredicate(criteria);
+        final Predicate<String> includeExcludePredicate = getIncludeExcludePredicate(criteria);
 
         // For signature validation we need to list all the located keys and need the extended
         // SignatureSigningParameters
         final SignatureSigningParameters params = new OIDCSignatureValidationParameters();
 
-        resolveAndPopulateCredentialAndSignatureAlgorithm(params, criteria, whitelistBlacklistPredicate);
+        resolveAndPopulateCredentialAndSignatureAlgorithm(params, criteria, includeExcludePredicate);
 
         if (validate(params)) {
             if (((OIDCSignatureValidationParameters) params).getValidationCredentials().size() == 0) {
@@ -144,7 +144,7 @@ public class OIDCClientInformationSignatureValidationParametersResolver
         return false;
     }
 
-    // Checkstyle: CyclomaticComplexity|ReturnCount OFF
+// Checkstyle: CyclomaticComplexity|MethodLength OFF
     /** {@inheritDoc} */
     @Override
     protected void resolveAndPopulateCredentialAndSignatureAlgorithm(@Nonnull final SignatureSigningParameters params,
@@ -233,6 +233,7 @@ public class OIDCClientInformationSignatureValidationParametersResolver
             super.resolveAndPopulateCredentialAndSignatureAlgorithm(params, criteria, whitelistBlacklistPredicate);
         }
     }
+// Checkstyle: CyclomaticComplexity|MethodLength ON
 
     /**
      * Convert algorithm string list to JWSAlgorithm list.

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