From 9e73770ae23ea5ce96c10e74c151c56390f0fded Mon Sep 17 00:00:00 2001 From: Looly Date: Tue, 14 Mar 2023 22:16:54 +0800 Subject: [PATCH] fix code --- .../java/cn/hutool/core/date/DateUtil.java | 20 ++++--------------- ...DateParser.java => ISO8601DateParser.java} | 6 +++--- 2 files changed, 7 insertions(+), 19 deletions(-) rename hutool-core/src/main/java/cn/hutool/core/date/format/parser/{UTCDateParser.java => ISO8601DateParser.java} (95%) diff --git a/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java b/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java index eb9469610..a20c27a93 100755 --- a/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java @@ -5,12 +5,7 @@ import cn.hutool.core.comparator.CompareUtil; import cn.hutool.core.date.format.DatePrinter; import cn.hutool.core.date.format.FastDateFormat; import cn.hutool.core.date.format.GlobalCustomFormat; -import cn.hutool.core.date.format.parser.CSTDateParser; -import cn.hutool.core.date.format.parser.NormalDateParser; -import cn.hutool.core.date.format.parser.PositionDateParser; -import cn.hutool.core.date.format.parser.PureDateParser; -import cn.hutool.core.date.format.parser.TimeParser; -import cn.hutool.core.date.format.parser.UTCDateParser; +import cn.hutool.core.date.format.parser.*; import cn.hutool.core.lang.Assert; import cn.hutool.core.math.NumberUtil; import cn.hutool.core.regex.PatternPool; @@ -26,14 +21,7 @@ import java.time.LocalDateTime; import java.time.Year; import java.time.format.DateTimeFormatter; import java.time.temporal.TemporalAccessor; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Collections; -import java.util.Date; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Locale; -import java.util.TimeZone; +import java.util.*; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; import java.util.function.Function; @@ -825,8 +813,8 @@ public class DateUtil extends CalendarUtil { // Wed Aug 01 00:00:00 CST 2012 return CSTDateParser.INSTANCE.parse(dateStr); } else if (StrUtil.contains(dateStr, 'T')) { - // UTC时间 - return UTCDateParser.INSTANCE.parse(dateStr); + // ISO8601标准时间 + return ISO8601DateParser.INSTANCE.parse(dateStr); } //标准日期格式(包括单个数字的日期时间) diff --git a/hutool-core/src/main/java/cn/hutool/core/date/format/parser/UTCDateParser.java b/hutool-core/src/main/java/cn/hutool/core/date/format/parser/ISO8601DateParser.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/date/format/parser/UTCDateParser.java rename to hutool-core/src/main/java/cn/hutool/core/date/format/parser/ISO8601DateParser.java index 7b3596990..77fc2cb0b 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/format/parser/UTCDateParser.java +++ b/hutool-core/src/main/java/cn/hutool/core/date/format/parser/ISO8601DateParser.java @@ -9,7 +9,7 @@ import cn.hutool.core.text.StrUtil; import cn.hutool.core.util.CharUtil; /** - * UTC日期字符串(JDK的Date对象toString默认格式)解析,支持格式; + * ISO8601日期字符串(JDK的Date对象toString默认格式)解析,支持格式; *
    *
  1. yyyy-MM-dd'T'HH:mm:ss'Z'
  2. *
  3. yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
  4. @@ -22,13 +22,13 @@ import cn.hutool.core.util.CharUtil; * @author looly * @since 6.0.0 */ -public class UTCDateParser extends DefaultDateBasic implements DateParser { +public class ISO8601DateParser extends DefaultDateBasic implements DateParser { private static final long serialVersionUID = 1L; /** * 单例对象 */ - public static UTCDateParser INSTANCE = new UTCDateParser(); + public static ISO8601DateParser INSTANCE = new ISO8601DateParser(); @Override public DateTime parse(String source) {