java: loads template classes when Unpacker, MessagePackObject or ClassTemplate is loaded

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 f7e9e0e..8dd9d8b 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 222f625..b693840 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 4e39748..9966fca 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;
  * </pre>
  */
 public class Unpacker implements Iterable<MessagePackObject> {
+	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 27edde1..1f0016d 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));