[java-identity-provider] 02/03: 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-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=dd9f695551ce12f08fda10f0b952174b1b0c3376

commit dd9f695551ce12f08fda10f0b952174b1b0c3376
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Nov 26 13:33:12 2022 +0000

    JSSH-5 ServiceableComponent should implement AutoClose
    
    https://shibboleth.atlassian.net/browse/JSSH-5
    
    PatternServiceRegistry no longer extends
    AbstractServiceableComponent
---
 .../idp/cas/service/PatternServiceRegistry.java          | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/idp-cas-api/src/main/java/net/shibboleth/idp/cas/service/PatternServiceRegistry.java b/idp-cas-api/src/main/java/net/shibboleth/idp/cas/service/PatternServiceRegistry.java
index 58ffc5366..5eccc2880 100644
--- a/idp-cas-api/src/main/java/net/shibboleth/idp/cas/service/PatternServiceRegistry.java
+++ b/idp-cas-api/src/main/java/net/shibboleth/idp/cas/service/PatternServiceRegistry.java
@@ -26,13 +26,13 @@ import java.util.regex.Pattern;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import net.shibboleth.shared.annotation.constraint.NonnullElements;
-import net.shibboleth.shared.logic.Constraint;
-import net.shibboleth.shared.spring.service.AbstractServiceableComponent;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
+import net.shibboleth.shared.component.AbstractIdentifiableInitializableComponent;
+import net.shibboleth.shared.logic.Constraint;
+
 /**
  * Service registry that evaluates a candidate service URL against one or more defined services, where each
  * definition contains a service URL regular expression pattern.
@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
  *
  * @author Marvin S. Addison
  */
-public class PatternServiceRegistry extends AbstractServiceableComponent<ServiceRegistry>
+public class PatternServiceRegistry extends AbstractIdentifiableInitializableComponent
         implements ServiceRegistry {
 
     /** Class logger. */
@@ -67,12 +67,6 @@ public class PatternServiceRegistry extends AbstractServiceableComponent<Service
         }
     }
 
-    @Nonnull
-    @Override
-    public ServiceRegistry getComponent() {
-        return this;
-    }
-
     @Override
     @Nullable
     public Service lookup(@Nonnull final String serviceURL) {

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