Skip to content

Commit 095e979

Browse files
Thomas Salzingertsalzinger
Thomas Salzinger
authored andcommitted
Replace deprecated usage of CredentialsProvider#lookupCredentials
`CredentialsProvider#lookupCredentials` was deprecated in favor of `CredentialsProvider.lookupCredentialsInItem` which uses `org.springframework.security.core.Authentication` instead of `org.acegisecurity.Authentication`.
1 parent 5a94b19 commit 095e979

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

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

+12-10
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import edu.umd.cs.findbugs.annotations.NonNull;
3636
import hudson.model.Item;
3737
import hudson.model.Queue;
38-
import hudson.model.queue.Tasks;
3938
import hudson.security.ACL;
4039
import hudson.security.AccessControlled;
4140
import hudson.util.FormValidation;
@@ -46,6 +45,7 @@
4645
import org.apache.commons.lang.StringUtils;
4746
import org.kohsuke.stapler.AncestorInPath;
4847
import org.kohsuke.stapler.QueryParameter;
48+
import org.springframework.security.core.Authentication;
4949

5050
/**
5151
* Utility class for common code accessing credentials
@@ -66,12 +66,10 @@ static <T extends StandardCredentials> T lookupCredentialsAndTrackUsage(@CheckFo
6666
@NonNull Class<T> type) {
6767
if (StringUtils.isNotBlank(id) && context != null) {
6868
final T credentials = CredentialsMatchers.firstOrNull(
69-
CredentialsProvider.lookupCredentials(
69+
CredentialsProvider.lookupCredentialsInItem(
7070
type,
7171
context,
72-
context instanceof Queue.Task
73-
? Tasks.getDefaultAuthenticationOf((Queue.Task) context)
74-
: ACL.SYSTEM,
72+
getAuthenticationForContext(context),
7573
URIRequirementBuilder.fromUri(serverUrl).build()
7674
),
7775
CredentialsMatchers.allOf(
@@ -97,9 +95,7 @@ static ListBoxModel fillCredentialsIdItems(
9795
return result;
9896
}
9997
result.includeMatchingAs(
100-
context instanceof Queue.Task
101-
? Tasks.getDefaultAuthenticationOf((Queue.Task) context)
102-
: ACL.SYSTEM,
98+
getAuthenticationForContext(context),
10399
context,
104100
StandardCredentials.class,
105101
URIRequirementBuilder.fromUri(serverUrl).build(),
@@ -116,10 +112,10 @@ static FormValidation checkCredentialsId(
116112
AccessControlled contextToCheck = context == null ? Jenkins.get() : context;
117113
contextToCheck.checkPermission(CredentialsProvider.VIEW);
118114
if (CredentialsMatchers.firstOrNull(
119-
CredentialsProvider.lookupCredentials(
115+
CredentialsProvider.lookupCredentialsInItem(
120116
StandardCertificateCredentials.class,
121117
context,
122-
context instanceof Queue.Task ? Tasks.getDefaultAuthenticationOf((Queue.Task) context) : ACL.SYSTEM,
118+
getAuthenticationForContext(context),
123119
URIRequirementBuilder.fromUri(serverUrl).build()),
124120
CredentialsMatchers.allOf(
125121
CredentialsMatchers.withId(value),
@@ -133,4 +129,10 @@ static FormValidation checkCredentialsId(
133129
return FormValidation.warning("Credentials are required for build notifications");
134130
}
135131
}
132+
133+
private static Authentication getAuthenticationForContext(SCMSourceOwner context) {
134+
return context instanceof Queue.Task
135+
? ((Queue.Task) context).getDefaultAuthentication2()
136+
: ACL.SYSTEM2;
137+
}
136138
}

0 commit comments

Comments
 (0)