From d8cf0f8b85af44818db70b5f8afa30d565905c8f Mon Sep 17 00:00:00 2001 From: ligen Date: Tue, 4 Jul 2023 16:20:14 +0800 Subject: [PATCH] fix issue#14441 (#14441) (#14444) alert-plugin-instances api, if no alert-plugin-instances, it will response an empty list, but not null Co-authored-by: ligen60 --- .../api/service/impl/AlertPluginInstanceServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 d7c7581f11..8a77821453 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 @@ -243,16 +243,16 @@ public class AlertPluginInstanceServiceImpl extends BaseServiceImpl implements A } private List buildPluginInstanceVOList(List alertPluginInstances) { + List alertPluginInstanceVOS = new ArrayList<>(); if (CollectionUtils.isEmpty(alertPluginInstances)) { - return null; + return alertPluginInstanceVOS; } List pluginDefineList = pluginDefineMapper.queryAllPluginDefineList(); if (CollectionUtils.isEmpty(pluginDefineList)) { - return null; + return alertPluginInstanceVOS; } Map pluginDefineMap = pluginDefineList.stream().collect(Collectors.toMap(PluginDefine::getId, Function.identity())); - List alertPluginInstanceVOS = new ArrayList<>(); alertPluginInstances.forEach(alertPluginInstance -> { AlertPluginInstanceVO alertPluginInstanceVO = new AlertPluginInstanceVO();