Add missing annotations

Author: offa

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
     }
 

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;

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";
         }

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) {

src/main/java/org/jenkinsci/plugins/docker/workflow/RegistryEndpointStep.java

@@ -38,6 +38,7 @@
 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 org.jenkinsci.plugins.docker.commons.credentials.DockerRegistryEndpoint;
@@ -57,14 +58,15 @@ public class RegistryEndpointStep extends Step {
     private @CheckForNull String toolName;
 
     @DataBoundConstructor public RegistryEndpointStep(@NonNull DockerRegistryEndpoint registry) {
-        assert registry != null;
-        this.registry = 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";
         }

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";
         }

src/main/java/org/jenkinsci/plugins/docker/workflow/ServerEndpointStep.java

@@ -29,6 +29,7 @@
 import hudson.FilePath;
 import hudson.model.Run;
 import java.io.IOException;
+import java.util.Objects;
 import java.util.Set;
 import org.jenkinsci.plugins.docker.commons.credentials.DockerServerEndpoint;
 import org.jenkinsci.plugins.docker.commons.credentials.KeyMaterialFactory;
@@ -43,10 +44,10 @@ public class ServerEndpointStep extends Step {
     private final @NonNull DockerServerEndpoint server;
 
     @DataBoundConstructor public ServerEndpointStep(@NonNull DockerServerEndpoint server) {
-        assert server != null;
-        this.server = 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";
         }

src/main/java/org/jenkinsci/plugins/docker/workflow/WithContainerStep.java

@@ -84,7 +84,8 @@ public class WithContainerStep extends AbstractStepImpl {
     @DataBoundConstructor public WithContainerStep(@NonNull String image) {
         this.image = image;
     }
-    
+
+    @NonNull
     public String getImage() {
         return image;
     }
@@ -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";
         }

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;

src/test/java/org/jenkinsci/plugins/docker/workflow/RegistryEndpointStepTest.java

@@ -37,8 +37,6 @@
 import hudson.model.Node;
 import hudson.model.Result;
 import hudson.model.User;
-import hudson.security.ACL;
-import hudson.security.ACLContext;
 import jenkins.model.Jenkins;
 import jenkins.security.QueueItemAuthenticatorConfiguration;
 import org.acegisecurity.Authentication;
@@ -210,7 +208,8 @@ public void stop(@NonNull Throwable throwable) {
         }
         private static class Decorator extends LauncherDecorator implements Serializable {
             private static final long serialVersionUID = 1;
-            @Override public Launcher decorate(Launcher launcher, Node node) {
+            @NonNull
+            @Override public Launcher decorate(@NonNull Launcher launcher, @NonNull Node node) {
                 return launcher.decorateByPrefix("echo");
             }
         }
@@ -224,6 +223,7 @@ public Set<? extends Class<?>> getRequiredContext() {
             @Override public String getFunctionName() {
                 return "mockDockerLoginWithEcho";
             }
+            @NonNull
             @Override public String getDisplayName() {
                 return "Mock Docker Login with Echo";
             }