[java-shib-metadata] branch main updated: Convert IdpUIInfo to non null methods where available

[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-metadata.

View the commit online:
http://git.shibboleth.net/view/?p=java-shib-metadata.git;a=commit;h=5a740b103026ccdd736cbe27e94a7d9d09095f2e

The following commit(s) were added to refs/heads/main by this push:
     new 5a740b10 Convert IdpUIInfo to non null methods where available
5a740b10 is described below

commit 5a740b103026ccdd736cbe27e94a7d9d09095f2e
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Jan 30 11:05:16 2023 +0000

    Convert IdpUIInfo to non null methods where available
---
 .../shibboleth/idp/saml/metadata/IdPUIInfo.java    | 32 ++++++++++++----------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/IdPUIInfo.java b/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/IdPUIInfo.java
index 2d3da1a5..f43fae50 100644
--- a/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/IdPUIInfo.java
+++ b/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/IdPUIInfo.java
@@ -24,12 +24,10 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.function.Predicate;
-import java.util.stream.Collector;
 import java.util.stream.Collectors;
 
 import javax.annotation.Nonnull;
 
-import org.opensaml.saml.ext.saml2mdui.DisplayName;
 import org.opensaml.saml.ext.saml2mdui.Keywords;
 import org.opensaml.saml.ext.saml2mdui.Logo;
 import org.opensaml.saml.ext.saml2mdui.UIInfo;
@@ -88,50 +86,54 @@ public class IdPUIInfo {
      * @param uiInfo The OpenSaml UIInfo to convert.
      */
     public IdPUIInfo(@Nonnull final UIInfo uiInfo) {
-        final Collector<DisplayName, ?, Map<Locale, String>> x = Collectors.toUnmodifiableMap(
-                displayName -> Locale.forLanguageTag(displayName.getXMLLang()),
-                displayName -> displayName.getValue(),
-                CollectionSupport.warningMergeFunction("IdpUIInfo DisplayName", false));
         displayNames = uiInfo.
                 getDisplayNames().
                 stream().
                 filter(nullLanguageString("DisplayName")). 
-                collect(CollectionSupport.nonnullCollector(x)).get();
+                collect(CollectionSupport.nonnullCollector(Collectors.toUnmodifiableMap(
+				        displayName -> Locale.forLanguageTag(displayName.getXMLLang()),
+				        displayName -> displayName.getValue(),
+				        CollectionSupport.warningMergeFunction("IdpUIInfo DisplayName", false)))).
+                get();
         keywordList = uiInfo.
                 getKeywords().
                 stream().
                 filter(nullLanguageKeyword).
-                collect(Collectors.toUnmodifiableMap(
+                collect(CollectionSupport.nonnullCollector(Collectors.toUnmodifiableMap(
                         keywords -> Locale.forLanguageTag(keywords.getXMLLang()), 
                         keywords -> keywords.getKeywords(),
-                        CollectionSupport.warningMergeFunction("IdpUIInfo Keyword", false)));
+                        CollectionSupport.warningMergeFunction("IdpUIInfo Keyword", false)))).
+                get();
 
         descriptions = uiInfo.
                 getDescriptions().
                 stream().
                 filter(nullLanguageString("Description")).
-                collect(Collectors.toUnmodifiableMap(
+                collect(CollectionSupport.nonnullCollector(Collectors.toUnmodifiableMap(
                         description -> Locale.forLanguageTag(description.getXMLLang()), 
                         description -> description.getValue(),
-                        CollectionSupport.warningMergeFunction("IdpUIInfo Descriptions", false)));
+                        CollectionSupport.warningMergeFunction("IdpUIInfo Descriptions", false)))).
+                get();
 
         informationURLs = uiInfo.
                 getInformationURLs().
                 stream().
                 filter(nullLanguageURL("InformationURL")).
-                collect(Collectors.toUnmodifiableMap(
+                collect(CollectionSupport.nonnullCollector(Collectors.toUnmodifiableMap(
                         url -> Locale.forLanguageTag(url.getXMLLang()), 
                         dn -> dn.getURI(),
-                        CollectionSupport.warningMergeFunction("IdpUIInfo InformationURL", false)));
+                        CollectionSupport.warningMergeFunction("IdpUIInfo InformationURL", false)))).
+                get();
 
         privacyStatementURLs = uiInfo.
                 getPrivacyStatementURLs().
                 stream().
                 filter(nullLanguageURL("PrivacyStatementURL")).
-                collect(Collectors.toUnmodifiableMap(
+                collect(CollectionSupport.nonnullCollector(Collectors.toUnmodifiableMap(
                         url -> Locale.forLanguageTag(url.getXMLLang()), 
                         url -> url.getURI(),
-                        CollectionSupport.warningMergeFunction("IdpUIInfo PrivacyStatementURL", false)));
+                        CollectionSupport.warningMergeFunction("IdpUIInfo PrivacyStatementURL", false)))).
+                get();
         
         final List<Logo> noLocaleLogo = new ArrayList<>();
         final Map<Locale, List<Logo>> withLocaleLogo = new HashMap<>();

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