Change-Id: I3b748620f067582afef20f144feebe40d0332be2 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>tags/v5.1.0.201809051400-rc1
@@ -43,6 +43,7 @@ | |||
package org.eclipse.jgit.http.server; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.eclipse.jgit.http.server.ServletUtils.getRepository; | |||
import java.io.IOException; | |||
@@ -73,7 +74,7 @@ class InfoRefsServlet extends HttpServlet { | |||
final Repository db = getRepository(req); | |||
try (OutputStreamWriter out = new OutputStreamWriter( | |||
new SmartOutputStream(req, rsp, true), | |||
Constants.CHARSET)) { | |||
UTF_8)) { | |||
final RefAdvertiser adv = new RefAdvertiser() { | |||
@Override | |||
protected void writeOne(CharSequence line) |
@@ -43,7 +43,7 @@ | |||
package org.eclipse.jgit.http.test; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.eclipse.jgit.util.HttpSupport.HDR_CONTENT_ENCODING; | |||
import static org.eclipse.jgit.util.HttpSupport.HDR_CONTENT_LENGTH; | |||
import static org.eclipse.jgit.util.HttpSupport.HDR_CONTENT_TYPE; | |||
@@ -1081,7 +1081,7 @@ public class SmartClientSmartServerTest extends HttpTestCase { | |||
public void testInvalidWant() throws Exception { | |||
@SuppressWarnings("resource") | |||
ObjectId id = new ObjectInserter.Formatter().idFor(Constants.OBJ_BLOB, | |||
"testInvalidWant".getBytes(CHARSET)); | |||
"testInvalidWant".getBytes(UTF_8)); | |||
Repository dst = createBareRepository(); | |||
try (Transport t = Transport.open(dst, remoteURI); |
@@ -45,7 +45,7 @@ | |||
package org.eclipse.jgit.junit; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import java.io.File; | |||
import java.io.FileNotFoundException; | |||
@@ -246,7 +246,7 @@ public abstract class JGitTestUtil { | |||
throws IOException { | |||
FileUtils.mkdirs(f.getParentFile(), true); | |||
try (Writer w = new OutputStreamWriter(new FileOutputStream(f), | |||
CHARSET)) { | |||
UTF_8)) { | |||
w.write(body); | |||
} | |||
} | |||
@@ -263,7 +263,7 @@ public abstract class JGitTestUtil { | |||
*/ | |||
public static String read(File file) throws IOException { | |||
final byte[] body = IO.readFully(file); | |||
return new String(body, 0, body.length, CHARSET); | |||
return new String(body, 0, body.length, UTF_8); | |||
} | |||
/** |
@@ -45,7 +45,7 @@ | |||
package org.eclipse.jgit.junit; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.junit.Assert.assertFalse; | |||
import static org.junit.Assert.fail; | |||
@@ -352,7 +352,7 @@ public abstract class LocalDiskRepositoryTestCase { | |||
if (0 != (includedOptions & CONTENT)) { | |||
sb.append(", content:" | |||
+ new String(repo.open(entry.getObjectId(), | |||
Constants.OBJ_BLOB).getCachedBytes(), CHARSET)); | |||
Constants.OBJ_BLOB).getCachedBytes(), UTF_8)); | |||
} | |||
if (0 != (includedOptions & ASSUME_UNCHANGED)) | |||
sb.append(", assume-unchanged:" |
@@ -46,7 +46,7 @@ | |||
package org.eclipse.jgit.junit; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.junit.Assert.assertEquals; | |||
import java.io.File; | |||
@@ -192,7 +192,7 @@ public abstract class RepositoryTestCase extends LocalDiskRepositoryTestCase { | |||
protected static void checkFile(File f, String checkData) | |||
throws IOException { | |||
try (Reader r = new InputStreamReader(new FileInputStream(f), | |||
CHARSET)) { | |||
UTF_8)) { | |||
if (checkData.length() > 0) { | |||
char[] data = new char[checkData.length()]; | |||
assertEquals(data.length, r.read(data)); |
@@ -43,7 +43,7 @@ | |||
package org.eclipse.jgit.junit; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.junit.Assert.assertEquals; | |||
import static org.junit.Assert.fail; | |||
@@ -268,7 +268,7 @@ public class TestRepository<R extends Repository> { | |||
* @throws Exception | |||
*/ | |||
public RevBlob blob(String content) throws Exception { | |||
return blob(content.getBytes(CHARSET)); | |||
return blob(content.getBytes(UTF_8)); | |||
} | |||
/** |
@@ -42,7 +42,7 @@ | |||
*/ | |||
package org.eclipse.jgit.lfs.server.fs; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.junit.Assert.assertEquals; | |||
import java.io.BufferedInputStream; | |||
@@ -211,11 +211,11 @@ public abstract class LfsServerTest { | |||
if (buf.hasArray()) { | |||
error = new String(buf.array(), | |||
buf.arrayOffset() + buf.position(), buf.remaining(), | |||
CHARSET); | |||
UTF_8); | |||
} else { | |||
final byte[] b = new byte[buf.remaining()]; | |||
buf.duplicate().get(b); | |||
error = new String(b, CHARSET); | |||
error = new String(b, UTF_8); | |||
} | |||
} catch (IOException e) { | |||
error = statusLine.getReasonPhrase(); |
@@ -42,7 +42,7 @@ | |||
*/ | |||
package org.eclipse.jgit.lfs.server; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.apache.http.HttpStatus.SC_FORBIDDEN; | |||
import static org.apache.http.HttpStatus.SC_INSUFFICIENT_STORAGE; | |||
import static org.apache.http.HttpStatus.SC_INTERNAL_SERVER_ERROR; | |||
@@ -202,10 +202,10 @@ public abstract class LfsProtocolServlet extends HttpServlet { | |||
protected void doPost(HttpServletRequest req, HttpServletResponse res) | |||
throws ServletException, IOException { | |||
Writer w = new BufferedWriter( | |||
new OutputStreamWriter(res.getOutputStream(), CHARSET)); | |||
new OutputStreamWriter(res.getOutputStream(), UTF_8)); | |||
Reader r = new BufferedReader( | |||
new InputStreamReader(req.getInputStream(), CHARSET)); | |||
new InputStreamReader(req.getInputStream(), UTF_8)); | |||
LfsRequest request = LfsGson.fromJson(r, LfsRequest.class); | |||
String path = req.getPathInfo(); | |||
@@ -43,7 +43,7 @@ | |||
*/ | |||
package org.eclipse.jgit.lfs.server.s3; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.eclipse.jgit.util.HttpSupport.HDR_AUTHORIZATION; | |||
import java.io.UnsupportedEncodingException; | |||
@@ -359,13 +359,13 @@ class SignerV4 { | |||
private static byte[] hash(String s) { | |||
MessageDigest md = Constants.newMessageDigest(); | |||
md.update(s.getBytes(CHARSET)); | |||
md.update(s.getBytes(UTF_8)); | |||
return md.digest(); | |||
} | |||
private static byte[] sign(String stringData, byte[] key) { | |||
try { | |||
byte[] data = stringData.getBytes(CHARSET); | |||
byte[] data = stringData.getBytes(UTF_8); | |||
Mac mac = Mac.getInstance(HMACSHA256); | |||
mac.init(new SecretKeySpec(key, HMACSHA256)); | |||
return mac.doFinal(data); | |||
@@ -395,7 +395,7 @@ class SignerV4 { | |||
private static String urlEncode(String url, boolean keepPathSlash) { | |||
String encoded; | |||
try { | |||
encoded = URLEncoder.encode(url, CHARSET.name()); | |||
encoded = URLEncoder.encode(url, UTF_8.name()); | |||
} catch (UnsupportedEncodingException e) { | |||
throw new RuntimeException(LfsServerText.get().unsupportedUtf8, e); | |||
} |
@@ -42,7 +42,7 @@ | |||
*/ | |||
package org.eclipse.jgit.lfs.test; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import java.io.BufferedInputStream; | |||
import java.io.FileNotFoundException; | |||
@@ -66,7 +66,7 @@ public class LongObjectIdTestUtils { | |||
*/ | |||
public static LongObjectId hash(String s) { | |||
MessageDigest md = Constants.newMessageDigest(); | |||
md.update(s.getBytes(CHARSET)); | |||
md.update(s.getBytes(UTF_8)); | |||
return LongObjectId.fromRaw(md.digest()); | |||
} | |||
@@ -43,6 +43,7 @@ | |||
package org.eclipse.jgit.lfs.lib; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static java.nio.charset.StandardCharsets.US_ASCII; | |||
import static org.junit.Assert.assertEquals; | |||
import static org.junit.Assert.assertFalse; | |||
@@ -62,7 +63,6 @@ import java.util.Locale; | |||
import org.eclipse.jgit.junit.JGitTestUtil; | |||
import org.eclipse.jgit.lfs.errors.InvalidLongObjectIdException; | |||
import org.eclipse.jgit.lfs.test.LongObjectIdTestUtils; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.util.FileUtils; | |||
import org.junit.AfterClass; | |||
import org.junit.BeforeClass; | |||
@@ -393,7 +393,7 @@ public class LongObjectIdTest { | |||
AnyLongObjectId id1 = LongObjectIdTestUtils.hash("test"); | |||
ByteArrayOutputStream os = new ByteArrayOutputStream(64); | |||
try (OutputStreamWriter w = new OutputStreamWriter(os, | |||
Constants.CHARSET)) { | |||
UTF_8)) { | |||
id1.copyTo(w); | |||
} | |||
assertEquals(id1, LongObjectId.fromString(os.toByteArray(), 0)); | |||
@@ -404,7 +404,7 @@ public class LongObjectIdTest { | |||
AnyLongObjectId id1 = LongObjectIdTestUtils.hash("test"); | |||
ByteArrayOutputStream os = new ByteArrayOutputStream(64); | |||
try (OutputStreamWriter w = new OutputStreamWriter(os, | |||
Constants.CHARSET)) { | |||
UTF_8)) { | |||
char[] buf = new char[64]; | |||
id1.copyTo(buf, w); | |||
} |
@@ -42,7 +42,7 @@ | |||
*/ | |||
package org.eclipse.jgit.lfs; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import java.io.BufferedReader; | |||
import java.io.IOException; | |||
@@ -134,7 +134,7 @@ public class LfsPointer implements Comparable<LfsPointer> { | |||
*/ | |||
public void encode(OutputStream out) { | |||
try (PrintStream ps = new PrintStream(out, false, | |||
CHARSET.name())) { | |||
UTF_8.name())) { | |||
ps.print("version "); //$NON-NLS-1$ | |||
ps.print(VERSION + "\n"); //$NON-NLS-1$ | |||
ps.print("oid " + HASH_FUNCTION_NAME + ":"); //$NON-NLS-1$ //$NON-NLS-2$ | |||
@@ -143,7 +143,7 @@ public class LfsPointer implements Comparable<LfsPointer> { | |||
ps.print(size + "\n"); //$NON-NLS-1$ | |||
} catch (UnsupportedEncodingException e) { | |||
// should not happen, we are using a standard charset | |||
throw new UnsupportedCharsetException(CHARSET.name()); | |||
throw new UnsupportedCharsetException(UTF_8.name()); | |||
} | |||
} | |||
@@ -165,7 +165,7 @@ public class LfsPointer implements Comparable<LfsPointer> { | |||
long sz = -1; | |||
try (BufferedReader br = new BufferedReader( | |||
new InputStreamReader(in, CHARSET))) { | |||
new InputStreamReader(in, UTF_8))) { | |||
for (String s = br.readLine(); s != null; s = br.readLine()) { | |||
if (s.startsWith("#") || s.length() == 0) { //$NON-NLS-1$ | |||
continue; |
@@ -42,7 +42,7 @@ | |||
*/ | |||
package org.eclipse.jgit.lfs; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.eclipse.jgit.lfs.Protocol.OPERATION_UPLOAD; | |||
import static org.eclipse.jgit.lfs.internal.LfsConnectionFactory.toRequest; | |||
import static org.eclipse.jgit.transport.http.HttpConnection.HTTP_OK; | |||
@@ -208,7 +208,7 @@ public class LfsPrePushHook extends PrePushHook { | |||
} | |||
Gson gson = Protocol.gson(); | |||
api.getOutputStream().write( | |||
gson.toJson(toRequest(OPERATION_UPLOAD, res)).getBytes(CHARSET)); | |||
gson.toJson(toRequest(OPERATION_UPLOAD, res)).getBytes(UTF_8)); | |||
int responseCode = api.getResponseCode(); | |||
if (responseCode != HTTP_OK) { | |||
throw new IOException( | |||
@@ -221,7 +221,7 @@ public class LfsPrePushHook extends PrePushHook { | |||
private void uploadContents(HttpConnection api, | |||
Map<String, LfsPointer> oid2ptr) throws IOException { | |||
try (JsonReader reader = new JsonReader( | |||
new InputStreamReader(api.getInputStream(), CHARSET))) { | |||
new InputStreamReader(api.getInputStream(), UTF_8))) { | |||
for (Protocol.ObjectInfo o : parseObjects(reader)) { | |||
if (o.actions == null) { | |||
continue; |
@@ -42,7 +42,7 @@ | |||
*/ | |||
package org.eclipse.jgit.lfs; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import java.io.IOException; | |||
import java.io.InputStream; | |||
@@ -170,7 +170,7 @@ public class SmudgeFilter extends FilterCommand { | |||
.write(gson | |||
.toJson(LfsConnectionFactory | |||
.toRequest(Protocol.OPERATION_DOWNLOAD, res)) | |||
.getBytes(CHARSET)); | |||
.getBytes(UTF_8)); | |||
int responseCode = lfsServerConn.getResponseCode(); | |||
if (responseCode != HttpConnection.HTTP_OK) { | |||
throw new IOException( | |||
@@ -180,7 +180,7 @@ public class SmudgeFilter extends FilterCommand { | |||
} | |||
try (JsonReader reader = new JsonReader( | |||
new InputStreamReader(lfsServerConn.getInputStream(), | |||
CHARSET))) { | |||
UTF_8))) { | |||
Protocol.Response resp = gson.fromJson(reader, | |||
Protocol.Response.class); | |||
for (Protocol.ObjectInfo o : resp.objects) { |
@@ -42,7 +42,7 @@ | |||
*/ | |||
package org.eclipse.jgit.pgm; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.junit.Assert.assertArrayEquals; | |||
import static org.junit.Assert.assertEquals; | |||
import static org.junit.Assert.fail; | |||
@@ -612,7 +612,7 @@ public class ArchiveTest extends CLIRepositoryTestCase { | |||
private BufferedReader readFromProcess(Process proc) throws Exception { | |||
return new BufferedReader( | |||
new InputStreamReader(proc.getInputStream(), CHARSET)); | |||
new InputStreamReader(proc.getInputStream(), UTF_8)); | |||
} | |||
private void grepForEntry(String name, String mode, String... cmdline) | |||
@@ -750,7 +750,7 @@ public class ArchiveTest extends CLIRepositoryTestCase { | |||
// found! | |||
List<String> l = new ArrayList<>(); | |||
BufferedReader reader = new BufferedReader( | |||
new InputStreamReader(in, CHARSET)); | |||
new InputStreamReader(in, UTF_8)); | |||
String line; | |||
while ((line = reader.readLine()) != null) | |||
l.add(line); |
@@ -43,7 +43,7 @@ | |||
package org.eclipse.jgit.pgm; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import java.io.BufferedReader; | |||
import java.io.IOException; | |||
@@ -148,7 +148,7 @@ public class CommandCatalog { | |||
private void scan(URL cUrl) { | |||
try (BufferedReader cIn = new BufferedReader( | |||
new InputStreamReader(cUrl.openStream(), CHARSET))) { | |||
new InputStreamReader(cUrl.openStream(), UTF_8))) { | |||
String line; | |||
while ((line = cIn.readLine()) != null) { | |||
if (line.length() > 0 && !line.startsWith("#")) //$NON-NLS-1$ |
@@ -44,7 +44,7 @@ | |||
package org.eclipse.jgit.pgm; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import java.io.File; | |||
import java.io.IOException; | |||
@@ -227,7 +227,7 @@ public class Main { | |||
} | |||
PrintWriter createErrorWriter() { | |||
return new PrintWriter(new OutputStreamWriter(System.err, CHARSET)); | |||
return new PrintWriter(new OutputStreamWriter(System.err, UTF_8)); | |||
} | |||
private void execute(String[] argv) throws Exception { |
@@ -43,7 +43,7 @@ | |||
package org.eclipse.jgit.pgm.debug; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.eclipse.jgit.lib.Constants.HEAD; | |||
import static org.eclipse.jgit.lib.Constants.MASTER; | |||
import static org.eclipse.jgit.lib.Constants.R_HEADS; | |||
@@ -154,7 +154,7 @@ class BenchmarkReftable extends TextBuiltin { | |||
throws IOException, FileNotFoundException { | |||
RefList.Builder<Ref> list = new RefList.Builder<>(); | |||
try (BufferedReader br = new BufferedReader(new InputStreamReader( | |||
new FileInputStream(lsRemotePath), CHARSET))) { | |||
new FileInputStream(lsRemotePath), UTF_8))) { | |||
Ref last = null; | |||
String line; | |||
while ((line = br.readLine()) != null) { |
@@ -43,6 +43,8 @@ | |||
package org.eclipse.jgit.pgm.debug; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import java.io.BufferedReader; | |||
import java.io.File; | |||
import java.io.FileInputStream; | |||
@@ -141,7 +143,7 @@ class RebuildCommitGraph extends TextBuiltin { | |||
try (RevWalk rw = new RevWalk(db); | |||
final BufferedReader br = new BufferedReader( | |||
new InputStreamReader(new FileInputStream(graph), | |||
Constants.CHARSET))) { | |||
UTF_8))) { | |||
String line; | |||
while ((line = br.readLine()) != null) { | |||
final String[] parts = line.split("[ \t]{1,}"); //$NON-NLS-1$ | |||
@@ -280,7 +282,7 @@ class RebuildCommitGraph extends TextBuiltin { | |||
try (RevWalk rw = new RevWalk(db); | |||
BufferedReader br = new BufferedReader( | |||
new InputStreamReader(new FileInputStream(refList), | |||
Constants.CHARSET))) { | |||
UTF_8))) { | |||
String line; | |||
while ((line = br.readLine()) != null) { | |||
final String[] parts = line.split("[ \t]{1,}"); //$NON-NLS-1$ |
@@ -43,7 +43,7 @@ | |||
package org.eclipse.jgit.pgm.debug; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.eclipse.jgit.lib.Constants.HEAD; | |||
import static org.eclipse.jgit.lib.Constants.MASTER; | |||
import static org.eclipse.jgit.lib.Constants.R_HEADS; | |||
@@ -192,7 +192,7 @@ class WriteReftable extends TextBuiltin { | |||
static List<Ref> readRefs(String inputFile) throws IOException { | |||
List<Ref> refs = new ArrayList<>(); | |||
try (BufferedReader br = new BufferedReader( | |||
new InputStreamReader(new FileInputStream(inputFile), CHARSET))) { | |||
new InputStreamReader(new FileInputStream(inputFile), UTF_8))) { | |||
String line; | |||
while ((line = br.readLine()) != null) { | |||
ObjectId id = ObjectId.fromString(line.substring(0, 40)); | |||
@@ -227,7 +227,7 @@ class WriteReftable extends TextBuiltin { | |||
List<LogEntry> log = new ArrayList<>(); | |||
try (BufferedReader br = new BufferedReader( | |||
new InputStreamReader(new FileInputStream(logPath), CHARSET))) { | |||
new InputStreamReader(new FileInputStream(logPath), UTF_8))) { | |||
@SuppressWarnings("nls") | |||
Pattern pattern = Pattern.compile("([^,]+)" // 1: ref | |||
+ ",([0-9]+(?:[.][0-9]+)?)" // 2: time |
@@ -42,7 +42,7 @@ | |||
*/ | |||
package org.eclipse.jgit.ignore; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import java.io.BufferedReader; | |||
import java.io.File; | |||
@@ -158,7 +158,7 @@ public class CGitVsJGitRandomIgnorePatternTest { | |||
this.gitDir = gitDir; | |||
this.pattern = pattern; | |||
Files.write(FileUtils.toPath(new File(gitDir, ".gitignore")), | |||
(pattern + "\n").getBytes(CHARSET), StandardOpenOption.CREATE, | |||
(pattern + "\n").getBytes(UTF_8), StandardOpenOption.CREATE, | |||
StandardOpenOption.TRUNCATE_EXISTING, | |||
StandardOpenOption.WRITE); | |||
} | |||
@@ -188,7 +188,7 @@ public class CGitVsJGitRandomIgnorePatternTest { | |||
Process proc = Runtime.getRuntime().exec(command, new String[0], | |||
gitDir); | |||
try (OutputStream out = proc.getOutputStream()) { | |||
out.write((path + "\n").getBytes(CHARSET)); | |||
out.write((path + "\n").getBytes(UTF_8)); | |||
out.flush(); | |||
} | |||
return proc; |
@@ -44,6 +44,7 @@ | |||
package org.eclipse.jgit.patch; | |||
import static java.nio.charset.StandardCharsets.ISO_8859_1; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.junit.Assert.assertEquals; | |||
import static org.junit.Assert.assertNotNull; | |||
import static org.junit.Assert.assertTrue; | |||
@@ -56,7 +57,6 @@ import java.io.UnsupportedEncodingException; | |||
import java.util.HashMap; | |||
import java.util.HashSet; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.util.MutableInteger; | |||
import org.eclipse.jgit.util.RawParseUtils; | |||
import org.eclipse.jgit.util.TemporaryBuffer; | |||
@@ -176,7 +176,7 @@ public class EGitPatchHistoryTest { | |||
i.added = RawParseUtils.parseBase10(buf, ptr.value, ptr); | |||
i.deleted = RawParseUtils.parseBase10(buf, ptr.value + 1, ptr); | |||
final int eol = RawParseUtils.nextLF(buf, ptr.value); | |||
final String name = RawParseUtils.decode(Constants.CHARSET, | |||
final String name = RawParseUtils.decode(UTF_8, | |||
buf, ptr.value + 1, eol - 1); | |||
files.put(name, i); | |||
ptr.value = eol; |
@@ -42,7 +42,7 @@ | |||
package org.eclipse.jgit.api; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.eclipse.jgit.lib.CoreConfig.EolStreamType.AUTO_CRLF; | |||
import static org.eclipse.jgit.lib.CoreConfig.EolStreamType.AUTO_LF; | |||
import static org.eclipse.jgit.lib.CoreConfig.EolStreamType.DIRECT; | |||
@@ -150,8 +150,8 @@ public class EolStreamTypeUtilTest { | |||
EolStreamType streamTypeWithBinaryCheck, String output, | |||
String expectedConversion) throws Exception { | |||
ByteArrayOutputStream b; | |||
byte[] outputBytes = output.getBytes(CHARSET); | |||
byte[] expectedConversionBytes = expectedConversion.getBytes(CHARSET); | |||
byte[] outputBytes = output.getBytes(UTF_8); | |||
byte[] expectedConversionBytes = expectedConversion.getBytes(UTF_8); | |||
// test using output text and assuming it was declared TEXT | |||
b = new ByteArrayOutputStream(); | |||
@@ -277,8 +277,8 @@ public class EolStreamTypeUtilTest { | |||
private void testCheckin(EolStreamType streamTypeText, | |||
EolStreamType streamTypeWithBinaryCheck, String input, | |||
String expectedConversion) throws Exception { | |||
byte[] inputBytes = input.getBytes(CHARSET); | |||
byte[] expectedConversionBytes = expectedConversion.getBytes(CHARSET); | |||
byte[] inputBytes = input.getBytes(UTF_8); | |||
byte[] expectedConversionBytes = expectedConversion.getBytes(UTF_8); | |||
// test using input text and assuming it was declared TEXT | |||
try (InputStream in = EolStreamTypeUtil.wrapInputStream( |
@@ -42,7 +42,7 @@ | |||
*/ | |||
package org.eclipse.jgit.api; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.junit.Assert.assertEquals; | |||
import java.util.List; | |||
@@ -88,7 +88,7 @@ public class NotesCommandTest extends RepositoryTestCase { | |||
git.notesAdd().setObjectId(commit2).setMessage("data").call(); | |||
Note note = git.notesShow().setObjectId(commit2).call(); | |||
String content = new String(db.open(note.getData()).getCachedBytes(), | |||
CHARSET); | |||
UTF_8); | |||
assertEquals(content, "data"); | |||
git.notesRemove().setObjectId(commit2).call(); |
@@ -42,7 +42,7 @@ | |||
*/ | |||
package org.eclipse.jgit.api; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
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.assertNotNull; | |||
@@ -592,7 +592,7 @@ public class PullCommandTest extends RepositoryTestCase { | |||
private static void writeToFile(File actFile, String string) | |||
throws IOException { | |||
try (FileOutputStream fos = new FileOutputStream(actFile)) { | |||
fos.write(string.getBytes(CHARSET)); | |||
fos.write(string.getBytes(UTF_8)); | |||
} | |||
} | |||
@@ -606,7 +606,7 @@ public class PullCommandTest extends RepositoryTestCase { | |||
bos.write(buffer, 0, read); | |||
read = fis.read(buffer); | |||
} | |||
String content = new String(bos.toByteArray(), CHARSET); | |||
String content = new String(bos.toByteArray(), UTF_8); | |||
assertEquals(string, content); | |||
} | |||
} |
@@ -42,7 +42,7 @@ | |||
*/ | |||
package org.eclipse.jgit.api; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
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.assertNotNull; | |||
@@ -396,7 +396,7 @@ public class PullCommandWithRebaseTest extends RepositoryTestCase { | |||
private static void writeToFile(File actFile, String string) | |||
throws IOException { | |||
try (FileOutputStream fos = new FileOutputStream(actFile)) { | |||
fos.write(string.getBytes(CHARSET)); | |||
fos.write(string.getBytes(UTF_8)); | |||
} | |||
} | |||
@@ -410,7 +410,7 @@ public class PullCommandWithRebaseTest extends RepositoryTestCase { | |||
bos.write(buffer, 0, read); | |||
read = fis.read(buffer); | |||
} | |||
String content = new String(bos.toByteArray(), CHARSET); | |||
String content = new String(bos.toByteArray(), UTF_8); | |||
assertEquals(string, content); | |||
} | |||
} |
@@ -42,7 +42,7 @@ | |||
*/ | |||
package org.eclipse.jgit.api; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.hamcrest.CoreMatchers.equalTo; | |||
import static org.hamcrest.CoreMatchers.not; | |||
import static org.hamcrest.MatcherAssert.assertThat; | |||
@@ -1468,7 +1468,7 @@ public class RebaseCommandTest extends RepositoryTestCase { | |||
assertEquals("GIT_AUTHOR_DATE='@123456789 -0100'", lines[2]); | |||
PersonIdent parsedIdent = git.rebase().parseAuthor( | |||
convertedAuthor.getBytes(CHARSET)); | |||
convertedAuthor.getBytes(UTF_8)); | |||
assertEquals(ident.getName(), parsedIdent.getName()); | |||
assertEquals(ident.getEmailAddress(), parsedIdent.getEmailAddress()); | |||
// this is rounded to the last second | |||
@@ -1485,7 +1485,7 @@ public class RebaseCommandTest extends RepositoryTestCase { | |||
assertEquals("GIT_AUTHOR_DATE='@123456789 +0930'", lines[2]); | |||
parsedIdent = git.rebase().parseAuthor( | |||
convertedAuthor.getBytes(CHARSET)); | |||
convertedAuthor.getBytes(UTF_8)); | |||
assertEquals(ident.getName(), parsedIdent.getName()); | |||
assertEquals(ident.getEmailAddress(), parsedIdent.getEmailAddress()); | |||
assertEquals(123456789000L, parsedIdent.getWhen().getTime()); | |||
@@ -2164,7 +2164,7 @@ public class RebaseCommandTest extends RepositoryTestCase { | |||
int count = 0; | |||
File todoFile = getTodoFile(); | |||
try (BufferedReader br = new BufferedReader(new InputStreamReader( | |||
new FileInputStream(todoFile), CHARSET))) { | |||
new FileInputStream(todoFile), UTF_8))) { | |||
String line = br.readLine(); | |||
while (line != null) { | |||
int firstBlank = line.indexOf(' '); |
@@ -42,6 +42,7 @@ | |||
*/ | |||
package org.eclipse.jgit.attributes; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.junit.Assert.assertArrayEquals; | |||
import static org.junit.Assert.assertEquals; | |||
@@ -57,7 +58,6 @@ import java.util.Map; | |||
import java.util.Set; | |||
import org.eclipse.jgit.junit.RepositoryTestCase; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.lib.StoredConfig; | |||
import org.eclipse.jgit.treewalk.FileTreeIterator; | |||
import org.eclipse.jgit.treewalk.TreeWalk; | |||
@@ -127,14 +127,14 @@ public class CGitAttributesTest extends RepositoryTestCase { | |||
builder.directory(db.getWorkTree()); | |||
builder.environment().put("HOME", fs.userHome().getAbsolutePath()); | |||
ExecutionResult result = fs.execute(builder, new ByteArrayInputStream( | |||
input.toString().getBytes(Constants.CHARSET))); | |||
input.toString().getBytes(UTF_8))); | |||
String errorOut = toString(result.getStderr()); | |||
assertEquals("External git failed", "exit 0\n", | |||
"exit " + result.getRc() + '\n' + errorOut); | |||
LinkedHashMap<String, Attributes> map = new LinkedHashMap<>(); | |||
try (BufferedReader r = new BufferedReader(new InputStreamReader( | |||
new BufferedInputStream(result.getStdout().openInputStream()), | |||
Constants.CHARSET))) { | |||
UTF_8))) { | |||
r.lines().forEach(line -> { | |||
// Parse the line and add to result map | |||
int start = 0; |
@@ -43,7 +43,7 @@ | |||
package org.eclipse.jgit.diff; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.junit.Assert.assertEquals; | |||
import static org.junit.Assert.assertTrue; | |||
@@ -240,6 +240,6 @@ public abstract class AbstractDiffTestCase { | |||
r.append(text.charAt(i)); | |||
r.append('\n'); | |||
} | |||
return new RawText(r.toString().getBytes(CHARSET)); | |||
return new RawText(r.toString().getBytes(UTF_8)); | |||
} | |||
} |
@@ -44,7 +44,7 @@ | |||
package org.eclipse.jgit.diff; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.junit.Assert.assertArrayEquals; | |||
import static org.junit.Assert.assertEquals; | |||
import static org.junit.Assert.assertFalse; | |||
@@ -147,8 +147,8 @@ public class RawTextTest { | |||
e = c.reduceCommonStartEnd(t("abQxy"), t("abRxy"), e); | |||
assertEquals(new Edit(2, 3, 2, 3), e); | |||
RawText a = new RawText("p\na b\nQ\nc d\n".getBytes(CHARSET)); | |||
RawText b = new RawText("p\na b \nR\n c d \n".getBytes(CHARSET)); | |||
RawText a = new RawText("p\na b\nQ\nc d\n".getBytes(UTF_8)); | |||
RawText b = new RawText("p\na b \nR\n c d \n".getBytes(UTF_8)); | |||
e = new Edit(0, 4, 0, 4); | |||
e = RawTextComparator.WS_IGNORE_ALL.reduceCommonStartEnd(a, b, e); | |||
assertEquals(new Edit(2, 3, 2, 3), e); | |||
@@ -160,14 +160,14 @@ public class RawTextTest { | |||
RawText b; | |||
Edit e; | |||
a = new RawText("R\n y\n".getBytes(CHARSET)); | |||
b = new RawText("S\n\n y\n".getBytes(CHARSET)); | |||
a = new RawText("R\n y\n".getBytes(UTF_8)); | |||
b = new RawText("S\n\n y\n".getBytes(UTF_8)); | |||
e = new Edit(0, 2, 0, 3); | |||
e = RawTextComparator.DEFAULT.reduceCommonStartEnd(a, b, e); | |||
assertEquals(new Edit(0, 1, 0, 2), e); | |||
a = new RawText("S\n\n y\n".getBytes(CHARSET)); | |||
b = new RawText("R\n y\n".getBytes(CHARSET)); | |||
a = new RawText("S\n\n y\n".getBytes(UTF_8)); | |||
b = new RawText("R\n y\n".getBytes(UTF_8)); | |||
e = new Edit(0, 3, 0, 2); | |||
e = RawTextComparator.DEFAULT.reduceCommonStartEnd(a, b, e); | |||
assertEquals(new Edit(0, 2, 0, 1), e); | |||
@@ -178,8 +178,8 @@ public class RawTextTest { | |||
RawText a; | |||
RawText b; | |||
Edit e; | |||
a = new RawText("start".getBytes(CHARSET)); | |||
b = new RawText("start of line".getBytes(CHARSET)); | |||
a = new RawText("start".getBytes(UTF_8)); | |||
b = new RawText("start of line".getBytes(UTF_8)); | |||
e = new Edit(0, 1, 0, 1); | |||
e = RawTextComparator.DEFAULT.reduceCommonStartEnd(a, b, e); | |||
assertEquals(new Edit(0, 1, 0, 1), e); | |||
@@ -190,8 +190,8 @@ public class RawTextTest { | |||
RawText a; | |||
RawText b; | |||
Edit e; | |||
a = new RawText("start".getBytes(CHARSET)); | |||
b = new RawText("start of\nlastline".getBytes(CHARSET)); | |||
a = new RawText("start".getBytes(UTF_8)); | |||
b = new RawText("start of\nlastline".getBytes(UTF_8)); | |||
e = new Edit(0, 1, 0, 2); | |||
e = RawTextComparator.DEFAULT.reduceCommonStartEnd(a, b, e); | |||
assertEquals(new Edit(0, 1, 0, 2), e); | |||
@@ -250,6 +250,6 @@ public class RawTextTest { | |||
r.append(text.charAt(i)); | |||
r.append('\n'); | |||
} | |||
return new RawText(r.toString().getBytes(CHARSET)); | |||
return new RawText(r.toString().getBytes(UTF_8)); | |||
} | |||
} |
@@ -43,7 +43,7 @@ | |||
package org.eclipse.jgit.diff; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.junit.Assert.assertEquals; | |||
import static org.junit.Assert.assertTrue; | |||
@@ -82,7 +82,7 @@ public class SimilarityIndexTest { | |||
+ "A\n" // | |||
+ "B\n" // | |||
+ "B\n" // | |||
+ "B\n").getBytes(CHARSET); | |||
+ "B\n").getBytes(UTF_8); | |||
SimilarityIndex si = new SimilarityIndex(); | |||
si.hash(new ByteArrayInputStream(in), in.length, false); | |||
assertEquals(2, si.size()); | |||
@@ -130,12 +130,12 @@ public class SimilarityIndexTest { | |||
+ "D\r\n" // | |||
+ "B\r\n"; | |||
SimilarityIndex src = new SimilarityIndex(); | |||
byte[] bytes1 = text.getBytes(CHARSET); | |||
byte[] bytes1 = text.getBytes(UTF_8); | |||
src.hash(new ByteArrayInputStream(bytes1), bytes1.length, true); | |||
src.sort(); | |||
SimilarityIndex dst = new SimilarityIndex(); | |||
byte[] bytes2 = text.replace("\r", "").getBytes(CHARSET); | |||
byte[] bytes2 = text.replace("\r", "").getBytes(UTF_8); | |||
dst.hash(new ByteArrayInputStream(bytes2), bytes2.length, true); | |||
dst.sort(); | |||
@@ -43,7 +43,7 @@ | |||
package org.eclipse.jgit.dircache; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.eclipse.jgit.junit.Assert.assertEquals; | |||
import static org.junit.Assert.assertArrayEquals; | |||
import static org.junit.Assert.assertEquals; | |||
@@ -236,7 +236,7 @@ public class DirCacheCGitCompatabilityTest extends LocalDiskRepositoryTestCase { | |||
private static Map<String, CGitIndexRecord> readLsFiles() throws Exception { | |||
final LinkedHashMap<String, CGitIndexRecord> r = new LinkedHashMap<>(); | |||
try (BufferedReader br = new BufferedReader(new InputStreamReader( | |||
new FileInputStream(pathOf("gitgit.lsfiles")), CHARSET))) { | |||
new FileInputStream(pathOf("gitgit.lsfiles")), UTF_8))) { | |||
String line; | |||
while ((line = br.readLine()) != null) { | |||
final CGitIndexRecord cr = new CGitIndexRecord(line); | |||
@@ -249,7 +249,7 @@ public class DirCacheCGitCompatabilityTest extends LocalDiskRepositoryTestCase { | |||
private static Map<String, CGitLsTreeRecord> readLsTree() throws Exception { | |||
final LinkedHashMap<String, CGitLsTreeRecord> r = new LinkedHashMap<>(); | |||
try (BufferedReader br = new BufferedReader(new InputStreamReader( | |||
new FileInputStream(pathOf("gitgit.lstree")), CHARSET))) { | |||
new FileInputStream(pathOf("gitgit.lstree")), UTF_8))) { | |||
String line; | |||
while ((line = br.readLine()) != null) { | |||
final CGitLsTreeRecord cr = new CGitLsTreeRecord(line); |
@@ -42,7 +42,7 @@ | |||
*/ | |||
package org.eclipse.jgit.gitrepo; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.junit.Assert.assertEquals; | |||
import static org.junit.Assert.assertTrue; | |||
import static org.junit.Assert.fail; | |||
@@ -85,7 +85,7 @@ public class ManifestParserTest { | |||
ManifestParser parser = new ManifestParser( | |||
null, null, "master", baseUrl, null, null); | |||
parser.read(new ByteArrayInputStream(xmlContent.toString().getBytes(CHARSET))); | |||
parser.read(new ByteArrayInputStream(xmlContent.toString().getBytes(UTF_8))); | |||
// Unfiltered projects should have them all. | |||
results.clear(); | |||
results.add("foo"); | |||
@@ -139,7 +139,7 @@ public class ManifestParserTest { | |||
baseUrl, null, null); | |||
try { | |||
parser.read(new ByteArrayInputStream( | |||
xmlContent.toString().getBytes(CHARSET))); | |||
xmlContent.toString().getBytes(UTF_8))); | |||
fail("ManifestParser did not throw exception for missing fetch"); | |||
} catch (IOException e) { | |||
assertTrue(e.getCause() instanceof SAXException); | |||
@@ -164,7 +164,7 @@ public class ManifestParserTest { | |||
ManifestParser parser = new ManifestParser(null, null, "master", | |||
"https://git.google.com/", null, null); | |||
parser.read(new ByteArrayInputStream( | |||
xmlContent.toString().getBytes(CHARSET))); | |||
xmlContent.toString().getBytes(UTF_8))); | |||
assertEquals(Stream.of("bar", "baz").collect(Collectors.toSet()), | |||
parser.getProjects().stream().map(RepoProject::getName) |
@@ -42,7 +42,7 @@ | |||
*/ | |||
package org.eclipse.jgit.gitrepo; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
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.assertNull; | |||
@@ -217,7 +217,7 @@ public class RepoCommandTest extends RepositoryTestCase { | |||
RevCommit commit = cmd | |||
.setInputStream(new ByteArrayInputStream( | |||
xmlContent.toString().getBytes(CHARSET))) | |||
xmlContent.toString().getBytes(UTF_8))) | |||
.setRemoteReader(repos).setURI("platform/") | |||
.setTargetURI("platform/superproject") | |||
.setRecordRemoteBranch(true).setRecordSubmoduleLabels(true) | |||
@@ -226,7 +226,7 @@ public class RepoCommandTest extends RepositoryTestCase { | |||
String firstIdStr = commit.getId().name() + ":" + ".gitmodules"; | |||
commit = new RepoCommand(dest) | |||
.setInputStream(new ByteArrayInputStream( | |||
xmlContent.toString().getBytes(CHARSET))) | |||
xmlContent.toString().getBytes(UTF_8))) | |||
.setRemoteReader(repos).setURI("platform/") | |||
.setTargetURI("platform/superproject") | |||
.setRecordRemoteBranch(true).setRecordSubmoduleLabels(true) | |||
@@ -254,7 +254,7 @@ public class RepoCommandTest extends RepositoryTestCase { | |||
RevCommit commit = cmd | |||
.setInputStream(new ByteArrayInputStream( | |||
xmlContent.toString().getBytes(CHARSET))) | |||
xmlContent.toString().getBytes(UTF_8))) | |||
.setRemoteReader(repos).setURI("platform/") | |||
.setTargetURI("platform/superproject") | |||
.setRecordRemoteBranch(true).setRecordSubmoduleLabels(true) | |||
@@ -288,7 +288,7 @@ public class RepoCommandTest extends RepositoryTestCase { | |||
try (Repository dest = cloneRepository(db, true)) { | |||
RevCommit commit = new RepoCommand(dest) | |||
.setInputStream(new ByteArrayInputStream( | |||
xmlContent.toString().getBytes(CHARSET))) | |||
xmlContent.toString().getBytes(UTF_8))) | |||
.setRemoteReader(new IndexedRepos()).setURI("platform/") | |||
.setTargetURI("platform/superproject") | |||
.setRecordRemoteBranch(true).setIgnoreRemoteFailures(true) | |||
@@ -327,7 +327,7 @@ public class RepoCommandTest extends RepositoryTestCase { | |||
RevCommit commit = cmd | |||
.setInputStream(new ByteArrayInputStream( | |||
xmlContent.toString().getBytes(CHARSET))) | |||
xmlContent.toString().getBytes(UTF_8))) | |||
.setRemoteReader(repos).setURI("").setTargetURI("gerrit") | |||
.setRecordRemoteBranch(true).setRecordSubmoduleLabels(true) | |||
.call(); | |||
@@ -376,7 +376,7 @@ public class RepoCommandTest extends RepositoryTestCase { | |||
RevCommit commit = cmd | |||
.setInputStream(new ByteArrayInputStream( | |||
xmlContent.toString().getBytes(CHARSET))) | |||
xmlContent.toString().getBytes(UTF_8))) | |||
.setRemoteReader(repos).setURI(baseUrl) | |||
.setTargetURI("gerrit").setRecordRemoteBranch(true) | |||
.setRecordSubmoduleLabels(true).call(); | |||
@@ -431,7 +431,7 @@ public class RepoCommandTest extends RepositoryTestCase { | |||
RevCommit commit = cmd | |||
.setInputStream(new ByteArrayInputStream( | |||
xmlContent.toString().getBytes(CHARSET))) | |||
xmlContent.toString().getBytes(UTF_8))) | |||
.setRemoteReader(repos).setURI(baseUrl) | |||
.setTargetURI(abs + "/superproject") | |||
.setRecordRemoteBranch(true) |
@@ -42,6 +42,7 @@ | |||
*/ | |||
package org.eclipse.jgit.ignore; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.junit.Assert.assertArrayEquals; | |||
import static org.junit.Assert.assertEquals; | |||
import static org.junit.Assert.assertFalse; | |||
@@ -56,7 +57,6 @@ import java.util.LinkedHashSet; | |||
import java.util.Set; | |||
import org.eclipse.jgit.junit.RepositoryTestCase; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.lib.StoredConfig; | |||
import org.eclipse.jgit.treewalk.FileTreeIterator; | |||
import org.eclipse.jgit.treewalk.TreeWalk; | |||
@@ -113,7 +113,7 @@ public class CGitIgnoreTest extends RepositoryTestCase { | |||
"exit " + result.getRc() + '\n' + errorOut); | |||
try (BufferedReader r = new BufferedReader(new InputStreamReader( | |||
new BufferedInputStream(result.getStdout().openInputStream()), | |||
Constants.CHARSET))) { | |||
UTF_8))) { | |||
return r.lines().toArray(String[]::new); | |||
} | |||
} | |||
@@ -131,7 +131,7 @@ public class CGitIgnoreTest extends RepositoryTestCase { | |||
"exit " + result.getRc() + '\n' + errorOut); | |||
try (BufferedReader r = new BufferedReader(new InputStreamReader( | |||
new BufferedInputStream(result.getStdout().openInputStream()), | |||
Constants.CHARSET))) { | |||
UTF_8))) { | |||
return r.lines().toArray(String[]::new); | |||
} | |||
} |
@@ -42,7 +42,7 @@ | |||
*/ | |||
package org.eclipse.jgit.ignore; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.eclipse.jgit.junit.Assert.assertEquals; | |||
import static org.junit.Assert.assertEquals; | |||
import static org.junit.Assert.assertFalse; | |||
@@ -767,6 +767,6 @@ public class IgnoreNodeTest extends RepositoryTestCase { | |||
for (String line : rules) { | |||
data.append(line + "\n"); | |||
} | |||
return new ByteArrayInputStream(data.toString().getBytes(CHARSET)); | |||
return new ByteArrayInputStream(data.toString().getBytes(UTF_8)); | |||
} | |||
} |
@@ -41,7 +41,7 @@ | |||
*/ | |||
package org.eclipse.jgit.indexdiff; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.junit.Assert.assertArrayEquals; | |||
import static org.junit.Assert.assertEquals; | |||
import static org.junit.Assert.assertNotNull; | |||
@@ -128,7 +128,7 @@ public class IndexDiffWithSymlinkTest extends LocalDiskRepositoryTestCase { | |||
File restoreScript = new File(testDir, name + ".sh"); | |||
try (OutputStream out = new BufferedOutputStream( | |||
new FileOutputStream(restoreScript)); | |||
Writer writer = new OutputStreamWriter(out, CHARSET)) { | |||
Writer writer = new OutputStreamWriter(out, UTF_8)) { | |||
writer.write("echo `which git` 1>&2\n"); | |||
writer.write("echo `git --version` 1>&2\n"); | |||
writer.write("git init " + name + " && \\\n"); | |||
@@ -170,7 +170,7 @@ public class IndexDiffWithSymlinkTest extends LocalDiskRepositoryTestCase { | |||
private String readStream(InputStream stream) throws IOException { | |||
try (BufferedReader in = new BufferedReader( | |||
new InputStreamReader(stream, CHARSET))) { | |||
new InputStreamReader(stream, UTF_8))) { | |||
StringBuilder out = new StringBuilder(); | |||
String line; | |||
while ((line = in.readLine()) != null) { |
@@ -46,7 +46,7 @@ | |||
package org.eclipse.jgit.internal.storage.file; | |||
import static org.eclipse.jgit.junit.Assert.assertEquals; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.eclipse.jgit.lib.Constants.LOCK_SUFFIX; | |||
import static org.junit.Assert.assertEquals; | |||
import static org.junit.Assert.assertFalse; | |||
@@ -263,7 +263,7 @@ public class RefUpdateTest extends SampleDataRepositoryTestCase { | |||
ObjectId blobId; | |||
try (ObjectInserter ins = bareRepo.newObjectInserter()) { | |||
blobId = ins.insert(Constants.OBJ_BLOB, "contents".getBytes(CHARSET)); | |||
blobId = ins.insert(Constants.OBJ_BLOB, "contents".getBytes(UTF_8)); | |||
ins.flush(); | |||
} | |||
@@ -47,7 +47,7 @@ | |||
package org.eclipse.jgit.internal.storage.file; | |||
import static java.nio.charset.StandardCharsets.ISO_8859_1; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
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.assertNotNull; | |||
@@ -368,7 +368,7 @@ public class T0003_BasicTest extends SampleDataRepositoryTestCase { | |||
+ " email = A U Thor <thor@example.com> # Just an example...\n" | |||
+ " name = \"A Thor \\\\ \\\"\\t \"\n" | |||
+ " defaultCheckInComment = a many line\\ncomment\\n to test\n"; | |||
assertEquals(expectedStr, new String(IO.readFully(cfg), Constants.CHARSET)); | |||
assertEquals(expectedStr, new String(IO.readFully(cfg), UTF_8)); | |||
} | |||
@Test | |||
@@ -517,7 +517,7 @@ public class T0003_BasicTest extends SampleDataRepositoryTestCase { | |||
4294967295000L, 60)); | |||
commit.setCommitter(new PersonIdent("Joe Hacker", "joe2@example.com", | |||
4294967295000L, 60)); | |||
commit.setEncoding(CHARSET); | |||
commit.setEncoding(UTF_8); | |||
commit.setMessage("\u00dcbergeeks"); | |||
ObjectId cid = insertCommit(commit); | |||
assertEquals("4680908112778718f37e686cbebcc912730b3154", cid.name()); | |||
@@ -559,7 +559,7 @@ public class T0003_BasicTest extends SampleDataRepositoryTestCase { | |||
final ObjectId treeId; | |||
try (ObjectInserter oi = db.newObjectInserter()) { | |||
final ObjectId blobId = oi.insert(Constants.OBJ_BLOB, | |||
"and this is the data in me\n".getBytes(Constants.CHARSET | |||
"and this is the data in me\n".getBytes(UTF_8 | |||
.name())); | |||
TreeFormatter fmt = new TreeFormatter(); | |||
fmt.append("i-am-a-file", FileMode.REGULAR_FILE, blobId); | |||
@@ -666,9 +666,9 @@ public class T0003_BasicTest extends SampleDataRepositoryTestCase { | |||
ObjectId id2; | |||
try (ObjectInserter ins = db.newObjectInserter()) { | |||
id1 = ins.insert( | |||
Constants.OBJ_BLOB, "contents1".getBytes(Constants.CHARSET)); | |||
Constants.OBJ_BLOB, "contents1".getBytes(UTF_8)); | |||
id2 = ins.insert( | |||
Constants.OBJ_BLOB, "contents2".getBytes(Constants.CHARSET)); | |||
Constants.OBJ_BLOB, "contents2".getBytes(UTF_8)); | |||
ins.flush(); | |||
} | |||
@@ -43,6 +43,7 @@ | |||
package org.eclipse.jgit.internal.storage.file; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.junit.Assert.assertEquals; | |||
import static org.junit.Assert.assertNotNull; | |||
import static org.junit.Assert.assertTrue; | |||
@@ -77,7 +78,7 @@ public class WindowCacheGetTest extends SampleDataRepositoryTestCase { | |||
try (BufferedReader br = new BufferedReader(new InputStreamReader( | |||
new FileInputStream(JGitTestUtil | |||
.getTestResourceFile("all_packed_objects.txt")), | |||
Constants.CHARSET))) { | |||
UTF_8))) { | |||
String line; | |||
while ((line = br.readLine()) != null) { | |||
final String[] parts = line.split(" {1,}"); |
@@ -43,7 +43,7 @@ | |||
package org.eclipse.jgit.junit; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
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; | |||
@@ -418,6 +418,6 @@ public class TestRepositoryTest { | |||
RevObject obj = tr.get(rw.parseTree(treeish), path); | |||
assertSame(RevBlob.class, obj.getClass()); | |||
ObjectLoader loader = rw.getObjectReader().open(obj); | |||
return new String(loader.getCachedBytes(), CHARSET); | |||
return new String(loader.getCachedBytes(), UTF_8); | |||
} | |||
} |
@@ -45,7 +45,7 @@ | |||
package org.eclipse.jgit.lib; | |||
import static java.lang.Integer.valueOf; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.eclipse.jgit.junit.JGitTestUtil.concat; | |||
import static org.eclipse.jgit.lib.Constants.OBJECT_ID_LENGTH; | |||
import static org.eclipse.jgit.lib.Constants.OBJ_BAD; | |||
@@ -1454,7 +1454,7 @@ public class ObjectCheckerTest { | |||
StringBuilder b = new StringBuilder(); | |||
entry(b, "100644 A"); | |||
entry(b, "100644 a"); | |||
byte[] data = b.toString().getBytes(CHARSET); | |||
byte[] data = b.toString().getBytes(UTF_8); | |||
checker.setSafeForWindows(true); | |||
assertCorrupt("duplicate entry names", OBJ_TREE, data); | |||
assertSkipListAccepts(OBJ_TREE, data); | |||
@@ -1468,7 +1468,7 @@ public class ObjectCheckerTest { | |||
StringBuilder b = new StringBuilder(); | |||
entry(b, "100644 A"); | |||
entry(b, "100644 a"); | |||
byte[] data = b.toString().getBytes(CHARSET); | |||
byte[] data = b.toString().getBytes(UTF_8); | |||
checker.setSafeForMacOS(true); | |||
assertCorrupt("duplicate entry names", OBJ_TREE, data); | |||
assertSkipListAccepts(OBJ_TREE, data); | |||
@@ -1482,7 +1482,7 @@ public class ObjectCheckerTest { | |||
StringBuilder b = new StringBuilder(); | |||
entry(b, "100644 \u0065\u0301"); | |||
entry(b, "100644 \u00e9"); | |||
byte[] data = b.toString().getBytes(CHARSET); | |||
byte[] data = b.toString().getBytes(UTF_8); | |||
checker.setSafeForMacOS(true); | |||
assertCorrupt("duplicate entry names", OBJ_TREE, data); | |||
assertSkipListAccepts(OBJ_TREE, data); | |||
@@ -1496,7 +1496,7 @@ public class ObjectCheckerTest { | |||
StringBuilder b = new StringBuilder(); | |||
entry(b, "100644 A"); | |||
checker.setSafeForMacOS(true); | |||
checker.checkTree(b.toString().getBytes(CHARSET)); | |||
checker.checkTree(b.toString().getBytes(UTF_8)); | |||
} | |||
@Test |
@@ -42,7 +42,7 @@ | |||
*/ | |||
package org.eclipse.jgit.merge; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.junit.Assert.assertEquals; | |||
import static org.junit.Assert.assertFalse; | |||
@@ -883,7 +883,7 @@ public class CrissCrossMergeTest extends RepositoryTestCase { | |||
StringBuilder result = new StringBuilder(); | |||
ObjectReader or = r.newObjectReader(); | |||
try (BufferedReader br = new BufferedReader( | |||
new InputStreamReader(or.open(blobId).openStream(), CHARSET))) { | |||
new InputStreamReader(or.open(blobId).openStream(), UTF_8))) { | |||
String line; | |||
boolean first = true; | |||
while ((line = br.readLine()) != null) { |
@@ -42,7 +42,7 @@ | |||
*/ | |||
package org.eclipse.jgit.merge; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.eclipse.jgit.lib.Constants.OBJ_BLOB; | |||
import static org.junit.Assert.assertEquals; | |||
import static org.junit.Assert.assertFalse; | |||
@@ -793,7 +793,7 @@ public class MergerTest extends RepositoryTestCase { | |||
} | |||
binary[50] = '\0'; | |||
writeTrashFile("file", new String(binary, CHARSET)); | |||
writeTrashFile("file", new String(binary, UTF_8)); | |||
git.add().addFilepattern("file").call(); | |||
RevCommit first = git.commit().setMessage("added file").call(); | |||
@@ -801,7 +801,7 @@ public class MergerTest extends RepositoryTestCase { | |||
int idx = LINELEN * 1200 + 1; | |||
byte save = binary[idx]; | |||
binary[idx] = '@'; | |||
writeTrashFile("file", new String(binary, CHARSET)); | |||
writeTrashFile("file", new String(binary, UTF_8)); | |||
binary[idx] = save; | |||
git.add().addFilepattern("file").call(); | |||
@@ -810,7 +810,7 @@ public class MergerTest extends RepositoryTestCase { | |||
git.checkout().setCreateBranch(true).setStartPoint(first).setName("side").call(); | |||
binary[LINELEN * 1500 + 1] = '!'; | |||
writeTrashFile("file", new String(binary, CHARSET)); | |||
writeTrashFile("file", new String(binary, UTF_8)); | |||
git.add().addFilepattern("file").call(); | |||
RevCommit sideCommit = git.commit().setAll(true) | |||
.setMessage("modified file l 1500").call(); | |||
@@ -972,7 +972,7 @@ public class MergerTest extends RepositoryTestCase { | |||
merger.getMergeResults().get("file"); | |||
try (ByteArrayOutputStream out = new ByteArrayOutputStream()) { | |||
fmt.formatMerge(out, merger.getMergeResults().get("file"), | |||
"BASE", "OURS", "THEIRS", CHARSET.name()); | |||
"BASE", "OURS", "THEIRS", UTF_8.name()); | |||
String expected = "<<<<<<< OURS\n" | |||
+ "1master\n" | |||
+ "=======\n" | |||
@@ -980,7 +980,7 @@ public class MergerTest extends RepositoryTestCase { | |||
+ ">>>>>>> THEIRS\n" | |||
+ "2\n" | |||
+ "3"; | |||
assertEquals(expected, new String(out.toByteArray(), CHARSET)); | |||
assertEquals(expected, new String(out.toByteArray(), UTF_8)); | |||
} | |||
} | |||
} | |||
@@ -1367,6 +1367,7 @@ public class MergerTest extends RepositoryTestCase { | |||
if (obj == null) { | |||
return null; | |||
} | |||
return new String(rw.getObjectReader().open(obj, OBJ_BLOB).getBytes(), CHARSET); | |||
return new String(rw.getObjectReader().open(obj, OBJ_BLOB).getBytes(), | |||
UTF_8); | |||
} | |||
} |
@@ -44,7 +44,7 @@ | |||
package org.eclipse.jgit.patch; | |||
import static java.nio.charset.StandardCharsets.ISO_8859_1; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.junit.Assert.assertEquals; | |||
import static org.junit.Assert.assertTrue; | |||
import static org.junit.Assert.fail; | |||
@@ -83,7 +83,7 @@ public class GetTextTest { | |||
@Test | |||
public void testGetText_Convert() throws IOException { | |||
final Charset csOld = ISO_8859_1; | |||
final Charset csNew = CHARSET; | |||
final Charset csNew = UTF_8; | |||
final Patch p = parseTestPatchFile(); | |||
assertTrue(p.getErrors().isEmpty()); | |||
assertEquals(1, p.getFiles().size()); | |||
@@ -103,7 +103,7 @@ public class GetTextTest { | |||
@Test | |||
public void testGetText_DiffCc() throws IOException { | |||
final Charset csOld = ISO_8859_1; | |||
final Charset csNew = CHARSET; | |||
final Charset csNew = UTF_8; | |||
final Patch p = parseTestPatchFile(); | |||
assertTrue(p.getErrors().isEmpty()); | |||
assertEquals(1, p.getFiles().size()); |
@@ -44,7 +44,7 @@ | |||
package org.eclipse.jgit.revwalk; | |||
import static java.nio.charset.StandardCharsets.ISO_8859_1; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.junit.Assert.assertEquals; | |||
import static org.junit.Assert.assertNotNull; | |||
import static org.junit.Assert.assertNull; | |||
@@ -114,7 +114,7 @@ public class RevCommitParseTest extends RepositoryTestCase { | |||
assertNull(c.getTree()); | |||
assertNull(c.parents); | |||
c.parseCanonical(rw, body.toString().getBytes(CHARSET)); | |||
c.parseCanonical(rw, body.toString().getBytes(UTF_8)); | |||
assertNotNull(c.getTree()); | |||
assertEquals(treeId, c.getTree().getId()); | |||
assertSame(rw.lookupTree(treeId), c.getTree()); | |||
@@ -148,7 +148,7 @@ public class RevCommitParseTest extends RepositoryTestCase { | |||
final RevCommit c; | |||
c = new RevCommit(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67")); | |||
c.parseCanonical(new RevWalk(db), b.toString().getBytes(CHARSET)); | |||
c.parseCanonical(new RevWalk(db), b.toString().getBytes(UTF_8)); | |||
return c; | |||
} | |||
@@ -161,7 +161,7 @@ public class RevCommitParseTest extends RepositoryTestCase { | |||
final RevCommit c; | |||
c = new RevCommit(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67")); | |||
c.parseCanonical(new RevWalk(db), b.toString().getBytes(CHARSET)); | |||
c.parseCanonical(new RevWalk(db), b.toString().getBytes(UTF_8)); | |||
assertEquals("", c.getFullMessage()); | |||
assertEquals("", c.getShortMessage()); | |||
@@ -176,7 +176,7 @@ public class RevCommitParseTest extends RepositoryTestCase { | |||
final RevCommit c; | |||
c = new RevCommit(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67")); | |||
c.parseCanonical(new RevWalk(db), b.toString().getBytes(CHARSET)); | |||
c.parseCanonical(new RevWalk(db), b.toString().getBytes(UTF_8)); | |||
assertEquals(new PersonIdent("", "a_u_thor@example.com", 1218123387000l, 7), c.getAuthorIdent()); | |||
assertEquals(new PersonIdent("", "", 1218123390000l, -5), c.getCommitterIdent()); | |||
@@ -185,18 +185,18 @@ public class RevCommitParseTest extends RepositoryTestCase { | |||
@Test | |||
public void testParse_implicit_UTF8_encoded() throws Exception { | |||
final ByteArrayOutputStream b = new ByteArrayOutputStream(); | |||
b.write("tree 9788669ad918b6fcce64af8882fc9a81cb6aba67\n".getBytes(CHARSET)); | |||
b.write("author F\u00f6r fattare <a_u_thor@example.com> 1218123387 +0700\n".getBytes(CHARSET)); | |||
b.write("committer C O. Miter <c@example.com> 1218123390 -0500\n".getBytes(CHARSET)); | |||
b.write("\n".getBytes(CHARSET)); | |||
b.write("Sm\u00f6rg\u00e5sbord\n".getBytes(CHARSET)); | |||
b.write("\n".getBytes(CHARSET)); | |||
b.write("\u304d\u308c\u3044\n".getBytes(CHARSET)); | |||
b.write("tree 9788669ad918b6fcce64af8882fc9a81cb6aba67\n".getBytes(UTF_8)); | |||
b.write("author F\u00f6r fattare <a_u_thor@example.com> 1218123387 +0700\n".getBytes(UTF_8)); | |||
b.write("committer C O. Miter <c@example.com> 1218123390 -0500\n".getBytes(UTF_8)); | |||
b.write("\n".getBytes(UTF_8)); | |||
b.write("Sm\u00f6rg\u00e5sbord\n".getBytes(UTF_8)); | |||
b.write("\n".getBytes(UTF_8)); | |||
b.write("\u304d\u308c\u3044\n".getBytes(UTF_8)); | |||
final RevCommit c; | |||
c = new RevCommit(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67")); // bogus id | |||
c.parseCanonical(new RevWalk(db), b.toByteArray()); | |||
assertSame(Constants.CHARSET, c.getEncoding()); | |||
assertSame(UTF_8, c.getEncoding()); | |||
assertEquals("F\u00f6r fattare", c.getAuthorIdent().getName()); | |||
assertEquals("Sm\u00f6rg\u00e5sbord", c.getShortMessage()); | |||
assertEquals("Sm\u00f6rg\u00e5sbord\n\n\u304d\u308c\u3044\n", c.getFullMessage()); | |||
@@ -205,18 +205,18 @@ public class RevCommitParseTest extends RepositoryTestCase { | |||
@Test | |||
public void testParse_implicit_mixed_encoded() throws Exception { | |||
final ByteArrayOutputStream b = new ByteArrayOutputStream(); | |||
b.write("tree 9788669ad918b6fcce64af8882fc9a81cb6aba67\n".getBytes(CHARSET)); | |||
b.write("tree 9788669ad918b6fcce64af8882fc9a81cb6aba67\n".getBytes(UTF_8)); | |||
b.write("author F\u00f6r fattare <a_u_thor@example.com> 1218123387 +0700\n".getBytes(ISO_8859_1)); | |||
b.write("committer C O. Miter <c@example.com> 1218123390 -0500\n".getBytes(CHARSET)); | |||
b.write("\n".getBytes(CHARSET)); | |||
b.write("Sm\u00f6rg\u00e5sbord\n".getBytes(CHARSET)); | |||
b.write("\n".getBytes(CHARSET)); | |||
b.write("\u304d\u308c\u3044\n".getBytes(CHARSET)); | |||
b.write("committer C O. Miter <c@example.com> 1218123390 -0500\n".getBytes(UTF_8)); | |||
b.write("\n".getBytes(UTF_8)); | |||
b.write("Sm\u00f6rg\u00e5sbord\n".getBytes(UTF_8)); | |||
b.write("\n".getBytes(UTF_8)); | |||
b.write("\u304d\u308c\u3044\n".getBytes(UTF_8)); | |||
final RevCommit c; | |||
c = new RevCommit(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67")); // bogus id | |||
c.parseCanonical(new RevWalk(db), b.toByteArray()); | |||
assertSame(Constants.CHARSET, c.getEncoding()); | |||
assertSame(UTF_8, c.getEncoding()); | |||
assertEquals("F\u00f6r fattare", c.getAuthorIdent().getName()); | |||
assertEquals("Sm\u00f6rg\u00e5sbord", c.getShortMessage()); | |||
assertEquals("Sm\u00f6rg\u00e5sbord\n\n\u304d\u308c\u3044\n", c.getFullMessage()); | |||
@@ -260,14 +260,14 @@ public class RevCommitParseTest extends RepositoryTestCase { | |||
@Test | |||
public void testParse_explicit_bad_encoded() throws Exception { | |||
final ByteArrayOutputStream b = new ByteArrayOutputStream(); | |||
b.write("tree 9788669ad918b6fcce64af8882fc9a81cb6aba67\n".getBytes(CHARSET)); | |||
b.write("tree 9788669ad918b6fcce64af8882fc9a81cb6aba67\n".getBytes(UTF_8)); | |||
b.write("author F\u00f6r fattare <a_u_thor@example.com> 1218123387 +0700\n".getBytes(ISO_8859_1)); | |||
b.write("committer C O. Miter <c@example.com> 1218123390 -0500\n".getBytes(CHARSET)); | |||
b.write("encoding EUC-JP\n".getBytes(CHARSET)); | |||
b.write("\n".getBytes(CHARSET)); | |||
b.write("\u304d\u308c\u3044\n".getBytes(CHARSET)); | |||
b.write("\n".getBytes(CHARSET)); | |||
b.write("Hi\n".getBytes(CHARSET)); | |||
b.write("committer C O. Miter <c@example.com> 1218123390 -0500\n".getBytes(UTF_8)); | |||
b.write("encoding EUC-JP\n".getBytes(UTF_8)); | |||
b.write("\n".getBytes(UTF_8)); | |||
b.write("\u304d\u308c\u3044\n".getBytes(UTF_8)); | |||
b.write("\n".getBytes(UTF_8)); | |||
b.write("Hi\n".getBytes(UTF_8)); | |||
final RevCommit c; | |||
c = new RevCommit(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67")); // bogus id | |||
c.parseCanonical(new RevWalk(db), b.toByteArray()); | |||
@@ -291,14 +291,14 @@ public class RevCommitParseTest extends RepositoryTestCase { | |||
@Test | |||
public void testParse_explicit_bad_encoded2() throws Exception { | |||
final ByteArrayOutputStream b = new ByteArrayOutputStream(); | |||
b.write("tree 9788669ad918b6fcce64af8882fc9a81cb6aba67\n".getBytes(CHARSET)); | |||
b.write("author F\u00f6r fattare <a_u_thor@example.com> 1218123387 +0700\n".getBytes(CHARSET)); | |||
b.write("committer C O. Miter <c@example.com> 1218123390 -0500\n".getBytes(CHARSET)); | |||
b.write("encoding ISO-8859-1\n".getBytes(CHARSET)); | |||
b.write("\n".getBytes(CHARSET)); | |||
b.write("\u304d\u308c\u3044\n".getBytes(CHARSET)); | |||
b.write("\n".getBytes(CHARSET)); | |||
b.write("Hi\n".getBytes(CHARSET)); | |||
b.write("tree 9788669ad918b6fcce64af8882fc9a81cb6aba67\n".getBytes(UTF_8)); | |||
b.write("author F\u00f6r fattare <a_u_thor@example.com> 1218123387 +0700\n".getBytes(UTF_8)); | |||
b.write("committer C O. Miter <c@example.com> 1218123390 -0500\n".getBytes(UTF_8)); | |||
b.write("encoding ISO-8859-1\n".getBytes(UTF_8)); | |||
b.write("\n".getBytes(UTF_8)); | |||
b.write("\u304d\u308c\u3044\n".getBytes(UTF_8)); | |||
b.write("\n".getBytes(UTF_8)); | |||
b.write("Hi\n".getBytes(UTF_8)); | |||
final RevCommit c; | |||
c = new RevCommit(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67")); // bogus id | |||
c.parseCanonical(new RevWalk(db), b.toByteArray()); | |||
@@ -313,13 +313,13 @@ public class RevCommitParseTest extends RepositoryTestCase { | |||
public void testParse_incorrectUtf8Name() throws Exception { | |||
ByteArrayOutputStream b = new ByteArrayOutputStream(); | |||
b.write("tree 9788669ad918b6fcce64af8882fc9a81cb6aba67\n" | |||
.getBytes(CHARSET)); | |||
b.write("author au <a@example.com> 1218123387 +0700\n".getBytes(CHARSET)); | |||
.getBytes(UTF_8)); | |||
b.write("author au <a@example.com> 1218123387 +0700\n".getBytes(UTF_8)); | |||
b.write("committer co <c@example.com> 1218123390 -0500\n" | |||
.getBytes(CHARSET)); | |||
b.write("encoding 'utf8'\n".getBytes(CHARSET)); | |||
b.write("\n".getBytes(CHARSET)); | |||
b.write("Sm\u00f6rg\u00e5sbord\n".getBytes(CHARSET)); | |||
.getBytes(UTF_8)); | |||
b.write("encoding 'utf8'\n".getBytes(UTF_8)); | |||
b.write("\n".getBytes(UTF_8)); | |||
b.write("Sm\u00f6rg\u00e5sbord\n".getBytes(UTF_8)); | |||
RevCommit c = new RevCommit( | |||
id("9473095c4cb2f12aefe1db8a355fe3fafba42f67")); | |||
@@ -338,12 +338,12 @@ public class RevCommitParseTest extends RepositoryTestCase { | |||
@Test | |||
public void testParse_illegalEncoding() throws Exception { | |||
ByteArrayOutputStream b = new ByteArrayOutputStream(); | |||
b.write("tree 9788669ad918b6fcce64af8882fc9a81cb6aba67\n".getBytes(CHARSET)); | |||
b.write("author au <a@example.com> 1218123387 +0700\n".getBytes(CHARSET)); | |||
b.write("committer co <c@example.com> 1218123390 -0500\n".getBytes(CHARSET)); | |||
b.write("encoding utf-8logoutputencoding=gbk\n".getBytes(CHARSET)); | |||
b.write("\n".getBytes(CHARSET)); | |||
b.write("message\n".getBytes(CHARSET)); | |||
b.write("tree 9788669ad918b6fcce64af8882fc9a81cb6aba67\n".getBytes(UTF_8)); | |||
b.write("author au <a@example.com> 1218123387 +0700\n".getBytes(UTF_8)); | |||
b.write("committer co <c@example.com> 1218123390 -0500\n".getBytes(UTF_8)); | |||
b.write("encoding utf-8logoutputencoding=gbk\n".getBytes(UTF_8)); | |||
b.write("\n".getBytes(UTF_8)); | |||
b.write("message\n".getBytes(UTF_8)); | |||
RevCommit c = new RevCommit( | |||
id("9473095c4cb2f12aefe1db8a355fe3fafba42f67")); | |||
@@ -365,12 +365,12 @@ public class RevCommitParseTest extends RepositoryTestCase { | |||
@Test | |||
public void testParse_unsupportedEncoding() throws Exception { | |||
ByteArrayOutputStream b = new ByteArrayOutputStream(); | |||
b.write("tree 9788669ad918b6fcce64af8882fc9a81cb6aba67\n".getBytes(CHARSET)); | |||
b.write("author au <a@example.com> 1218123387 +0700\n".getBytes(CHARSET)); | |||
b.write("committer co <c@example.com> 1218123390 -0500\n".getBytes(CHARSET)); | |||
b.write("encoding it_IT.UTF8\n".getBytes(CHARSET)); | |||
b.write("\n".getBytes(CHARSET)); | |||
b.write("message\n".getBytes(CHARSET)); | |||
b.write("tree 9788669ad918b6fcce64af8882fc9a81cb6aba67\n".getBytes(UTF_8)); | |||
b.write("author au <a@example.com> 1218123387 +0700\n".getBytes(UTF_8)); | |||
b.write("committer co <c@example.com> 1218123390 -0500\n".getBytes(UTF_8)); | |||
b.write("encoding it_IT.UTF8\n".getBytes(UTF_8)); | |||
b.write("\n".getBytes(UTF_8)); | |||
b.write("message\n".getBytes(UTF_8)); | |||
RevCommit c = new RevCommit( | |||
id("9473095c4cb2f12aefe1db8a355fe3fafba42f67")); |
@@ -44,7 +44,7 @@ | |||
package org.eclipse.jgit.revwalk; | |||
import static java.nio.charset.StandardCharsets.ISO_8859_1; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.junit.Assert.assertEquals; | |||
import static org.junit.Assert.assertNotNull; | |||
import static org.junit.Assert.assertNull; | |||
@@ -98,7 +98,7 @@ public class RevTagParseTest extends RepositoryTestCase { | |||
assertNull(c.getObject()); | |||
assertNull(c.getTagName()); | |||
c.parseCanonical(rw, b.toString().getBytes(CHARSET)); | |||
c.parseCanonical(rw, b.toString().getBytes(UTF_8)); | |||
assertNotNull(c.getObject()); | |||
assertEquals(id, c.getObject().getId()); | |||
assertSame(rw.lookupAny(id, typeCode), c.getObject()); | |||
@@ -141,7 +141,7 @@ public class RevTagParseTest extends RepositoryTestCase { | |||
assertNull(c.getObject()); | |||
assertNull(c.getTagName()); | |||
c.parseCanonical(rw, body.toString().getBytes(CHARSET)); | |||
c.parseCanonical(rw, body.toString().getBytes(UTF_8)); | |||
assertNotNull(c.getObject()); | |||
assertEquals(treeId, c.getObject().getId()); | |||
assertSame(rw.lookupTree(treeId), c.getObject()); | |||
@@ -189,7 +189,7 @@ public class RevTagParseTest extends RepositoryTestCase { | |||
assertNull(c.getObject()); | |||
assertNull(c.getTagName()); | |||
c.parseCanonical(rw, body.toString().getBytes(CHARSET)); | |||
c.parseCanonical(rw, body.toString().getBytes(UTF_8)); | |||
assertNotNull(c.getObject()); | |||
assertEquals(treeId, c.getObject().getId()); | |||
assertSame(rw.lookupTree(treeId), c.getObject()); | |||
@@ -213,7 +213,7 @@ public class RevTagParseTest extends RepositoryTestCase { | |||
final RevTag c; | |||
c = new RevTag(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67")); | |||
c.parseCanonical(new RevWalk(db), b.toString().getBytes(CHARSET)); | |||
c.parseCanonical(new RevWalk(db), b.toString().getBytes(UTF_8)); | |||
return c; | |||
} | |||
@@ -221,17 +221,17 @@ public class RevTagParseTest extends RepositoryTestCase { | |||
public void testParse_implicit_UTF8_encoded() throws Exception { | |||
final ByteArrayOutputStream b = new ByteArrayOutputStream(); | |||
b.write("object 9788669ad918b6fcce64af8882fc9a81cb6aba67\n" | |||
.getBytes(CHARSET)); | |||
b.write("type tree\n".getBytes(CHARSET)); | |||
b.write("tag v1.2.3.4.5\n".getBytes(CHARSET)); | |||
.getBytes(UTF_8)); | |||
b.write("type tree\n".getBytes(UTF_8)); | |||
b.write("tag v1.2.3.4.5\n".getBytes(UTF_8)); | |||
b | |||
.write("tagger F\u00f6r fattare <a_u_thor@example.com> 1218123387 +0700\n" | |||
.getBytes(CHARSET)); | |||
b.write("\n".getBytes(CHARSET)); | |||
b.write("Sm\u00f6rg\u00e5sbord\n".getBytes(CHARSET)); | |||
b.write("\n".getBytes(CHARSET)); | |||
b.write("\u304d\u308c\u3044\n".getBytes(CHARSET)); | |||
.getBytes(UTF_8)); | |||
b.write("\n".getBytes(UTF_8)); | |||
b.write("Sm\u00f6rg\u00e5sbord\n".getBytes(UTF_8)); | |||
b.write("\n".getBytes(UTF_8)); | |||
b.write("\u304d\u308c\u3044\n".getBytes(UTF_8)); | |||
final RevTag c; | |||
c = new RevTag(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67")); | |||
c.parseCanonical(new RevWalk(db), b.toByteArray()); | |||
@@ -246,15 +246,15 @@ public class RevTagParseTest extends RepositoryTestCase { | |||
public void testParse_implicit_mixed_encoded() throws Exception { | |||
final ByteArrayOutputStream b = new ByteArrayOutputStream(); | |||
b.write("object 9788669ad918b6fcce64af8882fc9a81cb6aba67\n" | |||
.getBytes(CHARSET)); | |||
b.write("type tree\n".getBytes(CHARSET)); | |||
b.write("tag v1.2.3.4.5\n".getBytes(CHARSET)); | |||
.getBytes(UTF_8)); | |||
b.write("type tree\n".getBytes(UTF_8)); | |||
b.write("tag v1.2.3.4.5\n".getBytes(UTF_8)); | |||
b.write("tagger F\u00f6r fattare <a_u_thor@example.com> 1218123387 +0700\n" | |||
.getBytes(ISO_8859_1)); | |||
b.write("\n".getBytes(CHARSET)); | |||
b.write("Sm\u00f6rg\u00e5sbord\n".getBytes(CHARSET)); | |||
b.write("\n".getBytes(CHARSET)); | |||
b.write("\u304d\u308c\u3044\n".getBytes(CHARSET)); | |||
b.write("\n".getBytes(UTF_8)); | |||
b.write("Sm\u00f6rg\u00e5sbord\n".getBytes(UTF_8)); | |||
b.write("\n".getBytes(UTF_8)); | |||
b.write("\u304d\u308c\u3044\n".getBytes(UTF_8)); | |||
final RevTag c; | |||
c = new RevTag(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67")); | |||
c.parseCanonical(new RevWalk(db), b.toByteArray()); | |||
@@ -307,17 +307,17 @@ public class RevTagParseTest extends RepositoryTestCase { | |||
public void testParse_explicit_bad_encoded() throws Exception { | |||
final ByteArrayOutputStream b = new ByteArrayOutputStream(); | |||
b.write("object 9788669ad918b6fcce64af8882fc9a81cb6aba67\n" | |||
.getBytes(CHARSET)); | |||
b.write("type tree\n".getBytes(CHARSET)); | |||
b.write("tag v1.2.3.4.5\n".getBytes(CHARSET)); | |||
.getBytes(UTF_8)); | |||
b.write("type tree\n".getBytes(UTF_8)); | |||
b.write("tag v1.2.3.4.5\n".getBytes(UTF_8)); | |||
b | |||
.write("tagger F\u00f6r fattare <a_u_thor@example.com> 1218123387 +0700\n" | |||
.getBytes(ISO_8859_1)); | |||
b.write("encoding EUC-JP\n".getBytes(CHARSET)); | |||
b.write("\n".getBytes(CHARSET)); | |||
b.write("\u304d\u308c\u3044\n".getBytes(CHARSET)); | |||
b.write("\n".getBytes(CHARSET)); | |||
b.write("Hi\n".getBytes(CHARSET)); | |||
b.write("encoding EUC-JP\n".getBytes(UTF_8)); | |||
b.write("\n".getBytes(UTF_8)); | |||
b.write("\u304d\u308c\u3044\n".getBytes(UTF_8)); | |||
b.write("\n".getBytes(UTF_8)); | |||
b.write("Hi\n".getBytes(UTF_8)); | |||
final RevTag c; | |||
c = new RevTag(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67")); | |||
c.parseCanonical(new RevWalk(db), b.toByteArray()); | |||
@@ -342,17 +342,17 @@ public class RevTagParseTest extends RepositoryTestCase { | |||
public void testParse_explicit_bad_encoded2() throws Exception { | |||
final ByteArrayOutputStream b = new ByteArrayOutputStream(); | |||
b.write("object 9788669ad918b6fcce64af8882fc9a81cb6aba67\n" | |||
.getBytes(CHARSET)); | |||
b.write("type tree\n".getBytes(CHARSET)); | |||
b.write("tag v1.2.3.4.5\n".getBytes(CHARSET)); | |||
.getBytes(UTF_8)); | |||
b.write("type tree\n".getBytes(UTF_8)); | |||
b.write("tag v1.2.3.4.5\n".getBytes(UTF_8)); | |||
b | |||
.write("tagger F\u00f6r fattare <a_u_thor@example.com> 1218123387 +0700\n" | |||
.getBytes(CHARSET)); | |||
b.write("encoding ISO-8859-1\n".getBytes(CHARSET)); | |||
b.write("\n".getBytes(CHARSET)); | |||
b.write("\u304d\u308c\u3044\n".getBytes(CHARSET)); | |||
b.write("\n".getBytes(CHARSET)); | |||
b.write("Hi\n".getBytes(CHARSET)); | |||
.getBytes(UTF_8)); | |||
b.write("encoding ISO-8859-1\n".getBytes(UTF_8)); | |||
b.write("\n".getBytes(UTF_8)); | |||
b.write("\u304d\u308c\u3044\n".getBytes(UTF_8)); | |||
b.write("\n".getBytes(UTF_8)); | |||
b.write("Hi\n".getBytes(UTF_8)); | |||
final RevTag c; | |||
c = new RevTag(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67")); | |||
c.parseCanonical(new RevWalk(db), b.toByteArray()); | |||
@@ -365,13 +365,13 @@ public class RevTagParseTest extends RepositoryTestCase { | |||
@Test | |||
public void testParse_illegalEncoding() throws Exception { | |||
ByteArrayOutputStream b = new ByteArrayOutputStream(); | |||
b.write("object 9788669ad918b6fcce64af8882fc9a81cb6aba67\n".getBytes(CHARSET)); | |||
b.write("type tree\n".getBytes(CHARSET)); | |||
b.write("tag v1.0\n".getBytes(CHARSET)); | |||
b.write("tagger t <t@example.com> 1218123387 +0700\n".getBytes(CHARSET)); | |||
b.write("encoding utf-8logoutputencoding=gbk\n".getBytes(CHARSET)); | |||
b.write("\n".getBytes(CHARSET)); | |||
b.write("message\n".getBytes(CHARSET)); | |||
b.write("object 9788669ad918b6fcce64af8882fc9a81cb6aba67\n".getBytes(UTF_8)); | |||
b.write("type tree\n".getBytes(UTF_8)); | |||
b.write("tag v1.0\n".getBytes(UTF_8)); | |||
b.write("tagger t <t@example.com> 1218123387 +0700\n".getBytes(UTF_8)); | |||
b.write("encoding utf-8logoutputencoding=gbk\n".getBytes(UTF_8)); | |||
b.write("\n".getBytes(UTF_8)); | |||
b.write("message\n".getBytes(UTF_8)); | |||
RevTag t = new RevTag(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67")); | |||
t.parseCanonical(new RevWalk(db), b.toByteArray()); | |||
@@ -384,13 +384,13 @@ public class RevTagParseTest extends RepositoryTestCase { | |||
@Test | |||
public void testParse_unsupportedEncoding() throws Exception { | |||
ByteArrayOutputStream b = new ByteArrayOutputStream(); | |||
b.write("object 9788669ad918b6fcce64af8882fc9a81cb6aba67\n".getBytes(CHARSET)); | |||
b.write("type tree\n".getBytes(CHARSET)); | |||
b.write("tag v1.0\n".getBytes(CHARSET)); | |||
b.write("tagger t <t@example.com> 1218123387 +0700\n".getBytes(CHARSET)); | |||
b.write("encoding it_IT.UTF8\n".getBytes(CHARSET)); | |||
b.write("\n".getBytes(CHARSET)); | |||
b.write("message\n".getBytes(CHARSET)); | |||
b.write("object 9788669ad918b6fcce64af8882fc9a81cb6aba67\n".getBytes(UTF_8)); | |||
b.write("type tree\n".getBytes(UTF_8)); | |||
b.write("tag v1.0\n".getBytes(UTF_8)); | |||
b.write("tagger t <t@example.com> 1218123387 +0700\n".getBytes(UTF_8)); | |||
b.write("encoding it_IT.UTF8\n".getBytes(UTF_8)); | |||
b.write("\n".getBytes(UTF_8)); | |||
b.write("message\n".getBytes(UTF_8)); | |||
RevTag t = new RevTag(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67")); | |||
t.parseCanonical(new RevWalk(db), b.toByteArray()); |
@@ -42,7 +42,7 @@ | |||
*/ | |||
package org.eclipse.jgit.storage.file; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.eclipse.jgit.util.FileUtils.pathToString; | |||
import static org.junit.Assert.assertArrayEquals; | |||
import static org.junit.Assert.assertEquals; | |||
@@ -105,7 +105,7 @@ public class FileBasedConfigTest { | |||
@Test | |||
public void testUTF8withoutBOM() throws IOException, ConfigInvalidException { | |||
final File file = createFile(CONTENT1.getBytes(CHARSET)); | |||
final File file = createFile(CONTENT1.getBytes(UTF_8)); | |||
final FileBasedConfig config = new FileBasedConfig(file, FS.DETECTED); | |||
config.load(); | |||
assertEquals(ALICE, config.getString(USER, null, NAME)); | |||
@@ -121,7 +121,7 @@ public class FileBasedConfigTest { | |||
bos1.write(0xEF); | |||
bos1.write(0xBB); | |||
bos1.write(0xBF); | |||
bos1.write(CONTENT1.getBytes(CHARSET)); | |||
bos1.write(CONTENT1.getBytes(UTF_8)); | |||
final File file = createFile(bos1.toByteArray()); | |||
final FileBasedConfig config = new FileBasedConfig(file, FS.DETECTED); | |||
@@ -135,7 +135,7 @@ public class FileBasedConfigTest { | |||
bos2.write(0xEF); | |||
bos2.write(0xBB); | |||
bos2.write(0xBF); | |||
bos2.write(CONTENT2.getBytes(CHARSET)); | |||
bos2.write(CONTENT2.getBytes(UTF_8)); | |||
assertArrayEquals(bos2.toByteArray(), IO.readFully(file)); | |||
} | |||
@@ -45,7 +45,7 @@ | |||
package org.eclipse.jgit.transport; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.eclipse.jgit.lib.Constants.OBJ_BLOB; | |||
import static org.junit.Assert.assertEquals; | |||
import static org.junit.Assert.assertNotNull; | |||
@@ -199,7 +199,8 @@ public class BundleWriterTest extends SampleDataRepositoryTestCase { | |||
Ref ref = repo.exactRef(refName); | |||
assertNotNull(ref); | |||
assertEquals(id, ref.getObjectId()); | |||
assertEquals(data, new String(repo.open(id, OBJ_BLOB).getBytes(), CHARSET)); | |||
assertEquals(data, | |||
new String(repo.open(id, OBJ_BLOB).getBytes(), UTF_8)); | |||
} | |||
} | |||
@@ -42,7 +42,7 @@ | |||
package org.eclipse.jgit.transport; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.junit.Assert.assertEquals; | |||
import static org.junit.Assert.assertNull; | |||
@@ -76,7 +76,7 @@ public class NetRCTest extends RepositoryTestCase { | |||
private void config(String data) throws IOException { | |||
try (OutputStreamWriter fw = new OutputStreamWriter( | |||
new FileOutputStream(configFile), CHARSET)) { | |||
new FileOutputStream(configFile), UTF_8)) { | |||
fw.write(data); | |||
} | |||
} |
@@ -43,7 +43,7 @@ | |||
package org.eclipse.jgit.transport; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.junit.Assert.assertArrayEquals; | |||
import static org.junit.Assert.assertEquals; | |||
import static org.junit.Assert.assertFalse; | |||
@@ -94,7 +94,7 @@ public class OpenSshConfigTest extends RepositoryTestCase { | |||
long lastMtime = configFile.lastModified(); | |||
do { | |||
try (final OutputStreamWriter fw = new OutputStreamWriter( | |||
new FileOutputStream(configFile), CHARSET)) { | |||
new FileOutputStream(configFile), UTF_8)) { | |||
fw.write(data); | |||
} | |||
} while (lastMtime == configFile.lastModified()); |
@@ -43,7 +43,7 @@ | |||
package org.eclipse.jgit.transport; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.eclipse.jgit.transport.WalkEncryptionTest.Util.cryptoCipherListPBE; | |||
import static org.eclipse.jgit.transport.WalkEncryptionTest.Util.cryptoCipherListTrans; | |||
import static org.eclipse.jgit.transport.WalkEncryptionTest.Util.folderDelete; | |||
@@ -360,7 +360,7 @@ public class WalkEncryptionTest { | |||
* @throws Exception | |||
*/ | |||
static String textRead(File file) throws Exception { | |||
return new String(Files.readAllBytes(file.toPath()), CHARSET); | |||
return new String(Files.readAllBytes(file.toPath()), UTF_8); | |||
} | |||
/** | |||
@@ -371,7 +371,7 @@ public class WalkEncryptionTest { | |||
* @throws Exception | |||
*/ | |||
static void textWrite(File file, String text) throws Exception { | |||
Files.write(file.toPath(), text.getBytes(CHARSET)); | |||
Files.write(file.toPath(), text.getBytes(UTF_8)); | |||
} | |||
static void verifyFileContent(File fileOne, File fileTwo) | |||
@@ -420,7 +420,7 @@ public class WalkEncryptionTest { | |||
c.setConnectTimeout(500); | |||
c.setReadTimeout(500); | |||
try (BufferedReader reader = new BufferedReader( | |||
new InputStreamReader(c.getInputStream(), CHARSET))) { | |||
new InputStreamReader(c.getInputStream(), UTF_8))) { | |||
return reader.readLine(); | |||
} | |||
} catch (UnknownHostException | SocketTimeoutException e) { | |||
@@ -738,7 +738,7 @@ public class WalkEncryptionTest { | |||
AmazonS3 s3 = new AmazonS3(props); | |||
String file = JGIT_USER + "-" + UUID.randomUUID().toString(); | |||
String path = JGIT_REMOTE_DIR + "/" + file; | |||
s3.put(bucket, path, file.getBytes(CHARSET)); | |||
s3.put(bucket, path, file.getBytes(UTF_8)); | |||
s3.delete(bucket, path); | |||
} | |||
@@ -43,6 +43,7 @@ | |||
package org.eclipse.jgit.treewalk; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.eclipse.jgit.lib.FileMode.REGULAR_FILE; | |||
import static org.eclipse.jgit.lib.FileMode.SYMLINK; | |||
import static org.junit.Assert.assertEquals; | |||
@@ -110,7 +111,7 @@ public class CanonicalTreeParserTest { | |||
} | |||
private String path() { | |||
return RawParseUtils.decode(Constants.CHARSET, ctp.path, | |||
return RawParseUtils.decode(UTF_8, ctp.path, | |||
ctp.pathOffset, ctp.pathLen); | |||
} | |||
@@ -370,7 +371,7 @@ public class CanonicalTreeParserTest { | |||
final String name = b.toString(); | |||
ctp.reset(entry(m644, name, hash_a)); | |||
assertFalse(ctp.eof()); | |||
assertEquals(name, RawParseUtils.decode(Constants.CHARSET, ctp.path, | |||
assertEquals(name, RawParseUtils.decode(UTF_8, ctp.path, | |||
ctp.pathOffset, ctp.pathLen)); | |||
} | |||
@@ -43,6 +43,7 @@ | |||
package org.eclipse.jgit.treewalk; | |||
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.assertNotNull; | |||
@@ -822,6 +823,6 @@ public class FileTreeIteratorTest extends RepositoryTestCase { | |||
} | |||
private static String nameOf(AbstractTreeIterator i) { | |||
return RawParseUtils.decode(Constants.CHARSET, i.path, 0, i.pathLen); | |||
return RawParseUtils.decode(UTF_8, i.path, 0, i.pathLen); | |||
} | |||
} |
@@ -42,7 +42,7 @@ | |||
*/ | |||
package org.eclipse.jgit.util; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.junit.Assert.assertEquals; | |||
import static org.junit.Assert.assertNotNull; | |||
@@ -93,7 +93,7 @@ public class RawSubStringPatternTest extends RepositoryTestCase { | |||
} | |||
private static RawCharSequence raw(String text) { | |||
byte[] bytes = text.getBytes(CHARSET); | |||
byte[] bytes = text.getBytes(UTF_8); | |||
return new RawCharSequence(bytes, 0, bytes.length); | |||
} | |||
} |
@@ -44,7 +44,7 @@ | |||
package org.eclipse.jgit.util.io; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.junit.Assert.assertEquals; | |||
import java.io.ByteArrayInputStream; | |||
@@ -132,6 +132,6 @@ public class AutoLFInputStreamTest { | |||
} | |||
private static byte[] asBytes(String in) { | |||
return in.getBytes(CHARSET); | |||
return in.getBytes(UTF_8); | |||
} | |||
} |
@@ -43,7 +43,7 @@ | |||
package org.eclipse.jgit.util.sha1; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.junit.Assert.assertEquals; | |||
import static org.junit.Assert.assertTrue; | |||
import static org.junit.Assert.fail; | |||
@@ -95,15 +95,15 @@ public class SHA1Test { | |||
.fromString("a9993e364706816aba3e25717850c26c9cd0d89d"); | |||
MessageDigest m = MessageDigest.getInstance("SHA-1"); | |||
m.update(TEST1.getBytes(CHARSET)); | |||
m.update(TEST1.getBytes(UTF_8)); | |||
ObjectId m1 = ObjectId.fromRaw(m.digest()); | |||
SHA1 s = SHA1.newInstance(); | |||
s.update(TEST1.getBytes(CHARSET)); | |||
s.update(TEST1.getBytes(UTF_8)); | |||
ObjectId s1 = ObjectId.fromRaw(s.digest()); | |||
s.reset(); | |||
s.update(TEST1.getBytes(CHARSET)); | |||
s.update(TEST1.getBytes(UTF_8)); | |||
ObjectId s2 = s.toObjectId(); | |||
assertEquals(m1, s1); | |||
@@ -117,15 +117,15 @@ public class SHA1Test { | |||
.fromString("84983e441c3bd26ebaae4aa1f95129e5e54670f1"); | |||
MessageDigest m = MessageDigest.getInstance("SHA-1"); | |||
m.update(TEST2.getBytes(CHARSET)); | |||
m.update(TEST2.getBytes(UTF_8)); | |||
ObjectId m1 = ObjectId.fromRaw(m.digest()); | |||
SHA1 s = SHA1.newInstance(); | |||
s.update(TEST2.getBytes(CHARSET)); | |||
s.update(TEST2.getBytes(UTF_8)); | |||
ObjectId s1 = ObjectId.fromRaw(s.digest()); | |||
s.reset(); | |||
s.update(TEST2.getBytes(CHARSET)); | |||
s.update(TEST2.getBytes(UTF_8)); | |||
ObjectId s2 = s.toObjectId(); | |||
assertEquals(m1, s1); |
@@ -42,6 +42,8 @@ | |||
*/ | |||
package org.eclipse.jgit.attributes; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import java.io.BufferedReader; | |||
import java.io.IOException; | |||
import java.io.InputStream; | |||
@@ -50,8 +52,6 @@ import java.util.ArrayList; | |||
import java.util.Collections; | |||
import java.util.List; | |||
import org.eclipse.jgit.lib.Constants; | |||
/** | |||
* Represents a bundle of attributes inherited from a base directory. | |||
* | |||
@@ -115,7 +115,7 @@ public class AttributesNode { | |||
} | |||
private static BufferedReader asReader(InputStream in) { | |||
return new BufferedReader(new InputStreamReader(in, Constants.CHARSET)); | |||
return new BufferedReader(new InputStreamReader(in, UTF_8)); | |||
} | |||
/** |
@@ -46,6 +46,8 @@ | |||
package org.eclipse.jgit.dircache; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import java.io.ByteArrayOutputStream; | |||
import java.io.EOFException; | |||
import java.io.IOException; | |||
@@ -772,7 +774,7 @@ public class DirCacheEntry { | |||
} | |||
static String toString(byte[] path) { | |||
return Constants.CHARSET.decode(ByteBuffer.wrap(path)).toString(); | |||
return UTF_8.decode(ByteBuffer.wrap(path)).toString(); | |||
} | |||
static int getMaximumInfoLength(boolean extended) { |
@@ -44,6 +44,7 @@ | |||
package org.eclipse.jgit.dircache; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.eclipse.jgit.lib.FileMode.TREE; | |||
import static org.eclipse.jgit.lib.TreeFormatter.entrySize; | |||
@@ -276,7 +277,7 @@ public class DirCacheTree { | |||
*/ | |||
public String getNameString() { | |||
final ByteBuffer bb = ByteBuffer.wrap(encodedName); | |||
return Constants.CHARSET.decode(bb).toString(); | |||
return UTF_8.decode(bb).toString(); | |||
} | |||
/** |
@@ -42,7 +42,7 @@ | |||
*/ | |||
package org.eclipse.jgit.hooks; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import java.io.ByteArrayOutputStream; | |||
import java.io.IOException; | |||
@@ -158,7 +158,7 @@ abstract class GitHook<T> implements Callable<T> { | |||
PrintStream hookErrRedirect = null; | |||
try { | |||
hookErrRedirect = new PrintStream(errorByteArray, false, | |||
CHARSET.name()); | |||
UTF_8.name()); | |||
} catch (UnsupportedEncodingException e) { | |||
// UTF-8 is guaranteed to be available | |||
} | |||
@@ -167,7 +167,7 @@ abstract class GitHook<T> implements Callable<T> { | |||
hookErrRedirect, getStdinArgs()); | |||
if (result.isExecutedWithError()) { | |||
throw new AbortedByHookException( | |||
new String(errorByteArray.toByteArray(), CHARSET), | |||
new String(errorByteArray.toByteArray(), UTF_8), | |||
getHookName(), result.getExitCode()); | |||
} | |||
} |
@@ -42,6 +42,8 @@ | |||
*/ | |||
package org.eclipse.jgit.ignore; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import java.io.BufferedReader; | |||
import java.io.IOException; | |||
import java.io.InputStream; | |||
@@ -50,8 +52,6 @@ import java.util.ArrayList; | |||
import java.util.Collections; | |||
import java.util.List; | |||
import org.eclipse.jgit.lib.Constants; | |||
/** | |||
* Represents a bundle of ignore rules inherited from a base directory. | |||
* | |||
@@ -121,7 +121,7 @@ public class IgnoreNode { | |||
} | |||
private static BufferedReader asReader(InputStream in) { | |||
return new BufferedReader(new InputStreamReader(in, Constants.CHARSET)); | |||
return new BufferedReader(new InputStreamReader(in, UTF_8)); | |||
} | |||
/** |
@@ -43,7 +43,7 @@ | |||
package org.eclipse.jgit.internal.storage.dfs; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import java.util.Arrays; | |||
@@ -67,7 +67,7 @@ public abstract class DfsStreamKey { | |||
*/ | |||
public static DfsStreamKey of(DfsRepositoryDescription repo, String name, | |||
@Nullable PackExt ext) { | |||
return new ByteArrayDfsStreamKey(repo, name.getBytes(CHARSET), ext); | |||
return new ByteArrayDfsStreamKey(repo, name.getBytes(UTF_8), ext); | |||
} | |||
final int hash; |
@@ -43,7 +43,7 @@ | |||
package org.eclipse.jgit.internal.storage.file; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import java.io.File; | |||
import java.io.IOException; | |||
@@ -171,6 +171,6 @@ class GcLog { | |||
if (content.length() > 0) { | |||
nonEmpty = true; | |||
} | |||
lock.write(content.getBytes(CHARSET)); | |||
lock.write(content.getBytes(UTF_8)); | |||
} | |||
} |
@@ -43,7 +43,7 @@ | |||
package org.eclipse.jgit.internal.storage.file; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import java.io.BufferedReader; | |||
import java.io.File; | |||
@@ -86,7 +86,7 @@ public class LazyObjectIdSetFile implements ObjectIdSet { | |||
private ObjectIdOwnerMap<Entry> load() { | |||
ObjectIdOwnerMap<Entry> r = new ObjectIdOwnerMap<>(); | |||
try (FileInputStream fin = new FileInputStream(src); | |||
Reader rin = new InputStreamReader(fin, CHARSET); | |||
Reader rin = new InputStreamReader(fin, UTF_8); | |||
BufferedReader br = new BufferedReader(rin)) { | |||
MutableObjectId id = new MutableObjectId(); | |||
for (String line; (line = br.readLine()) != null;) { |
@@ -46,7 +46,7 @@ | |||
package org.eclipse.jgit.internal.storage.file; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.eclipse.jgit.lib.Constants.HEAD; | |||
import static org.eclipse.jgit.lib.Constants.LOGS; | |||
import static org.eclipse.jgit.lib.Constants.OBJECT_ID_STRING_LENGTH; | |||
@@ -945,7 +945,7 @@ public class RefDirectory extends RefDatabase { | |||
try (BufferedReader br = new BufferedReader(new InputStreamReader( | |||
new DigestInputStream(new FileInputStream(packedRefsFile), | |||
digest), | |||
CHARSET))) { | |||
UTF_8))) { | |||
try { | |||
return new PackedRefList(parsePackedRefs(br), snapshot, | |||
ObjectId.fromRaw(digest.digest())); |
@@ -43,7 +43,7 @@ | |||
package org.eclipse.jgit.internal.storage.reftable; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.eclipse.jgit.internal.storage.reftable.BlockWriter.compare; | |||
import static org.eclipse.jgit.internal.storage.reftable.ReftableConstants.FILE_BLOCK_TYPE; | |||
import static org.eclipse.jgit.internal.storage.reftable.ReftableConstants.FILE_HEADER_LEN; | |||
@@ -138,7 +138,7 @@ class BlockReader { | |||
if (blockType == LOG_BLOCK_TYPE) { | |||
len -= 9; | |||
} | |||
return RawParseUtils.decode(CHARSET, nameBuf, 0, len); | |||
return RawParseUtils.decode(UTF_8, nameBuf, 0, len); | |||
} | |||
boolean match(byte[] match, boolean matchIsPrefix) { | |||
@@ -171,7 +171,7 @@ class BlockReader { | |||
} | |||
Ref readRef() throws IOException { | |||
String name = RawParseUtils.decode(CHARSET, nameBuf, 0, nameLen); | |||
String name = RawParseUtils.decode(UTF_8, nameBuf, 0, nameLen); | |||
switch (valueType & VALUE_TYPE_MASK) { | |||
case VALUE_NONE: // delete | |||
return newRef(name); | |||
@@ -266,7 +266,7 @@ class BlockReader { | |||
private String readValueString() { | |||
int len = readVarint32(); | |||
int end = ptr + len; | |||
String s = RawParseUtils.decode(CHARSET, buf, ptr, end); | |||
String s = RawParseUtils.decode(UTF_8, buf, ptr, end); | |||
ptr = end; | |||
return s; | |||
} |
@@ -43,7 +43,7 @@ | |||
package org.eclipse.jgit.internal.storage.reftable; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.eclipse.jgit.internal.storage.reftable.ReftableConstants.FILE_HEADER_LEN; | |||
import static org.eclipse.jgit.internal.storage.reftable.ReftableConstants.INDEX_BLOCK_TYPE; | |||
import static org.eclipse.jgit.internal.storage.reftable.ReftableConstants.LOG_BLOCK_TYPE; | |||
@@ -440,7 +440,7 @@ class BlockWriter { | |||
} | |||
private static byte[] nameUtf8(Ref ref) { | |||
return ref.getName().getBytes(CHARSET); | |||
return ref.getName().getBytes(UTF_8); | |||
} | |||
} | |||
@@ -559,13 +559,13 @@ class BlockWriter { | |||
this.newId = newId; | |||
this.timeSecs = who.getWhen().getTime() / 1000L; | |||
this.tz = (short) who.getTimeZoneOffset(); | |||
this.name = who.getName().getBytes(CHARSET); | |||
this.email = who.getEmailAddress().getBytes(CHARSET); | |||
this.msg = message.getBytes(CHARSET); | |||
this.name = who.getName().getBytes(UTF_8); | |||
this.email = who.getEmailAddress().getBytes(UTF_8); | |||
this.msg = message.getBytes(UTF_8); | |||
} | |||
static byte[] key(String ref, long index) { | |||
byte[] name = ref.getBytes(CHARSET); | |||
byte[] name = ref.getBytes(UTF_8); | |||
byte[] key = Arrays.copyOf(name, name.length + 1 + 8); | |||
NB.encodeInt64(key, key.length - 8, reverseUpdateIndex(index)); | |||
return key; |
@@ -43,7 +43,7 @@ | |||
package org.eclipse.jgit.internal.storage.reftable; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.eclipse.jgit.internal.storage.reftable.ReftableConstants.FILE_HEADER_LEN; | |||
import static org.eclipse.jgit.internal.storage.reftable.ReftableConstants.INDEX_BLOCK_TYPE; | |||
import static org.eclipse.jgit.internal.storage.reftable.ReftableConstants.LOG_BLOCK_TYPE; | |||
@@ -160,7 +160,7 @@ class ReftableOutputStream extends OutputStream { | |||
} | |||
void writeVarintString(String s) { | |||
writeVarintString(s.getBytes(CHARSET)); | |||
writeVarintString(s.getBytes(UTF_8)); | |||
} | |||
void writeVarintString(byte[] msg) { |
@@ -43,7 +43,7 @@ | |||
package org.eclipse.jgit.internal.storage.reftable; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.eclipse.jgit.internal.storage.reftable.BlockReader.decodeBlockLen; | |||
import static org.eclipse.jgit.internal.storage.reftable.ReftableConstants.FILE_BLOCK_TYPE; | |||
import static org.eclipse.jgit.internal.storage.reftable.ReftableConstants.FILE_FOOTER_LEN; | |||
@@ -182,7 +182,7 @@ public class ReftableReader extends Reftable { | |||
public RefCursor seekRef(String refName) throws IOException { | |||
initRefIndex(); | |||
byte[] key = refName.getBytes(CHARSET); | |||
byte[] key = refName.getBytes(UTF_8); | |||
RefCursorImpl i = new RefCursorImpl(refEnd, key, false); | |||
i.block = seek(REF_BLOCK_TYPE, key, refIndex, 0, refEnd); | |||
return i; | |||
@@ -193,7 +193,7 @@ public class ReftableReader extends Reftable { | |||
public RefCursor seekRefsWithPrefix(String prefix) throws IOException { | |||
initRefIndex(); | |||
byte[] key = prefix.getBytes(CHARSET); | |||
byte[] key = prefix.getBytes(UTF_8); | |||
RefCursorImpl i = new RefCursorImpl(refEnd, key, true); | |||
i.block = seek(REF_BLOCK_TYPE, key, refIndex, 0, refEnd); | |||
return i; | |||
@@ -232,7 +232,7 @@ public class ReftableReader extends Reftable { | |||
initLogIndex(); | |||
if (logPosition > 0) { | |||
byte[] key = LogEntry.key(refName, updateIndex); | |||
byte[] match = refName.getBytes(CHARSET); | |||
byte[] match = refName.getBytes(UTF_8); | |||
LogCursorImpl i = new LogCursorImpl(logEnd, match); | |||
i.block = seek(LOG_BLOCK_TYPE, key, logIndex, logPosition, logEnd); | |||
return i; |
@@ -45,7 +45,7 @@ | |||
package org.eclipse.jgit.lib; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import java.io.FileNotFoundException; | |||
import java.io.IOException; | |||
@@ -83,7 +83,7 @@ public class BlobBasedConfig extends Config { | |||
super(base); | |||
final String decoded; | |||
if (isUtf8(blob)) { | |||
decoded = RawParseUtils.decode(CHARSET, blob, 3, blob.length); | |||
decoded = RawParseUtils.decode(UTF_8, blob, 3, blob.length); | |||
} else { | |||
decoded = RawParseUtils.decode(blob); | |||
} |
@@ -45,6 +45,8 @@ | |||
package org.eclipse.jgit.lib; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import java.io.ByteArrayOutputStream; | |||
import java.io.IOException; | |||
import java.io.OutputStreamWriter; | |||
@@ -93,7 +95,7 @@ public class CommitBuilder { | |||
*/ | |||
public CommitBuilder() { | |||
parentIds = EMPTY_OBJECTID_LIST; | |||
encoding = Constants.CHARSET; | |||
encoding = UTF_8; | |||
} | |||
/** | |||
@@ -314,7 +316,7 @@ public class CommitBuilder { | |||
w.flush(); | |||
os.write('\n'); | |||
if (getEncoding() != Constants.CHARSET) { | |||
if (getEncoding() != UTF_8) { | |||
os.write(hencoding); | |||
os.write(' '); | |||
os.write(Constants.encodeASCII(getEncoding().name())); | |||
@@ -375,7 +377,7 @@ public class CommitBuilder { | |||
r.append(committer != null ? committer.toString() : "NOT_SET"); | |||
r.append("\n"); | |||
if (encoding != null && encoding != Constants.CHARSET) { | |||
if (encoding != null && encoding != UTF_8) { | |||
r.append("encoding "); | |||
r.append(encoding.name()); | |||
r.append("\n"); |
@@ -51,7 +51,7 @@ | |||
package org.eclipse.jgit.lib; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import java.text.MessageFormat; | |||
import java.util.ArrayList; | |||
@@ -1168,7 +1168,7 @@ public class Config { | |||
String decoded; | |||
if (isUtf8(bytes)) { | |||
decoded = RawParseUtils.decode(CHARSET, bytes, 3, bytes.length); | |||
decoded = RawParseUtils.decode(UTF_8, bytes, 3, bytes.length); | |||
} else { | |||
decoded = RawParseUtils.decode(bytes); | |||
} |
@@ -227,7 +227,13 @@ public final class Constants { | |||
*/ | |||
public static final byte[] PACK_SIGNATURE = { 'P', 'A', 'C', 'K' }; | |||
/** Native character encoding for commit messages, file names... */ | |||
/** | |||
* Native character encoding for commit messages, file names... | |||
* | |||
* @deprecated Use {@link java.nio.charset.StandardCharsets#UTF_8} directly | |||
* instead. | |||
**/ | |||
@Deprecated | |||
public static final Charset CHARSET; | |||
/** Native character encoding for commit messages, file names... */ | |||
@@ -638,7 +644,7 @@ public final class Constants { | |||
* @see #CHARACTER_ENCODING | |||
*/ | |||
public static byte[] encode(String str) { | |||
final ByteBuffer bb = Constants.CHARSET.encode(str); | |||
final ByteBuffer bb = UTF_8.encode(str); | |||
final int len = bb.limit(); | |||
if (bb.hasArray() && bb.arrayOffset() == 0) { | |||
final byte[] arr = bb.array(); | |||
@@ -655,7 +661,7 @@ public final class Constants { | |||
if (OBJECT_ID_LENGTH != newMessageDigest().getDigestLength()) | |||
throw new LinkageError(JGitText.get().incorrectOBJECT_ID_LENGTH); | |||
CHARSET = UTF_8; | |||
CHARACTER_ENCODING = CHARSET.name(); | |||
CHARACTER_ENCODING = UTF_8.name(); | |||
} | |||
/** name of the file containing the commit msg for a merge commit */ |
@@ -43,7 +43,7 @@ | |||
package org.eclipse.jgit.lib; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import java.io.BufferedOutputStream; | |||
import java.io.File; | |||
@@ -183,7 +183,7 @@ public class RebaseTodoFile { | |||
switch (tokenCount) { | |||
case 0: | |||
String actionToken = new String(buf, tokenBegin, | |||
nextSpace - tokenBegin - 1, CHARSET); | |||
nextSpace - tokenBegin - 1, UTF_8); | |||
tokenBegin = nextSpace; | |||
action = RebaseTodoLine.Action.parse(actionToken); | |||
if (action == null) | |||
@@ -192,7 +192,7 @@ public class RebaseTodoFile { | |||
case 1: | |||
nextSpace = RawParseUtils.next(buf, tokenBegin, ' '); | |||
String commitToken = new String(buf, tokenBegin, | |||
nextSpace - tokenBegin - 1, CHARSET); | |||
nextSpace - tokenBegin - 1, UTF_8); | |||
tokenBegin = nextSpace; | |||
commit = AbbreviatedObjectId.fromString(commitToken); | |||
break; |
@@ -45,6 +45,8 @@ | |||
package org.eclipse.jgit.lib; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import java.io.ByteArrayOutputStream; | |||
import java.io.IOException; | |||
import java.io.OutputStreamWriter; | |||
@@ -181,7 +183,7 @@ public class TagBuilder { | |||
public byte[] build() { | |||
ByteArrayOutputStream os = new ByteArrayOutputStream(); | |||
try (OutputStreamWriter w = new OutputStreamWriter(os, | |||
Constants.CHARSET)) { | |||
UTF_8)) { | |||
w.write("object "); //$NON-NLS-1$ | |||
getObjectId().copyTo(w); | |||
w.write('\n'); |
@@ -44,7 +44,7 @@ | |||
package org.eclipse.jgit.lib; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import java.io.IOException; | |||
import java.io.OutputStreamWriter; | |||
@@ -63,7 +63,7 @@ public class TextProgressMonitor extends BatchingProgressMonitor { | |||
* Initialize a new progress monitor. | |||
*/ | |||
public TextProgressMonitor() { | |||
this(new PrintWriter(new OutputStreamWriter(System.err, CHARSET))); | |||
this(new PrintWriter(new OutputStreamWriter(System.err, UTF_8))); | |||
} | |||
/** |
@@ -43,6 +43,7 @@ | |||
package org.eclipse.jgit.patch; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.eclipse.jgit.lib.Constants.encodeASCII; | |||
import static org.eclipse.jgit.util.RawParseUtils.decode; | |||
import static org.eclipse.jgit.util.RawParseUtils.decodeNoFallback; | |||
@@ -63,7 +64,6 @@ import org.eclipse.jgit.diff.DiffEntry; | |||
import org.eclipse.jgit.diff.EditList; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.AbbreviatedObjectId; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.lib.FileMode; | |||
import org.eclipse.jgit.util.QuotedString; | |||
import org.eclipse.jgit.util.RawParseUtils; | |||
@@ -198,7 +198,7 @@ public class FileHeader extends DiffEntry { | |||
* Convert the patch script for this file into a string. | |||
* <p> | |||
* The default character encoding | |||
* ({@link org.eclipse.jgit.lib.Constants#CHARSET}) is assumed for both the | |||
* ({@link java.nio.charset.StandardCharsets#UTF_8}) is assumed for both the | |||
* old and new files. | |||
* | |||
* @return the patch script, as a Unicode string. | |||
@@ -240,8 +240,9 @@ public class FileHeader extends DiffEntry { | |||
if (trySimpleConversion(charsetGuess)) { | |||
Charset cs = charsetGuess != null ? charsetGuess[0] : null; | |||
if (cs == null) | |||
cs = Constants.CHARSET; | |||
if (cs == null) { | |||
cs = UTF_8; | |||
} | |||
try { | |||
return decodeNoFallback(cs, buf, startOffset, endOffset); | |||
} catch (CharacterCodingException cee) { | |||
@@ -290,8 +291,9 @@ public class FileHeader extends DiffEntry { | |||
final String[] r = new String[tmp.length]; | |||
for (int i = 0; i < tmp.length; i++) { | |||
Charset cs = csGuess != null ? csGuess[i] : null; | |||
if (cs == null) | |||
cs = Constants.CHARSET; | |||
if (cs == null) { | |||
cs = UTF_8; | |||
} | |||
r[i] = RawParseUtils.decode(cs, tmp[i].toByteArray()); | |||
} | |||
return r; | |||
@@ -429,7 +431,7 @@ public class FileHeader extends DiffEntry { | |||
oldPath = QuotedString.GIT_PATH.dequote(buf, bol, sp - 1); | |||
oldPath = p1(oldPath); | |||
} else { | |||
oldPath = decode(Constants.CHARSET, buf, aStart, sp - 1); | |||
oldPath = decode(UTF_8, buf, aStart, sp - 1); | |||
} | |||
newPath = oldPath; | |||
return eol; | |||
@@ -572,7 +574,7 @@ public class FileHeader extends DiffEntry { | |||
tab--; | |||
if (ptr == tab) | |||
tab = end; | |||
r = decode(Constants.CHARSET, buf, ptr, tab - 1); | |||
r = decode(UTF_8, buf, ptr, tab - 1); | |||
} | |||
if (r.equals(DEV_NULL)) |
@@ -43,9 +43,10 @@ | |||
package org.eclipse.jgit.patch; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import java.util.Locale; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.util.RawParseUtils; | |||
/** | |||
@@ -120,7 +121,7 @@ public class FormatError { | |||
*/ | |||
public String getLineText() { | |||
final int eol = RawParseUtils.nextLF(buf, offset); | |||
return RawParseUtils.decode(Constants.CHARSET, buf, offset, eol); | |||
return RawParseUtils.decode(UTF_8, buf, offset, eol); | |||
} | |||
/** {@inheritDoc} */ |
@@ -44,7 +44,7 @@ | |||
package org.eclipse.jgit.revwalk; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import java.io.IOException; | |||
import java.nio.charset.Charset; | |||
@@ -541,7 +541,7 @@ public class RevCommit extends RevObject { | |||
try { | |||
return getEncoding(); | |||
} catch (IllegalCharsetNameException | UnsupportedCharsetException e) { | |||
return CHARSET; | |||
return UTF_8; | |||
} | |||
} | |||
@@ -45,7 +45,7 @@ | |||
package org.eclipse.jgit.revwalk; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import java.io.IOException; | |||
import java.nio.charset.Charset; | |||
@@ -169,7 +169,7 @@ public class RevTag extends RevObject { | |||
int p = pos.value += 4; // "tag " | |||
final int nameEnd = RawParseUtils.nextLF(rawTag, p) - 1; | |||
tagName = RawParseUtils.decode(CHARSET, rawTag, p, nameEnd); | |||
tagName = RawParseUtils.decode(UTF_8, rawTag, p, nameEnd); | |||
if (walk.isRetainBody()) | |||
buffer = rawTag; | |||
@@ -257,7 +257,7 @@ public class RevTag extends RevObject { | |||
try { | |||
return RawParseUtils.parseEncoding(buffer); | |||
} catch (IllegalCharsetNameException | UnsupportedCharsetException e) { | |||
return CHARSET; | |||
return UTF_8; | |||
} | |||
} | |||
@@ -49,7 +49,7 @@ | |||
package org.eclipse.jgit.storage.file; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import java.io.ByteArrayOutputStream; | |||
import java.io.File; | |||
@@ -166,7 +166,7 @@ public class FileBasedConfig extends StoredConfig { | |||
} else { | |||
final String decoded; | |||
if (isUtf8(in)) { | |||
decoded = RawParseUtils.decode(CHARSET, | |||
decoded = RawParseUtils.decode(UTF_8, | |||
in, 3, in.length); | |||
utf8Bom = true; | |||
} else { | |||
@@ -224,7 +224,7 @@ public class FileBasedConfig extends StoredConfig { | |||
bos.write(0xEF); | |||
bos.write(0xBB); | |||
bos.write(0xBF); | |||
bos.write(text.getBytes(CHARSET)); | |||
bos.write(text.getBytes(UTF_8)); | |||
out = bos.toByteArray(); | |||
} else { | |||
out = Constants.encode(text); |
@@ -43,7 +43,7 @@ | |||
package org.eclipse.jgit.transport; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import java.io.ByteArrayOutputStream; | |||
import java.io.File; | |||
@@ -635,7 +635,7 @@ public class AmazonS3 { | |||
try { | |||
final Mac m = Mac.getInstance(HMAC); | |||
m.init(privateKey); | |||
sec = Base64.encodeBytes(m.doFinal(s.toString().getBytes(CHARSET))); | |||
sec = Base64.encodeBytes(m.doFinal(s.toString().getBytes(UTF_8))); | |||
} catch (NoSuchAlgorithmException e) { | |||
throw new IOException(MessageFormat.format(JGitText.get().noHMACsupport, HMAC, e.getMessage())); | |||
} catch (InvalidKeyException e) { |
@@ -47,6 +47,8 @@ | |||
package org.eclipse.jgit.transport; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import java.io.BufferedInputStream; | |||
import java.io.IOException; | |||
import java.io.InputStream; | |||
@@ -66,7 +68,6 @@ import org.eclipse.jgit.errors.PackProtocolException; | |||
import org.eclipse.jgit.errors.TransportException; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.internal.storage.file.PackLock; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.lib.NullProgressMonitor; | |||
import org.eclipse.jgit.lib.ObjectId; | |||
import org.eclipse.jgit.lib.ObjectIdRef; | |||
@@ -173,7 +174,7 @@ class BundleFetchConnection extends BaseFetchConnection { | |||
IO.skipFully(bin, 1); | |||
done = true; | |||
} | |||
line.append(RawParseUtils.decode(Constants.CHARSET, hdrbuf, 0, lf)); | |||
line.append(RawParseUtils.decode(UTF_8, hdrbuf, 0, lf)); | |||
} | |||
return line.toString(); | |||
} |
@@ -43,6 +43,8 @@ | |||
package org.eclipse.jgit.transport; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import java.io.IOException; | |||
import java.io.OutputStream; | |||
import java.io.OutputStreamWriter; | |||
@@ -231,7 +233,7 @@ public class BundleWriter { | |||
packWriter.setTagTargets(tagTargets); | |||
packWriter.preparePack(monitor, inc, exc); | |||
final Writer w = new OutputStreamWriter(os, Constants.CHARSET); | |||
final Writer w = new OutputStreamWriter(os, UTF_8); | |||
w.write(TransportBundle.V2_BUNDLE_SIGNATURE); | |||
w.write('\n'); | |||
@@ -43,7 +43,7 @@ | |||
package org.eclipse.jgit.transport; | |||
import static java.nio.charset.StandardCharsets.ISO_8859_1; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import java.io.File; | |||
import java.security.InvalidKeyException; | |||
@@ -102,7 +102,7 @@ public class HMACSHA1NonceGenerator implements NonceGenerator { | |||
} | |||
String input = path + ":" + String.valueOf(timestamp); //$NON-NLS-1$ | |||
byte[] rawHmac = mac.doFinal(input.getBytes(CHARSET)); | |||
byte[] rawHmac = mac.doFinal(input.getBytes(UTF_8)); | |||
return Long.toString(timestamp) + "-" + toHex(rawHmac); //$NON-NLS-1$ | |||
} | |||
@@ -43,7 +43,7 @@ | |||
package org.eclipse.jgit.transport; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.eclipse.jgit.util.HttpSupport.HDR_AUTHORIZATION; | |||
import static org.eclipse.jgit.util.HttpSupport.HDR_WWW_AUTHENTICATE; | |||
@@ -315,7 +315,7 @@ abstract class HttpAuthMethod { | |||
@Override | |||
void configureRequest(HttpConnection conn) throws IOException { | |||
String ident = user + ":" + pass; //$NON-NLS-1$ | |||
String enc = Base64.encodeBytes(ident.getBytes(CHARSET)); | |||
String enc = Base64.encodeBytes(ident.getBytes(UTF_8)); | |||
conn.setRequestProperty(HDR_AUTHORIZATION, type.getSchemeName() | |||
+ " " + enc); //$NON-NLS-1$ | |||
} | |||
@@ -430,15 +430,15 @@ abstract class HttpAuthMethod { | |||
private static String H(String data) { | |||
MessageDigest md = newMD5(); | |||
md.update(data.getBytes(CHARSET)); | |||
md.update(data.getBytes(UTF_8)); | |||
return LHEX(md.digest()); | |||
} | |||
private static String KD(String secret, String data) { | |||
MessageDigest md = newMD5(); | |||
md.update(secret.getBytes(CHARSET)); | |||
md.update(secret.getBytes(UTF_8)); | |||
md.update((byte) ':'); | |||
md.update(data.getBytes(CHARSET)); | |||
md.update(data.getBytes(UTF_8)); | |||
return LHEX(md.digest()); | |||
} | |||
@@ -45,13 +45,14 @@ | |||
package org.eclipse.jgit.transport; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import java.io.IOException; | |||
import java.io.InputStream; | |||
import java.text.MessageFormat; | |||
import org.eclipse.jgit.errors.PackProtocolException; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.lib.MutableObjectId; | |||
import org.eclipse.jgit.util.IO; | |||
import org.eclipse.jgit.util.RawParseUtils; | |||
@@ -186,7 +187,7 @@ public class PacketLineIn { | |||
if (raw[len - 1] == '\n') | |||
len--; | |||
String s = RawParseUtils.decode(Constants.CHARSET, raw, 0, len); | |||
String s = RawParseUtils.decode(UTF_8, raw, 0, len); | |||
log.debug("git< " + s); //$NON-NLS-1$ | |||
return s; | |||
} | |||
@@ -218,7 +219,7 @@ public class PacketLineIn { | |||
IO.readFully(in, raw, 0, len); | |||
String s = RawParseUtils.decode(Constants.CHARSET, raw, 0, len); | |||
String s = RawParseUtils.decode(UTF_8, raw, 0, len); | |||
log.debug("git< " + s); //$NON-NLS-1$ | |||
return s; | |||
} |
@@ -45,6 +45,8 @@ | |||
package org.eclipse.jgit.transport; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import java.io.IOException; | |||
import java.io.OutputStream; | |||
@@ -141,7 +143,7 @@ public class PacketLineOut { | |||
out.write(lenbuffer, 0, 4); | |||
out.write(buf, pos, len); | |||
if (log.isDebugEnabled()) { | |||
String s = RawParseUtils.decode(Constants.CHARSET, buf, pos, len); | |||
String s = RawParseUtils.decode(UTF_8, buf, pos, len); | |||
log.debug("git> " + s); //$NON-NLS-1$ | |||
} | |||
} |
@@ -43,7 +43,7 @@ | |||
package org.eclipse.jgit.transport; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import java.io.IOException; | |||
import java.io.OutputStream; | |||
@@ -141,7 +141,7 @@ public class ProgressSpinner { | |||
private void write(String s) { | |||
if (write) { | |||
try { | |||
out.write(s.getBytes(CHARSET)); | |||
out.write(s.getBytes(UTF_8)); | |||
out.flush(); | |||
} catch (IOException e) { | |||
write = false; |
@@ -43,7 +43,7 @@ | |||
package org.eclipse.jgit.transport; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.eclipse.jgit.util.RawParseUtils.lastIndexOfTrim; | |||
import java.text.SimpleDateFormat; | |||
@@ -95,7 +95,7 @@ public class PushCertificateIdent { | |||
*/ | |||
public static PushCertificateIdent parse(String str) { | |||
MutableInteger p = new MutableInteger(); | |||
byte[] raw = str.getBytes(CHARSET); | |||
byte[] raw = str.getBytes(UTF_8); | |||
int tzBegin = raw.length - 1; | |||
tzBegin = lastIndexOfTrim(raw, ' ', tzBegin); | |||
if (tzBegin < 0 || raw[tzBegin] != ' ') { | |||
@@ -129,7 +129,7 @@ public class PushCertificateIdent { | |||
idEnd = raw.length; | |||
} | |||
} | |||
String id = new String(raw, 0, idEnd, CHARSET); | |||
String id = new String(raw, 0, idEnd, UTF_8); | |||
return new PushCertificateIdent(str, id, when * 1000L, tz); | |||
} |
@@ -43,7 +43,7 @@ | |||
package org.eclipse.jgit.transport; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.eclipse.jgit.lib.Constants.OBJ_BLOB; | |||
import static org.eclipse.jgit.lib.Constants.OBJ_COMMIT; | |||
import static org.eclipse.jgit.lib.FileMode.TYPE_FILE; | |||
@@ -292,7 +292,8 @@ public class PushCertificateStore implements AutoCloseable { | |||
ObjectLoader loader = | |||
tw.getObjectReader().open(tw.getObjectId(0), OBJ_BLOB); | |||
try (InputStream in = loader.openStream(); | |||
Reader r = new BufferedReader(new InputStreamReader(in, CHARSET))) { | |||
Reader r = new BufferedReader( | |||
new InputStreamReader(in, UTF_8))) { | |||
return PushCertificateParser.fromReader(r); | |||
} | |||
} | |||
@@ -473,7 +474,7 @@ public class PushCertificateStore implements AutoCloseable { | |||
DirCacheEditor editor = dc.editor(); | |||
String certText = pc.cert.toText() + pc.cert.getSignature(); | |||
final ObjectId certId = inserter.insert(OBJ_BLOB, certText.getBytes(CHARSET)); | |||
final ObjectId certId = inserter.insert(OBJ_BLOB, certText.getBytes(UTF_8)); | |||
boolean any = false; | |||
for (ReceiveCommand cmd : pc.cert.getCommands()) { | |||
if (byRef != null && !commandsEqual(cmd, byRef.get(cmd.getRefName()))) { |
@@ -43,7 +43,7 @@ | |||
package org.eclipse.jgit.transport; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.eclipse.jgit.lib.Constants.OBJECT_ID_STRING_LENGTH; | |||
import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_SYMREF; | |||
@@ -74,7 +74,7 @@ import org.eclipse.jgit.lib.Repository; | |||
public abstract class RefAdvertiser { | |||
/** Advertiser which frames lines in a {@link PacketLineOut} format. */ | |||
public static class PacketLineOutRefAdvertiser extends RefAdvertiser { | |||
private final CharsetEncoder utf8 = CHARSET.newEncoder(); | |||
private final CharsetEncoder utf8 = UTF_8.newEncoder(); | |||
private final PacketLineOut pckOut; | |||
private byte[] binArr = new byte[256]; |
@@ -44,6 +44,7 @@ | |||
package org.eclipse.jgit.transport; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.eclipse.jgit.transport.SideBandOutputStream.HDR_SIZE; | |||
import java.io.IOException; | |||
@@ -57,7 +58,6 @@ import java.util.regex.Pattern; | |||
import org.eclipse.jgit.errors.PackProtocolException; | |||
import org.eclipse.jgit.errors.TransportException; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.lib.ProgressMonitor; | |||
import org.eclipse.jgit.util.IO; | |||
import org.eclipse.jgit.util.RawParseUtils; | |||
@@ -257,6 +257,6 @@ public class SideBandInputStream extends InputStream { | |||
private String readString(int len) throws IOException { | |||
final byte[] raw = new byte[len]; | |||
IO.readFully(rawIn, raw, 0, len); | |||
return RawParseUtils.decode(Constants.CHARSET, raw, 0, len); | |||
return RawParseUtils.decode(UTF_8, raw, 0, len); | |||
} | |||
} |
@@ -46,7 +46,7 @@ | |||
package org.eclipse.jgit.transport; | |||
import static org.eclipse.jgit.lib.Constants.CHARSET; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import java.io.BufferedReader; | |||
import java.io.IOException; | |||
@@ -144,7 +144,7 @@ public abstract class Transport implements AutoCloseable { | |||
private static void scan(ClassLoader ldr, URL url) { | |||
try (BufferedReader br = new BufferedReader( | |||
new InputStreamReader(url.openStream(), CHARSET))) { | |||
new InputStreamReader(url.openStream(), UTF_8))) { | |||
String line; | |||
while ((line = br.readLine()) != null) { | |||
line = line.trim(); |
@@ -46,6 +46,7 @@ | |||
package org.eclipse.jgit.transport; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.eclipse.jgit.lib.Constants.HEAD; | |||
import static org.eclipse.jgit.util.HttpSupport.ENCODING_GZIP; | |||
import static org.eclipse.jgit.util.HttpSupport.ENCODING_X_GZIP; | |||
@@ -426,7 +427,7 @@ public class TransportHttp extends HttpTransport implements WalkTransport, | |||
} | |||
private BufferedReader toBufferedReader(InputStream in) { | |||
return new BufferedReader(new InputStreamReader(in, Constants.CHARSET)); | |||
return new BufferedReader(new InputStreamReader(in, UTF_8)); | |||
} | |||
/** {@inheritDoc} */ | |||
@@ -952,7 +953,7 @@ public class TransportHttp extends HttpTransport implements WalkTransport, | |||
// Line oriented readable content is likely to compress well. | |||
// Request gzip encoding. | |||
InputStream is = open(path, AcceptEncoding.GZIP).in; | |||
return new BufferedReader(new InputStreamReader(is, Constants.CHARSET)); | |||
return new BufferedReader(new InputStreamReader(is, UTF_8)); | |||
} | |||
@Override |
@@ -43,6 +43,8 @@ | |||
package org.eclipse.jgit.transport; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import java.io.BufferedReader; | |||
import java.io.ByteArrayOutputStream; | |||
import java.io.FileNotFoundException; | |||
@@ -363,7 +365,7 @@ abstract class WalkRemoteObjectDatabase { | |||
*/ | |||
BufferedReader openReader(String path) throws IOException { | |||
final InputStream is = open(path).in; | |||
return new BufferedReader(new InputStreamReader(is, Constants.CHARSET)); | |||
return new BufferedReader(new InputStreamReader(is, UTF_8)); | |||
} | |||
/** |
@@ -45,6 +45,8 @@ | |||
package org.eclipse.jgit.treewalk; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import java.io.IOException; | |||
import java.nio.ByteBuffer; | |||
import java.nio.CharBuffer; | |||
@@ -182,7 +184,7 @@ public abstract class AbstractTreeIterator { | |||
if (prefix != null && prefix.length() > 0) { | |||
final ByteBuffer b; | |||
b = Constants.CHARSET.encode(CharBuffer.wrap(prefix)); | |||
b = UTF_8.encode(CharBuffer.wrap(prefix)); | |||
pathLen = b.limit(); | |||
path = new byte[Math.max(DEFAULT_PATH_SIZE, pathLen + 1)]; | |||
b.get(path, 0, pathLen); |
@@ -44,6 +44,8 @@ | |||
package org.eclipse.jgit.treewalk; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import java.io.IOException; | |||
import java.util.HashMap; | |||
import java.util.Map; | |||
@@ -1045,7 +1047,7 @@ public class TreeWalk implements AutoCloseable, AttributesProvider { | |||
final AbstractTreeIterator t = currentHead; | |||
final int off = t.pathOffset; | |||
final int end = t.pathLen; | |||
return RawParseUtils.decode(Constants.CHARSET, t.path, off, end); | |||
return RawParseUtils.decode(UTF_8, t.path, off, end); | |||
} | |||
/** | |||
@@ -1378,11 +1380,11 @@ public class TreeWalk implements AutoCloseable, AttributesProvider { | |||
} | |||
static String pathOf(AbstractTreeIterator t) { | |||
return RawParseUtils.decode(Constants.CHARSET, t.path, 0, t.pathLen); | |||
return RawParseUtils.decode(UTF_8, t.path, 0, t.pathLen); | |||
} | |||
static String pathOf(byte[] buf, int pos, int end) { | |||
return RawParseUtils.decode(Constants.CHARSET, buf, pos, end); | |||
return RawParseUtils.decode(UTF_8, buf, pos, end); | |||
} | |||
/** |