Unzip/Deflate content on error status for Default Client (#2184)

* Unzip/Deflate content on error status for Default Client * Fix assert message --------- Co-authored-by: Marvin Froeder <[email protected]>
OpenFeign · Oct 20, 2023 · ccfee12 · ccfee12
1 parent d22a1f3
commit ccfee12
Show file tree

Hide file tree

Showing 5 changed files with 89 additions and 7 deletions.
diff --git a/core/src/main/java/feign/Client.java b/core/src/main/java/feign/Client.java
@@ -135,13 +135,12 @@ Response convertResponse(HttpURLConnection connection, Request request) throws I
       if (status >= 400) {
         stream = connection.getErrorStream();
       } else {
-        if (this.isGzip(headers.get(CONTENT_ENCODING))) {
-          stream = new GZIPInputStream(connection.getInputStream());
-        } else if (this.isDeflate(headers.get(CONTENT_ENCODING))) {
-          stream = new InflaterInputStream(connection.getInputStream());
-        } else {
-          stream = connection.getInputStream();
-        }
+        stream = connection.getInputStream();
+      }
+      if (this.isGzip(headers.get(CONTENT_ENCODING))) {
+        stream = new GZIPInputStream(stream);
+      } else if (this.isDeflate(headers.get(CONTENT_ENCODING))) {
+        stream = new InflaterInputStream(stream);
       }
       return Response.builder()
           .status(status)

diff --git a/core/src/test/java/feign/client/AbstractClientTest.java b/core/src/test/java/feign/client/AbstractClientTest.java
@@ -17,6 +17,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.entry;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
 import feign.Client;
 import feign.CollectionFormat;
@@ -420,6 +421,32 @@ public void canSupportGzip() throws Exception {
     assertThat(result).isNotNull().isEqualToIgnoringCase(responseData);
   }
 
+  @Test
+  public void canSupportGzipOnError() throws Exception {
+    /* enqueue a zipped response */
+    final String responseData = "Compressed Data";
+    server.enqueue(
+        new MockResponse()
+            .setResponseCode(400)
+            .addHeader("Content-Encoding", "gzip")
+            .setBody(new Buffer().write(compress(responseData))));
+
+    TestInterface api =
+        newBuilder().target(TestInterface.class, "http://localhost:" + server.getPort());
+
+    try {
+      api.get();
+      fail("Expect FeignException");
+    } catch (FeignException e) {
+      /* verify that the response is unzipped */
+      assertThat(e.responseBody())
+          .isNotEmpty()
+          .map(body -> new String(body.array(), StandardCharsets.UTF_8))
+          .get()
+          .isEqualTo(responseData);
+    }
+  }
+
   @Test
   public void canSupportDeflate() throws Exception {
     /* enqueue a zipped response */
@@ -438,6 +465,32 @@ public void canSupportDeflate() throws Exception {
     assertThat(result).isNotNull().isEqualToIgnoringCase(responseData);
   }
 
+  @Test
+  public void canSupportDeflateOnError() throws Exception {
+    /* enqueue a zipped response */
+    final String responseData = "Compressed Data";
+    server.enqueue(
+        new MockResponse()
+            .setResponseCode(400)
+            .addHeader("Content-Encoding", "deflate")
+            .setBody(new Buffer().write(deflate(responseData))));
+
+    TestInterface api =
+        newBuilder().target(TestInterface.class, "http://localhost:" + server.getPort());
+
+    try {
+      api.get();
+      fail("Expect FeignException");
+    } catch (FeignException e) {
+      /* verify that the response is unzipped */
+      assertThat(e.responseBody())
+          .isNotEmpty()
+          .map(body -> new String(body.array(), StandardCharsets.UTF_8))
+          .get()
+          .isEqualTo(responseData);
+    }
+  }
+
   @Test
   public void canExceptCaseInsensitiveHeader() throws Exception {
     /* enqueue a zipped response */

diff --git a/googlehttpclient/src/test/java/feign/googlehttpclient/GoogleHttpClientTest.java b/googlehttpclient/src/test/java/feign/googlehttpclient/GoogleHttpClientTest.java
@@ -54,11 +54,21 @@ public void canSupportGzip() throws Exception {
     assumeFalse("Google HTTP client client do not support gzip compression", false);
   }
 
+  @Override
+  public void canSupportGzipOnError() throws Exception {
+    assumeFalse("Google HTTP client client do not support gzip compression", false);
+  }
+
   @Override
   public void canSupportDeflate() throws Exception {
     assumeFalse("Google HTTP client client do not support deflate compression", false);
   }
 
+  @Override
+  public void canSupportDeflateOnError() throws Exception {
+    assumeFalse("Google HTTP client client do not support deflate compression", false);
+  }
+
   @Override
   public void canExceptCaseInsensitiveHeader() throws Exception {
     assumeFalse("Google HTTP client client do not support gzip compression", false);

diff --git a/jaxrs2/src/test/java/feign/jaxrs2/JAXRSClientTest.java b/jaxrs2/src/test/java/feign/jaxrs2/JAXRSClientTest.java
@@ -159,11 +159,21 @@ public void canSupportGzip() throws Exception {
     assumeFalse("JaxRS client do not support gzip compression", false);
   }
 
+  @Override
+  public void canSupportGzipOnError() throws Exception {
+    assumeFalse("JaxRS client do not support gzip compression", false);
+  }
+
   @Override
   public void canSupportDeflate() throws Exception {
     assumeFalse("JaxRS client do not support deflate compression", false);
   }
 
+  @Override
+  public void canSupportDeflateOnError() throws Exception {
+    assumeFalse("JaxRS client do not support deflate compression", false);
+  }
+
   @Override
   public void canExceptCaseInsensitiveHeader() throws Exception {
     assumeFalse("JaxRS client do not support gzip compression", false);

diff --git a/okhttp/src/test/java/feign/okhttp/OkHttpClientTest.java b/okhttp/src/test/java/feign/okhttp/OkHttpClientTest.java
@@ -115,11 +115,21 @@ public void canSupportGzip() throws Exception {
     assumeFalse("OkHTTP client do not support gzip compression", false);
   }
 
+  @Override
+  public void canSupportGzipOnError() throws Exception {
+    assumeFalse("OkHTTP client do not support gzip compression", false);
+  }
+
   @Override
   public void canSupportDeflate() throws Exception {
     assumeFalse("OkHTTP client do not support deflate compression", false);
   }
 
+  @Override
+  public void canSupportDeflateOnError() throws Exception {
+    assumeFalse("OkHTTP client do not support deflate compression", false);
+  }
+
   @Override
   public void canExceptCaseInsensitiveHeader() throws Exception {
     assumeFalse("OkHTTP client do not support gzip compression", false);