Polishing contribution

rstoyanchev · rstoyanchev · commit fe4fd004291a · 2024-08-13T16:59:13.000+03:00
Closes gh-33374
diff --git a/spring-web/src/main/java/org/springframework/http/HttpHeaders.java b/spring-web/src/main/java/org/springframework/http/HttpHeaders.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 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.
@@ -1048,9 +1048,8 @@ public long getDate() {
 	 */
 	public void setETag(@Nullable String etag) {
 		if (etag != null) {
-			Assert.isTrue(etag.startsWith("\"") || etag.startsWith("W/\""),
-					"Invalid ETag: does not start with W/\" or \"");
-			Assert.isTrue(etag.endsWith("\""), "Invalid ETag: does not end with \"");
+			Assert.isTrue(etag.startsWith("\"") || etag.startsWith("W/\""), "ETag does not start with W/\" or \"");
+			Assert.isTrue(etag.endsWith("\""), "ETag does not end with \"");
 			set(ETAG, etag);
 		}
 		else {
diff --git a/spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java b/spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java
@@ -191,15 +191,15 @@ void ipv6Host() {
 	}
 
 	@Test
-	void illegalETag() {
+	void illegalETagWithoutQuotes() {
 		String eTag = "v2.6";
 		assertThatIllegalArgumentException().isThrownBy(() -> headers.setETag(eTag));
 	}
 
 	@Test
-	void illegalETagWithoutQuoteAfterWSlash() {
+	void illegalWeakETagWithoutLeadingQuote() {
 		String etag = "W/v2.6\"";
-		assertThatIllegalArgumentException().as("Invalid Weak ETag").isThrownBy(() -> headers.setETag(etag));
+		assertThatIllegalArgumentException().isThrownBy(() -> headers.setETag(etag));
 	}
 
 	@Test

Original file line number	Diff line number	Diff line change
`@@ -191,15 +191,15 @@ void ipv6Host() {`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`@Test`
`194`		`- void illegalETag() {`
	`194`	`+ void illegalETagWithoutQuotes() {`
`195`	`195`	`String eTag = "v2.6";`
`196`	`196`	`assertThatIllegalArgumentException().isThrownBy(() -> headers.setETag(eTag));`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`@Test`
`200`		`- void illegalETagWithoutQuoteAfterWSlash() {`
	`200`	`+ void illegalWeakETagWithoutLeadingQuote() {`
`201`	`201`	`String etag = "W/v2.6\"";`
`202`		`- assertThatIllegalArgumentException().as("Invalid Weak ETag").isThrownBy(() -> headers.setETag(etag));`
	`202`	`+ assertThatIllegalArgumentException().isThrownBy(() -> headers.setETag(etag));`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`@Test`