[java-identity-provider] branch master updated: Cleanup warnings and deprecated method calls.
Scott Cantor
cantor.2 at osu.edu
Mon Nov 25 20:15:20 EST 2019
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch master
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=654aa6f984ba126edd4b6839a6c9dcd49e7be84c
The following commit(s) were added to refs/heads/master by this push:
new 654aa6f Cleanup warnings and deprecated method calls.
654aa6f is described below
commit 654aa6f984ba126edd4b6839a6c9dcd49e7be84c
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Nov 25 20:15:13 2019 -0500
Cleanup warnings and deprecated method calls.
---
.../saml/impl/AttributeInMetadataMatcher.java | 2 +-
.../impl/AbstractEntityAttributePolicyRule.java | 2 +-
...ributeRequesterNameIDFormatExactPolicyRule.java | 2 +-
.../resolver/ad/mapped/impl/ValueMap.java | 5 ++---
.../ad/impl/ScriptedAttributeDefinitionParser.java | 1 -
.../spring/ad/mapped/impl/ValueMapParser.java | 1 -
.../idp/saml/metadata/OrganizationUIInfo.java | 4 ++--
...tractCollectionConfigurationLookupStrategy.java | 2 +-
.../config/StringConfigurationLookupStrategy.java | 2 +-
.../DefaultNameIdentifierFormatStrategyTest.java | 16 +++++++--------
.../audit/impl/StatusMessageAuditExtractor.java | 2 +-
.../impl/DecorateDelegatedAssertion.java | 6 +++---
.../delegation/impl/PopulateDelegationContext.java | 2 +-
.../messaging/impl/LibertyHTTPSOAP11Encoder.java | 2 +-
.../idp/saml/session/impl/AddLogoutRequest.java | 2 +-
.../impl/DecorateDelegatedAssertionTest.java | 4 ++--
.../impl/PopulateDelegationContextTest.java | 2 +-
.../impl/LibertyHTTPSOAP11EncoderTest.java | 2 +-
.../profile/impl/ProcessLogoutRequestTest.java | 2 +-
.../idp/ui/context/RelyingPartyUIContext.java | 6 +++---
.../idp/ui/taglib/ServiceContactTag.java | 6 +++---
.../net/shibboleth/idp/ui/csrf/BaseCSRFTest.java | 6 +++---
.../idp/ui/csrf/BaseCSRFTokenPredicateTest.java | 24 +++++++++++-----------
23 files changed, 50 insertions(+), 53 deletions(-)
diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeInMetadataMatcher.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeInMetadataMatcher.java
index 56fba82..0332e01 100644
--- a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeInMetadataMatcher.java
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeInMetadataMatcher.java
@@ -391,7 +391,7 @@ public class AttributeInMetadataMatcher extends AbstractIdentifiableInitializabl
if (xmlObj instanceof XSString) {
toMatch = ((XSString) xmlObj).getValue();
} else if (xmlObj instanceof XSURI) {
- toMatch = ((XSURI) xmlObj).getValue();
+ toMatch = ((XSURI) xmlObj).getURI();
} else if (xmlObj instanceof XSBoolean) {
toMatch = ((XSBoolean) xmlObj).getValue().getValue() ? "1" : "0";
} else if (xmlObj instanceof XSInteger) {
diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AbstractEntityAttributePolicyRule.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AbstractEntityAttributePolicyRule.java
index 8337d19..e42aa2e 100644
--- a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AbstractEntityAttributePolicyRule.java
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AbstractEntityAttributePolicyRule.java
@@ -340,7 +340,7 @@ public abstract class AbstractEntityAttributePolicyRule extends AbstractPolicyRu
} else if (object instanceof XSURI) {
- retVal = ((XSURI) object).getValue();
+ retVal = ((XSURI) object).getURI();
} else if (object instanceof XSBoolean) {
diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterNameIDFormatExactPolicyRule.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterNameIDFormatExactPolicyRule.java
index 67bfea5..3a682c1 100644
--- a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterNameIDFormatExactPolicyRule.java
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterNameIDFormatExactPolicyRule.java
@@ -129,7 +129,7 @@ public class AttributeRequesterNameIDFormatExactPolicyRule extends AbstractPolic
}
for (final NameIDFormat supportedFormat : supportedFormats) {
- if (nameIdFormat.equals(supportedFormat.getFormat())) {
+ if (nameIdFormat.equals(supportedFormat.getURI())) {
log.debug("{} Entity does support the NameID format '{}'", getLogPrefix(), nameIdFormat);
return Tristate.TRUE;
}
diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/mapped/impl/ValueMap.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/mapped/impl/ValueMap.java
index fe338f6..0ebd06e 100644
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/mapped/impl/ValueMap.java
+++ b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/mapped/impl/ValueMap.java
@@ -96,14 +96,13 @@ public class ValueMap implements Function<String, Set<StringAttributeValue>> {
return sourceValues;
}
+// CheckStyle: CyclomaticComplexity OFF
/**
* Evaluate an incoming attribute value against this value map.
*
* @param attributeValue incoming attribute value
* @return set of new values the incoming value mapped to
*/
- /** {@inheritDoc} */
- // CheckStyle: CyclomaticComplexity OFF
@Nullable public Set<StringAttributeValue> apply(@Nullable final String attributeValue) {
if (attributeValue == null) {
@@ -151,5 +150,5 @@ public class ValueMap implements Function<String, Set<StringAttributeValue>> {
return mappedValues;
}
- // CheckStyle: CyclomaticComplexity ON
+// CheckStyle: CyclomaticComplexity ON
}
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScriptedAttributeDefinitionParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScriptedAttributeDefinitionParser.java
index 013f31a..c08735d 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScriptedAttributeDefinitionParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScriptedAttributeDefinitionParser.java
@@ -42,7 +42,6 @@ import net.shibboleth.utilities.java.support.xml.ElementSupport;
*/
public class ScriptedAttributeDefinitionParser extends BaseAttributeDefinitionParser {
- /** Schema type name. */
/** Schema type name - resolver: . */
@Nonnull public static final QName TYPE_NAME_RESOLVER =
new QName(AttributeResolverNamespaceHandler.NAMESPACE, "ScriptedAttribute");
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/impl/ValueMapParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/impl/ValueMapParser.java
index 6845122..aedc999 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/impl/ValueMapParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/impl/ValueMapParser.java
@@ -42,7 +42,6 @@ import net.shibboleth.utilities.java.support.xml.ElementSupport;
/** Bean definition parser for a {@link ValueMap}. */
public class ValueMapParser extends AbstractSingleBeanDefinitionParser {
- /** Schema type name. */
/** Schema type name - resolver: . */
@Nonnull public static final QName TYPE_NAME_RESOLVER =
new QName(AttributeResolverNamespaceHandler.NAMESPACE, "ValueMap");
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/metadata/OrganizationUIInfo.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/metadata/OrganizationUIInfo.java
index 07ed5f2..60998dc 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/metadata/OrganizationUIInfo.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/metadata/OrganizationUIInfo.java
@@ -63,7 +63,7 @@ public class OrganizationUIInfo {
private final Predicate<LocalizedURI> nullLanguageURL = new Predicate<>() {
public boolean test(final LocalizedURI u) {
if (u.getXMLLang() == null) {
- LOG.warn("URI with value {} has no language associated, ignoring", u.getValue());
+ LOG.warn("URI with value {} has no language associated, ignoring", u.getURI());
return false;
}
return true;
@@ -98,7 +98,7 @@ public class OrganizationUIInfo {
filter(nullLanguageURL).
collect(Collectors.toUnmodifiableMap(
url -> Locale.forLanguageTag(url.getXMLLang()),
- dn -> dn.getValue()));
+ dn -> dn.getURI()));
}
/**
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/AbstractCollectionConfigurationLookupStrategy.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/AbstractCollectionConfigurationLookupStrategy.java
index 664f0eb..f254c4d 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/AbstractCollectionConfigurationLookupStrategy.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/AbstractCollectionConfigurationLookupStrategy.java
@@ -117,7 +117,7 @@ public abstract class AbstractCollectionConfigurationLookupStrategy<T1,T2>
if (object instanceof XSString) {
return ((XSString) object).getValue();
} else if (object instanceof XSURI) {
- return ((XSURI) object).getValue();
+ return ((XSURI) object).getURI();
} else if (object instanceof XSBoolean) {
final XSBooleanValue value = ((XSBoolean) object).getValue();
return value != null ? (value.getValue() ? "1" : "0") : null;
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/StringConfigurationLookupStrategy.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/StringConfigurationLookupStrategy.java
index 3198d1b..875f385 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/StringConfigurationLookupStrategy.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/StringConfigurationLookupStrategy.java
@@ -97,7 +97,7 @@ public class StringConfigurationLookupStrategy extends AbstractMetadataDrivenCon
if (object instanceof XSString) {
return ((XSString) object).getValue();
} else if (object instanceof XSURI) {
- return ((XSURI) object).getValue();
+ return ((XSURI) object).getURI();
} else if (object instanceof XSBoolean) {
final XSBooleanValue value = ((XSBoolean) object).getValue();
return value != null ? (value.getValue() ? "1" : "0") : null;
diff --git a/idp-saml-api/src/test/java/net/shibboleth/idp/saml/profile/logic/DefaultNameIdentifierFormatStrategyTest.java b/idp-saml-api/src/test/java/net/shibboleth/idp/saml/profile/logic/DefaultNameIdentifierFormatStrategyTest.java
index 9b5c7fd..a369967 100644
--- a/idp-saml-api/src/test/java/net/shibboleth/idp/saml/profile/logic/DefaultNameIdentifierFormatStrategyTest.java
+++ b/idp-saml-api/src/test/java/net/shibboleth/idp/saml/profile/logic/DefaultNameIdentifierFormatStrategyTest.java
@@ -102,10 +102,10 @@ public class DefaultNameIdentifierFormatStrategyTest extends OpenSAMLInitBaseTes
XMLObjectProviderRegistrySupport.getBuilderFactory().<NameIDFormat>getBuilderOrThrow(
NameIDFormat.DEFAULT_ELEMENT_NAME);
NameIDFormat format = formatBuilder.buildObject();
- format.setFormat(NameID.EMAIL);
+ format.setURI(NameID.EMAIL);
role.getNameIDFormats().add(format);
format = formatBuilder.buildObject();
- format.setFormat(NameID.TRANSIENT);
+ format.setURI(NameID.TRANSIENT);
role.getNameIDFormats().add(format);
final List<String> formats = strategy.apply(prc);
@@ -120,10 +120,10 @@ public class DefaultNameIdentifierFormatStrategyTest extends OpenSAMLInitBaseTes
XMLObjectProviderRegistrySupport.getBuilderFactory().<NameIDFormat>getBuilderOrThrow(
NameIDFormat.DEFAULT_ELEMENT_NAME);
NameIDFormat format = formatBuilder.buildObject();
- format.setFormat(NameID.PERSISTENT);
+ format.setURI(NameID.PERSISTENT);
role.getNameIDFormats().add(format);
format = formatBuilder.buildObject();
- format.setFormat(NameID.X509_SUBJECT);
+ format.setURI(NameID.X509_SUBJECT);
role.getNameIDFormats().add(format);
final List<String> formats = strategy.apply(prc);
@@ -138,10 +138,10 @@ public class DefaultNameIdentifierFormatStrategyTest extends OpenSAMLInitBaseTes
XMLObjectProviderRegistrySupport.getBuilderFactory().<NameIDFormat>getBuilderOrThrow(
NameIDFormat.DEFAULT_ELEMENT_NAME);
NameIDFormat format = formatBuilder.buildObject();
- format.setFormat(NameID.TRANSIENT);
+ format.setURI(NameID.TRANSIENT);
role.getNameIDFormats().add(format);
format = formatBuilder.buildObject();
- format.setFormat(NameID.X509_SUBJECT);
+ format.setURI(NameID.X509_SUBJECT);
role.getNameIDFormats().add(format);
final List<String> formats = strategy.apply(prc);
@@ -156,10 +156,10 @@ public class DefaultNameIdentifierFormatStrategyTest extends OpenSAMLInitBaseTes
XMLObjectProviderRegistrySupport.getBuilderFactory().<NameIDFormat>getBuilderOrThrow(
NameIDFormat.DEFAULT_ELEMENT_NAME);
NameIDFormat format = formatBuilder.buildObject();
- format.setFormat(NameID.TRANSIENT);
+ format.setURI(NameID.TRANSIENT);
role.getNameIDFormats().add(format);
format = formatBuilder.buildObject();
- format.setFormat(NameID.UNSPECIFIED);
+ format.setURI(NameID.UNSPECIFIED);
role.getNameIDFormats().add(format);
final List<String> formats = strategy.apply(prc);
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/StatusMessageAuditExtractor.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/StatusMessageAuditExtractor.java
index c1bcbdb..cbaf52a 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/StatusMessageAuditExtractor.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/StatusMessageAuditExtractor.java
@@ -60,7 +60,7 @@ public class StatusMessageAuditExtractor implements Function<ProfileRequestConte
((StatusResponseType) response).getStatus() != null
? ((StatusResponseType) response).getStatus().getStatusMessage() : null;
if (msg != null) {
- return msg.getMessage();
+ return msg.getValue();
}
}
}
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/DecorateDelegatedAssertion.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/DecorateDelegatedAssertion.java
index b8154f0..988631e 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/DecorateDelegatedAssertion.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/DecorateDelegatedAssertion.java
@@ -425,7 +425,7 @@ public class DecorateDelegatedAssertion extends AbstractProfileAction {
@Nonnull final Assertion assertion) {
final Address address = (Address) XMLObjectSupport.buildXMLObject(Address.ELEMENT_NAME);
- address.setValue(libertySSOSEndpointURL);
+ address.setURI(libertySSOSEndpointURL);
final MetadataAbstract libertyAbstract = (MetadataAbstract) XMLObjectSupport.buildXMLObject(
LibertyConstants.DISCO_ABSTRACT_ELEMENT_NAME);
@@ -498,7 +498,7 @@ public class DecorateDelegatedAssertion extends AbstractProfileAction {
// Sanity check that IdP audience has not already been added by other code.
for (final Audience audience : audienceRestriction.getAudiences()) {
- if (Objects.equals(responderId, StringSupport.trimOrNull(audience.getAudienceURI()))) {
+ if (Objects.equals(responderId, StringSupport.trimOrNull(audience.getURI()))) {
log.debug("Local entity ID '{}' already present in assertion AudienceRestriction set, skipping",
responderId);
return;
@@ -506,7 +506,7 @@ public class DecorateDelegatedAssertion extends AbstractProfileAction {
}
final Audience idpAudience = (Audience) XMLObjectSupport.buildXMLObject(Audience.DEFAULT_ELEMENT_NAME);
- idpAudience.setAudienceURI(responderId);
+ idpAudience.setURI(responderId);
audienceRestriction.getAudiences().add(idpAudience);
}
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/PopulateDelegationContext.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/PopulateDelegationContext.java
index 0b05e13..3949fb1 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/PopulateDelegationContext.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/PopulateDelegationContext.java
@@ -552,7 +552,7 @@ public class PopulateDelegationContext extends AbstractProfileAction {
final Conditions conditions = authnRequest.getConditions();
for (final AudienceRestriction ar : conditions.getAudienceRestrictions()) {
for (final Audience audience : ar.getAudiences()) {
- final String audienceValue = StringSupport.trimOrNull(audience.getAudienceURI());
+ final String audienceValue = StringSupport.trimOrNull(audience.getURI());
if (Objects.equals(audienceValue, responderId)) {
log.debug("Saw an AuthnRequest/Conditions/AudienceRestriction/Audience with value of '{}'",
responderId);
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/LibertyHTTPSOAP11Encoder.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/LibertyHTTPSOAP11Encoder.java
index 975074d..fe2a15d 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/LibertyHTTPSOAP11Encoder.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/LibertyHTTPSOAP11Encoder.java
@@ -218,7 +218,7 @@ public class LibertyHTTPSOAP11Encoder extends BaseHttpServletResponseXMLMessageE
if (objList == null || objList.isEmpty()) {
return null;
}
- return ((Action)objList.get(0)).getValue();
+ return ((Action)objList.get(0)).getURI();
}
/**
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/session/impl/AddLogoutRequest.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/session/impl/AddLogoutRequest.java
index a263af5..cf591b3 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/session/impl/AddLogoutRequest.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/session/impl/AddLogoutRequest.java
@@ -260,7 +260,7 @@ public class AddLogoutRequest extends AbstractProfileAction {
(SAMLObjectBuilder<SessionIndex>) bf.<SessionIndex>getBuilderOrThrow(
SessionIndex.DEFAULT_ELEMENT_NAME);
final SessionIndex index = indexBuilder.buildObject();
- index.setSessionIndex(saml2Session.getSessionIndex());
+ index.setValue(saml2Session.getSessionIndex());
object.getSessionIndexes().add(index);
}
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/DecorateDelegatedAssertionTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/DecorateDelegatedAssertionTest.java
index 7ba6def..3904793 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/DecorateDelegatedAssertionTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/DecorateDelegatedAssertionTest.java
@@ -389,7 +389,7 @@ public class DecorateDelegatedAssertionTest extends OpenSAMLInitBaseTestCase {
Assert.assertTrue(assertion.getConditions().getAudienceRestrictions().get(0).getAudiences().size() > 0);
boolean sawAudience = false;
for (Audience audience : assertion.getConditions().getAudienceRestrictions().get(0).getAudiences()) {
- if (Objects.equals(audience.getAudienceURI(), ActionTestingSupport.OUTBOUND_MSG_ISSUER)) {
+ if (Objects.equals(audience.getURI(), ActionTestingSupport.OUTBOUND_MSG_ISSUER)) {
sawAudience = true;
}
}
@@ -411,7 +411,7 @@ public class DecorateDelegatedAssertionTest extends OpenSAMLInitBaseTestCase {
Assert.assertEquals(attribValue.getUnknownXMLObjects(EndpointReference.ELEMENT_NAME).size(), 1);
EndpointReference epr = (EndpointReference) attribValue.getUnknownXMLObjects(EndpointReference.ELEMENT_NAME).get(0);
Assert.assertNotNull(epr.getAddress());
- Assert.assertEquals(epr.getAddress().getValue(), ssosURL);
+ Assert.assertEquals(epr.getAddress().getURI(), ssosURL);
Assert.assertNotNull(epr.getMetadata());
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/PopulateDelegationContextTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/PopulateDelegationContextTest.java
index 77fda3c..1adf02d 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/PopulateDelegationContextTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/PopulateDelegationContextTest.java
@@ -416,7 +416,7 @@ public class PopulateDelegationContextTest extends OpenSAMLInitBaseTestCase {
private Conditions buildDelegationRequestConditions() {
Audience audience = (Audience) XMLObjectSupport.buildXMLObject(Audience.DEFAULT_ELEMENT_NAME);
- audience.setAudienceURI(prc.getSubcontext(RelyingPartyContext.class).getConfiguration().getResponderId(prc));
+ audience.setURI(prc.getSubcontext(RelyingPartyContext.class).getConfiguration().getResponderId(prc));
AudienceRestriction ar = (AudienceRestriction) XMLObjectSupport.buildXMLObject(AudienceRestriction.DEFAULT_ELEMENT_NAME);
ar.getAudiences().add(audience);
Conditions conditions = (Conditions) XMLObjectSupport.buildXMLObject(Conditions.DEFAULT_ELEMENT_NAME);
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/LibertyHTTPSOAP11EncoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/LibertyHTTPSOAP11EncoderTest.java
index 4fa34a3..78cf3c5 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/LibertyHTTPSOAP11EncoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/LibertyHTTPSOAP11EncoderTest.java
@@ -96,7 +96,7 @@ public class LibertyHTTPSOAP11EncoderTest extends XMLObjectBaseTestCase {
encoder.prepareContext();
Action action = buildXMLObject(Action.ELEMENT_NAME);
- action.setValue(LibertyConstants.SSOS_RESPONSE_WSA_ACTION_URI);
+ action.setURI(LibertyConstants.SSOS_RESPONSE_WSA_ACTION_URI);
SOAPMessagingSupport.addHeaderBlock(messageContext, action);
encoder.encode();
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessLogoutRequestTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessLogoutRequestTest.java
index 8748816..b4cb87a 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessLogoutRequestTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessLogoutRequestTest.java
@@ -377,7 +377,7 @@ public class ProcessLogoutRequestTest extends SessionManagerBaseTestCase {
final NameID nameId = SAML2ActionTestingSupport.buildNameID("joe");
final SessionIndex sessionIndex = sessionIndexBuilder.buildObject();
- sessionIndex.setSessionIndex("index");
+ sessionIndex.setValue("index");
prc.getInboundMessageContext().setMessage(SAML2ActionTestingSupport.buildLogoutRequest(nameId));
((LogoutRequest) prc.getInboundMessageContext().getMessage()).getSessionIndexes().add(sessionIndex);
diff --git a/idp-ui/src/main/java/net/shibboleth/idp/ui/context/RelyingPartyUIContext.java b/idp-ui/src/main/java/net/shibboleth/idp/ui/context/RelyingPartyUIContext.java
index c90e36e..64c14fb 100644
--- a/idp-ui/src/main/java/net/shibboleth/idp/ui/context/RelyingPartyUIContext.java
+++ b/idp-ui/src/main/java/net/shibboleth/idp/ui/context/RelyingPartyUIContext.java
@@ -634,7 +634,7 @@ public final class RelyingPartyUIContext extends BaseContext {
if (null == contact || null == contact.getSurName()) {
return null;
}
- return contact.getSurName().getName();
+ return contact.getSurName().getValue();
}
/**
@@ -649,7 +649,7 @@ public final class RelyingPartyUIContext extends BaseContext {
if (null == contact || null == contact.getGivenName()) {
return null;
}
- return contact.getGivenName().getName();
+ return contact.getGivenName().getValue();
}
/**
@@ -664,7 +664,7 @@ public final class RelyingPartyUIContext extends BaseContext {
if (null == contact || null == contact.getEmailAddresses() || contact.getEmailAddresses().isEmpty()) {
return null;
}
- return policeURLNonLogo(contact.getEmailAddresses().get(0).getAddress());
+ return policeURLNonLogo(contact.getEmailAddresses().get(0).getURI());
}
/** Helper function for methods which need localized strings.
diff --git a/idp-ui/src/main/java/net/shibboleth/idp/ui/taglib/ServiceContactTag.java b/idp-ui/src/main/java/net/shibboleth/idp/ui/taglib/ServiceContactTag.java
index ca3eab3..640146e 100644
--- a/idp-ui/src/main/java/net/shibboleth/idp/ui/taglib/ServiceContactTag.java
+++ b/idp-ui/src/main/java/net/shibboleth/idp/ui/taglib/ServiceContactTag.java
@@ -117,7 +117,7 @@ public class ServiceContactTag extends ServiceTagSupport {
String emailAddress = null;
if (emails != null && !emails.isEmpty()) {
- emailAddress = emails.get(0).getAddress();
+ emailAddress = emails.get(0).getURI();
}
if (null != contactName) {
@@ -127,10 +127,10 @@ public class ServiceContactTag extends ServiceTagSupport {
final GivenName givenName = contact.getGivenName();
final StringBuilder fullName = new StringBuilder();
if (null != givenName) {
- fullName.append(givenName.getName()).append(" ");
+ fullName.append(givenName.getValue()).append(" ");
}
if (null != surName) {
- fullName.append(surName.getName()).append(" ");
+ fullName.append(surName.getValue()).append(" ");
}
if (0 == fullName.length()) {
if (null == emails) {
diff --git a/idp-ui/src/test/java/net/shibboleth/idp/ui/csrf/BaseCSRFTest.java b/idp-ui/src/test/java/net/shibboleth/idp/ui/csrf/BaseCSRFTest.java
index fb4beda..80c17e0 100644
--- a/idp-ui/src/test/java/net/shibboleth/idp/ui/csrf/BaseCSRFTest.java
+++ b/idp-ui/src/test/java/net/shibboleth/idp/ui/csrf/BaseCSRFTest.java
@@ -70,9 +70,9 @@ public class BaseCSRFTest {
private RequestContext context;
- public MockView(String viewId, RequestContext context) {
- this.viewId = viewId;
- this.context = context;
+ public MockView(String id, RequestContext ctx) {
+ viewId = id;
+ context = ctx;
}
/**
diff --git a/idp-ui/src/test/java/net/shibboleth/idp/ui/csrf/BaseCSRFTokenPredicateTest.java b/idp-ui/src/test/java/net/shibboleth/idp/ui/csrf/BaseCSRFTokenPredicateTest.java
index 3119a8d..acd6a23 100644
--- a/idp-ui/src/test/java/net/shibboleth/idp/ui/csrf/BaseCSRFTokenPredicateTest.java
+++ b/idp-ui/src/test/java/net/shibboleth/idp/ui/csrf/BaseCSRFTokenPredicateTest.java
@@ -44,7 +44,7 @@ public class BaseCSRFTokenPredicateTest extends BaseCSRFTest{
Object excludedListObject = ReflectionTestUtils.getField(predicate, INCLUDED_VIEWSTATES_FIELDNAME);
Assert.assertNotNull(excludedListObject);
Assert.assertTrue(excludedListObject instanceof Set);
- Assert.assertEquals(((Set) excludedListObject).size(), 0);
+ Assert.assertEquals(((Set<?>) excludedListObject).size(), 0);
}
@@ -58,7 +58,7 @@ public class BaseCSRFTokenPredicateTest extends BaseCSRFTest{
Object excludedListObject = ReflectionTestUtils.getField(predicate, EXCLUDED_VIEWSTATES_FIELDNAME);
Assert.assertNotNull(excludedListObject);
Assert.assertTrue(excludedListObject instanceof Set);
- Assert.assertEquals(((Set) excludedListObject).size(), 0);
+ Assert.assertEquals(((Set<?>) excludedListObject).size(), 0);
// test setting an actual excluded view state
List<String> excludedViewStates = Arrays.asList(new String[] {"excludedViewId"});
@@ -66,8 +66,8 @@ public class BaseCSRFTokenPredicateTest extends BaseCSRFTest{
excludedListObject = ReflectionTestUtils.getField(predicate, EXCLUDED_VIEWSTATES_FIELDNAME);
Assert.assertNotNull(excludedListObject);
Assert.assertTrue(excludedListObject instanceof Set);
- Assert.assertEquals(((Set) excludedListObject).size(), 1);
- Assert.assertTrue(((Set) excludedListObject).contains("excludedViewId"));
+ Assert.assertEquals(((Set<?>) excludedListObject).size(), 1);
+ Assert.assertTrue(((Set<?>) excludedListObject).contains("excludedViewId"));
}
@@ -83,8 +83,8 @@ public class BaseCSRFTokenPredicateTest extends BaseCSRFTest{
Object includeAllViews = ReflectionTestUtils.getField(predicate, INCLUDE_ALL_VIEWSTATES_FIELDNAME);
Assert.assertNotNull(includedListObject);
Assert.assertTrue(includedListObject instanceof Set);
- Assert.assertEquals(((Set) includedListObject).size(), 1);
- Assert.assertTrue(((Set) includedListObject).contains("includedViewId"));
+ Assert.assertEquals(((Set<?>) includedListObject).size(), 1);
+ Assert.assertTrue(((Set<?>) includedListObject).contains("includedViewId"));
Assert.assertNotNull(includeAllViews);
Assert.assertTrue(includeAllViews instanceof Boolean);
Assert.assertFalse((Boolean)includeAllViews);
@@ -102,9 +102,9 @@ public class BaseCSRFTokenPredicateTest extends BaseCSRFTest{
Object includeAllViews = ReflectionTestUtils.getField(predicate, INCLUDE_ALL_VIEWSTATES_FIELDNAME);
Assert.assertNotNull(includedListObject);
Assert.assertTrue(includedListObject instanceof Set);
- Assert.assertEquals(((Set) includedListObject).size(), 2);
- Assert.assertTrue(((Set) includedListObject).contains("includedViewId"));
- Assert.assertTrue(((Set) includedListObject).contains("includedViewId2"));
+ Assert.assertEquals(((Set<?>) includedListObject).size(), 2);
+ Assert.assertTrue(((Set<?>) includedListObject).contains("includedViewId"));
+ Assert.assertTrue(((Set<?>) includedListObject).contains("includedViewId2"));
Assert.assertNotNull(includeAllViews);
Assert.assertTrue(includeAllViews instanceof Boolean);
Assert.assertFalse((Boolean)includeAllViews);
@@ -122,7 +122,7 @@ public class BaseCSRFTokenPredicateTest extends BaseCSRFTest{
Object includeAllViews = ReflectionTestUtils.getField(predicate, INCLUDE_ALL_VIEWSTATES_FIELDNAME);
Assert.assertNotNull(includedListObject);
Assert.assertTrue(includedListObject instanceof Set);
- Assert.assertEquals(((Set) includedListObject).size(), 0);
+ Assert.assertEquals(((Set<?>) includedListObject).size(), 0);
Assert.assertNotNull(includeAllViews);
Assert.assertTrue(includeAllViews instanceof Boolean);
Assert.assertTrue((Boolean)includeAllViews);
@@ -141,7 +141,7 @@ public class BaseCSRFTokenPredicateTest extends BaseCSRFTest{
Object includeAllViews = ReflectionTestUtils.getField(predicate, INCLUDE_ALL_VIEWSTATES_FIELDNAME);
Assert.assertNotNull(includedListObject);
Assert.assertTrue(includedListObject instanceof Set);
- Assert.assertEquals(((Set) includedListObject).size(), 0);
+ Assert.assertEquals(((Set<?>) includedListObject).size(), 0);
Assert.assertNotNull(includeAllViews);
Assert.assertTrue(includeAllViews instanceof Boolean);
Assert.assertTrue((Boolean)includeAllViews);
@@ -159,7 +159,7 @@ public class BaseCSRFTokenPredicateTest extends BaseCSRFTest{
Object includeAllViews = ReflectionTestUtils.getField(predicate, INCLUDE_ALL_VIEWSTATES_FIELDNAME);
Assert.assertNotNull(includedListObject);
Assert.assertTrue(includedListObject instanceof Set);
- Assert.assertEquals(((Set) includedListObject).size(), 0);
+ Assert.assertEquals(((Set<?>) includedListObject).size(), 0);
Assert.assertNotNull(includeAllViews);
Assert.assertTrue(includeAllViews instanceof Boolean);
Assert.assertFalse((Boolean)includeAllViews);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list