opendev/gerrit
Code Issues Proposed changes

AccountCacheImpl: Use java.util.Optional

Browse Source 
Change-Id: I7e25ee99a59231a34f5ff4174f844b0c1d0e1a8d
This commit is contained in:
Dave Borowitz
2016-10-13 15:52:40 -04:00
parent 1888a81fe4
commit 46949f7f92
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gerrit-server/src/main/java/com/google/gerrit/server/account/AccountCacheImpl.java
View File

@@ -14,7 +14,6 @@
package com.google.gerrit.server.account; package com.google.gerrit.server.account;
import com.google.common.base.Optional;
import com.google.common.cache.CacheLoader; import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache; import com.google.common.cache.LoadingCache;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
@@ -52,6 +51,7 @@ import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Map; import java.util.Map;
import java.util.Optional;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
@@ -252,17 +252,13 @@ public class AccountCacheImpl implements AccountCache {
if (accountIndexes.getSearchIndex() != null) { if (accountIndexes.getSearchIndex() != null) {
AccountState accountState = AccountState accountState =
accountQueryProvider.get().oneByExternalId(key.get()); accountQueryProvider.get().oneByExternalId(key.get());
return accountState != null return Optional.ofNullable(accountState)
? Optional.of(accountState.getAccount().getId()) .map(s -> s.getAccount().getId());
: Optional.<Account.Id>absent();
} }
try (ReviewDb db = schema.open()) { try (ReviewDb db = schema.open()) {
AccountExternalId id = db.accountExternalIds().get(key); return Optional.ofNullable(db.accountExternalIds().get(key))
if (id != null) { .map(AccountExternalId::getAccountId);
return Optional.of(id.getAccountId());
}
return Optional.absent();
} }
} }
} }