[MSHADE-443] Fix problems with shadeSourcesContent (#185)

Due to MSHADE-396, some cases which were made to work in MSHADE-252, started breaking. This change fixes them.
apache · May 14, 2023 · f15f26b · f15f26b
1 parent 06d9058
commit f15f26b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/src/main/java/org/apache/maven/plugins/shade/relocation/SimpleRelocator.java b/src/main/java/org/apache/maven/plugins/shade/relocation/SimpleRelocator.java
@@ -40,13 +40,17 @@ public class SimpleRelocator implements Relocator {
      * Match <ul>
      *     <li>certain Java keywords + space</li>
      *     <li>beginning of Javadoc link + optional line breaks and continuations with '*'</li>
+     *     <li>(opening curly brace / opening parenthesis / comma / equals / semicolon) + space</li>
+     *     <li>(closing curly brace / closing multi-line comment) + space</li>
      * </ul>
      * at end of string
      */
-    private static final Pattern RX_ENDS_WITH_JAVA_KEYWORD =
-            Pattern.compile("\\b(import|package|public|protected|private|static|final|synchronized|abstract|volatile) $"
+    private static final Pattern RX_ENDS_WITH_JAVA_KEYWORD = Pattern.compile(
+            "\\b(import|package|public|protected|private|static|final|synchronized|abstract|volatile|extends|implements|throws) $"
                     + "|"
-                    + "\\{@link( \\*)* $");
+                    + "\\{@link( \\*)* $"
+                    + "|"
+                    + "([{}(=;,]|\\*/) $");
 
     private final String pattern;
 
@@ -217,7 +221,7 @@ private String shadeSourceWithExcludes(
         // Usually shading makes package names a bit longer, so make buffer 10% bigger than original source
         StringBuilder shadedSourceContent = new StringBuilder(sourceContent.length() * 11 / 10);
         boolean isFirstSnippet = true;
-        // Make sure that search pattern starts at word boundary and we look for literal ".", not regex jokers
+        // Make sure that search pattern starts at word boundary and that we look for literal ".", not regex jokers
         String[] snippets = sourceContent.split("\\b" + patternFrom.replace(".", "[.]") + "\\b");
         for (int i = 0, snippetsLength = snippets.length; i < snippetsLength; i++) {
             String snippet = snippets[i];

diff --git a/src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorTest.java b/src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorTest.java
@@ -205,7 +205,10 @@ public void testRelocateMavenFiles() {
             + "  private org.apache.maven.h.H h;\n"
             + "  private String ioInput;\n"
             + "\n"
-            + "  public void doSomething() {\n"
+            + "  /** Javadoc, followed by default visibility method with fully qualified return type */\n"
+            + "  org.apache.maven.MyReturnType doSomething( org.apache.maven.Bar bar, org.objectweb.asm.sub.Something something) {\n"
+            + "    org.apache.maven.Bar bar;\n"
+            + "    org.objectweb.asm.sub.Something something;\n"
             + "    String io, val;\n"
             + "    String noRelocation = \"NoWordBoundaryXXXorg.apache.maven.In\";\n"
             + "    String relocationPackage = \"org.apache.maven.In\";\n"
@@ -235,7 +238,10 @@ public void testRelocateMavenFiles() {
             + "  private com.acme.maven.h.H h;\n"
             + "  private String ioInput;\n"
             + "\n"
-            + "  public void doSomething() {\n"
+            + "  /** Javadoc, followed by default visibility method with fully qualified return type */\n"
+            + "  com.acme.maven.MyReturnType doSomething( com.acme.maven.Bar bar, aj.org.objectweb.asm.sub.Something something) {\n"
+            + "    com.acme.maven.Bar bar;\n"
+            + "    aj.org.objectweb.asm.sub.Something something;\n"
             + "    String io, val;\n"
             + "    String noRelocation = \"NoWordBoundaryXXXorg.apache.maven.In\";\n"
             + "    String relocationPackage = \"com.acme.maven.In\";\n"