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

Adapting partial code(file name start with S #2) to the sonar cloud rule (#2270)

parent c706b21c

dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/enums/StatusTest.java

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ public class StatusTest { 


    @Test

    public void testGetCode() {

        assertEquals(Status.SUCCESS.getCode(), 0);

        assertEquals(0, Status.SUCCESS.getCode());

        assertNotEquals(Status.REQUEST_PARAMS_NOT_VALID_ERROR.getCode(), 0);

    }

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/spark/SparkParameters.java

+7 −3
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import org.apache.dolphinscheduler.common.enums.ProgramType; 
import org.apache.dolphinscheduler.common.process.ResourceInfo;

import org.apache.dolphinscheduler.common.task.AbstractParameters;



import java.util.Collections;

import java.util.List;

import java.util.stream.Collectors;
@@ -222,11 +223,14 @@ public class SparkParameters extends AbstractParameters { 
  @Override

  public List<String> getResourceFilesList() {

    if(resourceList !=null ) {

      this.resourceList.add(mainJar);

      return resourceList.stream()

      List<String> resourceFilesList = resourceList.stream()

              .map(ResourceInfo::getRes).collect(Collectors.toList());

      if(mainJar != null){

          resourceFilesList.add(mainJar.getRes());

      }

    return null;

      return resourceFilesList;

    }

    return Collections.emptyList();

  }

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/Stopper.java

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import java.util.concurrent.atomic.AtomicBoolean; 
 */

public class Stopper {



	private static volatile AtomicBoolean signal = new AtomicBoolean(false);

	private static AtomicBoolean signal = new AtomicBoolean(false);

	

	public static final boolean isStopped(){

		return signal.get();

dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/StringTest.java

+0 −6
Original line number Diff line number Diff line
@@ -24,12 +24,6 @@ import java.util.List; 


public class StringTest {





    @Test

    public void test1(){

        System.out.println(String.format("%s_%010d_%010d", String.valueOf(1), Long.valueOf(3), Integer.valueOf(4)));

    }



    @Test

    public void stringCompareTest(){

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/SubProcessTaskExecThread.java

+3 −3
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ public class SubProcessTaskExecThread extends MasterBaseTaskExecThread { 
     *  set task instance state

     * @return

     */

    private Boolean setTaskInstanceState(){

    private boolean setTaskInstanceState(){

        subProcessInstance = processService.findSubProcessInstance(processInstance.getId(), taskInstance.getId());

        if(subProcessInstance == null || taskInstance.getState().typeIsFinished()){

            return false;
@@ -131,8 +131,8 @@ public class SubProcessTaskExecThread extends MasterBaseTaskExecThread { 
        if (taskInstance.getState().typeIsFinished()) {

            logger.info("sub work flow task {} already complete. task state:{}, parent work flow instance state:{}",

                    this.taskInstance.getName(),

                    this.taskInstance.getState().toString(),

                    this.processInstance.getState().toString());

                    this.taskInstance.getState(),

                    this.processInstance.getState());

            return;

        }

        while (Stopper.isRunning()) {