opendev/gerrit
Code Issues Proposed changes

Rename AccountGroupByIdAud to AccountGroupByIdAudit

Browse Source 
For consistency with AccountGroupMemberAudit. We don't generally
abbreviate individual words in the reviewdb.client classes. And "ById"
is already shorter than "Member", so this new class name is still not
the longest.

Change-Id: I45b4d2c0c2a60adf91efcc91f5102cd55ea7eece
This commit is contained in:
Dave Borowitz
2019-05-01 10:05:38 -07:00
parent 86873f520b
commit c6b037b2ab
5 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
java/com/google/gerrit/reviewdb/client/AccountGroupByIdAud.java → java/com/google/gerrit/reviewdb/client/AccountGroupByIdAudit.java
View File

@@ -20,9 +20,9 @@ import java.util.Optional;
/** Inclusion of an {@link AccountGroup} in another {@link AccountGroup}. */
@AutoValue
public abstract class AccountGroupByIdAud {
public abstract class AccountGroupByIdAudit {
public static Key key(AccountGroup.Id groupId, AccountGroup.UUID includeUuid, Timestamp addedOn) {
return new AutoValue_AccountGroupByIdAud_Key(groupId, includeUuid, addedOn);
return new AutoValue_AccountGroupByIdAudit_Key(groupId, includeUuid, addedOn);
}
@AutoValue
@@ -35,7 +35,7 @@ public abstract class AccountGroupByIdAud {
}
public static Builder builder() {
return new AutoValue_AccountGroupByIdAud.Builder();
return new AutoValue_AccountGroupByIdAudit.Builder();
}
@AutoValue.Builder
@@ -52,10 +52,10 @@ public abstract class AccountGroupByIdAud {
return removedBy(removedBy).removedOn(removedOn);
}
public abstract AccountGroupByIdAud build();
public abstract AccountGroupByIdAudit build();
}
public abstract AccountGroupByIdAud.Key key();
public abstract AccountGroupByIdAudit.Key key();
public abstract Account.Id addedBy();

22
java/com/google/gerrit/server/group/db/AuditLogReader.java
View File

@@ -23,7 +23,7 @@ import com.google.common.collect.MultimapBuilder;
import com.google.common.flogger.FluentLogger;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.AccountGroup;
import com.google.gerrit.reviewdb.client.AccountGroupByIdAud;
import com.google.gerrit.reviewdb.client.AccountGroupByIdAudit;
import com.google.gerrit.reviewdb.client.AccountGroupMemberAudit;
import com.google.gerrit.reviewdb.client.RefNames;
import com.google.gerrit.server.config.AllUsersName;
@@ -103,37 +103,37 @@ public class AuditLogReader {
return result.stream().map(AccountGroupMemberAudit.Builder::build).collect(toImmutableList());
}
public ImmutableList<AccountGroupByIdAud> getSubgroupsAudit(
public ImmutableList<AccountGroupByIdAudit> getSubgroupsAudit(
Repository repo, AccountGroup.UUID uuid) throws IOException, ConfigInvalidException {
return getSubgroupsAudit(getGroupId(repo, uuid), parseCommits(repo, uuid));
}
private ImmutableList<AccountGroupByIdAud> getSubgroupsAudit(
private ImmutableList<AccountGroupByIdAudit> getSubgroupsAudit(
AccountGroup.Id groupId, List<ParsedCommit> commits) {
ListMultimap<SubgroupKey, AccountGroupByIdAud.Builder> audits =
ListMultimap<SubgroupKey, AccountGroupByIdAudit.Builder> audits =
MultimapBuilder.hashKeys().linkedListValues().build();
List<AccountGroupByIdAud.Builder> result = new ArrayList<>();
List<AccountGroupByIdAudit.Builder> result = new ArrayList<>();
for (ParsedCommit pc : commits) {
for (AccountGroup.UUID uuid : pc.addedSubgroups()) {
SubgroupKey key = SubgroupKey.create(groupId, uuid);
AccountGroupByIdAud.Builder audit =
AccountGroupByIdAud.builder()
.key(AccountGroupByIdAud.key(groupId, uuid, pc.when()))
AccountGroupByIdAudit.Builder audit =
AccountGroupByIdAudit.builder()
.key(AccountGroupByIdAudit.key(groupId, uuid, pc.when()))
.addedBy(pc.authorId());
audits.put(key, audit);
result.add(audit);
}
for (AccountGroup.UUID uuid : pc.removedSubgroups()) {
List<AccountGroupByIdAud.Builder> adds = audits.get(SubgroupKey.create(groupId, uuid));
List<AccountGroupByIdAudit.Builder> adds = audits.get(SubgroupKey.create(groupId, uuid));
if (!adds.isEmpty()) {
AccountGroupByIdAud.Builder audit = adds.remove(0);
AccountGroupByIdAudit.Builder audit = adds.remove(0);
audit.removed(pc.authorId(), pc.when());
} else {
// Unlike members, DbGroupAuditListener didn't insert an add/remove pair here.
}
}
}
return result.stream().map(AccountGroupByIdAud.Builder::build).collect(toImmutableList());
return result.stream().map(AccountGroupByIdAudit.Builder::build).collect(toImmutableList());
}
private Optional<ParsedCommit> parse(AccountGroup.UUID uuid, RevCommit c) {

4
java/com/google/gerrit/server/group/db/Groups.java
View File

@@ -18,7 +18,7 @@ import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.gerrit.common.data.GroupReference;
import com.google.gerrit.reviewdb.client.AccountGroup;
import com.google.gerrit.reviewdb.client.AccountGroupByIdAud;
import com.google.gerrit.reviewdb.client.AccountGroupByIdAudit;
import com.google.gerrit.reviewdb.client.AccountGroupMemberAudit;
import com.google.gerrit.server.config.AllUsersName;
import com.google.gerrit.server.git.GitRepositoryManager;
@@ -152,7 +152,7 @@ public class Groups {
* @throws IOException if an error occurs while reading from NoteDb
* @throws ConfigInvalidException if the group couldn't be retrieved from NoteDb
*/
public List<AccountGroupByIdAud> getSubgroupsAudit(Repository repo, AccountGroup.UUID groupUuid)
public List<AccountGroupByIdAudit> getSubgroupsAudit(Repository repo, AccountGroup.UUID groupUuid)
throws IOException, ConfigInvalidException {
return auditLogReader.getSubgroupsAudit(repo, groupUuid);
}

4
java/com/google/gerrit/server/restapi/group/GetAuditLog.java
View File

@@ -24,7 +24,7 @@ import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.extensions.restapi.RestReadView;
import com.google.gerrit.extensions.restapi.Url;
import com.google.gerrit.reviewdb.client.AccountGroup;
import com.google.gerrit.reviewdb.client.AccountGroupByIdAud;
import com.google.gerrit.reviewdb.client.AccountGroupByIdAudit;
import com.google.gerrit.reviewdb.client.AccountGroupMemberAudit;
import com.google.gerrit.server.account.AccountLoader;
import com.google.gerrit.server.account.GroupBackend;
@@ -105,7 +105,7 @@ public class GetAuditLog implements RestReadView<GroupResource> {
}
}
for (AccountGroupByIdAud auditEvent :
for (AccountGroupByIdAudit auditEvent :
groups.getSubgroupsAudit(allUsersRepo, group.getGroupUUID())) {
AccountGroup.UUID includedGroupUUID = auditEvent.includeUuid();
Optional<InternalGroup> includedGroup = groupCache.get(includedGroupUUID);

22
javatests/com/google/gerrit/server/group/db/AuditLogReaderTest.java
View File

@@ -20,7 +20,7 @@ import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.AccountGroup;
import com.google.gerrit.reviewdb.client.AccountGroupByIdAud;
import com.google.gerrit.reviewdb.client.AccountGroupByIdAudit;
import com.google.gerrit.reviewdb.client.AccountGroupMemberAudit;
import com.google.gerrit.server.account.GroupUUID;
import com.google.gerrit.server.group.InternalGroup;
@@ -118,7 +118,7 @@ public final class AuditLogReaderTest extends AbstractGroupTest {
addSubgroups(uuid, ImmutableSet.of(subgroupUuid));
AccountGroupByIdAud expAudit =
AccountGroupByIdAudit expAudit =
createExpGroupAudit(group.getId(), subgroupUuid, userId, getTipTimestamp(uuid));
assertThat(auditLogReader.getSubgroupsAudit(allUsersRepo, uuid)).containsExactly(expAudit);
@@ -140,9 +140,9 @@ public final class AuditLogReaderTest extends AbstractGroupTest {
addSubgroups(uuid, ImmutableSet.of(subgroupUuid1, subgroupUuid2));
AccountGroupByIdAud expAudit1 =
AccountGroupByIdAudit expAudit1 =
createExpGroupAudit(group.getId(), subgroupUuid1, userId, getTipTimestamp(uuid));
AccountGroupByIdAud expAudit2 =
AccountGroupByIdAudit expAudit2 =
createExpGroupAudit(group.getId(), subgroupUuid2, userId, getTipTimestamp(uuid));
assertThat(auditLogReader.getSubgroupsAudit(allUsersRepo, uuid))
.containsExactly(expAudit1, expAudit2)
@@ -180,7 +180,7 @@ public final class AuditLogReaderTest extends AbstractGroupTest {
// Add one subgroup.
addSubgroups(uuid, ImmutableSet.of(subgroupUuid1));
AccountGroupByIdAud expGroupAudit1 =
AccountGroupByIdAudit expGroupAudit1 =
createExpGroupAudit(group.getId(), subgroupUuid1, userId, getTipTimestamp(uuid));
assertThat(auditLogReader.getSubgroupsAudit(allUsersRepo, uuid))
.containsExactly(expGroupAudit1);
@@ -194,9 +194,9 @@ public final class AuditLogReaderTest extends AbstractGroupTest {
// Add two subgroups.
addSubgroups(uuid, ImmutableSet.of(subgroupUuid2, subgroupUuid3));
AccountGroupByIdAud expGroupAudit2 =
AccountGroupByIdAudit expGroupAudit2 =
createExpGroupAudit(group.getId(), subgroupUuid2, userId, getTipTimestamp(uuid));
AccountGroupByIdAud expGroupAudit3 =
AccountGroupByIdAudit expGroupAudit3 =
createExpGroupAudit(group.getId(), subgroupUuid3, userId, getTipTimestamp(uuid));
assertThat(auditLogReader.getSubgroupsAudit(allUsersRepo, uuid))
.containsExactly(expGroupAudit1, expGroupAudit2, expGroupAudit3)
@@ -223,7 +223,7 @@ public final class AuditLogReaderTest extends AbstractGroupTest {
// Add back one removed subgroup.
addSubgroups(uuid, ImmutableSet.of(subgroupUuid1));
AccountGroupByIdAud expGroupAudit4 =
AccountGroupByIdAudit expGroupAudit4 =
createExpGroupAudit(group.getId(), subgroupUuid1, userId, getTipTimestamp(uuid));
assertThat(auditLogReader.getSubgroupsAudit(allUsersRepo, uuid))
.containsExactly(expGroupAudit1, expGroupAudit2, expGroupAudit3, expGroupAudit4)
@@ -309,10 +309,10 @@ public final class AuditLogReaderTest extends AbstractGroupTest {
.build();
}
private static AccountGroupByIdAud createExpGroupAudit(
private static AccountGroupByIdAudit createExpGroupAudit(
AccountGroup.Id groupId, AccountGroup.UUID uuid, Account.Id addedBy, Timestamp addedOn) {
return AccountGroupByIdAud.builder()
.key(AccountGroupByIdAud.key(groupId, uuid, addedOn))
return AccountGroupByIdAudit.builder()
.key(AccountGroupByIdAudit.key(groupId, uuid, addedOn))
.addedBy(addedBy)
.build();
}