[java-opensaml] branch main updated: OSJ-318 - Deprecate terms from classes and configuration

[Scott Cantor]

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

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

View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=8669db5d5e37f5ce40b4143defd8f6ea11674131

The following commit(s) were added to refs/heads/main by this push:
       new  8669db5d5 OSJ-318 - Deprecate terms from classes and configuration
8669db5d5 is described below

commit 8669db5d5e37f5ce40b4143defd8f6ea11674131
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Nov 24 12:04:31 2020 -0500

    OSJ-318 - Deprecate terms from classes and configuration
    
    https://issues.shibboleth.net/jira/browse/OSJ-318
    
    Deprecate and replace a protected method.
---
 .../BasicSignatureSigningParametersResolver.java   | 24 +++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureSigningParametersResolver.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureSigningParametersResolver.java
index fc5d2341e..77eeb4ee8 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureSigningParametersResolver.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureSigningParametersResolver.java
@@ -112,13 +112,13 @@ public class BasicSignatureSigningParametersResolver
         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);
         
-        params.setSignatureReferenceDigestMethod(resolveReferenceDigestMethod(criteria, whitelistBlacklistPredicate));
+        params.setSignatureReferenceDigestMethod(resolveReferenceDigestMethod(criteria, includeExcludePredicate));
         params.setSignatureReferenceCanonicalizationAlgorithm(resolveReferenceCanonicalizationAlgorithm(criteria));
         
         params.setSignatureCanonicalizationAlgorithm(resolveCanonicalizationAlgorithm(criteria));
@@ -197,13 +197,27 @@ public class BasicSignatureSigningParametersResolver
      * 
      * @param criteria the input criteria being evaluated
      * 
-     * @return a whitelist/blacklist predicate instance
+     * @return include/exclude predicate instance
      */
-    @Nonnull protected Predicate<String> getWhitelistBlacklistPredicate(@Nonnull final CriteriaSet criteria) {
+    @Nonnull protected Predicate<String> getIncludeExcludePredicate(@Nonnull final CriteriaSet criteria) {
         return resolveIncludeExcludePredicate(criteria, 
                 criteria.get(SignatureSigningConfigurationCriterion.class).getConfigurations());
     }
 
+    /**
+     * Get a predicate which implements the effective configured include/exclude policy.
+     * 
+     * @param criteria the input criteria being evaluated
+     * 
+     * @return include/exclude predicate instance
+     * 
+     * @deprecated
+     */
+    @Deprecated(since="4.1.0",forRemoval=true)
+    @Nonnull protected Predicate<String> getWhitelistBlacklistPredicate(@Nonnull final CriteriaSet criteria) {
+        return getIncludeExcludePredicate(criteria);
+    }
+
     /**
      * Resolve and populate the signing credential and signature method algorithm URI on the 
      * supplied parameters instance.

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