fix additional PR comments

jenkinsci · Mar 15, 2019 · 4e071dc · 4e071dc
1 parent 94811cd
commit 4e071dc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/main/java/jenkins/plugins/slack/CredentialsObtainer.java b/src/main/java/jenkins/plugins/slack/CredentialsObtainer.java
@@ -5,6 +5,7 @@
 import com.cloudbees.plugins.credentials.CredentialsProvider;
 import hudson.model.Item;
 import hudson.security.ACL;
+import jenkins.model.Jenkins;
 import org.apache.commons.lang.StringUtils;
 import org.jenkinsci.plugins.plaincredentials.StringCredentials;
 
@@ -13,6 +14,12 @@
 
 public class CredentialsObtainer {
 
+    public static StringCredentials lookupCredentials(String credentialId) {
+        List<StringCredentials> credentials = CredentialsProvider.lookupCredentials(StringCredentials.class, Jenkins.get(), ACL.SYSTEM, Collections.emptyList());
+        CredentialsMatcher matcher = CredentialsMatchers.withId(credentialId);
+        return CredentialsMatchers.firstOrNull(credentials, matcher);
+    }
+
     public static StringCredentials lookupCredentials(String credentialId, Item item) {
         List<StringCredentials> credentials = CredentialsProvider.lookupCredentials(StringCredentials.class, item, ACL.SYSTEM, Collections.emptyList());
         CredentialsMatcher matcher = CredentialsMatchers.withId(credentialId);

diff --git a/src/main/java/jenkins/plugins/slack/StandardSlackService.java b/src/main/java/jenkins/plugins/slack/StandardSlackService.java
@@ -220,7 +220,7 @@ public boolean publish(String message, JSONArray attachments, String color) {
 
     private String getTokenToUse(String authTokenCredentialId, String token) {
         if (!StringUtils.isEmpty(authTokenCredentialId)) {
-            StringCredentials credentials = CredentialsObtainer.lookupCredentials(authTokenCredentialId, null);
+            StringCredentials credentials = CredentialsObtainer.lookupCredentials(authTokenCredentialId);
             if (credentials != null) {
                 logger.fine("Using Integration Token Credential ID.");
                 return credentials.getSecret().getPlainText();

diff --git a/src/main/java/jenkins/plugins/slack/workflow/SlackSendStep.java b/src/main/java/jenkins/plugins/slack/workflow/SlackSendStep.java
@@ -63,8 +63,6 @@ public class SlackSendStep extends Step {
     private Object attachments;
     private boolean replyBroadcast;
 
-
-
     @Nonnull
     public String getMessage() {
         return message;