Cleanup code

Author: nfalco79

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

@@ -224,6 +224,7 @@ private void withPullRequestRemote(PullRequestSCMHead head, String headName) {
             && revision instanceof PullRequestSCMRevision;
         String targetBranch = head.getTarget().getName();
         String branchName = head.getBranchName();
+        boolean scmCloud = BitbucketApiUtils.isCloud(scmSource.getServerUrl());
         if (prFromTargetRepository) {
             withRefSpec("+refs/heads/" + branchName + ":refs/remotes/@{remote}/" + branchName);
             if (cloneFromMirror) {
@@ -247,7 +248,7 @@ private void withPullRequestRemote(PullRequestSCMHead head, String headName) {
                 withPrimaryRemote();
             }
         } else {
-            if (scmSource.isCloud()) {
+            if (scmCloud) {
                 withRefSpec("+refs/heads/" + branchName + ":refs/remotes/@{remote}/" + headName);
                 String cloneLink = getCloudRepositoryUri(pullRequestRepoOwner, pullRequestRepository);
                 withRemote(cloneLink);
@@ -260,7 +261,7 @@ private void withPullRequestRemote(PullRequestSCMHead head, String headName) {
         if (head.getCheckoutStrategy() == ChangeRequestCheckoutStrategy.MERGE) {
             String hash = revision instanceof PullRequestSCMRevision prRevision ? prRevision.getTargetImpl().getHash() : null;
             String refSpec = "+refs/heads/" + targetBranch + ":refs/remotes/@{remote}/" + targetBranch;
-            if (!prFromTargetRepository && scmSource.isCloud()) {
+            if (!prFromTargetRepository && scmCloud) {
                 String upstreamRemoteName = remoteName().equals("upstream") ? "upstream-upstream" : "upstream";
                 withAdditionalRemote(upstreamRemoteName, getCloneLink(primaryCloneLinks), refSpec);
                 withExtension(new MergeWithGitSCMExtension("remotes/" + upstreamRemoteName + "/" + targetBranch, hash));

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

@@ -345,7 +345,7 @@ public List<Action> retrieveActions(@NonNull SCMNavigatorOwner owner,
     }
 
     private boolean showAvatar() {
-        return traits.stream().anyMatch(ShowBitbucketAvatarTrait.class::isInstance);
+        return SCMTrait.find(traits, ShowBitbucketAvatarTrait.class) != null;
     }
 
     @Symbol("bitbucket")

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

@@ -79,7 +79,7 @@ public Collection<BitbucketRepository> repositories() {
                                                                .filter(BitbucketSCMSource.class::isInstance)
                                                                .map(BitbucketSCMSource.class::cast)
                                                                .map(BitbucketSCMSource::getRepository)
-                                                               .collect(Collectors.toList());
+                                                               .toList();
         // process new repositories first
         final Set<BitbucketRepository> newRepositories = this.repositoryMap.entrySet()
                                                                            .stream()

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

@@ -439,8 +439,8 @@ private void retrievePullRequests(final BitbucketSCMSourceRequest request) throw
         class Skip extends IOException {
         }
 
-        final BitbucketApi originBitbucket = buildBitbucketClient();
-        if (request.isSkipPublicPRs() && !originBitbucket.isPrivate()) {
+        final BitbucketApi originClient = buildBitbucketClient();
+        if (request.isSkipPublicPRs() && !originClient.isPrivate()) {
             request.listener().getLogger().printf("Skipping pull requests for %s (public repository)%n", fullName);
             return;
         }
@@ -460,15 +460,15 @@ class Skip extends IOException {
             boolean fork = !StringUtils.equalsIgnoreCase(fullName, pull.getSource().getRepository().getFullName());
             String pullRepoOwner = pull.getSource().getRepository().getOwnerName();
             String pullRepository = pull.getSource().getRepository().getRepositoryName();
-            final BitbucketApi client = fork && BitbucketApiUtils.isCloud(originBitbucket)
+            final BitbucketApi client = fork && BitbucketApiUtils.isCloud(originClient)
                     ? BitbucketApiFactory.newInstance(
                     getServerUrl(),
                     authenticator(),
                     pullRepoOwner,
                     null,
                     pullRepository
             )
-                    : originBitbucket;
+                    : originClient;
             count++;
             livePRs.add(pull.getId());
             getPullRequestTitleCache()
@@ -507,7 +507,7 @@ public SCMRevision create(@NonNull SCMHead head, @Nullable BitbucketCommit sourc
                                         BranchHeadCommit targetCommit = new BranchHeadCommit(pull.getDestination().getBranch());
                                         return super.create(head, sourceCommit, targetCommit);
                                     } catch (BitbucketRequestException e) {
-                                        if (originBitbucket instanceof BitbucketCloudApiClient) {
+                                        if (BitbucketApiUtils.isCloud(originClient)) {
                                             if (e.getHttpCode() == 403) {
                                                 request.listener().getLogger().printf( //
                                                         "Skipping %s because of %s%n", //
@@ -555,15 +555,15 @@ private void retrieveBranches(final BitbucketSCMSourceRequest request)
         String fullName = repoOwner + "/" + repository;
         request.listener().getLogger().println("Looking up " + fullName + " for branches");
 
-        final BitbucketApi bitbucket = buildBitbucketClient();
+        final BitbucketApi client = buildBitbucketClient();
         int count = 0;
         for (final BitbucketBranch branch : request.getBranches()) {
             request.listener().getLogger().println("Checking branch " + branch.getName() + " from " + fullName);
             count++;
             if (request.process(new BranchSCMHead(branch.getName()), //
                 (IntermediateLambda<BitbucketCommit>) () -> new BranchHeadCommit(branch), //
-                    new BitbucketProbeFactory<>(bitbucket, request), //
-                    new BitbucketRevisionFactory<>(bitbucket), //
+                    new BitbucketProbeFactory<>(client, request), //
+                    new BitbucketRevisionFactory<>(client), //
                     new CriteriaWitness(request))) {
                 request.listener().getLogger().format("%n  %d branches were processed (query completed)%n", count);
                 return;
@@ -596,16 +596,16 @@ private void retrieveTags(final BitbucketSCMSourceRequest request) throws IOExce
 
     @Override
     protected SCMRevision retrieve(SCMHead head, TaskListener listener) throws IOException, InterruptedException {
-        final BitbucketApi bitbucket = buildBitbucketClient();
+        final BitbucketApi client = buildBitbucketClient();
         try {
             if (head instanceof PullRequestSCMHead prHead) {
                 BitbucketCommit sourceRevision;
                 BitbucketCommit targetRevision;
 
-                if (bitbucket instanceof BitbucketCloudApiClient) {
+                if (BitbucketApiUtils.isCloud(client)) {
                     // Bitbucket Cloud /pullrequests/{id} API endpoint only returns short commit IDs of the source
                     // and target branch. We therefore retrieve the branches directly
-                    BitbucketBranch targetBranch = bitbucket.getBranch(prHead.getTarget().getName());
+                    BitbucketBranch targetBranch = client.getBranch(prHead.getTarget().getName());
 
                     if(targetBranch == null) {
                         listener.getLogger().format("No branch found in {0}/{1} with name [{2}]",
@@ -623,7 +623,7 @@ protected SCMRevision retrieve(SCMHead head, TaskListener listener) throws IOExc
                     // Retrieve the source branch commit
                     BitbucketBranch branch;
                     if (head.getOrigin() == SCMHeadOrigin.DEFAULT) {
-                        branch = bitbucket.getBranch(prHead.getBranchName());
+                        branch = client.getBranch(prHead.getBranchName());
                     } else {
                         // In case of a forked branch, retrieve the branch as that owner
                         branch = buildBitbucketClient(prHead).getBranch(prHead.getBranchName());
@@ -640,7 +640,7 @@ protected SCMRevision retrieve(SCMHead head, TaskListener listener) throws IOExc
                 } else {
                     BitbucketPullRequest pr;
                     try {
-                        pr = bitbucket.getPullRequestById(Integer.parseInt(prHead.getId()));
+                        pr = client.getPullRequestById(Integer.parseInt(prHead.getId()));
                     } catch (NumberFormatException nfe) {
                         LOGGER.log(Level.WARNING, "Cannot parse the PR id {0}", prHead.getId());
                         return null;
@@ -672,7 +672,7 @@ protected SCMRevision retrieve(SCMHead head, TaskListener listener) throws IOExc
                     new BitbucketGitSCMRevision(prHead, sourceRevision)
                 );
             } else if (head instanceof BitbucketTagSCMHead tagHead) {
-                BitbucketBranch tag = bitbucket.getTag(tagHead.getName());
+                BitbucketBranch tag = client.getTag(tagHead.getName());
                 if(tag == null) {
                     listener.getLogger().format( "No tag found in {0}/{1} with name [{2}]",
                         repoOwner, repository, head.getName());
@@ -686,7 +686,7 @@ protected SCMRevision retrieve(SCMHead head, TaskListener listener) throws IOExc
                 }
                 return new BitbucketTagSCMRevision(tagHead, revision);
             } else {
-                BitbucketBranch branch = bitbucket.getBranch(head.getName());
+                BitbucketBranch branch = client.getBranch(head.getName());
                 if(branch == null) {
                     listener.getLogger().format("No branch found in {0}/{1} with name [{2}]",
                         repoOwner, repository, head.getName());
@@ -1093,8 +1093,9 @@ private List<BitbucketHref> getCloneLinksFromPrimary(BitbucketApi bitbucket) thr
         return cloneLinksLocal;
     }
 
+    @Deprecated(since = "936.0.0", forRemoval = true)
     public boolean isCloud() {
-        return BitbucketCloudEndpoint.SERVER_URL.equals(serverUrl);
+        return BitbucketApiUtils.isCloud(serverUrl);
     }
 
     @Symbol("bitbucket")

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

@@ -59,7 +59,7 @@ public ListBoxModel doFillCredentialsIdItems(@QueryParameter String serverUrl) {
         jenkins.checkPermission(Jenkins.MANAGE);
         StandardListBoxModel result = new StandardListBoxModel();
         result.includeMatchingAs(
-                ACL.SYSTEM,
+                ACL.SYSTEM2,
                 jenkins,
                 StandardCredentials.class,
                 URIRequirementBuilder.fromUri(serverUrl).build(),

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

@@ -86,9 +86,9 @@ private static String getRootURL(@NonNull Run<?, ?> build) {
      * Throws an IllegalStateException if it is not valid, or return the url otherwise
      *
      * @param url the URL of the build to check
-     * @param bitbucket the bitbucket client we are facing.
+     * @param client the bitbucket client we are facing.
      */
-    static String checkURL(@NonNull String url, BitbucketApi bitbucket) {
+    static String checkURL(@NonNull String url, BitbucketApi client) {
         try {
             URL anURL = new URL(url);
             if ("localhost".equals(anURL.getHost())) {
@@ -97,7 +97,7 @@ static String checkURL(@NonNull String url, BitbucketApi bitbucket) {
             if ("unconfigured-jenkins-location".equals(anURL.getHost())) {
                 throw new IllegalStateException("Could not determine Jenkins URL.");
             }
-            if (bitbucket instanceof BitbucketCloudApiClient && !anURL.getHost().contains(".")) {
+            if (BitbucketApiUtils.isCloud(client) && !anURL.getHost().contains(".")) {
                 throw new IllegalStateException(
                     "Please use a fully qualified name or an IP address for Jenkins URL, this is required by Bitbucket cloud");
             }