[MSHARED-1359] Optimize classloader in BeanShellScriptInterpreter

slawekjaranowski · slawekjaranowski · commit 9dfe91dbfb13 · 2024-03-29T00:01:56.000+01:00
diff --git a/src/main/java/org/apache/maven/shared/scriptinterpreter/BeanShellScriptInterpreter.java b/src/main/java/org/apache/maven/shared/scriptinterpreter/BeanShellScriptInterpreter.java
@@ -40,16 +40,26 @@
  */
 class BeanShellScriptInterpreter implements ScriptInterpreter {
 
-    private URLClassLoader classLoader;
+    private static class AppendableURLClassLoader extends URLClassLoader {
+        AppendableURLClassLoader() {
+            super(new URL[] {}, Thread.currentThread().getContextClassLoader());
+        }
+
+        @Override
+        public void addURL(URL url) {
+            super.addURL(url);
+        }
+    }
+
+    private final AppendableURLClassLoader classLoader = new AppendableURLClassLoader();
 
     @Override
     public void setClassPath(List<String> classPath) {
         if (classPath == null || classPath.isEmpty()) {
             return;
         }
 
-        URL[] urls = classPath.stream().map(this::toUrl).toArray(URL[]::new);
-        classLoader = new URLClassLoader(urls, Thread.currentThread().getContextClassLoader());
+        classPath.stream().map(this::toUrl).forEach(classLoader::addURL);
     }
 
     private URL toUrl(String path) {
diff --git a/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java b/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java
@@ -23,7 +23,6 @@
 import java.io.IOException;
 import java.io.PrintStream;
 import java.nio.file.Files;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -54,11 +53,6 @@ public class ScriptRunner implements Closeable {
      */
     private Map<String, Object> globalVariables;
 
-    /**
-     * The additional class path for the script interpreter, never <code>null</code>.
-     */
-    private List<String> classPath;
-
     /**
      * The file encoding of the hook scripts or <code>null</code> to use platform encoding.
      */
@@ -72,7 +66,6 @@ public ScriptRunner() {
         scriptInterpreters.put("bsh", new BeanShellScriptInterpreter());
         scriptInterpreters.put("groovy", new GroovyScriptInterpreter());
         globalVariables = new HashMap<>();
-        classPath = new ArrayList<>();
     }
 
     /**
@@ -104,7 +97,9 @@ public void setGlobalVariable(String name, Object value) {
      * artifacts from the plugin class path.
      */
     public void setClassPath(List<String> classPath) {
-        this.classPath = (classPath != null) ? new ArrayList<>(classPath) : new ArrayList<>();
+        if (classPath != null && !classPath.isEmpty()) {
+            scriptInterpreters.values().forEach(scriptInterpreter -> scriptInterpreter.setClassPath(classPath));
+        }
     }
 
     /**
@@ -114,7 +109,7 @@ public void setClassPath(List<String> classPath) {
      *                 default encoding.
      */
     public void setScriptEncoding(String encoding) {
-        this.encoding = (encoding != null && encoding.length() > 0) ? encoding : null;
+        this.encoding = (encoding != null && !encoding.isEmpty()) ? encoding : null;
     }
 
     /**
@@ -221,7 +216,6 @@ private void executeRun(
             scriptVariables.put("basedir", scriptFile.getParentFile());
             scriptVariables.put("context", context);
 
-            interpreter.setClassPath(classPath);
             result = interpreter.evaluateScript(script, scriptVariables, out);
             if (logger != null) {
                 logger.consumeLine("Finished " + scriptDescription + ": " + scriptFile);
