Unverified Commit d83a94a3 authored by Gabry.wu's avatar Gabry.wu Committed by GitHub
Browse files

Adapting partial code(file name start with T) to the sonar cloud rule (#2271)

parent 74525c28

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/TaskCountDto.java

+18 −18
Original line number Diff line number Diff line
@@ -43,36 +43,36 @@ public class TaskCountDto { 
    }



    private void countTaskDtos(List<ExecuteStatusCount> taskInstanceStateCounts){

        int submitted_success = 0;

        int running_exeution = 0;

        int ready_pause = 0;

        int submittedSuccess = 0;

        int runningExeution = 0;

        int readyPause = 0;

        int pause = 0;

        int ready_stop = 0;

        int readyStop = 0;

        int stop = 0;

        int failure = 0;

        int success = 0;

        int need_fault_tolerance = 0;

        int needFaultTolerance = 0;

        int kill = 0;

        int waitting_thread = 0;

        int waittingThread = 0;



        for(ExecuteStatusCount taskInstanceStateCount : taskInstanceStateCounts){

            ExecutionStatus status = taskInstanceStateCount.getExecutionStatus();

            totalCount += taskInstanceStateCount.getCount();

            switch (status){

                case SUBMITTED_SUCCESS:

                    submitted_success += taskInstanceStateCount.getCount();

                    submittedSuccess += taskInstanceStateCount.getCount();

                    break;

                case RUNNING_EXEUTION:

                    running_exeution += taskInstanceStateCount.getCount();

                    runningExeution += taskInstanceStateCount.getCount();

                    break;

                case READY_PAUSE:

                    ready_pause += taskInstanceStateCount.getCount();

                    readyPause += taskInstanceStateCount.getCount();

                    break;

                case PAUSE:

                    pause += taskInstanceStateCount.getCount();

                    break;

                case READY_STOP:

                    ready_stop += taskInstanceStateCount.getCount();

                    readyStop += taskInstanceStateCount.getCount();

                    break;

                case STOP:

                    stop += taskInstanceStateCount.getCount();
@@ -84,13 +84,13 @@ public class TaskCountDto { 
                    success += taskInstanceStateCount.getCount();

                    break;

                case NEED_FAULT_TOLERANCE:

                    need_fault_tolerance += taskInstanceStateCount.getCount();

                    needFaultTolerance += taskInstanceStateCount.getCount();

                    break;

                case KILL:

                    kill += taskInstanceStateCount.getCount();

                    break;

                case WAITTING_THREAD:

                    waitting_thread += taskInstanceStateCount.getCount();

                    waittingThread += taskInstanceStateCount.getCount();

                    break;



                    default:
@@ -98,17 +98,17 @@ public class TaskCountDto { 
            }

        }

        this.taskCountDtos = new ArrayList<>();

        this.taskCountDtos.add(new TaskStateCount(ExecutionStatus.SUBMITTED_SUCCESS, submitted_success));

        this.taskCountDtos.add(new TaskStateCount(ExecutionStatus.RUNNING_EXEUTION, running_exeution));

        this.taskCountDtos.add(new TaskStateCount(ExecutionStatus.READY_PAUSE, ready_pause));

        this.taskCountDtos.add(new TaskStateCount(ExecutionStatus.SUBMITTED_SUCCESS, submittedSuccess));

        this.taskCountDtos.add(new TaskStateCount(ExecutionStatus.RUNNING_EXEUTION, runningExeution));

        this.taskCountDtos.add(new TaskStateCount(ExecutionStatus.READY_PAUSE, readyPause));

        this.taskCountDtos.add(new TaskStateCount(ExecutionStatus.PAUSE, pause));

        this.taskCountDtos.add(new TaskStateCount(ExecutionStatus.READY_STOP, ready_stop));

        this.taskCountDtos.add(new TaskStateCount(ExecutionStatus.READY_STOP, readyStop));

        this.taskCountDtos.add(new TaskStateCount(ExecutionStatus.STOP, stop));

        this.taskCountDtos.add(new TaskStateCount(ExecutionStatus.FAILURE, failure));

        this.taskCountDtos.add(new TaskStateCount(ExecutionStatus.SUCCESS, success));

        this.taskCountDtos.add(new TaskStateCount(ExecutionStatus.NEED_FAULT_TOLERANCE, need_fault_tolerance));

        this.taskCountDtos.add(new TaskStateCount(ExecutionStatus.NEED_FAULT_TOLERANCE, needFaultTolerance));

        this.taskCountDtos.add(new TaskStateCount(ExecutionStatus.KILL, kill));

        this.taskCountDtos.add(new TaskStateCount(ExecutionStatus.WAITTING_THREAD, waitting_thread));

        this.taskCountDtos.add(new TaskStateCount(ExecutionStatus.WAITTING_THREAD, waittingThread));

    }

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

+0 −4
Original line number Diff line number Diff line
@@ -32,8 +32,6 @@ import org.apache.dolphinscheduler.dao.entity.User; 
import org.apache.dolphinscheduler.dao.mapper.ProjectMapper;

import org.apache.dolphinscheduler.dao.mapper.TaskInstanceMapper;

import org.apache.dolphinscheduler.service.process.ProcessService;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Service;
@@ -46,8 +44,6 @@ import java.util.*; 
@Service

public class TaskInstanceService extends BaseService {



    private static final Logger logger = LoggerFactory.getLogger(TaskInstanceService.class);



    @Autowired

    ProjectMapper projectMapper;

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

+0 −4
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ import org.apache.dolphinscheduler.api.utils.PageInfo; 
import org.apache.dolphinscheduler.common.Constants;

import org.apache.dolphinscheduler.dao.TaskRecordDao;

import org.apache.dolphinscheduler.dao.entity.TaskRecord;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import org.springframework.stereotype.Service;



import java.util.HashMap;
@@ -37,8 +35,6 @@ import static org.apache.dolphinscheduler.common.Constants.*; 
@Service

public class TaskRecordService extends BaseService{



    private static final Logger logger = LoggerFactory.getLogger(TaskRecordService.class);



    /**

     * query task record list paging

     *

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

+2 −2
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ public class TenantService extends BaseService{ 
    Map<String, Object> result = new HashMap<>(5);



    List<Tenant> resourceList = tenantMapper.queryByTenantCode(tenantCode);

    if (resourceList != null && resourceList.size() > 0) {

    if (CollectionUtils.isNotEmpty(resourceList)) {

      result.put(Constants.DATA_LIST, resourceList);

      putMsg(result, Status.SUCCESS);

    } else {
@@ -346,6 +346,6 @@ public class TenantService extends BaseService{ 
   */

  private boolean checkTenantExists(String tenantCode) {

      List<Tenant> tenants = tenantMapper.queryByTenantCode(tenantCode);

      return (tenants != null && tenants.size() > 0);

      return CollectionUtils.isNotEmpty(tenants);

  }

}

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskStateType.java

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ public enum TaskStateType { 
                default:

                    break;

        }

        return null;

        return new int[0];

    }



}