[master] fix issue AsyncHttpClient#564

AsyncHttpClient#564
"emtpy HTTP delete message is sent using chunked transfer-encoding for no reason"

Author: oleksiys

providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/Utils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Sonatype, Inc. All rights reserved.
+ * Copyright (c) 2013-2014 Sonatype, Inc. All rights reserved.
  *
  * This program is licensed to you under the Apache License Version 2.0,
  * and you may not use this file except in compliance with the Apache License Version 2.0.
@@ -13,12 +13,10 @@
 
 package org.asynchttpclient.providers.grizzly;
 
-import org.asynchttpclient.Request;
 import org.glassfish.grizzly.Connection;
 import org.glassfish.grizzly.Grizzly;
 import org.glassfish.grizzly.attributes.Attribute;
 import org.glassfish.grizzly.attributes.AttributeStorage;
-import org.glassfish.grizzly.http.Method;
 
 import java.net.URI;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -86,13 +84,4 @@ public static boolean isSpdyConnection(final Connection c) {
         Boolean result = SPDY.get(c);
         return result != null ? result : false;
     }
-
-    public static boolean requestHasEntityBody(final Request request) {
-
-        final String method = request.getMethod();
-        return Method.POST.matchesMethod(method)//
-                || Method.PUT.matchesMethod(method)//
-                || Method.PATCH.matchesMethod(method)//
-                || Method.DELETE.matchesMethod(method);
-    }
 }

providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/bodyhandler/BodyGeneratorBodyHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Sonatype, Inc. All rights reserved.
+ * Copyright (c) 2013-2014 Sonatype, Inc. All rights reserved.
  *
  * This program is licensed to you under the Apache License Version 2.0,
  * and you may not use this file except in compliance with the Apache License Version 2.0.
@@ -26,7 +26,7 @@
 
 import java.io.IOException;
 
-public final class BodyGeneratorBodyHandler implements BodyHandler {
+public final class BodyGeneratorBodyHandler extends BodyHandler {
 
     // -------------------------------------------- Methods from BodyHandler
 

providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/bodyhandler/BodyHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Sonatype, Inc. All rights reserved.
+ * Copyright (c) 2013-2014 Sonatype, Inc. All rights reserved.
  *
  * This program is licensed to you under the Apache License Version 2.0,
  * and you may not use this file except in compliance with the Apache License Version 2.0.
@@ -19,11 +19,25 @@
 
 import java.io.IOException;
 
-public interface BodyHandler {
+public abstract class BodyHandler {
 
-    static int MAX_CHUNK_SIZE = 8192;
+    public static int MAX_CHUNK_SIZE = 8192;
 
-    boolean handlesBodyType(final Request request);
+    public abstract boolean handlesBodyType(final Request request);
 
-    boolean doHandle(final FilterChainContext ctx, final Request request, final HttpRequestPacket requestPacket) throws IOException;
+    public abstract boolean doHandle(final FilterChainContext ctx,
+            final Request request, final HttpRequestPacket requestPacket)
+            throws IOException;
+    
+    /**
+     * Tries to predict request content-length based on the {@link Request}.
+     * Not all the <tt>BodyHandler</tt>s can predict the content-length in advance.
+     * 
+     * @param request
+     * @return the content-length, or <tt>-1</tt> if the content-length can't be
+     * predicted
+     */
+    protected long getContentLength(final Request request) {
+        return request.getContentLength();
+    }
 }

providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/bodyhandler/BodyHandlerFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Sonatype, Inc. All rights reserved.
+ * Copyright (c) 2013-2014 Sonatype, Inc. All rights reserved.
  *
  * This program is licensed to you under the Apache License Version 2.0,
  * and you may not use this file except in compliance with the Apache License Version 2.0.
@@ -27,7 +27,7 @@ public BodyHandlerFactory(GrizzlyAsyncHttpProvider grizzlyAsyncHttpProvider) {
                 new ParamsBodyHandler(grizzlyAsyncHttpProvider),//
                 new StreamDataBodyHandler(),//
                 new PartsBodyHandler(),//
-                new FileBodyHandler(),//
+                new FileBodyHandler(grizzlyAsyncHttpProvider),//
                 new BodyGeneratorBodyHandler() //
         };
     }
@@ -39,7 +39,8 @@ public BodyHandler getBodyHandler(final Request request) {
                 return h;
             }
         }
-        return new NoBodyHandler();
+        
+        return null;
     }
 
 } // END BodyHandlerFactory

providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/bodyhandler/ByteArrayBodyHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Sonatype, Inc. All rights reserved.
+ * Copyright (c) 2013-2014 Sonatype, Inc. All rights reserved.
  *
  * This program is licensed to you under the Apache License Version 2.0,
  * and you may not use this file except in compliance with the Apache License Version 2.0.
@@ -24,11 +24,12 @@
 
 import java.io.IOException;
 
-public final class ByteArrayBodyHandler implements BodyHandler {
+public final class ByteArrayBodyHandler extends BodyHandler {
 
     private final boolean compressionEnabled;
 
-    public ByteArrayBodyHandler(GrizzlyAsyncHttpProvider grizzlyAsyncHttpProvider) {
+    public ByteArrayBodyHandler(
+            final GrizzlyAsyncHttpProvider grizzlyAsyncHttpProvider) {
         compressionEnabled = grizzlyAsyncHttpProvider.getClientConfig().isCompressionEnabled();
     }
 
@@ -39,7 +40,8 @@ public boolean handlesBodyType(final Request request) {
     }
 
     @SuppressWarnings({ "unchecked" })
-    public boolean doHandle(final FilterChainContext ctx, final Request request, final HttpRequestPacket requestPacket) throws IOException {
+    public boolean doHandle(final FilterChainContext ctx, final Request request,
+            final HttpRequestPacket requestPacket) throws IOException {
 
         final byte[] data = request.getByteData();
         final MemoryManager mm = ctx.getMemoryManager();
@@ -54,4 +56,13 @@ public boolean doHandle(final FilterChainContext ctx, final Request request, fin
         ctx.write(content, ((!requestPacket.isCommitted()) ? ctx.getTransportContext().getCompletionHandler() : null));
         return true;
     }
+
+    @Override
+    protected long getContentLength(final Request request) {
+        if (request.getContentLength() >= 0) {
+            return request.getContentLength();
+        }
+        
+        return compressionEnabled ? -1 : request.getByteData().length;
+    }
 }

providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/bodyhandler/ExpectHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Sonatype, Inc. All rights reserved.
+ * Copyright (c) 2013-2014 Sonatype, Inc. All rights reserved.
  *
  * This program is licensed to you under the Apache License Version 2.0,
  * and you may not use this file except in compliance with the Apache License Version 2.0.
@@ -19,7 +19,7 @@
 
 import java.io.IOException;
 
-public final class ExpectHandler implements BodyHandler {
+public final class ExpectHandler extends BodyHandler {
 
     private final BodyHandler delegate;
     private Request request;
@@ -41,6 +41,13 @@ public boolean handlesBodyType(Request request) {
     public boolean doHandle(FilterChainContext ctx, Request request, HttpRequestPacket requestPacket) throws IOException {
         this.request = request;
         this.requestPacket = requestPacket;
+        
+        // Set content-length if possible
+        final long contentLength = delegate.getContentLength(request);
+        if (contentLength != -1) {
+            requestPacket.setContentLengthLong(contentLength);
+        }
+        
         ctx.write(requestPacket, ((!requestPacket.isCommitted()) ? ctx.getTransportContext().getCompletionHandler() : null));
         return true;
     }

providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/bodyhandler/FileBodyHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Sonatype, Inc. All rights reserved.
+ * Copyright (c) 2013-2014 Sonatype, Inc. All rights reserved.
  *
  * This program is licensed to you under the Apache License Version 2.0,
  * and you may not use this file except in compliance with the Apache License Version 2.0.
@@ -31,14 +31,22 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicInteger;
+import org.asynchttpclient.providers.grizzly.GrizzlyAsyncHttpProvider;
 
-public final class FileBodyHandler implements BodyHandler {
+public final class FileBodyHandler extends BodyHandler {
 
     private static final boolean SEND_FILE_SUPPORT;
     static {
         SEND_FILE_SUPPORT = configSendFileSupport();
     }
 
+    private final boolean compressionEnabled;
+
+    public FileBodyHandler(
+            final GrizzlyAsyncHttpProvider grizzlyAsyncHttpProvider) {
+        compressionEnabled = grizzlyAsyncHttpProvider.getClientConfig().isCompressionEnabled();
+    }
+    
     // ------------------------------------------------ Methods from BodyHandler
 
     public boolean handlesBodyType(final Request request) {
@@ -51,7 +59,7 @@ public boolean doHandle(final FilterChainContext ctx, final Request request, fin
         final File f = request.getFile();
         requestPacket.setContentLengthLong(f.length());
         final HttpTxContext context = HttpTxContext.get(ctx);
-        if (!SEND_FILE_SUPPORT || requestPacket.isSecure()) {
+        if (compressionEnabled || !SEND_FILE_SUPPORT || requestPacket.isSecure()) {
             final FileInputStream fis = new FileInputStream(request.getFile());
             final MemoryManager mm = ctx.getMemoryManager();
             AtomicInteger written = new AtomicInteger();
@@ -98,6 +106,15 @@ public void completed(WriteResult result) {
         return true;
     }
 
+    @Override
+    protected long getContentLength(final Request request) {
+        if (request.getContentLength() >= 0) {
+            return request.getContentLength();
+        }
+        
+        return compressionEnabled ? -1 : request.getFile().length();
+    }
+    
     // --------------------------------------------------------- Private Methods
 
     private static void notifyHandlerIfNeeded(final HttpTxContext context, final HttpRequestPacket requestPacket,

providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/bodyhandler/NoBodyHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Sonatype, Inc. All rights reserved.
+ * Copyright (c) 2013-2014 Sonatype, Inc. All rights reserved.
  *
  * This program is licensed to you under the Apache License Version 2.0,
  * and you may not use this file except in compliance with the Apache License Version 2.0.
@@ -21,7 +21,7 @@
 
 import java.io.IOException;
 
-public final class NoBodyHandler implements BodyHandler {
+public final class NoBodyHandler extends BodyHandler {
 
     // -------------------------------------------- Methods from BodyHandler
 

providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/bodyhandler/ParamsBodyHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Sonatype, Inc. All rights reserved.
+ * Copyright (c) 2013-2014 Sonatype, Inc. All rights reserved.
  *
  * This program is licensed to you under the Apache License Version 2.0,
  * and you may not use this file except in compliance with the Apache License Version 2.0.
@@ -31,7 +31,7 @@
 import java.util.List;
 import java.util.Map;
 
-public final class ParamsBodyHandler implements BodyHandler {
+public final class ParamsBodyHandler extends BodyHandler {
 
     private final boolean compressionEnabled;
 

providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/bodyhandler/PartsBodyHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Sonatype, Inc. All rights reserved.
+ * Copyright (c) 2013-2014 Sonatype, Inc. All rights reserved.
  *
  * This program is licensed to you under the Apache License Version 2.0,
  * and you may not use this file except in compliance with the Apache License Version 2.0.
@@ -31,7 +31,7 @@
 import java.io.IOException;
 import java.util.List;
 
-public final class PartsBodyHandler implements BodyHandler {
+public final class PartsBodyHandler extends BodyHandler {
 
     // -------------------------------------------- Methods from BodyHandler
 

providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/bodyhandler/StreamDataBodyHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Sonatype, Inc. All rights reserved.
+ * Copyright (c) 2013-2014 Sonatype, Inc. All rights reserved.
  *
  * This program is licensed to you under the Apache License Version 2.0,
  * and you may not use this file except in compliance with the Apache License Version 2.0.
@@ -25,7 +25,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-public final class StreamDataBodyHandler implements BodyHandler {
+public final class StreamDataBodyHandler extends BodyHandler {
 
     // -------------------------------------------- Methods from BodyHandler
 

providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/bodyhandler/StringBodyHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Sonatype, Inc. All rights reserved.
+ * Copyright (c) 2013-2014 Sonatype, Inc. All rights reserved.
  *
  * This program is licensed to you under the Apache License Version 2.0,
  * and you may not use this file except in compliance with the Apache License Version 2.0.
@@ -25,7 +25,7 @@
 
 import java.io.IOException;
 
-public final class StringBodyHandler implements BodyHandler {
+public final class StringBodyHandler extends BodyHandler {
     private final GrizzlyAsyncHttpProvider grizzlyAsyncHttpProvider;
 
     public StringBodyHandler(GrizzlyAsyncHttpProvider grizzlyAsyncHttpProvider) {