opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.11'

Browse Source 
* stable-2.11:
  Don't suggest inactive accounts
This commit is contained in:
Shawn Pearce
2015-07-22 08:40:00 -07:00
parent 3b6e5050c8 00b083916d
commit 9f01d88538
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gerrit-server/src/main/java/com/google/gerrit/server/account/SuggestAccounts.java
View File

@@ -45,6 +45,7 @@ public class SuggestAccounts implements RestReadView<TopLevelResource> {
private final AccountControl accountControl;
private final AccountLoader accountLoader;
private final AccountCache accountCache;
private final ReviewDb db;
private final boolean suggest;
private final int suggestFrom;
@@ -71,10 +72,12 @@ public class SuggestAccounts implements RestReadView<TopLevelResource> {
@Inject
SuggestAccounts(AccountControl.Factory accountControlFactory,
AccountLoader.Factory accountLoaderFactory,
AccountCache accountCache,
ReviewDb db,
@GerritServerConfig Config cfg) {
accountControl = accountControlFactory.get();
accountLoader = accountLoaderFactory.create(true);
this.accountCache = accountCache;
this.db = db;
this.suggestFrom = cfg.getInt("suggest", null, "from", 0);
@@ -111,12 +114,12 @@ public class SuggestAccounts implements RestReadView<TopLevelResource> {
Map<Account.Id, String> queryEmail = new HashMap<>();
for (Account p : db.accounts().suggestByFullName(a, b, limit)) {
addSuggestion(matches, p.getId());
addSuggestion(matches, p);
}
if (matches.size() < limit) {
for (Account p : db.accounts()
.suggestByPreferredEmail(a, b, limit - matches.size())) {
addSuggestion(matches, p.getId());
addSuggestion(matches, p);
}
}
if (matches.size() < limit) {
@@ -149,11 +152,20 @@ public class SuggestAccounts implements RestReadView<TopLevelResource> {
return m;
}
private boolean addSuggestion(Map<Account.Id, AccountInfo> map, Account.Id id) {
private boolean addSuggestion(Map<Account.Id, AccountInfo> map, Account a) {
if (!a.isActive()) {
return false;
}
Account.Id id = a.getId();
if (!map.containsKey(id) && accountControl.canSee(id)) {
map.put(id, accountLoader.get(id));
return true;
}
return false;
}
private boolean addSuggestion(Map<Account.Id, AccountInfo> map, Account.Id id) {
Account a = accountCache.get(id).getAccount();
return addSuggestion(map, a);
}
}