Ensure that Key annotations are respected for proxy instances.

gk-brown · gk-brown · commit e4f0770aaab6 · 2019-11-15T17:14:36.000-05:00
diff --git a/httprpc-client/src/main/java/org/httprpc/beans/BeanAdapter.java b/httprpc-client/src/main/java/org/httprpc/beans/BeanAdapter.java
@@ -175,6 +175,16 @@ private BeanAdapter(Object bean, HashMap<Class<?>, HashMap<String, Method>> acce
 
         Class<?> type = bean.getClass();
 
+        if (Proxy.class.isAssignableFrom(type)) {
+            Class<?>[] interfaces = type.getInterfaces();
+
+            if (interfaces.length == 0) {
+                throw new IllegalArgumentException();
+            }
+
+            type = interfaces[0];
+        }
+
         accessors = accessorCache.get(type);
 
         if (accessors == null) {
diff --git a/httprpc-client/src/test/java/org/httprpc/beans/BeanAdapterTest.java b/httprpc-client/src/test/java/org/httprpc/beans/BeanAdapterTest.java
@@ -188,4 +188,13 @@ public void testDescribe() {
             structures.get(TestBean.NestedBean.class)
         );
     }
+
+    @Test
+    public void testInterfaceKey() {
+        TestInterface testInterface = BeanAdapter.adapt(mapOf(entry("i", 10)), TestInterface.class);
+
+        Map<String, ?> map = new BeanAdapter(testInterface);
+
+        Assertions.assertEquals(10, map.get("i"));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -188,4 +188,13 @@ public void testDescribe() {`
`188`	`188`	`structures.get(TestBean.NestedBean.class)`
`189`	`189`	`);`
`190`	`190`	`}`
	`191`	`+`
	`192`	`+ @Test`
	`193`	`+ public void testInterfaceKey() {`
	`194`	`+ TestInterface testInterface = BeanAdapter.adapt(mapOf(entry("i", 10)), TestInterface.class);`
	`195`	`+`
	`196`	`+ Map<String, ?> map = new BeanAdapter(testInterface);`
	`197`	`+`
	`198`	`+ Assertions.assertEquals(10, map.get("i"));`
	`199`	`+ }`
`191`	`200`	`}`