opendev/gerrit
Code Issues Proposed changes

Rename PatchSetApproval methods

Browse Source 
Remove the "get" prefix on AutoValue getters. Also remove the "is" in
"isPostSubmit", which AutoValue treats the same as "get"; note how the
method on the Builder class was already required to be named postSubmit.

Change-Id: Ic2f6fe9b7195bcec9b021d65eb3ca6c9f74f0c45
This commit is contained in:
Dave Borowitz
2019-05-01 09:16:33 -07:00
parent bbbcc59d7e
commit 0e0c999911
46 changed files with 311 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/com/google/gerrit/server/notedb/ChangeNotes.java
View File

@@ -76,7 +76,7 @@ public class ChangeNotes extends AbstractChangeNotes<ChangeNotes> {
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
static final Ordering<PatchSetApproval> PSA_BY_TIME =
Ordering.from(comparing(PatchSetApproval::getGranted));
Ordering.from(comparing(PatchSetApproval::granted));
public static final Ordering<ChangeMessage> MESSAGE_BY_TIME =
Ordering.from(comparing(ChangeMessage::getWrittenOn));

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

@@ -281,13 +281,13 @@ class ChangeNotesParser {
ListMultimap<PatchSet.Id, PatchSetApproval> result =
MultimapBuilder.hashKeys().arrayListValues().build();
for (PatchSetApproval.Builder a : approvals.values()) {
if (!patchSetCommitParsed(a.getKey().patchSetId())) {
if (!patchSetCommitParsed(a.key().patchSetId())) {
continue; // Patch set deleted or missing.
} else if (allPastReviewers.contains(a.getKey().accountId())
&& !reviewers.containsRow(a.getKey().accountId())) {
} else if (allPastReviewers.contains(a.key().accountId())
&& !reviewers.containsRow(a.key().accountId())) {
continue; // Reviewer was explicitly removed.
}
result.put(a.getKey().patchSetId(), a.build());
result.put(a.key().patchSetId(), a.build());
}
result.keySet().forEach(k -> result.get(k).sort(ChangeNotes.PSA_BY_TIME));
return result;
@@ -613,7 +613,7 @@ class ChangeNotesParser {
// up sorted after the submit during rebuilding.
if (status == Change.Status.MERGED) {
for (PatchSetApproval.Builder psa : bufferedApprovals) {
if (!psa.getKey().isLegacySubmit()) {
if (!psa.key().isLegacySubmit()) {
psa.postSubmit(true);
}
}
@@ -798,7 +798,7 @@ class ChangeNotesParser {
if (!Objects.equals(realAccountId, committerId)) {
psa.realAccountId(realAccountId);
}
approvals.putIfAbsent(psa.getKey(), psa);
approvals.putIfAbsent(psa.key(), psa);
return psa;
}
@@ -837,7 +837,7 @@ class ChangeNotesParser {
if (!Objects.equals(realAccountId, committerId)) {
remove.realAccountId(realAccountId);
}
approvals.putIfAbsent(remove.getKey(), remove);
approvals.putIfAbsent(remove.key(), remove);
return remove;
}
@@ -1023,7 +1023,7 @@ class ChangeNotesParser {
comments.values(), c -> PatchSet.id(id, c.key.patchSetId), missing);
pruned +=
pruneEntitiesForMissingPatchSets(
approvals.values(), psa -> psa.getKey().patchSetId(), missing);
approvals.values(), psa -> psa.key().patchSetId(), missing);
if (!missing.isEmpty()) {
logger.atWarning().log(

2
java/com/google/gerrit/server/notedb/ChangeNotesState.java
View File

@@ -560,7 +560,7 @@ public abstract class ChangeNotesState {
.approvals(
proto.getApprovalList().stream()
.map(bytes -> parseProtoFrom(PatchSetApprovalProtoConverter.INSTANCE, bytes))
.map(a -> Maps.immutableEntry(a.getPatchSetId(), a))
.map(a -> Maps.immutableEntry(a.patchSetId(), a))
.collect(toImmutableList()))
.reviewers(toReviewerSet(proto.getReviewerList()))
.reviewersByEmail(toReviewerByEmailSet(proto.getReviewerByEmailList()))