commit da48b9de2344f19d6afb5fc1abc2a25ea4448d2b
author Dave Borowitz <dborowitz@google.com> Mon Feb 03 15:52:39 2014 -0800
committer Dave Borowitz <dborowitz@google.com> Mon Feb 03 15:52:39 2014 -0800
tree cbeb6bc962a55b52cc56e2b14e553783920b6422
parent 9760cdc2b2aff18194724b4f1077fb6ada811692

ReviewerJson: actually use passed-in approvals

Change-Id: Ib2d6293829000023db57809ae1ebc7a1d99b542c

gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewers.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewers.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewers.java
index 50bbc73..7fde39c 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewers.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewers.java
@@ -241,7 +241,6 @@
     for (PatchSetApproval psa : added) {
       result.reviewers.add(json.format(
           new ReviewerInfo(psa.getAccountId()),
-          rsrc.getNotes(),
           reviewers.get(psa.getAccountId()),
           ImmutableList.of(psa)));
     }

gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerJson.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerJson.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerJson.java
index f44aeca..5f2f17e5 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerJson.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerJson.java
@@ -67,7 +67,10 @@
     List<ReviewerInfo> infos = Lists.newArrayListWithCapacity(rsrcs.size());
     AccountInfo.Loader loader = accountLoaderFactory.create(true);
     for (ReviewerResource rsrc : rsrcs) {
-      ReviewerInfo info = format(rsrc, null);
+      ReviewerInfo info = format(new ReviewerInfo(
+          rsrc.getUser().getAccountId()),
+          rsrc.getUserControl(),
+          rsrc.getNotes());
       loader.put(info);
       infos.add(info);
     }
@@ -79,12 +82,15 @@
     return format(ImmutableList.<ReviewerResource> of(rsrc));
   }
 
-  public ReviewerInfo format(ReviewerInfo out, ChangeNotes changeNotes,
-      ChangeControl ctl, List<PatchSetApproval> approvals) throws OrmException {
+  public ReviewerInfo format(ReviewerInfo out, ChangeControl ctl,
+      ChangeNotes changeNotes) throws OrmException {
     PatchSet.Id psId = ctl.getChange().currentPatchSetId();
+    return format(out, ctl,
+        approvalsUtil.byPatchSetUser(db.get(), changeNotes, psId, out._id));
+  }
 
-    approvals =
-        approvalsUtil.byPatchSetUser(db.get(), changeNotes, psId, out._id);
+  public ReviewerInfo format(ReviewerInfo out, ChangeControl ctl,
+      List<PatchSetApproval> approvals) throws OrmException {
     approvals = labelNormalizer.normalize(ctl, approvals);
     LabelTypes labelTypes = ctl.getLabelTypes();
 
@@ -128,12 +134,6 @@
     return out;
   }
 
-  private ReviewerInfo format(ReviewerResource rsrc,
-      List<PatchSetApproval> approvals) throws OrmException {
-    return format(new ReviewerInfo(rsrc.getUser().getAccountId()),
-        rsrc.getNotes(), rsrc.getUserControl(), approvals);
-  }
-
   public static class ReviewerInfo extends AccountInfo {
     final String kind = "gerritcodereview#reviewer";
     Map<String, String> approvals;