Merge pull request #420 from msgpack/jackson-dataformat-msgpack-parse-str-as-bin

Make MessagePackParser accept a string as a byte array field

Author: komamitsu

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

@@ -32,7 +32,6 @@
 import org.msgpack.core.MessageFormat;
 import org.msgpack.core.MessagePack;
 import org.msgpack.core.MessageUnpacker;
-import org.msgpack.core.Preconditions;
 import org.msgpack.core.buffer.ArrayBufferInput;
 import org.msgpack.core.buffer.InputStreamBufferInput;
 import org.msgpack.core.buffer.MessageBufferInput;
@@ -419,8 +418,14 @@ public int getTextOffset()
     public byte[] getBinaryValue(Base64Variant b64variant)
             throws IOException, JsonParseException
     {
-        Preconditions.checkArgument(type == Type.BYTES);
-        return bytesValue;
+        switch (type) {
+            case BYTES:
+                return bytesValue;
+            case STRING:
+                return stringValue.getBytes(MessagePack.UTF8);
+            default:
+                throw new IllegalStateException("Invalid type=" + type);
+        }
     }
 
     @Override

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

@@ -160,6 +160,12 @@ public void setS(String s)
         }
     }
 
+    public static class BinKeyPojo
+    {
+        public byte[] b;
+        public String s;
+    }
+
     public static class UsingCustomConstructorPojo
     {
         final String name;

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

@@ -758,4 +758,26 @@ public Object deserialize(byte[] data)
         }
         assertThat((String) values.get(4), is("Java"));
     }
+
+    @Test
+    public void parserShouldReadStrAsBin()
+            throws IOException
+    {
+        MessagePacker packer = MessagePack.newDefaultPacker(out);
+        packer.packMapHeader(2);
+        // #1
+        packer.packString("s");
+        packer.packString("foo");
+        // #2
+        packer.packString("b");
+        packer.packString("bar");
+
+        packer.flush();
+
+        byte[] bytes = out.toByteArray();
+
+        BinKeyPojo binKeyPojo = objectMapper.readValue(bytes, BinKeyPojo.class);
+        assertEquals("foo", binKeyPojo.s);
+        assertArrayEquals("bar".getBytes(), binKeyPojo.b);
+    }
 }