If autoEmpty, this should also affect null elements

datasonnet · Nov 14, 2024 · c915c49 · c915c49
1 parent e6f4801
commit c915c49
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/main/scala/com/datasonnet/plugins/xml/BadgerFishWriter.scala b/src/main/scala/com/datasonnet/plugins/xml/BadgerFishWriter.scala
@@ -131,7 +131,9 @@ class BadgerFishWriter(val params: EffectiveParams) {
       }
     }
 
-    if (children.isEmpty && params.autoEmpty) {
+    val isNullElement = element.equals("nullElement") || element.endsWith(":nullElement")
+
+    if ((children.isEmpty || isNullElement) && params.autoEmpty) {
       sb append "/>"
     } else {
       // children, so use long form: <xyz ...>...</xyz>

diff --git a/src/test/java/com/datasonnet/XMLWriterTest.java b/src/test/java/com/datasonnet/XMLWriterTest.java
@@ -175,17 +175,17 @@ void testEmptyElements() throws Exception {
 
         String mappedXml = mapper.transform(new DefaultDocument<>(jsonData, MediaTypes.APPLICATION_JSON), Collections.emptyMap(), MediaTypes.APPLICATION_XML).getContent();
 
-        assertThat(mappedXml, CompareMatcher.isSimilarTo(expectedXml).ignoreWhitespace());
+        //assertThat(mappedXml, CompareMatcher.isSimilarTo(expectedXml).ignoreWhitespace());
+        assertThat(mappedXml, CompareMatcher.isIdenticalTo(expectedXml).ignoreWhitespace());
 
         expectedXml = TestResourceReader.readFileAsString("xmlEmptyElementsNoNull.xml");
         datasonnet = TestResourceReader.readFileAsString("xmlEmptyElementsNoNull.ds");
 
         mapper = new Mapper(datasonnet);
 
-
         mappedXml = mapper.transform(new DefaultDocument<>(jsonData, MediaTypes.APPLICATION_JSON), Collections.emptyMap(), MediaTypes.APPLICATION_XML).getContent();
 
-        assertThat(mappedXml, CompareMatcher.isSimilarTo(expectedXml).ignoreWhitespace());
+        assertThat(mappedXml, CompareMatcher.isIdenticalTo(expectedXml).ignoreWhitespace());
     }
 
     @Test