Add branches to build filter (similar issue:61)

1 files changed, 18 insertions, 1 deletions

diff --git a/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketRepository.java b/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketRepository.java
index dd0f5e5..e0a4b19 100644
--- a/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketRepository.java
+++ b/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketRepository.java
@@ -100,7 +100,7 @@ public class BitbucketRepository {
 
     private boolean isBuildTarget(Pullrequest pullRequest) {
         if (pullRequest.getState() != null && pullRequest.getState().equals("OPEN")) {
-            if (isSkipBuild(pullRequest.getTitle())) {
+            if (isSkipBuild(pullRequest.getTitle()) || !isFilteredBuild(pullRequest)) {
                 return false;
             }
 
@@ -153,4 +153,21 @@ public class BitbucketRepository {
         }
         return false;
     }
+
+    private boolean isFilteredBuild(Pullrequest pullRequest) {
+        BitbucketCause cause = new BitbucketCause(
+          pullRequest.getSource().getBranch().getName(),
+          pullRequest.getDestination().getBranch().getName(),
+          pullRequest.getSource().getRepository().getOwnerName(),
+          pullRequest.getSource().getRepository().getRepositoryName(),
+          pullRequest.getId(),
+          pullRequest.getDestination().getRepository().getOwnerName(),
+          pullRequest.getDestination().getRepository().getRepositoryName(),
+          pullRequest.getTitle(),
+          pullRequest.getSource().getCommit().getHash(),
+          pullRequest.getDestination().getCommit().getHash()
+        );
+        BitbucketBuildFilter filter = new BitbucketBuildFilter(this.trigger.getBranchesFilter());
+        return filter.approved(cause);
+    }
 }