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

Refactored DefaultLdapAuthoritiesPopulator to remove contextSource field and setter method.

This commit is contained in:
Luke Taylor 2008-08-26 12:38:02 +00:00
parent 1cfd886517
commit 7f28a8bc5d
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
core/src/main/java/org/springframework/security/ldap/populator/DefaultLdapAuthoritiesPopulator.java
View File

@ -99,8 +99,6 @@ public class DefaultLdapAuthoritiesPopulator implements LdapAuthoritiesPopulator
*/ */
private GrantedAuthority defaultRole; private GrantedAuthority defaultRole;
private ContextSource contextSource;
private SpringSecurityLdapTemplate ldapTemplate; private SpringSecurityLdapTemplate ldapTemplate;
/** /**
@ -143,8 +141,10 @@ public class DefaultLdapAuthoritiesPopulator implements LdapAuthoritiesPopulator
* context factory. * context factory.
*/ */
public DefaultLdapAuthoritiesPopulator(ContextSource contextSource, String groupSearchBase) { public DefaultLdapAuthoritiesPopulator(ContextSource contextSource, String groupSearchBase) {
this.setContextSource(contextSource); Assert.notNull(contextSource, "contextSource must not be null");
this.setGroupSearchBase(groupSearchBase); ldapTemplate = new SpringSecurityLdapTemplate(contextSource);
ldapTemplate.setSearchControls(searchControls);
setGroupSearchBase(groupSearchBase);
} }
//~ Methods ======================================================================================================== //~ Methods ========================================================================================================
@ -226,20 +226,7 @@ public class DefaultLdapAuthoritiesPopulator implements LdapAuthoritiesPopulator
} }
protected ContextSource getContextSource() { protected ContextSource getContextSource() {
return contextSource; return ldapTemplate.getContextSource();
}
/**
* Set the {@link ContextSource}
*
* @param contextSource supplies the contexts used to search for user roles.
*/
private void setContextSource(ContextSource contextSource) {
Assert.notNull(contextSource, "contextSource must not be null");
this.contextSource = contextSource;
ldapTemplate = new SpringSecurityLdapTemplate(contextSource);
ldapTemplate.setSearchControls(searchControls);
} }
/** /**