[dolphinscheduler] branch dev updated: [Feature][dolphinscheduler-api] Return domain object after creating success (#8825)

[wenjun]

This is an automated email from the ASF dual-hosted git repository.

wenjun 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 5fa1c4e  [Feature][dolphinscheduler-api] Return domain object after 
creating success (#8825)
5fa1c4e is described below

commit 5fa1c4e7e3d2b0ea8ec30e6981c0ca9997cfaa29
Author: ouyangyewei <ouyangye...@foxmail.com>
AuthorDate: Sun Mar 13 21:20:36 2022 +0800

    [Feature][dolphinscheduler-api] Return domain object after creating success 
(#8825)
    
    Co-authored-by: ouyangyewei <yewei.o...@alibaba-inc.com>
---
 .../dolphinscheduler/api/service/impl/AlertGroupServiceImpl.java   | 7 ++++++-
 .../api/service/impl/AlertPluginInstanceServiceImpl.java           | 2 +-
 .../apache/dolphinscheduler/api/service/AlertGroupServiceTest.java | 1 +
 .../api/service/AlertPluginInstanceServiceTest.java                | 1 +
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git 
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertGroupServiceImpl.java
 
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertGroupServiceImpl.java
index 2e31920..afd0846 100644
--- 
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertGroupServiceImpl.java
+++ 
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertGroupServiceImpl.java
@@ -157,7 +157,12 @@ public class AlertGroupServiceImpl extends BaseServiceImpl 
implements AlertGroup
         // insert
         try {
             int insert = alertGroupMapper.insert(alertGroup);
-            putMsg(result, insert > 0 ? Status.SUCCESS : 
Status.CREATE_ALERT_GROUP_ERROR);
+            if (insert > 0) {
+                result.put(Constants.DATA_LIST, alertGroup);
+                putMsg(result, Status.SUCCESS);
+            } else {
+                putMsg(result, Status.CREATE_ALERT_GROUP_ERROR);
+            }
         } catch (DuplicateKeyException ex) {
             logger.error("Create alert group error.", ex);
             putMsg(result, Status.ALERT_GROUP_EXIST);
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 ec55880..0848968 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
@@ -91,8 +91,8 @@ public class AlertPluginInstanceServiceImpl extends 
BaseServiceImpl implements A
         }
 
         int i = alertPluginInstanceMapper.insert(alertPluginInstance);
-
         if (i > 0) {
+            result.put(Constants.DATA_LIST, alertPluginInstance);
             putMsg(result, Status.SUCCESS);
             return result;
         }
diff --git 
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/AlertGroupServiceTest.java
 
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/AlertGroupServiceTest.java
index 443b68e..b78e329 100644
--- 
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/AlertGroupServiceTest.java
+++ 
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/AlertGroupServiceTest.java
@@ -110,6 +110,7 @@ public class AlertGroupServiceTest {
         result = alertGroupService.createAlertgroup(user, groupName, 
groupName, null);
         logger.info(result.toString());
         Assert.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
+        Assert.assertNotNull(result.get(Constants.DATA_LIST));
     }
 
     @Test
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 071d59b..bb36487 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
@@ -163,6 +163,7 @@ public class AlertPluginInstanceServiceTest {
         
Mockito.when(alertPluginInstanceMapper.insert(Mockito.any())).thenReturn(1);
         result = alertPluginInstanceService.create(user, 1, "test1", uiParams);
         Assert.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
+        Assert.assertNotNull(result.get(Constants.DATA_LIST));
     }
 
     @Test