[RESTEASY-1075] HTTP redirect support in ApacheHttpClient engine

resteasy-client/src/main/java/org/jboss/resteasy/client/jaxrs/engines/ApacheHttpClient4Engine.java

@@ -68,6 +68,7 @@ public class ApacheHttpClient4Engine implements ClientHttpEngine
    protected int responseBufferSize = 8192;
    protected HttpHost defaultProxy = null;
    protected boolean chunked = false;
+   protected boolean followRedirects = false;
 
    /**
     * For uploading File's over JAX-RS framework, this property, together with {@link #fileUploadMemoryUnit},
@@ -432,15 +433,6 @@ public String getMethod()
       }
    }
 
-   protected boolean isRedirectRequired(final ClientInvocation request, final HttpRequestBase httpMethod)
-   {
-      if (httpMethod instanceof HttpGet && false) // todo  && request.followRedirects())
-      {
-         return true;
-      }
-      return false;
-   }
-
    @SuppressWarnings("deprecation")
    protected HttpClient createDefaultHttpClient()
    {
@@ -468,7 +460,7 @@ protected void setRedirectNotRequired(final ClientInvocation request, HttpReques
 
    protected void loadHttpMethod(final ClientInvocation request, HttpRequestBase httpMethod) throws Exception
    {
-      if (isRedirectRequired(request,httpMethod)) // todo  && request.followRedirects())
+      if (isFollowRedirects())
       {
          setRedirectRequired(request,httpMethod);
       }
@@ -553,6 +545,16 @@ public void setChunked(boolean chunked)
    {
       this.chunked = chunked;
    }
+
+   public boolean isFollowRedirects()
+   {
+      return followRedirects;
+   }
+
+   public void setFollowRedirects(boolean followRedirects)
+   {
+      this.followRedirects = followRedirects;
+   }
 
    /**
     * If passed httpMethod is of type HttpPost then obtain its entity. If the entity has an enclosing File then

testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/client/RedirectTest.java

@@ -0,0 +1,112 @@
+package org.jboss.resteasy.test.client;
+
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.core.Response;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
+import org.jboss.resteasy.client.jaxrs.engines.ApacheHttpClient43Engine;
+import org.jboss.resteasy.test.client.resource.TestResource;
+import org.jboss.resteasy.utils.PortProviderUtil;
+import org.jboss.resteasy.utils.TestUtil;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * @tpSubChapter Resteasy-client
+ * @tpChapter Integration tests
+ * @tpSince RESTEasy 4.0.0
+ */
+@RunWith(Arquillian.class)
+@RunAsClient
+public class RedirectTest extends ClientTestBase
+{
+   @Deployment
+   public static Archive<?> deploy()
+   {
+      WebArchive war = TestUtil.prepareArchive(RedirectTest.class.getSimpleName());
+      war.addClasses(PortProviderUtil.class);
+      return TestUtil.finishContainerPrepare(war, null, TestResource.class);
+   }
+
+   @Test
+   public void testRedirect()
+   {
+      ApacheHttpClient43Engine engine = new ApacheHttpClient43Engine();
+      engine.setFollowRedirects(true);
+      Client client = new ResteasyClientBuilder().httpEngine(engine).build();
+      try
+      {
+         Response response = client.target(generateURL("/redirect/" + RedirectTest.class.getSimpleName())).request()
+               .get();
+         Assert.assertEquals(200, response.getStatus());
+         Assert.assertEquals("OK", response.readEntity(String.class));
+         response.close();
+      }
+      finally
+      {
+         client.close();
+      }
+   }
+
+   @Test
+   public void testPostRedirect()
+   {
+      ApacheHttpClient43Engine engine = new ApacheHttpClient43Engine();
+      engine.setFollowRedirects(true);
+      Client client = new ResteasyClientBuilder().httpEngine(engine).build();
+      try
+      {
+         Response response = client.target(generateURL("/post-redirect")).request()
+               .post(Entity.entity(RedirectTest.class.getSimpleName(), "text/plain"));
+         Assert.assertEquals(200, response.getStatus());
+         Assert.assertEquals("OK", response.readEntity(String.class));
+         response.close();
+      }
+      finally
+      {
+         client.close();
+      }
+   }
+
+   @Test
+   public void testNoRedirect()
+   {
+      Client client = ClientBuilder.newClient();
+      try
+      {
+         Response response = client.target(generateURL("/redirect/" + RedirectTest.class.getSimpleName())).request()
+               .get();
+         Assert.assertEquals(307, response.getStatus());
+         response.close();
+      }
+      finally
+      {
+         client.close();
+      }
+   }
+
+   @Test
+   public void testNoPostRedirect()
+   {
+      Client client = ClientBuilder.newClient();
+      try
+      {
+         Response response = client.target(generateURL("/post-redirect")).request()
+               .post(Entity.entity(RedirectTest.class.getSimpleName(), "text/plain"));
+         Assert.assertEquals(303, response.getStatus());
+         response.close();
+      }
+      finally
+      {
+         client.close();
+      }
+   }
+}

testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/client/resource/TestResource.java

@@ -14,9 +14,12 @@
 import javax.ws.rs.POST;
 import javax.ws.rs.PUT;
 import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
+import org.jboss.resteasy.utils.PortProviderUtil;
+
 @Path("")
 public class TestResource
 {
@@ -96,4 +99,25 @@ public Response methodEntity(String s)
    {
       return Response.ok(s).build();
    }
+
+   @Path("redirect/{p}")
+   @GET
+   public Response redirect(@PathParam("p") String p)
+   {
+      return Response.temporaryRedirect(PortProviderUtil.createURI("/redirected", p)).build();
+   }
+
+   @Path("redirected")
+   @GET
+   public Response redirected()
+   {
+      return Response.ok("OK").build();
+   }
+
+   @Path("post-redirect")
+   @POST
+   public Response postRedirect(String p)
+   {
+      return Response.seeOther(PortProviderUtil.createURI("/redirected", p)).build();
+   }
 }