[java-shib-shared] branch main 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 main
in repository java-shib-shared.

View the commit online:
https://codeberg.org/Shibboleth/java-shib-shared/commit/7507cede27faaa24e9b6a33c6a26228f1bdb999a

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

commit 7507cede27faaa24e9b6a33c6a26228f1bdb999a
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Jul 21 13:58:44 2026 +0100

    JSSH-71 Remove the impact of the DestructableComponent Interface
    
    https://shibboleth.atlassian.net/browse/JSSH-71
    
    Stub out teardownInstance() in a factory bean (to stop
    debugging noise when the base class calls destroy() on the component)
---
 .../spring/factory/EvaluableScriptFactoryBean.java   | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/EvaluableScriptFactoryBean.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/EvaluableScriptFactoryBean.java
index 7529ac58..be9039e7 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/EvaluableScriptFactoryBean.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/EvaluableScriptFactoryBean.java
@@ -19,18 +19,20 @@ import java.io.InputStream;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import net.shibboleth.shared.primitive.LoggerFactory;
-import net.shibboleth.shared.primitive.StringSupport;
-import net.shibboleth.shared.scripting.EvaluableScript;
-
 import org.slf4j.Logger;
-
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.core.io.Resource;
 
+import net.shibboleth.shared.primitive.LoggerFactory;
+import net.shibboleth.shared.primitive.StringSupport;
+import net.shibboleth.shared.scripting.EvaluableScript;
+
 /**
  * A factory bean to summon up an {@link EvaluableScript} from either inline data or from a resource.
+ *
+ * TODO: Remove the {@link #destroyInstance()} from this class in V6.
  */
+
 public class EvaluableScriptFactoryBean extends AbstractComponentAwareFactoryBean<EvaluableScript> {
 
     /** log. */
@@ -168,4 +170,12 @@ public class EvaluableScriptFactoryBean extends AbstractComponentAwareFactoryBea
         throw new BeanCreationException("Unable to load script");
     }
 
+    /**
+     * {@inheritDoc}
+     * <p> We do not call the parent tear down so as to avoid any deprecation logging.
+     * </>
+     */
+    @Override protected void destroyInstance(@Nullable final EvaluableScript instance) throws Exception {
+        // No appropriate tear down, but we do not want to be called at destroy
+    }
 }
\ No newline at end of file

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