Explicitly specify charset in constructor of InputStreamReader
Change-Id: Id43e27c590f41f7435c2ca1d127f27e45745da7f Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
This commit is contained in:
parent
2f1350c9ac
commit
dbabe5f37a
|
@ -43,6 +43,7 @@
|
|||
|
||||
package org.eclipse.jgit.http.test;
|
||||
|
||||
import static java.nio.charset.StandardCharsets.UTF_8;
|
||||
import static org.junit.Assert.assertEquals;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
|
@ -120,7 +121,8 @@ public void testSimpleRegex() throws Exception {
|
|||
c = ((HttpURLConnection) uri.resolve("/a").toURL()
|
||||
.openConnection());
|
||||
assertEquals(200, c.getResponseCode());
|
||||
r = new BufferedReader(new InputStreamReader(c.getInputStream()));
|
||||
r = new BufferedReader(
|
||||
new InputStreamReader(c.getInputStream(), UTF_8));
|
||||
assertEquals("test", r.readLine());
|
||||
assertEquals("", r.readLine());
|
||||
assertEquals("/a", r.readLine());
|
||||
|
@ -129,7 +131,8 @@ public void testSimpleRegex() throws Exception {
|
|||
c = ((HttpURLConnection) uri.resolve("/b").toURL()
|
||||
.openConnection());
|
||||
assertEquals(200, c.getResponseCode());
|
||||
r = new BufferedReader(new InputStreamReader(c.getInputStream()));
|
||||
r = new BufferedReader(
|
||||
new InputStreamReader(c.getInputStream(), UTF_8));
|
||||
assertEquals("test", r.readLine());
|
||||
assertEquals("", r.readLine());
|
||||
assertEquals("/b", r.readLine());
|
||||
|
@ -155,7 +158,8 @@ public void testServeOrdering() throws Exception {
|
|||
c = ((HttpURLConnection) uri.resolve("/a").toURL()
|
||||
.openConnection());
|
||||
assertEquals(200, c.getResponseCode());
|
||||
r = new BufferedReader(new InputStreamReader(c.getInputStream()));
|
||||
r = new BufferedReader(
|
||||
new InputStreamReader(c.getInputStream(), UTF_8));
|
||||
assertEquals("test1", r.readLine());
|
||||
assertEquals("", r.readLine());
|
||||
assertEquals("/a", r.readLine());
|
||||
|
@ -183,7 +187,8 @@ public void testRegexGroupFilter() throws Exception {
|
|||
c = ((HttpURLConnection) uri.resolve("/a/b").toURL()
|
||||
.openConnection());
|
||||
assertEquals(200, c.getResponseCode());
|
||||
r = new BufferedReader(new InputStreamReader(c.getInputStream()));
|
||||
r = new BufferedReader(
|
||||
new InputStreamReader(c.getInputStream(), UTF_8));
|
||||
assertEquals("test1", r.readLine());
|
||||
assertEquals("", r.readLine());
|
||||
// No RegexGroupFilter defaults to first group.
|
||||
|
@ -193,7 +198,8 @@ public void testRegexGroupFilter() throws Exception {
|
|||
c = ((HttpURLConnection) uri.resolve("/c/d").toURL()
|
||||
.openConnection());
|
||||
assertEquals(200, c.getResponseCode());
|
||||
r = new BufferedReader(new InputStreamReader(c.getInputStream()));
|
||||
r = new BufferedReader(
|
||||
new InputStreamReader(c.getInputStream(), UTF_8));
|
||||
assertEquals("test2", r.readLine());
|
||||
assertEquals("", r.readLine());
|
||||
assertEquals("/c", r.readLine());
|
||||
|
@ -202,7 +208,8 @@ public void testRegexGroupFilter() throws Exception {
|
|||
c = ((HttpURLConnection) uri.resolve("/e/f/g").toURL()
|
||||
.openConnection());
|
||||
assertEquals(200, c.getResponseCode());
|
||||
r = new BufferedReader(new InputStreamReader(c.getInputStream()));
|
||||
r = new BufferedReader(
|
||||
new InputStreamReader(c.getInputStream(), UTF_8));
|
||||
assertEquals("test3", r.readLine());
|
||||
assertEquals("/e/f", r.readLine());
|
||||
assertEquals("/g", r.readLine());
|
||||
|
|
|
@ -42,6 +42,7 @@
|
|||
|
||||
package org.eclipse.jgit.transport;
|
||||
|
||||
import static java.nio.charset.StandardCharsets.UTF_8;
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertFalse;
|
||||
import static org.junit.Assert.assertNotEquals;
|
||||
|
@ -334,7 +335,7 @@ public void testParseMultipleFromStream() throws Exception {
|
|||
assertFalse(input.contains(PushCertificateParser.END_CERT));
|
||||
input += input;
|
||||
Reader reader = new InputStreamReader(
|
||||
new ByteArrayInputStream(Constants.encode(input)));
|
||||
new ByteArrayInputStream(Constants.encode(input)), UTF_8);
|
||||
|
||||
assertNotNull(PushCertificateParser.fromReader(reader));
|
||||
assertNotNull(PushCertificateParser.fromReader(reader));
|
||||
|
|
|
@ -43,6 +43,7 @@
|
|||
|
||||
package org.eclipse.jgit.transport;
|
||||
|
||||
import static java.nio.charset.StandardCharsets.UTF_8;
|
||||
import static org.eclipse.jgit.lib.ObjectId.zeroId;
|
||||
import static org.eclipse.jgit.lib.RefUpdate.Result.FAST_FORWARD;
|
||||
import static org.eclipse.jgit.lib.RefUpdate.Result.LOCK_FAILURE;
|
||||
|
@ -96,7 +97,9 @@ private static PushCertificate newCert(String... updateLines) {
|
|||
+ "-----END PGP SIGNATURE-----\n");
|
||||
try {
|
||||
return PushCertificateParser.fromReader(new InputStreamReader(
|
||||
new ByteArrayInputStream(Constants.encode(cert.toString()))));
|
||||
new ByteArrayInputStream(
|
||||
Constants.encode(cert.toString())),
|
||||
UTF_8));
|
||||
} catch (IOException e) {
|
||||
throw new IllegalArgumentException(e);
|
||||
}
|
||||
|
|
|
@ -43,6 +43,7 @@
|
|||
|
||||
package org.eclipse.jgit.util;
|
||||
|
||||
import static java.nio.charset.StandardCharsets.UTF_8;
|
||||
import static org.junit.Assert.assertEquals;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
|
@ -105,7 +106,7 @@ private String readLine(Reader r) throws Exception {
|
|||
|
||||
private Reader newReader(String in) {
|
||||
Reader r = new InputStreamReader(
|
||||
new ByteArrayInputStream(Constants.encode(in)));
|
||||
new ByteArrayInputStream(Constants.encode(in)), UTF_8);
|
||||
if (buffered) {
|
||||
r = new BufferedReader(r);
|
||||
}
|
||||
|
|
|
@ -43,6 +43,8 @@
|
|||
|
||||
package org.eclipse.jgit.transport;
|
||||
|
||||
import static java.nio.charset.StandardCharsets.UTF_8;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
|
@ -241,7 +243,8 @@ private synchronized State refresh() {
|
|||
private Map<String, HostEntry> parse(InputStream in)
|
||||
throws IOException {
|
||||
final Map<String, HostEntry> m = new LinkedHashMap<>();
|
||||
final BufferedReader br = new BufferedReader(new InputStreamReader(in));
|
||||
final BufferedReader br = new BufferedReader(
|
||||
new InputStreamReader(in, UTF_8));
|
||||
final List<HostEntry> current = new ArrayList<>(4);
|
||||
String line;
|
||||
|
||||
|
|
Loading…
Reference in New Issue