Add missing nullability annotations and remove JSR 305 usage (#85)

jenkinsci · Jun 14, 2022 · 2e360f0 · 2e360f0
1 parent a1233b1
commit 2e360f0
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/src/test/java/org/jenkinsci/plugins/displayurlapi/DisplayURLProviderTest.java b/src/test/java/org/jenkinsci/plugins/displayurlapi/DisplayURLProviderTest.java
@@ -66,18 +66,21 @@ private DisplayURLProvider getRootProvider()
                 ClassicDisplayURLProvider.class.getName() );
         }
 
+        @NonNull
         @Override
         public String getRunURL( Run<?, ?> run )
         {
             return getRootProvider().getRunURL( run ) + EXTRA_CONTENT_IN_URL;
         }
 
+        @NonNull
         @Override
         public String getArtifactsURL( Run<?, ?> run )
         {
             return getRootProvider().getArtifactsURL( run ) + "/" + EXTRA_CONTENT_IN_URL;
         }
 
+        @NonNull
         @Override
         public String getChangesURL( Run<?, ?> run )
         {
@@ -90,6 +93,7 @@ public String getTestsURL( Run<?, ?> run )
             return getRootProvider().getTestsURL( run ) + "/" + EXTRA_CONTENT_IN_URL;
         }
 
+        @NonNull
         @Override
         public String getJobURL( Job<?, ?> project )
         {
@@ -141,18 +145,21 @@ private DisplayURLProvider getRootProvider()
                 ClassicDisplayURLProvider.class.getName() );
         }
 
+        @NonNull
         @Override
         public String getRunURL( Run<?, ?> run )
         {
             return getRootProvider().getRunURL( run ) + EXTRA_CONTENT_IN_URL;
         }
 
+        @NonNull
         @Override
         public String getArtifactsURL( Run<?, ?> run )
         {
             return getRootProvider().getArtifactsURL( run ) + "/" + EXTRA_CONTENT_IN_URL;
         }
 
+        @NonNull
         @Override
         public String getChangesURL( Run<?, ?> run )
         {
@@ -165,6 +172,7 @@ public String getTestsURL( Run<?, ?> run )
             return getRootProvider().getTestsURL( run ) + "/" + EXTRA_CONTENT_IN_URL;
         }
 
+        @NonNull
         @Override
         public String getJobURL( Job<?, ?> project )
         {

diff --git a/src/test/java/org/jenkinsci/plugins/displayurlapi/actions/ActionRedirectEligibilityTest.java b/src/test/java/org/jenkinsci/plugins/displayurlapi/actions/ActionRedirectEligibilityTest.java
@@ -1,8 +1,7 @@
 package org.jenkinsci.plugins.displayurlapi.actions;
 
-import com.google.common.base.Predicates;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Iterables;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.model.Action;
 import hudson.model.Job;
 import hudson.model.Run;
@@ -16,7 +15,6 @@
 import org.junit.Test;
 import org.jvnet.hudson.test.TestExtension;
 
-import javax.annotation.Nonnull;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Collection;
 
@@ -112,11 +110,13 @@ public static class EligibleDisplayURLProvider extends DisplayURLProvider {
 
         public static final String ELIGIBLE_IN_URL = "http://eligible.com";
 
+        @NonNull
         @Override
         public String getRunURL(Run<?, ?> run) {
             return ELIGIBLE_IN_URL;
         }
 
+        @NonNull
         @Override
         public String getChangesURL(Run<?, ?> run) {
             return ELIGIBLE_IN_URL;
@@ -127,11 +127,13 @@ public String getTestsURL(Run<?, ?> run) {
             return ELIGIBLE_IN_URL;
         }
 
+        @NonNull
         @Override
         public String getArtifactsURL(Run<?, ?> run) {
             return ELIGIBLE_IN_URL;
         }
 
+        @NonNull
         @Override
         public String getJobURL(Job<?, ?> project) {
             return ELIGIBLE_IN_URL;
@@ -145,9 +147,9 @@ public Class type() {
             return Run.class;
         }
 
-        @Nonnull
+        @NonNull
         @Override
-        public Collection<? extends Action> createFor(@Nonnull Object target) {
+        public Collection<? extends Action> createFor(@NonNull Object target) {
             return ImmutableList.of(new MockRunDisplayAction((Run) target));
         }
     }

diff --git a/src/test/java/org/jenkinsci/plugins/displayurlapi/actions/ActionRedirectExtendedTest.java b/src/test/java/org/jenkinsci/plugins/displayurlapi/actions/ActionRedirectExtendedTest.java
@@ -2,6 +2,7 @@
 
 import com.google.common.base.Predicates;
 import com.google.common.collect.Iterables;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.model.Job;
 import hudson.model.Run;
 import org.hamcrest.Matchers;
@@ -104,16 +105,19 @@ public static class AnotherDisplayURLProvider extends DisplayURLProvider {
 
         public static final String EXTRA_CONTENT_IN_URL = "another";
 
+        @NonNull
         @Override
         public String getRunURL(Run<?, ?> run) {
             return DisplayURLProvider.getDefault().getRunURL(run) + EXTRA_CONTENT_IN_URL;
         }
 
+        @NonNull
         @Override
         public String getArtifactsURL(Run<?, ?> run) {
             return DisplayURLProvider.getDefault().getArtifactsURL(run) + EXTRA_CONTENT_IN_URL;
         }
 
+        @NonNull
         @Override
         public String getChangesURL(Run<?, ?> run) {
             return DisplayURLProvider.getDefault().getChangesURL(run) + EXTRA_CONTENT_IN_URL;
@@ -124,6 +128,7 @@ public String getTestsURL(Run<?, ?> run) {
             return DisplayURLProvider.getDefault().getTestsURL(run) + EXTRA_CONTENT_IN_URL;
         }
 
+        @NonNull
         @Override
         public String getJobURL(Job<?, ?> project) {
             return DisplayURLProvider.getDefault().getJobURL(project) + EXTRA_CONTENT_IN_URL;
@@ -135,16 +140,19 @@ public static class YetAnotherDisplayURLProvider extends DisplayURLProvider {
 
         public static final String EXTRA_CONTENT_IN_URL = "yetanother";
 
+        @NonNull
         @Override
         public String getRunURL(Run<?, ?> run) {
             return DisplayURLProvider.getDefault().getRunURL(run) + EXTRA_CONTENT_IN_URL;
         }
 
+        @NonNull
         @Override
         public String getArtifactsURL(Run<?, ?> run) {
             return DisplayURLProvider.getDefault().getArtifactsURL(run) + EXTRA_CONTENT_IN_URL;
         }
 
+        @NonNull
         @Override
         public String getChangesURL(Run<?, ?> run) {
             return DisplayURLProvider.getDefault().getChangesURL(run) + EXTRA_CONTENT_IN_URL;
@@ -155,6 +163,7 @@ public String getTestsURL(Run<?, ?> run) {
             return DisplayURLProvider.getDefault().getTestsURL(run) + EXTRA_CONTENT_IN_URL;
         }
 
+        @NonNull
         @Override
         public String getJobURL(Job<?, ?> project) {
             return DisplayURLProvider.getDefault().getJobURL(project) + EXTRA_CONTENT_IN_URL;