perf: avoid writing full body to an intermediate string

OpenFeign · Sep 26, 2023 · 818a242 · 818a242
1 parent b5e6809
commit 818a242
Showing 1 changed file with 5 additions and 17 deletions.
diff --git a/moshi/src/main/java/feign/moshi/MoshiDecoder.java b/moshi/src/main/java/feign/moshi/MoshiDecoder.java
@@ -13,19 +13,17 @@
  */
 package feign.moshi;
 
-import com.google.common.io.CharStreams;
 import com.squareup.moshi.JsonAdapter;
 import com.squareup.moshi.JsonDataException;
-import com.squareup.moshi.JsonEncodingException;
 import com.squareup.moshi.Moshi;
 import feign.Response;
 import feign.Util;
 import feign.codec.Decoder;
+import okio.BufferedSource;
+import okio.Okio;
+
 import java.io.IOException;
-import java.io.Reader;
 import java.lang.reflect.Type;
-import static feign.Util.UTF_8;
-import static feign.Util.ensureClosed;
 
 public class MoshiDecoder implements Decoder {
   private final Moshi moshi;
@@ -42,7 +40,6 @@ public MoshiDecoder(Iterable<JsonAdapter<?>> adapters) {
     this(MoshiFactory.create(adapters));
   }
 
-
   @Override
   public Object decode(Response response, Type type) throws IOException {
     JsonAdapter<Object> jsonAdapter = moshi.adapter(type);
@@ -52,23 +49,14 @@ public Object decode(Response response, Type type) throws IOException {
     if (response.body() == null)
       return null;
 
-    Reader reader = response.body().asReader(UTF_8);
-
-    try {
-      return parseJson(jsonAdapter, reader);
+    try (BufferedSource source = Okio.buffer(Okio.source(response.body().asInputStream()))) {
+      return jsonAdapter.fromJson(source);
     } catch (JsonDataException e) {
       if (e.getCause() != null && e.getCause() instanceof IOException) {
         throw (IOException) e.getCause();
       }
       throw e;
-    } finally {
-      ensureClosed(reader);
     }
   }
 
-  private Object parseJson(JsonAdapter<Object> jsonAdapter, Reader reader) throws IOException {
-    String targetString = CharStreams.toString(reader);
-    return jsonAdapter.fromJson(targetString);
-  }
 }
-