check whether category is valid

weibocom · Feb 28, 2024 · 7648dc7 · 7648dc7
1 parent febdc3b
commit 7648dc7
Showing 1 changed file with 21 additions and 5 deletions.
diff --git a/rill-flow-impl/src/main/java/com/weibo/rill/flow/impl/service/TaskTemplateServiceImpl.java b/rill-flow-impl/src/main/java/com/weibo/rill/flow/impl/service/TaskTemplateServiceImpl.java
@@ -114,7 +114,11 @@ private List<TaskTemplate> getTaskTemplatesFromDB(TaskTemplateParams params, int
             return taskTemplateList;
         }
         for (TaskTemplateDO taskTemplateDO : taskTemplateDOList) {
-            taskTemplateList.add(turnTaskTemplateDOToTaskTemplate(taskTemplateDO));
+            try {
+                taskTemplateList.add(turnTaskTemplateDOToTaskTemplate(taskTemplateDO));
+            } catch (Exception e) {
+                log.error("taskTemplateDO to taskTemplate error", e);
+            }
         }
         return taskTemplateList;
     }
@@ -141,6 +145,10 @@ private List<AbstractTaskRunner> getTaskRunners(TaskTemplateParams params) {
     }
 
     private TaskTemplate turnTaskTemplateDOToTaskTemplate(TaskTemplateDO taskTemplateDO) {
+        AbstractTaskRunner taskRunner = taskRunnerMap.get(taskTemplateDO.getCategory() + "TaskRunner");
+        if (taskRunner == null) {
+            throw new IllegalArgumentException("模板 category 不存在");
+        }
         TaskTemplate result = new TaskTemplate();
         result.setId(taskTemplateDO.getId());
         result.setCategory(taskTemplateDO.getCategory());
@@ -153,7 +161,6 @@ private TaskTemplate turnTaskTemplateDOToTaskTemplate(TaskTemplateDO taskTemplat
         result.setEnable(taskTemplateDO.getEnable());
         result.setTypeStr(TaskTemplateTypeEnum.getEnumByType(taskTemplateDO.getType()).getDesc());
         result.setNodeType("template");
-        AbstractTaskRunner taskRunner = taskRunnerMap.get(taskTemplateDO.getCategory() + "TaskRunner");
         MetaData metaData = MetaData.builder().icon(taskRunner.getIcon()).fields(taskRunner.getFields()).build();
         result.setMetaData(metaData);
         return result;
@@ -182,9 +189,7 @@ private TaskTemplate turnMetaDataToTaskTemplate(AbstractTaskRunner taskRunner) {
     public long createTaskTemplate(JSONObject taskTemplate) {
         try {
             TaskTemplateDO taskTemplateDO = JSONObject.parseObject(taskTemplate.toJSONString(), TaskTemplateDO.class);
-            if (taskTemplateDO == null || taskTemplateDO.getName() == null || taskTemplateDO.getType() == null) {
-                throw new IllegalArgumentException("task_template can't be null");
-            }
+            checkTaskTemplateDOValid(taskTemplateDO);
             // set default value if field is null
             setTemplateDOBeforeCreate(taskTemplateDO);
             return taskTemplateDAO.insert(taskTemplateDO);
@@ -194,6 +199,17 @@ public long createTaskTemplate(JSONObject taskTemplate) {
         }
     }
 
+    private static void checkTaskTemplateDOValid(TaskTemplateDO taskTemplateDO) {
+        if (taskTemplateDO == null || taskTemplateDO.getName() == null || taskTemplateDO.getType() == null) {
+            throw new IllegalArgumentException("task_template can't be null");
+        }
+        String category = taskTemplateDO.getCategory();
+        TaskCategory taskCategory = TaskCategory.getEnumByValue(category);
+        if (taskCategory == null) {
+            throw new IllegalArgumentException("task_template category is illegal");
+        }
+    }
+
     private static void setTemplateDOBeforeCreate(TaskTemplateDO taskTemplateDO) {
         if (taskTemplateDO.getIcon() == null) {
             taskTemplateDO.setIcon("");