[java-shib-attribute] 02/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/5e805547845b7c084e5a7680aa0815f43bd49567

commit 5e805547845b7c084e5a7680aa0815f43bd49567
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri May 22 16:33:37 2026 +0100

    JSSH-71 Remove the impact of the DestructableComponent Interface
    
    https://shibboleth.atlassian.net/browse/JSSH-71
    
    Remove doDestroy methods which just clear down fields or
    destroy encapsulated objects.
---
 .../net/shibboleth/idp/attribute/filter/BaseBridgingClass.java   | 9 ---------
 .../idp/attribute/resolver/AbstractResolverPlugin.java           | 8 --------
 2 files changed, 17 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..cf928c08f 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
@@ -59,15 +59,6 @@ public abstract class BaseBridgingClass extends AbstractIdentifiableInitializabl
         logPrefix = null;
     }
 
-    /** {@inheritDoc} */
-    @Override
-    protected void doDestroy() {
-        if (bridgedObject instanceof DestructableComponent) {
-            ((DestructableComponent) bridgedObject).destroy();
-        }
-        super.doDestroy();
-    }
-    
     /**
      * Get the prefix for logging.
      * 
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.