opendev/gerrit
Code Issues Proposed changes

Merge "Add @Nullable annotations for some Accounts methods "

Browse Source
This commit is contained in:
David Pursehouse
2017-11-14 23:38:27 +00:00
committed by Gerrit Code Review
parent fc8032393c 1f72443dff
commit d34ebab60b
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/com/google/gerrit/server/account/Accounts.java
View File

@@ -18,6 +18,7 @@ import static java.util.Comparator.comparing;
import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toList;
import static java.util.stream.Collectors.toSet; import static java.util.stream.Collectors.toSet;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.RefNames; import com.google.gerrit.reviewdb.client.RefNames;
import com.google.gerrit.server.config.AllUsersName; import com.google.gerrit.server.config.AllUsersName;
@@ -56,6 +57,7 @@ public class Accounts {
this.emailValidator = emailValidator; this.emailValidator = emailValidator;
} }
@Nullable
public Account get(Account.Id accountId) throws IOException, ConfigInvalidException { public Account get(Account.Id accountId) throws IOException, ConfigInvalidException {
try (Repository repo = repoManager.openRepository(allUsersName)) { try (Repository repo = repoManager.openRepository(allUsersName)) {
return read(repo, accountId); return read(repo, accountId);
@@ -133,6 +135,7 @@ public class Accounts {
} }
} }
@Nullable
private Account read(Repository allUsersRepository, Account.Id accountId) private Account read(Repository allUsersRepository, Account.Id accountId)
throws IOException, ConfigInvalidException { throws IOException, ConfigInvalidException {
AccountConfig accountConfig = new AccountConfig(emailValidator, accountId); AccountConfig accountConfig = new AccountConfig(emailValidator, accountId);