opendev/gerrit
Code Issues Proposed changes

Rename group audit methods to remove get prefix

Browse Source 
Change-Id: If354631f3e1ca22ad013bee8b03f906dea5ba0c1
This commit is contained in:
Dave Borowitz
2019-05-01 10:02:09 -07:00
parent f84621b9d5
commit 86873f520b
3 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
java/com/google/gerrit/reviewdb/client/AccountGroupByIdAud.java
View File

@@ -55,29 +55,29 @@ public abstract class AccountGroupByIdAud {
public abstract AccountGroupByIdAud build();
}
public abstract AccountGroupByIdAud.Key getKey();
public abstract AccountGroupByIdAud.Key key();
public abstract Account.Id getAddedBy();
public abstract Account.Id addedBy();
public abstract Optional<Account.Id> getRemovedBy();
public abstract Optional<Account.Id> removedBy();
public abstract Optional<Timestamp> getRemovedOn();
public abstract Optional<Timestamp> removedOn();
public abstract Builder toBuilder();
public AccountGroup.Id getGroupId() {
return getKey().groupId();
public AccountGroup.Id groupId() {
return key().groupId();
}
public Timestamp getAddedOn() {
return getKey().addedOn();
return key().addedOn();
}
public AccountGroup.UUID getIncludeUUID() {
return getKey().includeUuid();
public AccountGroup.UUID includeUuid() {
return key().includeUuid();
}
public boolean isActive() {
return !getRemovedOn().isPresent();
return !removedOn().isPresent();
}
}

28
java/com/google/gerrit/reviewdb/client/AccountGroupMemberAudit.java
View File

@@ -42,11 +42,11 @@ public abstract class AccountGroupMemberAudit {
public abstract static class Builder {
public abstract Builder key(Key key);
abstract Key getKey();
abstract Key key();
public abstract Builder addedBy(Account.Id addedBy);
abstract Account.Id getAddedBy();
abstract Account.Id addedBy();
abstract Builder removedBy(Account.Id removedBy);
@@ -57,35 +57,35 @@ public abstract class AccountGroupMemberAudit {
}
public Builder removedLegacy() {
return removed(getAddedBy(), getKey().addedOn());
return removed(addedBy(), key().addedOn());
}
public abstract AccountGroupMemberAudit build();
}
public abstract AccountGroupMemberAudit.Key getKey();
public abstract AccountGroupMemberAudit.Key key();
public abstract Account.Id getAddedBy();
public abstract Account.Id addedBy();
public abstract Optional<Account.Id> getRemovedBy();
public abstract Optional<Account.Id> removedBy();
public abstract Optional<Timestamp> getRemovedOn();
public abstract Optional<Timestamp> removedOn();
public abstract Builder toBuilder();
public AccountGroup.Id getGroupId() {
return getKey().groupId();
public AccountGroup.Id groupId() {
return key().groupId();
}
public Account.Id getMemberId() {
return getKey().accountId();
public Account.Id memberId() {
return key().accountId();
}
public Timestamp getAddedOn() {
return getKey().addedOn();
public Timestamp addedOn() {
return key().addedOn();
}
public boolean isActive() {
return !getRemovedOn().isPresent();
return !removedOn().isPresent();
}
}

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

@@ -90,24 +90,24 @@ public class GetAuditLog implements RestReadView<GroupResource> {
try (Repository allUsersRepo = repoManager.openRepository(allUsers)) {
for (AccountGroupMemberAudit auditEvent :
groups.getMembersAudit(allUsersRepo, group.getGroupUUID())) {
AccountInfo member = accountLoader.get(auditEvent.getMemberId());
AccountInfo member = accountLoader.get(auditEvent.memberId());
auditEvents.add(
GroupAuditEventInfo.createAddUserEvent(
accountLoader.get(auditEvent.getAddedBy()), auditEvent.getAddedOn(), member));
accountLoader.get(auditEvent.addedBy()), auditEvent.addedOn(), member));
if (!auditEvent.isActive()) {
auditEvents.add(
GroupAuditEventInfo.createRemoveUserEvent(
accountLoader.get(auditEvent.getRemovedBy().orElse(null)),
auditEvent.getRemovedOn(),
accountLoader.get(auditEvent.removedBy().orElse(null)),
auditEvent.removedOn(),
member));
}
}
for (AccountGroupByIdAud auditEvent :
groups.getSubgroupsAudit(allUsersRepo, group.getGroupUUID())) {
AccountGroup.UUID includedGroupUUID = auditEvent.getIncludeUUID();
AccountGroup.UUID includedGroupUUID = auditEvent.includeUuid();
Optional<InternalGroup> includedGroup = groupCache.get(includedGroupUUID);
GroupInfo member;
if (includedGroup.isPresent()) {
@@ -123,13 +123,13 @@ public class GetAuditLog implements RestReadView<GroupResource> {
auditEvents.add(
GroupAuditEventInfo.createAddGroupEvent(
accountLoader.get(auditEvent.getAddedBy()), auditEvent.getKey().addedOn(), member));
accountLoader.get(auditEvent.addedBy()), auditEvent.key().addedOn(), member));
if (!auditEvent.isActive()) {
auditEvents.add(
GroupAuditEventInfo.createRemoveGroupEvent(
accountLoader.get(auditEvent.getRemovedBy().orElse(null)),
auditEvent.getRemovedOn(),
accountLoader.get(auditEvent.removedBy().orElse(null)),
auditEvent.removedOn(),
member));
}
}