forkProject() methods now return the newly forked Project instance (#106).

Author: gmessner

src/main/java/org/gitlab4j/api/ProjectApi.java

@@ -841,10 +841,11 @@ public void deleteProject(Project project) throws GitLabApiException {
      * @param namespace path of the namespace that the project will be forked to
      * @throws GitLabApiException if any exception occurs
      */
-    public void forkProject(Integer id, String namespace) throws GitLabApiException {
+    public Project forkProject(Integer id, String namespace) throws GitLabApiException {
         GitLabApiForm formData = new GitLabApiForm().withParam("namespace", namespace, true);
-        Response.Status expectedStatus = (isApiVersion(ApiVersion.V3) ? Response.Status.OK : Response.Status.NO_CONTENT);
-        post(expectedStatus, formData, "projects", id, "fork");
+        Response.Status expectedStatus = (isApiVersion(ApiVersion.V3) ? Response.Status.OK : Response.Status.CREATED);
+        Response response = post(expectedStatus, formData, "projects", id, "fork");
+        return (response.readEntity(Project.class));
     }
 
     /**
@@ -858,8 +859,8 @@ public void forkProject(Integer id, String namespace) throws GitLabApiException
      * @param namespace path of the namespace that the project will be forked to
      * @throws GitLabApiException if any exception occurs
      */
-    public void forkProject(Project project, String namespace) throws GitLabApiException {
-        forkProject(project.getId(), namespace);
+    public Project forkProject(Project project, String namespace) throws GitLabApiException {
+        return (forkProject(project.getId(), namespace));
     }
 
     /**
@@ -873,10 +874,11 @@ public void forkProject(Project project, String namespace) throws GitLabApiExcep
      * @param namespaceId ID of the namespace that the project will be forked to
      * @throws GitLabApiException if any exception occurs
      */
-    public void forkProject(Integer id, Integer namespaceId) throws GitLabApiException {
+    public Project forkProject(Integer id, Integer namespaceId) throws GitLabApiException {
         GitLabApiForm formData = new GitLabApiForm().withParam("namespace", namespaceId, true);
-        Response.Status expectedStatus = (isApiVersion(ApiVersion.V3) ? Response.Status.OK : Response.Status.NO_CONTENT);
-        post(expectedStatus, formData, "projects", id, "fork");
+        Response.Status expectedStatus = (isApiVersion(ApiVersion.V3) ? Response.Status.OK : Response.Status.CREATED);
+        Response response = post(expectedStatus, formData, "projects", id, "fork");
+        return (response.readEntity(Project.class));
     }
 
     /**
@@ -890,8 +892,8 @@ public void forkProject(Integer id, Integer namespaceId) throws GitLabApiExcepti
      * @param namespaceId ID of the namespace that the project will be forked to
      * @throws GitLabApiException if any exception occurs
      */
-    public void forkProject(Project project, Integer namespaceId) throws GitLabApiException {
-        forkProject(project.getId(), namespaceId);
+    public Project forkProject(Project project, Integer namespaceId) throws GitLabApiException {
+        return (forkProject(project.getId(), namespaceId));
     }
 
     /**

src/test/java/org/gitlab4j/api/TestProjectApi.java

@@ -47,6 +47,7 @@
  * TEST_PROJECT_NAME
  * TEST_HOST_URL
  * TEST_PRIVATE_TOKEN
+ * TEST_GROUP_PROJECT
  * 
  * If any of the above are NULL, all tests in this class will be skipped.
  *
@@ -60,12 +61,16 @@ public class TestProjectApi {
     private static final String TEST_PROJECT_NAME;
     private static final String TEST_HOST_URL;
     private static final String TEST_PRIVATE_TOKEN;
+    private static final String TEST_GROUP;
+    private static final String TEST_GROUP_PROJECT;
 
     static {
         TEST_NAMESPACE = TestUtils.getProperty("TEST_NAMESPACE");
         TEST_PROJECT_NAME = TestUtils.getProperty("TEST_PROJECT_NAME");
         TEST_HOST_URL = TestUtils.getProperty("TEST_HOST_URL");
         TEST_PRIVATE_TOKEN = TestUtils.getProperty("TEST_PRIVATE_TOKEN");
+        TEST_GROUP = TestUtils.getProperty("TEST_GROUP");
+        TEST_GROUP_PROJECT = TestUtils.getProperty("TEST_GROUP_PROJECT");
     }
 
     private static final String TEST_PROJECT_NAME_1 = "test-gitlab4j-create-project";
@@ -123,6 +128,14 @@ private static void deleteAllTestProjects() {
                 Project project = gitLabApi.getProjectApi().getProject(TEST_NAMESPACE, TEST_PROJECT_NAME_UPDATE);
                 gitLabApi.getProjectApi().deleteProject(project);
             } catch (GitLabApiException ignore) {}
+
+            if (TEST_GROUP != null && TEST_GROUP_PROJECT != null) {
+                try {
+                    Project project = gitLabApi.getProjectApi().getProject(TEST_NAMESPACE, TEST_GROUP_PROJECT);
+                    gitLabApi.getProjectApi().deleteProject(project);
+                } catch (GitLabApiException ignore) {
+                }
+            }
         }
     }
 
@@ -382,4 +395,16 @@ public void testMemberProjectsPerPage() throws GitLabApiException {
         assertTrue(projects != null);
         assertTrue(projects.size() > 0);
     }
+
+    @Test
+    public void testForkProject() throws GitLabApiException {
+
+        assumeTrue(TEST_GROUP != null && TEST_GROUP_PROJECT != null);
+        assumeTrue(TEST_GROUP.trim().length() > 0 && TEST_GROUP_PROJECT.trim().length() > 0);
+
+        Project project = gitLabApi.getProjectApi().getProject(TEST_GROUP, TEST_GROUP_PROJECT);
+        assertNotNull(project);
+        Project forkedProject = gitLabApi.getProjectApi().forkProject(project.getId(), TEST_NAMESPACE);
+        assertNotNull(forkedProject);
+    }
 }