Merge pull request #702 from jsonwan/github_fix/create_cron

bugfix: 通过ESB V3接口创建一次性定时任务报错 #701

src/backend/job-crontab/service-job-crontab/src/main/java/com/tencent/bk/job/crontab/util/CronExpressionUtil.java

@@ -28,6 +28,7 @@
 import com.cronutils.model.Cron;
 import com.cronutils.model.definition.CronDefinitionBuilder;
 import com.cronutils.parser.CronParser;
+import org.apache.commons.lang3.StringUtils;
 
 import static com.cronutils.model.CronType.QUARTZ;
 import static com.cronutils.model.CronType.UNIX;
@@ -41,16 +42,18 @@ public class CronExpressionUtil {
     private static final CronParser UNIX_PARSER = new CronParser(CronDefinitionBuilder.instanceDefinitionFor(UNIX));
 
     public static String fixExpressionForQuartz(String expression) {
+        if (StringUtils.isBlank(expression)) {
+            return expression;
+        }
         Cron unixCron = UNIX_PARSER.parse(expression);
         unixCron.validate();
         return CronMapper.fromUnixToQuartz().map(unixCron).validate().asString();
     }
 
     public static String fixExpressionForUser(String expression) {
+        if (StringUtils.isBlank(expression)) {
+            return expression;
+        }
         return CronMapper.fromQuartzToUnix().map(QUARTZ_PARSER.parse(expression)).asString();
     }
-
-    public static void main(String[] args) {
-        System.out.println(CronExpressionUtil.fixExpressionForUser("0 30 10 8 * ? *"));
-    }
 }

src/backend/job-crontab/service-job-crontab/src/test/java/com/tencent/bk/job/crontab/util/CronExpressionUtilTest.java

@@ -0,0 +1,16 @@
+package com.tencent.bk.job.crontab.util;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class CronExpressionUtilTest {
+
+    @Test
+    public void testFixExpression() {
+        String fixedCron = CronExpressionUtil.fixExpressionForUser("0 30 10 8 * ? *");
+        assertThat("30 10 8 * *".equals(fixedCron)).isTrue();
+        assertThat(" ".equals(CronExpressionUtil.fixExpressionForUser(" "))).isTrue();
+        assertThat(CronExpressionUtil.fixExpressionForUser(null)).isNull();
+    }
+}