[java-identity-provider] 01/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=15980352637885d93f5cac8518d3b302a3bbcedd

commit 15980352637885d93f5cac8518d3b302a3bbcedd
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Nov 26 13:31:17 2022 +0000

    JSSH-5 ServiceableComponent should implement AutoClose
    
    https://shibboleth.atlassian.net/browse/JSSH-5
    
    DefaultRelyingPartyConfigurationResolver no longer extends
    AbstractServiceableComponent
---
 .../impl/DefaultRelyingPartyConfigurationResolver.java        | 11 ++---------
 .../impl/DefaultRelyingPartyConfigurationResolverTest.java    |  3 ---
 ...legatingCriteriaRelyingPartyConfigurationResolverTest.java |  4 ----
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java b/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java
index 8b4fc71db..a579d7221 100644
--- a/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java
+++ b/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java
@@ -44,10 +44,10 @@ import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.annotation.constraint.NotLive;
 import net.shibboleth.shared.annotation.constraint.Unmodifiable;
+import net.shibboleth.shared.component.AbstractIdentifiableInitializableComponent;
 import net.shibboleth.shared.component.ComponentInitializationException;
 import net.shibboleth.shared.logic.Constraint;
 import net.shibboleth.shared.resolver.ResolverException;
-import net.shibboleth.shared.spring.service.AbstractServiceableComponent;
 
 /**
  * Retrieves a per-relying party configuration for a given profile request based on the request context.
@@ -56,8 +56,7 @@ import net.shibboleth.shared.spring.service.AbstractServiceableComponent;
  * Note that this resolver does not permit more than one {@link RelyingPartyConfiguration} with the same ID.
  * </p>
  */
-public class DefaultRelyingPartyConfigurationResolver
-        extends AbstractServiceableComponent<RelyingPartyConfigurationResolver>
+public class DefaultRelyingPartyConfigurationResolver extends AbstractIdentifiableInitializableComponent
         implements RelyingPartyConfigurationResolver {
 
     /** Class logger. */
@@ -332,10 +331,4 @@ public class DefaultRelyingPartyConfigurationResolver
             encryptionCredentials = Collections.emptyList();
         }
     }
-
-    /** {@inheritDoc} */
-    @Override @Nonnull public RelyingPartyConfigurationResolver getComponent() {
-        return this;
-    }
-    
 }
\ No newline at end of file
diff --git a/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/DefaultRelyingPartyConfigurationResolverTest.java b/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/DefaultRelyingPartyConfigurationResolverTest.java
index 1d052715c..394cbc360 100644
--- a/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/DefaultRelyingPartyConfigurationResolverTest.java
+++ b/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/DefaultRelyingPartyConfigurationResolverTest.java
@@ -94,7 +94,6 @@ public class DefaultRelyingPartyConfigurationResolverTest {
         resolver.setId("test");
         resolver.setUnverifiedConfiguration(anonRP);
         resolver.setDefaultConfiguration(defaultRP);
-        resolver.setApplicationContext(new MockApplicationContext());
         resolver.initialize();
         
         final Iterable<RelyingPartyConfiguration> results = resolver.resolve(requestContext);
@@ -129,7 +128,6 @@ public class DefaultRelyingPartyConfigurationResolverTest {
         resolver.setId("test");
         resolver.setUnverifiedConfiguration(anonRP);
         resolver.setDefaultConfiguration(defaultRP);
-        resolver.setApplicationContext(new MockApplicationContext());
         resolver.initialize();
         
         final Iterable<RelyingPartyConfiguration> results = resolver.resolve(requestContext);
@@ -185,7 +183,6 @@ public class DefaultRelyingPartyConfigurationResolverTest {
         resolver.setRelyingPartyConfigurations(rpConfigs);
         resolver.setUnverifiedConfiguration(anonRP);
         resolver.setDefaultConfiguration(defaultRP);
-        resolver.setApplicationContext(new MockApplicationContext());
         resolver.initialize();
 
         Iterable<RelyingPartyConfiguration> results = resolver.resolve(requestContext);
diff --git a/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/DelegatingCriteriaRelyingPartyConfigurationResolverTest.java b/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/DelegatingCriteriaRelyingPartyConfigurationResolverTest.java
index 2f164e7ca..1ea5a1618 100644
--- a/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/DelegatingCriteriaRelyingPartyConfigurationResolverTest.java
+++ b/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/DelegatingCriteriaRelyingPartyConfigurationResolverTest.java
@@ -139,7 +139,6 @@ public class DelegatingCriteriaRelyingPartyConfigurationResolverTest extends XML
         final List<RelyingPartyConfiguration> rpConfigs = Arrays.asList(oneByName, twoByName, threeByName);
 
         delegate.setId("delegate");
-        delegate.setApplicationContext(new MockApplicationContext());
         delegate.setRelyingPartyConfigurations(rpConfigs);
         delegate.initialize();
         
@@ -173,7 +172,6 @@ public class DelegatingCriteriaRelyingPartyConfigurationResolverTest extends XML
         final List<RelyingPartyConfiguration> rpConfigs = Arrays.asList(oneByName, twoByName, threeByName);
 
         delegate.setId("delegate");
-        delegate.setApplicationContext(new MockApplicationContext());
         delegate.setRelyingPartyConfigurations(rpConfigs);
         delegate.initialize();
         
@@ -203,7 +201,6 @@ public class DelegatingCriteriaRelyingPartyConfigurationResolverTest extends XML
 
         delegate.setId("delegate");
         delegate.setRelyingPartyConfigurations(rpConfigs);
-        delegate.setApplicationContext(new MockApplicationContext());
         delegate.initialize();
         
         EntityDescriptor ed = (EntityDescriptor) XMLObjectSupport.buildXMLObject(EntityDescriptor.DEFAULT_ELEMENT_NAME);
@@ -246,7 +243,6 @@ public class DelegatingCriteriaRelyingPartyConfigurationResolverTest extends XML
         final List<RelyingPartyConfiguration> rpConfigs = Arrays.asList(oneByTag, twoByTag);
 
         delegate.setId("delegate");
-        delegate.setApplicationContext(new MockApplicationContext());
         delegate.setRelyingPartyConfigurations(rpConfigs);
         delegate.initialize();
         

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