feat: remove lambda suffix from cache loader name (#429)

Co-authored-by: Mark Zhang <[email protected]>

Author: YongwuHe

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

@@ -626,4 +626,18 @@ public static int countMatches(final String str, final String sub) {
         }
         return count;
     }
+
+    public static String substringBefore(final String str, final String separator) {
+        if (isEmpty(str) || separator == null) {
+            return str;
+        }
+        if (separator.isEmpty()) {
+            return EMPTY;
+        }
+        final int pos = str.indexOf(separator);
+        if (pos == INDEX_NOT_FOUND) {
+            return str;
+        }
+        return str.substring(0, pos);
+    }
 }

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

@@ -360,4 +360,15 @@ void countMatches() {
         assertEquals(0, StringUtil.countMatches("mock", "M"));
         assertEquals(1, StringUtil.countMatches("mock", "m"));
     }
+
+    @Test
+    void substringBefore() {
+        assertEquals(null, StringUtil.substringBefore(null, null));
+        assertEquals("", StringUtil.substringBefore("", null));
+        assertEquals("", StringUtil.substringBefore("", ""));
+        assertEquals("", StringUtil.substringBefore("mock", ""));
+        assertEquals("mock", StringUtil.substringBefore("mock", null));
+        assertEquals("mock", StringUtil.substringBefore("mock", "cd"));
+        assertEquals("mo", StringUtil.substringBefore("mock", "c"));
+    }
 }

arex-instrumentation/dynamic/arex-cache/src/main/java/io/arex/inst/cache/util/CacheLoaderUtil.java

@@ -14,6 +14,7 @@
 public class CacheLoaderUtil {
     private static final Map<Integer, Field> REFERENCE_FIELD_MAP = new ConcurrentHashMap<>();
     private static final Map<Integer, String> NO_REFERENCE_MAP = new ConcurrentHashMap<>();
+    private static final String LAMBDA_SUFFIX = "$$";
 
     /**
      * return the reference to the outer class in an inner class, if exists.
@@ -31,16 +32,12 @@ public static String getLocatedClass(Object loader) {
 
         Class<?> loaderClass = loader.getClass();
         if (isNotAbstractOrInterface(loaderClass.getEnclosingClass())) {
-            String loaderClassName = loaderClass.getName();
-            NO_REFERENCE_MAP.put(loaderHashCode, loaderClassName);
-            return loaderClassName;
+            return generateNameWithNoReference(loaderHashCode, loaderClass);
         }
 
         Field field = REFERENCE_FIELD_MAP.computeIfAbsent(loaderHashCode, k -> getReferenceField(loaderClass));
         if (field == null) {
-            String loaderClassName = loaderClass.getName();
-            NO_REFERENCE_MAP.put(loaderHashCode, loaderClassName);
-            return loaderClassName;
+            return generateNameWithNoReference(loaderHashCode, loaderClass);
         }
 
         try {
@@ -52,6 +49,16 @@ public static String getLocatedClass(Object loader) {
         }
     }
 
+    /**
+     * cache loader without external references directly obtain class name, and remove lambda suffix.
+     * @return
+     */
+    private static String generateNameWithNoReference(int loaderHashCode, Class<?> loaderClass) {
+        String loaderClassName = StringUtil.substringBefore(loaderClass.getName(), LAMBDA_SUFFIX);
+        NO_REFERENCE_MAP.put(loaderHashCode, loaderClassName);
+        return loaderClassName;
+    }
+
     private static boolean isNotAbstractOrInterface(Class<?> clazz) {
         if (clazz == null) {
             return true;

arex-instrumentation/dynamic/arex-cache/src/test/java/io/arex/inst/cache/util/CacheLoaderUtilTest.java

@@ -2,7 +2,6 @@
 
 import com.google.common.cache.CacheLoader;
 import io.arex.inst.runtime.config.Config;
-import io.arex.inst.runtime.model.ArexConstants;
 import org.junit.jupiter.api.Test;
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;

pom.xml

@@ -54,7 +54,7 @@
 
     <properties>
         <!-- Maven CI Friendly Versions https://maven.apache.org/maven-ci-friendly.html -->
-        <revision>0.4.1</revision>
+        <revision>0.4.2</revision>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>