added T Unpacker#read(Template<T>)

frsyuki · frsyuki · commit e0f1aa01a98c · 2011-09-22T14:13:02.000+09:00
diff --git a/src/main/java/org/msgpack/unpacker/AbstractUnpacker.java b/src/main/java/org/msgpack/unpacker/AbstractUnpacker.java
@@ -70,22 +70,27 @@ public Value readValue() throws IOException {
 
     protected abstract boolean tryReadNil() throws IOException;
 
+    @Override
+    public <T> T read(Template<T> template) throws IOException {
+        return template.read(this, null);
+    }
+
     @Override
     public <T> T read(Class<T> klass) throws IOException {
         if(tryReadNil()) {
             return null;
         }
-        Template<? super T> tmpl = msgpack.lookup(klass);
-        return (T) tmpl.read(this, null);
+        Template<T> tmpl = msgpack.lookup(klass);
+        return tmpl.read(this, null);
     }
 
     @Override
     public <T> T read(T to) throws IOException {
         if(tryReadNil()) {
             return null;
         }
-        Template<? super T> tmpl = msgpack.lookup((Class<T>) to.getClass());
-        return (T) tmpl.read(this, to);
+        Template<T> tmpl = msgpack.lookup((Class<T>) to.getClass());
+        return tmpl.read(this, to);
     }
 }
 
diff --git a/src/main/java/org/msgpack/unpacker/Unpacker.java b/src/main/java/org/msgpack/unpacker/Unpacker.java
@@ -23,13 +23,16 @@
 import java.math.BigInteger;
 import java.lang.Iterable;
 import org.msgpack.type.Value;
+import org.msgpack.template.Template;
 
 /**
  * Standard deserializer.
  *
  * @version 0.6.0
  */
 public interface Unpacker extends Iterable<Value>, Closeable {
+    public <T> T read(Template<T> template) throws IOException;
+
     public <T> T read(Class<T> klass) throws IOException;
 
     public <T> T read(T to) throws IOException;
diff --git a/src/test/java/org/msgpack/template/TestTemplates.java b/src/test/java/org/msgpack/template/TestTemplates.java
@@ -19,7 +19,6 @@
 import org.msgpack.unpacker.BufferUnpacker;
 
 import static org.msgpack.template.Templates.*;
-import static org.msgpack.template.Templates.TByte;
 
 import org.junit.Test;
 
diff --git a/src/test/java/org/msgpack/unpacker/TestReadTemplate.java b/src/test/java/org/msgpack/unpacker/TestReadTemplate.java
@@ -0,0 +1,100 @@
+package org.msgpack.unpacker;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+import java.util.Date;
+import java.math.BigInteger;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+
+import org.msgpack.MessagePack;
+import org.msgpack.packer.Packer;
+import org.msgpack.packer.BufferPacker;
+import org.msgpack.unpacker.Unpacker;
+import org.msgpack.unpacker.BufferUnpacker;
+import org.msgpack.template.Template;
+
+import static org.msgpack.template.Templates.*;
+
+import org.junit.Test;
+import org.junit.Ignore;
+
+
+public class TestReadTemplate {
+    public static enum MyEnum {
+        A, B, C;
+    }
+
+    @Test
+    public void testReadTemplateNull() throws IOException {
+        Byte tbyte = u().read(TByte);
+        assertNull(tbyte);
+
+        Short tshort = u().read(TShort);
+        assertNull(tshort);
+
+        Integer tinteger = u().read(TInteger);
+        assertNull(tinteger);
+
+        Long tlong = u().read(TLong);
+        assertNull(tlong);
+
+        Character tcharacter = u().read(TCharacter);
+        assertNull(tcharacter);
+
+        BigInteger tbiginteger = u().read(TBigInteger);
+        assertNull(tbiginteger);
+
+        BigDecimal tbigdecimail = u().read(TBigDecimal);
+        assertNull(tbigdecimail);
+
+        Float tfloat = u().read(TFloat);
+        assertNull(tfloat);
+
+        Double tdouble = u().read(TDouble);
+        assertNull(tdouble);
+
+        Boolean tboolean = u().read(TBoolean);
+        assertNull(tboolean);
+
+        String tstring = u().read(TString);
+        assertNull(tstring);
+
+        byte[] tbytearray = u().read(TByteArray);
+        assertNull(tbytearray);
+
+        ByteBuffer tbytebuffer = u().read(TByteBuffer);
+        assertNull(tbytebuffer);
+
+        Date tdate = u().read(TDate);
+        assertNull(tdate);
+
+        List<String> tlist = u().read(tList(TString));
+        assertNull(tlist);
+
+        Map<String,Integer> tmap = u().read(tMap(TString, TInteger));
+        assertNull(tmap);
+
+        Collection<Long> tcollection = u().read(tCollection(TLong));
+        assertNull(tcollection);
+
+        //MyEnum tordinalenum = u().read(tOrdinalEnum(MyEnum.class));
+        //assertNull(tordinalenum);
+    }
+
+    // return unpacker that can read a nil
+    private Unpacker u() throws IOException {
+        MessagePack msgpack = new MessagePack();
+        BufferPacker pk = msgpack.createBufferPacker();
+        pk.writeNil();
+        Unpacker u = msgpack.createBufferUnpacker(pk.toByteArray());
+        return u;
+    }
+}
+

Original file line number	Diff line number	Diff line change
`@@ -70,22 +70,27 @@ public Value readValue() throws IOException {`
`70`	`70`
`71`	`71`	`protected abstract boolean tryReadNil() throws IOException;`
`72`	`72`
	`73`	`+ @Override`
	`74`	`+ public <T> T read(Template<T> template) throws IOException {`
	`75`	`+ return template.read(this, null);`
	`76`	`+ }`
	`77`	`+`
`73`	`78`	`@Override`
`74`	`79`	`public <T> T read(Class<T> klass) throws IOException {`
`75`	`80`	`if(tryReadNil()) {`
`76`	`81`	`return null;`
`77`	`82`	`}`
`78`		`- Template<? super T> tmpl = msgpack.lookup(klass);`
`79`		`- return (T) tmpl.read(this, null);`
	`83`	`+ Template<T> tmpl = msgpack.lookup(klass);`
	`84`	`+ return tmpl.read(this, null);`
`80`	`85`	`}`
`81`	`86`
`82`	`87`	`@Override`
`83`	`88`	`public <T> T read(T to) throws IOException {`
`84`	`89`	`if(tryReadNil()) {`
`85`	`90`	`return null;`
`86`	`91`	`}`
`87`		`- Template<? super T> tmpl = msgpack.lookup((Class<T>) to.getClass());`
`88`		`- return (T) tmpl.read(this, to);`
	`92`	`+ Template<T> tmpl = msgpack.lookup((Class<T>) to.getClass());`
	`93`	`+ return tmpl.read(this, to);`
`89`	`94`	`}`
`90`	`95`	`}`
`91`	`96`