[java-identity-provider] branch master updated: Fix deprecated method call.
Scott Cantor
cantor.2 at osu.edu
Fri Jan 10 11:13:35 EST 2020
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=382701e7366658eded2f22e015b430f54f1b5cca
The following commit(s) were added to refs/heads/master by this push:
new 382701e Fix deprecated method call.
382701e is described below
commit 382701e7366658eded2f22e015b430f54f1b5cca
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Fri Jan 10 11:13:31 2020 -0500
Fix deprecated method call.
---
.../java/net/shibboleth/idp/attribute/IdPRequestedAttribute.java | 3 +++
.../java/net/shibboleth/idp/attribute/RequestedAttributeTest.java | 4 ++--
.../filter/matcher/saml/impl/AttributeInMetadataMatcher.java | 2 +-
.../resolver/spring/AttributeMappingNodeProcessorTest.java | 6 +++---
.../idp/consent/logic/impl/IsAttributeRequiredPredicate.java | 2 +-
.../attribute/transcoding/AbstractSAML2AttributeTranscoder.java | 2 +-
.../transcoding/impl/SAML1ByteAttributeTranscoderTest.java | 2 +-
.../transcoding/impl/SAML1ScopedStringAttributeTranscoderTest.java | 2 +-
.../transcoding/impl/SAML1StringAttributeTranscoderTest.java | 2 +-
.../transcoding/impl/SAML2ByteAttributeTranscoderTest.java | 4 ++--
.../transcoding/impl/SAML2ScopedStringAttributeTranscoderTest.java | 4 ++--
.../transcoding/impl/SAML2StringAttributeTranscoderTest.java | 4 ++--
.../transcoding/impl/SAML2XMLObjectAttributeTranscoderTest.java | 4 ++--
13 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/IdPRequestedAttribute.java b/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/IdPRequestedAttribute.java
index f1111ec..9d7eae7 100644
--- a/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/IdPRequestedAttribute.java
+++ b/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/IdPRequestedAttribute.java
@@ -18,6 +18,8 @@
package net.shibboleth.idp.attribute;
import net.shibboleth.utilities.java.support.annotation.ParameterName;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
/**
* IdP Representation of the SAML2 RequestedAttribute.
@@ -56,6 +58,7 @@ public final class IdPRequestedAttribute extends IdPAttribute {
*/
@Deprecated(forRemoval=true,since="4.0.0")
public boolean getIsRequired() {
+ DeprecationSupport.warn(ObjectType.METHOD, "getIsRequired", getClass().getName(), "isRequired");
return isRequired;
}
diff --git a/idp-attribute-api/src/test/java/net/shibboleth/idp/attribute/RequestedAttributeTest.java b/idp-attribute-api/src/test/java/net/shibboleth/idp/attribute/RequestedAttributeTest.java
index ee9a092..cbbdb25 100644
--- a/idp-attribute-api/src/test/java/net/shibboleth/idp/attribute/RequestedAttributeTest.java
+++ b/idp-attribute-api/src/test/java/net/shibboleth/idp/attribute/RequestedAttributeTest.java
@@ -32,9 +32,9 @@ public class RequestedAttributeTest {
IdPRequestedAttribute attr = new IdPRequestedAttribute("id");
Assert.assertEquals(attr.getId(), "id");
- Assert.assertFalse(attr.getIsRequired());
+ Assert.assertFalse(attr.isRequired());
attr.setRequired(true);
- Assert.assertTrue(attr.getIsRequired());
+ Assert.assertTrue(attr.isRequired());
}
}
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 389b4ca..536c0e7 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
@@ -253,7 +253,7 @@ public class AttributeInMetadataMatcher extends AbstractIdentifiableInitializabl
for (final IdPAttribute requestedAttribute : List.copyOf(requestedAttributeList)) {
if (requestedAttribute instanceof IdPRequestedAttribute
- && !((IdPRequestedAttribute) requestedAttribute).getIsRequired() && onlyIfRequired) {
+ && !((IdPRequestedAttribute) requestedAttribute).isRequired() && onlyIfRequired) {
log.debug("{} Decoded attribute {} found in metadata, but not required, values not matched",
getLogPrefix(), attribute.getId());
continue;
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMappingNodeProcessorTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMappingNodeProcessorTest.java
index d50f1ac..b57447f 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMappingNodeProcessorTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMappingNodeProcessorTest.java
@@ -148,18 +148,18 @@ public class AttributeMappingNodeProcessorTest extends XMLObjectBaseTestCase {
assertEquals(attribute.size(), 1);
IdPRequestedAttribute attr = IdPRequestedAttribute.class.cast(attribute.iterator().next());
assertTrue(attr.getValues().isEmpty());
- assertFalse(attr.getIsRequired());
+ assertFalse(attr.isRequired());
attribute = map.get("dn2");
assertEquals(attribute.size(), 1);
attr = IdPRequestedAttribute.class.cast(attribute.iterator().next());
assertTrue(attr.getValues().isEmpty());
- assertTrue(attr.getIsRequired());
+ assertTrue(attr.isRequired());
attribute = map.get("eppn");
assertEquals(attribute.size(), 1);
attr = IdPRequestedAttribute.class.cast(attribute.iterator().next());
assertTrue(attr.getValues().isEmpty());
- assertFalse(attr.getIsRequired());
+ assertFalse(attr.isRequired());
}
}
diff --git a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/logic/impl/IsAttributeRequiredPredicate.java b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/logic/impl/IsAttributeRequiredPredicate.java
index ccc41e9..99cd62f 100644
--- a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/logic/impl/IsAttributeRequiredPredicate.java
+++ b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/logic/impl/IsAttributeRequiredPredicate.java
@@ -132,7 +132,7 @@ public class IsAttributeRequiredPredicate implements Predicate<IdPAttribute> {
if (requestedAttrs != null) {
for (final IdPAttribute requestedAttr : requestedAttrs) {
if (requestedAttr instanceof IdPRequestedAttribute
- && ((IdPRequestedAttribute) requestedAttr).getIsRequired()) {
+ && ((IdPRequestedAttribute) requestedAttr).isRequired()) {
log.debug("Attribute '{}' is required", input);
return true;
}
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/transcoding/AbstractSAML2AttributeTranscoder.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/transcoding/AbstractSAML2AttributeTranscoder.java
index f545f4c..bb1737f 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/transcoding/AbstractSAML2AttributeTranscoder.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/transcoding/AbstractSAML2AttributeTranscoder.java
@@ -106,7 +106,7 @@ public abstract class AbstractSAML2AttributeTranscoder<EncodedType extends IdPAt
} else if (to.equals(RequestedAttribute.class)) {
samlAttribute = reqAttributeBuilder.buildObject();
if (attribute instanceof IdPRequestedAttribute) {
- ((RequestedAttribute) samlAttribute).setIsRequired(((IdPRequestedAttribute) attribute).getIsRequired());
+ ((RequestedAttribute) samlAttribute).setIsRequired(((IdPRequestedAttribute) attribute).isRequired());
}
} else {
throw new AttributeEncodingException("Unsupported target object type: " + to.getName());
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ByteAttributeTranscoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ByteAttributeTranscoderTest.java
index b49d3e6..b1f66bc 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ByteAttributeTranscoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ByteAttributeTranscoderTest.java
@@ -168,7 +168,7 @@ public class SAML1ByteAttributeTranscoderTest extends OpenSAMLInitBaseTestCase {
Assert.assertTrue(attr instanceof IdPRequestedAttribute);
Assert.assertEquals(attr.getId(), ATTR_NAME);
- Assert.assertFalse(((IdPRequestedAttribute) attr).getIsRequired());
+ Assert.assertFalse(((IdPRequestedAttribute) attr).isRequired());
Assert.assertTrue(attr.getValues().isEmpty());
}
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ScopedStringAttributeTranscoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ScopedStringAttributeTranscoderTest.java
index 69e530d..8d02070 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ScopedStringAttributeTranscoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ScopedStringAttributeTranscoderTest.java
@@ -161,7 +161,7 @@ public class SAML1ScopedStringAttributeTranscoderTest extends OpenSAMLInitBaseTe
Assert.assertTrue(attr instanceof IdPRequestedAttribute);
Assert.assertEquals(attr.getId(), ATTR_NAME);
- Assert.assertFalse(((IdPRequestedAttribute) attr).getIsRequired());
+ Assert.assertFalse(((IdPRequestedAttribute) attr).isRequired());
Assert.assertTrue(attr.getValues().isEmpty());
}
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1StringAttributeTranscoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1StringAttributeTranscoderTest.java
index a41e3f1..a43f54d 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1StringAttributeTranscoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1StringAttributeTranscoderTest.java
@@ -165,7 +165,7 @@ public class SAML1StringAttributeTranscoderTest extends OpenSAMLInitBaseTestCase
Assert.assertTrue(attr instanceof IdPRequestedAttribute);
Assert.assertEquals(attr.getId(), ATTR_NAME);
- Assert.assertFalse(((IdPRequestedAttribute) attr).getIsRequired());
+ Assert.assertFalse(((IdPRequestedAttribute) attr).isRequired());
Assert.assertTrue(attr.getValues().isEmpty());
}
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ByteAttributeTranscoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ByteAttributeTranscoderTest.java
index d635272..7012fd1 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ByteAttributeTranscoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ByteAttributeTranscoderTest.java
@@ -161,7 +161,7 @@ public class SAML2ByteAttributeTranscoderTest extends OpenSAMLInitBaseTestCase {
Assert.assertTrue(attr instanceof IdPRequestedAttribute);
Assert.assertEquals(attr.getId(), ATTR_NAME);
- Assert.assertTrue(((IdPRequestedAttribute) attr).getIsRequired());
+ Assert.assertTrue(((IdPRequestedAttribute) attr).isRequired());
Assert.assertTrue(attr.getValues().isEmpty());
}
@@ -320,7 +320,7 @@ public class SAML2ByteAttributeTranscoderTest extends OpenSAMLInitBaseTestCase {
Assert.assertTrue(attr instanceof IdPRequestedAttribute);
Assert.assertEquals(attr.getId(), ATTR_NAME);
- Assert.assertTrue(((IdPRequestedAttribute) attr).getIsRequired());
+ Assert.assertTrue(((IdPRequestedAttribute) attr).isRequired());
Assert.assertEquals(attr.getValues().size(), 1);
Assert.assertEquals(((ByteAttributeValue)attr.getValues().get(0)).getValue(), BYTE_ARRAY_1);
}
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ScopedStringAttributeTranscoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ScopedStringAttributeTranscoderTest.java
index 724ba28..40c2eb8 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ScopedStringAttributeTranscoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ScopedStringAttributeTranscoderTest.java
@@ -163,7 +163,7 @@ public class SAML2ScopedStringAttributeTranscoderTest extends OpenSAMLInitBaseTe
Assert.assertTrue(attr instanceof IdPRequestedAttribute);
Assert.assertEquals(attr.getId(), ATTR_NAME);
- Assert.assertTrue(((IdPRequestedAttribute) attr).getIsRequired());
+ Assert.assertTrue(((IdPRequestedAttribute) attr).isRequired());
Assert.assertTrue(attr.getValues().isEmpty());
}
@@ -312,7 +312,7 @@ public class SAML2ScopedStringAttributeTranscoderTest extends OpenSAMLInitBaseTe
Assert.assertTrue(attr instanceof IdPRequestedAttribute);
Assert.assertEquals(attr.getId(), ATTR_NAME);
- Assert.assertTrue(((IdPRequestedAttribute) attr).getIsRequired());
+ Assert.assertTrue(((IdPRequestedAttribute) attr).isRequired());
Assert.assertEquals(attr.getValues().size(), 1);
final ScopedStringAttributeValue value = (ScopedStringAttributeValue) attr.getValues().get(0);
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2StringAttributeTranscoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2StringAttributeTranscoderTest.java
index 685d8a2..286bec3 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2StringAttributeTranscoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2StringAttributeTranscoderTest.java
@@ -157,7 +157,7 @@ public class SAML2StringAttributeTranscoderTest extends OpenSAMLInitBaseTestCase
Assert.assertTrue(attr instanceof IdPRequestedAttribute);
Assert.assertEquals(attr.getId(), ATTR_NAME);
- Assert.assertTrue(((IdPRequestedAttribute) attr).getIsRequired());
+ Assert.assertTrue(((IdPRequestedAttribute) attr).isRequired());
Assert.assertTrue(attr.getValues().isEmpty());
}
@@ -299,7 +299,7 @@ public class SAML2StringAttributeTranscoderTest extends OpenSAMLInitBaseTestCase
Assert.assertTrue(attr instanceof IdPRequestedAttribute);
Assert.assertEquals(attr.getId(), ATTR_NAME);
- Assert.assertTrue(((IdPRequestedAttribute) attr).getIsRequired());
+ Assert.assertTrue(((IdPRequestedAttribute) attr).isRequired());
Assert.assertEquals(attr.getValues().size(), 1);
Assert.assertEquals(((StringAttributeValue)attr.getValues().get(0)).getValue().toString(), STRING_1);
}
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2XMLObjectAttributeTranscoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2XMLObjectAttributeTranscoderTest.java
index 9c7337f..fe10eef 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2XMLObjectAttributeTranscoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2XMLObjectAttributeTranscoderTest.java
@@ -162,7 +162,7 @@ public class SAML2XMLObjectAttributeTranscoderTest extends OpenSAMLInitBaseTestC
Assert.assertTrue(attr instanceof IdPRequestedAttribute);
Assert.assertEquals(attr.getId(), ATTR_NAME);
- Assert.assertTrue(((IdPRequestedAttribute) attr).getIsRequired());
+ Assert.assertTrue(((IdPRequestedAttribute) attr).isRequired());
Assert.assertTrue(attr.getValues().isEmpty());
}
@@ -304,7 +304,7 @@ public class SAML2XMLObjectAttributeTranscoderTest extends OpenSAMLInitBaseTestC
Assert.assertTrue(attr instanceof IdPRequestedAttribute);
Assert.assertEquals(attr.getId(), ATTR_NAME);
- Assert.assertTrue(((IdPRequestedAttribute) attr).getIsRequired());
+ Assert.assertTrue(((IdPRequestedAttribute) attr).isRequired());
Assert.assertEquals(attr.getValues().size(), 1);
final XMLObjectAttributeValue value = (XMLObjectAttributeValue) attr.getValues().get(0);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list