This is an automated email from the ASF dual-hosted git repository.
chufenggao pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new fb9761f27a Fix alert status spelling error (#12592)
fb9761f27a is described below
commit fb9761f27a95ad65c2197cf3bc3c6fbdeb98094b
Author: 旺阳 <[email protected]>
AuthorDate: Sat Oct 29 21:33:03 2022 +0800
Fix alert status spelling error (#12592)
* fix alert status spelling error
* fix-ut
---
.../dolphinscheduler/api/controller/AlertPluginInstanceController.java | 2 +-
.../src/main/java/org/apache/dolphinscheduler/api/enums/Status.java | 2 +-
.../api/service/impl/AlertPluginInstanceServiceImpl.java | 2 +-
.../api/controller/AlertPluginInstanceControllerTest.java | 2 +-
.../dolphinscheduler/api/service/AlertPluginInstanceServiceTest.java | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/AlertPluginInstanceController.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/AlertPluginInstanceController.java
index 8cabca9556..0b7879f316 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/AlertPluginInstanceController.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/AlertPluginInstanceController.java
@@ -201,7 +201,7 @@ public class AlertPluginInstanceController extends
BaseController {
boolean exist =
alertPluginInstanceService.checkExistPluginInstanceName(alertInstanceName);
if (exist) {
logger.error("alert plugin instance {} has exist, can't create
again.", alertInstanceName);
- return Result.error(Status.PLUGIN_INSTANCE_ALREADY_EXIT);
+ return Result.error(Status.PLUGIN_INSTANCE_ALREADY_EXISTS);
} else {
return Result.success();
}
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java
index f6d8257ec9..52bb5ae94a 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java
@@ -411,7 +411,7 @@ public enum Status {
GET_ALERT_PLUGIN_INSTANCE_ERROR(110007, "get alert plugin instance error",
"获取告警组和告警组插件实例错误"),
CREATE_ALERT_PLUGIN_INSTANCE_ERROR(110008, "create alert plugin instance
error", "创建告警组和告警组插件实例错误"),
QUERY_ALL_ALERT_PLUGIN_INSTANCE_ERROR(110009, "query all alert plugin
instance error", "查询所有告警实例失败"),
- PLUGIN_INSTANCE_ALREADY_EXIT(110010, "plugin instance already exit",
"该告警插件实例已存在"),
+ PLUGIN_INSTANCE_ALREADY_EXISTS(110010, "plugin instance already exists",
"该告警插件实例已存在"),
LIST_PAGING_ALERT_PLUGIN_INSTANCE_ERROR(110011, "query plugin instance
page error", "分页查询告警实例失败"),
DELETE_ALERT_PLUGIN_INSTANCE_ERROR_HAS_ALERT_GROUP_ASSOCIATED(110012,
"failed to delete the alert instance, there is an alarm group
associated with this alert instance",
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertPluginInstanceServiceImpl.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertPluginInstanceServiceImpl.java
index 76bad9519b..8432eccf34 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertPluginInstanceServiceImpl.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertPluginInstanceServiceImpl.java
@@ -102,7 +102,7 @@ public class AlertPluginInstanceServiceImpl extends
BaseServiceImpl implements A
if
(alertPluginInstanceMapper.existInstanceName(alertPluginInstance.getInstanceName())
== Boolean.TRUE) {
logger.error("Plugin instance with the same name already exists,
name:{}.",
alertPluginInstance.getInstanceName());
- putMsg(result, Status.PLUGIN_INSTANCE_ALREADY_EXIT);
+ putMsg(result, Status.PLUGIN_INSTANCE_ALREADY_EXISTS);
return result;
}
diff --git
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/AlertPluginInstanceControllerTest.java
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/AlertPluginInstanceControllerTest.java
index fcbea7e557..df77f558a6 100644
---
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/AlertPluginInstanceControllerTest.java
+++
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/AlertPluginInstanceControllerTest.java
@@ -217,7 +217,7 @@ public class AlertPluginInstanceControllerTest extends
AbstractControllerTest {
.thenReturn(true);
Result expectResponseContent = JSONUtils.parseObject(
- "{\"code\":110010,\"msg\":\"plugin instance already
exit\",\"data\":null,\"failed\":true,\"success\":false}",
+ "{\"code\":110010,\"msg\":\"plugin instance already
exists\",\"data\":null,\"failed\":true,\"success\":false}",
Result.class);
// When
diff --git
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/AlertPluginInstanceServiceTest.java
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/AlertPluginInstanceServiceTest.java
index 4dc7a4b28b..85522d3b56 100644
---
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/AlertPluginInstanceServiceTest.java
+++
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/AlertPluginInstanceServiceTest.java
@@ -177,7 +177,7 @@ public class AlertPluginInstanceServiceTest {
Mockito.when(resourcePermissionCheckService.resourcePermissionCheck(AuthorizationType.ALERT_PLUGIN_INSTANCE,
null, 0, baseServiceLogger)).thenReturn(true);
Map<String, Object> result = alertPluginInstanceService.create(user,
1, "test", uiParams);
- Assertions.assertEquals(Status.PLUGIN_INSTANCE_ALREADY_EXIT,
result.get(Constants.STATUS));
+ Assertions.assertEquals(Status.PLUGIN_INSTANCE_ALREADY_EXISTS,
result.get(Constants.STATUS));
Mockito.when(alertPluginInstanceMapper.insert(Mockito.any())).thenReturn(1);
result = alertPluginInstanceService.create(user, 1, "test1", uiParams);
Assertions.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
