Merge pull request #598 from MarkEWaite/fix-jsr-305

Replace JSR-305 annotations with spotbugs annotations
jenkinsci · May 8, 2024 · c67f6fd · c67f6fd
2 parents b8b4f6c + aaa093a
commit c67f6fd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/main/java/hudson/plugins/jira/JiraSite.java b/src/main/java/hudson/plugins/jira/JiraSite.java
@@ -73,7 +73,6 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
-import javax.annotation.Nonnull;
 import javax.annotation.PreDestroy;
 import javax.servlet.ServletException;
 import jenkins.model.Jenkins;
@@ -980,19 +979,19 @@ public String getPropertyValue(final String s) {
             throw new UnsupportedOperationException("Not implemented");
         }
 
-        @Nonnull
+        @NonNull
         @Override
         public String getApplicationFileEncoding() {
             return System.getProperty("file.encoding");
         }
 
-        @Nonnull
+        @NonNull
         @Override
         public Optional<Path> getLocalHomeDirectory() {
             return Optional.empty();
         }
 
-        @Nonnull
+        @NonNull
         @Override
         public Optional<Path> getSharedHomeDirectory() {
             return Optional.empty();

diff --git a/src/test/java/com/atlassian/httpclient/apache/httpcomponents/ApacheAsyncHttpClientTest.java b/src/test/java/com/atlassian/httpclient/apache/httpcomponents/ApacheAsyncHttpClientTest.java
@@ -15,7 +15,6 @@
 import java.util.Date;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
-import javax.annotation.Nonnull;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -271,19 +270,19 @@ public String getPropertyValue(String s) {
                 return null;
             }
 
-            @Nonnull
+            @NonNull
             @Override
             public String getApplicationFileEncoding() {
                 return System.getProperty("file.encoding");
             }
 
-            @Nonnull
+            @NonNull
             @Override
             public Optional<Path> getLocalHomeDirectory() {
                 return Optional.empty();
             }
 
-            @Nonnull
+            @NonNull
             @Override
             public Optional<Path> getSharedHomeDirectory() {
                 return Optional.empty();