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

Allow null for ResponseEntity.HeadersBuilder::eTag 

Closes gh-28947
This commit is contained in:
Arjen Poutsma 2022-08-16 12:02:00 +02:00
parent ef178d24ec
commit 59c2f4c069
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
spring-web/src/main/java/org/springframework/http/ResponseEntity.java
View File

@ -404,7 +404,7 @@ public class ResponseEntity<T> extends HttpEntity<T> {
* @return this builder * @return this builder
* @see HttpHeaders#setETag(String) * @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 * Set the time the resource was last changed, as specified by the
@ -562,12 +562,14 @@ public class ResponseEntity<T> extends HttpEntity<T> {
} }
@Override @Override
public BodyBuilder eTag(String etag) { public BodyBuilder eTag(@Nullable String etag) {
if (!etag.startsWith("\"") && !etag.startsWith("W/\"")) { if (etag != null) {
etag = "\"" + etag; if (!etag.startsWith("\"") && !etag.startsWith("W/\"")) {
} etag = "\"" + etag;
if (!etag.endsWith("\"")) { }
etag = etag + "\""; if (!etag.endsWith("\"")) {
etag = etag + "\"";
}
} }
this.headers.setETag(etag); this.headers.setETag(etag);
return this; return this;

3
spring-web/src/test/java/org/springframework/http/ResponseEntityTests.java
View File

@ -207,6 +207,9 @@ class ResponseEntityTests {
responseEntity = ResponseEntity.ok().eTag("W/\"foo\"").build(); responseEntity = ResponseEntity.ok().eTag("W/\"foo\"").build();
assertThat(responseEntity.getHeaders().getETag()).isEqualTo("W/\"foo\""); assertThat(responseEntity.getHeaders().getETag()).isEqualTo("W/\"foo\"");
responseEntity = ResponseEntity.ok().eTag(null).build();
assertThat(responseEntity.getHeaders().getETag()).isNull();
} }
@Test @Test