EOL JSR 305 (#332)

src/main/java/org/jenkinsci/plugins/saml/IdpMetadataConfiguration.java

@@ -10,7 +10,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
@@ -74,7 +74,7 @@ public IdpMetadataConfiguration(String xml, String url, Long period) {
      * Inline Constructor.
      * @param xml IdP Metadata XML.
      */
-    public IdpMetadataConfiguration(@Nonnull String xml) {
+    public IdpMetadataConfiguration(@NonNull String xml) {
         this.xml = xml;
         this.period = 0L;
     }
@@ -84,7 +84,7 @@ public IdpMetadataConfiguration(@Nonnull String xml) {
      * @param url URL to grab the IdP Metadata.
      * @param period Period between updates of the IdP Metadata.
      */
-    public IdpMetadataConfiguration(@Nonnull String url, @Nonnull Long period) {
+    public IdpMetadataConfiguration(@NonNull String url, @NonNull Long period) {
         this.url = url;
         this.period = period;
     }

src/main/java/org/jenkinsci/plugins/saml/SamlAuthenticationToken.java

@@ -17,7 +17,7 @@
 
 package org.jenkinsci.plugins.saml;
 
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import org.springframework.security.authentication.AbstractAuthenticationToken;
 
 /**
@@ -29,7 +29,7 @@ public final class SamlAuthenticationToken extends AbstractAuthenticationToken {
 
     private final SamlUserDetails userDetails;
 
-    public SamlAuthenticationToken(@Nonnull SamlUserDetails userDetails) {
+    public SamlAuthenticationToken(@NonNull SamlUserDetails userDetails) {
         super(userDetails.getAuthorities());
         this.userDetails = userDetails;
         this.setDetails(userDetails);

src/main/java/org/jenkinsci/plugins/saml/SamlEncryptionData.java

@@ -27,7 +27,7 @@
 import java.security.UnrecoverableKeyException;
 import java.security.cert.CertificateException;
 import java.util.Enumeration;
-import javax.annotation.CheckForNull;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import org.apache.commons.lang.StringUtils;
 import org.kohsuke.stapler.DataBoundConstructor;

src/main/java/org/jenkinsci/plugins/saml/SamlFileResource.java

@@ -23,7 +23,7 @@
 import java.io.OutputStream;
 import java.net.URI;
 import java.net.URL;
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import org.apache.commons.lang.NotImplementedException;
 import org.springframework.core.io.Resource;
@@ -36,15 +36,15 @@ class SamlFileResource implements WritableResource {
 
     private final WritableResource resource;
 
-    public SamlFileResource(@Nonnull String fileName) {
+    public SamlFileResource(@NonNull String fileName) {
         if(getUseDiskCache()){
             this.resource = new SamlFileResourceCache(fileName);
         } else {
             this.resource = new SamlFileResourceDisk(fileName);
         }
     }
 
-    public SamlFileResource(@Nonnull String fileName, @Nonnull String data) {
+    public SamlFileResource(@NonNull String fileName, @NonNull String data) {
         if(getUseDiskCache()){
             this.resource = new SamlFileResourceCache(fileName, data);
         } else {

src/main/java/org/jenkinsci/plugins/saml/SamlFileResourceCache.java

@@ -24,7 +24,7 @@
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.WritableResource;
 
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
@@ -49,11 +49,11 @@ class SamlFileResourceCache implements WritableResource {
 
     private final static Map<String,String> cache = new HashMap<>();
 
-    public SamlFileResourceCache(@Nonnull String fileName) {
+    public SamlFileResourceCache(@NonNull String fileName) {
         this.fileName = fileName;
     }
 
-    public SamlFileResourceCache(@Nonnull String fileName, @Nonnull String data) {
+    public SamlFileResourceCache(@NonNull String fileName, @NonNull String data) {
         this.fileName = fileName;
         try {
             save(fileName, data);
@@ -150,7 +150,7 @@ private boolean isNew(String fileName, String data){
         return !md5SumNew.equals(md5SumOld);
     }
 
-    private void save(@Nonnull String fileName, @Nonnull String data) throws IOException {
+    private void save(@NonNull String fileName, @NonNull String data) throws IOException {
         if(isNew(fileName, data)) {
             FileUtils.writeByteArrayToFile(new File(fileName), data.getBytes("UTF-8"));
             cache.put(fileName, data);

src/main/java/org/jenkinsci/plugins/saml/SamlFileResourceDisk.java

@@ -25,7 +25,7 @@
 import java.net.URI;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.NotImplementedException;
@@ -40,11 +40,11 @@ class SamlFileResourceDisk implements WritableResource {
 
     private final String fileName;
 
-    public SamlFileResourceDisk(@Nonnull String fileName) {
+    public SamlFileResourceDisk(@NonNull String fileName) {
         this.fileName = fileName;
     }
 
-    public SamlFileResourceDisk(@Nonnull String fileName, @Nonnull String data) {
+    public SamlFileResourceDisk(@NonNull String fileName, @NonNull String data) {
         this.fileName = fileName;
         try {
             FileUtils.writeByteArrayToFile(getFile(), data.getBytes(StandardCharsets.UTF_8));

src/main/java/org/jenkinsci/plugins/saml/SamlSecurityRealm.java

@@ -25,7 +25,7 @@
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import javax.servlet.http.HttpSession;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import org.acegisecurity.Authentication;
@@ -604,7 +604,7 @@ public HttpResponse doMetadata(StaplerRequest request, StaplerResponse response)
      */
     @SuppressWarnings("deprecation")
     @Override
-    protected String getPostLogOutUrl(StaplerRequest req, @Nonnull Authentication auth) {
+    protected String getPostLogOutUrl(StaplerRequest req, @NonNull Authentication auth) {
         LOG.log(Level.FINE, "Doing Logout {}", auth.getPrincipal());
         // if we just redirect to the root and anonymous does not have Overall read then we will start a login all over again.
         // we are actually anonymous here as the security context has been cleared

src/main/java/org/jenkinsci/plugins/saml/SamlUserDetails.java

@@ -20,7 +20,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import java.util.Arrays;
 import java.util.Collections;
 import org.springframework.security.core.GrantedAuthority;
@@ -36,7 +36,7 @@ public class SamlUserDetails implements UserDetails {
     private final String username;
     private final Collection<GrantedAuthority> authorities;
 
-    public SamlUserDetails(@Nonnull String username, Collection<GrantedAuthority> authorities) {
+    public SamlUserDetails(@NonNull String username, Collection<GrantedAuthority> authorities) {
         this.username = username;
         this.authorities = Collections.unmodifiableCollection(authorities);
     }

src/main/java/org/jenkinsci/plugins/saml/SamlUserDetailsService.java

@@ -20,7 +20,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
@@ -38,7 +38,7 @@
  */
 public class SamlUserDetailsService implements UserDetailsService {
 
-    public SamlUserDetails loadUserByUsername(@Nonnull String username) {
+    public SamlUserDetails loadUserByUsername(@NonNull String username) {
 
         // try to obtain user details from current authentication details
         Authentication auth = Jenkins.getAuthentication2();

src/main/java/org/jenkinsci/plugins/saml/user/LoginDetailsProperty.java

@@ -148,7 +148,7 @@ public UserProperty reconfigure(StaplerRequest req, JSONObject form) {
     public static class SecurityListenerImpl extends jenkins.security.SecurityListener {
 
         @Override
-        protected void loggedIn(@javax.annotation.Nonnull String username) {
+        protected void loggedIn(@edu.umd.cs.findbugs.annotations.NonNull String username) {
 
             SecurityRealm realm = Jenkins.get().getSecurityRealm();
             if (!(realm instanceof SamlSecurityRealm)) {