From e7e3414b63ab566d3f2a01d682b579c45f7b03e2 Mon Sep 17 00:00:00 2001
From: "robin.moss" <robin.moss@ocado.com>
Date: Thu, 28 Jan 2021 10:39:22 +0000
Subject: [PATCH 1/2] feat: add support for GitLab merge request reviewers

---
 .../java/org/gitlab4j/api/models/MergeRequest.java |  9 +++++++++
 .../gitlab4j/api/models/MergeRequestParams.java    | 14 ++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/src/main/java/org/gitlab4j/api/models/MergeRequest.java b/src/main/java/org/gitlab4j/api/models/MergeRequest.java
index 1417e1d2a..cca01c793 100644
--- a/src/main/java/org/gitlab4j/api/models/MergeRequest.java
+++ b/src/main/java/org/gitlab4j/api/models/MergeRequest.java
@@ -15,6 +15,7 @@ public class MergeRequest {
     private Integer approvalsBeforeMerge;
     private Assignee assignee;
     private List<Assignee> assignees;
+    private List<Assignee> reviewers;
     private Author author;
     private Boolean blockingDiscussionsResolved;
     private List<Diff> changes;
@@ -548,6 +549,14 @@ public static final boolean isValid(MergeRequest mergeRequest) {
         return (mergeRequest != null && mergeRequest.getId() != null);
     }
 
+    public List<Assignee> getReviewers() {
+        return reviewers;
+    }
+
+    public void setReviewers(List<Assignee> reviewers) {
+        this.reviewers = reviewers;
+    }
+
     @Override
     public String toString() {
         return (JacksonJson.toJsonString(this));
diff --git a/src/main/java/org/gitlab4j/api/models/MergeRequestParams.java b/src/main/java/org/gitlab4j/api/models/MergeRequestParams.java
index b04744b53..0a17c6c83 100644
--- a/src/main/java/org/gitlab4j/api/models/MergeRequestParams.java
+++ b/src/main/java/org/gitlab4j/api/models/MergeRequestParams.java
@@ -16,6 +16,7 @@ public class MergeRequestParams {
     private String title;
     private Integer assigneeId;
     private List<Integer> assigneeIds;
+    private List<Integer> reviewerIds;
     private Integer milestoneId;
     private List<String> labels;
     private String description;
@@ -83,6 +84,18 @@ public MergeRequestParams withAssigneeIds(List<Integer> assigneeIds) {
 	return (this);
     }
 
+    /**
+     * The ID of the user(s) to assign to the review of the merge request. Set to 0 or provide
+     * an empty value to unassign all reviewers.
+     *
+     * @param reviewerIds the reviewerIds to set
+     * @return the reference to this MergeRequestParams instance
+     */
+    public MergeRequestParams withReviewerIds(List<Integer> reviewerIds) {
+        this.reviewerIds = reviewerIds;
+        return (this);
+    }
+
     /**
      * Set the milestone ID field value.
      *
@@ -219,6 +232,7 @@ public GitLabApiForm getForm(boolean isCreate) {
             .withParam("title", title, isCreate)
             .withParam("assignee_id", assigneeId)
             .withParam("assignee_ids", assigneeIds)
+            .withParam("reviewer_ids", reviewerIds)
             .withParam("milestone_id", milestoneId)
             .withParam("labels", (labels != null ? String.join(",", labels) : null))
             .withParam("description", description)

From 1784223c63a3659cb82a5918ee7f4e3795270154 Mon Sep 17 00:00:00 2001
From: "robin.moss" <robin.moss@ocado.com>
Date: Mon, 22 Feb 2021 16:23:35 +0000
Subject: [PATCH 2/2] feat: add Reviewer user class

---
 src/main/java/org/gitlab4j/api/models/MergeRequest.java | 6 +++---
 src/main/java/org/gitlab4j/api/models/Reviewer.java     | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/org/gitlab4j/api/models/Reviewer.java

diff --git a/src/main/java/org/gitlab4j/api/models/MergeRequest.java b/src/main/java/org/gitlab4j/api/models/MergeRequest.java
index cca01c793..d2ae47a4d 100644
--- a/src/main/java/org/gitlab4j/api/models/MergeRequest.java
+++ b/src/main/java/org/gitlab4j/api/models/MergeRequest.java
@@ -15,7 +15,7 @@ public class MergeRequest {
     private Integer approvalsBeforeMerge;
     private Assignee assignee;
     private List<Assignee> assignees;
-    private List<Assignee> reviewers;
+    private List<Reviewer> reviewers;
     private Author author;
     private Boolean blockingDiscussionsResolved;
     private List<Diff> changes;
@@ -549,11 +549,11 @@ public static final boolean isValid(MergeRequest mergeRequest) {
         return (mergeRequest != null && mergeRequest.getId() != null);
     }
 
-    public List<Assignee> getReviewers() {
+    public List<Reviewer> getReviewers() {
         return reviewers;
     }
 
-    public void setReviewers(List<Assignee> reviewers) {
+    public void setReviewers(List<Reviewer> reviewers) {
         this.reviewers = reviewers;
     }
 
diff --git a/src/main/java/org/gitlab4j/api/models/Reviewer.java b/src/main/java/org/gitlab4j/api/models/Reviewer.java
new file mode 100644
index 000000000..694457aa6
--- /dev/null
+++ b/src/main/java/org/gitlab4j/api/models/Reviewer.java
@@ -0,0 +1,4 @@
+package org.gitlab4j.api.models;
+
+public class Reviewer extends AbstractUser<Reviewer> {
+}