add input stream wrapper

Author: diegomarquezp

google-http-client-apache-v5/src/main/java/com/google/api/client/http/apache/v5/Apache5HttpResponse.java

@@ -31,11 +31,23 @@ final class Apache5HttpResponse extends LowLevelHttpResponse {
   private final HttpUriRequestBase request;
   private final ClassicHttpResponse response;
   private final Header[] allHeaders;
+  private final HttpEntity entity;
+  private final Apache5ResponseContent content;
 
   Apache5HttpResponse(HttpUriRequestBase request, ClassicHttpResponse response) {
     this.request = request;
     this.response = response;
-    allHeaders = response.getHeaders();
+    this.allHeaders = response.getHeaders();
+    this.entity = response.getEntity();
+    Apache5ResponseContent contentValue = null;
+    if (entity != null) {
+      try {
+        contentValue = new Apache5ResponseContent(entity.getContent(), response);
+      } catch (IOException ex) {
+        LOGGER.log(Level.SEVERE, "Error when obtaining content from the response", ex);
+      }
+    }
+    this.content = contentValue;
   }
 
   @Override
@@ -45,28 +57,21 @@ public int getStatusCode() {
 
   @Override
   public InputStream getContent() throws IOException {
-    HttpEntity entity = response.getEntity();
-    return entity == null ? null : entity.getContent();
+    return content;
   }
 
   @Override
   public String getContentEncoding() {
-    HttpEntity entity = response.getEntity();
-    if (entity != null) {
-      return entity.getContentEncoding();
-    }
-    return null;
+    return entity != null ? entity.getContentEncoding() : null;
   }
 
   @Override
   public long getContentLength() {
-    HttpEntity entity = response.getEntity();
     return entity == null ? -1 : entity.getContentLength();
   }
 
   @Override
   public String getContentType() {
-    HttpEntity entity = response.getEntity();
     return entity == null ? null : entity.getContentType();
   }
 
@@ -102,17 +107,14 @@ public String getHeaderValue(int index) {
   /** Aborts execution of the request. */
   @Override
   public void disconnect() {
-    close();
-  }
-
-  public void close() {
     request.abort();
     try {
-      response.close();
+      // this call also close the response
+      content.close();
     } catch (IOException e) {
       // the close() method contract won't allow us to declare a thrown exception. Here we just log
       // the error
-      LOGGER.log(Level.SEVERE, "Error occurred when closing the response", e);
+      LOGGER.log(Level.SEVERE, "Error occurred when closing the content", e);
     }
   }
 }

google-http-client-apache-v5/src/main/java/com/google/api/client/http/apache/v5/Apache5ResponseContent.java

@@ -0,0 +1,36 @@
+package com.google.api.client.http.apache.v5;
+
+import java.io.IOException;
+import java.io.InputStream;
+import org.apache.hc.core5.http.ClassicHttpResponse;
+
+public class Apache5ResponseContent extends InputStream {
+  private final ClassicHttpResponse response;
+  private final InputStream wrappedStream;
+
+  public Apache5ResponseContent(InputStream wrappedStream, ClassicHttpResponse response) {
+    this.response = response;
+    this.wrappedStream = wrappedStream;
+  }
+
+  @Override
+  public int read() throws IOException {
+    return wrappedStream.read();
+  }
+
+  @Override
+  public void reset() throws IOException {
+    wrappedStream.reset();
+  }
+
+  @Override
+  public void mark(int readLimit) {
+    wrappedStream.mark(readLimit);
+  }
+
+  @Override
+  public void close() throws IOException {
+    wrappedStream.close();
+    response.close();
+  }
+}

google-http-client-apache-v5/src/test/java/com/google/api/client/http/apache/v5/Apache5HttpTransportTest.java

@@ -92,7 +92,7 @@ public void testRequest(HttpTransport transport) throws IOException {
     System.out.println("Project display name: " + project.getDisplayName());
 
     // temp test to confirm re-usage of client works with several consecutive requests
-    projects.get("projects/" + PROJECT_ID).execute();
+    Project p = projects.get("projects/" + PROJECT_ID).execute();
     projects.get("projects/" + PROJECT_ID).execute();
     projects.get("projects/" + PROJECT_ID).execute();
     projects.get("projects/" + PROJECT_ID).execute();