[java-shib-attribute] branch main updated: IDP-1959 IdPAttributes to stop carrying Display Information

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

The following commit(s) were added to refs/heads/main by this push:
     new bad30f619 IDP-1959 IdPAttributes to stop carrying Display Information
bad30f619 is described below

commit bad30f619718c0cca87d33b272b79dacb4540fc9
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Jul 18 09:57:28 2022 +0100

    IDP-1959 IdPAttributes to stop carrying Display Information
    
    https://shibboleth.atlassian.net/browse/IDP-1959
    
    Remove more redundant methods from IdPAttribute
---
 .../net/shibboleth/idp/attribute/IdPAttribute.java | 46 ----------------------
 1 file changed, 46 deletions(-)

diff --git a/shib-attribute-api/src/main/java/net/shibboleth/idp/attribute/IdPAttribute.java b/shib-attribute-api/src/main/java/net/shibboleth/idp/attribute/IdPAttribute.java
index be0ff6c76..4301c1f99 100644
--- a/shib-attribute-api/src/main/java/net/shibboleth/idp/attribute/IdPAttribute.java
+++ b/shib-attribute-api/src/main/java/net/shibboleth/idp/attribute/IdPAttribute.java
@@ -20,10 +20,6 @@ package net.shibboleth.idp.attribute;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -46,7 +42,6 @@ import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
 import net.shibboleth.utilities.java.support.annotation.constraint.NullableElements;
 import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
 import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
 import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
@@ -67,29 +62,6 @@ public class IdPAttribute implements Comparable<IdPAttribute>, Cloneable {
     /** Logger - static. */
     @Nonnull private static final Logger LOG = LoggerFactory.getLogger(IdPAttribute.class);
     
-    /** Helper Function for map manipulation. */
-    @Nonnull private static Function<Entry<Locale, String>, Entry<Locale, String>> filterEntry =
-            new Function<>() {
-        public Entry<Locale, String> apply(final Entry<Locale, String> t) {
-            return new Entry<>() {
-                private String val = Constraint.isNotNull(StringSupport.trimOrNull(t.getValue()),
-                        "Values must not be null");
-                private Locale key = Constraint.isNotNull(t.getKey(), "Locale must not be null");
-                public Locale getKey() {
-                    return key;
-                }
-
-                public String getValue() {
-                    return val;
-                }
-
-                public String setValue(final String value) {
-                    throw new ConstraintViolationException("Unmodifable map modified");
-                }
-            };
-        };
-    };
-
     /** ID of this attribute. */
     @Nonnull private final String id;
 
@@ -145,24 +117,6 @@ public class IdPAttribute implements Comparable<IdPAttribute>, Cloneable {
         return id;
     }
 
-    /**
-     * Process input to {@link #setDisplayNames(Map)} and {{@link #setDisplayDescriptions(Map)} to strip out null input,
-     * null keys, and null values.
-     * 
-     * @param inputMap the input map.
-     * @return the unmodifiable, non null-containing output.
-     */
-    @SuppressWarnings("unchecked")
-    @Nonnull @Unmodifiable private final Map<Locale, String> checkedNamesFrom(@Nonnull @NonnullElements
-            final Map<Locale, String> inputMap) {
-        
-        return Map.ofEntries(inputMap.
-                entrySet().
-                stream().
-                map(filterEntry).
-                toArray(Map.Entry[]::new));
-    }
-
     /**
      * Get the unmodifiable ordered collection of values of the attribute.
      * 

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