Allow responses to be streamed.

Carter Kozak · Adrian Cole · commit 9bbd865c2d5e · 2016-04-23T14:40:16.000+08:00
Never expands &gt;8kb responses into memory
diff --git a/core/src/main/java/feign/Response.java b/core/src/main/java/feign/Response.java
@@ -36,7 +36,7 @@
 /**
  * An immutable response to an http invocation which only returns string content.
  */
-public final class Response {
+public final class Response implements Closeable {
 
   private final int status;
   private final String reason;
@@ -114,6 +114,11 @@ public String toString() {
     return builder.toString();
   }
 
+  @Override
+  public void close() {
+    Util.ensureClosed(body);
+  }
+
   public interface Body extends Closeable {
 
     /**
diff --git a/core/src/main/java/feign/SynchronousMethodHandler.java b/core/src/main/java/feign/SynchronousMethodHandler.java
@@ -32,6 +32,8 @@
 
 final class SynchronousMethodHandler implements MethodHandler {
 
+  private static final long MAX_RESPONSE_BUFFER_SIZE = 8192L;
+
   private final MethodMetadata metadata;
   private final Target<?> target;
   private final Client client;
@@ -101,6 +103,7 @@ Object executeAndDecode(RequestTemplate template) throws Throwable {
     }
     long elapsedTime = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - start);
 
+    boolean shouldClose = true;
     try {
       if (logLevel != Logger.Level.NONE) {
         response =
@@ -110,6 +113,11 @@ Object executeAndDecode(RequestTemplate template) throws Throwable {
         if (response.body() == null) {
           return response;
         }
+        if (response.body().length() == null ||
+                response.body().length() > MAX_RESPONSE_BUFFER_SIZE) {
+          shouldClose = false;
+          return response;
+        }
         // Ensure the response body is disconnected
         byte[] bodyData = Util.toByteArray(response.body().asInputStream());
         return Response.create(response.status(), response.reason(), response.headers(), bodyData);
@@ -131,7 +139,9 @@ Object executeAndDecode(RequestTemplate template) throws Throwable {
       }
       throw errorReading(request, response, e);
     } finally {
-      ensureClosed(response.body());
+      if (shouldClose) {
+        ensureClosed(response.body());
+      }
     }
   }
 
diff --git a/httpclient/src/main/java/feign/httpclient/ApacheHttpClient.java b/httpclient/src/main/java/feign/httpclient/ApacheHttpClient.java
@@ -194,7 +194,7 @@ Response.Body toFeignBody(HttpResponse httpResponse) throws IOException {
 
       @Override
       public Integer length() {
-        return entity.getContentLength() < 0 ? (int) entity.getContentLength() : null;
+        return entity.getContentLength() >= 0 ? (int) entity.getContentLength() : null;
       }
 
       @Override
diff --git a/httpclient/src/test/java/feign/httpclient/ApacheHttpClientTest.java b/httpclient/src/test/java/feign/httpclient/ApacheHttpClientTest.java
@@ -61,6 +61,7 @@ public void parsesRequestAndResponse() throws IOException, InterruptedException
     assertThat(response.headers())
         .containsEntry("Content-Length", asList("3"))
         .containsEntry("Foo", asList("Bar"));
+    assertThat(response.body().length()).isEqualTo(3);
     assertThat(response.body().asInputStream())
         .hasContentEqualTo(new ByteArrayInputStream("foo".getBytes(UTF_8)));
 
@@ -70,6 +71,22 @@ public void parsesRequestAndResponse() throws IOException, InterruptedException
         .hasBody("foo");
   }
 
+  @Test
+  public void parsesResponseMissingLength() throws IOException, InterruptedException {
+    server.enqueue(new MockResponse().setChunkedBody("foo", 1));
+
+    TestInterface api = Feign.builder()
+        .client(new ApacheHttpClient())
+        .target(TestInterface.class, "http://localhost:" + server.getPort());
+
+    Response response = api.post("testing");
+    assertThat(response.status()).isEqualTo(200);
+    assertThat(response.reason()).isEqualTo("OK");
+    assertThat(response.body().length()).isNull();
+    assertThat(response.body().asInputStream())
+        .hasContentEqualTo(new ByteArrayInputStream("foo".getBytes(UTF_8)));
+  }
+
   @Test
   public void parsesErrorResponse() throws IOException, InterruptedException {
     thrown.expect(FeignException.class);

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ Response.Body toFeignBody(HttpResponse httpResponse) throws IOException {`
`194`	`194`
`195`	`195`	`@Override`
`196`	`196`	`public Integer length() {`
`197`		`- return entity.getContentLength() < 0 ? (int) entity.getContentLength() : null;`
	`197`	`+ return entity.getContentLength() >= 0 ? (int) entity.getContentLength() : null;`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`@Override`