Merge pull request #94 from zhang6464/master

Adding variables:
 * ${PULL_REQUEST_REVIEWERS} Example: Administrator,User
 * ${PULL_REQUEST_REVIEWERS_ID} Example: 1,2
 * ${PULL_REQUEST_REVIEWERS_SLUG} Example: admin,use

Author: tomasbjerre

CHANGELOG.md

@@ -5,6 +5,7 @@ Changelog of Pull Request Notifier for Bitbucket.
 ## 2.13
 * Allowing SSL certificates to be ignored.
 * Adding settings to configure custom keystore.
+* Add attribute for list of reviewers, reviewers' IDs and reviewers' names.
 
 ## 2.12
 * Fixing PULL_REQUEST_URL-bug correctly with getSlug.

README.md

@@ -60,6 +60,9 @@ The filter text as well as the URL support variables. These are:
 * ${PULL_REQUEST_AUTHOR_ID} Example: 1
 * ${PULL_REQUEST_AUTHOR_NAME} Example: admin
 * ${PULL_REQUEST_AUTHOR_SLUG} Example: admin
+* ${PULL_REQUEST_REVIEWERS} Example: Administrator,User
+* ${PULL_REQUEST_REVIEWERS_ID} Example: 1,2
+* ${PULL_REQUEST_REVIEWERS_SLUG} Example: admin,user
 * ${PULL_REQUEST_REVIEWERS_APPROVED_COUNT} Number of reviewers that approved the PR.
 * ${PULL_REQUEST_PARTICIPANTS_APPROVED_COUNT} Number of participants that approved the PR.
 * ${PULL_REQUEST_MERGE_COMMIT} Hash of merged commit (only available for merged-event).

src/main/java/se/bjurr/prnfb/listener/PrnfbRenderer.java

@@ -15,6 +15,7 @@
 import java.io.UnsupportedEncodingException;
 import java.util.Map;
 import java.util.Set;
+import java.util.List;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 
@@ -440,6 +441,54 @@ public String resolve(PullRequest pullRequest, PrnfbPullRequestAction pullReques
      Map<PrnfbVariable, Supplier<String>> variables, ClientKeyStore clientKeyStore, boolean shouldAcceptAnyCertificate) {
     return pullRequest.getTitle();
    }
+  }), PULL_REQUEST_REVIEWERS(new Resolver() {
+   @Override
+   public String resolve(PullRequest pullRequest, PrnfbPullRequestAction pullRequestAction,
+     ApplicationUser applicationUser, RepositoryService repositoryService,
+     ApplicationPropertiesService propertiesService, PrnfbNotification prnfbNotification,
+     Map<PrnfbVariable, Supplier<String>> variables, ClientKeyStore clientKeyStore, boolean shouldAcceptAnyCertificate) {
+    List<PullRequestParticipant> slist = newArrayList(pullRequest.getReviewers());
+    StringBuilder rString = new StringBuilder();
+
+    String sep = ",";
+    for (PullRequestParticipant each : slist) {
+        rString.append(sep).append(each.getUser().getDisplayName());
+    }
+
+    return rString.substring(1);
+   }
+  }), PULL_REQUEST_REVIEWERS_ID(new Resolver() {
+   @Override
+   public String resolve(PullRequest pullRequest, PrnfbPullRequestAction pullRequestAction,
+     ApplicationUser applicationUser, RepositoryService repositoryService,
+     ApplicationPropertiesService propertiesService, PrnfbNotification prnfbNotification,
+     Map<PrnfbVariable, Supplier<String>> variables, ClientKeyStore clientKeyStore, boolean shouldAcceptAnyCertificate) {
+    List<PullRequestParticipant> slist = newArrayList(pullRequest.getReviewers());
+    StringBuilder rString = new StringBuilder();
+
+    String sep = ",";
+    for (PullRequestParticipant each : slist) {
+        rString.append(sep).append(Integer.toString(each.getUser().getId()));
+    }
+
+    return rString.substring(1);
+   }
+  }), PULL_REQUEST_REVIEWERS_SLUG(new Resolver() {
+   @Override
+   public String resolve(PullRequest pullRequest, PrnfbPullRequestAction pullRequestAction,
+     ApplicationUser applicationUser, RepositoryService repositoryService,
+     ApplicationPropertiesService propertiesService, PrnfbNotification prnfbNotification,
+     Map<PrnfbVariable, Supplier<String>> variables, ClientKeyStore clientKeyStore, boolean shouldAcceptAnyCertificate) {
+    List<PullRequestParticipant> slist = newArrayList(pullRequest.getReviewers());
+    StringBuilder rString = new StringBuilder();
+
+    String sep = ",";
+    for (PullRequestParticipant each : slist) {
+        rString.append(sep).append(each.getUser().getSlug());
+    }
+
+    return rString.substring(1);
+   }
   }), PULL_REQUEST_REVIEWERS_APPROVED_COUNT(new Resolver() {
    @Override
    public String resolve(PullRequest pullRequest, PrnfbPullRequestAction pullRequestAction,

src/main/resources/admin.vm

@@ -47,7 +47,7 @@
 
     <div class="prnfb-BUTTON_CONFIG_FORM">
     </div>
-  
+
     <div>
       <div class="description">
         You can use variables when invoking the URL, when forming the filter string, custom header values or in POST content.
@@ -70,6 +70,9 @@
         <li><b>${PULL_REQUEST_AUTHOR_ID}</b> Example: 1</li>
         <li><b>${PULL_REQUEST_AUTHOR_NAME}</b> Example: admin</li>
         <li><b>${PULL_REQUEST_AUTHOR_SLUG}</b> Example: admin</li>
+        <li><b>${PULL_REQUEST_REVIEWERS}</b> Reviewers list.</li>
+        <li><b>${PULL_REQUEST_REVIEWERS_ID}</b> Reviewers ID list.</li>
+        <li><b>${PULL_REQUEST_REVIEWERS_SLUG}</b> Reviewers slug list.</li>
         <li><b>${PULL_REQUEST_REVIEWERS_APPROVED_COUNT}</b> Number of reviewers that approved the PR.</li>
         <li><b>${PULL_REQUEST_PARTICIPANTS_APPROVED_COUNT}</b> Number of participants that approved the PR.</li>
         <li><b>${PULL_REQUEST_MERGE_COMMIT}</b> Hash of merged commit (only available for merged-event).</li>
@@ -96,10 +99,10 @@
         </ul>
       </div>
     </div>
-    
+
     <div class="prnfb-TRIGGER_CONFIG_FORM">
     </div>
-    
+
     <div class="prnfb-template prnfb-template-BUTTON_CONFIG_FORM">
      <form class="config-area">
        <div class="content">
@@ -133,7 +136,7 @@
        </div>
      </form>
     </div>
-    
+
     <div class="prnfb-template prnfb-template-TRIGGER_CONFIG_FORM">
      <form class="trigger config-area">
       <div class="expandable">