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

Adapting partial code(file name start with Q) to the sonar cloud rule (#2242)

parent ca6872a9

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

+12 −14
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import org.apache.dolphinscheduler.api.enums.Status; 
import org.apache.dolphinscheduler.api.utils.PageInfo;

import org.apache.dolphinscheduler.api.utils.Result;

import org.apache.dolphinscheduler.common.Constants;

import org.apache.dolphinscheduler.common.utils.CollectionUtils;

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

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

import org.apache.dolphinscheduler.dao.mapper.QueueMapper;
@@ -43,7 +44,7 @@ import java.util.Map; 
@Service

public class QueueService extends BaseService {



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

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



    @Autowired

    private QueueMapper queueMapper;
@@ -186,20 +187,17 @@ public class QueueService extends BaseService { 
        }



        // check queue name is exist

        if (!queueName.equals(queueObj.getQueueName())) {

            if (checkQueueNameExist(queueName)) {

        if (!queueName.equals(queueObj.getQueueName())

                && checkQueueNameExist(queueName)) {

            putMsg(result, Status.QUEUE_NAME_EXIST, queueName);

            return result;

        }

        }



        // check queue value is exist

        if (!queue.equals(queueObj.getQueue())) {

            if (checkQueueExist(queue)) {

        if (!queue.equals(queueObj.getQueue()) && checkQueueExist(queue)) {

            putMsg(result, Status.QUEUE_VALUE_EXIST, queue);

            return result;

        }

        }



        // check old queue using by any user

        if (checkIfQueueIsInUsing(queueObj.getQueueName(), queueName)) {
@@ -267,7 +265,7 @@ public class QueueService extends BaseService { 
     * @return true if the queue not exists, otherwise return false

     */

    private boolean checkQueueExist(String queue) {

        return queueMapper.queryAllQueueList(queue, null).size() > 0;

        return CollectionUtils.isNotEmpty(queueMapper.queryAllQueueList(queue, null));

    }



    /**
@@ -278,7 +276,7 @@ public class QueueService extends BaseService { 
     * @return true if the queue name not exists, otherwise return false

     */

    private boolean checkQueueNameExist(String queueName) {

        return queueMapper.queryAllQueueList(null, queueName).size() > 0;

        return CollectionUtils.isNotEmpty(queueMapper.queryAllQueueList(null, queueName));

    }



    /**
@@ -290,7 +288,7 @@ public class QueueService extends BaseService { 
     * @return true if need to update user

     */

    private boolean checkIfQueueIsInUsing (String oldQueue, String newQueue) {

        return !oldQueue.equals(newQueue) && userMapper.queryUserListByQueue(oldQueue).size() > 0;

        return !oldQueue.equals(newQueue) && CollectionUtils.isNotEmpty(userMapper.queryUserListByQueue(oldQueue));

    }



}

dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/QueueMapperTest.java

+2 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ public class QueueMapperTest { 
        queue.setCreateTime(new Date());

        //update

        int update = queueMapper.updateById(queue);

        Assert.assertEquals(update, 1);

        Assert.assertEquals(1, update);

        queueMapper.deleteById(queue.getId());

    }
@@ -75,7 +75,7 @@ public class QueueMapperTest { 
    public void testDelete(){

        Queue queue = insertOne();

        int delete = queueMapper.deleteById(queue.getId());

        Assert.assertEquals(delete, 1);

        Assert.assertEquals(1, delete);

    }



    /**

dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/quartz/QuartzExecutors.java

+3 −2
Original line number Diff line number Diff line
@@ -70,9 +70,10 @@ public class QuartzExecutors { 
      synchronized (QuartzExecutors.class) {

        // when more than two threads run into the first null check same time, to avoid instanced more than one time, it needs to be checked again.

        if (INSTANCE == null) {

          INSTANCE = new QuartzExecutors();

          QuartzExecutors quartzExecutors = new QuartzExecutors();

          //finish QuartzExecutors init

          INSTANCE.init();

          quartzExecutors.init();

          INSTANCE = quartzExecutors;

        }

      }

    }