Update XMLEncoder.

gk-brown · gk-brown · commit d0c152be2e73 · 2019-01-20T11:42:05.000-05:00
diff --git a/httprpc/src/main/java/org/httprpc/io/XMLEncoder.java b/httprpc/src/main/java/org/httprpc/io/XMLEncoder.java
@@ -20,6 +20,7 @@
 import java.io.Writer;
 import java.nio.charset.Charset;
 import java.util.Date;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 import javax.xml.stream.XMLOutputFactory;
@@ -81,41 +82,58 @@ public void write(Iterable<? extends Map<String, ?>> values, Writer writer) thro
             XMLStreamWriter streamWriter = outputFactory.createXMLStreamWriter(writer);
 
             streamWriter.writeStartDocument();
-
             streamWriter.writeStartElement(rootElementName);
 
-            for (Map<String, ?> map : values) {
-                streamWriter.writeStartElement("item");
+            writeValues(values, streamWriter);
+
+            streamWriter.writeEndElement();
+            streamWriter.writeEndDocument();
+        } catch (XMLStreamException exception) {
+            throw new IOException(exception);
+        }
+
+        writer.flush();
+    }
+
+    @SuppressWarnings("unchecked")
+    private void writeValues(Iterable<? extends Map<String, ?>> values, XMLStreamWriter streamWriter) throws XMLStreamException {
+        for (Map<String, ?> map : values) {
+            streamWriter.writeStartElement("item");
 
-                for (Map.Entry<String, ?> entry : map.entrySet()) {
-                    String key = entry.getKey();
+            LinkedHashMap<String, Iterable<?>> collections = new LinkedHashMap<>();
 
-                    if (key == null) {
-                        continue;
-                    }
+            for (Map.Entry<String, ?> entry : map.entrySet()) {
+                String key = entry.getKey();
 
-                    Object value = entry.getValue();
+                if (key == null) {
+                    continue;
+                }
 
-                    if (value == null) {
-                        continue;
-                    }
+                Object value = entry.getValue();
 
-                    // TODO Prepend ancestor keypath
+                if (value == null) {
+                    continue;
+                }
 
+                if (value instanceof Iterable<?>) {
+                    collections.put(key, (Iterable<? extends Map<String, ?>>)value);
+                } else if (value instanceof Map<?, ?>) {
+                    // TODO
+                } else {
                     encode(key, value, streamWriter);
                 }
+            }
+
+            for (Map.Entry<String, Iterable<?>> entry : collections.entrySet()) {
+                streamWriter.writeStartElement(entry.getKey());
+
+                writeValues((Iterable<? extends Map<String, ?>>)entry.getValue(), streamWriter);
 
                 streamWriter.writeEndElement();
             }
 
             streamWriter.writeEndElement();
-
-            streamWriter.writeEndDocument();
-        } catch (XMLStreamException exception) {
-            throw new IOException(exception);
         }
-
-        writer.flush();
     }
 
     private void encode(String key, Object value, XMLStreamWriter streamWriter) throws XMLStreamException {
diff --git a/httprpc/src/test/java/org/httprpc/io/XMLEncoderTest.java b/httprpc/src/test/java/org/httprpc/io/XMLEncoderTest.java
@@ -30,7 +30,9 @@ public class XMLEncoderTest extends AbstractTest {
     public void testWrite() throws IOException {
         String expected = "<?xml version=\"1.0\" ?>"
             + "<test>"
-            + "<item a=\"ABC\" b=\"1\" c=\"2.345\" d=\"{e=true}\" f=\"0\" g=\"3\"></item>"
+            + "<item a=\"ABC\" b=\"1\" c=\"2.345\" f=\"0\" g=\"3\">"
+            + "<d><item e=\"true\"></item><item e=\"false\"></item></d>"
+            + "</item>"
             + "<item a=\"DÉF\" b=\"2\" c=\"4.5678\"></item>"
             + "</test>";
 
@@ -39,8 +41,14 @@ public void testWrite() throws IOException {
                 entry("a", "ABC"),
                 entry("b", 1),
                 entry("c", 2.345),
-                entry("d", mapOf(
-                    entry("e", true)
+                entry("d", listOf(
+                    mapOf(entry("e", true)),
+                    mapOf(entry("e", false))
+                )),
+                entry("e", mapOf(
+                    entry("f", mapOf(
+                        entry("g", "XYZ")
+                    ))
                 )),
                 entry("f", new Date(0)),
                 entry("g", DayOfWeek.THURSDAY)
