[java-shib-attribute] branch main updated: 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/6ef191865152af6a1d2896080e3a43a966aee654

The following commit(s) were added to refs/heads/main by this push:
     new 6ef191865 JSSH-71 Remove the impact of the DestructableComponent Interface
6ef191865 is described below

commit 6ef191865152af6a1d2896080e3a43a966aee654
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Jul 7 16:17:34 2026 +0100

    JSSH-71 Remove the impact of the DestructableComponent Interface
    
    https://shibboleth.atlassian.net/browse/JSSH-71
    
    Remove one no-op doDestroy and replace another with an explicit teardown annotation
---
 .../net/shibboleth/idp/attribute/filter/BaseBridgingClass.java    | 8 ++++----
 .../shibboleth/idp/attribute/resolver/AbstractResolverPlugin.java | 8 --------
 2 files changed, 4 insertions(+), 12 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 ad954b95f..4c8b6b92e 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
@@ -17,6 +17,7 @@ package net.shibboleth.idp.attribute.filter;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import net.shibboleth.shared.annotation.OnTeardown;
 import net.shibboleth.shared.annotation.ParameterName;
 import net.shibboleth.shared.component.AbstractIdentifiableInitializableComponent;
 import net.shibboleth.shared.component.ComponentInitializationException;
@@ -59,13 +60,12 @@ public abstract class BaseBridgingClass extends AbstractIdentifiableInitializabl
         logPrefix = null;
     }
 
-    /** {@inheritDoc} */
-    @Override
-    protected void doDestroy() {
+    /** Tear down when an embedding service refreshes. */
+    @OnTeardown
+    public void tearDownBaseBridgingClass() {
         if (bridgedObject instanceof DestructableComponent) {
             ((DestructableComponent) bridgedObject).destroy();
         }
-        super.doDestroy();
     }
     
     /**
diff --git a/shib-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPlugin.java b/shib-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPlugin.java
index 9edb020d2..bba7018e4 100644
--- a/shib-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPlugin.java
+++ b/shib-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPlugin.java
@@ -213,14 +213,6 @@ public abstract class AbstractResolverPlugin<ResolvedType> extends AbstractIdent
         }
     }
 
-    /** {@inheritDoc} */
-    @Override protected void doDestroy() {
-        // TODO: probably should strip this out
-        attributeDependencies = CollectionSupport.emptySet();
-        dataConnectorDependencies = CollectionSupport.emptySet();
-        super.doDestroy();
-    }
-
     /** {@inheritDoc} */
     @Override public int hashCode() {
         return Objects.hash(getId());

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