You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ke...@apache.org on 2022/03/16 02:42:12 UTC
[dolphinscheduler] branch dev updated: AlertPluginInstanceController verifyGroupName method code optimizatio… (#8920)
This is an automated email from the ASF dual-hosted git repository.
kerwin 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 b7cf8b4 AlertPluginInstanceController verifyGroupName method code optimizatio… (#8920)
b7cf8b4 is described below
commit b7cf8b49c5d050f64d80ac2f48d0505523bffa8b
Author: yangyunxi <ya...@163.com>
AuthorDate: Wed Mar 16 10:42:03 2022 +0800
AlertPluginInstanceController verifyGroupName method code optimizatio… (#8920)
* AlertPluginInstanceController verifyGroupName method code optimization #8863
Co-authored-by: Kerwin <37...@users.noreply.github.com>
---
.../api/controller/AlertPluginInstanceController.java | 8 ++------
.../org/apache/dolphinscheduler/api/utils/Result.java | 17 +++++++++++------
2 files changed, 13 insertions(+), 12 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 43da273..4da9563 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
@@ -198,16 +198,12 @@ public class AlertPluginInstanceController extends BaseController {
@RequestParam(value = "alertInstanceName") String alertInstanceName) {
boolean exist = alertPluginInstanceService.checkExistPluginInstanceName(alertInstanceName);
- Result result = new Result();
if (exist) {
logger.error("alert plugin instance {} has exist, can't create again.", alertInstanceName);
- result.setCode(Status.PLUGIN_INSTANCE_ALREADY_EXIT.getCode());
- result.setMsg(Status.PLUGIN_INSTANCE_ALREADY_EXIT.getMsg());
+ return Result.error(Status.PLUGIN_INSTANCE_ALREADY_EXIT);
} else {
- result.setCode(Status.SUCCESS.getCode());
- result.setMsg(Status.SUCCESS.getMsg());
+ return Result.success();
}
- return result;
}
/**
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/Result.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/Result.java
index 82f9038..287ebcc 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/Result.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/Result.java
@@ -50,17 +50,18 @@ public class Result<T> {
this.msg = msg;
}
- private Result(T data) {
- this.code = 0;
- this.data = data;
- }
-
private Result(Status status) {
if (status != null) {
this.code = status.getCode();
this.msg = status.getMsg();
}
}
+
+ public Result(Integer code, String msg, T data) {
+ this.code = code;
+ this.msg = msg;
+ this.data = data;
+ }
/**
* Call this function if there is success
@@ -70,7 +71,11 @@ public class Result<T> {
* @return resule
*/
public static <T> Result<T> success(T data) {
- return new Result<>(data);
+ return new Result<>(Status.SUCCESS.getCode(), Status.SUCCESS.getMsg(), data);
+ }
+
+ public static Result success() {
+ return success(null);
}
public boolean isSuccess() {