Use annotations consistently. (#525)

Signed-off-by: Alexander Falkenstern <alexander.falkenstern@gmail.com>

Author: falkena

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/BitbucketBuildStatusNotifications.java

@@ -27,6 +27,7 @@
 import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketApi;
 import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketBuildStatus;
 import com.cloudbees.jenkins.plugins.bitbucket.client.BitbucketCloudApiClient;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.Extension;
 import hudson.FilePath;
@@ -41,7 +42,6 @@
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
-import javax.annotation.CheckForNull;
 import jenkins.model.JenkinsLocationConfiguration;
 import jenkins.plugins.git.AbstractGitSCMSource;
 import jenkins.scm.api.SCMHeadObserver;

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/client/BitbucketCloudPage.java

@@ -25,9 +25,9 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
+import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
 import java.util.List;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 
 /**
  * Bitbucket paginated resource
@@ -43,7 +43,7 @@ public BitbucketCloudPage(@JsonProperty("pagelen") int pageLength,
                        @JsonProperty("page") int page,
                        @JsonProperty("size") int size,
                        @Nullable @JsonProperty("next") String next,
-                       @Nonnull @JsonProperty("values") List<T> values) {
+                       @NonNull @JsonProperty("values") List<T> values) {
         this.pageLength = pageLength;
         this.page = page;
         this.size = size;

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/endpoints/BitbucketServerEndpoint.java

@@ -36,7 +36,6 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Objects;
-import javax.annotation.Nonnull;
 import jenkins.scm.api.SCMName;
 import org.apache.commons.lang.StringUtils;
 import org.kohsuke.accmod.Restricted;
@@ -233,7 +232,7 @@ public static class DescriptorImpl extends AbstractBitbucketEndpointDescriptor {
         /**
          * {@inheritDoc}
          */
-        @Nonnull
+        @NonNull
         @Override
         public String getDisplayName() {
             return Messages.BitbucketServerEndpoint_displayName();

src/test/java/integration/ScanningFailuresTest.java

@@ -67,7 +67,8 @@ public void resetEnvironment() throws Exception {
             i.delete();
         }
         BitbucketMockApiFactory.clear();
-        message = "We gonna Boom Boom Boom 'til the break of Boom. "+ Long.toHexString(entropy.nextLong())+ " Who's the Boom King? Who? I'm the Boom King!" ;
+        message = "We gonna Boom Boom Boom 'til the break of Boom. " + Long.toHexString(entropy.nextLong()) +
+            " Who's the Boom King? Who? I'm the Boom King!" ;
     }
 
     @Test