[java-identity-provider] branch main updated: Adjust deprecation warnings to reference parent beans.

[Scott Cantor]

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

scantor pushed a commit to branch main
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=a3312e54cad3349d2843fc53c44e9f21469b7bfe

The following commit(s) were added to refs/heads/main by this push:
     new a3312e54c Adjust deprecation warnings to reference parent beans.
a3312e54c is described below

commit a3312e54cad3349d2843fc53c44e9f21469b7bfe
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue May 16 09:13:02 2023 -0400

    Adjust deprecation warnings to reference parent beans.
---
 .../src/main/resources/net/shibboleth/idp/conf/conditions.xml      | 3 +++
 .../net/shibboleth/idp/profile/logic/DateAttributePredicate.java   | 7 ++++---
 .../shibboleth/idp/profile/logic/DynamicAttributePredicate.java    | 3 ++-
 .../net/shibboleth/idp/profile/logic/LoopDetectionPredicate.java   | 3 ++-
 .../net/shibboleth/idp/profile/logic/RegexAttributePredicate.java  | 3 ++-
 .../net/shibboleth/idp/profile/logic/SimpleAttributePredicate.java | 3 ++-
 6 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/conditions.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/conditions.xml
index 0fee5ab5a..45bb7cad1 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/conditions.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/conditions.xml
@@ -70,6 +70,9 @@
     <bean id="shibboleth.Conditions.DateAttribute"
         class="net.shibboleth.profile.context.logic.DateAttributePredicate" abstract="true" />
 
+    <bean id="shibboleth.Conditions.LoopDetection"
+        class="net.shibboleth.profile.context.logic.LoopDetectionPredicate" abstract="true" />
+
     <!-- Parent bean for building predicates acting over a candidate c14n Subject based on proxy authn. -->
     <bean id="shibboleth.Conditions.ProxyAuthentication" abstract="true"
             class="net.shibboleth.shared.logic.StrategyIndirectedPredicate">
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/DateAttributePredicate.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/DateAttributePredicate.java
index 7b7035edd..fdabe734c 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/DateAttributePredicate.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/DateAttributePredicate.java
@@ -32,6 +32,7 @@ import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
  * @deprecated
  */
 @Deprecated(since="5.0.0", forRemoval=true)
+ at SuppressWarnings("null")
 public class DateAttributePredicate extends net.shibboleth.profile.context.logic.DateAttributePredicate {
 
     /**
@@ -42,7 +43,7 @@ public class DateAttributePredicate extends net.shibboleth.profile.context.logic
     public DateAttributePredicate(@Nonnull @NotEmpty @ParameterName(name="attribute") final String attribute) {
         super(attribute);
         DeprecationSupport.warn(ObjectType.CLASS, getClass().getName(), null,
-                net.shibboleth.profile.context.logic.DateAttributePredicate.class.getName());
+                "Parent bean 'shibboleth.Conditions.DateAttribute'");
     }
 
     /**
@@ -56,7 +57,7 @@ public class DateAttributePredicate extends net.shibboleth.profile.context.logic
             @Nonnull @ParameterName(name="formatter") final DateTimeFormatter formatter) {
         super(attribute, formatter);
         DeprecationSupport.warn(ObjectType.CLASS, getClass().getName(), null,
-                net.shibboleth.profile.context.logic.DateAttributePredicate.class.getName());
+                "Parent bean 'shibboleth.Conditions.DateAttribute'");
     }
 
     /**
@@ -70,7 +71,7 @@ public class DateAttributePredicate extends net.shibboleth.profile.context.logic
             @Nonnull @NotEmpty @ParameterName(name="formatString") final String formatString) {
         super(attribute, formatString);
         DeprecationSupport.warn(ObjectType.CLASS, getClass().getName(), null,
-                net.shibboleth.profile.context.logic.DateAttributePredicate.class.getName());
+                "Parent bean 'shibboleth.Conditions.DateAttribute'");
     }
     
 }
\ No newline at end of file
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/DynamicAttributePredicate.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/DynamicAttributePredicate.java
index b9c822912..fe888e415 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/DynamicAttributePredicate.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/DynamicAttributePredicate.java
@@ -29,9 +29,10 @@ import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
 public class DynamicAttributePredicate extends net.shibboleth.profile.context.logic.DynamicAttributePredicate {
 
     /** Constructor. */
+    @SuppressWarnings("null")
     public DynamicAttributePredicate() {
         DeprecationSupport.warn(ObjectType.CLASS, getClass().getName(), null,
-                net.shibboleth.profile.context.logic.DynamicAttributePredicate.class.getName());
+                "Parent bean 'shibboleth.Conditions.DynamicAttribute'");
     }
 
 }
\ No newline at end of file
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/LoopDetectionPredicate.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/LoopDetectionPredicate.java
index fe998b482..f328860ae 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/LoopDetectionPredicate.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/LoopDetectionPredicate.java
@@ -29,9 +29,10 @@ import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
 public class LoopDetectionPredicate extends net.shibboleth.profile.context.logic.LoopDetectionPredicate {
     
     /** Constructor. */
+    @SuppressWarnings("null")
     public LoopDetectionPredicate() {
         DeprecationSupport.warn(ObjectType.CLASS, getClass().getName(), null,
-                net.shibboleth.profile.context.logic.LoopDetectionPredicate.class.getName());
+                "Parent bean 'shibboleth.Conditions.LoopDetection'");
     }
 
 }
\ No newline at end of file
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/RegexAttributePredicate.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/RegexAttributePredicate.java
index e7e20101f..6d004e346 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/RegexAttributePredicate.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/RegexAttributePredicate.java
@@ -29,9 +29,10 @@ import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
 public class RegexAttributePredicate extends net.shibboleth.profile.context.logic.RegexAttributePredicate {
 
     /** Constructor. */
+    @SuppressWarnings("null")
     public RegexAttributePredicate() {
         DeprecationSupport.warn(ObjectType.CLASS, getClass().getName(), null,
-                net.shibboleth.profile.context.logic.RegexAttributePredicate.class.getName());
+                "Parent bean 'shibboleth.Conditions.RegexAttribute'");
     }
 
 }
\ No newline at end of file
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/SimpleAttributePredicate.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/SimpleAttributePredicate.java
index 3cadb0fa2..1056cb163 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/SimpleAttributePredicate.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/SimpleAttributePredicate.java
@@ -29,9 +29,10 @@ import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
 public class SimpleAttributePredicate extends net.shibboleth.profile.context.logic.SimpleAttributePredicate {
     
     /** Constructor. */
+    @SuppressWarnings("null")
     public SimpleAttributePredicate() {
         DeprecationSupport.warn(ObjectType.CLASS, getClass().getName(), null,
-                net.shibboleth.profile.context.logic.SimpleAttributePredicate.class.getName());
+                "Parent bean 'shibboleth.Conditions.SimpleAttribute'");
     }
 
 }
\ No newline at end of file

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