Fixed not working Response.getStream method

arcao · arcao · commit 9bc1ff892fb8 · 2016-11-29T12:09:20.000+01:00
diff --git a/scribejava-httpclient-okhttp/src/main/java/com/github/scribejava/httpclient/okhttp/OAuthAsyncCompletionHandler.java b/scribejava-httpclient-okhttp/src/main/java/com/github/scribejava/httpclient/okhttp/OAuthAsyncCompletionHandler.java
@@ -58,8 +58,8 @@ public void onResponse(Call call, okhttp3.Response okHttpResponse) throws IOExce
             final Response response = new Response(okHttpResponse.code(),
                                                     okHttpResponse.message(),
                                                     headersMap,
-                                                    okHttpResponse.body().string(),
-                                                    null); // cannot return both body String and InputStream
+                                                    null, // cannot return both body String and InputStream
+                                                    okHttpResponse.body().byteStream());
 
             @SuppressWarnings("unchecked")
             final T t = converter == null ? (T) response : converter.convert(response);
diff --git a/scribejava-httpclient-okhttp/src/test/java/com/github/scribejava/httpclient/okhttp/OkHttpHttpClientTest.java b/scribejava-httpclient-okhttp/src/test/java/com/github/scribejava/httpclient/okhttp/OkHttpHttpClientTest.java
@@ -1,8 +1,13 @@
 package com.github.scribejava.httpclient.okhttp;
 
-import com.github.scribejava.core.model.*;
+import com.github.scribejava.core.model.HttpClient;
+import com.github.scribejava.core.model.OAuthConfig;
+import com.github.scribejava.core.model.OAuthRequestAsync;
+import com.github.scribejava.core.model.Response;
+import com.github.scribejava.core.model.Verb;
 import com.github.scribejava.core.oauth.OAuth20Service;
 import com.github.scribejava.core.oauth.OAuthService;
+import com.github.scribejava.core.utils.StreamUtils;
 import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
 import okhttp3.mockwebserver.MockResponse;
@@ -84,4 +89,25 @@ public void shouldSendPostRequest() throws Exception {
 
         server.shutdown();
     }
+
+    @Test
+    public void shouldReadResponseStream() throws Exception {
+        String expectedResponseBody = "response body";
+
+        MockWebServer server = new MockWebServer();
+        server.enqueue(new MockResponse().setBody(expectedResponseBody));
+        server.start();
+
+        HttpUrl baseUrl = server.url("/testUrl");
+
+        OAuthRequestAsync request = new OAuthRequestAsync(Verb.GET, baseUrl.toString(), oAuthService);
+        Response response = request.sendAsync(null).get(30, TimeUnit.SECONDS);
+
+        assertEquals(expectedResponseBody, StreamUtils.getStreamContents(response.getStream()));
+
+        RecordedRequest recordedRequest = server.takeRequest();
+        assertEquals("GET", recordedRequest.getMethod());
+
+        server.shutdown();
+    }
 }
