- Add methods to ClientConfig to be able to determine if any {Request,Reponse}Filters have been registered.

rlubke · rlubke · commit bf575f6f040a · 2013-08-23T11:04:12.000-07:00
- Avoid unnecessary iterator creation.
diff --git a/api/src/main/java/org/asynchttpclient/AsyncHttpClient.java b/api/src/main/java/org/asynchttpclient/AsyncHttpClient.java
@@ -28,6 +28,7 @@
 import java.io.InputStream;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -592,16 +593,20 @@ public ListenableFuture<Response> executeRequest(Request request) throws IOExcep
      * @return {@link FilterContext}
      */
     private <T> FilterContext<T> preProcessRequest(FilterContext<T> fc) throws IOException {
-        for (RequestFilter asyncFilter : config.getRequestFilters()) {
-            try {
-                fc = asyncFilter.filter(fc);
-                if (fc == null) {
-                    throw new NullPointerException("FilterContext is null");
+        if (config.hasRequestFilters()) {
+            final List<RequestFilter> requestFilters = config.getRequestFilters();
+            for (int i = 0, len = requestFilters.size(); i < len; i++) {
+                final RequestFilter asyncFilter = requestFilters.get(i);
+                try {
+                    fc = asyncFilter.filter(fc);
+                    if (fc == null) {
+                        throw new NullPointerException("FilterContext is null");
+                    }
+                } catch (FilterException e) {
+                    IOException ex = new IOException();
+                    ex.initCause(e);
+                    throw ex;
                 }
-            } catch (FilterException e) {
-                IOException ex = new IOException();
-                ex.initCause(e);
-                throw ex;
             }
         }
 
diff --git a/api/src/main/java/org/asynchttpclient/AsyncHttpClientConfig.java b/api/src/main/java/org/asynchttpclient/AsyncHttpClientConfig.java
@@ -424,6 +424,15 @@ public Realm getRealm() {
         return realm;
     }
 
+    /**
+     * @return <code>true</code> if {@link RequestFilter}s have been defined.
+     *
+     * @since 2.0.0
+     */
+    public boolean hasRequestFilters() {
+        return !requestFilters.isEmpty();
+    }
+
     /**
      * Return the list of {@link RequestFilter}
      *
@@ -433,6 +442,14 @@ public List<RequestFilter> getRequestFilters() {
         return Collections.unmodifiableList(requestFilters);
     }
 
+    /**
+     * @return <code>true</code> if {@link ResponseFilter}s have been defined.
+     * @since 2.0.0
+     */
+    public boolean hasResponseFilters() {
+        return !requestFilters.isEmpty();
+    }
+
     /**
      * Return the list of {@link ResponseFilter}
      *
diff --git a/providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/EventHandler.java b/providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/EventHandler.java
@@ -245,19 +245,20 @@ public void onHttpHeadersParsed(HttpHeader httpHeader,
         }
 
         final AsyncHandler handler = context.getHandler();
-        final List<ResponseFilter> filters = context.getProvider()
-                .getClientConfig().getResponseFilters();
         final GrizzlyResponseHeaders responseHeaders =
                 new GrizzlyResponseHeaders((HttpResponsePacket) httpHeader,
                                            context.getRequest().getURI(),
                                            provider);
-        if (!filters.isEmpty()) {
+        if (context.getProvider().getClientConfig().hasResponseFilters()) {
+            final List<ResponseFilter> filters = context.getProvider()
+                    .getClientConfig().getResponseFilters();
             FilterContext fc = new FilterContext.FilterContextBuilder()
                     .asyncHandler(handler).request(context.getRequest())
                     .responseHeaders(responseHeaders)
                     .responseStatus(context.getResponseStatus()).build();
             try {
-                for (final ResponseFilter f : filters) {
+                for (int i = 0, len = filters.size(); i < len; i++) {
+                    final ResponseFilter f = filters.get(i);
                     fc = f.filter(fc);
                 }
             } catch (Exception e) {
@@ -514,9 +515,11 @@ public static Request newRequest(final URI uri,
         if (ctx.getProvider().getClientConfig().isRemoveQueryParamOnRedirect()) {
             builder.setQueryParameters(null);
         }
-        for (String cookieStr : response.getHeaders().values(Header.Cookie)) {
-            for (Cookie c : CookieDecoder.decode(cookieStr)) {
-                builder.addOrReplaceCookie(c);
+        if (response.getHeader(Header.Cookie) != null) {
+            for (String cookieStr : response.getHeaders().values(Header.Cookie)) {
+                for (Cookie c : CookieDecoder.decode(cookieStr)) {
+                    builder.addOrReplaceCookie(c);
+                }
             }
         }
         return builder.build();
diff --git a/providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/GrizzlyResponse.java b/providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/GrizzlyResponse.java
@@ -25,6 +25,7 @@
 
 import org.glassfish.grizzly.Buffer;
 import org.glassfish.grizzly.http.Cookies;
+import org.glassfish.grizzly.http.util.Header;
 import org.glassfish.grizzly.utils.Charsets;
 import org.glassfish.grizzly.memory.Buffers;
 import org.glassfish.grizzly.memory.MemoryManager;
@@ -146,11 +147,11 @@ public Buffer getResponseBodyAsBuffer() {
      */
     public List<Cookie> buildCookies() {
 
-        List<String> values = headers.getHeaders().get("set-cookie");
+        List<String> values = headers.getHeaders().get(Header.SetCookie.toString());
         if (isNonEmpty(values)) {
             ServerCookiesBuilder builder = new ServerCookiesBuilder(false, rfc6265Enabled);
-            for (String header : values) {
-                builder.parse(header);
+            for (int i = 0, len = values.size(); i < len; i++) {
+                builder.parse(values.get(i));
             }
             return convertCookies(builder.build());
 
@@ -166,7 +167,8 @@ private List<Cookie> convertCookies(Cookies cookies) {
 
         final org.glassfish.grizzly.http.Cookie[] grizzlyCookies = cookies.get();
         List<Cookie> convertedCookies = new ArrayList<Cookie>(grizzlyCookies.length);
-        for (org.glassfish.grizzly.http.Cookie gCookie : grizzlyCookies) {
+        for (int i = 0, len = grizzlyCookies.length; i < len; i++) {
+            org.glassfish.grizzly.http.Cookie gCookie = grizzlyCookies[i];
             convertedCookies.add(new Cookie(gCookie.getDomain(),
                                    gCookie.getName(),
                                    gCookie.getValue(),
diff --git a/providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/bodyhandler/BodyHandlerFactory.java b/providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/bodyhandler/BodyHandlerFactory.java
@@ -34,7 +34,8 @@ public BodyHandlerFactory(GrizzlyAsyncHttpProvider grizzlyAsyncHttpProvider) {
     }
 
     public BodyHandler getBodyHandler(final Request request) {
-        for (final BodyHandler h : handlers) {
+        for (int i = 0, len = handlers.length; i < len; i++) {
+            final BodyHandler h = handlers[i];
             if (h.handlesBodyType(request)) {
                 return h;
             }
diff --git a/providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/bodyhandler/ParamsBodyHandler.java b/providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/bodyhandler/ParamsBodyHandler.java
@@ -71,7 +71,8 @@ public boolean doHandle(final FilterChainContext ctx,
                     if (sb == null) {
                         sb = new StringBuilder(128);
                     }
-                    for (String value : values) {
+                    for (int i = 0, len = values.size(); i < len; i++) {
+                        final String value = values.get(i);
                         if (sb.length() > 0) {
                             sb.append('&');
                         }
diff --git a/providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/filters/AsyncHttpClientFilter.java b/providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/filters/AsyncHttpClientFilter.java
@@ -375,8 +375,8 @@ private void addGeneralHeaders(final Request request,
                 final String headerName = entry.getKey();
                 final List<String> headerValues = entry.getValue();
                 if (isNonEmpty(headerValues)) {
-                    for (final String headerValue : headerValues) {
-                        requestPacket.addHeader(headerName, headerValue);
+                    for (int i = 0, len = headerValues.size(); i < len; i++) {
+                        requestPacket.addHeader(headerName, headerValues.get(i));
                     }
                 }
             }
@@ -418,16 +418,19 @@ private void addCookies(final Request request,
     private static void convertCookies(final Collection<Cookie> cookies,
                                        final org.glassfish.grizzly.http.Cookie[] gCookies) {
         int idx = 0;
-        for (final Cookie cookie : cookies) {
-            final org.glassfish.grizzly.http.Cookie gCookie =
-                    new org.glassfish.grizzly.http.Cookie(cookie.getName(), cookie.getValue());
-            gCookie.setDomain(cookie.getDomain());
-            gCookie.setPath(cookie.getPath());
-            gCookie.setVersion(cookie.getVersion());
-            gCookie.setMaxAge(cookie.getMaxAge());
-            gCookie.setSecure(cookie.isSecure());
-            gCookies[idx] = gCookie;
-            idx++;
+        if (!cookies.isEmpty()) {
+            for (final Cookie cookie : cookies) {
+                final org.glassfish.grizzly.http.Cookie gCookie =
+                        new org.glassfish.grizzly.http.Cookie(cookie.getName(),
+                                                              cookie.getValue());
+                gCookie.setDomain(cookie.getDomain());
+                gCookie.setPath(cookie.getPath());
+                gCookie.setVersion(cookie.getVersion());
+                gCookie.setMaxAge(cookie.getMaxAge());
+                gCookie.setSecure(cookie.isSecure());
+                gCookies[idx] = gCookie;
+                idx++;
+            }
         }
 
     }

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,8 @@ public BodyHandlerFactory(GrizzlyAsyncHttpProvider grizzlyAsyncHttpProvider) {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`public BodyHandler getBodyHandler(final Request request) {`
`37`		`- for (final BodyHandler h : handlers) {`
	`37`	`+ for (int i = 0, len = handlers.length; i < len; i++) {`
	`38`	`+ final BodyHandler h = handlers[i];`
`38`	`39`	`if (h.handlesBodyType(request)) {`
`39`	`40`	`return h;`
`40`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,8 @@ public boolean doHandle(final FilterChainContext ctx,`
`71`	`71`	`if (sb == null) {`
`72`	`72`	`sb = new StringBuilder(128);`
`73`	`73`	`}`
`74`		`- for (String value : values) {`
	`74`	`+ for (int i = 0, len = values.size(); i < len; i++) {`
	`75`	`+ final String value = values.get(i);`
`75`	`76`	`if (sb.length() > 0) {`
`76`	`77`	`sb.append('&');`
`77`	`78`	`}`