Avoid excessive Closures (#1131)

Author: jglick

pom.xml

@@ -35,7 +35,9 @@
     <revision>1.9.1</revision>
     <changelist>-SNAPSHOT</changelist>
     <jenkins.baseline>2.479</jenkins.baseline>
-    <jenkins.version>${jenkins.baseline}.1</jenkins.version>
+    <jenkins.version>${jenkins.baseline}.3</jenkins.version>
+    <!-- TODO until in BOM -->
+    <pipeline-model-definition.version>2.2234.v4a_b_13b_8cd590</pipeline-model-definition.version>
     <gitHubRepo>jenkinsci/docker-plugin</gitHubRepo>
     <!-- Our unit-tests that talk to a real docker deamon aren't very stable -->
     <surefire.rerunFailingTestsCount>3</surefire.rerunFailingTestsCount>
@@ -50,10 +52,36 @@
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
         <artifactId>bom-${jenkins.baseline}.x</artifactId>
-        <version>4051.v78dce3ce8b_d6</version>
+        <version>4228.v0a_71308d905b_</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>org.jenkinsci.plugins</groupId>
+        <artifactId>pipeline-model-api</artifactId>
+        <version>${pipeline-model-definition.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.jenkinsci.plugins</groupId>
+        <artifactId>pipeline-model-definition</artifactId>
+        <version>${pipeline-model-definition.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.jenkinsci.plugins</groupId>
+        <artifactId>pipeline-model-definition</artifactId>
+        <version>${pipeline-model-definition.version}</version>
+        <classifier>tests</classifier>
+      </dependency>
+      <dependency>
+        <groupId>org.jenkinsci.plugins</groupId>
+        <artifactId>pipeline-model-extensions</artifactId>
+        <version>${pipeline-model-definition.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.jenkinsci.plugins</groupId>
+        <artifactId>pipeline-stage-tags-metadata</artifactId>
+        <version>${pipeline-model-definition.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 

src/main/resources/io/jenkins/docker/pipeline/DockerAgentScript.groovy

@@ -2,26 +2,24 @@ package io.jenkins.docker.pipeline
 
 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
 import org.jenkinsci.plugins.pipeline.modeldefinition.agent.CheckoutScript
-import org.jenkinsci.plugins.pipeline.modeldefinition.agent.DeclarativeAgentScript
+import org.jenkinsci.plugins.pipeline.modeldefinition.agent.DeclarativeAgentScript2
 import org.jenkinsci.plugins.workflow.cps.CpsScript
 
-class DockerAgentScript extends DeclarativeAgentScript<DockerAgent> {
+class DockerAgentScript extends DeclarativeAgentScript2<DockerAgent> {
 
     DockerAgentScript(CpsScript s, DockerAgent a) {
         super(s, a)
     }
 
     @Override
-    Closure run(Closure body) {
-        return {
-            try {
-                script.dockerNode(describable.asArgs) {
-                    CheckoutScript.doCheckout(script, describable, null, body).call()
-                }
-            } catch (Exception e) {
-                script.getProperty("currentBuild").result = Utils.getResultFromException(e)
-                throw e
+    void run(Closure body) {
+        try {
+            script.dockerNode(describable.asArgs) {
+                CheckoutScript.doCheckout2(script, describable, null, body)
             }
+        } catch (Exception e) {
+            script.getProperty("currentBuild").result = Utils.getResultFromException(e)
+            throw e
         }
     }