Replace the use of deprecated methods.

Use JDK 17 feature
Remove unused import

Author: nfalco79

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

@@ -843,36 +843,35 @@ private void retrieveTags(final BitbucketSCMSourceRequest request) throws IOExce
     protected SCMRevision retrieve(SCMHead head, TaskListener listener) throws IOException, InterruptedException {
         final BitbucketApi bitbucket = buildBitbucketClient();
         try {
-            if (head instanceof PullRequestSCMHead) {
-                PullRequestSCMHead h = (PullRequestSCMHead) head;
+            if (head instanceof PullRequestSCMHead prHead) {
                 BitbucketCommit sourceRevision;
                 BitbucketCommit targetRevision;
 
                 if (bitbucket instanceof BitbucketCloudApiClient) {
                     // 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(h.getTarget().getName());
+                    BitbucketBranch targetBranch = bitbucket.getBranch(prHead.getTarget().getName());
 
                     if(targetBranch == null) {
                         listener.getLogger().format("No branch found in {0}/{1} with name [{2}]",
-                            repoOwner, repository, h.getTarget().getName());
+                            repoOwner, repository, prHead.getTarget().getName());
                         return null;
                     }
                     targetRevision = findCommit(targetBranch, listener);
 
                     if (targetRevision == null) {
                         listener.getLogger().format("No branch found in {0}/{1} with name [{2}]",
-                            repoOwner, repository, h.getTarget().getName());
+                            repoOwner, repository, prHead.getTarget().getName());
                         return null;
                     }
 
                     // Retrieve the source branch commit
                     BitbucketBranch branch;
                     if (head.getOrigin() == SCMHeadOrigin.DEFAULT) {
-                        branch = bitbucket.getBranch(h.getBranchName());
+                        branch = bitbucket.getBranch(prHead.getBranchName());
                     } else {
                         // In case of a forked branch, retrieve the branch as that owner
-                        branch = buildBitbucketClient(h).getBranch(h.getBranchName());
+                        branch = buildBitbucketClient(prHead).getBranch(prHead.getBranchName());
                     }
 
                     if(branch == null) {
@@ -886,17 +885,17 @@ protected SCMRevision retrieve(SCMHead head, TaskListener listener) throws IOExc
                 } else {
                     BitbucketPullRequest pr;
                     try {
-                        pr = bitbucket.getPullRequestById(Integer.parseInt(h.getId()));
+                        pr = bitbucket.getPullRequestById(Integer.parseInt(prHead.getId()));
                     } catch (NumberFormatException nfe) {
-                        LOGGER.log(Level.WARNING, "Cannot parse the PR id {0}", h.getId());
+                        LOGGER.log(Level.WARNING, "Cannot parse the PR id {0}", prHead.getId());
                         return null;
                     }
 
                     targetRevision = findPRDestinationCommit(pr, listener);
 
                     if (targetRevision == null) {
                         listener.getLogger().format("No branch found in {0}/{1} with name [{2}]",
-                            repoOwner, repository, h.getTarget().getName());
+                            repoOwner, repository, prHead.getTarget().getName());
                         return null;
                     }
 
@@ -905,20 +904,19 @@ protected SCMRevision retrieve(SCMHead head, TaskListener listener) throws IOExc
 
                 if (sourceRevision == null) {
                     listener.getLogger().format("No revision found in {0}/{1} for PR-{2} [{3}]",
-                        h.getRepoOwner(),
-                        h.getRepository(),
-                        h.getId(),
-                        h.getBranchName());
+                        prHead.getRepoOwner(),
+                        prHead.getRepository(),
+                        prHead.getId(),
+                        prHead.getBranchName());
                     return null;
                 }
 
                 return new PullRequestSCMRevision(
-                    h,
-                    new BitbucketGitSCMRevision(h.getTarget(), targetRevision),
-                    new BitbucketGitSCMRevision(h, sourceRevision)
+                    prHead,
+                    new BitbucketGitSCMRevision(prHead.getTarget(), targetRevision),
+                    new BitbucketGitSCMRevision(prHead, sourceRevision)
                 );
-            } else if (head instanceof BitbucketTagSCMHead) {
-                BitbucketTagSCMHead tagHead = (BitbucketTagSCMHead) head;
+            } else if (head instanceof BitbucketTagSCMHead tagHead) {
                 BitbucketBranch tag = bitbucket.getTag(tagHead.getName());
                 if(tag == null) {
                     listener.getLogger().format( "No tag found in {0}/{1} with name [{2}]",
@@ -949,8 +947,7 @@ protected SCMRevision retrieve(SCMHead head, TaskListener listener) throws IOExc
             }
         } catch (IOException e) {
             // here we only want to display the job name to have it in the log
-            if (e instanceof BitbucketRequestException) {
-                BitbucketRequestException bre = (BitbucketRequestException) e;
+            if (e instanceof BitbucketRequestException bre) {
                 SCMSourceOwner scmSourceOwner = getOwner();
                 if (bre.getHttpCode() == 401 && scmSourceOwner != null) {
                     LOGGER.log(Level.WARNING, "BitbucketRequestException: Authz error. Status: 401 for Item '{0}' using credentialId '{1}'",

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

@@ -108,12 +108,12 @@ public AvatarImage fetch(StandardCredentials credentials) {
         }
 
         private StandardCredentials findCredentials() {
-            try (ACLContext ctx = ACL.as(ACL.SYSTEM)) {
+            try (ACLContext ctx = ACL.as2(ACL.SYSTEM2)) {
                 return CredentialsMatchers.firstOrNull(
-                        CredentialsProvider.lookupCredentials(
+                        CredentialsProvider.lookupCredentialsInItem(
                                 credentials.getClass(),
                                 (Item) null, // context
-                                ACL.SYSTEM,
+                                ACL.SYSTEM2,
                                 URIRequirementBuilder.fromUri(serverUrl).build()
                         ),
                         CredentialsMatchers.allOf(

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

@@ -234,7 +234,6 @@ public List<SCMHeadAuthorityDescriptor> getTrustDescriptors() {
      * <p>
      * This reduces generics in the databound constructor method signature as a workaround for JENKINS-26535
      */
-    @SuppressWarnings("rawtypes")
     public static abstract class BitbucketForkTrustPolicy extends SCMHeadAuthority<BitbucketSCMSourceRequest, PullRequestSCMHead, PullRequestSCMRevision> {
     }
 

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

@@ -54,6 +54,7 @@
 import org.kohsuke.stapler.AncestorInPath;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.QueryParameter;
+import org.springframework.security.core.Authentication;
 
 /**
  * A {@link SCMSourceTrait} for {@link BitbucketSCMSource} that causes the {@link GitSCM}
@@ -176,9 +177,9 @@ public ListBoxModel doFillCredentialsIdItems(@CheckForNull @AncestorInPath Item
             StandardListBoxModel result = new StandardListBoxModel();
             result.add(Messages.SSHCheckoutTrait_useAgentKey(), "");
             return result.includeMatchingAs(
-                    context instanceof Queue.Task
-                            ? ((Queue.Task) context).getDefaultAuthentication()
-                            : ACL.SYSTEM,
+                    context instanceof Queue.Task task
+                            ? task.getDefaultAuthentication2()
+                            : ACL.SYSTEM2,
                     context,
                     StandardUsernameCredentials.class,
                     URIRequirementBuilder.fromUri(serverUrl).build(),
@@ -208,18 +209,21 @@ public FormValidation doCheckCredentialsId(@CheckForNull @AncestorInPath Item co
                 // use agent key
                 return FormValidation.ok();
             }
-            if (CredentialsMatchers.firstOrNull(CredentialsProvider.lookupCredentials(
+            Authentication authentication = context instanceof Queue.Task task
+                    ? task.getDefaultAuthentication2()
+                    : ACL.SYSTEM2;
+            if (CredentialsMatchers.firstOrNull(CredentialsProvider.lookupCredentialsInItem(
                     SSHUserPrivateKey.class,
                     context,
-                    context instanceof Queue.Task ? ((Queue.Task) context).getDefaultAuthentication() : ACL.SYSTEM,
+                    authentication,
                     URIRequirementBuilder.fromUri(serverUrl).build()),
                     CredentialsMatchers.withId(value)) != null) {
                 return FormValidation.ok();
             }
-            if (CredentialsMatchers.firstOrNull(CredentialsProvider.lookupCredentials(
+            if (CredentialsMatchers.firstOrNull(CredentialsProvider.lookupCredentialsInItem(
                     StandardUsernameCredentials.class,
                     context,
-                    context instanceof Queue.Task ? ((Queue.Task) context).getDefaultAuthentication() : ACL.SYSTEM,
+                    authentication,
                     URIRequirementBuilder.fromUri(serverUrl).build()),
                     CredentialsMatchers.withId(value)) != null) {
                 return FormValidation.error(Messages.SSHCheckoutTrait_incompatibleCredentials());

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/api/AbstractBitbucketTeam.java

@@ -23,8 +23,6 @@
  */
 package com.cloudbees.jenkins.plugins.bitbucket.api;
 
-import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketHref;
-import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketTeam;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;