Instantiate header/cookie collections lazily.

Author: rlubke

api/src/main/java/org/asynchttpclient/Request.java

@@ -86,6 +86,14 @@ public static interface EntityWriter {
      */
     public FluentCaseInsensitiveStringsMap getHeaders();
 
+    /**
+     * @return return <code>true</code> if request headers have been added,
+     *  otherwise, returns <code>false</code>.
+     *
+     * @since 2.0
+     */
+    boolean hasHeaders();
+
     /**
      * Return Coookie.
      *

api/src/main/java/org/asynchttpclient/RequestBuilderBase.java

@@ -54,8 +54,8 @@ private static final class RequestImpl implements Request {
         private URI rawUri;
         private InetAddress address;
         private InetAddress localAddress;
-        private FluentCaseInsensitiveStringsMap headers = new FluentCaseInsensitiveStringsMap();
-        private Collection<Cookie> cookies = new ArrayList<Cookie>();
+        private FluentCaseInsensitiveStringsMap headers;
+        private Collection<Cookie> cookies;
         private byte[] byteData;
         private String stringData;
         private InputStream streamData;
@@ -213,12 +213,23 @@ private URI toURI(boolean encode) {
 
         /* @Override */
         public FluentCaseInsensitiveStringsMap getHeaders() {
+            if (headers == null) {
+                headers = new FluentCaseInsensitiveStringsMap();
+            }
             return headers;
         }
 
+        @Override
+        public boolean hasHeaders() {
+            return headers != null && !headers.isEmpty();
+        }
+
         /* @Override */
         public Collection<Cookie> getCookies() {
-            return Collections.unmodifiableCollection(cookies);
+            if (cookies == null) {
+                cookies = Collections.unmodifiableCollection(Collections.<Cookie>emptyList());
+            }
+            return cookies;
         }
 
         /* @Override */
@@ -322,12 +333,13 @@ public String toString() {
             sb.append("\t");
             sb.append(method);
             sb.append("\theaders:");
-            if (headers != null) {
-                for (String name : headers.keySet()) {
+            final FluentCaseInsensitiveStringsMap headersLocal = getHeaders();
+            if (headersLocal != null) {
+                for (String name : headersLocal.keySet()) {
                     sb.append("\t");
                     sb.append(name);
                     sb.append(":");
-                    sb.append(headers.getJoinedValue(name, ", "));
+                    sb.append(headersLocal.getJoinedValue(name, ", "));
                 }
             }
             sb.append("\tparams:");
@@ -436,7 +448,7 @@ public T setVirtualHost(String virtualHost) {
     }
 
     public T setHeader(String name, String value) {
-        request.headers.replace(name, value);
+        request.getHeaders().replace(name, value);
         return derived.cast(this);
     }
 
@@ -446,17 +458,21 @@ public T addHeader(String name, String value) {
             value = "";
         }
 
-        request.headers.add(name, value);
+        request.getHeaders().add(name, value);
         return derived.cast(this);
     }
 
     public T setHeaders(FluentCaseInsensitiveStringsMap headers) {
-        request.headers = (headers == null ? new FluentCaseInsensitiveStringsMap() : new FluentCaseInsensitiveStringsMap(headers));
+        if (headers != null) {
+            request.headers = new FluentCaseInsensitiveStringsMap(headers);
+        }
         return derived.cast(this);
     }
 
     public T setHeaders(Map<String, Collection<String>> headers) {
-        request.headers = (headers == null ? new FluentCaseInsensitiveStringsMap() : new FluentCaseInsensitiveStringsMap(headers));
+        if (headers != null) {
+            request.headers = new FluentCaseInsensitiveStringsMap(headers);
+        }
         return derived.cast(this);
     }
 
@@ -466,6 +482,9 @@ public T setContentLength(int length) {
     }
 
     public T addCookie(Cookie cookie) {
+        if (request.cookies == null) {
+            request.cookies = new ArrayList<Cookie>();
+        }
         request.cookies.add(cookie);
         return derived.cast(this);
     }
@@ -639,7 +658,10 @@ public T setConnectionPoolKeyStrategy(ConnectionPoolKeyStrategy connectionPoolKe
     public Request build() {
         if ((request.length < 0) && (request.streamData == null) && allowBody(request.getMethod())) {
             // can't concatenate content-length
-            String contentLength = request.headers.getFirstValue("Content-Length");
+            String contentLength = null;
+            if (request.headers != null && request.headers.isEmpty()) {
+                contentLength = request.headers.getFirstValue("Content-Length");
+            }
 
             if (contentLength != null) {
                 try {
@@ -649,6 +671,9 @@ public Request build() {
                 }
             }
         }
+        if (request.cookies != null) {
+            request.cookies = Collections.unmodifiableCollection(request.cookies);
+        }
         return request;
     }
 
@@ -660,6 +685,11 @@ public T addOrReplaceCookie(Cookie cookie) {
         String cookieKey = cookie.getName();
         boolean replace = false;
         int index = 0;
+        if (request.cookies == null) {
+            request.cookies = new ArrayList<Cookie>();
+            request.cookies.add(cookie);
+            return derived.cast(this);
+        }
         for (Cookie c : request.cookies) {
             if (c.getName().equals(cookieKey)) {
                 replace = true;

providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/filters/AsyncHttpClientFilter.java

@@ -285,10 +285,12 @@ private static FilterChainContext checkAndHandleFilterChainUpdate(final FilterCh
     private static void initTransferCompletionHandler(final Request request,
                                                       final AsyncHandler h)
     throws IOException {
-		if (h instanceof TransferCompletionHandler) {
-			final FluentCaseInsensitiveStringsMap map = new FluentCaseInsensitiveStringsMap(request.getHeaders());
-			TransferCompletionHandler.class.cast(h).transferAdapter(new GrizzlyTransferAdapter(map));
-		}
+        if (h instanceof TransferCompletionHandler) {
+            final FluentCaseInsensitiveStringsMap map =
+                    new FluentCaseInsensitiveStringsMap(request.getHeaders());
+            TransferCompletionHandler.class.cast(h)
+                    .transferAdapter(new GrizzlyTransferAdapter(map));
+        }
     }
 
     private static boolean checkHandshakeError(final FilterChainContext ctx,
@@ -369,14 +371,15 @@ private static void convertToUpgradeRequest(final HttpTransactionContext ctx) {
     private void addGeneralHeaders(final Request request,
                                    final HttpRequestPacket requestPacket) {
 
-        final FluentCaseInsensitiveStringsMap map = request.getHeaders();
-        if (isNonEmpty(map)) {
+        if (request.hasHeaders()) {
+            final FluentCaseInsensitiveStringsMap map = request.getHeaders();
             for (final Map.Entry<String, List<String>> entry : map.entrySet()) {
                 final String headerName = entry.getKey();
                 final List<String> headerValues = entry.getValue();
                 if (isNonEmpty(headerValues)) {
                     for (int i = 0, len = headerValues.size(); i < len; i++) {
-                        requestPacket.addHeader(headerName, headerValues.get(i));
+                        requestPacket.addHeader(headerName,
+                                                headerValues.get(i));
                     }
                 }
             }