Fix for #1286 (#1287)

* Fix for #1286

When feign is done with the response, also invoke close on http response (if closeable)

* Update httpclient/src/main/java/feign/httpclient/ApacheHttpClient.java

Co-authored-by: Austin Pio <austinpioj@gmail.com>

* Update ApacheHttpClient.java

* Use finally block to close http5 client

* Use finally block to close http5 client

Co-authored-by: Kevin Davis <kdavisk6@gmail.com>
Co-authored-by: Austin Pio <austinpioj@gmail.com>

Author: 3 people

hc5/src/main/java/feign/hc5/ApacheHttp5Client.java

@@ -16,18 +16,34 @@
 import static feign.Util.UTF_8;
 import static feign.Util.enumForName;
 
-import feign.*;
-import java.io.*;
+import feign.Client;
+import feign.Request;
+import feign.Response;
+import feign.Util;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.charset.Charset;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import org.apache.hc.client5.http.classic.HttpClient;
 import org.apache.hc.client5.http.config.Configurable;
 import org.apache.hc.client5.http.config.RequestConfig;
 import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
 import org.apache.hc.client5.http.protocol.HttpClientContext;
-import org.apache.hc.core5.http.*;
+import org.apache.hc.core5.http.ClassicHttpRequest;
+import org.apache.hc.core5.http.ClassicHttpResponse;
+import org.apache.hc.core5.http.ContentType;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.NameValuePair;
 import org.apache.hc.core5.http.io.entity.ByteArrayEntity;
 import org.apache.hc.core5.http.io.entity.EntityUtils;
 import org.apache.hc.core5.http.io.entity.StringEntity;
@@ -174,14 +190,14 @@ Response toFeignResponse(ClassicHttpResponse httpResponse, Request request) thro
 
     final String reason = httpResponse.getReasonPhrase();
 
-    final Map<String, Collection<String>> headers = new HashMap<String, Collection<String>>();
+    final Map<String, Collection<String>> headers = new HashMap<>();
     for (final Header header : httpResponse.getHeaders()) {
       final String name = header.getName();
       final String value = header.getValue();
 
       Collection<String> headerValues = headers.get(name);
       if (headerValues == null) {
-        headerValues = new ArrayList<String>();
+        headerValues = new ArrayList<>();
         headers.put(name, headerValues);
       }
       headerValues.add(value);
@@ -222,7 +238,6 @@ public InputStream asInputStream() throws IOException {
         return entity.getContent();
       }
 
-      @SuppressWarnings("deprecation")
       @Override
       public Reader asReader() throws IOException {
         return new InputStreamReader(asInputStream(), UTF_8);
@@ -236,7 +251,11 @@ public Reader asReader(Charset charset) throws IOException {
 
       @Override
       public void close() throws IOException {
-        EntityUtils.consume(entity);
+        try {
+          EntityUtils.consume(entity);
+        } finally {
+          httpResponse.close();
+        }
       }
     };
   }

httpclient/src/main/java/feign/httpclient/ApacheHttpClient.java

@@ -38,9 +38,7 @@
 import org.apache.http.StatusLine;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.Configurable;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.client.methods.RequestBuilder;
+import org.apache.http.client.methods.*;
 import org.apache.http.client.utils.URIBuilder;
 import org.apache.http.client.utils.URLEncodedUtils;
 import org.apache.http.entity.ByteArrayEntity;
@@ -234,6 +232,12 @@ public Reader asReader(Charset charset) throws IOException {
       @Override
       public void close() throws IOException {
         EntityUtils.consume(entity);
+        try {
+          EntityUtils.consume(entity);
+        } finally {
+          if (httpResponse instanceof CloseableHttpResponse)
+            ((CloseableHttpResponse) httpResponse).close();
+        }
       }
     };
   }