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

rename vaild to valid (#1961)

parent 90df1484

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

+3 −3
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ public class ExecutorService extends BaseService{ 
        }



        if (!checkTenantSuitable(processDefinition)){

            logger.error("there is not any vaild tenant for the process definition: id:{},name:{}, ",

            logger.error("there is not any valid tenant for the process definition: id:{},name:{}, ",

                    processDefinition.getId(), processDefinition.getName());

            putMsg(result, Status.TENANT_NOT_SUITABLE);

            return result;
@@ -206,7 +206,7 @@ public class ExecutorService extends BaseService{ 
            return checkResult;

        }

        if (!checkTenantSuitable(processDefinition)){

            logger.error("there is not any vaild tenant for the process definition: id:{},name:{}, ",

            logger.error("there is not any valid tenant for the process definition: id:{},name:{}, ",

                    processDefinition.getId(), processDefinition.getName());

            putMsg(result, Status.TENANT_NOT_SUITABLE);

        }
@@ -539,7 +539,7 @@ public class ExecutorService extends BaseService{ 
                    }

                }

            }else{

                logger.error("there is not vaild schedule date for the process definition: id:{},date:{}",

                logger.error("there is not valid schedule date for the process definition: id:{},date:{}",

                        processDefineId, schedule);

            }

        }else{

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/CheckUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ public class CheckUtils { 
   * @return true if other parameters are valid, otherwise return false

   */

  public static boolean checkOtherParams(String otherParams) {

    return StringUtils.isNotEmpty(otherParams) && !JSONUtils.checkJsonVaild(otherParams);

    return StringUtils.isNotEmpty(otherParams) && !JSONUtils.checkJsonValid(otherParams);

  }



  /**

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/JSONUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ public class JSONUtils { 
   * @param json json

   * @return true if valid

   */

  public static boolean checkJsonVaild(String json) {

  public static boolean checkJsonValid(String json) {



    if (StringUtils.isEmpty(json)) {

      return false;

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

+3 −3
Original line number Diff line number Diff line
@@ -117,9 +117,9 @@ public class JSONUtilsTest { 
    }



    @Test

    public void testCheckJsonVaild() {

        Assert.assertTrue(JSONUtils.checkJsonVaild("3"));

        Assert.assertFalse(JSONUtils.checkJsonVaild(""));

    public void testCheckJsonValid() {

        Assert.assertTrue(JSONUtils.checkJsonValid("3"));

        Assert.assertFalse(JSONUtils.checkJsonValid(""));

    }



    @Test

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

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ public class TaskInstanceMapperTest { 
    }



    /**

     * test find vaild task list by process instance id

     * test find valid task list by process instance id

     */

    @Test

    public void testFindValidTaskListByProcessId() {