opendev/gerrit
Code Issues Proposed changes

LDAP: Use java.util.Optional

Browse Source 
Change-Id: I1323e79836f2a0acbdef8331165fb63146cfe87a
This commit is contained in:
Dave Borowitz
2016-10-13 16:00:13 -04:00
parent 3d825003c1
commit b06cfdbe4b
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapModule.java
View File

@@ -16,7 +16,6 @@ package com.google.gerrit.server.auth.ldap;
import static java.util.concurrent.TimeUnit.HOURS; import static java.util.concurrent.TimeUnit.HOURS;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.google.gerrit.extensions.registration.DynamicSet; import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Account;
@@ -27,6 +26,7 @@ import com.google.gerrit.server.cache.CacheModule;
import com.google.inject.Scopes; import com.google.inject.Scopes;
import com.google.inject.TypeLiteral; import com.google.inject.TypeLiteral;
import java.util.Optional;
import java.util.Set; import java.util.Set;
public class LdapModule extends CacheModule { public class LdapModule extends CacheModule {

15
gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapRealm.java
View File

@@ -16,7 +16,6 @@ package com.google.gerrit.server.auth.ldap;
import static com.google.gerrit.reviewdb.client.AccountExternalId.SCHEME_GERRIT; import static com.google.gerrit.reviewdb.client.AccountExternalId.SCHEME_GERRIT;
import com.google.common.base.Optional;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.google.common.cache.CacheLoader; import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache; import com.google.common.cache.LoadingCache;
@@ -49,6 +48,7 @@ import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
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;
@@ -295,7 +295,7 @@ class LdapRealm extends AbstractRealm {
} }
try { try {
Optional<Account.Id> id = usernameCache.get(accountName); Optional<Account.Id> id = usernameCache.get(accountName);
return id != null ? id.orNull() : null; return id != null ? id.orElse(null) : null;
} catch (ExecutionException e) { } catch (ExecutionException e) {
log.warn(String.format("Cannot lookup account %s in LDAP", accountName), e); log.warn(String.format("Cannot lookup account %s in LDAP", accountName), e);
return null; return null;
@@ -313,13 +313,10 @@ class LdapRealm extends AbstractRealm {
@Override @Override
public Optional<Account.Id> load(String username) throws Exception { public Optional<Account.Id> load(String username) throws Exception {
try (ReviewDb db = schema.open()) { try (ReviewDb db = schema.open()) {
final AccountExternalId extId = return Optional.ofNullable(
db.accountExternalIds().get( db.accountExternalIds().get(
new AccountExternalId.Key(SCHEME_GERRIT, username)); new AccountExternalId.Key(SCHEME_GERRIT, username)))
if (extId != null) { .map(AccountExternalId::getAccountId);
return Optional.of(extId.getAccountId());
}
return Optional.absent();
} }
} }
} }