From 9a966e4cb263677103dfa3abaf7331c361721c85 Mon Sep 17 00:00:00 2001 From: "Mr.An" <42627702+SnowMoon-Dev@users.noreply.github.com> Date: Tue, 24 May 2022 09:17:44 +0800 Subject: [PATCH] [Fix-10199] [Workflow/Workflow Definition] After deleting messages in batches, the error message is repeated (#10201) * remove duplicate prompts * update import package (cherry picked from commit 0e8ed6ebb43c804e0264afe51657e98a54be962f) --- .../controller/ProcessDefinitionController.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionController.java index 942ac97839..b238044a16 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionController.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionController.java @@ -32,10 +32,10 @@ import org.apache.dolphinscheduler.dao.entity.User; import org.apache.commons.lang.StringUtils; import java.text.MessageFormat; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; +import java.util.Set; +import java.util.HashSet; import javax.servlet.http.HttpServletResponse; @@ -637,7 +637,7 @@ public class ProcessDefinitionController extends BaseController { @ApiParam(name = "projectCode", value = "PROJECT_CODE", required = true) @PathVariable long projectCode, @RequestParam("codes") String codes) { Map result = new HashMap<>(); - List deleteFailedCodeList = new ArrayList<>(); + Set deleteFailedCodeSet = new HashSet<>(); if (!StringUtils.isEmpty(codes)) { String[] processDefinitionCodeArray = codes.split(","); for (String strProcessDefinitionCode : processDefinitionCodeArray) { @@ -645,17 +645,17 @@ public class ProcessDefinitionController extends BaseController { try { Map deleteResult = processDefinitionService.deleteProcessDefinitionByCode(loginUser, projectCode, code); if (!Status.SUCCESS.equals(deleteResult.get(Constants.STATUS))) { - deleteFailedCodeList.add((String) deleteResult.get(Constants.MSG)); + deleteFailedCodeSet.add((String) deleteResult.get(Constants.MSG)); logger.error((String) deleteResult.get(Constants.MSG)); } } catch (Exception e) { - deleteFailedCodeList.add(MessageFormat.format(Status.DELETE_PROCESS_DEFINE_BY_CODES_ERROR.getMsg(), strProcessDefinitionCode)); + deleteFailedCodeSet.add(MessageFormat.format(Status.DELETE_PROCESS_DEFINE_BY_CODES_ERROR.getMsg(), strProcessDefinitionCode)); } } } - if (!deleteFailedCodeList.isEmpty()) { - putMsg(result, BATCH_DELETE_PROCESS_DEFINE_BY_CODES_ERROR, String.join("\n", deleteFailedCodeList)); + if (!deleteFailedCodeSet.isEmpty()) { + putMsg(result, BATCH_DELETE_PROCESS_DEFINE_BY_CODES_ERROR, String.join("\n", deleteFailedCodeSet)); } else { putMsg(result, Status.SUCCESS); }