fix: support hook org/gradle/wrapper/WrapperExecutor.getProperty with args

Author: CarefulDeveloper

build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
 }
 
 group = "org.tingy"
-version = "1.4"
+version = "1.5"
 
 dependencies {
     implementation("org.ow2.asm:asm:9.7")

src/main/kotlin/org/tingy/agent/gradle/WrapperExecutorTransformer.kt

@@ -43,6 +43,7 @@ object WrapperExecutorTransformer {
      * key instruction:
      * ```
      * INVOKESPECIAL org/tingy/agent/gradle/WrapperExecutor.getProperty (Ljava/lang/String;)Ljava/lang/String;
+     * INVOKEVIRTUAL org/tingy/agent/gradle/WrapperExecutor.getProperty (Ljava/lang/String;Ljava/lang/String;Z)Ljava/lang/String;
      * ```
      * @param targetOrder The order of the target instruction should be replaced, start from 1.
      */
@@ -63,10 +64,10 @@ object WrapperExecutorTransformer {
             super.visitMethodInsn(opcode, owner, name, descriptor, isInterface)
             // stack [... String]
 
-            if (opcode == Opcodes.INVOKESPECIAL
-                && "org/gradle/wrapper/WrapperExecutor" == owner
+            if ("org/gradle/wrapper/WrapperExecutor" == owner
                 && "getProperty" == name
-                && "(Ljava/lang/String;)Ljava/lang/String;" == descriptor
+                && TARGET_OPCODES.contains(opcode)
+                && TARGET_DESCRIPTORS.contains(descriptor)
             ) {
                 if (++count == targetOrder) {
                     super.visitFieldInsn(
@@ -89,5 +90,13 @@ object WrapperExecutorTransformer {
                 }
             }
         }
+
+        companion object {
+            private val TARGET_OPCODES = intArrayOf(Opcodes.INVOKESPECIAL, Opcodes.INVOKEVIRTUAL)
+            private val TARGET_DESCRIPTORS = listOf(
+                "(Ljava/lang/String;)Ljava/lang/String;",
+                "(Ljava/lang/String;Ljava/lang/String;Z)Ljava/lang/String;",
+            )
+        }
     }
 }

src/test/kotlin/WrapperExecutorTransformerTest.kt

@@ -12,10 +12,13 @@ class WrapperExecutorTransformerTest {
     }
 
     private val bWrapperExecutorV1: ByteArray
-        get() = ClassLoader.getSystemResourceAsStream("WrapperExecutor.v1.class")!!.readBytes()
+        get() = readClassBytes("WrapperExecutor.v1.class")
 
     private val bWrapperExecutorV2: ByteArray
-        get() = ClassLoader.getSystemResourceAsStream("WrapperExecutor.v2.class")!!.readBytes()
+        get() = readClassBytes("WrapperExecutor.v2.class")
+
+    private val bWrapperExecutorV3: ByteArray
+        get() = readClassBytes("WrapperExecutor.v3.class")
 
     @Test
     fun `transform wrapper v1`() {
@@ -30,4 +33,13 @@ class WrapperExecutorTransformerTest {
         assertNotNull(bytes)
         File(classDir, "WrapperExecutor.v2.class").writeBytes(bytes)
     }
+
+    @Test
+    fun `transform wrapper v3`() {
+        val bytes = WrapperExecutorTransformer.transform(bWrapperExecutorV3)
+        assertNotNull(bytes)
+        File(classDir, "WrapperExecutor.v3.class").writeBytes(bytes)
+    }
+
+    private fun readClassBytes(name: String) = ClassLoader.getSystemResourceAsStream(name)!!.readBytes()
 }