Skip to content
GitLab
Switch branch/tag
Find file BlameHistoryPermalink
  • Дмитрий's avatar
    Merge reguest api: fix methods for diff and version (#1004) · 7d1d6b1a
    Дмитрий authored 
    
Changes MergeRequestApi:

- added methods "getDiffs()" for GitLab Endpoint:
GET /projects/:id/merge_requests/:merge_request_iid/diffs

- add methods "getDiffVersions()" for GitLab Endpoint:
GET /projects/:id/merge_requests/:merge_request_iid/versions

- add method "getDiffVersion()" and "getOptionalDiffVersion()" for GitLab Endpoint:
GET /projects/:id/merge_requests/:merge_request_iid/versions/:version_id

- deprecate "getMergeRequestDiffs()" and "getMergeRequestDiff()"

Fixes #993

---------

Co-authored-by: default avatarJeremie Bresson <jeremie.bresson@unblu.com>
    Unverified
    7d1d6b1a
TestGitLabApiBeans.java 29.96 KiB
Open in Web IDE
1 
/*
2 
 * The MIT License (MIT)
3 
 *
4 
 * Copyright (c) 2017-2020 Greg Messner <greg@messners.com>
5 
 *
6 
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
7 
 * this software and associated documentation files (the "Software.json"), to deal in
8 
 * the Software without restriction, including without limitation the rights to
9 
 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
10 
 * the Software, and to permit persons to whom the Software is furnished to do so,
11 
 * subject to the following conditions:
12 
 *
13 
 * The above copyright notice and this permission notice shall be included in all
14 
 * copies or substantial portions of the Software.
15 
 *
16 
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17 
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
18 
 * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
19 
 * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
20 
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
21 
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
22 
 */
23
24 
package org.gitlab4j.api;
25
26 
import static org.gitlab4j.api.JsonUtils.compareJson;
27 
import static org.gitlab4j.api.JsonUtils.readTreeFromResource;
28 
import static org.gitlab4j.api.JsonUtils.unmarshalResource;
29 
import static org.gitlab4j.api.JsonUtils.unmarshalResourceList;
30 
import static org.gitlab4j.api.JsonUtils.unmarshalResourceMap;
31 
import static org.junit.jupiter.api.Assertions.assertTrue;
32
33 
import java.util.List;
34 
import java.util.Map;
35
36 
import org.gitlab4j.api.models.AccessRequest;
37 
import org.gitlab4j.api.models.Application;
38 
import org.gitlab4j.api.models.ApplicationSettings;
39 
import org.gitlab4j.api.models.ApprovalRule;
40 
import org.gitlab4j.api.models.ApprovalState;
41 
import org.gitlab4j.api.models.ArtifactsFile;
42 
import org.gitlab4j.api.models.AuditEvent;
43 
import org.gitlab4j.api.models.AwardEmoji;
44 
import org.gitlab4j.api.models.Badge;
45 
import org.gitlab4j.api.models.Blame;
46 
import org.gitlab4j.api.models.Board;
47 
import org.gitlab4j.api.models.Branch;
48 
import org.gitlab4j.api.models.ChildEpic;
49 
import org.gitlab4j.api.models.Comment;
50 
import org.gitlab4j.api.models.Commit;
51 
import org.gitlab4j.api.models.CommitPayload;
52 
import org.gitlab4j.api.models.CommitStatus;
53 
import org.gitlab4j.api.models.CompareResults;
54 
import org.gitlab4j.api.models.Contributor;
55 
import org.gitlab4j.api.models.CreatedChildEpic;
56 
import org.gitlab4j.api.models.DeployKey;
57 
import org.gitlab4j.api.models.DeployToken;
58 
import org.gitlab4j.api.models.Deployment;
59 
import org.gitlab4j.api.models.Diff;
60 
import org.gitlab4j.api.models.Discussion;
61 
import org.gitlab4j.api.models.Email;
62 
import org.gitlab4j.api.models.Environment;
63 
import org.gitlab4j.api.models.Epic;
64 
import org.gitlab4j.api.models.EpicIssue;
65 
import org.gitlab4j.api.models.EpicIssueLink;
66 
import org.gitlab4j.api.models.Event;
67 
import org.gitlab4j.api.models.ExportStatus;
68 
import org.gitlab4j.api.models.ExternalStatusCheck;
69 
import org.gitlab4j.api.models.ExternalStatusCheckResult;
70 
import org.gitlab4j.api.models.ExternalStatusCheckStatus;