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

Merge branch '5.2.x'

Browse Source 
# Conflicts:
#	build.gradle
#	spring-test/src/main/java/org/springframework/mock/http/server/reactive/MockServerHttpRequest.java
#	spring-web/src/main/java/org/springframework/http/HttpHeaders.java
#	spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/server/reactive/MockServerHttpRequest.java
This commit is contained in:
Juergen Hoeller
2020-06-06 15:27:15 +02:00
parent aaa7c6c422 f3d4df2fd4
commit 5051d7302d
18 changed files with 125 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-test/src/main/java/org/springframework/mock/http/server/reactive/MockServerHttpRequest.java
View File

@@ -64,10 +64,10 @@ public final class MockServerHttpRequest extends AbstractServerHttpRequest {
private final MultiValueMap<String, HttpCookie> cookies;
@Nullable
private final InetSocketAddress remoteAddress;
private final InetSocketAddress localAddress;
@Nullable
private final InetSocketAddress localAddress;
private final InetSocketAddress remoteAddress;
@Nullable
private final SslInfo sslInfo;
@@ -103,18 +103,18 @@ public final class MockServerHttpRequest extends AbstractServerHttpRequest {
@Override
@Nullable
public InetSocketAddress getRemoteAddress() {
return this.remoteAddress;
}
@Nullable
@Override
public InetSocketAddress getLocalAddress() {
return this.localAddress;
}
@Nullable
@Override
@Nullable
public InetSocketAddress getRemoteAddress() {
return this.remoteAddress;
}
@Override
@Nullable
protected SslInfo initSslInfo() {
return this.sslInfo;
}