mirror of
https://github.com/spring-projects/spring-framework
synced 2026-06-08 17:33:33 +00:00
Modernize java.time API usages
See gh-35861 Signed-off-by: Vincent Potucek <vpotucek@me.com>
This commit is contained in:
committed by
Sébastien Deleuze
parent
3686b89ab5
commit
83bbf16e6c
@@ -20,7 +20,7 @@ import java.net.InetSocketAddress;
|
||||
import java.net.URI;
|
||||
import java.nio.charset.Charset;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.time.ZoneId;
|
||||
import java.time.ZoneOffset;
|
||||
import java.time.ZonedDateTime;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
@@ -370,7 +370,7 @@ class HttpHeadersTests {
|
||||
|
||||
@Test
|
||||
void expiresZonedDateTime() {
|
||||
ZonedDateTime zonedDateTime = ZonedDateTime.of(2008, 12, 18, 10, 20, 0, 0, ZoneId.of("GMT"));
|
||||
ZonedDateTime zonedDateTime = ZonedDateTime.of(2008, 12, 18, 10, 20, 0, 0, ZoneOffset.UTC);
|
||||
headers.setExpires(zonedDateTime);
|
||||
assertThat(headers.getExpires()).as("Invalid Expires header").isEqualTo(zonedDateTime.toInstant().toEpochMilli());
|
||||
assertThat(headers.getFirst("expires")).as("Invalid Expires header").isEqualTo("Thu, 18 Dec 2008 10:20:00 GMT");
|
||||
@@ -605,7 +605,7 @@ class HttpHeadersTests {
|
||||
|
||||
@Test
|
||||
void firstZonedDateTime() {
|
||||
ZonedDateTime date = ZonedDateTime.of(2017, 6, 2, 2, 22, 0, 0, ZoneId.of("GMT"));
|
||||
ZonedDateTime date = ZonedDateTime.of(2017, 6, 2, 2, 22, 0, 0, ZoneOffset.UTC);
|
||||
headers.setZonedDateTime(HttpHeaders.DATE, date);
|
||||
assertThat(headers.getFirst(HttpHeaders.DATE)).isEqualTo("Fri, 02 Jun 2017 02:22:00 GMT");
|
||||
assertThat(headers.getFirstZonedDateTime(HttpHeaders.DATE).isEqual(date)).isTrue();
|
||||
|
||||
+2
-2
@@ -24,7 +24,7 @@ import java.lang.annotation.Target;
|
||||
import java.net.URI;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.time.Duration;
|
||||
import java.time.ZoneId;
|
||||
import java.time.ZoneOffset;
|
||||
import java.time.ZonedDateTime;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.ArrayList;
|
||||
@@ -184,7 +184,7 @@ class ClientHttpConnectorTests {
|
||||
|
||||
@ParameterizedConnectorTest
|
||||
void cookieExpireValueSetAsMaxAge(ClientHttpConnector connector) {
|
||||
ZonedDateTime tomorrow = ZonedDateTime.now(ZoneId.of("UTC")).plusDays(1);
|
||||
ZonedDateTime tomorrow = ZonedDateTime.now(ZoneOffset.UTC).plusDays(1);
|
||||
String formattedDate = tomorrow.format(DateTimeFormatter.RFC_1123_DATE_TIME);
|
||||
|
||||
prepareResponse(builder -> builder
|
||||
|
||||
+2
-2
@@ -16,7 +16,7 @@
|
||||
|
||||
package org.springframework.web.server.i18n;
|
||||
|
||||
import java.time.ZoneId;
|
||||
import java.time.ZoneOffset;
|
||||
import java.util.Locale;
|
||||
import java.util.TimeZone;
|
||||
|
||||
@@ -61,7 +61,7 @@ class FixedLocaleContextResolverTests {
|
||||
|
||||
@Test
|
||||
void resolveCustomizedAndTimeZoneLocale() {
|
||||
TimeZone timeZone = TimeZone.getTimeZone(ZoneId.of("UTC"));
|
||||
TimeZone timeZone = TimeZone.getTimeZone(ZoneOffset.UTC);
|
||||
FixedLocaleContextResolver resolver = new FixedLocaleContextResolver(FRANCE, timeZone);
|
||||
TimeZoneAwareLocaleContext context = (TimeZoneAwareLocaleContext) resolver.resolveLocaleContext(exchange());
|
||||
assertThat(context.getLocale()).isEqualTo(FRANCE);
|
||||
|
||||
Reference in New Issue
Block a user