Return response from PR create/update (#107)

* Return response from PR create/update

* Fix incorrect http method

Author: thomashaefele

src/main/java/com/spotify/github/v3/clients/GitHubClient.java

@@ -519,7 +519,7 @@ CompletableFuture<Response> put(final String path, final String data) {
    * @param path relative to the Github base url
    * @param data request body as stringified JSON
    * @param clazz class to cast response as
-   * @return response body as String
+   * @return response body deserialized as provided class
    */
   <T> CompletableFuture<T> put(final String path, final String data, final Class<T> clazz) {
     return put(path, data)
@@ -543,13 +543,27 @@ CompletableFuture<Response> patch(final String path, final String data) {
     return call(request);
   }
 
+  /**
+   * Make an http PATCH request for the given path with provided JSON body.
+   *
+   * @param path relative to the Github base url
+   * @param data request body as stringified JSON
+   * @param clazz class to cast response as
+   * @return response body deserialized as provided class
+   */
+  <T> CompletableFuture<T> patch(final String path, final String data, final Class<T> clazz) {
+    return patch(path, data)
+        .thenApply(
+            response -> json().fromJsonUncheckedNotNull(responseBodyUnchecked(response), clazz));
+  }
+
   /**
    * Make an http PATCH request for the given path with provided JSON body
    *
    * @param path relative to the Github base url
    * @param data request body as stringified JSON
    * @param clazz class to cast response as
-   * @return response body as String
+   * @return response body deserialized as provided class
    */
   <T> CompletableFuture<T> patch(
       final String path,

src/main/java/com/spotify/github/v3/clients/PullRequestClient.java

@@ -102,25 +102,23 @@ public CompletableFuture<PullRequest> get(final int number) {
    * Create a pull request.
    *
    * @param request create request
+   * @return pull request
    */
-  public CompletableFuture<Void> create(final PullRequestCreate request) {
+  public CompletableFuture<PullRequest> create(final PullRequestCreate request) {
     final String path = String.format(PR_TEMPLATE, owner, repo);
-    return github
-        .post(path, github.json().toJsonUnchecked(request))
-        .thenAccept(IGNORE_RESPONSE_CONSUMER);
+    return github.post(path, github.json().toJsonUnchecked(request), PullRequest.class);
   }
 
   /**
    * Update given pull request.
    *
    * @param number pull request number
    * @param request update request
+   * @return pull request
    */
-  public CompletableFuture<Void> update(final int number, final PullRequestUpdate request) {
+  public CompletableFuture<PullRequest> update(final int number, final PullRequestUpdate request) {
     final String path = String.format(PR_NUMBER_TEMPLATE, owner, repo, number);
-    return github
-        .patch(path, github.json().toJsonUnchecked(request))
-        .thenAccept(IGNORE_RESPONSE_CONSUMER);
+    return github.patch(path, github.json().toJsonUnchecked(request), PullRequest.class);
   }
 
   /**

src/test/java/com/spotify/github/v3/clients/PullRequestClientTest.java

@@ -20,19 +20,31 @@
 
 package com.spotify.github.v3.clients;
 
+import static com.google.common.collect.ImmutableMap.of;
 import static com.google.common.io.Resources.getResource;
 import static java.nio.charset.Charset.defaultCharset;
+import static java.util.concurrent.CompletableFuture.completedFuture;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.io.Resources;
+import com.spotify.github.jackson.Json;
 import com.spotify.github.v3.exceptions.RequestNotOkException;
+import com.spotify.github.v3.git.Reference;
 import com.spotify.github.v3.prs.ImmutableRequestReviewParameters;
+import com.spotify.github.v3.prs.PullRequest;
 import com.spotify.github.v3.prs.ReviewRequests;
+import com.spotify.github.v3.prs.requests.ImmutablePullRequestCreate;
+import com.spotify.github.v3.prs.requests.ImmutablePullRequestUpdate;
+import com.spotify.github.v3.prs.requests.PullRequestCreate;
+import com.spotify.github.v3.prs.requests.PullRequestUpdate;
 import java.io.IOException;
 import java.net.URI;
 import java.util.concurrent.CompletableFuture;
@@ -64,6 +76,88 @@ public void setUp() {
     github = GitHubClient.create(client, URI.create("http://bogus"), "token");
   }
 
+  @Test
+  public void createPullRequest() throws Exception {
+    final String title = "Amazing new feature";
+    final String body = "Please pull these awesome changes in!";
+    final String head = "octocat:new-topic";
+    final String base = "master";
+
+    final Call call = mock(Call.class);
+    final ArgumentCaptor<Callback> capture = ArgumentCaptor.forClass(Callback.class);
+    doNothing().when(call).enqueue(capture.capture());
+
+    final Response response =
+        new Response.Builder()
+            .code(201)
+            .protocol(Protocol.HTTP_1_1)
+            .message("Created")
+            .body(
+                ResponseBody.create(
+                    MediaType.get("application/json"),
+                    getFixture("pull_request.json")))
+            .request(new Request.Builder().url("http://localhost/").build())
+            .build();
+
+    when(client.newCall(any())).thenReturn(call);
+
+    final PullRequestClient pullRequestClient =
+        PullRequestClient.create(github, "owner", "repo");
+
+    final PullRequestCreate request = ImmutablePullRequestCreate.builder().title(title).body(body)
+        .head(head).base(base).build();
+
+    final CompletableFuture<PullRequest> result = pullRequestClient.create(request);
+
+    capture.getValue().onResponse(call, response);
+
+    PullRequest pullRequest = result.get();
+
+    assertThat(pullRequest.title(), is(title));
+    assertThat(pullRequest.body().get(), is(body));
+    assertThat(pullRequest.head().label().get(), is(head));
+    assertThat(pullRequest.base().ref(), is(base));
+  }
+
+  @Test
+  public void updatePullRequest() throws Exception {
+    final String title = "Amazing new feature";
+    final String body = "Please pull these awesome changes in!";
+
+    final Call call = mock(Call.class);
+    final ArgumentCaptor<Callback> capture = ArgumentCaptor.forClass(Callback.class);
+    doNothing().when(call).enqueue(capture.capture());
+
+    final Response response =
+        new Response.Builder()
+            .code(200)
+            .protocol(Protocol.HTTP_1_1)
+            .message("OK")
+            .body(
+                ResponseBody.create(
+                    MediaType.get("application/json"),
+                    getFixture("pull_request.json")))
+            .request(new Request.Builder().url("http://localhost/").build())
+            .build();
+
+    when(client.newCall(any())).thenReturn(call);
+
+    final PullRequestClient pullRequestClient =
+        PullRequestClient.create(github, "owner", "repo");
+
+    final PullRequestUpdate request = ImmutablePullRequestUpdate.builder().title(title).body(body)
+        .build();
+
+    final CompletableFuture<PullRequest> result = pullRequestClient.update(1, request);
+
+    capture.getValue().onResponse(call, response);
+
+    PullRequest pullRequest = result.get();
+
+    assertThat(pullRequest.title(), is(title));
+    assertThat(pullRequest.body().get(), is(body));
+  }
+
   @Test
   public void testListReviewRequests() throws Throwable {
     final Call call = mock(Call.class);