From 4cee9ba129ae2434a9af2d30173b1395cf05c921 Mon Sep 17 00:00:00 2001 From: Looly Date: Sun, 27 Mar 2022 20:11:38 +0800 Subject: [PATCH] fix code --- .../cron/pattern/CronPatternBuilder.java | 1 + .../cron/pattern/matcher/PartMatcher.java | 2 ++ .../cron/pattern/matcher/PatternMatcher.java | 28 +++++++++++++++---- .../cron/pattern/matcher/package-info.java | 13 +++++++-- 4 files changed, 36 insertions(+), 8 deletions(-) diff --git a/hutool-cron/src/main/java/cn/hutool/cron/pattern/CronPatternBuilder.java b/hutool-cron/src/main/java/cn/hutool/cron/pattern/CronPatternBuilder.java index 02eb6db0f..b8251dc8c 100644 --- a/hutool-cron/src/main/java/cn/hutool/cron/pattern/CronPatternBuilder.java +++ b/hutool-cron/src/main/java/cn/hutool/cron/pattern/CronPatternBuilder.java @@ -4,6 +4,7 @@ import cn.hutool.core.builder.Builder; import cn.hutool.core.util.StrUtil; public class CronPatternBuilder implements Builder { + private static final long serialVersionUID = 1L; final String[] parts = new String[7]; diff --git a/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/PartMatcher.java b/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/PartMatcher.java index e62e28417..27b7cac79 100644 --- a/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/PartMatcher.java +++ b/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/PartMatcher.java @@ -9,8 +9,10 @@ import cn.hutool.core.lang.Matcher; * @author Looly */ public interface PartMatcher extends Matcher { + /** * 获取指定值之后的匹配值,也可以是指定值本身 + * * @param value 指定的值 * @return 匹配到的值或之后的值 */ diff --git a/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/PatternMatcher.java b/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/PatternMatcher.java index 1cd364e38..ac3355b45 100644 --- a/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/PatternMatcher.java +++ b/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/PatternMatcher.java @@ -8,7 +8,11 @@ import java.util.Calendar; import java.util.TimeZone; /** - * 单一表达式的匹配器,匹配器由7个{@link PartMatcher}组成 + * 单一表达式的匹配器,匹配器由7个{@link PartMatcher}组成,分别是: + *
+ *         0      1     2        3         4       5        6
+ *      SECOND MINUTE HOUR DAY_OF_MONTH MONTH DAY_OF_WEEK YEAR
+ * 
* * @author looly * @since 5.8.0 @@ -17,6 +21,17 @@ public class PatternMatcher { private final PartMatcher[] matchers; + /** + * 构造 + * + * @param secondMatcher 秒匹配器 + * @param minuteMatcher 分匹配器 + * @param hourMatcher 时匹配器 + * @param dayOfMonthMatcher 日匹配器 + * @param monthMatcher 月匹配器 + * @param dayOfWeekMatcher 周匹配器 + * @param yearMatcher 年匹配器 + */ public PatternMatcher(PartMatcher secondMatcher, PartMatcher minuteMatcher, PartMatcher hourMatcher, @@ -38,14 +53,16 @@ public class PatternMatcher { /** * 根据表达式位置,获取对应的{@link PartMatcher} + * * @param part 表达式位置 * @return {@link PartMatcher} */ - public PartMatcher get(Part part){ + public PartMatcher get(Part part) { return matchers[part.ordinal()]; } //region match + /** * 给定时间是否匹配定时任务表达式 * @@ -71,9 +88,9 @@ public class PatternMatcher { /** * 是否匹配日(指定月份的第几天) * - * @param matcher {@link PartMatcher} + * @param matcher {@link PartMatcher} * @param dayOfMonth 日 - * @param month 月 + * @param month 月 * @param isLeapYear 是否闰年 * @return 是否匹配 */ @@ -85,6 +102,7 @@ public class PatternMatcher { //endregion //region nextMatchAfter + /** * 获取下一个匹配日期时间 * @@ -99,7 +117,7 @@ public class PatternMatcher { * @return {@link Calendar} */ public Calendar nextMatchAfter(int second, int minute, int hour, - int dayOfMonth, int month, int dayOfWeek, int year, TimeZone zone) { + int dayOfMonth, int month, int dayOfWeek, int year, TimeZone zone) { Calendar calendar = Calendar.getInstance(zone); diff --git a/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/package-info.java b/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/package-info.java index dd0950df8..86adae0a8 100644 --- a/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/package-info.java +++ b/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/package-info.java @@ -1,7 +1,14 @@ /** - * 定时任务表达式匹配器,内部使用 - * + * 定时任务表达式匹配器,内部使用
+ * 单一表达式使用{@link cn.hutool.cron.pattern.matcher.PatternMatcher}表示
+ * {@link cn.hutool.cron.pattern.matcher.PatternMatcher}由7个{@link cn.hutool.cron.pattern.matcher.PartMatcher}组成, + * 分别表示定时任务表达式中的7个位置: + *
+ *         0      1     2        3         4       5        6
+ *      SECOND MINUTE HOUR DAY_OF_MONTH MONTH DAY_OF_WEEK YEAR
+ * 
+ * * @author looly * */ -package cn.hutool.cron.pattern.matcher; \ No newline at end of file +package cn.hutool.cron.pattern.matcher;