[java-shib-attribute] 05/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 main
in repository java-shib-attribute.

View the commit online:
https://codeberg.org/Shibboleth/java-shib-attribute/commit/8fcfb2bb94160662605c03810dee4e55ab22ba98

commit 8fcfb2bb94160662605c03810dee4e55ab22ba98
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Jul 21 16:46:44 2026 +0100

    JSSH-71 Remove the impact of the DestructableComponent Interface
    
    https://shibboleth.atlassian.net/browse/JSSH-71
    
    Remove explicit destroy from base bridging class.
---
 .../java/net/shibboleth/idp/attribute/filter/BaseBridgingClass.java  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/shib-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/BaseBridgingClass.java b/shib-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/BaseBridgingClass.java
index 4c8b6b92e..c776b60a5 100644
--- a/shib-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/BaseBridgingClass.java
+++ b/shib-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/BaseBridgingClass.java
@@ -25,6 +25,7 @@ import net.shibboleth.shared.component.DestructableComponent;
 import net.shibboleth.shared.component.IdentifiableComponent;
 import net.shibboleth.shared.component.InitializableComponent;
 import net.shibboleth.shared.logic.Constraint;
+import net.shibboleth.shared.primitive.AnnotationsSupport;
 
 /**
  * Base class for all classes which bridge between {@link PolicyRequirementRule} and {@link Matcher} (in either
@@ -63,9 +64,7 @@ public abstract class BaseBridgingClass extends AbstractIdentifiableInitializabl
     /** Tear down when an embedding service refreshes. */
     @OnTeardown
     public void tearDownBaseBridgingClass() {
-        if (bridgedObject instanceof DestructableComponent) {
-            ((DestructableComponent) bridgedObject).destroy();
-        }
+        AnnotationsSupport.callOnTeardownAnnotations(bridgedObject);
     }
     
     /**

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