fix: map type error (#260)

Author: YongwuHe

arex-instrumentation-api/src/main/java/io/arex/inst/runtime/util/TypeUtil.java

@@ -6,6 +6,7 @@
 import io.arex.inst.runtime.log.LogManager;
 
 import java.lang.reflect.Field;
+import java.lang.reflect.TypeVariable;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Optional;
@@ -229,17 +230,31 @@ private static String optionalToString(Optional<?> result) {
     }
 
     private static String mapToString(Map<?, ?> result) {
-        if (result.size() < 1) {
+        if (result.isEmpty()) {
             return result.getClass().getName();
         }
+
+        String resultClassName = result.getClass().getName();
+        final TypeVariable<?>[] typeParameters = result.getClass().getTypeParameters();
+        if (ArrayUtils.isEmpty(typeParameters)) {
+            return resultClassName;
+        }
         StringBuilder builder = new StringBuilder();
-        builder.append(result.getClass().getName()).append(HORIZONTAL_LINE);
+        builder.append(resultClassName).append(HORIZONTAL_LINE);
+
+        // only get the first element
         for (Map.Entry<?, ?> entry : result.entrySet()) {
-            String keyClassName = entry.getKey() == null ? DEFAULT_CLASS_NAME : entry.getKey().getClass().getName();
             String valueClassName = entry.getValue() == null ? DEFAULT_CLASS_NAME : getName(entry.getValue());
-            builder.append(keyClassName).append(COMMA).append(valueClassName);
+
+            if (typeParameters.length == 1) {
+                builder.append(valueClassName);
+            } else {
+                String keyClassName = entry.getKey() == null ? DEFAULT_CLASS_NAME : entry.getKey().getClass().getName();
+                builder.append(keyClassName).append(COMMA).append(valueClassName);
+            }
             break;
         }
+
         return builder.toString();
     }
 

arex-instrumentation-api/src/test/java/io/arex/inst/runtime/util/TypeUtilTest.java

@@ -251,4 +251,37 @@ void testSerializeObjectToString() {
         final String arg2Type = TypeUtil.errorSerializeToString(arg2);
         assertEquals("java.lang.Double", arg2Type);
     }
+
+    @Test
+    void testMapToString() {
+        // single generic map
+        final Map<Integer, String> map = new SingleTypeMap<>();
+
+        // empty map
+        final String name1 = TypeUtil.getName(map);
+        assertEquals("io.arex.inst.runtime.util.TypeUtilTest$SingleTypeMap", name1);
+
+        map.put(1, "test");
+        final String name = TypeUtil.getName(map);
+        assertEquals("io.arex.inst.runtime.util.TypeUtilTest$SingleTypeMap-java.lang.String", name);
+        final Type type = TypeUtil.forName(name);
+        assert type != null;
+        assertEquals("io.arex.inst.runtime.util.TypeUtilTest$SingleTypeMap<java.lang.String>", type.getTypeName());
+
+        // no generic map
+        final Map<Integer, String> map2 = new Integer2String();
+        map2.put(1, "test");
+        final String name2 = TypeUtil.getName(map2);
+        assertEquals(Integer2String.class.getName(), name2);
+        final Type type2 = TypeUtil.forName(name2);
+        assert type2 != null;
+        assertEquals(Integer2String.class.getName(), type2.getTypeName());
+    }
+
+
+    static class SingleTypeMap<V> extends HashMap<Integer, V> {
+    }
+
+    static class Integer2String extends HashMap<Integer, String> {
+    }
 }