Merge pull request #213 from MarkEWaite/fix-jsr-305

Replace JSR-305 annotations with spotbugs annotations
jenkinsci · May 8, 2024 · d974fc9 · d974fc9
2 parents 695802c + 862ba6b
commit d974fc9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/ansible/AnsibleAdHocCommandBuilder.java b/src/main/java/org/jenkinsci/plugins/ansible/AnsibleAdHocCommandBuilder.java
@@ -18,6 +18,7 @@
 import com.cloudbees.plugins.credentials.CredentialsProvider;
 import com.cloudbees.plugins.credentials.common.StandardCredentials;
 import com.cloudbees.plugins.credentials.common.StandardUsernameCredentials;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.AbortException;
 import hudson.EnvVars;
@@ -33,7 +34,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
-import javax.annotation.Nonnull;
 import jenkins.tasks.SimpleBuildStep;
 import org.apache.commons.lang.StringUtils;
 import org.kohsuke.stapler.DataBoundConstructor;
@@ -227,7 +227,7 @@ public void setExtraVars(List<ExtraVar> extraVars) {
 
     @Override
     public void perform(
-            @Nonnull Run<?, ?> run, @Nonnull FilePath ws, @Nonnull Launcher launcher, @Nonnull TaskListener listener)
+            @NonNull Run<?, ?> run, @NonNull FilePath ws, @NonNull Launcher launcher, @NonNull TaskListener listener)
             throws InterruptedException, IOException {
         try {
             CLIRunner runner = new CLIRunner(run, ws, launcher, listener);

diff --git a/src/main/java/org/jenkinsci/plugins/ansible/AnsiblePlaybookBuilder.java b/src/main/java/org/jenkinsci/plugins/ansible/AnsiblePlaybookBuilder.java
@@ -18,6 +18,7 @@
 import com.cloudbees.plugins.credentials.CredentialsProvider;
 import com.cloudbees.plugins.credentials.common.StandardCredentials;
 import com.cloudbees.plugins.credentials.common.StandardUsernameCredentials;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.AbortException;
 import hudson.EnvVars;
@@ -35,7 +36,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
-import javax.annotation.Nonnull;
 import jenkins.tasks.SimpleBuildStep;
 import org.apache.commons.lang.StringUtils;
 import org.kohsuke.stapler.DataBoundConstructor;
@@ -266,7 +266,7 @@ public void setExtraVars(List<ExtraVar> extraVars) {
 
     @Override
     public void perform(
-            @Nonnull Run<?, ?> run, @Nonnull FilePath ws, @Nonnull Launcher launcher, @Nonnull TaskListener listener)
+            @NonNull Run<?, ?> run, @NonNull FilePath ws, @NonNull Launcher launcher, @NonNull TaskListener listener)
             throws InterruptedException, IOException {
         Computer computer = ws.toComputer();
         Node node;
@@ -277,11 +277,11 @@ public void perform(
     }
 
     public void perform(
-            @Nonnull Run<?, ?> run,
-            @Nonnull Node node,
-            @Nonnull FilePath ws,
-            @Nonnull Launcher launcher,
-            @Nonnull TaskListener listener,
+            @NonNull Run<?, ?> run,
+            @NonNull Node node,
+            @NonNull FilePath ws,
+            @NonNull Launcher launcher,
+            @NonNull TaskListener listener,
             EnvVars envVars)
             throws InterruptedException, IOException {
         try {

diff --git a/src/main/java/org/jenkinsci/plugins/ansible/AnsibleVaultBuilder.java b/src/main/java/org/jenkinsci/plugins/ansible/AnsibleVaultBuilder.java
@@ -15,6 +15,7 @@
 
 import com.cloudbees.plugins.credentials.CredentialsProvider;
 import com.cloudbees.plugins.credentials.common.StandardCredentials;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.AbortException;
 import hudson.EnvVars;
@@ -31,7 +32,6 @@
 import hudson.util.FormValidation;
 import java.io.File;
 import java.io.IOException;
-import javax.annotation.Nonnull;
 import jenkins.tasks.SimpleBuildStep;
 import org.apache.commons.lang.StringUtils;
 import org.kohsuke.stapler.DataBoundConstructor;
@@ -114,7 +114,7 @@ public void setOutput(String output) {
 
     @Override
     public void perform(
-            @Nonnull Run<?, ?> run, @Nonnull FilePath ws, @Nonnull Launcher launcher, @Nonnull TaskListener listener)
+            @NonNull Run<?, ?> run, @NonNull FilePath ws, @NonNull Launcher launcher, @NonNull TaskListener listener)
             throws InterruptedException, IOException {
         Computer computer = ws.toComputer();
         Node node;
@@ -125,11 +125,11 @@ public void perform(
     }
 
     public void perform(
-            @Nonnull Run<?, ?> run,
-            @Nonnull Node node,
-            @Nonnull FilePath ws,
-            @Nonnull Launcher launcher,
-            @Nonnull TaskListener listener,
+            @NonNull Run<?, ?> run,
+            @NonNull Node node,
+            @NonNull FilePath ws,
+            @NonNull Launcher launcher,
+            @NonNull TaskListener listener,
             EnvVars envVars)
             throws InterruptedException, IOException {
         try {