[java-shib-shared] branch main updated: JSSH-71 Remove the impact of the DestructableComponent Interface
Codeberg
noreply at shibboleth.net
Thu Jul 23 18:12:24 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-shared.
View the commit online:
https://codeberg.org/Shibboleth/java-shib-shared/commit/95fd83db991ed0c306ce456abbf7151830dfb579
The following commit(s) were added to refs/heads/main by this push:
new 95fd83db JSSH-71 Remove the impact of the DestructableComponent Interface
95fd83db is described below
commit 95fd83db991ed0c306ce456abbf7151830dfb579
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Jul 23 19:12:37 2026 +0100
JSSH-71 Remove the impact of the DestructableComponent Interface
https://shibboleth.atlassian.net/browse/JSSH-71
Remove non-required "default-destroy-method" from all test files.
---
.../shared/spring/httpclient/resource/conditional-import.xml | 5 ++---
.../shibboleth/shared/spring/httpclient/resource/conditional.xml | 5 ++---
.../resources/net/shibboleth/shared/spring/config/combined.xml | 6 ++----
.../resources/net/shibboleth/shared/spring/config/freeOnly.xml | 7 +++----
.../shared/spring/config/identifiableBeanPostProcessorTest.xml | 4 ++--
.../test/resources/net/shibboleth/shared/spring/config/overlap.xml | 6 ++----
.../net/shibboleth/shared/spring/config/predicateConverter.xml | 5 ++---
.../resources/net/shibboleth/shared/spring/config/staticOnly.xml | 6 ++----
8 files changed, 17 insertions(+), 27 deletions(-)
diff --git a/shib-networking-spring/src/test/resources/net/shibboleth/shared/spring/httpclient/resource/conditional-import.xml b/shib-networking-spring/src/test/resources/net/shibboleth/shared/spring/httpclient/resource/conditional-import.xml
index c08033a9..56fd78fb 100644
--- a/shib-networking-spring/src/test/resources/net/shibboleth/shared/spring/httpclient/resource/conditional-import.xml
+++ b/shib-networking-spring/src/test/resources/net/shibboleth/shared/spring/httpclient/resource/conditional-import.xml
@@ -4,11 +4,10 @@
xmlns:p="http://www.springframework.org/schema/p"
xmlns:c="http://www.springframework.org/schema/c"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"
- default-init-method="initialize"
- default-destroy-method="destroy">
+ default-init-method="initialize">
<import resource="conditional:net/shibboleth/shared/spring/httpclient/resource/conditional.xml" />
<import resource="conditional:missing.xml" />
-</beans>
\ No newline at end of file
+</beans>
diff --git a/shib-networking-spring/src/test/resources/net/shibboleth/shared/spring/httpclient/resource/conditional.xml b/shib-networking-spring/src/test/resources/net/shibboleth/shared/spring/httpclient/resource/conditional.xml
index 56b351b4..0d48913e 100644
--- a/shib-networking-spring/src/test/resources/net/shibboleth/shared/spring/httpclient/resource/conditional.xml
+++ b/shib-networking-spring/src/test/resources/net/shibboleth/shared/spring/httpclient/resource/conditional.xml
@@ -4,12 +4,11 @@
xmlns:p="http://www.springframework.org/schema/p"
xmlns:c="http://www.springframework.org/schema/c"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"
- default-init-method="initialize"
- default-destroy-method="destroy">
+ default-init-method="initialize">
<bean id="testBean"
class="java.lang.String"
c:_0="foo" />
-</beans>
\ No newline at end of file
+</beans>
diff --git a/shib-spring/src/test/resources/net/shibboleth/shared/spring/config/combined.xml b/shib-spring/src/test/resources/net/shibboleth/shared/spring/config/combined.xml
index bab61bb9..b7c50f74 100644
--- a/shib-spring/src/test/resources/net/shibboleth/shared/spring/config/combined.xml
+++ b/shib-spring/src/test/resources/net/shibboleth/shared/spring/config/combined.xml
@@ -7,9 +7,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
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 class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
@@ -25,4 +23,4 @@
<bean class="net.shibboleth.shared.spring.config.IdentifiedComponentManagerTest.MockComponentManager"
p:components-ref="StaticList" />
-</beans>
\ No newline at end of file
+</beans>
diff --git a/shib-spring/src/test/resources/net/shibboleth/shared/spring/config/freeOnly.xml b/shib-spring/src/test/resources/net/shibboleth/shared/spring/config/freeOnly.xml
index 42358083..b9090817 100644
--- a/shib-spring/src/test/resources/net/shibboleth/shared/spring/config/freeOnly.xml
+++ b/shib-spring/src/test/resources/net/shibboleth/shared/spring/config/freeOnly.xml
@@ -7,9 +7,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
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 class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
@@ -23,4 +21,5 @@
<bean class="net.shibboleth.shared.spring.config.IdentifiedComponentManagerTest.MockComponentManager"
p:components-ref="StaticList" />
-</beans>
\ No newline at end of file
+</beans>
+
diff --git a/shib-spring/src/test/resources/net/shibboleth/shared/spring/config/identifiableBeanPostProcessorTest.xml b/shib-spring/src/test/resources/net/shibboleth/shared/spring/config/identifiableBeanPostProcessorTest.xml
index 5dd91b27..a6ea6767 100644
--- a/shib-spring/src/test/resources/net/shibboleth/shared/spring/config/identifiableBeanPostProcessorTest.xml
+++ b/shib-spring/src/test/resources/net/shibboleth/shared/spring/config/identifiableBeanPostProcessorTest.xml
@@ -2,7 +2,7 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:p="http://www.springframework.org/schema/p" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"
- default-init-method="initialize" default-destroy-method="destroy">
+ default-init-method="initialize">
<bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" destroy-method="" />
@@ -34,4 +34,4 @@
class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessorTest$Identifiable"
scope="singleton" p:id="NameForNonDefaultSingletonIdentifiableBean" />
-</beans>
\ No newline at end of file
+</beans>
diff --git a/shib-spring/src/test/resources/net/shibboleth/shared/spring/config/overlap.xml b/shib-spring/src/test/resources/net/shibboleth/shared/spring/config/overlap.xml
index 27a569ee..0a47fadc 100644
--- a/shib-spring/src/test/resources/net/shibboleth/shared/spring/config/overlap.xml
+++ b/shib-spring/src/test/resources/net/shibboleth/shared/spring/config/overlap.xml
@@ -7,9 +7,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
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 class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
@@ -26,4 +24,4 @@
<bean class="net.shibboleth.shared.spring.config.IdentifiedComponentManagerTest.MockComponentManager"
p:components-ref="StaticList" />
-</beans>
\ No newline at end of file
+</beans>
diff --git a/shib-spring/src/test/resources/net/shibboleth/shared/spring/config/predicateConverter.xml b/shib-spring/src/test/resources/net/shibboleth/shared/spring/config/predicateConverter.xml
index bc85e112..3c581954 100644
--- a/shib-spring/src/test/resources/net/shibboleth/shared/spring/config/predicateConverter.xml
+++ b/shib-spring/src/test/resources/net/shibboleth/shared/spring/config/predicateConverter.xml
@@ -8,8 +8,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-lazy-init="true"
- default-init-method="initialize"
- default-destroy-method="destroy">
+ default-init-method="initialize">
<bean id="conversionService" destroy-method=""
class="org.springframework.context.support.ConversionServiceFactoryBean">
@@ -33,4 +32,4 @@
<bean destroy-method="" id="predOnly" class="net.shibboleth.shared.spring.config.StringBooleanToPredicateConverterTest.OneProp" p:name="true"/>
<bean destroy-method="" id="stringOnly" class="net.shibboleth.shared.spring.config.StringBooleanToPredicateConverterTest.OneProp" p:name="string"/>
-</beans>
\ No newline at end of file
+</beans>
diff --git a/shib-spring/src/test/resources/net/shibboleth/shared/spring/config/staticOnly.xml b/shib-spring/src/test/resources/net/shibboleth/shared/spring/config/staticOnly.xml
index 69d8f3da..01c09b4d 100644
--- a/shib-spring/src/test/resources/net/shibboleth/shared/spring/config/staticOnly.xml
+++ b/shib-spring/src/test/resources/net/shibboleth/shared/spring/config/staticOnly.xml
@@ -7,9 +7,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
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 class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
@@ -24,4 +22,4 @@
<bean class="net.shibboleth.shared.spring.config.IdentifiedComponentManagerTest.MockComponentManager"
p:components-ref="StaticList" />
-</beans>
\ No newline at end of file
+</beans>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list