[java-metadata-aggregator] 01/01: MDA-315 JSSH-78 Prepare to stop using DestructableComponent

[Codeberg]

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

codeberg pushed a commit to branch dev/MDA-315
in repository java-metadata-aggregator.

View the commit online:
https://codeberg.org/Shibboleth/java-metadata-aggregator/commit/efa31cec448adb684b5dede63434cf8eba34e43b

commit efa31cec448adb684b5dede63434cf8eba34e43b
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Oct 19 16:06:20 2026 +0100

    MDA-315 JSSH-78 Prepare to stop using DestructableComponent
    
    https://shibboleth.atlassian.net/browse/MDA-315
    
    Remove vestigial doDestroy() support.
---
 .../src/test/java/net/shibboleth/metadata/cli/MDA137Stage.java |  5 -----
 .../shibboleth/metadata/dom/AbstractDOMValidationStage.java    | 10 ----------
 .../metadata/dom/saml/shibboleth/ScopeValidationStage.java     |  6 ------
 .../java/net/shibboleth/metadata/validate/BaseAsValidator.java |  6 ------
 .../metadata/validate/x509/X509RSAOpenSSLKeylistValidator.java |  8 --------
 .../net/shibboleth/metadata/pipeline/CompositeStageTest.java   |  8 --------
 6 files changed, 43 deletions(-)

diff --git a/mda-cli/src/test/java/net/shibboleth/metadata/cli/MDA137Stage.java b/mda-cli/src/test/java/net/shibboleth/metadata/cli/MDA137Stage.java
index 34b9b19..447fa6a 100644
--- a/mda-cli/src/test/java/net/shibboleth/metadata/cli/MDA137Stage.java
+++ b/mda-cli/src/test/java/net/shibboleth/metadata/cli/MDA137Stage.java
@@ -45,9 +45,4 @@ public class MDA137Stage<T> extends AbstractStage<T> {
         LOG.info("MDA-137 initialized");
     }
     
-    @Override
-    protected void doDestroy() {
-        LOG.info("MDA-137 destroyed");
-    }
-
 }
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractDOMValidationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractDOMValidationStage.java
index eb67630..3a4805c 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractDOMValidationStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractDOMValidationStage.java
@@ -84,16 +84,6 @@ public abstract class AbstractDOMValidationStage<V, C extends DOMTraversalContex
         validators.validate(obj, context.getItem(), myId);
     }
     
-    @Override
-    protected void doDestroy() {
-        /*
-         * We created and initialized the validators object,
-         * so we should destroy it.
-         */
-        validators.destroy();
-        super.doDestroy();
-    }
-
     @Override
     protected void doInitialize() throws ComponentInitializationException {
         super.doInitialize();
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/shibboleth/ScopeValidationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/shibboleth/ScopeValidationStage.java
index 34a5770..fa2bd24 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/shibboleth/ScopeValidationStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/shibboleth/ScopeValidationStage.java
@@ -119,12 +119,6 @@ public class ScopeValidationStage extends AbstractDOMValidationStage<String, DOM
         }
     }
 
-    @Override
-    protected void doDestroy() {
-        regexpValidators.destroy();
-        super.doDestroy();
-    }
-
     @Override
     protected void doInitialize() throws ComponentInitializationException {
         super.doInitialize();
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/validate/BaseAsValidator.java b/mda-framework/src/main/java/net/shibboleth/metadata/validate/BaseAsValidator.java
index 6a430bf..536126e 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/validate/BaseAsValidator.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/validate/BaseAsValidator.java
@@ -130,12 +130,6 @@ public abstract class BaseAsValidator<V, A> extends BaseValidator implements Val
         }
     }
 
-    @Override
-    protected void doDestroy() {
-        validators.destroy();
-        super.doDestroy();
-    }
-
     @Override
     protected void doInitialize() throws ComponentInitializationException {
         super.doInitialize();
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLKeylistValidator.java b/mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLKeylistValidator.java
index 6dad861..f098ddc 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLKeylistValidator.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLKeylistValidator.java
@@ -192,14 +192,6 @@ public class X509RSAOpenSSLKeylistValidator extends AbstractX509Validator {
         }
     }
 
-    @Override
-    protected void doDestroy() {
-        // We don't need references to the individual values any more.
-        digestValues.clear();
-
-        super.doDestroy();
-    }
-
     @Override
     protected void doInitialize() throws ComponentInitializationException {
         super.doInitialize();
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/CompositeStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/CompositeStageTest.java
index 3b1f6a1..de5e543 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/CompositeStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/CompositeStageTest.java
@@ -93,14 +93,6 @@ public class CompositeStageTest {
         Assert.assertEquals(items.get(0).getItemMetadata().get(TestMarker.class).size(), 2);
     }
 
-    @Test
-    public void doDestroyTest() throws Exception {
-        final var stage = new CompositeStage<String>();
-        stage.setId("test");
-        stage.initialize();
-        stage.destroy();
-    }
-
     @Test
     public void testNotLogging() throws Exception {
     	final var marker = new MarkerStage<String>();

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