Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow null for ResponseEntity.HeadersBuilder::eTag

Browse Source 
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
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
* @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 class ResponseEntity<T> extends HttpEntity<T> {
}
@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;