From c7ed383382d036f14a766d9b0ea0a5fd35789f3f Mon Sep 17 00:00:00 2001 From: ZhouXY108 Date: Sat, 13 Jul 2024 20:23:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xyz/zhouxy/plusone/commons/util/DateTimeTools.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/xyz/zhouxy/plusone/commons/util/DateTimeTools.java b/src/main/java/xyz/zhouxy/plusone/commons/util/DateTimeTools.java index f3032b5..529f83a 100644 --- a/src/main/java/xyz/zhouxy/plusone/commons/util/DateTimeTools.java +++ b/src/main/java/xyz/zhouxy/plusone/commons/util/DateTimeTools.java @@ -13,7 +13,6 @@ import java.util.Date; import java.util.TimeZone; import org.apache.commons.lang3.StringUtils; -import org.joda.time.DateTimeZone; import com.google.common.base.Preconditions; @@ -104,7 +103,7 @@ public class DateTimeTools { * @deprecated 使用 {@link ZonedDateTime#toInstant()} */ @Deprecated - public static Instant toInstant(ZonedDateTime zonedDateTime) { + public static Instant toInstant(ZonedDateTime zonedDateTime) { // NOSONAR return zonedDateTime.toInstant(); } @@ -177,7 +176,7 @@ public class DateTimeTools { * @deprecated 使用 {@link ZonedDateTime#of(LocalDateTime, ZoneId)} */ @Deprecated - public static ZonedDateTime toZonedDateTime(LocalDateTime localDateTime, ZoneId zone) { + public static ZonedDateTime toZonedDateTime(LocalDateTime localDateTime, ZoneId zone) { // NOSONAR return ZonedDateTime.of(localDateTime, zone); } @@ -322,7 +321,7 @@ public class DateTimeTools { return jodaZone.toTimeZone().toZoneId(); } - public static DateTimeZone toJodaTime(java.time.ZoneId zone) { + public static org.joda.time.DateTimeZone toJodaTime(java.time.ZoneId zone) { return org.joda.time.DateTimeZone.forID(zone.getId()); }