[JENKINS-41591] Fix pipeline support using TransientActionFactory

src/main/java/com/sonyericsson/rebuild/RebuildAction.java

@@ -81,6 +81,7 @@ public class RebuildAction implements Action {
     private transient String p = "parameter";
     private transient Run<?, ?> build;
     private transient ParametersDefinitionProperty pdp;
+    private transient boolean isTransient = false;
     private static final String PARAMETERIZED_URL = "parameterized";
     /**
      * Rebuild Descriptor.
@@ -93,6 +94,14 @@ public class RebuildAction implements Action {
     public RebuildAction() {
     }
 
+    /**
+     * RebuildAction constructor.
+     * @param isTransient true to mark it as transient
+     */
+     RebuildAction(boolean isTransient) {
+        this.isTransient = isTransient;
+    }
+
     /**
      * Getter method for pdp.
      *
@@ -168,7 +177,7 @@ public Job getProject() {
 
     @Override
     public String getIconFileName() {
-        if (isRebuildAvailable()) {
+        if (isTransient && isRebuildAvailable()) {
             return "clock.png";
         } else {
             return null;
@@ -177,7 +186,7 @@ public String getIconFileName() {
 
     @Override
     public String getDisplayName() {
-		if (isRebuildAvailable()) {
+		if (isTransient && isRebuildAvailable()) {
             return "Rebuild";
         } else {
             return null;
@@ -186,7 +195,7 @@ public String getDisplayName() {
 
     @Override
     public String getUrlName() {
-        if (isRebuildAvailable()) {
+        if (isTransient && isRebuildAvailable()) {
             return "rebuild";
         } else {
             return null;

src/main/java/com/sonyericsson/rebuild/RebuildActionFactory.java

@@ -23,14 +23,14 @@
  */
 package com.sonyericsson.rebuild;
 
-import hudson.matrix.MatrixConfiguration;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.Extension;
+import hudson.matrix.MatrixConfiguration;
 import hudson.model.Action;
 import hudson.model.Queue;
 import hudson.model.Run;
-import hudson.model.TransientBuildActionFactory;
 import jenkins.model.Jenkins;
-
+import jenkins.model.TransientActionFactory;
 import java.util.Collection;
 
 import static java.util.Collections.emptyList;
@@ -40,28 +40,33 @@
  * Enables rebuild for builds that ran before installing the rebuild plugin.
  */
 @Extension
-public class RebuildActionFactory extends TransientBuildActionFactory {
+public class RebuildActionFactory extends TransientActionFactory<Run> {
+
+    @Override
+    public Class<Run> type() {
+        return Run.class;
+    }
 
+    @NonNull
     @Override
-    public Collection<? extends Action> createFor(Run build) {
+    public Collection<? extends Action> createFor(@NonNull Run run) {
+
         // TODO should this not just use RebuildAction.isRebuildAvailable? Or conversely, is that method needed if we are already filtering here?
-        if (build.getParent() instanceof MatrixConfiguration) {
+        if (run.getParent() instanceof MatrixConfiguration) {
             return emptyList();
         }
-        if (!(build.getParent() instanceof Queue.Task)) {
+        if (!(run.getParent() instanceof Queue.Task)) {
             return emptyList();
         }
 
-        boolean hasRebuildAction = build.getAction(RebuildAction.class) != null;
-        if (hasRebuildAction) {
-            return emptyList();
-        }
         for (RebuildValidator rebuildValidator : Jenkins.get().
                 getExtensionList(RebuildValidator.class)) {
-            if (rebuildValidator.isApplicable(build)) {
+            if (rebuildValidator.isApplicable(run)) {
                 return emptyList();
             }
         }
-        return singleton(new RebuildAction());
+
+        return singleton(new RebuildAction(true));
     }
+
 }

src/main/java/com/sonyericsson/rebuild/RebuildLastCompletedBuildAction.java

@@ -31,6 +31,10 @@
  */
 public class RebuildLastCompletedBuildAction extends RebuildAction {
 
+    public RebuildLastCompletedBuildAction(boolean isTransient) {
+        super(isTransient);
+    }
+
     @Override
     public String getUrlName() {
         Job project = getProject();

src/main/java/com/sonyericsson/rebuild/RebuildProjectActionFactory.java

@@ -23,30 +23,35 @@
  */
 package com.sonyericsson.rebuild;
 
-import hudson.matrix.MatrixConfiguration;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.Extension;
-import hudson.model.AbstractProject;
+import hudson.matrix.MatrixConfiguration;
 import hudson.model.Action;
-import hudson.model.TransientProjectActionFactory;
-
+import hudson.model.Job;
+import jenkins.model.TransientActionFactory;
 import java.util.Collection;
 
-import static java.util.Collections.singleton;
 import static java.util.Collections.emptyList;
+import static java.util.Collections.singleton;
 
 /**
  * Makes the rebuild button available on the project level.
  * Rebuilds the last completed build.
  */
 @Extension
-// TODO when depending on 1.548+, switch to TransientActionFactory (also for RebuildActionFactory) and take Job not AbstractProject (again consider consolidating logic with isRebuildAvailable)
-public class RebuildProjectActionFactory extends TransientProjectActionFactory {
+public class RebuildProjectActionFactory extends TransientActionFactory<Job> {
+
+    @Override
+    public Class<Job> type() {
+        return Job.class;
+    }
 
+    @NonNull
     @Override
-    public Collection<? extends Action> createFor(AbstractProject abstractProject) {
-        if (abstractProject instanceof MatrixConfiguration) {
+    public Collection<? extends Action> createFor(@NonNull Job job) {
+        if (job instanceof MatrixConfiguration) {
             return emptyList();
         }
-        return singleton(new RebuildLastCompletedBuildAction());
+        return singleton(new RebuildLastCompletedBuildAction(true));
     }
 }