From feff7476693e47a1b28543521dae2bb79e8a1b3e Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Fri, 14 Jan 2022 16:45:58 -0700 Subject: [PATCH] Polish multiple RequestRejectedHandlers support Issue gh-10603 --- .../config/annotation/web/builders/WebSecurity.java | 2 +- .../web/firewall/CompositeRequestRejectedHandler.java | 2 +- .../firewall/CompositeRequestRejectedHandlerTests.java | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/builders/WebSecurity.java b/config/src/main/java/org/springframework/security/config/annotation/web/builders/WebSecurity.java index 14970f2669..75c126ca44 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/builders/WebSecurity.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/builders/WebSecurity.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/web/src/main/java/org/springframework/security/web/firewall/CompositeRequestRejectedHandler.java b/web/src/main/java/org/springframework/security/web/firewall/CompositeRequestRejectedHandler.java index 8866377b14..acb3233b2e 100644 --- a/web/src/main/java/org/springframework/security/web/firewall/CompositeRequestRejectedHandler.java +++ b/web/src/main/java/org/springframework/security/web/firewall/CompositeRequestRejectedHandler.java @@ -50,7 +50,7 @@ public final class CompositeRequestRejectedHandler implements RequestRejectedHan @Override public void handle(HttpServletRequest request, HttpServletResponse response, RequestRejectedException requestRejectedException) throws IOException, ServletException { - for (RequestRejectedHandler requestRejectedhandler : requestRejectedhandlers) { + for (RequestRejectedHandler requestRejectedhandler : this.requestRejectedhandlers) { requestRejectedhandler.handle(request, response, requestRejectedException); } } diff --git a/web/src/test/java/org/springframework/security/web/firewall/CompositeRequestRejectedHandlerTests.java b/web/src/test/java/org/springframework/security/web/firewall/CompositeRequestRejectedHandlerTests.java index 063957b7c0..a2a3fb92b5 100644 --- a/web/src/test/java/org/springframework/security/web/firewall/CompositeRequestRejectedHandlerTests.java +++ b/web/src/test/java/org/springframework/security/web/firewall/CompositeRequestRejectedHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,9 +29,9 @@ public class CompositeRequestRejectedHandlerTests { @Test void compositeRequestRejectedHandlerRethrowsTheException() { RequestRejectedException requestRejectedException = new RequestRejectedException("rejected"); - DefaultRequestRejectedHandler sut = new DefaultRequestRejectedHandler(); - CompositeRequestRejectedHandler crrh = new CompositeRequestRejectedHandler(sut); - assertThatExceptionOfType(RequestRejectedException.class).isThrownBy(() -> crrh + CompositeRequestRejectedHandler handler = new CompositeRequestRejectedHandler( + new DefaultRequestRejectedHandler()); + assertThatExceptionOfType(RequestRejectedException.class).isThrownBy(() -> handler .handle(mock(HttpServletRequest.class), mock(HttpServletResponse.class), requestRejectedException)) .withMessage("rejected"); }