[java-sp-server] branch main updated: Fix more null warnings.

[Scott Cantor]

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

scantor pushed a commit to branch main
in repository java-sp-server.

View the commit online:
http://git.shibboleth.net/view/?p=java-sp-server.git;a=commit;h=2b6e35963e0e3e17b4d2729d51f2c880e932962a

The following commit(s) were added to refs/heads/main by this push:
     new 2b6e359  Fix more null warnings.
2b6e359 is described below

commit 2b6e35963e0e3e17b4d2729d51f2c880e932962a
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Feb 1 14:11:30 2023 -0500

    Fix more null warnings.
---
 sp-server-impl/src/main/java/net/shibboleth/sp/impl/Main.java        | 5 ++---
 .../src/main/java/net/shibboleth/sp/impl/OpenSAMLConfigBean.java     | 3 ++-
 .../java/net/shibboleth/sp/remoting/endpoint/impl/XMLParser.java     | 3 ++-
 .../shibboleth/sp/remoting/impl/BasicApplicationEndpointManager.java | 4 +++-
 .../java/net/shibboleth/sp/remoting/impl/BasicEndpointManager.java   | 4 +++-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/sp-server-impl/src/main/java/net/shibboleth/sp/impl/Main.java b/sp-server-impl/src/main/java/net/shibboleth/sp/impl/Main.java
index 4320989..3b58b69 100644
--- a/sp-server-impl/src/main/java/net/shibboleth/sp/impl/Main.java
+++ b/sp-server-impl/src/main/java/net/shibboleth/sp/impl/Main.java
@@ -14,10 +14,9 @@
 
 package net.shibboleth.sp.impl;
 
-import java.util.List;
-
 import org.springframework.context.support.GenericApplicationContext;
 
+import net.shibboleth.shared.collection.CollectionSupport;
 import net.shibboleth.shared.spring.util.ApplicationContextBuilder;
 import net.shibboleth.sp.spring.impl.PropertiesApplicationContextInitializer;
 
@@ -39,7 +38,7 @@ public final class Main {
                         .setName("Shibboleth Service Provider Service Context")
                         .setContextInitializer(new PropertiesApplicationContextInitializer())
                         .setUnresolvedServiceConfigurations(
-                                List.of(
+                                CollectionSupport.listOf(
                                     "classpath*:/META-INF/net/shibboleth/sp/preconfig.xml",
                                     "classpath:/net/shibboleth/sp/conf/global-system.xml",
                                     "classpath*:/META-INF/net/shibboleth/sp/postconfig.xml")
diff --git a/sp-server-impl/src/main/java/net/shibboleth/sp/impl/OpenSAMLConfigBean.java b/sp-server-impl/src/main/java/net/shibboleth/sp/impl/OpenSAMLConfigBean.java
index c553d97..184249f 100644
--- a/sp-server-impl/src/main/java/net/shibboleth/sp/impl/OpenSAMLConfigBean.java
+++ b/sp-server-impl/src/main/java/net/shibboleth/sp/impl/OpenSAMLConfigBean.java
@@ -26,13 +26,14 @@ import org.opensaml.core.config.InitializationException;
 import org.opensaml.core.config.InitializationService;
 import org.opensaml.core.xml.config.XMLObjectProviderRegistry;
 import org.opensaml.xmlsec.config.DecryptionParserPool;
+
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import com.codahale.metrics.MetricRegistry;
 
 import net.shibboleth.shared.component.AbstractInitializableComponent;
 import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.primitive.LoggerFactory;
 import net.shibboleth.shared.xml.ParserPool;
 
 
diff --git a/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/endpoint/impl/XMLParser.java b/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/endpoint/impl/XMLParser.java
index ca86e6f..90798f3 100644
--- a/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/endpoint/impl/XMLParser.java
+++ b/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/endpoint/impl/XMLParser.java
@@ -24,13 +24,14 @@ import java.io.InputStream;
 import javax.annotation.Nonnull;
 
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
 import org.w3c.dom.Document;
 
 import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.component.ComponentInitializationException;
 import net.shibboleth.shared.logic.Constraint;
+import net.shibboleth.shared.primitive.LoggerFactory;
 import net.shibboleth.shared.xml.ParserPool;
 import net.shibboleth.shared.xml.XMLParserException;
 import net.shibboleth.sp.remoting.AbstractEndpoint;
diff --git a/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/impl/BasicApplicationEndpointManager.java b/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/impl/BasicApplicationEndpointManager.java
index 1ccd65d..1485dce 100644
--- a/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/impl/BasicApplicationEndpointManager.java
+++ b/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/impl/BasicApplicationEndpointManager.java
@@ -54,7 +54,9 @@ public class BasicApplicationEndpointManager extends AbstractIdentifiableInitial
     @Autowired
     public BasicApplicationEndpointManager(@Nullable @NonnullElements Collection<ApplicationEndpoint> remotedObjects) {
         if (remotedObjects != null) {
-            addressMap = remotedObjects.stream().collect(Collectors.toMap(ApplicationEndpoint::getAddress, r -> r));
+            addressMap = remotedObjects.stream()
+                    .collect(CollectionSupport.nonnullCollector(
+                            Collectors.toMap(ApplicationEndpoint::getAddress, r -> r))).get();
         } else {
             addressMap = CollectionSupport.emptyMap();
         }
diff --git a/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/impl/BasicEndpointManager.java b/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/impl/BasicEndpointManager.java
index 7b28178..ad33eb8 100644
--- a/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/impl/BasicEndpointManager.java
+++ b/sp-server-impl/src/main/java/net/shibboleth/sp/remoting/impl/BasicEndpointManager.java
@@ -53,7 +53,9 @@ public class BasicEndpointManager extends AbstractIdentifiableInitializableCompo
     @Autowired
     public BasicEndpointManager(@Nullable @NonnullElements Collection<Endpoint> remotedObjects) {
         if (remotedObjects != null) {
-            addressMap = remotedObjects.stream().collect(Collectors.toMap(Endpoint::getAddress, r -> r));
+            addressMap = remotedObjects.stream()
+                    .collect(CollectionSupport.nonnullCollector(
+                            Collectors.toMap(Endpoint::getAddress, r -> r))).get();
         } else {
             addressMap = CollectionSupport.emptyMap();
         }

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