[java-identity-provider] branch master updated: More Guava cleanup.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=d9ca0ead0d2724440658b931bb4cff78c6f774d3

The following commit(s) were added to refs/heads/master by this push:
       new  d9ca0ea   More Guava cleanup.
d9ca0ea is described below

commit d9ca0ead0d2724440658b931bb4cff78c6f774d3
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Nov 14 21:25:33 2019 -0500

    More Guava cleanup.
---
 .../RequestedPrincipalContextPrincipalLookupFunction.java        | 8 +++++---
 .../AbstractMetadataDrivenConfigurationLookupStrategy.java       | 9 +++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/navigate/RequestedPrincipalContextPrincipalLookupFunction.java b/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/navigate/RequestedPrincipalContextPrincipalLookupFunction.java
index c728a74..38bf55f 100644
--- a/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/navigate/RequestedPrincipalContextPrincipalLookupFunction.java
+++ b/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/navigate/RequestedPrincipalContextPrincipalLookupFunction.java
@@ -19,6 +19,7 @@ package net.shibboleth.idp.authn.context.navigate;
 
 import java.security.Principal;
 import java.util.Collection;
+import java.util.stream.Collectors;
 
 import javax.annotation.Nullable;
 
@@ -26,8 +27,6 @@ import net.shibboleth.idp.authn.context.RequestedPrincipalContext;
 
 import org.opensaml.messaging.context.navigate.ContextDataLookupFunction;
 
-import com.google.common.collect.Collections2;
-
 /**
  * A function that returns {@link RequestedPrincipalContext#getRequestedPrincipals()} but
  * transforms the values into strings.
@@ -39,7 +38,10 @@ public class RequestedPrincipalContextPrincipalLookupFunction
     @Nullable public Collection<String> apply(@Nullable final RequestedPrincipalContext input) {
         
         if (input != null) {
-            return Collections2.transform(input.getRequestedPrincipals(), Principal::getName);
+            return input.getRequestedPrincipals()
+                    .stream()
+                    .map(Principal::getName)
+                    .collect(Collectors.toUnmodifiableList());
         }
         return null;
     }
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/AbstractMetadataDrivenConfigurationLookupStrategy.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/AbstractMetadataDrivenConfigurationLookupStrategy.java
index 03a877b..b46062c 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/AbstractMetadataDrivenConfigurationLookupStrategy.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/AbstractMetadataDrivenConfigurationLookupStrategy.java
@@ -24,6 +24,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.function.Function;
+import java.util.stream.Collectors;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -43,8 +44,6 @@ import org.opensaml.soap.client.security.SOAPClientSecurityProfileIdLookupFuncti
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.Collections2;
-
 import net.shibboleth.idp.attribute.AttributesMapContainer;
 import net.shibboleth.idp.attribute.IdPAttribute;
 import net.shibboleth.idp.attribute.IdPAttributeValue;
@@ -185,8 +184,10 @@ public abstract class AbstractMetadataDrivenConfigurationLookupStrategy<T> exten
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         Constraint.isNotNull(aliases, "Alias collection cannot be null");
         
-        propertyAliases = Collections2.transform(StringSupport.normalizeStringCollection(aliases),
-                s -> s + (s.endsWith("/") ? propertyName : '/' + propertyName));
+        propertyAliases = StringSupport.normalizeStringCollection(aliases)
+                .stream()
+                .map(s -> s + (s.endsWith("/") ? propertyName : '/' + propertyName))
+                .collect(Collectors.toUnmodifiableList());
     }
     
     /**

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