From 46949f7f92360f8200f2f3ab25ee040624f10137 Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Thu, 13 Oct 2016 15:52:40 -0400 Subject: [PATCH] AccountCacheImpl: Use java.util.Optional Change-Id: I7e25ee99a59231a34f5ff4174f844b0c1d0e1a8d --- .../gerrit/server/account/AccountCacheImpl.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountCacheImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountCacheImpl.java index 149931d856..846b44b925 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountCacheImpl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountCacheImpl.java @@ -14,7 +14,6 @@ package com.google.gerrit.server.account; -import com.google.common.base.Optional; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import com.google.common.collect.ImmutableSet; @@ -52,6 +51,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.Map; +import java.util.Optional; import java.util.Set; import java.util.concurrent.ExecutionException; @@ -252,17 +252,13 @@ public class AccountCacheImpl implements AccountCache { if (accountIndexes.getSearchIndex() != null) { AccountState accountState = accountQueryProvider.get().oneByExternalId(key.get()); - return accountState != null - ? Optional.of(accountState.getAccount().getId()) - : Optional.absent(); + return Optional.ofNullable(accountState) + .map(s -> s.getAccount().getId()); } try (ReviewDb db = schema.open()) { - AccountExternalId id = db.accountExternalIds().get(key); - if (id != null) { - return Optional.of(id.getAccountId()); - } - return Optional.absent(); + return Optional.ofNullable(db.accountExternalIds().get(key)) + .map(AccountExternalId::getAccountId); } } }