Merge pull request #67 from basil/jsr305

EOL JSR 305
jenkinsci · Jan 3, 2022 · d7de486 · d7de486
2 parents ac25576 + b9998f0
commit d7de486
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/workflow/support/steps/input/ApproverAction.java b/src/main/java/org/jenkinsci/plugins/workflow/support/steps/input/ApproverAction.java
@@ -31,7 +31,7 @@
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
 
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 
 /**
  * @author Valentina Armenise
@@ -44,7 +44,7 @@ public ApproverAction(String userId) {
         this.userId = userId;
     }
 
-    @Nonnull
+    @NonNull
     final private String userId;
 
     @Exported

diff --git a/src/main/java/org/jenkinsci/plugins/workflow/support/steps/input/InputAction.java b/src/main/java/org/jenkinsci/plugins/workflow/support/steps/input/InputAction.java
@@ -13,7 +13,7 @@
 import java.util.concurrent.TimeoutException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import org.jenkinsci.plugins.workflow.flow.FlowExecution;
 import org.jenkinsci.plugins.workflow.flow.FlowExecutionList;
 import org.jenkinsci.plugins.workflow.steps.StepExecution;
@@ -120,7 +120,7 @@ public String getUrlName() {
         return "input";
     }
 
-    public synchronized void add(@Nonnull InputStepExecution step) throws IOException, InterruptedException, TimeoutException {
+    public synchronized void add(@NonNull InputStepExecution step) throws IOException, InterruptedException, TimeoutException {
         loadExecutions();
         if (executions == null) {
             throw new IOException("cannot load state");

diff --git a/src/main/java/org/jenkinsci/plugins/workflow/support/steps/input/InputStepExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/support/steps/input/InputStepExecution.java
@@ -37,7 +37,7 @@
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.interceptor.RequirePOST;
 
-import javax.annotation.CheckForNull;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
 import javax.servlet.ServletException;
 import java.io.IOException;
 import java.util.Collections;

diff --git a/src/main/java/org/jenkinsci/plugins/workflow/support/steps/input/InputSubmittedAction.java b/src/main/java/org/jenkinsci/plugins/workflow/support/steps/input/InputSubmittedAction.java
@@ -26,8 +26,8 @@
 
 import org.jenkinsci.plugins.workflow.actions.PersistentAction;
 
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -50,7 +50,7 @@ public InputSubmittedAction(String approver, @CheckForNull Map<String,Object> pa
         }
     }
 
-    @Nonnull
+    @NonNull
     public Map<String,Object> getParameters() {
         return parameters;
     }

diff --git a/src/main/java/org/jenkinsci/plugins/workflow/support/steps/input/Rejection.java b/src/main/java/org/jenkinsci/plugins/workflow/support/steps/input/Rejection.java
@@ -1,7 +1,7 @@
 package org.jenkinsci.plugins.workflow.support.steps.input;
 
 import hudson.model.User;
-import javax.annotation.CheckForNull;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
 import jenkins.model.CauseOfInterruption;
 import org.kohsuke.stapler.export.Exported;
 

diff --git a/src/test/java/org/jenkinsci/plugins/workflow/support/steps/input/InputStepTest.java b/src/test/java/org/jenkinsci/plugins/workflow/support/steps/input/InputStepTest.java
@@ -75,7 +75,7 @@
 
 import org.jvnet.hudson.test.MockAuthorizationStrategy;
 
-import javax.annotation.Nullable;
+import edu.umd.cs.findbugs.annotations.Nullable;
 
 /**
  * @author Kohsuke Kawaguchi