Rename AddReviewerResult to ReviewerResult
This change doesn't perform any logical changes, but a follow-up can
extend the functionality to also return results of reviewer deletions.
This change breaks implementors of ChangeApi, which means it should be
mentioned in the release notes.
Change-Id: I3741392acbc49a431727c71d3d3f3e86a9e041f7
diff --git a/Documentation/rest-api-changes.txt b/Documentation/rest-api-changes.txt
index 5c4f174..381693f 100644
--- a/Documentation/rest-api-changes.txt
+++ b/Documentation/rest-api-changes.txt
@@ -3363,7 +3363,7 @@
}
----
-As response an link:#add-reviewer-result[AddReviewerResult] entity is
+As response an link:#reviewer-result[ReviewerResult] entity is
returned that describes the newly added reviewers.
.Response
@@ -4169,7 +4169,7 @@
Each element of the `reviewers` list is an instance of
link:#reviewer-input[ReviewerInput]. The corresponding result of
adding each reviewer will be returned in a map of inputs to
-link:#add-reviewer-result[AddReviewerResult]s.
+link:#reviewer-result[ReviewerResult]s.
.Response
----
@@ -6270,33 +6270,6 @@
at the server or permissions are modified. Not present if false.
|====================================
-[[add-reviewer-result]]
-=== AddReviewerResult
-The `AddReviewerResult` entity describes the result of adding a
-reviewer to a change.
-
-[options="header",cols="1,^1,5"]
-|===========================
-|Field Name ||Description
-|`input` ||
-Value of the `reviewer` field from link:#reviewer-input[ReviewerInput]
-set while adding the reviewer.
-|`reviewers` |optional|
-The newly added reviewers as a list of link:#reviewer-info[
-ReviewerInfo] entities.
-|`ccs` |optional|
-The newly CCed accounts as a list of link:#reviewer-info[
-ReviewerInfo] entities. This field will only appear if the requested
-`state` for the reviewer was `CC` *and* NoteDb is enabled on the
-server.
-|`error` |optional|
-Error message explaining why the reviewer could not be added. +
-If a group was specified in the input and an error is returned, it
-means that none of the members were added as reviewer.
-|`confirm` |`false` if not set|
-Whether adding the reviewer requires confirmation.
-|===========================
-
[[approval-info]]
=== ApprovalInfo
The `ApprovalInfo` entity contains information about an approval from a
@@ -7818,7 +7791,7 @@
additions were rejected.
|`reviewers` |optional|
Map of account or group identifier to
-link:rest-api-changes.html#add-reviewer-result[AddReviewerResult]
+link:rest-api-changes.html#reviewer-result[ReviewerResult]
representing the outcome of adding as a reviewer.
Absent if no reviewer additions were requested.
|`ready` |optional|
@@ -7884,6 +7857,33 @@
link:#notify-info[NotifyInfo] entity.
|=============================
+[[reviewer-result]]
+=== ReviewerResult
+The `ReviewerResult` entity describes the result of adding a reviewer to a
+change.
+
+[options="header",cols="1,^1,5"]
+|===========================
+|Field Name ||Description
+|`input` ||
+Value of the `reviewer` field from link:#reviewer-input[ReviewerInput]
+set while adding the reviewer.
+|`reviewers` |optional|
+The newly added reviewers as a list of link:#reviewer-info[
+ReviewerInfo] entities.
+|`ccs` |optional|
+The newly CCed accounts as a list of link:#reviewer-info[
+ReviewerInfo] entities. This field will only appear if the requested
+`state` for the reviewer was `CC` *and* NoteDb is enabled on the
+server.
+|`error` |optional|
+Error message explaining why the reviewer could not be added. +
+If a group was specified in the input and an error is returned, it
+means that none of the members were added as reviewer.
+|`confirm` |`false` if not set|
+Whether adding the reviewer requires confirmation.
+|===========================
+
[[revision-info]]
=== RevisionInfo
The `RevisionInfo` entity contains information about a patch set.
diff --git a/java/com/google/gerrit/extensions/api/changes/ChangeApi.java b/java/com/google/gerrit/extensions/api/changes/ChangeApi.java
index 7ddc115..04f5bd2 100644
--- a/java/com/google/gerrit/extensions/api/changes/ChangeApi.java
+++ b/java/com/google/gerrit/extensions/api/changes/ChangeApi.java
@@ -205,13 +205,13 @@
IncludedInInfo includedIn() throws RestApiException;
- default AddReviewerResult addReviewer(String reviewer) throws RestApiException {
+ default ReviewerResult addReviewer(String reviewer) throws RestApiException {
ReviewerInput in = new ReviewerInput();
in.reviewer = reviewer;
return addReviewer(in);
}
- AddReviewerResult addReviewer(ReviewerInput in) throws RestApiException;
+ ReviewerResult addReviewer(ReviewerInput in) throws RestApiException;
SuggestedReviewersRequest suggestReviewers() throws RestApiException;
@@ -643,7 +643,7 @@
}
@Override
- public AddReviewerResult addReviewer(ReviewerInput in) throws RestApiException {
+ public ReviewerResult addReviewer(ReviewerInput in) throws RestApiException {
throw new NotImplementedException();
}
diff --git a/java/com/google/gerrit/extensions/api/changes/ReviewResult.java b/java/com/google/gerrit/extensions/api/changes/ReviewResult.java
index ff88bbe..95bea5b 100644
--- a/java/com/google/gerrit/extensions/api/changes/ReviewResult.java
+++ b/java/com/google/gerrit/extensions/api/changes/ReviewResult.java
@@ -29,7 +29,7 @@
* Map of account or group identifier to outcome of adding as a reviewer. Null if no reviewer
* additions were requested.
*/
- @Nullable public Map<String, AddReviewerResult> reviewers;
+ @Nullable public Map<String, ReviewerResult> reviewers;
/**
* Boolean indicating whether the change was moved out of WIP by this review. Either true or null.
diff --git a/java/com/google/gerrit/extensions/api/changes/AddReviewerResult.java b/java/com/google/gerrit/extensions/api/changes/ReviewerResult.java
similarity index 92%
rename from java/com/google/gerrit/extensions/api/changes/AddReviewerResult.java
rename to java/com/google/gerrit/extensions/api/changes/ReviewerResult.java
index a23281a..324275a 100644
--- a/java/com/google/gerrit/extensions/api/changes/AddReviewerResult.java
+++ b/java/com/google/gerrit/extensions/api/changes/ReviewerResult.java
@@ -19,7 +19,7 @@
import java.util.List;
/** Result object representing the outcome of a request to add a reviewer. */
-public class AddReviewerResult {
+public class ReviewerResult {
/** The identifier of an account or group that was to be added as a reviewer. */
public String input;
@@ -49,7 +49,7 @@
*
* @param input String identifier of an account or group, from user request
*/
- public AddReviewerResult(String input) {
+ public ReviewerResult(String input) {
this.input = input;
}
@@ -59,7 +59,7 @@
* @param reviewer String identifier of an account or group
* @param error Error message
*/
- public AddReviewerResult(String reviewer, String error) {
+ public ReviewerResult(String reviewer, String error) {
this(reviewer);
this.error = error;
}
@@ -69,7 +69,7 @@
*
* @param confirm Whether confirmation is needed.
*/
- public AddReviewerResult(String reviewer, boolean confirm) {
+ public ReviewerResult(String reviewer, boolean confirm) {
this(reviewer);
this.confirm = confirm;
}
diff --git a/java/com/google/gerrit/server/api/changes/ChangeApiImpl.java b/java/com/google/gerrit/server/api/changes/ChangeApiImpl.java
index 78ecb41..6a26f53 100644
--- a/java/com/google/gerrit/server/api/changes/ChangeApiImpl.java
+++ b/java/com/google/gerrit/server/api/changes/ChangeApiImpl.java
@@ -21,7 +21,6 @@
import com.google.gerrit.common.Nullable;
import com.google.gerrit.exceptions.StorageException;
import com.google.gerrit.extensions.api.changes.AbandonInput;
-import com.google.gerrit.extensions.api.changes.AddReviewerResult;
import com.google.gerrit.extensions.api.changes.AssigneeInput;
import com.google.gerrit.extensions.api.changes.AttentionSetApi;
import com.google.gerrit.extensions.api.changes.AttentionSetInput;
@@ -39,6 +38,7 @@
import com.google.gerrit.extensions.api.changes.ReviewerApi;
import com.google.gerrit.extensions.api.changes.ReviewerInfo;
import com.google.gerrit.extensions.api.changes.ReviewerInput;
+import com.google.gerrit.extensions.api.changes.ReviewerResult;
import com.google.gerrit.extensions.api.changes.RevisionApi;
import com.google.gerrit.extensions.api.changes.SubmittedTogetherInfo;
import com.google.gerrit.extensions.api.changes.SubmittedTogetherOption;
@@ -467,7 +467,7 @@
}
@Override
- public AddReviewerResult addReviewer(ReviewerInput in) throws RestApiException {
+ public ReviewerResult addReviewer(ReviewerInput in) throws RestApiException {
try {
return postReviewers.apply(change, in).value();
} catch (Exception e) {
diff --git a/java/com/google/gerrit/server/change/AddReviewersOp.java b/java/com/google/gerrit/server/change/AddReviewersOp.java
index 07e1799..f79c9fc 100644
--- a/java/com/google/gerrit/server/change/AddReviewersOp.java
+++ b/java/com/google/gerrit/server/change/AddReviewersOp.java
@@ -114,7 +114,7 @@
private final ReviewerState state;
private final boolean forGroup;
- // Unlike addedCCs, addedReviewers is a PatchSetApproval because the AddReviewerResult returned
+ // Unlike addedCCs, addedReviewers is a PatchSetApproval because the ReviewerResult returned
// via the REST API is supposed to include vote information.
private List<PatchSetApproval> addedReviewers = ImmutableList.of();
private Collection<Address> addedReviewersByEmail = ImmutableList.of();
diff --git a/java/com/google/gerrit/server/change/ReviewerModifier.java b/java/com/google/gerrit/server/change/ReviewerModifier.java
index 72b7bbc..653209e 100644
--- a/java/com/google/gerrit/server/change/ReviewerModifier.java
+++ b/java/com/google/gerrit/server/change/ReviewerModifier.java
@@ -39,10 +39,10 @@
import com.google.gerrit.entities.GroupDescription;
import com.google.gerrit.entities.PatchSet;
import com.google.gerrit.entities.PatchSetApproval;
-import com.google.gerrit.extensions.api.changes.AddReviewerResult;
import com.google.gerrit.extensions.api.changes.NotifyHandling;
import com.google.gerrit.extensions.api.changes.ReviewerInfo;
import com.google.gerrit.extensions.api.changes.ReviewerInput;
+import com.google.gerrit.extensions.api.changes.ReviewerResult;
import com.google.gerrit.extensions.client.ReviewerState;
import com.google.gerrit.extensions.common.AccountInfo;
import com.google.gerrit.extensions.restapi.AuthException;
@@ -411,7 +411,7 @@
}
public class ReviewerModification {
- public final AddReviewerResult result;
+ public final ReviewerResult result;
@Nullable public final AddReviewersOp op;
public final ImmutableSet<Account.Id> reviewers;
public final ImmutableSet<Address> reviewersByEmail;
@@ -423,7 +423,7 @@
private ReviewerModification(ReviewerInput input, FailureType failureType) {
this.input = input;
this.failureType = requireNonNull(failureType);
- result = new AddReviewerResult(input.reviewer);
+ result = new ReviewerResult(input.reviewer);
op = null;
reviewers = ImmutableSet.of();
reviewersByEmail = ImmutableSet.of();
@@ -445,7 +445,7 @@
this.input = input;
this.failureType = null;
- result = new AddReviewerResult(input.reviewer);
+ result = new ReviewerResult(input.reviewer);
// Always silently ignore adding the owner as any type of reviewer on their own change. They
// may still be implicitly added as a reviewer if they vote, but not via the reviewer API.
this.reviewers = omitOwner(notes, reviewers);
diff --git a/java/com/google/gerrit/server/restapi/change/PostReview.java b/java/com/google/gerrit/server/restapi/change/PostReview.java
index da6734d..b5f2ab1 100644
--- a/java/com/google/gerrit/server/restapi/change/PostReview.java
+++ b/java/com/google/gerrit/server/restapi/change/PostReview.java
@@ -55,7 +55,6 @@
import com.google.gerrit.entities.PatchSetApproval;
import com.google.gerrit.entities.RobotComment;
import com.google.gerrit.exceptions.StorageException;
-import com.google.gerrit.extensions.api.changes.AddReviewerResult;
import com.google.gerrit.extensions.api.changes.NotifyHandling;
import com.google.gerrit.extensions.api.changes.ReviewInput;
import com.google.gerrit.extensions.api.changes.ReviewInput.CommentInput;
@@ -63,6 +62,7 @@
import com.google.gerrit.extensions.api.changes.ReviewInput.RobotCommentInput;
import com.google.gerrit.extensions.api.changes.ReviewResult;
import com.google.gerrit.extensions.api.changes.ReviewerInput;
+import com.google.gerrit.extensions.api.changes.ReviewerResult;
import com.google.gerrit.extensions.client.Comment.Range;
import com.google.gerrit.extensions.client.DiffPreferencesInfo.Whitespace;
import com.google.gerrit.extensions.client.ReviewerState;
@@ -276,7 +276,7 @@
}
logger.atFine().log("notify handling = %s", input.notify);
- Map<String, AddReviewerResult> reviewerJsonResults = null;
+ Map<String, ReviewerResult> reviewerJsonResults = null;
List<ReviewerModification> reviewerResults = Lists.newArrayList();
boolean hasError = false;
boolean confirm = false;
diff --git a/java/com/google/gerrit/server/restapi/change/PostReviewers.java b/java/com/google/gerrit/server/restapi/change/PostReviewers.java
index 8d54d36..4691550 100644
--- a/java/com/google/gerrit/server/restapi/change/PostReviewers.java
+++ b/java/com/google/gerrit/server/restapi/change/PostReviewers.java
@@ -15,9 +15,9 @@
package com.google.gerrit.server.restapi.change;
import com.google.gerrit.entities.Change;
-import com.google.gerrit.extensions.api.changes.AddReviewerResult;
import com.google.gerrit.extensions.api.changes.NotifyHandling;
import com.google.gerrit.extensions.api.changes.ReviewerInput;
+import com.google.gerrit.extensions.api.changes.ReviewerResult;
import com.google.gerrit.extensions.restapi.BadRequestException;
import com.google.gerrit.extensions.restapi.Response;
import com.google.gerrit.extensions.restapi.RestApiException;
@@ -58,7 +58,7 @@
}
@Override
- public Response<AddReviewerResult> apply(ChangeResource rsrc, ReviewerInput input)
+ public Response<ReviewerResult> apply(ChangeResource rsrc, ReviewerInput input)
throws IOException, RestApiException, UpdateException, PermissionBackendException,
ConfigInvalidException {
if (input.reviewer == null) {
diff --git a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java
index 8ac41b9..dee7861 100644
--- a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java
@@ -104,7 +104,6 @@
import com.google.gerrit.exceptions.StorageException;
import com.google.gerrit.extensions.annotations.Exports;
import com.google.gerrit.extensions.api.accounts.DeleteDraftCommentsInput;
-import com.google.gerrit.extensions.api.changes.AddReviewerResult;
import com.google.gerrit.extensions.api.changes.DeleteReviewerInput;
import com.google.gerrit.extensions.api.changes.DeleteVoteInput;
import com.google.gerrit.extensions.api.changes.DraftApi;
@@ -119,6 +118,7 @@
import com.google.gerrit.extensions.api.changes.ReviewResult;
import com.google.gerrit.extensions.api.changes.ReviewerInfo;
import com.google.gerrit.extensions.api.changes.ReviewerInput;
+import com.google.gerrit.extensions.api.changes.ReviewerResult;
import com.google.gerrit.extensions.api.changes.RevisionApi;
import com.google.gerrit.extensions.api.changes.StarsInput;
import com.google.gerrit.extensions.api.groups.GroupApi;
@@ -1793,7 +1793,7 @@
requestScopeOperations.setApiUser(admin.id());
ReviewerInput in = new ReviewerInput();
in.reviewer = user.email();
- AddReviewerResult r = gApi.changes().id(result.getChangeId()).addReviewer(in);
+ ReviewerResult r = gApi.changes().id(result.getChangeId()).addReviewer(in);
assertThat(r.input).isEqualTo(user.email());
assertThat(r.error).contains("does not have permission to see this change");
@@ -1809,7 +1809,7 @@
ReviewerInput in = new ReviewerInput();
in.reviewer = username;
- AddReviewerResult r = gApi.changes().id(result.getChangeId()).addReviewer(in);
+ ReviewerResult r = gApi.changes().id(result.getChangeId()).addReviewer(in);
assertThat(r.input).isEqualTo(in.reviewer);
assertThat(r.error)
@@ -1836,7 +1836,7 @@
ReviewerInput in = new ReviewerInput();
in.reviewer = Integer.toString(id.get());
- AddReviewerResult r = gApi.changes().id(result.getChangeId()).addReviewer(in);
+ ReviewerResult r = gApi.changes().id(result.getChangeId()).addReviewer(in);
assertThat(r.input).isEqualTo(in.reviewer);
assertThat(r.error).isNull();
@@ -1860,7 +1860,7 @@
ReviewerInput in = new ReviewerInput();
in.reviewer = username;
in.state = ReviewerState.CC;
- AddReviewerResult r = gApi.changes().id(result.getChangeId()).addReviewer(in);
+ ReviewerResult r = gApi.changes().id(result.getChangeId()).addReviewer(in);
assertThat(r.input).isEqualTo(username);
assertThat(r.error).isNull();
diff --git a/javatests/com/google/gerrit/acceptance/rest/change/ChangeReviewersByEmailIT.java b/javatests/com/google/gerrit/acceptance/rest/change/ChangeReviewersByEmailIT.java
index 79029ec..88e5f10 100644
--- a/javatests/com/google/gerrit/acceptance/rest/change/ChangeReviewersByEmailIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/change/ChangeReviewersByEmailIT.java
@@ -25,10 +25,10 @@
import com.google.gerrit.acceptance.RestResponse;
import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations;
import com.google.gerrit.entities.Address;
-import com.google.gerrit.extensions.api.changes.AddReviewerResult;
import com.google.gerrit.extensions.api.changes.ReviewInput;
import com.google.gerrit.extensions.api.changes.ReviewerInfo;
import com.google.gerrit.extensions.api.changes.ReviewerInput;
+import com.google.gerrit.extensions.api.changes.ReviewerResult;
import com.google.gerrit.extensions.api.projects.ConfigInput;
import com.google.gerrit.extensions.client.InheritableBoolean;
import com.google.gerrit.extensions.client.ReviewerState;
@@ -280,7 +280,7 @@
public void rejectMissingEmail() throws Exception {
PushOneCommit.Result r = createChange();
- AddReviewerResult result = gApi.changes().id(r.getChangeId()).addReviewer("");
+ ReviewerResult result = gApi.changes().id(r.getChangeId()).addReviewer("");
assertThat(result.error).isEqualTo(" is not a valid user identifier");
assertThat(result.reviewers).isNull();
}
@@ -289,7 +289,7 @@
public void rejectMalformedEmail() throws Exception {
PushOneCommit.Result r = createChange();
- AddReviewerResult result = gApi.changes().id(r.getChangeId()).addReviewer("Foo Bar <foo.bar@");
+ ReviewerResult result = gApi.changes().id(r.getChangeId()).addReviewer("Foo Bar <foo.bar@");
assertThat(result.error).isEqualTo("Foo Bar <foo.bar@ is not a valid user identifier");
assertThat(result.reviewers).isNull();
}
@@ -302,7 +302,7 @@
PushOneCommit.Result r = createChange();
- AddReviewerResult result =
+ ReviewerResult result =
gApi.changes().id(r.getChangeId()).addReviewer("Foo Bar <foo.bar@gerritcodereview.com>");
assertThat(result.error)
.isEqualTo(
@@ -341,7 +341,7 @@
input.reviewer = "nonexisting@example.com";
input.state = ReviewerState.REVIEWER;
- AddReviewerResult result = gApi.changes().id(r.getChangeId()).addReviewer(input);
+ ReviewerResult result = gApi.changes().id(r.getChangeId()).addReviewer(input);
assertThat(result.reviewers).hasSize(1);
ReviewerInfo info = result.reviewers.get(0);
assertThat(info._accountId).isNull();
@@ -357,7 +357,7 @@
ReviewerInput input = new ReviewerInput();
input.reviewer = "nonexisting@example.com";
input.state = ReviewerState.CC;
- AddReviewerResult result = gApi.changes().id(r.getChangeId()).addReviewer(input);
+ ReviewerResult result = gApi.changes().id(r.getChangeId()).addReviewer(input);
assertThat(result.ccs).hasSize(1);
AccountInfo info = result.ccs.get(0);
diff --git a/javatests/com/google/gerrit/acceptance/rest/change/ChangeReviewersIT.java b/javatests/com/google/gerrit/acceptance/rest/change/ChangeReviewersIT.java
index 2d7510c..41bedbc 100644
--- a/javatests/com/google/gerrit/acceptance/rest/change/ChangeReviewersIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/change/ChangeReviewersIT.java
@@ -41,7 +41,6 @@
import com.google.gerrit.entities.LabelId;
import com.google.gerrit.entities.Permission;
import com.google.gerrit.entities.RefNames;
-import com.google.gerrit.extensions.api.changes.AddReviewerResult;
import com.google.gerrit.extensions.api.changes.NotifyHandling;
import com.google.gerrit.extensions.api.changes.NotifyInfo;
import com.google.gerrit.extensions.api.changes.RecipientType;
@@ -49,6 +48,7 @@
import com.google.gerrit.extensions.api.changes.ReviewResult;
import com.google.gerrit.extensions.api.changes.ReviewerInfo;
import com.google.gerrit.extensions.api.changes.ReviewerInput;
+import com.google.gerrit.extensions.api.changes.ReviewerResult;
import com.google.gerrit.extensions.client.ReviewerState;
import com.google.gerrit.extensions.common.AccountInfo;
import com.google.gerrit.extensions.common.ApprovalInfo;
@@ -100,7 +100,7 @@
// Attempt to add overly large group as reviewers.
PushOneCommit.Result r = createChange();
String changeId = r.getChangeId();
- AddReviewerResult result = addReviewer(changeId, largeGroup);
+ ReviewerResult result = addReviewer(changeId, largeGroup);
assertThat(result.input).isEqualTo(largeGroup);
assertThat(result.confirm).isNull();
assertThat(result.error).contains("has too many members to add them all as reviewers");
@@ -136,7 +136,7 @@
ReviewerInput in = new ReviewerInput();
in.reviewer = user.email();
in.state = CC;
- AddReviewerResult result = addReviewer(changeId, in);
+ ReviewerResult result = addReviewer(changeId, in);
assertThat(result.input).isEqualTo(user.email());
assertThat(result.confirm).isNull();
@@ -175,7 +175,7 @@
gApi.groups()
.id(in.reviewer)
.addMembers(firstUsernames.toArray(new String[firstUsernames.size()]));
- AddReviewerResult result = addReviewer(changeId, in);
+ ReviewerResult result = addReviewer(changeId, in);
assertThat(result.input).isEqualTo(in.reviewer);
assertThat(result.confirm).isNull();
@@ -442,7 +442,7 @@
assertThat(result.labels).isNull();
assertThat(result.reviewers).isNotNull();
assertThat(result.reviewers).hasSize(3);
- AddReviewerResult reviewerResult = result.reviewers.get(largeGroup);
+ ReviewerResult reviewerResult = result.reviewers.get(largeGroup);
assertThat(reviewerResult).isNotNull();
assertThat(reviewerResult.confirm).isNull();
assertThat(reviewerResult.error).isNotNull();
@@ -539,7 +539,7 @@
ReviewResult result = review(r.getChangeId(), r.getCommit().name(), input);
assertThat(result.reviewers).isNotNull();
assertThat(result.reviewers).hasSize(1);
- AddReviewerResult reviewerResult = result.reviewers.get(user.email());
+ ReviewerResult reviewerResult = result.reviewers.get(user.email());
assertThat(reviewerResult).isNotNull();
assertThat(reviewerResult.confirm).isNull();
assertThat(reviewerResult.error).isNull();
@@ -564,7 +564,7 @@
ReviewResult result = review(r.getChangeId(), r.getCommit().name(), input);
assertThat(result.reviewers).isNotNull();
assertThat(result.reviewers).hasSize(2);
- AddReviewerResult reviewerResult = result.reviewers.get(group1);
+ ReviewerResult reviewerResult = result.reviewers.get(group1);
assertThat(reviewerResult.error).isNull();
assertThat(reviewerResult.reviewers).hasSize(2);
reviewerResult = result.reviewers.get(group2);
@@ -881,7 +881,7 @@
input.reviewer = user.email();
input.state = ReviewerState.REVIEWER;
- AddReviewerResult result = gApi.changes().id(r.getChangeId()).addReviewer(input);
+ ReviewerResult result = gApi.changes().id(r.getChangeId()).addReviewer(input);
assertThat(result.reviewers).hasSize(1);
ReviewerInfo info = result.reviewers.get(0);
assertThat(info._accountId).isEqualTo(user.id().get());
@@ -897,7 +897,7 @@
input.reviewer = user.email();
input.state = ReviewerState.CC;
- AddReviewerResult result = gApi.changes().id(r.getChangeId()).addReviewer(input);
+ ReviewerResult result = gApi.changes().id(r.getChangeId()).addReviewer(input);
assertThat(result.ccs).hasSize(1);
AccountInfo info = result.ccs.get(0);
assertThat(info._accountId).isEqualTo(user.id().get());
@@ -992,25 +992,25 @@
.containsExactly(ReviewerState.REVIEWER, ImmutableList.of(userInfo));
}
- private AddReviewerResult addReviewer(String changeId, String reviewer) throws Exception {
+ private ReviewerResult addReviewer(String changeId, String reviewer) throws Exception {
return addReviewer(changeId, reviewer, SC_OK);
}
- private AddReviewerResult addReviewer(String changeId, String reviewer, int expectedStatus)
+ private ReviewerResult addReviewer(String changeId, String reviewer, int expectedStatus)
throws Exception {
ReviewerInput in = new ReviewerInput();
in.reviewer = reviewer;
return addReviewer(changeId, in, expectedStatus);
}
- private AddReviewerResult addReviewer(String changeId, ReviewerInput in) throws Exception {
+ private ReviewerResult addReviewer(String changeId, ReviewerInput in) throws Exception {
return addReviewer(changeId, in, SC_OK);
}
- private AddReviewerResult addReviewer(String changeId, ReviewerInput in, int expectedStatus)
+ private ReviewerResult addReviewer(String changeId, ReviewerInput in, int expectedStatus)
throws Exception {
RestResponse resp = adminRestSession.post("/changes/" + changeId + "/reviewers", in);
- return readContentFromJson(resp, expectedStatus, AddReviewerResult.class);
+ return readContentFromJson(resp, expectedStatus, ReviewerResult.class);
}
private RestResponse deleteReviewer(String changeId, TestAccount account) throws Exception {
diff --git a/polygerrit-ui/app/types/common.ts b/polygerrit-ui/app/types/common.ts
index 3183510..c628661 100644
--- a/polygerrit-ui/app/types/common.ts
+++ b/polygerrit-ui/app/types/common.ts
@@ -1829,7 +1829,8 @@
/**
* The AddReviewerResult entity describes the result of adding a reviewer to a
* change.
- * https://gerrit-review.googlesource.com/Documentation/rest-api-changes.html#add-reviewer-result
+ * https://gerrit-review.googlesource.com/Documentation/rest-api-changes.html#reviewer-result
+ * TODO(paiking): update this to ReviewerResult while considering removals.
*/
export interface AddReviewerResult {
input: AccountId | GroupId | EmailAddress;