add dependency

dumasd · Dec 17, 2024 · cff6265 · cff6265
1 parent 9f66044
commit cff6265
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -79,6 +79,10 @@
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>config-file-provider</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.jenkins-ci.plugins</groupId>
+      <artifactId>credentials</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>structs</artifactId>

diff --git a/src/main/java/io/jenkins/plugins/blueking/utils/Utils.java b/src/main/java/io/jenkins/plugins/blueking/utils/Utils.java
@@ -2,6 +2,7 @@
 
 import com.cloudbees.plugins.credentials.CredentialsProvider;
 import com.cloudbees.plugins.credentials.common.StandardCredentials;
+import hudson.model.ItemGroup;
 import java.util.Collections;
 import java.util.Objects;
 import jenkins.model.Jenkins;
@@ -23,13 +24,16 @@ public static boolean isNotEmpty(final String name) {
     }
 
     public static <T extends StandardCredentials> T findCredential(String credentialsId, Class<T> clazz) {
-        StandardCredentials credentials = null;
+        return findCredential(credentialsId, null, clazz);
+    }
+
+    public static <T extends StandardCredentials> T findCredential(
+            String credentialsId, ItemGroup<?> itemGroup, Class<T> clazz) {
         if (Utils.isNullOrEmpty(credentialsId)) {
             return null;
         }
-
-        for (T c :
-                CredentialsProvider.lookupCredentialsInItemGroup(clazz, Jenkins.get(), null, Collections.emptyList())) {
+        for (T c : CredentialsProvider.lookupCredentialsInItemGroup(
+                clazz, Objects.requireNonNullElse(itemGroup, Jenkins.get()), null, Collections.emptyList())) {
             if (Objects.equals(c.getId(), credentialsId)) {
                 return c;
             }