[java-shib-attribute] branch main updated: IDP-2375 Aliased decoded IdPAttributes are lost during subsequent use

[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=eb133f6ae094ace18116396dca62b992b739989a

The following commit(s) were added to refs/heads/main by this push:
     new eb133f6ae IDP-2375 Aliased decoded IdPAttributes are lost during subsequent use
eb133f6ae is described below

commit eb133f6ae094ace18116396dca62b992b739989a
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Apr 23 15:28:44 2025 +0100

    IDP-2375 Aliased decoded IdPAttributes are lost during subsequent use
    
    https://shibboleth.atlassian.net/browse/IDP-2375
    
    Reverting the behavior means changing the test
---
 .../java/net/shibboleth/idp/attribute/AttributeContextTest.java   | 8 ++++----
 .../idp/attribute/filter/context/AttributeFilterContextTest.java  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/shib-attribute-api/src/test/java/net/shibboleth/idp/attribute/AttributeContextTest.java b/shib-attribute-api/src/test/java/net/shibboleth/idp/attribute/AttributeContextTest.java
index 2b498c2a4..0f82af552 100644
--- a/shib-attribute-api/src/test/java/net/shibboleth/idp/attribute/AttributeContextTest.java
+++ b/shib-attribute-api/src/test/java/net/shibboleth/idp/attribute/AttributeContextTest.java
@@ -84,7 +84,7 @@ public class AttributeContextTest {
     @Test public void testAttributeMerge() {
 
         final AttributeContext context = new AttributeContext();
-        context.setIdPAttributes(getMergeList());
+        context.setIdPAttributes(IdPAttributeSupport.toMapMergeDuplicates(getMergeList()));
 
         Map<String, IdPAttribute> attrs = context.getIdPAttributes();
 
@@ -102,7 +102,7 @@ public class AttributeContextTest {
     @Test public void testAttributeNoMerge() {
 
         final AttributeContext context = new AttributeContext();
-        context.setIdPAttributes(IdPAttributeSupport.toMapNoDuplicates(getMergeList()));
+        context.setIdPAttributes(getMergeList());
 
         Map<String, IdPAttribute> attrs = context.getIdPAttributes();
 
@@ -115,7 +115,7 @@ public class AttributeContextTest {
 
     @Test public void testUnfilteredMerge() {
         final AttributeContext context = new AttributeContext();
-        context.setUnfilteredIdPAttributes(getMergeList());
+        context.setUnfilteredIdPAttributes(IdPAttributeSupport.toMapMergeDuplicates(getMergeList()));
 
         Map<String, IdPAttribute> attrs = context.getUnfilteredIdPAttributes();
         assertEquals(attrs.size(), 3);
@@ -127,7 +127,7 @@ public class AttributeContextTest {
 
     @Test public void testUnfilteredNoMerge() {
         final AttributeContext context = new AttributeContext();
-        context.setUnfilteredIdPAttributes(IdPAttributeSupport.toMapNoDuplicates(getMergeList()));
+        context.setUnfilteredIdPAttributes(getMergeList());
 
         Map<String, IdPAttribute> attrs = context.getUnfilteredIdPAttributes();
         assertEquals(attrs.size(), 3);
diff --git a/shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContextTest.java b/shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContextTest.java
index f352e4206..fb59dc1cc 100644
--- a/shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContextTest.java
+++ b/shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContextTest.java
@@ -171,7 +171,7 @@ public class AttributeFilterContextTest {
 
         final AttributeFilterContext context = new AttributeFilterContext();
         Collection<IdPAttribute> attributes = CollectionSupport.listOf(attribute1a, attribute1b, attribute2a, attribute2b, attribute3); 
-        context.setPrefilteredIdPAttributes( attributes );
+        context.setPrefilteredIdPAttributes(IdPAttributeSupport.toMapMergeDuplicates(attributes));
 
         Map<String, IdPAttribute> attrs = context.getPrefilteredIdPAttributes();
 

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