[MSHARED-1386] Manage context ClassLoader for current thread

slawekjaranowski · slawekjaranowski · commit 47ae5e4fb688 · 2024-04-29T17:48:22.000+02:00
diff --git a/pom.xml b/pom.xml
@@ -112,12 +112,18 @@
         <executions>
           <execution>
             <goals>
-              <goal>copy-dependencies</goal>
+              <goal>copy</goal>
             </goals>
             <phase>generate-test-resources</phase>
             <configuration>
-              <includeGroupIds>org.slf4j</includeGroupIds>
               <stripVersion>true</stripVersion>
+              <artifactItems>
+                <item>
+                  <groupId>com.github.tomakehurst</groupId>
+                  <artifactId>wiremock-jre8-standalone</artifactId>
+                  <version>2.35.2</version>
+                </item>
+              </artifactItems>
             </configuration>
           </execution>
         </executions>
diff --git a/src/main/java/org/apache/maven/shared/scriptinterpreter/BeanShellScriptInterpreter.java b/src/main/java/org/apache/maven/shared/scriptinterpreter/BeanShellScriptInterpreter.java
@@ -139,15 +139,18 @@ public Object evaluateScript(String script, Map<String, ?> globalVariables, Prin
                     }
                 }
             }
-
+            ClassLoader curentClassLoader = Thread.currentThread().getContextClassLoader();
             try {
+                Thread.currentThread().setContextClassLoader(classLoader);
                 return engine.eval(script);
             } catch (TargetError e) {
                 throw new ScriptEvaluationException(e.getTarget());
             } catch (ThreadDeath e) {
                 throw e;
             } catch (Throwable e) {
                 throw new ScriptEvaluationException(e);
+            } finally {
+                Thread.currentThread().setContextClassLoader(curentClassLoader);
             }
         } finally {
             System.setErr(origErr);
diff --git a/src/main/java/org/apache/maven/shared/scriptinterpreter/GroovyScriptInterpreter.java b/src/main/java/org/apache/maven/shared/scriptinterpreter/GroovyScriptInterpreter.java
@@ -68,6 +68,7 @@ public Object evaluateScript(String script, Map<String, ?> globalVariables, Prin
         PrintStream origOut = System.out;
         PrintStream origErr = System.err;
 
+        ClassLoader curentClassLoader = Thread.currentThread().getContextClassLoader();
         try {
 
             if (scriptOutput != null) {
@@ -80,10 +81,12 @@ public Object evaluateScript(String script, Map<String, ?> globalVariables, Prin
                     new Binding(globalVariables),
                     new CompilerConfiguration(CompilerConfiguration.DEFAULT));
 
+            Thread.currentThread().setContextClassLoader(childFirstLoader);
             return interpreter.evaluate(script);
         } catch (Throwable e) {
             throw new ScriptEvaluationException(e);
         } finally {
+            Thread.currentThread().setContextClassLoader(curentClassLoader);
             System.setErr(origErr);
             System.setOut(origOut);
         }
diff --git a/src/test/java/org/apache/maven/shared/scriptinterpreter/ScriptRunnerTest.java b/src/test/java/org/apache/maven/shared/scriptinterpreter/ScriptRunnerTest.java
@@ -20,7 +20,7 @@
 
 import java.io.File;
 import java.nio.file.Files;
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -251,18 +251,17 @@ void theSameClassloaderShouldBeUsed(String scriptType) throws Exception {
 
         try (FileLogger logger = new FileLogger(logFile);
                 ScriptRunner scriptRunner = new ScriptRunner()) {
-            scriptRunner.setClassPath(
-                    Arrays.asList("target/dependency/slf4j-api.jar", "target/dependency/slf4j-simple.jar"));
+            scriptRunner.setClassPath(Collections.singletonList("target/dependency/wiremock-jre8-standalone.jar"));
 
             scriptRunner.run("test classpath 1", basedir, "class-path1", context, logger);
-            assertNotNull(context.get("logger"));
+            assertNotNull(context.get("wireMockServer"));
 
             scriptRunner.run("test classpath 2", basedir, "class-path2", context, logger);
         }
 
         String logContent = new String(Files.readAllBytes(logFile.toPath()));
-        assertTrue(logContent.contains("INFO test - Test log 1"));
-        assertTrue(logContent.contains("INFO test - Test log 2"));
+        assertTrue(logContent.contains("wireMockServer started with port="));
+        assertTrue(logContent.contains("wireMockServer stopped"));
     }
 
     private Map<String, ?> buildContext() {
diff --git a/src/test/resources/bsh-test/class-path1.bsh b/src/test/resources/bsh-test/class-path1.bsh
@@ -17,11 +17,15 @@
  * under the License.
  */
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.github.tomakehurst.wiremock.WireMockServer;
+import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
 
-Logger logger = LoggerFactory.getLogger("test");
-context.put("logger", logger);
-logger.info("Test log 1");
+
+WireMockServer wireMockServer = new WireMockServer(WireMockConfiguration.options().dynamicPort().dynamicHttpsPort());
+wireMockServer.start();
+
+System.out.println("wireMockServer started with port=" + wireMockServer.port());
+
+context.put("wireMockServer", wireMockServer);
 
 return true;
diff --git a/src/test/resources/bsh-test/class-path2.bsh b/src/test/resources/bsh-test/class-path2.bsh
@@ -17,9 +17,11 @@
  * under the License.
  */
 
-import org.slf4j.Logger;
+import com.github.tomakehurst.wiremock.WireMockServer;
 
-Logger logger = context.get("logger");
-logger.info("Test log 2");
+WireMockServer wireMockServer = context.get("wireMockServer");
+wireMockServer.stop();
+
+System.out.println("wireMockServer stopped");
 
 return true;
diff --git a/src/test/resources/groovy-test/class-path1.groovy b/src/test/resources/groovy-test/class-path1.groovy
@@ -17,11 +17,14 @@
  * under the License.
  */
 
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
+import com.github.tomakehurst.wiremock.WireMockServer
+import com.github.tomakehurst.wiremock.core.WireMockConfiguration
 
-Logger logger = LoggerFactory.getLogger("test")
-context.put("logger", logger)
-logger.info("Test log 1")
+WireMockServer wireMockServer = new WireMockServer(WireMockConfiguration.options().dynamicPort().dynamicHttpsPort())
+wireMockServer.start()
+
+println("wireMockServer started with port=" + wireMockServer.port())
+
+context.put("wireMockServer", wireMockServer)
 
 return true
diff --git a/src/test/resources/groovy-test/class-path2.groovy b/src/test/resources/groovy-test/class-path2.groovy
@@ -17,9 +17,11 @@
  * under the License.
  */
 
-import org.slf4j.Logger
+import com.github.tomakehurst.wiremock.WireMockServer;
 
-Logger logger = context.get("logger")
-logger.info("Test log 2")
+WireMockServer wireMockServer = context.get("wireMockServer")
+wireMockServer.stop()
+
+println("wireMockServer stopped")
 
 return true

Original file line number	Diff line number	Diff line change
`@@ -139,15 +139,18 @@ public Object evaluateScript(String script, Map<String, ?> globalVariables, Prin`
`139`	`139`	`}`
`140`	`140`	`}`
`141`	`141`	`}`
`142`		`-`
	`142`	`+ ClassLoader curentClassLoader = Thread.currentThread().getContextClassLoader();`
`143`	`143`	`try {`
	`144`	`+ Thread.currentThread().setContextClassLoader(classLoader);`
`144`	`145`	`return engine.eval(script);`
`145`	`146`	`} catch (TargetError e) {`
`146`	`147`	`throw new ScriptEvaluationException(e.getTarget());`
`147`	`148`	`} catch (ThreadDeath e) {`
`148`	`149`	`throw e;`
`149`	`150`	`} catch (Throwable e) {`
`150`	`151`	`throw new ScriptEvaluationException(e);`
	`152`	`+ } finally {`
	`153`	`+ Thread.currentThread().setContextClassLoader(curentClassLoader);`
`151`	`154`	`}`
`152`	`155`	`} finally {`
`153`	`156`	`System.setErr(origErr);`