修复无法匹配内部类的问题

zhangzhenfeng216 · Feb 27, 2018 · 3e719f1 · 3e719f1
1 parent 1bdefaa
commit 3e719f1
Show file tree

Hide file tree

Showing 15 changed files with 34 additions and 23 deletions.
diff --git a/bin/set-version.sh b/bin/set-version.sh
@@ -18,4 +18,7 @@ while getopts "sr" ARG
 [[ ${OP_RELEASE} ]] && NEW_VERSION=${1}
 
 echo "set project to new version: ${NEW_VERSION}"
-mvn -f ../pom.xml versions:set -DoldVersion=* -DnewVersion=${NEW_VERSION} -DprocessAllModules=true -DallowSnapshots=true
+cat ../pom.xml\
+    | sed "s/<sandbox.version>[^<]*<\/sandbox.version>/<sandbox.version>${NEW_VERSION}<\/sandbox.version>/1" > ../pom.xml.newVersion\
+    && mv ../pom.xml.newVersion ../pom.xml\
+    && mvn -f ../pom.xml versions:set -DoldVersion=* -DnewVersion=${NEW_VERSION} -DprocessAllModules=true -DallowSnapshots=true
diff --git a/pom.xml b/pom.xml
@@ -5,14 +5,14 @@
 
     <groupId>com.alibaba.jvm.sandbox</groupId>
     <artifactId>sandbox</artifactId>
-    <version>1.0.13</version>
+    <version>1.0.14</version>
     <packaging>pom</packaging>
 
     <name>sandbox ${sandbox.version}</name>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <sandbox.version>1.0.13</sandbox.version>
+        <sandbox.version>1.0.14</sandbox.version>
     </properties>
 
     <build>
@@ -281,4 +281,4 @@
     </scm>
 
 
-</project>
+</project>
diff --git a/sandbox-agent/pom.xml b/sandbox-agent/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alibaba.jvm.sandbox</groupId>
         <artifactId>sandbox</artifactId>
-        <version>1.0.13</version>
+        <version>1.0.14</version>
     </parent>
     <artifactId>sandbox-agent</artifactId>
     <name>sandbox-agent ${sandbox.version}</name>

diff --git a/sandbox-api/pom.xml b/sandbox-api/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alibaba.jvm.sandbox</groupId>
         <artifactId>sandbox</artifactId>
-        <version>1.0.13</version>
+        <version>1.0.14</version>
     </parent>
     <artifactId>sandbox-api</artifactId>
     <name>sandbox-api ${sandbox.version}</name>

diff --git a/sandbox-api/src/main/java/com/alibaba/jvm/sandbox/api/util/GaStringUtils.java b/sandbox-api/src/main/java/com/alibaba/jvm/sandbox/api/util/GaStringUtils.java
@@ -18,10 +18,13 @@ public class GaStringUtils {
      * @return Class类名
      */
     public static String getJavaClassName(final Class<?> clazz) {
-        final String canonicalName = clazz.getCanonicalName();
-        return isEmpty(canonicalName)
-                ? clazz.getName()
-                : canonicalName;
+        return clazz.isArray()
+                ? clazz.getCanonicalName()
+                : clazz.getName();
+//        final String canonicalName = clazz.getCanonicalName();
+//        return isEmpty(canonicalName)
+//                ? clazz.getName()
+//                : canonicalName;
     }
 
     /**

diff --git a/sandbox-common-api/pom.xml b/sandbox-common-api/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>sandbox</artifactId>
         <groupId>com.alibaba.jvm.sandbox</groupId>
-        <version>1.0.13</version>
+        <version>1.0.14</version>
     </parent>
     <artifactId>sandbox-common-api</artifactId>
     <name>sandbox-common-api ${sandbox.version}</name>

diff --git a/sandbox-core/pom.xml b/sandbox-core/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alibaba.jvm.sandbox</groupId>
         <artifactId>sandbox</artifactId>
-        <version>1.0.13</version>
+        <version>1.0.14</version>
     </parent>
     <artifactId>sandbox-core</artifactId>
     <name>sandbox-core ${sandbox.version}</name>

diff --git a/...ain/java/com/alibaba/jvm/sandbox/core/util/matcher/structure/ClassStructureImplByJDK.java b/...ain/java/com/alibaba/jvm/sandbox/core/util/matcher/structure/ClassStructureImplByJDK.java
@@ -140,10 +140,15 @@ public String getJavaClassName() {
         if (null != javaClassName) {
             return javaClassName;
         }
-        final String canonicalName = clazz.getCanonicalName();
-        return javaClassName = StringUtils.isEmpty(canonicalName)
-                ? clazz.getName()
-                : canonicalName;
+
+        return javaClassName = clazz.isArray()
+                ? clazz.getCanonicalName()
+                : clazz.getName();
+
+//        final String canonicalName = clazz.getCanonicalName();
+//        return javaClassName = StringUtils.isEmpty(canonicalName)
+//                ? clazz.getName()
+//                : canonicalName;
     }
 
     @Override

diff --git a/sandbox-core/src/main/resources/com/alibaba/jvm/sandbox/version b/sandbox-core/src/main/resources/com/alibaba/jvm/sandbox/version
@@ -1 +1 @@
-0.1.0.4
+0.1.0.5
diff --git a/sandbox-debug-module/pom.xml b/sandbox-debug-module/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alibaba.jvm.sandbox</groupId>
         <artifactId>sandbox-module-starter</artifactId>
-        <version>1.0.13</version>
+        <version>1.0.14</version>
         <relativePath>../sandbox-module-starter/pom.xml</relativePath>
     </parent>
     <artifactId>sandbox-debug-module</artifactId>

diff --git a/sandbox-mgr-module/pom.xml b/sandbox-mgr-module/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>sandbox</artifactId>
         <groupId>com.alibaba.jvm.sandbox</groupId>
-        <version>1.0.13</version>
+        <version>1.0.14</version>
     </parent>
     <artifactId>sandbox-mgr-module</artifactId>
     <name>sandbox-mgr-module ${sandbox.version}</name>

diff --git a/sandbox-mgr-provider/pom.xml b/sandbox-mgr-provider/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>sandbox</artifactId>
         <groupId>com.alibaba.jvm.sandbox</groupId>
-        <version>1.0.13</version>
+        <version>1.0.14</version>
     </parent>
     <artifactId>sandbox-mgr-provider</artifactId>
     <name>sandbox-mgr-provider ${sandbox.version}</name>

diff --git a/sandbox-module-starter/pom.xml b/sandbox-module-starter/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alibaba.jvm.sandbox</groupId>
         <artifactId>sandbox</artifactId>
-        <version>1.0.13</version>
+        <version>1.0.14</version>
     </parent>
     <artifactId>sandbox-module-starter</artifactId>
     <name>sandbox-module-starter ${sandbox.version}</name>

diff --git a/sandbox-provider-api/pom.xml b/sandbox-provider-api/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>sandbox</artifactId>
         <groupId>com.alibaba.jvm.sandbox</groupId>
-        <version>1.0.13</version>
+        <version>1.0.14</version>
     </parent>
     <artifactId>sandbox-provider-api</artifactId>
     <name>sandbox-provider-api ${sandbox.version}</name>

diff --git a/sandbox-spy/pom.xml b/sandbox-spy/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alibaba.jvm.sandbox</groupId>
         <artifactId>sandbox</artifactId>
-        <version>1.0.13</version>
+        <version>1.0.14</version>
     </parent>
     <artifactId>sandbox-spy</artifactId>
     <name>sandbox-spy ${sandbox.version}</name>