[java-identity-provider] 02/02: Tidy Deprecation warnings

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw 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=c852859cdfdc7406e63abb5d76c3f3d95cce209a

commit c852859cdfdc7406e63abb5d76c3f3d95cce209a
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Apr 6 10:19:01 2019 +0100

    Tidy Deprecation warnings
---
 .../common/attribute/provider/BasicAttribute.java   |  2 +-
 .../provider/V2SAMLProfileRequestContext.java       | 21 +++++++++++++--------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/idp-attribute-resolver-impl/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/BasicAttribute.java b/idp-attribute-resolver-impl/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/BasicAttribute.java
index 18b4c25..0a639dd 100644
--- a/idp-attribute-resolver-impl/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/BasicAttribute.java
+++ b/idp-attribute-resolver-impl/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/BasicAttribute.java
@@ -36,7 +36,7 @@ public class BasicAttribute extends ScriptedIdPAttributeImpl {
      */
     public BasicAttribute(final String id) {
         super(new IdPAttribute(id), "Scripted Attribute Definition: ");
-        // Deprecation is NEW in V4.0
+        // Deprecation is NEW in V3.4.4
         DeprecationSupport.warnOnce(ObjectType.CLASS,
                 "edu.internet2.middleware.shibboleth.common.attribute.provider.BasicAttribute",
                 null, "IdPAttribute");
diff --git a/idp-attribute-resolver-impl/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/V2SAMLProfileRequestContext.java b/idp-attribute-resolver-impl/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/V2SAMLProfileRequestContext.java
index 1f9cd4b..1eae7cd 100644
--- a/idp-attribute-resolver-impl/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/V2SAMLProfileRequestContext.java
+++ b/idp-attribute-resolver-impl/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/V2SAMLProfileRequestContext.java
@@ -75,7 +75,7 @@ public class V2SAMLProfileRequestContext {
      * @return attribute ID
      */
     @Nullable protected String getId() {
-        // Deprecation is NEW in V4.0
+        // Deprecation is NEW in V3.4.4
         DeprecationSupport.warnOnce(ObjectType.METHOD, "requestContext.getId()", null, null);
         return id;
     }
@@ -86,8 +86,9 @@ public class V2SAMLProfileRequestContext {
      * @return the Principal.
      */
     public String getPrincipalName() {
-        // Deprecation is NEW in V4.0
-        DeprecationSupport.warnOnce(ObjectType.METHOD, "requestContext.getPrincipalName()", null, null);
+        // Deprecation is NEW in V3.4.4
+        DeprecationSupport.warnOnce(ObjectType.METHOD, "requestContext.getPrincipalName()", null,
+                "resolutionContext.getPrincipal()");
         return resolutionContext.getPrincipal();
     }
 
@@ -97,8 +98,10 @@ public class V2SAMLProfileRequestContext {
      * @return the entityId.
      */
     public String getPeerEntityId() {
-        // Deprecation is NEW in V4.0
-        DeprecationSupport.warnOnce(ObjectType.METHOD, "requestContext.getPeerEntityId()", null, null);
+        // Deprecation is NEW in V3.4.4
+        DeprecationSupport.warnOnce(ObjectType.METHOD, "requestContext.getPeerEntityId()",
+                null,
+                "resolutionContext.getAttributeRecipientID()");
         return resolutionContext.getAttributeRecipientID();
     }
 
@@ -109,7 +112,9 @@ public class V2SAMLProfileRequestContext {
      */
     public String getLocalEntityId() {
         // Deprecation is NEW in V4.0
-        DeprecationSupport.warnOnce(ObjectType.METHOD, "requestContext.getLocalEntityId()", null, null);
+        DeprecationSupport.warnOnce(ObjectType.METHOD,
+                "requestContext.getLocalEntityId()", null,
+                "resolutionContext.getAttributeIssuerID()");
         return resolutionContext.getAttributeIssuerID();
     }
 
@@ -915,10 +920,10 @@ public class V2SAMLProfileRequestContext {
      * @param method the method
      */
     protected void unsupportedMethod(@Nonnull final String method) {
-        if (null == getId()) {
+        if (null == id) {
             log.error("Template definition referenced unsupported method {}", method);
         } else {
-            log.error("AttributeDefinition: '{}' called unsupported method {}", getId(), method);
+            log.error("AttributeDefinition: '{}' called unsupported method {}", id, method);
         }
     }
 

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