From 1c0afbc5c5abba1bddff6743581d4e1e48b895f8 Mon Sep 17 00:00:00 2001 From: frsyuki Date: Mon, 27 Sep 2010 17:42:00 +0900 Subject: [PATCH 1/2] java: loads template classes when Unpacker, MessagePackObject or ClassTemplate is loaded --- java/src/main/java/org/msgpack/MessagePackObject.java | 4 ++++ java/src/main/java/org/msgpack/Templates.java | 2 ++ java/src/main/java/org/msgpack/Unpacker.java | 3 +++ .../test/java/org/msgpack/TestReflectionPackerTemplate.java | 4 ---- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/java/src/main/java/org/msgpack/MessagePackObject.java b/java/src/main/java/org/msgpack/MessagePackObject.java index f7e9e0e6..8dd9d8b5 100644 --- a/java/src/main/java/org/msgpack/MessagePackObject.java +++ b/java/src/main/java/org/msgpack/MessagePackObject.java @@ -23,6 +23,10 @@ import java.util.Map; import java.math.BigInteger; public abstract class MessagePackObject implements Cloneable, MessagePackable { + static { + Templates.load(); + } + public boolean isNil() { return false; } diff --git a/java/src/main/java/org/msgpack/Templates.java b/java/src/main/java/org/msgpack/Templates.java index 222f6257..b6938400 100644 --- a/java/src/main/java/org/msgpack/Templates.java +++ b/java/src/main/java/org/msgpack/Templates.java @@ -20,6 +20,8 @@ package org.msgpack; import org.msgpack.template.*; public class Templates { + public static void load() { } + public static Template tList(Template elementTemplate) { return new ListTemplate(elementTemplate); } diff --git a/java/src/main/java/org/msgpack/Unpacker.java b/java/src/main/java/org/msgpack/Unpacker.java index 4e397488..9966fcad 100644 --- a/java/src/main/java/org/msgpack/Unpacker.java +++ b/java/src/main/java/org/msgpack/Unpacker.java @@ -103,6 +103,9 @@ import java.math.BigInteger; * */ public class Unpacker implements Iterable { + static { + Templates.load(); + } // buffer: // +---------------------------------------------+ diff --git a/java/src/test/java/org/msgpack/TestReflectionPackerTemplate.java b/java/src/test/java/org/msgpack/TestReflectionPackerTemplate.java index 27edde1f..1f0016d7 100644 --- a/java/src/test/java/org/msgpack/TestReflectionPackerTemplate.java +++ b/java/src/test/java/org/msgpack/TestReflectionPackerTemplate.java @@ -18,8 +18,6 @@ public class TestReflectionPackerTemplate { @Test public void testPackConvert() throws Exception { - tString(); // FIXME link StringTemplate - ByteArrayOutputStream out = new ByteArrayOutputStream(); MessagePacker packer = ReflectionPacker.create(StringFieldClass.class); @@ -45,8 +43,6 @@ public class TestReflectionPackerTemplate { @Test public void testPackConvert02() throws Exception { - tString(); // FIXME link StringTemplate - ByteArrayOutputStream out = new ByteArrayOutputStream(); CustomPacker.register(StringFieldClass.class, ReflectionPacker.create(StringFieldClass.class)); From e739c60e9f37c9d9903df7f11c866e15f2c12404 Mon Sep 17 00:00:00 2001 From: frsyuki Date: Mon, 27 Sep 2010 17:42:22 +0900 Subject: [PATCH 2/2] java: pom.xml: v0.4 --- java/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/pom.xml b/java/pom.xml index 70da6a6f..eb7930d5 100755 --- a/java/pom.xml +++ b/java/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.msgpack msgpack - 0.3 + 0.4 MessagePack for Java MessagePack for Java