Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-06-28 14:52:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tidying.

Browse Source
This commit is contained in:
Luke Taylor 2007-12-06 00:12:24 +00:00
parent 3ddcc203bf
commit 4d133be0d0
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
core/src/main/java/org/springframework/security/userdetails/ldap/LdapUserDetailsImpl.java
View File

@ -16,18 +16,16 @@
package org.springframework.security.userdetails.ldap; package org.springframework.security.userdetails.ldap;
import org.springframework.security.GrantedAuthority; import org.springframework.security.GrantedAuthority;
import org.springframework.security.util.AuthorityUtils;
import org.springframework.util.Assert;
import org.springframework.ldap.core.DirContextOperations; import org.springframework.ldap.core.DirContextOperations;
import org.springframework.util.Assert;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Iterator;
import javax.naming.directory.Attributes; import javax.naming.directory.Attributes;
import javax.naming.directory.BasicAttributes; import javax.naming.directory.BasicAttributes;
import javax.naming.ldap.Control; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
/** /**
@ -45,9 +43,6 @@ import javax.naming.ldap.Control;
* @version $Id$ * @version $Id$
*/ */
public class LdapUserDetailsImpl implements LdapUserDetails { public class LdapUserDetailsImpl implements LdapUserDetails {
//~ Static fields/initializers =====================================================================================
private static final GrantedAuthority[] NO_AUTHORITIES = new GrantedAuthority[0];
//~ Instance fields ================================================================================================ //~ Instance fields ================================================================================================
@ -55,7 +50,7 @@ public class LdapUserDetailsImpl implements LdapUserDetails {
private String dn; private String dn;
private String password; private String password;
private String username; private String username;
private GrantedAuthority[] authorities = NO_AUTHORITIES; private GrantedAuthority[] authorities = AuthorityUtils.NO_AUTHORITIES;
private boolean accountNonExpired = true; private boolean accountNonExpired = true;
private boolean accountNonLocked = true; private boolean accountNonLocked = true;
private boolean credentialsNonExpired = true; private boolean credentialsNonExpired = true;
@ -154,8 +149,9 @@ public class LdapUserDetailsImpl implements LdapUserDetails {
} }
public LdapUserDetails createUserDetails() { public LdapUserDetails createUserDetails() {
//TODO: Validation of properties
Assert.notNull(instance, "Essence can only be used to create a single instance"); Assert.notNull(instance, "Essence can only be used to create a single instance");
Assert.notNull(instance.username, "username must not be null");
Assert.notNull(instance.getDn(), "Distinguished name must not be null");
instance.authorities = getGrantedAuthorities(); instance.authorities = getGrantedAuthorities();