[java-identity-provider] branch main updated: IDP-1623 Add test for data connectors returning null as resolved attributes

[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=3bd66e158916a9694bd56358ec1d1464a486a9e4

The following commit(s) were added to refs/heads/main by this push:
       new  3bd66e158 IDP-1623 Add test for data connectors returning null as resolved attributes
3bd66e158 is described below

commit 3bd66e158916a9694bd56358ec1d1464a486a9e4
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Nov 30 16:10:18 2020 +0000

    IDP-1623 Add test for data connectors returning null as resolved attributes
    
    https://issues.shibboleth.net/jira/browse/IDP-1623
---
 .../idp/attribute/resolver/impl/AttributeResolverImpl.java  |  2 +-
 .../attribute/resolver/impl/AttributeResolverImplTest.java  | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
index d1259a81c..ff35985c9 100644
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
+++ b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
@@ -140,7 +140,7 @@ public class AttributeResolverImpl extends AbstractServiceableComponent<Attribut
      */
     public void setDataConnectors(@Nonnull @NonnullElements  final Collection<DataConnector> connectors){
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
-        Constraint.isNotNull(connectors, "Attribute Defintions should be non-null");
+        Constraint.isNotNull(connectors, "Data Connectors should be non-null");
         
         final Map<String, DataConnector> checkedConnectors = new HashMap<>(connectors.size());
         for (final DataConnector connector : connectors) {
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java
index bb6e01488..d44affa00 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java
@@ -219,7 +219,18 @@ public class AttributeResolverImplTest {
         connector3.setId("dc3");
         connector3.setValues(List.of(attribute4));
 
-        final AttributeResolverImpl resolver = newAttributeResolverImpl("foo", null, List.of(connector1, connector2, connector3));
+        // IDP-1623 Connector 4 contributes nullness
+        final StaticDataConnector connector4 = new StaticDataConnector() {
+            public java.util.Map<String,IdPAttribute> doDataConnectorResolve(@Nonnull final AttributeResolutionContext resolutionContext,
+                    @Nonnull final AttributeResolverWorkContext workContext) throws ResolutionException {
+                return null;
+            }
+        };
+        connector4.setId("dc4");
+        connector4.setValues(List.of(attribute4));
+        connector4.setExportAttributes(List.of(attribute4.getId()));
+
+        final AttributeResolverImpl resolver = newAttributeResolverImpl("foo", null, List.of(connector1, connector2, connector3, connector4));
         for (DataConnector connector : resolver.getDataConnectors().values()) {
             connector.initialize();
         }

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