From 390e4c650b7805b20a1957b0148c7261e97d3aca Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Wed, 17 Apr 2019 13:13:19 -0700 Subject: [PATCH] Convert AccountGroup.NameKey to AutoValue See I6982fb24 for context. Change-Id: I7a312c4aee94c8e2ebd7c2542c760ce54f190f04 --- .../gerrit/acceptance/AbstractDaemonTest.java | 6 +- .../gerrit/acceptance/AccountCreator.java | 2 +- .../testsuite/group/GroupOperationsImpl.java | 4 +- .../gerrit/reviewdb/client/AccountGroup.java | 31 +++---- .../server/account/CreateGroupArgs.java | 2 +- .../gerrit/server/account/GroupCacheImpl.java | 2 +- .../server/args4j/AccountGroupIdHandler.java | 2 +- .../server/group/db/GroupConfigEntry.java | 2 +- .../server/group/db/GroupNameNotes.java | 2 +- .../db/GroupsNoteDbConsistencyChecker.java | 2 +- .../gerrit/server/restapi/group/PutName.java | 2 +- .../server/schema/SchemaCreatorImpl.java | 2 +- .../sshd/commands/ListMembersCommand.java | 2 +- .../api/group/GroupsConsistencyIT.java | 4 +- .../gerrit/acceptance/api/group/GroupsIT.java | 4 +- .../acceptance/api/group/GroupsUpdateIT.java | 4 +- .../acceptance/rest/change/IndexChangeIT.java | 2 +- .../rest/project/CreateProjectIT.java | 2 +- .../group/GroupOperationsImplTest.java | 2 +- .../reviewdb/client/AccountGroupTest.java | 6 +- .../server/group/db/AuditLogReaderTest.java | 2 +- .../server/group/db/GroupConfigTest.java | 83 ++++++------------- .../server/group/db/GroupNameNotesTest.java | 48 +++++------ .../GroupsNoteDbConsistencyCheckerTest.java | 16 ++-- .../gerrit/server/schema/TestGroup.java | 4 +- 25 files changed, 106 insertions(+), 132 deletions(-) diff --git a/java/com/google/gerrit/acceptance/AbstractDaemonTest.java b/java/com/google/gerrit/acceptance/AbstractDaemonTest.java index bb6a4b46eb..c94a738c66 100644 --- a/java/com/google/gerrit/acceptance/AbstractDaemonTest.java +++ b/java/com/google/gerrit/acceptance/AbstractDaemonTest.java @@ -1322,13 +1322,13 @@ public abstract class AbstractDaemonTest { } protected InternalGroup group(String groupName) { - InternalGroup group = groupCache.get(new AccountGroup.NameKey(groupName)).orElse(null); + InternalGroup group = groupCache.get(AccountGroup.nameKey(groupName)).orElse(null); assertThat(group).named(groupName).isNotNull(); return group; } protected GroupReference groupRef(String groupName) { - InternalGroup group = groupCache.get(new AccountGroup.NameKey(groupName)).orElse(null); + InternalGroup group = groupCache.get(AccountGroup.nameKey(groupName)).orElse(null); assertThat(group).isNotNull(); return new GroupReference(group.getGroupUUID(), group.getName()); } @@ -1350,7 +1350,7 @@ public abstract class AbstractDaemonTest { } protected void assertGroupDoesNotExist(String groupName) { - InternalGroup group = groupCache.get(new AccountGroup.NameKey(groupName)).orElse(null); + InternalGroup group = groupCache.get(AccountGroup.nameKey(groupName)).orElse(null); assertThat(group).named(groupName).isNull(); } diff --git a/java/com/google/gerrit/acceptance/AccountCreator.java b/java/com/google/gerrit/acceptance/AccountCreator.java index aeae2c2cfd..8e3e656b54 100644 --- a/java/com/google/gerrit/acceptance/AccountCreator.java +++ b/java/com/google/gerrit/acceptance/AccountCreator.java @@ -98,7 +98,7 @@ public class AccountCreator { if (groupNames != null) { for (String n : groupNames) { - AccountGroup.NameKey k = new AccountGroup.NameKey(n); + AccountGroup.NameKey k = AccountGroup.nameKey(n); Optional group = groupCache.get(k); if (!group.isPresent()) { throw new NoSuchGroupException(n); diff --git a/java/com/google/gerrit/acceptance/testsuite/group/GroupOperationsImpl.java b/java/com/google/gerrit/acceptance/testsuite/group/GroupOperationsImpl.java index e0ddee56fd..add3fd1f43 100644 --- a/java/com/google/gerrit/acceptance/testsuite/group/GroupOperationsImpl.java +++ b/java/com/google/gerrit/acceptance/testsuite/group/GroupOperationsImpl.java @@ -81,7 +81,7 @@ public class GroupOperationsImpl implements GroupOperations { AccountGroup.Id groupId = new AccountGroup.Id(seq.nextGroupId()); String groupName = groupCreation.name().orElse("group-with-id-" + groupId.get()); AccountGroup.UUID groupUuid = GroupUUID.make(groupName, serverIdent); - AccountGroup.NameKey nameKey = new AccountGroup.NameKey(groupName); + AccountGroup.NameKey nameKey = AccountGroup.nameKey(groupName); return InternalGroupCreation.builder() .setId(groupId) .setGroupUUID(groupUuid) @@ -153,7 +153,7 @@ public class GroupOperationsImpl implements GroupOperations { private InternalGroupUpdate toInternalGroupUpdate(TestGroupUpdate groupUpdate) { InternalGroupUpdate.Builder builder = InternalGroupUpdate.builder(); - groupUpdate.name().map(AccountGroup.NameKey::new).ifPresent(builder::setName); + groupUpdate.name().map(AccountGroup::nameKey).ifPresent(builder::setName); groupUpdate.description().ifPresent(builder::setDescription); groupUpdate.ownerGroupUuid().ifPresent(builder::setOwnerGroupUUID); groupUpdate.visibleToAll().ifPresent(builder::setVisibleToAll); diff --git a/java/com/google/gerrit/reviewdb/client/AccountGroup.java b/java/com/google/gerrit/reviewdb/client/AccountGroup.java index 10e302b8ff..da7314ecc5 100644 --- a/java/com/google/gerrit/reviewdb/client/AccountGroup.java +++ b/java/com/google/gerrit/reviewdb/client/AccountGroup.java @@ -14,8 +14,10 @@ package com.google.gerrit.reviewdb.client; +import com.google.auto.value.AutoValue; import com.google.gerrit.common.Nullable; import com.google.gwtorm.client.IntKey; +import com.google.gwtorm.client.StandardKeyEncoder; import com.google.gwtorm.client.StringKey; import java.sql.Timestamp; import java.time.Instant; @@ -33,26 +35,27 @@ public final class AccountGroup { return Timestamp.from(AUDIT_CREATION_INSTANT_MS); } + public static NameKey nameKey(String n) { + return new AutoValue_AccountGroup_NameKey(n); + } + /** Group name key */ - public static class NameKey extends StringKey> { - private static final long serialVersionUID = 1L; + @AutoValue + public abstract static class NameKey implements Comparable { + abstract String name(); - protected String name; - - protected NameKey() {} - - public NameKey(String n) { - name = n; - } - - @Override public String get() { - return name; + return name(); } @Override - protected void set(String newValue) { - name = newValue; + public int compareTo(NameKey o) { + return name().compareTo(o.name()); + } + + @Override + public String toString() { + return new StandardKeyEncoder().encode(get()); } } diff --git a/java/com/google/gerrit/server/account/CreateGroupArgs.java b/java/com/google/gerrit/server/account/CreateGroupArgs.java index 5bcb84b1b6..573baeec8b 100644 --- a/java/com/google/gerrit/server/account/CreateGroupArgs.java +++ b/java/com/google/gerrit/server/account/CreateGroupArgs.java @@ -34,7 +34,7 @@ public class CreateGroupArgs { } public void setGroupName(String n) { - groupName = n != null ? new AccountGroup.NameKey(n) : null; + groupName = n != null ? AccountGroup.nameKey(n) : null; } public void setGroupName(AccountGroup.NameKey n) { diff --git a/java/com/google/gerrit/server/account/GroupCacheImpl.java b/java/com/google/gerrit/server/account/GroupCacheImpl.java index c85e2dfb39..9f7954d946 100644 --- a/java/com/google/gerrit/server/account/GroupCacheImpl.java +++ b/java/com/google/gerrit/server/account/GroupCacheImpl.java @@ -166,7 +166,7 @@ public class GroupCacheImpl implements GroupCache { @Override public Optional load(String name) throws Exception { try (TraceTimer timer = TraceContext.newTimer("Loading group '%s' by name", name)) { - return groupQueryProvider.get().byName(new AccountGroup.NameKey(name)); + return groupQueryProvider.get().byName(AccountGroup.nameKey(name)); } } } diff --git a/java/com/google/gerrit/server/args4j/AccountGroupIdHandler.java b/java/com/google/gerrit/server/args4j/AccountGroupIdHandler.java index 46a22c06ed..34864f9858 100644 --- a/java/com/google/gerrit/server/args4j/AccountGroupIdHandler.java +++ b/java/com/google/gerrit/server/args4j/AccountGroupIdHandler.java @@ -45,7 +45,7 @@ public class AccountGroupIdHandler extends OptionHandler { @Override public final int parseArguments(Parameters params) throws CmdLineException { final String n = params.getParameter(0); - Optional group = groupCache.get(new AccountGroup.NameKey(n)); + Optional group = groupCache.get(AccountGroup.nameKey(n)); if (!group.isPresent()) { throw new CmdLineException(owner, localizable("Group \"%s\" does not exist"), n); } diff --git a/java/com/google/gerrit/server/group/db/GroupConfigEntry.java b/java/com/google/gerrit/server/group/db/GroupConfigEntry.java index f7a104d7d9..37f49cfa44 100644 --- a/java/com/google/gerrit/server/group/db/GroupConfigEntry.java +++ b/java/com/google/gerrit/server/group/db/GroupConfigEntry.java @@ -77,7 +77,7 @@ enum GroupConfigEntry { // the NoteDb migration converted such groups faithfully, so we need to be able to read them // back here. name = Strings.nullToEmpty(name); - group.setNameKey(new AccountGroup.NameKey(name)); + group.setNameKey(AccountGroup.nameKey(name)); } @Override diff --git a/java/com/google/gerrit/server/group/db/GroupNameNotes.java b/java/com/google/gerrit/server/group/db/GroupNameNotes.java index eda7153cf2..e5108b3a6b 100644 --- a/java/com/google/gerrit/server/group/db/GroupNameNotes.java +++ b/java/com/google/gerrit/server/group/db/GroupNameNotes.java @@ -266,7 +266,7 @@ public class GroupNameNotes extends VersionedMetaData { RevCommit oldCommit = ref != null ? rw.parseCommit(ref.getObjectId()) : null; for (Map.Entry e : biMap.entrySet()) { - AccountGroup.NameKey nameKey = new AccountGroup.NameKey(e.getValue()); + AccountGroup.NameKey nameKey = AccountGroup.nameKey(e.getValue()); ObjectId noteKey = getNoteKey(nameKey); noteMap.set(noteKey, getAsNoteData(e.getKey(), nameKey), inserter); } diff --git a/java/com/google/gerrit/server/group/db/GroupsNoteDbConsistencyChecker.java b/java/com/google/gerrit/server/group/db/GroupsNoteDbConsistencyChecker.java index c3ca60bf11..cea8101165 100644 --- a/java/com/google/gerrit/server/group/db/GroupsNoteDbConsistencyChecker.java +++ b/java/com/google/gerrit/server/group/db/GroupsNoteDbConsistencyChecker.java @@ -163,7 +163,7 @@ public class GroupsNoteDbConsistencyChecker { continue; } - ObjectId nameKey = GroupNameNotes.getNoteKey(new AccountGroup.NameKey(gRef.getName())); + ObjectId nameKey = GroupNameNotes.getNoteKey(AccountGroup.nameKey(gRef.getName())); if (!Objects.equals(nameKey, note)) { result.problems.add( error("notename entry %s does not match name %s", note, gRef.getName())); diff --git a/java/com/google/gerrit/server/restapi/group/PutName.java b/java/com/google/gerrit/server/restapi/group/PutName.java index 319dc45050..0cf5fa9dd7 100644 --- a/java/com/google/gerrit/server/restapi/group/PutName.java +++ b/java/com/google/gerrit/server/restapi/group/PutName.java @@ -74,7 +74,7 @@ public class PutName implements RestModifyView { ConfigInvalidException { AccountGroup.UUID groupUuid = group.getGroupUUID(); InternalGroupUpdate groupUpdate = - InternalGroupUpdate.builder().setName(new AccountGroup.NameKey(newName)).build(); + InternalGroupUpdate.builder().setName(AccountGroup.nameKey(newName)).build(); try { groupsUpdateProvider.get().updateGroup(groupUuid, groupUpdate); } catch (NoSuchGroupException e) { diff --git a/java/com/google/gerrit/server/schema/SchemaCreatorImpl.java b/java/com/google/gerrit/server/schema/SchemaCreatorImpl.java index 0a5823a743..5d77d685b5 100644 --- a/java/com/google/gerrit/server/schema/SchemaCreatorImpl.java +++ b/java/com/google/gerrit/server/schema/SchemaCreatorImpl.java @@ -218,7 +218,7 @@ public class SchemaCreatorImpl implements SchemaCreator { private InternalGroupCreation getGroupCreation(Sequences seqs, GroupReference groupReference) { int next = seqs.nextGroupId(); return InternalGroupCreation.builder() - .setNameKey(new AccountGroup.NameKey(groupReference.getName())) + .setNameKey(AccountGroup.nameKey(groupReference.getName())) .setId(new AccountGroup.Id(next)) .setGroupUUID(groupReference.getUUID()) .build(); diff --git a/java/com/google/gerrit/sshd/commands/ListMembersCommand.java b/java/com/google/gerrit/sshd/commands/ListMembersCommand.java index 1565ecb8bc..38feecf4b9 100644 --- a/java/com/google/gerrit/sshd/commands/ListMembersCommand.java +++ b/java/com/google/gerrit/sshd/commands/ListMembersCommand.java @@ -69,7 +69,7 @@ public class ListMembersCommand extends SshCommand { } void display(PrintWriter writer) throws PermissionBackendException { - Optional group = groupCache.get(new AccountGroup.NameKey(name)); + Optional group = groupCache.get(AccountGroup.nameKey(name)); String errorText = "Group not found or not visible\n"; if (!group.isPresent()) { diff --git a/javatests/com/google/gerrit/acceptance/api/group/GroupsConsistencyIT.java b/javatests/com/google/gerrit/acceptance/api/group/GroupsConsistencyIT.java index e269e682f5..d90f2e06d2 100644 --- a/javatests/com/google/gerrit/acceptance/api/group/GroupsConsistencyIT.java +++ b/javatests/com/google/gerrit/acceptance/api/group/GroupsConsistencyIT.java @@ -145,7 +145,7 @@ public class GroupsConsistencyIT extends AbstractDaemonTest { public void nameRefDoesNotParse() throws Exception { updateGroupFile( RefNames.REFS_GROUPNAMES, - GroupNameNotes.getNoteKey(new AccountGroup.NameKey(g1.name)).getName(), + GroupNameNotes.getNoteKey(AccountGroup.nameKey(g1.name)).getName(), "[this is not valid\n"); assertError("does not parse"); } @@ -201,7 +201,7 @@ public class GroupsConsistencyIT extends AbstractDaemonTest { updateGroupFile( RefNames.REFS_GROUPNAMES, - GroupNameNotes.getNoteKey(new AccountGroup.NameKey(bogusName)).getName(), + GroupNameNotes.getNoteKey(AccountGroup.nameKey(bogusName)).getName(), config.toText()); assertError("entry missing as group ref"); } diff --git a/javatests/com/google/gerrit/acceptance/api/group/GroupsIT.java b/javatests/com/google/gerrit/acceptance/api/group/GroupsIT.java index fca94afc29..6bdd6ba946 100644 --- a/javatests/com/google/gerrit/acceptance/api/group/GroupsIT.java +++ b/javatests/com/google/gerrit/acceptance/api/group/GroupsIT.java @@ -214,7 +214,7 @@ public class GroupsIT extends AbstractDaemonTest { @Test public void cachedGroupByNameIsUpdatedOnCreation() throws Exception { String newGroupName = name("newGroup"); - AccountGroup.NameKey nameKey = new AccountGroup.NameKey(newGroupName); + AccountGroup.NameKey nameKey = AccountGroup.nameKey(newGroupName); assertThat(groupCache.get(nameKey)).isEmpty(); gApi.groups().create(newGroupName); assertThat(groupCache.get(nameKey)).isPresent(); @@ -1339,7 +1339,7 @@ public class GroupsIT extends AbstractDaemonTest { groupsUpdate.createGroupInNoteDb( InternalGroupCreation.builder() .setGroupUUID(groupUuid) - .setNameKey(new AccountGroup.NameKey(groupName)) + .setNameKey(AccountGroup.nameKey(groupName)) .setId(new AccountGroup.Id(seq.nextGroupId())) .build(), InternalGroupUpdate.builder().build()); diff --git a/javatests/com/google/gerrit/acceptance/api/group/GroupsUpdateIT.java b/javatests/com/google/gerrit/acceptance/api/group/GroupsUpdateIT.java index 5e143c0d8b..c703f25b00 100644 --- a/javatests/com/google/gerrit/acceptance/api/group/GroupsUpdateIT.java +++ b/javatests/com/google/gerrit/acceptance/api/group/GroupsUpdateIT.java @@ -65,7 +65,7 @@ public class GroupsUpdateIT { InternalGroupUpdate groupUpdate = InternalGroupUpdate.builder() - .setName(new AccountGroup.NameKey("contributors")) + .setName(AccountGroup.nameKey("contributors")) .setMemberModification( new CreateAnotherGroupOnceAsSideEffectOfMemberModification("verifiers")) .build(); @@ -108,7 +108,7 @@ public class GroupsUpdateIT { private static InternalGroupCreation getGroupCreation(String groupName, String groupUuid) { return InternalGroupCreation.builder() .setGroupUUID(new AccountGroup.UUID(groupUuid)) - .setNameKey(new AccountGroup.NameKey(groupName)) + .setNameKey(AccountGroup.nameKey(groupName)) .setId(new AccountGroup.Id(Math.abs(groupName.hashCode()))) .build(); } diff --git a/javatests/com/google/gerrit/acceptance/rest/change/IndexChangeIT.java b/javatests/com/google/gerrit/acceptance/rest/change/IndexChangeIT.java index f49d1fb156..00872680c9 100644 --- a/javatests/com/google/gerrit/acceptance/rest/change/IndexChangeIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/change/IndexChangeIT.java @@ -66,7 +66,7 @@ public class IndexChangeIT extends AbstractDaemonTest { Util.allow( u.getConfig(), Permission.READ, - groupCache.get(new AccountGroup.NameKey(group)).get().getGroupUUID(), + groupCache.get(AccountGroup.nameKey(group)).get().getGroupUUID(), "refs/*"); Util.block(u.getConfig(), Permission.READ, REGISTERED_USERS, "refs/*"); u.save(); diff --git a/javatests/com/google/gerrit/acceptance/rest/project/CreateProjectIT.java b/javatests/com/google/gerrit/acceptance/rest/project/CreateProjectIT.java index d8fbbe537b..5993dad81b 100644 --- a/javatests/com/google/gerrit/acceptance/rest/project/CreateProjectIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/project/CreateProjectIT.java @@ -265,7 +265,7 @@ public class CreateProjectIT extends AbstractDaemonTest { in.owners.add( Integer.toString( groupCache - .get(new AccountGroup.NameKey("Administrators")) + .get(AccountGroup.nameKey("Administrators")) .orElse(null) .getId() .get())); // by ID diff --git a/javatests/com/google/gerrit/acceptance/testsuite/group/GroupOperationsImplTest.java b/javatests/com/google/gerrit/acceptance/testsuite/group/GroupOperationsImplTest.java index f01ac00376..07b45f033b 100644 --- a/javatests/com/google/gerrit/acceptance/testsuite/group/GroupOperationsImplTest.java +++ b/javatests/com/google/gerrit/acceptance/testsuite/group/GroupOperationsImplTest.java @@ -269,7 +269,7 @@ public class GroupOperationsImplTest extends AbstractDaemonTest { AccountGroup.NameKey groupName = groupOperations.group(groupUuid).get().nameKey(); - assertThat(groupName).isEqualTo(new AccountGroup.NameKey("ABC-789-this-name-must-be-unique")); + assertThat(groupName).isEqualTo(AccountGroup.nameKey("ABC-789-this-name-must-be-unique")); } @Test diff --git a/javatests/com/google/gerrit/reviewdb/client/AccountGroupTest.java b/javatests/com/google/gerrit/reviewdb/client/AccountGroupTest.java index b269f11973..1ebdd3eff2 100644 --- a/javatests/com/google/gerrit/reviewdb/client/AccountGroupTest.java +++ b/javatests/com/google/gerrit/reviewdb/client/AccountGroupTest.java @@ -91,9 +91,9 @@ public class AccountGroupTest { @Test public void nameKeyToString() { - assertThat(new AccountGroup.NameKey("foo").toString()).isEqualTo("foo"); - assertThat(new AccountGroup.NameKey("foo bar").toString()).isEqualTo("foo+bar"); - assertThat(new AccountGroup.NameKey("foo:bar").toString()).isEqualTo("foo%3Abar"); + assertThat(AccountGroup.nameKey("foo").toString()).isEqualTo("foo"); + assertThat(AccountGroup.nameKey("foo bar").toString()).isEqualTo("foo+bar"); + assertThat(AccountGroup.nameKey("foo:bar").toString()).isEqualTo("foo%3Abar"); } private AccountGroup.UUID uuid(String uuid) { diff --git a/javatests/com/google/gerrit/server/group/db/AuditLogReaderTest.java b/javatests/com/google/gerrit/server/group/db/AuditLogReaderTest.java index ba94e859bd..28dcdc0743 100644 --- a/javatests/com/google/gerrit/server/group/db/AuditLogReaderTest.java +++ b/javatests/com/google/gerrit/server/group/db/AuditLogReaderTest.java @@ -239,7 +239,7 @@ public final class AuditLogReaderTest extends AbstractGroupTest { InternalGroupCreation groupCreation = InternalGroupCreation.builder() .setGroupUUID(GroupUUID.make(groupName, serverIdent)) - .setNameKey(new AccountGroup.NameKey(groupName)) + .setNameKey(AccountGroup.nameKey(groupName)) .setId(new AccountGroup.Id(next)) .build(); InternalGroupUpdate groupUpdate = diff --git a/javatests/com/google/gerrit/server/group/db/GroupConfigTest.java b/javatests/com/google/gerrit/server/group/db/GroupConfigTest.java index c9ba72ea2d..3cf4a0d72e 100644 --- a/javatests/com/google/gerrit/server/group/db/GroupConfigTest.java +++ b/javatests/com/google/gerrit/server/group/db/GroupConfigTest.java @@ -60,7 +60,7 @@ public class GroupConfigTest extends GerritBaseTests { private Repository repository; private TestRepository testRepository; private final AccountGroup.UUID groupUuid = new AccountGroup.UUID("users-XYZ"); - private final AccountGroup.NameKey groupName = new AccountGroup.NameKey("users"); + private final AccountGroup.NameKey groupName = AccountGroup.nameKey("users"); private final AccountGroup.Id groupId = new AccountGroup.Id(123); private final AuditLogFormatter auditLogFormatter = AuditLogFormatter.createBackedBy(ImmutableSet.of(), ImmutableSet.of(), "server-id"); @@ -95,7 +95,7 @@ public class GroupConfigTest extends GerritBaseTests { @Test public void nameOfGroupUpdateOverridesGroupCreation() throws Exception { - AccountGroup.NameKey anotherName = new AccountGroup.NameKey("Another name"); + AccountGroup.NameKey anotherName = AccountGroup.nameKey("Another name"); InternalGroupCreation groupCreation = getPrefilledGroupCreationBuilder().setNameKey(groupName).build(); @@ -109,20 +109,7 @@ public class GroupConfigTest extends GerritBaseTests { @Test public void nameOfNewGroupMustNotBeEmpty() throws Exception { InternalGroupCreation groupCreation = - getPrefilledGroupCreationBuilder().setNameKey(new AccountGroup.NameKey("")).build(); - GroupConfig groupConfig = GroupConfig.createForNewGroup(projectName, repository, groupCreation); - - try (MetaDataUpdate metaDataUpdate = createMetaDataUpdate()) { - exception.expectCause(instanceOf(ConfigInvalidException.class)); - exception.expectMessage("Name of the group " + groupUuid); - groupConfig.commit(metaDataUpdate); - } - } - - @Test - public void nameOfNewGroupMustNotBeNull() throws Exception { - InternalGroupCreation groupCreation = - getPrefilledGroupCreationBuilder().setNameKey(new AccountGroup.NameKey(null)).build(); + getPrefilledGroupCreationBuilder().setNameKey(AccountGroup.nameKey("")).build(); GroupConfig groupConfig = GroupConfig.createForNewGroup(projectName, repository, groupCreation); try (MetaDataUpdate metaDataUpdate = createMetaDataUpdate()) { @@ -526,7 +513,7 @@ public class GroupConfigTest extends GerritBaseTests { @Test public void nameCanBeUpdated() throws Exception { createArbitraryGroup(groupUuid); - AccountGroup.NameKey newName = new AccountGroup.NameKey("New name"); + AccountGroup.NameKey newName = AccountGroup.nameKey("New name"); InternalGroupUpdate groupUpdate = InternalGroupUpdate.builder().setName(newName).build(); updateGroup(groupUuid, groupUpdate); @@ -535,29 +522,13 @@ public class GroupConfigTest extends GerritBaseTests { assertThatGroup(group).value().nameKey().isEqualTo(newName); } - @Test - public void nameCannotBeUpdatedToNull() throws Exception { - createArbitraryGroup(groupUuid); - - GroupConfig groupConfig = GroupConfig.loadForGroup(projectName, repository, groupUuid); - InternalGroupUpdate groupUpdate = - InternalGroupUpdate.builder().setName(new AccountGroup.NameKey(null)).build(); - groupConfig.setGroupUpdate(groupUpdate, auditLogFormatter); - - try (MetaDataUpdate metaDataUpdate = createMetaDataUpdate()) { - exception.expectCause(instanceOf(ConfigInvalidException.class)); - exception.expectMessage("Name of the group " + groupUuid); - groupConfig.commit(metaDataUpdate); - } - } - @Test public void nameCannotBeUpdatedToEmptyString() throws Exception { createArbitraryGroup(groupUuid); GroupConfig groupConfig = GroupConfig.loadForGroup(projectName, repository, groupUuid); InternalGroupUpdate groupUpdate = - InternalGroupUpdate.builder().setName(new AccountGroup.NameKey("")).build(); + InternalGroupUpdate.builder().setName(AccountGroup.nameKey("")).build(); groupConfig.setGroupUpdate(groupUpdate, auditLogFormatter); try (MetaDataUpdate metaDataUpdate = createMetaDataUpdate()) { @@ -570,7 +541,7 @@ public class GroupConfigTest extends GerritBaseTests { @Test public void nameCanBeUpdatedToEmptyStringIfExplicitlySpecified() throws Exception { createArbitraryGroup(groupUuid); - AccountGroup.NameKey emptyName = new AccountGroup.NameKey(""); + AccountGroup.NameKey emptyName = AccountGroup.nameKey(""); GroupConfig groupConfig = GroupConfig.loadForGroup(projectName, repository, groupUuid); groupConfig.setAllowSaveEmptyName(); @@ -675,7 +646,7 @@ public class GroupConfigTest extends GerritBaseTests { InternalGroupUpdate laterGroupUpdate = InternalGroupUpdate.builder() - .setName(new AccountGroup.NameKey("Another name")) + .setName(AccountGroup.nameKey("Another name")) .setUpdatedOn(updatedOn) .build(); Optional group = updateGroup(groupCreation.getGroupUUID(), laterGroupUpdate); @@ -800,7 +771,7 @@ public class GroupConfigTest extends GerritBaseTests { .setDescription("A test group") .setOwnerGroupUUID(new AccountGroup.UUID("another owner")) .setVisibleToAll(true) - .setName(new AccountGroup.NameKey("Another name")) + .setName(AccountGroup.nameKey("Another name")) .setUpdatedOn(new Timestamp(92900892)) .setMemberModification(members -> ImmutableSet.of(new Account.Id(1), new Account.Id(2))) .setSubgroupModification( @@ -822,7 +793,7 @@ public class GroupConfigTest extends GerritBaseTests { .setDescription("A test group") .setOwnerGroupUUID(new AccountGroup.UUID("another owner")) .setVisibleToAll(true) - .setName(new AccountGroup.NameKey("Another name")) + .setName(AccountGroup.nameKey("Another name")) .setUpdatedOn(new Timestamp(92900892)) .setMemberModification(members -> ImmutableSet.of(new Account.Id(1), new Account.Id(2))) .setSubgroupModification( @@ -845,7 +816,7 @@ public class GroupConfigTest extends GerritBaseTests { .setDescription("A test group") .setOwnerGroupUUID(new AccountGroup.UUID("another owner")) .setVisibleToAll(true) - .setName(new AccountGroup.NameKey("Another name")) + .setName(AccountGroup.nameKey("Another name")) .setUpdatedOn(new Timestamp(92900892)) .setMemberModification(members -> ImmutableSet.of(new Account.Id(1), new Account.Id(2))) .setSubgroupModification( @@ -855,7 +826,7 @@ public class GroupConfigTest extends GerritBaseTests { // Only update one of the properties. InternalGroupUpdate groupUpdate = - InternalGroupUpdate.builder().setName(new AccountGroup.NameKey("Another name")).build(); + InternalGroupUpdate.builder().setName(AccountGroup.nameKey("Another name")).build(); Optional updatedGroup = updateGroup(groupCreation.getGroupUUID(), groupUpdate); Optional reloadedGroup = loadGroup(groupCreation.getGroupUUID()); @@ -870,7 +841,7 @@ public class GroupConfigTest extends GerritBaseTests { GroupConfig groupConfig = GroupConfig.createForNewGroup(projectName, repository, groupCreation); commit(groupConfig); - AccountGroup.NameKey name = new AccountGroup.NameKey("Robots"); + AccountGroup.NameKey name = AccountGroup.nameKey("Robots"); InternalGroupUpdate groupUpdate1 = InternalGroupUpdate.builder().setName(name).build(); groupConfig.setGroupUpdate(groupUpdate1, auditLogFormatter); commit(groupConfig); @@ -907,7 +878,7 @@ public class GroupConfigTest extends GerritBaseTests { RevCommit commitAfterCreation = getLatestCommitForGroup(groupUuid); InternalGroupUpdate groupUpdate = - InternalGroupUpdate.builder().setName(new AccountGroup.NameKey("Another name")).build(); + InternalGroupUpdate.builder().setName(AccountGroup.nameKey("Another name")).build(); updateGroup(groupUuid, groupUpdate); RevCommit commitAfterUpdate = getLatestCommitForGroup(groupUuid); @@ -1045,7 +1016,7 @@ public class GroupConfigTest extends GerritBaseTests { getPrefilledGroupCreationBuilder().setGroupUUID(groupUuid).build(); InternalGroupUpdate groupUpdate = - InternalGroupUpdate.builder().setName(new AccountGroup.NameKey("Another name")).build(); + InternalGroupUpdate.builder().setName(AccountGroup.nameKey("Another name")).build(); GroupConfig groupConfig = GroupConfig.createForNewGroup(projectName, repository, groupCreation); groupConfig.setGroupUpdate(groupUpdate, auditLogFormatter); @@ -1128,7 +1099,7 @@ public class GroupConfigTest extends GerritBaseTests { .build(); InternalGroupUpdate groupUpdate = InternalGroupUpdate.builder() - .setName(new AccountGroup.NameKey("Another name")) + .setName(AccountGroup.nameKey("Another name")) .setUpdatedOn(createdOn) .build(); GroupConfig groupConfig = GroupConfig.createForNewGroup(projectName, repository, groupCreation); @@ -1161,7 +1132,7 @@ public class GroupConfigTest extends GerritBaseTests { .build(); InternalGroupUpdate groupUpdate = InternalGroupUpdate.builder() - .setName(new AccountGroup.NameKey("Another name")) + .setName(AccountGroup.nameKey("Another name")) .setUpdatedOn(createdOn) .build(); GroupConfig groupConfig = GroupConfig.createForNewGroup(projectName, repository, groupCreation); @@ -1187,7 +1158,7 @@ public class GroupConfigTest extends GerritBaseTests { createArbitraryGroup(groupUuid); InternalGroupUpdate groupUpdate = - InternalGroupUpdate.builder().setName(new AccountGroup.NameKey("Another name")).build(); + InternalGroupUpdate.builder().setName(AccountGroup.nameKey("Another name")).build(); updateGroup(groupUuid, groupUpdate); RevCommit revCommit = getLatestCommitForGroup(groupUuid); @@ -1202,7 +1173,7 @@ public class GroupConfigTest extends GerritBaseTests { createArbitraryGroup(groupUuid); InternalGroupUpdate groupUpdate = InternalGroupUpdate.builder() - .setName(new AccountGroup.NameKey("Another name")) + .setName(AccountGroup.nameKey("Another name")) .setUpdatedOn(new Timestamp(updatedOnAsSecondsSinceEpoch * 1000)) .build(); updateGroup(groupUuid, groupUpdate); @@ -1220,7 +1191,7 @@ public class GroupConfigTest extends GerritBaseTests { createArbitraryGroup(groupUuid); InternalGroupUpdate groupUpdate = InternalGroupUpdate.builder() - .setName(new AccountGroup.NameKey("Another name")) + .setName(AccountGroup.nameKey("Another name")) .setUpdatedOn(updatedOn) .build(); GroupConfig groupConfig = GroupConfig.loadForGroup(projectName, repository, groupUuid); @@ -1248,7 +1219,7 @@ public class GroupConfigTest extends GerritBaseTests { createArbitraryGroup(groupUuid); InternalGroupUpdate groupUpdate = InternalGroupUpdate.builder() - .setName(new AccountGroup.NameKey("Another name")) + .setName(AccountGroup.nameKey("Another name")) .setUpdatedOn(updatedOn) .build(); GroupConfig groupConfig = GroupConfig.loadForGroup(projectName, repository, groupUuid); @@ -1281,14 +1252,14 @@ public class GroupConfigTest extends GerritBaseTests { public void groupCanBeLoadedAtASpecificRevision() throws Exception { createArbitraryGroup(groupUuid); - AccountGroup.NameKey firstName = new AccountGroup.NameKey("Bots"); + AccountGroup.NameKey firstName = AccountGroup.nameKey("Bots"); InternalGroupUpdate groupUpdate1 = InternalGroupUpdate.builder().setName(firstName).build(); updateGroup(groupUuid, groupUpdate1); RevCommit commitAfterUpdate1 = getLatestCommitForGroup(groupUuid); InternalGroupUpdate groupUpdate2 = - InternalGroupUpdate.builder().setName(new AccountGroup.NameKey("Robots")).build(); + InternalGroupUpdate.builder().setName(AccountGroup.nameKey("Robots")).build(); updateGroup(groupUuid, groupUpdate2); GroupConfig groupConfig = @@ -1315,7 +1286,7 @@ public class GroupConfigTest extends GerritBaseTests { InternalGroupCreation groupCreation = getPrefilledGroupCreationBuilder().setGroupUUID(groupUuid).build(); InternalGroupUpdate groupUpdate = - InternalGroupUpdate.builder().setName(new AccountGroup.NameKey("Another name")).build(); + InternalGroupUpdate.builder().setName(AccountGroup.nameKey("Another name")).build(); createGroup(groupCreation, groupUpdate); RevCommit revCommit = getLatestCommitForGroup(groupUuid); @@ -1478,11 +1449,11 @@ public class GroupConfigTest extends GerritBaseTests { createArbitraryGroup(groupUuid); InternalGroupUpdate groupUpdate1 = - InternalGroupUpdate.builder().setName(new AccountGroup.NameKey("Old name")).build(); + InternalGroupUpdate.builder().setName(AccountGroup.nameKey("Old name")).build(); updateGroup(groupUuid, groupUpdate1); InternalGroupUpdate groupUpdate2 = - InternalGroupUpdate.builder().setName(new AccountGroup.NameKey("New name")).build(); + InternalGroupUpdate.builder().setName(AccountGroup.nameKey("New name")).build(); updateGroup(groupUuid, groupUpdate2); RevCommit revCommit = getLatestCommitForGroup(groupUuid); @@ -1506,7 +1477,7 @@ public class GroupConfigTest extends GerritBaseTests { InternalGroupUpdate groupUpdate1 = InternalGroupUpdate.builder() - .setName(new AccountGroup.NameKey("Old name")) + .setName(AccountGroup.nameKey("Old name")) .setMemberModification(members -> ImmutableSet.of(account7.getId())) .setSubgroupModification(subgroups -> ImmutableSet.of(group2.getGroupUUID())) .build(); @@ -1514,7 +1485,7 @@ public class GroupConfigTest extends GerritBaseTests { InternalGroupUpdate groupUpdate2 = InternalGroupUpdate.builder() - .setName(new AccountGroup.NameKey("New name")) + .setName(AccountGroup.nameKey("New name")) .setMemberModification(members -> ImmutableSet.of(account13.getId())) .setSubgroupModification(subgroups -> ImmutableSet.of(group1.getGroupUUID())) .build(); diff --git a/javatests/com/google/gerrit/server/group/db/GroupNameNotesTest.java b/javatests/com/google/gerrit/server/group/db/GroupNameNotesTest.java index e1211d3144..05842f5599 100644 --- a/javatests/com/google/gerrit/server/group/db/GroupNameNotesTest.java +++ b/javatests/com/google/gerrit/server/group/db/GroupNameNotesTest.java @@ -75,7 +75,7 @@ public class GroupNameNotesTest extends GerritBaseTests { private static final TimeZone TZ = TimeZone.getTimeZone("America/Los_Angeles"); private final AccountGroup.UUID groupUuid = new AccountGroup.UUID("users-XYZ"); - private final AccountGroup.NameKey groupName = new AccountGroup.NameKey("users"); + private final AccountGroup.NameKey groupName = AccountGroup.nameKey("users"); private AtomicInteger idCounter; private AllUsersName allUsersName; @@ -117,7 +117,7 @@ public class GroupNameNotesTest extends GerritBaseTests { @Test public void nameOfNewGroupMayBeEmpty() throws Exception { - AccountGroup.NameKey emptyName = new AccountGroup.NameKey(""); + AccountGroup.NameKey emptyName = AccountGroup.nameKey(""); createGroup(groupUuid, emptyName); Optional groupReference = loadGroup(emptyName); @@ -138,7 +138,7 @@ public class GroupNameNotesTest extends GerritBaseTests { public void newGroupMayReuseUuidOfAnotherGroup() throws Exception { createGroup(groupUuid, groupName); - AccountGroup.NameKey anotherName = new AccountGroup.NameKey("admins"); + AccountGroup.NameKey anotherName = AccountGroup.nameKey("admins"); createGroup(groupUuid, anotherName); Optional group1 = loadGroup(groupName); @@ -151,7 +151,7 @@ public class GroupNameNotesTest extends GerritBaseTests { public void groupCanBeRenamed() throws Exception { createGroup(groupUuid, groupName); - AccountGroup.NameKey anotherName = new AccountGroup.NameKey("admins"); + AccountGroup.NameKey anotherName = AccountGroup.nameKey("admins"); renameGroup(groupUuid, groupName, anotherName); Optional groupReference = loadGroup(anotherName); @@ -163,7 +163,7 @@ public class GroupNameNotesTest extends GerritBaseTests { public void previousNameOfGroupCannotBeUsedAfterRename() throws Exception { createGroup(groupUuid, groupName); - AccountGroup.NameKey anotherName = new AccountGroup.NameKey("admins"); + AccountGroup.NameKey anotherName = AccountGroup.nameKey("admins"); renameGroup(groupUuid, groupName, anotherName); Optional group = loadGroup(groupName); @@ -182,7 +182,7 @@ public class GroupNameNotesTest extends GerritBaseTests { public void oldNameOfGroupMustBeSpecifiedForRename() throws Exception { createGroup(groupUuid, groupName); - AccountGroup.NameKey anotherName = new AccountGroup.NameKey("admins"); + AccountGroup.NameKey anotherName = AccountGroup.nameKey("admins"); exception.expect(NullPointerException.class); GroupNameNotes.forRename(allUsersName, repo, groupUuid, null, anotherName); } @@ -191,8 +191,8 @@ public class GroupNameNotesTest extends GerritBaseTests { public void groupCannotBeRenamedWhenOldNameIsWrong() throws Exception { createGroup(groupUuid, groupName); - AccountGroup.NameKey anotherOldName = new AccountGroup.NameKey("contributors"); - AccountGroup.NameKey anotherName = new AccountGroup.NameKey("admins"); + AccountGroup.NameKey anotherOldName = AccountGroup.nameKey("contributors"); + AccountGroup.NameKey anotherName = AccountGroup.nameKey("admins"); exception.expect(ConfigInvalidException.class); exception.expectMessage(anotherOldName.get()); GroupNameNotes.forRename(allUsersName, repo, groupUuid, anotherOldName, anotherName); @@ -202,7 +202,7 @@ public class GroupNameNotesTest extends GerritBaseTests { public void groupCannotBeRenamedToNameOfAnotherGroup() throws Exception { createGroup(groupUuid, groupName); AccountGroup.UUID anotherGroupUuid = new AccountGroup.UUID("admins-ABC"); - AccountGroup.NameKey anotherGroupName = new AccountGroup.NameKey("admins"); + AccountGroup.NameKey anotherGroupName = AccountGroup.nameKey("admins"); createGroup(anotherGroupUuid, anotherGroupName); exception.expect(DuplicateKeyException.class); @@ -214,7 +214,7 @@ public class GroupNameNotesTest extends GerritBaseTests { public void groupCannotBeRenamedWithoutSpecifiedUuid() throws Exception { createGroup(groupUuid, groupName); - AccountGroup.NameKey anotherName = new AccountGroup.NameKey("admins"); + AccountGroup.NameKey anotherName = AccountGroup.nameKey("admins"); exception.expect(NullPointerException.class); GroupNameNotes.forRename(allUsersName, repo, null, groupName, anotherName); } @@ -224,7 +224,7 @@ public class GroupNameNotesTest extends GerritBaseTests { createGroup(groupUuid, groupName); AccountGroup.UUID anotherGroupUuid = new AccountGroup.UUID("admins-ABC"); - AccountGroup.NameKey anotherName = new AccountGroup.NameKey("admins"); + AccountGroup.NameKey anotherName = AccountGroup.nameKey("admins"); exception.expect(ConfigInvalidException.class); exception.expectMessage(groupUuid.get()); GroupNameNotes.forRename(allUsersName, repo, anotherGroupUuid, groupName, anotherName); @@ -249,7 +249,7 @@ public class GroupNameNotesTest extends GerritBaseTests { ImmutableList commitsAfterCreation = log(); AccountGroup.UUID anotherGroupUuid = new AccountGroup.UUID("admins-ABC"); - AccountGroup.NameKey anotherName = new AccountGroup.NameKey("admins"); + AccountGroup.NameKey anotherName = AccountGroup.nameKey("admins"); createGroup(anotherGroupUuid, anotherName); ImmutableList commitsAfterFurtherGroup = log(); @@ -262,7 +262,7 @@ public class GroupNameNotesTest extends GerritBaseTests { createGroup(groupUuid, groupName); ImmutableList commitsAfterCreation = log(); - AccountGroup.NameKey anotherName = new AccountGroup.NameKey("admins"); + AccountGroup.NameKey anotherName = AccountGroup.nameKey("admins"); renameGroup(groupUuid, groupName, anotherName); ImmutableList commitsAfterRename = log(); @@ -298,7 +298,7 @@ public class GroupNameNotesTest extends GerritBaseTests { public void newCommitIsNotCreatedWhenCommittingGroupRenamingTwice() throws Exception { createGroup(groupUuid, groupName); - AccountGroup.NameKey anotherName = new AccountGroup.NameKey("admins"); + AccountGroup.NameKey anotherName = AccountGroup.nameKey("admins"); GroupNameNotes groupNameNotes = GroupNameNotes.forRename(allUsersName, repo, groupUuid, groupName, anotherName); @@ -323,7 +323,7 @@ public class GroupNameNotesTest extends GerritBaseTests { public void commitMessageMentionsGroupRenaming() throws Exception { createGroup(groupUuid, groupName); - AccountGroup.NameKey anotherName = new AccountGroup.NameKey("admins"); + AccountGroup.NameKey anotherName = AccountGroup.nameKey("admins"); renameGroup(groupUuid, groupName, anotherName); ImmutableList commits = log(); @@ -341,18 +341,18 @@ public class GroupNameNotesTest extends GerritBaseTests { @Test public void nonExistentGroupCannotBeLoaded() throws Exception { - createGroup(new AccountGroup.UUID("contributors-MN"), new AccountGroup.NameKey("contributors")); + createGroup(new AccountGroup.UUID("contributors-MN"), AccountGroup.nameKey("contributors")); createGroup(groupUuid, groupName); - Optional group = loadGroup(new AccountGroup.NameKey("admins")); + Optional group = loadGroup(AccountGroup.nameKey("admins")); assertThatGroup(group).isAbsent(); } @Test public void specificGroupCanBeLoaded() throws Exception { - createGroup(new AccountGroup.UUID("contributors-MN"), new AccountGroup.NameKey("contributors")); + createGroup(new AccountGroup.UUID("contributors-MN"), AccountGroup.nameKey("contributors")); createGroup(groupUuid, groupName); - createGroup(new AccountGroup.UUID("admins-ABC"), new AccountGroup.NameKey("admins")); + createGroup(new AccountGroup.UUID("admins-ABC"), AccountGroup.nameKey("admins")); Optional group = loadGroup(groupName); assertThatGroup(group).value().groupUuid().isEqualTo(groupUuid); @@ -368,10 +368,10 @@ public class GroupNameNotesTest extends GerritBaseTests { @Test public void allGroupsCanBeLoaded() throws Exception { AccountGroup.UUID groupUuid1 = new AccountGroup.UUID("contributors-MN"); - AccountGroup.NameKey groupName1 = new AccountGroup.NameKey("contributors"); + AccountGroup.NameKey groupName1 = AccountGroup.nameKey("contributors"); createGroup(groupUuid1, groupName1); AccountGroup.UUID groupUuid2 = new AccountGroup.UUID("admins-ABC"); - AccountGroup.NameKey groupName2 = new AccountGroup.NameKey("admins"); + AccountGroup.NameKey groupName2 = AccountGroup.nameKey("admins"); createGroup(groupUuid2, groupName2); ImmutableList allGroups = GroupNameNotes.loadAllGroups(repo); @@ -384,7 +384,7 @@ public class GroupNameNotesTest extends GerritBaseTests { @Test public void loadedGroupsContainGroupsWithDuplicateGroupUuids() throws Exception { createGroup(groupUuid, groupName); - AccountGroup.NameKey anotherGroupName = new AccountGroup.NameKey("admins"); + AccountGroup.NameKey anotherGroupName = AccountGroup.nameKey("admins"); createGroup(groupUuid, anotherGroupName); ImmutableList allGroups = GroupNameNotes.loadAllGroups(repo); @@ -427,7 +427,7 @@ public class GroupNameNotesTest extends GerritBaseTests { TestRepository tr = new TestRepository<>(repo); ObjectId k1 = getNoteKey(g1); ObjectId k2 = getNoteKey(g2); - ObjectId k3 = GroupNameNotes.getNoteKey(new AccountGroup.NameKey("c")); + ObjectId k3 = GroupNameNotes.getNoteKey(AccountGroup.nameKey("c")); PersonIdent ident = newPersonIdent(); ObjectId origCommitId = tr.branch(REFS_GROUPNAMES) @@ -545,7 +545,7 @@ public class GroupNameNotesTest extends GerritBaseTests { } private static ObjectId getNoteKey(GroupReference g) { - return GroupNameNotes.getNoteKey(new AccountGroup.NameKey(g.getName())); + return GroupNameNotes.getNoteKey(AccountGroup.nameKey(g.getName())); } private void updateAllGroups(PersonIdent ident, GroupReference... groupRefs) throws Exception { diff --git a/javatests/com/google/gerrit/server/group/db/GroupsNoteDbConsistencyCheckerTest.java b/javatests/com/google/gerrit/server/group/db/GroupsNoteDbConsistencyCheckerTest.java index a5b04eebc8..c0a628668a 100644 --- a/javatests/com/google/gerrit/server/group/db/GroupsNoteDbConsistencyCheckerTest.java +++ b/javatests/com/google/gerrit/server/group/db/GroupsNoteDbConsistencyCheckerTest.java @@ -30,7 +30,7 @@ public class GroupsNoteDbConsistencyCheckerTest extends AbstractGroupTest { public void groupNamesRefIsMissing() throws Exception { List problems = GroupsNoteDbConsistencyChecker.checkWithGroupNameNotes( - allUsersRepo, new AccountGroup.NameKey("g-1"), new AccountGroup.UUID("uuid-1")); + allUsersRepo, AccountGroup.nameKey("g-1"), new AccountGroup.UUID("uuid-1")); assertThat(problems) .containsExactly(warning("Group with name 'g-1' doesn't exist in the list of all names")); } @@ -40,7 +40,7 @@ public class GroupsNoteDbConsistencyCheckerTest extends AbstractGroupTest { updateGroupNamesRef("g-2", "[group]\n\tuuid = uuid-2\n\tname = g-2\n"); List problems = GroupsNoteDbConsistencyChecker.checkWithGroupNameNotes( - allUsersRepo, new AccountGroup.NameKey("g-1"), new AccountGroup.UUID("uuid-1")); + allUsersRepo, AccountGroup.nameKey("g-1"), new AccountGroup.UUID("uuid-1")); assertThat(problems) .containsExactly(warning("Group with name 'g-1' doesn't exist in the list of all names")); } @@ -50,7 +50,7 @@ public class GroupsNoteDbConsistencyCheckerTest extends AbstractGroupTest { updateGroupNamesRef("g-1", "[group]\n\tuuid = uuid-1\n\tname = g-1\n"); List problems = GroupsNoteDbConsistencyChecker.checkWithGroupNameNotes( - allUsersRepo, new AccountGroup.NameKey("g-1"), new AccountGroup.UUID("uuid-1")); + allUsersRepo, AccountGroup.nameKey("g-1"), new AccountGroup.UUID("uuid-1")); assertThat(problems).isEmpty(); } @@ -59,7 +59,7 @@ public class GroupsNoteDbConsistencyCheckerTest extends AbstractGroupTest { updateGroupNamesRef("g-1", "[group]\n\tuuid = uuid-2\n\tname = g-1\n"); List problems = GroupsNoteDbConsistencyChecker.checkWithGroupNameNotes( - allUsersRepo, new AccountGroup.NameKey("g-1"), new AccountGroup.UUID("uuid-1")); + allUsersRepo, AccountGroup.nameKey("g-1"), new AccountGroup.UUID("uuid-1")); assertThat(problems) .containsExactly( warning( @@ -72,7 +72,7 @@ public class GroupsNoteDbConsistencyCheckerTest extends AbstractGroupTest { updateGroupNamesRef("g-1", "[group]\n\tuuid = uuid-1\n\tname = g-2\n"); List problems = GroupsNoteDbConsistencyChecker.checkWithGroupNameNotes( - allUsersRepo, new AccountGroup.NameKey("g-1"), new AccountGroup.UUID("uuid-1")); + allUsersRepo, AccountGroup.nameKey("g-1"), new AccountGroup.UUID("uuid-1")); assertThat(problems) .containsExactly(warning("group note of name 'g-1' claims to represent name of 'g-2'")); } @@ -82,7 +82,7 @@ public class GroupsNoteDbConsistencyCheckerTest extends AbstractGroupTest { updateGroupNamesRef("g-1", "[group]\n\tuuid = uuid-2\n\tname = g-2\n"); List problems = GroupsNoteDbConsistencyChecker.checkWithGroupNameNotes( - allUsersRepo, new AccountGroup.NameKey("g-1"), new AccountGroup.UUID("uuid-1")); + allUsersRepo, AccountGroup.nameKey("g-1"), new AccountGroup.UUID("uuid-1")); assertThat(problems) .containsExactly( warning( @@ -97,7 +97,7 @@ public class GroupsNoteDbConsistencyCheckerTest extends AbstractGroupTest { updateGroupNamesRef("g-1", "[invalid"); List problems = GroupsNoteDbConsistencyChecker.checkWithGroupNameNotes( - allUsersRepo, new AccountGroup.NameKey("g-1"), new AccountGroup.UUID("uuid-1")); + allUsersRepo, AccountGroup.nameKey("g-1"), new AccountGroup.UUID("uuid-1")); assertThat(problems) .containsExactly( warning( @@ -105,7 +105,7 @@ public class GroupsNoteDbConsistencyCheckerTest extends AbstractGroupTest { } private void updateGroupNamesRef(String groupName, String content) throws Exception { - String nameKey = GroupNameNotes.getNoteKey(new AccountGroup.NameKey(groupName)).getName(); + String nameKey = GroupNameNotes.getNoteKey(AccountGroup.nameKey(groupName)).getName(); GroupTestUtil.updateGroupFile( allUsersRepo, serverIdent, RefNames.REFS_GROUPNAMES, nameKey, content); } diff --git a/javatests/com/google/gerrit/server/schema/TestGroup.java b/javatests/com/google/gerrit/server/schema/TestGroup.java index 4627e8be0e..5f3ba52394 100644 --- a/javatests/com/google/gerrit/server/schema/TestGroup.java +++ b/javatests/com/google/gerrit/server/schema/TestGroup.java @@ -47,7 +47,7 @@ public abstract class TestGroup { public abstract Builder setNameKey(AccountGroup.NameKey nameKey); public Builder setName(String name) { - return setNameKey(new AccountGroup.NameKey(name)); + return setNameKey(AccountGroup.nameKey(name)); } public abstract Builder setGroupUuid(AccountGroup.UUID uuid); @@ -66,7 +66,7 @@ public abstract class TestGroup { public AccountGroup build() { TestGroup testGroup = autoBuild(); - AccountGroup.NameKey name = testGroup.getNameKey().orElse(new AccountGroup.NameKey("users")); + AccountGroup.NameKey name = testGroup.getNameKey().orElse(AccountGroup.nameKey("users")); AccountGroup.Id id = testGroup.getId().orElse(new AccountGroup.Id(Math.abs(name.hashCode()))); AccountGroup.UUID uuid = testGroup.getGroupUuid().orElse(new AccountGroup.UUID(name + "-UUID"));