opendev/gerrit
Code Issues Proposed changes

Merge changes I782dd3fb,I9ea1cb53

Browse Source 
* changes:
  InternalAccountDirectory: Use AccountCache#maybeGet instead of AccountCache#get
  Simplify InternalAccountDirectory#fill method
This commit is contained in:
Dave Borowitz
2018-01-26 17:28:05 +00:00
committed by Gerrit Code Review
parent 0671cc65cb e7ceec5313
commit 4b6530779e
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
java/com/google/gerrit/server/account/InternalAccountDirectory.java
View File

@@ -17,7 +17,6 @@ package com.google.gerrit.server.account;
import static java.util.stream.Collectors.toList;
import com.google.common.base.Strings;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.extensions.common.AccountInfo;
import com.google.gerrit.extensions.common.AvatarInfo;
import com.google.gerrit.extensions.registration.DynamicItem;
@@ -33,6 +32,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.EnumSet;
import java.util.List;
import java.util.Optional;
import java.util.Set;
@Singleton
@@ -68,16 +68,16 @@ public class InternalAccountDirectory extends AccountDirectory {
}
for (AccountInfo info : in) {
Account.Id id = new Account.Id(info._accountId);
AccountState state = accountCache.get(id);
fill(info, state, state.getExternalIds(), options);
Optional<AccountState> state = accountCache.maybeGet(id);
if (state.isPresent()) {
fill(info, state.get(), options);
} else {
info._accountId = options.contains(FillOptions.ID) ? id.get() : null;
}
}
}
private void fill(
AccountInfo info,
AccountState accountState,
@Nullable Collection<ExternalId> externalIds,
Set<FillOptions> options) {
private void fill(AccountInfo info, AccountState accountState, Set<FillOptions> options) {
Account account = accountState.getAccount();
if (options.contains(FillOptions.ID)) {
info._accountId = account.getId().get();
@@ -95,10 +95,10 @@ public class InternalAccountDirectory extends AccountDirectory {
info.email = account.getPreferredEmail();
}
if (options.contains(FillOptions.SECONDARY_EMAILS)) {
info.secondaryEmails = externalIds != null ? getSecondaryEmails(account, externalIds) : null;
info.secondaryEmails = getSecondaryEmails(account, accountState.getExternalIds());
}
if (options.contains(FillOptions.USERNAME)) {
info.username = externalIds != null ? ExternalId.getUserName(externalIds).orElse(null) : null;
info.username = accountState.getUserName().orElse(null);
}
if (options.contains(FillOptions.STATUS)) {