[JENKINS-57903]- Refactor PromotionConditionDescriptor extension Point to make it Pipeline Compatible.

src/main/java/hudson/plugins/promoted_builds/Promotion.java

@@ -23,6 +23,7 @@
 import hudson.model.Run;
 import hudson.model.User;
 import hudson.plugins.promoted_builds.conditions.ManualCondition;
+import hudson.plugins.promoted_builds.pipeline.PromotionRun;
 import hudson.plugins.promoted_builds.util.JenkinsHelper;
 import hudson.security.Permission;
 import hudson.security.PermissionGroup;
@@ -60,11 +61,11 @@
 import org.kohsuke.stapler.StaplerResponse;
 
 /**
- * Records a promotion process.
+ * Records a promotion process for {@link AbstractProject}s.
  *
  * @author Kohsuke Kawaguchi
  */
-public class Promotion extends AbstractBuild<PromotionProcess,Promotion> {
+public class Promotion extends AbstractBuild<PromotionProcess,Promotion> implements PromotionRun {
 
     public Promotion(PromotionProcess job) throws IOException {
         super(job);
@@ -113,6 +114,7 @@ public EnvVars getEnvironment(TaskListener listener) throws IOException, Interru
 
         // Augment environment with target build's information
         String rootUrl = JenkinsHelper.getInstance().getRootUrl();
+        //TODO: Refactor to Run
         AbstractBuild<?, ?> target = getTarget();
         if(rootUrl!=null)
             e.put("PROMOTED_URL",rootUrl+target.getUrl());
@@ -162,7 +164,7 @@ public EnvVars getEnvironment(TaskListener listener) throws IOException, Interru
         }
 
         // Allow the promotion status to contribute to build environment
-        getStatus().buildEnvVars(this, e);
+        getStatus().buildEnvVars(this, e, listener);
 
         return e;
     }
@@ -239,6 +241,21 @@ public String getUserId() {
         return User.getUnknown().getId();
     }
 
+    @Nonnull
+    @Override
+    public Run<?, ?> getPromotedRun() {
+        return getTarget();
+    }
+
+
+    @Nonnull
+    @Override
+    public Run<?, ?> getPromotionRun() {
+        return this;
+    }
+
+    //TODO: move to a default method
+    @Override
     public List<ParameterValue> getParameterValues(){
       List<ParameterValue> values=new ArrayList<ParameterValue>();
       ParametersAction parametersAction=getParametersActions(this);

src/main/java/hudson/plugins/promoted_builds/PromotionBadge.java

@@ -2,8 +2,12 @@
 
 import hudson.EnvVars;
 import hudson.model.AbstractBuild;
+import hudson.model.Run;
+import hudson.model.TaskListener;
 import org.kohsuke.stapler.export.ExportedBean;
 
+import javax.annotation.Nonnull;
+
 /**
  * Captures the information about how/when the promotion criteria is satisfied.
  *
@@ -18,11 +22,22 @@ public abstract class PromotionBadge {
     /**
      * Called by {@link Status} to allow promotion badges to contribute environment variables.
      *
-     * @param build
-     *      The calling build. Never null.
+     * @param run
+     *      The calling run.
      * @param env
      *      Environment variables should be added to this map.
      */
+    public void buildEnvVars(@Nonnull Run<?,?> run,  EnvVars env, TaskListener listener) {
+        // Default implementation when the method is not overridden
+        if (run instanceof AbstractBuild) {
+            buildEnvVars((AbstractBuild<?,?>)run, env);
+        }
+    }
+
+    /**
+     * @deprecated Use {@link #buildEnvVars(Run, EnvVars, TaskListener)}
+     */
+    @Deprecated
     public void buildEnvVars(AbstractBuild<?,?> build, EnvVars env) {
         // by default don't contribute any variables
     }

src/main/java/hudson/plugins/promoted_builds/PromotionConditionDescriptor.java

@@ -2,6 +2,10 @@
 
 import hudson.model.AbstractProject;
 import hudson.model.Descriptor;
+import hudson.model.Job;
+import hudson.model.TaskListener;
+
+import javax.annotation.Nonnull;
 
 /**
  * {@link Descriptor} for {@link PromotionCondition}.
@@ -25,5 +29,11 @@ protected PromotionConditionDescriptor() {
      * @return
      *      true to allow user to configure this promotion condition for the given project.
      */
+    public boolean isApplicable(@Nonnull Job<?,?> item,@Nonnull TaskListener listener){
+        if(item instanceof AbstractProject){
+            return isApplicable((AbstractProject)item, TaskListener.NULL);
+        }
+        return isApplicable((Job) item, listener);
+    }
     public abstract boolean isApplicable(AbstractProject<?,?> item);
 }

src/main/java/hudson/plugins/promoted_builds/Status.java

@@ -9,6 +9,8 @@
 import hudson.model.ParameterDefinition;
 import hudson.model.ParameterValue;
 import hudson.model.Result;
+import hudson.model.Run;
+import hudson.model.TaskListener;
 import hudson.plugins.promoted_builds.conditions.ManualCondition;
 import hudson.util.Iterators;
 import net.sf.json.JSONArray;
@@ -147,17 +149,29 @@ public AbstractBuild<?,?> getTarget() {
         return _parent != null ? _parent.owner : null;
     }
 
+
+
     /**
      * Called by {@link Promotion} to allow status to contribute environment variables.
      *
-     * @param build
-     *      The calling build. Never null.
+     * @param run
+     *      The calling run
      * @param env
      *      Environment variables should be added to this map.
      */
+    public void buildEnvVars(Run<?,?> run, EnvVars env, TaskListener listener) {
+        for (PromotionBadge badge : badges) {
+            badge.buildEnvVars(run, env, listener);
+        }
+    }
+
+    /**
+     * @deprecated Use {@link #buildEnvVars(Run, EnvVars, TaskListener)}
+     */
+    @Deprecated
     public void buildEnvVars(AbstractBuild<?,?> build, EnvVars env) {
         for (PromotionBadge badge : badges) {
-            badge.buildEnvVars(build, env);
+            badge.buildEnvVars(build, env, TaskListener.NULL);
         }
     }
 

src/main/java/hudson/plugins/promoted_builds/conditions/DownstreamPassCondition.java

@@ -7,19 +7,9 @@
 import hudson.Extension;
 import hudson.Util;
 import hudson.console.HyperlinkNote;
-import hudson.model.AbstractBuild;
-import hudson.model.AbstractProject;
-import hudson.model.AutoCompletionCandidates;
-import hudson.model.Cause;
+import hudson.model.*;
 import hudson.model.Cause.UpstreamCause;
-import hudson.model.Fingerprint;
 import hudson.model.Fingerprint.BuildPtr;
-import hudson.model.InvisibleAction;
-import hudson.model.Item;
-import hudson.model.ItemGroup;
-import hudson.model.Result;
-import hudson.model.Run;
-import hudson.model.TaskListener;
 import hudson.model.listeners.RunListener;
 import hudson.plugins.promoted_builds.JobPropertyImpl;
 import hudson.plugins.promoted_builds.PromotionBadge;
@@ -46,6 +36,7 @@
 import java.util.Stack;
 
 import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
 
 import org.kohsuke.stapler.export.Exported;
 
@@ -205,6 +196,13 @@ void add(AbstractBuild<?,?> b) {
 
     @Extension
     public static final class DescriptorImpl extends PromotionConditionDescriptor {
+        public boolean isApplicable(@Nonnull Job<?,?> item, @Nonnull TaskListener listener) {
+            if(item instanceof AbstractProject){
+                return isApplicable((AbstractProject)item, TaskListener.NULL);
+            }
+            return true;
+        }
+
         public boolean isApplicable(AbstractProject<?,?> item) {
             return true;
         }

src/main/java/hudson/plugins/promoted_builds/conditions/GroovyCondition.java

@@ -5,6 +5,8 @@
 import hudson.PluginManager;
 import hudson.Util;
 import hudson.model.AbstractBuild;
+import hudson.model.Run;
+import hudson.model.TaskListener;
 import hudson.plugins.promoted_builds.PromotionBadge;
 import hudson.plugins.promoted_builds.PromotionCondition;
 import hudson.plugins.promoted_builds.PromotionProcess;
@@ -130,8 +132,7 @@ public String getDisplayLabel() {
         }
 
         @Override
-        public void buildEnvVars(final AbstractBuild<?, ?> build, final EnvVars env) {
-            super.buildEnvVars(build, env);
+        public void buildEnvVars(final Run<?, ?> build, final EnvVars env, TaskListener listener) {
             for (final Map.Entry<String, String> entry :
                     variables.entrySet()) {
                 env.put(entry.getKey(), entry.getValue());

src/main/java/hudson/plugins/promoted_builds/conditions/GroovyConditionDescriptor.java

@@ -4,41 +4,53 @@
 import hudson.PluginManager;
 import hudson.PluginWrapper;
 import hudson.model.AbstractProject;
+import hudson.model.Job;
+import hudson.model.TaskListener;
 import hudson.plugins.promoted_builds.PromotionConditionDescriptor;
+import javafx.concurrent.Task;
 import jenkins.model.Jenkins;
 
+import javax.annotation.Nonnull;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
  * Declared outside GroovyCondition as it depends on the optional 'script-security' dependency
  */
 @Extension(optional = true)
-public final class GroovyConditionDescriptor extends PromotionConditionDescriptor {
+public class GroovyConditionDescriptor extends PromotionConditionDescriptor {
 
     private static final Logger LOGGER = Logger.getLogger(GroovyConditionDescriptor.class.getName());
 
     public GroovyConditionDescriptor() {
         super(GroovyCondition.class);
     }
 
-    @Override
-    public boolean isApplicable(final AbstractProject<?, ?> item) {
-        // TODO switch to Jenkins.getActiveInstance() once bumped to 1.590
-        final Jenkins jenkins = Jenkins.getInstance();
-        if (jenkins == null) {
-            // Jenkins not started or shut down
-            return false;
-        }
-        final PluginManager pluginManager = jenkins.getPluginManager();
-        if (pluginManager == null) {
-            LOGGER.log(Level.WARNING, "No PluginManager");
-            return false;
+   public boolean isApplicable(@Nonnull Job<?,?> item, TaskListener listener){
+        if(item instanceof AbstractProject){
+            return isApplicable((AbstractProject)item, TaskListener.NULL);
+        }else{
+            final Jenkins jenkins = Jenkins.getInstance();
+            if (jenkins == null) {
+                // Jenkins not started or shut down
+                return false;
+            }
+            final PluginManager pluginManager = jenkins.getPluginManager();
+            if (pluginManager == null) {
+                LOGGER.log(Level.WARNING, "No PluginManager");
+                return false;
+            }
+            final PluginWrapper plugin = pluginManager.getPlugin("script-security");
+            return plugin != null && plugin.isActive();
         }
-        final PluginWrapper plugin = pluginManager.getPlugin("script-security");
-        return plugin != null && plugin.isActive();
+
+   }
+
+   public boolean isApplicable(AbstractProject<?, ?> item) {
+        return false;
     }
 
+
     @Override
     public String getDisplayName() {
         return Messages.GroovyCondition_DisplayName();

src/main/java/hudson/plugins/promoted_builds/conditions/ManualCondition.java

@@ -2,21 +2,14 @@
 
 import hudson.EnvVars;
 import hudson.Extension;
-import hudson.model.AbstractBuild;
-import hudson.model.AbstractProject;
-import hudson.model.Descriptor;
-import hudson.model.Hudson;
-import hudson.model.InvisibleAction;
-import hudson.model.SimpleParameterDefinition;
-import hudson.model.ParameterDefinition;
-import hudson.model.ParameterValue;
-import hudson.model.User;
-import hudson.plugins.promoted_builds.PromotionPermissionHelper;
+import hudson.model.*;
+import hudson.plugins.promoted_builds.Promotion;
 import hudson.plugins.promoted_builds.PromotionBadge;
 import hudson.plugins.promoted_builds.PromotionCondition;
 import hudson.plugins.promoted_builds.PromotionConditionDescriptor;
-import hudson.plugins.promoted_builds.Promotion;
+import hudson.plugins.promoted_builds.PromotionPermissionHelper;
 import hudson.plugins.promoted_builds.PromotionProcess;
+import hudson.plugins.promoted_builds.pipeline.PromotionRun;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -36,6 +29,7 @@
 
 import javax.servlet.ServletException;
 
+import hudson.plugins.promoted_builds.pipeline.PromotionRun;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
@@ -283,23 +277,33 @@ public List<ParameterValue> getParameterValues() {
             return values != null ? values : Collections.<ParameterValue>emptyList();
         }
 
+        //TODO, TBD: Refactor API to PromotionRun ?
         @Override
-        public void buildEnvVars(AbstractBuild<?, ?> build, EnvVars env) {
-            if (!(build instanceof Promotion)) {
-                throw new IllegalStateException ("Wrong build type. Expected a Promotion, but got "+build.getClass());
+        public void buildEnvVars(Run<?, ?> run, EnvVars env, TaskListener listener) {
+            // TODO: Refactor to support Pipeline Promotion types
+            if (!(run instanceof PromotionRun)) {
+                throw new IllegalStateException ("Wrong build type. Expected a PromotionRun, but got "+run.getClass());
             }
-
-            List<ParameterValue> params = ((Promotion) build).getParameterValues();
+
+            PromotionRun promotion = (PromotionRun)run;
+            List<ParameterValue> params = ((PromotionRun) run).getParameterValues();
             if (params != null) {
                 for (ParameterValue value : params) {
-                    value.buildEnvVars(build, env);
+                    value.buildEnvironment(promotion.getPromotionRun(), env);
                 }
             }
         }
     }
 
     @Extension
     public static final class DescriptorImpl extends PromotionConditionDescriptor {
+        public boolean isApplicable(@Nonnull Job<?,?> item, @Nonnull TaskListener listener) {
+            if(item instanceof AbstractProject){
+                return isApplicable((AbstractProject)item, TaskListener.NULL);
+            }
+            return true;
+        }
+
         public boolean isApplicable(AbstractProject<?,?> item) {
             return true;
         }