TemplateRegistry::lookup try to traverse ancestor interfaces

kjim · kjim · commit d42d95161505 · 2011-10-30T21:16:30.000+09:00
diff --git a/src/main/java/org/msgpack/template/TemplateRegistry.java b/src/main/java/org/msgpack/template/TemplateRegistry.java
@@ -342,6 +342,11 @@ 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
 		    }
diff --git a/src/test/java/org/msgpack/template/TestTemplateRegistry.java b/src/test/java/org/msgpack/template/TestTemplateRegistry.java
@@ -0,0 +1,38 @@
+package org.msgpack.template;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Test;
+
+public class TestTemplateRegistry {
+
+    private static final TemplateRegistry root = new TemplateRegistry(null);
+
+    static class MyArrayList<E> extends ArrayList<E> {
+        private static final long serialVersionUID = 1L;
+    }
+
+    @Test
+    public void testTraverseInterface() throws Exception {
+        Template<?> template = root.lookup(List.class);
+        assertThat(template, is(instanceOf(ListTemplate.class)));
+    }
+
+    @Test
+    public void testTraverseDescentInterface() throws Exception {
+        Template<?> template = root.lookup(MyArrayList.class);
+        assertThat(template, is(instanceOf(ListTemplate.class)));
+    }
+
+    @Test
+    public void testArraysAsListIsPackable() throws Exception {
+        Template<?> template = root.lookup(Arrays.asList().getClass());
+        assertThat(template, is(instanceOf(ListTemplate.class)));
+    }
+
+}

Original file line number	Diff line number	Diff line change
`@@ -342,6 +342,11 @@ private <T> Template<T> lookupSuperclasses(Class<T> targetClass) {`
`342`	`342`	`if (tmpl != null) {`
`343`	`343`	`register(targetClass, tmpl);`
`344`	`344`	`return tmpl;`
	`345`	`+ } else {`
	`346`	`+ tmpl = (Template<T>) lookupInterfaceTypes(superClass);`
	`347`	`+ if (tmpl != null) {`
	`348`	`+ return tmpl;`
	`349`	`+ }`
`345`	`350`	`}`
`346`	`351`	`} catch (NullPointerException e) { // ignore`
`347`	`352`	`}`