support charset when build Reader for Response.Body (#766)

* add charset to Response.Body when create Reader

* format

* support charset when build Reader for Response.Body

* support charset when build Reader for Response.Body

* support charset when build Reader for Response.Body

* format header

* format Response

Author: arebya

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

@@ -218,6 +218,9 @@ public interface Body extends Closeable {
 
     /** It is the responsibility of the caller to close the stream. */
     Reader asReader() throws IOException;
+
+    /** */
+    Reader asReader(Charset charset) throws IOException;
   }
 
   private static final class InputStreamBody implements Response.Body {
@@ -257,6 +260,12 @@ public Reader asReader() throws IOException {
       return new InputStreamReader(inputStream, UTF_8);
     }
 
+    @Override
+    public Reader asReader(Charset charset) throws IOException {
+      checkNotNull(charset, "charset should not be null");
+      return new InputStreamReader(inputStream, charset);
+    }
+
     @Override
     public void close() throws IOException {
       inputStream.close();
@@ -306,6 +315,12 @@ public Reader asReader() throws IOException {
       return new InputStreamReader(asInputStream(), UTF_8);
     }
 
+    @Override
+    public Reader asReader(Charset charset) throws IOException {
+      checkNotNull(charset, "charset should not be null");
+      return new InputStreamReader(asInputStream(), charset);
+    }
+
     @Override
     public void close() throws IOException {}
 

core/src/test/java/feign/FeignBuilderTest.java

@@ -28,6 +28,7 @@
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
+import java.nio.charset.Charset;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
@@ -402,6 +403,11 @@ public Reader asReader() throws IOException {
                                 return original.body().asReader();
                               }
 
+                              @Override
+                              public Reader asReader(Charset charset) throws IOException {
+                                return original.body().asReader(charset);
+                              }
+
                               @Override
                               public void close() throws IOException {
                                 closed.set(true);

httpclient/src/main/java/feign/httpclient/ApacheHttpClient.java

@@ -27,6 +27,7 @@
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -226,6 +227,12 @@ public Reader asReader() throws IOException {
         return new InputStreamReader(asInputStream(), UTF_8);
       }
 
+      @Override
+      public Reader asReader(Charset charset) throws IOException {
+        Util.checkNotNull(charset, "charset should not be null");
+        return new InputStreamReader(asInputStream(), charset);
+      }
+
       @Override
       public void close() throws IOException {
         EntityUtils.consume(entity);

okhttp/src/main/java/feign/okhttp/OkHttpClient.java

@@ -17,6 +17,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
+import java.nio.charset.Charset;
 import java.util.Collection;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -143,6 +144,11 @@ public InputStream asInputStream() throws IOException {
       public Reader asReader() throws IOException {
         return input.charStream();
       }
+
+      @Override
+      public Reader asReader(Charset charset) throws IOException {
+        return asReader();
+      }
     };
   }