You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2021/10/01 08:00:47 UTC
[ws-wss4j] branch master updated: Replacing deprecated opensaml
methods
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ws-wss4j.git
The following commit(s) were added to refs/heads/master by this push:
new f84a0fc Replacing deprecated opensaml methods
f84a0fc is described below
commit f84a0fc31b426b08405dc3d477c33f5a7ec636b4
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri Oct 1 08:59:55 2021 +0100
Replacing deprecated opensaml methods
---
.../org/apache/wss4j/common/saml/SamlAssertionWrapper.java | 8 ++++----
.../wss4j/common/saml/builder/SAML1ComponentBuilder.java | 8 ++++----
.../wss4j/common/saml/builder/SAML2ComponentBuilder.java | 12 ++++++------
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java b/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java
index 0430b9f..0cea8bb 100644
--- a/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java
+++ b/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java
@@ -393,12 +393,12 @@ public class SamlAssertionWrapper {
XMLObject data = confirmation.getSubjectConfirmationData();
if (data instanceof ConfirmationMethod) {
ConfirmationMethod method = (ConfirmationMethod) data;
- methods.add(method.getConfirmationMethod());
+ methods.add(method.getURI());
}
List<ConfirmationMethod> confirmationMethods =
confirmation.getConfirmationMethods();
for (ConfirmationMethod confirmationMethod : confirmationMethods) {
- methods.add(confirmationMethod.getConfirmationMethod());
+ methods.add(confirmationMethod.getURI());
}
}
}
@@ -876,7 +876,7 @@ public class SamlAssertionWrapper {
List<org.opensaml.saml.saml2.core.Audience> audiences =
audienceRestriction.getAudiences();
for (org.opensaml.saml.saml2.core.Audience audience : audiences) {
- String audienceURI = audience.getAudienceURI();
+ String audienceURI = audience.getURI();
if (audienceRestrictions.contains(audienceURI)) {
foundAddress = true;
break;
@@ -900,7 +900,7 @@ public class SamlAssertionWrapper {
List<org.opensaml.saml.saml1.core.Audience> audiences =
audienceRestriction.getAudiences();
for (org.opensaml.saml.saml1.core.Audience audience : audiences) {
- String audienceURI = audience.getUri();
+ String audienceURI = audience.getURI();
if (audienceRestrictions.contains(audienceURI)) {
foundAddress = true;
break;
diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML1ComponentBuilder.java b/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML1ComponentBuilder.java
index 4b08dd0..6db7e7e 100644
--- a/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML1ComponentBuilder.java
+++ b/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML1ComponentBuilder.java
@@ -193,7 +193,7 @@ public final class SAML1ComponentBuilder {
confirmationMethodStr = SAML1Constants.CONF_SENDER_VOUCHES;
}
- confirmationMethod.setConfirmationMethod(confirmationMethodStr);
+ confirmationMethod.setURI(confirmationMethodStr);
subjectConfirmation.getConfirmationMethods().add(confirmationMethod);
if (subjectBean.getKeyInfo() != null) {
KeyInfo keyInfo = createKeyInfo(subjectBean.getKeyInfo());
@@ -328,7 +328,7 @@ public final class SAML1ComponentBuilder {
for (String ref : adviceBean.getIdReferences()) {
AssertionIDReference assertionIdReference =
assertionIDReferenceBuilder.buildObject();
- assertionIdReference.setReference(ref);
+ assertionIdReference.setValue(ref);
advice.getAssertionIDReferences().add(assertionIdReference);
}
}
@@ -369,7 +369,7 @@ public final class SAML1ComponentBuilder {
for (String audienceURI : audienceRestrictionBean.getAudienceURIs()) {
Audience audience = audienceV1Builder.buildObject();
- audience.setUri(audienceURI);
+ audience.setURI(audienceURI);
audienceRestriction.getAudiences().add(audience);
}
return audienceRestriction;
@@ -598,7 +598,7 @@ public final class SAML1ComponentBuilder {
Action actionElement = actionElementV1Builder.buildObject();
actionElement.setNamespace(actionBean.getActionNamespace());
- actionElement.setContents(actionBean.getContents());
+ actionElement.setValue(actionBean.getContents());
return actionElement;
}
diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML2ComponentBuilder.java b/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML2ComponentBuilder.java
index d3e19fc..bff03d1 100644
--- a/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML2ComponentBuilder.java
+++ b/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML2ComponentBuilder.java
@@ -294,7 +294,7 @@ public final class SAML2ComponentBuilder {
for (String ref : adviceBean.getIdReferences()) {
AssertionIDRef assertionIdRef = assertionIDRefBuilder.buildObject();
- assertionIdRef.setAssertionID(ref);
+ assertionIdRef.setValue(ref);
advice.getAssertionIDReferences().add(assertionIdRef);
}
}
@@ -307,7 +307,7 @@ public final class SAML2ComponentBuilder {
for (String ref : adviceBean.getUriReferences()) {
AssertionURIRef assertionURIRef = assertionURIRefBuilder.buildObject();
- assertionURIRef.setAssertionURI(ref);
+ assertionURIRef.setURI(ref);
advice.getAssertionURIReferences().add(assertionURIRef);
}
}
@@ -348,7 +348,7 @@ public final class SAML2ComponentBuilder {
for (String audienceURI : audienceRestrictionBean.getAudienceURIs()) {
Audience audience = audienceBuilder.buildObject();
- audience.setAudienceURI(audienceURI);
+ audience.setURI(audienceURI);
audienceRestriction.getAudiences().add(audience);
}
return audienceRestriction;
@@ -432,7 +432,7 @@ public final class SAML2ComponentBuilder {
}
for (String audienceURI : proxyRestrictionBean.getAudienceURIs()) {
Audience audience = audienceBuilder.buildObject();
- audience.setAudienceURI(audienceURI);
+ audience.setURI(audienceURI);
proxyRestriction.getAudiences().add(audience);
}
}
@@ -488,7 +488,7 @@ public final class SAML2ComponentBuilder {
}
AuthnContextClassRef authnContextClassRef = authnContextClassRefBuilder.buildObject();
- authnContextClassRef.setAuthnContextClassRef(
+ authnContextClassRef.setURI(
transformAuthenticationMethod(statementBean.getAuthenticationMethod())
);
AuthnContext authnContext = authnContextBuilder.buildObject();
@@ -864,7 +864,7 @@ public final class SAML2ComponentBuilder {
if (actionBean.getActionNamespace() == null) {
actionElement.setNamespace("urn:oasis:names:tc:SAML:1.0:action:rwedc-negation");
}
- actionElement.setAction(actionBean.getContents());
+ actionElement.setValue(actionBean.getContents());
return actionElement;
}