Skip to content

Fix typo in BranchFilter #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
memoricab wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix typo in BranchFilter #156

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/main/java/in/ashwanthkumar/gocd/github/util/BranchFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,23 @@ public class BranchFilter {

public static final String NO_BRANCHES = "";
private final BranchMatcher blacklistedBranches;
private final BranchMatcher whitelistedBrandches;
private final BranchMatcher whitelistedBranches;

public BranchFilter() {
this(NO_BRANCHES, NO_BRANCHES);
}

public BranchFilter(String blacklistOption, String whitelistOption) {
this.blacklistedBranches = new BranchMatcher(blacklistOption, BranchMatcher.Mode.FAIL_EMPTY);
this.whitelistedBrandches = new BranchMatcher(whitelistOption, BranchMatcher.Mode.PASS_EMPTY);
this.whitelistedBranches = new BranchMatcher(whitelistOption, BranchMatcher.Mode.PASS_EMPTY);
}

public boolean isBranchValid(String branch) {
if (branch == null) {
return false;
} else if (whitelistedBrandches.isEmpty() && blacklistedBranches.isEmpty()) {
} else if (whitelistedBranches.isEmpty() && blacklistedBranches.isEmpty()) {
return true;
} else if (whitelistedBrandches.matches(branch) && !blacklistedBranches.matches(branch)) {
} else if (whitelistedBranches.matches(branch) && !blacklistedBranches.matches(branch)) {
return true;
} else {
return false;
Expand Down