[java-shib-attribute] branch main updated: Null checking, more low hanging fruit

[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=8500a1667dbc2dda30659fe59b10488d4dc023fb

The following commit(s) were added to refs/heads/main by this push:
     new 8500a1667 Null checking, more low hanging fruit
8500a1667 is described below

commit 8500a1667dbc2dda30659fe59b10488d4dc023fb
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Jan 31 11:22:52 2023 +0000

    Null checking, more low hanging fruit
---
 .../idp/attribute/resolver/dc/impl/StaticDataConnector.java          | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/StaticDataConnector.java b/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/StaticDataConnector.java
index 264e4e003..face1384b 100644
--- a/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/StaticDataConnector.java
+++ b/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/StaticDataConnector.java
@@ -73,9 +73,10 @@ public class StaticDataConnector extends AbstractDataConnector {
         attributes = newValues.
                 stream().
                 map(e -> Constraint.isNotNull(e, "non null Attribute in connector")).
-                collect(Collectors.toUnmodifiableMap(IdPAttribute::getId,
+                collect(CollectionSupport.nonnullCollector(Collectors.toUnmodifiableMap(IdPAttribute::getId,
                         i -> i,
-                        CollectionSupport.warningMergeFunction("StaticDataConnector " + getId(), true)));
+                        CollectionSupport.warningMergeFunction("StaticDataConnector " + getId(), true)))).
+                get();
     }
 
     /** {@inheritDoc} */

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