JENKINS-51031 Support sorting of Jenkins pipeline based views

* Introduced generic core classes for specific implementations to extend, allowing comparators to operate on the same data model regardless which view implementation is used

src/main/java/se/diabol/jenkins/pipeline/domain/AbstractItem.java → src/main/java/se/diabol/jenkins/core/AbstractItem.java

@@ -15,7 +15,7 @@
 along with Delivery Pipeline Plugin.
 If not, see <http://www.gnu.org/licenses/>.
 */
-package se.diabol.jenkins.pipeline.domain;
+package se.diabol.jenkins.core;
 
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;

src/main/java/se/diabol/jenkins/core/GenericComponent.java

@@ -0,0 +1,48 @@
+/*
+This file is part of Delivery Pipeline Plugin.
+
+Delivery Pipeline Plugin is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Delivery Pipeline Plugin is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Delivery Pipeline Plugin.
+If not, see <http://www.gnu.org/licenses/>.
+*/
+package se.diabol.jenkins.core;
+
+import org.kohsuke.stapler.export.Exported;
+import org.kohsuke.stapler.export.ExportedBean;
+
+import java.util.List;
+
+@ExportedBean(defaultVisibility = AbstractItem.VISIBILITY)
+public abstract class GenericComponent extends AbstractItem {
+
+    public GenericComponent(String name) {
+        super(name);
+    }
+
+    @Exported
+    public long getLastActivity() {
+        long result = 0;
+        if (getPipelines() != null) {
+            for (GenericPipeline pipeline : getPipelines()) {
+                long lastActivity = pipeline.getLastActivity();
+                if (lastActivity > result) {
+                    result = lastActivity;
+                }
+            }
+        }
+        return result;
+    }
+
+    @Exported
+    public abstract List<? extends GenericPipeline> getPipelines();
+}

src/main/java/se/diabol/jenkins/core/GenericPipeline.java

@@ -0,0 +1,30 @@
+/*
+This file is part of Delivery Pipeline Plugin.
+
+Delivery Pipeline Plugin is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Delivery Pipeline Plugin is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Delivery Pipeline Plugin.
+If not, see <http://www.gnu.org/licenses/>.
+*/
+package se.diabol.jenkins.core;
+
+import org.kohsuke.stapler.export.ExportedBean;
+
+@ExportedBean(defaultVisibility = AbstractItem.VISIBILITY)
+public abstract class GenericPipeline extends AbstractItem {
+
+    public GenericPipeline(String name) {
+        super(name);
+    }
+
+    public abstract long getLastActivity();
+}

src/main/java/se/diabol/jenkins/pipeline/DeliveryPipelineView.java

@@ -51,8 +51,8 @@
 import se.diabol.jenkins.pipeline.domain.Component;
 import se.diabol.jenkins.pipeline.domain.Pipeline;
 import se.diabol.jenkins.pipeline.domain.PipelineException;
-import se.diabol.jenkins.pipeline.sort.ComponentComparator;
 import se.diabol.jenkins.pipeline.sort.ComponentComparatorDescriptor;
+import se.diabol.jenkins.pipeline.sort.GenericComponentComparator;
 import se.diabol.jenkins.pipeline.trigger.ManualTrigger;
 import se.diabol.jenkins.pipeline.trigger.ManualTriggerFactory;
 import se.diabol.jenkins.pipeline.trigger.TriggerException;
