From ed0165cc81aa0536428ccb63f0508dce2c1d58b8 Mon Sep 17 00:00:00 2001 From: Cole Markham Date: Fri, 20 Feb 2015 13:52:52 -0600 Subject: [PATCH] Simplify to use HEAD instead of GET requests --- .../rare/HttpClientUnshortenLiveTest.java | 21 +++++-------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/httpclient/src/test/java/org/baeldung/httpclient/rare/HttpClientUnshortenLiveTest.java b/httpclient/src/test/java/org/baeldung/httpclient/rare/HttpClientUnshortenLiveTest.java index 0e57969a48..a185e99639 100644 --- a/httpclient/src/test/java/org/baeldung/httpclient/rare/HttpClientUnshortenLiveTest.java +++ b/httpclient/src/test/java/org/baeldung/httpclient/rare/HttpClientUnshortenLiveTest.java @@ -13,7 +13,7 @@ import org.apache.http.Header; 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 @@ public class HttpClientUnshortenLiveTest { } final Pair 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 @@ public class HttpClientUnshortenLiveTest { } 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 @@ public class HttpClientUnshortenLiveTest { if (request != null) { request.releaseConnection(); } - if (entityContentStream != null) { - entityContentStream.close(); - } - if (httpEntity != null) { - EntityUtils.consume(httpEntity); - } } }