[java-shib-attribute] branch main updated: IDP-1795 Complete the removal of Collections from IdPAttributes

[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=79150846d7a648313ee45cac0b210de85c76e9d2

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

commit 79150846d7a648313ee45cac0b210de85c76e9d2
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Jul 18 20:13:04 2022 +0100

    IDP-1795  Complete the removal of Collections from IdPAttributes
    
    https://shibboleth.atlassian.net/browse/IDP-1795
    
    Change all scripts to use Lists, not Sets.
    These tests all throw deprecation warning in v4.
---
 .../attribute/resolver/impl/ad/nullValue.script    |  2 +-
 .../resolver/impl/ad/simpleWithPredef.script       |  2 +-
 .../idp/attribute/resolver/impl/dc/http/test.js    |  4 ++--
 .../idp/attribute/resolver/impl/dc/storage/test.js |  4 ++--
 .../resolver/spring/dc/scriptedConnector.8.js      | 26 +++++++++++-----------
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/shib-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/nullValue.script b/shib-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/nullValue.script
index 198f2d367..a3eb38331 100644
--- a/shib-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/nullValue.script
+++ b/shib-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/nullValue.script
@@ -1,5 +1,5 @@
 nativeAttribute = Scripted.getNativeAttribute();
-tmp = new (Java.type("java.util.HashSet"));
+tmp = new (Java.type("java.util.ArrayList"));
 val = Java.type("net.shibboleth.idp.attribute.StringAttributeValue").valueOf(null);
 tmp.add(val);
 nativeAttribute.setValues(tmp);
diff --git a/shib-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/simpleWithPredef.script b/shib-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/simpleWithPredef.script
index fc254df2d..1fd3e2451 100644
--- a/shib-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/simpleWithPredef.script
+++ b/shib-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/simpleWithPredef.script
@@ -1,5 +1,5 @@
 nativeAttribute = Scripted.getNativeAttribute();
-tmp = new (Java.type("java.util.HashSet"));
+tmp = new (Java.type("java.util.ArrayList"));
 tmp.addAll(nativeAttribute.getValues()); 
 val = new (Java.type("net.shibboleth.idp.attribute.StringAttributeValue"))("simple");
 tmp.add(val);
diff --git a/shib-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/http/test.js b/shib-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/http/test.js
index ee14d9ae2..03592e085 100644
--- a/shib-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/http/test.js
+++ b/shib-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/http/test.js
@@ -4,12 +4,12 @@ var result = JSON.parse(body);
 
 var IdPAttribute = Java.type("net.shibboleth.idp.attribute.IdPAttribute");
 var StringValue = Java.type("net.shibboleth.idp.attribute.StringAttributeValue");
-var HashSet = Java.type("java.util.HashSet");
+var ArrayList = Java.type("java.util.ArrayList");
 
 for (var i=0; i<result.length; i++) {
 
     var attr = new IdPAttribute(result[i].name);
-    var values = new HashSet();
+    var values = new ArrayList();
     
     for (var j=0; j<result[i].values.length; j++) {
         values.add(new StringValue(result[i].values[j]));
diff --git a/shib-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/storage/test.js b/shib-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/storage/test.js
index d5bc45416..00f159b3c 100644
--- a/shib-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/storage/test.js
+++ b/shib-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/storage/test.js
@@ -2,12 +2,12 @@ var result = JSON.parse(record.getValue());
 
 var IdPAttribute = Java.type("net.shibboleth.idp.attribute.IdPAttribute");
 var StringValue = Java.type("net.shibboleth.idp.attribute.StringAttributeValue");
-var HashSet = Java.type("java.util.HashSet");
+var ArrayList = Java.type("java.util.ArrayList");
 
 for (var i=0; i<result.length; i++) {
 
     var attr = new IdPAttribute(result[i].name);
-    var values = new HashSet();
+    var values = new ArrayList();
     
     for (var j=0; j<result[i].values.length; j++) {
         values.add(new StringValue(result[i].values[j]));
diff --git a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/scriptedConnector.8.js b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/scriptedConnector.8.js
index 0ef646b5c..ecc6dd389 100644
--- a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/scriptedConnector.8.js
+++ b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/scriptedConnector.8.js
@@ -1,24 +1,24 @@
 IdPAttribute = Java.type("net.shibboleth.idp.attribute.IdPAttribute");
 StringAttributeValue = Java.type("net.shibboleth.idp.attribute.StringAttributeValue");
-HashSet = Java.type("java.util.HashSet");
+ArrayList = Java.type("java.util.ArrayList");
 
 attr = new IdPAttribute("ScriptedOne");
-set = new HashSet(2);
-set.add(new StringAttributeValue("Value 1"));
-set.add(new StringAttributeValue("Value 2"));
-attr.setValues(set);
+list = new ArrayList(2);
+list.add(new StringAttributeValue("Value 1"));
+list.add(new StringAttributeValue("Value 2"));
+attr.setValues(list);
 connectorResults.add(attr);
 
 attr = new IdPAttribute("TwoScripted");
-set = new HashSet(4);
-set.add(new StringAttributeValue("1Value"));
-set.add(new StringAttributeValue("2Value"));
-set.add(new StringAttributeValue("3Value"));
-attr.setValues(set);
+list = new ArrayList(4);
+list.add(new StringAttributeValue("1Value"));
+list.add(new StringAttributeValue("2Value"));
+list.add(new StringAttributeValue("3Value"));
+attr.setValues(list);
 connectorResults.add(attr);
 
 attr = new IdPAttribute("zorkmid");
-set = new HashSet(1);
-set.add(new StringAttributeValue(zorkmid));
-attr.setValues(set);
+list = new ArrayList(1);
+list.add(new StringAttributeValue(zorkmid));
+attr.setValues(list);
 connectorResults.add(attr);

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