[java-shib-metadata] 02/02: 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-metadata.

View the commit online:
https://codeberg.org/Shibboleth/java-shib-metadata/commit/66c5753d6c2ab4f340120c70993f78d13b4bc9e2

commit 66c5753d6c2ab4f340120c70993f78d13b4bc9e2
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sun May 24 16:18:41 2026 +0100

    JSSH-71 Remove the impact of the DestructableComponent Interface
    
    https://shibboleth.atlassian.net/browse/JSSH-71
    
    Remove destroy calls from the spring environment
      p:destroy-method
      p:default-destroy-method
      setDestroyMethodName()
---
 .../net/shibboleth/spring/metadata/AbstractMetadataProviderParser.java  | 2 --
 .../shibboleth/spring/metadata/filter/AbstractMetadataFilterParser.java | 1 -
 .../src/test/resources/net/shibboleth/spring/http/HTTPResources.xml     | 2 +-
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractMetadataProviderParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractMetadataProviderParser.java
index 030e358f..b00872c5 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractMetadataProviderParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractMetadataProviderParser.java
@@ -167,7 +167,6 @@ public abstract class AbstractMetadataProviderParser extends AbstractCustomBeanD
         super.doParse(element, parserContext, builder);
         if (isTopMost(element)) {
             builder.setInitMethodName("initialize");
-            builder.setDestroyMethodName("destroy");
             builder.setLazyInit(true);
             
             final BeanDefinitionBuilder childBeanDefinitionBuilder =
@@ -202,7 +201,6 @@ public abstract class AbstractMetadataProviderParser extends AbstractCustomBeanD
             @Nonnull final BeanDefinitionBuilder builder) {
 
         builder.setInitMethodName("initialize");
-        builder.setDestroyMethodName("destroy");
         builder.setLazyInit(true);
 
         final String resolverId = StringSupport.trimOrNull(element.getAttributeNS(null, "id"));
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/AbstractMetadataFilterParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/AbstractMetadataFilterParser.java
index 471402a6..125fd1b1 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/AbstractMetadataFilterParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/AbstractMetadataFilterParser.java
@@ -37,7 +37,6 @@ public abstract class AbstractMetadataFilterParser extends AbstractCustomBeanDef
             @Nonnull final BeanDefinitionBuilder builder) {
 
         builder.setInitMethodName("initialize");
-        builder.setDestroyMethodName("destroy");
 
         final QName filterType = DOMTypeSupport.getXSIType(element);
         if (filterType != null) {
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/http/HTTPResources.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/http/HTTPResources.xml
index 45378dcb..ff5ecdb9 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/http/HTTPResources.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/http/HTTPResources.xml
@@ -8,7 +8,7 @@
 		class="net.shibboleth.shared.httpclient.FileCachingHttpClientBuilder"
 		p:maxCacheEntries="3" p:cacheDirectory-ref="theDir" />
 
-	<bean id="basicClient" factory-bean="clientBuilder" init-method="initialize" destroy-method="destroy"
+	<bean id="basicClient" factory-bean="clientBuilder" init-method="initialize"
 		factory-method="buildClient" />
 
 	<bean id="basic" class="net.shibboleth.shared.spring.httpclient.resource.HTTPResource"

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