[java-opensaml] branch main updated: OSJ-371 - Removal of deprecated features

[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=6ee7e9d269c8beaa22317ee412442776f256535d

The following commit(s) were added to refs/heads/main by this push:
     new 6ee7e9d26 OSJ-371 - Removal of deprecated features
6ee7e9d26 is described below

commit 6ee7e9d269c8beaa22317ee412442776f256535d
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Jan 24 09:27:23 2023 -0500

    OSJ-371 - Removal of deprecated features
    
    https://shibboleth.atlassian.net/browse/OSJ-371
    
    Pull support for Longs as durations in assertion validators.
---
 .../opensaml/saml/saml2/assertion/SAML20AssertionValidator.java    | 6 ------
 .../saml/saml2/assertion/impl/OneTimeUseConditionValidator.java    | 7 -------
 2 files changed, 13 deletions(-)

diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/assertion/SAML20AssertionValidator.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/assertion/SAML20AssertionValidator.java
index 6edeca699..6fea287b2 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/assertion/SAML20AssertionValidator.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/assertion/SAML20AssertionValidator.java
@@ -29,9 +29,7 @@ import javax.xml.namespace.QName;
 
 import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.collection.LazyMap;
-import net.shibboleth.shared.primitive.DeprecationSupport;
 import net.shibboleth.shared.primitive.StringSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
 import net.shibboleth.shared.resolver.CriteriaSet;
 import net.shibboleth.shared.xml.SerializeSupport;
 
@@ -254,10 +252,6 @@ public class SAML20AssertionValidator {
                 final Object raw = context.getStaticParameters().get(paramName);
                 if (raw instanceof Duration) {
                     duration = (Duration) raw;
-                } else if (raw instanceof Long) {
-                    duration = Duration.ofMillis((Long) raw);
-                    // This is a V4 deprecation, remove in V5.
-                    DeprecationSupport.warn(ObjectType.CONFIGURATION, paramName, null, Duration.class.getName());
                 }
                 
                 if (duration.isZero()) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/assertion/impl/OneTimeUseConditionValidator.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/assertion/impl/OneTimeUseConditionValidator.java
index ce63738ce..707301bf8 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/assertion/impl/OneTimeUseConditionValidator.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/assertion/impl/OneTimeUseConditionValidator.java
@@ -28,9 +28,7 @@ import javax.xml.namespace.QName;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.logic.Constraint;
-import net.shibboleth.shared.primitive.DeprecationSupport;
 import net.shibboleth.shared.primitive.StringSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
 
 import org.opensaml.saml.common.assertion.AssertionValidationException;
 import org.opensaml.saml.common.assertion.ValidationContext;
@@ -157,11 +155,6 @@ public class OneTimeUseConditionValidator implements ConditionValidator {
                 SAML2AssertionValidationParameters.COND_ONE_TIME_USE_EXPIRES);
         if (raw instanceof Duration) {
             expires = (Duration) raw;
-        } else if (raw instanceof Long) {
-            expires = Duration.ofMillis((Long) raw);
-            // V4 deprecation, remove in V5
-            DeprecationSupport.warn(ObjectType.CONFIGURATION,
-                    SAML2AssertionValidationParameters.COND_ONE_TIME_USE_EXPIRES, null, Duration.class.getName());
         }
         
         log.debug("Saw one-time use cache expires context param: {}", expires);

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