Skip to content

Commit 53a84b9

Browse files
authored
[Improvement-18056] Clean up unused methods and classes in the dolphinschudler-service module (#18169)
1 parent 64e3e27 commit 53a84b9

File tree

5 files changed

+1
-64
lines changed

5 files changed

+1
-64
lines changed

dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/cron/CronUtils.java

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
package org.apache.dolphinscheduler.service.cron;
1919

2020
import static com.cronutils.model.CronType.QUARTZ;
21-
import static org.apache.dolphinscheduler.common.constants.CommandKeyConstants.CMD_PARAM_COMPLEMENT_DATA_SCHEDULE_DATE_LIST;
22-
import static org.apache.dolphinscheduler.common.constants.Constants.COMMA;
2321
import static org.apache.dolphinscheduler.service.cron.CycleFactory.day;
2422
import static org.apache.dolphinscheduler.service.cron.CycleFactory.hour;
2523
import static org.apache.dolphinscheduler.service.cron.CycleFactory.min;
@@ -35,18 +33,14 @@
3533
import org.apache.dolphinscheduler.service.exceptions.CronParseException;
3634

3735
import org.apache.commons.collections4.CollectionUtils;
38-
import org.apache.commons.lang3.StringUtils;
3936

40-
import java.time.ZoneId;
4137
import java.time.ZonedDateTime;
4238
import java.util.ArrayList;
4339
import java.util.Calendar;
4440
import java.util.Date;
4541
import java.util.GregorianCalendar;
4642
import java.util.List;
47-
import java.util.Map;
4843
import java.util.Optional;
49-
import java.util.stream.Collectors;
5044

5145
import lombok.NonNull;
5246
import lombok.extern.slf4j.Slf4j;
@@ -206,17 +200,6 @@ public static List<ZonedDateTime> getSelfFireDateList(@NonNull ZonedDateTime sta
206200
return executeTimes;
207201
}
208202

209-
public static List<Date> getSelfFireDateList(@NonNull final Date startTime,
210-
@NonNull final Date endTime,
211-
@NonNull final List<Schedule> schedules) throws CronParseException {
212-
ZonedDateTime zonedDateTimeStart = ZonedDateTime.ofInstant(startTime.toInstant(), ZoneId.systemDefault());
213-
ZonedDateTime zonedDateTimeEnd = ZonedDateTime.ofInstant(endTime.toInstant(), ZoneId.systemDefault());
214-
215-
return getSelfFireDateList(zonedDateTimeStart, zonedDateTimeEnd, schedules).stream()
216-
.map(zonedDateTime -> new Date(zonedDateTime.toInstant().toEpochMilli()))
217-
.collect(Collectors.toList());
218-
}
219-
220203
/**
221204
* gets all scheduled times for a period of time based on self dependency
222205
* if schedulers is empty then default scheduler = 1 day
@@ -301,22 +284,4 @@ private static Date getEndTime(Date date) {
301284
return end.getTime();
302285
}
303286

304-
/**
305-
* get Schedule Date
306-
*
307-
* @param param
308-
* @return date list
309-
*/
310-
public static List<Date> getSelfScheduleDateList(Map<String, String> param) {
311-
List<Date> result = new ArrayList<>();
312-
String scheduleDates = param.get(CMD_PARAM_COMPLEMENT_DATA_SCHEDULE_DATE_LIST);
313-
if (StringUtils.isNotEmpty(scheduleDates)) {
314-
for (String stringDate : scheduleDates.split(COMMA)) {
315-
result.add(DateUtils.stringToDate(stringDate.trim()));
316-
}
317-
return result;
318-
}
319-
return null;
320-
}
321-
322287
}

dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/exceptions/CronParseException.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,8 @@
1919

2020
public class CronParseException extends Exception {
2121

22-
public CronParseException(String message) {
23-
super(message);
24-
}
25-
2622
public CronParseException(String message, Throwable throwable) {
2723
super(message, throwable);
2824
}
25+
2926
}

dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
import org.apache.dolphinscheduler.dao.repository.WorkflowInstanceDao;
6565
import org.apache.dolphinscheduler.plugin.task.api.parameters.SubWorkflowParameters;
6666
import org.apache.dolphinscheduler.plugin.task.api.parameters.TaskTimeoutParameter;
67-
import org.apache.dolphinscheduler.service.expand.CuringParamsService;
6867
import org.apache.dolphinscheduler.service.model.TaskNode;
6968
import org.apache.dolphinscheduler.service.utils.ClusterConfUtils;
7069
import org.apache.dolphinscheduler.service.utils.DagHelper;
@@ -156,9 +155,6 @@ public class ProcessServiceImpl implements ProcessService {
156155
@Autowired
157156
private ClusterMapper clusterMapper;
158157

159-
@Autowired
160-
private CuringParamsService curingGlobalParamsService;
161-
162158
/**
163159
* find workflow instance detail by id
164160
*
@@ -737,7 +733,6 @@ public List<TaskNode> transformTask(List<WorkflowTaskRelation> taskRelationList,
737733
* @param clusterName clusterName
738734
* @return datasource
739735
*/
740-
741736
@Override
742737
public String findConfigYamlByName(String clusterName) {
743738
if (Strings.isNullOrEmpty(clusterName)) {

dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/command/MessageServiceImplTest.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.apache.dolphinscheduler.dao.entity.Command;
2424
import org.apache.dolphinscheduler.dao.mapper.CommandMapper;
2525
import org.apache.dolphinscheduler.dao.mapper.ScheduleMapper;
26-
import org.apache.dolphinscheduler.dao.mapper.WorkflowDefinitionMapper;
2726

2827
import java.util.ArrayList;
2928
import java.util.List;
@@ -48,9 +47,6 @@ class MessageServiceImplTest {
4847
@Mock
4948
private CommandMapper commandMapper;
5049

51-
@Mock
52-
private WorkflowDefinitionMapper processDefineMapper;
53-
5450
@Mock
5551
private ScheduleMapper scheduleMapper;
5652

dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/process/ProcessServiceTest.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,11 @@
3131
import org.apache.dolphinscheduler.dao.entity.WorkflowTaskRelationLog;
3232
import org.apache.dolphinscheduler.dao.mapper.TaskDefinitionLogMapper;
3333
import org.apache.dolphinscheduler.dao.mapper.TaskDefinitionMapper;
34-
import org.apache.dolphinscheduler.dao.mapper.TaskGroupQueueMapper;
3534
import org.apache.dolphinscheduler.dao.mapper.UserMapper;
36-
import org.apache.dolphinscheduler.dao.mapper.WorkflowDefinitionLogMapper;
3735
import org.apache.dolphinscheduler.dao.mapper.WorkflowDefinitionMapper;
38-
import org.apache.dolphinscheduler.dao.mapper.WorkflowInstanceMapper;
3936
import org.apache.dolphinscheduler.dao.mapper.WorkflowTaskRelationLogMapper;
4037
import org.apache.dolphinscheduler.dao.repository.TaskDefinitionDao;
4138
import org.apache.dolphinscheduler.dao.repository.TaskDefinitionLogDao;
42-
import org.apache.dolphinscheduler.service.expand.CuringParamsService;
4339
import org.apache.dolphinscheduler.service.model.TaskNode;
4440

4541
import java.util.ArrayList;
@@ -70,12 +66,6 @@ public class ProcessServiceTest {
7066
@Mock
7167
private WorkflowDefinitionMapper workflowDefinitionMapper;
7268

73-
@Mock
74-
private WorkflowInstanceMapper workflowInstanceMapper;
75-
76-
@Mock
77-
private WorkflowDefinitionLogMapper workflowDefinitionLogMapper;
78-
7969
@Mock
8070
private TaskDefinitionDao taskDefinitionDao;
8171

@@ -91,12 +81,6 @@ public class ProcessServiceTest {
9181
@Mock
9282
private TaskDefinitionMapper taskDefinitionMapper;
9383

94-
@Mock
95-
private TaskGroupQueueMapper taskGroupQueueMapper;
96-
97-
@Mock
98-
CuringParamsService curingGlobalParamsService;
99-
10084
@Test
10185
public void testGetUserById() {
10286
User user = new User();

0 commit comments

Comments
 (0)