opendev/gerrit
Code Issues Proposed changes

GerritPublicKeyChecker: Use ternary instead of MoreObjects.firstNonNull

Browse Source 
Change-Id: I632d502fd56bc6af7d33bf87c143775a664c9d9b
This commit is contained in:
David Pursehouse
2016-10-25 20:18:31 +09:00
parent f853fad152
commit 74dd282c6e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gerrit-gpg/src/main/java/com/google/gerrit/gpg/GerritPublicKeyChecker.java
View File

@@ -18,7 +18,6 @@ import static com.google.gerrit.gpg.PublicKeyStore.keyIdToString;
import static com.google.gerrit.reviewdb.client.AccountExternalId.SCHEME_GPGKEY; import static com.google.gerrit.reviewdb.client.AccountExternalId.SCHEME_GPGKEY;
import com.google.common.base.CharMatcher; import com.google.common.base.CharMatcher;
import com.google.common.base.MoreObjects;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.google.common.io.BaseEncoding; import com.google.common.io.BaseEncoding;
@@ -228,9 +227,10 @@ public class GerritPublicKeyChecker extends PublicKeyChecker {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private Iterator<PGPSignature> getSignaturesForId(PGPPublicKey key, private Iterator<PGPSignature> getSignaturesForId(PGPPublicKey key,
String userId) { String userId) {
return MoreObjects.firstNonNull( Iterator<PGPSignature> result = key.getSignaturesForID(userId);
key.getSignaturesForID(userId), return result != null
Collections.emptyIterator()); ? result
: Collections.emptyIterator();
} }
private Set<String> getAllowedUserIds(IdentifiedUser user) { private Set<String> getAllowedUserIds(IdentifiedUser user) {