[java-shib-attribute] 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-attribute.

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

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

commit 78873dcec2152076168f809fc4be6de9dc588deb
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Sep 29 15:10:34 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.
---
 .../filter/spring/impl/AttributeFilterServiceStrategy.java | 14 +++++++-------
 .../transcoding/impl/AttributeRegistryServiceStrategy.java |  8 ++++----
 .../spring/impl/AttributeResolverServiceStrategy.java      |  6 +++---
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/shib-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/impl/AttributeFilterServiceStrategy.java b/shib-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/impl/AttributeFilterServiceStrategy.java
index e6bb2638f..073571f3d 100644
--- a/shib-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/impl/AttributeFilterServiceStrategy.java
+++ b/shib-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/impl/AttributeFilterServiceStrategy.java
@@ -22,17 +22,17 @@ import java.util.function.Function;
 
 import javax.annotation.Nullable;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.ApplicationContext;
+
 import net.shibboleth.idp.attribute.filter.AttributeFilter;
 import net.shibboleth.idp.attribute.filter.AttributeFilterPolicy;
 import net.shibboleth.idp.attribute.filter.impl.AttributeFilterImpl;
 import net.shibboleth.shared.component.AbstractIdentifiableInitializableComponent;
 import net.shibboleth.shared.component.ComponentInitializationException;
 import net.shibboleth.shared.service.ServiceException;
-import net.shibboleth.shared.service.ServiceableComponent;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.ApplicationContext;
+import net.shibboleth.shared.spring.service.AbstractServiceableComponent;
 
 /**
  * Strategy for summoning up an {@link AttributeFilterImpl} from a populated {@link ApplicationContext}. We do this by
@@ -40,13 +40,13 @@ import org.springframework.context.ApplicationContext;
  * then initialize.
  */
 public class AttributeFilterServiceStrategy extends AbstractIdentifiableInitializableComponent implements
-        Function<ApplicationContext, ServiceableComponent<AttributeFilter>> {
+        Function<ApplicationContext, AbstractServiceableComponent<AttributeFilter>> {
 
     /** log. */
     private final Logger log = LoggerFactory.getLogger(AttributeFilterServiceStrategy.class);
 
     /** {@inheritDoc} */
-    @Nullable public ServiceableComponent<AttributeFilter> apply(@Nullable final ApplicationContext appContext) {
+    @Nullable public AbstractServiceableComponent<AttributeFilter> apply(@Nullable final ApplicationContext appContext) {
 
         final Collection<AttributeFilterPolicy> afps = appContext.getBeansOfType(AttributeFilterPolicy.class).values();
         log.debug("Creating Attribute Filter {} with  {} Policies", getId(), afps.size());
diff --git a/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeRegistryServiceStrategy.java b/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeRegistryServiceStrategy.java
index d2fdb6ae6..bb26029b7 100644
--- a/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeRegistryServiceStrategy.java
+++ b/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeRegistryServiceStrategy.java
@@ -36,18 +36,18 @@ import org.springframework.context.ApplicationContext;
 
 import net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry;
 import net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry.NamingFunction;
+import net.shibboleth.idp.attribute.transcoding.TranscodingRule;
 import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.component.AbstractIdentifiableInitializableComponent;
 import net.shibboleth.shared.component.ComponentInitializationException;
 import net.shibboleth.shared.service.ServiceException;
-import net.shibboleth.shared.service.ServiceableComponent;
-import net.shibboleth.idp.attribute.transcoding.TranscodingRule;
+import net.shibboleth.shared.spring.service.AbstractServiceableComponent;
 
 /**
  * Strategy for summoning up an {@link AttributeTranscoderRegistryImpl} from a populated {@link ApplicationContext}.
  */
 public class AttributeRegistryServiceStrategy extends AbstractIdentifiableInitializableComponent implements
-        Function<ApplicationContext,ServiceableComponent<AttributeTranscoderRegistry>> {
+        Function<ApplicationContext,AbstractServiceableComponent<AttributeTranscoderRegistry>> {
 
     /** Class logger. */
     @Nonnull private final Logger log = LoggerFactory.getLogger(AttributeRegistryServiceStrategy.class);
@@ -94,7 +94,7 @@ public class AttributeRegistryServiceStrategy extends AbstractIdentifiableInitia
     }
 
     /** {@inheritDoc} */
-    @Nullable public ServiceableComponent<AttributeTranscoderRegistry> apply(
+    @Nullable public AbstractServiceableComponent<AttributeTranscoderRegistry> apply(
             @Nullable final ApplicationContext appContext) {
         
         final Collection<TranscodingRule> mappingBeans = appContext.getBeansOfType(TranscodingRule.class).values();
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverServiceStrategy.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverServiceStrategy.java
index 439658c8e..c17673e27 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverServiceStrategy.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverServiceStrategy.java
@@ -34,7 +34,7 @@ import net.shibboleth.idp.attribute.resolver.impl.AttributeResolverImpl;
 import net.shibboleth.shared.component.AbstractIdentifiableInitializableComponent;
 import net.shibboleth.shared.component.ComponentInitializationException;
 import net.shibboleth.shared.service.ServiceException;
-import net.shibboleth.shared.service.ServiceableComponent;
+import net.shibboleth.shared.spring.service.AbstractServiceableComponent;
 
 /**
  * Strategy for summoning up an {@link AttributeResolverImpl} from a populated {@link ApplicationContext}. We do this by
@@ -42,7 +42,7 @@ import net.shibboleth.shared.service.ServiceableComponent;
  * Attribute Resolver which we then initialize.
  */
 public class AttributeResolverServiceStrategy extends AbstractIdentifiableInitializableComponent implements
-        Function<ApplicationContext,ServiceableComponent<AttributeResolver>> {
+        Function<ApplicationContext,AbstractServiceableComponent<AttributeResolver>> {
 
     /** Class logger. */
     @Nonnull private final Logger log = LoggerFactory.getLogger(AttributeResolverServiceStrategy.class);
@@ -66,7 +66,7 @@ public class AttributeResolverServiceStrategy extends AbstractIdentifiableInitia
     }
 
     /** {@inheritDoc} */
-    @Nullable public ServiceableComponent<AttributeResolver> apply(@Nullable final ApplicationContext appContext) {
+    @Nullable public AbstractServiceableComponent<AttributeResolver> apply(@Nullable final ApplicationContext appContext) {
 
         final Collection<AttributeDefinition> definitions =
                 appContext.getBeansOfType(AttributeDefinition.class).values();

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