Update TemplateEncoder.

Author: gk-brown

build.gradle

@@ -14,7 +14,7 @@
 
 subprojects {
     group = 'org.httprpc'
-    version = '5.3.1'
+    version = '5.3.2'
 
     repositories {
         mavenCentral()

kilo-client/src/main/java/org/httprpc/kilo/io/TemplateEncoder.java

@@ -15,10 +15,16 @@
 package org.httprpc.kilo.io;
 
 import org.httprpc.kilo.beans.BeanAdapter;
+import org.httprpc.kilo.xml.ElementAdapter;
+import org.w3c.dom.Document;
 
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.io.StringWriter;
 import java.io.Writer;
 import java.text.NumberFormat;
 import java.time.Instant;
@@ -580,7 +586,21 @@ private void encode(Object root, Writer writer, Reader reader) throws IOExceptio
                                 value = modifier.apply(value, modifierArguments.get(modifierName), locale, timeZone);
                             }
 
-                            value = defaultModifier.apply(value, null, locale, timeZone);
+                            if (value instanceof Document document) {
+                                var transformer = ElementAdapter.newTransformer();
+
+                                var documentWriter = new StringWriter();
+
+                                try {
+                                    transformer.transform(new DOMSource(document), new StreamResult(documentWriter));
+                                } catch (TransformerException exception) {
+                                    throw new RuntimeException(exception);
+                                }
+
+                                value = documentWriter;
+                            } else {
+                                value = defaultModifier.apply(value, null, locale, timeZone);
+                            }
 
                             writer.append(value.toString());
                         }

kilo-client/src/test/java/org/httprpc/kilo/io/TemplateEncoderTest.java

@@ -14,9 +14,14 @@
 
 package org.httprpc.kilo.io;
 
+import org.httprpc.kilo.xml.ElementAdapter;
 import org.junit.jupiter.api.Test;
+import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
 
 import java.io.IOException;
+import java.io.StringReader;
 import java.io.StringWriter;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -476,7 +481,7 @@ public void testDateFormatModifiers() throws IOException {
 
     @Test
     public void testDefaultContentType() throws IOException {
-        var templateEncoder = new TemplateEncoder(getClass(), "xml.txt");
+        var templateEncoder = new TemplateEncoder(getClass(), "default-content-type.txt");
 
         templateEncoder.setResourceBundle(ResourceBundle.getBundle(getClass().getPackageName() + ".test"));
 
@@ -547,6 +552,30 @@ public void testEmptyRecursion() throws IOException {
         assertEquals("[]", writer.toString());
     }
 
+    @Test
+    public void testEmbeddedXML() throws IOException {
+        var xml = "<abc>123</abc>";
+
+        var documentBuilder = ElementAdapter.newDocumentBuilder();
+
+        Document document;
+        try {
+            document = documentBuilder.parse(new InputSource(new StringReader(xml)));
+        } catch (SAXException | IOException exception) {
+            throw new RuntimeException(exception);
+        }
+
+        var templateEncoder = new TemplateEncoder(getClass(), "embedded-xml.txt");
+
+        var writer = new StringWriter();
+
+        templateEncoder.write(mapOf(
+            entry("xml", document)
+        ), writer);
+
+        assertEquals(xml, writer.toString());
+    }
+
     @Test
     public void testInvalidPath1() {
         var templateEncoder = new TemplateEncoder(getClass(), "invalid-path.txt");

…st/resources/org/httprpc/kilo/io/xml.txt …httprpc/kilo/io/default-content-type.txtkilo-client/src/test/resources/org/httprpc/kilo/io/xml.txt renamed to kilo-client/src/test/resources/org/httprpc/kilo/io/default-content-type.txt kilo-client/src/test/resources/org/httprpc/kilo/io/xml.txt renamed to kilo-client/src/test/resources/org/httprpc/kilo/io/default-content-type.txt

@@ -0,0 +1 @@
+{{xml}}