opendev/gerrit
Code Issues Proposed changes

AccountConfig: Return loaded account as Optional

Browse Source 
This makes AccountConfig a little more consistent with GroupConfig.
Also rename getAccount() to getLoadedAccount() for consistency with
GroupConfig.

Change-Id: Ic6c7fe195b92d1451e9ec362e045e7c034c3e28d
Signed-off-by: Edwin Kempin <ekempin@google.com>
This commit is contained in:
Edwin Kempin
2017-12-07 15:03:20 +01:00
parent 897267d3da
commit 02482662fe
5 changed files with 48 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
java/com/google/gerrit/server/account/AccountsUpdate.java
View File

@@ -35,6 +35,7 @@ import com.google.inject.Provider;
import com.google.inject.Singleton;
import java.io.IOException;
import java.util.List;
import java.util.Optional;
import java.util.function.Consumer;
import org.eclipse.jgit.errors.ConfigInvalidException;
import org.eclipse.jgit.lib.ObjectId;
@@ -231,6 +232,7 @@ public class AccountsUpdate {
* @throws IOException if updating the user branch fails
* @throws ConfigInvalidException if any of the account fields has an invalid value
*/
@Nullable
public Account update(Account.Id accountId, List<Consumer<Account>> consumers)
throws IOException, ConfigInvalidException {
if (consumers.isEmpty()) {
@@ -238,13 +240,13 @@ public class AccountsUpdate {
}
AccountConfig accountConfig = read(accountId);
Account account = accountConfig.getAccount();
if (account != null) {
consumers.stream().forEach(c -> c.accept(account));
Optional<Account> account = accountConfig.getLoadedAccount();
if (account.isPresent()) {
consumers.stream().forEach(c -> c.accept(account.get()));
commit(accountConfig);
}
return account;
return account.orElse(null);
}
/**