github
/
DolphinScheduler
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

[Fix-10522] [API] Fix get executable time null pointer exception (#10523)

3.1.0-release
Kerwin 2 years ago committed by GitHub
parent
bf077cb38f
commit
cefcb6d556
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 46
      dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/corn/CronUtils.java

46
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/corn/CronUtils.java
Unescape View File

@ -17,19 +17,25 @@
package org.apache.dolphinscheduler.service.corn; package org.apache.dolphinscheduler.service.corn;
import com.cronutils.model.Cron; import static org.apache.dolphinscheduler.common.Constants.CMDPARAM_COMPLEMENT_DATA_SCHEDULE_DATE_LIST;
import com.cronutils.model.definition.CronDefinitionBuilder; import static org.apache.dolphinscheduler.common.Constants.COMMA;
import com.cronutils.parser.CronParser; import static org.apache.dolphinscheduler.service.corn.CycleFactory.day;
import org.apache.commons.collections.CollectionUtils; import static org.apache.dolphinscheduler.service.corn.CycleFactory.hour;
import static org.apache.dolphinscheduler.service.corn.CycleFactory.min;
import static org.apache.dolphinscheduler.service.corn.CycleFactory.month;
import static org.apache.dolphinscheduler.service.corn.CycleFactory.week;
import static org.apache.dolphinscheduler.service.corn.CycleFactory.year;
import static com.cronutils.model.CronType.QUARTZ;
import org.apache.dolphinscheduler.common.Constants; import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.common.enums.CycleEnum; import org.apache.dolphinscheduler.common.enums.CycleEnum;
import org.apache.dolphinscheduler.common.thread.Stopper; import org.apache.dolphinscheduler.common.thread.Stopper;
import org.apache.dolphinscheduler.common.utils.DateUtils; import org.apache.dolphinscheduler.common.utils.DateUtils;
import org.apache.dolphinscheduler.dao.entity.Schedule; import org.apache.dolphinscheduler.dao.entity.Schedule;
import org.apache.dolphinscheduler.spi.utils.StringUtils; import org.apache.dolphinscheduler.spi.utils.StringUtils;
import org.quartz.CronExpression;
import org.slf4j.Logger; import org.apache.commons.collections.CollectionUtils;
import org.slf4j.LoggerFactory;
import java.text.ParseException; import java.text.ParseException;
import java.util.ArrayList; import java.util.ArrayList;
@ -40,15 +46,13 @@ import java.util.GregorianCalendar;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import static com.cronutils.model.CronType.QUARTZ; import org.quartz.CronExpression;
import static org.apache.dolphinscheduler.common.Constants.CMDPARAM_COMPLEMENT_DATA_SCHEDULE_DATE_LIST; import org.slf4j.Logger;
import static org.apache.dolphinscheduler.common.Constants.COMMA; import org.slf4j.LoggerFactory;
import static org.apache.dolphinscheduler.service.corn.CycleFactory.day;
import static org.apache.dolphinscheduler.service.corn.CycleFactory.hour; import com.cronutils.model.Cron;
import static org.apache.dolphinscheduler.service.corn.CycleFactory.min; import com.cronutils.model.definition.CronDefinitionBuilder;
import static org.apache.dolphinscheduler.service.corn.CycleFactory.month; import com.cronutils.parser.CronParser;
import static org.apache.dolphinscheduler.service.corn.CycleFactory.week;
import static org.apache.dolphinscheduler.service.corn.CycleFactory.year;
/** /**
* // todo: this utils is heavy, it rely on quartz and corn-utils. * // todo: this utils is heavy, it rely on quartz and corn-utils.
@ -128,7 +132,7 @@ public class CronUtils {
while (Stopper.isRunning()) { while (Stopper.isRunning()) {
startTime = cronExpression.getNextValidTimeAfter(startTime); startTime = cronExpression.getNextValidTimeAfter(startTime);
if (startTime.after(endTime)) { if (startTime == null || startTime.after(endTime)) {
break; break;
} }
dateList.add(startTime); dateList.add(startTime);
@ -150,7 +154,7 @@ public class CronUtils {
List<Date> dateList = new ArrayList<>(); List<Date> dateList = new ArrayList<>();
while (fireTimes > 0) { while (fireTimes > 0) {
startTime = cronExpression.getNextValidTimeAfter(startTime); startTime = cronExpression.getNextValidTimeAfter(startTime);
if (startTime.after(endTime) || startTime.equals(endTime)) { if (startTime == null || startTime.after(endTime) || startTime.equals(endTime)) {
break; break;
} }
dateList.add(startTime); dateList.add(startTime);
@ -173,7 +177,7 @@ public class CronUtils {
while (Stopper.isRunning()) { while (Stopper.isRunning()) {
startTime = cronExpression.getNextValidTimeAfter(startTime); startTime = cronExpression.getNextValidTimeAfter(startTime);
if (startTime.after(endTime) || startTime.equals(endTime)) { if (startTime == null || startTime.after(endTime) || startTime.equals(endTime)) {
break; break;
} }
dateList.add(startTime); dateList.add(startTime);
@ -288,10 +292,10 @@ public class CronUtils {
* @param param * @param param
* @return date list * @return date list
*/ */
public static List<Date> getSelfScheduleDateList(Map<String, String> param){ public static List<Date> getSelfScheduleDateList(Map<String, String> param) {
List<Date> result = new ArrayList<>(); List<Date> result = new ArrayList<>();
String scheduleDates = param.get(CMDPARAM_COMPLEMENT_DATA_SCHEDULE_DATE_LIST); String scheduleDates = param.get(CMDPARAM_COMPLEMENT_DATA_SCHEDULE_DATE_LIST);
if(StringUtils.isNotEmpty(scheduleDates)){ if (StringUtils.isNotEmpty(scheduleDates)) {
for (String stringDate : scheduleDates.split(COMMA)) { for (String stringDate : scheduleDates.split(COMMA)) {
result.add(DateUtils.stringToDate(stringDate)); result.add(DateUtils.stringToDate(stringDate));
} }

Write Preview
Loading…
Cancel
Save