Replace Nullable with CheckForNull: CheckForNull is now supported by NullAway as well.

Author: uhafner

src/main/java/io/jenkins/plugins/util/BuildAction.java

@@ -9,7 +9,7 @@
 import java.util.concurrent.locks.ReentrantLock;
 
 import edu.hm.hafner.util.VisibleForTesting;
-import edu.umd.cs.findbugs.annotations.Nullable;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
 
 import hudson.model.Action;
 import hudson.model.Run;
@@ -32,7 +32,7 @@ public abstract class BuildAction<T> implements LastBuildAction, RunAction2, Ser
     private transient Run<?, ?> owner;
     private transient ReentrantLock lock = new ReentrantLock();
 
-    @Nullable
+    @CheckForNull
     private transient WeakReference<T> resultReference;
 
     /**
@@ -152,7 +152,7 @@ private Path getResultXmlPath() {
      * @return the next available {@link BuildAction}, or an empty result if there is no such action
      */
     public static <T extends BuildAction<?>> Optional<T> getBuildActionFromHistoryStartingFrom(
-            @Nullable final Run<?, ?> baseline, final Class<T> buildActionClass) {
+            @CheckForNull final Run<?, ?> baseline, final Class<T> buildActionClass) {
         for (Run<?, ?> run = baseline; run != null; run = run.getPreviousBuild()) {
             T action = run.getAction(buildActionClass);
             if (action != null) {

src/main/java/io/jenkins/plugins/util/EnvironmentResolver.java

@@ -3,7 +3,7 @@
 import org.apache.commons.lang3.StringUtils;
 
 import edu.hm.hafner.util.VisibleForTesting;
-import edu.umd.cs.findbugs.annotations.Nullable;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
 
 import hudson.EnvVars;
 import hudson.Util;
@@ -42,7 +42,7 @@ public EnvironmentResolver() {
      *
      * @return the expanded value
      */
-    public String expandEnvironmentVariables(@Nullable final EnvVars environment, final String nonExpandedValue) {
+    public String expandEnvironmentVariables(@CheckForNull final EnvVars environment, final String nonExpandedValue) {
         String expanded = nonExpandedValue;
         if (environment != null && !environment.isEmpty()) {
             for (int i = 0; i < resolveVariablesDepth && StringUtils.isNotBlank(expanded); i++) {