Skip to content

Commit 7d2e734

Browse files
gzhao9gzhao9
committed
Fix some checkstyle
1 parent 830f6be commit 7d2e734

File tree

6 files changed

+48
-48
lines changed

6 files changed

+48
-48
lines changed

‎core/src/test/java/org/springframework/security/authorization/method/AuthorizationManagerAfterMethodInterceptorTests.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,12 @@ public void invokeWhenCustomAuthorizationDeniedExceptionThenThrows() throws Thro
155155
assertThatExceptionOfType(MyAuthzDeniedException.class).isThrownBy(() -> advice.invoke(mi));
156156
}
157157

158+
private SecurityContextHolderStrategy mockSecurityContextHolderStrategy(SecurityContextImpl securityContextImpl) {
159+
SecurityContextHolderStrategy strategy = mock(SecurityContextHolderStrategy.class);
160+
given(strategy.getContext()).willReturn(securityContextImpl);
161+
return strategy;
162+
}
163+
158164
static class MyAuthzDeniedException extends AuthorizationDeniedException {
159165

160166
MyAuthzDeniedException(String msg, AuthorizationResult authorizationResult) {
@@ -163,10 +169,4 @@ static class MyAuthzDeniedException extends AuthorizationDeniedException {
163169

164170
}
165171

166-
private SecurityContextHolderStrategy mockSecurityContextHolderStrategy(SecurityContextImpl securityContextImpl) {
167-
SecurityContextHolderStrategy strategy = mock(SecurityContextHolderStrategy.class);
168-
given(strategy.getContext()).willReturn(securityContextImpl);
169-
return strategy;
170-
}
171-
172172
}

‎core/src/test/java/org/springframework/security/authorization/method/AuthorizationManagerBeforeMethodInterceptorTests.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,13 @@ public void invokeWhenCustomAuthorizationDeniedExceptionThenThrows() {
148148
assertThatExceptionOfType(MyAuthzDeniedException.class).isThrownBy(() -> advice.invoke(null));
149149
}
150150

151+
private SecurityContextHolderStrategy mockSecurityContextHolderStrategy(SecurityContextImpl securityContextImpl) {
152+
153+
SecurityContextHolderStrategy strategy = mock(SecurityContextHolderStrategy.class);
154+
given(strategy.getContext()).willReturn(securityContextImpl);
155+
return strategy;
156+
}
157+
151158
static class MyAuthzDeniedException extends AuthorizationDeniedException {
152159

153160
MyAuthzDeniedException(String msg, AuthorizationResult authorizationResult) {
@@ -156,11 +163,4 @@ static class MyAuthzDeniedException extends AuthorizationDeniedException {
156163

157164
}
158165

159-
private SecurityContextHolderStrategy mockSecurityContextHolderStrategy(SecurityContextImpl securityContextImpl) {
160-
161-
SecurityContextHolderStrategy strategy = mock(SecurityContextHolderStrategy.class);
162-
given(strategy.getContext()).willReturn(securityContextImpl);
163-
return strategy;
164-
}
165-
166166
}

‎core/src/test/java/org/springframework/security/authorization/method/PostFilterAuthorizationMethodInterceptorTests.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,13 @@ public Object proceed() {
164164
SecurityContextHolder.setContextHolderStrategy(saved);
165165
}
166166

167+
private SecurityContextHolderStrategy mockSecurityContextHolderStrategy(SecurityContextImpl securityContextImpl) {
168+
169+
SecurityContextHolderStrategy strategy = mock(SecurityContextHolderStrategy.class);
170+
given(strategy.getContext()).willReturn(securityContextImpl);
171+
return strategy;
172+
}
173+
167174
@PostFilter("filterObject == 'john'")
168175
public static class TestClass implements InterfaceAnnotationsOne, InterfaceAnnotationsTwo {
169176

@@ -231,11 +238,4 @@ public interface InterfaceAnnotationsThree {
231238

232239
}
233240

234-
private SecurityContextHolderStrategy mockSecurityContextHolderStrategy(SecurityContextImpl securityContextImpl) {
235-
236-
SecurityContextHolderStrategy strategy = mock(SecurityContextHolderStrategy.class);
237-
given(strategy.getContext()).willReturn(securityContextImpl);
238-
return strategy;
239-
}
240-
241241
}

‎core/src/test/java/org/springframework/security/authorization/method/PreFilterAuthorizationMethodInterceptorTests.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,13 @@ public void preFilterWhenStaticSecurityContextHolderStrategyAfterConstructorThen
216216
SecurityContextHolder.setContextHolderStrategy(saved);
217217
}
218218

219+
private SecurityContextHolderStrategy mockSecurityContextHolderStrategy(SecurityContextImpl securityContextImpl) {
220+
221+
SecurityContextHolderStrategy strategy = mock(SecurityContextHolderStrategy.class);
222+
given(strategy.getContext()).willReturn(securityContextImpl);
223+
return strategy;
224+
}
225+
219226
@PreFilter("filterObject == 'john'")
220227
public static class TestClass implements InterfaceAnnotationsOne, InterfaceAnnotationsTwo {
221228

@@ -298,11 +305,4 @@ public interface InterfaceAnnotationsThree {
298305

299306
}
300307

301-
private SecurityContextHolderStrategy mockSecurityContextHolderStrategy(SecurityContextImpl securityContextImpl) {
302-
303-
SecurityContextHolderStrategy strategy = mock(SecurityContextHolderStrategy.class);
304-
given(strategy.getContext()).willReturn(securityContextImpl);
305-
return strategy;
306-
}
307-
308308
}

‎ldap/src/test/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryLdapAuthenticationProviderTests.java

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ public class ActiveDirectoryLdapAuthenticationProviderTests {
7676
@BeforeEach
7777
public void setUp() throws NamingException {
7878
this.provider = new ActiveDirectoryLdapAuthenticationProvider("mydomain.eu", "ldap://192.168.1.200/");
79-
ctx = mock(DirContext.class);
80-
given(ctx.getNameInNamespace()).willReturn("");
79+
this.ctx = mock(DirContext.class);
80+
given(this.ctx.getNameInNamespace()).willReturn("");
8181
}
8282

8383
@Test
@@ -97,11 +97,11 @@ public void customSearchFilterIsUsedForSuccessfulAuthentication() throws Excepti
9797
String customSearchFilter = "(&(objectClass=user)(sAMAccountName={0}))";
9898
DirContextAdapter dca = new DirContextAdapter();
9999
SearchResult sr = new SearchResult("CN=Joe Jannsen,CN=Users", dca, dca.getAttributes());
100-
given(ctx.search(any(Name.class), eq(customSearchFilter), any(Object[].class), any(SearchControls.class)))
100+
given(this.ctx.search(any(Name.class), eq(customSearchFilter), any(Object[].class), any(SearchControls.class)))
101101
.willReturn(new MockNamingEnumeration(sr));
102102
ActiveDirectoryLdapAuthenticationProvider customProvider = new ActiveDirectoryLdapAuthenticationProvider(
103103
"mydomain.eu", "ldap://192.168.1.200/");
104-
customProvider.contextFactory = createContextFactoryReturning(ctx);
104+
customProvider.contextFactory = createContextFactoryReturning(this.ctx);
105105
customProvider.setSearchFilter(customSearchFilter);
106106
Authentication result = customProvider.authenticate(this.joe);
107107
assertThat(result.isAuthenticated()).isTrue();
@@ -112,14 +112,15 @@ public void defaultSearchFilter() throws Exception {
112112
final String defaultSearchFilter = "(&(objectClass=user)(userPrincipalName={0}))";
113113
DirContextAdapter dca = new DirContextAdapter();
114114
SearchResult sr = new SearchResult("CN=Joe Jannsen,CN=Users", dca, dca.getAttributes());
115-
given(ctx.search(any(Name.class), eq(defaultSearchFilter), any(Object[].class), any(SearchControls.class)))
115+
given(this.ctx.search(any(Name.class), eq(defaultSearchFilter), any(Object[].class), any(SearchControls.class)))
116116
.willReturn(new MockNamingEnumeration(sr));
117117
ActiveDirectoryLdapAuthenticationProvider customProvider = new ActiveDirectoryLdapAuthenticationProvider(
118118
"mydomain.eu", "ldap://192.168.1.200/");
119-
customProvider.contextFactory = createContextFactoryReturning(ctx);
119+
customProvider.contextFactory = createContextFactoryReturning(this.ctx);
120120
Authentication result = customProvider.authenticate(this.joe);
121121
assertThat(result.isAuthenticated()).isTrue();
122-
verify(ctx).search(any(Name.class), eq(defaultSearchFilter), any(Object[].class), any(SearchControls.class));
122+
verify(this.ctx).search(any(Name.class), eq(defaultSearchFilter), any(Object[].class),
123+
any(SearchControls.class));
123124
}
124125

125126
// SEC-2897,SEC-2224
@@ -129,11 +130,11 @@ public void bindPrincipalAndUsernameUsed() throws Exception {
129130
ArgumentCaptor<Object[]> captor = ArgumentCaptor.forClass(Object[].class);
130131
DirContextAdapter dca = new DirContextAdapter();
131132
SearchResult sr = new SearchResult("CN=Joe Jannsen,CN=Users", dca, dca.getAttributes());
132-
given(ctx.search(any(Name.class), eq(defaultSearchFilter), captor.capture(), any(SearchControls.class)))
133+
given(this.ctx.search(any(Name.class), eq(defaultSearchFilter), captor.capture(), any(SearchControls.class)))
133134
.willReturn(new MockNamingEnumeration(sr));
134135
ActiveDirectoryLdapAuthenticationProvider customProvider = new ActiveDirectoryLdapAuthenticationProvider(
135136
"mydomain.eu", "ldap://192.168.1.200/");
136-
customProvider.contextFactory = createContextFactoryReturning(ctx);
137+
customProvider.contextFactory = createContextFactoryReturning(this.ctx);
137138
Authentication result = customProvider.authenticate(this.joe);
138139
assertThat(captor.getValue()).containsExactly("[email protected]", "joe");
139140
assertThat(result.isAuthenticated()).isTrue();
@@ -154,28 +155,28 @@ public void nullDomainIsSupportedIfAuthenticatingWithFullUserPrincipal() throws
154155
this.provider = new ActiveDirectoryLdapAuthenticationProvider(null, "ldap://192.168.1.200/");
155156
DirContextAdapter dca = new DirContextAdapter();
156157
SearchResult sr = new SearchResult("CN=Joe Jannsen,CN=Users", dca, dca.getAttributes());
157-
given(ctx.search(eq(LdapNameBuilder.newInstance("DC=mydomain,DC=eu").build()), any(String.class),
158+
given(this.ctx.search(eq(LdapNameBuilder.newInstance("DC=mydomain,DC=eu").build()), any(String.class),
158159
any(Object[].class), any(SearchControls.class)))
159160
.willReturn(new MockNamingEnumeration(sr));
160-
this.provider.contextFactory = createContextFactoryReturning(ctx);
161+
this.provider.contextFactory = createContextFactoryReturning(this.ctx);
161162
assertThatExceptionOfType(BadCredentialsException.class).isThrownBy(() -> this.provider.authenticate(this.joe));
162163
this.provider.authenticate(UsernamePasswordAuthenticationToken.unauthenticated("[email protected]", "password"));
163164
}
164165

165166
@Test
166167
public void failedUserSearchCausesBadCredentials() throws Exception {
167-
given(ctx.search(any(Name.class), any(String.class), any(Object[].class), any(SearchControls.class)))
168+
given(this.ctx.search(any(Name.class), any(String.class), any(Object[].class), any(SearchControls.class)))
168169
.willThrow(new NameNotFoundException());
169-
this.provider.contextFactory = createContextFactoryReturning(ctx);
170+
this.provider.contextFactory = createContextFactoryReturning(this.ctx);
170171
assertThatExceptionOfType(BadCredentialsException.class).isThrownBy(() -> this.provider.authenticate(this.joe));
171172
}
172173

173174
// SEC-2017
174175
@Test
175176
public void noUserSearchCausesUsernameNotFound() throws Exception {
176-
given(ctx.search(any(Name.class), any(String.class), any(Object[].class), any(SearchControls.class)))
177+
given(this.ctx.search(any(Name.class), any(String.class), any(Object[].class), any(SearchControls.class)))
177178
.willReturn(new EmptyEnumeration<>());
178-
this.provider.contextFactory = createContextFactoryReturning(ctx);
179+
this.provider.contextFactory = createContextFactoryReturning(this.ctx);
179180
assertThatExceptionOfType(BadCredentialsException.class).isThrownBy(() -> this.provider.authenticate(this.joe));
180181
}
181182

@@ -194,9 +195,9 @@ public void duplicateUserSearchCausesError() throws Exception {
194195
SearchResult searchResult = mock(SearchResult.class);
195196
given(searchResult.getObject()).willReturn(new DirContextAdapter("ou=1"), new DirContextAdapter("ou=2"));
196197
given(searchResults.next()).willReturn(searchResult);
197-
given(ctx.search(any(Name.class), any(String.class), any(Object[].class), any(SearchControls.class)))
198+
given(this.ctx.search(any(Name.class), any(String.class), any(Object[].class), any(SearchControls.class)))
198199
.willReturn(searchResults);
199-
this.provider.contextFactory = createContextFactoryReturning(ctx);
200+
this.provider.contextFactory = createContextFactoryReturning(this.ctx);
200201
assertThatExceptionOfType(IncorrectResultSizeDataAccessException.class)
201202
.isThrownBy(() -> this.provider.authenticate(this.joe));
202203
}
@@ -352,10 +353,10 @@ private void checkAuthentication(String rootDn, ActiveDirectoryLdapAuthenticatio
352353
SearchResult sr = new SearchResult("CN=Joe Jannsen,CN=Users", dca, dca.getAttributes());
353354
@SuppressWarnings("deprecation")
354355
Name searchBaseDn = LdapNameBuilder.newInstance(rootDn).build();
355-
given(ctx.search(eq(searchBaseDn), any(String.class), any(Object[].class), any(SearchControls.class)))
356+
given(this.ctx.search(eq(searchBaseDn), any(String.class), any(Object[].class), any(SearchControls.class)))
356357
.willReturn(new MockNamingEnumeration(sr))
357358
.willReturn(new MockNamingEnumeration(sr));
358-
provider.contextFactory = createContextFactoryReturning(ctx);
359+
provider.contextFactory = createContextFactoryReturning(this.ctx);
359360
Authentication result = provider.authenticate(this.joe);
360361
assertThat(result.getAuthorities()).isEmpty();
361362
dca.addAttributeValue("memberOf", "CN=Admin,CN=Users,DC=mydomain,DC=eu");

‎web/src/test/java/org/springframework/security/web/access/ExceptionTranslationFilterTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,7 @@ public void setMessageSourceWhenNotNullThenCanGet() {
295295

296296
private FilterChain mockFilterChainWithException(Exception exception) throws ServletException, IOException {
297297
FilterChain fc = mock(FilterChain.class);
298-
willThrow(exception).given(fc)
299-
.doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class));
298+
willThrow(exception).given(fc).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class));
300299
return fc;
301300
}
302301

0 commit comments

Comments
 (0)