Delete DownstreamJobListener and instead create NodeDownstreamBuildAction dynamically during graph processing based on DownstreamBuildAction

blueocean-pipeline-api-impl/src/main/java/io/jenkins/blueocean/listeners/NodeDownstreamBuildAction.java

@@ -3,16 +3,15 @@
 import hudson.model.InvisibleAction;
 import io.jenkins.blueocean.rest.Reachable;
 import io.jenkins.blueocean.rest.hal.Link;
+import java.util.Objects;
 import org.jenkinsci.plugins.workflow.actions.FlowNodeAction;
 import org.jenkinsci.plugins.workflow.graph.FlowNode;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
 
-import java.util.Objects;
-
 /**
- * Annotates a FlowNode to point to a downstream build triggered by said node. Applied by
- * io.jenkins.blueocean.listeners.DownstreamJobListener in blueocean-pipeline-api-impl
+ * Annotates a FlowNode to point to a downstream build triggered by said node.
+ * <p>Added dynamically to {@code FlowNodeWrapper} during graph processing by {@code PipelineNodeGraphVisitor}.
  */
 @ExportedBean
 public class NodeDownstreamBuildAction extends InvisibleAction implements FlowNodeAction, Reachable {

blueocean-pipeline-api-impl/src/main/java/io/jenkins/blueocean/rest/impl/pipeline/PipelineNodeGraphVisitor.java

@@ -2,7 +2,10 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.model.Action;
+import hudson.model.Run;
+import io.jenkins.blueocean.listeners.NodeDownstreamBuildAction;
 import io.jenkins.blueocean.rest.hal.Link;
+import io.jenkins.blueocean.rest.hal.LinkResolver;
 import io.jenkins.blueocean.rest.model.BluePipelineNode;
 import io.jenkins.blueocean.rest.model.BluePipelineStep;
 import io.jenkins.blueocean.rest.model.BlueRun;
@@ -28,6 +31,7 @@
 import org.jenkinsci.plugins.workflow.pipelinegraphanalysis.StatusAndTiming;
 import org.jenkinsci.plugins.workflow.pipelinegraphanalysis.TimingInfo;
 import org.jenkinsci.plugins.workflow.support.actions.PauseAction;
+import org.jenkinsci.plugins.workflow.support.steps.build.DownstreamBuildAction;
 import org.jenkinsci.plugins.workflow.support.steps.input.InputAction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -97,6 +101,8 @@ public class PipelineNodeGraphVisitor extends StandardChunkVisitor implements No
 
     // Collects instances of Action as we walk up the graph, to be drained when appropriate
     private Set<Action> pipelineActions;
+    // The IDs of nodes which contributed to pipelineActions.
+    private Set<String> pipelineActionsNodes;
 
     // Temporary holding for actions waiting to be assigned to the wrapper for a branch
     private Map<FlowNode /* is the branchStartNode */, Set<Action>> pendingActionsForBranches;
@@ -558,6 +564,7 @@ private void dump(String str) {
     protected void accumulatePipelineActions(FlowNode node) {
         final List<Action> actions = node.getActions(Action.class);
         pipelineActions.addAll(actions);
+        pipelineActionsNodes.add(node.getId());
         if (isNodeVisitorDumpEnabled) {
             dump(String.format("\t\taccumulating actions - added %d, total is %d", actions.size(), pipelineActions.size()));
         }
@@ -571,12 +578,29 @@ protected Set<Action> drainPipelineActions() {
             dump(String.format("\t\tdraining accumulated actions - total is %d", pipelineActions.size()));
         }
 
-        if (pipelineActions.size() == 0) {
-            return Collections.emptySet();
-        }
-
         Set<Action> drainedActions = pipelineActions;
+        Set<String> nodes = pipelineActionsNodes;
         pipelineActions = new HashSet<>();
+        pipelineActionsNodes = new HashSet<>();
+        if (!nodes.isEmpty()) {
+            DownstreamBuildAction action = run.getAction(DownstreamBuildAction.class);
+            if (action != null) {
+                for (DownstreamBuildAction.DownstreamBuild downstreamBuild : action.getDownstreamBuilds()) {
+                    if (nodes.contains(downstreamBuild.getFlowNodeId())) {
+                        Run<?, ?> downstream = downstreamBuild.getBuild();
+                        if (downstream != null) {
+                            Link link = LinkResolver.resolveLink(downstream);
+                            String description = downstream.getDescription();
+                            if (description == null) {
+                                description = downstream.getFullDisplayName();
+                            }
+                            drainedActions.add(new NodeDownstreamBuildAction(link, description));
+                        }
+                    }
+                }
+            }
+        }
+
         return drainedActions;
     }
 

pom.xml

@@ -218,7 +218,7 @@
         <dependency>
             <groupId>io.jenkins.tools.bom</groupId>
             <artifactId>bom-2.401.x</artifactId>
-            <version>2401.v7a_d68f8d0b_09</version>
+            <version>2661.vb_b_60650f6d97</version>
             <scope>import</scope>
             <type>pom</type>
         </dependency>