[java-shib-shared] branch main updated: JSSH-5 ServiceableComponent should implement AutoClose

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch main
in repository java-shib-shared.

View the commit online:
http://git.shibboleth.net/view/?p=java-shib-shared.git;a=commit;h=cdd23e3c6db10783c9d5b4c866a1bfeb37f337eb

The following commit(s) were added to refs/heads/main by this push:
     new cdd23e3c JSSH-5 ServiceableComponent should implement AutoClose
cdd23e3c is described below

commit cdd23e3c6db10783c9d5b4c866a1bfeb37f337eb
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Sep 29 15:06:46 2022 +0100

    JSSH-5 ServiceableComponent should implement AutoClose
    
    https://shibboleth.atlassian.net/browse/JSSH-5
    
    Start converting Service Strategies to return  AbstractServiceableComponent
    rather than ServiceableComponent.
---
 .../shared/spring/service/ApplicationContextServiceStrategy.java | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/shib-service/src/main/java/net/shibboleth/shared/spring/service/ApplicationContextServiceStrategy.java b/shib-service/src/main/java/net/shibboleth/shared/spring/service/ApplicationContextServiceStrategy.java
index bb163169..db18ef16 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/spring/service/ApplicationContextServiceStrategy.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/spring/service/ApplicationContextServiceStrategy.java
@@ -22,13 +22,12 @@ import java.util.function.Function;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import net.shibboleth.shared.component.ComponentInitializationException;
-import net.shibboleth.shared.service.ServiceableComponent;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationContext;
 
+import net.shibboleth.shared.component.ComponentInitializationException;
+
 /**
  * Strategy for summoning up an {@link ApplicationContextServiceableComponent} wrapper
  * around a populated {@link ApplicationContext}.
@@ -36,13 +35,13 @@ import org.springframework.context.ApplicationContext;
  * @since 5.4.0
  */
 public class ApplicationContextServiceStrategy implements
-        Function<ApplicationContext, ServiceableComponent<ApplicationContext>> {
+        Function<ApplicationContext, AbstractServiceableComponent<ApplicationContext>> {
 
     /** Logger. */
     @Nonnull private final Logger log = LoggerFactory.getLogger(ApplicationContextServiceStrategy.class);
     
     /** {@inheritDoc} */
-    @Nullable public ServiceableComponent<ApplicationContext> apply(@Nullable final ApplicationContext appContext) {
+    @Nullable public AbstractServiceableComponent<ApplicationContext> apply(@Nullable final ApplicationContext appContext) {
 
         if (appContext != null) {
             final ApplicationContextServiceableComponent wrapper = new ApplicationContextServiceableComponent();

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