diff --git a/src/main/java/org/gitlab4j/api/models/MergeRequest.java b/src/main/java/org/gitlab4j/api/models/MergeRequest.java index 537ba69aa7c8e0fd97d90a1601a86a84582f6f2f..3c2d777ccee50214d9ad670096d582648204bac8 100644 --- a/src/main/java/org/gitlab4j/api/models/MergeRequest.java +++ b/src/main/java/org/gitlab4j/api/models/MergeRequest.java @@ -44,7 +44,12 @@ public class MergeRequest { private String mergeStatus; private String detailedMergeStatus; private Date mergedAt; + /** + * @deprecated since 14.7, use {@link #mergeUser} instead. + * see https://docs.gitlab.com/ee/update/deprecations.html#merged_by-api-field + */ private Participant mergedBy; + private Participant mergeUser; private Boolean mergeWhenPipelineSucceeds; private String mergeError; private Milestone milestone; @@ -311,14 +316,32 @@ public class MergeRequest { this.mergedAt = mergedAt; } + /** + * @deprecated since 14.7, use {@link #getMergeUser()} instead. + * see https://docs.gitlab.com/ee/update/deprecations.html#merged_by-api-field + */ + @Deprecated public Participant getMergedBy() { return mergedBy; } + /** + * @deprecated since 14.7, use {@link #setMergeUser(Participant)} instead. + * see https://docs.gitlab.com/ee/update/deprecations.html#merged_by-api-field + */ + @Deprecated public void setMergedBy(Participant mergedBy) { this.mergedBy = mergedBy; } + public Participant getMergeUser() { + return mergeUser; + } + + public void setMergeUser(Participant mergeUser) { + this.mergeUser = mergeUser; + } + public Boolean getMergeWhenPipelineSucceeds() { return mergeWhenPipelineSucceeds; } diff --git a/src/test/resources/org/gitlab4j/api/merge-request.json b/src/test/resources/org/gitlab4j/api/merge-request.json index 1c05164bee677fee50c0926ed77ecb784698210f..a4ebdf6c0e75c01cd7a4df88845540162a7f51a5 100644 --- a/src/test/resources/org/gitlab4j/api/merge-request.json +++ b/src/test/resources/org/gitlab4j/api/merge-request.json @@ -21,6 +21,14 @@ "avatar_url": "https://www.google.com/", "web_url": "https://www.google.com/" }, + "merge_user": { + "id": 87854, + "name": "Douwe Maan", + "username": "DouweM", + "state": "active", + "avatar_url": "https://gitlab.example.com/uploads/-/system/user/avatar/87854/avatar.png", + "web_url": "https://gitlab.com/DouweM" + }, "merge_error": "Merge request is not mergeable", "author":{ "id":1,