X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.ldap%2Fsrc%2Forg%2Fargeo%2Fsecurity%2Fldap%2Fjcr%2FJcrUserDetailsContextMapper.java;h=f63250c31b999651fe1314965d41f6f29c0e6703;hb=b3b39d5606a0c48d64a804f4aff5459ea3addc31;hp=87973d9bdb2e37dfe023a14dca2af0fbc2c7f583;hpb=5ae7bd094c6b8a2f9c0b6b3460b5abe6fe0b7fff;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.security.ldap/src/org/argeo/security/ldap/jcr/JcrUserDetailsContextMapper.java b/org.argeo.security.ldap/src/org/argeo/security/ldap/jcr/JcrUserDetailsContextMapper.java
index 87973d9bd..f63250c31 100644
--- a/org.argeo.security.ldap/src/org/argeo/security/ldap/jcr/JcrUserDetailsContextMapper.java
+++ b/org.argeo.security.ldap/src/org/argeo/security/ldap/jcr/JcrUserDetailsContextMapper.java
@@ -15,6 +15,7 @@
  */
 package org.argeo.security.ldap.jcr;
 
+import java.util.Collection;
 import java.util.UUID;
 
 import javax.jcr.Node;
@@ -29,9 +30,9 @@ import org.argeo.jcr.UserJcrUtils;
 import org.argeo.security.jcr.JcrUserDetails;
 import org.springframework.ldap.core.DirContextAdapter;
 import org.springframework.ldap.core.DirContextOperations;
-import org.springframework.security.GrantedAuthority;
-import org.springframework.security.userdetails.UserDetails;
-import org.springframework.security.userdetails.ldap.UserDetailsContextMapper;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.ldap.userdetails.UserDetailsContextMapper;
 
 /** @deprecated Read only mapping from LDAP to user details */
 @Deprecated
@@ -58,7 +59,8 @@ public class JcrUserDetailsContextMapper implements UserDetailsContextMapper,
 
 	/** Called during authentication in order to retrieve user details */
 	public UserDetails mapUserFromContext(final DirContextOperations ctx,
-			final String username, GrantedAuthority[] authorities) {
+			final String username,
+			Collection<? extends GrantedAuthority> authorities) {
 		if (ctx == null)
 			throw new ArgeoException("No LDAP information for user " + username);
 		Node userHome = UserJcrUtils.getUserHome(securitySession, username);