Change FilterBasedLdapUserSearch to use LdapClient

Closes: gh-17290
Signed-off-by: Andrey Litvitski <[email protected]>

Author: therepanic

ldap/src/main/java/org/springframework/security/ldap/search/FilterBasedLdapUserSearch.java

@@ -23,8 +23,8 @@
 
 import org.springframework.core.log.LogMessage;
 import org.springframework.dao.IncorrectResultSizeDataAccessException;
-import org.springframework.ldap.core.ContextSource;
 import org.springframework.ldap.core.ContextMapper;
+import org.springframework.ldap.core.ContextSource;
 import org.springframework.ldap.core.DirContextOperations;
 import org.springframework.ldap.core.LdapClient;
 import org.springframework.ldap.core.support.BaseLdapPathContextSource;
@@ -102,11 +102,11 @@ public DirContextOperations searchForUser(String username) {
 			.contextSource(this.contextSource)
 			.defaultSearchControls(() -> this.searchControls)
 			.build();
-		LdapQuery query = LdapQueryBuilder.query().base(this.searchBase).filter(searchFilter, username);
+		LdapQuery query = LdapQueryBuilder.query().base(this.searchBase).filter(this.searchFilter, username);
 		try {
 			DirContextOperations operations = ldapClient.search()
 				.query(query)
-				.toObject((ContextMapper<DirContextOperations>) ctx -> (DirContextOperations) ctx);
+				.toObject((ContextMapper<DirContextOperations>) (ctx) -> (DirContextOperations) ctx);
 			if (operations == null) {
 				throw UsernameNotFoundException.fromUsername(username);
 			}