Remove unused graph code (#74)

Author: timja

src/main/java/io/jenkins/plugins/pipelinegraphview/multipipelinegraphview/MultiPipelineGraphViewAction.java

@@ -6,7 +6,6 @@
 import hudson.util.HttpResponses;
 import hudson.util.RunList;
 import io.jenkins.plugins.pipelinegraphview.utils.PipelineGraph;
-import io.jenkins.plugins.pipelinegraphview.utils.PipelineGraphApi;
 import java.util.ArrayList;
 import java.util.List;
 import net.sf.json.JSONArray;
@@ -17,7 +16,6 @@
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
 import org.jenkinsci.plugins.workflow.job.WorkflowRun;
 import org.kohsuke.stapler.HttpResponse;
-import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.WebMethod;
 import org.kohsuke.stapler.verb.GET;
 
@@ -44,16 +42,6 @@ public MultiPipelineGraphViewAction(WorkflowJob target) {
     this.target = target;
   }
 
-  @GET
-  @WebMethod(name = "graph")
-  public HttpResponse getGraph(StaplerRequest req) throws JsonProcessingException {
-    String runId = req.getParameter("runId");
-    WorkflowRun run = target.getBuildByNumber(Integer.parseInt(runId));
-    PipelineGraphApi api = new PipelineGraphApi(run);
-    JSONObject graph = createGraphJson(api.createGraph());
-    return HttpResponses.okJSON(graph);
-  }
-
   protected JSONObject createGraphJson(PipelineGraph pipelineGraph) throws JsonProcessingException {
     String graph = OBJECT_MAPPER.writeValueAsString(pipelineGraph);
     return JSONObject.fromObject(graph);

src/main/java/io/jenkins/plugins/pipelinegraphview/utils/AbstractPipelineViewAction.java

@@ -11,7 +11,6 @@
 import org.jenkinsci.plugins.workflow.job.WorkflowRun;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.WebMethod;
-import org.kohsuke.stapler.verb.GET;
 
 public abstract class AbstractPipelineViewAction implements Action, IconSpec {
   private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
@@ -40,16 +39,6 @@ protected JSONObject createJson(PipelineGraph pipelineGraph) throws JsonProcessi
     return JSONObject.fromObject(graph);
   }
 
-  @GET
-  @WebMethod(name = "graph")
-  public HttpResponse getGraph() throws JsonProcessingException {
-    // TODO for automatic json serialisation look at:
-    // https://github.com/jenkinsci/blueocean-plugin/blob/4f2aa260fca22604a087629dc0da5c80735e0548/blueocean-commons/src/main/java/io/jenkins/blueocean/commons/stapler/Export.java#L101
-    // https://github.com/jenkinsci/blueocean-plugin/blob/4f2aa260fca22604a087629dc0da5c80735e0548/blueocean-commons/src/main/java/io/jenkins/blueocean/commons/stapler/TreeResponse.java#L48
-    JSONObject graph = createJson(api.createGraph());
-    return HttpResponses.okJSON(graph);
-  }
-
   @WebMethod(name = "tree")
   public HttpResponse getTree() throws JsonProcessingException {
     // TODO: This need to be updated to return a tree representation of the graph, not the graph.

src/main/java/io/jenkins/plugins/pipelinegraphview/utils/PipelineGraphApi.java

@@ -52,83 +52,6 @@ private List<PipelineStageInternal> getPipelineNodes() {
         .collect(Collectors.toList());
   }
 
-  public PipelineGraph createGraph() {
-    List<PipelineStageInternal> stages = getPipelineNodes();
-
-    // id => stage
-    Map<String, PipelineStageInternal> stageMap =
-        stages.stream()
-            .collect(
-                Collectors.toMap(
-                    PipelineStageInternal::getId, stage -> stage, (u, v) -> u, LinkedHashMap::new));
-
-    Map<String, List<String>> stageToChildrenMap = new HashMap<>();
-
-    List<String> stagesThatAreNested = new ArrayList<>();
-
-    Map<String, String> nextSiblingToOlderSibling = new HashMap<>();
-
-    List<String> stagesThatAreChildrenOrNestedStages = new ArrayList<>();
-    stages.forEach(
-        stage -> {
-          if (stage.getParents().isEmpty()) {
-            stageToChildrenMap.put(stage.getId(), new ArrayList<>());
-          } else if (stage.getType().equals("PARALLEL")) {
-            String parentId = stage.getParents().get(0); // assume one parent for now
-            List<String> childrenOfParent =
-                stageToChildrenMap.getOrDefault(parentId, new ArrayList<>());
-            childrenOfParent.add(stage.getId());
-            stageToChildrenMap.put(parentId, childrenOfParent);
-            stagesThatAreChildrenOrNestedStages.add(stage.getId());
-          } else if (stageMap.get(stage.getParents().get(0)).getType().equals("PARALLEL")) {
-            String parentId = stage.getParents().get(0);
-            PipelineStageInternal parent = stageMap.get(parentId);
-            parent.setSeqContainerName(parent.getName());
-            parent.setName(stage.getName());
-            parent.setSequential(true);
-            parent.setType(stage.getType());
-            parent.setTitle(stage.getTitle());
-            parent.setCompletePercent(stage.getCompletePercent());
-            stage.setSequential(true);
-
-            nextSiblingToOlderSibling.put(stage.getId(), parentId);
-            stagesThatAreNested.add(stage.getId());
-            stagesThatAreChildrenOrNestedStages.add(stage.getId());
-            // nested stage of nested stage
-          } else if (stagesThatAreNested.contains(
-              stageMap.get(stage.getParents().get(0)).getId())) {
-            PipelineStageInternal parent =
-                stageMap.get(nextSiblingToOlderSibling.get(stage.getParents().get(0)));
-            // shouldn't happen but found it after restarting a matrix build
-            // this breaks the layout badly but prevents a null pointer
-            if (parent != null) {
-              stage.setSequential(true);
-              parent.setNextSibling(stage);
-              stagesThatAreNested.add(stage.getId());
-              stagesThatAreChildrenOrNestedStages.add(stage.getId());
-            }
-          }
-        });
-
-    List<PipelineStage> stageResults =
-        stageMap.values().stream()
-            .map(
-                pipelineStageInternal -> {
-                  List<PipelineStage> children =
-                      stageToChildrenMap.getOrDefault(pipelineStageInternal.getId(), emptyList())
-                          .stream()
-                          .map(mapper(stageMap, stageToChildrenMap))
-                          .collect(Collectors.toList());
-
-                  return pipelineStageInternal.toPipelineStage(children);
-                })
-            .filter(stage -> !stagesThatAreChildrenOrNestedStages.contains(stage.getId()))
-            .collect(Collectors.toList());
-
-    FlowExecution execution = run.getExecution();
-    return new PipelineGraph(stageResults, execution != null && execution.isComplete());
-  }
-
   private Function<String, PipelineStage> mapper(
       Map<String, PipelineStageInternal> stageMap, Map<String, List<String>> stageToChildrenMap) {
 

src/test/java/io/jenkins/plugins/pipelinegraphview/utils/PipelineGraphApiTest.java

@@ -5,7 +5,6 @@
 
 import hudson.model.Result;
 import java.util.List;
-import java.util.Optional;
 import org.jenkinsci.plugins.workflow.job.WorkflowRun;
 import org.junit.Rule;
 import org.junit.Test;
@@ -15,71 +14,6 @@ public class PipelineGraphApiTest {
 
   @Rule public JenkinsRule j = new JenkinsRule();
 
-  @Test
-  public void createGraph_unstableSmokes() throws Exception {
-    WorkflowRun run =
-        TestUtils.createAndRunJob(
-            j, "unstableSmokes", "unstableSmokes.jenkinsfile", Result.FAILURE);
-    PipelineGraphApi api = new PipelineGraphApi(run);
-    PipelineGraph graph = api.createGraph();
-
-    List<PipelineStage> stages = graph.getStages();
-
-    String stagesString =
-        TestUtils.collectStagesAsString(
-            stages,
-            (PipelineStage stage) ->
-                String.format(
-                    "{%d,%s,%s,%s,%s}",
-                    stage.getCompletePercent(),
-                    stage.getName(),
-                    stage.getTitle(),
-                    stage.getType(),
-                    stage.getState()));
-    assertThat(
-        stagesString,
-        is(
-            String.join(
-                "",
-                "{50,unstable-one,unstable-one,STAGE,UNSTABLE},",
-                "{50,success,success,STAGE,SUCCESS},",
-                "{50,unstable-two,unstable-two,STAGE,UNSTABLE},",
-                "{50,failure,failure,STAGE,FAILURE}")));
-  }
-
-  @Test
-  public void createGraph_complexSmokes() throws Exception {
-    WorkflowRun run =
-        TestUtils.createAndRunJob(j, "complexSmokes", "complexSmokes.jenkinsfile", Result.SUCCESS);
-    PipelineGraphApi api = new PipelineGraphApi(run);
-    PipelineGraph graph = api.createGraph();
-
-    List<PipelineStage> stages = graph.getStages();
-
-    String stagesString =
-        TestUtils.collectStagesAsString(
-            stages,
-            (PipelineStage stage) ->
-                String.format(
-                    "{%s,%s}",
-                    stage.getName(), Optional.ofNullable(stage.getSeqContainerName()).orElse("-")));
-
-    // As this is a graph view, and 'Branch C' doesn't have and steps, it doesn't get added as a
-    // node.
-    // Instead, its first child with steps 'Nested 1' gets added as a node, and all other children
-    // get added as siblings. The 'getSeqContainerName' property of the 'Nested 1' now gets set to
-    // its parent's display name ('Branch C') so the frontend can add a label.
-    assertThat(
-        stagesString,
-        is(
-            String.join(
-                "",
-                "{Non-Parallel Stage,-},",
-                "{Parallel Stage,-}[{Branch A,-},{Branch B,-},{Nested 1,Branch C}],",
-                "{Skipped stage,-},",
-                "{Parallel Stage 2,-}[{Branch A,-},{Branch B,-},{Nested 1,Branch C}]")));
-  }
-
   @Test
   public void createTree_unstableSmokes() throws Exception {
     WorkflowRun run =