[GitHub] [maven-build-cache-extension] AlexanderAshitkin commented on a diff in pull request #30: [MBUILDCACHE-24] - Fixes IllegalArgumentException in forked executions

[GitBox <gi...@apache.org>]

AlexanderAshitkin commented on code in PR #30:
URL: https://github.com/apache/maven-build-cache-extension/pull/30#discussion_r1003477563


##########
src/main/java/org/apache/maven/buildcache/LifecyclePhasesHelper.java:
##########
@@ -21,35 +21,95 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 import java.util.stream.Collectors;
+import javax.annotation.Nonnull;
+import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Named;
-import javax.inject.Singleton;
+import org.apache.maven.SessionScoped;
 import org.apache.maven.buildcache.xml.Build;
+import org.apache.maven.execution.AbstractExecutionListener;
+import org.apache.maven.execution.ExecutionEvent;
+import org.apache.maven.execution.MavenExecutionRequest;
+import org.apache.maven.execution.MavenSession;
 import org.apache.maven.lifecycle.DefaultLifecycles;
 import org.apache.maven.lifecycle.Lifecycle;
 import org.apache.maven.plugin.MojoExecution;
+import org.apache.maven.project.MavenProject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-@Singleton
+@SessionScoped
 @Named
-public class LifecyclePhasesHelper
+public class LifecyclePhasesHelper extends AbstractExecutionListener
 {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger( LifecyclePhasesHelper.class );
+
+    private final MavenSession session;
     private final DefaultLifecycles defaultLifecycles;
     private final List<String> phases;
     private final String lastCleanPhase;
 
+    private final ConcurrentMap<MavenProject, MojoExecution> forkedProjectToOrigin = new ConcurrentHashMap<>();
+
     @Inject
-    public LifecyclePhasesHelper( DefaultLifecycles defaultLifecycles,
+    public LifecyclePhasesHelper( MavenSession session,
+            DefaultLifecycles defaultLifecycles,
             @Named( "clean" ) Lifecycle cleanLifecycle )
     {
+        this.session = session;
         this.defaultLifecycles = Objects.requireNonNull( defaultLifecycles );
         this.phases = defaultLifecycles.getLifeCycles().stream()
                 .flatMap( lf -> lf.getPhases().stream() )
                 .collect( Collectors.toList() );
         this.lastCleanPhase = CacheUtils.getLast( cleanLifecycle.getPhases() );
     }
 
+    @PostConstruct
+    public void init()
+    {
+        MavenExecutionRequest request = session.getRequest();
+        ChainedListener lifecycleListener = new ChainedListener( request.getExecutionListener() );
+        lifecycleListener.chainListener( this );
+        request.setExecutionListener( lifecycleListener );
+    }
+
+    @Override
+    public void forkedProjectStarted( ExecutionEvent event )
+    {
+        LOGGER.debug( "Started forked project. Project: {}, instance: {}, originating mojo: {}", event.getProject(),
+                System.identityHashCode( event.getProject() ), event.getMojoExecution() );
+        forkedProjectToOrigin.put( event.getProject(), event.getMojoExecution() );
+    }
+
+    @Override
+    public void forkedProjectSucceeded( ExecutionEvent event )
+    {
+        LOGGER.debug( "Finished forked project. Project: {}, instance: {}", event.getProject(),
+                System.identityHashCode( event.getProject() ) );
+        forkedProjectToOrigin.remove( event.getProject(), event.getMojoExecution() );
+    }
+
+    @Override
+    public void forkedProjectFailed( ExecutionEvent event )
+    {
+        LOGGER.debug( "Finished forked project. Project: {}, instance: {}", event.getProject(),
+                System.identityHashCode( event.getProject() ) );
+        forkedProjectToOrigin.remove( event.getProject(), event.getMojoExecution() );
+    }
+
+    @Nonnull
+    public String resolveHighestLifecyclePhase( MavenProject project, List<MojoExecution> mojoExecutions )
+    {
+        // if forked, take originating mojo as the highest phase, else last mojo phase
+        return forkedProjectToOrigin.getOrDefault( project, CacheUtils.getLast( mojoExecutions ) )

Review Comment:
   this is the essence of the change - if forked project present, then lifecycle of the originating mojo (which originated forked executions) is taken, otherwise the last execution in the build is taken (as previously)
   
   In order to make this work, need to populate the map from `ForkedProjectStarted` execution events



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org