Merge pull request square#1282 from square/jw/sources-and-sinks

Use Sources and Sinks for all IO.
wuqingman · Jan 4, 2015 · 607fb15 · 607fb15
2 parents 7000edd + f6c3ab9
commit 607fb15
Show file tree

Hide file tree

Showing 4 changed files with 122 additions and 145 deletions.
diff --git a/mockwebserver/src/main/java/com/squareup/okhttp/mockwebserver/MockResponse.java b/mockwebserver/src/main/java/com/squareup/okhttp/mockwebserver/MockResponse.java
@@ -22,6 +22,8 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import okio.Buffer;
+import okio.Okio;
+import okio.Source;
 
 /** A scripted response to be replayed by the mock web server. */
 public final class MockResponse implements Cloneable {
@@ -133,13 +135,8 @@ public Buffer getBody() {
     return body != null ? body.clone() : null; // Defensive copy.
   }
 
-  /** Returns an input stream containing the raw HTTP payload. */
-  InputStream getBodyStream() {
-    if (bodyStream != null) {
-      return bodyStream;
-    }
-    Buffer body = getBody();
-    return body != null ? body.inputStream() : null;
+  Source getBodySource() {
+    return bodyStream != null ? Okio.source(bodyStream) : getBody();
   }
 
   public MockResponse setBody(byte[] body) {