[java-shib-profile] 01/01: 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-profile.

View the commit online:
https://codeberg.org/Shibboleth/java-shib-profile/commit/d686577926cab6b27c87620fb20450b3ea11ad4e

commit d686577926cab6b27c87620fb20450b3ea11ad4e
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri May 22 17:08:46 2026 +0100

    JSSH-71 Remove the impact of the DestructableComponent Interface
    
    https://shibboleth.atlassian.net/browse/JSSH-71
    
    replace doDestroy with annotated method
---
 shib-profile-impl/pom.xml                                          | 5 +++++
 .../impl/DefaultRelyingPartyConfigurationResolver.java             | 7 ++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/shib-profile-impl/pom.xml b/shib-profile-impl/pom.xml
index cc43aab..fb7165c 100644
--- a/shib-profile-impl/pom.xml
+++ b/shib-profile-impl/pom.xml
@@ -73,6 +73,11 @@
             <artifactId>spring-beans</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-core</artifactId>
diff --git a/shib-profile-impl/src/main/java/net/shibboleth/profile/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java b/shib-profile-impl/src/main/java/net/shibboleth/profile/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java
index f11b17c..1969aaa 100644
--- a/shib-profile-impl/src/main/java/net/shibboleth/profile/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java
+++ b/shib-profile-impl/src/main/java/net/shibboleth/profile/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java
@@ -24,6 +24,8 @@ import java.util.stream.Collectors;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import jakarta.annotation.PreDestroy;
+
 import org.opensaml.core.criterion.EntityIdCriterion;
 import org.opensaml.core.metrics.MetricsSupport;
 import org.opensaml.profile.context.ProfileRequestContext;
@@ -247,14 +249,13 @@ public class DefaultRelyingPartyConfigurationResolver extends AbstractIdentifiab
         }
     }
     
-    /** {@inheritDoc} */
-    @Override protected void doDestroy() {
+    /** Bean-specific function to handle tear down. */
+    @PreDestroy synchronized public void teardown() {
         final String localMetricName = getMetricName();
         if (localMetricName != null && counterGauge != null) {
             MetricsSupport.remove(localMetricName, counterGauge);
         }
         
-        super.doDestroy();
     }
 
     /** {@inheritDoc} */

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