Fixing build issues

- Fixing haphazard changes to Docker.groovy
- Fixing FindBugs issue with annotations on WindowsDockerClient.launch()

Author: rbutcher

src/main/java/org/jenkinsci/plugins/docker/workflow/client/WindowsDockerClient.java

@@ -106,7 +106,7 @@ public Optional<String> getContainerIdIfContainerized() throws IOException, Inte
     private LaunchResult launch(@Nonnull EnvVars env, boolean quiet, FilePath workDir, String... args) throws IOException, InterruptedException {
         return launch(env, quiet, workDir, new ArgumentListBuilder(args));
     }
-    private LaunchResult launch(@CheckForNull @Nonnull EnvVars env, boolean quiet, FilePath workDir, ArgumentListBuilder argb) throws IOException, InterruptedException {
+    private LaunchResult launch(@Nonnull EnvVars env, boolean quiet, FilePath workDir, ArgumentListBuilder argb) throws IOException, InterruptedException {
         if (LOGGER.isLoggable(Level.FINE)) {
             LOGGER.log(Level.FINE, "Executing command \"{0}\"", argb);
         }

src/main/resources/org/jenkinsci/plugins/docker/workflow/Docker.groovy

@@ -113,11 +113,11 @@ class Docker implements Serializable {
         public <V> V inside(String args = '', Closure<V> body) {
             docker.node {
                 def toRun = imageName()
-                if (toRun != id && docker.script."${shell()}"(script: "docker inspect -f . ${id}", returnStatus: true) == 0) {
+                if (toRun != id && docker.script."${docker.shell()}"(script: "docker inspect -f . ${id}", returnStatus: true) == 0) {
                     // Can run it without registry prefix, because it was locally built.
                     toRun = id
                 } else {
-                    if (docker.script."${shell()}"(script: "docker inspect -f . ${toRun}", returnStatus: true) != 0) {
+                    if (docker.script."${docker.shell()}"(script: "docker inspect -f . ${toRun}", returnStatus: true) != 0) {
                         // Not yet present locally.
                         // withDockerContainer requires the image to be available locally, since its start phase is not a durable task.
                         pull()
@@ -131,13 +131,13 @@ class Docker implements Serializable {
 
         public void pull() {
             docker.node {
-                docker.script."${shell()}" "docker pull ${imageName()}"
+                docker.script."${docker.shell()}" "docker pull ${imageName()}"
             }
         }
 
         public Container run(String args = '', String command = "") {
             docker.node {
-                def container = docker.script."${shell()}"(script: "docker run -d${args != '' ? ' ' + args : ''} ${id}${command != '' ? ' ' + command : ''}", returnStdout: true).trim()
+                def container = docker.script."${docker.shell()}"(script: "docker run -d${args != '' ? ' ' + args : ''} ${id}${command != '' ? ' ' + command : ''}", returnStdout: true).trim()
                 new Container(docker, container)
             }
         }
@@ -156,7 +156,7 @@ class Docker implements Serializable {
         public void tag(String tagName = parsedId.tag, boolean force = true) {
             docker.node {
                 def taggedImageName = toQualifiedImageName(parsedId.userAndRepo + ':' + tagName)
-                docker.script."${shell()}" "docker tag ${id} ${taggedImageName}"
+                docker.script."${docker.shell()}" "docker tag ${id} ${taggedImageName}"
                 return taggedImageName;
             }
         }
@@ -166,7 +166,7 @@ class Docker implements Serializable {
                 // The image may have already been tagged, so the tagging may be a no-op.
                 // That's ok since tagging is cheap.
                 def taggedImageName = tag(tagName, force)
-                docker.script."${shell()}" "docker push ${taggedImageName}"
+                docker.script."${docker.shell()}" "docker push ${taggedImageName}"
             }
         }
 
@@ -183,11 +183,11 @@ class Docker implements Serializable {
         }
 
         public void stop() {
-            docker.script."${shell()}" "docker stop ${id} && docker rm -f ${id}"
+            docker.script."${docker.shell()}" "docker stop ${id} && docker rm -f ${id}"
         }
 
         public String port(int port) {
-            docker.script."${shell()}"(script: "docker port ${id} ${port}", returnStdout: true).trim()
+            docker.script."${docker.shell()}"(script: "docker port ${id} ${port}", returnStdout: true).trim()
         }
     }