Spring/spring-security
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Apply code cleanup rules to projects

Browse Source 
Apply automated cleanup rules to add `@Override` and `@Deprecated`
annotations and to fix class references used with static methods.

Issue gh-8945
This commit is contained in:
Phillip Webb
2020-07-26 12:04:13 -07:00
committed by Rob Winch
parent 8866fa6fb0
commit 9e08b51ed3
558 changed files with 1418 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ldap/src/test/java/org/springframework/security/ldap/authentication/LdapAuthenticationProviderTests.java
View File

@@ -179,6 +179,7 @@ public class LdapAuthenticationProviderTests {
class MockAuthenticator implements LdapAuthenticator {
@Override
public DirContextOperations authenticate(Authentication authentication) {
DirContextAdapter ctx = new DirContextAdapter();
ctx.setAttributeValue("ou", "FROM_ENTRY");
@@ -206,6 +207,7 @@ public class LdapAuthenticationProviderTests {
String username;
@Override
public Collection<GrantedAuthority> getGrantedAuthorities(DirContextOperations userCtx, String username) {
this.username = username;
return AuthorityUtils.createAuthorityList("ROLE_FROM_POPULATOR");

1
ldap/src/test/java/org/springframework/security/ldap/authentication/MockUserSearch.java
View File

@@ -33,6 +33,7 @@ public class MockUserSearch implements LdapUserSearch {
this.user = user;
}
@Override
public DirContextOperations searchForUser(String username) {
return this.user;
}

7
ldap/src/test/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryLdapAuthenticationProviderTests.java
View File

@@ -290,12 +290,14 @@ public class ActiveDirectoryLdapAuthenticationProviderTests {
private Matcher<String> causeDataCode = CoreMatchers.equalTo(dataCode);
@Override
public boolean matches(Object that) {
Throwable t = (Throwable) that;
ActiveDirectoryAuthenticationException cause = (ActiveDirectoryAuthenticationException) t.getCause();
return this.causeInstance.matches(cause) && this.causeDataCode.matches(cause.getDataCode());
}
@Override
public void describeTo(Description desc) {
desc.appendText("getCause() ");
this.causeInstance.describeTo(desc);
@@ -468,23 +470,28 @@ public class ActiveDirectoryLdapAuthenticationProviderTests {
this.sr = sr;
}
@Override
public SearchResult next() {
SearchResult result = this.sr;
this.sr = null;
return result;
}
@Override
public boolean hasMore() {
return this.sr != null;
}
@Override
public void close() {
}
@Override
public boolean hasMoreElements() {
return hasMore();
}
@Override
public SearchResult nextElement() {
return next();
}

1
ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsServiceTests.java
View File

@@ -74,6 +74,7 @@ public class LdapUserDetailsServiceTests {
class MockAuthoritiesPopulator implements LdapAuthoritiesPopulator {
@Override
public Collection<GrantedAuthority> getGrantedAuthorities(DirContextOperations userCtx, String username) {
return AuthorityUtils.createAuthorityList("ROLE_FROM_POPULATOR");
}