| commit | 79649cc4881cda91330b5de79b7a80551c9745cb | [log] [tgz] |
|---|---|---|
| author | Patrick Hiesel <hiesel@google.com> | Thu Jul 25 09:54:33 2019 +0200 |
| committer | Patrick Hiesel <hiesel@google.com> | Thu Jul 25 09:55:19 2019 +0200 |
| tree | 9ee05dc47a4e85d82a4b35a847399f53e460dd05 | |
| parent | a504e1e430cccb05ac3fe3bd3c2c837666c74fae [diff] |
Adapt to Account being an AutoValue in core and run google-java-format Change-Id: Ia5c17ca4b238aa4428fa975ea38f96770e1e502a
diff --git a/src/main/java/com/googlesource/gerrit/plugins/uploadvalidator/ValidatorConfig.java b/src/main/java/com/googlesource/gerrit/plugins/uploadvalidator/ValidatorConfig.java index f9f30c0..ba940df 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/uploadvalidator/ValidatorConfig.java +++ b/src/main/java/com/googlesource/gerrit/plugins/uploadvalidator/ValidatorConfig.java
@@ -176,8 +176,7 @@ } private AccountGroup.UUID groupUUID(String groupNameOrUUID) { - Optional<InternalGroup> group = - groupByNameFinder.get(AccountGroup.nameKey(groupNameOrUUID)); + Optional<InternalGroup> group = groupByNameFinder.get(AccountGroup.nameKey(groupNameOrUUID)); return group.map(InternalGroup::getGroupUUID).orElse(AccountGroup.uuid(groupNameOrUUID)); }
diff --git a/src/test/java/com/googlesource/gerrit/plugins/uploadvalidator/FakeUserProvider.java b/src/test/java/com/googlesource/gerrit/plugins/uploadvalidator/FakeUserProvider.java index ff79961..978020e 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/uploadvalidator/FakeUserProvider.java +++ b/src/test/java/com/googlesource/gerrit/plugins/uploadvalidator/FakeUserProvider.java
@@ -43,8 +43,8 @@ private IdentifiedUser createNew(String email) { IdentifiedUser user = createMock(IdentifiedUser.class); - Account account = new Account(Account.id(1), TimeUtil.nowTs()); - account.setPreferredEmail(email); + Account account = + Account.builder(Account.id(1), TimeUtil.nowTs()).setPreferredEmail(email).build(); expect(user.isIdentifiedUser()).andReturn(true); expect(user.asIdentifiedUser()).andReturn(user); expect(user.getAccount()).andStubReturn(account);