[java-identity-provider] branch dev/JSSH-71 updated: 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-identity-provider.

View the commit online:
https://codeberg.org/Shibboleth/java-identity-provider/commit/9d221b340afdbf85bef0f9e0f85e9e45ee8d24e6

The following commit(s) were added to refs/heads/dev/JSSH-71 by this push:
     new 9d221b340 JSSH-71 Remove the impact of the DestructableComponent Interface
9d221b340 is described below

commit 9d221b340afdbf85bef0f9e0f85e9e45ee8d24e6
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed May 27 16:11:26 2026 +0100

    JSSH-71 Remove the impact of the DestructableComponent Interface
    
    https://shibboleth.atlassian.net/browse/JSSH-71
    
    Make the minimal changes to the spring xml wiring for the IdP tests to pass.
---
 .../main/resources/net/shibboleth/idp/conf/global-system.xml   | 10 ++++++++++
 .../main/resources/net/shibboleth/idp/conf/services-system.xml |  2 +-
 .../main/resources/net/shibboleth/idp/conf/webflow-config.xml  |  6 +++---
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml
index 43b322cbd..ce5247c07 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml
@@ -37,11 +37,21 @@
     <bean id="shibboleth.IdentifiableBeanPostProcessor"
         class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
 
+    <!-- This BeanPostProcessor tells Spring to listen to @PreDestroy. -->
+    <bean id="shibboleth.CommonAnnotationBeanPostProcessor"
+        class="org.springframework.context.annotation.CommonAnnotationBeanPostProcessor" />
+
+    <util:list id="shibboleth.BeanPostProcessors">
+        <ref bean="shibboleth.IdentifiableBeanPostProcessor" />
+        <ref bean="shibboleth.CommonAnnotationBeanPostProcessor" />
+    </util:list>
+
     <!-- This BeanFactoryPostProcessor rewrites class and parent references to relocated classes or beans. -->
     <bean id="shibboleth.RelocatedBeanFactoryPostProcessor"
         class="net.shibboleth.shared.spring.config.RelocatedBeanFactoryPostProcessor"
         p:classes-ref="shibboleth.RelocatedClassMap"/>
 
+
     <util:map id="shibboleth.RelocatedClassMap">
         <!-- At present all of these are being added for V5 and would be removable for V6. -->
         
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/services-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/services-system.xml
index f1e6b0529..0ffe472a8 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/services-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/services-system.xml
@@ -18,7 +18,7 @@
         class="net.shibboleth.shared.spring.service.ReloadableSpringService" 
         p:failFast="%{idp.service.failFast:false}"
         p:reloadCheckDelay="PT0S"
-        p:beanPostProcessors-ref="shibboleth.IdentifiableBeanPostProcessor"
+        p:beanPostProcessors-ref="shibboleth.BeanPostProcessors"
         p:beanFactoryPostProcessors-ref="shibboleth.BeanFactoryPostProcessors" />
 
     <!--
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/webflow-config.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/webflow-config.xml
index df7eb1a9d..5badf4e77 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/webflow-config.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/webflow-config.xml
@@ -193,14 +193,14 @@
     <bean id="profileRequestContextFlowExecutionListener"
           class="net.shibboleth.idp.profile.support.ProfileRequestContextFlowExecutionListener" />
 
-	<bean id="csrfTokenFlowExecutionListener" init-method="initialize" destroy-method="destroy"
+	<bean id="csrfTokenFlowExecutionListener" init-method="initialize"
           class="net.shibboleth.idp.ui.csrf.impl.CSRFTokenFlowExecutionListener" p:csrfTokenManager-ref="shibboleth.CSRFTokenManager"
           p:enabled="%{idp.csrf.enabled:false}"
           p:tokenPerFlow="%{idp.csrf.token.perFlow:false}"
           p:viewRequiresCSRFTokenPredicate-ref="shibboleth.DefaultViewRequiresCSRFTokenPredicate"
           p:eventRequiresCSRFTokenValidationPredicate-ref="shibboleth.DefaultEventRequiresCSRFTokenValidationPredicate"/>
-    
-   	<bean id="shibboleth.CSRFTokenManager" init-method="initialize" destroy-method="destroy"
+
+    <bean id="shibboleth.CSRFTokenManager" init-method="initialize"
         class="net.shibboleth.idp.ui.csrf.CSRFTokenManager"
         p:csrfParameterName="%{idp.csrf.token.parameter:csrf_token}"/>
    	

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