Merge pull request eugenp#145 from colemarkham/master

Simplify to use HEAD instead of GET requests

Author: Eugen

httpclient/src/test/java/org/baeldung/httpclient/rare/HttpClientUnshortenLiveTest.java

@@ -13,7 +13,7 @@
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpHeaders;
 import org.apache.http.HttpResponse;
-import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpHead;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.util.EntityUtils;
@@ -82,12 +82,12 @@ final String expandSafe(final String urlArg) throws IOException {
     }
 
     final Pair<Integer, String> expandSingleLevelSafe(final String url) throws IOException {
-        HttpGet request = null;
+        HttpHead request = null;
         HttpEntity httpEntity = null;
         InputStream entityContentStream = null;
 
         try {
-            request = new HttpGet(url);
+            request = new HttpHead(url);
             final HttpResponse httpResponse = client.execute(request);
 
             httpEntity = httpResponse.getEntity();
@@ -118,17 +118,12 @@ final Pair<Integer, String> expandSingleLevelSafe(final String url) throws IOExc
     }
 
     final String expandSingleLevel(final String url) throws IOException {
-        HttpGet request = null;
-        HttpEntity httpEntity = null;
-        InputStream entityContentStream = null;
+        HttpHead request = null;
 
         try {
-            request = new HttpGet(url);
+            request = new HttpHead(url);
             final HttpResponse httpResponse = client.execute(request);
 
-            httpEntity = httpResponse.getEntity();
-            entityContentStream = httpEntity.getContent();
-
             final int statusCode = httpResponse.getStatusLine().getStatusCode();
             if (statusCode != 301 && statusCode != 302) {
                 return url;
@@ -144,12 +139,6 @@ final String expandSingleLevel(final String url) throws IOException {
             if (request != null) {
                 request.releaseConnection();
             }
-            if (entityContentStream != null) {
-                entityContentStream.close();
-            }
-            if (httpEntity != null) {
-                EntityUtils.consume(httpEntity);
-            }
         }
     }