diff options
author | Maxim Epishchev <epishev@garant.ru> | 2016-01-13 15:46:45 +0300 |
---|---|---|
committer | Maxim Epishchev <epishev@garant.ru> | 2016-01-13 19:41:17 +0300 |
commit | 523e5384fc123a554d9a0babc1ae3493d50499bb (patch) | |
tree | c58e665229297b52ba509e47d1363c7fdcd5d45d /src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketRepository.java | |
parent | 75c0d8c06f0202e8b602f2a09a76a3e427aba0bc (diff) | |
download | bbprb-523e5384fc123a554d9a0babc1ae3493d50499bb.tar.gz |
Add branches to build filter (similar issue:61)
Diffstat (limited to 'src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketRepository.java')
-rw-r--r-- | src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketRepository.java | 19 |
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); + } } |