From 0b40fd174ac70d0acb1a3a00926f8646e5079c48 Mon Sep 17 00:00:00 2001 From: Evgeny Date: Thu, 3 May 2018 16:12:44 +0800 Subject: [PATCH 1/2] Sending namespace during fork --- src/main/java/org/gitlab/api/GitlabAPI.java | 5 ++--- src/test/java/org/gitlab/api/GitlabAPIIT.java | 5 ++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 3b41aafb..b57ed463 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -1262,9 +1262,8 @@ public GitlabProject createUserProject(Integer userId, String name, String descr */ public GitlabProject createFork(String namespace, Integer projectId) throws IOException { Query query = new Query() - .appendIf("id", projectId) - .append("namespace", namespace); - String tailUrl = GitlabProject.URL + "/" + projectId + "/fork"; + .appendIf("namespace", namespace); + String tailUrl = GitlabProject.URL + "/" + projectId + "/fork" + query.toString(); return dispatch().to(tailUrl, GitlabProject.class); } diff --git a/src/test/java/org/gitlab/api/GitlabAPIIT.java b/src/test/java/org/gitlab/api/GitlabAPIIT.java index 121d86a0..f4fb353f 100644 --- a/src/test/java/org/gitlab/api/GitlabAPIIT.java +++ b/src/test/java/org/gitlab/api/GitlabAPIIT.java @@ -270,12 +270,15 @@ public void testCreateDeleteFork() throws IOException { false); + String namespace = api.getNamespaces().get(0).getPath(); + GitlabProject project = api.createUserProject(gitUser.getId(), projectName); - GitlabProject fork = api.createFork(api.getNamespaces().get(0).getPath(), project); + GitlabProject fork = api.createFork(namespace, project); assertNotNull(fork); assertEquals(project.getId(), fork.getForkedFrom().getId()); + assertEquals(project.getNamespace(), namespace); api.deleteProject(project.getId()); api.deleteProject(fork.getId()); From 37bf3ec8b9b1f3684ba30818557dcf9912b751b5 Mon Sep 17 00:00:00 2001 From: Evgeny Date: Thu, 3 May 2018 16:20:00 +0800 Subject: [PATCH 2/2] Added import_status field for project model --- src/main/java/org/gitlab/api/models/GitlabProject.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/org/gitlab/api/models/GitlabProject.java b/src/main/java/org/gitlab/api/models/GitlabProject.java index 33fb923c..4e504617 100644 --- a/src/main/java/org/gitlab/api/models/GitlabProject.java +++ b/src/main/java/org/gitlab/api/models/GitlabProject.java @@ -128,6 +128,9 @@ public class GitlabProject { @JsonProperty("is_printing_merge_request_link_enabled") private Boolean printingMergeRequestLinkEnabled; + @JsonProperty("import_status") + private String importStatus; + public Integer getId() { return id; }