@@ -525,7 +525,7 @@ public List<Component> getPipelines() {
                 }
             }
             if (getSorting() != null && !getSorting().equals(NONE_SORTER)) {
-                ComponentComparatorDescriptor comparatorDescriptor = ComponentComparator.all().find(sorting);
+                ComponentComparatorDescriptor comparatorDescriptor = GenericComponentComparator.all().find(sorting);
                 if (comparatorDescriptor != null) {
                     components.sort(comparatorDescriptor.createInstance());
                 }
@@ -639,8 +639,8 @@ public ListBoxModel doFillNoOfPipelinesItems(@AncestorInPath ItemGroup<?> contex
         }
 
         public ListBoxModel doFillSortingItems() {
-            DescriptorExtensionList<ComponentComparator, ComponentComparatorDescriptor> descriptors =
-                    ComponentComparator.all();
+            DescriptorExtensionList<GenericComponentComparator, ComponentComparatorDescriptor> descriptors =
+                    GenericComponentComparator.all();
             ListBoxModel options = new ListBoxModel();
             options.add("None", NONE_SORTER);
             for (ComponentComparatorDescriptor descriptor : descriptors) {

src/main/java/se/diabol/jenkins/pipeline/domain/Change.java

@@ -22,6 +22,7 @@
 import hudson.scm.RepositoryBrowser;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
+import se.diabol.jenkins.core.AbstractItem;
 
 import java.io.IOException;
 import java.net.URL;

src/main/java/se/diabol/jenkins/pipeline/domain/Component.java

@@ -24,15 +24,18 @@
 import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.export.Exported;
-import org.kohsuke.stapler.export.ExportedBean;
 
+import org.kohsuke.stapler.export.ExportedBean;
+import se.diabol.jenkins.core.AbstractItem;
+import se.diabol.jenkins.core.GenericComponent;
 import se.diabol.jenkins.pipeline.PipelinePagination;
 import se.diabol.jenkins.pipeline.util.FullScreen;
 
 import java.util.List;
 
 @ExportedBean(defaultVisibility = AbstractItem.VISIBILITY)
-public class Component extends AbstractItem {
+public class Component extends GenericComponent {
+
     private List<Pipeline> pipelines;
     private final String firstJob;
     private final String firstJobUrl;

src/main/java/se/diabol/jenkins/pipeline/domain/Pipeline.java

@@ -26,22 +26,20 @@
 import hudson.model.ItemGroup;
 import hudson.model.Result;
 import org.kohsuke.stapler.export.Exported;
-import org.kohsuke.stapler.export.ExportedBean;
+import se.diabol.jenkins.core.GenericPipeline;
 import se.diabol.jenkins.pipeline.domain.task.Task;
 import se.diabol.jenkins.pipeline.sort.BuildStartTimeComparator;
 import se.diabol.jenkins.pipeline.util.PipelineUtils;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-@ExportedBean(defaultVisibility = AbstractItem.VISIBILITY)
-public class Pipeline extends AbstractItem {
+public class Pipeline extends GenericPipeline {
 
     private final AbstractProject firstProject;
     private final AbstractProject lastProject;
@@ -170,6 +168,18 @@ public void calculateTotalBuildTime() {
         }
     }
 
+    public long getLastActivity() {
+        long result = 0;
+        for (Stage stage : getStages()) {
+            for (Task task : stage.getTasks()) {
+                if (task.getStatus().getLastActivity() > result) {
+                    result = task.getStatus().getLastActivity();
+                }
+            }
+        }
+        return result;
+    }
+
     private Route createRouteAndCopyTasks(final Route route, Task task) {
         Route currentRoute = new Route();
         if (route != null) {

src/main/java/se/diabol/jenkins/pipeline/domain/Stage.java

@@ -38,6 +38,7 @@
 import org.jgrapht.graph.SimpleDirectedGraph;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
+import se.diabol.jenkins.core.AbstractItem;
 import se.diabol.jenkins.pipeline.PipelineProperty;
 import se.diabol.jenkins.pipeline.domain.task.Task;
 import se.diabol.jenkins.pipeline.util.BuildUtil;
@@ -47,7 +48,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;

src/main/java/se/diabol/jenkins/pipeline/domain/TriggerCause.java

@@ -22,6 +22,7 @@
 import hudson.model.Run;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
+import se.diabol.jenkins.core.AbstractItem;
 import se.diabol.jenkins.pipeline.CauseResolver;
 
 import java.util.ArrayList;

src/main/java/se/diabol/jenkins/pipeline/domain/UserInfo.java

@@ -19,6 +19,7 @@
 
 import hudson.model.User;
 import org.kohsuke.stapler.export.Exported;
+import se.diabol.jenkins.core.AbstractItem;
 
 import java.util.HashSet;
 import java.util.List;

src/main/java/se/diabol/jenkins/pipeline/domain/results/Result.java

@@ -20,7 +20,7 @@
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
 
-import se.diabol.jenkins.pipeline.domain.AbstractItem;
+import se.diabol.jenkins.core.AbstractItem;
 
 @ExportedBean(defaultVisibility = AbstractItem.VISIBILITY)
 public class Result {

src/main/java/se/diabol/jenkins/pipeline/domain/status/Running.java

@@ -19,7 +19,7 @@
 
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
-import se.diabol.jenkins.pipeline.domain.AbstractItem;
+import se.diabol.jenkins.core.AbstractItem;
 
 @ExportedBean(defaultVisibility = AbstractItem.VISIBILITY)
 public class Running extends SimpleStatus {

src/main/java/se/diabol/jenkins/pipeline/domain/status/SimpleStatus.java

@@ -35,7 +35,7 @@
 import org.apache.commons.collections.CollectionUtils;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
-import se.diabol.jenkins.pipeline.domain.AbstractItem;
+import se.diabol.jenkins.core.AbstractItem;
 import se.diabol.jenkins.pipeline.domain.status.promotion.AbstractPromotionStatusProvider;
 import se.diabol.jenkins.pipeline.domain.status.promotion.PromotionStatus;
 import se.diabol.jenkins.pipeline.util.PipelineUtils;

src/main/java/se/diabol/jenkins/pipeline/domain/status/promotion/PromotionStatus.java

@@ -20,7 +20,7 @@
 
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
-import se.diabol.jenkins.pipeline.domain.AbstractItem;
+import se.diabol.jenkins.core.AbstractItem;
 
 import java.util.List;
 

src/main/java/se/diabol/jenkins/pipeline/domain/task/ManualStep.java

@@ -23,7 +23,7 @@
 import hudson.model.Result;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
-import se.diabol.jenkins.pipeline.domain.AbstractItem;
+import se.diabol.jenkins.core.AbstractItem;
 import se.diabol.jenkins.pipeline.trigger.ManualTriggerResolver;
 import se.diabol.jenkins.pipeline.util.BuildUtil;
 import se.diabol.jenkins.pipeline.util.JenkinsUtil;

src/main/java/se/diabol/jenkins/pipeline/domain/task/Task.java

@@ -29,8 +29,8 @@
 import jenkins.model.Jenkins;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
+import se.diabol.jenkins.core.AbstractItem;
 import se.diabol.jenkins.pipeline.PipelineProperty;
-import se.diabol.jenkins.pipeline.domain.AbstractItem;
 import se.diabol.jenkins.pipeline.domain.results.StaticAnalysisResult;
 import se.diabol.jenkins.pipeline.domain.results.TestResult;
 import se.diabol.jenkins.pipeline.domain.status.SimpleStatus;

src/main/java/se/diabol/jenkins/pipeline/sort/ComponentComparatorDescriptor.java

@@ -19,7 +19,7 @@
 
 import hudson.model.Descriptor;
 
-public abstract class ComponentComparatorDescriptor extends Descriptor<ComponentComparator> {
+public abstract class ComponentComparatorDescriptor extends Descriptor<GenericComponentComparator> {
 
-    public abstract ComponentComparator createInstance();
+    public abstract GenericComponentComparator createInstance();
 }

src/main/java/se/diabol/jenkins/pipeline/sort/FailedJobComparator.java

@@ -18,17 +18,18 @@
 package se.diabol.jenkins.pipeline.sort;
 
 import hudson.Extension;
-import se.diabol.jenkins.pipeline.domain.Component;
+import se.diabol.jenkins.core.GenericComponent;
+import se.diabol.jenkins.core.GenericPipeline;
 import se.diabol.jenkins.pipeline.domain.Pipeline;
 import se.diabol.jenkins.pipeline.domain.Stage;
 import se.diabol.jenkins.pipeline.domain.task.Task;
 
 import java.io.Serializable;
 
-public class FailedJobComparator extends ComponentComparator implements Serializable {
+public class FailedJobComparator extends GenericComponentComparator implements Serializable {
 
     @Override
-    public int compare(Component o1, Component o2) {
+    public int compare(GenericComponent o1, GenericComponent o2) {
         if ((hasFailedJob(firstPipeline(o1)) && (!hasFailedJob(firstPipeline(o2))))) {
             return -1;
         } else if ((hasFailedJob(firstPipeline(o2)) && (!hasFailedJob(firstPipeline(o1))))) {
@@ -38,15 +39,28 @@ public int compare(Component o1, Component o2) {
         }
     }
 
-    private Pipeline firstPipeline(Component component) {
+    private GenericPipeline firstPipeline(GenericComponent component) {
         if (component != null && component.getPipelines() != null && !component.getPipelines().isEmpty()) {
             return component.getPipelines().get(0);
         } else {
             return null;
         }
     }
 
-    private boolean hasFailedJob(Pipeline pipeline) {
+    private boolean hasFailedJob(GenericPipeline pipeline) {
+        if (pipeline == null) {
+            return false;
+        }
+        if (pipeline instanceof Pipeline) {
+            return hasFailedJobs((Pipeline) pipeline);
+        } else if (pipeline instanceof se.diabol.jenkins.workflow.model.Pipeline) {
+            return hasFailed((se.diabol.jenkins.workflow.model.Pipeline) pipeline);
+        } else {
+            throw new IllegalStateException("Unable to resolve pipeline type for " + pipeline);
+        }
+    }
+
+    private boolean hasFailedJobs(Pipeline pipeline) {
         if (pipeline != null) {
             for (Stage stage : pipeline.getStages()) {
                 for (Task task : stage.getTasks()) {
@@ -59,6 +73,19 @@ private boolean hasFailedJob(Pipeline pipeline) {
         return false;
     }
 
+    private boolean hasFailed(se.diabol.jenkins.workflow.model.Pipeline pipeline) {
+        if (pipeline != null) {
+            for (se.diabol.jenkins.workflow.model.Stage stage : pipeline.getStages()) {
+                for (se.diabol.jenkins.workflow.model.Task task : stage.getTasks()) {
+                    if (task.getStatus().isFailed()) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
     @Extension
     public static class DescriptorImpl extends ComponentComparatorDescriptor {
         @Override
@@ -67,7 +94,7 @@ public String getDisplayName() {
         }
 
         @Override
-        public ComponentComparator createInstance() {
+        public GenericComponentComparator createInstance() {
             return new FailedJobComparator();
         }
     }

src/main/java/se/diabol/jenkins/pipeline/sort/ComponentComparator.java → src/main/java/se/diabol/jenkins/pipeline/sort/GenericComponentComparator.java

@@ -21,20 +21,21 @@
 import hudson.ExtensionPoint;
 import hudson.model.Describable;
 import hudson.model.Descriptor;
-import se.diabol.jenkins.pipeline.domain.Component;
+import se.diabol.jenkins.core.GenericComponent;
 import se.diabol.jenkins.pipeline.util.JenkinsUtil;
 
 import java.util.Comparator;
 
-public abstract class ComponentComparator implements Comparator<Component>, ExtensionPoint,
-        Describable<ComponentComparator> {
+public abstract class GenericComponentComparator implements Comparator<GenericComponent>,
+        ExtensionPoint,
+        Describable<GenericComponentComparator> {
 
     @Override
-    public Descriptor<ComponentComparator> getDescriptor() {
+    public Descriptor<GenericComponentComparator> getDescriptor() {
         return (ComponentComparatorDescriptor) JenkinsUtil.getInstance().getDescriptor(getClass());
     }
 
-    public static DescriptorExtensionList<ComponentComparator, ComponentComparatorDescriptor> all() {
-        return JenkinsUtil.getInstance().getDescriptorList(ComponentComparator.class);
+    public static DescriptorExtensionList<GenericComponentComparator, ComponentComparatorDescriptor> all() {
+        return JenkinsUtil.getInstance().getDescriptorList(GenericComponentComparator.class);
     }
 }