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

Merge branch '5.1.x'

Browse Source
This commit is contained in:
Sam Brannen
2019-08-27 17:37:25 +02:00
parent 1ec9721617 8189c90741
commit b2ad16aaa7
3 changed files with 109 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletResponse.java
View File

@@ -57,6 +57,7 @@ import org.springframework.web.util.WebUtils;
* @author Brian Clozel
* @author Vedran Pavic
* @author Sebastien Deleuze
* @author Sam Brannen
* @since 1.0.2
*/
public class MockHttpServletResponse implements HttpServletResponse {
@@ -602,20 +603,22 @@ public class MockHttpServletResponse implements HttpServletResponse {
}
private void setHeaderValue(String name, Object value) {
if (setSpecialHeader(name, value)) {
boolean replaceHeader = true;
if (setSpecialHeader(name, value, replaceHeader)) {
return;
}
doAddHeaderValue(name, value, true);
doAddHeaderValue(name, value, replaceHeader);
}
private void addHeaderValue(String name, Object value) {
if (setSpecialHeader(name, value)) {
boolean replaceHeader = false;
if (setSpecialHeader(name, value, replaceHeader)) {
return;
}
doAddHeaderValue(name, value, false);
doAddHeaderValue(name, value, replaceHeader);
}
private boolean setSpecialHeader(String name, Object value) {
private boolean setSpecialHeader(String name, Object value, boolean replaceHeader) {
if (HttpHeaders.CONTENT_TYPE.equalsIgnoreCase(name)) {
setContentType(value.toString());
return true;
@@ -634,7 +637,12 @@ public class MockHttpServletResponse implements HttpServletResponse {
}
else if (HttpHeaders.SET_COOKIE.equalsIgnoreCase(name)) {
MockCookie cookie = MockCookie.parse(value.toString());
addCookie(cookie);
if (replaceHeader) {
setCookie(cookie);
}
else {
addCookie(cookie);
}
return true;
}
else {
@@ -657,6 +665,20 @@ public class MockHttpServletResponse implements HttpServletResponse {
}
}
/**
* Set the {@code Set-Cookie} header to the supplied {@link Cookie},
* overwriting any previous cookies.
* @param cookie the {@code Cookie} to set
* @since 5.1.10
* @see #addCookie(Cookie)
*/
private void setCookie(Cookie cookie) {
Assert.notNull(cookie, "Cookie must not be null");
this.cookies.clear();
this.cookies.add(cookie);
doAddHeaderValue(HttpHeaders.SET_COOKIE, getCookieHeader(cookie), true);
}
@Override
public void setStatus(int status) {
if (!this.isCommitted()) {