Exclude condition in json response when condition is null. (#2022)

azkaban · Nov 10, 2018 · d399897 · d399897
1 parent d33e82e
commit d399897
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/azkaban-web-server/src/main/java/azkaban/webapp/servlet/ExecutorServlet.java b/azkaban-web-server/src/main/java/azkaban/webapp/servlet/ExecutorServlet.java
@@ -867,7 +867,9 @@ private Map<String, Object> getExecutableNodeInfo(final ExecutableNode node) {
     nodeObj.put("endTime", node.getEndTime());
     nodeObj.put("updateTime", node.getUpdateTime());
     nodeObj.put("type", node.getType());
-    nodeObj.put("condition", node.getCondition());
+    if (node.getCondition() != null) {
+      nodeObj.put("condition", node.getCondition());
+    }
     nodeObj.put("nestedId", node.getNestedId());
 
     nodeObj.put("attempt", node.getAttempt());

diff --git a/azkaban-web-server/src/main/java/azkaban/webapp/servlet/ProjectManagerServlet.java b/azkaban-web-server/src/main/java/azkaban/webapp/servlet/ProjectManagerServlet.java
@@ -801,7 +801,9 @@ private void fillFlowInfo(final Project project, final String flowId,
       final HashMap<String, Object> nodeObj = new HashMap<>();
       nodeObj.put("id", node.getId());
       nodeObj.put("type", node.getType());
-      nodeObj.put("condition", node.getCondition());
+      if (node.getCondition() != null) {
+        nodeObj.put("condition", node.getCondition());
+      }
       if (node.getEmbeddedFlowId() != null) {
         nodeObj.put("flowId", node.getEmbeddedFlowId());
         fillFlowInfo(project, node.getEmbeddedFlowId(), nodeObj);