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 DefaultEntityResponseBuilder 

This commit adds various non-null assertions to
DefaultEntityResponseBuilder, in Spring MVC.

Closes gh-30433
This commit is contained in:
Vatsa 2023-05-05 13:01:43 -04:00 committed by Arjen Poutsma
parent 326e27eab2
commit 0c817f0441
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilder.java
View File

@ -114,12 +114,14 @@ final class DefaultEntityResponseBuilder<T> implements EntityResponse.Builder<T>
@Override
public EntityResponse.Builder<T> cookies(
Consumer<MultiValueMap<String, Cookie>> cookiesConsumer) {
Assert.notNull(cookiesConsumer, "cookiesConsumer must not be null");
cookiesConsumer.accept(this.cookies);
return this;
}
@Override
public EntityResponse.Builder<T> header(String headerName, String... headerValues) {
Assert.notNull(headerName, "headerName must not be null");
for (String headerValue : headerValues) {
this.headers.add(headerName, headerValue);
}
@ -128,18 +130,21 @@ final class DefaultEntityResponseBuilder<T> implements EntityResponse.Builder<T>
@Override
public EntityResponse.Builder<T> headers(Consumer<HttpHeaders> headersConsumer) {
Assert.notNull(headersConsumer, "headersConsumer must not be null");
headersConsumer.accept(this.headers);
return this;
}
@Override
public EntityResponse.Builder<T> allow(HttpMethod... allowedMethods) {
Assert.notNull(allowedMethods, "allowedMethods must not be null");
this.headers.setAllow(new LinkedHashSet<>(Arrays.asList(allowedMethods)));
return this;
}
@Override
public EntityResponse.Builder<T> allow(Set<HttpMethod> allowedMethods) {
Assert.notNull(allowedMethods, "allowedMethods must not be null");
this.headers.setAllow(allowedMethods);
return this;
}
@ -152,6 +157,7 @@ final class DefaultEntityResponseBuilder<T> implements EntityResponse.Builder<T>
@Override
public EntityResponse.Builder<T> contentType(MediaType contentType) {
Assert.notNull(contentType, "contentType must not be null");
this.headers.setContentType(contentType);
return this;
}
@ -170,24 +176,28 @@ final class DefaultEntityResponseBuilder<T> implements EntityResponse.Builder<T>
@Override
public EntityResponse.Builder<T> lastModified(ZonedDateTime lastModified) {
Assert.notNull(lastModified, "lastModified must not be null");
this.headers.setLastModified(lastModified);
return this;
}
@Override
public EntityResponse.Builder<T> lastModified(Instant lastModified) {
Assert.notNull(lastModified, "lastModified must not be null");
this.headers.setLastModified(lastModified);
return this;
}
@Override
public EntityResponse.Builder<T> location(URI location) {
Assert.notNull(location, "location must not be null");
this.headers.setLocation(location);
return this;
}
@Override
public EntityResponse.Builder<T> cacheControl(CacheControl cacheControl) {
Assert.notNull(cacheControl, "cacheControl must not be null");
this.headers.setCacheControl(cacheControl);
return this;
}
@ -498,14 +508,14 @@ final class DefaultEntityResponseBuilder<T> implements EntityResponse.Builder<T>
@Override
public void addIntHeader(String name, int value) {
if (!HttpHeaders.CONTENT_LENGTH.equals(name)) {
if (name!=null && !HttpHeaders.CONTENT_LENGTH.equals(name)) {
super.addIntHeader(name, value);
}
}
@Override
public void addHeader(String name, String value) {
if (!HttpHeaders.CONTENT_LENGTH.equals(name)) {
if (name!= null && !HttpHeaders.CONTENT_LENGTH.equals(name)) {
super.addHeader(name, value);
}
}