From e999f4e47dd6c642ac95e591c3bce650c2be06b2 Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Fri, 24 May 2024 13:09:02 +0200 Subject: [PATCH] Sync changes to MockHttpServletRequest --- .../web/testfixture/servlet/MockHttpServletRequest.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletRequest.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletRequest.java index 59eb0b977c7..1d2381d4959 100644 --- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletRequest.java +++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletRequest.java @@ -100,9 +100,6 @@ public class MockHttpServletRequest implements HttpServletRequest { private static final TimeZone GMT = TimeZone.getTimeZone("GMT"); - private static final BufferedReader EMPTY_BUFFERED_READER = - new BufferedReader(new StringReader("")); - /** * Date formats as specified in the HTTP RFC. * @see Section 7.1.1.1 of RFC 7231 @@ -383,6 +380,7 @@ public class MockHttpServletRequest implements HttpServletRequest { // --------------------------------------------------------------------- @Override + @Nullable public Object getAttribute(String name) { checkActive(); return this.attributes.get(name); @@ -637,6 +635,7 @@ public class MockHttpServletRequest implements HttpServletRequest { } @Override + @Nullable public String[] getParameterValues(String name) { Assert.notNull(name, "Parameter name must not be null"); return this.parameters.get(name); @@ -736,7 +735,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.reader = new BufferedReader(sourceReader); } else { - this.reader = EMPTY_BUFFERED_READER; + this.reader = new BufferedReader(new StringReader("")); } return this.reader; }