Use original codec to support v0.6 format when serializing complex type

Author: komamitsu

msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackGenerator.java

@@ -22,11 +22,11 @@
 import com.fasterxml.jackson.core.base.GeneratorBase;
 import com.fasterxml.jackson.core.io.SerializedString;
 import com.fasterxml.jackson.core.json.JsonWriteContext;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.msgpack.core.MessagePack;
 import org.msgpack.core.MessagePacker;
 import org.msgpack.core.buffer.OutputStreamBufferOutput;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.math.BigDecimal;
@@ -243,10 +243,10 @@ else if (v instanceof MessagePackExtensionType) {
         }
         else {
             messagePacker.flush();
-            MessagePackFactory messagePackFactory = new MessagePackFactory(packerConfig);
-            messagePackFactory.setReuseResourceInGenerator(false);
-            ObjectMapper objectMapper = new ObjectMapper(messagePackFactory);
-            output.write(objectMapper.writeValueAsBytes(v));
+            ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+            MessagePackGenerator messagePackGenerator = new MessagePackGenerator(getFeatureMask(), getCodec(), outputStream, packerConfig, false);
+            getCodec().writeValue(messagePackGenerator, v);
+            output.write(outputStream.toByteArray());
         }
     }
 

msgpack-jackson/src/test/java/org/msgpack/jackson/dataformat/MessagePackGeneratorTest.java

@@ -711,4 +711,25 @@ public void testComplexTypeKey()
         assertThat(unpacker.unpackString(), is("foo"));
         assertThat(unpacker.unpackInt(), is(42));
     }
+
+    @Test
+    public void testComplexTypeKeyWithV06Format()
+            throws IOException
+    {
+        HashMap<TinyPojo, Integer> map = new HashMap<TinyPojo, Integer>();
+        TinyPojo pojo = new TinyPojo();
+        pojo.t = "foo";
+        map.put(pojo, 42);
+
+        ObjectMapper objectMapper = new ObjectMapper(new MessagePackFactory());
+        objectMapper.setAnnotationIntrospector(new JsonArrayFormat());
+        objectMapper.setSerializerFactory(new MessagePackSerializerFactory());
+        byte[] bytes = objectMapper.writeValueAsBytes(map);
+
+        MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(bytes);
+        assertThat(unpacker.unpackMapHeader(), is(1));
+        assertThat(unpacker.unpackArrayHeader(), is(1));
+        assertThat(unpacker.unpackString(), is("foo"));
+        assertThat(unpacker.unpackInt(), is(42));
+    }
 }