opendev/gerrit
Code Issues Proposed changes

Make Account an AutoValue

Browse Source 
Change-Id: Iaf2fc09dee221cf25d05932ba8ccf30b047da014
This commit is contained in:
Patrick Hiesel
2019-07-23 15:04:06 +02:00
parent c9b0eb1849
commit cd7077cd9e
98 changed files with 422 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
java/com/google/gerrit/acceptance/testsuite/account/AccountOperationsImpl.java
View File

@@ -61,9 +61,9 @@ public class AccountOperationsImpl implements AccountOperations {
private Account.Id createAccount(TestAccountCreation accountCreation) throws Exception {
AccountsUpdate.AccountUpdater accountUpdater =
(account, updateBuilder) ->
fillBuilder(updateBuilder, accountCreation, account.getAccount().getId());
fillBuilder(updateBuilder, accountCreation, account.getAccount().id());
AccountState createdAccount = createAccount(accountUpdater);
return createdAccount.getAccount().getId();
return createdAccount.getAccount().id();
}
private AccountState createAccount(AccountsUpdate.AccountUpdater accountUpdater)
@@ -131,9 +131,9 @@ public class AccountOperationsImpl implements AccountOperations {
private TestAccount toTestAccount(AccountState accountState) {
Account account = accountState.getAccount();
return TestAccount.builder()
.accountId(account.getId())
.preferredEmail(Optional.ofNullable(account.getPreferredEmail()))
.fullname(Optional.ofNullable(account.getFullName()))
.accountId(account.id())
.preferredEmail(Optional.ofNullable(account.preferredEmail()))
.fullname(Optional.ofNullable(account.fullName()))
.username(accountState.getUserName())
.active(accountState.getAccount().isActive())
.build();