Also wrap the exception of Decoder.decode() in case of a 404. (#487)

OpenFeign · Nov 8, 2016 · 7b646ab · 7b646ab
1 parent 95f78cb
commit 7b646ab
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/core/src/main/java/feign/SynchronousMethodHandler.java b/core/src/main/java/feign/SynchronousMethodHandler.java
@@ -133,7 +133,7 @@ Object executeAndDecode(RequestTemplate template) throws Throwable {
           return decode(response);
         }
       } else if (decode404 && response.status() == 404) {
-        return decoder.decode(response, metadata.returnType());
+        return decode(response);
       } else {
         throw errorDecoder.decode(metadata.configKey(), response);
       }

diff --git a/core/src/test/java/feign/FeignTest.java b/core/src/test/java/feign/FeignTest.java
@@ -52,6 +52,7 @@
 
 import static feign.Util.UTF_8;
 import static feign.assertj.MockWebServerAssertions.assertThat;
+import static org.hamcrest.CoreMatchers.isA;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -546,9 +547,10 @@ public Object decode(Response response, Type type) throws IOException {
   }
 
   @Test
-  public void decoderCanThrowUnwrappedExceptionInDecode404Mode() throws Exception {
+  public void decodingExceptionGetWrappedInDecode404Mode() throws Exception {
     server.enqueue(new MockResponse().setResponseCode(404));
-    thrown.expect(NoSuchElementException.class);
+    thrown.expect(DecodeException.class);
+    thrown.expectCause(isA(NoSuchElementException.class));;
 
     TestInterface api = new TestInterfaceBuilder()
         .decode404()