commit aade2a45aa08ed464585474f669bd2fb54903295
author Edwin Kempin <ekempin@google.com> Mon Jul 15 10:16:16 2019 +0200
committer Edwin Kempin <ekempin@google.com> Mon Jul 15 15:41:20 2019 +0000
tree 0686f008602b83b0f87a5f99e953a1beb947b15d
parent fd905ba8f0acf01444700e853a7bce5eb60947b4

ApprovalCopier: Remove option to exclude approvals from copying

This option is not used. The only caller of getForPatchSet(ChangeNotes,
PatchSet.Id, RevWalk rw, Config repoConfig, Iterable<PatchSetApproval>)
always passed in an empty collection for the approvals that shouldn't be
copied. Removing this option simplifies the code and makes it more
readable.

Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: I76378822b0a8eddc1acea950e9c68bc6428ac672

java/com/google/gerrit/server/ApprovalCopier.java

diff --git a/java/com/google/gerrit/server/ApprovalCopier.java b/java/com/google/gerrit/server/ApprovalCopier.java
index 979cc11..85a6079 100644
--- a/java/com/google/gerrit/server/ApprovalCopier.java
+++ b/java/com/google/gerrit/server/ApprovalCopier.java
@@ -73,49 +73,27 @@
 
   Iterable<PatchSetApproval> getForPatchSet(
       ChangeNotes notes, PatchSet.Id psId, @Nullable RevWalk rw, @Nullable Config repoConfig) {
-    return getForPatchSet(notes, psId, rw, repoConfig, Collections.emptyList());
-  }
 
-  Iterable<PatchSetApproval> getForPatchSet(
-      ChangeNotes notes,
-      PatchSet.Id psId,
-      @Nullable RevWalk rw,
-      @Nullable Config repoConfig,
-      Iterable<PatchSetApproval> dontCopy) {
     PatchSet ps = psUtil.get(notes, psId);
     if (ps == null) {
       return Collections.emptyList();
     }
-    return getForPatchSet(notes, ps, rw, repoConfig, dontCopy);
-  }
 
-  private Iterable<PatchSetApproval> getForPatchSet(
-      ChangeNotes notes,
-      PatchSet ps,
-      @Nullable RevWalk rw,
-      @Nullable Config repoConfig,
-      Iterable<PatchSetApproval> dontCopy) {
-    requireNonNull(ps, "ps should not be null");
     ChangeData cd = changeDataFactory.create(notes);
     try {
       ProjectState project = projectCache.checkedGet(cd.change().getDest().project());
       ListMultimap<PatchSet.Id, PatchSetApproval> all = cd.approvals();
       requireNonNull(all, "all should not be null");
 
-      Table<String, Account.Id, PatchSetApproval> wontCopy = HashBasedTable.create();
-      for (PatchSetApproval psa : dontCopy) {
-        wontCopy.put(psa.label(), psa.accountId(), psa);
-      }
-
       Table<String, Account.Id, PatchSetApproval> byUser = HashBasedTable.create();
       for (PatchSetApproval psa : all.get(ps.id())) {
-        if (!wontCopy.contains(psa.label(), psa.accountId())) {
-          byUser.put(psa.label(), psa.accountId(), psa);
-        }
+        byUser.put(psa.label(), psa.accountId(), psa);
       }
 
       TreeMap<Integer, PatchSet> patchSets = getPatchSets(cd);
 
+      Table<String, Account.Id, PatchSetApproval> wontCopy = HashBasedTable.create();
+
       // Walk patch sets strictly less than current in descending order.
       Collection<PatchSet> allPrior =
           patchSets.descendingMap().tailMap(ps.id().get(), false).values();