From b2a87bffbe229570255124ac90ec408cc2b0a664 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=87=91=E6=88=9F?= <jinji.lf@alibaba-inc.com>
Date: Sun, 29 May 2022 14:08:35 +0800
Subject: [PATCH] refactor: use constant dollar symbol

---
 .../com/alibaba/testable/agent/handler/SourceClassHandler.java | 3 ++-
 .../main/java/com/alibaba/testable/agent/util/ClassUtil.java   | 2 +-
 .../java/com/alibaba/testable/core/tool/OmniConstructor.java   | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/testable-agent/src/main/java/com/alibaba/testable/agent/handler/SourceClassHandler.java b/testable-agent/src/main/java/com/alibaba/testable/agent/handler/SourceClassHandler.java
index a6d7833..e0b45bb 100644
--- a/testable-agent/src/main/java/com/alibaba/testable/agent/handler/SourceClassHandler.java
+++ b/testable-agent/src/main/java/com/alibaba/testable/agent/handler/SourceClassHandler.java
@@ -15,6 +15,7 @@ import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import static com.alibaba.testable.core.constant.ConstPool.CONSTRUCTOR;
+import static com.alibaba.testable.core.constant.ConstPool.DOLLAR;
 
 /**
  * @author flin
@@ -70,7 +71,7 @@ public class SourceClassHandler extends BaseClassHandler {
     private void transformMethod(MethodNode mn, Set<MethodInfo> memberInjectMethods,
                                  Set<MethodInfo> newOperatorInjectMethods) {
         LogUtil.verbose("   Found method %s", mn.name);
-        if (mn.name.startsWith("$")) {
+        if (mn.name.startsWith(DOLLAR)) {
             // skip methods e.g. "$jacocoInit"
             return;
         }
diff --git a/testable-agent/src/main/java/com/alibaba/testable/agent/util/ClassUtil.java b/testable-agent/src/main/java/com/alibaba/testable/agent/util/ClassUtil.java
index 3210e9a..5c552bd 100644
--- a/testable-agent/src/main/java/com/alibaba/testable/agent/util/ClassUtil.java
+++ b/testable-agent/src/main/java/com/alibaba/testable/agent/util/ClassUtil.java
@@ -239,7 +239,7 @@ public class ClassUtil {
      * @return outer class name
      */
     public static String toOuterClassName(String name) {
-        int pos = name.lastIndexOf("$");
+        int pos = name.lastIndexOf(DOLLAR);
         return (pos > 0) ? name.substring(0, pos) : name;
     }
 
diff --git a/testable-core/src/main/java/com/alibaba/testable/core/tool/OmniConstructor.java b/testable-core/src/main/java/com/alibaba/testable/core/tool/OmniConstructor.java
index 6cf24c5..2db2fe1 100644
--- a/testable-core/src/main/java/com/alibaba/testable/core/tool/OmniConstructor.java
+++ b/testable-core/src/main/java/com/alibaba/testable/core/tool/OmniConstructor.java
@@ -3,6 +3,7 @@ package com.alibaba.testable.core.tool;
 import com.alibaba.testable.core.exception.ClassConstructionException;
 import com.alibaba.testable.core.model.ConstructionOption;
 import com.alibaba.testable.core.util.CollectionUtil;
+import com.alibaba.testable.core.util.ConstructionUtil;
 import com.alibaba.testable.core.util.LogUtil;
 import com.alibaba.testable.core.util.TypeUtil;
 
@@ -180,7 +181,7 @@ public class OmniConstructor {
         }
         classPool.put(type, instance);
         for (Field f : TypeUtil.getAllFields(type)) {
-            if (f.getName().startsWith("$") || isStaticFinalField(f)) {
+            if (f.getName().startsWith(DOLLAR) || isStaticFinalField(f)) {
                 // skip static-final fields and fields e.g. "$jacocoData"
                 continue;
             }