refactored TemplateRegistry class

Author: muga

src/main/java/org/msgpack/MessagePack.java

@@ -189,9 +189,7 @@ public <T> byte[] write(T v) throws IOException {
 	BufferPacker pk = createBufferPacker();
 	if (v == null) {
 	    pk.writeNil();
-	} else if(v instanceof Value){
-        return write((Value)v);
-    }else {
+	}else {
 	    @SuppressWarnings("unchecked")
 	    Template<T> tmpl = registry.lookup(v.getClass());
 	    tmpl.write(pk, v);

src/main/java/org/msgpack/packer/AbstractPacker.java

@@ -199,8 +199,6 @@ public Packer write(String o) throws IOException {
     public Packer write(Object o) throws IOException {
         if(o == null) {
             writeNil();
-        } else if(o instanceof Value){
-            write((Value)o);
         } else {
             Template tmpl = msgpack.lookup(o.getClass());
             tmpl.write(this, o);

src/main/java/org/msgpack/template/AnyTemplate.java

@@ -34,9 +34,7 @@ public AnyTemplate(TemplateRegistry registry) {
 
     @SuppressWarnings("unchecked")
     public void write(Packer pk, T target, boolean required) throws IOException {
-	if (target instanceof Value) {
-	    pk.write((Value) target);
-	} else if (target == null) {
+        if (target == null) {
             if(required) {
 		throw new MessageTypeException("Attempted to write null");
             }

src/main/java/org/msgpack/template/TemplateRegistry.java

@@ -233,6 +233,12 @@ public synchronized Template lookup(Type targetType) {
 	    return tmpl;
 	}
 
+	// lookup template of interface type of superclasss
+	tmpl = lookupSuperclassInterfaceTypes(targetClass);
+	if (tmpl != null) {
+	    return tmpl;
+	}
+
 	throw new MessageTypeException(
 		"Cannot find template for " + targetClass + " class. Try to add @Message annotation to the class or call MessagePack.register(Type).");
     }
@@ -342,11 +348,6 @@ private <T> Template<T> lookupSuperclasses(Class<T> targetClass) {
 			if (tmpl != null) {
 			    register(targetClass, tmpl);
 			    return tmpl;
-			} else {
-			    tmpl = (Template<T>) lookupInterfaceTypes(superClass);
-			    if (tmpl != null) {
-			        return tmpl;
-			    }
 			}
 		    } catch (NullPointerException e) { // ignore
 		    }
@@ -356,6 +357,30 @@ private <T> Template<T> lookupSuperclasses(Class<T> targetClass) {
 	return tmpl;
     }
 
+    private <T> Template<T> lookupSuperclassInterfaceTypes(Class<T> targetClass) {
+        Class<?> superClass = targetClass.getSuperclass();
+        Template<T> tmpl = null;
+        if (superClass != null) {
+            for (; superClass != Object.class; superClass = superClass.getSuperclass()) {
+                tmpl = (Template<T>) lookupInterfaceTypes(superClass);
+                if (tmpl != null) {
+                    register(targetClass, tmpl);
+                    return tmpl;
+                } else {
+                    try {
+                        tmpl = (Template<T>) parent.lookupCache(superClass);
+                        if (tmpl != null) {
+                            register(targetClass, tmpl);
+                            return tmpl;
+                        }
+                    } catch (NullPointerException e) { // ignore
+                    }
+                }
+            }
+        }
+        return tmpl;
+    }
+
     private synchronized Template buildAndRegister(TemplateBuilder builder, final Class targetClass,
 	    final boolean hasAnnotation, final FieldList flist) {
 	Template newTmpl = null;