Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove "controls" property as it doesn't really make sense and has never been used.

This commit is contained in:
Luke Taylor 2007-11-17 20:55:39 +00:00
parent 91e0a329f9
commit 1196381220
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/main/java/org/springframework/security/userdetails/ldap/LdapUserDetails.java
View File

@ -39,13 +39,6 @@ public interface LdapUserDetails extends UserDetails {
*/ */
Attributes getAttributes(); Attributes getAttributes();
/**
* Returns any LDAP response controls (as part of a user authentication process, for example).
*
* @return an array of LDAP Control instances, never null
*/
Control[] getControls();
/** /**
* The DN of the entry for this user's account. * The DN of the entry for this user's account.
* *

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

@ -48,7 +48,6 @@ public class LdapUserDetailsImpl implements LdapUserDetails {
//~ Static fields/initializers ===================================================================================== //~ Static fields/initializers =====================================================================================
private static final GrantedAuthority[] NO_AUTHORITIES = new GrantedAuthority[0]; private static final GrantedAuthority[] NO_AUTHORITIES = new GrantedAuthority[0];
private static final Control[] NO_CONTROLS = new Control[0];
//~ Instance fields ================================================================================================ //~ Instance fields ================================================================================================
@ -57,7 +56,6 @@ public class LdapUserDetailsImpl implements LdapUserDetails {
private String password; private String password;
private String username; private String username;
private GrantedAuthority[] authorities = NO_AUTHORITIES; private GrantedAuthority[] authorities = NO_AUTHORITIES;
private Control[] controls = NO_CONTROLS;
private boolean accountNonExpired = true; private boolean accountNonExpired = true;
private boolean accountNonLocked = true; private boolean accountNonLocked = true;
private boolean credentialsNonExpired = true; private boolean credentialsNonExpired = true;
@ -77,10 +75,6 @@ public class LdapUserDetailsImpl implements LdapUserDetails {
return authorities; return authorities;
} }
public Control[] getControls() {
return controls;
}
public String getDn() { public String getDn() {
return dn; return dn;
} }
@ -133,7 +127,6 @@ public class LdapUserDetailsImpl implements LdapUserDetails {
setAccountNonExpired(copyMe.isAccountNonExpired()); setAccountNonExpired(copyMe.isAccountNonExpired());
setCredentialsNonExpired(copyMe.isCredentialsNonExpired()); setCredentialsNonExpired(copyMe.isCredentialsNonExpired());
setAccountNonLocked(copyMe.isAccountNonLocked()); setAccountNonLocked(copyMe.isAccountNonLocked());
setControls(copyMe.getControls());
setAuthorities(copyMe.getAuthorities()); setAuthorities(copyMe.getAuthorities());
} }
@ -193,10 +186,6 @@ public class LdapUserDetailsImpl implements LdapUserDetails {
mutableAuthorities = new ArrayList(Arrays.asList(authorities)); mutableAuthorities = new ArrayList(Arrays.asList(authorities));
} }
public void setControls(Control[] controls) {
instance.controls = controls;
}
public void setCredentialsNonExpired(boolean credentialsNonExpired) { public void setCredentialsNonExpired(boolean credentialsNonExpired) {
instance.credentialsNonExpired = credentialsNonExpired; instance.credentialsNonExpired = credentialsNonExpired;
} }