Get rid of TransferAdapter

Author: Stephane Landelle

api/src/main/java/org/asynchttpclient/listener/TransferCompletionHandler.java

@@ -60,7 +60,7 @@ public class TransferCompletionHandler extends AsyncCompletionHandlerBase {
     private final static Logger logger = LoggerFactory.getLogger(TransferCompletionHandler.class);
     private final ConcurrentLinkedQueue<TransferListener> listeners = new ConcurrentLinkedQueue<TransferListener>();
     private final boolean accumulateResponseBytes;
-    private TransferAdapter transferAdapter;
+    private FluentCaseInsensitiveStringsMap headers;
 
     /**
      * Create a TransferCompletionHandler that will not accumulate bytes. The resulting {@link org.asynchttpclient.Response#getResponseBody()},
@@ -106,13 +106,13 @@ public TransferCompletionHandler removeTransferListener(TransferListener t) {
     }
 
     /**
-     * Associate a {@link TransferCompletionHandler.TransferAdapter} with this listener.
+     * Set headers to this listener.
      * 
-     * @param transferAdapter
-     *            {@link TransferAdapter}
+     * @param headers
+     *            {@link FluentCaseInsensitiveStringsMap}
      */
-    public void transferAdapter(TransferAdapter transferAdapter) {
-        this.transferAdapter = transferAdapter;
+    public void headers(FluentCaseInsensitiveStringsMap headers) {
+        this.headers = headers;
     }
 
     @Override
@@ -139,8 +139,8 @@ public Response onCompleted(Response response) throws Exception {
 
     @Override
     public STATE onHeaderWriteCompleted() {
-        if (transferAdapter != null) {
-            fireOnHeadersSent(transferAdapter.getHeaders());
+        if (headers != null) {
+            fireOnHeadersSent(headers);
         }
         return STATE.CONTINUE;
     }
@@ -215,16 +215,4 @@ private void fireOnThrowable(Throwable t) {
             }
         }
     }
-
-    public static class TransferAdapter {
-        private final FluentCaseInsensitiveStringsMap headers;
-
-        public TransferAdapter(FluentCaseInsensitiveStringsMap headers) {
-            this.headers = headers;
-        }
-
-        public FluentCaseInsensitiveStringsMap getHeaders() {
-            return headers;
-        }
-    }
 }

providers/netty/src/main/java/org/asynchttpclient/providers/netty/NettyAsyncHttpProvider.java

@@ -43,7 +43,6 @@
 import org.asynchttpclient.filter.ResponseFilter;
 import org.asynchttpclient.generators.InputStreamBodyGenerator;
 import org.asynchttpclient.listener.TransferCompletionHandler;
-import org.asynchttpclient.listener.TransferCompletionHandler.TransferAdapter;
 import org.asynchttpclient.multipart.MultipartBody;
 import org.asynchttpclient.multipart.MultipartRequestEntity;
 import org.asynchttpclient.ntlm.NTLMEngine;
@@ -452,7 +451,7 @@ protected final <T> void writeRequest(final Channel channel, final AsyncHttpClie
                     }
                 }
 
-                TransferCompletionHandler.class.cast(future.getAsyncHandler()).transferAdapter(new TransferAdapter(h));
+                TransferCompletionHandler.class.cast(future.getAsyncHandler()).headers(h);
             }
 
             // Leave it to true.

providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/request/NettyRequestSender.java

@@ -59,7 +59,6 @@
 import org.asynchttpclient.filter.IOExceptionFilter;
 import org.asynchttpclient.generators.InputStreamBodyGenerator;
 import org.asynchttpclient.listener.TransferCompletionHandler;
-import org.asynchttpclient.listener.TransferCompletionHandler.TransferAdapter;
 import org.asynchttpclient.multipart.MultipartBody;
 import org.asynchttpclient.providers.netty4.Constants;
 import org.asynchttpclient.providers.netty4.channel.Channels;
@@ -451,7 +450,7 @@ private void configureTransferAdapter(AsyncHandler<?> handler, HttpRequest netty
             h.add(entries.getKey(), entries.getValue());
         }
 
-        TransferCompletionHandler.class.cast(handler).transferAdapter(new TransferAdapter(h));
+        TransferCompletionHandler.class.cast(handler).headers(h);
     }
 
     private void scheduleReaper(NettyResponseFuture<?> future) {