feature: merge conflict

flowerfine · Jan 3, 2024 · b87da68 · b87da68
2 parents c1fca36 + ddec5b1
commit b87da68
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/...src/main/java/cn/sliew/scaleph/engine/seatunnel/service/convert/WsDiJobAttrVOConvert.java b/...src/main/java/cn/sliew/scaleph/engine/seatunnel/service/convert/WsDiJobAttrVOConvert.java
@@ -52,18 +52,12 @@ default DiJobAttrVO toDto(JsonNode entity) {
             return vo;
         }
         ObjectNode dagAttrs = (ObjectNode) entity;
-        if (dagAttrs.has(JobAttrType.VARIABLE.getValue())) {
-            Map<String, String> variable = JacksonUtil.toObject(dagAttrs.get(JobAttrType.VARIABLE.getValue()), new TypeReference<Map<String, String>>() {});
-            vo.setJobAttr(PropertyUtil.mapToFormatProp(variable));
-        }
-        if (dagAttrs.has(JobAttrType.ENV.getValue())) {
-            Map<String, String> env = JacksonUtil.toObject(dagAttrs.get(JobAttrType.ENV.getValue()), new TypeReference<Map<String, String>>() {});
-            vo.setJobProp(PropertyUtil.mapToFormatProp(env));
-        }
-        if (dagAttrs.has(JobAttrType.PROPERTIES.getValue())) {
-            Map<String, String> properties = JacksonUtil.toObject(dagAttrs.get(JobAttrType.PROPERTIES.getValue()), new TypeReference<Map<String, String>>() {});
-            vo.setEngineProp(PropertyUtil.mapToFormatProp(properties));
-        }
+        Map<String, String> variable = JacksonUtil.toObject(dagAttrs.get(JobAttrType.VARIABLE.getValue()), new TypeReference<Map<String, String>>() {});
+        Map<String, String> env = JacksonUtil.toObject(dagAttrs.get(JobAttrType.ENV.getValue()), new TypeReference<Map<String, String>>() {});
+        Map<String, String> properties = JacksonUtil.toObject(dagAttrs.get(JobAttrType.PROPERTIES.getValue()), new TypeReference<Map<String, String>>() {});
+        vo.setJobAttr(PropertyUtil.mapToFormatProp(variable));
+        vo.setJobProp(PropertyUtil.mapToFormatProp(env));
+        vo.setEngineProp(PropertyUtil.mapToFormatProp(properties));
         return vo;
     }
 }