You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by te...@apache.org on 2020/02/15 10:55:27 UTC
[incubator-dolphinscheduler] branch dev updated: rename vaild to
valid (#1961)
This is an automated email from the ASF dual-hosted git repository.
technoboy pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 99ac739 rename vaild to valid (#1961)
99ac739 is described below
commit 99ac7398518ba5f0970b192cecd40024d8006075
Author: gabry.wu <wu...@qq.com>
AuthorDate: Sat Feb 15 18:55:16 2020 +0800
rename vaild to valid (#1961)
---
.../org/apache/dolphinscheduler/api/service/ExecutorService.java | 6 +++---
.../main/java/org/apache/dolphinscheduler/api/utils/CheckUtils.java | 2 +-
.../java/org/apache/dolphinscheduler/common/utils/JSONUtils.java | 2 +-
.../org/apache/dolphinscheduler/common/utils/JSONUtilsTest.java | 6 +++---
.../apache/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 6edd48d..0389890 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 c5c7024..a888712 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 9e9e4f6..ec523b1 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 799874a..bd924e4 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 c60cc3a..16ba4b0 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() {