Drop NettyResponseHeaders, don't buffer response headers there, but in ResponseBuilder

Author: slandelle

client/src/main/java/org/asynchttpclient/HttpResponseHeaders.java

@@ -17,35 +17,28 @@
 
 import io.netty.handler.codec.http.HttpHeaders;
 
-
 /**
  * A class that represent the HTTP headers.
  */
-public abstract class HttpResponseHeaders {
+public class HttpResponseHeaders {
 
-    private final boolean traillingHeaders;
+    private final HttpHeaders headers;
+    private final boolean trailling;
 
-    public HttpResponseHeaders() {
-        this.traillingHeaders = false;
+    public HttpResponseHeaders(HttpHeaders headers) {
+        this(headers, false);
     }
 
-    public HttpResponseHeaders(boolean traillingHeaders) {
-        this.traillingHeaders = traillingHeaders;
+    public HttpResponseHeaders(HttpHeaders headers, boolean trailling) {
+        this.headers = headers;
+        this.trailling = trailling;
     }
 
-    /**
-     * Return the HTTP header
-     *
-     * @return an {@link HttpHeaders}
-     */
-    abstract public HttpHeaders getHeaders();
+    public HttpHeaders getHeaders() {
+        return headers;
+    }
 
-    /**
-     * Return true is headers has been received after the response body.
-     *
-     * @return true is headers has been received after the response body.
-     */
-    public boolean isTraillingHeadersReceived() {
-        return traillingHeaders;
+    public boolean isTrailling() {
+        return trailling;
     }
 }

client/src/main/java/org/asynchttpclient/Response.java

@@ -70,8 +70,7 @@ public interface Response {
     /**
      * Return the entire response body as a String.
      * 
-     * @param charset
-     *            the charset to use when decoding the stream
+     * @param charset the charset to use when decoding the stream
      * @return the entire response body as a String.
      */
     String getResponseBody(Charset charset);
@@ -158,19 +157,17 @@ public interface Response {
     /**
      * Get remote address client initiated request to.
      * 
-     * @return remote address client initiated request to, may be {@code null}
-     *         if asynchronous provider is unable to provide the remote address
+     * @return remote address client initiated request to, may be {@code null} if asynchronous provider is unable to provide the remote address
      */
     SocketAddress getRemoteAddress();
 
     /**
      * Get local address client initiated request from.
      * 
-     * @return local address client initiated request from, may be {@code null}
-     *         if asynchronous provider is unable to provide the local address
+     * @return local address client initiated request from, may be {@code null} if asynchronous provider is unable to provide the local address
      */
     SocketAddress getLocalAddress();
-    
+
     class ResponseBuilder {
         private final List<HttpResponseBodyPart> bodyParts = new ArrayList<>();
         private HttpResponseStatus status;
@@ -182,13 +179,12 @@ public ResponseBuilder accumulate(HttpResponseStatus status) {
         }
 
         public ResponseBuilder accumulate(HttpResponseHeaders headers) {
-            this.headers = headers;
+            this.headers = this.headers == null ? headers : new HttpResponseHeaders(this.headers.getHeaders().add(headers.getHeaders()), true);
             return this;
         }
 
         /**
-         * @param bodyPart
-         *            a body part (possibly empty, but will be filtered out)
+         * @param bodyPart a body part (possibly empty, but will be filtered out)
          * @return this
          */
         public ResponseBuilder accumulate(HttpResponseBodyPart bodyPart) {

client/src/main/java/org/asynchttpclient/netty/NettyResponseFuture.java

@@ -16,7 +16,6 @@
 import static org.asynchttpclient.util.DateUtils.millisTime;
 import static org.asynchttpclient.util.MiscUtils.getCause;
 import io.netty.channel.Channel;
-import io.netty.handler.codec.http.HttpHeaders;
 
 import java.net.SocketAddress;
 import java.util.concurrent.CancellationException;
@@ -84,7 +83,6 @@ public final class NettyResponseFuture<V> extends AbstractListenableFuture<V> {
     private Request targetRequest;
     private Request currentRequest;
     private NettyRequest nettyRequest;
-    private HttpHeaders httpHeaders;
     private AsyncHandler<V> asyncHandler;
     private boolean streamWasAlreadyConsumed;
     private boolean reuseChannel;
@@ -321,14 +319,6 @@ public final void setKeepAlive(final boolean keepAlive) {
         this.keepAlive = keepAlive;
     }
 
-    public final HttpHeaders getHttpHeaders() {
-        return httpHeaders;
-    }
-
-    public final void setHttpHeaders(HttpHeaders httpHeaders) {
-        this.httpHeaders = httpHeaders;
-    }
-
     public int incrementAndGetCurrentRedirectCount() {
         return redirectCount.incrementAndGet();
     }
@@ -477,7 +467,6 @@ public String toString() {
                 ",\n\tcontent=" + content + //
                 ",\n\turi=" + getUri() + //
                 ",\n\tkeepAlive=" + keepAlive + //
-                ",\n\thttpHeaders=" + httpHeaders + //
                 ",\n\texEx=" + exEx + //
                 ",\n\tredirectCount=" + redirectCount + //
                 ",\n\ttimeoutsHolder=" + timeoutsHolder + //

client/src/main/java/org/asynchttpclient/netty/NettyResponseHeaders.java

@@ -38,7 +38,6 @@
 import org.asynchttpclient.netty.Callback;
 import org.asynchttpclient.netty.NettyResponseBodyPart;
 import org.asynchttpclient.netty.NettyResponseFuture;
-import org.asynchttpclient.netty.NettyResponseHeaders;
 import org.asynchttpclient.netty.NettyResponseStatus;
 import org.asynchttpclient.netty.channel.ChannelManager;
 import org.asynchttpclient.netty.channel.Channels;
@@ -84,14 +83,13 @@ public void call() throws Exception {
             Request request = future.getCurrentRequest();
 
             HttpResponseStatus status = new NettyResponseStatus(future.getUri(), config, response, channel);
-            HttpResponseHeaders responseHeaders = new NettyResponseHeaders(response.headers());
+            HttpResponseHeaders responseHeaders = new HttpResponseHeaders(response.headers());
             Realm realm = request.getRealm() != null ? request.getRealm() : config.getRealm();
 
             if (exitAfterProcessingFilters(channel, future, handler, status, responseHeaders)) {
                 return;
             }
 
-            future.setHttpHeaders(response.headers());
             if (exitAfterHandlingRedirect(channel, future, response, request, response.getStatus().code(), realm))
                 return;
 

client/src/main/java/org/asynchttpclient/netty/handler/WebSocketProtocol.java

@@ -38,12 +38,8 @@ public void testCookieParseExpires() {
         Date date = new Date(System.currentTimeMillis() + 60000);
         final String cookieDef = String.format("efmembercheck=true; expires=%s; path=/; domain=.eclipse.org", sdf.format(date));
 
-        NettyResponse response = new NettyResponse(new NettyResponseStatus(null, null, null, null), new HttpResponseHeaders() {
-            @Override
-            public HttpHeaders getHeaders() {
-                return new DefaultHttpHeaders().add(HttpHeaders.Names.SET_COOKIE, cookieDef);
-            }
-        }, null);
+        HttpResponseHeaders responseHeaders = new HttpResponseHeaders(new DefaultHttpHeaders().add(HttpHeaders.Names.SET_COOKIE, cookieDef));
+        NettyResponse response = new NettyResponse(new NettyResponseStatus(null, null, null, null), responseHeaders, null);
 
         List<Cookie> cookies = response.getCookies();
         assertEquals(cookies.size(), 1);
@@ -55,12 +51,9 @@ public HttpHeaders getHeaders() {
     @Test(groups = "standalone")
     public void testCookieParseMaxAge() {
         final String cookieDef = "efmembercheck=true; max-age=60; path=/; domain=.eclipse.org";
-        NettyResponse response = new NettyResponse(new NettyResponseStatus(null, null, null, null), new HttpResponseHeaders() {
-            @Override
-            public HttpHeaders getHeaders() {
-                return new DefaultHttpHeaders().add(HttpHeaders.Names.SET_COOKIE, cookieDef);
-            }
-        }, null);
+        
+        HttpResponseHeaders responseHeaders = new HttpResponseHeaders(new DefaultHttpHeaders().add(HttpHeaders.Names.SET_COOKIE, cookieDef));
+        NettyResponse response = new NettyResponse(new NettyResponseStatus(null, null, null, null), responseHeaders, null);
         List<Cookie> cookies = response.getCookies();
         assertEquals(cookies.size(), 1);
 
@@ -71,12 +64,8 @@ public HttpHeaders getHeaders() {
     @Test(groups = "standalone")
     public void testCookieParseWeirdExpiresValue() {
         final String cookieDef = "efmembercheck=true; expires=60; path=/; domain=.eclipse.org";
-        NettyResponse response = new NettyResponse(new NettyResponseStatus(null, null, null, null), new HttpResponseHeaders() {
-            @Override
-            public HttpHeaders getHeaders() {
-                return new DefaultHttpHeaders().add(HttpHeaders.Names.SET_COOKIE, cookieDef);
-            }
-        }, null);
+        HttpResponseHeaders responseHeaders = new HttpResponseHeaders(new DefaultHttpHeaders().add(HttpHeaders.Names.SET_COOKIE, cookieDef));
+        NettyResponse response = new NettyResponse(new NettyResponseStatus(null, null, null, null), responseHeaders, null);
 
         List<Cookie> cookies = response.getCookies();
         assertEquals(cookies.size(), 1);