Merge pull request #230 in CORE/base-third from ~HARRISON/base-third:feature/10.0 to feature/10.0

* commit '838954e6e1a47bc4f780663130a2eb376acc09dc':
  继续修改
  REPORT-17684 third的byteBuddy包名修改不完整，可能是导致test失败的原因

fine-byte-buddy/src/com/fr/third/net/bytebuddy/NamingStrategy.java

@@ -108,7 +108,7 @@ public interface NamingStrategy {
          * The default package for defining types that are renamed to not be contained in the
          * {@link NamingStrategy.SuffixingRandom#JAVA_PACKAGE} package.
          */
-        public static final String BYTE_BUDDY_RENAME_PACKAGE = "net.bytebuddy.renamed";
+        public static final String BYTE_BUDDY_RENAME_PACKAGE = "com.fr.third.net.bytebuddy.renamed";
 
         /**
          * Indicates that types of the {@code java.*} package should not be prefixed.

fine-byte-buddy/src/com/fr/third/net/bytebuddy/agent/ByteBuddyAgent.java

@@ -929,7 +929,7 @@ public class ByteBuddyAgent {
             /**
              * The property being read for locating {@code tools.jar}.
              */
-            public static final String PROPERTY = "net.bytebuddy.agent.toolsjar";
+            public static final String PROPERTY = "com.fr.third.net.bytebuddy.agent.toolsjar";
 
             /**
              * {@inheritDoc}

fine-byte-buddy/src/com/fr/third/net/bytebuddy/agent/builder/AgentBuilder.java

@@ -7749,7 +7749,7 @@ public interface AgentBuilder {
          *     MethodType instantiatedMethodType) throws Exception {
          *   Unsafe unsafe = Unsafe.getUnsafe();
          *   {@code Class<?>} lambdaClass = unsafe.defineAnonymousClass(caller.lookupClass(),
-         *       (byte[]) ClassLoader.getSystemClassLoader().loadClass("net.bytebuddy.agent.builder.LambdaFactory").getDeclaredMethod("make",
+         *       (byte[]) ClassLoader.getSystemClassLoader().loadClass("com.fr.third.net.bytebuddy.agent.builder.LambdaFactory").getDeclaredMethod("make",
          *           Object.class,
          *           String.class,
          *           Object.class,
@@ -7799,7 +7799,7 @@ public interface AgentBuilder {
                 methodVisitor.visitVarInsn(Opcodes.ALOAD, 0);
                 methodVisitor.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/invoke/MethodHandles$Lookup", "lookupClass", "()Ljava/lang/Class;", false);
                 methodVisitor.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/ClassLoader", "getSystemClassLoader", "()Ljava/lang/ClassLoader;", false);
-                methodVisitor.visitLdcInsn("net.bytebuddy.agent.builder.LambdaFactory");
+                methodVisitor.visitLdcInsn("com.fr.third.net.bytebuddy.agent.builder.LambdaFactory");
                 methodVisitor.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/ClassLoader", "loadClass", "(Ljava/lang/String;)Ljava/lang/Class;", false);
                 methodVisitor.visitLdcInsn("make");
                 methodVisitor.visitIntInsn(Opcodes.BIPUSH, 9);
@@ -7956,7 +7956,7 @@ public interface AgentBuilder {
          *   }
          *   Unsafe unsafe = Unsafe.getUnsafe();
          *   {@code Class<?>} lambdaClass = unsafe.defineAnonymousClass(caller.lookupClass(),
-         *       (byte[]) ClassLoader.getSystemClassLoader().loadClass("net.bytebuddy.agent.builder.LambdaFactory").getDeclaredMethod("make",
+         *       (byte[]) ClassLoader.getSystemClassLoader().loadClass("com.fr.third.net.bytebuddy.agent.builder.LambdaFactory").getDeclaredMethod("make",
          *           Object.class,
          *           String.class,
          *           Object.class,
@@ -8079,7 +8079,7 @@ public interface AgentBuilder {
                 methodVisitor.visitVarInsn(Opcodes.ALOAD, 0);
                 methodVisitor.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/invoke/MethodHandles$Lookup", "lookupClass", "()Ljava/lang/Class;", false);
                 methodVisitor.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/ClassLoader", "getSystemClassLoader", "()Ljava/lang/ClassLoader;", false);
-                methodVisitor.visitLdcInsn("net.bytebuddy.agent.builder.LambdaFactory");
+                methodVisitor.visitLdcInsn("com.fr.third.net.bytebuddy.agent.builder.LambdaFactory");
                 methodVisitor.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/ClassLoader", "loadClass", "(Ljava/lang/String;)Ljava/lang/Class;", false);
                 methodVisitor.visitLdcInsn("make");
                 methodVisitor.visitIntInsn(Opcodes.BIPUSH, 9);
@@ -8244,7 +8244,7 @@ public interface AgentBuilder {
         /**
          * The name of the Byte Buddy {@code net.bytebuddy.agent.Installer} class.
          */
-        private static final String INSTALLER_TYPE = "net.bytebuddy.agent.Installer";
+        private static final String INSTALLER_TYPE = "com.fr.third.net.bytebuddy.agent.Installer";
 
         /**
          * The name of the {@code net.bytebuddy.agent.Installer} getter for reading an installed {@link Instrumentation}.
@@ -8421,7 +8421,7 @@ public interface AgentBuilder {
                     InstallationListener.NoOp.INSTANCE,
                     new RawMatcher.Disjunction(
                             new RawMatcher.ForElementMatchers(ElementMatchers.any(), ElementMatchers.isBootstrapClassLoader().or(ElementMatchers.isExtensionClassLoader())),
-                            new RawMatcher.ForElementMatchers(ElementMatchers.nameStartsWith("net.bytebuddy.").or(ElementMatchers.nameStartsWith("sun.reflect.")).<TypeDescription>or(ElementMatchers.isSynthetic()))),
+                            new RawMatcher.ForElementMatchers(ElementMatchers.nameStartsWith("com.fr.third.net.bytebuddy.").or(ElementMatchers.nameStartsWith("sun.reflect.")).<TypeDescription>or(ElementMatchers.isSynthetic()))),
                     Transformation.Ignored.INSTANCE);
         }
 

fine-byte-buddy/src/com/fr/third/net/bytebuddy/description/type/TypeDefinition.java

@@ -47,7 +47,7 @@ public interface TypeDefinition extends NamedElement, ModifierReviewable.ForType
      * byte code without changing a class type's structure.
      * </p>
      */
-    String RAW_TYPES_PROPERTY = "net.bytebuddy.raw";
+    String RAW_TYPES_PROPERTY = "com.fr.third.net.bytebuddy.raw";
 
     /**
      * Returns this type definition as a generic type.

fine-byte-buddy/src/com/fr/third/net/bytebuddy/dynamic/ClassFileLocator.java

@@ -1166,7 +1166,7 @@ public interface ClassFileLocator extends Closeable {
         /**
          * The name of the Byte Buddy {@code net.bytebuddy.agent.Installer} class.
          */
-        private static final String INSTALLER_TYPE = "net.bytebuddy.agent.Installer";
+        private static final String INSTALLER_TYPE = "com.fr.third.net.bytebuddy.agent.Installer";
 
         /**
          * The name of the {@code net.bytebuddy.agent.Installer} getter for reading an installed {@link Instrumentation}.

fine-byte-buddy/src/com/fr/third/net/bytebuddy/dynamic/Nexus.java

@@ -47,7 +47,7 @@ public class Nexus extends WeakReference<ClassLoader> {
     /**
      * A system property that allows to disable the use of the {@link Nexus} class which is normally injected into the system class loader.
      */
-    public static final String PROPERTY = "net.bytebuddy.nexus.disabled";
+    public static final String PROPERTY = "com.fr.third.net.bytebuddy.nexus.disabled";
 
     /**
      * An type-safe constant for a non-operational reference queue.

fine-byte-buddy/src/com/fr/third/net/bytebuddy/dynamic/loading/ClassInjector.java

@@ -1037,7 +1037,7 @@ ClassInjector {
                         // the offset location and still set a value to it, despite it being hidden from the reflection API.
                         override = new ByteBuddy()
                                 .redefine(AccessibleObject.class)
-                                .name("net.bytebuddy.mirror." + AccessibleObject.class.getSimpleName())
+                                .name("com.fr.third.net.bytebuddy.mirror." + AccessibleObject.class.getSimpleName())
                                 .noNestMate()
                                 .visit(new MemberRemoval().stripInvokables(ElementMatchers.any()))
                                 .make()
@@ -1706,7 +1706,7 @@ ClassInjector {
         /**
          * If this property is set, Byte Buddy does not make use of any {@code Unsafe} class.
          */
-        public static final String SAFE_PROPERTY = "net.bytebuddy.safe";
+        public static final String SAFE_PROPERTY = "com.fr.third.net.bytebuddy.safe";
 
         /**
          * The dispatcher to use.
@@ -1895,7 +1895,7 @@ ClassInjector {
                                     // the offset location and still set a value to it, despite it being hidden from the reflection API.
                                     override = new ByteBuddy()
                                             .redefine(AccessibleObject.class)
-                                            .name("net.bytebuddy.mirror." + AccessibleObject.class.getSimpleName())
+                                            .name("com.fr.third.net.bytebuddy.mirror." + AccessibleObject.class.getSimpleName())
                                             .noNestMate()
                                             .visit(new MemberRemoval().stripInvokables(ElementMatchers.any()))
                                             .make()

fine-byte-buddy/src/com/fr/third/net/bytebuddy/dynamic/loading/ClassReloadingStrategy.java

@@ -55,7 +55,7 @@ public class ClassReloadingStrategy implements ClassLoadingStrategy<ClassLoader>
     /**
      * The name of the Byte Buddy {@code net.bytebuddy.agent.Installer} class.
      */
-    private static final String INSTALLER_TYPE = "net.bytebuddy.agent.Installer";
+    private static final String INSTALLER_TYPE = "com.fr.third.net.bytebuddy.agent.Installer";
 
     /**
      * The name of the {@code net.bytebuddy.agent.Installer} getter for reading an installed {@link Instrumentation}.

fine-byte-buddy/src/com/fr/third/net/bytebuddy/dynamic/scaffold/TypeWriter.java

@@ -87,7 +87,7 @@ public interface TypeWriter<T> {
      * If this property is not set, Byte Buddy does not dump any class files. This property is only read a single
      * time which is why it must be set on application start-up.
      */
-    String DUMP_PROPERTY = "net.bytebuddy.dump";
+    String DUMP_PROPERTY = "com.fr.third.net.bytebuddy.dump";
 
     /**
      * Creates the dynamic type that is described by this type writer.

fine-byte-buddy/src/com/fr/third/net/bytebuddy/utility/OpenedClassReader.java

@@ -29,7 +29,7 @@ public class OpenedClassReader {
     /**
      * Indicates that Byte Buddy should not validate the maximum supported class file version.
      */
-    public static final String EXPERIMENTAL_PROPERTY = "net.bytebuddy.experimental";
+    public static final String EXPERIMENTAL_PROPERTY = "com.fr.third.net.bytebuddy.experimental";
 
     /**
      * {@code true} if Byte Buddy is executed in experimental mode.