Specify charset when constructing InputStreamReader
ErrorProne warns [1] about implicit use of the platform default charset, which can result in differing behaviour between JVM executions or incorrect behavior if the encoding of the data source doesn't match expectations. [1] http://errorprone.info/bugpattern/DefaultCharset Change-Id: I0fd489d352170339c3867355cd24324dfdbd4b59 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
This commit is contained in:
parent
c9e4359c7c
commit
a3cb474c94
|
@ -221,7 +221,7 @@ private Map<String, LfsPointer> requestBatchUpload(HttpConnection api,
|
||||||
private void uploadContents(HttpConnection api,
|
private void uploadContents(HttpConnection api,
|
||||||
Map<String, LfsPointer> oid2ptr) throws IOException {
|
Map<String, LfsPointer> oid2ptr) throws IOException {
|
||||||
try (JsonReader reader = new JsonReader(
|
try (JsonReader reader = new JsonReader(
|
||||||
new InputStreamReader(api.getInputStream()))) {
|
new InputStreamReader(api.getInputStream(), CHARSET))) {
|
||||||
for (Protocol.ObjectInfo o : parseObjects(reader)) {
|
for (Protocol.ObjectInfo o : parseObjects(reader)) {
|
||||||
if (o.actions == null) {
|
if (o.actions == null) {
|
||||||
continue;
|
continue;
|
||||||
|
|
|
@ -179,7 +179,8 @@ public static Collection<Path> downloadLfsResource(Lfs lfs, Repository db,
|
||||||
Integer.valueOf(responseCode)));
|
Integer.valueOf(responseCode)));
|
||||||
}
|
}
|
||||||
try (JsonReader reader = new JsonReader(
|
try (JsonReader reader = new JsonReader(
|
||||||
new InputStreamReader(lfsServerConn.getInputStream()))) {
|
new InputStreamReader(lfsServerConn.getInputStream(),
|
||||||
|
CHARSET))) {
|
||||||
Protocol.Response resp = gson.fromJson(reader,
|
Protocol.Response resp = gson.fromJson(reader,
|
||||||
Protocol.Response.class);
|
Protocol.Response.class);
|
||||||
for (Protocol.ObjectInfo o : resp.objects) {
|
for (Protocol.ObjectInfo o : resp.objects) {
|
||||||
|
|
|
@ -170,7 +170,7 @@ private void copy(InputStream from, File to) throws IOException {
|
||||||
|
|
||||||
private String readStream(InputStream stream) throws IOException {
|
private String readStream(InputStream stream) throws IOException {
|
||||||
try (BufferedReader in = new BufferedReader(
|
try (BufferedReader in = new BufferedReader(
|
||||||
new InputStreamReader(stream))) {
|
new InputStreamReader(stream, CHARSET))) {
|
||||||
StringBuilder out = new StringBuilder();
|
StringBuilder out = new StringBuilder();
|
||||||
String line;
|
String line;
|
||||||
while ((line = in.readLine()) != null) {
|
while ((line = in.readLine()) != null) {
|
||||||
|
|
|
@ -42,6 +42,8 @@
|
||||||
*/
|
*/
|
||||||
package org.eclipse.jgit.merge;
|
package org.eclipse.jgit.merge;
|
||||||
|
|
||||||
|
import static org.eclipse.jgit.lib.Constants.CHARSET;
|
||||||
|
|
||||||
import static org.junit.Assert.assertEquals;
|
import static org.junit.Assert.assertEquals;
|
||||||
import static org.junit.Assert.assertFalse;
|
import static org.junit.Assert.assertFalse;
|
||||||
import static org.junit.Assert.assertTrue;
|
import static org.junit.Assert.assertTrue;
|
||||||
|
@ -881,7 +883,7 @@ private String contentAsString(Repository r, ObjectId treeId, String path)
|
||||||
StringBuilder result = new StringBuilder();
|
StringBuilder result = new StringBuilder();
|
||||||
ObjectReader or = r.newObjectReader();
|
ObjectReader or = r.newObjectReader();
|
||||||
try (BufferedReader br = new BufferedReader(
|
try (BufferedReader br = new BufferedReader(
|
||||||
new InputStreamReader(or.open(blobId).openStream()))) {
|
new InputStreamReader(or.open(blobId).openStream(), CHARSET))) {
|
||||||
String line;
|
String line;
|
||||||
boolean first = true;
|
boolean first = true;
|
||||||
while ((line = br.readLine()) != null) {
|
while ((line = br.readLine()) != null) {
|
||||||
|
|
|
@ -420,7 +420,7 @@ static String publicAddress() throws Exception {
|
||||||
c.setConnectTimeout(500);
|
c.setConnectTimeout(500);
|
||||||
c.setReadTimeout(500);
|
c.setReadTimeout(500);
|
||||||
try (BufferedReader reader = new BufferedReader(
|
try (BufferedReader reader = new BufferedReader(
|
||||||
new InputStreamReader(c.getInputStream()))) {
|
new InputStreamReader(c.getInputStream(), CHARSET))) {
|
||||||
return reader.readLine();
|
return reader.readLine();
|
||||||
}
|
}
|
||||||
} catch (UnknownHostException | SocketTimeoutException e) {
|
} catch (UnknownHostException | SocketTimeoutException e) {
|
||||||
|
|
Loading…
Reference in New Issue