diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilder.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilder.java index 1abf279e5c3..846c3074ee7 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilder.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -114,12 +114,14 @@ final class DefaultEntityResponseBuilder implements EntityResponse.Builder @Override public EntityResponse.Builder cookies( Consumer> cookiesConsumer) { + Assert.notNull(cookiesConsumer, "cookiesConsumer must not be null"); cookiesConsumer.accept(this.cookies); return this; } @Override public EntityResponse.Builder 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 implements EntityResponse.Builder @Override public EntityResponse.Builder headers(Consumer headersConsumer) { + Assert.notNull(headersConsumer, "headersConsumer must not be null"); headersConsumer.accept(this.headers); return this; } @Override public EntityResponse.Builder 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 allow(Set allowedMethods) { + Assert.notNull(allowedMethods, "allowedMethods must not be null"); this.headers.setAllow(allowedMethods); return this; } @@ -152,6 +157,7 @@ final class DefaultEntityResponseBuilder implements EntityResponse.Builder @Override public EntityResponse.Builder contentType(MediaType contentType) { + Assert.notNull(contentType, "contentType must not be null"); this.headers.setContentType(contentType); return this; } @@ -170,24 +176,28 @@ final class DefaultEntityResponseBuilder implements EntityResponse.Builder @Override public EntityResponse.Builder lastModified(ZonedDateTime lastModified) { + Assert.notNull(lastModified, "lastModified must not be null"); this.headers.setLastModified(lastModified); return this; } @Override public EntityResponse.Builder lastModified(Instant lastModified) { + Assert.notNull(lastModified, "lastModified must not be null"); this.headers.setLastModified(lastModified); return this; } @Override public EntityResponse.Builder location(URI location) { + Assert.notNull(location, "location must not be null"); this.headers.setLocation(location); return this; } @Override public EntityResponse.Builder cacheControl(CacheControl cacheControl) { + Assert.notNull(cacheControl, "cacheControl must not be null"); this.headers.setCacheControl(cacheControl); return this; }