[Improvement-18056] Remove unused code in service module (#18112)

Author: SbloodyS

dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/alert/WorkflowAlertManager.java

@@ -136,68 +136,6 @@ public String getContentWorkflowInstance(WorkflowInstance workflowInstance,
         return res;
     }
 
-    /**
-     * getting worker fault tolerant content
-     *
-     * @param workflowInstance workflow instance
-     * @param toleranceTaskList tolerance task list
-     * @return worker tolerance content
-     */
-    private String getWorkerToleranceContent(WorkflowInstance workflowInstance, List<TaskInstance> toleranceTaskList) {
-
-        List<WorkflowAlertContent> toleranceTaskInstanceList = new ArrayList<>();
-
-        WorkflowDefinitionLog workflowDefinitionLog = workflowDefinitionLogDao
-                .queryByDefinitionCodeAndVersion(workflowInstance.getWorkflowDefinitionCode(),
-                        workflowInstance.getWorkflowDefinitionVersion());
-        String modifyBy = "";
-        if (workflowDefinitionLog != null) {
-            User operator = userDao.queryById(workflowDefinitionLog.getOperator());
-            modifyBy = operator == null ? "" : operator.getUserName();
-        }
-
-        for (TaskInstance taskInstance : toleranceTaskList) {
-            WorkflowAlertContent workflowAlertContent = WorkflowAlertContent.builder()
-                    .workflowInstanceId(workflowInstance.getId())
-                    .workflowDefinitionCode(workflowInstance.getWorkflowDefinitionCode())
-                    .workflowInstanceName(workflowInstance.getName())
-                    .modifyBy(modifyBy)
-                    .taskCode(taskInstance.getTaskCode())
-                    .taskName(taskInstance.getName())
-                    .taskHost(taskInstance.getHost())
-                    .taskPriority(taskInstance.getTaskInstancePriority().getDescp())
-                    .retryTimes(taskInstance.getRetryTimes())
-                    .build();
-            toleranceTaskInstanceList.add(workflowAlertContent);
-        }
-        return JSONUtils.toJsonString(toleranceTaskInstanceList);
-    }
-
-    /**
-     * send worker alert fault tolerance
-     *
-     * @param workflowInstance workflow instance
-     * @param toleranceTaskList tolerance task list
-     */
-    public void sendAlertWorkerToleranceFault(WorkflowInstance workflowInstance, List<TaskInstance> toleranceTaskList) {
-        try {
-            Alert alert = new Alert();
-            alert.setTitle("worker fault tolerance");
-            String content = getWorkerToleranceContent(workflowInstance, toleranceTaskList);
-            alert.setContent(content);
-            alert.setWarningType(WarningType.FAILURE);
-            alert.setCreateTime(new Date());
-            alert.setAlertGroupId(
-                    workflowInstance.getWarningGroupId() == null ? 1 : workflowInstance.getWarningGroupId());
-            alert.setAlertType(AlertType.FAULT_TOLERANCE_WARNING);
-            alertDao.addAlert(alert);
-
-        } catch (Exception e) {
-            log.error("send alert failed:{} ", e.getMessage());
-        }
-
-    }
-
     /**
      * send workflow instance alert
      *

dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/bean/SpringApplicationContext.java

@@ -18,7 +18,6 @@
 package org.apache.dolphinscheduler.service.bean;
 
 import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.support.AbstractApplicationContext;
@@ -45,12 +44,4 @@ public void close() {
     public static <T> T getBean(Class<T> requiredType) {
         return applicationContext.getBean(requiredType);
     }
-
-    public static <T> T getBean(Class<T> requiredType, T defaultValue) {
-        try {
-            return applicationContext.getBean(requiredType);
-        } catch (NoSuchBeanDefinitionException e) {
-            return defaultValue;
-        }
-    }
 }

dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/expand/CuringParamsService.java

@@ -27,8 +27,6 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.Nullable;
-
 import lombok.NonNull;
 
 public interface CuringParamsService {
@@ -70,16 +68,6 @@ Map<String, Property> paramParsingPreparation(@NonNull TaskInstance taskInstance
                                                   String projectName,
                                                   String workflowDefinitionName);
 
-    /**
-     * Parse workflow star parameter
-     */
-    Map<String, Property> parseWorkflowStartParam(@Nullable Map<String, String> cmdParam);
-
-    /**
-     * Parse workflow father parameter
-     */
-    Map<String, Property> parseWorkflowFatherParam(@Nullable Map<String, String> cmdParam);
-
     /**
      * preBuildBusinessParams
      * @param workflowInstance

dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/expand/CuringParamsServiceImpl.java

@@ -28,7 +28,6 @@
 import static org.apache.dolphinscheduler.plugin.task.api.TaskConstants.PARAMETER_WORKFLOW_DEFINITION_NAME;
 import static org.apache.dolphinscheduler.plugin.task.api.TaskConstants.PARAMETER_WORKFLOW_INSTANCE_ID;
 
-import org.apache.dolphinscheduler.common.constants.CommandKeyConstants;
 import org.apache.dolphinscheduler.common.constants.Constants;
 import org.apache.dolphinscheduler.common.constants.DateConstants;
 import org.apache.dolphinscheduler.common.enums.CommandType;
@@ -47,7 +46,6 @@
 import org.apache.dolphinscheduler.plugin.task.api.utils.GlobalParameterUtils;
 import org.apache.dolphinscheduler.plugin.task.api.utils.MapUtils;
 import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
-import org.apache.dolphinscheduler.plugin.task.api.utils.PropertyUtils;
 import org.apache.dolphinscheduler.plugin.task.api.utils.VarPoolUtils;
 import org.apache.dolphinscheduler.service.exceptions.ServiceException;
 
@@ -64,8 +62,6 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import javax.annotation.Nullable;
-
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
 
@@ -138,30 +134,6 @@ public String curingGlobalParams(Integer workflowInstanceId, Map<String, String>
         return GlobalParameterUtils.serializeGlobalParameter(globalParamList);
     }
 
-    @Override
-    public Map<String, Property> parseWorkflowStartParam(@Nullable Map<String, String> cmdParam) {
-        if (cmdParam == null || !cmdParam.containsKey(CommandKeyConstants.CMD_PARAM_START_PARAMS)) {
-            return new HashMap<>();
-        }
-        String startParamJson = cmdParam.get(CommandKeyConstants.CMD_PARAM_START_PARAMS);
-        List<Property> propertyList = PropertyUtils.startParamsTransformPropertyList(startParamJson);
-        if (CollectionUtils.isEmpty(propertyList)) {
-            return new HashMap<>();
-        }
-        return propertyList.stream().collect(Collectors.toMap(Property::getProp, Function.identity()));
-    }
-
-    @Override
-    public Map<String, Property> parseWorkflowFatherParam(@Nullable Map<String, String> cmdParam) {
-        if (cmdParam == null || !cmdParam.containsKey(CommandKeyConstants.CMD_PARAM_FATHER_PARAMS)) {
-            return new HashMap<>();
-        }
-        String startParamJson = cmdParam.get(CommandKeyConstants.CMD_PARAM_FATHER_PARAMS);
-        Map<String, String> startParamMap = JSONUtils.toMap(startParamJson);
-        return startParamMap.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey,
-                entry -> new Property(entry.getKey(), Direct.IN, DataType.VARCHAR, entry.getValue())));
-    }
-
     /**
      * Prepares the final map of task execution parameters by merging parameters from multiple sources
      * in a well-defined priority order. The resulting map is guaranteed to contain only valid entries:

dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/alert/WorkflowAlertManagerTest.java

@@ -232,48 +232,6 @@ public void testParamParsingPreparation() {
                 String.valueOf(workflowDefinition.getCode()));
     }
 
-    @Test
-    public void testParseWorkflowStartParam() {
-        Map<String, Property> result;
-        // empty cmd param
-        Map<String, String> startParamMap = new HashMap<>();
-        result = curingParamsServiceImpl.parseWorkflowStartParam(startParamMap);
-        Assertions.assertTrue(MapUtils.isEmpty(result));
-
-        // without key
-        startParamMap.put("testStartParam", "$[yyyyMMdd]");
-        result = curingParamsServiceImpl.parseWorkflowStartParam(startParamMap);
-        Assertions.assertTrue(MapUtils.isEmpty(result));
-
-        startParamMap.put("StartParams", "{\"param1\":\"11111\", \"param2\":\"22222\"}");
-        result = curingParamsServiceImpl.parseWorkflowStartParam(startParamMap);
-        Assertions.assertTrue(MapUtils.isNotEmpty(result));
-        Assertions.assertEquals(2, result.keySet().size());
-        Assertions.assertEquals("11111", result.get("param1").getValue());
-        Assertions.assertEquals("22222", result.get("param2").getValue());
-    }
-
-    @Test
-    public void testParseWorkflowFatherParam() {
-        Map<String, Property> result;
-        // empty cmd param
-        Map<String, String> startParamMap = new HashMap<>();
-        result = curingParamsServiceImpl.parseWorkflowFatherParam(startParamMap);
-        Assertions.assertTrue(MapUtils.isEmpty(result));
-
-        // without key
-        startParamMap.put("testfatherParams", "$[yyyyMMdd]");
-        result = curingParamsServiceImpl.parseWorkflowFatherParam(startParamMap);
-        Assertions.assertTrue(MapUtils.isEmpty(result));
-
-        startParamMap.put("fatherParams", "{\"param1\":\"11111\", \"param2\":\"22222\"}");
-        result = curingParamsServiceImpl.parseWorkflowFatherParam(startParamMap);
-        Assertions.assertTrue(MapUtils.isNotEmpty(result));
-        Assertions.assertEquals(2, result.keySet().size());
-        Assertions.assertEquals("11111", result.get("param1").getValue());
-        Assertions.assertEquals("22222", result.get("param2").getValue());
-    }
-
     @Test
     public void testParseGlobalParamsMap() throws Exception {
         WorkflowInstance workflowInstance = new WorkflowInstance();