Cwikius-Spring/spring-security
1
0
Fork 0
mirror of synced 2026-05-22 21:33:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant throws clauses

Browse Source 
Removes exceptions that are declared in a method's signature but never thrown by the method itself or its implementations/derivatives.
This commit is contained in:
Lars Grefer
2019-08-23 01:03:54 +02:00
parent f0515a021c
commit 34dd5fea30
418 changed files with 1146 additions and 1273 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/src/main/java/org/springframework/security/test/context/support/ReactorContextTestExecutionListener.java
+2 -2
View File
@@ -58,13 +58,13 @@ public class ReactorContextTestExecutionListener
private static class DelegateTestExecutionListener extends AbstractTestExecutionListener {
@Override
public void beforeTestMethod(TestContext testContext) throws Exception {
public void beforeTestMethod(TestContext testContext) {
SecurityContext securityContext = TestSecurityContextHolder.getContext();
Hooks.onLastOperator(CONTEXT_OPERATOR_KEY, Operators.lift((s, sub) -> new SecuritySubContext<>(sub, securityContext)));
}
@Override
public void afterTestMethod(TestContext testContext) throws Exception {
public void afterTestMethod(TestContext testContext) {
Hooks.resetOnLastOperator(CONTEXT_OPERATOR_KEY);
}
test/src/main/java/org/springframework/security/test/context/support/WithSecurityContextTestExecutionListener.java
+2 -2
View File
@@ -58,7 +58,7 @@ public class WithSecurityContextTestExecutionListener
* still not found, then no {@link SecurityContext} is populated.
*/
@Override
public void beforeTestMethod(TestContext testContext) throws Exception {
public void beforeTestMethod(TestContext testContext) {
TestSecurityContext testSecurityContext = createTestSecurityContext(
testContext.getTestMethod(), testContext);
if (testSecurityContext == null) {
@@ -166,7 +166,7 @@ public class WithSecurityContextTestExecutionListener
* {@link SecurityContextHolder} after each test method.
*/
@Override
public void afterTestMethod(TestContext testContext) throws Exception {
public void afterTestMethod(TestContext testContext) {
TestSecurityContextHolder.clearContext();
}
test/src/main/java/org/springframework/security/test/web/servlet/response/SecurityMockMvcResultMatchers.java
+2 -2
View File
@@ -92,7 +92,7 @@ public final class SecurityMockMvcResultMatchers {
private Consumer<Authentication> assertAuthentication;
@Override
public void match(MvcResult result) throws Exception {
public void match(MvcResult result) {
SecurityContext context = load(result);
Authentication auth = context.getAuthentication();
@@ -252,7 +252,7 @@ public final class SecurityMockMvcResultMatchers {
private AuthenticationTrustResolver trustResolver = new AuthenticationTrustResolverImpl();
@Override
public void match(MvcResult result) throws Exception {
public void match(MvcResult result) {
SecurityContext context = load(result);
Authentication authentication = context.getAuthentication();
test/src/test/java/org/springframework/security/test/context/support/WithSecurityContextTestExecutionListenerTests.java
+2 -2
View File
@@ -106,14 +106,14 @@ public class WithSecurityContextTestExecutionListenerTests {
}
@Test
public void beforeTestExecutionWhenTestContextNullThenSecurityContextNotSet() throws Exception {
public void beforeTestExecutionWhenTestContextNullThenSecurityContextNotSet() {
this.listener.beforeTestExecution(this.testContext);
assertThat(TestSecurityContextHolder.getContext().getAuthentication()).isNull();
}
@Test
public void beforeTestExecutionWhenTestContextNotNullThenSecurityContextSet() throws Exception {
public void beforeTestExecutionWhenTestContextNotNullThenSecurityContextSet() {
SecurityContextImpl securityContext = new SecurityContextImpl();
securityContext.setAuthentication(new TestingAuthenticationToken("user", "passsword", "ROLE_USER"));
when(this.testContext.removeAttribute(WithSecurityContextTestExecutionListener.SECURITY_CONTEXT_ATTR_NAME)).thenReturn(securityContext);
test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestBuildersFormLoginTests.java
+4 -4
View File
@@ -31,12 +31,12 @@ public class SecurityMockMvcRequestBuildersFormLoginTests {
private MockServletContext servletContext;
@Before
public void setup() throws Exception {
public void setup() {
this.servletContext = new MockServletContext();
}
@Test
public void defaults() throws Exception {
public void defaults() {
MockHttpServletRequest request = formLogin().buildRequest(this.servletContext);
CsrfToken token = (CsrfToken) request
.getAttribute(CsrfRequestPostProcessor.TestCsrfTokenRepository.TOKEN_ATTR_NAME);
@@ -51,7 +51,7 @@ public class SecurityMockMvcRequestBuildersFormLoginTests {
}
@Test
public void custom() throws Exception {
public void custom() {
MockHttpServletRequest request = formLogin("/login").user("username", "admin")
.password("password", "secret").buildRequest(this.servletContext);
@@ -68,7 +68,7 @@ public class SecurityMockMvcRequestBuildersFormLoginTests {
// gh-3920
@Test
public void usesAcceptMediaForContentNegotiation() throws Exception {
public void usesAcceptMediaForContentNegotiation() {
MockHttpServletRequest request = formLogin("/login").user("username", "admin")
.password("password", "secret").buildRequest(this.servletContext);
test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestBuildersFormLogoutTests.java
+2 -2
View File
@@ -34,7 +34,7 @@ public class SecurityMockMvcRequestBuildersFormLogoutTests {
}
@Test
public void defaults() throws Exception {
public void defaults() {
MockHttpServletRequest request = logout().buildRequest(servletContext);
CsrfToken token = (CsrfToken) request.getAttribute(CsrfRequestPostProcessor.TestCsrfTokenRepository.TOKEN_ATTR_NAME);
@@ -46,7 +46,7 @@ public class SecurityMockMvcRequestBuildersFormLogoutTests {
}
@Test
public void custom() throws Exception {
public void custom() {
MockHttpServletRequest request = logout("/admin/logout").buildRequest(
servletContext);
test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsCsrfDebugFilterTests.java
+3 -3
View File
@@ -44,7 +44,7 @@ public class SecurityMockMvcRequestPostProcessorsCsrfDebugFilterTests {
// SEC-3836
@Test
public void findCookieCsrfTokenRepository() throws Exception {
public void findCookieCsrfTokenRepository() {
MockHttpServletRequest request = post("/").buildRequest(wac.getServletContext());
CsrfTokenRepository csrfTokenRepository = WebTestUtils.getCsrfTokenRepository(request);
assertThat(csrfTokenRepository).isNotNull();
@@ -61,9 +61,9 @@ public class SecurityMockMvcRequestPostProcessorsCsrfDebugFilterTests {
}
@Override
public void configure(WebSecurity web) throws Exception {
public void configure(WebSecurity web) {
// Enable the DebugFilter
web.debug(true);
}
}
}
}
test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsCsrfTests.java
+3 -3
View File
@@ -172,7 +172,7 @@ public class SecurityMockMvcRequestPostProcessorsCsrfTests {
static class CsrfParamResultMatcher implements ResultMatcher {
@Override
public void match(MvcResult result) throws Exception {
public void match(MvcResult result) {
MockHttpServletRequest request = result.getRequest();
assertThat(request.getParameter("_csrf")).isNotNull();
assertThat(request.getHeader("X-CSRF-TOKEN")).isNull();
@@ -186,7 +186,7 @@ public class SecurityMockMvcRequestPostProcessorsCsrfTests {
static class CsrfHeaderResultMatcher implements ResultMatcher {
@Override
public void match(MvcResult result) throws Exception {
public void match(MvcResult result) {
MockHttpServletRequest request = result.getRequest();
assertThat(request.getParameter("_csrf")).isNull();
assertThat(request.getHeader("X-CSRF-TOKEN")).isNotNull();
@@ -224,7 +224,7 @@ public class SecurityMockMvcRequestPostProcessorsCsrfTests {
@EnableWebSecurity
static class Config extends WebSecurityConfigurerAdapter {
@Override
protected void configure(HttpSecurity http) throws Exception {
protected void configure(HttpSecurity http) {
}
@RestController
test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsDigestTests.java
+1 -2
View File
@@ -116,8 +116,7 @@ public class SecurityMockMvcRequestPostProcessorsDigestTests {
private String extractUser() throws IOException, ServletException {
filter.doFilter(request, new MockHttpServletResponse(), new MockFilterChain() {
@Override
public void doFilter(ServletRequest request, ServletResponse response)
throws IOException, ServletException {
public void doFilter(ServletRequest request, ServletResponse response) {
Authentication authentication = SecurityContextHolder.getContext()
.getAuthentication();
username = authentication == null ? null : authentication.getName();
test/src/test/java/org/springframework/security/test/web/servlet/setup/SecurityMockMvcConfigurerTests.java
+2 -2
View File
@@ -89,14 +89,14 @@ public class SecurityMockMvcConfigurerTests {
}
@Test(expected = IllegalStateException.class)
public void beforeMockMvcCreatedNoFilter() throws Exception {
public void beforeMockMvcCreatedNoFilter() {
SecurityMockMvcConfigurer configurer = new SecurityMockMvcConfigurer();
configurer.afterConfigurerAdded(this.builder);
configurer.beforeMockMvcCreated(this.builder, this.context);
}
private void assertFilterAdded(Filter filter) throws IOException, ServletException {
private void assertFilterAdded(Filter filter) {
ArgumentCaptor<SecurityMockMvcConfigurer.DelegateFilter> filterArg = ArgumentCaptor.forClass(
SecurityMockMvcConfigurer.DelegateFilter.class);
verify(this.builder).addFilters(filterArg.capture());
test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/CsrfShowcaseTests.java
+1 -1
View File
@@ -72,7 +72,7 @@ public class CsrfShowcaseTests {
static class Config extends WebSecurityConfigurerAdapter {
@Override
protected void configure(HttpSecurity http) throws Exception {
protected void configure(HttpSecurity http) {
}
// @formatter:off
test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/DefaultCsrfShowcaseTests.java
+1 -1
View File
@@ -67,7 +67,7 @@ public class DefaultCsrfShowcaseTests {
static class Config extends WebSecurityConfigurerAdapter {
@Override
protected void configure(HttpSecurity http) throws Exception {
protected void configure(HttpSecurity http) {
}
// @formatter:off
test/src/test/java/org/springframework/security/test/web/support/WebTestUtilsTests.java
+1 -1
View File
@@ -207,7 +207,7 @@ public class WebTestUtilsTests {
// @formatter:off
@Override
public void configure(HttpSecurity http) throws Exception {
public void configure(HttpSecurity http) {
http
.antMatcher("/willnotmatchthis");
}