Skip to content

Commit 7b93a2c

Browse files
committed
Satisfy checkstyle
1 parent 5f5588e commit 7b93a2c

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

ldap/src/main/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryLdapAuthenticationProvider.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
* attribute.
7070
* <p>
7171
* <h3>Active Directory Sub-Error Codes</h3>
72-
*
72+
* <p>
7373
* When an authentication fails, resulting in a standard LDAP 49 error code, Active
7474
* Directory also supplies its own sub-error codes within the error message. These will be
7575
* used to provide additional log information on why an authentication has failed. Typical
@@ -85,7 +85,7 @@
8585
* <li>773 - user must reset password</li>
8686
* <li>775 - account locked</li>
8787
* </ul>
88-
*
88+
* <p>
8989
* If you set the {@link #setConvertSubErrorCodesToExceptions(boolean)
9090
* convertSubErrorCodesToExceptions} property to {@code true}, the codes will also be used
9191
* to control the exception raised.
@@ -143,7 +143,7 @@ public ActiveDirectoryLdapAuthenticationProvider(String domain, String url, Stri
143143
this.domain = StringUtils.hasText(domain) ? domain.toLowerCase() : null;
144144
this.url = url;
145145
this.rootDn = StringUtils.hasText(rootDn) ? rootDn.toLowerCase() : null;
146-
this.setAuthoritiesPopulator(authoritiesPopulator);
146+
this.setAuthoritiesPopulator(this.authoritiesPopulator);
147147
}
148148

149149
/**
@@ -155,7 +155,7 @@ public ActiveDirectoryLdapAuthenticationProvider(String domain, String url) {
155155
this.domain = StringUtils.hasText(domain) ? domain.toLowerCase() : null;
156156
this.url = url;
157157
this.rootDn = (this.domain != null) ? rootDnFromDomain(this.domain) : null;
158-
this.setAuthoritiesPopulator(authoritiesPopulator);
158+
this.setAuthoritiesPopulator(this.authoritiesPopulator);
159159
}
160160

161161
@Override
@@ -182,7 +182,7 @@ protected DirContextOperations doAuthentication(UsernamePasswordAuthenticationTo
182182
@Override
183183
protected Collection<? extends GrantedAuthority> loadUserAuthorities(DirContextOperations userData, String username,
184184
String password) {
185-
return authoritiesPopulator.getGrantedAuthorities(userData, username);
185+
return this.authoritiesPopulator.getGrantedAuthorities(userData, username);
186186
}
187187

188188
private DirContext bindAsUser(String username, String password) {
@@ -363,7 +363,6 @@ public void setConvertSubErrorCodesToExceptions(boolean convertSubErrorCodesToEx
363363
* Defaults to: {@code (&(objectClass=user)(userPrincipalName={0}))}
364364
* </p>
365365
* @param searchFilter the filter string
366-
*
367366
* @since 3.2.6
368367
*/
369368
public void setSearchFilter(String searchFilter) {

ldap/src/main/java/org/springframework/security/ldap/authentication/ad/DefaultActiveDirectoryAuthoritiesPopulator.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,21 @@
1616

1717
package org.springframework.security.ldap.authentication.ad;
1818

19+
import java.util.ArrayList;
20+
import java.util.Arrays;
21+
import java.util.Collection;
22+
import java.util.List;
23+
1924
import org.apache.commons.logging.Log;
2025
import org.apache.commons.logging.LogFactory;
26+
2127
import org.springframework.ldap.core.DirContextOperations;
2228
import org.springframework.ldap.core.DistinguishedName;
2329
import org.springframework.security.core.GrantedAuthority;
2430
import org.springframework.security.core.authority.AuthorityUtils;
2531
import org.springframework.security.core.authority.SimpleGrantedAuthority;
2632
import org.springframework.security.ldap.userdetails.LdapAuthoritiesPopulator;
2733

28-
import java.util.ArrayList;
29-
import java.util.Arrays;
30-
import java.util.Collection;
31-
import java.util.List;
32-
3334
/**
3435
* The default strategy for obtaining user role information from the active directory.
3536
* Creates the user authority list from the values of the {@code memberOf} attribute

0 commit comments

Comments
 (0)