Rename GroupUUID to GroupUuid
The new name is compliant with our naming conventions. Signed-off-by: Edwin Kempin <ekempin@google.com> Change-Id: I113795896549adb39c1b312bef0eac73289c8d27
This commit is contained in:
committed by
David Pursehouse
parent
dbd6b13863
commit
3fed0eebf8
@@ -21,7 +21,7 @@ import com.google.gerrit.exceptions.DuplicateKeyException;
|
|||||||
import com.google.gerrit.exceptions.NoSuchGroupException;
|
import com.google.gerrit.exceptions.NoSuchGroupException;
|
||||||
import com.google.gerrit.server.GerritPersonIdent;
|
import com.google.gerrit.server.GerritPersonIdent;
|
||||||
import com.google.gerrit.server.ServerInitiated;
|
import com.google.gerrit.server.ServerInitiated;
|
||||||
import com.google.gerrit.server.account.GroupUUID;
|
import com.google.gerrit.server.account.GroupUuid;
|
||||||
import com.google.gerrit.server.group.InternalGroup;
|
import com.google.gerrit.server.group.InternalGroup;
|
||||||
import com.google.gerrit.server.group.db.Groups;
|
import com.google.gerrit.server.group.db.Groups;
|
||||||
import com.google.gerrit.server.group.db.GroupsUpdate;
|
import com.google.gerrit.server.group.db.GroupsUpdate;
|
||||||
@@ -80,7 +80,7 @@ public class GroupOperationsImpl implements GroupOperations {
|
|||||||
private InternalGroupCreation toInternalGroupCreation(TestGroupCreation groupCreation) {
|
private InternalGroupCreation toInternalGroupCreation(TestGroupCreation groupCreation) {
|
||||||
AccountGroup.Id groupId = AccountGroup.id(seq.nextGroupId());
|
AccountGroup.Id groupId = AccountGroup.id(seq.nextGroupId());
|
||||||
String groupName = groupCreation.name().orElse("group-with-id-" + groupId.get());
|
String groupName = groupCreation.name().orElse("group-with-id-" + groupId.get());
|
||||||
AccountGroup.UUID groupUuid = GroupUUID.make(groupName, serverIdent);
|
AccountGroup.UUID groupUuid = GroupUuid.make(groupName, serverIdent);
|
||||||
AccountGroup.NameKey nameKey = AccountGroup.nameKey(groupName);
|
AccountGroup.NameKey nameKey = AccountGroup.nameKey(groupName);
|
||||||
return InternalGroupCreation.builder()
|
return InternalGroupCreation.builder()
|
||||||
.setId(groupId)
|
.setId(groupId)
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ import org.eclipse.jgit.lib.Constants;
|
|||||||
import org.eclipse.jgit.lib.ObjectId;
|
import org.eclipse.jgit.lib.ObjectId;
|
||||||
import org.eclipse.jgit.lib.PersonIdent;
|
import org.eclipse.jgit.lib.PersonIdent;
|
||||||
|
|
||||||
public class GroupUUID {
|
public class GroupUuid {
|
||||||
public static AccountGroup.UUID make(String groupName, PersonIdent creator) {
|
public static AccountGroup.UUID make(String groupName, PersonIdent creator) {
|
||||||
MessageDigest md = Constants.newMessageDigest();
|
MessageDigest md = Constants.newMessageDigest();
|
||||||
md.update(Constants.encode("group " + groupName + "\n"));
|
md.update(Constants.encode("group " + groupName + "\n"));
|
||||||
@@ -29,5 +29,5 @@ public class GroupUUID {
|
|||||||
return AccountGroup.uuid(ObjectId.fromRaw(md.digest()).name());
|
return AccountGroup.uuid(ObjectId.fromRaw(md.digest()).name());
|
||||||
}
|
}
|
||||||
|
|
||||||
private GroupUUID() {}
|
private GroupUuid() {}
|
||||||
}
|
}
|
||||||
@@ -41,7 +41,7 @@ import com.google.gerrit.server.IdentifiedUser;
|
|||||||
import com.google.gerrit.server.UserInitiated;
|
import com.google.gerrit.server.UserInitiated;
|
||||||
import com.google.gerrit.server.account.CreateGroupArgs;
|
import com.google.gerrit.server.account.CreateGroupArgs;
|
||||||
import com.google.gerrit.server.account.GroupCache;
|
import com.google.gerrit.server.account.GroupCache;
|
||||||
import com.google.gerrit.server.account.GroupUUID;
|
import com.google.gerrit.server.account.GroupUuid;
|
||||||
import com.google.gerrit.server.config.GerritServerConfig;
|
import com.google.gerrit.server.config.GerritServerConfig;
|
||||||
import com.google.gerrit.server.group.GroupResolver;
|
import com.google.gerrit.server.group.GroupResolver;
|
||||||
import com.google.gerrit.server.group.GroupResource;
|
import com.google.gerrit.server.group.GroupResource;
|
||||||
@@ -196,7 +196,7 @@ public class CreateGroup
|
|||||||
|
|
||||||
AccountGroup.Id groupId = AccountGroup.id(sequences.nextGroupId());
|
AccountGroup.Id groupId = AccountGroup.id(sequences.nextGroupId());
|
||||||
AccountGroup.UUID uuid =
|
AccountGroup.UUID uuid =
|
||||||
GroupUUID.make(
|
GroupUuid.make(
|
||||||
createGroupArgs.getGroupName(),
|
createGroupArgs.getGroupName(),
|
||||||
self.get().newCommitterIdent(serverIdent.getWhen(), serverIdent.getTimeZone()));
|
self.get().newCommitterIdent(serverIdent.getWhen(), serverIdent.getTimeZone()));
|
||||||
InternalGroupCreation groupCreation =
|
InternalGroupCreation groupCreation =
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ import com.google.gerrit.exceptions.DuplicateKeyException;
|
|||||||
import com.google.gerrit.git.RefUpdateUtil;
|
import com.google.gerrit.git.RefUpdateUtil;
|
||||||
import com.google.gerrit.metrics.MetricMaker;
|
import com.google.gerrit.metrics.MetricMaker;
|
||||||
import com.google.gerrit.server.GerritPersonIdent;
|
import com.google.gerrit.server.GerritPersonIdent;
|
||||||
import com.google.gerrit.server.account.GroupUUID;
|
import com.google.gerrit.server.account.GroupUuid;
|
||||||
import com.google.gerrit.server.config.AllProjectsName;
|
import com.google.gerrit.server.config.AllProjectsName;
|
||||||
import com.google.gerrit.server.config.AllUsersName;
|
import com.google.gerrit.server.config.AllUsersName;
|
||||||
import com.google.gerrit.server.extensions.events.GitReferenceUpdated;
|
import com.google.gerrit.server.extensions.events.GitReferenceUpdated;
|
||||||
@@ -211,7 +211,7 @@ public class SchemaCreatorImpl implements SchemaCreator {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private GroupReference createGroupReference(String name) {
|
private GroupReference createGroupReference(String name) {
|
||||||
AccountGroup.UUID groupUuid = GroupUUID.make(name, serverUser);
|
AccountGroup.UUID groupUuid = GroupUuid.make(name, serverUser);
|
||||||
return new GroupReference(groupUuid, name);
|
return new GroupReference(groupUuid, name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -20,13 +20,13 @@ import com.google.gerrit.entities.AccountGroup;
|
|||||||
import org.eclipse.jgit.lib.PersonIdent;
|
import org.eclipse.jgit.lib.PersonIdent;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
public class GroupUUIDTest {
|
public class GroupUuidTest {
|
||||||
@Test
|
@Test
|
||||||
public void createdUuidsForSameInputShouldBeDifferent() {
|
public void createdUuidsForSameInputShouldBeDifferent() {
|
||||||
String groupName = "Users";
|
String groupName = "Users";
|
||||||
PersonIdent personIdent = new PersonIdent("John", "john@example.com");
|
PersonIdent personIdent = new PersonIdent("John", "john@example.com");
|
||||||
AccountGroup.UUID uuid1 = GroupUUID.make(groupName, personIdent);
|
AccountGroup.UUID uuid1 = GroupUuid.make(groupName, personIdent);
|
||||||
AccountGroup.UUID uuid2 = GroupUUID.make(groupName, personIdent);
|
AccountGroup.UUID uuid2 = GroupUuid.make(groupName, personIdent);
|
||||||
assertThat(uuid2).isNotEqualTo(uuid1);
|
assertThat(uuid2).isNotEqualTo(uuid1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -22,7 +22,7 @@ import com.google.gerrit.entities.Account;
|
|||||||
import com.google.gerrit.entities.AccountGroup;
|
import com.google.gerrit.entities.AccountGroup;
|
||||||
import com.google.gerrit.entities.AccountGroupByIdAudit;
|
import com.google.gerrit.entities.AccountGroupByIdAudit;
|
||||||
import com.google.gerrit.entities.AccountGroupMemberAudit;
|
import com.google.gerrit.entities.AccountGroupMemberAudit;
|
||||||
import com.google.gerrit.server.account.GroupUUID;
|
import com.google.gerrit.server.account.GroupUuid;
|
||||||
import com.google.gerrit.server.group.InternalGroup;
|
import com.google.gerrit.server.group.InternalGroup;
|
||||||
import java.sql.Timestamp;
|
import java.sql.Timestamp;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@@ -238,7 +238,7 @@ public final class AuditLogReaderTest extends AbstractGroupTest {
|
|||||||
int next, String groupName, PersonIdent authorIdent, Account.Id authorId) throws Exception {
|
int next, String groupName, PersonIdent authorIdent, Account.Id authorId) throws Exception {
|
||||||
InternalGroupCreation groupCreation =
|
InternalGroupCreation groupCreation =
|
||||||
InternalGroupCreation.builder()
|
InternalGroupCreation.builder()
|
||||||
.setGroupUUID(GroupUUID.make(groupName, serverIdent))
|
.setGroupUUID(GroupUuid.make(groupName, serverIdent))
|
||||||
.setNameKey(AccountGroup.nameKey(groupName))
|
.setNameKey(AccountGroup.nameKey(groupName))
|
||||||
.setId(AccountGroup.id(next))
|
.setId(AccountGroup.id(next))
|
||||||
.build();
|
.build();
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ import com.google.gerrit.entities.AccountGroup;
|
|||||||
import com.google.gerrit.entities.BooleanProjectConfig;
|
import com.google.gerrit.entities.BooleanProjectConfig;
|
||||||
import com.google.gerrit.extensions.client.InheritableBoolean;
|
import com.google.gerrit.extensions.client.InheritableBoolean;
|
||||||
import com.google.gerrit.server.GerritPersonIdent;
|
import com.google.gerrit.server.GerritPersonIdent;
|
||||||
import com.google.gerrit.server.account.GroupUUID;
|
import com.google.gerrit.server.account.GroupUuid;
|
||||||
import com.google.gerrit.server.config.AllProjectsName;
|
import com.google.gerrit.server.config.AllProjectsName;
|
||||||
import com.google.gerrit.server.git.GitRepositoryManager;
|
import com.google.gerrit.server.git.GitRepositoryManager;
|
||||||
import com.google.gerrit.server.notedb.Sequences;
|
import com.google.gerrit.server.notedb.Sequences;
|
||||||
@@ -102,7 +102,7 @@ public class AllProjectsCreatorTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private GroupReference createGroupReference(String name) {
|
private GroupReference createGroupReference(String name) {
|
||||||
AccountGroup.UUID groupUuid = GroupUUID.make(name, serverUser);
|
AccountGroup.UUID groupUuid = GroupUuid.make(name, serverUser);
|
||||||
return new GroupReference(groupUuid, name);
|
return new GroupReference(groupUuid, name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user