Cleaned up MavenExecutor

Author: fabapp2

sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/MavenExecutor.java

@@ -27,7 +27,7 @@
 import java.util.function.Consumer;
 
 /**
- * Execute Maven goals and prpivide the  provide a {@link Consumer} for
+ * Execute Maven goals and provides the current MavenSession to a custom listener.
  *
  * @author Fabian Krüger
  */
@@ -38,11 +38,13 @@ class MavenExecutor {
     private final MavenExecutionRequestFactory requestFactory;
     private final MavenPlexusContainerFactory containerFactory;
 
+
     /**
-     * Runs given {@code goals} in Maven and calls {@code eventConsumer} when {@link org.apache.maven.execution.ExecutionListener#projectSucceeded(ExecutionEvent)} is called
-     * providing the current {@link MavenSession}.
+     * Runs given {@code goals} in Maven and calls {@code eventConsumer} when Maven calls {@link org.apache.maven.execution.ExecutionListener#projectSucceeded(ExecutionEvent)}.
+     * The {@code eventConsumer} will be provided with the current {@link MavenSession} through the {@link ExecutionEvent}.
      */
-    void runAfterMavenGoals(Path baseDir, PlexusContainer plexusContainer, List<String> goals, Consumer<ExecutionEvent> eventConsumer) {
+     public void onProjectSucceededEvent(Path baseDir, List<String> goals, Consumer<ExecutionEvent> eventConsumer) {
+        PlexusContainer plexusContainer = containerFactory.create();
         AbstractExecutionListener executionListener = new AbstractExecutionListener() {
             @Override
             public void mojoFailed(ExecutionEvent event) {
@@ -55,49 +57,34 @@ public void mojoFailed(ExecutionEvent event) {
             public void projectSucceeded(ExecutionEvent event) {
                 eventConsumer.accept(event);
             }
-        };
-        MavenExecutionRequest request = requestFactory.createMavenExecutionRequest(plexusContainer, baseDir);
-        runWithListener(baseDir, request, plexusContainer, goals, executionListener);
 
-    }
-
-    void runAfterMavenGoals(Path baseDir, List<String> goals, Consumer<ExecutionEvent> eventConsumer) {
-        PlexusContainer plexusContainer = containerFactory.create(baseDir);
-        runAfterMavenGoals(baseDir, plexusContainer, goals, eventConsumer);
-    }
-
-    // FIXME: goals are part of the request and request goals param can be removed
-    void runAfterMavenGoals(Path baseDir, MavenExecutionRequest request, PlexusContainer plexusContainer, List<String> goals, AbstractExecutionListener listener) {
-        runWithListener(baseDir,
-                request,
-                plexusContainer,
-                goals,
-                listener);
-    }
-
-    private void runWithListener(Path baseDir, MavenExecutionRequest request, PlexusContainer plexusContainer, List<String> goals, AbstractExecutionListener executionListener) {
-        try {
-            request.setExecutionListener(executionListener);
-            Maven maven = plexusContainer.lookup(Maven.class);
-            MavenExecutionResult execute = maven.execute(request);
-            if (execute.hasExceptions()) {
-                throw new ParsingException("Maven could not run %s on project '%s'".formatted(goals, baseDir), execute.getExceptions());
+            @Override
+            public void projectFailed(ExecutionEvent event) {
+                super.projectFailed(event);
+                throw new RuntimeException("Exception while executing Maven project: " + event.getProject().getName(), event.getException());
             }
-        } catch (ComponentLookupException e) {
-            throw new RuntimeException(e);
-        }
+        };
+        MavenExecutionRequest request = requestFactory.createMavenExecutionRequest(plexusContainer, baseDir);
+        request.setGoals(goals);
+        request.setExecutionListener(executionListener);
+        execute(request);
     }
 
-    public void execute(Path baseDir, MavenExecutionRequest request, PlexusContainer plexusContainer) {
+    /**
+     * Executes the {@code request} against Maven.
+     *
+     * @see MavenExecutionRequestFactory
+     */
+    public void execute(MavenExecutionRequest request) {
         try {
+            PlexusContainer plexusContainer = containerFactory.create();
             Maven maven = plexusContainer.lookup(Maven.class);
             MavenExecutionResult execute = maven.execute(request);
             if (execute.hasExceptions()) {
-                throw new ParsingException("Maven could not run %s on project '%s'".formatted(request.getGoals(), baseDir), execute.getExceptions());
+                throw new ParsingException("Maven could not run %s on project '%s'".formatted(request.getGoals(), request.getBaseDirectory()), execute.getExceptions());
             }
         } catch (ComponentLookupException e) {
             throw new RuntimeException(e);
-
         }
     }
 }

sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/MavenProjectFactory.java

@@ -84,7 +84,7 @@ public void sessionStarted(ExecutionEvent event) {
                 }
             });
             request.setGoals(List.of("validate"));
-            mavenExecutor.execute(baseDir, request, plexusContainer);
+            mavenExecutor.execute(request);
             return projectAtomicReference.get();
         } catch (ComponentLookupException e) {
             throw new RuntimeException(e);

sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/RewriteMavenProjectParser.java

@@ -103,9 +103,8 @@ public RewriteProjectParsingResult parse(Path baseDir, boolean pomCacheEnabled,
 
     private RewriteProjectParsingResult parseInternal(Path baseDir, boolean pomCacheEnabled, String pomCacheDirectory, boolean skipMavenParsing, Collection<String> plainTextMasks, int sizeThreshold, boolean runPerSubmodule, ExecutionContext executionContext, Path absoluteBaseDir, Collection<String> allExclusions, PlexusContainer plexusContainer) {
         AtomicReference<RewriteProjectParsingResult> parsingResult = new AtomicReference<>();
-        mavenRunner.runAfterMavenGoals(
+        mavenRunner.onProjectSucceededEvent(
                 baseDir,
-                plexusContainer,
                 List.of("clean", "package"),
                 event -> {
                     List<MavenProject> projects = event.getSession().getProjectDependencyGraph().getAllProjects();

sbm-support-rewrite/src/test/java/org/springframework/sbm/parsers/MavenExecutorTest.java

@@ -35,8 +35,10 @@ void verifyMavenSessionWhenRunningInMaven() {
         MavenExecutor sut = new MavenExecutor(requestFactory, containerFactory);
         Path baseDir = Path.of("./testcode/maven-projects/maven-config");
         List<String> goals = List.of("clean", "install");
-        sut.runAfterMavenGoals(baseDir, goals, event -> {
+        sut.onProjectSucceededEvent(baseDir, goals, event -> {
             assertThat(event.getSession()).isNotNull();
         });
     }
+
+
 }