Merge changes Ie0161bc1,Ib797bdd8,Ide37faae,I3741392a,I7f0b8788, ...
* changes:
Rename ReviewerAdditionList to ReviewerModificationList
Remove conditions of NoteDb being enabled in the docs
Fix documentation for ReviewerResult
Rename AddReviewerResult to ReviewerResult
Rename AddReviewerSender to ModifyReviewerSender
Rename AddReviewersEmail to ModifyReviewersEmail
Rename ReviewerAddition to ReviewerModification
Rename ReviewerAdder to ReviewerModifier
Rename AddReviewerInput to ReviewerInput
diff --git a/Documentation/rest-api-changes.txt b/Documentation/rest-api-changes.txt
index a6a9cb7..0122615 100644
--- a/Documentation/rest-api-changes.txt
+++ b/Documentation/rest-api-changes.txt
@@ -3360,7 +3360,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
@@ -4166,7 +4166,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
----
@@ -6267,33 +6267,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
@@ -6438,8 +6411,7 @@
The assignee of the change as an link:rest-api-accounts.html#account-info[
AccountInfo] entity.
|`hashtags` |optional|
-List of hashtags that are set on the change (only populated when NoteDb
-is enabled).
+List of hashtags that are set on the change.
|`change_id` ||The Change-Id of the change.
|`subject` ||
The subject of the change (header line of the commit message).
@@ -7815,7 +7787,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|
@@ -7881,6 +7853,32 @@
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:rest-api-accounts.html#account-info[AccountInfo] entities. This field will
+only appear if the requested `state` for the reviewer was `CC`.
+|`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 7cbfebd..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 {
- AddReviewerInput in = new AddReviewerInput();
+ default ReviewerResult addReviewer(String reviewer) throws RestApiException {
+ ReviewerInput in = new ReviewerInput();
in.reviewer = reviewer;
return addReviewer(in);
}
- AddReviewerResult addReviewer(AddReviewerInput in) throws RestApiException;
+ ReviewerResult addReviewer(ReviewerInput in) throws RestApiException;
SuggestedReviewersRequest suggestReviewers() throws RestApiException;
@@ -643,7 +643,7 @@
}
@Override
- public AddReviewerResult addReviewer(AddReviewerInput in) throws RestApiException {
+ public ReviewerResult addReviewer(ReviewerInput in) throws RestApiException {
throw new NotImplementedException();
}
diff --git a/java/com/google/gerrit/extensions/api/changes/ReviewInput.java b/java/com/google/gerrit/extensions/api/changes/ReviewInput.java
index fd445b6..9da0d0f 100644
--- a/java/com/google/gerrit/extensions/api/changes/ReviewInput.java
+++ b/java/com/google/gerrit/extensions/api/changes/ReviewInput.java
@@ -63,7 +63,7 @@
public String onBehalfOf;
/** Reviewers that should be added to this change. */
- public List<AddReviewerInput> reviewers;
+ public List<ReviewerInput> reviewers;
/**
* If true mark the change as work in progress. It is an error for both {@link #workInProgress}
@@ -155,7 +155,7 @@
}
public ReviewInput reviewer(String reviewer, ReviewerState state, boolean confirmed) {
- AddReviewerInput input = new AddReviewerInput();
+ ReviewerInput input = new ReviewerInput();
input.reviewer = reviewer;
input.state = state;
input.confirmed = confirmed;
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/AddReviewerInput.java b/java/com/google/gerrit/extensions/api/changes/ReviewerInput.java
similarity index 97%
rename from java/com/google/gerrit/extensions/api/changes/AddReviewerInput.java
rename to java/com/google/gerrit/extensions/api/changes/ReviewerInput.java
index bc8b28a..a7b511b 100644
--- a/java/com/google/gerrit/extensions/api/changes/AddReviewerInput.java
+++ b/java/com/google/gerrit/extensions/api/changes/ReviewerInput.java
@@ -20,7 +20,7 @@
import com.google.gerrit.extensions.restapi.DefaultInput;
import java.util.Map;
-public class AddReviewerInput {
+public class ReviewerInput {
@DefaultInput public String reviewer;
public Boolean confirmed;
public ReviewerState state;
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 0b340b8..6a26f53 100644
--- a/java/com/google/gerrit/server/api/changes/ChangeApiImpl.java
+++ b/java/com/google/gerrit/server/api/changes/ChangeApiImpl.java
@@ -21,8 +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.AddReviewerInput;
-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 +37,8 @@
import com.google.gerrit.extensions.api.changes.RevertInput;
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(AddReviewerInput 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 d05a97c..f79c9fc 100644
--- a/java/com/google/gerrit/server/change/AddReviewersOp.java
+++ b/java/com/google/gerrit/server/change/AddReviewersOp.java
@@ -108,13 +108,13 @@
private final ReviewerAdded reviewerAdded;
private final AccountCache accountCache;
private final ProjectCache projectCache;
- private final AddReviewersEmail addReviewersEmail;
+ private final ModifyReviewersEmail modifyReviewersEmail;
private final Set<Account.Id> accountIds;
private final Collection<Address> addresses;
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();
@@ -133,7 +133,7 @@
ReviewerAdded reviewerAdded,
AccountCache accountCache,
ProjectCache projectCache,
- AddReviewersEmail addReviewersEmail,
+ ModifyReviewersEmail modifyReviewersEmail,
@Assisted Set<Account.Id> accountIds,
@Assisted Collection<Address> addresses,
@Assisted ReviewerState state,
@@ -144,7 +144,7 @@
this.reviewerAdded = reviewerAdded;
this.accountCache = accountCache;
this.projectCache = projectCache;
- this.addReviewersEmail = addReviewersEmail;
+ this.modifyReviewersEmail = modifyReviewersEmail;
this.accountIds = accountIds;
this.addresses = addresses;
@@ -247,7 +247,7 @@
.setAddedCCsByEmail(addedCCsByEmail)
.build();
if (sendEmail) {
- addReviewersEmail.emailReviewersAsync(
+ modifyReviewersEmail.emailReviewersAsync(
ctx.getUser().asIdentifiedUser(),
change,
Lists.transform(addedReviewers, PatchSetApproval::accountId),
diff --git a/java/com/google/gerrit/server/change/ChangeInserter.java b/java/com/google/gerrit/server/change/ChangeInserter.java
index 00ef8fa..22bbd82 100644
--- a/java/com/google/gerrit/server/change/ChangeInserter.java
+++ b/java/com/google/gerrit/server/change/ChangeInserter.java
@@ -18,7 +18,7 @@
import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.ImmutableSet.toImmutableSet;
import static com.google.gerrit.entities.Change.INITIAL_PATCH_SET_ID;
-import static com.google.gerrit.server.change.ReviewerAdder.newAddReviewerInputFromCommitIdentity;
+import static com.google.gerrit.server.change.ReviewerModifier.newReviewerInputFromCommitIdentity;
import static com.google.gerrit.server.notedb.ReviewerStateInternal.REVIEWER;
import static com.google.gerrit.server.project.ProjectCache.illegalState;
import static java.util.Objects.requireNonNull;
@@ -50,9 +50,9 @@
import com.google.gerrit.server.ChangeMessagesUtil;
import com.google.gerrit.server.ChangeUtil;
import com.google.gerrit.server.PatchSetUtil;
-import com.google.gerrit.server.change.ReviewerAdder.InternalAddReviewerInput;
-import com.google.gerrit.server.change.ReviewerAdder.ReviewerAddition;
-import com.google.gerrit.server.change.ReviewerAdder.ReviewerAdditionList;
+import com.google.gerrit.server.change.ReviewerModifier.InternalReviewerInput;
+import com.google.gerrit.server.change.ReviewerModifier.ReviewerModification;
+import com.google.gerrit.server.change.ReviewerModifier.ReviewerModificationList;
import com.google.gerrit.server.config.SendEmailExecutor;
import com.google.gerrit.server.config.UrlFormatter;
import com.google.gerrit.server.events.CommitReceivedEvent;
@@ -113,7 +113,7 @@
private final CommitValidators.Factory commitValidatorsFactory;
private final RevisionCreated revisionCreated;
private final CommentAdded commentAdded;
- private final ReviewerAdder reviewerAdder;
+ private final ReviewerModifier reviewerModifier;
private final MessageIdGenerator messageIdGenerator;
private final DynamicItem<UrlFormatter> urlFormatter;
private final AutoMerger autoMerger;
@@ -139,7 +139,7 @@
private boolean sendMail;
private boolean updateRef;
private Change.Id revertOf;
- private ImmutableList<InternalAddReviewerInput> reviewerInputs;
+ private ImmutableList<InternalReviewerInput> reviewerInputs;
// Fields set during the insertion process.
private ReceiveCommand cmd;
@@ -149,7 +149,7 @@
private PatchSet patchSet;
private String pushCert;
private ProjectState projectState;
- private ReviewerAdditionList reviewerAdditions;
+ private ReviewerModificationList reviewerAdditions;
@Inject
ChangeInserter(
@@ -164,7 +164,7 @@
CommitValidators.Factory commitValidatorsFactory,
CommentAdded commentAdded,
RevisionCreated revisionCreated,
- ReviewerAdder reviewerAdder,
+ ReviewerModifier reviewerModifier,
MessageIdGenerator messageIdGenerator,
DynamicItem<UrlFormatter> urlFormatter,
AutoMerger autoMerger,
@@ -182,7 +182,7 @@
this.commitValidatorsFactory = commitValidatorsFactory;
this.revisionCreated = revisionCreated;
this.commentAdded = commentAdded;
- this.reviewerAdder = reviewerAdder;
+ this.reviewerModifier = reviewerModifier;
this.messageIdGenerator = messageIdGenerator;
this.urlFormatter = urlFormatter;
this.autoMerger = autoMerger;
@@ -281,8 +281,8 @@
Streams.concat(
Streams.stream(reviewers)
.distinct()
- .map(id -> newAddReviewerInput(id, ReviewerState.REVIEWER)),
- Streams.stream(ccs).distinct().map(id -> newAddReviewerInput(id, ReviewerState.CC)))
+ .map(id -> newReviewerInput(id, ReviewerState.REVIEWER)),
+ Streams.stream(ccs).distinct().map(id -> newReviewerInput(id, ReviewerState.CC)))
.collect(toImmutableList());
return this;
}
@@ -444,8 +444,9 @@
}
reviewerAdditions =
- reviewerAdder.prepare(ctx.getNotes(), ctx.getUser(), getReviewerInputs(), true);
- Optional<ReviewerAddition> reviewerError = reviewerAdditions.getFailures().stream().findFirst();
+ reviewerModifier.prepare(ctx.getNotes(), ctx.getUser(), getReviewerInputs(), true);
+ Optional<ReviewerModification> reviewerError =
+ reviewerAdditions.getFailures().stream().findFirst();
if (reviewerError.isPresent()) {
throw new UnprocessableEntityException(reviewerError.get().result.error);
}
@@ -588,35 +589,34 @@
}
}
- private static InternalAddReviewerInput newAddReviewerInput(
- String reviewer, ReviewerState state) {
+ private static InternalReviewerInput newReviewerInput(String reviewer, ReviewerState state) {
// Disable individual emails when adding reviewers, as all reviewers will receive the single
// bulk new change email.
- InternalAddReviewerInput input =
- ReviewerAdder.newAddReviewerInput(reviewer, state, NotifyHandling.NONE);
+ InternalReviewerInput input =
+ ReviewerModifier.newReviewerInput(reviewer, state, NotifyHandling.NONE);
// Ignore failures for reasons like the reviewer being inactive or being unable to see the
// change. This is required for the push path, where it automatically sets reviewers from
// certain commit footers: putting a nonexistent user in a footer should not cause an error. In
// theory we could provide finer control to do this for some reviewers and not others, but it's
// not worth complicating the ChangeInserter interface further at this time.
- input.otherFailureBehavior = ReviewerAdder.FailureBehavior.IGNORE;
+ input.otherFailureBehavior = ReviewerModifier.FailureBehavior.IGNORE;
return input;
}
- private ImmutableList<InternalAddReviewerInput> getReviewerInputs() {
+ private ImmutableList<InternalReviewerInput> getReviewerInputs() {
return Streams.concat(
reviewerInputs.stream(),
Streams.stream(
- newAddReviewerInputFromCommitIdentity(
+ newReviewerInputFromCommitIdentity(
change,
patchSetInfo.getCommitId(),
patchSetInfo.getAuthor().getAccount(),
NotifyHandling.NONE,
change.getOwner())),
Streams.stream(
- newAddReviewerInputFromCommitIdentity(
+ newReviewerInputFromCommitIdentity(
change,
patchSetInfo.getCommitId(),
patchSetInfo.getCommitter().getAccount(),
diff --git a/java/com/google/gerrit/server/change/AddReviewersEmail.java b/java/com/google/gerrit/server/change/ModifyReviewersEmail.java
similarity index 92%
rename from java/com/google/gerrit/server/change/AddReviewersEmail.java
rename to java/com/google/gerrit/server/change/ModifyReviewersEmail.java
index 4a3f638..a7327f6 100644
--- a/java/com/google/gerrit/server/change/AddReviewersEmail.java
+++ b/java/com/google/gerrit/server/change/ModifyReviewersEmail.java
@@ -24,8 +24,8 @@
import com.google.gerrit.entities.Project;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.config.SendEmailExecutor;
-import com.google.gerrit.server.mail.send.AddReviewerSender;
import com.google.gerrit.server.mail.send.MessageIdGenerator;
+import com.google.gerrit.server.mail.send.ModifyReviewerSender;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.util.Collection;
@@ -33,16 +33,16 @@
import java.util.concurrent.Future;
@Singleton
-public class AddReviewersEmail {
+public class ModifyReviewersEmail {
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
- private final AddReviewerSender.Factory addReviewerSenderFactory;
+ private final ModifyReviewerSender.Factory addReviewerSenderFactory;
private final ExecutorService sendEmailsExecutor;
private final MessageIdGenerator messageIdGenerator;
@Inject
- AddReviewersEmail(
- AddReviewerSender.Factory addReviewerSenderFactory,
+ ModifyReviewersEmail(
+ ModifyReviewerSender.Factory addReviewerSenderFactory,
@SendEmailExecutor ExecutorService sendEmailsExecutor,
MessageIdGenerator messageIdGenerator) {
this.addReviewerSenderFactory = addReviewerSenderFactory;
@@ -83,7 +83,7 @@
sendEmailsExecutor.submit(
() -> {
try {
- AddReviewerSender emailSender =
+ ModifyReviewerSender emailSender =
addReviewerSenderFactory.create(projectNameKey, cId);
emailSender.setNotify(notify);
emailSender.setFrom(userId);
diff --git a/java/com/google/gerrit/server/change/ReviewerAdder.java b/java/com/google/gerrit/server/change/ReviewerModifier.java
similarity index 84%
rename from java/com/google/gerrit/server/change/ReviewerAdder.java
rename to java/com/google/gerrit/server/change/ReviewerModifier.java
index 1732a2c..b45b6a9 100644
--- a/java/com/google/gerrit/server/change/ReviewerAdder.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.AddReviewerInput;
-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;
@@ -85,7 +85,7 @@
import org.eclipse.jgit.lib.Config;
import org.eclipse.jgit.lib.ObjectId;
-public class ReviewerAdder {
+public class ReviewerModifier {
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
public static final int DEFAULT_MAX_REVIEWERS_WITHOUT_CHECK = 10;
@@ -102,9 +102,9 @@
}
// TODO(dborowitz): Subclassing is not the right way to do this. We should instead use an internal
- // type in the public interfaces of ReviewerAdder, rather than passing around the REST API type
+ // type in the public interfaces of ReviewerModifier, rather than passing around the REST API type
// internally.
- public static class InternalAddReviewerInput extends AddReviewerInput {
+ public static class InternalReviewerInput extends ReviewerInput {
/**
* Behavior when identifying reviewers fails for any reason <em>besides</em> the input not
* resolving to an account/group/email.
@@ -112,22 +112,16 @@
public FailureBehavior otherFailureBehavior = FailureBehavior.FAIL;
}
- public static InternalAddReviewerInput newAddReviewerInput(
- Account.Id reviewer, ReviewerState state, NotifyHandling notify) {
- // AccountResolver always resolves by ID if the input string is numeric.
- return newAddReviewerInput(reviewer.toString(), state, notify);
- }
-
- public static InternalAddReviewerInput newAddReviewerInput(
+ public static InternalReviewerInput newReviewerInput(
String reviewer, ReviewerState state, NotifyHandling notify) {
- InternalAddReviewerInput in = new InternalAddReviewerInput();
+ InternalReviewerInput in = new InternalReviewerInput();
in.reviewer = reviewer;
in.state = state;
in.notify = notify;
return in;
}
- public static Optional<InternalAddReviewerInput> newAddReviewerInputFromCommitIdentity(
+ public static Optional<InternalReviewerInput> newReviewerInputFromCommitIdentity(
Change change,
ObjectId commitId,
@Nullable Account.Id accountId,
@@ -142,7 +136,7 @@
"Adding account %d from author/committer identity of commit %s as cc to change %d",
accountId.get(), commitId.name(), change.getChangeId());
- InternalAddReviewerInput in = new InternalAddReviewerInput();
+ InternalReviewerInput in = new InternalReviewerInput();
in.reviewer = accountId.toString();
in.state = CC;
in.notify = notify;
@@ -163,7 +157,7 @@
private final OutgoingEmailValidator validator;
@Inject
- ReviewerAdder(
+ ReviewerModifier(
AccountResolver accountResolver,
PermissionBackend permissionBackend,
GroupResolver groupResolver,
@@ -189,7 +183,7 @@
}
/**
- * Prepare application of a single {@link AddReviewerInput}.
+ * Prepare application of a single {@link ReviewerInput}.
*
* @param notes change notes.
* @param user user performing the reviewer addition.
@@ -202,8 +196,8 @@
* @throws PermissionBackendException
* @throws ConfigInvalidException
*/
- public ReviewerAddition prepare(
- ChangeNotes notes, CurrentUser user, AddReviewerInput input, boolean allowGroup)
+ public ReviewerModification prepare(
+ ChangeNotes notes, CurrentUser user, ReviewerInput input, boolean allowGroup)
throws IOException, PermissionBackendException, ConfigInvalidException {
try (TraceContext.TraceTimer ignored =
TraceContext.newTimer(getClass().getSimpleName() + "#prepare", Metadata.empty())) {
@@ -215,9 +209,9 @@
.orElseThrow(illegalState(notes.getProjectName()))
.is(BooleanProjectConfig.ENABLE_REVIEWER_BY_EMAIL);
- ReviewerAddition byAccountId = addByAccountId(input, notes, user);
+ ReviewerModification byAccountId = addByAccountId(input, notes, user);
- ReviewerAddition wholeGroup = null;
+ ReviewerModification wholeGroup = null;
if (!byAccountId.exactMatchFound) {
wholeGroup = addWholeGroup(input, notes, user, confirmed, allowGroup, allowByEmail);
if (wholeGroup != null && wholeGroup.exactMatchFound) {
@@ -245,9 +239,9 @@
}
}
- public ReviewerAddition ccCurrentUser(CurrentUser user, RevisionResource revision) {
- return new ReviewerAddition(
- newAddReviewerInput(user.getUserName().orElse(null), CC, NotifyHandling.NONE),
+ public ReviewerModification ccCurrentUser(CurrentUser user, RevisionResource revision) {
+ return new ReviewerModification(
+ newReviewerInput(user.getUserName().orElse(null), CC, NotifyHandling.NONE),
revision.getNotes(),
revision.getUser(),
ImmutableSet.of(user.getAccountId()),
@@ -257,8 +251,8 @@
}
@Nullable
- private ReviewerAddition addByAccountId(
- AddReviewerInput input, ChangeNotes notes, CurrentUser user)
+ private ReviewerModification addByAccountId(
+ ReviewerInput input, ChangeNotes notes, CurrentUser user)
throws PermissionBackendException, IOException, ConfigInvalidException {
IdentifiedUser reviewerUser;
boolean exactMatchFound = false;
@@ -275,7 +269,7 @@
}
if (isValidReviewer(notes.getChange().getDest(), reviewerUser.getAccount())) {
- return new ReviewerAddition(
+ return new ReviewerModification(
input,
notes,
user,
@@ -291,8 +285,8 @@
}
@Nullable
- private ReviewerAddition addWholeGroup(
- AddReviewerInput input,
+ private ReviewerModification addWholeGroup(
+ ReviewerInput input,
ChangeNotes notes,
CurrentUser user,
boolean confirmed,
@@ -366,11 +360,11 @@
}
}
- return new ReviewerAddition(input, notes, user, reviewers, null, true, true);
+ return new ReviewerModification(input, notes, user, reviewers, null, true, true);
}
@Nullable
- private ReviewerAddition addByEmail(AddReviewerInput input, ChangeNotes notes, CurrentUser user)
+ private ReviewerModification addByEmail(ReviewerInput input, ChangeNotes notes, CurrentUser user)
throws PermissionBackendException {
try {
permissionBackend.user(anonymousProvider.get()).change(notes).check(ChangePermission.READ);
@@ -388,7 +382,7 @@
FailureType.NOT_FOUND,
MessageFormat.format(ChangeMessages.get().reviewerInvalid, input.reviewer));
}
- return new ReviewerAddition(input, notes, user, null, ImmutableList.of(adr), true, false);
+ return new ReviewerModification(input, notes, user, null, ImmutableList.of(adr), true, false);
}
private boolean isValidReviewer(BranchNameKey branch, Account member)
@@ -404,32 +398,32 @@
}
}
- private ReviewerAddition fail(AddReviewerInput input, FailureType failureType, String error) {
+ private ReviewerModification fail(ReviewerInput input, FailureType failureType, String error) {
return fail(input, failureType, false, error);
}
- private ReviewerAddition fail(
- AddReviewerInput input, FailureType failureType, boolean confirm, String error) {
- ReviewerAddition addition = new ReviewerAddition(input, failureType);
+ private ReviewerModification fail(
+ ReviewerInput input, FailureType failureType, boolean confirm, String error) {
+ ReviewerModification addition = new ReviewerModification(input, failureType);
addition.result.confirm = confirm ? true : null;
addition.result.error = error;
return addition;
}
- public class ReviewerAddition {
- public final AddReviewerResult result;
+ public class ReviewerModification {
+ public final ReviewerResult result;
@Nullable public final AddReviewersOp op;
public final ImmutableSet<Account.Id> reviewers;
public final ImmutableSet<Address> reviewersByEmail;
@Nullable final IdentifiedUser caller;
final boolean exactMatchFound;
- private final AddReviewerInput input;
+ private final ReviewerInput input;
@Nullable private final FailureType failureType;
- private ReviewerAddition(AddReviewerInput input, FailureType failureType) {
+ 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();
@@ -437,8 +431,8 @@
exactMatchFound = false;
}
- private ReviewerAddition(
- AddReviewerInput input,
+ private ReviewerModification(
+ ReviewerInput input,
ChangeNotes notes,
CurrentUser caller,
@Nullable Iterable<Account.Id> reviewers,
@@ -451,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);
@@ -515,8 +509,8 @@
public boolean isIgnorableFailure() {
checkState(failureType != null);
FailureBehavior behavior =
- (input instanceof InternalAddReviewerInput)
- ? ((InternalAddReviewerInput) input).otherFailureBehavior
+ (input instanceof InternalReviewerInput)
+ ? ((InternalReviewerInput) input).otherFailureBehavior
: FailureBehavior.FAIL;
return failureType == FailureType.OTHER && behavior == FailureBehavior.IGNORE;
}
@@ -526,10 +520,10 @@
return !SystemGroupBackend.isSystemGroup(groupUUID);
}
- public ReviewerAdditionList prepare(
+ public ReviewerModificationList prepare(
ChangeNotes notes,
CurrentUser user,
- Iterable<? extends AddReviewerInput> inputs,
+ Iterable<? extends ReviewerInput> inputs,
boolean allowGroup)
throws IOException, PermissionBackendException, ConfigInvalidException {
// Process CC ops before reviewer ops, so a user that appears in both lists ends up as a
@@ -539,39 +533,39 @@
// TODO(dborowitz): Consider changing interface to allow excluding reviewers that were
// previously processed, to proactively prevent overlap so we don't have to rely on this subtle
// behavior.
- ImmutableList<AddReviewerInput> sorted =
+ ImmutableList<ReviewerInput> sorted =
Streams.stream(inputs)
.sorted(
comparing(
- AddReviewerInput::state,
+ ReviewerInput::state,
Ordering.explicit(ReviewerState.CC, ReviewerState.REVIEWER)))
.collect(toImmutableList());
- List<ReviewerAddition> additions = new ArrayList<>();
- for (AddReviewerInput input : sorted) {
- ReviewerAddition addition = prepare(notes, user, input, allowGroup);
+ List<ReviewerModification> additions = new ArrayList<>();
+ for (ReviewerInput input : sorted) {
+ ReviewerModification addition = prepare(notes, user, input, allowGroup);
if (addition.op != null) {
// Assume any callers preparing a list of batch insertions are handling their own email.
addition.op.suppressEmail();
}
additions.add(addition);
}
- return new ReviewerAdditionList(additions);
+ return new ReviewerModificationList(additions);
}
// TODO(dborowitz): This class works, but ultimately feels wrong. It seems like an op but isn't
// really an op, it's a collection of ops, and it's only called from the body of other ops. We
// could make this class an op, but we would still have AddReviewersOp. Better would probably be
- // to design a single op that supports combining multiple AddReviewerInputs together. That would
+ // to design a single op that supports combining multiple ReviewerInputs together. That would
// probably also subsume the Addition class itself, which would be a good thing.
- public static class ReviewerAdditionList {
- private final ImmutableList<ReviewerAddition> additions;
+ public static class ReviewerModificationList {
+ private final ImmutableList<ReviewerModification> modifications;
- private ReviewerAdditionList(List<ReviewerAddition> additions) {
- this.additions = ImmutableList.copyOf(additions);
+ private ReviewerModificationList(List<ReviewerModification> modifications) {
+ this.modifications = ImmutableList.copyOf(modifications);
}
- public ImmutableList<ReviewerAddition> getFailures() {
- return additions.stream()
+ public ImmutableList<ReviewerModification> getFailures() {
+ return modifications.stream()
.filter(a -> a.isFailure() && !a.isIgnorableFailure())
.collect(toImmutableList());
}
@@ -580,14 +574,14 @@
public void updateChange(ChangeContext ctx, PatchSet patchSet)
throws RestApiException, IOException {
- for (ReviewerAddition addition : additions()) {
+ for (ReviewerModification addition : modifications()) {
addition.op.setPatchSet(patchSet);
addition.op.updateChange(ctx);
}
}
public void postUpdate(PostUpdateContext ctx) throws Exception {
- for (ReviewerAddition addition : additions()) {
+ for (ReviewerModification addition : modifications()) {
if (addition.op != null) {
addition.op.postUpdate(ctx);
}
@@ -596,20 +590,20 @@
public <T> ImmutableSet<T> flattenResults(
Function<AddReviewersOp.Result, ? extends Collection<T>> func) {
- additions()
+ modifications()
.forEach(
a ->
checkArgument(
a.op != null && a.op.getResult() != null, "missing result on %s", a));
- return additions().stream()
+ return modifications().stream()
.map(a -> a.op.getResult())
.map(func)
.flatMap(Collection::stream)
.collect(toImmutableSet());
}
- private ImmutableList<ReviewerAddition> additions() {
- return additions.stream()
+ private ImmutableList<ReviewerModification> modifications() {
+ return modifications.stream()
.filter(
a -> {
if (a.isFailure()) {
diff --git a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java
index 633a407..377718b 100644
--- a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java
+++ b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java
@@ -1675,7 +1675,7 @@
* account IDs computed from the commit message itself.
*
* @param additionalRecipients recipients parsed from the commit.
- * @return set of reviewer strings to pass to {@code ReviewerAdder}.
+ * @return set of reviewer strings to pass to {@code ReviewerModifier}.
*/
ImmutableSet<String> getCombinedReviewers(MailRecipients additionalRecipients) {
return getCombinedReviewers(reviewer, additionalRecipients.getReviewers());
@@ -1689,7 +1689,7 @@
* account IDs computed from the commit message itself.
*
* @param additionalRecipients recipients parsed from the commit.
- * @return set of CC strings to pass to {@code ReviewerAdder}.
+ * @return set of CC strings to pass to {@code ReviewerModifier}.
*/
ImmutableSet<String> getCombinedCcs(MailRecipients additionalRecipients) {
return getCombinedReviewers(cc, additionalRecipients.getCcOnly());
diff --git a/java/com/google/gerrit/server/git/receive/ReplaceOp.java b/java/com/google/gerrit/server/git/receive/ReplaceOp.java
index 75ee311..6e4f9da 100644
--- a/java/com/google/gerrit/server/git/receive/ReplaceOp.java
+++ b/java/com/google/gerrit/server/git/receive/ReplaceOp.java
@@ -16,7 +16,7 @@
import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.ImmutableSet.toImmutableSet;
-import static com.google.gerrit.server.change.ReviewerAdder.newAddReviewerInputFromCommitIdentity;
+import static com.google.gerrit.server.change.ReviewerModifier.newReviewerInputFromCommitIdentity;
import static com.google.gerrit.server.mail.MailUtil.getRecipientsFromFooters;
import static com.google.gerrit.server.mail.MailUtil.getRecipientsFromReviewers;
import static com.google.gerrit.server.notedb.ReviewerStateInternal.REVIEWER;
@@ -36,8 +36,8 @@
import com.google.gerrit.entities.PatchSetApproval;
import com.google.gerrit.entities.PatchSetInfo;
import com.google.gerrit.entities.SubmissionId;
-import com.google.gerrit.extensions.api.changes.AddReviewerInput;
import com.google.gerrit.extensions.api.changes.NotifyHandling;
+import com.google.gerrit.extensions.api.changes.ReviewerInput;
import com.google.gerrit.extensions.client.ChangeKind;
import com.google.gerrit.extensions.client.ReviewerState;
import com.google.gerrit.extensions.registration.DynamicItem;
@@ -52,10 +52,10 @@
import com.google.gerrit.server.change.AddReviewersOp;
import com.google.gerrit.server.change.ChangeKindCache;
import com.google.gerrit.server.change.NotifyResolver;
-import com.google.gerrit.server.change.ReviewerAdder;
-import com.google.gerrit.server.change.ReviewerAdder.InternalAddReviewerInput;
-import com.google.gerrit.server.change.ReviewerAdder.ReviewerAddition;
-import com.google.gerrit.server.change.ReviewerAdder.ReviewerAdditionList;
+import com.google.gerrit.server.change.ReviewerModifier;
+import com.google.gerrit.server.change.ReviewerModifier.InternalReviewerInput;
+import com.google.gerrit.server.change.ReviewerModifier.ReviewerModification;
+import com.google.gerrit.server.change.ReviewerModifier.ReviewerModificationList;
import com.google.gerrit.server.config.SendEmailExecutor;
import com.google.gerrit.server.config.UrlFormatter;
import com.google.gerrit.server.extensions.events.CommentAdded;
@@ -131,7 +131,7 @@
private final PatchSetUtil psUtil;
private final ReplacePatchSetSender.Factory replacePatchSetFactory;
private final ProjectCache projectCache;
- private final ReviewerAdder reviewerAdder;
+ private final ReviewerModifier reviewerModifier;
private final Change change;
private final MessageIdGenerator messageIdGenerator;
private final DynamicItem<UrlFormatter> urlFormatter;
@@ -159,7 +159,7 @@
private String rejectMessage;
private MergedByPushOp mergedByPushOp;
private RequestScopePropagator requestScopePropagator;
- private ReviewerAdditionList reviewerAdditions;
+ private ReviewerModificationList reviewerAdditions;
private MailRecipients oldRecipients;
@Inject
@@ -176,7 +176,7 @@
ReplacePatchSetSender.Factory replacePatchSetFactory,
ProjectCache projectCache,
@SendEmailExecutor ExecutorService sendEmailExecutor,
- ReviewerAdder reviewerAdder,
+ ReviewerModifier reviewerModifier,
Change change,
MessageIdGenerator messageIdGenerator,
DynamicItem<UrlFormatter> urlFormatter,
@@ -204,7 +204,7 @@
this.replacePatchSetFactory = replacePatchSetFactory;
this.projectCache = projectCache;
this.sendEmailExecutor = sendEmailExecutor;
- this.reviewerAdder = reviewerAdder;
+ this.reviewerModifier = reviewerModifier;
this.change = change;
this.messageIdGenerator = messageIdGenerator;
this.urlFormatter = urlFormatter;
@@ -324,12 +324,13 @@
update, projectState.getLabelTypes(), newPatchSet, ctx.getUser(), approvals);
reviewerAdditions =
- reviewerAdder.prepare(
+ reviewerModifier.prepare(
ctx.getNotes(),
ctx.getUser(),
getReviewerInputs(magicBranch, fromFooters, ctx.getChange(), info),
true);
- Optional<ReviewerAddition> reviewerError = reviewerAdditions.getFailures().stream().findFirst();
+ Optional<ReviewerModification> reviewerError =
+ reviewerAdditions.getFailures().stream().findFirst();
if (reviewerError.isPresent()) {
throw new UnprocessableEntityException(reviewerError.get().result.error);
}
@@ -354,24 +355,24 @@
return true;
}
- private ImmutableList<AddReviewerInput> getReviewerInputs(
+ private ImmutableList<ReviewerInput> getReviewerInputs(
@Nullable MagicBranchInput magicBranch,
MailRecipients fromFooters,
Change change,
PatchSetInfo psInfo) {
// Disable individual emails when adding reviewers, as all reviewers will receive the single
// bulk new change email.
- Stream<AddReviewerInput> inputs =
+ Stream<ReviewerInput> inputs =
Streams.concat(
Streams.stream(
- newAddReviewerInputFromCommitIdentity(
+ newReviewerInputFromCommitIdentity(
change,
psInfo.getCommitId(),
psInfo.getAuthor().getAccount(),
NotifyHandling.NONE,
newPatchSet.uploader())),
Streams.stream(
- newAddReviewerInputFromCommitIdentity(
+ newReviewerInputFromCommitIdentity(
change,
psInfo.getCommitId(),
psInfo.getCommitter().getAccount(),
@@ -382,23 +383,22 @@
Streams.concat(
inputs,
magicBranch.getCombinedReviewers(fromFooters).stream()
- .map(r -> newAddReviewerInput(r, ReviewerState.REVIEWER)),
+ .map(r -> newReviewerInput(r, ReviewerState.REVIEWER)),
magicBranch.getCombinedCcs(fromFooters).stream()
- .map(r -> newAddReviewerInput(r, ReviewerState.CC)));
+ .map(r -> newReviewerInput(r, ReviewerState.CC)));
}
return inputs.collect(toImmutableList());
}
- private static InternalAddReviewerInput newAddReviewerInput(
- String reviewer, ReviewerState state) {
+ private static InternalReviewerInput newReviewerInput(String reviewer, ReviewerState state) {
// Disable individual emails when adding reviewers, as all reviewers will receive the single
// bulk new patch set email.
- InternalAddReviewerInput input =
- ReviewerAdder.newAddReviewerInput(reviewer, state, NotifyHandling.NONE);
+ InternalReviewerInput input =
+ ReviewerModifier.newReviewerInput(reviewer, state, NotifyHandling.NONE);
// Ignore failures for reasons like the reviewer being inactive or being unable to see the
// change. See discussion in ChangeInserter.
- input.otherFailureBehavior = ReviewerAdder.FailureBehavior.IGNORE;
+ input.otherFailureBehavior = ReviewerModifier.FailureBehavior.IGNORE;
return input;
}
diff --git a/java/com/google/gerrit/server/mail/EmailModule.java b/java/com/google/gerrit/server/mail/EmailModule.java
index ff166b1..c659b5f 100644
--- a/java/com/google/gerrit/server/mail/EmailModule.java
+++ b/java/com/google/gerrit/server/mail/EmailModule.java
@@ -17,7 +17,6 @@
import com.google.gerrit.extensions.config.FactoryModule;
import com.google.gerrit.server.mail.send.AbandonedSender;
import com.google.gerrit.server.mail.send.AddKeySender;
-import com.google.gerrit.server.mail.send.AddReviewerSender;
import com.google.gerrit.server.mail.send.AddToAttentionSetSender;
import com.google.gerrit.server.mail.send.CommentSender;
import com.google.gerrit.server.mail.send.CreateChangeSender;
@@ -26,6 +25,7 @@
import com.google.gerrit.server.mail.send.DeleteVoteSender;
import com.google.gerrit.server.mail.send.HttpPasswordUpdateSender;
import com.google.gerrit.server.mail.send.MergedSender;
+import com.google.gerrit.server.mail.send.ModifyReviewerSender;
import com.google.gerrit.server.mail.send.RegisterNewEmailSender;
import com.google.gerrit.server.mail.send.RemoveFromAttentionSetSender;
import com.google.gerrit.server.mail.send.ReplacePatchSetSender;
@@ -38,7 +38,7 @@
protected void configure() {
factory(AbandonedSender.Factory.class);
factory(AddKeySender.Factory.class);
- factory(AddReviewerSender.Factory.class);
+ factory(ModifyReviewerSender.Factory.class);
factory(CommentSender.Factory.class);
factory(CreateChangeSender.Factory.class);
factory(DeleteKeySender.Factory.class);
diff --git a/java/com/google/gerrit/server/mail/send/AddReviewerSender.java b/java/com/google/gerrit/server/mail/send/ModifyReviewerSender.java
similarity index 87%
rename from java/com/google/gerrit/server/mail/send/AddReviewerSender.java
rename to java/com/google/gerrit/server/mail/send/ModifyReviewerSender.java
index 96d9483..dcf3b6c 100644
--- a/java/com/google/gerrit/server/mail/send/AddReviewerSender.java
+++ b/java/com/google/gerrit/server/mail/send/ModifyReviewerSender.java
@@ -21,13 +21,13 @@
import com.google.inject.assistedinject.Assisted;
/** Asks a user to review a change. */
-public class AddReviewerSender extends NewChangeSender {
+public class ModifyReviewerSender extends NewChangeSender {
public interface Factory {
- AddReviewerSender create(Project.NameKey project, Change.Id changeId);
+ ModifyReviewerSender create(Project.NameKey project, Change.Id changeId);
}
@Inject
- public AddReviewerSender(
+ public ModifyReviewerSender(
EmailArguments args, @Assisted Project.NameKey project, @Assisted Change.Id changeId) {
super(args, newChangeData(args, project, changeId));
}
diff --git a/java/com/google/gerrit/server/restapi/change/PostReview.java b/java/com/google/gerrit/server/restapi/change/PostReview.java
index aad251a..b5f2ab1 100644
--- a/java/com/google/gerrit/server/restapi/change/PostReview.java
+++ b/java/com/google/gerrit/server/restapi/change/PostReview.java
@@ -55,14 +55,14 @@
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.AddReviewerInput;
-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;
import com.google.gerrit.extensions.api.changes.ReviewInput.DraftHandling;
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;
@@ -91,13 +91,13 @@
import com.google.gerrit.server.PublishCommentUtil;
import com.google.gerrit.server.ReviewerSet;
import com.google.gerrit.server.account.AccountResolver;
-import com.google.gerrit.server.change.AddReviewersEmail;
import com.google.gerrit.server.change.AddReviewersOp.Result;
import com.google.gerrit.server.change.ChangeResource;
import com.google.gerrit.server.change.EmailReviewComments;
+import com.google.gerrit.server.change.ModifyReviewersEmail;
import com.google.gerrit.server.change.NotifyResolver;
-import com.google.gerrit.server.change.ReviewerAdder;
-import com.google.gerrit.server.change.ReviewerAdder.ReviewerAddition;
+import com.google.gerrit.server.change.ReviewerModifier;
+import com.google.gerrit.server.change.ReviewerModifier.ReviewerModification;
import com.google.gerrit.server.change.RevisionResource;
import com.google.gerrit.server.change.WorkInProgressOp;
import com.google.gerrit.server.config.GerritServerConfig;
@@ -170,8 +170,8 @@
private final AccountResolver accountResolver;
private final EmailReviewComments.Factory email;
private final CommentAdded commentAdded;
- private final ReviewerAdder reviewerAdder;
- private final AddReviewersEmail addReviewersEmail;
+ private final ReviewerModifier reviewerModifier;
+ private final ModifyReviewersEmail modifyReviewersEmail;
private final NotifyResolver notifyResolver;
private final WorkInProgressOp.Factory workInProgressOpFactory;
private final ProjectCache projectCache;
@@ -196,8 +196,8 @@
AccountResolver accountResolver,
EmailReviewComments.Factory email,
CommentAdded commentAdded,
- ReviewerAdder reviewerAdder,
- AddReviewersEmail addReviewersEmail,
+ ReviewerModifier reviewerModifier,
+ ModifyReviewersEmail modifyReviewersEmail,
NotifyResolver notifyResolver,
@GerritServerConfig Config gerritConfig,
WorkInProgressOp.Factory workInProgressOpFactory,
@@ -218,8 +218,8 @@
this.accountResolver = accountResolver;
this.email = email;
this.commentAdded = commentAdded;
- this.reviewerAdder = reviewerAdder;
- this.addReviewersEmail = addReviewersEmail;
+ this.reviewerModifier = reviewerModifier;
+ this.modifyReviewersEmail = modifyReviewersEmail;
this.notifyResolver = notifyResolver;
this.workInProgressOpFactory = workInProgressOpFactory;
this.projectCache = projectCache;
@@ -276,15 +276,15 @@
}
logger.atFine().log("notify handling = %s", input.notify);
- Map<String, AddReviewerResult> reviewerJsonResults = null;
- List<ReviewerAddition> reviewerResults = Lists.newArrayList();
+ Map<String, ReviewerResult> reviewerJsonResults = null;
+ List<ReviewerModification> reviewerResults = Lists.newArrayList();
boolean hasError = false;
boolean confirm = false;
if (input.reviewers != null) {
reviewerJsonResults = Maps.newHashMap();
- for (AddReviewerInput reviewerInput : input.reviewers) {
- ReviewerAddition result =
- reviewerAdder.prepare(revision.getNotes(), revision.getUser(), reviewerInput, true);
+ for (ReviewerInput reviewerInput : input.reviewers) {
+ ReviewerModification result =
+ reviewerModifier.prepare(revision.getNotes(), revision.getUser(), reviewerInput, true);
reviewerJsonResults.put(reviewerInput.reviewer, result.result);
if (result.result.error != null) {
logger.atFine().log(
@@ -336,7 +336,7 @@
// updated set of reviewers. Also keep track of whether the user added
// themselves as a reviewer or to the CC list.
logger.atFine().log("adding reviewer additions");
- for (ReviewerAddition reviewerResult : reviewerResults) {
+ for (ReviewerModification reviewerResult : reviewerResults) {
reviewerResult.op.suppressEmail(); // Send a single batch email below.
bu.addOp(revision.getChange().getId(), reviewerResult.op);
if (!ccOrReviewer && reviewerResult.reviewers.contains(id)) {
@@ -350,7 +350,8 @@
// isn't being explicitly added, and isn't voting on any label.
// Automatically CC them on this change so they receive replies.
logger.atFine().log("CCing calling user");
- ReviewerAddition selfAddition = reviewerAdder.ccCurrentUser(revision.getUser(), revision);
+ ReviewerModification selfAddition =
+ reviewerModifier.ccCurrentUser(revision.getUser(), revision);
selfAddition.op.suppressEmail();
bu.addOp(revision.getChange().getId(), selfAddition.op);
}
@@ -384,7 +385,7 @@
bu.addOp(
revision.getChange().getId(), new Op(projectState, revision.getPatchSet().id(), input));
- // Notify based on ReviewInput, ignoring the notify settings from any AddReviewerInputs.
+ // Notify based on ReviewInput, ignoring the notify settings from any ReviewerInputs.
NotifyResolver.Result notify = notifyResolver.resolve(input.notify, input.notifyDetails);
bu.setNotify(notify);
@@ -395,7 +396,7 @@
// Re-read change to take into account results of the update.
ChangeData cd = changeDataFactory.create(revision.getProject(), revision.getChange().getId());
- for (ReviewerAddition reviewerResult : reviewerResults) {
+ for (ReviewerModification reviewerResult : reviewerResults) {
reviewerResult.gatherResults(cd);
}
@@ -437,28 +438,28 @@
private void batchEmailReviewers(
CurrentUser user,
Change change,
- List<ReviewerAddition> reviewerAdditions,
+ List<ReviewerModification> reviewerModifications,
NotifyResolver.Result notify) {
try (TraceContext.TraceTimer ignored = newTimer("batchEmailReviewers")) {
List<Account.Id> to = new ArrayList<>();
List<Account.Id> cc = new ArrayList<>();
List<Address> toByEmail = new ArrayList<>();
List<Address> ccByEmail = new ArrayList<>();
- for (ReviewerAddition addition : reviewerAdditions) {
- Result reviewAdditionResult = addition.op.getResult();
- if (addition.state() == ReviewerState.REVIEWER
+ for (ReviewerModification modification : reviewerModifications) {
+ Result reviewAdditionResult = modification.op.getResult();
+ if (modification.state() == ReviewerState.REVIEWER
&& (!reviewAdditionResult.addedReviewers().isEmpty()
|| !reviewAdditionResult.addedReviewersByEmail().isEmpty())) {
- to.addAll(addition.reviewers);
- toByEmail.addAll(addition.reviewersByEmail);
- } else if (addition.state() == ReviewerState.CC
+ to.addAll(modification.reviewers);
+ toByEmail.addAll(modification.reviewersByEmail);
+ } else if (modification.state() == ReviewerState.CC
&& (!reviewAdditionResult.addedCCs().isEmpty()
|| !reviewAdditionResult.addedCCsByEmail().isEmpty())) {
- cc.addAll(addition.reviewers);
- ccByEmail.addAll(addition.reviewersByEmail);
+ cc.addAll(modification.reviewers);
+ ccByEmail.addAll(modification.reviewersByEmail);
}
}
- addReviewersEmail.emailReviewersAsync(
+ modifyReviewersEmail.emailReviewersAsync(
user.asIdentifiedUser(), change, to, cc, toByEmail, ccByEmail, notify);
}
}
diff --git a/java/com/google/gerrit/server/restapi/change/PostReviewers.java b/java/com/google/gerrit/server/restapi/change/PostReviewers.java
index e6a87e9..4691550 100644
--- a/java/com/google/gerrit/server/restapi/change/PostReviewers.java
+++ b/java/com/google/gerrit/server/restapi/change/PostReviewers.java
@@ -15,17 +15,17 @@
package com.google.gerrit.server.restapi.change;
import com.google.gerrit.entities.Change;
-import com.google.gerrit.extensions.api.changes.AddReviewerInput;
-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;
import com.google.gerrit.extensions.restapi.RestCollectionModifyView;
import com.google.gerrit.server.change.ChangeResource;
import com.google.gerrit.server.change.NotifyResolver;
-import com.google.gerrit.server.change.ReviewerAdder;
-import com.google.gerrit.server.change.ReviewerAdder.ReviewerAddition;
+import com.google.gerrit.server.change.ReviewerModifier;
+import com.google.gerrit.server.change.ReviewerModifier.ReviewerModification;
import com.google.gerrit.server.change.ReviewerResource;
import com.google.gerrit.server.permissions.PermissionBackendException;
import com.google.gerrit.server.query.change.ChangeData;
@@ -39,50 +39,51 @@
@Singleton
public class PostReviewers
- implements RestCollectionModifyView<ChangeResource, ReviewerResource, AddReviewerInput> {
+ implements RestCollectionModifyView<ChangeResource, ReviewerResource, ReviewerInput> {
private final BatchUpdate.Factory updateFactory;
private final ChangeData.Factory changeDataFactory;
private final NotifyResolver notifyResolver;
- private final ReviewerAdder reviewerAdder;
+ private final ReviewerModifier reviewerModifier;
@Inject
PostReviewers(
BatchUpdate.Factory updateFactory,
ChangeData.Factory changeDataFactory,
NotifyResolver notifyResolver,
- ReviewerAdder reviewerAdder) {
+ ReviewerModifier reviewerModifier) {
this.updateFactory = updateFactory;
this.changeDataFactory = changeDataFactory;
this.notifyResolver = notifyResolver;
- this.reviewerAdder = reviewerAdder;
+ this.reviewerModifier = reviewerModifier;
}
@Override
- public Response<AddReviewerResult> apply(ChangeResource rsrc, AddReviewerInput input)
+ public Response<ReviewerResult> apply(ChangeResource rsrc, ReviewerInput input)
throws IOException, RestApiException, UpdateException, PermissionBackendException,
ConfigInvalidException {
if (input.reviewer == null) {
throw new BadRequestException("missing reviewer field");
}
- ReviewerAddition addition = reviewerAdder.prepare(rsrc.getNotes(), rsrc.getUser(), input, true);
- if (addition.op == null) {
- return Response.ok(addition.result);
+ ReviewerModification modification =
+ reviewerModifier.prepare(rsrc.getNotes(), rsrc.getUser(), input, true);
+ if (modification.op == null) {
+ return Response.ok(modification.result);
}
try (BatchUpdate bu =
updateFactory.create(rsrc.getProject(), rsrc.getUser(), TimeUtil.nowTs())) {
bu.setNotify(resolveNotify(rsrc, input));
Change.Id id = rsrc.getChange().getId();
- bu.addOp(id, addition.op);
+ bu.addOp(id, modification.op);
bu.execute();
}
// Re-read change to take into account results of the update.
- addition.gatherResults(changeDataFactory.create(rsrc.getProject(), rsrc.getId()));
- return Response.ok(addition.result);
+ modification.gatherResults(changeDataFactory.create(rsrc.getProject(), rsrc.getId()));
+ return Response.ok(modification.result);
}
- private NotifyResolver.Result resolveNotify(ChangeResource rsrc, AddReviewerInput input)
+ private NotifyResolver.Result resolveNotify(ChangeResource rsrc, ReviewerInput input)
throws BadRequestException, ConfigInvalidException, IOException {
NotifyHandling notifyHandling = input.notify;
if (notifyHandling == null) {
diff --git a/java/com/google/gerrit/server/restapi/change/PutAssignee.java b/java/com/google/gerrit/server/restapi/change/PutAssignee.java
index 7b0d905..17ee92e 100644
--- a/java/com/google/gerrit/server/restapi/change/PutAssignee.java
+++ b/java/com/google/gerrit/server/restapi/change/PutAssignee.java
@@ -15,9 +15,9 @@
package com.google.gerrit.server.restapi.change;
import com.google.common.base.Strings;
-import com.google.gerrit.extensions.api.changes.AddReviewerInput;
import com.google.gerrit.extensions.api.changes.AssigneeInput;
import com.google.gerrit.extensions.api.changes.NotifyHandling;
+import com.google.gerrit.extensions.api.changes.ReviewerInput;
import com.google.gerrit.extensions.client.ReviewerState;
import com.google.gerrit.extensions.common.AccountInfo;
import com.google.gerrit.extensions.restapi.AuthException;
@@ -32,8 +32,8 @@
import com.google.gerrit.server.account.AccountLoader;
import com.google.gerrit.server.account.AccountResolver;
import com.google.gerrit.server.change.ChangeResource;
-import com.google.gerrit.server.change.ReviewerAdder;
-import com.google.gerrit.server.change.ReviewerAdder.ReviewerAddition;
+import com.google.gerrit.server.change.ReviewerModifier;
+import com.google.gerrit.server.change.ReviewerModifier.ReviewerModification;
import com.google.gerrit.server.change.SetAssigneeOp;
import com.google.gerrit.server.permissions.ChangePermission;
import com.google.gerrit.server.permissions.PermissionBackend;
@@ -53,7 +53,7 @@
private final BatchUpdate.Factory updateFactory;
private final AccountResolver accountResolver;
private final SetAssigneeOp.Factory assigneeFactory;
- private final ReviewerAdder reviewerAdder;
+ private final ReviewerModifier reviewerModifier;
private final AccountLoader.Factory accountLoaderFactory;
private final PermissionBackend permissionBackend;
private final ApprovalsUtil approvalsUtil;
@@ -63,14 +63,14 @@
BatchUpdate.Factory updateFactory,
AccountResolver accountResolver,
SetAssigneeOp.Factory assigneeFactory,
- ReviewerAdder reviewerAdder,
+ ReviewerModifier reviewerModifier,
AccountLoader.Factory accountLoaderFactory,
PermissionBackend permissionBackend,
ApprovalsUtil approvalsUtil) {
this.updateFactory = updateFactory;
this.accountResolver = accountResolver;
this.assigneeFactory = assigneeFactory;
- this.reviewerAdder = reviewerAdder;
+ this.reviewerModifier = reviewerModifier;
this.accountLoaderFactory = accountLoaderFactory;
this.permissionBackend = permissionBackend;
this.approvalsUtil = approvalsUtil;
@@ -104,7 +104,7 @@
ReviewerSet currentReviewers = approvalsUtil.getReviewers(rsrc.getNotes());
if (!currentReviewers.all().contains(assignee.getAccountId())) {
- ReviewerAddition reviewersAddition = addAssigneeAsCC(rsrc, input.assignee);
+ ReviewerModification reviewersAddition = addAssigneeAsCC(rsrc, input.assignee);
reviewersAddition.op.suppressEmail();
bu.addOp(rsrc.getId(), reviewersAddition.op);
}
@@ -114,14 +114,14 @@
}
}
- private ReviewerAddition addAssigneeAsCC(ChangeResource rsrc, String assignee)
+ private ReviewerModification addAssigneeAsCC(ChangeResource rsrc, String assignee)
throws IOException, PermissionBackendException, ConfigInvalidException {
- AddReviewerInput reviewerInput = new AddReviewerInput();
+ ReviewerInput reviewerInput = new ReviewerInput();
reviewerInput.reviewer = assignee;
reviewerInput.state = ReviewerState.CC;
reviewerInput.confirmed = true;
reviewerInput.notify = NotifyHandling.NONE;
- return reviewerAdder.prepare(rsrc.getNotes(), rsrc.getUser(), reviewerInput, false);
+ return reviewerModifier.prepare(rsrc.getNotes(), rsrc.getUser(), reviewerInput, false);
}
@Override
diff --git a/java/com/google/gerrit/server/restapi/change/ReviewersUtil.java b/java/com/google/gerrit/server/restapi/change/ReviewersUtil.java
index 38be27e..d6c4c51 100644
--- a/java/com/google/gerrit/server/restapi/change/ReviewersUtil.java
+++ b/java/com/google/gerrit/server/restapi/change/ReviewersUtil.java
@@ -52,7 +52,7 @@
import com.google.gerrit.server.account.GroupBackend;
import com.google.gerrit.server.account.GroupMembers;
import com.google.gerrit.server.account.ServiceUserClassifier;
-import com.google.gerrit.server.change.ReviewerAdder;
+import com.google.gerrit.server.change.ReviewerModifier;
import com.google.gerrit.server.index.account.AccountField;
import com.google.gerrit.server.index.account.AccountIndexCollection;
import com.google.gerrit.server.index.account.AccountIndexRewriter;
@@ -415,7 +415,7 @@
int maxAllowedWithoutConfirmation = suggestReviewers.getMaxAllowedWithoutConfirmation();
logger.atFine().log("maxAllowedWithoutConfirmation: " + maxAllowedWithoutConfirmation);
- if (!ReviewerAdder.isLegalReviewerGroup(group.getUUID())) {
+ if (!ReviewerModifier.isLegalReviewerGroup(group.getUUID())) {
logger.atFine().log("Ignore group %s that is not legal as reviewer", group.getUUID());
return result;
}
diff --git a/java/com/google/gerrit/server/restapi/change/SuggestReviewers.java b/java/com/google/gerrit/server/restapi/change/SuggestReviewers.java
index 71ff493..74f5290 100644
--- a/java/com/google/gerrit/server/restapi/change/SuggestReviewers.java
+++ b/java/com/google/gerrit/server/restapi/change/SuggestReviewers.java
@@ -18,7 +18,7 @@
import com.google.common.flogger.FluentLogger;
import com.google.gerrit.extensions.common.AccountVisibility;
-import com.google.gerrit.server.change.ReviewerAdder;
+import com.google.gerrit.server.change.ReviewerModifier;
import com.google.gerrit.server.config.ConfigKey;
import com.google.gerrit.server.config.GerritConfigListener;
import com.google.gerrit.server.config.GerritServerConfig;
@@ -99,12 +99,13 @@
this.suggestAccounts = (av != AccountVisibility.NONE);
}
- this.maxAllowed = cfg.getInt("addreviewer", "maxAllowed", ReviewerAdder.DEFAULT_MAX_REVIEWERS);
+ this.maxAllowed =
+ cfg.getInt("addreviewer", "maxAllowed", ReviewerModifier.DEFAULT_MAX_REVIEWERS);
this.maxAllowedWithoutConfirmation =
cfg.getInt(
"addreviewer",
"maxWithoutConfirmation",
- ReviewerAdder.DEFAULT_MAX_REVIEWERS_WITHOUT_CHECK);
+ ReviewerModifier.DEFAULT_MAX_REVIEWERS_WITHOUT_CHECK);
logger.atFine().log("AccountVisibility: %s", av.name());
diff --git a/java/com/google/gerrit/sshd/commands/SetReviewersCommand.java b/java/com/google/gerrit/sshd/commands/SetReviewersCommand.java
index 95627e1..4f23d1d 100644
--- a/java/com/google/gerrit/sshd/commands/SetReviewersCommand.java
+++ b/java/com/google/gerrit/sshd/commands/SetReviewersCommand.java
@@ -18,8 +18,8 @@
import com.google.gerrit.entities.Account;
import com.google.gerrit.entities.Change;
import com.google.gerrit.exceptions.StorageException;
-import com.google.gerrit.extensions.api.changes.AddReviewerInput;
import com.google.gerrit.extensions.api.changes.DeleteReviewerInput;
+import com.google.gerrit.extensions.api.changes.ReviewerInput;
import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
import com.google.gerrit.server.change.ChangeResource;
import com.google.gerrit.server.change.ReviewerResource;
@@ -136,7 +136,7 @@
// Add reviewers
//
for (String reviewer : toAdd) {
- AddReviewerInput input = new AddReviewerInput();
+ ReviewerInput input = new ReviewerInput();
input.reviewer = reviewer;
input.confirmed = true;
String error;
diff --git a/javatests/com/google/gerrit/acceptance/OutgoingEmailIT.java b/javatests/com/google/gerrit/acceptance/OutgoingEmailIT.java
index 30f1dcb..5e85fae 100644
--- a/javatests/com/google/gerrit/acceptance/OutgoingEmailIT.java
+++ b/javatests/com/google/gerrit/acceptance/OutgoingEmailIT.java
@@ -22,8 +22,8 @@
import com.google.gerrit.entities.EmailHeader;
import com.google.gerrit.entities.RefNames;
import com.google.gerrit.extensions.api.accounts.EmailInput;
-import com.google.gerrit.extensions.api.changes.AddReviewerInput;
import com.google.gerrit.extensions.api.changes.ReviewInput;
+import com.google.gerrit.extensions.api.changes.ReviewerInput;
import com.google.gerrit.extensions.client.GeneralPreferencesInfo;
import com.google.gerrit.testing.FakeEmailSender;
import java.net.URL;
@@ -36,9 +36,9 @@
public void messageIdHeaderFromChangeUpdate() throws Exception {
Repository repository = repoManager.openRepository(project);
PushOneCommit.Result result = createChange();
- AddReviewerInput addReviewerInput = new AddReviewerInput();
- addReviewerInput.reviewer = user.email();
- gApi.changes().id(result.getChangeId()).addReviewer(addReviewerInput);
+ ReviewerInput reviewerInput = new ReviewerInput();
+ reviewerInput.reviewer = user.email();
+ gApi.changes().id(result.getChangeId()).addReviewer(reviewerInput);
sender.clear();
gApi.changes().id(result.getChangeId()).abandon();
@@ -107,9 +107,9 @@
GeneralPreferencesInfo generalPreferencesInfo = new GeneralPreferencesInfo();
generalPreferencesInfo.emailFormat = GeneralPreferencesInfo.EmailFormat.PLAINTEXT;
gApi.accounts().id(user.id().get()).setPreferences(generalPreferencesInfo);
- AddReviewerInput addReviewerInput = new AddReviewerInput();
- addReviewerInput.reviewer = user.email();
- gApi.changes().id(result.getChangeId()).addReviewer(addReviewerInput);
+ ReviewerInput reviewerInput = new ReviewerInput();
+ reviewerInput.reviewer = user.email();
+ gApi.changes().id(result.getChangeId()).addReviewer(reviewerInput);
sender.clear();
gApi.changes().id(result.getChangeId()).current().review(ReviewInput.approve());
diff --git a/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java b/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java
index 7495e63..ca412da 100644
--- a/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java
@@ -95,9 +95,9 @@
import com.google.gerrit.extensions.api.accounts.DeleteDraftCommentsInput;
import com.google.gerrit.extensions.api.accounts.DeletedDraftCommentInfo;
import com.google.gerrit.extensions.api.accounts.EmailInput;
-import com.google.gerrit.extensions.api.changes.AddReviewerInput;
import com.google.gerrit.extensions.api.changes.DraftInput;
import com.google.gerrit.extensions.api.changes.ReviewInput;
+import com.google.gerrit.extensions.api.changes.ReviewerInput;
import com.google.gerrit.extensions.api.changes.StarsInput;
import com.google.gerrit.extensions.api.config.ConsistencyCheckInfo;
import com.google.gerrit.extensions.api.config.ConsistencyCheckInfo.ConsistencyProblemInfo;
@@ -919,11 +919,11 @@
PushOneCommit.Result r = createChange();
- AddReviewerInput in = new AddReviewerInput();
+ ReviewerInput in = new ReviewerInput();
in.reviewer = user.email();
gApi.changes().id(r.getChangeId()).addReviewer(in);
- in = new AddReviewerInput();
+ in = new ReviewerInput();
in.reviewer = user2.email();
gApi.changes().id(r.getChangeId()).addReviewer(in);
@@ -957,7 +957,7 @@
sender.clear();
requestScopeOperations.setApiUser(admin.id());
- AddReviewerInput in = new AddReviewerInput();
+ ReviewerInput in = new ReviewerInput();
in.reviewer = user.email();
gApi.changes().id(r.getChangeId()).addReviewer(in);
List<Message> messages = sender.getMessages();
@@ -976,9 +976,9 @@
// First reviewer added to the change
ReviewInput input = new ReviewInput();
input.reviewers = new ArrayList<>(1);
- AddReviewerInput addReviewerInput = new AddReviewerInput();
- addReviewerInput.reviewer = user.email();
- input.reviewers.add(addReviewerInput);
+ ReviewerInput reviewerInput = new ReviewerInput();
+ reviewerInput.reviewer = user.email();
+ input.reviewers.add(reviewerInput);
gApi.changes().id(r.getChangeId()).current().review(input);
List<Message> messages = sender.getMessages();
assertThat(messages).hasSize(1);
@@ -991,14 +991,14 @@
// Second reviewer and existing reviewer added to the change
ReviewInput input2 = new ReviewInput();
input2.reviewers = new ArrayList<>(2);
- AddReviewerInput addReviewerInput2 = new AddReviewerInput();
- addReviewerInput2.reviewer = user.email();
- input2.reviewers.add(addReviewerInput2);
- AddReviewerInput addReviewerInput3 = new AddReviewerInput();
+ ReviewerInput reviewerInput2 = new ReviewerInput();
+ reviewerInput2.reviewer = user.email();
+ input2.reviewers.add(reviewerInput2);
+ ReviewerInput reviewerInput3 = new ReviewerInput();
TestAccount user2 = accountCreator.user2();
- addReviewerInput3.reviewer = user2.email();
- input2.reviewers.add(addReviewerInput3);
+ reviewerInput3.reviewer = user2.email();
+ input2.reviewers.add(reviewerInput3);
gApi.changes().id(r.getChangeId()).current().review(input2);
List<Message> messages2 = sender.getMessages();
@@ -1012,13 +1012,13 @@
// Existing reviewers re-added to the change: no notifications
ReviewInput input3 = new ReviewInput();
input3.reviewers = new ArrayList<>(2);
- AddReviewerInput addReviewerInput4 = new AddReviewerInput();
- addReviewerInput4.reviewer = user.email();
- input3.reviewers.add(addReviewerInput4);
- AddReviewerInput addReviewerInput5 = new AddReviewerInput();
+ ReviewerInput reviewerInput4 = new ReviewerInput();
+ reviewerInput4.reviewer = user.email();
+ input3.reviewers.add(reviewerInput4);
+ ReviewerInput reviewerInput5 = new ReviewerInput();
- addReviewerInput5.reviewer = user2.email();
- input3.reviewers.add(addReviewerInput5);
+ reviewerInput5.reviewer = user2.email();
+ input3.reviewers.add(reviewerInput5);
gApi.changes().id(r.getChangeId()).current().review(input3);
List<Message> messages3 = sender.getMessages();
@@ -1030,9 +1030,9 @@
PushOneCommit.Result r = createChange();
// First reviewer added to the change
- AddReviewerInput addReviewerInput = new AddReviewerInput();
- addReviewerInput.reviewer = user.email();
- gApi.changes().id(r.getChangeId()).addReviewer(addReviewerInput);
+ ReviewerInput reviewerInput = new ReviewerInput();
+ reviewerInput.reviewer = user.email();
+ gApi.changes().id(r.getChangeId()).addReviewer(reviewerInput);
List<Message> messages = sender.getMessages();
assertThat(messages).hasSize(1);
Message message = messages.get(0);
@@ -1043,9 +1043,9 @@
// Second reviewer added to the change
TestAccount user2 = accountCreator.user2();
- AddReviewerInput addReviewerInput2 = new AddReviewerInput();
- addReviewerInput2.reviewer = user2.email();
- gApi.changes().id(r.getChangeId()).addReviewer(addReviewerInput2);
+ ReviewerInput reviewerInput2 = new ReviewerInput();
+ reviewerInput2.reviewer = user2.email();
+ gApi.changes().id(r.getChangeId()).addReviewer(reviewerInput2);
List<Message> messages2 = sender.getMessages();
assertThat(messages2).hasSize(1);
Message message2 = messages2.get(0);
@@ -1055,9 +1055,9 @@
sender.clear();
// Exiting reviewer re-added to the change: no notifications
- AddReviewerInput addReviewerInput3 = new AddReviewerInput();
- addReviewerInput3.reviewer = user2.email();
- gApi.changes().id(r.getChangeId()).addReviewer(addReviewerInput3);
+ ReviewerInput reviewerInput3 = new ReviewerInput();
+ reviewerInput3.reviewer = user2.email();
+ gApi.changes().id(r.getChangeId()).addReviewer(reviewerInput3);
List<Message> messages3 = sender.getMessages();
assertThat(messages3).isEmpty();
}
diff --git a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java
index 517cf89..dee7861 100644
--- a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java
@@ -104,8 +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.AddReviewerInput;
-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 +117,8 @@
import com.google.gerrit.extensions.api.changes.ReviewInput.DraftHandling;
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;
@@ -1791,9 +1791,9 @@
// try to add user as reviewer
requestScopeOperations.setApiUser(admin.id());
- AddReviewerInput in = new AddReviewerInput();
+ 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");
@@ -1807,9 +1807,9 @@
String username = name("new-user");
Account.Id id = accountOperations.newAccount().username(username).inactive().create();
- AddReviewerInput in = new AddReviewerInput();
+ 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)
@@ -1834,9 +1834,9 @@
String username = name("new-user");
Account.Id id = accountOperations.newAccount().username(username).inactive().create();
- AddReviewerInput in = new AddReviewerInput();
+ 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();
@@ -1857,10 +1857,10 @@
String username = "user@domain.com";
accountOperations.newAccount().username(username).inactive().create();
- AddReviewerInput in = new AddReviewerInput();
+ 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();
@@ -1874,7 +1874,7 @@
public void addReviewer() throws Exception {
testAddReviewerViaPostReview(
(changeId, reviewer) -> {
- AddReviewerInput in = new AddReviewerInput();
+ ReviewerInput in = new ReviewerInput();
in.reviewer = reviewer;
gApi.changes().id(changeId).addReviewer(in);
});
@@ -1885,10 +1885,10 @@
public void addReviewerViaPostReview() throws Exception {
testAddReviewerViaPostReview(
(changeId, reviewer) -> {
- AddReviewerInput addReviewerInput = new AddReviewerInput();
- addReviewerInput.reviewer = reviewer;
+ ReviewerInput reviewerInput = new ReviewerInput();
+ reviewerInput.reviewer = reviewer;
ReviewInput reviewInput = new ReviewInput();
- reviewInput.reviewers = ImmutableList.of(addReviewerInput);
+ reviewInput.reviewers = ImmutableList.of(reviewerInput);
gApi.changes().id(changeId).current().review(reviewInput);
});
}
@@ -1948,7 +1948,7 @@
@Test
public void listReviewers() throws Exception {
PushOneCommit.Result r = createChange();
- AddReviewerInput in = new AddReviewerInput();
+ ReviewerInput in = new ReviewerInput();
in.reviewer = user.email();
gApi.changes().id(r.getChangeId()).addReviewer(in);
assertThat(gApi.changes().id(r.getChangeId()).reviewers()).hasSize(1);
@@ -1970,7 +1970,7 @@
@Test
public void notificationsForAddedWorkInProgressReviewers() throws Exception {
- AddReviewerInput in = new AddReviewerInput();
+ ReviewerInput in = new ReviewerInput();
in.reviewer = user.email();
ReviewInput batchIn = new ReviewInput();
batchIn.reviewers = ImmutableList.of(in);
@@ -2025,7 +2025,7 @@
groupApi.description("test group");
groupApi.addMembers(user.fullName());
- AddReviewerInput in = new AddReviewerInput();
+ ReviewerInput in = new ReviewerInput();
in.reviewer = "abc";
gApi.changes().id(r.getChangeId()).addReviewer(in.reviewer);
@@ -2086,7 +2086,7 @@
// ensure that user "user" is not in the group
groupApi.removeMembers(testUserFullname);
- AddReviewerInput in = new AddReviewerInput();
+ ReviewerInput in = new ReviewerInput();
in.reviewer = testGroup;
gApi.changes().id(r.getChangeId()).addReviewer(in.reviewer);
@@ -2120,7 +2120,7 @@
String oldETag = rsrc.getETag();
Timestamp oldTs = rsrc.getChange().getLastUpdatedOn();
- AddReviewerInput in = new AddReviewerInput();
+ ReviewerInput in = new ReviewerInput();
in.reviewer = user.email();
requestScopeOperations.setApiUser(user.id());
gApi.changes().id(r.getChangeId()).addReviewer(in);
@@ -2212,7 +2212,7 @@
assertThat(reviewers.iterator().next()._accountId).isEqualTo(admin.id().get());
assertThat(c.reviewers).doesNotContainKey(CC);
- AddReviewerInput in = new AddReviewerInput();
+ ReviewerInput in = new ReviewerInput();
in.reviewer = user.email();
gApi.changes().id(r.getChangeId()).addReviewer(in);
@@ -2279,7 +2279,7 @@
public void emailNotificationForFileLevelComment() throws Exception {
String changeId = createChange().getChangeId();
- AddReviewerInput in = new AddReviewerInput();
+ ReviewerInput in = new ReviewerInput();
in.reviewer = user.email();
gApi.changes().id(changeId).addReviewer(in);
sender.clear();
@@ -2417,10 +2417,10 @@
PushOneCommit.Result result = createChange();
String changeId = result.getChangeId();
// Add a cc
- AddReviewerInput addReviewerInput = new AddReviewerInput();
- addReviewerInput.state = CC;
- addReviewerInput.reviewer = user.id().toString();
- gApi.changes().id(changeId).addReviewer(addReviewerInput);
+ ReviewerInput reviewerInput = new ReviewerInput();
+ reviewerInput.state = CC;
+ reviewerInput.reviewer = user.id().toString();
+ gApi.changes().id(changeId).addReviewer(reviewerInput);
// Remove a cc
sender.clear();
@@ -2708,7 +2708,7 @@
assertThat(c.reviewers.get(CC)).isNull();
// Add the user as reviewer
- AddReviewerInput in = new AddReviewerInput();
+ ReviewerInput in = new ReviewerInput();
in.reviewer = user.email();
gApi.changes().id(changeId).addReviewer(in);
c = gApi.changes().id(changeId).get();
@@ -2905,7 +2905,7 @@
@Test
public void checkReviewedFlagBeforeAndAfterReview() throws Exception {
PushOneCommit.Result r = createChange();
- AddReviewerInput in = new AddReviewerInput();
+ ReviewerInput in = new ReviewerInput();
in.reviewer = user.email();
gApi.changes().id(r.getChangeId()).addReviewer(in);
@@ -4218,11 +4218,11 @@
PushOneCommit.Result r = createChange();
- AddReviewerInput in = new AddReviewerInput();
+ ReviewerInput in = new ReviewerInput();
in.reviewer = user.email();
gApi.changes().id(r.getChangeId()).addReviewer(in);
- in = new AddReviewerInput();
+ in = new ReviewerInput();
in.reviewer = email;
gApi.changes().id(r.getChangeId()).addReviewer(in);
@@ -4315,7 +4315,7 @@
PushOneCommit.Result r = createChange();
- AddReviewerInput in = new AddReviewerInput();
+ ReviewerInput in = new ReviewerInput();
in.reviewer = user.email();
gApi.changes().id(r.getChangeId()).addReviewer(in);
diff --git a/javatests/com/google/gerrit/acceptance/edit/ChangeEditIT.java b/javatests/com/google/gerrit/acceptance/edit/ChangeEditIT.java
index 8233f0c..a90cd56 100644
--- a/javatests/com/google/gerrit/acceptance/edit/ChangeEditIT.java
+++ b/javatests/com/google/gerrit/acceptance/edit/ChangeEditIT.java
@@ -46,11 +46,11 @@
import com.google.gerrit.entities.PatchSet;
import com.google.gerrit.entities.Permission;
import com.google.gerrit.entities.Project;
-import com.google.gerrit.extensions.api.changes.AddReviewerInput;
import com.google.gerrit.extensions.api.changes.FileContentInput;
import com.google.gerrit.extensions.api.changes.NotifyHandling;
import com.google.gerrit.extensions.api.changes.PublishChangeEditInput;
import com.google.gerrit.extensions.api.changes.ReviewInput;
+import com.google.gerrit.extensions.api.changes.ReviewerInput;
import com.google.gerrit.extensions.client.ChangeEditDetailOption;
import com.google.gerrit.extensions.client.ChangeStatus;
import com.google.gerrit.extensions.client.ListChangesOption;
@@ -154,7 +154,7 @@
public void publishEdit() throws Exception {
createArbitraryEditFor(changeId);
- AddReviewerInput in = new AddReviewerInput();
+ ReviewerInput in = new ReviewerInput();
in.reviewer = user.email();
gApi.changes().id(changeId).addReviewer(in);
@@ -209,7 +209,7 @@
@Test
public void publishEditNotifyRest() throws Exception {
- AddReviewerInput in = new AddReviewerInput();
+ ReviewerInput in = new ReviewerInput();
in.reviewer = user.email();
gApi.changes().id(changeId).addReviewer(in);
@@ -224,7 +224,7 @@
@Test
public void publishEditWithDefaultNotify() throws Exception {
- AddReviewerInput in = new AddReviewerInput();
+ ReviewerInput in = new ReviewerInput();
in.reviewer = user.email();
gApi.changes().id(changeId).addReviewer(in);
diff --git a/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java b/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java
index eac0f1b..a76616a 100644
--- a/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java
+++ b/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java
@@ -674,7 +674,7 @@
GroupInput gin = new GroupInput();
gin.name = group;
gin.members = ImmutableList.of(user.username(), user2.username());
- gin.visibleToAll = true; // TODO(dborowitz): Shouldn't be necessary; see ReviewerAdder.
+ gin.visibleToAll = true; // TODO(dborowitz): Shouldn't be necessary; see ReviewerModifier.
gApi.groups().create(gin);
PushOneCommit.Result r = pushTo("refs/for/master%cc=" + group);
@@ -752,7 +752,7 @@
GroupInput gin = new GroupInput();
gin.name = group;
gin.members = ImmutableList.of(user.username(), user2.username());
- gin.visibleToAll = true; // TODO(dborowitz): Shouldn't be necessary; see ReviewerAdder.
+ gin.visibleToAll = true; // TODO(dborowitz): Shouldn't be necessary; see ReviewerModifier.
gApi.groups().create(gin);
PushOneCommit.Result r = pushTo("refs/for/master%r=" + group);
diff --git a/javatests/com/google/gerrit/acceptance/rest/binding/ChangesRestApiBindingsIT.java b/javatests/com/google/gerrit/acceptance/rest/binding/ChangesRestApiBindingsIT.java
index 2e702c10..68b24ce 100644
--- a/javatests/com/google/gerrit/acceptance/rest/binding/ChangesRestApiBindingsIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/binding/ChangesRestApiBindingsIT.java
@@ -25,11 +25,11 @@
import com.google.gerrit.acceptance.rest.util.RestApiCallHelper;
import com.google.gerrit.acceptance.rest.util.RestCall;
import com.google.gerrit.entities.Patch;
-import com.google.gerrit.extensions.api.changes.AddReviewerInput;
import com.google.gerrit.extensions.api.changes.DraftInput;
import com.google.gerrit.extensions.api.changes.ReviewInput;
import com.google.gerrit.extensions.api.changes.ReviewInput.DraftHandling;
import com.google.gerrit.extensions.api.changes.ReviewInput.RobotCommentInput;
+import com.google.gerrit.extensions.api.changes.ReviewerInput;
import com.google.gerrit.extensions.client.Comment;
import com.google.gerrit.extensions.client.Side;
import com.google.gerrit.extensions.common.CommentInfo;
@@ -289,15 +289,15 @@
public void reviewerEndpoints() throws Exception {
String changeId = createChange().getChangeId();
- AddReviewerInput addReviewerInput = new AddReviewerInput();
- addReviewerInput.reviewer = user.email();
+ ReviewerInput reviewerInput = new ReviewerInput();
+ reviewerInput.reviewer = user.email();
RestApiCallHelper.execute(
adminRestSession,
REVIEWER_ENDPOINTS,
- () -> gApi.changes().id(changeId).addReviewer(addReviewerInput),
+ () -> gApi.changes().id(changeId).addReviewer(reviewerInput),
changeId,
- addReviewerInput.reviewer);
+ reviewerInput.reviewer);
}
@Test
@@ -323,16 +323,16 @@
public void revisionReviewerEndpoints() throws Exception {
String changeId = createChange().getChangeId();
- AddReviewerInput addReviewerInput = new AddReviewerInput();
- addReviewerInput.reviewer = user.email();
+ ReviewerInput reviewerInput = new ReviewerInput();
+ reviewerInput.reviewer = user.email();
RestApiCallHelper.execute(
adminRestSession,
REVISION_REVIEWER_ENDPOINTS,
- () -> gApi.changes().id(changeId).addReviewer(addReviewerInput),
+ () -> gApi.changes().id(changeId).addReviewer(reviewerInput),
changeId,
"current",
- addReviewerInput.reviewer);
+ reviewerInput.reviewer);
}
@Test
diff --git a/javatests/com/google/gerrit/acceptance/rest/change/AttentionSetIT.java b/javatests/com/google/gerrit/acceptance/rest/change/AttentionSetIT.java
index 61b7360..5b31fd8 100644
--- a/javatests/com/google/gerrit/acceptance/rest/change/AttentionSetIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/change/AttentionSetIT.java
@@ -39,11 +39,11 @@
import com.google.gerrit.entities.Change;
import com.google.gerrit.entities.LabelId;
import com.google.gerrit.entities.Patch;
-import com.google.gerrit.extensions.api.changes.AddReviewerInput;
import com.google.gerrit.extensions.api.changes.AttentionSetInput;
import com.google.gerrit.extensions.api.changes.DeleteReviewerInput;
import com.google.gerrit.extensions.api.changes.HashtagsInput;
import com.google.gerrit.extensions.api.changes.ReviewInput;
+import com.google.gerrit.extensions.api.changes.ReviewerInput;
import com.google.gerrit.extensions.client.GeneralPreferencesInfo;
import com.google.gerrit.extensions.client.GeneralPreferencesInfo.EmailStrategy;
import com.google.gerrit.extensions.client.ReviewerState;
@@ -352,7 +352,7 @@
PushOneCommit.Result r = createChange();
// Add cc
- AddReviewerInput input = new AddReviewerInput();
+ ReviewerInput input = new ReviewerInput();
input.reviewer = user.email();
input.state = ReviewerState.CC;
change(r).addReviewer(input);
@@ -404,10 +404,10 @@
public void addingReviewerWhileMarkingWorkInProgressDoesntAddToAttentionSet() throws Exception {
PushOneCommit.Result r = createChange();
ReviewInput reviewInput = ReviewInput.create().setWorkInProgress(true);
- AddReviewerInput addReviewerInput = new AddReviewerInput();
- addReviewerInput.state = ReviewerState.REVIEWER;
- addReviewerInput.reviewer = user.email();
- reviewInput.reviewers = ImmutableList.of(addReviewerInput);
+ ReviewerInput reviewerInput = new ReviewerInput();
+ reviewerInput.state = ReviewerState.REVIEWER;
+ reviewerInput.reviewer = user.email();
+ reviewInput.reviewers = ImmutableList.of(reviewerInput);
change(r).current().review(reviewInput);
assertThat(getAttentionSetUpdatesForUser(r, user)).isEmpty();
@@ -435,11 +435,11 @@
@Test
public void ccsAreIgnored() throws Exception {
PushOneCommit.Result r = createChange();
- AddReviewerInput addReviewerInput = new AddReviewerInput();
- addReviewerInput.state = ReviewerState.CC;
- addReviewerInput.reviewer = user.email();
+ ReviewerInput reviewerInput = new ReviewerInput();
+ reviewerInput.state = ReviewerState.CC;
+ reviewerInput.reviewer = user.email();
- change(r).addReviewer(addReviewerInput);
+ change(r).addReviewer(reviewerInput);
assertThat(r.getChange().attentionSet()).isEmpty();
}
@@ -449,10 +449,10 @@
PushOneCommit.Result r = createChange();
change(r).addReviewer(user.email());
- AddReviewerInput addReviewerInput = new AddReviewerInput();
- addReviewerInput.state = ReviewerState.CC;
- addReviewerInput.reviewer = user.email();
- change(r).addReviewer(addReviewerInput);
+ ReviewerInput reviewerInput = new ReviewerInput();
+ reviewerInput.state = ReviewerState.CC;
+ reviewerInput.reviewer = user.email();
+ change(r).addReviewer(reviewerInput);
AttentionSetUpdate attentionSet = Iterables.getOnlyElement(r.getChange().attentionSet());
assertThat(attentionSet).hasAccountIdThat().isEqualTo(user.id());
@@ -558,10 +558,10 @@
change(r).addReviewer(user.email());
ReviewInput reviewInput = ReviewInput.create().setReady(true);
- AddReviewerInput addReviewerInput = new AddReviewerInput();
- addReviewerInput.state = ReviewerState.CC;
- addReviewerInput.reviewer = user.email();
- reviewInput.reviewers = ImmutableList.of(addReviewerInput);
+ ReviewerInput reviewerInput = new ReviewerInput();
+ reviewerInput.state = ReviewerState.CC;
+ reviewerInput.reviewer = user.email();
+ reviewInput.reviewers = ImmutableList.of(reviewerInput);
change(r).addToAttentionSet(new AttentionSetInput(user.email(), "reason"));
change(r).current().review(reviewInput);
diff --git a/javatests/com/google/gerrit/acceptance/rest/change/ChangeReviewersByEmailIT.java b/javatests/com/google/gerrit/acceptance/rest/change/ChangeReviewersByEmailIT.java
index 012e98d..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.AddReviewerInput;
-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;
@@ -59,7 +59,7 @@
for (ReviewerState state : ImmutableList.of(ReviewerState.CC, ReviewerState.REVIEWER)) {
PushOneCommit.Result r = createChange();
- AddReviewerInput input = new AddReviewerInput();
+ ReviewerInput input = new ReviewerInput();
input.reviewer = toRfcAddressString(acc);
input.state = state;
gApi.changes().id(r.getChangeId()).addReviewer(input);
@@ -79,12 +79,12 @@
for (ReviewerState state : ImmutableList.of(ReviewerState.CC, ReviewerState.REVIEWER)) {
PushOneCommit.Result r = createChange();
- AddReviewerInput inputByEmail = new AddReviewerInput();
+ ReviewerInput inputByEmail = new ReviewerInput();
inputByEmail.reviewer = toRfcAddressString(byEmail);
inputByEmail.state = state;
gApi.changes().id(r.getChangeId()).addReviewer(inputByEmail);
- AddReviewerInput inputById = new AddReviewerInput();
+ ReviewerInput inputById = new ReviewerInput();
inputById.reviewer = user.email();
inputById.state = state;
gApi.changes().id(r.getChangeId()).addReviewer(inputById);
@@ -103,7 +103,7 @@
for (ReviewerState state : ImmutableList.of(ReviewerState.CC, ReviewerState.REVIEWER)) {
PushOneCommit.Result r = createChange();
- AddReviewerInput input = new AddReviewerInput();
+ ReviewerInput input = new ReviewerInput();
input.reviewer = toRfcAddressString(acc);
input.state = state;
gApi.changes().id(r.getChangeId()).addReviewer(input);
@@ -130,7 +130,7 @@
for (ReviewerState state : ImmutableList.of(ReviewerState.CC, ReviewerState.REVIEWER)) {
PushOneCommit.Result r = createChange();
- AddReviewerInput addInput = new AddReviewerInput();
+ ReviewerInput addInput = new ReviewerInput();
addInput.reviewer = toRfcAddressString(acc);
addInput.state = state;
gApi.changes().id(r.getChangeId()).addReviewer(addInput);
@@ -148,12 +148,12 @@
PushOneCommit.Result r = createChange();
- AddReviewerInput addInput = new AddReviewerInput();
+ ReviewerInput addInput = new ReviewerInput();
addInput.reviewer = toRfcAddressString(acc);
addInput.state = ReviewerState.CC;
gApi.changes().id(r.getChangeId()).addReviewer(addInput);
- AddReviewerInput modifyInput = new AddReviewerInput();
+ ReviewerInput modifyInput = new ReviewerInput();
modifyInput.reviewer = addInput.reviewer;
modifyInput.state = ReviewerState.REVIEWER;
gApi.changes().id(r.getChangeId()).addReviewer(modifyInput);
@@ -170,7 +170,7 @@
for (ReviewerState state : ImmutableList.of(ReviewerState.CC, ReviewerState.REVIEWER)) {
PushOneCommit.Result r = createChange();
- AddReviewerInput input = new AddReviewerInput();
+ ReviewerInput input = new ReviewerInput();
input.reviewer = toRfcAddressString(acc);
input.state = state;
gApi.changes().id(r.getChangeId()).addReviewer(input);
@@ -189,7 +189,7 @@
for (ReviewerState state : ImmutableList.of(ReviewerState.CC, ReviewerState.REVIEWER)) {
PushOneCommit.Result r = createChange();
- AddReviewerInput addInput = new AddReviewerInput();
+ ReviewerInput addInput = new ReviewerInput();
addInput.reviewer = toRfcAddressString(acc);
addInput.state = state;
gApi.changes().id(r.getChangeId()).addReviewer(addInput);
@@ -221,7 +221,7 @@
for (ReviewerState state : ImmutableList.of(ReviewerState.CC, ReviewerState.REVIEWER)) {
PushOneCommit.Result r = createChange();
- AddReviewerInput input = new AddReviewerInput();
+ ReviewerInput input = new ReviewerInput();
input.reviewer = toRfcAddressString(acc);
input.state = state;
gApi.changes().id(r.getChangeId()).addReviewer(input);
@@ -241,7 +241,7 @@
PushOneCommit.Result r = createChange();
for (ReviewerState state : ImmutableList.of(ReviewerState.CC, ReviewerState.REVIEWER)) {
for (int i = 0; i < 10; i++) {
- AddReviewerInput input = new AddReviewerInput();
+ ReviewerInput input = new ReviewerInput();
input.reviewer = String.format("%s-%s@gerritcodereview.com", state, i);
input.state = state;
gApi.changes().id(r.getChangeId()).addReviewer(input);
@@ -249,7 +249,7 @@
}
// Also add user as a regular reviewer
- AddReviewerInput input = new AddReviewerInput();
+ ReviewerInput input = new ReviewerInput();
input.reviewer = user.email();
input.state = ReviewerState.REVIEWER;
gApi.changes().id(r.getChangeId()).addReviewer(input);
@@ -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(
@@ -319,7 +319,7 @@
for (ReviewerState state : ImmutableList.of(ReviewerState.CC, ReviewerState.REVIEWER)) {
PushOneCommit.Result r = createChange();
- AddReviewerInput input = new AddReviewerInput();
+ ReviewerInput input = new ReviewerInput();
input.reviewer = toRfcAddressString(acc);
input.state = state;
gApi.changes().id(r.getChangeId()).addReviewer(input);
@@ -337,11 +337,11 @@
public void addExistingReviewerByEmailShortCircuits() throws Exception {
PushOneCommit.Result r = createChange();
- AddReviewerInput input = new AddReviewerInput();
+ ReviewerInput input = new ReviewerInput();
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();
@@ -354,10 +354,10 @@
public void addExistingCcByEmailShortCircuits() throws Exception {
PushOneCommit.Result r = createChange();
- AddReviewerInput input = new AddReviewerInput();
+ 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 f9493c2..41bedbc 100644
--- a/javatests/com/google/gerrit/acceptance/rest/change/ChangeReviewersIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/change/ChangeReviewersIT.java
@@ -41,14 +41,14 @@
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.AddReviewerInput;
-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;
import com.google.gerrit.extensions.api.changes.ReviewInput;
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;
@@ -56,7 +56,7 @@
import com.google.gerrit.extensions.common.LabelInfo;
import com.google.gerrit.extensions.common.ReviewerUpdateInfo;
import com.google.gerrit.extensions.restapi.AuthException;
-import com.google.gerrit.server.change.ReviewerAdder;
+import com.google.gerrit.server.change.ReviewerModifier;
import com.google.gerrit.testing.FakeEmailSender.Message;
import com.google.gson.stream.JsonReader;
import com.google.inject.Inject;
@@ -82,8 +82,8 @@
String largeGroup = groupOperations.newGroup().name("largeGroup").create().get();
String mediumGroup = groupOperations.newGroup().name("mediumGroup").create().get();
- int largeGroupSize = ReviewerAdder.DEFAULT_MAX_REVIEWERS + 1;
- int mediumGroupSize = ReviewerAdder.DEFAULT_MAX_REVIEWERS_WITHOUT_CHECK + 1;
+ int largeGroupSize = ReviewerModifier.DEFAULT_MAX_REVIEWERS + 1;
+ int mediumGroupSize = ReviewerModifier.DEFAULT_MAX_REVIEWERS_WITHOUT_CHECK + 1;
List<TestAccount> users = createAccounts(largeGroupSize, "addGroupAsReviewer");
List<String> largeGroupUsernames = new ArrayList<>(mediumGroupSize);
for (TestAccount u : users) {
@@ -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");
@@ -115,7 +115,7 @@
assertThat(result.reviewers).isNull();
// Add medium group with confirmation.
- AddReviewerInput in = new AddReviewerInput();
+ ReviewerInput in = new ReviewerInput();
in.reviewer = mediumGroup;
in.confirmed = true;
result = addReviewer(changeId, in);
@@ -133,10 +133,10 @@
public void addCcAccount() throws Exception {
PushOneCommit.Result r = createChange();
String changeId = r.getChangeId();
- AddReviewerInput in = new AddReviewerInput();
+ 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();
@@ -169,13 +169,13 @@
PushOneCommit.Result r = createChange();
String changeId = r.getChangeId();
- AddReviewerInput in = new AddReviewerInput();
+ ReviewerInput in = new ReviewerInput();
in.reviewer = groupOperations.newGroup().name("cc1").create().get();
in.state = CC;
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();
@@ -229,7 +229,7 @@
public void transitionCcToReviewer() throws Exception {
PushOneCommit.Result r = createChange();
String changeId = r.getChangeId();
- AddReviewerInput in = new AddReviewerInput();
+ ReviewerInput in = new ReviewerInput();
in.reviewer = user.email();
in.state = CC;
addReviewer(changeId, in);
@@ -414,8 +414,8 @@
@Test
public void reviewAndAddGroupReviewers() throws Exception {
- int largeGroupSize = ReviewerAdder.DEFAULT_MAX_REVIEWERS + 1;
- int mediumGroupSize = ReviewerAdder.DEFAULT_MAX_REVIEWERS_WITHOUT_CHECK + 1;
+ int largeGroupSize = ReviewerModifier.DEFAULT_MAX_REVIEWERS + 1;
+ int mediumGroupSize = ReviewerModifier.DEFAULT_MAX_REVIEWERS_WITHOUT_CHECK + 1;
List<TestAccount> users = createAccounts(largeGroupSize, "reviewAndAddGroupReviewers");
List<String> usernames = new ArrayList<>(largeGroupSize);
for (TestAccount u : users) {
@@ -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();
@@ -495,7 +495,7 @@
public void addReviewerToReviewerChangeInfo() throws Exception {
PushOneCommit.Result r = createChange();
String changeId = r.getChangeId();
- AddReviewerInput in = new AddReviewerInput();
+ ReviewerInput in = new ReviewerInput();
in.reviewer = user.email();
in.state = CC;
addReviewer(changeId, in);
@@ -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);
@@ -646,7 +646,7 @@
PushOneCommit.Result r = createChange();
TestAccount userToNotify = createAccounts(1, "notify-details-post-reviewers").get(0);
- AddReviewerInput addReviewer = new AddReviewerInput();
+ ReviewerInput addReviewer = new ReviewerInput();
addReviewer.reviewer = user.email();
addReviewer.notify = NotifyHandling.NONE;
addReviewer.notifyDetails =
@@ -859,7 +859,7 @@
PushOneCommit.Result r = createChange();
TestAccount newUser = createAccounts(1, name("foo")).get(0);
- AddReviewerInput input = new AddReviewerInput();
+ ReviewerInput input = new ReviewerInput();
input.reviewer = user.email();
input.state = ReviewerState.CC;
gApi.changes().id(r.getChangeId()).addReviewer(input);
@@ -877,11 +877,11 @@
public void addExistingReviewerShortCircuits() throws Exception {
PushOneCommit.Result r = createChange();
- AddReviewerInput input = new AddReviewerInput();
+ ReviewerInput input = new ReviewerInput();
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());
@@ -893,11 +893,11 @@
public void addExistingCcShortCircuits() throws Exception {
PushOneCommit.Result r = createChange();
- AddReviewerInput input = new AddReviewerInput();
+ ReviewerInput input = new ReviewerInput();
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());
@@ -909,7 +909,7 @@
public void moveCcToReviewer() throws Exception {
// Create a change and add 'user' as CC.
String changeId = createChange().getChangeId();
- AddReviewerInput reviewerInput = new AddReviewerInput();
+ ReviewerInput reviewerInput = new ReviewerInput();
reviewerInput.reviewer = user.email();
reviewerInput.state = ReviewerState.CC;
gApi.changes().id(changeId).addReviewer(reviewerInput);
@@ -967,7 +967,7 @@
// Move 'user' from reviewer to CC.
requestScopeOperations.setApiUser(admin.id());
- AddReviewerInput reviewerInput = new AddReviewerInput();
+ ReviewerInput reviewerInput = new ReviewerInput();
reviewerInput.reviewer = user.id().toString();
reviewerInput.state = CC;
gApi.changes().id(changeId).addReviewer(reviewerInput);
@@ -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 {
- AddReviewerInput in = new AddReviewerInput();
+ ReviewerInput in = new ReviewerInput();
in.reviewer = reviewer;
return addReviewer(changeId, in, expectedStatus);
}
- private AddReviewerResult addReviewer(String changeId, AddReviewerInput in) throws Exception {
+ private ReviewerResult addReviewer(String changeId, ReviewerInput in) throws Exception {
return addReviewer(changeId, in, SC_OK);
}
- private AddReviewerResult addReviewer(String changeId, AddReviewerInput 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/javatests/com/google/gerrit/acceptance/rest/change/SuggestReviewersIT.java b/javatests/com/google/gerrit/acceptance/rest/change/SuggestReviewersIT.java
index ffde622..ed6254a 100644
--- a/javatests/com/google/gerrit/acceptance/rest/change/SuggestReviewersIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/change/SuggestReviewersIT.java
@@ -38,7 +38,7 @@
import com.google.gerrit.entities.AccountGroup;
import com.google.gerrit.entities.Project;
import com.google.gerrit.extensions.api.accounts.EmailInput;
-import com.google.gerrit.extensions.api.changes.AddReviewerInput;
+import com.google.gerrit.extensions.api.changes.ReviewerInput;
import com.google.gerrit.extensions.client.ReviewerState;
import com.google.gerrit.extensions.common.ChangeInput;
import com.google.gerrit.extensions.common.SuggestedReviewerInfo;
@@ -502,7 +502,7 @@
assertReviewers(
suggestReviewers(changeId, name), ImmutableList.of(foo1, foo2), ImmutableList.of());
- AddReviewerInput reviewerInput = new AddReviewerInput();
+ ReviewerInput reviewerInput = new ReviewerInput();
reviewerInput.reviewer = foo2.id().toString();
reviewerInput.state = ReviewerState.CC;
gApi.changes().id(changeId).addReviewer(reviewerInput);
@@ -525,7 +525,7 @@
assertReviewers(suggestCcs(changeId, name), ImmutableList.of(foo1, foo2), ImmutableList.of());
- AddReviewerInput reviewerInput = new AddReviewerInput();
+ ReviewerInput reviewerInput = new ReviewerInput();
reviewerInput.reviewer = foo2.id().toString();
reviewerInput.state = ReviewerState.REVIEWER;
gApi.changes().id(changeId).addReviewer(reviewerInput);
diff --git a/javatests/com/google/gerrit/acceptance/server/mail/ChangeNotificationsIT.java b/javatests/com/google/gerrit/acceptance/server/mail/ChangeNotificationsIT.java
index f267513..4a8c376 100644
--- a/javatests/com/google/gerrit/acceptance/server/mail/ChangeNotificationsIT.java
+++ b/javatests/com/google/gerrit/acceptance/server/mail/ChangeNotificationsIT.java
@@ -41,12 +41,12 @@
import com.google.gerrit.entities.Permission;
import com.google.gerrit.entities.Project;
import com.google.gerrit.extensions.api.changes.AbandonInput;
-import com.google.gerrit.extensions.api.changes.AddReviewerInput;
import com.google.gerrit.extensions.api.changes.AssigneeInput;
import com.google.gerrit.extensions.api.changes.DeleteReviewerInput;
import com.google.gerrit.extensions.api.changes.DeleteVoteInput;
import com.google.gerrit.extensions.api.changes.NotifyHandling;
import com.google.gerrit.extensions.api.changes.ReviewInput;
+import com.google.gerrit.extensions.api.changes.ReviewerInput;
import com.google.gerrit.extensions.api.changes.SubmitInput;
import com.google.gerrit.extensions.api.projects.ConfigInput;
import com.google.gerrit.extensions.client.GeneralPreferencesInfo;
@@ -273,7 +273,7 @@
}
/*
- * AddReviewerSender tests.
+ * ModifyReviewerSender tests (only for additions).
*/
private void addReviewerToReviewableChange(Adder adder) throws Exception {
@@ -421,7 +421,7 @@
TestAccount reviewer = accountCreator.create("added", "added@example.com", "added", null);
addReviewer(singly(), sc.changeId, sc.owner, reviewer.email());
// TODO(dborowitz): In theory this should match the batch case, but we don't currently pass
- // enough info into AddReviewersEmail#emailReviewers to distinguish the reviewStarted case.
+ // enough info into ModifyReviewersEmail#emailReviewers to distinguish the reviewStarted case.
// Complicating the emailReviewers arguments is not the answer; this needs to be rewritten.
// Tolerate the difference for now.
assertThat(sender).didNotSend();
@@ -582,7 +582,7 @@
private Adder singly(ReviewerState reviewerState) {
return (String changeId, String reviewer, @Nullable NotifyHandling notify) -> {
- AddReviewerInput in = new AddReviewerInput();
+ ReviewerInput in = new ReviewerInput();
in.reviewer = reviewer;
in.state = reviewerState;
if (notify != null) {
diff --git a/javatests/com/google/gerrit/acceptance/server/project/CustomLabelIT.java b/javatests/com/google/gerrit/acceptance/server/project/CustomLabelIT.java
index 6aa5878..6b34cca 100644
--- a/javatests/com/google/gerrit/acceptance/server/project/CustomLabelIT.java
+++ b/javatests/com/google/gerrit/acceptance/server/project/CustomLabelIT.java
@@ -43,8 +43,8 @@
import com.google.gerrit.entities.CachedProjectConfig;
import com.google.gerrit.entities.LabelFunction;
import com.google.gerrit.entities.LabelType;
-import com.google.gerrit.extensions.api.changes.AddReviewerInput;
import com.google.gerrit.extensions.api.changes.ReviewInput;
+import com.google.gerrit.extensions.api.changes.ReviewerInput;
import com.google.gerrit.extensions.common.ChangeInfo;
import com.google.gerrit.extensions.common.LabelInfo;
import com.google.gerrit.extensions.events.CommentAddedListener;
@@ -169,7 +169,7 @@
try (Registration registration = extensionRegistry.newRegistration().add(testListener)) {
saveLabelConfig(P.toBuilder().setFunction(ANY_WITH_BLOCK));
PushOneCommit.Result r = createChange();
- AddReviewerInput in = new AddReviewerInput();
+ ReviewerInput in = new ReviewerInput();
in.reviewer = user.email();
gApi.changes().id(r.getChangeId()).addReviewer(in);
diff --git a/javatests/com/google/gerrit/acceptance/ssh/QueryIT.java b/javatests/com/google/gerrit/acceptance/ssh/QueryIT.java
index 78960bb..cf316c7 100644
--- a/javatests/com/google/gerrit/acceptance/ssh/QueryIT.java
+++ b/javatests/com/google/gerrit/acceptance/ssh/QueryIT.java
@@ -23,8 +23,8 @@
import com.google.gerrit.acceptance.PushOneCommit;
import com.google.gerrit.acceptance.SshSession;
import com.google.gerrit.acceptance.UseSsh;
-import com.google.gerrit.extensions.api.changes.AddReviewerInput;
import com.google.gerrit.extensions.api.changes.ReviewInput;
+import com.google.gerrit.extensions.api.changes.ReviewerInput;
import com.google.gerrit.extensions.client.ListChangesOption;
import com.google.gerrit.extensions.client.Side;
import com.google.gerrit.server.data.ChangeAttribute;
@@ -84,7 +84,7 @@
@Test
public void allReviewersOptionJSON() throws Exception {
String changeId = createChange().getChangeId();
- AddReviewerInput in = new AddReviewerInput();
+ ReviewerInput in = new ReviewerInput();
in.reviewer = user.email();
gApi.changes().id(changeId).addReviewer(in);
diff --git a/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java b/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java
index de9c0a5..4e84b3c 100644
--- a/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java
+++ b/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java
@@ -59,7 +59,6 @@
import com.google.gerrit.entities.Project;
import com.google.gerrit.entities.RefNames;
import com.google.gerrit.extensions.api.GerritApi;
-import com.google.gerrit.extensions.api.changes.AddReviewerInput;
import com.google.gerrit.extensions.api.changes.AssigneeInput;
import com.google.gerrit.extensions.api.changes.AttentionSetInput;
import com.google.gerrit.extensions.api.changes.ChangeApi;
@@ -68,6 +67,7 @@
import com.google.gerrit.extensions.api.changes.HashtagsInput;
import com.google.gerrit.extensions.api.changes.ReviewInput;
import com.google.gerrit.extensions.api.changes.ReviewInput.DraftHandling;
+import com.google.gerrit.extensions.api.changes.ReviewerInput;
import com.google.gerrit.extensions.api.changes.StarsInput;
import com.google.gerrit.extensions.api.groups.GroupInput;
import com.google.gerrit.extensions.api.projects.ConfigInput;
@@ -2484,12 +2484,12 @@
Change change3 = insert(repo, newChange(repo));
insert(repo, newChange(repo));
- AddReviewerInput rin = new AddReviewerInput();
+ ReviewerInput rin = new ReviewerInput();
rin.reviewer = user1.toString();
rin.state = ReviewerState.REVIEWER;
gApi.changes().id(change1.getId().get()).addReviewer(rin);
- rin = new AddReviewerInput();
+ rin = new ReviewerInput();
rin.reviewer = user1.toString();
rin.state = ReviewerState.CC;
gApi.changes().id(change2.getId().get()).addReviewer(rin);
@@ -2540,17 +2540,17 @@
Change change2 = insert(repo, newChange(repo));
Change change3 = insert(repo, newChange(repo));
- AddReviewerInput rin = new AddReviewerInput();
+ ReviewerInput rin = new ReviewerInput();
rin.reviewer = user1.toString();
rin.state = ReviewerState.REVIEWER;
gApi.changes().id(change1.getId().get()).addReviewer(rin);
- rin = new AddReviewerInput();
+ rin = new ReviewerInput();
rin.reviewer = user2.toString();
rin.state = ReviewerState.REVIEWER;
gApi.changes().id(change2.getId().get()).addReviewer(rin);
- rin = new AddReviewerInput();
+ rin = new ReviewerInput();
rin.reviewer = user3.toString();
rin.state = ReviewerState.CC;
gApi.changes().id(change3.getId().get()).addReviewer(rin);
@@ -2590,12 +2590,12 @@
Change change2 = insert(repo, newChange(repo));
insert(repo, newChange(repo));
- AddReviewerInput rin = new AddReviewerInput();
+ ReviewerInput rin = new ReviewerInput();
rin.reviewer = userByEmailWithName;
rin.state = ReviewerState.REVIEWER;
gApi.changes().id(change1.getId().get()).addReviewer(rin);
- rin = new AddReviewerInput();
+ rin = new ReviewerInput();
rin.reviewer = userByEmailWithName;
rin.state = ReviewerState.CC;
gApi.changes().id(change2.getId().get()).addReviewer(rin);
@@ -2622,12 +2622,12 @@
Change change2 = insert(repo, newChange(repo));
insert(repo, newChange(repo));
- AddReviewerInput rin = new AddReviewerInput();
+ ReviewerInput rin = new ReviewerInput();
rin.reviewer = userByEmail;
rin.state = ReviewerState.REVIEWER;
gApi.changes().id(change1.getId().get()).addReviewer(rin);
- rin = new AddReviewerInput();
+ rin = new ReviewerInput();
rin.reviewer = userByEmail;
rin.state = ReviewerState.CC;
gApi.changes().id(change2.getId().get()).addReviewer(rin);
@@ -2989,7 +2989,7 @@
cApi.addReviewer("" + reviewerId);
}
for (Account.Id reviewerId : cced) {
- AddReviewerInput in = new AddReviewerInput();
+ ReviewerInput in = new ReviewerInput();
in.reviewer = reviewerId.toString();
in.state = ReviewerState.CC;
cApi.addReviewer(in);
@@ -3351,10 +3351,10 @@
// Add the second user as cc to ensure that user took part of the change and can be added to the
// attention set.
- AddReviewerInput addReviewerInput = new AddReviewerInput();
- addReviewerInput.reviewer = user2Id.toString();
- addReviewerInput.state = ReviewerState.CC;
- gApi.changes().id(change.getChangeId()).addReviewer(addReviewerInput);
+ ReviewerInput reviewerInput = new ReviewerInput();
+ reviewerInput.reviewer = user2Id.toString();
+ reviewerInput.state = ReviewerState.CC;
+ gApi.changes().id(change.getChangeId()).addReviewer(reviewerInput);
input = new AttentionSetInput(user2Id.toString(), "reason 2");
gApi.changes().id(change.getChangeId()).addToAttentionSet(input);
diff --git a/polygerrit-ui/app/types/common.ts b/polygerrit-ui/app/types/common.ts
index 9e30484..0f229df 100644
--- a/polygerrit-ui/app/types/common.ts
+++ b/polygerrit-ui/app/types/common.ts
@@ -1830,7 +1830,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;
