Support relocating list of types in RelocatorRemapper (#1714)

* Test `relocateMultiClassSignatureStringConstants`

* Update `RelocatorRemapper`

* Comment `classPattern`

* Add unit test for `RelocatorRemapperTest`

* Update changelog

* Update src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/RelocatorRemapper.kt

Co-authored-by: Copilot <[email protected]>

* Update src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/RelocatorRemapper.kt

Co-authored-by: Copilot <[email protected]>

* Cleanups

* Update src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/RelocatorRemapper.kt

Co-authored-by: Copilot <[email protected]>

---------

Co-authored-by: Copilot <[email protected]>

Author: Goooler

docs/changes/README.md

@@ -7,6 +7,7 @@
 
 - Support relocating Groovy extensions in Module descriptors. ([#1705](https://github.com/GradleUp/shadow/pull/1705))
 - Add extensions for `Iterable<Relocator>`. ([#1710](https://github.com/GradleUp/shadow/pull/1710))
+- Support relocating list of types in `RelocatorRemapper`. ([#1714](https://github.com/GradleUp/shadow/pull/1714))
 
 ### Changed
 

src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/RelocationTest.kt

@@ -533,6 +533,45 @@ class RelocationTest : BasePluginTest() {
     }
   }
 
+  @Issue(
+    "https://github.com/GradleUp/shadow/issues/1403",
+  )
+  @Test
+  fun relocateMultiClassSignatureStringConstants() {
+    writeClass {
+      """
+        package my;
+        public class Main {
+          public static void main(String[] args) {
+            System.out.println("Lorg/package/ClassA;Lorg/package/ClassB;");
+            System.out.println("(Lorg/package/ClassC;Lorg/package/ClassD;)");
+            System.out.println("()Lorg/package/ClassE;Lorg/package/ClassF;");
+          }
+        }
+      """.trimIndent()
+    }
+    projectScript.appendText(
+      """
+        $shadowJarTask {
+          manifest {
+            attributes '$mainClassAttributeKey': 'my.Main'
+          }
+          relocate('org.package', 'shadow.org.package')
+        }
+      """.trimIndent(),
+    )
+
+    run(shadowJarPath)
+    val result = runProcess("java", "-jar", outputShadowedJar.use { it.toString() })
+
+    // Just check that the jar can be executed without NoClassDefFoundError.
+    assertThat(result).contains(
+      "Lshadow/org/package/ClassA;Lshadow/org/package/ClassB",
+      "Lshadow/org/package/ClassC;Lshadow/org/package/ClassD",
+      "Lshadow/org/package/ClassE;Lshadow/org/package/ClassF",
+    )
+  }
+
   @Test
   fun classBytesUnchangedIfPossible() {
     val mainClassEntry = writeClass()

src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/RelocatorRemapper.kt

@@ -16,7 +16,6 @@ internal class RelocatorRemapper(
   private val relocators: Set<Relocator>,
   private val onModified: () -> Unit = {},
 ) : Remapper() {
-  private val classPattern: Pattern = Pattern.compile("(\\[*)?L(.+)")
 
   override fun mapValue(value: Any): Any {
     return if (value is String) {
@@ -29,7 +28,11 @@ internal class RelocatorRemapper(
   override fun map(internalName: String): String = mapName(internalName)
 
   private fun mapName(name: String, mapLiterals: Boolean = false): String {
-    val newName = mapNameImpl(name, mapLiterals)
+    // Maybe a list of types.
+    val newName = name.split(';').joinToString(";") {
+      mapNameImpl(it, mapLiterals)
+    }
+
     if (newName != name) {
       onModified()
     }
@@ -60,4 +63,8 @@ internal class RelocatorRemapper(
 
     return name
   }
+
+  private companion object {
+    val classPattern: Pattern = Pattern.compile("([\\[()]*)?L([^;]+);?")
+  }
 }

src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/relocation/RelocatorRemapperTest.kt

@@ -0,0 +1,41 @@
+package com.github.jengelman.gradle.plugins.shadow.relocation
+
+import assertk.assertThat
+import assertk.assertions.isEqualTo
+import com.github.jengelman.gradle.plugins.shadow.internal.RelocatorRemapper
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.Arguments
+import org.junit.jupiter.params.provider.MethodSource
+
+class RelocatorRemapperTest {
+  @ParameterizedTest
+  @MethodSource("classSignatureStringConstants")
+  fun relocateSignaturePatterns(input: String, expected: String) {
+    val relocator = RelocatorRemapper(
+      relocators = setOf(
+        SimpleRelocator("org.package", "shadow.org.package"),
+      ),
+    )
+    assertThat(relocator.map(input)).isEqualTo(expected)
+  }
+
+  private companion object {
+    @JvmStatic
+    fun classSignatureStringConstants() = listOf(
+      // Normal class.
+      Arguments.of("Lorg/package/ClassA;", "Lshadow/org/package/ClassA;"),
+      // Array class.
+      Arguments.of("[Lorg/package/ClassA;", "[Lshadow/org/package/ClassA;"),
+      // Multidimensional array of class.
+      Arguments.of("[[Lorg/package/ClassA;", "[[Lshadow/org/package/ClassA;"),
+      // Multiple classes.
+      Arguments.of("Lorg/package/ClassA;Lorg/package/ClassB;", "Lshadow/org/package/ClassA;Lshadow/org/package/ClassB;"),
+      // Multiple classes.
+      Arguments.of("Ljava/lang/Object;Lorg/package/ClassB;", "Ljava/lang/Object;Lshadow/org/package/ClassB;"),
+      // Method arguments.
+      Arguments.of("(Lorg/package/ClassA;Lorg/package/ClassB;)", "(Lshadow/org/package/ClassA;Lshadow/org/package/ClassB;)"),
+      // Method return types.
+      Arguments.of("()Lorg/package/ClassA;Lorg/package/ClassB;", "()Lshadow/org/package/ClassA;Lshadow/org/package/ClassB;"),
+    )
+  }
+}