generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-03-31 07:58:20 +02:00
Code Issues Projects Releases Wiki Activity

java: adds NullableTemplate 2

Browse Source
This commit is contained in:
frsyuki 2010-11-09 02:07:53 +09:00
parent 95f01a5976
commit 517509db6e
11 changed files with 139 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
java/src/main/java/org/msgpack/Templates.java
View File

@ -23,19 +23,16 @@ public class Templates {
public static void load() { } public static void load() { }
public static Template tNullable(Template elementTemplate) {
return new NullableTemplate(elementTemplate);
}
public static final Template TAny = AnyTemplate.getInstance(); public static final Template TAny = AnyTemplate.getInstance();
public static Template tAny() { public static Template tAny() {
return TAny; return TAny;
} }
public static Template tOptional(Template elementTemplate) {
return new OptionalTemplate(elementTemplate);
}
public static Template tOptional(Template elementTemplate, Object defaultObject) {
return new OptionalTemplate(elementTemplate, defaultObject);
}
public static Template tList(Template elementTemplate) { public static Template tList(Template elementTemplate) {
return new ListTemplate(elementTemplate); return new ListTemplate(elementTemplate);

6
java/src/main/java/org/msgpack/Unpacker.java
View File

@ -23,6 +23,8 @@ import java.io.IOException;
import java.util.Iterator; import java.util.Iterator;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.math.BigInteger; import java.math.BigInteger;
import org.msgpack.template.ClassTemplate;
import org.msgpack.template.NullableTemplate;
/** /**
* Unpacker enables you to deserialize objects from stream. * Unpacker enables you to deserialize objects from stream.
@ -581,8 +583,8 @@ public class Unpacker implements Iterable<MessagePackObject> {
} }
final public <T> T unpack(Class<T> klass) throws IOException, MessageTypeException { final public <T> T unpack(Class<T> klass) throws IOException, MessageTypeException {
// FIXME optional? // FIXME nullable?
return (T)unpack(Templates.tOptional(Templates.tClass(klass))); return (T)unpack(new NullableTemplate(new ClassTemplate(klass)));
} }
} }

69
java/src/test/java/org/msgpack/TestMessagePackStaticMethods.java
View File

@ -75,16 +75,14 @@ public class TestMessagePackStaticMethods extends TestCase {
{ {
Object aobj = MessagePack.unpack(a, TString); Object aobj = MessagePack.unpack(a, TString);
Object bobj = MessagePack.unpack(b, TInteger); Object bobj = MessagePack.unpack(b, TInteger);
Object cobj_any = MessagePack.unpack(c, TAny); Object cobj = MessagePack.unpack(c, tNullable(TAny));
Object cobj_obj = MessagePack.unpack(c, tOptional(TAny));
Object dobj = MessagePack.unpack(d, tList(TString)); Object dobj = MessagePack.unpack(d, tList(TString));
Object eobj = MessagePack.unpack(e, tClass(ProvidedClass.class)); Object eobj = MessagePack.unpack(e, tClass(ProvidedClass.class));
Object fobj = MessagePack.unpack(f, tClass(UserDefinedClass.class)); Object fobj = MessagePack.unpack(f, tClass(UserDefinedClass.class));
assertEquals(aobj, "msgpack"); assertEquals(aobj, "msgpack");
assertEquals(bobj, 1); assertEquals(bobj, 1);
assertEquals(cobj_any, NilType.create()); assertEquals(cobj, null);
assertEquals(cobj_obj, null);
assertEquals(dobj, createStringList()); assertEquals(dobj, createStringList());
assertEquals(eobj, createProvidedClass()); assertEquals(eobj, createProvidedClass());
assertEquals(fobj, createUserDefinedClass()); assertEquals(fobj, createUserDefinedClass());
@ -94,6 +92,7 @@ public class TestMessagePackStaticMethods extends TestCase {
String aobj = MessagePack.unpack(a, String.class); String aobj = MessagePack.unpack(a, String.class);
Integer bobj = MessagePack.unpack(b, Integer.class); Integer bobj = MessagePack.unpack(b, Integer.class);
Object cobj = MessagePack.unpack(c, Object.class); Object cobj = MessagePack.unpack(c, Object.class);
// Generics are not supported on unpack(Class<?> klass) interface
ProvidedClass eobj = MessagePack.unpack(e, ProvidedClass.class); ProvidedClass eobj = MessagePack.unpack(e, ProvidedClass.class);
UserDefinedClass fobj = MessagePack.unpack(f, UserDefinedClass.class); UserDefinedClass fobj = MessagePack.unpack(f, UserDefinedClass.class);
@ -108,38 +107,37 @@ public class TestMessagePackStaticMethods extends TestCase {
@Test @Test
public void testCheckedPackToStream() throws Exception { public void testCheckedPackToStream() throws Exception {
ByteArrayOutputStream aout = new ByteArrayOutputStream(); ByteArrayOutputStream aout = new ByteArrayOutputStream();
MessagePack.pack(aout, "msgpack");
ByteArrayOutputStream bout = new ByteArrayOutputStream(); ByteArrayOutputStream bout = new ByteArrayOutputStream();
MessagePack.pack(bout, (Object)1);
ByteArrayOutputStream cout = new ByteArrayOutputStream(); ByteArrayOutputStream cout = new ByteArrayOutputStream();
MessagePack.pack(cout, (Object)null);
ByteArrayOutputStream dout = new ByteArrayOutputStream(); ByteArrayOutputStream dout = new ByteArrayOutputStream();
MessagePack.pack(dout, createStringList());
ByteArrayOutputStream eout = new ByteArrayOutputStream(); ByteArrayOutputStream eout = new ByteArrayOutputStream();
MessagePack.pack(eout, createProvidedClass());
ByteArrayOutputStream fout = new ByteArrayOutputStream(); ByteArrayOutputStream fout = new ByteArrayOutputStream();
MessagePack.pack(aout, "msgpack");
MessagePack.pack(bout, (Object)1);
MessagePack.pack(cout, (Object)null);
MessagePack.pack(dout, createStringList());
MessagePack.pack(eout, createProvidedClass());
MessagePack.pack(fout, createUserDefinedClass()); MessagePack.pack(fout, createUserDefinedClass());
{ {
InputStream ain = new ByteArrayInputStream(aout.toByteArray()); InputStream ain = new ByteArrayInputStream(aout.toByteArray());
Object aobj = MessagePack.unpack(ain, TString);
InputStream bin = new ByteArrayInputStream(bout.toByteArray()); InputStream bin = new ByteArrayInputStream(bout.toByteArray());
Object bobj = MessagePack.unpack(bin, TInteger); InputStream cin = new ByteArrayInputStream(cout.toByteArray());
InputStream cin_any = new ByteArrayInputStream(cout.toByteArray());
Object cobj_any = MessagePack.unpack(cin_any, TAny);
InputStream cin_obj = new ByteArrayInputStream(cout.toByteArray());
Object cobj_obj = MessagePack.unpack(cin_obj, tOptional(TAny));
InputStream din = new ByteArrayInputStream(dout.toByteArray()); InputStream din = new ByteArrayInputStream(dout.toByteArray());
Object dobj = MessagePack.unpack(din, tList(TString));
InputStream ein = new ByteArrayInputStream(eout.toByteArray()); InputStream ein = new ByteArrayInputStream(eout.toByteArray());
Object eobj = MessagePack.unpack(ein, tClass(ProvidedClass.class));
InputStream fin = new ByteArrayInputStream(fout.toByteArray()); InputStream fin = new ByteArrayInputStream(fout.toByteArray());
Object aobj = MessagePack.unpack(ain, TString);
Object bobj = MessagePack.unpack(bin, TInteger);
Object cobj = MessagePack.unpack(cin, tNullable(TAny));
Object dobj = MessagePack.unpack(din, tList(TString));
Object eobj = MessagePack.unpack(ein, tClass(ProvidedClass.class));
Object fobj = MessagePack.unpack(fin, tClass(UserDefinedClass.class)); Object fobj = MessagePack.unpack(fin, tClass(UserDefinedClass.class));
assertEquals(aobj, "msgpack"); assertEquals(aobj, "msgpack");
assertEquals(bobj, 1); assertEquals(bobj, 1);
assertEquals(cobj_any, NilType.create()); assertEquals(cobj, null);
assertEquals(cobj_obj, null);
assertEquals(dobj, createStringList()); assertEquals(dobj, createStringList());
assertEquals(eobj, createProvidedClass()); assertEquals(eobj, createProvidedClass());
assertEquals(fobj, createUserDefinedClass()); assertEquals(fobj, createUserDefinedClass());
@ -147,14 +145,17 @@ public class TestMessagePackStaticMethods extends TestCase {
{ {
InputStream ain = new ByteArrayInputStream(aout.toByteArray()); InputStream ain = new ByteArrayInputStream(aout.toByteArray());
String aobj = MessagePack.unpack(ain, String.class);
InputStream bin = new ByteArrayInputStream(bout.toByteArray()); InputStream bin = new ByteArrayInputStream(bout.toByteArray());
Integer bobj = MessagePack.unpack(bin, Integer.class);
InputStream cin = new ByteArrayInputStream(cout.toByteArray()); InputStream cin = new ByteArrayInputStream(cout.toByteArray());
Object cobj = MessagePack.unpack(cin, Object.class);
InputStream ein = new ByteArrayInputStream(eout.toByteArray()); InputStream ein = new ByteArrayInputStream(eout.toByteArray());
ProvidedClass eobj = MessagePack.unpack(ein, ProvidedClass.class); //
InputStream fin = new ByteArrayInputStream(fout.toByteArray()); InputStream fin = new ByteArrayInputStream(fout.toByteArray());
String aobj = MessagePack.unpack(ain, String.class);
Integer bobj = MessagePack.unpack(bin, Integer.class);
Object cobj = MessagePack.unpack(cin, Object.class);
// Generics are not supported on unpack(Class<?> klass) interface
ProvidedClass eobj = MessagePack.unpack(ein, ProvidedClass.class);
UserDefinedClass fobj = MessagePack.unpack(fin, UserDefinedClass.class); UserDefinedClass fobj = MessagePack.unpack(fin, UserDefinedClass.class);
assertEquals(aobj, "msgpack"); assertEquals(aobj, "msgpack");
@ -194,30 +195,32 @@ public class TestMessagePackStaticMethods extends TestCase {
@Test @Test
public void testPackToStream() throws Exception { public void testPackToStream() throws Exception {
ByteArrayOutputStream aout = new ByteArrayOutputStream(); ByteArrayOutputStream aout = new ByteArrayOutputStream();
MessagePack.pack(aout, "msgpack");
ByteArrayOutputStream bout = new ByteArrayOutputStream(); ByteArrayOutputStream bout = new ByteArrayOutputStream();
MessagePack.pack(bout, (Object)1);
ByteArrayOutputStream cout = new ByteArrayOutputStream(); ByteArrayOutputStream cout = new ByteArrayOutputStream();
MessagePack.pack(cout, (Object)null);
ByteArrayOutputStream dout = new ByteArrayOutputStream(); ByteArrayOutputStream dout = new ByteArrayOutputStream();
MessagePack.pack(dout, createStringList());
ByteArrayOutputStream eout = new ByteArrayOutputStream(); ByteArrayOutputStream eout = new ByteArrayOutputStream();
MessagePack.pack(eout, createProvidedClass());
ByteArrayOutputStream fout = new ByteArrayOutputStream(); ByteArrayOutputStream fout = new ByteArrayOutputStream();
MessagePack.pack(aout, "msgpack");
MessagePack.pack(bout, (Object)1);
MessagePack.pack(cout, (Object)null);
MessagePack.pack(dout, createStringList());
MessagePack.pack(eout, createProvidedClass());
MessagePack.pack(fout, createUserDefinedClass()); MessagePack.pack(fout, createUserDefinedClass());
{ {
InputStream ain = new ByteArrayInputStream(aout.toByteArray()); InputStream ain = new ByteArrayInputStream(aout.toByteArray());
MessagePackObject aobj = MessagePack.unpack(ain);
InputStream bin = new ByteArrayInputStream(bout.toByteArray()); InputStream bin = new ByteArrayInputStream(bout.toByteArray());
MessagePackObject bobj = MessagePack.unpack(bin);
InputStream cin = new ByteArrayInputStream(cout.toByteArray()); InputStream cin = new ByteArrayInputStream(cout.toByteArray());
MessagePackObject cobj = MessagePack.unpack(cin);
InputStream din = new ByteArrayInputStream(dout.toByteArray()); InputStream din = new ByteArrayInputStream(dout.toByteArray());
MessagePackObject dobj = MessagePack.unpack(din);
InputStream ein = new ByteArrayInputStream(eout.toByteArray()); InputStream ein = new ByteArrayInputStream(eout.toByteArray());
MessagePackObject eobj = MessagePack.unpack(ein);
InputStream fin = new ByteArrayInputStream(fout.toByteArray()); InputStream fin = new ByteArrayInputStream(fout.toByteArray());
MessagePackObject aobj = MessagePack.unpack(ain);
MessagePackObject bobj = MessagePack.unpack(bin);
MessagePackObject cobj = MessagePack.unpack(cin);
MessagePackObject dobj = MessagePack.unpack(din);
MessagePackObject eobj = MessagePack.unpack(ein);
MessagePackObject fobj = MessagePack.unpack(fin); MessagePackObject fobj = MessagePack.unpack(fin);
assertEquals(aobj, RawType.create("msgpack")); assertEquals(aobj, RawType.create("msgpack"));

20
java/src/test/java/org/msgpack/packer/TestPackConvert.java
View File

@ -20,7 +20,7 @@ import org.msgpack.template.DoubleTemplate;
import org.msgpack.template.FloatTemplate; import org.msgpack.template.FloatTemplate;
import org.msgpack.template.IntegerTemplate; import org.msgpack.template.IntegerTemplate;
import org.msgpack.template.LongTemplate; import org.msgpack.template.LongTemplate;
import org.msgpack.template.OptionalTemplate; import org.msgpack.template.NullableTemplate;
import org.msgpack.template.ShortTemplate; import org.msgpack.template.ShortTemplate;
import org.msgpack.template.StringTemplate; import org.msgpack.template.StringTemplate;
@ -64,7 +64,7 @@ public class TestPackConvert extends TestCase {
assertTrue(e instanceof MessageTypeException); assertTrue(e instanceof MessageTypeException);
} }
obj = Util.unpackOne(out.toByteArray()); obj = Util.unpackOne(out.toByteArray());
tmpl = new OptionalTemplate(ByteTemplate.getInstance()); tmpl = new NullableTemplate(ByteTemplate.getInstance());
dst = (Byte) tmpl.convert(obj); dst = (Byte) tmpl.convert(obj);
assertEquals(src, dst); assertEquals(src, dst);
} }
@ -107,7 +107,7 @@ public class TestPackConvert extends TestCase {
assertTrue(e instanceof MessageTypeException); assertTrue(e instanceof MessageTypeException);
} }
obj = Util.unpackOne(out.toByteArray()); obj = Util.unpackOne(out.toByteArray());
tmpl = new OptionalTemplate(ShortTemplate.getInstance()); tmpl = new NullableTemplate(ShortTemplate.getInstance());
dst = (Short) tmpl.convert(obj); dst = (Short) tmpl.convert(obj);
assertEquals(src, dst); assertEquals(src, dst);
} }
@ -150,7 +150,7 @@ public class TestPackConvert extends TestCase {
assertTrue(e instanceof MessageTypeException); assertTrue(e instanceof MessageTypeException);
} }
obj = Util.unpackOne(out.toByteArray()); obj = Util.unpackOne(out.toByteArray());
tmpl = new OptionalTemplate(IntegerTemplate.getInstance()); tmpl = new NullableTemplate(IntegerTemplate.getInstance());
dst = (Integer) tmpl.convert(obj); dst = (Integer) tmpl.convert(obj);
assertEquals(src, dst); assertEquals(src, dst);
} }
@ -195,7 +195,7 @@ public class TestPackConvert extends TestCase {
assertTrue(e instanceof MessageTypeException); assertTrue(e instanceof MessageTypeException);
} }
obj = Util.unpackOne(out.toByteArray()); obj = Util.unpackOne(out.toByteArray());
tmpl = new OptionalTemplate(LongTemplate.getInstance()); tmpl = new NullableTemplate(LongTemplate.getInstance());
dst = (Long) tmpl.convert(obj); dst = (Long) tmpl.convert(obj);
assertEquals(src, dst); assertEquals(src, dst);
} }
@ -244,7 +244,7 @@ public class TestPackConvert extends TestCase {
assertTrue(e instanceof MessageTypeException); assertTrue(e instanceof MessageTypeException);
} }
obj = Util.unpackOne(out.toByteArray()); obj = Util.unpackOne(out.toByteArray());
tmpl = new OptionalTemplate(BigIntegerTemplate.getInstance()); tmpl = new NullableTemplate(BigIntegerTemplate.getInstance());
dst = (BigInteger) tmpl.convert(obj); dst = (BigInteger) tmpl.convert(obj);
assertEquals(src, dst); assertEquals(src, dst);
} }
@ -291,7 +291,7 @@ public class TestPackConvert extends TestCase {
assertTrue(e instanceof MessageTypeException); assertTrue(e instanceof MessageTypeException);
} }
obj = Util.unpackOne(out.toByteArray()); obj = Util.unpackOne(out.toByteArray());
tmpl = new OptionalTemplate(FloatTemplate.getInstance()); tmpl = new NullableTemplate(FloatTemplate.getInstance());
dst = (Float) tmpl.convert(obj); dst = (Float) tmpl.convert(obj);
assertEquals(src, dst); assertEquals(src, dst);
} }
@ -337,7 +337,7 @@ public class TestPackConvert extends TestCase {
assertTrue(e instanceof MessageTypeException); assertTrue(e instanceof MessageTypeException);
} }
obj = Util.unpackOne(out.toByteArray()); obj = Util.unpackOne(out.toByteArray());
tmpl = new OptionalTemplate(DoubleTemplate.getInstance()); tmpl = new NullableTemplate(DoubleTemplate.getInstance());
dst = (Double) tmpl.convert(obj); dst = (Double) tmpl.convert(obj);
assertEquals(src, dst); assertEquals(src, dst);
} }
@ -373,7 +373,7 @@ public class TestPackConvert extends TestCase {
assertTrue(e instanceof MessageTypeException); assertTrue(e instanceof MessageTypeException);
} }
obj = Util.unpackOne(out.toByteArray()); obj = Util.unpackOne(out.toByteArray());
tmpl = new OptionalTemplate(BooleanTemplate.getInstance()); tmpl = new NullableTemplate(BooleanTemplate.getInstance());
dst = (Boolean) tmpl.convert(obj); dst = (Boolean) tmpl.convert(obj);
assertEquals(src, dst); assertEquals(src, dst);
} }
@ -441,7 +441,7 @@ public class TestPackConvert extends TestCase {
assertTrue(e instanceof MessageTypeException); assertTrue(e instanceof MessageTypeException);
} }
obj = Util.unpackOne(out.toByteArray()); obj = Util.unpackOne(out.toByteArray());
tmpl = new OptionalTemplate(StringTemplate.getInstance()); tmpl = new NullableTemplate(StringTemplate.getInstance());
dst = (String) tmpl.convert(obj); dst = (String) tmpl.convert(obj);
assertEquals(src, dst); assertEquals(src, dst);
} }

20
java/src/test/java/org/msgpack/packer/TestPackUnpack.java
View File

@ -20,7 +20,7 @@ import org.msgpack.template.DoubleTemplate;
import org.msgpack.template.FloatTemplate; import org.msgpack.template.FloatTemplate;
import org.msgpack.template.IntegerTemplate; import org.msgpack.template.IntegerTemplate;
import org.msgpack.template.LongTemplate; import org.msgpack.template.LongTemplate;
import org.msgpack.template.OptionalTemplate; import org.msgpack.template.NullableTemplate;
import org.msgpack.template.ShortTemplate; import org.msgpack.template.ShortTemplate;
import org.msgpack.template.StringTemplate; import org.msgpack.template.StringTemplate;
@ -67,7 +67,7 @@ public class TestPackUnpack extends TestCase {
assertTrue(e instanceof MessageTypeException); assertTrue(e instanceof MessageTypeException);
} }
unpacker.wrap(bytes); unpacker.wrap(bytes);
tmpl = new OptionalTemplate(ByteTemplate.getInstance()); tmpl = new NullableTemplate(ByteTemplate.getInstance());
dst = (Byte) tmpl.unpack(unpacker); dst = (Byte) tmpl.unpack(unpacker);
assertEquals(src, dst); assertEquals(src, dst);
} }
@ -113,7 +113,7 @@ public class TestPackUnpack extends TestCase {
assertTrue(e instanceof MessageTypeException); assertTrue(e instanceof MessageTypeException);
} }
unpacker.wrap(bytes); unpacker.wrap(bytes);
tmpl = new OptionalTemplate(ShortTemplate.getInstance()); tmpl = new NullableTemplate(ShortTemplate.getInstance());
dst = (Short) tmpl.unpack(unpacker); dst = (Short) tmpl.unpack(unpacker);
assertEquals(src, dst); assertEquals(src, dst);
} }
@ -159,7 +159,7 @@ public class TestPackUnpack extends TestCase {
assertTrue(e instanceof MessageTypeException); assertTrue(e instanceof MessageTypeException);
} }
unpacker.wrap(bytes); unpacker.wrap(bytes);
tmpl = new OptionalTemplate(IntegerTemplate.getInstance()); tmpl = new NullableTemplate(IntegerTemplate.getInstance());
dst = (Integer) tmpl.unpack(unpacker); dst = (Integer) tmpl.unpack(unpacker);
assertEquals(src, dst); assertEquals(src, dst);
} }
@ -207,7 +207,7 @@ public class TestPackUnpack extends TestCase {
assertTrue(e instanceof MessageTypeException); assertTrue(e instanceof MessageTypeException);
} }
unpacker.wrap(bytes); unpacker.wrap(bytes);
tmpl = new OptionalTemplate(LongTemplate.getInstance()); tmpl = new NullableTemplate(LongTemplate.getInstance());
dst = (Long) tmpl.unpack(unpacker); dst = (Long) tmpl.unpack(unpacker);
assertEquals(src, dst); assertEquals(src, dst);
} }
@ -259,7 +259,7 @@ public class TestPackUnpack extends TestCase {
assertTrue(e instanceof MessageTypeException); assertTrue(e instanceof MessageTypeException);
} }
unpacker.wrap(bytes); unpacker.wrap(bytes);
tmpl = new OptionalTemplate(BigIntegerTemplate.getInstance()); tmpl = new NullableTemplate(BigIntegerTemplate.getInstance());
dst = (BigInteger) tmpl.unpack(unpacker); dst = (BigInteger) tmpl.unpack(unpacker);
assertEquals(src, dst); assertEquals(src, dst);
} }
@ -309,7 +309,7 @@ public class TestPackUnpack extends TestCase {
assertTrue(e instanceof MessageTypeException); assertTrue(e instanceof MessageTypeException);
} }
unpacker.wrap(bytes); unpacker.wrap(bytes);
tmpl = new OptionalTemplate(FloatTemplate.getInstance()); tmpl = new NullableTemplate(FloatTemplate.getInstance());
dst = (Float) tmpl.unpack(unpacker); dst = (Float) tmpl.unpack(unpacker);
assertEquals(src, dst); assertEquals(src, dst);
} }
@ -358,7 +358,7 @@ public class TestPackUnpack extends TestCase {
assertTrue(e instanceof MessageTypeException); assertTrue(e instanceof MessageTypeException);
} }
unpacker.wrap(bytes); unpacker.wrap(bytes);
tmpl = new OptionalTemplate(DoubleTemplate.getInstance()); tmpl = new NullableTemplate(DoubleTemplate.getInstance());
dst = (Double) tmpl.unpack(unpacker); dst = (Double) tmpl.unpack(unpacker);
assertEquals(src, dst); assertEquals(src, dst);
} }
@ -397,7 +397,7 @@ public class TestPackUnpack extends TestCase {
assertTrue(e instanceof MessageTypeException); assertTrue(e instanceof MessageTypeException);
} }
unpacker.wrap(bytes); unpacker.wrap(bytes);
tmpl = new OptionalTemplate(BooleanTemplate.getInstance()); tmpl = new NullableTemplate(BooleanTemplate.getInstance());
dst = (Boolean) tmpl.unpack(unpacker); dst = (Boolean) tmpl.unpack(unpacker);
assertEquals(src, dst); assertEquals(src, dst);
} }
@ -468,7 +468,7 @@ public class TestPackUnpack extends TestCase {
assertTrue(e instanceof MessageTypeException); assertTrue(e instanceof MessageTypeException);
} }
unpacker.wrap(bytes); unpacker.wrap(bytes);
tmpl = new OptionalTemplate(StringTemplate.getInstance()); tmpl = new NullableTemplate(StringTemplate.getInstance());
dst = (String) tmpl.unpack(unpacker); dst = (String) tmpl.unpack(unpacker);
assertEquals(src, dst); assertEquals(src, dst);
} }

18
java/src/test/java/org/msgpack/template/TestPackConvert.java
View File

@ -56,7 +56,7 @@ public class TestPackConvert extends TestCase {
assertTrue(e instanceof MessageTypeException); assertTrue(e instanceof MessageTypeException);
} }
obj = Util.unpackOne(out.toByteArray()); obj = Util.unpackOne(out.toByteArray());
tmpl = new OptionalTemplate(IntegerTemplate.getInstance()); tmpl = new NullableTemplate(IntegerTemplate.getInstance());
dst = (Integer) tmpl.convert(obj); dst = (Integer) tmpl.convert(obj);
assertEquals(src, dst); assertEquals(src, dst);
} }
@ -100,7 +100,7 @@ public class TestPackConvert extends TestCase {
assertTrue(e instanceof MessageTypeException); assertTrue(e instanceof MessageTypeException);
} }
obj = Util.unpackOne(out.toByteArray()); obj = Util.unpackOne(out.toByteArray());
tmpl = new OptionalTemplate(LongTemplate.getInstance()); tmpl = new NullableTemplate(LongTemplate.getInstance());
dst = (Long) tmpl.convert(obj); dst = (Long) tmpl.convert(obj);
assertEquals(src, dst); assertEquals(src, dst);
} }
@ -147,7 +147,7 @@ public class TestPackConvert extends TestCase {
assertTrue(e instanceof MessageTypeException); assertTrue(e instanceof MessageTypeException);
} }
obj = Util.unpackOne(out.toByteArray()); obj = Util.unpackOne(out.toByteArray());
tmpl = new OptionalTemplate(BigIntegerTemplate.getInstance()); tmpl = new NullableTemplate(BigIntegerTemplate.getInstance());
dst = (BigInteger) tmpl.convert(obj); dst = (BigInteger) tmpl.convert(obj);
assertEquals(src, dst); assertEquals(src, dst);
} }
@ -193,7 +193,7 @@ public class TestPackConvert extends TestCase {
assertTrue(e instanceof MessageTypeException); assertTrue(e instanceof MessageTypeException);
} }
obj = Util.unpackOne(out.toByteArray()); obj = Util.unpackOne(out.toByteArray());
tmpl = new OptionalTemplate(FloatTemplate.getInstance()); tmpl = new NullableTemplate(FloatTemplate.getInstance());
dst = (Float) tmpl.convert(obj); dst = (Float) tmpl.convert(obj);
assertEquals(src, dst); assertEquals(src, dst);
} }
@ -239,7 +239,7 @@ public class TestPackConvert extends TestCase {
assertTrue(e instanceof MessageTypeException); assertTrue(e instanceof MessageTypeException);
} }
obj = Util.unpackOne(out.toByteArray()); obj = Util.unpackOne(out.toByteArray());
tmpl = new OptionalTemplate(DoubleTemplate.getInstance()); tmpl = new NullableTemplate(DoubleTemplate.getInstance());
dst = (Double) tmpl.convert(obj); dst = (Double) tmpl.convert(obj);
assertEquals(src, dst); assertEquals(src, dst);
} }
@ -274,7 +274,7 @@ public class TestPackConvert extends TestCase {
assertTrue(e instanceof MessageTypeException); assertTrue(e instanceof MessageTypeException);
} }
obj = Util.unpackOne(out.toByteArray()); obj = Util.unpackOne(out.toByteArray());
tmpl = new OptionalTemplate(BooleanTemplate.getInstance()); tmpl = new NullableTemplate(BooleanTemplate.getInstance());
dst = (Boolean) tmpl.convert(obj); dst = (Boolean) tmpl.convert(obj);
assertEquals(src, dst); assertEquals(src, dst);
} }
@ -341,7 +341,7 @@ public class TestPackConvert extends TestCase {
assertTrue(e instanceof MessageTypeException); assertTrue(e instanceof MessageTypeException);
} }
obj = Util.unpackOne(out.toByteArray()); obj = Util.unpackOne(out.toByteArray());
tmpl = new OptionalTemplate(StringTemplate.getInstance()); tmpl = new NullableTemplate(StringTemplate.getInstance());
dst = (String) tmpl.convert(obj); dst = (String) tmpl.convert(obj);
assertEquals(src, dst); assertEquals(src, dst);
} }
@ -410,7 +410,7 @@ public class TestPackConvert extends TestCase {
assertTrue(e instanceof MessageTypeException); assertTrue(e instanceof MessageTypeException);
} }
obj = Util.unpackOne(out.toByteArray()); obj = Util.unpackOne(out.toByteArray());
tmpl = new OptionalTemplate(new ListTemplate(StringTemplate tmpl = new NullableTemplate(new ListTemplate(StringTemplate
.getInstance())); .getInstance()));
dst = (List<String>) tmpl.convert(obj); dst = (List<String>) tmpl.convert(obj);
assertEquals(src, dst); assertEquals(src, dst);
@ -489,7 +489,7 @@ public class TestPackConvert extends TestCase {
assertTrue(e instanceof MessageTypeException); assertTrue(e instanceof MessageTypeException);
} }
obj = Util.unpackOne(out.toByteArray()); obj = Util.unpackOne(out.toByteArray());
tmpl = new OptionalTemplate(new MapTemplate(StringTemplate tmpl = new NullableTemplate(new MapTemplate(StringTemplate
.getInstance(), StringTemplate.getInstance())); .getInstance(), StringTemplate.getInstance()));
dst = (Map<String, String>) tmpl.convert(obj); dst = (Map<String, String>) tmpl.convert(obj);
assertEquals(src, dst); assertEquals(src, dst);

16
java/src/test/java/org/msgpack/template/TestPackUnpack.java
View File

@ -58,7 +58,7 @@ public class TestPackUnpack extends TestCase {
assertTrue(e instanceof MessageTypeException); assertTrue(e instanceof MessageTypeException);
} }
unpacker.wrap(bytes); unpacker.wrap(bytes);
tmpl = new OptionalTemplate(IntegerTemplate.getInstance()); tmpl = new NullableTemplate(IntegerTemplate.getInstance());
dst = (Integer) tmpl.unpack(unpacker); dst = (Integer) tmpl.unpack(unpacker);
assertEquals(src, dst); assertEquals(src, dst);
} }
@ -105,7 +105,7 @@ public class TestPackUnpack extends TestCase {
assertTrue(e instanceof MessageTypeException); assertTrue(e instanceof MessageTypeException);
} }
unpacker.wrap(bytes); unpacker.wrap(bytes);
tmpl = new OptionalTemplate(LongTemplate.getInstance()); tmpl = new NullableTemplate(LongTemplate.getInstance());
dst = (Long) tmpl.unpack(unpacker); dst = (Long) tmpl.unpack(unpacker);
assertEquals(src, dst); assertEquals(src, dst);
} }
@ -155,7 +155,7 @@ public class TestPackUnpack extends TestCase {
assertTrue(e instanceof MessageTypeException); assertTrue(e instanceof MessageTypeException);
} }
unpacker.wrap(bytes); unpacker.wrap(bytes);
tmpl = new OptionalTemplate(BigIntegerTemplate.getInstance()); tmpl = new NullableTemplate(BigIntegerTemplate.getInstance());
dst = (BigInteger) tmpl.unpack(unpacker); dst = (BigInteger) tmpl.unpack(unpacker);
assertEquals(src, dst); assertEquals(src, dst);
} }
@ -230,7 +230,7 @@ public class TestPackUnpack extends TestCase {
assertTrue(e instanceof MessageTypeException); assertTrue(e instanceof MessageTypeException);
} }
unpacker.wrap(bytes); unpacker.wrap(bytes);
tmpl = new OptionalTemplate(DoubleTemplate.getInstance()); tmpl = new NullableTemplate(DoubleTemplate.getInstance());
dst = (Double) tmpl.unpack(unpacker); dst = (Double) tmpl.unpack(unpacker);
assertEquals(src, dst); assertEquals(src, dst);
} }
@ -268,7 +268,7 @@ public class TestPackUnpack extends TestCase {
assertTrue(e instanceof MessageTypeException); assertTrue(e instanceof MessageTypeException);
} }
unpacker.wrap(bytes); unpacker.wrap(bytes);
tmpl = new OptionalTemplate(BooleanTemplate.getInstance()); tmpl = new NullableTemplate(BooleanTemplate.getInstance());
dst = (Boolean) tmpl.unpack(unpacker); dst = (Boolean) tmpl.unpack(unpacker);
assertEquals(src, dst); assertEquals(src, dst);
} }
@ -338,7 +338,7 @@ public class TestPackUnpack extends TestCase {
assertTrue(e instanceof MessageTypeException); assertTrue(e instanceof MessageTypeException);
} }
unpacker.wrap(bytes); unpacker.wrap(bytes);
tmpl = new OptionalTemplate(StringTemplate.getInstance()); tmpl = new NullableTemplate(StringTemplate.getInstance());
dst = (String) tmpl.unpack(unpacker); dst = (String) tmpl.unpack(unpacker);
assertEquals(src, dst); assertEquals(src, dst);
} }
@ -412,7 +412,7 @@ public class TestPackUnpack extends TestCase {
assertTrue(e instanceof MessageTypeException); assertTrue(e instanceof MessageTypeException);
} }
unpacker.wrap(bytes); unpacker.wrap(bytes);
tmpl = new OptionalTemplate(new ListTemplate(StringTemplate tmpl = new NullableTemplate(new ListTemplate(StringTemplate
.getInstance())); .getInstance()));
dst = (List<String>) tmpl.unpack(unpacker); dst = (List<String>) tmpl.unpack(unpacker);
assertEquals(src, dst); assertEquals(src, dst);
@ -499,7 +499,7 @@ public class TestPackUnpack extends TestCase {
assertTrue(e instanceof MessageTypeException); assertTrue(e instanceof MessageTypeException);
} }
unpacker.wrap(bytes); unpacker.wrap(bytes);
tmpl = new OptionalTemplate(new MapTemplate(StringTemplate tmpl = new NullableTemplate(new MapTemplate(StringTemplate
.getInstance(), StringTemplate.getInstance())); .getInstance(), StringTemplate.getInstance()));
dst = (Map<String, String>) tmpl.unpack(unpacker); dst = (Map<String, String>) tmpl.unpack(unpacker);
assertEquals(src, dst); assertEquals(src, dst);

57
java/src/test/java/org/msgpack/util/codegen/TestPackConvert.java
View File

@ -29,7 +29,7 @@ import org.msgpack.annotation.MessagePackMessage;
import org.msgpack.annotation.MessagePackOptional; import org.msgpack.annotation.MessagePackOptional;
import org.msgpack.annotation.MessagePackOrdinalEnum; import org.msgpack.annotation.MessagePackOrdinalEnum;
import org.msgpack.packer.OptionalPacker; import org.msgpack.packer.OptionalPacker;
import org.msgpack.template.OptionalTemplate; import org.msgpack.template.NullableTemplate;
public class TestPackConvert extends TestCase { public class TestPackConvert extends TestCase {
@ -73,7 +73,7 @@ public class TestPackConvert extends TestCase {
.create(PrimitiveTypeFieldsClass.class)); .create(PrimitiveTypeFieldsClass.class));
packer.pack(new Packer(out), src); packer.pack(new Packer(out), src);
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
Template tmpl = new OptionalTemplate(DynamicTemplate Template tmpl = new NullableTemplate(DynamicTemplate
.create(PrimitiveTypeFieldsClass.class)); .create(PrimitiveTypeFieldsClass.class));
Unpacker pac = new Unpacker(in); Unpacker pac = new Unpacker(in);
Iterator<MessagePackObject> it = pac.iterator(); Iterator<MessagePackObject> it = pac.iterator();
@ -165,7 +165,7 @@ public class TestPackConvert extends TestCase {
.create(OptionalPrimitiveTypeFieldsClass.class)); .create(OptionalPrimitiveTypeFieldsClass.class));
packer.pack(new Packer(out), src); packer.pack(new Packer(out), src);
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
Template tmpl = new OptionalTemplate(DynamicTemplate Template tmpl = new NullableTemplate(DynamicTemplate
.create(OptionalPrimitiveTypeFieldsClass.class)); .create(OptionalPrimitiveTypeFieldsClass.class));
Unpacker pac = new Unpacker(in); Unpacker pac = new Unpacker(in);
Iterator<MessagePackObject> it = pac.iterator(); Iterator<MessagePackObject> it = pac.iterator();
@ -245,7 +245,7 @@ public class TestPackConvert extends TestCase {
.create(GeneralReferenceTypeFieldsClass.class)); .create(GeneralReferenceTypeFieldsClass.class));
packer.pack(new Packer(out), src); packer.pack(new Packer(out), src);
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
Template tmpl = new OptionalTemplate(DynamicTemplate Template tmpl = new NullableTemplate(DynamicTemplate
.create(GeneralReferenceTypeFieldsClass.class)); .create(GeneralReferenceTypeFieldsClass.class));
Unpacker pac = new Unpacker(in); Unpacker pac = new Unpacker(in);
Iterator<MessagePackObject> it = pac.iterator(); Iterator<MessagePackObject> it = pac.iterator();
@ -363,7 +363,7 @@ public class TestPackConvert extends TestCase {
.create(OptionalGeneralReferenceTypeFieldsClass.class)); .create(OptionalGeneralReferenceTypeFieldsClass.class));
packer.pack(new Packer(out), src); packer.pack(new Packer(out), src);
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
Template tmpl = new OptionalTemplate(DynamicTemplate Template tmpl = new NullableTemplate(DynamicTemplate
.create(OptionalGeneralReferenceTypeFieldsClass.class)); .create(OptionalGeneralReferenceTypeFieldsClass.class));
Unpacker pac = new Unpacker(in); Unpacker pac = new Unpacker(in);
Iterator<MessagePackObject> it = pac.iterator(); Iterator<MessagePackObject> it = pac.iterator();
@ -467,7 +467,7 @@ public class TestPackConvert extends TestCase {
.create(SampleListTypes.class)); .create(SampleListTypes.class));
packer.pack(new Packer(out), src); packer.pack(new Packer(out), src);
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
Template tmpl = new OptionalTemplate(DynamicTemplate Template tmpl = new NullableTemplate(DynamicTemplate
.create(SampleListTypes.class)); .create(SampleListTypes.class));
Unpacker pac = new Unpacker(in); Unpacker pac = new Unpacker(in);
Iterator<MessagePackObject> it = pac.iterator(); Iterator<MessagePackObject> it = pac.iterator();
@ -594,7 +594,7 @@ public class TestPackConvert extends TestCase {
.create(SampleOptionalListTypes.class)); .create(SampleOptionalListTypes.class));
packer.pack(new Packer(out), src); packer.pack(new Packer(out), src);
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
Template tmpl = new OptionalTemplate(DynamicTemplate Template tmpl = new NullableTemplate(DynamicTemplate
.create(SampleOptionalListTypes.class)); .create(SampleOptionalListTypes.class));
Unpacker pac = new Unpacker(in); Unpacker pac = new Unpacker(in);
Iterator<MessagePackObject> it = pac.iterator(); Iterator<MessagePackObject> it = pac.iterator();
@ -685,7 +685,7 @@ public class TestPackConvert extends TestCase {
.create(SampleMapTypes.class)); .create(SampleMapTypes.class));
packer.pack(new Packer(out), src); packer.pack(new Packer(out), src);
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
Template tmpl = new OptionalTemplate(DynamicTemplate Template tmpl = new NullableTemplate(DynamicTemplate
.create(SampleMapTypes.class)); .create(SampleMapTypes.class));
Unpacker pac = new Unpacker(in); Unpacker pac = new Unpacker(in);
Iterator<MessagePackObject> it = pac.iterator(); Iterator<MessagePackObject> it = pac.iterator();
@ -781,7 +781,7 @@ public class TestPackConvert extends TestCase {
.create(SampleOptionalMapTypes.class)); .create(SampleOptionalMapTypes.class));
packer.pack(new Packer(out), src); packer.pack(new Packer(out), src);
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
Template tmpl = new OptionalTemplate(DynamicTemplate Template tmpl = new NullableTemplate(DynamicTemplate
.create(SampleOptionalMapTypes.class)); .create(SampleOptionalMapTypes.class));
Unpacker pac = new Unpacker(in); Unpacker pac = new Unpacker(in);
Iterator<MessagePackObject> it = pac.iterator(); Iterator<MessagePackObject> it = pac.iterator();
@ -1051,7 +1051,7 @@ public class TestPackConvert extends TestCase {
.create(SampleEnumFieldClass.class)); .create(SampleEnumFieldClass.class));
packer.pack(new Packer(out), src); packer.pack(new Packer(out), src);
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
Template tmpl = new OptionalTemplate(DynamicTemplate Template tmpl = new NullableTemplate(DynamicTemplate
.create(SampleEnumFieldClass.class)); .create(SampleEnumFieldClass.class));
Unpacker pac = new Unpacker(in); Unpacker pac = new Unpacker(in);
Iterator<MessagePackObject> it = pac.iterator(); Iterator<MessagePackObject> it = pac.iterator();
@ -1128,7 +1128,7 @@ public class TestPackConvert extends TestCase {
.create(SampleOptionalEnumFieldClass.class)); .create(SampleOptionalEnumFieldClass.class));
packer.pack(new Packer(out), src); packer.pack(new Packer(out), src);
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
Template tmpl = new OptionalTemplate(DynamicTemplate Template tmpl = new NullableTemplate(DynamicTemplate
.create(SampleOptionalEnumFieldClass.class)); .create(SampleOptionalEnumFieldClass.class));
Unpacker pac = new Unpacker(in); Unpacker pac = new Unpacker(in);
Iterator<MessagePackObject> it = pac.iterator(); Iterator<MessagePackObject> it = pac.iterator();
@ -1244,13 +1244,13 @@ public class TestPackConvert extends TestCase {
src2.f2 = 2; src2.f2 = 2;
src.f1 = src2; src.f1 = src2;
ByteArrayOutputStream out = new ByteArrayOutputStream(); ByteArrayOutputStream out = new ByteArrayOutputStream();
tmpl.pack(new Packer(out), src); new Packer(out).pack(src);
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
Unpacker pac = new Unpacker(in); Unpacker pac = new Unpacker(in);
Iterator<MessagePackObject> it = pac.iterator(); Iterator<MessagePackObject> it = pac.iterator();
assertTrue(it.hasNext()); assertTrue(it.hasNext());
MessagePackObject mpo = it.next(); MessagePackObject mpo = it.next();
BaseClass dst = (BaseClass) tmpl.convert(mpo); BaseClass dst = mpo.convert(BaseClass.class);
assertTrue(src.f0 == dst.f0); assertTrue(src.f0 == dst.f0);
assertTrue(src.f1.f2 == dst.f1.f2); assertTrue(src.f1.f2 == dst.f1.f2);
assertFalse(it.hasNext()); assertFalse(it.hasNext());
@ -1260,17 +1260,17 @@ public class TestPackConvert extends TestCase {
public void testNestedFieldClass02() throws Exception { public void testNestedFieldClass02() throws Exception {
Template tmpl2 = DynamicTemplate.create(NestedClass.class); Template tmpl2 = DynamicTemplate.create(NestedClass.class);
CustomMessage.register(NestedClass.class, tmpl2); CustomMessage.register(NestedClass.class, tmpl2);
Template tmpl = new OptionalTemplate(DynamicTemplate.create(BaseClass.class)); Template tmpl = DynamicTemplate.create(BaseClass.class);
CustomMessage.register(BaseClass.class, tmpl); CustomMessage.register(BaseClass.class, tmpl);
BaseClass src = null; BaseClass src = null;
ByteArrayOutputStream out = new ByteArrayOutputStream(); ByteArrayOutputStream out = new ByteArrayOutputStream();
tmpl.pack(new Packer(out), src); new Packer(out).pack(src);
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
Unpacker pac = new Unpacker(in); Unpacker pac = new Unpacker(in);
Iterator<MessagePackObject> it = pac.iterator(); Iterator<MessagePackObject> it = pac.iterator();
assertTrue(it.hasNext()); assertTrue(it.hasNext());
MessagePackObject mpo = it.next(); MessagePackObject mpo = it.next();
BaseClass dst = (BaseClass) tmpl.convert(mpo); BaseClass dst = mpo.convert(BaseClass.class);
assertEquals(src, dst); assertEquals(src, dst);
assertFalse(it.hasNext()); assertFalse(it.hasNext());
} }
@ -1302,13 +1302,13 @@ public class TestPackConvert extends TestCase {
src2.f2 = 2; src2.f2 = 2;
src.f1 = src2; src.f1 = src2;
ByteArrayOutputStream out = new ByteArrayOutputStream(); ByteArrayOutputStream out = new ByteArrayOutputStream();
tmpl.pack(new Packer(out), src); new Packer(out).pack(src);
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
Unpacker pac = new Unpacker(in); Unpacker pac = new Unpacker(in);
Iterator<MessagePackObject> it = pac.iterator(); Iterator<MessagePackObject> it = pac.iterator();
assertTrue(it.hasNext()); assertTrue(it.hasNext());
MessagePackObject mpo = it.next(); MessagePackObject mpo = it.next();
OptionalBaseClass dst = (OptionalBaseClass) tmpl.convert(mpo); OptionalBaseClass dst = mpo.convert(OptionalBaseClass.class);
assertTrue(src.f0 == dst.f0); assertTrue(src.f0 == dst.f0);
assertTrue(src.f1.f2 == dst.f1.f2); assertTrue(src.f1.f2 == dst.f1.f2);
assertFalse(it.hasNext()); assertFalse(it.hasNext());
@ -1322,13 +1322,13 @@ public class TestPackConvert extends TestCase {
CustomMessage.register(OptionalBaseClass.class, tmpl); CustomMessage.register(OptionalBaseClass.class, tmpl);
OptionalBaseClass src = new OptionalBaseClass(); OptionalBaseClass src = new OptionalBaseClass();
ByteArrayOutputStream out = new ByteArrayOutputStream(); ByteArrayOutputStream out = new ByteArrayOutputStream();
tmpl.pack(new Packer(out), src); new Packer(out).pack(src);
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
Unpacker pac = new Unpacker(in); Unpacker pac = new Unpacker(in);
Iterator<MessagePackObject> it = pac.iterator(); Iterator<MessagePackObject> it = pac.iterator();
assertTrue(it.hasNext()); assertTrue(it.hasNext());
MessagePackObject mpo = it.next(); MessagePackObject mpo = it.next();
OptionalBaseClass dst = (OptionalBaseClass) tmpl.convert(mpo); OptionalBaseClass dst = mpo.convert(OptionalBaseClass.class);
assertTrue(src.f0 == dst.f0); assertTrue(src.f0 == dst.f0);
assertEquals(src.f1, dst.f1); assertEquals(src.f1, dst.f1);
assertFalse(it.hasNext()); assertFalse(it.hasNext());
@ -1344,8 +1344,7 @@ public class TestPackConvert extends TestCase {
Template tmpl2 = DynamicTemplate.create(NestedClass.class); Template tmpl2 = DynamicTemplate.create(NestedClass.class);
CustomUnpacker.register(NestedClass.class, tmpl2); CustomUnpacker.register(NestedClass.class, tmpl2);
CustomConverter.register(NestedClass.class, tmpl2); CustomConverter.register(NestedClass.class, tmpl2);
Template tmpl = new OptionalTemplate(DynamicTemplate Template tmpl = DynamicTemplate.create(BaseClass.class);
.create(BaseClass.class));
CustomUnpacker.register(BaseClass.class, tmpl); CustomUnpacker.register(BaseClass.class, tmpl);
CustomConverter.register(BaseClass.class, tmpl); CustomConverter.register(BaseClass.class, tmpl);
BaseClass src = null; BaseClass src = null;
@ -1356,7 +1355,7 @@ public class TestPackConvert extends TestCase {
Iterator<MessagePackObject> it = pac.iterator(); Iterator<MessagePackObject> it = pac.iterator();
assertTrue(it.hasNext()); assertTrue(it.hasNext());
MessagePackObject mpo = it.next(); MessagePackObject mpo = it.next();
BaseClass dst = (BaseClass) tmpl.convert(mpo); BaseClass dst = mpo.convert(BaseClass.class);
assertEquals(src, dst); assertEquals(src, dst);
assertFalse(it.hasNext()); assertFalse(it.hasNext());
} }
@ -1413,7 +1412,7 @@ public class TestPackConvert extends TestCase {
Iterator<MessagePackObject> it = pac.iterator(); Iterator<MessagePackObject> it = pac.iterator();
assertTrue(it.hasNext()); assertTrue(it.hasNext());
MessagePackObject mpo = it.next(); MessagePackObject mpo = it.next();
Template tmpl = new OptionalTemplate(DynamicTemplate Template tmpl = new NullableTemplate(DynamicTemplate
.create(BaseClass2.class)); .create(BaseClass2.class));
BaseClass2 dst = (BaseClass2) tmpl.convert(mpo); BaseClass2 dst = (BaseClass2) tmpl.convert(mpo);
assertEquals(src, dst); assertEquals(src, dst);
@ -1488,7 +1487,7 @@ public class TestPackConvert extends TestCase {
Iterator<MessagePackObject> it = pac.iterator(); Iterator<MessagePackObject> it = pac.iterator();
assertTrue(it.hasNext()); assertTrue(it.hasNext());
MessagePackObject mpo = it.next(); MessagePackObject mpo = it.next();
Template tmpl = new OptionalTemplate(DynamicTemplate Template tmpl = new NullableTemplate(DynamicTemplate
.create(OptionalBaseClass2.class)); .create(OptionalBaseClass2.class));
OptionalBaseClass2 dst = (OptionalBaseClass2) tmpl.convert(mpo); OptionalBaseClass2 dst = (OptionalBaseClass2) tmpl.convert(mpo);
assertEquals(src, dst); assertEquals(src, dst);
@ -1554,7 +1553,7 @@ public class TestPackConvert extends TestCase {
.create(SampleSubClass.class)); .create(SampleSubClass.class));
packer.pack(new Packer(out), src); packer.pack(new Packer(out), src);
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
Template tmpl = new OptionalTemplate(DynamicTemplate Template tmpl = new NullableTemplate(DynamicTemplate
.create(SampleSubClass.class)); .create(SampleSubClass.class));
Unpacker pac = new Unpacker(in); Unpacker pac = new Unpacker(in);
Iterator<MessagePackObject> it = pac.iterator(); Iterator<MessagePackObject> it = pac.iterator();
@ -1629,7 +1628,7 @@ public class TestPackConvert extends TestCase {
.create(SampleOptionalSubClass.class)); .create(SampleOptionalSubClass.class));
packer.pack(new Packer(out), src); packer.pack(new Packer(out), src);
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
Template tmpl = new OptionalTemplate(DynamicTemplate Template tmpl = new NullableTemplate(DynamicTemplate
.create(SampleOptionalSubClass.class)); .create(SampleOptionalSubClass.class));
Unpacker pac = new Unpacker(in); Unpacker pac = new Unpacker(in);
Iterator<MessagePackObject> it = pac.iterator(); Iterator<MessagePackObject> it = pac.iterator();
@ -1706,7 +1705,7 @@ public class TestPackConvert extends TestCase {
.create(BaseMessagePackableConvertableClass.class)); .create(BaseMessagePackableConvertableClass.class));
packer.pack(new Packer(out), src); packer.pack(new Packer(out), src);
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
Template tmpl = new OptionalTemplate(DynamicTemplate Template tmpl = new NullableTemplate(DynamicTemplate
.create(BaseMessagePackableConvertableClass.class)); .create(BaseMessagePackableConvertableClass.class));
Unpacker pac = new Unpacker(in); Unpacker pac = new Unpacker(in);
Iterator<MessagePackObject> it = pac.iterator(); Iterator<MessagePackObject> it = pac.iterator();
@ -1820,7 +1819,7 @@ public class TestPackConvert extends TestCase {
.create(OptionalBaseMessagePackableConvertableClass.class)); .create(OptionalBaseMessagePackableConvertableClass.class));
packer.pack(new Packer(out), src); packer.pack(new Packer(out), src);
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
Template tmpl = new OptionalTemplate(DynamicTemplate Template tmpl = new NullableTemplate(DynamicTemplate
.create(OptionalBaseMessagePackableConvertableClass.class)); .create(OptionalBaseMessagePackableConvertableClass.class));
Unpacker pac = new Unpacker(in); Unpacker pac = new Unpacker(in);
Iterator<MessagePackObject> it = pac.iterator(); Iterator<MessagePackObject> it = pac.iterator();

9
java/src/test/java/org/msgpack/util/codegen/TestPackConvertWithFieldOption.java
View File

@ -20,6 +20,7 @@ import org.msgpack.packer.OptionalPacker;
import org.msgpack.template.ListTemplate; import org.msgpack.template.ListTemplate;
import org.msgpack.template.MapTemplate; import org.msgpack.template.MapTemplate;
import org.msgpack.template.OptionalTemplate; import org.msgpack.template.OptionalTemplate;
import org.msgpack.template.NullableTemplate;
import static org.msgpack.Templates.tBigInteger; import static org.msgpack.Templates.tBigInteger;
import static org.msgpack.Templates.tBoolean; import static org.msgpack.Templates.tBoolean;
import static org.msgpack.Templates.tByte; import static org.msgpack.Templates.tByte;
@ -125,7 +126,7 @@ public class TestPackConvertWithFieldOption extends TestCase {
PrimitiveTypeFieldsClass.class, opts)); PrimitiveTypeFieldsClass.class, opts));
packer.pack(new Packer(out), src); packer.pack(new Packer(out), src);
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
Template tmpl = new OptionalTemplate(DynamicTemplate.create(PrimitiveTypeFieldsClass.class, opts)); Template tmpl = new NullableTemplate(DynamicTemplate.create(PrimitiveTypeFieldsClass.class, opts));
Unpacker pac = new Unpacker(in); Unpacker pac = new Unpacker(in);
Iterator<MessagePackObject> it = pac.iterator(); Iterator<MessagePackObject> it = pac.iterator();
assertTrue(it.hasNext()); assertTrue(it.hasNext());
@ -268,7 +269,7 @@ public class TestPackConvertWithFieldOption extends TestCase {
.create(GeneralReferenceTypeFieldsClass.class, opts)); .create(GeneralReferenceTypeFieldsClass.class, opts));
packer.pack(new Packer(out), src); packer.pack(new Packer(out), src);
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
Template tmpl = new OptionalTemplate(DynamicTemplate Template tmpl = new NullableTemplate(DynamicTemplate
.create(GeneralReferenceTypeFieldsClass.class, opts)); .create(GeneralReferenceTypeFieldsClass.class, opts));
Unpacker pac = new Unpacker(in); Unpacker pac = new Unpacker(in);
Iterator<MessagePackObject> it = pac.iterator(); Iterator<MessagePackObject> it = pac.iterator();
@ -410,7 +411,7 @@ public class TestPackConvertWithFieldOption extends TestCase {
.create(SampleListTypes.class)); .create(SampleListTypes.class));
packer.pack(new Packer(out), src); packer.pack(new Packer(out), src);
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
Template tmpl = new OptionalTemplate(DynamicTemplate Template tmpl = new NullableTemplate(DynamicTemplate
.create(SampleListTypes.class, opts)); .create(SampleListTypes.class, opts));
Unpacker pac = new Unpacker(in); Unpacker pac = new Unpacker(in);
Iterator<MessagePackObject> it = pac.iterator(); Iterator<MessagePackObject> it = pac.iterator();
@ -532,7 +533,7 @@ public class TestPackConvertWithFieldOption extends TestCase {
.create(SampleMapTypes.class, opts)); .create(SampleMapTypes.class, opts));
packer.pack(new Packer(out), src); packer.pack(new Packer(out), src);
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
Template tmpl = new OptionalTemplate(DynamicTemplate.create(SampleMapTypes.class, opts)); Template tmpl = new NullableTemplate(DynamicTemplate.create(SampleMapTypes.class, opts));
Unpacker pac = new Unpacker(in); Unpacker pac = new Unpacker(in);
Iterator<MessagePackObject> it = pac.iterator(); Iterator<MessagePackObject> it = pac.iterator();
assertTrue(it.hasNext()); assertTrue(it.hasNext());

38
java/src/test/java/org/msgpack/util/codegen/TestPackUnpack.java
View File

@ -23,7 +23,7 @@ import org.msgpack.annotation.MessagePackMessage;
import org.msgpack.annotation.MessagePackOptional; import org.msgpack.annotation.MessagePackOptional;
import org.msgpack.annotation.MessagePackOrdinalEnum; import org.msgpack.annotation.MessagePackOrdinalEnum;
import org.msgpack.packer.OptionalPacker; import org.msgpack.packer.OptionalPacker;
import org.msgpack.template.OptionalTemplate; import org.msgpack.template.NullableTemplate;
import junit.framework.TestCase; import junit.framework.TestCase;
@ -84,7 +84,7 @@ public class TestPackUnpack extends TestCase {
.create(PrimitiveTypeFieldsClass.class)); .create(PrimitiveTypeFieldsClass.class));
packer.pack(new Packer(out), src); packer.pack(new Packer(out), src);
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
Template tmpl = new OptionalTemplate(DynamicTemplate Template tmpl = new NullableTemplate(DynamicTemplate
.create(PrimitiveTypeFieldsClass.class)); .create(PrimitiveTypeFieldsClass.class));
PrimitiveTypeFieldsClass dst = (PrimitiveTypeFieldsClass) tmpl PrimitiveTypeFieldsClass dst = (PrimitiveTypeFieldsClass) tmpl
.unpack(new Unpacker(in)); .unpack(new Unpacker(in));
@ -161,7 +161,7 @@ public class TestPackUnpack extends TestCase {
.create(OptionalPrimitiveTypeFieldsClass.class)); .create(OptionalPrimitiveTypeFieldsClass.class));
packer.pack(new Packer(out), src); packer.pack(new Packer(out), src);
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
Template tmpl = new OptionalTemplate(DynamicTemplate Template tmpl = new NullableTemplate(DynamicTemplate
.create(OptionalPrimitiveTypeFieldsClass.class)); .create(OptionalPrimitiveTypeFieldsClass.class));
OptionalPrimitiveTypeFieldsClass dst = (OptionalPrimitiveTypeFieldsClass) tmpl OptionalPrimitiveTypeFieldsClass dst = (OptionalPrimitiveTypeFieldsClass) tmpl
.unpack(new Unpacker(in)); .unpack(new Unpacker(in));
@ -231,7 +231,7 @@ public class TestPackUnpack extends TestCase {
.create(GeneralReferenceTypeFieldsClass.class)); .create(GeneralReferenceTypeFieldsClass.class));
packer.pack(new Packer(out), src); packer.pack(new Packer(out), src);
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
Template tmpl = new OptionalTemplate(DynamicTemplate Template tmpl = new NullableTemplate(DynamicTemplate
.create(GeneralReferenceTypeFieldsClass.class)); .create(GeneralReferenceTypeFieldsClass.class));
GeneralReferenceTypeFieldsClass dst = (GeneralReferenceTypeFieldsClass) tmpl GeneralReferenceTypeFieldsClass dst = (GeneralReferenceTypeFieldsClass) tmpl
.unpack(new Unpacker(in)); .unpack(new Unpacker(in));
@ -334,7 +334,7 @@ public class TestPackUnpack extends TestCase {
.create(GeneralOptionalReferenceTypeFieldsClass.class)); .create(GeneralOptionalReferenceTypeFieldsClass.class));
packer.pack(new Packer(out), src); packer.pack(new Packer(out), src);
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
Template tmpl = new OptionalTemplate(DynamicTemplate Template tmpl = new NullableTemplate(DynamicTemplate
.create(GeneralOptionalReferenceTypeFieldsClass.class)); .create(GeneralOptionalReferenceTypeFieldsClass.class));
GeneralOptionalReferenceTypeFieldsClass dst = (GeneralOptionalReferenceTypeFieldsClass) tmpl GeneralOptionalReferenceTypeFieldsClass dst = (GeneralOptionalReferenceTypeFieldsClass) tmpl
.unpack(new Unpacker(in)); .unpack(new Unpacker(in));
@ -428,7 +428,7 @@ public class TestPackUnpack extends TestCase {
.create(SampleListTypes.class)); .create(SampleListTypes.class));
packer.pack(new Packer(out), src); packer.pack(new Packer(out), src);
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
Template tmpl = new OptionalTemplate(DynamicTemplate Template tmpl = new NullableTemplate(DynamicTemplate
.create(SampleListTypes.class)); .create(SampleListTypes.class));
SampleListTypes dst = (SampleListTypes) tmpl.unpack(new Unpacker(in)); SampleListTypes dst = (SampleListTypes) tmpl.unpack(new Unpacker(in));
assertEquals(src, dst); assertEquals(src, dst);
@ -540,7 +540,7 @@ public class TestPackUnpack extends TestCase {
.create(SampleOptionalListTypes.class)); .create(SampleOptionalListTypes.class));
packer.pack(new Packer(out), src); packer.pack(new Packer(out), src);
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
Template tmpl = new OptionalTemplate(DynamicTemplate Template tmpl = new NullableTemplate(DynamicTemplate
.create(SampleOptionalListTypes.class)); .create(SampleOptionalListTypes.class));
SampleListTypes dst = (SampleListTypes) tmpl.unpack(new Unpacker(in)); SampleListTypes dst = (SampleListTypes) tmpl.unpack(new Unpacker(in));
assertEquals(src, dst); assertEquals(src, dst);
@ -620,7 +620,7 @@ public class TestPackUnpack extends TestCase {
.create(SampleMapTypes.class)); .create(SampleMapTypes.class));
packer.pack(new Packer(out), src); packer.pack(new Packer(out), src);
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
Template tmpl = new OptionalTemplate(DynamicTemplate Template tmpl = new NullableTemplate(DynamicTemplate
.create(SampleMapTypes.class)); .create(SampleMapTypes.class));
SampleMapTypes dst = (SampleMapTypes) tmpl.unpack(new Unpacker(in)); SampleMapTypes dst = (SampleMapTypes) tmpl.unpack(new Unpacker(in));
assertEquals(src, dst); assertEquals(src, dst);
@ -703,7 +703,7 @@ public class TestPackUnpack extends TestCase {
.create(SampleOptionalMapTypes.class)); .create(SampleOptionalMapTypes.class));
packer.pack(new Packer(out), src); packer.pack(new Packer(out), src);
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
Template tmpl = new OptionalTemplate(DynamicTemplate Template tmpl = new NullableTemplate(DynamicTemplate
.create(SampleOptionalMapTypes.class)); .create(SampleOptionalMapTypes.class));
SampleOptionalMapTypes dst = (SampleOptionalMapTypes) tmpl SampleOptionalMapTypes dst = (SampleOptionalMapTypes) tmpl
.unpack(new Unpacker(in)); .unpack(new Unpacker(in));
@ -958,7 +958,7 @@ public class TestPackUnpack extends TestCase {
.create(SampleEnumFieldClass.class)); .create(SampleEnumFieldClass.class));
packer.pack(new Packer(out), src); packer.pack(new Packer(out), src);
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
Template tmpl = new OptionalTemplate(DynamicTemplate Template tmpl = new NullableTemplate(DynamicTemplate
.create(SampleEnumFieldClass.class)); .create(SampleEnumFieldClass.class));
SampleEnumFieldClass dst = (SampleEnumFieldClass) tmpl SampleEnumFieldClass dst = (SampleEnumFieldClass) tmpl
.unpack(new Unpacker(in)); .unpack(new Unpacker(in));
@ -1022,7 +1022,7 @@ public class TestPackUnpack extends TestCase {
.create(SampleEnumFieldClass.class)); .create(SampleEnumFieldClass.class));
packer.pack(new Packer(out), src); packer.pack(new Packer(out), src);
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
Template tmpl = new OptionalTemplate(DynamicTemplate Template tmpl = new NullableTemplate(DynamicTemplate
.create(SampleEnumFieldClass.class)); .create(SampleEnumFieldClass.class));
SampleEnumFieldClass dst = (SampleEnumFieldClass) tmpl SampleEnumFieldClass dst = (SampleEnumFieldClass) tmpl
.unpack(new Unpacker(in)); .unpack(new Unpacker(in));
@ -1136,7 +1136,7 @@ public class TestPackUnpack extends TestCase {
public void testNestedFieldClass01() throws Exception { public void testNestedFieldClass01() throws Exception {
Template tmpl2 = DynamicTemplate.create(NestedClass.class); Template tmpl2 = DynamicTemplate.create(NestedClass.class);
CustomMessage.register(NestedClass.class, tmpl2); CustomMessage.register(NestedClass.class, tmpl2);
Template tmpl = new OptionalTemplate(DynamicTemplate.create(BaseClass.class)); Template tmpl = new NullableTemplate(DynamicTemplate.create(BaseClass.class));
BaseClass src = null; BaseClass src = null;
ByteArrayOutputStream out = new ByteArrayOutputStream(); ByteArrayOutputStream out = new ByteArrayOutputStream();
tmpl.pack(new Packer(out), src); tmpl.pack(new Packer(out), src);
@ -1198,7 +1198,7 @@ public class TestPackUnpack extends TestCase {
public void testOptionalNestedFieldClass02() throws Exception { public void testOptionalNestedFieldClass02() throws Exception {
Template tmpl2 = DynamicTemplate.create(OptionalNestedClass.class); Template tmpl2 = DynamicTemplate.create(OptionalNestedClass.class);
CustomMessage.register(OptionalNestedClass.class, tmpl2); CustomMessage.register(OptionalNestedClass.class, tmpl2);
Template tmpl = new OptionalTemplate(DynamicTemplate.create(OptionalBaseClass.class)); Template tmpl = new NullableTemplate(DynamicTemplate.create(OptionalBaseClass.class));
CustomMessage.register(OptionalBaseClass.class, tmpl); CustomMessage.register(OptionalBaseClass.class, tmpl);
OptionalBaseClass src = null; OptionalBaseClass src = null;
ByteArrayOutputStream out = new ByteArrayOutputStream(); ByteArrayOutputStream out = new ByteArrayOutputStream();
@ -1252,7 +1252,7 @@ public class TestPackUnpack extends TestCase {
.create(BaseClass2.class)); .create(BaseClass2.class));
packer.pack(new Packer(out), src); packer.pack(new Packer(out), src);
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
Template tmpl = new OptionalTemplate(DynamicTemplate Template tmpl = new NullableTemplate(DynamicTemplate
.create(BaseClass2.class)); .create(BaseClass2.class));
BaseClass2 dst = (BaseClass2) tmpl.unpack(new Unpacker(in)); BaseClass2 dst = (BaseClass2) tmpl.unpack(new Unpacker(in));
assertEquals(src, dst); assertEquals(src, dst);
@ -1315,7 +1315,7 @@ public class TestPackUnpack extends TestCase {
.create(OptionalBaseClass2.class)); .create(OptionalBaseClass2.class));
packer.pack(new Packer(out), src); packer.pack(new Packer(out), src);
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
Template tmpl = new OptionalTemplate(DynamicTemplate Template tmpl = new NullableTemplate(DynamicTemplate
.create(OptionalBaseClass2.class)); .create(OptionalBaseClass2.class));
OptionalBaseClass2 dst = (OptionalBaseClass2) tmpl.unpack(new Unpacker( OptionalBaseClass2 dst = (OptionalBaseClass2) tmpl.unpack(new Unpacker(
in)); in));
@ -1376,7 +1376,7 @@ public class TestPackUnpack extends TestCase {
.create(SampleSubClass.class)); .create(SampleSubClass.class));
packer.pack(new Packer(out), src); packer.pack(new Packer(out), src);
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
Template tmpl = new OptionalTemplate(DynamicTemplate Template tmpl = new NullableTemplate(DynamicTemplate
.create(SampleSubClass.class)); .create(SampleSubClass.class));
SampleSubClass dst = (SampleSubClass) tmpl.unpack(new Unpacker(in)); SampleSubClass dst = (SampleSubClass) tmpl.unpack(new Unpacker(in));
assertEquals(src, dst); assertEquals(src, dst);
@ -1442,7 +1442,7 @@ public class TestPackUnpack extends TestCase {
.create(SampleOptionalSubClass.class)); .create(SampleOptionalSubClass.class));
packer.pack(new Packer(out), src); packer.pack(new Packer(out), src);
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
Template tmpl = new OptionalTemplate(DynamicTemplate Template tmpl = new NullableTemplate(DynamicTemplate
.create(SampleOptionalSubClass.class)); .create(SampleOptionalSubClass.class));
SampleOptionalSubClass dst = (SampleOptionalSubClass) tmpl SampleOptionalSubClass dst = (SampleOptionalSubClass) tmpl
.unpack(new Unpacker(in)); .unpack(new Unpacker(in));
@ -1510,7 +1510,7 @@ public class TestPackUnpack extends TestCase {
.create(BaseMessagePackableUnpackableClass.class)); .create(BaseMessagePackableUnpackableClass.class));
packer.pack(new Packer(out), src); packer.pack(new Packer(out), src);
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
Template tmpl = new OptionalTemplate(DynamicTemplate Template tmpl = new NullableTemplate(DynamicTemplate
.create(BaseMessagePackableUnpackableClass.class)); .create(BaseMessagePackableUnpackableClass.class));
BaseMessagePackableUnpackableClass dst = (BaseMessagePackableUnpackableClass) tmpl BaseMessagePackableUnpackableClass dst = (BaseMessagePackableUnpackableClass) tmpl
.unpack(new Unpacker(in)); .unpack(new Unpacker(in));
@ -1609,7 +1609,7 @@ public class TestPackUnpack extends TestCase {
.create(OptionalBaseMessagePackableUnpackableClass.class)); .create(OptionalBaseMessagePackableUnpackableClass.class));
packer.pack(new Packer(out), src); packer.pack(new Packer(out), src);
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
Template tmpl = new OptionalTemplate(DynamicTemplate Template tmpl = new NullableTemplate(DynamicTemplate
.create(OptionalBaseMessagePackableUnpackableClass.class)); .create(OptionalBaseMessagePackableUnpackableClass.class));
OptionalBaseMessagePackableUnpackableClass dst = (OptionalBaseMessagePackableUnpackableClass) tmpl OptionalBaseMessagePackableUnpackableClass dst = (OptionalBaseMessagePackableUnpackableClass) tmpl
.unpack(new Unpacker(in)); .unpack(new Unpacker(in));

9
java/src/test/java/org/msgpack/util/codegen/TestPackUnpackWithFieldOption.java
View File

@ -19,6 +19,7 @@ import org.msgpack.packer.OptionalPacker;
import org.msgpack.template.ListTemplate; import org.msgpack.template.ListTemplate;
import org.msgpack.template.MapTemplate; import org.msgpack.template.MapTemplate;
import org.msgpack.template.OptionalTemplate; import org.msgpack.template.OptionalTemplate;
import org.msgpack.template.NullableTemplate;
import static org.msgpack.Templates.tBigInteger; import static org.msgpack.Templates.tBigInteger;
import static org.msgpack.Templates.tBoolean; import static org.msgpack.Templates.tBoolean;
import static org.msgpack.Templates.tByte; import static org.msgpack.Templates.tByte;
@ -118,7 +119,7 @@ public class TestPackUnpackWithFieldOption extends TestCase {
PrimitiveTypeFieldsClass.class, opts)); PrimitiveTypeFieldsClass.class, opts));
packer.pack(new Packer(out), src); packer.pack(new Packer(out), src);
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
Template tmpl = new OptionalTemplate(DynamicTemplate.create( Template tmpl = new NullableTemplate(DynamicTemplate.create(
PrimitiveTypeFieldsClass.class, opts)); PrimitiveTypeFieldsClass.class, opts));
PrimitiveTypeFieldsClass dst = (PrimitiveTypeFieldsClass) tmpl PrimitiveTypeFieldsClass dst = (PrimitiveTypeFieldsClass) tmpl
.unpack(new Unpacker(in)); .unpack(new Unpacker(in));
@ -252,7 +253,7 @@ public class TestPackUnpackWithFieldOption extends TestCase {
.create(GeneralReferenceTypeFieldsClass.class, opts)); .create(GeneralReferenceTypeFieldsClass.class, opts));
packer.pack(new Packer(out), src); packer.pack(new Packer(out), src);
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
Template tmpl = new OptionalTemplate(DynamicTemplate Template tmpl = new NullableTemplate(DynamicTemplate
.create(GeneralReferenceTypeFieldsClass.class, opts)); .create(GeneralReferenceTypeFieldsClass.class, opts));
GeneralReferenceTypeFieldsClass dst = (GeneralReferenceTypeFieldsClass) tmpl GeneralReferenceTypeFieldsClass dst = (GeneralReferenceTypeFieldsClass) tmpl
.unpack(new Unpacker(in)); .unpack(new Unpacker(in));
@ -382,7 +383,7 @@ public class TestPackUnpackWithFieldOption extends TestCase {
.create(SampleListTypes.class)); .create(SampleListTypes.class));
packer.pack(new Packer(out), src); packer.pack(new Packer(out), src);
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
Template tmpl = new OptionalTemplate(DynamicTemplate Template tmpl = new NullableTemplate(DynamicTemplate
.create(SampleListTypes.class)); .create(SampleListTypes.class));
SampleListTypes dst = (SampleListTypes) tmpl.unpack(new Unpacker(in)); SampleListTypes dst = (SampleListTypes) tmpl.unpack(new Unpacker(in));
assertEquals(src, dst); assertEquals(src, dst);
@ -491,7 +492,7 @@ public class TestPackUnpackWithFieldOption extends TestCase {
.create(SampleMapTypes.class, opts)); .create(SampleMapTypes.class, opts));
packer.pack(new Packer(out), src); packer.pack(new Packer(out), src);
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
Template tmpl = new OptionalTemplate(DynamicTemplate Template tmpl = new NullableTemplate(DynamicTemplate
.create(SampleMapTypes.class, opts)); .create(SampleMapTypes.class, opts));
SampleMapTypes dst = (SampleMapTypes) tmpl SampleMapTypes dst = (SampleMapTypes) tmpl
.unpack(new Unpacker(in)); .unpack(new Unpacker(in));