From 99ac7398518ba5f0970b192cecd40024d8006075 Mon Sep 17 00:00:00 2001
From: "gabry.wu" <wu_shao_jie@qq.com>
Date: Sat, 15 Feb 2020 18:55:16 +0800
Subject: [PATCH] rename vaild to valid (#1961)

---
 .../dolphinscheduler/api/service/ExecutorService.java       | 6 +++---
 .../org/apache/dolphinscheduler/api/utils/CheckUtils.java   | 2 +-
 .../org/apache/dolphinscheduler/common/utils/JSONUtils.java | 2 +-
 .../apache/dolphinscheduler/common/utils/JSONUtilsTest.java | 6 +++---
 .../dolphinscheduler/dao/mapper/TaskInstanceMapperTest.java | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
index 6edd48d499..0389890691 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
@@ -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{
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/CheckUtils.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/CheckUtils.java
index c5c702404d..a888712511 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/CheckUtils.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/CheckUtils.java
@@ -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);
   }
 
   /**
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/JSONUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/JSONUtils.java
index 9e9e4f6546..ec523b1ff2 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/JSONUtils.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/JSONUtils.java
@@ -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;
diff --git a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/JSONUtilsTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/JSONUtilsTest.java
index 799874ad71..bd924e4852 100644
--- a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/JSONUtilsTest.java
+++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/JSONUtilsTest.java
@@ -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
diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapperTest.java
index c60cc3a655..16ba4b06c4 100644
--- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapperTest.java
+++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapperTest.java
@@ -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() {