Merge pull request #252 from logzio/DEV-20299-Fix-Sawmill-XML-Process…

…or-Creates-Empty-Object DEV-20299 Fix Sawmill XML Processor Creates Empty Object
logzio · Jan 6, 2021 · 0cb482b · 0cb482b
2 parents c674794 + 5a05507
commit 0cb482b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/sawmill-core/src/main/java/io/logz/sawmill/Doc.java b/sawmill-core/src/main/java/io/logz/sawmill/Doc.java
@@ -1,6 +1,5 @@
 package io.logz.sawmill;
 
-import static com.google.common.base.Preconditions.checkState;
 import org.apache.commons.collections4.MapUtils;
 
 import java.util.ArrayList;
@@ -9,6 +8,8 @@
 import java.util.Map;
 import java.util.Optional;
 
+import static com.google.common.base.Preconditions.checkState;
+
 public class Doc {
 
     private final Map<String, Object> source;

diff --git a/sawmill-core/src/main/java/io/logz/sawmill/processors/XmlProcessor.java b/sawmill-core/src/main/java/io/logz/sawmill/processors/XmlProcessor.java
@@ -104,33 +104,38 @@ public ProcessResult process(Doc doc) {
                 xmlNodes.forEach(doc::addField);
             }
         }
+
         return ProcessResult.success();
     }
 
     private Map<String, Object> extractNodes(Node parent) {
         Map<String, Object> xmlNodes = new HashMap<>();
         NodeList nodes = parent.getChildNodes();
+
         for (int i = 0; i < nodes.getLength(); i++) {
             Node node = nodes.item(i);
 
             String key = node.getNodeName();
             Object value;
 
-            if (node.getChildNodes().getLength() == 1 &&
-                    node.getChildNodes().item(0).getNodeValue() != null) {
+            if (node.getChildNodes().getLength() == 1
+                    && node.getChildNodes().item(0) != null
+                    && node.getChildNodes().item(0).getNodeValue() != null ) {
                 value = node.getChildNodes().item(0).getNodeValue();
             } else {
                 value = extractNodes(node);
             }
 
             xmlNodes.compute(key, (k, oldVal) -> {
+                if (node.getChildNodes().item(0) == null) { return oldVal; }
                 if (oldVal == null) return value;
                 if (oldVal instanceof List) {
                     ((List) oldVal).add(value);
                     return oldVal;
                 }
                 return new ArrayList<>(Arrays.asList(oldVal, value));
             });
+
         }
 
         return xmlNodes;
@@ -190,5 +195,6 @@ public Map<String, String> getXpath() {
         public boolean isStoreXml() {
             return storeXml;
         }
+
     }
 }
diff --git a/sawmill-core/src/test/java/io/logz/sawmill/processors/XmlProcessorTest.java b/sawmill-core/src/test/java/io/logz/sawmill/processors/XmlProcessorTest.java
@@ -47,6 +47,8 @@ public void testValidXml() {
         assertThat(processResult.isSucceeded()).isTrue();
         assertThat((String) doc.getField("country.id")).isEqualTo("1");
         assertThat((String) doc.getField("country.name")).isEqualTo("Israel");
+        assertThat(doc.hasField("country.TestEmptyField")).isFalse();
+        assertThatThrownBy(() -> doc.getField("country.TestEmptyField")).isInstanceOf(IllegalStateException.class);
         assertThat((List) doc.getField("country.cities.city"))
                 .isEqualTo(Arrays.asList(ImmutableMap.of("name", "Jerusalem"),
                         ImmutableMap.of("name", "Tel Aviv")));

diff --git a/sawmill-core/src/test/resources/xml_valid.xml b/sawmill-core/src/test/resources/xml_valid.xml
@@ -1,6 +1,7 @@
 <country>
     <id>1</id>
     <name>Israel</name>
+    <TestEmptyField></TestEmptyField>
     <cities>
         <city><name>Jerusalem</name></city>
         <city><name>Tel Aviv</name></city>