fix

apache · Nov 4, 2024 · 78910f6 · 78910f6
1 parent 6c513dc
commit 78910f6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/...heduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/AlertInputTips.java b/...heduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/AlertInputTips.java
@@ -77,7 +77,7 @@ public String getMsg() {
     }
 
     public static Map<String, String> getAllMsg(AlertInputTips alertInputTips) {
-        HashMap<String, String> allMsgMap = new HashMap<>(16);
+        Map<String, String> allMsgMap = new HashMap<>();
         allMsgMap.put("zhMsg", alertInputTips.zhMsg);
         allMsgMap.put("enMsg", alertInputTips.enMsg);
         return allMsgMap;

diff --git a/...eduler-api/src/test/java/org/apache/dolphinscheduler/api/service/UiPluginServiceTest.java b/...eduler-api/src/test/java/org/apache/dolphinscheduler/api/service/UiPluginServiceTest.java
@@ -20,6 +20,7 @@
 import org.apache.dolphinscheduler.api.enums.Status;
 import org.apache.dolphinscheduler.api.service.impl.UiPluginServiceImpl;
 import org.apache.dolphinscheduler.common.enums.PluginType;
+import org.apache.dolphinscheduler.common.utils.JSONUtils;
 import org.apache.dolphinscheduler.dao.entity.PluginDefine;
 import org.apache.dolphinscheduler.dao.mapper.PluginDefineMapper;
 
@@ -35,6 +36,8 @@
 import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 
+import com.fasterxml.jackson.databind.node.ArrayNode;
+
 /**
  * ui plugin service test
  */
@@ -51,7 +54,8 @@ public class UiPluginServiceTest {
 
     @BeforeEach
     public void before() {
-        String pluginParams = "[{\"field\":\"receivers\",\"props\":null,\"type\"}]";
+        String pluginParams =
+                "[{\"field\":\"receivers\",\"props\":{\"placeholder\":\"{\\\"zhMsg\\\": \\\"请输入收件人\\\",\\\"enMsg\\\": \\\"pleaseinputreceivers\\\"}\"},\"type\":\"input\"}]";
         pluginDefine = new PluginDefine("email-alert", "alert", pluginParams);
     }
 
@@ -82,6 +86,12 @@ public void testQueryPluginDetailById() {
         Mockito.when(pluginDefineMapper.queryDetailById(1)).thenReturn(pluginDefine);
         result = uiPluginService.queryUiPluginDetailById(1);
         Assertions.assertEquals(Status.SUCCESS, result.get("status"));
+
+        PluginDefine data = (PluginDefine) result.get("data");
+        String pluginParams = data.getPluginParams();
+        ArrayNode arrayNode = JSONUtils.parseArray(pluginParams);
+        String placeholder = arrayNode.path(0).path("props").path("placeholder").asText();
+        Assertions.assertEquals(2, JSONUtils.toMap(placeholder).size());
     }
 
 }