Per request redirects

README

@@ -8,7 +8,7 @@ Async Http Client library purpose is to allow Java applications to easily execut
         <repository>
             <id>Sonatype</id>
             <name>Sonatype Release</name>
-            <url>http://oss.sonatype.org/content/repositories/releases</url>
+            <url>http://oss.sonatype.org/content/repositories/releases </url>
         </repository>
 
 and then define the dependency as:
@@ -29,7 +29,7 @@ Then in your code you can simply do:
     import java.util.concurrent.Future;
 
     AsyncHttpClient asyncHttpClient = new AsyncHttpClient();
-    Future<Response> f = asyncHttpClient.prepareGet("http://www.ning.com/").execute();
+    Future<Response> f = asyncHttpClient.prepareGet("http://www.ning.com/ ").execute();
     Response r = f.get();
 
 You can also accomplish asynchronous operation without using a Future if you want to receive and process the response in your handler:
@@ -38,7 +38,7 @@ You can also accomplish asynchronous operation without using a Future if you wan
     import java.util.concurrent.Future;
 
     AsyncHttpClient asyncHttpClient = new AsyncHttpClient();
-    asyncHttpClient.prepareGet("http://www.ning.com/").execute(new AsyncCompletionHandler<Response>(){
+    asyncHttpClient.prepareGet("http://www.ning.com/ ").execute(new AsyncCompletionHandler<Response>(){
 
         @Override
         public Response onCompleted(Response response) throws Exception{
@@ -59,7 +59,7 @@ You can also mix Future with AsyncHandler to only retrieve part of the asynchron
     import java.util.concurrent.Future;
 
     AsyncHttpClient asyncHttpClient = new AsyncHttpClient();
-    Future<Integer> f = asyncHttpClient.prepareGet("http://www.ning.com/").execute(new AsyncCompletionHandler<Integer>(){
+    Future<Integer> f = asyncHttpClient.prepareGet("http://www.ning.com/ ").execute(new AsyncCompletionHandler<Integer>(){
 
         @Override
         public Integer onCompleted(Response response) throws Exception{
@@ -81,7 +81,7 @@ You can also mix Future with AsyncHandler to only retrieve part of the asynchron
       import java.util.concurrent.Future;
 
       AsyncHttpClient c = new AsyncHttpClient();
-      Future<String> f = c.prepareGet("http://www.ning.com/").execute(new AsyncHandler<String>() {
+      Future<String> f = c.prepareGet("http://www.ning.com/ ").execute(new AsyncHandler<String>() {
           private StringBuilder builder = new StringBuilder();
 
           @Override

pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.sonatype.oss</groupId>
         <artifactId>oss-parent</artifactId>
@@ -10,17 +9,17 @@
     <groupId>com.ning</groupId>
     <artifactId>async-http-client</artifactId>
     <name>async-http-client</name>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <description>
         Async Http Client library purpose is to allow Java applications to easily execute HTTP requests and
         asynchronously process the HTTP responses.
     </description>
-    <url>http://github.com/ning/async-http-client</url>
+    <url>http://github.com/AsyncHttpClient/async-http-client</url>
     <scm>
-        <connection>scm:git:git@github.com:ning/async-http-client.git</connection>
-        <url>scm:git:git@github.com:ning/async-http-client.git</url>
-        <developerConnection>scm:git:git@github.com:ning/async-http-client.git</developerConnection>
+        <connection>scm:git:git@github.com:AsynHttpClient/async-http-client.git</connection>
+        <url>scm:git:git@github.com:AsyncHttpClient/async-http-client.git</url>
+        <developerConnection>scm:git:git@github.com:AsyncHttpClient/async-http-client.git</developerConnection>
     </scm>
     <prerequisites>
         <maven>2.0.9</maven>
@@ -57,7 +56,7 @@
         <dependency>
             <groupId>org.jboss.netty</groupId>
             <artifactId>netty</artifactId>
-            <version>3.2.1.Final</version>
+            <version>3.2.2.Final</version>
             <exclusions>
                 <exclusion>
                     <groupId>javax.servlet</groupId>
@@ -69,10 +68,19 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
+        <!-- Provided logging implementations (aside from java.util.logging) -->
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <version>1.2.13</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.5.6</version>
+            <optional>true</optional>
         </dependency>
 
         <!-- Test dependencies -->
@@ -89,6 +97,18 @@
             <version>7.1.4.v20100610</version>
             <scope>test</scope>
         </dependency>
+         <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-security</artifactId>
+            <version>7.1.4.v20100610</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>1.5.6</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <defaultGoal>install</defaultGoal>
@@ -158,6 +178,13 @@
                     <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <argLine>-Dcom.ning.http.client.logging.LoggerProvider.class=com.ning.http.client.logging.Slf4jLoggerProvider</argLine>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
@@ -212,23 +239,18 @@
                         <configuration>
                             <shadedArtifactAttached>true</shadedArtifactAttached>
                             <shadedClassifierName>shaded</shadedClassifierName>
-                            <transformers>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer"/>
-                            </transformers>
                             <artifactSet>
-                                <includes>
-                                    <include>com.google.collections:google-collections</include>
-                                </includes>
+                                <excludes>
+                                    <exclude>junit:junit</exclude>
+                                    <exclude>log4j:log4j</exclude>
+                                    <excluse>org.slf4j:slf4j-api</excluse>
+                                </excludes>
                             </artifactSet>
-                            <relocations>
-                                <relocation>
-                                    <pattern>com.google.common</pattern>
-                                    <shadedPattern>com.ning.http.shaded.com.google.collections</shadedPattern>
-                                </relocation>
-                            </relocations>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer" />
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"/>
+                            </transformers>
                         </configuration>
                     </execution>
                 </executions>
@@ -271,6 +293,7 @@
                         <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
                             <groups>standalone</groups>
+                            <argLine>-Dcom.ning.http.client.logging.LoggerProvider.class=com.ning.http.client.logging.Slf4jLoggerProvider</argLine>
                         </configuration>
                     </plugin>
                 </plugins>
@@ -285,6 +308,7 @@
                         <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
                             <groups>standalone, online</groups>
+                            <argLine>-Dcom.ning.http.client.logging.LoggerProvider.class=com.ning.http.client.logging.Slf4jLoggerProvider</argLine>
                         </configuration>
                     </plugin>
                 </plugins>

src/main/java/com/ning/http/client/AsyncCompletionHandler.java

@@ -16,22 +16,41 @@
  */
 package com.ning.http.client;
 
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 
+import com.ning.http.client.logging.LogManager;
+import com.ning.http.client.logging.Logger;
+
 /**
  * An {@link AsyncHandler} augmented with an {@link #onCompleted(Response)} convenience method which gets called
  * when the {@link Response} has been fully received.
  *
+ * <strong>NOTE:<strong> Sending another asynchronous request from an {@link AsyncHandler} must be done using
+ * another thread to avoid potential deadlock inside the {@link com.ning.http.client.AsyncHttpProvider}
+ *
+ * The recommended way is to use the {@link java.util.concurrent.ExecutorService} from the {@link com.ning.http.client.AsyncHttpClientConfig}:
+ * {@code
+ *         &#64;Override
+ *         public T onCompleted(Response response) throws Exception
+ *         &#123;
+ *             asyncHttpClient.getConfig().executorService().execute(new Runnable()
+ *             &#123;
+ *                 public void run()
+ *                 &#123;
+ *                     asyncHttpClient.prepareGet(...);
+ *                 &#125;
+ *             &#125;);
+ *            return T;
+ *         &#125;
+ * }
+ *
  * @param <T>  Type of the value that will be returned by the associated {@link java.util.concurrent.Future}
  */
-public abstract class AsyncCompletionHandler<T> implements AsyncHandler<T> {
+public abstract class AsyncCompletionHandler<T> implements AsyncHandler<T>, ProgressAsyncHandler<T> {
 
-    private final static Logger log = LogManager.getLogger(AsyncCompletionHandlerBase.class);
+    private final Logger log = LogManager.getLogger(AsyncCompletionHandlerBase.class);
 
     private final Collection<HttpResponseBodyPart> bodies =
             Collections.synchronizedCollection(new ArrayList<HttpResponseBodyPart>());
@@ -78,8 +97,7 @@ public final T onCompleted() throws Exception {
      */
     /* @Override */
     public void onThrowable(Throwable t) {
-        if (log.isDebugEnabled())
-            log.debug(t);
+        log.debug(t);
     }
 
     /**
@@ -89,4 +107,35 @@ public void onThrowable(Throwable t) {
      * @return Type of the value that will be returned by the associated {@link java.util.concurrent.Future}
      */
     abstract public T onCompleted(Response response) throws Exception;
+
+    /**
+     * Invoked when the content (a {@link java.io.File}, {@link String} or {@link java.io.FileInputStream} has been fully
+     * written on the I/O socket.
+     *
+     * @return a {@link com.ning.http.client.AsyncHandler.STATE} telling to CONTINUE or ABORT the current processing.
+     */
+    public STATE onHeaderWriteCompleted() {
+        return STATE.CONTINUE;
+    }
+
+    /**
+     * Invoked when the content (a {@link java.io.File}, {@link String} or {@link java.io.FileInputStream} has been fully
+     * written on the I/O socket.
+     *
+     * @return a {@link com.ning.http.client.AsyncHandler.STATE} telling to CONTINUE or ABORT the current processing.
+     */
+    public STATE onContentWriteCompleted() {
+        return STATE.CONTINUE;
+    }
+
+    /**
+     * Invoked when the I/O operation associated with the {@link Request} body as been progressed.
+     * @param amount The amount of bytes to transfer.
+     * @param current The amount of bytes transferred
+     * @param total The total number of bytes transferred
+     * @return a {@link com.ning.http.client.AsyncHandler.STATE} telling to CONTINUE or ABORT the current processing.
+     */
+    public STATE onContentWriteProgess(long amount, long current, long total) {
+        return STATE.CONTINUE;
+    }
 }

src/main/java/com/ning/http/client/AsyncCompletionHandlerBase.java

@@ -16,14 +16,33 @@
  */
 package com.ning.http.client;
 
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import com.ning.http.client.logging.LogManager;
+import com.ning.http.client.logging.Logger;
 
 /**
  *  Simple {@link AsyncHandler} of type {@link Response}
+ *
+ * <strong>NOTE:<strong> Sending another asynchronous request from an {@link AsyncHandler} must be done using
+ * another thread to avoid potential deadlock inside the {@link com.ning.http.client.AsyncHttpProvider}
+ *
+ * The recommended way is to use the {@link java.util.concurrent.ExecutorService} from the {@link com.ning.http.client.AsyncHttpClientConfig}:
+ * {@code
+ *         &#64;Override
+ *         public Response onCompleted(Response response) throws Exception
+ *         &#123;
+ *             asyncHttpClient.getConfig().executorService().execute(new Runnable()
+ *             &#123;
+ *                 public void run()
+ *                 &#123;
+ *                     asyncHttpClient.prepareGet(...);
+ *                 &#125;
+ *             &#125;);
+ *            return response;
+ *         &#125;
+ * }
  */
 public class AsyncCompletionHandlerBase extends AsyncCompletionHandler<Response>{
-    private final static Logger log = LogManager.getLogger(AsyncCompletionHandlerBase.class);
+    private final Logger log = LogManager.getLogger(AsyncCompletionHandlerBase.class);
 
     @Override
     public Response onCompleted(Response response) throws Exception {
@@ -32,8 +51,6 @@ public Response onCompleted(Response response) throws Exception {
 
     /* @Override */
     public void onThrowable(Throwable t) {
-        if (log.isDebugEnabled()) {
-            log.debug(t);
-        }
+        log.debug(t);
     }
 }