Skip to content

Commit fad1f82

Browse files
author
Pritham Marupaka
committed
fix silly mistakes
1 parent bcbf495 commit fad1f82

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

dialogue-serde/src/main/java/com/palantir/conjure/java/dialogue/serde/EndpointErrorDecoder.java

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import com.google.common.collect.ImmutableList;
2121
import com.google.common.collect.ImmutableMap;
2222
import com.google.common.collect.Maps;
23-
import com.google.common.io.CharStreams;
2423
import com.google.common.net.HttpHeaders;
2524
import com.google.common.primitives.Longs;
2625
import com.palantir.conjure.java.api.errors.QosException;
@@ -43,8 +42,6 @@
4342
import java.io.ByteArrayInputStream;
4443
import java.io.IOException;
4544
import java.io.InputStream;
46-
import java.io.InputStreamReader;
47-
import java.io.Reader;
4845
import java.net.MalformedURLException;
4946
import java.net.URL;
5047
import java.nio.charset.StandardCharsets;
@@ -71,6 +68,8 @@ final class EndpointErrorDecoder<T> {
7168
private static final Encoding JSON_ENCODING = Encodings.json();
7269
private static final Deserializer<NamedError> NAMED_ERROR_DESERIALIZER =
7370
JSON_ENCODING.deserializer(new TypeMarker<>() {});
71+
private static final Deserializer<SerializableError> SERIALIZABLE_ERROR_DESERIALIZER =
72+
JSON_ENCODING.deserializer(new TypeMarker<>() {});
7473
private final Map<String, Encoding.Deserializer<? extends T>> errorNameToJsonDeserializerMap;
7574

7675
EndpointErrorDecoder(Map<String, TypeMarker<? extends T>> errorNameToTypeMap) {
@@ -187,15 +186,14 @@ private T decodeInternal(Response response) {
187186
}
188187

189188
private static RemoteException createRemoteException(byte[] body, int code) throws IOException {
190-
SerializableError serializableError = JSON_ENCODING
191-
.deserializer(new TypeMarker<SerializableError>() {})
192-
.deserialize(new ByteArrayInputStream(body));
189+
SerializableError serializableError =
190+
SERIALIZABLE_ERROR_DESERIALIZER.deserialize(new ByteArrayInputStream(body));
193191
return new RemoteException(serializableError, code);
194192
}
195193

196194
private static byte[] toByteArray(InputStream body) throws IOException {
197-
try (Reader reader = new InputStreamReader(body, StandardCharsets.UTF_8)) {
198-
return CharStreams.toString(reader).getBytes(StandardCharsets.UTF_8);
195+
try (body) {
196+
return body.readAllBytes();
199197
}
200198
}
201199

0 commit comments

Comments
 (0)