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

Polish spring-security-web main code

Browse Source 
Manually polish `spring-security-web` following the formatting
and checkstyle fixes.

Issue gh-8945
This commit is contained in:
Phillip Webb
2020-08-03 22:57:18 -07:00
committed by Rob Winch
parent ef951bae90
commit 5bdd757108
178 changed files with 1676 additions and 2791 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
web/src/test/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImplTests.java
View File

@@ -29,6 +29,7 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
@@ -41,7 +42,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
@@ -133,14 +133,11 @@ public class JdbcTokenRepositoryImplTests {
// SEC-1964
@Test
public void retrievingTokenWithNoSeriesReturnsNull() {
given(this.logger.isDebugEnabled()).willReturn(true);
assertThat(this.repo.getTokenForSeries("missingSeries")).isNull();
verify(this.logger).isDebugEnabled();
verify(this.logger).debug(eq("Querying token for series 'missingSeries' returned no results."),
any(EmptyResultDataAccessException.class));
ArgumentCaptor<Object> captor = ArgumentCaptor.forClass(Object.class);
verify(this.logger).debug(captor.capture(), any(EmptyResultDataAccessException.class));
verifyNoMoreInteractions(this.logger);
assertThat(captor.getValue()).hasToString("Querying token for series 'missingSeries' returned no results.");
}
@Test

10
web/src/test/java/org/springframework/security/web/server/authorization/DelegatingReactiveAuthorizationManagerTests.java
View File

@@ -18,11 +18,12 @@ package org.springframework.security.web.server.authorization;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.MockitoAnnotations;
import reactor.core.publisher.Mono;
import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
import org.springframework.mock.web.server.MockServerWebExchange;
import org.springframework.security.authorization.AuthorityReactiveAuthorizationManager;
import org.springframework.security.authorization.AuthorizationDecision;
import org.springframework.security.core.Authentication;
@@ -40,7 +41,6 @@ import static org.mockito.Mockito.verifyZeroInteractions;
* @author Rob Winch
* @since 5.0
*/
@RunWith(MockitoJUnitRunner.class)
public class DelegatingReactiveAuthorizationManagerTests {
@Mock
@@ -55,7 +55,6 @@ public class DelegatingReactiveAuthorizationManagerTests {
@Mock
AuthorityReactiveAuthorizationManager<AuthorizationContext> delegate2;
@Mock
ServerWebExchange exchange;
@Mock
@@ -68,9 +67,12 @@ public class DelegatingReactiveAuthorizationManagerTests {
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
this.manager = DelegatingReactiveAuthorizationManager.builder()
.add(new ServerWebExchangeMatcherEntry<>(this.match1, this.delegate1))
.add(new ServerWebExchangeMatcherEntry<>(this.match2, this.delegate2)).build();
MockServerHttpRequest request = MockServerHttpRequest.get("/test").build();
this.exchange = MockServerWebExchange.from(request);
}
@Test