[java-identity-provider] branch main updated: IDP-1795 Complete the removal of Collections from IdPAttributes (again)

[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=26d1f06bffaa41f4f949b329ba3b67f44d629039

The following commit(s) were added to refs/heads/main by this push:
       new  26d1f06bf IDP-1795 Complete the removal of Collections from IdPAttributes (again)
26d1f06bf is described below

commit 26d1f06bffaa41f4f949b329ba3b67f44d629039
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Apr 13 12:41:27 2021 +0100

    IDP-1795 Complete the removal of Collections from IdPAttributes (again)
    
    https://issues.shibboleth.net/jira/browse/IDP-1795
    
    Fix a couple of places where attributes are passed as a Collection
    (we favor List).
    
    Do this with the correct contents this time.
    
    Resubmits commit 78da41cf3f9
---
 .../filter/spring/AttributeFilterServiceTest.java      |  4 ++--
 .../resolver/ad/impl/DecryptedAttributeDefinition.java | 18 +++++++++---------
 .../dc/storage/impl/SimpleStorageMappingStrategy.java  |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java
index 11b46362e..8f323d4b8 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java
@@ -99,11 +99,11 @@ public class AttributeFilterServiceTest {
         attributesToBeFiltered = new HashMap<>();
 
         IdPAttribute firstName = new IdPAttribute("firstName");
-        firstName.setValues(Collections.singleton(new StringAttributeValue("john")));
+        firstName.setValues(Collections.singletonList(new StringAttributeValue("john")));
         attributesToBeFiltered.put(firstName.getId(), firstName);
 
         IdPAttribute lastName = new IdPAttribute("lastName");
-        lastName.setValues(Collections.singleton(new StringAttributeValue("smith")));
+        lastName.setValues(Collections.singletonList(new StringAttributeValue("smith")));
         attributesToBeFiltered.put(lastName.getId(), lastName);
 
         IdPAttribute email = new IdPAttribute("email");
diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/DecryptedAttributeDefinition.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/DecryptedAttributeDefinition.java
index b50b365d4..eb9f3a7e3 100644
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/DecryptedAttributeDefinition.java
+++ b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/DecryptedAttributeDefinition.java
@@ -17,31 +17,31 @@
 
 package net.shibboleth.idp.attribute.resolver.ad.impl;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import javax.annotation.Nonnull;
 import javax.annotation.concurrent.ThreadSafe;
-import java.util.Collection;
-import java.util.List;
-import java.util.ArrayList;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import net.shibboleth.idp.attribute.EmptyAttributeValue;
 import net.shibboleth.idp.attribute.IdPAttribute;
-import net.shibboleth.idp.attribute.StringAttributeValue;
 import net.shibboleth.idp.attribute.IdPAttributeValue;
+import net.shibboleth.idp.attribute.StringAttributeValue;
 import net.shibboleth.idp.attribute.resolver.AbstractAttributeDefinition;
 import net.shibboleth.idp.attribute.resolver.AttributeDefinition;
 import net.shibboleth.idp.attribute.resolver.PluginDependencySupport;
 import net.shibboleth.idp.attribute.resolver.ResolutionException;
 import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
 import net.shibboleth.idp.attribute.resolver.context.AttributeResolverWorkContext;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.security.DataSealer;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 
 /**
  * An {@link AttributeDefinition} that creates an attribute whose values are the
@@ -93,7 +93,7 @@ public class DecryptedAttributeDefinition extends AbstractAttributeDefinition {
                 PluginDependencySupport.getMergedAttributeValues(workContext, getAttributeDependencies(), 
                         getDataConnectorDependencies(), getId());
 
-        final Collection<IdPAttributeValue> decryptedValues = new ArrayList<>(results.size());
+        final List<IdPAttributeValue> decryptedValues = new ArrayList<>(results.size());
 
         for (final IdPAttributeValue value : results) {
             
diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/storage/impl/SimpleStorageMappingStrategy.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/storage/impl/SimpleStorageMappingStrategy.java
index 0db5484b2..aef12b50e 100644
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/storage/impl/SimpleStorageMappingStrategy.java
+++ b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/storage/impl/SimpleStorageMappingStrategy.java
@@ -58,7 +58,7 @@ public class SimpleStorageMappingStrategy implements StorageMappingStrategy {
             @Nonnull final StorageRecord<?> results) throws ResolutionException {
         
         final IdPAttribute attribute = new IdPAttribute(attributeId);
-        attribute.setValues(Collections.singleton(StringAttributeValue.valueOf(results.getValue())));
+        attribute.setValues(Collections.singletonList(StringAttributeValue.valueOf(results.getValue())));
         
         return Collections.singletonMap(attributeId, attribute);
     }

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