jenkinsci · rsandell · Apr 29, 2022 · Feb 15, 2022
diff --git a/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/GerritManagement.java b/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/GerritManagement.java
@@ -57,7 +57,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.CheckForNull;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
 import javax.servlet.ServletException;
 import java.io.IOException;
 import java.net.URLDecoder;

diff --git a/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/PluginImpl.java b/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/PluginImpl.java
@@ -71,8 +71,8 @@
 
 import jenkins.model.Jenkins;
 
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 
 /**
  * Main Plugin entrance.
@@ -189,7 +189,7 @@ public List<GerritServer> getServers() {
      *
      * @return the list of GerritServers
      */
-    @Nonnull
+    @NonNull
     //CS IGNORE MethodName FOR NEXT 1 LINES. REASON: Static equivalent marker.
     public static List<GerritServer> getServers_() {
         PluginImpl plugin = getInstance();
@@ -219,7 +219,7 @@ public List<String> getServerNames() {
      *
      * @return the list of server names.
      */
-    @Nonnull
+    @NonNull
     //CS IGNORE MethodName FOR NEXT 1 LINES. REASON: Static equivalent marker.
     public static List<String> getServerNames_() {
         PluginImpl plugin = getInstance();
@@ -473,7 +473,7 @@ protected XmlFile getConfigFile() {
      *
      * @return gerritEventManager
      */
-    @Nonnull
+    @NonNull
     public GerritHandler getHandler() {
         if (gerritEventManager == null) {
             throw new IllegalStateException("Plugin is not started yet, or it is stopped already");
@@ -523,7 +523,7 @@ public List<Job> getConfiguredJobs(String serverName) {
      * @param serverName the name of the Gerrit server.
      * @return the list of jobs configured with this server.
      */
-    @Nonnull
+    @NonNull
     //CS IGNORE MethodName FOR NEXT 1 LINES. REASON: Static equivalent marker.
     public static List<Job> getConfiguredJobs_(String serverName) {
         PluginImpl plugin = getInstance();

diff --git a/...n/java/com/sonyericsson/hudson/plugins/gerrit/trigger/config/GerritJcascConfigurator.java b/...n/java/com/sonyericsson/hudson/plugins/gerrit/trigger/config/GerritJcascConfigurator.java
@@ -40,7 +40,7 @@
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
@@ -72,7 +72,7 @@ protected PluginImpl instance(Mapping mapping, ConfigurationContext configuratio
     }
 
     @Override
-    @Nonnull
+    @NonNull
     public String getName() {
         return PluginImpl.SYMBOL_NAME;
     }

diff --git a/...ava/com/sonyericsson/hudson/plugins/gerrit/trigger/dependency/GerritDependencyAction.java b/...ava/com/sonyericsson/hudson/plugins/gerrit/trigger/dependency/GerritDependencyAction.java
@@ -6,15 +6,15 @@
 import hudson.model.InvisibleAction;
 import hudson.model.Run;
 
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * Adds Action that stores the data about dependency jobs.
  */
 public class GerritDependencyAction extends InvisibleAction implements EnvironmentContributingAction {
-    @Nonnull
+    @NonNull
     private final List<String> deps;
 
     /**
@@ -37,7 +37,7 @@ public GerritDependencyAction(List<Run> runs) {
      *  @param env Environment variables should be added to this map.
      */
     @SuppressWarnings("unused")
-    public void buildEnvironment(@Nonnull Run<?, ?> run, @Nonnull EnvVars env) {
+    public void buildEnvironment(@NonNull Run<?, ?> run, @NonNull EnvVars env) {
         fillEnv(env);
     }
 

diff --git a/...in/java/com/sonyericsson/hudson/plugins/gerrit/trigger/diagnostics/BuildMemoryReport.java b/...in/java/com/sonyericsson/hudson/plugins/gerrit/trigger/diagnostics/BuildMemoryReport.java
@@ -31,7 +31,7 @@
 import com.sonymobile.tools.gerrit.gerritevents.dto.events.RefUpdated;
 import hudson.model.ModelObject;
 
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -178,19 +178,19 @@ public void clear() {
     }
 
     @Override
-    @Nonnull
+    @NonNull
     public Set<GerritTriggeredEvent> keySet() {
         return internal.keySet();
     }
 
     @Override
-    @Nonnull
+    @NonNull
     public Collection<List<BuildMemory.MemoryImprint.Entry>> values() {
         return internal.values();
     }
 
     @Override
-    @Nonnull
+    @NonNull
     public Set<Entry<GerritTriggeredEvent, List<BuildMemory.MemoryImprint.Entry>>> entrySet() {
         return internal.entrySet();
     }

diff --git a/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/diagnostics/Diagnostics.java b/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/diagnostics/Diagnostics.java
@@ -46,8 +46,8 @@
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
 
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import java.io.IOException;
 import java.util.Date;
 import java.util.List;
@@ -115,7 +115,7 @@ private String makeRelativeUrl(String context, String name) {
      *
      * @return the permission
      */
-    @Nonnull
+    @NonNull
     public static Permission getRequiredPermission() {
         return Jenkins.ADMINISTER;
     }

diff --git a/...java/com/sonyericsson/hudson/plugins/gerrit/trigger/diagnostics/EventListenersReport.java b/...java/com/sonyericsson/hudson/plugins/gerrit/trigger/diagnostics/EventListenersReport.java
@@ -34,7 +34,7 @@
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 
-import javax.annotation.CheckForNull;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
 import java.util.Comparator;
 import java.util.LinkedHashSet;
 import java.util.Set;

diff --git a/...va/com/sonyericsson/hudson/plugins/gerrit/trigger/gerritnotifier/ToGerritRunListener.java b/...va/com/sonyericsson/hudson/plugins/gerrit/trigger/gerritnotifier/ToGerritRunListener.java
@@ -52,9 +52,9 @@
 
 import jenkins.model.Jenkins;
 
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
+import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
 
 /**
  * The Big RunListener in charge of coordinating build results and reporting back to Gerrit.
@@ -98,7 +98,7 @@ public static ToGerritRunListener getInstance() {
      * @param r         the build.
      * @param customUrl the URL.
      */
-    public void setBuildCustomUrl(@Nonnull Run r, @Nonnull String customUrl) {
+    public void setBuildCustomUrl(@NonNull Run r, @NonNull String customUrl) {
         GerritCause cause = getCause(r);
         if (cause != null) {
             cleanUpGerritCauses(cause, r);
@@ -112,7 +112,7 @@ public void setBuildCustomUrl(@Nonnull Run r, @Nonnull String customUrl) {
      * @param r                   the build that caused the failure.
      * @param unsuccessfulMessage the unsuccessful message
      */
-    public void setBuildUnsuccessfulMessage(@Nonnull Run r, @Nonnull String unsuccessfulMessage) {
+    public void setBuildUnsuccessfulMessage(@NonNull Run r, @NonNull String unsuccessfulMessage) {
         GerritCause cause = getCause(r);
         if (cause != null) {
             cleanUpGerritCauses(cause, r);
@@ -121,7 +121,7 @@ public void setBuildUnsuccessfulMessage(@Nonnull Run r, @Nonnull String unsucces
     }
 
     @Override
-    public synchronized void onCompleted(@Nonnull Run r, @Nonnull TaskListener listener) {
+    public synchronized void onCompleted(@NonNull Run r, @NonNull TaskListener listener) {
         GerritCause cause = getCause(r);
         logger.debug("Completed. Build: {} Cause: {}", r, cause);
         if (cause != null) {
@@ -170,7 +170,7 @@ public synchronized void onCompleted(@Nonnull Run r, @Nonnull TaskListener liste
      * @return the report.
      * @see com.sonyericsson.hudson.plugins.gerrit.trigger.diagnostics.Diagnostics
      */
-    @Nonnull
+    @NonNull
     public synchronized BuildMemoryReport report() {
         return memory.report();
     }
@@ -454,8 +454,8 @@ private GerritCause getCause(Run build) {
      * @throws IOException if an error occurs while reading the workspace
      * @throws InterruptedException if an error occurs while reading the workspace
      */
-    @Nonnull
-    protected FilePath[] getMatchingWorkspaceFiles(@Nullable FilePath ws, @Nonnull String filepath)
+    @NonNull
+    protected FilePath[] getMatchingWorkspaceFiles(@Nullable FilePath ws, @NonNull String filepath)
             throws IOException, InterruptedException {
         if (ws == null) {
             return new FilePath[0];
@@ -492,7 +492,7 @@ protected String getExpandedContent(FilePath path, EnvVars envVars) throws IOExc
      * @throws InterruptedException If interrupted while working with the {@link FilePath} or {@link EnvVars Environment}
      */
     private String obtainUnsuccessfulMessage(@Nullable GerritTriggeredEvent event,
-                                             @Nonnull Run build,
+                                             @NonNull Run build,
                                              @Nullable TaskListener listener)
             throws IOException, InterruptedException {
         Job project = build.getParent();

diff --git a/...java/com/sonyericsson/hudson/plugins/gerrit/trigger/gerritnotifier/model/BuildMemory.java b/...java/com/sonyericsson/hudson/plugins/gerrit/trigger/gerritnotifier/model/BuildMemory.java
@@ -40,8 +40,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -302,7 +302,7 @@ public synchronized void updateTriggerContext(GerritCause cause, Run r) {
      * @param entryToUpdate the entry to update.
      * @param imprint       the information for the update.
      */
-    private synchronized void updateTriggerContext(@Nonnull Entry entryToUpdate, @Nonnull MemoryImprint imprint) {
+    private synchronized void updateTriggerContext(@NonNull Entry entryToUpdate, @NonNull MemoryImprint imprint) {
         Run build = entryToUpdate.getBuild();
         if (build != null) {
             GerritCause cause = (GerritCause)build.getCause(GerritCause.class);
@@ -337,7 +337,7 @@ private synchronized void updateTriggerContext(@Nonnull Entry entryToUpdate, @No
      * @param project the project.
      * @return true if so.
      */
-    public synchronized boolean isTriggered(@Nonnull GerritTriggeredEvent event, @Nonnull Job project) {
+    public synchronized boolean isTriggered(@NonNull GerritTriggeredEvent event, @NonNull Job project) {
         MemoryImprint pb = memory.get(event);
         if (pb == null) {
             return false;
@@ -359,7 +359,7 @@ public synchronized boolean isTriggered(@Nonnull GerritTriggeredEvent event, @No
      * @param project the project.
      * @return true if so.
      */
-    public synchronized boolean isBuilding(GerritTriggeredEvent event, @Nonnull Job project) {
+    public synchronized boolean isBuilding(GerritTriggeredEvent event, @NonNull Job project) {
         MemoryImprint pb = memory.get(event);
         if (pb == null) {
             return false;
@@ -480,7 +480,7 @@ public synchronized void removeProject(Job project) {
      *
      * @return the report
      */
-    @Nonnull
+    @NonNull
     public synchronized BuildMemoryReport report() {
         BuildMemoryReport report = new BuildMemoryReport();
         for (Map.Entry<GerritTriggeredEvent, MemoryImprint> entry : memory.entrySet()) {
@@ -685,7 +685,7 @@ public synchronized String getStatusReport() {
          * @param project the project.
          * @return the entry or null if nothing is found.
          */
-        private Entry getEntry(@Nonnull Job project) {
+        private Entry getEntry(@NonNull Job project) {
             for (Entry entry : list) {
                 if (entry != null && project.equals(entry.getProject())) {
                     return entry;

diff --git a/...main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/EventListener.java b/...main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/EventListener.java
@@ -49,8 +49,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
@@ -79,7 +79,7 @@ public final class EventListener implements GerritEventListener {
      *
      * @param job the job to handle.
      */
-    EventListener(@Nonnull Job job) {
+    EventListener(@NonNull Job job) {
         this(job.getFullName());
     }
 
@@ -88,7 +88,7 @@ public final class EventListener implements GerritEventListener {
      *
      * @param fullName the job to handle full name.
      */
-    EventListener(@Nonnull String fullName) {
+    EventListener(@NonNull String fullName) {
         this.job = fullName;
     }
 

diff --git a/...om/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritConnectionListener.java b/...om/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritConnectionListener.java
@@ -36,7 +36,7 @@
 import com.sonyericsson.hudson.plugins.gerrit.trigger.version.GerritVersionChecker;
 import com.sonyericsson.hudson.plugins.gerrit.trigger.version.GerritVersionNumber;
 
-import javax.annotation.CheckForNull;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
 
 /**
  * Every instance of this class is a connection listener to a specific Gerrit server.