Adding Deflate support

Author: kdavisk6

core/src/main/java/feign/Client.java

@@ -34,9 +34,11 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.zip.DeflaterInputStream;
 import java.util.zip.DeflaterOutputStream;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
+import java.util.zip.InflaterInputStream;
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLSocketFactory;
@@ -132,6 +134,8 @@ Response convertResponse(HttpURLConnection connection, Request request) throws I
       } else {
         if (this.isGzip(connection)) {
           stream = new GZIPInputStream(connection.getInputStream());
+        } else if (this.isDeflate(connection)) {
+          stream = new InflaterInputStream(connection.getInputStream());
         } else {
           stream = connection.getInputStream();
         }
@@ -223,9 +227,17 @@ HttpURLConnection convertAndSend(Request request, Options options) throws IOExce
     }
 
     private boolean isGzip(HttpURLConnection connection) {
-      String contentEncoding = connection.getHeaderField("Content-Encoding");
+      String contentEncoding = connection.getHeaderField(CONTENT_ENCODING);
       if (Util.isNotBlank(contentEncoding)) {
-        return contentEncoding.equalsIgnoreCase("gzip");
+        return contentEncoding.equalsIgnoreCase(ENCODING_GZIP);
+      }
+      return false;
+    }
+
+    private boolean isDeflate(HttpURLConnection connection) {
+      String contentEncoding = connection.getHeaderField(CONTENT_ENCODING);
+      if (Util.isNotBlank(contentEncoding)) {
+        return contentEncoding.equalsIgnoreCase(ENCODING_DEFLATE);
       }
       return false;
     }

core/src/main/java/feign/Response.java

@@ -284,14 +284,6 @@ public void close() throws IOException {
       inputStream.close();
     }
 
-    @Override
-    public String toString() {
-      try {
-        return new String(toByteArray(inputStream), UTF_8);
-      } catch (Exception e) {
-        return super.toString();
-      }
-    }
   }
 
   private static final class ByteArrayBody implements Response.Body {
@@ -347,10 +339,6 @@ public Reader asReader(Charset charset) throws IOException {
     @Override
     public void close() throws IOException {}
 
-    @Override
-    public String toString() {
-      return decodeOrDefault(data, UTF_8, "Binary data");
-    }
   }
 
   private static Map<String, Collection<String>> caseInsensitiveCopyOf(Map<String, Collection<String>> headers) {

core/src/test/java/feign/client/DefaultClientTest.java

@@ -27,6 +27,7 @@
 import java.net.SocketAddress;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
+import java.util.zip.DeflaterOutputStream;
 import java.util.zip.GZIPOutputStream;
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLSession;
@@ -169,13 +170,40 @@ public void canSupportGzip() throws Exception {
 
   }
 
+  @Test
+  public void canSupportDeflate() throws Exception {
+    /* enqueue a zipped response */
+    final String responseData = "Compressed Data";
+    server.enqueue(new MockResponse()
+        .addHeader("Content-Encoding", "deflate")
+        .setBody(new Buffer().write(deflate(responseData))));
+
+    TestInterface api = newBuilder()
+        .target(TestInterface.class, "http://localhost:" + server.getPort());
+
+    String result = api.get();
+
+    /* verify that the response is unzipped */
+    assertThat(result).isNotNull()
+        .isEqualToIgnoringCase(responseData);
+
+  }
+
   private byte[] compress(String data) throws Exception {
     try (ByteArrayOutputStream bos = new ByteArrayOutputStream(data.length())) {
       GZIPOutputStream gzipOutputStream = new GZIPOutputStream(bos);
       gzipOutputStream.write(data.getBytes(StandardCharsets.UTF_8), 0, data.length());
       gzipOutputStream.close();
       return bos.toByteArray();
     }
+  }
 
+  private byte[] deflate(String data) throws Exception {
+    try (ByteArrayOutputStream bos = new ByteArrayOutputStream(data.length())) {
+      DeflaterOutputStream deflaterOutputStream = new DeflaterOutputStream(bos);
+      deflaterOutputStream.write(data.getBytes(StandardCharsets.UTF_8), 0, data.length());
+      deflaterOutputStream.close();
+      return bos.toByteArray();
+    }
   }
 }