X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.core%2Fsrc%2Forg%2Fargeo%2Fsecurity%2Fcore%2FOsAuthenticationProvider.java;fp=org.argeo.security.core%2Fsrc%2Forg%2Fargeo%2Fsecurity%2Fcore%2FOsAuthenticationProvider.java;h=4f1d5644722f0c79a5530b4f8b1800a21022d84e;hb=b3b39d5606a0c48d64a804f4aff5459ea3addc31;hp=0e29ecd59a75e6fbfe0f422acce415508da73f4b;hpb=5ae7bd094c6b8a2f9c0b6b3460b5abe6fe0b7fff;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.security.core/src/org/argeo/security/core/OsAuthenticationProvider.java b/org.argeo.security.core/src/org/argeo/security/core/OsAuthenticationProvider.java
index 0e29ecd59..4f1d56447 100644
--- a/org.argeo.security.core/src/org/argeo/security/core/OsAuthenticationProvider.java
+++ b/org.argeo.security.core/src/org/argeo/security/core/OsAuthenticationProvider.java
@@ -16,14 +16,15 @@
 package org.argeo.security.core;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 import org.argeo.security.OsAuthenticationToken;
-import org.springframework.security.Authentication;
-import org.springframework.security.AuthenticationException;
-import org.springframework.security.GrantedAuthority;
-import org.springframework.security.GrantedAuthorityImpl;
-import org.springframework.security.providers.AuthenticationProvider;
+import org.springframework.security.authentication.AuthenticationProvider;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
 
 /**
  * Validates an OS authentication. The id is that it will always be
@@ -44,13 +45,13 @@ public class OsAuthenticationProvider implements AuthenticationProvider {
 		return new OsAuthenticationToken(getBaseAuthorities());
 	}
 
-	public static GrantedAuthority[] getBaseAuthorities() {
+	public static Collection<? extends GrantedAuthority> getBaseAuthorities() {
 		List<GrantedAuthority> auths = new ArrayList<GrantedAuthority>();
-		auths.add(new GrantedAuthorityImpl(osUserRole));
-		auths.add(new GrantedAuthorityImpl(userRole));
+		auths.add(new SimpleGrantedAuthority(osUserRole));
+		auths.add(new SimpleGrantedAuthority(userRole));
 		if (isAdmin)
-			auths.add(new GrantedAuthorityImpl(adminRole));
-		return auths.toArray(new GrantedAuthority[auths.size()]);
+			auths.add(new SimpleGrantedAuthority(adminRole));
+		return auths;
 	}
 
 	@SuppressWarnings("rawtypes")