From a04775781ad7d0aeecf6b48970e990cc4f83dc2f Mon Sep 17 00:00:00 2001 From: Looly Date: Wed, 13 Sep 2023 20:34:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DLocalDateTimeUtil.of=20?= =?UTF-8?q?=E6=9F=90=E4=BA=9B=E7=89=B9=E6=AE=8ATemporalAccessor=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E8=BF=94=E5=9B=9E=E6=AD=A3=E7=A1=AE=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/hutool/core/date/TimeUtil.java | 23 ++++++++++++++++--- .../hutool/core/date/Issue3301Test.java | 22 ++++++++++++++++++ 2 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 hutool-core/src/test/java/org/dromara/hutool/core/date/Issue3301Test.java diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/TimeUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/TimeUtil.java index bfefb69cc..c0107681d 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/TimeUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/TimeUtil.java @@ -167,10 +167,27 @@ public class TimeUtil extends TemporalAccessorUtil { if (temporalAccessor instanceof LocalDate) { return ((LocalDate) temporalAccessor).atStartOfDay(); - } else if (temporalAccessor instanceof Instant) { + } else if(temporalAccessor instanceof Instant){ return LocalDateTime.ofInstant((Instant) temporalAccessor, ZoneId.systemDefault()); - } else if (temporalAccessor instanceof ZonedDateTime) { - return ((ZonedDateTime) temporalAccessor).toLocalDateTime(); + } + + // issue#3301 + try{ + return LocalDateTime.from(temporalAccessor); + } catch (final Exception ignore){ + //ignore + } + + try{ + return ZonedDateTime.from(temporalAccessor).toLocalDateTime(); + } catch (final Exception ignore){ + //ignore + } + + try{ + return LocalDateTime.ofInstant(Instant.from(temporalAccessor), ZoneId.systemDefault()); + } catch (final Exception ignore){ + //ignore } return LocalDateTime.of( diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/date/Issue3301Test.java b/hutool-core/src/test/java/org/dromara/hutool/core/date/Issue3301Test.java new file mode 100644 index 000000000..f7703b738 --- /dev/null +++ b/hutool-core/src/test/java/org/dromara/hutool/core/date/Issue3301Test.java @@ -0,0 +1,22 @@ +package org.dromara.hutool.core.date; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +import java.time.LocalDateTime; +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; +import java.time.temporal.TemporalAccessor; + +public class Issue3301Test { + @Test + void ofTest() { + final ZonedDateTime now = ZonedDateTime.now(); + // 获得一个特殊的 temporal + final String text = DateTimeFormatter.ISO_INSTANT.format(now); + final TemporalAccessor temporal = DateTimeFormatter.ISO_INSTANT.parse(text); + + final LocalDateTime actual = TimeUtil.of(temporal); + Assertions.assertEquals(now.toLocalDateTime().toString(), actual.toString()); + } +}