opendev/gerrit
Code Issues Proposed changes

Move PostReviewers result classes into extensions

Browse Source 
Details about the results returned by the server when adding
reviewers were previously unknown to users of the extensions
API package. This change moves these details into new classes
(AddReviewerResult and ReviewerInfo) so we can more thoroughly
test this API.

Change-Id: I3bb0d6b5becc487cc66c3e5660f9fe3c9c916432
This commit is contained in:
Logan Hanks
2016-07-06 14:31:56 -07:00
parent 530409a84c
commit 23e7028283
8 changed files with 252 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,7 @@ import com.google.gerrit.common.data.LabelTypes;
import com.google.gerrit.common.data.Permission;
import com.google.gerrit.common.data.PermissionRange;
import com.google.gerrit.common.data.SubmitRecord;
import com.google.gerrit.extensions.common.AccountInfo;
import com.google.gerrit.extensions.api.changes.ReviewerInfo;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.reviewdb.client.PatchSetApproval;
@@ -40,7 +40,6 @@ import com.google.inject.Singleton;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
@Singleton
@@ -67,7 +66,7 @@ public class ReviewerJson {
AccountLoader loader = accountLoaderFactory.create(true);
for (ReviewerResource rsrc : rsrcs) {
ReviewerInfo info = format(new ReviewerInfo(
rsrc.getReviewerUser().getAccountId()),
rsrc.getReviewerUser().getAccountId().get()),
rsrc.getReviewerControl());
loader.put(info);
infos.add(info);
@@ -132,18 +131,4 @@ public class ReviewerJson {
return out;
}
public static class ReviewerInfo extends AccountInfo {
Map<String, String> approvals;
protected ReviewerInfo(Account.Id id) {
super(id.get());
}
}
public static class PostResult {
public List<ReviewerInfo> reviewers;
public String error;
Boolean confirm;
}
}