Skip to content

Commit 6d686f3

Browse files
authored
[Improvement-18056] Clean up unused methods and classes in the dolphinschudler-api module (#18134)
1 parent 08e7bda commit 6d686f3

51 files changed

Lines changed: 8 additions & 2966 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/constants/AuditLogConstants.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,5 @@ private AuditLogConstants() {
4141
public static final String ALIAS = "alias";
4242
public static final String FILE_NAME = "fileName";
4343
public static final String FULL_NAME = "fullName";
44-
public static final String FUNC_NAME = "funcName";
4544

4645
}

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/constants/ApiFuncIdentificationConstant.java

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -24,44 +24,27 @@
2424

2525
public class ApiFuncIdentificationConstant {
2626

27-
public static final String ACCESS_TOKEN_MANAGE = "security:token:view";
28-
public static final String ACCESS_TOKEN_VIEW = "security:token:view";
2927
public static final String ACCESS_TOKEN_CREATE = "security:token:create";
3028
public static final String ACCESS_TOKEN_UPDATE = "security:token:update";
3129
public static final String ACCESS_TOKEN_DELETE = "security:token:delete";
3230
public static final String ALERT_GROUP_VIEW = "security:alert-group:view";
3331
public static final String ALERT_GROUP_CREATE = "security:alert-group:create";
3432
public static final String ALERT_GROUP_UPDATE = "security:alert-group:update";
3533
public static final String ALERT_GROUP_DELETE = "security:alert-group:delete";
36-
public static final String TENANT_MANAGER = "security:tenant:view";
3734
public static final String TENANT_CREATE = "security:tenant:create";
3835
public static final String TENANT_UPDATE = "security:tenant:update";
3936
public static final String TENANT_DELETE = "security:tenant:delete";
4037
public static final String ALERT_INSTANCE_CREATE = "security:alert-plugin:create";
4138
public static final String ALERT_PLUGIN_UPDATE = "security:alert-plugin:update";
4239
public static final String ALERT_PLUGIN_DELETE = "security:alert-plugin:delete";
4340
public static final String WORKER_GROUP_CREATE = "security:worker-group:create";
44-
public static final String WORKER_GROUP_EDIT = "security:worker-group:update";
4541
public static final String WORKER_GROUP_DELETE = "security:worker-group:delete";
46-
public static final String YARN_QUEUE_MANAGE = "security:queue:view";
4742
public static final String YARN_QUEUE_CREATE = "security:queue:create";
4843
public static final String YARN_QUEUE_UPDATE = "security:queue:update";
4944
public static final String ENVIRONMENT_CREATE = "security:environment:create";
5045
public static final String ENVIRONMENT_UPDATE = "security:environment:update";
5146
public static final String ENVIRONMENT_DELETE = "security:environment:delete";
52-
public static final String ENVIRONMENT_MANAGER = "security:environment:view";
53-
public static final String CALENDAR_CREATE = "security:calendar:create";
54-
public static final String CALENDAR_EDIT = "security:calendar:update";
55-
public static final String CALENDAR_DELETE = "security:calendar:delete";
56-
public static final String CARDS_CREATE = "security:cards:create";
57-
public static final String CARDS_EDIT = "security:cards:update";
58-
public static final String CARDS_EDIT_VALUE = "security:cards:value";
59-
public static final String CARDS_CARDS_DELETE = "security:cards:delete";
60-
public static final String ALARM_GROUP_MANAGE = "security:alert-group:view";
6147
public static final String ALARM_INSTANCE_MANAGE = "security:alert-plugin:view";
62-
public static final String WORKER_GROUP_MANAGE = "security:worker-group:view";
63-
public static final String CALENDAR_MANAGE = "security:calendar:view";
64-
public static final String CARDS_MANAGER = "security:cards:view";
6548
public static final String USER_MANAGER = "security:user:view";
6649

6750
public static final String PROJECT = "project:view";
@@ -70,80 +53,47 @@ public class ApiFuncIdentificationConstant {
7053
public static final String PROJECT_DELETE = "project:delete";
7154
public static final String WORKFLOW_DEFINITION = "project:definition:list";
7255
public static final String WORKFLOW_CREATE = "project:definition:create";
73-
public static final String WORKFLOW_IMPORT = "project:definition:import";
7456
public static final String WORKFLOW_UPDATE = "project:definition:update";
75-
public static final String WORKFLOW_START = "project:executors:start";
76-
public static final String TIMING = "project:schedules:timing";
7757
public static final String WORKFLOW_ONLINE_OFFLINE = "project:definition:release";
78-
public static final String WORKFLOW_COPY = "project:definition:copy";
79-
public static final String CRON_MANAGE = "project:schedules:corn";
80-
public static final String WORKFLOW_DELETE = "project:definition:delete";
8158
public static final String WORKFLOW_TREE_VIEW = "project:definition:view-tree";
82-
public static final String WORKFLOW_EXPORT = "project:definition:export";
8359
public static final String WORKFLOW_BATCH_COPY = "project:definition:batch-copy";
84-
public static final String WORKFLOW_DEFINITION_EXPORT = "project:definition:batch-export";
85-
public static final String WORKFLOW_DEFINITION_BATCH_DELETE = "project:definition:batch-delete";
8660
public static final String WORKFLOW_SWITCH_TO_THIS_VERSION = "project:definition:version:switch";
8761
public static final String WORKFLOW_DEFINITION_DELETE = "project:definition:version:delete";
88-
public static final String WORKFLOW_SAVE = "project:definition:verify-name";
8962
public static final String WORKFLOW_INSTANCE = "project:process-instance:list";
9063
public static final String RERUN = "project:executors:execute";
9164
public static final String FAILED_TO_RETRY = "project:executors:retry";
9265
public static final String STOP = "project:executors:stop";
9366
public static final String RECOVERY_SUSPEND = "project:executors:recover";
9467
public static final String PAUSE = "project:executors:pause";
9568
public static final String INSTANCE_DELETE = "project:process-instance:delete";
96-
public static final String INSTANCE_BATCH_DELETE = "project:process-instance:batch-delete";
9769
public static final String FORCED_SUCCESS = "project:task-instance:force-success";
9870
public static final String VIEW_LOG = "project:log:detail";
9971
public static final String DOWNLOAD_LOG = "project:log:download-log";
10072
public static final String PROJECT_OVERVIEW = "project:overview:view";
101-
public static final String WORKFLOW_RELATION = "project:lineages:view";
102-
public static final String WORKFLOW_DEFINITION_VIEW = "project:definition:view";
103-
public static final String WORKFLOW_INSTANCE_VIEW = "project:process-instance:view";
10473
public static final String TASK_INSTANCE = "project:task-instance:view";
10574
public static final String INSTANCE_UPDATE = "project:process-instance:update";
10675
public static final String VERSION_LIST = "project:version:list";
10776
public static final String TASK_DEFINITION = "project:task-definition:view";
108-
public static final String TASK_DEFINITION_CREATE = "project:task-definition:create";
109-
public static final String TASK_DEFINITION_UPDATE = "project:task-definition:edit";
11077
public static final String TASK_DEFINITION_MOVE = "project:task-definition:move";
11178
public static final String TASK_VERSION_VIEW = "project:task-definition:version";
11279
public static final String TASK_DEFINITION_DELETE = "project:task-definition:delete";
113-
public static final String VERSION_DELETE = "project:version:delete";
11480

11581
public static final String DATASOURCE = "datasource:view";
11682
public static final String DATASOURCE_CREATE_DATASOURCE = "datasource:create";
11783
public static final String DATASOURCE_UPDATE = "datasource:update";
11884
public static final String DATASOURCE_DELETE = "datasource:delete";
119-
public static final String DATASOURCE_LIST = "datasource:list";
120-
public static final String DATASOURCE_PARAM_VIEW = "datasource:param-view";
121-
122-
public static final String FILE_VIEW = "resources:file:view";
123-
public static final String FOLDER_ONLINE_CREATE = "resources:file:create";
124-
public static final String FILE_ONLINE_CREATE = "resources:file:online-create";
125-
public static final String FILE_UPLOAD = "resources:file:upload";
126-
public static final String FILE_UPDATE = "resources:file:update-content";
127-
public static final String FILE_RENAME = "resources:file:rename";
128-
public static final String FILE_DOWNLOAD = "resources:file:download";
129-
public static final String FILE_DELETE = "resources:file:delete";
13085

13186
public static final String TASK_GROUP_VIEW = "resources:task-group:view";
13287
public static final String TASK_GROUP_CREATE = "resources:task-group:create";
13388
public static final String TASK_GROUP_CLOSE = "resources:task-group:close";
13489
public static final String TASK_GROUP_EDIT = "resources:task-group:update";
135-
public static final String TASK_GROUP_VIEW_QUEUE = "resources:task-group:queue-view";
13690

137-
public static final String TASK_GROUP_QUEUE = "resources:task-group-queue:view";
13891
public static final String TASK_GROUP_QUEUE_PRIORITY = "resources:task-group-queue:priority";
13992
public static final String TASK_GROUP_QUEUE_START = "resources:task-group-queue:start";
14093

14194
public static final String MONITOR_MASTER_VIEW = "monitor:masters:view";
142-
public static final String MONITOR_WORKER_VIEW = "monitor:workers:view";
14395
public static final String MONITOR_DATABASES_VIEW = "monitor:databases:view";
14496

145-
public static final String MONITOR_STATISTICS_VIEW = "monitor:statistics:view";
146-
14797
public final static Map<ExecuteType, String> map = new HashMap<ExecuteType, String>();
14898

14999
static {

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/gantt/GanttDto.java

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@
2727
@Data
2828
public class GanttDto {
2929

30-
/**
31-
* height
32-
*/
33-
private int height;
34-
3530
/**
3631
* tasks list
3732
*/
@@ -52,18 +47,4 @@ public GanttDto() {
5247
taskStatus.put("success", "success");
5348
}
5449

55-
public GanttDto(int height, List<Task> tasks, List<Long> taskNames) {
56-
this();
57-
this.height = height;
58-
this.tasks = tasks;
59-
this.taskNames = taskNames;
60-
}
61-
62-
public GanttDto(int height, List<Task> tasks, List<Long> taskNames, Map<String, String> taskStatus) {
63-
this.height = height;
64-
this.tasks = tasks;
65-
this.taskNames = taskNames;
66-
this.taskStatus = taskStatus;
67-
}
68-
6950
}

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/taskRelation/TaskRelationFilterRequest.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,6 @@ public class TaskRelationFilterRequest extends PageQueryDto {
4444
@Schema(example = "1234567890123")
4545
private long postTaskCode;
4646

47-
public TaskRelationFilterRequest(long workflowCode, long preTaskCode, long postTaskCode) {
48-
this.workflowCode = workflowCode;
49-
this.preTaskCode = preTaskCode;
50-
this.postTaskCode = postTaskCode;
51-
}
52-
5347
public TaskRelationFilterRequest(long preTaskCode, long postTaskCode) {
5448
this.preTaskCode = preTaskCode;
5549
this.postTaskCode = postTaskCode;

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/treeview/Instance.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,6 @@ public class Instance {
6868

6969
private long subflowCode;
7070

71-
public Instance() {
72-
}
73-
7471
public Instance(int id, String name, long code, String type) {
7572
this.id = id;
7673
this.name = name;

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/ExecuteType.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,13 @@ public enum ExecuteType {
2424

2525
/**
2626
* operation type
27+
* 0 none
2728
* 1 repeat running
2829
* 2 resume pause
2930
* 3 resume failure
3031
* 4 stop
3132
* 5 pause
33+
* 6 execute task
3234
*/
3335
NONE(0, "NONE"),
3436

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/BackfillWorkflowExecutorDelegate.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,12 @@
2525
import org.apache.dolphinscheduler.common.model.Server;
2626
import org.apache.dolphinscheduler.common.utils.DateUtils;
2727
import org.apache.dolphinscheduler.dao.entity.WorkflowDefinition;
28-
import org.apache.dolphinscheduler.dao.repository.CommandDao;
2928
import org.apache.dolphinscheduler.extract.base.client.Clients;
3029
import org.apache.dolphinscheduler.extract.master.IWorkflowControlClient;
3130
import org.apache.dolphinscheduler.extract.master.transportor.workflow.WorkflowBackfillTriggerRequest;
3231
import org.apache.dolphinscheduler.extract.master.transportor.workflow.WorkflowBackfillTriggerResponse;
3332
import org.apache.dolphinscheduler.registry.api.RegistryClient;
3433
import org.apache.dolphinscheduler.registry.api.enums.RegistryNodeType;
35-
import org.apache.dolphinscheduler.service.process.ProcessService;
3634

3735
import java.time.ZonedDateTime;
3836
import java.util.ArrayList;
@@ -51,12 +49,6 @@
5149
@Component
5250
public class BackfillWorkflowExecutorDelegate implements IExecutorDelegate<BackfillWorkflowDTO, List<Integer>> {
5351

54-
@Autowired
55-
private CommandDao commandDao;
56-
57-
@Autowired
58-
private ProcessService processService;
59-
6052
@Autowired
6153
private RegistryClient registryClient;
6254

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/PermissionCheck.java

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.apache.dolphinscheduler.common.enums.AuthorizationType;
2121
import org.apache.dolphinscheduler.common.enums.UserType;
2222
import org.apache.dolphinscheduler.dao.entity.User;
23-
import org.apache.dolphinscheduler.plugin.task.api.model.ResourceInfo;
2423
import org.apache.dolphinscheduler.service.exceptions.ServiceException;
2524
import org.apache.dolphinscheduler.service.process.ProcessService;
2625

@@ -36,6 +35,7 @@ public class PermissionCheck<T> {
3635
* logger
3736
*/
3837
private Logger logger;
38+
3939
/**
4040
* Authorization Type
4141
*/
@@ -51,11 +51,6 @@ public class PermissionCheck<T> {
5151
*/
5252
private T[] needChecks;
5353

54-
/**
55-
* resoruce info
56-
*/
57-
private List<ResourceInfo> resourceList;
58-
5954
/**
6055
* user id
6156
*/
@@ -86,14 +81,6 @@ public void setUserId(int userId) {
8681
this.userId = userId;
8782
}
8883

89-
public List<ResourceInfo> getResourceList() {
90-
return resourceList;
91-
}
92-
93-
public void setResourceList(List<ResourceInfo> resourceList) {
94-
this.resourceList = resourceList;
95-
}
96-
9784
/**
9885
* check permission
9986
*

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/python/PythonGateway.java

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,10 @@
3434
import org.apache.dolphinscheduler.api.service.WorkflowDefinitionService;
3535
import org.apache.dolphinscheduler.common.constants.Constants;
3636
import org.apache.dolphinscheduler.common.enums.CommandType;
37-
import org.apache.dolphinscheduler.common.enums.ComplementDependentMode;
38-
import org.apache.dolphinscheduler.common.enums.ExecutionOrder;
3937
import org.apache.dolphinscheduler.common.enums.FailureStrategy;
4038
import org.apache.dolphinscheduler.common.enums.Flag;
4139
import org.apache.dolphinscheduler.common.enums.Priority;
4240
import org.apache.dolphinscheduler.common.enums.ReleaseState;
43-
import org.apache.dolphinscheduler.common.enums.RunMode;
4441
import org.apache.dolphinscheduler.common.enums.TaskDependType;
4542
import org.apache.dolphinscheduler.common.enums.UserType;
4643
import org.apache.dolphinscheduler.common.enums.WarningType;
@@ -49,7 +46,6 @@
4946
import org.apache.dolphinscheduler.dao.entity.DataSource;
5047
import org.apache.dolphinscheduler.dao.entity.Project;
5148
import org.apache.dolphinscheduler.dao.entity.ProjectUser;
52-
import org.apache.dolphinscheduler.dao.entity.Queue;
5349
import org.apache.dolphinscheduler.dao.entity.Schedule;
5450
import org.apache.dolphinscheduler.dao.entity.TaskDefinition;
5551
import org.apache.dolphinscheduler.dao.entity.Tenant;
@@ -94,11 +90,6 @@ public class PythonGateway {
9490
private static final Priority DEFAULT_PRIORITY = Priority.MEDIUM;
9591
private static final Long DEFAULT_ENVIRONMENT_CODE = -1L;
9692

97-
private static final TaskDependType DEFAULT_TASK_DEPEND_TYPE = TaskDependType.TASK_POST;
98-
private static final RunMode DEFAULT_RUN_MODE = RunMode.RUN_MODE_SERIAL;
99-
private static final ExecutionOrder DEFAULT_EXECUTION_ORDER = ExecutionOrder.DESC_ORDER;
100-
private static final int DEFAULT_DRY_RUN = 0;
101-
private static final ComplementDependentMode COMPLEMENT_DEPENDENT_MODE = ComplementDependentMode.OFF_MODE;
10293
// We use admin user's user_id to skip some permission issue from python gateway service
10394
private static final int ADMIN_USER_ID = 1;
10495

@@ -160,14 +151,6 @@ public class PythonGateway {
160151
}
161152
};
162153

163-
private final Queue queuePythonGateway = new Queue() {
164-
165-
{
166-
setId(Integer.MAX_VALUE);
167-
setQueueName("queuePythonGateway");
168-
}
169-
};
170-
171154
public String ping() {
172155
return "PONG";
173156
}

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskDefinitionService.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717

1818
package org.apache.dolphinscheduler.api.service;
1919

20-
import org.apache.dolphinscheduler.api.dto.task.TaskFilterRequest;
21-
import org.apache.dolphinscheduler.api.utils.PageInfo;
2220
import org.apache.dolphinscheduler.api.utils.Result;
2321
import org.apache.dolphinscheduler.common.enums.ReleaseState;
2422
import org.apache.dolphinscheduler.dao.entity.TaskDefinition;
@@ -54,16 +52,6 @@ Map<String, Object> queryTaskDefinitionByName(User loginUser,
5452
TaskDefinition getTaskDefinition(User loginUser,
5553
long taskCode);
5654

57-
/**
58-
* Get resource task definition according to query parameter
59-
*
60-
* @param loginUser login user
61-
* @param taskFilterRequest taskFilterRequest
62-
* @return PageResourceResponse from condition
63-
*/
64-
PageInfo<TaskDefinition> filterTaskDefinition(User loginUser,
65-
TaskFilterRequest taskFilterRequest);
66-
6755
/**
6856
* update task definition and upstream
6957
*

0 commit comments

Comments
 (0)