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:
Juergen Hoeller
2019-07-30 22:52:20 +02:00
parent ac9a11a581 59064f0780
commit 3b235a098f
12 changed files with 32 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-web/src/test/java/org/springframework/mock/http/client/reactive/test/MockClientHttpResponse.java
View File

@@ -71,7 +71,7 @@ public class MockClientHttpResponse implements ClientHttpResponse {
@Override
public HttpStatus getStatusCode() {
return HttpStatus.resolve(this.status);
return HttpStatus.valueOf(this.status);
}
@Override
@@ -81,10 +81,9 @@ public class MockClientHttpResponse implements ClientHttpResponse {
@Override
public HttpHeaders getHeaders() {
String headerName = HttpHeaders.SET_COOKIE;
if (!getCookies().isEmpty() && this.headers.get(headerName) == null) {
if (!getCookies().isEmpty() && this.headers.get(HttpHeaders.SET_COOKIE) == null) {
getCookies().values().stream().flatMap(Collection::stream)
.forEach(cookie -> getHeaders().add(headerName, cookie.toString()));
.forEach(cookie -> getHeaders().add(HttpHeaders.SET_COOKIE, cookie.toString()));
}
return this.headers;
}