Adds deflate encoding support

santhosh-tekuri · santhosh-tekuri · commit 2d06330b49c4 · 2015-05-10T19:41:14.000+05:30
diff --git a/core/src/main/java/feign/Client.java b/core/src/main/java/feign/Client.java
@@ -24,6 +24,7 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.zip.DeflaterOutputStream;
 import java.util.zip.GZIPOutputStream;
 
 import javax.net.ssl.HostnameVerifier;
@@ -34,6 +35,7 @@
 
 import static feign.Util.CONTENT_ENCODING;
 import static feign.Util.CONTENT_LENGTH;
+import static feign.Util.ENCODING_DEFLATE;
 import static feign.Util.ENCODING_GZIP;
 
 /**
@@ -93,6 +95,9 @@ HttpURLConnection convertAndSend(Request request, Options options) throws IOExce
       boolean
           gzipEncodedRequest =
           contentEncodingValues != null && contentEncodingValues.contains(ENCODING_GZIP);
+      boolean
+          deflateEncodedRequest =
+          contentEncodingValues != null && contentEncodingValues.contains(ENCODING_DEFLATE);
 
       boolean hasAcceptHeader = false;
       Integer contentLength = null;
@@ -102,7 +107,7 @@ HttpURLConnection convertAndSend(Request request, Options options) throws IOExce
         }
         for (String value : request.headers().get(field)) {
           if (field.equals(CONTENT_LENGTH)) {
-            if (!gzipEncodedRequest) {
+            if (!gzipEncodedRequest && !deflateEncodedRequest) {
               contentLength = Integer.valueOf(value);
               connection.addRequestProperty(field, value);
             }
@@ -126,6 +131,8 @@ HttpURLConnection convertAndSend(Request request, Options options) throws IOExce
         OutputStream out = connection.getOutputStream();
         if (gzipEncodedRequest) {
           out = new GZIPOutputStream(out);
+        } else if (deflateEncodedRequest) {
+          out = new DeflaterOutputStream(out);
         }
         try {
           out.write(request.body());
diff --git a/core/src/main/java/feign/Util.java b/core/src/main/java/feign/Util.java
@@ -57,6 +57,10 @@ public class Util {
    * Value for the Content-Encoding header that indicates that GZIP encoding is in use.
    */
   public static final String ENCODING_GZIP = "gzip";
+  /**
+   * Value for the Content-Encoding header that indicates that DEFLATE encoding is in use.
+   */
+  public static final String ENCODING_DEFLATE = "deflate";
   /**
    * UTF-8: eight-bit UCS Transformation Format.
    */
diff --git a/core/src/test/java/feign/FeignTest.java b/core/src/test/java/feign/FeignTest.java
@@ -156,6 +156,19 @@ public void postGZIPEncodedBodyParam() throws Exception {
         .hasGzippedBody("[netflix, denominator, password]".getBytes(UTF_8));
   }
 
+  @Test
+  public void postDeflateEncodedBodyParam() throws Exception {
+    server.enqueue(new MockResponse().setBody("foo"));
+
+    TestInterface api = new TestInterfaceBuilder().target("http://localhost:" + server.getPort());
+
+    api.deflateBody(Arrays.asList("netflix", "denominator", "password"));
+
+    assertThat(server.takeRequest())
+        .hasNoHeaderNamed("Content-Length")
+        .hasDeflatedBody("[netflix, denominator, password]".getBytes(UTF_8));
+  }
+
   @Test
   public void singleInterceptor() throws Exception {
     server.enqueue(new MockResponse().setBody("foo"));
@@ -409,6 +422,10 @@ void login(
     @Headers("Content-Encoding: gzip")
     void gzipBody(List<String> contents);
 
+    @RequestLine("POST /")
+    @Headers("Content-Encoding: deflate")
+    void deflateBody(List<String> contents);
+
     @RequestLine("POST /")
     void form(
         @Param("customer_name") String customer, @Param("user_name") String user,
diff --git a/core/src/test/java/feign/assertj/RecordedRequestAssert.java b/core/src/test/java/feign/assertj/RecordedRequestAssert.java
@@ -28,6 +28,7 @@
 import java.util.LinkedHashSet;
 import java.util.Set;
 import java.util.zip.GZIPInputStream;
+import java.util.zip.InflaterInputStream;
 
 import feign.Util;
 
@@ -77,6 +78,20 @@ public RecordedRequestAssert hasGzippedBody(byte[] expectedUncompressed) {
     return this;
   }
 
+  public RecordedRequestAssert hasDeflatedBody(byte[] expectedUncompressed) {
+    isNotNull();
+    byte[] compressedBody = actual.getBody();
+    byte[] uncompressedBody;
+    try {
+      uncompressedBody =
+          Util.toByteArray(new InflaterInputStream(new ByteArrayInputStream(compressedBody)));
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+    arrays.assertContains(info, uncompressedBody, expectedUncompressed);
+    return this;
+  }
+
   public RecordedRequestAssert hasBody(byte[] expected) {
     isNotNull();
     arrays.assertContains(info, actual.getBody(), expected);
