Polishing

See spring-projectsgh-35861

Author: sdeleuze

spring-test/src/main/java/org/springframework/test/http/HttpHeadersAssert.java

@@ -17,9 +17,7 @@
 package org.springframework.test.http;
 
 import java.time.Instant;
-import java.time.ZoneId;
 import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.Arrays;
 import java.util.Collection;
@@ -43,9 +41,6 @@
  */
 public class HttpHeadersAssert extends AbstractObjectAssert<HttpHeadersAssert, HttpHeaders> {
 
-	private static final ZoneId GMT = ZoneOffset.UTC;
-
-
 	private final AbstractCollectionAssert<?, Collection<? extends String>, String, ObjectAssert<String>> namesAssert;
 
 
@@ -174,7 +169,7 @@ public HttpHeadersAssert hasValue(String name, Instant value) {
 		containsHeader(name);
 		Assertions.assertThat(this.actual.getFirstZonedDateTime(name))
 				.as("check primary date value for HTTP header '%s'", name)
-				.isCloseTo(value.atZone(GMT), Assertions.within(999, ChronoUnit.MILLIS));
+				.isCloseTo(value.atZone(ZoneOffset.UTC), Assertions.within(999, ChronoUnit.MILLIS));
 		return this.myself;
 	}
 

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorMockTests.java

@@ -22,7 +22,6 @@
 import java.lang.reflect.Method;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
-import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 import java.util.Arrays;
@@ -98,9 +97,6 @@
  */
 class HttpEntityMethodProcessorMockTests {
 
-	private static final ZoneId GMT = ZoneOffset.UTC;
-
-
 	private HttpEntityMethodProcessor processor;
 
 	private HttpMessageConverter<String> stringHttpMessageConverter = mock();
@@ -477,7 +473,7 @@ void shouldHandleResponseHeaderAndBody() throws Exception {
 	void shouldHandleLastModifiedWithHttp304() throws Exception {
 		long currentTime = new Date().getTime();
 		long oneMinuteAgo = currentTime - (1000 * 60);
-		ZonedDateTime dateTime = ofEpochMilli(currentTime).atZone(GMT);
+		ZonedDateTime dateTime = ofEpochMilli(currentTime).atZone(ZoneOffset.UTC);
 		servletRequest.addHeader(HttpHeaders.IF_MODIFIED_SINCE, RFC_1123_DATE_TIME.format(dateTime));
 		ResponseEntity<String> returnValue = ResponseEntity.ok().lastModified(oneMinuteAgo).body("body");
 
@@ -537,7 +533,7 @@ void shouldHandleETagAndLastModifiedWithHttp304() throws Exception {
 		long currentTime = new Date().getTime();
 		long oneMinuteAgo = currentTime - (1000 * 60);
 		String etagValue = "\"deadb33f8badf00d\"";
-		ZonedDateTime dateTime = ofEpochMilli(currentTime).atZone(GMT);
+		ZonedDateTime dateTime = ofEpochMilli(currentTime).atZone(ZoneOffset.UTC);
 		servletRequest.addHeader(HttpHeaders.IF_MODIFIED_SINCE, RFC_1123_DATE_TIME.format(dateTime));
 		servletRequest.addHeader(HttpHeaders.IF_NONE_MATCH, etagValue);
 		ResponseEntity<String> returnValue = ResponseEntity.ok()
@@ -569,7 +565,7 @@ void shouldHandleChangedETagAndLastModified() throws Exception {
 		long oneMinuteAgo = currentTime - (1000 * 60);
 		String etagValue = "\"deadb33f8badf00d\"";
 		String changedEtagValue = "\"changed-etag-value\"";
-		ZonedDateTime dateTime = ofEpochMilli(currentTime).atZone(GMT);
+		ZonedDateTime dateTime = ofEpochMilli(currentTime).atZone(ZoneOffset.UTC);
 		servletRequest.addHeader(HttpHeaders.IF_MODIFIED_SINCE, RFC_1123_DATE_TIME.format(dateTime));
 		servletRequest.addHeader(HttpHeaders.IF_NONE_MATCH, etagValue);
 		ResponseEntity<String> returnValue = ResponseEntity.ok()
@@ -625,7 +621,7 @@ void shouldHandleIfNoneMatchIfMatch() throws Exception {
 	void shouldHandleIfNoneMatchIfUnmodifiedSince() throws Exception {
 		String etagValue = "\"some-etag\"";
 		servletRequest.addHeader(HttpHeaders.IF_NONE_MATCH, etagValue);
-		ZonedDateTime dateTime = ofEpochMilli(new Date().getTime()).atZone(GMT);
+		ZonedDateTime dateTime = ofEpochMilli(new Date().getTime()).atZone(ZoneOffset.UTC);
 		servletRequest.addHeader(HttpHeaders.IF_UNMODIFIED_SINCE, RFC_1123_DATE_TIME.format(dateTime));
 		ResponseEntity<String> returnValue = ResponseEntity.ok().eTag(etagValue).body("body");
 
@@ -732,7 +728,7 @@ void shouldHandleValidatorHeadersInputResponses() throws Exception {
 	@Test
 	void shouldNotFailPreconditionForPutRequests() throws Exception {
 		servletRequest.setMethod("PUT");
-		ZonedDateTime dateTime = ofEpochMilli(new Date().getTime()).atZone(GMT);
+		ZonedDateTime dateTime = ofEpochMilli(new Date().getTime()).atZone(ZoneOffset.UTC);
 		servletRequest.addHeader(HttpHeaders.IF_UNMODIFIED_SINCE, RFC_1123_DATE_TIME.format(dateTime));
 
 		long justModified = dateTime.plusSeconds(1).toEpochSecond() * 1000;