Merge branch 'master' of https://github.com/tomwilkie/msgpack-java

muga · muga · commit 49d80eaa9584 · 2013-01-19T16:12:00.000+09:00
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,7 @@ target
 .settings
 .iml
 *~
+._*
+.DS_Store
+build
+lib
diff --git a/src/main/java/org/msgpack/MessagePack.java b/src/main/java/org/msgpack/MessagePack.java
@@ -340,6 +340,23 @@ public <T> T read(byte[] bytes, T v) throws IOException {
         return read(bytes, v, tmpl);
     }
 
+    /**
+     * Deserializes byte array to object.
+     * 
+     * @since 0.6.0
+     * @param bytes
+     *            input byte array
+     * @param v
+     * @return
+     * @throws IOException
+     */
+    public <T> T read(byte[] bytes, int off, int len, Class<T> c) throws IOException {
+    	@SuppressWarnings("unchecked")
+        Template<T> tmpl = registry.lookup(c);
+        BufferUnpacker u = createBufferUnpacker(bytes, off, len);
+        return (T) tmpl.read(u, null);
+    }
+    
     /**
      * Deserializes byte array to object according to template.
      * 
diff --git a/src/main/java/org/msgpack/template/builder/ArrayTemplateBuilder.java b/src/main/java/org/msgpack/template/builder/ArrayTemplateBuilder.java
@@ -29,6 +29,7 @@
 import org.msgpack.packer.Packer;
 import org.msgpack.template.AbstractTemplate;
 import org.msgpack.template.BooleanArrayTemplate;
+import org.msgpack.template.ByteArrayTemplate;
 import org.msgpack.template.DoubleArrayTemplate;
 import org.msgpack.template.FieldList;
 import org.msgpack.template.FloatArrayTemplate;
@@ -156,6 +157,8 @@ private Template toTemplate(Type arrayType, Type genericBaseType, Class baseClas
                 return FloatArrayTemplate.getInstance();
             } else if (baseClass == double.class) {
                 return DoubleArrayTemplate.getInstance();
+            } else if (baseClass == byte.class) {
+                return ByteArrayTemplate.getInstance();
             } else {
                 Template baseTemplate = registry.lookup(genericBaseType);
                 return new ObjectArrayTemplate(baseClass, baseTemplate);
diff --git a/src/test/java/org/msgpack/TestSimpleArrays.java b/src/test/java/org/msgpack/TestSimpleArrays.java
@@ -262,6 +262,7 @@ public void testGenerics() throws Exception {
     @Message
     public static class Dim2Test {
 	public int[][] i;
+	public byte[][] b;
 	public String[][] str;
 	public List<String>[][] slist;
 
@@ -277,6 +278,9 @@ public void testDim2() throws Exception {
 	t.i = new int[2][];
 	t.i[0] = new int[] { 0, 1 };
 	t.i[1] = new int[] { 2, 3, 4 };
+	t.b = new byte[2][];
+	t.b[0] = new byte[] { 5, 6 };
+	t.b[1] = new byte[] { 7, 8, 9 };
 	t.str = new String[2][];
 	t.str[0] = new String[] { "aa", "bb" };
 	t.str[1] = new String[] { "cc", "dd", "ee" };
@@ -298,21 +302,28 @@ public void testDim2() throws Exception {
 	byte[] raw = packer.toByteArray();
 	BufferUnpacker unpacker = msgpack.createBufferUnpacker(raw);
 	Dim2Test u = unpacker.read(Dim2Test.class);
-	assertEquals(t.i.length, t.i.length);
+	assertEquals(t.i.length, u.i.length);
 	for (int i = 0; i < t.i.length; i++) {
 	    assertEquals(t.i[i].length, u.i[i].length);
 	    for (int j = 0; j < t.i[i].length; j++) {
 		assertEquals(t.i[i][j], u.i[i][j]);
 	    }
 	}
-	assertEquals(t.str.length, t.str.length);
+	assertEquals(t.b.length, u.b.length);
+	for (int i = 0; i < t.b.length; i++) {
+	    assertEquals(t.b[i].length, u.b[i].length);
+	    for (int j = 0; j < t.i[i].length; j++) {
+		assertEquals(t.b[i][j], u.b[i][j]);
+	    }
+	}
+	assertEquals(t.str.length, u.str.length);
 	for (int i = 0; i < t.str.length; i++) {
 	    assertEquals(t.str[i].length, u.str[i].length);
 	    for (int j = 0; j < t.str[i].length; j++) {
 		assertEquals(t.str[i][j], u.str[i][j]);
 	    }
 	}
-	assertEquals(t.slist.length, t.slist.length);
+	assertEquals(t.slist.length, u.slist.length);
 	for (int i = 0; i < t.slist.length; i++) {
 	    assertEquals(t.slist[i].length, u.slist[i].length);
 	    for (int j = 0; j < t.slist[i].length; j++) {
