[java-shib-attribute] 03/06: JSSH-71 Remove the impact of the DestructableComponent Interface

[Codeberg]

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

codeberg pushed a commit to branch dev/JSSH-71
in repository java-shib-attribute.

View the commit online:
https://codeberg.org/Shibboleth/java-shib-attribute/commit/94592abfc8c3aed157a5787231821e0662470bb0

commit 94592abfc8c3aed157a5787231821e0662470bb0
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri May 22 16:40:20 2026 +0100

    JSSH-71 Remove the impact of the DestructableComponent Interface
    
    https://shibboleth.atlassian.net/browse/JSSH-71
    
    Modify testing support to use @PreDestroy annotation
---
 shib-attribute-testing/pom.xml                                     | 5 +++++
 .../idp/attribute/resolver/testing/MockAttributeDefinition.java    | 7 +++----
 .../idp/attribute/resolver/testing/MockDataConnector.java          | 7 +++----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/shib-attribute-testing/pom.xml b/shib-attribute-testing/pom.xml
index 2b583f7b4..10a115674 100644
--- a/shib-attribute-testing/pom.xml
+++ b/shib-attribute-testing/pom.xml
@@ -53,6 +53,11 @@
             <artifactId>opensaml-saml-api</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </dependency>
+
         <!-- Provided Dependencies -->
 
         <!-- Runtime Dependencies -->
diff --git a/shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/testing/MockAttributeDefinition.java b/shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/testing/MockAttributeDefinition.java
index 20520495c..7588110a4 100644
--- a/shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/testing/MockAttributeDefinition.java
+++ b/shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/testing/MockAttributeDefinition.java
@@ -18,6 +18,7 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
 
+import jakarta.annotation.PreDestroy;
 import net.shibboleth.idp.attribute.IdPAttribute;
 import net.shibboleth.idp.attribute.resolver.AbstractAttributeDefinition;
 import net.shibboleth.idp.attribute.resolver.ResolutionException;
@@ -79,10 +80,8 @@ public class MockAttributeDefinition extends AbstractAttributeDefinition {
         return staticValue;
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public void doDestroy() {
-        super.doDestroy();
+    /** Bean-specific function to handle tear down. */
+    @PreDestroy synchronized public void teardown() {
         destroyCount += 1;
     }
 
diff --git a/shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/testing/MockDataConnector.java b/shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/testing/MockDataConnector.java
index fb0b0c962..e4c8dd7c2 100644
--- a/shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/testing/MockDataConnector.java
+++ b/shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/testing/MockDataConnector.java
@@ -21,6 +21,7 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
 
+import jakarta.annotation.PreDestroy;
 import net.shibboleth.idp.attribute.IdPAttribute;
 import net.shibboleth.idp.attribute.resolver.AbstractDataConnector;
 import net.shibboleth.idp.attribute.resolver.ResolutionException;
@@ -106,10 +107,8 @@ public class MockDataConnector extends AbstractDataConnector {
         return values;
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public void doDestroy() {
-        super.doDestroy();
+    /** Bean-specific function to handle tear down. */
+    @PreDestroy synchronized public void teardown() {
         destroyCount += 1;
     }
 

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