Fix deprecations, avoid @Inject

Author: jglick

plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/LoadStep.java

@@ -1,16 +1,21 @@
 package org.jenkinsci.plugins.workflow.cps.steps;
 
 import hudson.Extension;
-import org.jenkinsci.plugins.workflow.steps.AbstractStepDescriptorImpl;
-import org.jenkinsci.plugins.workflow.steps.AbstractStepImpl;
+import hudson.FilePath;
+import hudson.model.TaskListener;
+import java.util.Set;
+import org.jenkinsci.plugins.workflow.steps.Step;
+import org.jenkinsci.plugins.workflow.steps.StepContext;
+import org.jenkinsci.plugins.workflow.steps.StepDescriptor;
+import org.jenkinsci.plugins.workflow.steps.StepExecution;
 import org.kohsuke.stapler.DataBoundConstructor;
 
 /**
  * Evaluate arbitrary script file.
  *
  * @author Kohsuke Kawaguchi
  */
-public class LoadStep extends AbstractStepImpl {
+public class LoadStep extends Step {
     /**
      * Relative path of the script within the current workspace.
      */
@@ -25,11 +30,13 @@ public String getPath() {
         return path;
     }
 
+    @Override
+    public StepExecution start(StepContext context) throws Exception {
+        return new LoadStepExecution(this, context);
+    }
+
     @Extension
-    public static class DescriptorImpl extends AbstractStepDescriptorImpl {
-        public DescriptorImpl() {
-            super(LoadStepExecution.class);
-        }
+    public static class DescriptorImpl extends StepDescriptor {
 
         @Override
         public String getFunctionName() {
@@ -40,6 +47,11 @@ public String getFunctionName() {
         public String getDisplayName() {
             return "Evaluate a Groovy source file into the Pipeline script";
         }
+
+        @Override
+        public Set<? extends Class<?>> getRequiredContext() {
+            return Set.of(FilePath.class, TaskListener.class);
+        }
     }
 
 }

plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/LoadStepExecution.java

@@ -1,6 +1,5 @@
 package org.jenkinsci.plugins.workflow.cps.steps;
 
-import com.google.inject.Inject;
 import groovy.lang.Script;
 import hudson.FilePath;
 import hudson.model.TaskListener;
@@ -12,26 +11,27 @@
 import org.jenkinsci.plugins.workflow.cps.replay.ReplayAction;
 import org.jenkinsci.plugins.workflow.steps.AbstractStepExecutionImpl;
 import org.jenkinsci.plugins.workflow.steps.BodyExecutionCallback;
-import org.jenkinsci.plugins.workflow.steps.StepContextParameter;
+import org.jenkinsci.plugins.workflow.steps.StepContext;
 
 /**
  * Loads another Groovy script file and executes it.
  *
  * @author Kohsuke Kawaguchi
  */
 public class LoadStepExecution extends AbstractStepExecutionImpl {
-    @StepContextParameter
-    private transient FilePath cwd;
 
-    @Inject(optional=true)
     private transient LoadStep step;
 
-    @StepContextParameter
-    private transient TaskListener listener;
+    LoadStepExecution(LoadStep step, StepContext context) {
+        super(context);
+        this.step = step;
+    }
 
     @Override
     public boolean start() throws Exception {
         CpsStepContext cps = (CpsStepContext) getContext();
+        FilePath cwd = cps.get(FilePath.class);
+        TaskListener listener = cps.get(TaskListener.class);
         CpsThread t = CpsThread.current();
 
         CpsFlowExecution execution = t.getExecution();
@@ -62,6 +62,11 @@ public boolean start() throws Exception {
         return false;
     }
 
+    @Override
+    public void onResume() {
+        // do nothing
+    }
+
     private static final long serialVersionUID = 1L;
 
 }