From 7f28a8bc5d833ac445e70e9739f3f9c63c48e798 Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Tue, 26 Aug 2008 12:38:02 +0000
Subject: [PATCH] Refactored DefaultLdapAuthoritiesPopulator to remove
 contextSource field and setter method.

---
 .../DefaultLdapAuthoritiesPopulator.java      | 23 ++++---------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/core/src/main/java/org/springframework/security/ldap/populator/DefaultLdapAuthoritiesPopulator.java b/core/src/main/java/org/springframework/security/ldap/populator/DefaultLdapAuthoritiesPopulator.java
index ae9a555e47..55686bdba3 100644
--- a/core/src/main/java/org/springframework/security/ldap/populator/DefaultLdapAuthoritiesPopulator.java
+++ b/core/src/main/java/org/springframework/security/ldap/populator/DefaultLdapAuthoritiesPopulator.java
@@ -99,8 +99,6 @@ public class DefaultLdapAuthoritiesPopulator implements LdapAuthoritiesPopulator
      */
     private GrantedAuthority defaultRole;
 
-    private ContextSource contextSource;
-
     private SpringSecurityLdapTemplate ldapTemplate;
 
     /**
@@ -143,8 +141,10 @@ public class DefaultLdapAuthoritiesPopulator implements LdapAuthoritiesPopulator
      *                                 context factory.
      */
     public DefaultLdapAuthoritiesPopulator(ContextSource contextSource, String groupSearchBase) {
-        this.setContextSource(contextSource);
-        this.setGroupSearchBase(groupSearchBase);
+        Assert.notNull(contextSource, "contextSource must not be null");
+        ldapTemplate = new SpringSecurityLdapTemplate(contextSource);
+        ldapTemplate.setSearchControls(searchControls);
+        setGroupSearchBase(groupSearchBase);
     }
 
     //~ Methods ========================================================================================================
@@ -226,20 +226,7 @@ public class DefaultLdapAuthoritiesPopulator implements LdapAuthoritiesPopulator
     }
 
     protected ContextSource getContextSource() {
-        return contextSource;
-    }
-
-    /**
-     * 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);
+        return ldapTemplate.getContextSource();
     }
 
     /**