Skip to content

Commit adb2ea4

Browse files
authored
fix: JSON spec mandates UTF-8 (#1220)
1 parent f605679 commit adb2ea4

File tree

1 file changed

+2
-4
lines changed
  • google-http-client-gson/src/main/java/com/google/api/client/json/gson

1 file changed

+2
-4
lines changed

google-http-client-gson/src/main/java/com/google/api/client/json/gson/GsonFactory.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import com.google.api.client.json.JsonGenerator;
1919
import com.google.api.client.json.JsonParser;
2020
import com.google.api.client.util.Beta;
21-
import com.google.api.client.util.Charsets;
2221
import com.google.gson.stream.JsonReader;
2322
import com.google.gson.stream.JsonWriter;
2423
import java.io.InputStream;
@@ -29,6 +28,7 @@
2928
import java.io.StringReader;
3029
import java.io.Writer;
3130
import java.nio.charset.Charset;
31+
import java.nio.charset.StandardCharsets;
3232

3333
/**
3434
* Low-level JSON library implementation based on GSON.
@@ -60,9 +60,7 @@ static class InstanceHolder {
6060

6161
@Override
6262
public JsonParser createJsonParser(InputStream in) {
63-
// TODO(mlinder): Parser should try to detect the charset automatically when using GSON
64-
// https://github.com/googleapis/google-http-java-client/issues/6
65-
return createJsonParser(new InputStreamReader(in, Charsets.UTF_8));
63+
return createJsonParser(new InputStreamReader(in, StandardCharsets.UTF_8));
6664
}
6765

6866
@Override

0 commit comments

Comments
 (0)