Use charset from response Content-Type header to decode (OpenFeign#1302)

jaime-pineiro-imatia · web-flow · commit c65d8b747a5f · 2021-02-02T23:27:42.000-05:00
* If charset is set in Content-type, we decode response using that charset

* Java 8 compatibility

* Format fix

* Moving code to get charset to Response in order to be used by another
decoders
diff --git a/core/src/main/java/feign/Response.java b/core/src/main/java/feign/Response.java
@@ -182,6 +182,25 @@ public Request request() {
     return request;
   }
 
+  public Charset charset() {
+
+    Collection<String> contentTypeHeaders = headers().get("Content-Type");
+
+    if (contentTypeHeaders != null) {
+      for (String contentTypeHeader : contentTypeHeaders) {
+        String[] contentTypeParmeters = contentTypeHeader.split(";");
+        if (contentTypeParmeters.length > 1) {
+          String[] charsetParts = contentTypeParmeters[1].split("=");
+          if (charsetParts.length == 2 && "charset".equalsIgnoreCase(charsetParts[0].trim())) {
+            return Charset.forName(charsetParts[1]);
+          }
+        }
+      }
+    }
+
+    return Util.UTF_8;
+  }
+
   @Override
   public String toString() {
     StringBuilder builder = new StringBuilder("HTTP/1.1 ").append(status);
diff --git a/jackson/src/main/java/feign/jackson/JacksonDecoder.java b/jackson/src/main/java/feign/jackson/JacksonDecoder.java
@@ -18,7 +18,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.RuntimeJsonMappingException;
 import feign.Response;
-import feign.Util;
 import feign.codec.Decoder;
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -48,7 +47,7 @@ public JacksonDecoder(ObjectMapper mapper) {
   @Override
   public Object decode(Response response, Type type) throws IOException {
     if (response.body() == null) return null;
-    Reader reader = response.body().asReader(Util.UTF_8);
+    Reader reader = response.body().asReader(response.charset());
     if (!reader.markSupported()) {
       reader = new BufferedReader(reader, 1);
     }
diff --git a/jackson/src/test/java/feign/jackson/JacksonCodecTest.java b/jackson/src/test/java/feign/jackson/JacksonCodecTest.java
@@ -35,9 +35,12 @@
 import feign.Util;
 import java.io.Closeable;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
@@ -205,6 +208,38 @@ public void customEncoder() {
                 + "} ]");
   }
 
+  @Test
+  public void decoderCharset() throws IOException {
+    Zone zone = new Zone("denominator.io.", "ÁÉÍÓÚÀÈÌÒÙÄËÏÖÜÑ");
+
+    Map<String, Collection<String>> headers = new HashMap<String, Collection<String>>();
+    headers.put("Content-Type", Arrays.asList("application/json;charset=ISO-8859-1"));
+
+    Response response =
+        Response.builder()
+            .status(200)
+            .reason("OK")
+            .request(
+                Request.create(HttpMethod.GET, "/api", Collections.emptyMap(), null, Util.UTF_8))
+            .headers(headers)
+            .body(
+                new String(
+                        "" //
+                            + "{"
+                            + System.lineSeparator()
+                            + "  \"name\" : \"DENOMINATOR.IO.\","
+                            + System.lineSeparator()
+                            + "  \"id\" : \"ÁÉÍÓÚÀÈÌÒÙÄËÏÖÜÑ\""
+                            + System.lineSeparator()
+                            + "}")
+                    .getBytes(StandardCharsets.ISO_8859_1))
+            .build();
+    assertEquals(
+        zone.get("id"),
+        ((Zone) new JacksonDecoder().decode(response, new TypeReference<Zone>() {}.getType()))
+            .get("id"));
+  }
+
   @Test
   public void decodesIterator() throws Exception {
     List<Zone> zones = new LinkedList<Zone>();
