From a2ec6fb2ce14fa3998dcb94c8c24d68704c85380 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Fri, 22 Dec 2023 10:28:18 -0700 Subject: [PATCH] Replace deprecated javax annotation with spotbugs annotation (#325) The javax.annotation.Nonnull has been deprecated for a long time and is steadily being removed from Jenkins. --- src/test/java/org/kohsuke/stapler/MockStaplerRequest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/kohsuke/stapler/MockStaplerRequest.java b/src/test/java/org/kohsuke/stapler/MockStaplerRequest.java index 90527669..b94c9926 100644 --- a/src/test/java/org/kohsuke/stapler/MockStaplerRequest.java +++ b/src/test/java/org/kohsuke/stapler/MockStaplerRequest.java @@ -25,11 +25,11 @@ import static org.mockito.Mockito.mock; +import edu.umd.cs.findbugs.annotations.NonNull; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.annotation.Nonnull; import javax.servlet.http.HttpServletRequest; import org.jvnet.hudson.test.JenkinsRule; @@ -43,7 +43,7 @@ public static class MockStaplerRequestBuilder { final Map getters = new HashMap<>(); private Stapler stapler; - public MockStaplerRequestBuilder(@Nonnull JenkinsRule r, String url) { + public MockStaplerRequestBuilder(@NonNull JenkinsRule r, String url) { this.r = r; this.tokens = new TokenList(url); }