Fix standard decoders trying to decode body on 404 with decode404 set

gson/src/main/java/feign/gson/GsonDecoder.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2012-2020 The Feign Authors
+ * Copyright 2012-2021 The Feign Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -43,7 +43,7 @@ public GsonDecoder(Gson gson) {
 
   @Override
   public Object decode(Response response, Type type) throws IOException {
-    if (response.body() == null)
+    if (response.status() == 404 || response.body() == null)
       return null;
     Reader reader = response.body().asReader(UTF_8);
     try {

gson/src/test/java/feign/gson/GsonCodecTest.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2012-2020 The Feign Authors
+ * Copyright 2012-2021 The Feign Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -22,6 +22,7 @@
 import feign.Util;
 import org.junit.Test;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedHashMap;
@@ -237,4 +238,17 @@ public void notFoundDecodesToNull() throws Exception {
         .build();
     assertThat((byte[]) new GsonDecoder().decode(response, byte[].class)).isNull();
   }
+
+  /** Enabled via {@link feign.Feign.Builder#decode404()} */
+  @Test
+  public void notFoundWithBodyDecodesToNull() throws Exception {
+    Response response = Response.builder()
+        .status(404)
+        .reason("NOT FOUND")
+        .request(Request.create(HttpMethod.GET, "/api", Collections.emptyMap(), null, Util.UTF_8))
+        .headers(Collections.emptyMap())
+        .body("description explaining the 404", StandardCharsets.UTF_8)
+        .build();
+    assertThat((byte[]) new GsonDecoder().decode(response, byte[].class)).isNull();
+  }
 }

jackson-jaxb/src/main/java/feign/jackson/jaxb/JacksonJaxbJsonDecoder.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2012-2020 The Feign Authors
+ * Copyright 2012-2021 The Feign Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -36,7 +36,7 @@ public JacksonJaxbJsonDecoder(ObjectMapper objectMapper) {
 
   @Override
   public Object decode(Response response, Type type) throws IOException, FeignException {
-    if (response.body() == null)
+    if (response.status() == 404 || response.body() == null)
       return null;
     return jacksonJaxbJsonProvider.readFrom(Object.class, type, null, APPLICATION_JSON_TYPE, null,
         response.body().asInputStream());

jackson-jaxb/src/test/java/feign/jackson/jaxb/JacksonJaxbCodecTest.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2012-2020 The Feign Authors
+ * Copyright 2012-2021 The Feign Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -20,6 +20,7 @@
 import feign.RequestTemplate;
 import feign.Response;
 import feign.Util;
+import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -69,6 +70,21 @@ public void notFoundDecodesToNull() throws Exception {
     assertThat((byte[]) new JacksonJaxbJsonDecoder().decode(response, byte[].class)).isNull();
   }
 
+  /**
+   * Enabled via {@link feign.Feign.Builder#decode404()}
+   */
+  @Test
+  public void notFoundWithBodyDecodesToNull() throws Exception {
+    Response response = Response.builder()
+        .status(404)
+        .reason("NOT FOUND")
+        .request(Request.create(HttpMethod.GET, "/api", Collections.emptyMap(), null, Util.UTF_8))
+        .headers(Collections.emptyMap())
+        .body("description explaining the 404", StandardCharsets.UTF_8)
+        .build();
+    assertThat((byte[]) new JacksonJaxbJsonDecoder().decode(response, byte[].class)).isNull();
+  }
+
   @XmlRootElement
   @XmlAccessorType(XmlAccessType.FIELD)
   static class MockObject {

jackson/src/main/java/feign/jackson/JacksonDecoder.java

@@ -47,7 +47,7 @@ public JacksonDecoder(ObjectMapper mapper) {
 
   @Override
   public Object decode(Response response, Type type) throws IOException {
-    if (response.body() == null)
+    if (response.status() == 404 || response.body() == null)
       return null;
     Reader reader = response.body().asReader(response.charset());
     if (!reader.markSupported()) {

jackson/src/main/java/feign/jackson/JacksonIteratorDecoder.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2012-2020 The Feign Authors
+ * Copyright 2012-2021 The Feign Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -64,7 +64,7 @@ public final class JacksonIteratorDecoder implements Decoder {
 
   @Override
   public Object decode(Response response, Type type) throws IOException {
-    if (response.body() == null)
+    if (response.status() == 404 || response.body() == null)
       return null;
     Reader reader = response.body().asReader(UTF_8);
     if (!reader.markSupported()) {

jackson/src/test/java/feign/jackson/JacksonCodecTest.java

@@ -316,6 +316,19 @@ public void notFoundDecodesToNull() throws Exception {
     assertThat((byte[]) new JacksonDecoder().decode(response, byte[].class)).isNull();
   }
 
+  /** Enabled via {@link feign.Feign.Builder#decode404()} */
+  @Test
+  public void notFoundWithBodyDecodesToNull() throws Exception {
+    Response response = Response.builder()
+        .status(404)
+        .reason("NOT FOUND")
+        .request(Request.create(HttpMethod.GET, "/api", Collections.emptyMap(), null, Util.UTF_8))
+        .headers(Collections.emptyMap())
+        .body("description explaining the 404", StandardCharsets.UTF_8)
+        .build();
+    assertThat((byte[]) new JacksonDecoder().decode(response, byte[].class)).isNull();
+  }
+
   /** Enabled via {@link feign.Feign.Builder#decode404()} */
   @Test
   public void notFoundDecodesToNullIterator() throws Exception {
@@ -327,4 +340,17 @@ public void notFoundDecodesToNullIterator() throws Exception {
         .build();
     assertThat((byte[]) JacksonIteratorDecoder.create().decode(response, byte[].class)).isNull();
   }
+
+  /** Enabled via {@link feign.Feign.Builder#decode404()} */
+  @Test
+  public void notFoundWithBodyDecodesToNullIterator() throws Exception {
+    Response response = Response.builder()
+        .status(404)
+        .reason("NOT FOUND")
+        .request(Request.create(HttpMethod.GET, "/api", Collections.emptyMap(), null, Util.UTF_8))
+        .headers(Collections.emptyMap())
+        .body("description explaining the 404", StandardCharsets.UTF_8)
+        .build();
+    assertThat((byte[]) JacksonIteratorDecoder.create().decode(response, byte[].class)).isNull();
+  }
 }

jaxb/src/main/java/feign/jaxb/JAXBDecoder.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2012-2020 The Feign Authors
+ * Copyright 2012-2021 The Feign Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -66,7 +66,7 @@ private JAXBDecoder(Builder builder) {
   public Object decode(Response response, Type type) throws IOException {
     if (response.status() == 204)
       return Util.emptyValueOf(type);
-    if (response.body() == null)
+    if (response.status() == 404 || response.body() == null)
       return null;
     while (type instanceof ParameterizedType) {
       ParameterizedType ptype = (ParameterizedType) type;

jaxb/src/test/java/feign/jaxb/JAXBCodecTest.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2012-2020 The Feign Authors
+ * Copyright 2012-2021 The Feign Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -23,6 +23,7 @@
 import feign.Util;
 import feign.codec.Encoder;
 import java.lang.reflect.Type;
+import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
@@ -256,6 +257,22 @@ public void notFoundDecodesToNull() throws Exception {
         .decode(response, byte[].class)).isNull();
   }
 
+  /**
+   * Enabled via {@link feign.Feign.Builder#decode404()}
+   */
+  @Test
+  public void notFoundWithBodyDecodesToNull() throws Exception {
+    Response response = Response.builder()
+        .status(404)
+        .reason("NOT FOUND")
+        .request(Request.create(HttpMethod.GET, "/api", Collections.emptyMap(), null, Util.UTF_8))
+        .headers(Collections.<String, Collection<String>>emptyMap())
+        .body("description explaining the 404", StandardCharsets.UTF_8)
+        .build();
+    assertThat((byte[]) new JAXBDecoder(new JAXBContextFactory.Builder().build())
+        .decode(response, byte[].class)).isNull();
+  }
+
   @XmlRootElement
   @XmlAccessorType(XmlAccessType.FIELD)
   static class MockObject {

sax/src/main/java/feign/sax/SAXDecoder.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2012-2020 The Feign Authors
+ * Copyright 2012-2021 The Feign Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -60,7 +60,7 @@ public static Builder builder() {
 
   @Override
   public Object decode(Response response, Type type) throws IOException, DecodeException {
-    if (response.body() == null)
+    if (response.status() == 404 || response.body() == null)
       return null;
     ContentHandlerWithResult.Factory<?> handlerFactory = handlerFactories.get(type);
     checkState(handlerFactory != null, "type %s not in configured handlers %s", type,

sax/src/test/java/feign/sax/SAXDecoderTest.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2012-2020 The Feign Authors
+ * Copyright 2012-2021 The Feign Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -21,6 +21,7 @@
 import org.junit.rules.ExpectedException;
 import org.xml.sax.helpers.DefaultHandler;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.util.Collection;
 import java.util.Collections;
@@ -105,6 +106,19 @@ public void notFoundDecodesToNull() throws Exception {
     assertThat((byte[]) decoder.decode(response, byte[].class)).isNull();
   }
 
+  /** Enabled via {@link feign.Feign.Builder#decode404()} */
+  @Test
+  public void notFoundWithBodyDecodesToNull() throws Exception {
+    Response response = Response.builder()
+        .status(404)
+        .reason("NOT FOUND")
+        .request(Request.create(HttpMethod.GET, "/api", Collections.emptyMap(), null, Util.UTF_8))
+        .headers(Collections.<String, Collection<String>>emptyMap())
+        .body("description explaining the 404", StandardCharsets.UTF_8)
+        .build();
+    assertThat((byte[]) decoder.decode(response, byte[].class)).isNull();
+  }
+
   static enum NetworkStatus {
     GOOD, FAILED;
   }

soap/src/test/java/feign/soap/SOAPCodecTest.java

@@ -384,6 +384,22 @@ public void notFoundDecodesToNull() throws Exception {
         .decode(response, byte[].class)).isNull();
   }
 
+  /**
+   * Enabled via {@link feign.Feign.Builder#decode404()}
+   */
+  @Test
+  public void notFoundWithBodyDecodesToNull() throws Exception {
+    Response response = Response.builder()
+        .status(404)
+        .reason("NOT FOUND")
+        .request(Request.create(HttpMethod.GET, "/api", Collections.emptyMap(), null, Util.UTF_8))
+        .headers(Collections.emptyMap())
+        .body("description explaining the 404", StandardCharsets.UTF_8)
+        .build();
+    assertThat((byte[]) new JAXBDecoder(new JAXBContextFactory.Builder().build())
+        .decode(response, byte[].class)).isNull();
+  }
+
 
   @XmlRootElement(name = "GetPrice")
   @XmlAccessorType(XmlAccessType.FIELD)