jenkinsci · rsandell · May 10, 2022 · Feb 4, 2022 · Feb 4, 2022
diff --git a/src/main/java/org/jenkinsci/plugins/docker/workflow/AbstractEndpointStepExecution.java b/src/main/java/org/jenkinsci/plugins/docker/workflow/AbstractEndpointStepExecution.java
@@ -23,6 +23,7 @@
  */
 package org.jenkinsci.plugins.docker.workflow;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.EnvVars;
 import java.io.IOException;
 import java.util.logging.Level;
@@ -48,7 +49,7 @@ protected KeyMaterialFactory newKeyMaterialFactory() throws IOException, Interru
         throw new AssertionError();
     }
 
-    @Override public final void stop(Throwable cause) throws Exception {
+    @Override public final void stop(@NonNull Throwable cause) throws Exception {
         // should not need to do anything special
     }
 

diff --git a/src/main/java/org/jenkinsci/plugins/docker/workflow/DockerDSL.java b/src/main/java/org/jenkinsci/plugins/docker/workflow/DockerDSL.java
@@ -23,6 +23,7 @@
  */
 package org.jenkinsci.plugins.docker.workflow;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
 import groovy.lang.Binding;
 import hudson.Extension;
 import org.jenkinsci.plugins.workflow.cps.CpsScript;
@@ -33,10 +34,12 @@
  */
 @Extension public class DockerDSL extends GlobalVariable {
 
+    @NonNull
     @Override public String getName() {
         return "docker";
     }
 
+    @NonNull
     @Override public Object getValue(CpsScript script) throws Exception {
         Binding binding = script.getBinding();
         Object docker;

diff --git a/src/main/java/org/jenkinsci/plugins/docker/workflow/FromFingerprintStep.java b/src/main/java/org/jenkinsci/plugins/docker/workflow/FromFingerprintStep.java
@@ -26,6 +26,7 @@
 import java.util.Map;
 
 import com.google.inject.Inject;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.AbortException;
 import hudson.EnvVars;
 import hudson.Extension;
@@ -133,6 +134,7 @@ public DescriptorImpl() {
             return "dockerFingerprintFrom";
         }
 
+        @NonNull
         @Override public String getDisplayName() {
             return "Record trace of a Docker image used in FROM";
         }

diff --git a/src/main/java/org/jenkinsci/plugins/docker/workflow/ImageAction.java b/src/main/java/org/jenkinsci/plugins/docker/workflow/ImageAction.java
@@ -23,6 +23,7 @@
  */
 package org.jenkinsci.plugins.docker.workflow;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.BulkChange;
 import hudson.Extension;
 import hudson.model.InvisibleAction;
@@ -70,6 +71,7 @@ static void add(String image, Run<?,?> run) throws IOException {
 
     @Extension public static final class ExtractorImpl extends DockerImageExtractor {
 
+        @NonNull
         @Override public Collection<String> getDockerImagesUsedByJob(Job<?,?> job) {
             Run<?,?> build = job.getLastCompletedBuild();
             if (build != null) {

diff --git a/src/main/java/org/jenkinsci/plugins/docker/workflow/ImageNameTokens.java b/src/main/java/org/jenkinsci/plugins/docker/workflow/ImageNameTokens.java
@@ -23,7 +23,8 @@
  */
 package org.jenkinsci.plugins.docker.workflow;
 
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.NonNull;
+
 import java.io.Serializable;
 
 /**
@@ -43,7 +44,7 @@ public class ImageNameTokens implements Serializable {
     public final String userAndRepo;
     public final String tag;
 
-    public ImageNameTokens(@Nonnull String name) {
+    public ImageNameTokens(@NonNull String name) {
         int tagIdx = name.lastIndexOf(':');
         if (tagIdx != -1) {
             this.userAndRepo = name.substring(0, tagIdx);

diff --git a/src/main/java/org/jenkinsci/plugins/docker/workflow/RegistryEndpointStep.java b/src/main/java/org/jenkinsci/plugins/docker/workflow/RegistryEndpointStep.java
@@ -24,6 +24,8 @@
 package org.jenkinsci.plugins.docker.workflow;
 
 import com.google.common.collect.ImmutableSet;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.EnvVars;
 import hudson.Extension;
 import hudson.FilePath;
@@ -36,10 +38,9 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.TreeMap;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
 import org.jenkinsci.plugins.docker.commons.credentials.DockerRegistryEndpoint;
 import org.jenkinsci.plugins.docker.commons.credentials.KeyMaterialFactory;
 import org.jenkinsci.plugins.docker.commons.tools.DockerTool;
@@ -53,18 +54,19 @@
 
 public class RegistryEndpointStep extends Step {
 
-    private final @Nonnull DockerRegistryEndpoint registry;
+    private final @NonNull DockerRegistryEndpoint registry;
     private @CheckForNull String toolName;
 
-    @DataBoundConstructor public RegistryEndpointStep(@Nonnull DockerRegistryEndpoint registry) {
-        assert registry != null;
-        this.registry = registry;
+    @DataBoundConstructor public RegistryEndpointStep(@NonNull DockerRegistryEndpoint registry) {
+        this.registry = Objects.requireNonNull(registry, "registry must not be null");;
     }
-
+
+    @NonNull
     public DockerRegistryEndpoint getRegistry() {
         return registry;
     }
 
+    @CheckForNull
     public String getToolName() {
         return toolName;
     }
@@ -111,6 +113,7 @@ public static class Execution extends AbstractEndpointStepExecution {
             return "withDockerRegistry";
         }
 
+        @NonNull
         @Override public String getDisplayName() {
             return "Sets up Docker registry endpoint";
         }

diff --git a/src/main/java/org/jenkinsci/plugins/docker/workflow/RunFingerprintStep.java b/src/main/java/org/jenkinsci/plugins/docker/workflow/RunFingerprintStep.java
@@ -23,6 +23,7 @@
  */
 package org.jenkinsci.plugins.docker.workflow;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
 import org.jenkinsci.plugins.docker.workflow.client.DockerClient;
 import com.google.inject.Inject;
 import hudson.EnvVars;
@@ -98,6 +99,7 @@ public DescriptorImpl() {
             return "dockerFingerprintRun";
         }
 
+        @NonNull
         @Override public String getDisplayName() {
             return "Record trace of a Docker image run in a container";
         }

diff --git a/src/main/java/org/jenkinsci/plugins/docker/workflow/ServerEndpointStep.java b/src/main/java/org/jenkinsci/plugins/docker/workflow/ServerEndpointStep.java
@@ -24,12 +24,13 @@
 package org.jenkinsci.plugins.docker.workflow;
 
 import com.google.common.collect.ImmutableSet;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.Extension;
 import hudson.FilePath;
 import hudson.model.Run;
 import java.io.IOException;
+import java.util.Objects;
 import java.util.Set;
-import javax.annotation.Nonnull;
 import org.jenkinsci.plugins.docker.commons.credentials.DockerServerEndpoint;
 import org.jenkinsci.plugins.docker.commons.credentials.KeyMaterialFactory;
 import org.jenkinsci.plugins.workflow.steps.Step;
@@ -40,13 +41,13 @@
 
 public class ServerEndpointStep extends Step {
 
-    private final @Nonnull DockerServerEndpoint server;
+    private final @NonNull DockerServerEndpoint server;
 
-    @DataBoundConstructor public ServerEndpointStep(@Nonnull DockerServerEndpoint server) {
-        assert server != null;
-        this.server = server;
+    @DataBoundConstructor public ServerEndpointStep(@NonNull DockerServerEndpoint server) {
+        this.server = Objects.requireNonNull(server, "server must not be null");;
     }
-
+
+    @NonNull
     public DockerServerEndpoint getServer() {
         return server;
     }
@@ -86,6 +87,7 @@ public static class Execution extends AbstractEndpointStepExecution {
             return "withDockerServer";
         }
 
+        @NonNull
         @Override public String getDisplayName() {
             return "Sets up Docker server endpoint";
         }

diff --git a/src/main/java/org/jenkinsci/plugins/docker/workflow/WithContainerStep.java b/src/main/java/org/jenkinsci/plugins/docker/workflow/WithContainerStep.java
@@ -25,6 +25,8 @@
 
 import com.google.common.base.Optional;
 import com.google.inject.Inject;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.AbortException;
 import hudson.EnvVars;
 import hudson.Extension;
@@ -63,8 +65,6 @@
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
 
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.Serializable;
@@ -77,14 +77,15 @@
 public class WithContainerStep extends AbstractStepImpl {
 
     private static final Logger LOGGER = Logger.getLogger(WithContainerStep.class.getName());
-    private final @Nonnull String image;
+    private final @NonNull String image;
     private String args;
     private String toolName;
 
-    @DataBoundConstructor public WithContainerStep(@Nonnull String image) {
+    @DataBoundConstructor public WithContainerStep(@NonNull String image) {
         this.image = image;
     }
-
+
+    @NonNull
     public String getImage() {
         return image;
     }
@@ -228,7 +229,7 @@ private static FilePath tempDir(FilePath ws) {
             return ws.sibling(ws.getName() + System.getProperty(WorkspaceList.class.getName(), "@") + "tmp");
         }
 
-        @Override public void stop(@Nonnull Throwable cause) throws Exception {
+        @Override public void stop(@NonNull Throwable cause) throws Exception {
             if (container != null) {
                 LOGGER.log(Level.FINE, "stopping container " + container, cause);
                 destroy(container, launcher, getContext().get(Node.class), env, toolName);
@@ -247,7 +248,7 @@ private static class Decorator extends LauncherDecorator implements Serializable
         private final boolean hasEnv;
         private final boolean hasWorkdir;
 
-        Decorator(String container, EnvVars envHost, String ws, String toolName, VersionNumber dockerVersion) {
+        Decorator(String container, EnvVars envHost, String ws, @CheckForNull String toolName, VersionNumber dockerVersion) {
             this.container = container;
             this.envHost = Util.mapToEnv(envHost);
             this.ws = ws;
@@ -256,7 +257,8 @@ private static class Decorator extends LauncherDecorator implements Serializable
             this.hasWorkdir = dockerVersion != null && dockerVersion.compareTo(new VersionNumber("17.12")) >= 0;
         }
 
-        @Override public Launcher decorate(final Launcher launcher, final Node node) {
+        @NonNull
+        @Override public Launcher decorate(@NonNull final Launcher launcher, @NonNull final Node node) {
             return new Launcher.DecoratedLauncher(launcher) {
                 @Override public Proc launch(Launcher.ProcStarter starter) throws IOException {
                     String executable;
@@ -414,6 +416,7 @@ public DescriptorImpl() {
             return "withDockerContainer";
         }
 
+        @NonNull
         @Override public String getDisplayName() {
             return "Run build steps inside a Docker container";
         }

diff --git a/src/main/java/org/jenkinsci/plugins/docker/workflow/client/ControlGroup.java b/src/main/java/org/jenkinsci/plugins/docker/workflow/client/ControlGroup.java
@@ -8,8 +8,6 @@
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;