zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly
2023-03-26 17:15:17 +08:00
parent 7581ab6428
commit a745f1be80
40 changed files with 550 additions and 812 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
hutool-cron/src/main/java/cn/hutool/cron/pattern/parser/PartParser.java
View File

@@ -5,14 +5,10 @@ import cn.hutool.core.date.Month;
import cn.hutool.core.date.Week;
import cn.hutool.core.math.NumberUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.core.util.CharUtil;
import cn.hutool.core.text.split.SplitUtil;
import cn.hutool.cron.CronException;
import cn.hutool.cron.pattern.Part;
import cn.hutool.cron.pattern.matcher.AlwaysTrueMatcher;
import cn.hutool.cron.pattern.matcher.BoolArrayMatcher;
import cn.hutool.cron.pattern.matcher.DayOfMonthMatcher;
import cn.hutool.cron.pattern.matcher.PartMatcher;
import cn.hutool.cron.pattern.matcher.YearValueMatcher;
import cn.hutool.cron.pattern.matcher.*;
import java.util.ArrayList;
import java.util.List;
@@ -103,7 +99,7 @@ public class PartParser {
private List<Integer> parseArray(final String value) {
final List<Integer> values = new ArrayList<>();
final List<String> parts = StrUtil.split(value, CharUtil.COMMA);
final List<String> parts = SplitUtil.split(value, StrUtil.COMMA);
for (final String part : parts) {
ListUtil.addAllIfNotContains(values, parseStep(part));
}
@@ -123,7 +119,7 @@ public class PartParser {
* @return List
*/
private List<Integer> parseStep(final String value) {
final List<String> parts = StrUtil.split(value, CharUtil.SLASH);
final List<String> parts = SplitUtil.split(value, StrUtil.SLASH);
final int size = parts.size();
final List<Integer> results;
@@ -187,7 +183,7 @@ public class PartParser {
}
//Range模式
final List<String> parts = StrUtil.split(value, '-');
final List<String> parts = SplitUtil.split(value, StrUtil.DASHED);
final int size = parts.size();
if (size == 1) {// 普通值
final int v1 = parseNumber(value);

4
hutool-cron/src/main/java/cn/hutool/cron/pattern/parser/PatternParser.java
View File

@@ -1,7 +1,7 @@
package cn.hutool.cron.pattern.parser;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.text.StrUtil;
import cn.hutool.core.text.split.SplitUtil;
import cn.hutool.cron.CronException;
import cn.hutool.cron.pattern.Part;
import cn.hutool.cron.pattern.matcher.AlwaysTrueMatcher;
@@ -47,7 +47,7 @@ public class PatternParser {
* @return {@link List}
*/
private static List<PatternMatcher> parseGroupPattern(final String groupPattern) {
final List<String> patternList = StrUtil.splitTrim(groupPattern, '|');
final List<String> patternList = SplitUtil.splitTrim(groupPattern, "|");
final List<PatternMatcher> patternMatchers = new ArrayList<>(patternList.size());
for (final String pattern : patternList) {
patternMatchers.add(parseSingle(pattern));