[master] + remove deprecated compression logic

Author: oleksiys

providers/grizzly/pom.xml

@@ -14,7 +14,7 @@
     </description>
 
     <properties>
-        <grizzly.version>2.3.16</grizzly.version>
+        <grizzly.version>2.3.17-SNAPSHOT</grizzly.version>
         <grizzly.npn.version>1.1</grizzly.npn.version>
     </properties>
 

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

@@ -22,12 +22,12 @@ public final class BodyHandlerFactory {
 
     public BodyHandlerFactory(GrizzlyAsyncHttpProvider grizzlyAsyncHttpProvider) {
         handlers = new BodyHandler[] {//
-        new StringBodyHandler(grizzlyAsyncHttpProvider),//
-                new ByteArrayBodyHandler(grizzlyAsyncHttpProvider),//
-                new ParamsBodyHandler(grizzlyAsyncHttpProvider),//
+        new StringBodyHandler(),//
+                new ByteArrayBodyHandler(),//
+                new ParamsBodyHandler(),//
                 new StreamDataBodyHandler(),//
                 new PartsBodyHandler(),//
-                new FileBodyHandler(grizzlyAsyncHttpProvider),//
+                new FileBodyHandler(),//
                 new BodyGeneratorBodyHandler() //
         };
     }

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

@@ -14,7 +14,6 @@
 package org.asynchttpclient.providers.grizzly.bodyhandler;
 
 import org.asynchttpclient.Request;
-import org.asynchttpclient.providers.grizzly.GrizzlyAsyncHttpProvider;
 import org.glassfish.grizzly.Buffer;
 import org.glassfish.grizzly.filterchain.FilterChainContext;
 import org.glassfish.grizzly.http.HttpContent;
@@ -26,13 +25,6 @@
 
 public final class ByteArrayBodyHandler extends BodyHandler {
 
-    private final boolean compressionEnabled;
-
-    public ByteArrayBodyHandler(
-            final GrizzlyAsyncHttpProvider grizzlyAsyncHttpProvider) {
-        compressionEnabled = grizzlyAsyncHttpProvider.getClientConfig().isCompressionEnforced();
-    }
-
     // -------------------------------------------- Methods from BodyHandler
 
     public boolean handlesBodyType(final Request request) {
@@ -47,22 +39,20 @@ public boolean doHandle(final FilterChainContext ctx, final Request request,
         final MemoryManager mm = ctx.getMemoryManager();
         final Buffer gBuffer = Buffers.wrap(mm, data);
         if (requestPacket.getContentLength() == -1) {
-            if (!compressionEnabled) {
-                requestPacket.setContentLengthLong(data.length);
-            }
+            requestPacket.setContentLengthLong(data.length);
         }
-        final HttpContent content = requestPacket.httpContentBuilder().content(gBuffer).build();
-        content.setLast(true);
+        final HttpContent content = requestPacket.httpContentBuilder()
+                .content(gBuffer)
+                .last(true)
+                .build();
         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;
+        return request.getContentLength() >= 0
+                ? request.getContentLength()
+                : request.getByteData().length;
     }
 }

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

@@ -31,7 +31,6 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicInteger;
-import org.asynchttpclient.providers.grizzly.GrizzlyAsyncHttpProvider;
 
 public final class FileBodyHandler extends BodyHandler {
 
@@ -40,13 +39,6 @@ public final class FileBodyHandler extends BodyHandler {
         SEND_FILE_SUPPORT = configSendFileSupport();
     }
 
-    private final boolean compressionEnabled;
-
-    public FileBodyHandler(
-            final GrizzlyAsyncHttpProvider grizzlyAsyncHttpProvider) {
-        compressionEnabled = grizzlyAsyncHttpProvider.getClientConfig().isCompressionEnforced();
-    }
-    
     // ------------------------------------------------ Methods from BodyHandler
 
     public boolean handlesBodyType(final Request request) {
@@ -59,7 +51,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 (compressionEnabled || !SEND_FILE_SUPPORT || requestPacket.isSecure()) {
+        if (!SEND_FILE_SUPPORT || requestPacket.isSecure()) {
             final FileInputStream fis = new FileInputStream(request.getFile());
             final MemoryManager mm = ctx.getMemoryManager();
             AtomicInteger written = new AtomicInteger();
@@ -108,11 +100,9 @@ public void completed(WriteResult result) {
 
     @Override
     protected long getContentLength(final Request request) {
-        if (request.getContentLength() >= 0) {
-            return request.getContentLength();
-        }
-        
-        return compressionEnabled ? -1 : request.getFile().length();
+        return request.getContentLength() >= 0
+                ? request.getContentLength()
+                : request.getFile().length();
     }
 
     // --------------------------------------------------------- Private Methods

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

@@ -17,7 +17,6 @@
 
 import org.asynchttpclient.Param;
 import org.asynchttpclient.Request;
-import org.asynchttpclient.providers.grizzly.GrizzlyAsyncHttpProvider;
 import org.glassfish.grizzly.Buffer;
 import org.glassfish.grizzly.filterchain.FilterChainContext;
 import org.glassfish.grizzly.http.HttpContent;
@@ -32,12 +31,6 @@
 
 public final class ParamsBodyHandler extends BodyHandler {
 
-    private final boolean compressionEnabled;
-
-    public ParamsBodyHandler(GrizzlyAsyncHttpProvider grizzlyAsyncHttpProvider) {
-        compressionEnabled = grizzlyAsyncHttpProvider.getClientConfig().isCompressionEnforced();
-    }
-
     // -------------------------------------------- Methods from BodyHandler
 
     public boolean handlesBodyType(final Request request) {
@@ -71,13 +64,13 @@ public boolean doHandle(final FilterChainContext ctx, final Request request, fin
             final byte[] data = sb.toString().getBytes(charset);
             final MemoryManager mm = ctx.getMemoryManager();
             final Buffer gBuffer = Buffers.wrap(mm, data);
-            final HttpContent content = requestPacket.httpContentBuilder().content(gBuffer).build();
+            final HttpContent content = requestPacket.httpContentBuilder()
+                    .content(gBuffer)
+                    .last(true)
+                    .build();
             if (requestPacket.getContentLength() == -1) {
-                if (!compressionEnabled) {
-                    requestPacket.setContentLengthLong(data.length);
-                }
+                requestPacket.setContentLengthLong(data.length);
             }
-            content.setLast(true);
             ctx.write(content, ((!requestPacket.isCommitted()) ? ctx.getTransportContext().getCompletionHandler() : null));
         }
         return true;

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

@@ -14,7 +14,6 @@
 package org.asynchttpclient.providers.grizzly.bodyhandler;
 
 import org.asynchttpclient.Request;
-import org.asynchttpclient.providers.grizzly.GrizzlyAsyncHttpProvider;
 import org.glassfish.grizzly.Buffer;
 import org.glassfish.grizzly.filterchain.FilterChainContext;
 import org.glassfish.grizzly.http.HttpContent;
@@ -26,12 +25,6 @@
 import java.io.IOException;
 
 public final class StringBodyHandler extends BodyHandler {
-    private final GrizzlyAsyncHttpProvider grizzlyAsyncHttpProvider;
-
-    public StringBodyHandler(GrizzlyAsyncHttpProvider grizzlyAsyncHttpProvider) {
-        this.grizzlyAsyncHttpProvider = grizzlyAsyncHttpProvider;
-    }
-
     // -------------------------------------------- Methods from BodyHandler
 
     public boolean handlesBodyType(final Request request) {
@@ -49,12 +42,12 @@ public boolean doHandle(final FilterChainContext ctx, final Request request, fin
         final MemoryManager mm = ctx.getMemoryManager();
         final Buffer gBuffer = Buffers.wrap(mm, data);
         if (requestPacket.getContentLength() == -1) {
-            if (!grizzlyAsyncHttpProvider.getClientConfig().isCompressionEnforced()) {
-                requestPacket.setContentLengthLong(data.length);
-            }
+            requestPacket.setContentLengthLong(data.length);
         }
-        final HttpContent content = requestPacket.httpContentBuilder().content(gBuffer).build();
-        content.setLast(true);
+        final HttpContent content = requestPacket.httpContentBuilder()
+                .content(gBuffer)
+                .last(true)
+                .build();
         ctx.write(content, ((!requestPacket.isCommitted()) ? ctx.getTransportContext().getCompletionHandler() : null));
         return true;
     }