Fix #1617 支持泛型对象嵌套

Author: puppet-fish

src/org/nutz/lang/Mirror.java

@@ -1708,6 +1708,7 @@ public static Class<?>[] getGenericTypes(Field f) {
         Matcher m = PTN.matcher(gts);
         if (m.find()) {
             String s = m.group(2);
+            s = s.replaceAll("<+.*?>+", "");
             String[] ss = Strings.splitIgnoreBlank(s);
             if (ss.length > 0) {
                 Class<?>[] re = new Class<?>[ss.length];

test/org/nutz/lang/MirrorTest.java

@@ -501,6 +501,9 @@ class Abcc {
 
         List<?> list2;
 
+        List<Map<String, String>> list3;
+
+        Map<String, List<Map<String, ?>>> map3;
     }
 
     @Test
@@ -530,6 +533,14 @@ public void test_getGenericTypes() throws Exception {
         f = Abcc.class.getDeclaredField("name");
         types = Mirror.getGenericTypes(f);
         assertEquals(0, types.length);
+
+        f = Abcc.class.getDeclaredField("list3");
+        types = Mirror.getGenericTypes(f);
+        assertEquals(1, types.length);
+
+        f = Abcc.class.getDeclaredField("map3");
+        types = Mirror.getGenericTypes(f);
+        assertEquals(2, types.length);
     }
 
     public static class TBOC {