gitCourseTest
diff --git a/‎httprpc/src/main/java/org/httprpc/io/XMLDecoder.java‎
Lines changed: 0 additions & 62 deletions b/‎httprpc/src/main/java/org/httprpc/io/XMLDecoder.java‎
Lines changed: 0 additions & 62 deletions
diff --git a/‎httprpc/src/main/java/org/httprpc/io/XMLEncoder.java‎
Lines changed: 38 additions & 25 deletions b/‎httprpc/src/main/java/org/httprpc/io/XMLEncoder.java‎
Lines changed: 38 additions & 25 deletions
diff --git a/‎httprpc/src/test/java/org/httprpc/io/XMLDecoderTest.java‎
Lines changed: 0 additions & 46 deletions b/‎httprpc/src/test/java/org/httprpc/io/XMLDecoderTest.java‎
Lines changed: 0 additions & 46 deletions
diff --git a/‎httprpc/src/test/java/org/httprpc/io/XMLEncoderTest.java‎
Lines changed: 1 addition & 0 deletions b/‎httprpc/src/test/java/org/httprpc/io/XMLEncoderTest.java‎
Lines changed: 1 addition & 0 deletions
@@ -84,7 +84,7 @@ public void write(Iterable<? extends Map<String, ?>> values, Writer writer) thro
             streamWriter.writeStartDocument();
             streamWriter.writeStartElement(rootElementName);
 
-            writeValues(values, streamWriter);
+            writeSequence(values, streamWriter);
 
             streamWriter.writeEndElement();
             streamWriter.writeEndDocument();
@@ -95,42 +95,55 @@ public void write(Iterable<? extends Map<String, ?>> values, Writer writer) thro
         writer.flush();
     }
 
-    @SuppressWarnings("unchecked")
-    private void writeValues(Iterable<? extends Map<String, ?>> values, XMLStreamWriter streamWriter) throws XMLStreamException {
+    private void writeSequence(Iterable<? extends Map<String, ?>> values, XMLStreamWriter streamWriter) throws XMLStreamException {
         for (Map<String, ?> map : values) {
             streamWriter.writeStartElement("item");
 
-            LinkedHashMap<String, Iterable<?>> collections = new LinkedHashMap<>();
-
-            for (Map.Entry<String, ?> entry : map.entrySet()) {
-                String key = entry.getKey();
+            writeMap(map, streamWriter);
 
-                if (key == null) {
-                    continue;
-                }
+            streamWriter.writeEndElement();
+        }
+    }
 
-                Object value = entry.getValue();
+    @SuppressWarnings("unchecked")
+    private void writeMap(Map<String, ?> map, XMLStreamWriter streamWriter) throws XMLStreamException {
+        LinkedHashMap<String, Iterable<?>> sequences = new LinkedHashMap<>();
+        LinkedHashMap<String, Map<?, ?>> maps = new LinkedHashMap<>();
 
-                if (value == null) {
-                    continue;
-                }
+        for (Map.Entry<String, ?> entry : map.entrySet()) {
+            String key = entry.getKey();
 
-                if (value instanceof Iterable<?>) {
-                    collections.put(key, (Iterable<? extends Map<String, ?>>)value);
-                } else if (value instanceof Map<?, ?>) {
-                    // TODO
-                } else {
-                    encode(key, value, streamWriter);
-                }
+            if (key == null) {
+                continue;
             }
 
-            for (Map.Entry<String, Iterable<?>> entry : collections.entrySet()) {
-                streamWriter.writeStartElement(entry.getKey());
+            Object value = entry.getValue();
 
-                writeValues((Iterable<? extends Map<String, ?>>)entry.getValue(), streamWriter);
+            if (value == null) {
+                continue;
+            }
 
-                streamWriter.writeEndElement();
+            if (value instanceof Iterable<?>) {
+                sequences.put(key, (Iterable<? extends Map<String, ?>>)value);
+            } else if (value instanceof Map<?, ?>) {
+                maps.put(key, (Map<?, ?>)value);
+            } else {
+                encode(key, value, streamWriter);
             }
+        }
+
+        for (Map.Entry<String, Iterable<?>> entry : sequences.entrySet()) {
+            streamWriter.writeStartElement(entry.getKey());
+
+            writeSequence((Iterable<? extends Map<String, ?>>)entry.getValue(), streamWriter);
+
+            streamWriter.writeEndElement();
+        }
+
+        for (Map.Entry<String, Map<?, ?>> entry : maps.entrySet()) {
+            streamWriter.writeStartElement(entry.getKey());
+
+            writeMap((Map<String, ?>)entry.getValue(), streamWriter);
 
             streamWriter.writeEndElement();
         }
 
@@ -32,6 +32,7 @@ public void testWrite() throws IOException {
             + "<test>"
             + "<item a=\"ABC\" b=\"1\" c=\"2.345\" f=\"0\" g=\"3\">"
             + "<d><item e=\"true\"></item><item e=\"false\"></item></d>"
+            + "<e><f g=\"XYZ\"></f></e>"
             + "</item>"
             + "<item a=\"DÉF\" b=\"2\" c=\"4.5678\"></item>"
             + "</test>";