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

Add non-null assertions in DefaultServerRequestBuilder 

This commit adds various non-null assertions to
DefaultServerRequestBuilder, in both Spring MVC and WebFlux.

Closes gh-30046
This commit is contained in:
Vatsa 2023-02-27 15:22:53 -05:00 committed by Arjen Poutsma
parent a31cfba992
commit d8fbd35467
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,6 +122,7 @@ class DefaultServerRequestBuilder implements ServerRequest.Builder {
@Override
public ServerRequest.Builder header(String headerName, String... headerValues) {
Assert.notNull(headerName, "Header Name must not be null");
for (String headerValue : headerValues) {
this.headers.add(headerName, headerValue);
}
@ -130,12 +131,14 @@ class DefaultServerRequestBuilder implements ServerRequest.Builder {
@Override
public ServerRequest.Builder headers(Consumer<HttpHeaders> headersConsumer) {
Assert.notNull(headersConsumer, "Header Consumer must not be null");
headersConsumer.accept(this.headers);
return this;
}
@Override
public ServerRequest.Builder cookie(String name, String... values) {
Assert.notNull(name, "Cookie Name must not be null");
for (String value : values) {
this.cookies.add(name, new HttpCookie(name, value));
}
@ -144,6 +147,7 @@ class DefaultServerRequestBuilder implements ServerRequest.Builder {
@Override
public ServerRequest.Builder cookies(Consumer<MultiValueMap<String, HttpCookie>> cookiesConsumer) {
Assert.notNull(cookiesConsumer, "Cookie Consumer must not be null");
cookiesConsumer.accept(this.cookies);
return this;
}
@ -174,12 +178,14 @@ class DefaultServerRequestBuilder implements ServerRequest.Builder {
@Override
public ServerRequest.Builder attribute(String name, Object value) {
Assert.notNull(name, "name must not be null");
this.attributes.put(name, value);
return this;
}
@Override
public ServerRequest.Builder attributes(Consumer<Map<String, Object>> attributesConsumer) {
Assert.notNull(attributesConsumer, "AttributesConsumer must not be null");
attributesConsumer.accept(this.attributes);
return this;
}

13
spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequestBuilder.java
View File

@ -115,6 +115,7 @@ class DefaultServerRequestBuilder implements ServerRequest.Builder {
@Override
public ServerRequest.Builder header(String headerName, String... headerValues) {
Assert.notNull(headerName, "Header Name must not be null");
for (String headerValue : headerValues) {
this.headers.add(headerName, headerValue);
}
@ -123,12 +124,14 @@ class DefaultServerRequestBuilder implements ServerRequest.Builder {
@Override
public ServerRequest.Builder headers(Consumer<HttpHeaders> headersConsumer) {
Assert.notNull(headersConsumer, "Header Consumer must not be null");
headersConsumer.accept(this.headers);
return this;
}
@Override
public ServerRequest.Builder cookie(String name, String... values) {
Assert.notNull(name, "Cookie Name must not be null");
for (String value : values) {
this.cookies.add(name, new Cookie(name, value));
}
@ -137,36 +140,41 @@ class DefaultServerRequestBuilder implements ServerRequest.Builder {
@Override
public ServerRequest.Builder cookies(Consumer<MultiValueMap<String, Cookie>> cookiesConsumer) {
Assert.notNull(cookiesConsumer, "Cookie Consumer must not be null");
cookiesConsumer.accept(this.cookies);
return this;
}
@Override
public ServerRequest.Builder body(byte[] body) {
Assert.notNull(body, "body must not be null");
this.body = body;
return this;
}
@Override
public ServerRequest.Builder body(String body) {
Assert.notNull(body, "body must not be null");
return body(body.getBytes(StandardCharsets.UTF_8));
}
@Override
public ServerRequest.Builder attribute(String name, Object value) {
Assert.notNull(name, "'name' must not be null");
Assert.notNull(name, "name must not be null");
this.attributes.put(name, value);
return this;
}
@Override
public ServerRequest.Builder attributes(Consumer<Map<String, Object>> attributesConsumer) {
Assert.notNull(attributesConsumer, "AttributesConsumer must not be null");
attributesConsumer.accept(this.attributes);
return this;
}
@Override
public ServerRequest.Builder param(String name, String... values) {
Assert.notNull(name, "name must not be null");
for (String value : values) {
this.params.add(name, value);
}
@ -175,12 +183,13 @@ class DefaultServerRequestBuilder implements ServerRequest.Builder {
@Override
public ServerRequest.Builder params(Consumer<MultiValueMap<String, String>> paramsConsumer) {
Assert.notNull(paramsConsumer, "paramsConsumer must not be null");
paramsConsumer.accept(this.params);
return this;
}
@Override
public ServerRequest.Builder remoteAddress(InetSocketAddress remoteAddress) {
public ServerRequest.Builder remoteAddress(@Nullable InetSocketAddress remoteAddress) {
this.remoteAddress = remoteAddress;
return this;
}