Using HttpClient 4.3 API in camel-restlet
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c8c2a930 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c8c2a930 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c8c2a930 Branch: refs/heads/master Commit: c8c2a930ba44b65af853afcf788b32677e4aff68 Parents: 866a399 Author: Willem Jiang <willem.ji...@gmail.com> Authored: Thu Aug 28 14:49:33 2014 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Thu Aug 28 14:49:54 2014 +0800 ---------------------------------------------------------------------- .../component/restlet/RestletRedirectTest.java | 36 ++++++++++++-------- .../component/restlet/RestletTestSupport.java | 8 ++--- 2 files changed, 25 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/c8c2a930/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletRedirectTest.java ---------------------------------------------------------------------- diff --git a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletRedirectTest.java b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletRedirectTest.java index a54c5c1..39f366b 100644 --- a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletRedirectTest.java +++ b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletRedirectTest.java @@ -20,10 +20,10 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.http.Header; import org.apache.http.HttpResponse; -import org.apache.http.client.HttpClient; +import org.apache.http.client.config.RequestConfig; import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.params.ClientPNames; -import org.apache.http.impl.client.DefaultHttpClient; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; import org.junit.Test; /** @@ -37,19 +37,25 @@ public class RestletRedirectTest extends RestletTestSupport { HttpGet get = new HttpGet("http://localhost:" + portNum + "/users/homer"); // do not follow redirects - HttpClient client = new DefaultHttpClient(); - client.getParams().setBooleanParameter(ClientPNames.HANDLE_REDIRECTS, false); - - HttpResponse response = client.execute(get); - - for (Header header : response.getAllHeaders()) { - log.info("Header {}", header); + RequestConfig requestconfig = RequestConfig.custom().setRedirectsEnabled(false).build(); + + CloseableHttpClient client = HttpClientBuilder.create().setDefaultRequestConfig(requestconfig).build(); + + try { + + HttpResponse response = client.execute(get); + + for (Header header : response.getAllHeaders()) { + log.info("Header {}", header); + } + + assertEquals(302, response.getStatusLine().getStatusCode()); + assertTrue("Should have location header", response.containsHeader("Location")); + assertEquals("http://somewhere.com", response.getFirstHeader("Location").getValue()); + assertEquals("bar", response.getFirstHeader("Foo").getValue()); + } finally { + client.close(); } - - assertEquals(302, response.getStatusLine().getStatusCode()); - assertTrue("Should have location header", response.containsHeader("Location")); - assertEquals("http://somewhere.com", response.getFirstHeader("Location").getValue()); - assertEquals("bar", response.getFirstHeader("Foo").getValue()); } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/c8c2a930/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletTestSupport.java ---------------------------------------------------------------------- diff --git a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletTestSupport.java b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletTestSupport.java index f1ddf06..389a1f5 100644 --- a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletTestSupport.java +++ b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletTestSupport.java @@ -22,10 +22,10 @@ import org.apache.camel.test.AvailablePortFinder; import org.apache.camel.test.junit4.CamelTestSupport; import org.apache.http.HttpResponse; import org.apache.http.ParseException; -import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpUriRequest; import org.apache.http.entity.BufferedHttpEntity; -import org.apache.http.impl.client.DefaultHttpClient; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.util.EntityUtils; import org.junit.BeforeClass; @@ -42,13 +42,13 @@ public abstract class RestletTestSupport extends CamelTestSupport { } public HttpResponse doExecute(HttpUriRequest method) throws Exception { - HttpClient client = new DefaultHttpClient(); + CloseableHttpClient client = HttpClientBuilder.create().build(); try { HttpResponse response = client.execute(method); response.setEntity(new BufferedHttpEntity(response.getEntity())); return response; } finally { - client.getConnectionManager().shutdown(); + client.close(); } }