diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 50b860c8..946475f3 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -1301,9 +1301,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/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; } diff --git a/src/test/java/org/gitlab/api/GitlabAPIIT.java b/src/test/java/org/gitlab/api/GitlabAPIIT.java index bee0c645..f8d2fc62 100644 --- a/src/test/java/org/gitlab/api/GitlabAPIIT.java +++ b/src/test/java/org/gitlab/api/GitlabAPIIT.java @@ -256,11 +256,14 @@ public void testCreateDeleteFork() throws Exception { false, 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());