ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

!1303 新增: CronUtil.isValidExpression方法;完善PatternParser.parseGroupPattern逻辑

Browse Source 
Merge pull request !1303 from 随风/v6-dev
This commit is contained in:
Looly 2025-01-26 01:16:09 +00:00 committed by Gitee
commit 40fe4a2e00
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hutool-cron/src/main/java/org/dromara/hutool/cron/CronUtil.java
View File

@ -20,6 +20,7 @@ package org.dromara.hutool.cron;
import org.dromara.hutool.core.exception.HutoolException; import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.io.resource.NoResourceException; import org.dromara.hutool.core.io.resource.NoResourceException;
import org.dromara.hutool.cron.pattern.CronPattern; import org.dromara.hutool.cron.pattern.CronPattern;
import org.dromara.hutool.cron.pattern.parser.PatternParser;
import org.dromara.hutool.cron.task.Task; import org.dromara.hutool.cron.task.Task;
import org.dromara.hutool.setting.Setting; import org.dromara.hutool.setting.Setting;
import org.dromara.hutool.setting.SettingException; import org.dromara.hutool.setting.SettingException;
@ -211,4 +212,20 @@ public class CronUtil {
scheduler.stop(true); scheduler.stop(true);
} }
/**
* 验证是否为合法的Cron表达式
*/
public static boolean isValidExpression(String expression) {
if (expression == null) {
return false;
} else {
try {
PatternParser.parse(expression);
return true;
} catch (RuntimeException e) {
return false;
}
}
}
} }

1
hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/parser/PatternParser.java
View File

@ -63,6 +63,7 @@ public class PatternParser {
* @return {@link List} * @return {@link List}
*/ */
private static List<PatternMatcher> parseGroupPattern(final String groupPattern) { private static List<PatternMatcher> parseGroupPattern(final String groupPattern) {
Assert.notBlank(groupPattern, "Cron expression must not be empty!");
final List<String> patternList = SplitUtil.splitTrim(groupPattern, "|"); final List<String> patternList = SplitUtil.splitTrim(groupPattern, "|");
final List<PatternMatcher> patternMatchers = new ArrayList<>(patternList.size()); final List<PatternMatcher> patternMatchers = new ArrayList<>(patternList.size());
for (final String pattern : patternList) { for (final String pattern : patternList) {

11
hutool-cron/src/test/java/org/dromara/hutool/cron/demo/CronTest.java
View File

@ -96,4 +96,15 @@ public class CronTest {
CronUtil.setMatchSecond(true); CronUtil.setMatchSecond(true);
CronUtil.start(); CronUtil.start();
} }
@Test
@Disabled
public void isValidExpressionTest() {
Console.log(CronUtil.isValidExpression("5 * * * *"));
Console.log(CronUtil.isValidExpression("3-18 5 * * * *"));
Console.log(CronUtil.isValidExpression(""));
Console.log(CronUtil.isValidExpression(null));
Console.log(CronUtil.isValidExpression("A B C D E F"));
}
} }