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

Expose localAddress in WebFlux server

Browse Source 
Closes gh-24174
This commit is contained in:
Rossen Stoyanchev
2019-12-10 15:10:13 +00:00
parent 2bd821c909
commit 1b172c1d20
14 changed files with 176 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerRequest.java
View File

@@ -122,6 +122,11 @@ class DefaultServerRequest implements ServerRequest {
return Optional.ofNullable(request().getRemoteAddress());
}
@Override
public Optional<InetSocketAddress> localAddress() {
return Optional.ofNullable(request().getLocalAddress());
}
@Override
public List<HttpMessageReader<?>> messageReaders() {
return this.messageReaders;

5
spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicates.java
View File

@@ -947,6 +947,11 @@ public abstract class RequestPredicates {
return this.request.remoteAddress();
}
@Override
public Optional<InetSocketAddress> localAddress() {
return this.request.localAddress();
}
@Override
public List<HttpMessageReader<?>> messageReaders() {
return this.request.messageReaders();

6
spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ServerRequest.java
View File

@@ -124,6 +124,12 @@ public interface ServerRequest {
*/
Optional<InetSocketAddress> remoteAddress();
/**
* Get the remote address to which this request is connected, if available.
* @since 5.2.3
*/
Optional<InetSocketAddress> localAddress();
/**
* Get the readers used to convert the body of this request.
* @since 5.1

5
spring-webflux/src/main/java/org/springframework/web/reactive/function/server/support/ServerRequestWrapper.java
View File

@@ -123,6 +123,11 @@ public class ServerRequestWrapper implements ServerRequest {
return this.delegate.remoteAddress();
}
@Override
public Optional<InetSocketAddress> localAddress() {
return this.delegate.localAddress();
}
@Override
public List<HttpMessageReader<?>> messageReaders() {
return this.delegate.messageReaders();

36
spring-webflux/src/test/java/org/springframework/web/reactive/function/server/MockServerRequest.java
View File

@@ -61,7 +61,7 @@ import org.springframework.web.util.UriComponentsBuilder;
* @author Arjen Poutsma
* @since 5.0
*/
public class MockServerRequest implements ServerRequest {
public final class MockServerRequest implements ServerRequest {
private final HttpMethod method;
@@ -91,6 +91,9 @@ public class MockServerRequest implements ServerRequest {
@Nullable
private final InetSocketAddress remoteAddress;
@Nullable
private final InetSocketAddress localAddress;
private final List<HttpMessageReader<?>> messageReaders;
@Nullable
@@ -101,8 +104,8 @@ public class MockServerRequest implements ServerRequest {
MultiValueMap<String, HttpCookie> cookies, @Nullable Object body,
Map<String, Object> attributes, MultiValueMap<String, String> queryParams,
Map<String, String> pathVariables, @Nullable WebSession session, @Nullable Principal principal,
@Nullable InetSocketAddress remoteAddress, List<HttpMessageReader<?>> messageReaders,
@Nullable ServerWebExchange exchange) {
@Nullable InetSocketAddress remoteAddress, @Nullable InetSocketAddress localAddress,
List<HttpMessageReader<?>> messageReaders, @Nullable ServerWebExchange exchange) {
this.method = method;
this.uri = uri;
@@ -116,6 +119,7 @@ public class MockServerRequest implements ServerRequest {
this.session = session;
this.principal = principal;
this.remoteAddress = remoteAddress;
this.localAddress = localAddress;
this.messageReaders = messageReaders;
this.exchange = exchange;
}
@@ -161,6 +165,11 @@ public class MockServerRequest implements ServerRequest {
return Optional.ofNullable(this.remoteAddress);
}
@Override
public Optional<InetSocketAddress> localAddress() {
return Optional.ofNullable(this.localAddress);
}
@Override
public List<HttpMessageReader<?>> messageReaders() {
return this.messageReaders;
@@ -291,6 +300,7 @@ public class MockServerRequest implements ServerRequest {
Builder session(WebSession session);
/**
* Sets the request {@link Principal}.
* @deprecated in favor of {@link #principal(Principal)}
*/
@Deprecated
@@ -300,6 +310,8 @@ public class MockServerRequest implements ServerRequest {
Builder remoteAddress(InetSocketAddress remoteAddress);
Builder localAddress(InetSocketAddress localAddress);
Builder messageReaders(List<HttpMessageReader<?>> messageReaders);
Builder exchange(ServerWebExchange exchange);
@@ -340,6 +352,9 @@ public class MockServerRequest implements ServerRequest {
@Nullable
private InetSocketAddress remoteAddress;
@Nullable
private InetSocketAddress localAddress;
private List<HttpMessageReader<?>> messageReaders = HandlerStrategies.withDefaults().messageReaders();
@Nullable
@@ -467,6 +482,13 @@ public class MockServerRequest implements ServerRequest {
return this;
}
@Override
public Builder localAddress(InetSocketAddress localAddress) {
Assert.notNull(localAddress, "'localAddress' must not be null");
this.localAddress = localAddress;
return this;
}
@Override
public Builder messageReaders(List<HttpMessageReader<?>> messageReaders) {
Assert.notNull(messageReaders, "'messageReaders' must not be null");
@@ -486,16 +508,16 @@ public class MockServerRequest implements ServerRequest {
this.body = body;
return new MockServerRequest(this.method, this.uri, this.contextPath, this.headers,
this.cookies, this.body, this.attributes, this.queryParams, this.pathVariables,
this.session, this.principal, this.remoteAddress, this.messageReaders,
this.exchange);
this.session, this.principal, this.remoteAddress, this.localAddress,
this.messageReaders, this.exchange);
}
@Override
public MockServerRequest build() {
return new MockServerRequest(this.method, this.uri, this.contextPath, this.headers,
this.cookies, null, this.attributes, this.queryParams, this.pathVariables,
this.session, this.principal, this.remoteAddress, this.messageReaders,
this.exchange);
this.session, this.principal, this.remoteAddress, this.localAddress,
this.messageReaders, this.exchange);
}
}