Merge pull request #618 from Vlatombe/refactor-externalmavenrunner-co…

…nstructor Introduce a more useful `ExternalMavenRunner` constructor
jenkinsci · Aug 9, 2024 · ceb1075 · ceb1075
2 parents c01cdff + 9663c79
commit ceb1075
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/main/java/org/jenkins/tools/test/PluginCompatTester.java b/src/main/java/org/jenkins/tools/test/PluginCompatTester.java
@@ -82,7 +82,7 @@ public class PluginCompatTester {
 
     public PluginCompatTester(PluginCompatTesterConfig config) {
         this.config = config;
-        runner = new ExternalMavenRunner(config.getExternalMaven(), config.getMavenSettings(), config.getMavenArgs());
+        runner = new ExternalMavenRunner(config);
     }
 
     @SuppressFBWarnings(

diff --git a/src/main/java/org/jenkins/tools/test/hook/PropertyVersionHook.java b/src/main/java/org/jenkins/tools/test/hook/PropertyVersionHook.java
@@ -6,7 +6,6 @@
 import org.jenkins.tools.test.maven.ExpressionEvaluator;
 import org.jenkins.tools.test.maven.ExternalMavenRunner;
 import org.jenkins.tools.test.maven.MavenRunner;
-import org.jenkins.tools.test.model.PluginCompatTesterConfig;
 import org.jenkins.tools.test.model.hook.BeforeExecutionContext;
 import org.jenkins.tools.test.model.hook.PluginCompatTesterHookBeforeExecution;
 
@@ -27,9 +26,7 @@ public abstract class PropertyVersionHook extends PluginCompatTesterHookBeforeEx
 
     @Override
     public boolean check(@NonNull BeforeExecutionContext context) {
-        PluginCompatTesterConfig config = context.getConfig();
-        MavenRunner runner =
-                new ExternalMavenRunner(config.getExternalMaven(), config.getMavenSettings(), config.getMavenArgs());
+        MavenRunner runner = new ExternalMavenRunner(context.getConfig());
         ExpressionEvaluator expressionEvaluator = new ExpressionEvaluator(
                 context.getCloneDirectory(), context.getPlugin().getModule(), runner);
         try {

diff --git a/src/main/java/org/jenkins/tools/test/maven/ExternalMavenRunner.java b/src/main/java/org/jenkins/tools/test/maven/ExternalMavenRunner.java
@@ -24,6 +24,7 @@
 import java.util.logging.Logger;
 import org.apache.commons.lang.SystemUtils;
 import org.jenkins.tools.test.exception.PomExecutionException;
+import org.jenkins.tools.test.model.PluginCompatTesterConfig;
 
 /** Runs external Maven executable. */
 public class ExternalMavenRunner implements MavenRunner {
@@ -52,6 +53,13 @@ public ExternalMavenRunner(
         this.mavenArgs = mavenArgs;
     }
 
+    /**
+     * @param config The PCT configuration to extract maven arguments from.
+     */
+    public ExternalMavenRunner(@NonNull PluginCompatTesterConfig config) {
+        this(config.getExternalMaven(), config.getMavenSettings(), config.getMavenArgs());
+    }
+
     @Override
     @SuppressFBWarnings(value = "COMMAND_INJECTION", justification = "intended behavior")
     public void run(