DataOutput test

Author: pjfanning

src/main/java/com/fasterxml/jackson/dataformat/xml/XmlMapper.java

@@ -1,5 +1,6 @@
 package com.fasterxml.jackson.dataformat.xml;
 
+import java.io.DataOutput;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -13,6 +14,7 @@
 
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.exc.StreamWriteException;
+import com.fasterxml.jackson.core.io.DataOutputAsStream;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.core.util.ByteArrayBuilder;
 import com.fasterxml.jackson.databind.*;
@@ -459,6 +461,12 @@ public void writeValue(OutputStream out, Object value, Charset encoding)
         _writeValueAndClose(createGenerator(out, encoding), value);
     }
 
+    public void writeValue(DataOutput out, Object value, Charset encoding)
+            throws IOException, StreamWriteException, DatabindException
+    {
+        _writeValueAndClose(createGenerator(out, encoding), value);
+    }
+
     protected final JsonGenerator createGenerator(OutputStream out, Charset encoding) throws IOException {
         this._assertNotNull("out", out);
         JsonGenerator g = ((XmlFactory) _jsonFactory).createGenerator(out, encoding);
@@ -473,4 +481,11 @@ protected final JsonGenerator createGenerator(File outputFile, Charset encoding)
         _serializationConfig.initialize(g);
         return g;
     }
+
+    protected final JsonGenerator createGenerator(DataOutput out, Charset encoding) throws IOException {
+        this._assertNotNull("out", out);
+        JsonGenerator g = ((XmlFactory) _jsonFactory).createGenerator(new DataOutputAsStream(out), encoding);
+        this._serializationConfig.initialize(g);
+        return g;
+    }
 }

src/test/java/com/fasterxml/jackson/dataformat/xml/ser/TestCharset.java

@@ -12,7 +12,7 @@ static class StringBean {
         public String 象形字;
     }
 
-    public void testBig5() throws IOException
+    public void testBig5Bytes() throws IOException
     {
         Charset big5 = Charset.forName("Big5");
         StringBean stringBean = new StringBean();
@@ -25,4 +25,16 @@ public void testBig5() throws IOException
                 "<?xml version='1.1' encoding='Big5'?><StringBean><象形字>pictogram</象形字></StringBean>";
         assertEquals(expected, xmlText);
     }
+
+    public void testBig5RoundTrip() throws IOException
+    {
+        Charset big5 = Charset.forName("Big5");
+        StringBean stringBean = new StringBean();
+        stringBean.象形字 = "pictogram";
+        XmlMapper xmlMapper = new XmlMapper();
+        xmlMapper.configure(ToXmlGenerator.Feature.WRITE_XML_1_1, true);
+        byte[] xml = xmlMapper.writeValueAsBytes(stringBean, big5);
+        StringBean stringBean1 = xmlMapper.readValue(xml, StringBean.class);
+        assertEquals(stringBean.象形字, stringBean1.象形字);
+    }
 }