[DSIP-28] Donnot scan whole bean under classpath (apache#15874)

privking · Apr 19, 2024 · 285c5a8 · 285c5a8
1 parent a9decc9
commit 285c5a8
Show file tree

Hide file tree

Showing 61 changed files with 911 additions and 871 deletions.
diff --git a/...inscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/AlertServer.java b/...inscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/AlertServer.java
@@ -23,11 +23,13 @@
 import org.apache.dolphinscheduler.alert.rpc.AlertRpcServer;
 import org.apache.dolphinscheduler.alert.service.AlertBootstrapService;
 import org.apache.dolphinscheduler.alert.service.ListenerEventPostService;
+import org.apache.dolphinscheduler.common.CommonConfiguration;
 import org.apache.dolphinscheduler.common.constants.Constants;
 import org.apache.dolphinscheduler.common.lifecycle.ServerLifeCycleManager;
 import org.apache.dolphinscheduler.common.thread.DefaultUncaughtExceptionHandler;
 import org.apache.dolphinscheduler.common.thread.ThreadUtils;
-import org.apache.dolphinscheduler.plugin.registry.jdbc.JdbcRegistryAutoConfiguration;
+import org.apache.dolphinscheduler.dao.DaoConfiguration;
+import org.apache.dolphinscheduler.registry.api.RegistryConfiguration;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
@@ -37,14 +39,13 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.FilterType;
+import org.springframework.context.annotation.Import;
 
 @Slf4j
+@Import({CommonConfiguration.class,
+        DaoConfiguration.class,
+        RegistryConfiguration.class})
 @SpringBootApplication
-@ComponentScan(value = "org.apache.dolphinscheduler", excludeFilters = {
-        @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = JdbcRegistryAutoConfiguration.class)
-})
 public class AlertServer {
 
     @Autowired

diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/ApiApplicationServer.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/ApiApplicationServer.java
@@ -18,13 +18,17 @@
 package org.apache.dolphinscheduler.api;
 
 import org.apache.dolphinscheduler.api.metrics.ApiServerMetrics;
+import org.apache.dolphinscheduler.common.CommonConfiguration;
 import org.apache.dolphinscheduler.common.enums.PluginType;
 import org.apache.dolphinscheduler.common.thread.DefaultUncaughtExceptionHandler;
+import org.apache.dolphinscheduler.dao.DaoConfiguration;
 import org.apache.dolphinscheduler.dao.PluginDao;
 import org.apache.dolphinscheduler.dao.entity.PluginDefine;
-import org.apache.dolphinscheduler.plugin.registry.jdbc.JdbcRegistryAutoConfiguration;
+import org.apache.dolphinscheduler.plugin.storage.api.StorageConfiguration;
 import org.apache.dolphinscheduler.plugin.task.api.TaskChannelFactory;
 import org.apache.dolphinscheduler.plugin.task.api.TaskPluginManager;
+import org.apache.dolphinscheduler.registry.api.RegistryConfiguration;
+import org.apache.dolphinscheduler.service.ServiceConfiguration;
 import org.apache.dolphinscheduler.spi.params.PluginParamsTransfer;
 import org.apache.dolphinscheduler.spi.params.base.PluginParams;
 
@@ -38,21 +42,19 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.boot.web.servlet.ServletComponentScan;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.FilterType;
+import org.springframework.context.annotation.Import;
 import org.springframework.context.event.EventListener;
 
+@Slf4j
+@Import({DaoConfiguration.class,
+        CommonConfiguration.class,
+        ServiceConfiguration.class,
+        StorageConfiguration.class,
+        RegistryConfiguration.class})
 @ServletComponentScan
 @SpringBootApplication
-@ComponentScan(value = "org.apache.dolphinscheduler", excludeFilters = {
-        @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = JdbcRegistryAutoConfiguration.class)
-})
-@Slf4j
 public class ApiApplicationServer {
 
-    @Autowired
-    private TaskPluginManager taskPluginManager;
-
     @Autowired
     private PluginDao pluginDao;
 
@@ -66,8 +68,8 @@ public static void main(String[] args) {
     public void run(ApplicationReadyEvent readyEvent) {
         log.info("Received spring application context ready event will load taskPlugin and write to DB");
         // install task plugin
-        taskPluginManager.loadPlugin();
-        for (Map.Entry<String, TaskChannelFactory> entry : taskPluginManager.getTaskChannelFactoryMap().entrySet()) {
+        TaskPluginManager.loadPlugin();
+        for (Map.Entry<String, TaskChannelFactory> entry : TaskPluginManager.getTaskChannelFactoryMap().entrySet()) {
             String taskPluginName = entry.getKey();
             TaskChannelFactory taskChannelFactory = entry.getValue();
             List<PluginParams> params = taskChannelFactory.getParams();

diff --git a/...heduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/task/TaskUpdateRequest.java b/...heduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/task/TaskUpdateRequest.java
@@ -25,10 +25,10 @@
 
 import org.apache.commons.beanutils.BeanUtils;
 
-import java.lang.reflect.InvocationTargetException;
 import java.util.Date;
 
 import lombok.Data;
+import lombok.SneakyThrows;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -107,7 +107,8 @@ public class TaskUpdateRequest {
      * @param taskDefinition exists task definition object
      * @return task definition
      */
-    public TaskDefinition mergeIntoTaskDefinition(TaskDefinition taskDefinition) throws InvocationTargetException, IllegalAccessException, InstantiationException, NoSuchMethodException {
+    @SneakyThrows
+    public TaskDefinition mergeIntoTaskDefinition(TaskDefinition taskDefinition) {
         TaskDefinition taskDefinitionDeepCopy = (TaskDefinition) BeanUtils.cloneBean(taskDefinition);
         assert taskDefinitionDeepCopy != null;
         if (this.name != null) {

diff --git a/.../main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java b/.../main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
@@ -238,9 +238,6 @@ public class ProcessDefinitionServiceImpl extends BaseServiceImpl implements Pro
     @Autowired
     private DataSourceMapper dataSourceMapper;
 
-    @Autowired
-    private TaskPluginManager taskPluginManager;
-
     @Autowired
     private WorkFlowLineageService workFlowLineageService;
 
@@ -424,7 +421,7 @@ private List<TaskDefinitionLog> generateTaskDefinitionList(String taskDefinition
                 throw new ServiceException(Status.DATA_IS_NOT_VALID, taskDefinitionJson);
             }
             for (TaskDefinitionLog taskDefinitionLog : taskDefinitionLogs) {
-                if (!taskPluginManager.checkTaskParameters(ParametersNode.builder()
+                if (!TaskPluginManager.checkTaskParameters(ParametersNode.builder()
                         .taskType(taskDefinitionLog.getTaskType())
                         .taskParams(taskDefinitionLog.getTaskParams())
                         .dependence(taskDefinitionLog.getDependence())
@@ -1618,7 +1615,7 @@ public Map<String, Object> checkProcessNodeList(String processTaskRelationJson,
 
             // check whether the process definition json is normal
             for (TaskNode taskNode : taskNodes) {
-                if (!taskPluginManager.checkTaskParameters(ParametersNode.builder()
+                if (!TaskPluginManager.checkTaskParameters(ParametersNode.builder()
                         .taskType(taskNode.getType())
                         .taskParams(taskNode.getTaskParams())
                         .dependence(taskNode.getDependence())

diff --git a/...rc/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java b/...rc/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java
@@ -70,11 +70,9 @@
 import org.apache.dolphinscheduler.dao.mapper.ProcessInstanceMapper;
 import org.apache.dolphinscheduler.dao.mapper.ProjectMapper;
 import org.apache.dolphinscheduler.dao.mapper.RelationSubWorkflowMapper;
-import org.apache.dolphinscheduler.dao.mapper.ScheduleMapper;
 import org.apache.dolphinscheduler.dao.mapper.TaskDefinitionLogMapper;
 import org.apache.dolphinscheduler.dao.mapper.TaskDefinitionMapper;
 import org.apache.dolphinscheduler.dao.mapper.TaskInstanceMapper;
-import org.apache.dolphinscheduler.dao.mapper.TenantMapper;
 import org.apache.dolphinscheduler.dao.repository.ProcessInstanceDao;
 import org.apache.dolphinscheduler.dao.repository.ProcessInstanceMapDao;
 import org.apache.dolphinscheduler.dao.repository.TaskInstanceDao;
@@ -177,18 +175,9 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce
     @Autowired
     UsersService usersService;
 
-    @Autowired
-    private TenantMapper tenantMapper;
-
     @Autowired
     TaskDefinitionMapper taskDefinitionMapper;
 
-    @Autowired
-    private TaskPluginManager taskPluginManager;
-
-    @Autowired
-    private ScheduleMapper scheduleMapper;
-
     @Autowired
     private RelationSubWorkflowMapper relationSubWorkflowMapper;
 
@@ -725,7 +714,7 @@ public Map<String, Object> updateProcessInstance(User loginUser, long projectCod
             return result;
         }
         for (TaskDefinitionLog taskDefinitionLog : taskDefinitionLogs) {
-            if (!taskPluginManager.checkTaskParameters(ParametersNode.builder()
+            if (!TaskPluginManager.checkTaskParameters(ParametersNode.builder()
                     .taskType(taskDefinitionLog.getTaskType())
                     .taskParams(taskDefinitionLog.getTaskParams())
                     .dependence(taskDefinitionLog.getDependence())