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

[Scott Cantor]

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

scantor pushed a commit to branch main
in repository java-shib-metadata.

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

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

commit d8e079abee30d66557aac776377556a1709f4e24
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Nov 28 13:11:16 2022 -0500

    JSSH-5 - ServiceableComponent should implement AutoClose
    
    https://shibboleth.atlassian.net/browse/JSSH-5
    
    Fix some bugs and convert getServiceableComponent to non-null.
---
 .../idp/saml/metadata/impl/MetadataResolverServiceStrategy.java      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataResolverServiceStrategy.java b/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataResolverServiceStrategy.java
index db918550..66c6da0a 100644
--- a/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataResolverServiceStrategy.java
+++ b/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataResolverServiceStrategy.java
@@ -24,6 +24,7 @@ import java.util.List;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import org.opensaml.saml.metadata.resolver.ChainingMetadataResolver;
@@ -52,7 +53,7 @@ public class MetadataResolverServiceStrategy extends AbstractIdentifiableInitial
         Function<ApplicationContext, AbstractServiceableComponent<MetadataResolver>> {
 
     /** {@inheritDoc} */
-    @Nullable public AbstractServiceableComponent<MetadataResolver> apply(@Nullable final ApplicationContext appContext) {
+    @Nonnull public AbstractServiceableComponent<MetadataResolver> apply(@Nullable final ApplicationContext appContext) {
         if (appContext == null) {
             throw new ServiceException("ApplicationContext was null");
         }
@@ -69,7 +70,7 @@ public class MetadataResolverServiceStrategy extends AbstractIdentifiableInitial
             return containers.iterator().next();
         }
         // initialize so we can sort
-        for (final MetadataProviderContainer resolver:containers) {
+        for (final MetadataProviderContainer resolver : containers) {
             try {
                 resolver.initialize();
             } catch (final ComponentInitializationException e) {

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