opendev/gerrit
Code Issues Proposed changes

ChangeNotesParser: Replace ApprovalKey with PatchSetApproval.Key

Browse Source 
ApprovalKey was added in afe569ab with a different set of fields from
PatchSetApproval.Key, so we couldn't reuse PatchSetApproval.Key. The tag
field was removed in 0bc9ac8e[1], after which the two classes had the
same set of fields. Remove the redundant copy.

[1] https://gerrit-review.googlesource.com/c/gerrit/+/89132/8/gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeNotesTest.java#142

Change-Id: I046889c43b42b64dfc3410adec9161b7dba1642c
This commit is contained in:
Dave Borowitz
2019-05-01 08:52:45 -07:00
parent c8c218e70a
commit f0f4c50b57
1 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
java/com/google/gerrit/server/notedb/ChangeNotesParser.java
View File

@@ -40,7 +40,6 @@ import static com.google.gerrit.server.notedb.NoteDbTable.CHANGES;
import static java.util.Comparator.comparing; import static java.util.Comparator.comparing;
import static java.util.stream.Collectors.joining; import static java.util.stream.Collectors.joining;
import com.google.auto.value.AutoValue;
import com.google.common.base.Enums; import com.google.common.base.Enums;
import com.google.common.base.Splitter; import com.google.common.base.Splitter;
import com.google.common.collect.HashBasedTable; import com.google.common.collect.HashBasedTable;
@@ -101,19 +100,6 @@ import org.eclipse.jgit.util.RawParseUtils;
class ChangeNotesParser { class ChangeNotesParser {
private static final FluentLogger logger = FluentLogger.forEnclosingClass(); private static final FluentLogger logger = FluentLogger.forEnclosingClass();
@AutoValue
abstract static class ApprovalKey {
abstract PatchSet.Id psId();
abstract Account.Id accountId();
abstract String label();
private static ApprovalKey create(PatchSet.Id psId, Account.Id accountId, String label) {
return new AutoValue_ChangeNotesParser_ApprovalKey(psId, accountId, label);
}
}
// Private final members initialized in the constructor. // Private final members initialized in the constructor.
private final ChangeNoteJson changeNoteJson; private final ChangeNoteJson changeNoteJson;
private final LegacyChangeNoteRead legacyChangeNoteRead; private final LegacyChangeNoteRead legacyChangeNoteRead;
@@ -135,7 +121,7 @@ class ChangeNotesParser {
private final Set<PatchSet.Id> deletedPatchSets; private final Set<PatchSet.Id> deletedPatchSets;
private final Map<PatchSet.Id, PatchSetState> patchSetStates; private final Map<PatchSet.Id, PatchSetState> patchSetStates;
private final List<PatchSet.Id> currentPatchSets; private final List<PatchSet.Id> currentPatchSets;
private final Map<ApprovalKey, PatchSetApproval> approvals; private final Map<PatchSetApproval.Key, PatchSetApproval> approvals;
private final List<PatchSetApproval> bufferedApprovals; private final List<PatchSetApproval> bufferedApprovals;
private final List<ChangeMessage> allChangeMessages; private final List<ChangeMessage> allChangeMessages;
@@ -812,7 +798,8 @@ class ChangeNotesParser {
if (!Objects.equals(realAccountId, committerId)) { if (!Objects.equals(realAccountId, committerId)) {
psa.setRealAccountId(realAccountId); psa.setRealAccountId(realAccountId);
} }
ApprovalKey k = ApprovalKey.create(psId, effectiveAccountId, l.label()); PatchSetApproval.Key k =
PatchSetApproval.key(psId, effectiveAccountId, LabelId.create(l.label()));
if (!approvals.containsKey(k)) { if (!approvals.containsKey(k)) {
approvals.put(k, psa); approvals.put(k, psa);
} }
@@ -852,7 +839,7 @@ class ChangeNotesParser {
if (!Objects.equals(realAccountId, committerId)) { if (!Objects.equals(realAccountId, committerId)) {
remove.setRealAccountId(realAccountId); remove.setRealAccountId(realAccountId);
} }
ApprovalKey k = ApprovalKey.create(psId, effectiveAccountId, label); PatchSetApproval.Key k = PatchSetApproval.key(psId, effectiveAccountId, LabelId.create(label));
if (!approvals.containsKey(k)) { if (!approvals.containsKey(k)) {
approvals.put(k, remove); approvals.put(k, remove);
} }