[java-opensaml] branch main updated: OSJ-371 - Removal of deprecated features
Scott Cantor
cantor.2 at osu.edu
Tue Jan 24 13:57:52 UTC 2023
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=e5b13fff0177337d2c8682ad87a992ddf53cc0cc
The following commit(s) were added to refs/heads/main by this push:
new e5b13fff0 OSJ-371 - Removal of deprecated features
e5b13fff0 is described below
commit e5b13fff0177337d2c8682ad87a992ddf53cc0cc
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Jan 24 08:57:49 2023 -0500
OSJ-371 - Removal of deprecated features
https://shibboleth.atlassian.net/browse/OSJ-371
Remove deprecated methods and constructors.
---
.../opensaml/saml/ext/saml2mdui/DomainHint.java | 25 --------------------
.../saml/ext/saml2mdui/GeolocationHint.java | 26 +--------------------
.../org/opensaml/saml/ext/saml2mdui/IPHint.java | 25 --------------------
.../java/org/opensaml/saml/ext/saml2mdui/Logo.java | 24 -------------------
.../java/org/opensaml/saml/saml1/core/Action.java | 24 -------------------
.../saml/saml1/core/AssertionArtifact.java | 27 ----------------------
.../saml/saml1/core/AssertionIDReference.java | 25 --------------------
.../org/opensaml/saml/saml1/core/Audience.java | 25 --------------------
.../saml/saml1/core/ConfirmationMethod.java | 27 ----------------------
.../saml2/assertion/SAML20AssertionValidator.java | 26 ---------------------
.../java/org/opensaml/saml/saml2/core/Action.java | 24 -------------------
.../org/opensaml/saml/saml2/core/Artifact.java | 25 --------------------
.../opensaml/saml/saml2/core/AssertionIDRef.java | 25 --------------------
.../opensaml/saml/saml2/core/AssertionURIRef.java | 25 --------------------
.../org/opensaml/saml/saml2/core/Audience.java | 25 --------------------
.../saml/saml2/core/AuthnContextClassRef.java | 27 ----------------------
.../saml/saml2/core/AuthnContextDeclRef.java | 27 ----------------------
.../org/opensaml/saml/saml2/core/GetComplete.java | 25 --------------------
.../java/org/opensaml/saml/saml2/core/NewID.java | 25 --------------------
.../org/opensaml/saml/saml2/core/RequesterID.java | 25 --------------------
.../org/opensaml/saml/saml2/core/SessionIndex.java | 25 --------------------
.../opensaml/saml/saml2/core/StatusMessage.java | 25 --------------------
.../saml2/metadata/AdditionalMetadataLocation.java | 26 ---------------------
.../saml/saml2/metadata/AffiliateMember.java | 25 --------------------
.../saml/saml2/metadata/AttributeProfile.java | 24 -------------------
.../org/opensaml/saml/saml2/metadata/Company.java | 24 -------------------
.../opensaml/saml/saml2/metadata/EmailAddress.java | 25 --------------------
.../opensaml/saml/saml2/metadata/GivenName.java | 25 --------------------
.../opensaml/saml/saml2/metadata/NameIDFormat.java | 25 --------------------
.../org/opensaml/saml/saml2/metadata/SurName.java | 25 --------------------
.../saml/saml2/metadata/TelephoneNumber.java | 25 --------------------
.../assertion/tests/MockAssertionValidator.java | 2 +-
.../tests/SAML20AssertionValidatorTest.java | 14 ++++++-----
...itySAML20AssertionTokenSecurityHandlerTest.java | 5 ++--
34 files changed, 13 insertions(+), 789 deletions(-)
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/DomainHint.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/DomainHint.java
index c60aa5558..784dc883c 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/DomainHint.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/DomainHint.java
@@ -18,7 +18,6 @@
package org.opensaml.saml.ext.saml2mdui;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.xml.namespace.QName;
import org.opensaml.core.xml.schema.XSString;
@@ -26,8 +25,6 @@ import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.common.xml.SAMLConstants;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
/**
* DomainHint.
@@ -47,27 +44,5 @@ public interface DomainHint extends SAMLObject, XSString {
/** Default element name. */
@Nonnull static final QName DEFAULT_ELEMENT_NAME =
new QName(SAMLConstants.SAML20MDUI_NS, DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20MDUI_PREFIX);
-
- /**
- * Gets the hint.
- *
- * @return the hint
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- @Nullable default String getHint() {
- DeprecationSupport.warn(ObjectType.METHOD, "getHint", DomainHint.class.toString(), "getValue");
- return getValue();
- }
-
- /**
- * Sets the hint.
- *
- * @param value hint
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- default void setHint(@Nullable final String value) {
- DeprecationSupport.warn(ObjectType.METHOD, "setHint", DomainHint.class.toString(), "setValue");
- setValue(value);
- }
}
\ No newline at end of file
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/GeolocationHint.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/GeolocationHint.java
index bdd9d18e1..d09ab37a9 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/GeolocationHint.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/GeolocationHint.java
@@ -18,7 +18,6 @@
package org.opensaml.saml.ext.saml2mdui;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.xml.namespace.QName;
import org.opensaml.core.xml.schema.XSURI;
@@ -26,8 +25,6 @@ import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.common.xml.SAMLConstants;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
/**
* GeolocationHint.
@@ -48,26 +45,5 @@ public interface GeolocationHint extends SAMLObject, XSURI {
/** Default element name. */
@Nonnull static final QName DEFAULT_ELEMENT_NAME =
new QName(SAMLConstants.SAML20MDUI_NS, DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20MDUI_PREFIX);
-
- /**
- * Gets the hint.
- *
- * @return the Hint
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- @Nullable default String getHint() {
- DeprecationSupport.warn(ObjectType.METHOD, "getHint", GeolocationHint.class.toString(), "getURI");
- return getURI();
- }
-
- /**
- * Sets the hint.
- *
- * @param value hint
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- default void setHint(@Nullable final String value) {
- DeprecationSupport.warn(ObjectType.METHOD, "setHint", GeolocationHint.class.toString(), "setURI");
- setURI(value);
- }
+
}
\ No newline at end of file
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/IPHint.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/IPHint.java
index 4c473e1d0..46cea92ad 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/IPHint.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/IPHint.java
@@ -18,7 +18,6 @@
package org.opensaml.saml.ext.saml2mdui;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.xml.namespace.QName;
import org.opensaml.core.xml.schema.XSString;
@@ -26,8 +25,6 @@ import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.common.xml.SAMLConstants;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
/**
* IPHint.
@@ -47,27 +44,5 @@ public interface IPHint extends SAMLObject, XSString {
/** Default element name. */
@Nonnull static final QName DEFAULT_ELEMENT_NAME =
new QName(SAMLConstants.SAML20MDUI_NS, DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20MDUI_PREFIX);
-
- /**
- * Gets the hint.
- *
- * @return the hint
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- @Nullable default String getHint() {
- DeprecationSupport.warn(ObjectType.METHOD, "getHint", IPHint.class.toString(), "getValue");
- return getValue();
- }
-
- /**
- * Sets the hint.
- *
- * @param value hint
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- default void setHint(@Nullable final String value) {
- DeprecationSupport.warn(ObjectType.METHOD, "setHint", IPHint.class.toString(), "setValue");
- setValue(value);
- }
}
\ No newline at end of file
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/Logo.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/Logo.java
index 8709c9eda..1b4d46923 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/Logo.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/saml2mdui/Logo.java
@@ -26,8 +26,6 @@ import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.metadata.LocalizedURI;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
/**
* Localized logo type.
@@ -60,28 +58,6 @@ public interface Logo extends LocalizedURI, SAMLObject {
/** Attribute label. */
@Nonnull @NotEmpty static final String WIDTH_ATTR_NAME = "width";
- /**
- * Gets the URL.
- *
- * @return the URL
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- @Nullable default String getURL() {
- DeprecationSupport.warn(ObjectType.METHOD, "getURL", Logo.class.toString(), "getURI");
- return getURI();
- }
-
- /**
- * Sets the URL.
- *
- * @param uri the URL
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- default void setURL(@Nullable final String uri) {
- DeprecationSupport.warn(ObjectType.METHOD, "setURL", Logo.class.toString(), "setURI");
- setURI(uri);
- }
-
/**
* Get the height of the logo.
* @return the height of the logo
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/Action.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/Action.java
index 120381a8c..ced254886 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/Action.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/Action.java
@@ -26,8 +26,6 @@ import javax.annotation.Nullable;
import javax.xml.namespace.QName;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
import org.opensaml.core.xml.schema.XSString;
import org.opensaml.saml.common.SAMLObject;
@@ -68,27 +66,5 @@ public interface Action extends SAMLObject, XSString {
* @param namespace what to set
*/
void setNamespace(@Nullable final String namespace);
-
- /**
- * Gets the value of the action to be performed.
- *
- * @return the value of the action to be performed
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- @Nullable default String getContents() {
- DeprecationSupport.warn(ObjectType.METHOD, "getContents", Action.class.toString(), "getValue");
- return getValue();
- }
-
- /**
- * Sets the value of the action to be performed.
- *
- * @param value the value of the action to be performed
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- default void setContents(@Nullable final String value) {
- DeprecationSupport.warn(ObjectType.METHOD, "setContents", Action.class.toString(), "setValue");
- setValue(value);
- }
}
\ No newline at end of file
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/AssertionArtifact.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/AssertionArtifact.java
index c158f7839..1a7443a8b 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/AssertionArtifact.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/AssertionArtifact.java
@@ -18,12 +18,9 @@
package org.opensaml.saml.saml1.core;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.xml.namespace.QName;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
import org.opensaml.core.xml.schema.XSString;
import org.opensaml.saml.common.SAMLObject;
@@ -41,28 +38,4 @@ public interface AssertionArtifact extends XSString, SAMLObject {
@Nonnull static final QName DEFAULT_ELEMENT_NAME =
new QName(SAMLConstants.SAML10P_NS, DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML1P_PREFIX);
- /**
- * Get artifact value.
- *
- * @return the artifact value
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- @Nullable default String getAssertionArtifact() {
- DeprecationSupport.warn(ObjectType.METHOD, "getAssertionArtifact", AssertionArtifact.class.toString(),
- "getValue");
- return getValue();
- }
-
- /**
- * Set artifact value.
- *
- * @param value new artifact value
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- default void setAssertionArtifact(@Nullable final String value) {
- DeprecationSupport.warn(ObjectType.METHOD, "setAssertionArtifact", AssertionArtifact.class.toString(),
- "setValue");
- setValue(value);
- }
-
}
\ No newline at end of file
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/AssertionIDReference.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/AssertionIDReference.java
index c5563bab0..aecc6c400 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/AssertionIDReference.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/AssertionIDReference.java
@@ -22,12 +22,9 @@
package org.opensaml.saml.saml1.core;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.xml.namespace.QName;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
import org.opensaml.core.xml.schema.XSString;
import org.opensaml.saml.common.xml.SAMLConstants;
@@ -43,27 +40,5 @@ public interface AssertionIDReference extends XSString, Evidentiary {
/** Default element name. */
@Nonnull static final QName DEFAULT_ELEMENT_NAME =
new QName(SAMLConstants.SAML1_NS, DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML1_PREFIX);
-
- /**
- * Gets the ID of the assertion this references.
- *
- * @return the ID of the assertion this references
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- @Nullable default String getReference() {
- DeprecationSupport.warn(ObjectType.METHOD, "getReference", AssertionIDReference.class.toString(), "getValue");
- return getValue();
- }
-
- /**
- * Sets the ID of the assertion this references.
- *
- * @param value the ID of the assertion this references
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- default void setReference(@Nullable final String value) {
- DeprecationSupport.warn(ObjectType.METHOD, "setReference", AssertionIDReference.class.toString(), "setValue");
- setValue(value);
- }
}
\ No newline at end of file
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/Audience.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/Audience.java
index a839537d7..362fb18bc 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/Audience.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/Audience.java
@@ -22,7 +22,6 @@
package org.opensaml.saml.saml1.core;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.xml.namespace.QName;
import org.opensaml.core.xml.schema.XSURI;
@@ -30,8 +29,6 @@ import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.common.xml.SAMLConstants;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
/**
* This interface describes how an object representing a SAML1 <code>Audience</code> element will behave.
@@ -44,27 +41,5 @@ public interface Audience extends SAMLObject, XSURI {
/** Default element name. */
@Nonnull static final QName DEFAULT_ELEMENT_NAME =
new QName(SAMLConstants.SAML1_NS, DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML1_PREFIX);
-
- /**
- * Gets the URI of the audience for the assertion.
- *
- * @return the URI of the audience for the assertion
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- @Nullable default String getUri() {
- DeprecationSupport.warn(ObjectType.METHOD, "getUri", Audience.class.toString(), "getURI");
- return getURI();
- }
-
- /**
- * Sets the URI of the audience for the assertion.
- *
- * @param uri the URI of the audience for the assertion
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- default void setUri(@Nullable final String uri) {
- DeprecationSupport.warn(ObjectType.METHOD, "setUri", Audience.class.toString(), "setURI");
- setURI(uri);
- }
}
\ No newline at end of file
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/ConfirmationMethod.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/ConfirmationMethod.java
index fb98f5bd7..39d23999a 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/ConfirmationMethod.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/ConfirmationMethod.java
@@ -21,7 +21,6 @@
package org.opensaml.saml.saml1.core;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.xml.namespace.QName;
import org.opensaml.core.xml.schema.XSURI;
@@ -29,8 +28,6 @@ import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.common.xml.SAMLConstants;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
/**
* This interface defines how the object representing a SAML1 <code> ConfirmationMethod </code> element behaves.
@@ -60,28 +57,4 @@ public interface ConfirmationMethod extends SAMLObject, XSURI {
/** Sender-Vouches confirmation method. */
@Nonnull @NotEmpty static final String METHOD_SENDER_VOUCHES = "urn:oasis:names:tc:SAML:1.0:cm:sender-vouches";
- /**
- * Gets the confirmation method.
- *
- * @return the confirmation method
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- @Nullable default String getConfirmationMethod() {
- DeprecationSupport.warn(ObjectType.METHOD, "getConfirmationMethod", ConfirmationMethod.class.toString(),
- "getURI");
- return getURI();
- }
-
- /**
- * Sets the confirmation method.
- *
- * @param uri the confirmation method
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- default void setConfirmationMethod(@Nullable final String uri) {
- DeprecationSupport.warn(ObjectType.METHOD, "setConfirmationMethod", ConfirmationMethod.class.toString(),
- "setURI");
- setURI(uri);
- }
-
}
\ No newline at end of file
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 334f212f6..6edeca699 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
@@ -209,32 +209,6 @@ public class SAML20AssertionValidator {
signaturePrevalidator = newSignaturePrevalidator;
}
// Checkstyle: ParameterNumber ON
-
- /**
- * Constructor.
- *
- * @param newConditionValidators validators used to validate the {@link Condition}s within the assertion
- * @param newConfirmationValidators validators used to validate {@link SubjectConfirmation} methods within the
- * assertion
- * @param newStatementValidators validators used to validate {@link Statement}s within the assertion
- * @param newTrustEngine the trust used to validate the Assertion signature
- * @param newSignaturePrevalidator the signature pre-validator used to pre-validate the Assertion signature
- *
- * @deprecated
- */
- @Deprecated
- public SAML20AssertionValidator(@Nullable final Collection<ConditionValidator> newConditionValidators,
- @Nullable final Collection<SubjectConfirmationValidator> newConfirmationValidators,
- @Nullable final Collection<StatementValidator> newStatementValidators,
- @Nullable final SignatureTrustEngine newTrustEngine,
- @Nullable final SignaturePrevalidator newSignaturePrevalidator) {
-
- this(newConditionValidators, newConfirmationValidators, newStatementValidators, null,
- newTrustEngine, newSignaturePrevalidator);
-
- DeprecationSupport.warn(ObjectType.METHOD, "SAML20AssertionValidator 5 argument constructor", null,
- "SAML20AssertionValidator 6 argument constructor");
- }
/**
* Gets the lifetime duration from the {@link ValidationContext#getStaticParameters()} parameters.
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/Action.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/Action.java
index 37fc3ad12..b9a1cc3a7 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/Action.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/Action.java
@@ -26,8 +26,6 @@ import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.common.xml.SAMLConstants;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
/**
* SAML 2.0 Core Action.
@@ -119,26 +117,4 @@ public interface Action extends SAMLObject, XSString {
*/
void setNamespace(@Nullable final String newNamespace);
- /**
- * Gets the value of the action to be performed.
- *
- * @return the value of the action to be performed
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- @Nullable default String getAction() {
- DeprecationSupport.warn(ObjectType.METHOD, "getAction", Action.class.toString(), "getValue");
- return getValue();
- }
-
- /**
- * Sets the value of the action to be performed.
- *
- * @param value the value of the action to be performed
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- default void setAction(@Nullable final String value) {
- DeprecationSupport.warn(ObjectType.METHOD, "setAction", Action.class.toString(), "setValue");
- setValue(value);
- }
-
}
\ No newline at end of file
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/Artifact.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/Artifact.java
index bfc1043b7..c8bdd80e7 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/Artifact.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/Artifact.java
@@ -22,7 +22,6 @@
package org.opensaml.saml.saml2.core;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.xml.namespace.QName;
import org.opensaml.core.xml.schema.XSString;
@@ -30,8 +29,6 @@ import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.common.xml.SAMLConstants;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
/**
* SAML 2.0 Core Artifact.
@@ -44,27 +41,5 @@ public interface Artifact extends SAMLObject, XSString {
/** Default element name. */
@Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SAMLConstants.SAML20P_NS, DEFAULT_ELEMENT_LOCAL_NAME,
SAMLConstants.SAML20P_PREFIX);
-
- /**
- * Get artifact value.
- *
- * @return the artifact value
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- @Nullable default String getArtifact() {
- DeprecationSupport.warn(ObjectType.METHOD, "getArtifact", Artifact.class.toString(), "getValue");
- return getValue();
- }
-
- /**
- * Set artifact value.
- *
- * @param value new artifact value
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- default void setArtifact(@Nullable final String value) {
- DeprecationSupport.warn(ObjectType.METHOD, "setArtifact", Artifact.class.toString(), "setValue");
- setValue(value);
- }
}
\ No newline at end of file
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/AssertionIDRef.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/AssertionIDRef.java
index 00d8726ae..3341d09e5 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/AssertionIDRef.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/AssertionIDRef.java
@@ -18,7 +18,6 @@
package org.opensaml.saml.saml2.core;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.xml.namespace.QName;
import org.opensaml.core.xml.schema.XSString;
@@ -26,8 +25,6 @@ import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.common.xml.SAMLConstants;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
/**
* SAML 2.0 Core AssertionIDRef.
@@ -41,26 +38,4 @@ public interface AssertionIDRef extends SAMLObject, XSString, Evidentiary {
@Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SAMLConstants.SAML20_NS, DEFAULT_ELEMENT_LOCAL_NAME,
SAMLConstants.SAML20_PREFIX);
- /**
- * Gets the ID of the assertion this references.
- *
- * @return the ID of the assertion this references
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- @Nullable default String getAssertionID() {
- DeprecationSupport.warn(ObjectType.METHOD, "getAssertionID", AssertionIDRef.class.toString(), "getValue");
- return getValue();
- }
-
- /**
- * Sets the ID of the assertion this references.
- *
- * @param value the ID of the assertion this references
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- default void setAssertionID(@Nullable final String value) {
- DeprecationSupport.warn(ObjectType.METHOD, "setAssertionID", AssertionIDRef.class.toString(), "setValue");
- setValue(value);
- }
-
}
\ No newline at end of file
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/AssertionURIRef.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/AssertionURIRef.java
index afcc20ba8..ff22b815a 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/AssertionURIRef.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/AssertionURIRef.java
@@ -18,7 +18,6 @@
package org.opensaml.saml.saml2.core;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.xml.namespace.QName;
import org.opensaml.core.xml.schema.XSURI;
@@ -26,8 +25,6 @@ import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.common.xml.SAMLConstants;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
/**
* SAML 2.0 Core AssertionURIRef.
@@ -40,27 +37,5 @@ public interface AssertionURIRef extends SAMLObject, XSURI, Evidentiary {
/** Default element name. */
@Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SAMLConstants.SAML20_NS, DEFAULT_ELEMENT_LOCAL_NAME,
SAMLConstants.SAML20_PREFIX);
-
- /**
- * Gets the URI of the assertion this references.
- *
- * @return the URI of the assertion this references
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- @Nullable default String getAssertionURI() {
- DeprecationSupport.warn(ObjectType.METHOD, "getAssertionURI", AssertionURIRef.class.toString(), "getURI");
- return getURI();
- }
-
- /**
- * Sets the URI of the assertion this references.
- *
- * @param uri the URI of the assertion this references
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- default void setAssertionURI(@Nullable final String uri) {
- DeprecationSupport.warn(ObjectType.METHOD, "setAssertionURI", AssertionURIRef.class.toString(), "setURI");
- setURI(uri);
- }
}
\ No newline at end of file
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/Audience.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/Audience.java
index c4053954b..e1a1e38d9 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/Audience.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/Audience.java
@@ -18,7 +18,6 @@
package org.opensaml.saml.saml2.core;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.xml.namespace.QName;
import org.opensaml.core.xml.schema.XSURI;
@@ -26,8 +25,6 @@ import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.common.xml.SAMLConstants;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
/**
* SAML 2.0 Core Audience.
@@ -40,27 +37,5 @@ public interface Audience extends SAMLObject, XSURI {
/** Default element name. */
@Nonnull static final QName DEFAULT_ELEMENT_NAME =
new QName(SAMLConstants.SAML20_NS, DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
-
- /**
- * Gets the URI of the audience for the assertion.
- *
- * @return the URI of the audience for the assertion
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- @Nullable default String getAudienceURI() {
- DeprecationSupport.warn(ObjectType.METHOD, "getAudienceURI", Audience.class.toString(), "getURI");
- return getURI();
- }
-
- /**
- * Sets the URI of the audience for the assertion.
- *
- * @param uri the URI of the audience for the assertion
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- default void setAudienceURI(@Nullable final String uri) {
- DeprecationSupport.warn(ObjectType.METHOD, "setAudienceURI", Audience.class.toString(), "setURI");
- setURI(uri);
- }
}
\ No newline at end of file
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/AuthnContextClassRef.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/AuthnContextClassRef.java
index 7f7cce284..e5e03afc9 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/AuthnContextClassRef.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/AuthnContextClassRef.java
@@ -21,7 +21,6 @@
package org.opensaml.saml.saml2.core;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.xml.namespace.QName;
import org.opensaml.core.xml.schema.XSURI;
@@ -29,8 +28,6 @@ import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.common.xml.SAMLConstants;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
/**
* SAML 2.0 Core AuthnContextClassRef.
@@ -43,29 +40,5 @@ public interface AuthnContextClassRef extends SAMLObject, XSURI {
/** Default element name. */
@Nonnull static final QName DEFAULT_ELEMENT_NAME =
new QName(SAMLConstants.SAML20_NS, DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
-
- /**
- * Gets the URI reference to an authentication context class.
- *
- * @return authentication context class reference URI
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- @Nullable default String getAuthnContextClassRef() {
- DeprecationSupport.warn(ObjectType.METHOD, "getAuthnContextClassRef", AuthnContextClassRef.class.toString(),
- "getURI");
- return getURI();
- }
-
- /**
- * Sets the URI reference to an authentication context class.
- *
- * @param uri the new AuthnContextClassRef URI
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- default void setAuthnContextClassRef(@Nullable final String uri) {
- DeprecationSupport.warn(ObjectType.METHOD, "setAuthnContextClassRef", AuthnContextClassRef.class.toString(),
- "setURI");
- setURI(uri);
- }
}
\ No newline at end of file
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/AuthnContextDeclRef.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/AuthnContextDeclRef.java
index 59d664b35..62e51ab46 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/AuthnContextDeclRef.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/AuthnContextDeclRef.java
@@ -18,7 +18,6 @@
package org.opensaml.saml.saml2.core;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.xml.namespace.QName;
import org.opensaml.core.xml.schema.XSURI;
@@ -26,8 +25,6 @@ import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.common.xml.SAMLConstants;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
/**
* SAML 2.0 Core AuthnContextDeclRef.
@@ -41,28 +38,4 @@ public interface AuthnContextDeclRef extends SAMLObject, XSURI {
@Nonnull static final QName DEFAULT_ELEMENT_NAME =
new QName(SAMLConstants.SAML20_NS, DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20_PREFIX);
- /**
- * Gets the URI reference to an authentication context declaration.
- *
- * @return authentication context declaration reference URI
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- @Nullable default String getAuthnContextDeclRef() {
- DeprecationSupport.warn(ObjectType.METHOD, "getAuthnContextDeclRef", AuthnContextDeclRef.class.toString(),
- "getURI");
- return getURI();
- }
-
- /**
- * Sets the URI reference to an authentication context declaration.
- *
- * @param uri the new AuthnContextDeclRef URI
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- default void setAuthnContextDeclRef(@Nullable String uri) {
- DeprecationSupport.warn(ObjectType.METHOD, "setAuthnContextDeclRef", AuthnContextDeclRef.class.toString(),
- "setURI");
- setURI(uri);
- }
-
}
\ No newline at end of file
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/GetComplete.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/GetComplete.java
index 721435c2e..414fe82f9 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/GetComplete.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/GetComplete.java
@@ -18,7 +18,6 @@
package org.opensaml.saml.saml2.core;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.xml.namespace.QName;
import org.opensaml.core.xml.schema.XSURI;
@@ -26,8 +25,6 @@ import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.common.xml.SAMLConstants;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
/**
* SAML 2.0 Core GetComplete.
@@ -41,26 +38,4 @@ public interface GetComplete extends SAMLObject, XSURI {
@Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SAMLConstants.SAML20P_NS, DEFAULT_ELEMENT_LOCAL_NAME,
SAMLConstants.SAML20P_PREFIX);
- /**
- * Gets the GetComplete URI value.
- *
- * @return GetComplete URI
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- @Nullable default String getGetComplete() {
- DeprecationSupport.warn(ObjectType.METHOD, "getGetComplete", GetComplete.class.toString(), "getURI");
- return getURI();
- }
-
- /**
- * Sets the GetComplete URI.
- *
- * @param uri the GetComplete URI
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- default void setGetComplete(@Nullable final String uri) {
- DeprecationSupport.warn(ObjectType.METHOD, "setGetComplete", GetComplete.class.toString(), "setURI");
- setURI(uri);
- }
-
}
\ No newline at end of file
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/NewID.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/NewID.java
index 363a316ab..0a0828f7e 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/NewID.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/NewID.java
@@ -22,7 +22,6 @@
package org.opensaml.saml.saml2.core;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.xml.namespace.QName;
import org.opensaml.core.xml.schema.XSString;
@@ -30,8 +29,6 @@ import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.common.xml.SAMLConstants;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
/**
* SAML 2.0 Core NewID.
@@ -45,26 +42,4 @@ public interface NewID extends SAMLObject, XSString {
@Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SAMLConstants.SAML20P_NS, DEFAULT_ELEMENT_LOCAL_NAME,
SAMLConstants.SAML20P_PREFIX);
- /**
- * Get NewID value.
- *
- * @return NewID value
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- @Nullable default String getNewID() {
- DeprecationSupport.warn(ObjectType.METHOD, "getNewID", NewID.class.toString(), "getValue");
- return getValue();
- }
-
- /**
- * Set NewID value.
- *
- * @param value the new NewID value
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- default void setNewID(@Nullable final String value) {
- DeprecationSupport.warn(ObjectType.METHOD, "setNewID", NewID.class.toString(), "setValue");
- setValue(value);
- }
-
}
\ No newline at end of file
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/RequesterID.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/RequesterID.java
index e0adc00b0..77b4146d7 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/RequesterID.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/RequesterID.java
@@ -18,7 +18,6 @@
package org.opensaml.saml.saml2.core;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.xml.namespace.QName;
import org.opensaml.core.xml.schema.XSURI;
@@ -26,8 +25,6 @@ import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.common.xml.SAMLConstants;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
/**
* SAML 2.0 Core RequesterID.
@@ -40,27 +37,5 @@ public interface RequesterID extends SAMLObject, XSURI {
/** Default element name. */
@Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SAMLConstants.SAML20P_NS, DEFAULT_ELEMENT_LOCAL_NAME,
SAMLConstants.SAML20P_PREFIX);
-
- /**
- * Gets the RequesterID value.
- *
- * @return RequesterID value
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- @Nullable default String getRequesterID() {
- DeprecationSupport.warn(ObjectType.METHOD, "getRequesterID", RequesterID.class.toString(), "getURI");
- return getURI();
- }
-
- /**
- * Sets the RequesterID value.
- *
- * @param value the RequesterID value
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- default void setRequesterID(@Nullable final String value) {
- DeprecationSupport.warn(ObjectType.METHOD, "setRequesterID", RequesterID.class.toString(), "setURI");
- setURI(value);
- }
}
\ No newline at end of file
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/SessionIndex.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/SessionIndex.java
index 2af13418d..c5363580d 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/SessionIndex.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/SessionIndex.java
@@ -22,7 +22,6 @@
package org.opensaml.saml.saml2.core;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.xml.namespace.QName;
import org.opensaml.core.xml.schema.XSString;
@@ -30,8 +29,6 @@ import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.common.xml.SAMLConstants;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
/**
* SAML 2.0 Core SessionIndex.
@@ -45,26 +42,4 @@ public interface SessionIndex extends SAMLObject, XSString {
@Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SAMLConstants.SAML20P_NS, DEFAULT_ELEMENT_LOCAL_NAME,
SAMLConstants.SAML20P_PREFIX);
- /**
- * Gets the session index value of the request.
- *
- * @return the session index value of the request
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- @Nullable default String getSessionIndex() {
- DeprecationSupport.warn(ObjectType.METHOD, "getSessionIndex", SessionIndex.class.toString(), "getValue");
- return getValue();
- }
-
- /**
- * Sets the session index value of the request.
- *
- * @param value the new session index value of the request
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- default void setSessionIndex(@Nullable final String value) {
- DeprecationSupport.warn(ObjectType.METHOD, "setSessionIndex", SessionIndex.class.toString(), "setValue");
- setValue(value);
- }
-
}
\ No newline at end of file
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/StatusMessage.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/StatusMessage.java
index 6bd0fbdc9..867ec2a03 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/StatusMessage.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/StatusMessage.java
@@ -18,7 +18,6 @@
package org.opensaml.saml.saml2.core;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.xml.namespace.QName;
import org.opensaml.core.xml.schema.XSString;
@@ -26,8 +25,6 @@ import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.common.xml.SAMLConstants;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
/**
* SAML 2.0 Core StatusMessage.
@@ -41,26 +38,4 @@ public interface StatusMessage extends SAMLObject, XSString {
@Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SAMLConstants.SAML20P_NS, DEFAULT_ELEMENT_LOCAL_NAME,
SAMLConstants.SAML20P_PREFIX);
- /**
- * Gets the Message of this Status Message.
- *
- * @return StatusMessage message
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- @Nullable default String getMessage() {
- DeprecationSupport.warn(ObjectType.METHOD, "getMessage", StatusMessage.class.toString(), "getValue");
- return getValue();
- }
-
- /**
- * Sets the Message of this Status Message.
- *
- * @param value the Message of this Status Message
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- default void setMessage(@Nullable final String value) {
- DeprecationSupport.warn(ObjectType.METHOD, "setMessage", StatusMessage.class.toString(), "setValue");
- setValue(value);
- }
-
}
\ No newline at end of file
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/AdditionalMetadataLocation.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/AdditionalMetadataLocation.java
index 6cd971e39..7f48d4812 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/AdditionalMetadataLocation.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/AdditionalMetadataLocation.java
@@ -26,8 +26,6 @@ import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.common.xml.SAMLConstants;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
/**
* SAML 2.0 Metadata AdditionalMetadataLocation.
@@ -51,30 +49,6 @@ public interface AdditionalMetadataLocation extends SAMLObject, XSURI {
/** "affiliationOwnerID" attribute's local name. */
@Nonnull @NotEmpty static final String NAMESPACE_ATTRIB_NAME = "namespace";
- /**
- * Gets the location URI.
- *
- * @return the location URI
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- @Nullable default String getLocationURI() {
- DeprecationSupport.warn(ObjectType.METHOD, "getLocationURI", AdditionalMetadataLocation.class.toString(),
- "getURI");
- return getURI();
- }
-
- /**
- * Sets the location URI.
- *
- * @param uri the location URI
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- default void setLocationURI(@Nullable final String uri) {
- DeprecationSupport.warn(ObjectType.METHOD, "setLocationURI", AdditionalMetadataLocation.class.toString(),
- "setURI");
- setURI(uri);
- }
-
/**
* Gets the namespace URI.
*
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/AffiliateMember.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/AffiliateMember.java
index 1a133cfb8..ac062e911 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/AffiliateMember.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/AffiliateMember.java
@@ -18,7 +18,6 @@
package org.opensaml.saml.saml2.metadata;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.xml.namespace.QName;
import org.opensaml.core.xml.schema.XSURI;
@@ -26,8 +25,6 @@ import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.common.xml.SAMLConstants;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
/**
* SAML 2.0 Metadata AffiliateMember.
@@ -48,26 +45,4 @@ public interface AffiliateMember extends SAMLObject, XSURI {
@Nonnull static final QName TYPE_NAME = new QName(SAMLConstants.SAML20MD_NS, TYPE_LOCAL_NAME,
SAMLConstants.SAML20MD_PREFIX);
- /**
- * Gets the member's entity ID.
- *
- * @return the member's ID
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- @Nullable default String getID() {
- DeprecationSupport.warn(ObjectType.METHOD, "getID", AffiliateMember.class.toString(), "getURI");
- return getURI();
- }
-
- /**
- * Sets the member's entity ID.
- *
- * @param uri the member's ID
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- default void setID(@Nullable final String uri) {
- DeprecationSupport.warn(ObjectType.METHOD, "setID", AffiliateMember.class.toString(), "setURI");
- setURI(uri);
- }
-
}
\ No newline at end of file
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/AttributeProfile.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/AttributeProfile.java
index c86d9dbb9..d568f5ddf 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/AttributeProfile.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/AttributeProfile.java
@@ -18,7 +18,6 @@
package org.opensaml.saml.saml2.metadata;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.xml.namespace.QName;
import org.opensaml.core.xml.schema.XSURI;
@@ -26,8 +25,6 @@ import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.common.xml.SAMLConstants;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
/**
* SAML 2.0 Metadata AttributeProfile.
@@ -40,26 +37,5 @@ public interface AttributeProfile extends SAMLObject, XSURI {
/** Default element name. */
@Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SAMLConstants.SAML20MD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
SAMLConstants.SAML20MD_PREFIX);
-
- /**
- * Gets the URI of this attribute profile.
- *
- * @return the URI of this attribute profile
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- @Nullable default String getProfileURI() {
- DeprecationSupport.warn(ObjectType.METHOD, "getProfileURI", AttributeProfile.class.toString(), "getURI");
- return getURI();
- }
- /**
- * Sets the URI of this attribute profile.
- *
- * @param uri the URI of this attribute profile
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- default void setProfileURI(@Nullable final String uri) {
- DeprecationSupport.warn(ObjectType.METHOD, "setProfileURI", AttributeProfile.class.toString(), "setURI");
- setURI(uri);
- }
}
\ No newline at end of file
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/Company.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/Company.java
index 0448502c9..d0a258145 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/Company.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/Company.java
@@ -18,7 +18,6 @@
package org.opensaml.saml.saml2.metadata;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.xml.namespace.QName;
import org.opensaml.core.xml.schema.XSString;
@@ -26,8 +25,6 @@ import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.common.xml.SAMLConstants;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
/**
* SAML 2.0 Metadata Company.
@@ -41,25 +38,4 @@ public interface Company extends SAMLObject, XSString {
@Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SAMLConstants.SAML20MD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
SAMLConstants.SAML20MD_PREFIX);
- /**
- * Gets the name of the company.
- *
- * @return the name of the company
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- @Nullable default String getName() {
- DeprecationSupport.warn(ObjectType.METHOD, "getName", Company.class.toString(), "getValue");
- return getValue();
- }
-
- /**
- * Sets the name of the company.
- *
- * @param value the name of the company
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- default void setName(@Nullable final String value) {
- DeprecationSupport.warn(ObjectType.METHOD, "setName", Company.class.toString(), "setValue");
- setValue(value);
- }
}
\ No newline at end of file
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/EmailAddress.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/EmailAddress.java
index 0fc607a12..fa5daa5d5 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/EmailAddress.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/EmailAddress.java
@@ -18,7 +18,6 @@
package org.opensaml.saml.saml2.metadata;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.xml.namespace.QName;
import org.opensaml.core.xml.schema.XSURI;
@@ -26,8 +25,6 @@ import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.common.xml.SAMLConstants;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
/**
* SAML 2.0 Metadata EmailAddress.
@@ -40,27 +37,5 @@ public interface EmailAddress extends SAMLObject, XSURI {
/** Default element name. */
@Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SAMLConstants.SAML20MD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
SAMLConstants.SAML20MD_PREFIX);
-
- /**
- * Gets the email address.
- *
- * @return the email address
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- @Nullable default String getAddress() {
- DeprecationSupport.warn(ObjectType.METHOD, "getAddress", EmailAddress.class.toString(), "getURI");
- return getURI();
- }
-
- /**
- * Sets the email address.
- *
- * @param value email address
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- default void setAddress(@Nullable final String value) {
- DeprecationSupport.warn(ObjectType.METHOD, "setAddress", EmailAddress.class.toString(), "setURI");
- setURI(value);
- }
}
\ No newline at end of file
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/GivenName.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/GivenName.java
index 50685a2e2..1bbc435bb 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/GivenName.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/GivenName.java
@@ -18,7 +18,6 @@
package org.opensaml.saml.saml2.metadata;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.xml.namespace.QName;
import org.opensaml.core.xml.schema.XSString;
@@ -26,8 +25,6 @@ import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.common.xml.SAMLConstants;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
/**
* SAML 2.0 Metadata GivenName.
@@ -40,27 +37,5 @@ public interface GivenName extends SAMLObject, XSString {
/** Default element name. */
@Nonnull public static final QName DEFAULT_ELEMENT_NAME =
new QName(SAMLConstants.SAML20MD_NS, DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20MD_PREFIX);
-
- /**
- * Gets the name.
- *
- * @return the name
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- @Nullable default String getName() {
- DeprecationSupport.warn(ObjectType.METHOD, "getName", GivenName.class.toString(), "getValue");
- return getValue();
- }
-
- /**
- * Sets the name.
- *
- * @param value the name
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- default void setName(@Nullable final String value) {
- DeprecationSupport.warn(ObjectType.METHOD, "setName", GivenName.class.toString(), "setValue");
- setValue(value);
- }
}
\ No newline at end of file
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/NameIDFormat.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/NameIDFormat.java
index b945e2436..d58e5ce55 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/NameIDFormat.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/NameIDFormat.java
@@ -18,7 +18,6 @@
package org.opensaml.saml.saml2.metadata;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.xml.namespace.QName;
import org.opensaml.core.xml.schema.XSURI;
@@ -26,8 +25,6 @@ import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.common.xml.SAMLConstants;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
/**
* SAML 2.0 Metadata NameIDFormat.
@@ -40,27 +37,5 @@ public interface NameIDFormat extends SAMLObject, XSURI {
/** Default element name. */
@Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SAMLConstants.SAML20MD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
SAMLConstants.SAML20MD_PREFIX);
-
- /**
- * Gets the format of the NameID.
- *
- * @return the format of the NameID
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- @Nullable default String getFormat() {
- DeprecationSupport.warn(ObjectType.METHOD, "getFormat", NameIDFormat.class.toString(), "getURI");
- return getURI();
- }
-
- /**
- * Sets the format of the NameID.
- *
- * @param uri the format of the NameID
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- default void setFormat(@Nullable final String uri) {
- DeprecationSupport.warn(ObjectType.METHOD, "setFormat", NameIDFormat.class.toString(), "setURI");
- setURI(uri);
- }
}
\ No newline at end of file
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/SurName.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/SurName.java
index 9f8a19ae1..aefed957d 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/SurName.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/SurName.java
@@ -18,7 +18,6 @@
package org.opensaml.saml.saml2.metadata;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.xml.namespace.QName;
import org.opensaml.core.xml.schema.XSString;
@@ -26,8 +25,6 @@ import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.common.xml.SAMLConstants;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
/**
* SAML 2.0 Metadata SurName.
@@ -40,27 +37,5 @@ public interface SurName extends SAMLObject, XSString {
/** Default element name. */
@Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SAMLConstants.SAML20MD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
SAMLConstants.SAML20MD_PREFIX);
-
- /**
- * Gets the name.
- *
- * @return the name
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- @Nullable default String getName() {
- DeprecationSupport.warn(ObjectType.METHOD, "getName", SurName.class.toString(), "getValue");
- return getValue();
- }
-
- /**
- * Sets the name.
- *
- * @param value the name
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- default void setName(@Nullable final String value) {
- DeprecationSupport.warn(ObjectType.METHOD, "setName", SurName.class.toString(), "setValue");
- setValue(value);
- }
}
\ No newline at end of file
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/TelephoneNumber.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/TelephoneNumber.java
index d3db44ca3..3599c7a1f 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/TelephoneNumber.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/TelephoneNumber.java
@@ -18,7 +18,6 @@
package org.opensaml.saml.saml2.metadata;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.xml.namespace.QName;
import org.opensaml.core.xml.schema.XSString;
@@ -26,8 +25,6 @@ import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.common.xml.SAMLConstants;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
/**
* SAML 2.0 Metadata TelephoneNumber.
@@ -40,27 +37,5 @@ public interface TelephoneNumber extends SAMLObject, XSString {
/** Default element name. */
@Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SAMLConstants.SAML20MD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
SAMLConstants.SAML20MD_PREFIX);
-
- /**
- * Gets the telephone number.
- *
- * @return the telephone number
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- @Nullable default String getNumber() {
- DeprecationSupport.warn(ObjectType.METHOD, "getNumber", TelephoneNumber.class.toString(), "getValue");
- return getValue();
- }
-
- /**
- * Sets the telephone number.
- *
- * @param value the telephone number
- */
- @Deprecated(forRemoval=true, since="4.0.0")
- default void setNumber(@Nullable final String value) {
- DeprecationSupport.warn(ObjectType.METHOD, "setNumber", TelephoneNumber.class.toString(), "setValue");
- setValue(value);
- }
}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/tests/MockAssertionValidator.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/tests/MockAssertionValidator.java
index 847184b41..7615025c9 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/tests/MockAssertionValidator.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/tests/MockAssertionValidator.java
@@ -34,7 +34,7 @@ public class MockAssertionValidator extends SAML20AssertionValidator {
private Map<Assertion, Object> resultsMap;
public MockAssertionValidator(Map<Assertion, Object> results) {
- super(Collections.emptyList(), Collections.emptyList(), Collections.emptyList(), null, null);
+ super(Collections.emptyList(), Collections.emptyList(), Collections.emptyList(), null, null, null);
resultsMap = Constraint.isNotNull(results, "Results map was null");
}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/tests/SAML20AssertionValidatorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/tests/SAML20AssertionValidatorTest.java
index 6038dd079..c645f3354 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/tests/SAML20AssertionValidatorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/tests/SAML20AssertionValidatorTest.java
@@ -77,6 +77,8 @@ import org.testng.annotations.Test;
import net.shibboleth.shared.resolver.CriteriaSet;
+/** Unit test for {@link SAML20AssertionValidator}. */
+ at SuppressWarnings("javadoc")
public class SAML20AssertionValidatorTest extends BaseAssertionValidationTest {
private SAML20AssertionValidator validator;
@@ -237,7 +239,7 @@ public class SAML20AssertionValidatorTest extends BaseAssertionValidationTest {
trustedCredentials.add(cred1);
signAssertion(getAssertion(), cred1);
- validator = new SAML20AssertionValidator(conditionValidators, subjectConfirmationValidators, statementValidators, null, signaturePrevalidator);
+ validator = new SAML20AssertionValidator(conditionValidators, subjectConfirmationValidators, statementValidators, null, null, signaturePrevalidator);
Map<String,Object> staticParams = buildBasicStaticParameters();
staticParams.put(SAML2AssertionValidationParameters.SIGNATURE_REQUIRED, true);
@@ -258,7 +260,7 @@ public class SAML20AssertionValidatorTest extends BaseAssertionValidationTest {
trustedCredentials.add(cred1);
signAssertion(getAssertion(), cred1);
- validator = new SAML20AssertionValidator(conditionValidators, subjectConfirmationValidators, statementValidators, signatureTrustEngine, null);
+ validator = new SAML20AssertionValidator(conditionValidators, subjectConfirmationValidators, statementValidators, null, signatureTrustEngine, null);
Map<String,Object> staticParams = buildBasicStaticParameters();
staticParams.put(SAML2AssertionValidationParameters.SIGNATURE_REQUIRED, true);
@@ -295,7 +297,7 @@ public class SAML20AssertionValidatorTest extends BaseAssertionValidationTest {
public void testWithSignatureNoSignatureTrustEngine() throws AssertionValidationException, SecurityException, MarshallingException, SignatureException {
signAssertion(getAssertion(), cred1);
- validator = new SAML20AssertionValidator(conditionValidators, subjectConfirmationValidators, statementValidators, null, signaturePrevalidator);
+ validator = new SAML20AssertionValidator(conditionValidators, subjectConfirmationValidators, statementValidators, null, null, signaturePrevalidator);
Map<String,Object> staticParams = buildBasicStaticParameters();
staticParams.put(SAML2AssertionValidationParameters.SIGNATURE_REQUIRED, true);
@@ -318,7 +320,7 @@ public class SAML20AssertionValidatorTest extends BaseAssertionValidationTest {
}
};
- validator = new SAML20AssertionValidator(conditionValidators, subjectConfirmationValidators, statementValidators, signatureTrustEngine, failingValidator);
+ validator = new SAML20AssertionValidator(conditionValidators, subjectConfirmationValidators, statementValidators, null, signatureTrustEngine, failingValidator);
Map<String,Object> staticParams = buildBasicStaticParameters();
staticParams.put(SAML2AssertionValidationParameters.SIGNATURE_REQUIRED, true);
@@ -349,7 +351,7 @@ public class SAML20AssertionValidatorTest extends BaseAssertionValidationTest {
}
};
- validator = new SAML20AssertionValidator(conditionValidators, subjectConfirmationValidators, statementValidators, failingEngine, signaturePrevalidator);
+ validator = new SAML20AssertionValidator(conditionValidators, subjectConfirmationValidators, statementValidators, null, failingEngine, signaturePrevalidator);
Map<String,Object> staticParams = buildBasicStaticParameters();
staticParams.put(SAML2AssertionValidationParameters.SIGNATURE_REQUIRED, true);
@@ -718,7 +720,7 @@ public class SAML20AssertionValidatorTest extends BaseAssertionValidationTest {
// Helper methods
private SAML20AssertionValidator getCurrentValidator() {
- return new SAML20AssertionValidator(conditionValidators, subjectConfirmationValidators, statementValidators, signatureTrustEngine, signaturePrevalidator);
+ return new SAML20AssertionValidator(conditionValidators, subjectConfirmationValidators, statementValidators, null, signatureTrustEngine, signaturePrevalidator);
}
public static class MockCondition extends AbstractXMLObject implements Condition {
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/WSSecuritySAML20AssertionTokenSecurityHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/WSSecuritySAML20AssertionTokenSecurityHandlerTest.java
index bfdb8d35e..58ff2b8c9 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/WSSecuritySAML20AssertionTokenSecurityHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/WSSecuritySAML20AssertionTokenSecurityHandlerTest.java
@@ -63,8 +63,9 @@ import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.testing.ConstantSupplier;
/**
- *
+ * Unit test for {@link WSSecuritySAML20AssertionTokenSecurityHandler}.
*/
+ at SuppressWarnings("javadoc")
public class WSSecuritySAML20AssertionTokenSecurityHandlerTest extends XMLObjectBaseTestCase {
private WSSecuritySAML20AssertionTokenSecurityHandler handler;
@@ -344,7 +345,7 @@ public class WSSecuritySAML20AssertionTokenSecurityHandlerTest extends XMLObject
private SubjectConfirmation confirmedSubjectConfirmation;
public MockAssertionValidator(ValidationResult result, SubjectConfirmation confirmed, boolean throwException) {
- super(null, null, null, null, null);
+ super(null, null, null, null, null, null);
validationResult = result;
confirmedSubjectConfirmation = confirmed;
isThrowException = throwException;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list