[java-shib-metadata] branch main updated: JSSH-71 Remove the impact of the DestructableComponent Interface
Codeberg
noreply at shibboleth.net
Mon Jul 20 18:07:32 UTC 2026
This is an automated email from the git hooks/post-receive script.
codeberg pushed a commit to branch main
in repository java-shib-metadata.
View the commit online:
https://codeberg.org/Shibboleth/java-shib-metadata/commit/281d9cbfa63d7c72fb5137f2b4dac933d04c3397
The following commit(s) were added to refs/heads/main by this push:
new 281d9cbf JSSH-71 Remove the impact of the DestructableComponent Interface
281d9cbf is described below
commit 281d9cbfa63d7c72fb5137f2b4dac933d04c3397
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Jul 20 19:05:58 2026 +0100
JSSH-71 Remove the impact of the DestructableComponent Interface
https://shibboleth.atlassian.net/browse/JSSH-71
Complete the transition to using annotation-led teardown.
Three types of changes
1) Remove builder.setDestroyMethodName("destroy") in custom parsers
2) Change a few tests to stop explicit calls to destroy, using annotations if
it seems useful
3) Remove all 'default-destroy-method="destroy"'attributes from spring xml
There are several destroy-method="" attributes in place but they are left as is.
---
.../net/shibboleth/spring/metadata/AbstractMetadataProviderParser.java | 2 --
.../spring/metadata/filter/AbstractMetadataFilterParser.java | 1 -
.../java/net/shibboleth/spring/metadata/InlineMetadataParserTest.java | 3 ++-
.../test/resources/net/shibboleth/spring/failfast/metadataBeans.xml | 2 +-
.../net/shibboleth/spring/failfast/metadataBeansDefaultFF.xml | 2 +-
.../src/test/resources/net/shibboleth/spring/http/HTTPResources.xml | 2 +-
.../net/shibboleth/spring/metadata/beans-httpClientSecParams.xml | 2 +-
.../src/test/resources/net/shibboleth/spring/metadata/beans.xml | 2 +-
.../metadata/dynamic-https-trustEngine-explicitKey-params-merge.xml | 2 +-
.../dynamic-https-trustEngine-explicitKey-params-ref-same-document.xml | 2 +-
.../test/resources/net/shibboleth/spring/metadata/empty-chain-svc.xml | 2 +-
.../net/shibboleth/spring/metadata/filter/entityAttributesBeans.xml | 2 +-
.../spring/metadata/https-trustEngine-explicitKey-params-merge.xml | 2 +-
.../https-trustEngine-explicitKey-params-ref-same-document.xml | 2 +-
.../resources/net/shibboleth/spring/metadata/multipleResolvers.xml | 2 +-
.../src/test/resources/net/shibboleth/spring/metadata/serviceBeans.xml | 2 +-
16 files changed, 15 insertions(+), 17 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 d78ac652..0cb2fc36 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");
final BeanDefinitionBuilder childBeanDefinitionBuilder =
BeanDefinitionBuilder.genericBeanDefinition(getNativeBeanClass(element));
@@ -201,7 +200,6 @@ public abstract class AbstractMetadataProviderParser extends AbstractCustomBeanD
@Nonnull final BeanDefinitionBuilder builder) {
builder.setInitMethodName("initialize");
- builder.setDestroyMethodName("destroy");
final String resolverId = StringSupport.trimOrNull(element.getAttributeNS(null, "id"));
builder.addPropertyValue("id", resolverId);
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/java/net/shibboleth/spring/metadata/InlineMetadataParserTest.java b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/InlineMetadataParserTest.java
index d400256f..3a9d42d2 100644
--- a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/InlineMetadataParserTest.java
+++ b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/InlineMetadataParserTest.java
@@ -22,6 +22,7 @@ import java.util.stream.Collectors;
import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.logic.Constraint;
+import net.shibboleth.shared.primitive.AnnotationsSupport;
import net.shibboleth.shared.resolver.ResolverException;
import net.shibboleth.shared.service.ServiceableComponent;
import net.shibboleth.shared.spring.resource.PreferFileSystemResourceLoader;
@@ -124,7 +125,7 @@ public class InlineMetadataParserTest extends AbstractMetadataParserTest {
Assert.assertNotNull(resolver.resolveSingle(criteriaFor(IDP_ID)));
Assert.assertNotNull(resolver.resolveSingle(criteriaFor(SP_ID)));
}
- ms.destroy();
+ AnnotationsSupport.callOnTeardownAnnotations(ms);
}
}
\ No newline at end of file
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/failfast/metadataBeans.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/failfast/metadataBeans.xml
index 1391b7e4..4b4f59fe 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/failfast/metadataBeans.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/failfast/metadataBeans.xml
@@ -7,7 +7,7 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
- default-init-method="initialize" default-destroy-method="destroy">
+ default-init-method="initialize">
<bean id="myParserPool"
class="net.shibboleth.shared.xml.impl.BasicParserPool"
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/failfast/metadataBeansDefaultFF.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/failfast/metadataBeansDefaultFF.xml
index b68025f6..d70eeef0 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/failfast/metadataBeansDefaultFF.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/failfast/metadataBeansDefaultFF.xml
@@ -7,7 +7,7 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
- default-init-method="initialize" default-destroy-method="destroy">
+ default-init-method="initialize" >
<bean id="myParserPool"
class="net.shibboleth.shared.xml.impl.BasicParserPool"
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"
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/beans-httpClientSecParams.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/beans-httpClientSecParams.xml
index 5c6fedd3..58203ec1 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/beans-httpClientSecParams.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/beans-httpClientSecParams.xml
@@ -9,7 +9,7 @@
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
- default-init-method="initialize" default-destroy-method="destroy" default-lazy-init="true">
+ default-init-method="initialize" default-lazy-init="true">
<bean id="metadata.HttpClientSecurityParametersWithTrustEngine" destroy-method=""
class="org.opensaml.security.httpclient.HttpClientSecurityParameters">
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/beans.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/beans.xml
index 76fad639..4f5b6dbb 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/beans.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/beans.xml
@@ -7,7 +7,7 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
- default-init-method="initialize" default-destroy-method="destroy" default-lazy-init="true">
+ default-init-method="initialize" default-lazy-init="true">
<bean id="shibboleth.ParserPool"
class="net.shibboleth.shared.xml.impl.BasicParserPool"
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/dynamic-https-trustEngine-explicitKey-params-merge.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/dynamic-https-trustEngine-explicitKey-params-merge.xml
index ac317685..0ea7c92d 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/dynamic-https-trustEngine-explicitKey-params-merge.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/dynamic-https-trustEngine-explicitKey-params-merge.xml
@@ -13,7 +13,7 @@
urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd
urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd"
- default-init-method="initialize" default-destroy-method="destroy" default-lazy-init="true">
+ default-init-method="initialize" default-lazy-init="true">
<metadata:MetadataProvider
id="dynamicHttpsTrustEngineExplicitKey"
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/dynamic-https-trustEngine-explicitKey-params-ref-same-document.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/dynamic-https-trustEngine-explicitKey-params-ref-same-document.xml
index e11715bd..6cfa5c37 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/dynamic-https-trustEngine-explicitKey-params-ref-same-document.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/dynamic-https-trustEngine-explicitKey-params-ref-same-document.xml
@@ -13,7 +13,7 @@
urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd
urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd"
- default-init-method="initialize" default-destroy-method="destroy" default-lazy-init="true">
+ default-init-method="initialize" default-lazy-init="true">
<metadata:MetadataProvider
id="dynamicHttpsTrustEngineExplicitKey"
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/empty-chain-svc.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/empty-chain-svc.xml
index 07b91611..dde27b41 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/empty-chain-svc.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/empty-chain-svc.xml
@@ -7,7 +7,7 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
- default-init-method="initialize" default-destroy-method="destroy">
+ default-init-method="initialize">
<bean id="myParserPool"
class="net.shibboleth.shared.xml.impl.BasicParserPool"
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/entityAttributesBeans.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/entityAttributesBeans.xml
index ce926b5e..d1b8c983 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/entityAttributesBeans.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/entityAttributesBeans.xml
@@ -7,7 +7,7 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
- default-init-method="initialize" default-destroy-method="destroy" default-lazy-init="true">
+ default-init-method="initialize" default-lazy-init="true">
<bean id="predicate.NotRandS" destroy-method=""
class="net.shibboleth.shared.spring.expression.SpringExpressionPredicate"
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-trustEngine-explicitKey-params-merge.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-trustEngine-explicitKey-params-merge.xml
index d4e0f8ab..a8fdb0b9 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-trustEngine-explicitKey-params-merge.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-trustEngine-explicitKey-params-merge.xml
@@ -13,7 +13,7 @@
urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd
urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd"
- default-init-method="initialize" default-destroy-method="destroy" default-lazy-init="true">
+ default-init-method="initialize" default-lazy-init="true">
<metadata:MetadataProvider
id="HTTPSEntity"
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-trustEngine-explicitKey-params-ref-same-document.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-trustEngine-explicitKey-params-ref-same-document.xml
index 4feba417..17baaaf1 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-trustEngine-explicitKey-params-ref-same-document.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/https-trustEngine-explicitKey-params-ref-same-document.xml
@@ -13,7 +13,7 @@
urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd
urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd"
- default-init-method="initialize" default-destroy-method="destroy" default-lazy-init="true">
+ default-init-method="initialize" default-lazy-init="true">
<metadata:MetadataProvider
id="HTTPSEntity"
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/multipleResolvers.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/multipleResolvers.xml
index ef76e30f..f29f6834 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/multipleResolvers.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/multipleResolvers.xml
@@ -7,7 +7,7 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
- default-init-method="initialize" default-destroy-method="destroy">
+ default-init-method="initialize" >
<!-- This BeanPostProcessor auto-sets identifiable beans with the bean name
(if not already set). -->
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/serviceBeans.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/serviceBeans.xml
index 3d1a48b7..ad460ff1 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/serviceBeans.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/serviceBeans.xml
@@ -7,7 +7,7 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
- default-init-method="initialize" default-destroy-method="destroy">
+ default-init-method="initialize">
<bean id="myParserPool"
class="net.shibboleth.shared.xml.impl.BasicParserPool"
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list