fix: restore pair<map, xx> type error (#457)

Author: YongwuHe

arex-agent-bootstrap/src/main/java/io/arex/agent/bootstrap/util/StringUtil.java

@@ -254,6 +254,17 @@ public static String[] splitByFirstSeparator(String str, char separator) {
         return new String[]{str.substring(0, index), str.substring(index + 1)};
     }
 
+    public static String[] splitByLastSeparator(String str, char separator) {
+        if (str == null) {
+            return StringUtil.EMPTY_STRING_ARRAY;
+        }
+        int index = str.lastIndexOf(separator);
+        if (index == -1) {
+            return new String[]{str};
+        }
+        return new String[]{str.substring(0, index), str.substring(index + 1)};
+    }
+
     public static int encodeAndHash(String str){
         if (isBlank(str)) {
             return 0;

arex-agent-bootstrap/src/test/java/io/arex/agent/bootstrap/util/StringUtilTest.java

@@ -383,4 +383,18 @@ void subStringAfter() {
         assertEquals("k", StringUtil.substringAfter("mock", "c"));
         assertEquals("mock", StringUtil.substringAfter("mock", "cd"));
     }
+
+    @Test
+    void splitByLastSeparator() {
+        String[] actualResult = StringUtil.splitByLastSeparator(null, ',');
+        assertArrayEquals(new String[0], actualResult);
+
+        String noSeparator = "x";
+        actualResult = StringUtil.splitByLastSeparator(noSeparator, ',');
+        assertArrayEquals(new String[] {"x"}, actualResult);
+
+        String val = "x,,y,z";
+        actualResult = StringUtil.splitByLastSeparator(val, ',');
+        assertArrayEquals(new String[] {"x,,y", "z"}, actualResult);
+    }
 }

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

@@ -66,7 +66,11 @@ public static Type forName(String typeName) {
                 }
 
                 if (typeParametersLength == 2) {
-                    final String[] split = StringUtil.splitByFirstSeparator(types[1], COMMA);
+                    String[] split = StringUtil.splitByFirstSeparator(types[1], COMMA);
+                    if (split[0].contains(HORIZONTAL_LINE_STR)) {
+                        // ex: Pair-Map-String,String,Boolean
+                        split = StringUtil.splitByLastSeparator(types[1], COMMA);
+                    }
                     Type[] args = new Type[]{forName(split[0]), forName(split[1])};
                     ParameterizedTypeImpl parameterizedType = ParameterizedTypeImpl.make(raw, args, null);
                     TYPE_NAME_CACHE.put(typeName, parameterizedType);

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

@@ -390,6 +390,18 @@ void testNeedUseDefaultCollection() {
         assertEquals("java.util.Set<java.time.LocalDateTime>", type.getTypeName());
     }
 
+    @Test
+    void testPairMap() {
+        Map<String, String> map = new HashMap<>();
+        map.put("key", "value");
+        final Pair<Map<String, String>, Boolean> pair = Pair.of(map, Boolean.TRUE);
+        final String name = TypeUtil.getName(pair);
+        assertEquals("io.arex.agent.bootstrap.internal.Pair-java.util.HashMap-java.lang.String,java.lang.String,java.lang.Boolean", name);
+        final Type type = TypeUtil.forName(name);
+        assert type != null;
+        assertEquals("io.arex.agent.bootstrap.internal.Pair<java.util.HashMap<java.lang.String, java.lang.String>, java.lang.Boolean>", type.getTypeName());
+    }
+
     public static class FlightCollection extends ArrayList<LocalDateTime> {
     }