Skip to content

Commit db1d319

Browse files
authored
Reorganize some classes in common module, remove duplicate classes (#12321)
1 parent 17cd644 commit db1d319

132 files changed

Lines changed: 702 additions & 1125 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/controller/AccessTokenController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.apache.dolphinscheduler.api.service.AccessTokenService;
3030
import org.apache.dolphinscheduler.api.utils.Result;
3131
import org.apache.dolphinscheduler.common.Constants;
32-
import org.apache.dolphinscheduler.common.utils.ParameterUtils;
32+
import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
3333
import org.apache.dolphinscheduler.dao.entity.User;
3434

3535
import springfox.documentation.annotations.ApiIgnore;

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/AlertGroupController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.apache.dolphinscheduler.api.service.AlertGroupService;
3131
import org.apache.dolphinscheduler.api.utils.Result;
3232
import org.apache.dolphinscheduler.common.Constants;
33-
import org.apache.dolphinscheduler.common.utils.ParameterUtils;
33+
import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
3434
import org.apache.dolphinscheduler.dao.entity.User;
3535

3636
import springfox.documentation.annotations.ApiIgnore;

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/AlertPluginInstanceController.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,8 @@
3030
import org.apache.dolphinscheduler.api.service.AlertPluginInstanceService;
3131
import org.apache.dolphinscheduler.api.utils.Result;
3232
import org.apache.dolphinscheduler.common.Constants;
33-
import org.apache.dolphinscheduler.common.utils.ParameterUtils;
3433
import org.apache.dolphinscheduler.dao.entity.User;
35-
34+
import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
3635
import springfox.documentation.annotations.ApiIgnore;
3736

3837
import java.util.Map;

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ClusterController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.apache.dolphinscheduler.api.service.ClusterService;
3030
import org.apache.dolphinscheduler.api.utils.Result;
3131
import org.apache.dolphinscheduler.common.Constants;
32-
import org.apache.dolphinscheduler.common.utils.ParameterUtils;
32+
import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
3333
import org.apache.dolphinscheduler.dao.entity.User;
3434

3535
import springfox.documentation.annotations.ApiIgnore;

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataQualityController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.apache.dolphinscheduler.api.service.DqRuleService;
2929
import org.apache.dolphinscheduler.api.utils.Result;
3030
import org.apache.dolphinscheduler.common.Constants;
31-
import org.apache.dolphinscheduler.common.utils.ParameterUtils;
31+
import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
3232
import org.apache.dolphinscheduler.dao.entity.User;
3333

3434
import springfox.documentation.annotations.ApiIgnore;

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataSourceController.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@
3636
import org.apache.dolphinscheduler.api.service.DataSourceService;
3737
import org.apache.dolphinscheduler.api.utils.Result;
3838
import org.apache.dolphinscheduler.common.Constants;
39-
import org.apache.dolphinscheduler.common.utils.CommonUtils;
40-
import org.apache.dolphinscheduler.common.utils.ParameterUtils;
39+
import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
4140
import org.apache.dolphinscheduler.dao.entity.User;
4241
import org.apache.dolphinscheduler.plugin.datasource.api.datasource.BaseDataSourceParamDTO;
4342
import org.apache.dolphinscheduler.plugin.datasource.api.utils.DataSourceUtils;
43+
import org.apache.dolphinscheduler.service.utils.CommonUtils;
4444
import org.apache.dolphinscheduler.spi.datasource.ConnectionParam;
4545
import org.apache.dolphinscheduler.spi.enums.DbType;
4646

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/EnvironmentController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.apache.dolphinscheduler.api.service.EnvironmentService;
3030
import org.apache.dolphinscheduler.api.utils.Result;
3131
import org.apache.dolphinscheduler.common.Constants;
32-
import org.apache.dolphinscheduler.common.utils.ParameterUtils;
32+
import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
3333
import org.apache.dolphinscheduler.dao.entity.User;
3434

3535
import springfox.documentation.annotations.ApiIgnore;

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/K8sNamespaceController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import org.apache.dolphinscheduler.api.service.K8sNamespaceService;
3232
import org.apache.dolphinscheduler.api.utils.Result;
3333
import org.apache.dolphinscheduler.common.Constants;
34-
import org.apache.dolphinscheduler.common.utils.ParameterUtils;
34+
import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
3535
import org.apache.dolphinscheduler.dao.entity.K8sNamespace;
3636
import org.apache.dolphinscheduler.dao.entity.User;
3737

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
import org.apache.dolphinscheduler.common.Constants;
4646
import org.apache.dolphinscheduler.common.enums.ProcessExecutionTypeEnum;
4747
import org.apache.dolphinscheduler.common.enums.ReleaseState;
48-
import org.apache.dolphinscheduler.common.utils.ParameterUtils;
48+
import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
4949
import org.apache.dolphinscheduler.dao.entity.ProcessDefinition;
5050
import org.apache.dolphinscheduler.dao.entity.User;
5151

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessInstanceController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.apache.dolphinscheduler.api.utils.Result;
2727
import org.apache.dolphinscheduler.common.Constants;
2828
import org.apache.dolphinscheduler.common.enums.WorkflowExecutionStatus;
29-
import org.apache.dolphinscheduler.common.utils.ParameterUtils;
29+
import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
3030
import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
3131
import org.apache.dolphinscheduler.dao.entity.User;
3232
import org.slf4j.Logger;

0 commit comments

Comments
 (0)