root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Sync changes to MockHttpServletRequest

This commit is contained in:
Sam Brannen 2024-05-24 13:09:02 +02:00
parent e3c268ef18
commit e999f4e47d
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletRequest.java
View File

@ -100,9 +100,6 @@ public class MockHttpServletRequest implements HttpServletRequest {
private static final TimeZone GMT = TimeZone.getTimeZone("GMT"); 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. * Date formats as specified in the HTTP RFC.
* @see <a href="https://tools.ietf.org/html/rfc7231#section-7.1.1.1">Section 7.1.1.1 of RFC 7231</a> * @see <a href="https://tools.ietf.org/html/rfc7231#section-7.1.1.1">Section 7.1.1.1 of RFC 7231</a>
@ -383,6 +380,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
@Override @Override
@Nullable
public Object getAttribute(String name) { public Object getAttribute(String name) {
checkActive(); checkActive();
return this.attributes.get(name); return this.attributes.get(name);
@ -637,6 +635,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
} }
@Override @Override
@Nullable
public String[] getParameterValues(String name) { public String[] getParameterValues(String name) {
Assert.notNull(name, "Parameter name must not be null"); Assert.notNull(name, "Parameter name must not be null");
return this.parameters.get(name); return this.parameters.get(name);
@ -736,7 +735,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
this.reader = new BufferedReader(sourceReader); this.reader = new BufferedReader(sourceReader);
} }
else { else {
this.reader = EMPTY_BUFFERED_READER; this.reader = new BufferedReader(new StringReader(""));
} }
return this.reader; return this.reader;
} }