Allow null for ResponseEntity.HeadersBuilder::eTag

Closes gh-28947
spring-projects · Aug 16, 2022 · 59c2f4c · 59c2f4c
1 parent ef178d2
commit 59c2f4c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/spring-web/src/main/java/org/springframework/http/ResponseEntity.java b/spring-web/src/main/java/org/springframework/http/ResponseEntity.java
@@ -404,7 +404,7 @@ public interface HeadersBuilder<B extends HeadersBuilder<B>> {
 		 * @return this builder
 		 * @see HttpHeaders#setETag(String)
 		 */
-		B eTag(String etag);
+		B eTag(@Nullable String etag);
 
 		/**
 		 * Set the time the resource was last changed, as specified by the
@@ -562,12 +562,14 @@ public BodyBuilder contentType(MediaType contentType) {
 		}
 
 		@Override
-		public BodyBuilder eTag(String etag) {
-			if (!etag.startsWith("\"") && !etag.startsWith("W/\"")) {
-				etag = "\"" + etag;
-			}
-			if (!etag.endsWith("\"")) {
-				etag = etag + "\"";
+		public BodyBuilder eTag(@Nullable String etag) {
+			if (etag != null) {
+				if (!etag.startsWith("\"") && !etag.startsWith("W/\"")) {
+					etag = "\"" + etag;
+				}
+				if (!etag.endsWith("\"")) {
+					etag = etag + "\"";
+				}
 			}
 			this.headers.setETag(etag);
 			return this;

diff --git a/spring-web/src/test/java/org/springframework/http/ResponseEntityTests.java b/spring-web/src/test/java/org/springframework/http/ResponseEntityTests.java
@@ -207,6 +207,9 @@ void Etagheader() throws URISyntaxException {
 
 		responseEntity = ResponseEntity.ok().eTag("W/\"foo\"").build();
 		assertThat(responseEntity.getHeaders().getETag()).isEqualTo("W/\"foo\"");
+
+		responseEntity = ResponseEntity.ok().eTag(null).build();
+		assertThat(responseEntity.getHeaders().getETag()).isNull();
 	}
 
 	@Test