motiejus
/
jgit
1
Fork 0
Code Releases Activity

Deprecate Constants.CHARSET in favor of StandardCharsets.UTF_8 

Change-Id: I3b748620f067582afef20f144feebe40d0332be2
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
This commit is contained in:
David Pursehouse 2018-09-04 10:53:10 +09:00
parent 685f8c8dbe
commit 30c6c75421
105 changed files with 442 additions and 397 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/InfoRefsServlet.java
View File

@ -43,6 +43,7 @@
package org.eclipse.jgit.http.server; package org.eclipse.jgit.http.server;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.eclipse.jgit.http.server.ServletUtils.getRepository; import static org.eclipse.jgit.http.server.ServletUtils.getRepository;
import java.io.IOException; import java.io.IOException;
@ -73,7 +74,7 @@ public void doGet(final HttpServletRequest req,
final Repository db = getRepository(req); final Repository db = getRepository(req);
try (OutputStreamWriter out = new OutputStreamWriter( try (OutputStreamWriter out = new OutputStreamWriter(
new SmartOutputStream(req, rsp, true), new SmartOutputStream(req, rsp, true),
Constants.CHARSET)) { UTF_8)) {
final RefAdvertiser adv = new RefAdvertiser() { final RefAdvertiser adv = new RefAdvertiser() {
@Override @Override
protected void writeOne(CharSequence line) protected void writeOne(CharSequence line)

4
org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java
View File

@ -43,7 +43,7 @@
package org.eclipse.jgit.http.test; 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_ENCODING;
import static org.eclipse.jgit.util.HttpSupport.HDR_CONTENT_LENGTH; import static org.eclipse.jgit.util.HttpSupport.HDR_CONTENT_LENGTH;
import static org.eclipse.jgit.util.HttpSupport.HDR_CONTENT_TYPE; import static org.eclipse.jgit.util.HttpSupport.HDR_CONTENT_TYPE;
@ -1081,7 +1081,7 @@ public void testInitialClone_BrokenServer() throws Exception {
public void testInvalidWant() throws Exception { public void testInvalidWant() throws Exception {
@SuppressWarnings("resource") @SuppressWarnings("resource")
ObjectId id = new ObjectInserter.Formatter().idFor(Constants.OBJ_BLOB, ObjectId id = new ObjectInserter.Formatter().idFor(Constants.OBJ_BLOB,
"testInvalidWant".getBytes(CHARSET)); "testInvalidWant".getBytes(UTF_8));
Repository dst = createBareRepository(); Repository dst = createBareRepository();
try (Transport t = Transport.open(dst, remoteURI); try (Transport t = Transport.open(dst, remoteURI);

6
org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/JGitTestUtil.java
View File

@ -45,7 +45,7 @@
package org.eclipse.jgit.junit; 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.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
@ -246,7 +246,7 @@ public static void write(File f, String body)
throws IOException { throws IOException {
FileUtils.mkdirs(f.getParentFile(), true); FileUtils.mkdirs(f.getParentFile(), true);
try (Writer w = new OutputStreamWriter(new FileOutputStream(f), try (Writer w = new OutputStreamWriter(new FileOutputStream(f),
CHARSET)) { UTF_8)) {
w.write(body); w.write(body);
} }
} }
@ -263,7 +263,7 @@ public static void write(File f, String body)
*/ */
public static String read(File file) throws IOException { public static String read(File file) throws IOException {
final byte[] body = IO.readFully(file); final byte[] body = IO.readFully(file);
return new String(body, 0, body.length, CHARSET); return new String(body, 0, body.length, UTF_8);
} }
/** /**

4
org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java
View File

@ -45,7 +45,7 @@
package org.eclipse.jgit.junit; 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.assertFalse;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
@ -352,7 +352,7 @@ public static String indexState(Repository repo, int includedOptions)
if (0 != (includedOptions & CONTENT)) { if (0 != (includedOptions & CONTENT)) {
sb.append(", content:" sb.append(", content:"
+ new String(repo.open(entry.getObjectId(), + new String(repo.open(entry.getObjectId(),
Constants.OBJ_BLOB).getCachedBytes(), CHARSET)); Constants.OBJ_BLOB).getCachedBytes(), UTF_8));
} }
if (0 != (includedOptions & ASSUME_UNCHANGED)) if (0 != (includedOptions & ASSUME_UNCHANGED))
sb.append(", assume-unchanged:" sb.append(", assume-unchanged:"

4
org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/RepositoryTestCase.java
View File

@ -46,7 +46,7 @@
package org.eclipse.jgit.junit; 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.assertEquals;
import java.io.File; import java.io.File;
@ -192,7 +192,7 @@ protected void deleteTrashFile(String name) throws IOException {
protected static void checkFile(File f, String checkData) protected static void checkFile(File f, String checkData)
throws IOException { throws IOException {
try (Reader r = new InputStreamReader(new FileInputStream(f), try (Reader r = new InputStreamReader(new FileInputStream(f),
CHARSET)) { UTF_8)) {
if (checkData.length() > 0) { if (checkData.length() > 0) {
char[] data = new char[checkData.length()]; char[] data = new char[checkData.length()];
assertEquals(data.length, r.read(data)); assertEquals(data.length, r.read(data));

4
org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java
View File

@ -43,7 +43,7 @@
package org.eclipse.jgit.junit; 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.assertEquals;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
@ -268,7 +268,7 @@ public void setAuthorAndCommitter(org.eclipse.jgit.lib.CommitBuilder c) {
* @throws Exception * @throws Exception
*/ */
public RevBlob blob(String content) throws Exception { public RevBlob blob(String content) throws Exception {
return blob(content.getBytes(CHARSET)); return blob(content.getBytes(UTF_8));
} }
/** /**

6
org.eclipse.jgit.lfs.server.test/tst/org/eclipse/jgit/lfs/server/fs/LfsServerTest.java
View File

@ -42,7 +42,7 @@
*/ */
package org.eclipse.jgit.lfs.server.fs; 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 static org.junit.Assert.assertEquals;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
@ -211,11 +211,11 @@ private void checkResponseStatus(HttpResponse response) {
if (buf.hasArray()) { if (buf.hasArray()) {
error = new String(buf.array(), error = new String(buf.array(),
buf.arrayOffset() + buf.position(), buf.remaining(), buf.arrayOffset() + buf.position(), buf.remaining(),
CHARSET); UTF_8);
} else { } else {
final byte[] b = new byte[buf.remaining()]; final byte[] b = new byte[buf.remaining()];
buf.duplicate().get(b); buf.duplicate().get(b);
error = new String(b, CHARSET); error = new String(b, UTF_8);
} }
} catch (IOException e) { } catch (IOException e) {
error = statusLine.getReasonPhrase(); error = statusLine.getReasonPhrase();

6
org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/LfsProtocolServlet.java
View File

@ -42,7 +42,7 @@
*/ */
package org.eclipse.jgit.lfs.server; 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_FORBIDDEN;
import static org.apache.http.HttpStatus.SC_INSUFFICIENT_STORAGE; import static org.apache.http.HttpStatus.SC_INSUFFICIENT_STORAGE;
import static org.apache.http.HttpStatus.SC_INTERNAL_SERVER_ERROR; import static org.apache.http.HttpStatus.SC_INTERNAL_SERVER_ERROR;
@ -202,10 +202,10 @@ public boolean isVerify() {
protected void doPost(HttpServletRequest req, HttpServletResponse res) protected void doPost(HttpServletRequest req, HttpServletResponse res)
throws ServletException, IOException { throws ServletException, IOException {
Writer w = new BufferedWriter( Writer w = new BufferedWriter(
new OutputStreamWriter(res.getOutputStream(), CHARSET)); new OutputStreamWriter(res.getOutputStream(), UTF_8));
Reader r = new BufferedReader( Reader r = new BufferedReader(
new InputStreamReader(req.getInputStream(), CHARSET)); new InputStreamReader(req.getInputStream(), UTF_8));
LfsRequest request = LfsGson.fromJson(r, LfsRequest.class); LfsRequest request = LfsGson.fromJson(r, LfsRequest.class);
String path = req.getPathInfo(); String path = req.getPathInfo();

8
org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/s3/SignerV4.java
View File

@ -43,7 +43,7 @@
*/ */
package org.eclipse.jgit.lfs.server.s3; 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 static org.eclipse.jgit.util.HttpSupport.HDR_AUTHORIZATION;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
@ -359,13 +359,13 @@ private static String canonicalizeResourcePath(URL endpoint) {
private static byte[] hash(String s) { private static byte[] hash(String s) {
MessageDigest md = Constants.newMessageDigest(); MessageDigest md = Constants.newMessageDigest();
md.update(s.getBytes(CHARSET)); md.update(s.getBytes(UTF_8));
return md.digest(); return md.digest();
} }
private static byte[] sign(String stringData, byte[] key) { private static byte[] sign(String stringData, byte[] key) {
try { try {
byte[] data = stringData.getBytes(CHARSET); byte[] data = stringData.getBytes(UTF_8);
Mac mac = Mac.getInstance(HMACSHA256); Mac mac = Mac.getInstance(HMACSHA256);
mac.init(new SecretKeySpec(key, HMACSHA256)); mac.init(new SecretKeySpec(key, HMACSHA256));
return mac.doFinal(data); return mac.doFinal(data);
@ -395,7 +395,7 @@ private static String toHex(byte[] bytes) {
private static String urlEncode(String url, boolean keepPathSlash) { private static String urlEncode(String url, boolean keepPathSlash) {
String encoded; String encoded;
try { try {
encoded = URLEncoder.encode(url, CHARSET.name()); encoded = URLEncoder.encode(url, UTF_8.name());
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
throw new RuntimeException(LfsServerText.get().unsupportedUtf8, e); throw new RuntimeException(LfsServerText.get().unsupportedUtf8, e);
} }

4
org.eclipse.jgit.lfs.test/src/org/eclipse/jgit/lfs/test/LongObjectIdTestUtils.java
View File

@ -42,7 +42,7 @@
*/ */
package org.eclipse.jgit.lfs.test; 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.BufferedInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
@ -66,7 +66,7 @@ public class LongObjectIdTestUtils {
*/ */
public static LongObjectId hash(String s) { public static LongObjectId hash(String s) {
MessageDigest md = Constants.newMessageDigest(); MessageDigest md = Constants.newMessageDigest();
md.update(s.getBytes(CHARSET)); md.update(s.getBytes(UTF_8));
return LongObjectId.fromRaw(md.digest()); return LongObjectId.fromRaw(md.digest());
} }

6
org.eclipse.jgit.lfs.test/tst/org/eclipse/jgit/lfs/lib/LongObjectIdTest.java
View File

@ -43,6 +43,7 @@
package org.eclipse.jgit.lfs.lib; package org.eclipse.jgit.lfs.lib;
import static java.nio.charset.StandardCharsets.UTF_8;
import static java.nio.charset.StandardCharsets.US_ASCII; import static java.nio.charset.StandardCharsets.US_ASCII;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
@ -62,7 +63,6 @@
import org.eclipse.jgit.junit.JGitTestUtil; import org.eclipse.jgit.junit.JGitTestUtil;
import org.eclipse.jgit.lfs.errors.InvalidLongObjectIdException; import org.eclipse.jgit.lfs.errors.InvalidLongObjectIdException;
import org.eclipse.jgit.lfs.test.LongObjectIdTestUtils; import org.eclipse.jgit.lfs.test.LongObjectIdTestUtils;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.util.FileUtils; import org.eclipse.jgit.util.FileUtils;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.BeforeClass; import org.junit.BeforeClass;
@ -393,7 +393,7 @@ public void testCopyToWriter() throws IOException {
AnyLongObjectId id1 = LongObjectIdTestUtils.hash("test"); AnyLongObjectId id1 = LongObjectIdTestUtils.hash("test");
ByteArrayOutputStream os = new ByteArrayOutputStream(64); ByteArrayOutputStream os = new ByteArrayOutputStream(64);
try (OutputStreamWriter w = new OutputStreamWriter(os, try (OutputStreamWriter w = new OutputStreamWriter(os,
Constants.CHARSET)) { UTF_8)) {
id1.copyTo(w); id1.copyTo(w);
} }
assertEquals(id1, LongObjectId.fromString(os.toByteArray(), 0)); assertEquals(id1, LongObjectId.fromString(os.toByteArray(), 0));
@ -404,7 +404,7 @@ public void testCopyToWriterWithBuf() throws IOException {
AnyLongObjectId id1 = LongObjectIdTestUtils.hash("test"); AnyLongObjectId id1 = LongObjectIdTestUtils.hash("test");
ByteArrayOutputStream os = new ByteArrayOutputStream(64); ByteArrayOutputStream os = new ByteArrayOutputStream(64);
try (OutputStreamWriter w = new OutputStreamWriter(os, try (OutputStreamWriter w = new OutputStreamWriter(os,
Constants.CHARSET)) { UTF_8)) {
char[] buf = new char[64]; char[] buf = new char[64];
id1.copyTo(buf, w); id1.copyTo(buf, w);
} }

8
org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/LfsPointer.java
View File

@ -42,7 +42,7 @@
*/ */
package org.eclipse.jgit.lfs; 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.BufferedReader;
import java.io.IOException; import java.io.IOException;
@ -134,7 +134,7 @@ public long getSize() {
*/ */
public void encode(OutputStream out) { public void encode(OutputStream out) {
try (PrintStream ps = new PrintStream(out, false, try (PrintStream ps = new PrintStream(out, false,
CHARSET.name())) { UTF_8.name())) {
ps.print("version "); //$NON-NLS-1$ ps.print("version "); //$NON-NLS-1$
ps.print(VERSION + "\n"); //$NON-NLS-1$ ps.print(VERSION + "\n"); //$NON-NLS-1$
ps.print("oid " + HASH_FUNCTION_NAME + ":"); //$NON-NLS-1$ //$NON-NLS-2$ ps.print("oid " + HASH_FUNCTION_NAME + ":"); //$NON-NLS-1$ //$NON-NLS-2$
@ -143,7 +143,7 @@ public void encode(OutputStream out) {
ps.print(size + "\n"); //$NON-NLS-1$ ps.print(size + "\n"); //$NON-NLS-1$
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// should not happen, we are using a standard charset // 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 static LfsPointer parseLfsPointer(InputStream in)
long sz = -1; long sz = -1;
try (BufferedReader br = new BufferedReader( try (BufferedReader br = new BufferedReader(
new InputStreamReader(in, CHARSET))) { new InputStreamReader(in, UTF_8))) {
for (String s = br.readLine(); s != null; s = br.readLine()) { for (String s = br.readLine(); s != null; s = br.readLine()) {
if (s.startsWith("#") || s.length() == 0) { //$NON-NLS-1$ if (s.startsWith("#") || s.length() == 0) { //$NON-NLS-1$
continue; continue;

6
org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/LfsPrePushHook.java
View File

@ -42,7 +42,7 @@
*/ */
package org.eclipse.jgit.lfs; 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.Protocol.OPERATION_UPLOAD;
import static org.eclipse.jgit.lfs.internal.LfsConnectionFactory.toRequest; import static org.eclipse.jgit.lfs.internal.LfsConnectionFactory.toRequest;
import static org.eclipse.jgit.transport.http.HttpConnection.HTTP_OK; import static org.eclipse.jgit.transport.http.HttpConnection.HTTP_OK;
@ -208,7 +208,7 @@ private Map<String, LfsPointer> requestBatchUpload(HttpConnection api,
} }
Gson gson = Protocol.gson(); Gson gson = Protocol.gson();
api.getOutputStream().write( api.getOutputStream().write(
gson.toJson(toRequest(OPERATION_UPLOAD, res)).getBytes(CHARSET)); gson.toJson(toRequest(OPERATION_UPLOAD, res)).getBytes(UTF_8));
int responseCode = api.getResponseCode(); int responseCode = api.getResponseCode();
if (responseCode != HTTP_OK) { if (responseCode != HTTP_OK) {
throw new IOException( throw new IOException(
@ -221,7 +221,7 @@ private Map<String, LfsPointer> requestBatchUpload(HttpConnection api,
private void uploadContents(HttpConnection api, private void uploadContents(HttpConnection api,
Map<String, LfsPointer> oid2ptr) throws IOException { Map<String, LfsPointer> oid2ptr) throws IOException {
try (JsonReader reader = new JsonReader( try (JsonReader reader = new JsonReader(
new InputStreamReader(api.getInputStream(), CHARSET))) { new InputStreamReader(api.getInputStream(), UTF_8))) {
for (Protocol.ObjectInfo o : parseObjects(reader)) { for (Protocol.ObjectInfo o : parseObjects(reader)) {
if (o.actions == null) { if (o.actions == null) {
continue; continue;

6
org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/SmudgeFilter.java
View File

@ -42,7 +42,7 @@
*/ */
package org.eclipse.jgit.lfs; 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.IOException;
import java.io.InputStream; import java.io.InputStream;
@ -170,7 +170,7 @@ public static Collection<Path> downloadLfsResource(Lfs lfs, Repository db,
.write(gson .write(gson
.toJson(LfsConnectionFactory .toJson(LfsConnectionFactory
.toRequest(Protocol.OPERATION_DOWNLOAD, res)) .toRequest(Protocol.OPERATION_DOWNLOAD, res))
.getBytes(CHARSET)); .getBytes(UTF_8));
int responseCode = lfsServerConn.getResponseCode(); int responseCode = lfsServerConn.getResponseCode();
if (responseCode != HttpConnection.HTTP_OK) { if (responseCode != HttpConnection.HTTP_OK) {
throw new IOException( throw new IOException(
@ -180,7 +180,7 @@ public static Collection<Path> downloadLfsResource(Lfs lfs, Repository db,
} }
try (JsonReader reader = new JsonReader( try (JsonReader reader = new JsonReader(
new InputStreamReader(lfsServerConn.getInputStream(), new InputStreamReader(lfsServerConn.getInputStream(),
CHARSET))) { UTF_8))) {
Protocol.Response resp = gson.fromJson(reader, Protocol.Response resp = gson.fromJson(reader,
Protocol.Response.class); Protocol.Response.class);
for (Protocol.ObjectInfo o : resp.objects) { for (Protocol.ObjectInfo o : resp.objects) {

6
org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ArchiveTest.java
View File

@ -42,7 +42,7 @@
*/ */
package org.eclipse.jgit.pgm; 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.assertArrayEquals;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
@ -612,7 +612,7 @@ private Process spawnAssumingCommandPresent(String... cmdline) {
private BufferedReader readFromProcess(Process proc) throws Exception { private BufferedReader readFromProcess(Process proc) throws Exception {
return new BufferedReader( return new BufferedReader(
new InputStreamReader(proc.getInputStream(), CHARSET)); new InputStreamReader(proc.getInputStream(), UTF_8));
} }
private void grepForEntry(String name, String mode, String... cmdline) private void grepForEntry(String name, String mode, String... cmdline)
@ -750,7 +750,7 @@ private static String[] zipEntryContent(byte[] zipData, String path)
// found! // found!
List<String> l = new ArrayList<>(); List<String> l = new ArrayList<>();
BufferedReader reader = new BufferedReader( BufferedReader reader = new BufferedReader(
new InputStreamReader(in, CHARSET)); new InputStreamReader(in, UTF_8));
String line; String line;
while ((line = reader.readLine()) != null) while ((line = reader.readLine()) != null)
l.add(line); l.add(line);

4
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CommandCatalog.java
View File

@ -43,7 +43,7 @@
package org.eclipse.jgit.pgm; 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.BufferedReader;
import java.io.IOException; import java.io.IOException;
@ -148,7 +148,7 @@ private Enumeration<URL> catalogs() {
private void scan(URL cUrl) { private void scan(URL cUrl) {
try (BufferedReader cIn = new BufferedReader( try (BufferedReader cIn = new BufferedReader(
new InputStreamReader(cUrl.openStream(), CHARSET))) { new InputStreamReader(cUrl.openStream(), UTF_8))) {
String line; String line;
while ((line = cIn.readLine()) != null) { while ((line = cIn.readLine()) != null) {
if (line.length() > 0 && !line.startsWith("#")) //$NON-NLS-1$ if (line.length() > 0 && !line.startsWith("#")) //$NON-NLS-1$

4
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Main.java
View File

@ -44,7 +44,7 @@
package org.eclipse.jgit.pgm; 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.File;
import java.io.IOException; import java.io.IOException;
@ -227,7 +227,7 @@ protected void run(String[] argv) throws Exception {
} }
PrintWriter createErrorWriter() { 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 { private void execute(String[] argv) throws Exception {

4
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/BenchmarkReftable.java
View File

@ -43,7 +43,7 @@
package org.eclipse.jgit.pgm.debug; 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.HEAD;
import static org.eclipse.jgit.lib.Constants.MASTER; import static org.eclipse.jgit.lib.Constants.MASTER;
import static org.eclipse.jgit.lib.Constants.R_HEADS; import static org.eclipse.jgit.lib.Constants.R_HEADS;
@ -154,7 +154,7 @@ private RefList<Ref> readLsRemote()
throws IOException, FileNotFoundException { throws IOException, FileNotFoundException {
RefList.Builder<Ref> list = new RefList.Builder<>(); RefList.Builder<Ref> list = new RefList.Builder<>();
try (BufferedReader br = new BufferedReader(new InputStreamReader( try (BufferedReader br = new BufferedReader(new InputStreamReader(
new FileInputStream(lsRemotePath), CHARSET))) { new FileInputStream(lsRemotePath), UTF_8))) {
Ref last = null; Ref last = null;
String line; String line;
while ((line = br.readLine()) != null) { while ((line = br.readLine()) != null) {

6
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/RebuildCommitGraph.java
View File

@ -43,6 +43,8 @@
package org.eclipse.jgit.pgm.debug; package org.eclipse.jgit.pgm.debug;
import static java.nio.charset.StandardCharsets.UTF_8;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
@ -141,7 +143,7 @@ private void recreateCommitGraph() throws IOException {
try (RevWalk rw = new RevWalk(db); try (RevWalk rw = new RevWalk(db);
final BufferedReader br = new BufferedReader( final BufferedReader br = new BufferedReader(
new InputStreamReader(new FileInputStream(graph), new InputStreamReader(new FileInputStream(graph),
Constants.CHARSET))) { UTF_8))) {
String line; String line;
while ((line = br.readLine()) != null) { while ((line = br.readLine()) != null) {
final String[] parts = line.split("[ \t]{1,}"); //$NON-NLS-1$ final String[] parts = line.split("[ \t]{1,}"); //$NON-NLS-1$
@ -280,7 +282,7 @@ private Map<String, Ref> computeNewRefs() throws IOException {
try (RevWalk rw = new RevWalk(db); try (RevWalk rw = new RevWalk(db);
BufferedReader br = new BufferedReader( BufferedReader br = new BufferedReader(
new InputStreamReader(new FileInputStream(refList), new InputStreamReader(new FileInputStream(refList),
Constants.CHARSET))) { UTF_8))) {
String line; String line;
while ((line = br.readLine()) != null) { while ((line = br.readLine()) != null) {
final String[] parts = line.split("[ \t]{1,}"); //$NON-NLS-1$ final String[] parts = line.split("[ \t]{1,}"); //$NON-NLS-1$

6
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/WriteReftable.java
View File

@ -43,7 +43,7 @@
package org.eclipse.jgit.pgm.debug; 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.HEAD;
import static org.eclipse.jgit.lib.Constants.MASTER; import static org.eclipse.jgit.lib.Constants.MASTER;
import static org.eclipse.jgit.lib.Constants.R_HEADS; import static org.eclipse.jgit.lib.Constants.R_HEADS;
@ -192,7 +192,7 @@ private void printf(String fmt, Object... args) throws IOException {
static List<Ref> readRefs(String inputFile) throws IOException { static List<Ref> readRefs(String inputFile) throws IOException {
List<Ref> refs = new ArrayList<>(); List<Ref> refs = new ArrayList<>();
try (BufferedReader br = new BufferedReader( try (BufferedReader br = new BufferedReader(
new InputStreamReader(new FileInputStream(inputFile), CHARSET))) { new InputStreamReader(new FileInputStream(inputFile), UTF_8))) {
String line; String line;
while ((line = br.readLine()) != null) { while ((line = br.readLine()) != null) {
ObjectId id = ObjectId.fromString(line.substring(0, 40)); ObjectId id = ObjectId.fromString(line.substring(0, 40));
@ -227,7 +227,7 @@ private static List<LogEntry> readLog(String logPath)
List<LogEntry> log = new ArrayList<>(); List<LogEntry> log = new ArrayList<>();
try (BufferedReader br = new BufferedReader( try (BufferedReader br = new BufferedReader(
new InputStreamReader(new FileInputStream(logPath), CHARSET))) { new InputStreamReader(new FileInputStream(logPath), UTF_8))) {
@SuppressWarnings("nls") @SuppressWarnings("nls")
Pattern pattern = Pattern.compile("([^,]+)" // 1: ref Pattern pattern = Pattern.compile("([^,]+)" // 1: ref
+ ",([0-9]+(?:[.][0-9]+)?)" // 2: time + ",([0-9]+(?:[.][0-9]+)?)" // 2: time

6
org.eclipse.jgit.test/exttst/org/eclipse/jgit/ignore/CGitVsJGitRandomIgnorePatternTest.java
View File

@ -42,7 +42,7 @@
*/ */
package org.eclipse.jgit.ignore; 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.BufferedReader;
import java.io.File; import java.io.File;
@ -158,7 +158,7 @@ public CGitIgnoreRule(File gitDir, String pattern) throws IOException {
this.gitDir = gitDir; this.gitDir = gitDir;
this.pattern = pattern; this.pattern = pattern;
Files.write(FileUtils.toPath(new File(gitDir, ".gitignore")), 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.TRUNCATE_EXISTING,
StandardOpenOption.WRITE); StandardOpenOption.WRITE);
} }
@ -188,7 +188,7 @@ private Process startCgitCheckIgnore(String path) throws IOException {
Process proc = Runtime.getRuntime().exec(command, new String[0], Process proc = Runtime.getRuntime().exec(command, new String[0],
gitDir); gitDir);
try (OutputStream out = proc.getOutputStream()) { try (OutputStream out = proc.getOutputStream()) {
out.write((path + "\n").getBytes(CHARSET)); out.write((path + "\n").getBytes(UTF_8));
out.flush(); out.flush();
} }
return proc; return proc;

4
org.eclipse.jgit.test/exttst/org/eclipse/jgit/patch/EGitPatchHistoryTest.java
View File

@ -44,6 +44,7 @@
package org.eclipse.jgit.patch; package org.eclipse.jgit.patch;
import static java.nio.charset.StandardCharsets.ISO_8859_1; 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.assertEquals;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
@ -56,7 +57,6 @@
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.util.MutableInteger; import org.eclipse.jgit.util.MutableInteger;
import org.eclipse.jgit.util.RawParseUtils; import org.eclipse.jgit.util.RawParseUtils;
import org.eclipse.jgit.util.TemporaryBuffer; import org.eclipse.jgit.util.TemporaryBuffer;
@ -176,7 +176,7 @@ void onCommit(String commitId, byte[] buf) {
i.added = RawParseUtils.parseBase10(buf, ptr.value, ptr); i.added = RawParseUtils.parseBase10(buf, ptr.value, ptr);
i.deleted = RawParseUtils.parseBase10(buf, ptr.value + 1, ptr); i.deleted = RawParseUtils.parseBase10(buf, ptr.value + 1, ptr);
final int eol = RawParseUtils.nextLF(buf, ptr.value); 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); buf, ptr.value + 1, eol - 1);
files.put(name, i); files.put(name, i);
ptr.value = eol; ptr.value = eol;

10
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/EolStreamTypeUtilTest.java
View File

@ -42,7 +42,7 @@
package org.eclipse.jgit.api; 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_CRLF;
import static org.eclipse.jgit.lib.CoreConfig.EolStreamType.AUTO_LF; import static org.eclipse.jgit.lib.CoreConfig.EolStreamType.AUTO_LF;
import static org.eclipse.jgit.lib.CoreConfig.EolStreamType.DIRECT; import static org.eclipse.jgit.lib.CoreConfig.EolStreamType.DIRECT;
@ -150,8 +150,8 @@ private void testCheckout(EolStreamType streamTypeText,
EolStreamType streamTypeWithBinaryCheck, String output, EolStreamType streamTypeWithBinaryCheck, String output,
String expectedConversion) throws Exception { String expectedConversion) throws Exception {
ByteArrayOutputStream b; ByteArrayOutputStream b;
byte[] outputBytes = output.getBytes(CHARSET); byte[] outputBytes = output.getBytes(UTF_8);
byte[] expectedConversionBytes = expectedConversion.getBytes(CHARSET); byte[] expectedConversionBytes = expectedConversion.getBytes(UTF_8);
// test using output text and assuming it was declared TEXT // test using output text and assuming it was declared TEXT
b = new ByteArrayOutputStream(); b = new ByteArrayOutputStream();
@ -277,8 +277,8 @@ public void testCheckinCRLF() throws Exception {
private void testCheckin(EolStreamType streamTypeText, private void testCheckin(EolStreamType streamTypeText,
EolStreamType streamTypeWithBinaryCheck, String input, EolStreamType streamTypeWithBinaryCheck, String input,
String expectedConversion) throws Exception { String expectedConversion) throws Exception {
byte[] inputBytes = input.getBytes(CHARSET); byte[] inputBytes = input.getBytes(UTF_8);
byte[] expectedConversionBytes = expectedConversion.getBytes(CHARSET); byte[] expectedConversionBytes = expectedConversion.getBytes(UTF_8);
// test using input text and assuming it was declared TEXT // test using input text and assuming it was declared TEXT
try (InputStream in = EolStreamTypeUtil.wrapInputStream( try (InputStream in = EolStreamTypeUtil.wrapInputStream(

4
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/NotesCommandTest.java
View File

@ -42,7 +42,7 @@
*/ */
package org.eclipse.jgit.api; 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.assertEquals;
import java.util.List; import java.util.List;
@ -88,7 +88,7 @@ public void testAddAndRemoveNote() throws Exception {
git.notesAdd().setObjectId(commit2).setMessage("data").call(); git.notesAdd().setObjectId(commit2).setMessage("data").call();
Note note = git.notesShow().setObjectId(commit2).call(); Note note = git.notesShow().setObjectId(commit2).call();
String content = new String(db.open(note.getData()).getCachedBytes(), String content = new String(db.open(note.getData()).getCachedBytes(),
CHARSET); UTF_8);
assertEquals(content, "data"); assertEquals(content, "data");
git.notesRemove().setObjectId(commit2).call(); git.notesRemove().setObjectId(commit2).call();

6
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandTest.java
View File

@ -42,7 +42,7 @@
*/ */
package org.eclipse.jgit.api; 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.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
@ -592,7 +592,7 @@ public void setUp() throws Exception {
private static void writeToFile(File actFile, String string) private static void writeToFile(File actFile, String string)
throws IOException { throws IOException {
try (FileOutputStream fos = new FileOutputStream(actFile)) { try (FileOutputStream fos = new FileOutputStream(actFile)) {
fos.write(string.getBytes(CHARSET)); fos.write(string.getBytes(UTF_8));
} }
} }
@ -606,7 +606,7 @@ private static void assertFileContentsEqual(File actFile, String string)
bos.write(buffer, 0, read); bos.write(buffer, 0, read);
read = fis.read(buffer); read = fis.read(buffer);
} }
String content = new String(bos.toByteArray(), CHARSET); String content = new String(bos.toByteArray(), UTF_8);
assertEquals(string, content); assertEquals(string, content);
} }
} }

6
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandWithRebaseTest.java
View File

@ -42,7 +42,7 @@
*/ */
package org.eclipse.jgit.api; 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.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
@ -396,7 +396,7 @@ public void setUp() throws Exception {
private static void writeToFile(File actFile, String string) private static void writeToFile(File actFile, String string)
throws IOException { throws IOException {
try (FileOutputStream fos = new FileOutputStream(actFile)) { try (FileOutputStream fos = new FileOutputStream(actFile)) {
fos.write(string.getBytes(CHARSET)); fos.write(string.getBytes(UTF_8));
} }
} }
@ -410,7 +410,7 @@ private static void assertFileContentsEqual(File actFile, String string)
bos.write(buffer, 0, read); bos.write(buffer, 0, read);
read = fis.read(buffer); read = fis.read(buffer);
} }
String content = new String(bos.toByteArray(), CHARSET); String content = new String(bos.toByteArray(), UTF_8);
assertEquals(string, content); assertEquals(string, content);
} }
} }

8
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java
View File

@ -42,7 +42,7 @@
*/ */
package org.eclipse.jgit.api; 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.equalTo;
import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.MatcherAssert.assertThat;
@ -1468,7 +1468,7 @@ public void testAuthorScriptConverter() throws Exception {
assertEquals("GIT_AUTHOR_DATE='@123456789 -0100'", lines[2]); assertEquals("GIT_AUTHOR_DATE='@123456789 -0100'", lines[2]);
PersonIdent parsedIdent = git.rebase().parseAuthor( PersonIdent parsedIdent = git.rebase().parseAuthor(
convertedAuthor.getBytes(CHARSET)); convertedAuthor.getBytes(UTF_8));
assertEquals(ident.getName(), parsedIdent.getName()); assertEquals(ident.getName(), parsedIdent.getName());
assertEquals(ident.getEmailAddress(), parsedIdent.getEmailAddress()); assertEquals(ident.getEmailAddress(), parsedIdent.getEmailAddress());
// this is rounded to the last second // this is rounded to the last second
@ -1485,7 +1485,7 @@ public void testAuthorScriptConverter() throws Exception {
assertEquals("GIT_AUTHOR_DATE='@123456789 +0930'", lines[2]); assertEquals("GIT_AUTHOR_DATE='@123456789 +0930'", lines[2]);
parsedIdent = git.rebase().parseAuthor( parsedIdent = git.rebase().parseAuthor(
convertedAuthor.getBytes(CHARSET)); convertedAuthor.getBytes(UTF_8));
assertEquals(ident.getName(), parsedIdent.getName()); assertEquals(ident.getName(), parsedIdent.getName());
assertEquals(ident.getEmailAddress(), parsedIdent.getEmailAddress()); assertEquals(ident.getEmailAddress(), parsedIdent.getEmailAddress());
assertEquals(123456789000L, parsedIdent.getWhen().getTime()); assertEquals(123456789000L, parsedIdent.getWhen().getTime());
@ -2164,7 +2164,7 @@ private int countPicks() throws IOException {
int count = 0; int count = 0;
File todoFile = getTodoFile(); File todoFile = getTodoFile();
try (BufferedReader br = new BufferedReader(new InputStreamReader( try (BufferedReader br = new BufferedReader(new InputStreamReader(
new FileInputStream(todoFile), CHARSET))) { new FileInputStream(todoFile), UTF_8))) {
String line = br.readLine(); String line = br.readLine();
while (line != null) { while (line != null) {
int firstBlank = line.indexOf(' '); int firstBlank = line.indexOf(' ');

6
org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/CGitAttributesTest.java
View File

@ -42,6 +42,7 @@
*/ */
package org.eclipse.jgit.attributes; package org.eclipse.jgit.attributes;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
@ -57,7 +58,6 @@
import java.util.Set; import java.util.Set;
import org.eclipse.jgit.junit.RepositoryTestCase; import org.eclipse.jgit.junit.RepositoryTestCase;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.StoredConfig; import org.eclipse.jgit.lib.StoredConfig;
import org.eclipse.jgit.treewalk.FileTreeIterator; import org.eclipse.jgit.treewalk.FileTreeIterator;
import org.eclipse.jgit.treewalk.TreeWalk; import org.eclipse.jgit.treewalk.TreeWalk;
@ -127,14 +127,14 @@ private LinkedHashMap<String, Attributes> cgitAttributes(
builder.directory(db.getWorkTree()); builder.directory(db.getWorkTree());
builder.environment().put("HOME", fs.userHome().getAbsolutePath()); builder.environment().put("HOME", fs.userHome().getAbsolutePath());
ExecutionResult result = fs.execute(builder, new ByteArrayInputStream( ExecutionResult result = fs.execute(builder, new ByteArrayInputStream(
input.toString().getBytes(Constants.CHARSET))); input.toString().getBytes(UTF_8)));
String errorOut = toString(result.getStderr()); String errorOut = toString(result.getStderr());
assertEquals("External git failed", "exit 0\n", assertEquals("External git failed", "exit 0\n",
"exit " + result.getRc() + '\n' + errorOut); "exit " + result.getRc() + '\n' + errorOut);
LinkedHashMap<String, Attributes> map = new LinkedHashMap<>(); LinkedHashMap<String, Attributes> map = new LinkedHashMap<>();
try (BufferedReader r = new BufferedReader(new InputStreamReader( try (BufferedReader r = new BufferedReader(new InputStreamReader(
new BufferedInputStream(result.getStdout().openInputStream()), new BufferedInputStream(result.getStdout().openInputStream()),
Constants.CHARSET))) { UTF_8))) {
r.lines().forEach(line -> { r.lines().forEach(line -> {
// Parse the line and add to result map // Parse the line and add to result map
int start = 0; int start = 0;

4
org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/AbstractDiffTestCase.java
View File

@ -43,7 +43,7 @@
package org.eclipse.jgit.diff; 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.assertEquals;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
@ -240,6 +240,6 @@ public static RawText t(String text) {
r.append(text.charAt(i)); r.append(text.charAt(i));
r.append('\n'); r.append('\n');
} }
return new RawText(r.toString().getBytes(CHARSET)); return new RawText(r.toString().getBytes(UTF_8));
} }
} }

24
org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/RawTextTest.java
View File

@ -44,7 +44,7 @@
package org.eclipse.jgit.diff; 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.assertArrayEquals;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
@ -147,8 +147,8 @@ public void testComparatorReduceCommonStartEnd() {
e = c.reduceCommonStartEnd(t("abQxy"), t("abRxy"), e); e = c.reduceCommonStartEnd(t("abQxy"), t("abRxy"), e);
assertEquals(new Edit(2, 3, 2, 3), e); assertEquals(new Edit(2, 3, 2, 3), e);
RawText a = new RawText("p\na b\nQ\nc 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(CHARSET)); RawText b = new RawText("p\na b \nR\n c d \n".getBytes(UTF_8));
e = new Edit(0, 4, 0, 4); e = new Edit(0, 4, 0, 4);
e = RawTextComparator.WS_IGNORE_ALL.reduceCommonStartEnd(a, b, e); e = RawTextComparator.WS_IGNORE_ALL.reduceCommonStartEnd(a, b, e);
assertEquals(new Edit(2, 3, 2, 3), e); assertEquals(new Edit(2, 3, 2, 3), e);
@ -160,14 +160,14 @@ public void testComparatorReduceCommonStartEnd_EmptyLine() {
RawText b; RawText b;
Edit e; Edit e;
a = new RawText("R\n y\n".getBytes(CHARSET)); a = new RawText("R\n y\n".getBytes(UTF_8));
b = new RawText("S\n\n y\n".getBytes(CHARSET)); b = new RawText("S\n\n y\n".getBytes(UTF_8));
e = new Edit(0, 2, 0, 3); e = new Edit(0, 2, 0, 3);
e = RawTextComparator.DEFAULT.reduceCommonStartEnd(a, b, e); e = RawTextComparator.DEFAULT.reduceCommonStartEnd(a, b, e);
assertEquals(new Edit(0, 1, 0, 2), e); assertEquals(new Edit(0, 1, 0, 2), e);
a = new RawText("S\n\n y\n".getBytes(CHARSET)); a = new RawText("S\n\n y\n".getBytes(UTF_8));
b = new RawText("R\n y\n".getBytes(CHARSET)); b = new RawText("R\n y\n".getBytes(UTF_8));
e = new Edit(0, 3, 0, 2); e = new Edit(0, 3, 0, 2);
e = RawTextComparator.DEFAULT.reduceCommonStartEnd(a, b, e); e = RawTextComparator.DEFAULT.reduceCommonStartEnd(a, b, e);
assertEquals(new Edit(0, 2, 0, 1), e); assertEquals(new Edit(0, 2, 0, 1), e);
@ -178,8 +178,8 @@ public void testComparatorReduceCommonStartButLastLineNoEol() {
RawText a; RawText a;
RawText b; RawText b;
Edit e; Edit e;
a = new RawText("start".getBytes(CHARSET)); a = new RawText("start".getBytes(UTF_8));
b = new RawText("start of line".getBytes(CHARSET)); b = new RawText("start of line".getBytes(UTF_8));
e = new Edit(0, 1, 0, 1); e = new Edit(0, 1, 0, 1);
e = RawTextComparator.DEFAULT.reduceCommonStartEnd(a, b, e); e = RawTextComparator.DEFAULT.reduceCommonStartEnd(a, b, e);
assertEquals(new Edit(0, 1, 0, 1), e); assertEquals(new Edit(0, 1, 0, 1), e);
@ -190,8 +190,8 @@ public void testComparatorReduceCommonStartButLastLineNoEol_2() {
RawText a; RawText a;
RawText b; RawText b;
Edit e; Edit e;
a = new RawText("start".getBytes(CHARSET)); a = new RawText("start".getBytes(UTF_8));
b = new RawText("start of\nlastline".getBytes(CHARSET)); b = new RawText("start of\nlastline".getBytes(UTF_8));
e = new Edit(0, 1, 0, 2); e = new Edit(0, 1, 0, 2);
e = RawTextComparator.DEFAULT.reduceCommonStartEnd(a, b, e); e = RawTextComparator.DEFAULT.reduceCommonStartEnd(a, b, e);
assertEquals(new Edit(0, 1, 0, 2), e); assertEquals(new Edit(0, 1, 0, 2), e);
@ -250,6 +250,6 @@ private static RawText t(String text) {
r.append(text.charAt(i)); r.append(text.charAt(i));
r.append('\n'); r.append('\n');
} }
return new RawText(r.toString().getBytes(CHARSET)); return new RawText(r.toString().getBytes(UTF_8));
} }
} }

8
org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/SimilarityIndexTest.java
View File

@ -43,7 +43,7 @@
package org.eclipse.jgit.diff; 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.assertEquals;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
@ -82,7 +82,7 @@ public void testIndexingLargeObject() throws IOException,
+ "A\n" // + "A\n" //
+ "B\n" // + "B\n" //
+ "B\n" // + "B\n" //
+ "B\n").getBytes(CHARSET); + "B\n").getBytes(UTF_8);
SimilarityIndex si = new SimilarityIndex(); SimilarityIndex si = new SimilarityIndex();
si.hash(new ByteArrayInputStream(in), in.length, false); si.hash(new ByteArrayInputStream(in), in.length, false);
assertEquals(2, si.size()); assertEquals(2, si.size());
@ -130,12 +130,12 @@ public void testCommonScoreLargeObject_SameFiles_CR_canonicalization()
+ "D\r\n" // + "D\r\n" //
+ "B\r\n"; + "B\r\n";
SimilarityIndex src = new SimilarityIndex(); SimilarityIndex src = new SimilarityIndex();
byte[] bytes1 = text.getBytes(CHARSET); byte[] bytes1 = text.getBytes(UTF_8);
src.hash(new ByteArrayInputStream(bytes1), bytes1.length, true); src.hash(new ByteArrayInputStream(bytes1), bytes1.length, true);
src.sort(); src.sort();
SimilarityIndex dst = new SimilarityIndex(); 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.hash(new ByteArrayInputStream(bytes2), bytes2.length, true);
dst.sort(); dst.sort();

6
org.eclipse.jgit.test/tst/org/eclipse/jgit/dircache/DirCacheCGitCompatabilityTest.java
View File

@ -43,7 +43,7 @@
package org.eclipse.jgit.dircache; 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.eclipse.jgit.junit.Assert.assertEquals;
import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
@ -236,7 +236,7 @@ private static File pathOf(String name) {
private static Map<String, CGitIndexRecord> readLsFiles() throws Exception { private static Map<String, CGitIndexRecord> readLsFiles() throws Exception {
final LinkedHashMap<String, CGitIndexRecord> r = new LinkedHashMap<>(); final LinkedHashMap<String, CGitIndexRecord> r = new LinkedHashMap<>();
try (BufferedReader br = new BufferedReader(new InputStreamReader( try (BufferedReader br = new BufferedReader(new InputStreamReader(
new FileInputStream(pathOf("gitgit.lsfiles")), CHARSET))) { new FileInputStream(pathOf("gitgit.lsfiles")), UTF_8))) {
String line; String line;
while ((line = br.readLine()) != null) { while ((line = br.readLine()) != null) {
final CGitIndexRecord cr = new CGitIndexRecord(line); final CGitIndexRecord cr = new CGitIndexRecord(line);
@ -249,7 +249,7 @@ private static Map<String, CGitIndexRecord> readLsFiles() throws Exception {
private static Map<String, CGitLsTreeRecord> readLsTree() throws Exception { private static Map<String, CGitLsTreeRecord> readLsTree() throws Exception {
final LinkedHashMap<String, CGitLsTreeRecord> r = new LinkedHashMap<>(); final LinkedHashMap<String, CGitLsTreeRecord> r = new LinkedHashMap<>();
try (BufferedReader br = new BufferedReader(new InputStreamReader( try (BufferedReader br = new BufferedReader(new InputStreamReader(
new FileInputStream(pathOf("gitgit.lstree")), CHARSET))) { new FileInputStream(pathOf("gitgit.lstree")), UTF_8))) {
String line; String line;
while ((line = br.readLine()) != null) { while ((line = br.readLine()) != null) {
final CGitLsTreeRecord cr = new CGitLsTreeRecord(line); final CGitLsTreeRecord cr = new CGitLsTreeRecord(line);

8
org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/ManifestParserTest.java
View File

@ -42,7 +42,7 @@
*/ */
package org.eclipse.jgit.gitrepo; 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.assertEquals;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
@ -85,7 +85,7 @@ public void testManifestParser() throws Exception {
ManifestParser parser = new ManifestParser( ManifestParser parser = new ManifestParser(
null, null, "master", baseUrl, null, null); 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. // Unfiltered projects should have them all.
results.clear(); results.clear();
results.add("foo"); results.add("foo");
@ -139,7 +139,7 @@ public void testManifestParserWithMissingFetchOnRemote() throws Exception {
baseUrl, null, null); baseUrl, null, null);
try { try {
parser.read(new ByteArrayInputStream( parser.read(new ByteArrayInputStream(
xmlContent.toString().getBytes(CHARSET))); xmlContent.toString().getBytes(UTF_8)));
fail("ManifestParser did not throw exception for missing fetch"); fail("ManifestParser did not throw exception for missing fetch");
} catch (IOException e) { } catch (IOException e) {
assertTrue(e.getCause() instanceof SAXException); assertTrue(e.getCause() instanceof SAXException);
@ -164,7 +164,7 @@ public void testRemoveProject() throws Exception {
ManifestParser parser = new ManifestParser(null, null, "master", ManifestParser parser = new ManifestParser(null, null, "master",
"https://git.google.com/", null, null); "https://git.google.com/", null, null);
parser.read(new ByteArrayInputStream( parser.read(new ByteArrayInputStream(
xmlContent.toString().getBytes(CHARSET))); xmlContent.toString().getBytes(UTF_8)));
assertEquals(Stream.of("bar", "baz").collect(Collectors.toSet()), assertEquals(Stream.of("bar", "baz").collect(Collectors.toSet()),
parser.getProjects().stream().map(RepoProject::getName) parser.getProjects().stream().map(RepoProject::getName)

16
org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/RepoCommandTest.java
View File

@ -42,7 +42,7 @@
*/ */
package org.eclipse.jgit.gitrepo; 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.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNull;
@ -217,7 +217,7 @@ public void runTwiceIsNOP() throws Exception {
RevCommit commit = cmd RevCommit commit = cmd
.setInputStream(new ByteArrayInputStream( .setInputStream(new ByteArrayInputStream(
xmlContent.toString().getBytes(CHARSET))) xmlContent.toString().getBytes(UTF_8)))
.setRemoteReader(repos).setURI("platform/") .setRemoteReader(repos).setURI("platform/")
.setTargetURI("platform/superproject") .setTargetURI("platform/superproject")
.setRecordRemoteBranch(true).setRecordSubmoduleLabels(true) .setRecordRemoteBranch(true).setRecordSubmoduleLabels(true)
@ -226,7 +226,7 @@ public void runTwiceIsNOP() throws Exception {
String firstIdStr = commit.getId().name() + ":" + ".gitmodules"; String firstIdStr = commit.getId().name() + ":" + ".gitmodules";
commit = new RepoCommand(dest) commit = new RepoCommand(dest)
.setInputStream(new ByteArrayInputStream( .setInputStream(new ByteArrayInputStream(
xmlContent.toString().getBytes(CHARSET))) xmlContent.toString().getBytes(UTF_8)))
.setRemoteReader(repos).setURI("platform/") .setRemoteReader(repos).setURI("platform/")
.setTargetURI("platform/superproject") .setTargetURI("platform/superproject")
.setRecordRemoteBranch(true).setRecordSubmoduleLabels(true) .setRecordRemoteBranch(true).setRecordSubmoduleLabels(true)
@ -254,7 +254,7 @@ public void androidSetup() throws Exception {
RevCommit commit = cmd RevCommit commit = cmd
.setInputStream(new ByteArrayInputStream( .setInputStream(new ByteArrayInputStream(
xmlContent.toString().getBytes(CHARSET))) xmlContent.toString().getBytes(UTF_8)))
.setRemoteReader(repos).setURI("platform/") .setRemoteReader(repos).setURI("platform/")
.setTargetURI("platform/superproject") .setTargetURI("platform/superproject")
.setRecordRemoteBranch(true).setRecordSubmoduleLabels(true) .setRecordRemoteBranch(true).setRecordSubmoduleLabels(true)
@ -288,7 +288,7 @@ public void recordUnreachableRemotes() throws Exception {
try (Repository dest = cloneRepository(db, true)) { try (Repository dest = cloneRepository(db, true)) {
RevCommit commit = new RepoCommand(dest) RevCommit commit = new RepoCommand(dest)
.setInputStream(new ByteArrayInputStream( .setInputStream(new ByteArrayInputStream(
xmlContent.toString().getBytes(CHARSET))) xmlContent.toString().getBytes(UTF_8)))
.setRemoteReader(new IndexedRepos()).setURI("platform/") .setRemoteReader(new IndexedRepos()).setURI("platform/")
.setTargetURI("platform/superproject") .setTargetURI("platform/superproject")
.setRecordRemoteBranch(true).setIgnoreRemoteFailures(true) .setRecordRemoteBranch(true).setIgnoreRemoteFailures(true)
@ -327,7 +327,7 @@ public void gerritSetup() throws Exception {
RevCommit commit = cmd RevCommit commit = cmd
.setInputStream(new ByteArrayInputStream( .setInputStream(new ByteArrayInputStream(
xmlContent.toString().getBytes(CHARSET))) xmlContent.toString().getBytes(UTF_8)))
.setRemoteReader(repos).setURI("").setTargetURI("gerrit") .setRemoteReader(repos).setURI("").setTargetURI("gerrit")
.setRecordRemoteBranch(true).setRecordSubmoduleLabels(true) .setRecordRemoteBranch(true).setRecordSubmoduleLabels(true)
.call(); .call();
@ -376,7 +376,7 @@ public void absoluteRemoteURL() throws Exception {
RevCommit commit = cmd RevCommit commit = cmd
.setInputStream(new ByteArrayInputStream( .setInputStream(new ByteArrayInputStream(
xmlContent.toString().getBytes(CHARSET))) xmlContent.toString().getBytes(UTF_8)))
.setRemoteReader(repos).setURI(baseUrl) .setRemoteReader(repos).setURI(baseUrl)
.setTargetURI("gerrit").setRecordRemoteBranch(true) .setTargetURI("gerrit").setRecordRemoteBranch(true)
.setRecordSubmoduleLabels(true).call(); .setRecordSubmoduleLabels(true).call();
@ -431,7 +431,7 @@ public void absoluteRemoteURLAbsoluteTargetURL() throws Exception {
RevCommit commit = cmd RevCommit commit = cmd
.setInputStream(new ByteArrayInputStream( .setInputStream(new ByteArrayInputStream(
xmlContent.toString().getBytes(CHARSET))) xmlContent.toString().getBytes(UTF_8)))
.setRemoteReader(repos).setURI(baseUrl) .setRemoteReader(repos).setURI(baseUrl)
.setTargetURI(abs + "/superproject") .setTargetURI(abs + "/superproject")
.setRecordRemoteBranch(true) .setRecordRemoteBranch(true)

6
org.eclipse.jgit.test/tst/org/eclipse/jgit/ignore/CGitIgnoreTest.java
View File

@ -42,6 +42,7 @@
*/ */
package org.eclipse.jgit.ignore; package org.eclipse.jgit.ignore;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
@ -56,7 +57,6 @@
import java.util.Set; import java.util.Set;
import org.eclipse.jgit.junit.RepositoryTestCase; import org.eclipse.jgit.junit.RepositoryTestCase;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.StoredConfig; import org.eclipse.jgit.lib.StoredConfig;
import org.eclipse.jgit.treewalk.FileTreeIterator; import org.eclipse.jgit.treewalk.FileTreeIterator;
import org.eclipse.jgit.treewalk.TreeWalk; import org.eclipse.jgit.treewalk.TreeWalk;
@ -113,7 +113,7 @@ private String[] cgitIgnored() throws Exception {
"exit " + result.getRc() + '\n' + errorOut); "exit " + result.getRc() + '\n' + errorOut);
try (BufferedReader r = new BufferedReader(new InputStreamReader( try (BufferedReader r = new BufferedReader(new InputStreamReader(
new BufferedInputStream(result.getStdout().openInputStream()), new BufferedInputStream(result.getStdout().openInputStream()),
Constants.CHARSET))) { UTF_8))) {
return r.lines().toArray(String[]::new); return r.lines().toArray(String[]::new);
} }
} }
@ -131,7 +131,7 @@ private String[] cgitUntracked() throws Exception {
"exit " + result.getRc() + '\n' + errorOut); "exit " + result.getRc() + '\n' + errorOut);
try (BufferedReader r = new BufferedReader(new InputStreamReader( try (BufferedReader r = new BufferedReader(new InputStreamReader(
new BufferedInputStream(result.getStdout().openInputStream()), new BufferedInputStream(result.getStdout().openInputStream()),
Constants.CHARSET))) { UTF_8))) {
return r.lines().toArray(String[]::new); return r.lines().toArray(String[]::new);
} }
} }

4
org.eclipse.jgit.test/tst/org/eclipse/jgit/ignore/IgnoreNodeTest.java
View File

@ -42,7 +42,7 @@
*/ */
package org.eclipse.jgit.ignore; 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.eclipse.jgit.junit.Assert.assertEquals;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
@ -767,6 +767,6 @@ private InputStream writeToString(String... rules) {
for (String line : rules) { for (String line : rules) {
data.append(line + "\n"); data.append(line + "\n");
} }
return new ByteArrayInputStream(data.toString().getBytes(CHARSET)); return new ByteArrayInputStream(data.toString().getBytes(UTF_8));
} }
} }

6
org.eclipse.jgit.test/tst/org/eclipse/jgit/indexdiff/IndexDiffWithSymlinkTest.java
View File

@ -41,7 +41,7 @@
*/ */
package org.eclipse.jgit.indexdiff; 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.assertArrayEquals;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
@ -128,7 +128,7 @@ private File restoreGitRepo(InputStream in, File testDir, String name)
File restoreScript = new File(testDir, name + ".sh"); File restoreScript = new File(testDir, name + ".sh");
try (OutputStream out = new BufferedOutputStream( try (OutputStream out = new BufferedOutputStream(
new FileOutputStream(restoreScript)); 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 `which git` 1>&2\n");
writer.write("echo `git --version` 1>&2\n"); writer.write("echo `git --version` 1>&2\n");
writer.write("git init " + name + " && \\\n"); writer.write("git init " + name + " && \\\n");
@ -170,7 +170,7 @@ private void copy(InputStream from, File to) throws IOException {
private String readStream(InputStream stream) throws IOException { private String readStream(InputStream stream) throws IOException {
try (BufferedReader in = new BufferedReader( try (BufferedReader in = new BufferedReader(
new InputStreamReader(stream, CHARSET))) { new InputStreamReader(stream, UTF_8))) {
StringBuilder out = new StringBuilder(); StringBuilder out = new StringBuilder();
String line; String line;
while ((line = in.readLine()) != null) { while ((line = in.readLine()) != null) {

4
org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefUpdateTest.java
View File

@ -46,7 +46,7 @@
package org.eclipse.jgit.internal.storage.file; package org.eclipse.jgit.internal.storage.file;
import static org.eclipse.jgit.junit.Assert.assertEquals; 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.eclipse.jgit.lib.Constants.LOCK_SUFFIX;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
@ -263,7 +263,7 @@ public void testDeleteHeadInBareRepo() throws IOException {
ObjectId blobId; ObjectId blobId;
try (ObjectInserter ins = bareRepo.newObjectInserter()) { 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(); ins.flush();
} }

12
org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/T0003_BasicTest.java
View File

@ -47,7 +47,7 @@
package org.eclipse.jgit.internal.storage.file; package org.eclipse.jgit.internal.storage.file;
import static java.nio.charset.StandardCharsets.ISO_8859_1; 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.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
@ -368,7 +368,7 @@ public void test006_ReadUglyConfig() throws IOException,
+ " email = A U Thor <thor@example.com> # Just an example...\n" + " email = A U Thor <thor@example.com> # Just an example...\n"
+ " name = \"A Thor \\\\ \\\"\\t \"\n" + " name = \"A Thor \\\\ \\\"\\t \"\n"
+ " defaultCheckInComment = a many line\\ncomment\\n to test\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 @Test
@ -517,7 +517,7 @@ public void test023_createCommitNonAnullii() throws IOException {
4294967295000L, 60)); 4294967295000L, 60));
commit.setCommitter(new PersonIdent("Joe Hacker", "joe2@example.com", commit.setCommitter(new PersonIdent("Joe Hacker", "joe2@example.com",
4294967295000L, 60)); 4294967295000L, 60));
commit.setEncoding(CHARSET); commit.setEncoding(UTF_8);
commit.setMessage("\u00dcbergeeks"); commit.setMessage("\u00dcbergeeks");
ObjectId cid = insertCommit(commit); ObjectId cid = insertCommit(commit);
assertEquals("4680908112778718f37e686cbebcc912730b3154", cid.name()); assertEquals("4680908112778718f37e686cbebcc912730b3154", cid.name());
@ -559,7 +559,7 @@ public void test026_CreateCommitMultipleparents() throws IOException {
final ObjectId treeId; final ObjectId treeId;
try (ObjectInserter oi = db.newObjectInserter()) { try (ObjectInserter oi = db.newObjectInserter()) {
final ObjectId blobId = oi.insert(Constants.OBJ_BLOB, 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())); .name()));
TreeFormatter fmt = new TreeFormatter(); TreeFormatter fmt = new TreeFormatter();
fmt.append("i-am-a-file", FileMode.REGULAR_FILE, blobId); fmt.append("i-am-a-file", FileMode.REGULAR_FILE, blobId);
@ -666,9 +666,9 @@ public void test028_LockPackedRef() throws IOException {
ObjectId id2; ObjectId id2;
try (ObjectInserter ins = db.newObjectInserter()) { try (ObjectInserter ins = db.newObjectInserter()) {
id1 = ins.insert( id1 = ins.insert(
Constants.OBJ_BLOB, "contents1".getBytes(Constants.CHARSET)); Constants.OBJ_BLOB, "contents1".getBytes(UTF_8));
id2 = ins.insert( id2 = ins.insert(
Constants.OBJ_BLOB, "contents2".getBytes(Constants.CHARSET)); Constants.OBJ_BLOB, "contents2".getBytes(UTF_8));
ins.flush(); ins.flush();
} }

3
org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/WindowCacheGetTest.java
View File

@ -43,6 +43,7 @@
package org.eclipse.jgit.internal.storage.file; 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.assertEquals;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
@ -77,7 +78,7 @@ public void setUp() throws Exception {
try (BufferedReader br = new BufferedReader(new InputStreamReader( try (BufferedReader br = new BufferedReader(new InputStreamReader(
new FileInputStream(JGitTestUtil new FileInputStream(JGitTestUtil
.getTestResourceFile("all_packed_objects.txt")), .getTestResourceFile("all_packed_objects.txt")),
Constants.CHARSET))) { UTF_8))) {
String line; String line;
while ((line = br.readLine()) != null) { while ((line = br.readLine()) != null) {
final String[] parts = line.split(" {1,}"); final String[] parts = line.split(" {1,}");

4
org.eclipse.jgit.test/tst/org/eclipse/jgit/junit/TestRepositoryTest.java
View File

@ -43,7 +43,7 @@
package org.eclipse.jgit.junit; 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.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotEquals;
@ -418,6 +418,6 @@ private String blobAsString(AnyObjectId treeish, String path)
RevObject obj = tr.get(rw.parseTree(treeish), path); RevObject obj = tr.get(rw.parseTree(treeish), path);
assertSame(RevBlob.class, obj.getClass()); assertSame(RevBlob.class, obj.getClass());
ObjectLoader loader = rw.getObjectReader().open(obj); ObjectLoader loader = rw.getObjectReader().open(obj);
return new String(loader.getCachedBytes(), CHARSET); return new String(loader.getCachedBytes(), UTF_8);
} }
} }

10
org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ObjectCheckerTest.java
View File

@ -45,7 +45,7 @@
package org.eclipse.jgit.lib; package org.eclipse.jgit.lib;
import static java.lang.Integer.valueOf; 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.junit.JGitTestUtil.concat;
import static org.eclipse.jgit.lib.Constants.OBJECT_ID_LENGTH; import static org.eclipse.jgit.lib.Constants.OBJECT_ID_LENGTH;
import static org.eclipse.jgit.lib.Constants.OBJ_BAD; import static org.eclipse.jgit.lib.Constants.OBJ_BAD;
@ -1454,7 +1454,7 @@ public void testInvalidTreeDuplicateNames5()
StringBuilder b = new StringBuilder(); StringBuilder b = new StringBuilder();
entry(b, "100644 A"); entry(b, "100644 A");
entry(b, "100644 a"); entry(b, "100644 a");
byte[] data = b.toString().getBytes(CHARSET); byte[] data = b.toString().getBytes(UTF_8);
checker.setSafeForWindows(true); checker.setSafeForWindows(true);
assertCorrupt("duplicate entry names", OBJ_TREE, data); assertCorrupt("duplicate entry names", OBJ_TREE, data);
assertSkipListAccepts(OBJ_TREE, data); assertSkipListAccepts(OBJ_TREE, data);
@ -1468,7 +1468,7 @@ public void testInvalidTreeDuplicateNames6()
StringBuilder b = new StringBuilder(); StringBuilder b = new StringBuilder();
entry(b, "100644 A"); entry(b, "100644 A");
entry(b, "100644 a"); entry(b, "100644 a");
byte[] data = b.toString().getBytes(CHARSET); byte[] data = b.toString().getBytes(UTF_8);
checker.setSafeForMacOS(true); checker.setSafeForMacOS(true);
assertCorrupt("duplicate entry names", OBJ_TREE, data); assertCorrupt("duplicate entry names", OBJ_TREE, data);
assertSkipListAccepts(OBJ_TREE, data); assertSkipListAccepts(OBJ_TREE, data);
@ -1482,7 +1482,7 @@ public void testInvalidTreeDuplicateNames7()
StringBuilder b = new StringBuilder(); StringBuilder b = new StringBuilder();
entry(b, "100644 \u0065\u0301"); entry(b, "100644 \u0065\u0301");
entry(b, "100644 \u00e9"); entry(b, "100644 \u00e9");
byte[] data = b.toString().getBytes(CHARSET); byte[] data = b.toString().getBytes(UTF_8);
checker.setSafeForMacOS(true); checker.setSafeForMacOS(true);
assertCorrupt("duplicate entry names", OBJ_TREE, data); assertCorrupt("duplicate entry names", OBJ_TREE, data);
assertSkipListAccepts(OBJ_TREE, data); assertSkipListAccepts(OBJ_TREE, data);
@ -1496,7 +1496,7 @@ public void testInvalidTreeDuplicateNames8()
StringBuilder b = new StringBuilder(); StringBuilder b = new StringBuilder();
entry(b, "100644 A"); entry(b, "100644 A");
checker.setSafeForMacOS(true); checker.setSafeForMacOS(true);
checker.checkTree(b.toString().getBytes(CHARSET)); checker.checkTree(b.toString().getBytes(UTF_8));
} }
@Test @Test

4
org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/CrissCrossMergeTest.java
View File

@ -42,7 +42,7 @@
*/ */
package org.eclipse.jgit.merge; 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.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
@ -883,7 +883,7 @@ private String contentAsString(Repository r, ObjectId treeId, String path)
StringBuilder result = new StringBuilder(); StringBuilder result = new StringBuilder();
ObjectReader or = r.newObjectReader(); ObjectReader or = r.newObjectReader();
try (BufferedReader br = new BufferedReader( try (BufferedReader br = new BufferedReader(
new InputStreamReader(or.open(blobId).openStream(), CHARSET))) { new InputStreamReader(or.open(blobId).openStream(), UTF_8))) {
String line; String line;
boolean first = true; boolean first = true;
while ((line = br.readLine()) != null) { while ((line = br.readLine()) != null) {

15
org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergerTest.java
View File

@ -42,7 +42,7 @@
*/ */
package org.eclipse.jgit.merge; 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.eclipse.jgit.lib.Constants.OBJ_BLOB;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
@ -793,7 +793,7 @@ public void checkContentMergeLargeBinaries(MergeStrategy strategy) throws Except
} }
binary[50] = '\0'; binary[50] = '\0';
writeTrashFile("file", new String(binary, CHARSET)); writeTrashFile("file", new String(binary, UTF_8));
git.add().addFilepattern("file").call(); git.add().addFilepattern("file").call();
RevCommit first = git.commit().setMessage("added file").call(); RevCommit first = git.commit().setMessage("added file").call();
@ -801,7 +801,7 @@ public void checkContentMergeLargeBinaries(MergeStrategy strategy) throws Except
int idx = LINELEN * 1200 + 1; int idx = LINELEN * 1200 + 1;
byte save = binary[idx]; byte save = binary[idx];
binary[idx] = '@'; binary[idx] = '@';
writeTrashFile("file", new String(binary, CHARSET)); writeTrashFile("file", new String(binary, UTF_8));
binary[idx] = save; binary[idx] = save;
git.add().addFilepattern("file").call(); git.add().addFilepattern("file").call();
@ -810,7 +810,7 @@ public void checkContentMergeLargeBinaries(MergeStrategy strategy) throws Except
git.checkout().setCreateBranch(true).setStartPoint(first).setName("side").call(); git.checkout().setCreateBranch(true).setStartPoint(first).setName("side").call();
binary[LINELEN * 1500 + 1] = '!'; binary[LINELEN * 1500 + 1] = '!';
writeTrashFile("file", new String(binary, CHARSET)); writeTrashFile("file", new String(binary, UTF_8));
git.add().addFilepattern("file").call(); git.add().addFilepattern("file").call();
RevCommit sideCommit = git.commit().setAll(true) RevCommit sideCommit = git.commit().setAll(true)
.setMessage("modified file l 1500").call(); .setMessage("modified file l 1500").call();
@ -972,7 +972,7 @@ public void checkContentMergeConflict_noTree(MergeStrategy strategy)
merger.getMergeResults().get("file"); merger.getMergeResults().get("file");
try (ByteArrayOutputStream out = new ByteArrayOutputStream()) { try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
fmt.formatMerge(out, merger.getMergeResults().get("file"), fmt.formatMerge(out, merger.getMergeResults().get("file"),
"BASE", "OURS", "THEIRS", CHARSET.name()); "BASE", "OURS", "THEIRS", UTF_8.name());
String expected = "<<<<<<< OURS\n" String expected = "<<<<<<< OURS\n"
+ "1master\n" + "1master\n"
+ "=======\n" + "=======\n"
@ -980,7 +980,7 @@ public void checkContentMergeConflict_noTree(MergeStrategy strategy)
+ ">>>>>>> THEIRS\n" + ">>>>>>> THEIRS\n"
+ "2\n" + "2\n"
+ "3"; + "3";
assertEquals(expected, new String(out.toByteArray(), CHARSET)); assertEquals(expected, new String(out.toByteArray(), UTF_8));
} }
} }
} }
@ -1367,6 +1367,7 @@ private String readBlob(ObjectId treeish, String path) throws Exception {
if (obj == null) { if (obj == null) {
return 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);
} }
} }

6
org.eclipse.jgit.test/tst/org/eclipse/jgit/patch/GetTextTest.java
View File

@ -44,7 +44,7 @@
package org.eclipse.jgit.patch; package org.eclipse.jgit.patch;
import static java.nio.charset.StandardCharsets.ISO_8859_1; 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.assertEquals;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
@ -83,7 +83,7 @@ public void testGetText_NoBinary() throws IOException {
@Test @Test
public void testGetText_Convert() throws IOException { public void testGetText_Convert() throws IOException {
final Charset csOld = ISO_8859_1; final Charset csOld = ISO_8859_1;
final Charset csNew = CHARSET; final Charset csNew = UTF_8;
final Patch p = parseTestPatchFile(); final Patch p = parseTestPatchFile();
assertTrue(p.getErrors().isEmpty()); assertTrue(p.getErrors().isEmpty());
assertEquals(1, p.getFiles().size()); assertEquals(1, p.getFiles().size());
@ -103,7 +103,7 @@ public void testGetText_Convert() throws IOException {
@Test @Test
public void testGetText_DiffCc() throws IOException { public void testGetText_DiffCc() throws IOException {
final Charset csOld = ISO_8859_1; final Charset csOld = ISO_8859_1;
final Charset csNew = CHARSET; final Charset csNew = UTF_8;
final Patch p = parseTestPatchFile(); final Patch p = parseTestPatchFile();
assertTrue(p.getErrors().isEmpty()); assertTrue(p.getErrors().isEmpty());
assertEquals(1, p.getFiles().size()); assertEquals(1, p.getFiles().size());

106
org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevCommitParseTest.java
View File

@ -44,7 +44,7 @@
package org.eclipse.jgit.revwalk; package org.eclipse.jgit.revwalk;
import static java.nio.charset.StandardCharsets.ISO_8859_1; 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.assertEquals;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNull;
@ -114,7 +114,7 @@ public void testParse_NoParents() throws Exception {
assertNull(c.getTree()); assertNull(c.getTree());
assertNull(c.parents); assertNull(c.parents);
c.parseCanonical(rw, body.toString().getBytes(CHARSET)); c.parseCanonical(rw, body.toString().getBytes(UTF_8));
assertNotNull(c.getTree()); assertNotNull(c.getTree());
assertEquals(treeId, c.getTree().getId()); assertEquals(treeId, c.getTree().getId());
assertSame(rw.lookupTree(treeId), c.getTree()); assertSame(rw.lookupTree(treeId), c.getTree());
@ -148,7 +148,7 @@ private RevCommit create(String msg) throws Exception {
final RevCommit c; final RevCommit c;
c = new RevCommit(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67")); 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; return c;
} }
@ -161,7 +161,7 @@ public void testParse_WeirdHeaderOnlyCommit() throws Exception {
final RevCommit c; final RevCommit c;
c = new RevCommit(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67")); 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.getFullMessage());
assertEquals("", c.getShortMessage()); assertEquals("", c.getShortMessage());
@ -176,7 +176,7 @@ public void testParse_incompleteAuthorAndCommitter() throws Exception {
final RevCommit c; final RevCommit c;
c = new RevCommit(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67")); 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("", "a_u_thor@example.com", 1218123387000l, 7), c.getAuthorIdent());
assertEquals(new PersonIdent("", "", 1218123390000l, -5), c.getCommitterIdent()); assertEquals(new PersonIdent("", "", 1218123390000l, -5), c.getCommitterIdent());
@ -185,18 +185,18 @@ public void testParse_incompleteAuthorAndCommitter() throws Exception {
@Test @Test
public void testParse_implicit_UTF8_encoded() throws Exception { public void testParse_implicit_UTF8_encoded() throws Exception {
final ByteArrayOutputStream b = new ByteArrayOutputStream(); 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(CHARSET)); 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(CHARSET)); b.write("committer C O. Miter <c@example.com> 1218123390 -0500\n".getBytes(UTF_8));
b.write("\n".getBytes(CHARSET)); b.write("\n".getBytes(UTF_8));
b.write("Sm\u00f6rg\u00e5sbord\n".getBytes(CHARSET)); b.write("Sm\u00f6rg\u00e5sbord\n".getBytes(UTF_8));
b.write("\n".getBytes(CHARSET)); b.write("\n".getBytes(UTF_8));
b.write("\u304d\u308c\u3044\n".getBytes(CHARSET)); b.write("\u304d\u308c\u3044\n".getBytes(UTF_8));
final RevCommit c; final RevCommit c;
c = new RevCommit(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67")); // bogus id c = new RevCommit(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67")); // bogus id
c.parseCanonical(new RevWalk(db), b.toByteArray()); 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("F\u00f6r fattare", c.getAuthorIdent().getName());
assertEquals("Sm\u00f6rg\u00e5sbord", c.getShortMessage()); assertEquals("Sm\u00f6rg\u00e5sbord", c.getShortMessage());
assertEquals("Sm\u00f6rg\u00e5sbord\n\n\u304d\u308c\u3044\n", c.getFullMessage()); assertEquals("Sm\u00f6rg\u00e5sbord\n\n\u304d\u308c\u3044\n", c.getFullMessage());
@ -205,18 +205,18 @@ public void testParse_implicit_UTF8_encoded() throws Exception {
@Test @Test
public void testParse_implicit_mixed_encoded() throws Exception { public void testParse_implicit_mixed_encoded() throws Exception {
final ByteArrayOutputStream b = new ByteArrayOutputStream(); 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("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("committer C O. Miter <c@example.com> 1218123390 -0500\n".getBytes(UTF_8));
b.write("\n".getBytes(CHARSET)); b.write("\n".getBytes(UTF_8));
b.write("Sm\u00f6rg\u00e5sbord\n".getBytes(CHARSET)); b.write("Sm\u00f6rg\u00e5sbord\n".getBytes(UTF_8));
b.write("\n".getBytes(CHARSET)); b.write("\n".getBytes(UTF_8));
b.write("\u304d\u308c\u3044\n".getBytes(CHARSET)); b.write("\u304d\u308c\u3044\n".getBytes(UTF_8));
final RevCommit c; final RevCommit c;
c = new RevCommit(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67")); // bogus id c = new RevCommit(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67")); // bogus id
c.parseCanonical(new RevWalk(db), b.toByteArray()); 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("F\u00f6r fattare", c.getAuthorIdent().getName());
assertEquals("Sm\u00f6rg\u00e5sbord", c.getShortMessage()); assertEquals("Sm\u00f6rg\u00e5sbord", c.getShortMessage());
assertEquals("Sm\u00f6rg\u00e5sbord\n\n\u304d\u308c\u3044\n", c.getFullMessage()); assertEquals("Sm\u00f6rg\u00e5sbord\n\n\u304d\u308c\u3044\n", c.getFullMessage());
@ -260,14 +260,14 @@ public void testParse_explicit_encoded() throws Exception {
@Test @Test
public void testParse_explicit_bad_encoded() throws Exception { public void testParse_explicit_bad_encoded() throws Exception {
final ByteArrayOutputStream b = new ByteArrayOutputStream(); 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("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("committer C O. Miter <c@example.com> 1218123390 -0500\n".getBytes(UTF_8));
b.write("encoding EUC-JP\n".getBytes(CHARSET)); b.write("encoding EUC-JP\n".getBytes(UTF_8));
b.write("\n".getBytes(CHARSET)); b.write("\n".getBytes(UTF_8));
b.write("\u304d\u308c\u3044\n".getBytes(CHARSET)); b.write("\u304d\u308c\u3044\n".getBytes(UTF_8));
b.write("\n".getBytes(CHARSET)); b.write("\n".getBytes(UTF_8));
b.write("Hi\n".getBytes(CHARSET)); b.write("Hi\n".getBytes(UTF_8));
final RevCommit c; final RevCommit c;
c = new RevCommit(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67")); // bogus id c = new RevCommit(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67")); // bogus id
c.parseCanonical(new RevWalk(db), b.toByteArray()); c.parseCanonical(new RevWalk(db), b.toByteArray());
@ -291,14 +291,14 @@ public void testParse_explicit_bad_encoded() throws Exception {
@Test @Test
public void testParse_explicit_bad_encoded2() throws Exception { public void testParse_explicit_bad_encoded2() throws Exception {
final ByteArrayOutputStream b = new ByteArrayOutputStream(); 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(CHARSET)); 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(CHARSET)); b.write("committer C O. Miter <c@example.com> 1218123390 -0500\n".getBytes(UTF_8));
b.write("encoding ISO-8859-1\n".getBytes(CHARSET)); b.write("encoding ISO-8859-1\n".getBytes(UTF_8));
b.write("\n".getBytes(CHARSET)); b.write("\n".getBytes(UTF_8));
b.write("\u304d\u308c\u3044\n".getBytes(CHARSET)); b.write("\u304d\u308c\u3044\n".getBytes(UTF_8));
b.write("\n".getBytes(CHARSET)); b.write("\n".getBytes(UTF_8));
b.write("Hi\n".getBytes(CHARSET)); b.write("Hi\n".getBytes(UTF_8));
final RevCommit c; final RevCommit c;
c = new RevCommit(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67")); // bogus id c = new RevCommit(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67")); // bogus id
c.parseCanonical(new RevWalk(db), b.toByteArray()); c.parseCanonical(new RevWalk(db), b.toByteArray());
@ -313,13 +313,13 @@ public void testParse_explicit_bad_encoded2() throws Exception {
public void testParse_incorrectUtf8Name() throws Exception { public void testParse_incorrectUtf8Name() throws Exception {
ByteArrayOutputStream b = new ByteArrayOutputStream(); ByteArrayOutputStream b = new ByteArrayOutputStream();
b.write("tree 9788669ad918b6fcce64af8882fc9a81cb6aba67\n" b.write("tree 9788669ad918b6fcce64af8882fc9a81cb6aba67\n"
.getBytes(CHARSET)); .getBytes(UTF_8));
b.write("author au <a@example.com> 1218123387 +0700\n".getBytes(CHARSET)); b.write("author au <a@example.com> 1218123387 +0700\n".getBytes(UTF_8));
b.write("committer co <c@example.com> 1218123390 -0500\n" b.write("committer co <c@example.com> 1218123390 -0500\n"
.getBytes(CHARSET)); .getBytes(UTF_8));
b.write("encoding 'utf8'\n".getBytes(CHARSET)); b.write("encoding 'utf8'\n".getBytes(UTF_8));
b.write("\n".getBytes(CHARSET)); b.write("\n".getBytes(UTF_8));
b.write("Sm\u00f6rg\u00e5sbord\n".getBytes(CHARSET)); b.write("Sm\u00f6rg\u00e5sbord\n".getBytes(UTF_8));
RevCommit c = new RevCommit( RevCommit c = new RevCommit(
id("9473095c4cb2f12aefe1db8a355fe3fafba42f67")); id("9473095c4cb2f12aefe1db8a355fe3fafba42f67"));
@ -338,12 +338,12 @@ public void testParse_incorrectUtf8Name() throws Exception {
@Test @Test
public void testParse_illegalEncoding() throws Exception { public void testParse_illegalEncoding() throws Exception {
ByteArrayOutputStream b = new ByteArrayOutputStream(); ByteArrayOutputStream b = new ByteArrayOutputStream();
b.write("tree 9788669ad918b6fcce64af8882fc9a81cb6aba67\n".getBytes(CHARSET)); b.write("tree 9788669ad918b6fcce64af8882fc9a81cb6aba67\n".getBytes(UTF_8));
b.write("author au <a@example.com> 1218123387 +0700\n".getBytes(CHARSET)); 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("committer co <c@example.com> 1218123390 -0500\n".getBytes(UTF_8));
b.write("encoding utf-8logoutputencoding=gbk\n".getBytes(CHARSET)); b.write("encoding utf-8logoutputencoding=gbk\n".getBytes(UTF_8));
b.write("\n".getBytes(CHARSET)); b.write("\n".getBytes(UTF_8));
b.write("message\n".getBytes(CHARSET)); b.write("message\n".getBytes(UTF_8));
RevCommit c = new RevCommit( RevCommit c = new RevCommit(
id("9473095c4cb2f12aefe1db8a355fe3fafba42f67")); id("9473095c4cb2f12aefe1db8a355fe3fafba42f67"));
@ -365,12 +365,12 @@ public void testParse_illegalEncoding() throws Exception {
@Test @Test
public void testParse_unsupportedEncoding() throws Exception { public void testParse_unsupportedEncoding() throws Exception {
ByteArrayOutputStream b = new ByteArrayOutputStream(); ByteArrayOutputStream b = new ByteArrayOutputStream();
b.write("tree 9788669ad918b6fcce64af8882fc9a81cb6aba67\n".getBytes(CHARSET)); b.write("tree 9788669ad918b6fcce64af8882fc9a81cb6aba67\n".getBytes(UTF_8));
b.write("author au <a@example.com> 1218123387 +0700\n".getBytes(CHARSET)); 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("committer co <c@example.com> 1218123390 -0500\n".getBytes(UTF_8));
b.write("encoding it_IT.UTF8\n".getBytes(CHARSET)); b.write("encoding it_IT.UTF8\n".getBytes(UTF_8));
b.write("\n".getBytes(CHARSET)); b.write("\n".getBytes(UTF_8));
b.write("message\n".getBytes(CHARSET)); b.write("message\n".getBytes(UTF_8));
RevCommit c = new RevCommit( RevCommit c = new RevCommit(
id("9473095c4cb2f12aefe1db8a355fe3fafba42f67")); id("9473095c4cb2f12aefe1db8a355fe3fafba42f67"));

102
org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevTagParseTest.java
View File

@ -44,7 +44,7 @@
package org.eclipse.jgit.revwalk; package org.eclipse.jgit.revwalk;
import static java.nio.charset.StandardCharsets.ISO_8859_1; 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.assertEquals;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNull;
@ -98,7 +98,7 @@ private void testOneType(int typeCode) throws Exception {
assertNull(c.getObject()); assertNull(c.getObject());
assertNull(c.getTagName()); assertNull(c.getTagName());
c.parseCanonical(rw, b.toString().getBytes(CHARSET)); c.parseCanonical(rw, b.toString().getBytes(UTF_8));
assertNotNull(c.getObject()); assertNotNull(c.getObject());
assertEquals(id, c.getObject().getId()); assertEquals(id, c.getObject().getId());
assertSame(rw.lookupAny(id, typeCode), c.getObject()); assertSame(rw.lookupAny(id, typeCode), c.getObject());
@ -141,7 +141,7 @@ public void testParseAllFields() throws Exception {
assertNull(c.getObject()); assertNull(c.getObject());
assertNull(c.getTagName()); assertNull(c.getTagName());
c.parseCanonical(rw, body.toString().getBytes(CHARSET)); c.parseCanonical(rw, body.toString().getBytes(UTF_8));
assertNotNull(c.getObject()); assertNotNull(c.getObject());
assertEquals(treeId, c.getObject().getId()); assertEquals(treeId, c.getObject().getId());
assertSame(rw.lookupTree(treeId), c.getObject()); assertSame(rw.lookupTree(treeId), c.getObject());
@ -189,7 +189,7 @@ public void testParseOldStyleNoTagger() throws Exception {
assertNull(c.getObject()); assertNull(c.getObject());
assertNull(c.getTagName()); assertNull(c.getTagName());
c.parseCanonical(rw, body.toString().getBytes(CHARSET)); c.parseCanonical(rw, body.toString().getBytes(UTF_8));
assertNotNull(c.getObject()); assertNotNull(c.getObject());
assertEquals(treeId, c.getObject().getId()); assertEquals(treeId, c.getObject().getId());
assertSame(rw.lookupTree(treeId), c.getObject()); assertSame(rw.lookupTree(treeId), c.getObject());
@ -213,7 +213,7 @@ private RevTag create(String msg) throws Exception {
final RevTag c; final RevTag c;
c = new RevTag(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67")); 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; return c;
} }
@ -221,17 +221,17 @@ private RevTag create(String msg) throws Exception {
public void testParse_implicit_UTF8_encoded() throws Exception { public void testParse_implicit_UTF8_encoded() throws Exception {
final ByteArrayOutputStream b = new ByteArrayOutputStream(); final ByteArrayOutputStream b = new ByteArrayOutputStream();
b.write("object 9788669ad918b6fcce64af8882fc9a81cb6aba67\n" b.write("object 9788669ad918b6fcce64af8882fc9a81cb6aba67\n"
.getBytes(CHARSET)); .getBytes(UTF_8));
b.write("type tree\n".getBytes(CHARSET)); b.write("type tree\n".getBytes(UTF_8));
b.write("tag v1.2.3.4.5\n".getBytes(CHARSET)); b.write("tag v1.2.3.4.5\n".getBytes(UTF_8));
b b
.write("tagger F\u00f6r fattare <a_u_thor@example.com> 1218123387 +0700\n" .write("tagger F\u00f6r fattare <a_u_thor@example.com> 1218123387 +0700\n"
.getBytes(CHARSET)); .getBytes(UTF_8));
b.write("\n".getBytes(CHARSET)); b.write("\n".getBytes(UTF_8));
b.write("Sm\u00f6rg\u00e5sbord\n".getBytes(CHARSET)); b.write("Sm\u00f6rg\u00e5sbord\n".getBytes(UTF_8));
b.write("\n".getBytes(CHARSET)); b.write("\n".getBytes(UTF_8));
b.write("\u304d\u308c\u3044\n".getBytes(CHARSET)); b.write("\u304d\u308c\u3044\n".getBytes(UTF_8));
final RevTag c; final RevTag c;
c = new RevTag(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67")); c = new RevTag(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67"));
c.parseCanonical(new RevWalk(db), b.toByteArray()); c.parseCanonical(new RevWalk(db), b.toByteArray());
@ -246,15 +246,15 @@ public void testParse_implicit_UTF8_encoded() throws Exception {
public void testParse_implicit_mixed_encoded() throws Exception { public void testParse_implicit_mixed_encoded() throws Exception {
final ByteArrayOutputStream b = new ByteArrayOutputStream(); final ByteArrayOutputStream b = new ByteArrayOutputStream();
b.write("object 9788669ad918b6fcce64af8882fc9a81cb6aba67\n" b.write("object 9788669ad918b6fcce64af8882fc9a81cb6aba67\n"
.getBytes(CHARSET)); .getBytes(UTF_8));
b.write("type tree\n".getBytes(CHARSET)); b.write("type tree\n".getBytes(UTF_8));
b.write("tag v1.2.3.4.5\n".getBytes(CHARSET)); 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" b.write("tagger F\u00f6r fattare <a_u_thor@example.com> 1218123387 +0700\n"
.getBytes(ISO_8859_1)); .getBytes(ISO_8859_1));
b.write("\n".getBytes(CHARSET)); b.write("\n".getBytes(UTF_8));
b.write("Sm\u00f6rg\u00e5sbord\n".getBytes(CHARSET)); b.write("Sm\u00f6rg\u00e5sbord\n".getBytes(UTF_8));
b.write("\n".getBytes(CHARSET)); b.write("\n".getBytes(UTF_8));
b.write("\u304d\u308c\u3044\n".getBytes(CHARSET)); b.write("\u304d\u308c\u3044\n".getBytes(UTF_8));
final RevTag c; final RevTag c;
c = new RevTag(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67")); c = new RevTag(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67"));
c.parseCanonical(new RevWalk(db), b.toByteArray()); c.parseCanonical(new RevWalk(db), b.toByteArray());
@ -307,17 +307,17 @@ public void testParse_explicit_encoded() throws Exception {
public void testParse_explicit_bad_encoded() throws Exception { public void testParse_explicit_bad_encoded() throws Exception {
final ByteArrayOutputStream b = new ByteArrayOutputStream(); final ByteArrayOutputStream b = new ByteArrayOutputStream();
b.write("object 9788669ad918b6fcce64af8882fc9a81cb6aba67\n" b.write("object 9788669ad918b6fcce64af8882fc9a81cb6aba67\n"
.getBytes(CHARSET)); .getBytes(UTF_8));
b.write("type tree\n".getBytes(CHARSET)); b.write("type tree\n".getBytes(UTF_8));
b.write("tag v1.2.3.4.5\n".getBytes(CHARSET)); b.write("tag v1.2.3.4.5\n".getBytes(UTF_8));
b b
.write("tagger F\u00f6r fattare <a_u_thor@example.com> 1218123387 +0700\n" .write("tagger F\u00f6r fattare <a_u_thor@example.com> 1218123387 +0700\n"
.getBytes(ISO_8859_1)); .getBytes(ISO_8859_1));
b.write("encoding EUC-JP\n".getBytes(CHARSET)); b.write("encoding EUC-JP\n".getBytes(UTF_8));
b.write("\n".getBytes(CHARSET)); b.write("\n".getBytes(UTF_8));
b.write("\u304d\u308c\u3044\n".getBytes(CHARSET)); b.write("\u304d\u308c\u3044\n".getBytes(UTF_8));
b.write("\n".getBytes(CHARSET)); b.write("\n".getBytes(UTF_8));
b.write("Hi\n".getBytes(CHARSET)); b.write("Hi\n".getBytes(UTF_8));
final RevTag c; final RevTag c;
c = new RevTag(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67")); c = new RevTag(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67"));
c.parseCanonical(new RevWalk(db), b.toByteArray()); c.parseCanonical(new RevWalk(db), b.toByteArray());
@ -342,17 +342,17 @@ public void testParse_explicit_bad_encoded() throws Exception {
public void testParse_explicit_bad_encoded2() throws Exception { public void testParse_explicit_bad_encoded2() throws Exception {
final ByteArrayOutputStream b = new ByteArrayOutputStream(); final ByteArrayOutputStream b = new ByteArrayOutputStream();
b.write("object 9788669ad918b6fcce64af8882fc9a81cb6aba67\n" b.write("object 9788669ad918b6fcce64af8882fc9a81cb6aba67\n"
.getBytes(CHARSET)); .getBytes(UTF_8));
b.write("type tree\n".getBytes(CHARSET)); b.write("type tree\n".getBytes(UTF_8));
b.write("tag v1.2.3.4.5\n".getBytes(CHARSET)); b.write("tag v1.2.3.4.5\n".getBytes(UTF_8));
b b
.write("tagger F\u00f6r fattare <a_u_thor@example.com> 1218123387 +0700\n" .write("tagger F\u00f6r fattare <a_u_thor@example.com> 1218123387 +0700\n"
.getBytes(CHARSET)); .getBytes(UTF_8));
b.write("encoding ISO-8859-1\n".getBytes(CHARSET)); b.write("encoding ISO-8859-1\n".getBytes(UTF_8));
b.write("\n".getBytes(CHARSET)); b.write("\n".getBytes(UTF_8));
b.write("\u304d\u308c\u3044\n".getBytes(CHARSET)); b.write("\u304d\u308c\u3044\n".getBytes(UTF_8));
b.write("\n".getBytes(CHARSET)); b.write("\n".getBytes(UTF_8));
b.write("Hi\n".getBytes(CHARSET)); b.write("Hi\n".getBytes(UTF_8));
final RevTag c; final RevTag c;
c = new RevTag(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67")); c = new RevTag(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67"));
c.parseCanonical(new RevWalk(db), b.toByteArray()); c.parseCanonical(new RevWalk(db), b.toByteArray());
@ -365,13 +365,13 @@ public void testParse_explicit_bad_encoded2() throws Exception {
@Test @Test
public void testParse_illegalEncoding() throws Exception { public void testParse_illegalEncoding() throws Exception {
ByteArrayOutputStream b = new ByteArrayOutputStream(); ByteArrayOutputStream b = new ByteArrayOutputStream();
b.write("object 9788669ad918b6fcce64af8882fc9a81cb6aba67\n".getBytes(CHARSET)); b.write("object 9788669ad918b6fcce64af8882fc9a81cb6aba67\n".getBytes(UTF_8));
b.write("type tree\n".getBytes(CHARSET)); b.write("type tree\n".getBytes(UTF_8));
b.write("tag v1.0\n".getBytes(CHARSET)); b.write("tag v1.0\n".getBytes(UTF_8));
b.write("tagger t <t@example.com> 1218123387 +0700\n".getBytes(CHARSET)); b.write("tagger t <t@example.com> 1218123387 +0700\n".getBytes(UTF_8));
b.write("encoding utf-8logoutputencoding=gbk\n".getBytes(CHARSET)); b.write("encoding utf-8logoutputencoding=gbk\n".getBytes(UTF_8));
b.write("\n".getBytes(CHARSET)); b.write("\n".getBytes(UTF_8));
b.write("message\n".getBytes(CHARSET)); b.write("message\n".getBytes(UTF_8));
RevTag t = new RevTag(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67")); RevTag t = new RevTag(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67"));
t.parseCanonical(new RevWalk(db), b.toByteArray()); t.parseCanonical(new RevWalk(db), b.toByteArray());
@ -384,13 +384,13 @@ public void testParse_illegalEncoding() throws Exception {
@Test @Test
public void testParse_unsupportedEncoding() throws Exception { public void testParse_unsupportedEncoding() throws Exception {
ByteArrayOutputStream b = new ByteArrayOutputStream(); ByteArrayOutputStream b = new ByteArrayOutputStream();
b.write("object 9788669ad918b6fcce64af8882fc9a81cb6aba67\n".getBytes(CHARSET)); b.write("object 9788669ad918b6fcce64af8882fc9a81cb6aba67\n".getBytes(UTF_8));
b.write("type tree\n".getBytes(CHARSET)); b.write("type tree\n".getBytes(UTF_8));
b.write("tag v1.0\n".getBytes(CHARSET)); b.write("tag v1.0\n".getBytes(UTF_8));
b.write("tagger t <t@example.com> 1218123387 +0700\n".getBytes(CHARSET)); b.write("tagger t <t@example.com> 1218123387 +0700\n".getBytes(UTF_8));
b.write("encoding it_IT.UTF8\n".getBytes(CHARSET)); b.write("encoding it_IT.UTF8\n".getBytes(UTF_8));
b.write("\n".getBytes(CHARSET)); b.write("\n".getBytes(UTF_8));
b.write("message\n".getBytes(CHARSET)); b.write("message\n".getBytes(UTF_8));
RevTag t = new RevTag(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67")); RevTag t = new RevTag(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67"));
t.parseCanonical(new RevWalk(db), b.toByteArray()); t.parseCanonical(new RevWalk(db), b.toByteArray());

8
org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/FileBasedConfigTest.java
View File

@ -42,7 +42,7 @@
*/ */
package org.eclipse.jgit.storage.file; 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.eclipse.jgit.util.FileUtils.pathToString;
import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
@ -105,7 +105,7 @@ public void testSystemEncoding() throws IOException, ConfigInvalidException {
@Test @Test
public void testUTF8withoutBOM() throws IOException, ConfigInvalidException { 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); final FileBasedConfig config = new FileBasedConfig(file, FS.DETECTED);
config.load(); config.load();
assertEquals(ALICE, config.getString(USER, null, NAME)); assertEquals(ALICE, config.getString(USER, null, NAME));
@ -121,7 +121,7 @@ public void testUTF8withBOM() throws IOException, ConfigInvalidException {
bos1.write(0xEF); bos1.write(0xEF);
bos1.write(0xBB); bos1.write(0xBB);
bos1.write(0xBF); bos1.write(0xBF);
bos1.write(CONTENT1.getBytes(CHARSET)); bos1.write(CONTENT1.getBytes(UTF_8));
final File file = createFile(bos1.toByteArray()); final File file = createFile(bos1.toByteArray());
final FileBasedConfig config = new FileBasedConfig(file, FS.DETECTED); final FileBasedConfig config = new FileBasedConfig(file, FS.DETECTED);
@ -135,7 +135,7 @@ public void testUTF8withBOM() throws IOException, ConfigInvalidException {
bos2.write(0xEF); bos2.write(0xEF);
bos2.write(0xBB); bos2.write(0xBB);
bos2.write(0xBF); bos2.write(0xBF);
bos2.write(CONTENT2.getBytes(CHARSET)); bos2.write(CONTENT2.getBytes(UTF_8));
assertArrayEquals(bos2.toByteArray(), IO.readFully(file)); assertArrayEquals(bos2.toByteArray(), IO.readFully(file));
} }

5
org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/BundleWriterTest.java
View File

@ -45,7 +45,7 @@
package org.eclipse.jgit.transport; 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_BLOB;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
@ -199,7 +199,8 @@ public void testCustomObjectReader() throws Exception {
Ref ref = repo.exactRef(refName); Ref ref = repo.exactRef(refName);
assertNotNull(ref); assertNotNull(ref);
assertEquals(id, ref.getObjectId()); 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));
} }
} }

4
org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/NetRCTest.java
View File

@ -42,7 +42,7 @@
package org.eclipse.jgit.transport; 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.assertEquals;
import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNull;
@ -76,7 +76,7 @@ public void setUp() throws Exception {
private void config(String data) throws IOException { private void config(String data) throws IOException {
try (OutputStreamWriter fw = new OutputStreamWriter( try (OutputStreamWriter fw = new OutputStreamWriter(
new FileOutputStream(configFile), CHARSET)) { new FileOutputStream(configFile), UTF_8)) {
fw.write(data); fw.write(data);
} }
} }

4
org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/OpenSshConfigTest.java
View File

@ -43,7 +43,7 @@
package org.eclipse.jgit.transport; 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.assertArrayEquals;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
@ -94,7 +94,7 @@ private void config(String data) throws IOException {
long lastMtime = configFile.lastModified(); long lastMtime = configFile.lastModified();
do { do {
try (final OutputStreamWriter fw = new OutputStreamWriter( try (final OutputStreamWriter fw = new OutputStreamWriter(
new FileOutputStream(configFile), CHARSET)) { new FileOutputStream(configFile), UTF_8)) {
fw.write(data); fw.write(data);
} }
} while (lastMtime == configFile.lastModified()); } while (lastMtime == configFile.lastModified());

10
org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/WalkEncryptionTest.java
View File

@ -43,7 +43,7 @@
package org.eclipse.jgit.transport; 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.cryptoCipherListPBE;
import static org.eclipse.jgit.transport.WalkEncryptionTest.Util.cryptoCipherListTrans; import static org.eclipse.jgit.transport.WalkEncryptionTest.Util.cryptoCipherListTrans;
import static org.eclipse.jgit.transport.WalkEncryptionTest.Util.folderDelete; import static org.eclipse.jgit.transport.WalkEncryptionTest.Util.folderDelete;
@ -360,7 +360,7 @@ static class Util {
* @throws Exception * @throws Exception
*/ */
static String textRead(File file) 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 @@ static String textRead(File file) throws Exception {
* @throws Exception * @throws Exception
*/ */
static void textWrite(File file, String text) 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) static void verifyFileContent(File fileOne, File fileTwo)
@ -420,7 +420,7 @@ static String publicAddress() throws Exception {
c.setConnectTimeout(500); c.setConnectTimeout(500);
c.setReadTimeout(500); c.setReadTimeout(500);
try (BufferedReader reader = new BufferedReader( try (BufferedReader reader = new BufferedReader(
new InputStreamReader(c.getInputStream(), CHARSET))) { new InputStreamReader(c.getInputStream(), UTF_8))) {
return reader.readLine(); return reader.readLine();
} }
} catch (UnknownHostException | SocketTimeoutException e) { } catch (UnknownHostException | SocketTimeoutException e) {
@ -738,7 +738,7 @@ static void remoteVerify() throws Exception {
AmazonS3 s3 = new AmazonS3(props); AmazonS3 s3 = new AmazonS3(props);
String file = JGIT_USER + "-" + UUID.randomUUID().toString(); String file = JGIT_USER + "-" + UUID.randomUUID().toString();
String path = JGIT_REMOTE_DIR + "/" + file; 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); s3.delete(bucket, path);
} }

5
org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/CanonicalTreeParserTest.java
View File

@ -43,6 +43,7 @@
package org.eclipse.jgit.treewalk; 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.REGULAR_FILE;
import static org.eclipse.jgit.lib.FileMode.SYMLINK; import static org.eclipse.jgit.lib.FileMode.SYMLINK;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
@ -110,7 +111,7 @@ private static byte[] entry(final FileMode mode, final String name,
} }
private String path() { private String path() {
return RawParseUtils.decode(Constants.CHARSET, ctp.path, return RawParseUtils.decode(UTF_8, ctp.path,
ctp.pathOffset, ctp.pathLen); ctp.pathOffset, ctp.pathLen);
} }
@ -370,7 +371,7 @@ public void testFreakingHugePathName() throws Exception {
final String name = b.toString(); final String name = b.toString();
ctp.reset(entry(m644, name, hash_a)); ctp.reset(entry(m644, name, hash_a));
assertFalse(ctp.eof()); assertFalse(ctp.eof());
assertEquals(name, RawParseUtils.decode(Constants.CHARSET, ctp.path, assertEquals(name, RawParseUtils.decode(UTF_8, ctp.path,
ctp.pathOffset, ctp.pathLen)); ctp.pathOffset, ctp.pathLen));
} }

3
org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/FileTreeIteratorTest.java
View File

@ -43,6 +43,7 @@
package org.eclipse.jgit.treewalk; package org.eclipse.jgit.treewalk;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
@ -822,6 +823,6 @@ private static void assertEntry(String sha1string, String path, TreeWalk tw)
} }
private static String nameOf(AbstractTreeIterator i) { 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);
} }
} }

4
org.eclipse.jgit.test/tst/org/eclipse/jgit/util/RawSubStringPatternTest.java
View File

@ -42,7 +42,7 @@
*/ */
package org.eclipse.jgit.util; 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.assertEquals;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
@ -93,7 +93,7 @@ private static void assertMatchResult(String pattern, String input, int position
} }
private static RawCharSequence raw(String text) { private static RawCharSequence raw(String text) {
byte[] bytes = text.getBytes(CHARSET); byte[] bytes = text.getBytes(UTF_8);
return new RawCharSequence(bytes, 0, bytes.length); return new RawCharSequence(bytes, 0, bytes.length);
} }
} }

4
org.eclipse.jgit.test/tst/org/eclipse/jgit/util/io/AutoLFInputStreamTest.java
View File

@ -44,7 +44,7 @@
package org.eclipse.jgit.util.io; 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 static org.junit.Assert.assertEquals;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
@ -132,6 +132,6 @@ private static void test(byte[] input, byte[] expected,
} }
private static byte[] asBytes(String in) { private static byte[] asBytes(String in) {
return in.getBytes(CHARSET); return in.getBytes(UTF_8);
} }
} }

14
org.eclipse.jgit.test/tst/org/eclipse/jgit/util/sha1/SHA1Test.java
View File

@ -43,7 +43,7 @@
package org.eclipse.jgit.util.sha1; 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.assertEquals;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
@ -95,15 +95,15 @@ public void test1() throws NoSuchAlgorithmException {
.fromString("a9993e364706816aba3e25717850c26c9cd0d89d"); .fromString("a9993e364706816aba3e25717850c26c9cd0d89d");
MessageDigest m = MessageDigest.getInstance("SHA-1"); MessageDigest m = MessageDigest.getInstance("SHA-1");
m.update(TEST1.getBytes(CHARSET)); m.update(TEST1.getBytes(UTF_8));
ObjectId m1 = ObjectId.fromRaw(m.digest()); ObjectId m1 = ObjectId.fromRaw(m.digest());
SHA1 s = SHA1.newInstance(); SHA1 s = SHA1.newInstance();
s.update(TEST1.getBytes(CHARSET)); s.update(TEST1.getBytes(UTF_8));
ObjectId s1 = ObjectId.fromRaw(s.digest()); ObjectId s1 = ObjectId.fromRaw(s.digest());
s.reset(); s.reset();
s.update(TEST1.getBytes(CHARSET)); s.update(TEST1.getBytes(UTF_8));
ObjectId s2 = s.toObjectId(); ObjectId s2 = s.toObjectId();
assertEquals(m1, s1); assertEquals(m1, s1);
@ -117,15 +117,15 @@ public void test2() throws NoSuchAlgorithmException {
.fromString("84983e441c3bd26ebaae4aa1f95129e5e54670f1"); .fromString("84983e441c3bd26ebaae4aa1f95129e5e54670f1");
MessageDigest m = MessageDigest.getInstance("SHA-1"); MessageDigest m = MessageDigest.getInstance("SHA-1");
m.update(TEST2.getBytes(CHARSET)); m.update(TEST2.getBytes(UTF_8));
ObjectId m1 = ObjectId.fromRaw(m.digest()); ObjectId m1 = ObjectId.fromRaw(m.digest());
SHA1 s = SHA1.newInstance(); SHA1 s = SHA1.newInstance();
s.update(TEST2.getBytes(CHARSET)); s.update(TEST2.getBytes(UTF_8));
ObjectId s1 = ObjectId.fromRaw(s.digest()); ObjectId s1 = ObjectId.fromRaw(s.digest());
s.reset(); s.reset();
s.update(TEST2.getBytes(CHARSET)); s.update(TEST2.getBytes(UTF_8));
ObjectId s2 = s.toObjectId(); ObjectId s2 = s.toObjectId();
assertEquals(m1, s1); assertEquals(m1, s1);

6
org.eclipse.jgit/src/org/eclipse/jgit/attributes/AttributesNode.java
View File

@ -42,6 +42,8 @@
*/ */
package org.eclipse.jgit.attributes; package org.eclipse.jgit.attributes;
import static java.nio.charset.StandardCharsets.UTF_8;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
@ -50,8 +52,6 @@
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import org.eclipse.jgit.lib.Constants;
/** /**
* Represents a bundle of attributes inherited from a base directory. * Represents a bundle of attributes inherited from a base directory.
* *
@ -115,7 +115,7 @@ else if (patternEndTab == -1)
} }
private static BufferedReader asReader(InputStream in) { private static BufferedReader asReader(InputStream in) {
return new BufferedReader(new InputStreamReader(in, Constants.CHARSET)); return new BufferedReader(new InputStreamReader(in, UTF_8));
} }
/** /**

4
org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheEntry.java
View File

@ -46,6 +46,8 @@
package org.eclipse.jgit.dircache; package org.eclipse.jgit.dircache;
import static java.nio.charset.StandardCharsets.UTF_8;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.EOFException; import java.io.EOFException;
import java.io.IOException; import java.io.IOException;
@ -772,7 +774,7 @@ private static void checkPath(byte[] path) {
} }
static String toString(byte[] path) { 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) { static int getMaximumInfoLength(boolean extended) {

3
org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheTree.java
View File

@ -44,6 +44,7 @@
package org.eclipse.jgit.dircache; 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.FileMode.TREE;
import static org.eclipse.jgit.lib.TreeFormatter.entrySize; import static org.eclipse.jgit.lib.TreeFormatter.entrySize;
@ -276,7 +277,7 @@ public ObjectId getObjectId() {
*/ */
public String getNameString() { public String getNameString() {
final ByteBuffer bb = ByteBuffer.wrap(encodedName); final ByteBuffer bb = ByteBuffer.wrap(encodedName);
return Constants.CHARSET.decode(bb).toString(); return UTF_8.decode(bb).toString();
} }
/** /**

6
org.eclipse.jgit/src/org/eclipse/jgit/hooks/GitHook.java
View File

@ -42,7 +42,7 @@
*/ */
package org.eclipse.jgit.hooks; 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.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
@ -158,7 +158,7 @@ protected void doRun() throws AbortedByHookException {
PrintStream hookErrRedirect = null; PrintStream hookErrRedirect = null;
try { try {
hookErrRedirect = new PrintStream(errorByteArray, false, hookErrRedirect = new PrintStream(errorByteArray, false,
CHARSET.name()); UTF_8.name());
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// UTF-8 is guaranteed to be available // UTF-8 is guaranteed to be available
} }
@ -167,7 +167,7 @@ protected void doRun() throws AbortedByHookException {
hookErrRedirect, getStdinArgs()); hookErrRedirect, getStdinArgs());
if (result.isExecutedWithError()) { if (result.isExecutedWithError()) {
throw new AbortedByHookException( throw new AbortedByHookException(
new String(errorByteArray.toByteArray(), CHARSET), new String(errorByteArray.toByteArray(), UTF_8),
getHookName(), result.getExitCode()); getHookName(), result.getExitCode());
} }
} }

6
org.eclipse.jgit/src/org/eclipse/jgit/ignore/IgnoreNode.java
View File

@ -42,6 +42,8 @@
*/ */
package org.eclipse.jgit.ignore; package org.eclipse.jgit.ignore;
import static java.nio.charset.StandardCharsets.UTF_8;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
@ -50,8 +52,6 @@
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import org.eclipse.jgit.lib.Constants;
/** /**
* Represents a bundle of ignore rules inherited from a base directory. * Represents a bundle of ignore rules inherited from a base directory.
* *
@ -121,7 +121,7 @@ public void parse(InputStream in) throws IOException {
} }
private static BufferedReader asReader(InputStream in) { private static BufferedReader asReader(InputStream in) {
return new BufferedReader(new InputStreamReader(in, Constants.CHARSET)); return new BufferedReader(new InputStreamReader(in, UTF_8));
} }
/** /**

4
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsStreamKey.java
View File

@ -43,7 +43,7 @@
package org.eclipse.jgit.internal.storage.dfs; 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; import java.util.Arrays;
@ -67,7 +67,7 @@ public abstract class DfsStreamKey {
*/ */
public static DfsStreamKey of(DfsRepositoryDescription repo, String name, public static DfsStreamKey of(DfsRepositoryDescription repo, String name,
@Nullable PackExt ext) { @Nullable PackExt ext) {
return new ByteArrayDfsStreamKey(repo, name.getBytes(CHARSET), ext); return new ByteArrayDfsStreamKey(repo, name.getBytes(UTF_8), ext);
} }
final int hash; final int hash;

4
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GcLog.java
View File

@ -43,7 +43,7 @@
package org.eclipse.jgit.internal.storage.file; 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.File;
import java.io.IOException; import java.io.IOException;
@ -171,6 +171,6 @@ void write(String content) throws IOException {
if (content.length() > 0) { if (content.length() > 0) {
nonEmpty = true; nonEmpty = true;
} }
lock.write(content.getBytes(CHARSET)); lock.write(content.getBytes(UTF_8));
} }
} }

4
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LazyObjectIdSetFile.java
View File

@ -43,7 +43,7 @@
package org.eclipse.jgit.internal.storage.file; 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.BufferedReader;
import java.io.File; import java.io.File;
@ -86,7 +86,7 @@ public boolean contains(AnyObjectId objectId) {
private ObjectIdOwnerMap<Entry> load() { private ObjectIdOwnerMap<Entry> load() {
ObjectIdOwnerMap<Entry> r = new ObjectIdOwnerMap<>(); ObjectIdOwnerMap<Entry> r = new ObjectIdOwnerMap<>();
try (FileInputStream fin = new FileInputStream(src); try (FileInputStream fin = new FileInputStream(src);
Reader rin = new InputStreamReader(fin, CHARSET); Reader rin = new InputStreamReader(fin, UTF_8);
BufferedReader br = new BufferedReader(rin)) { BufferedReader br = new BufferedReader(rin)) {
MutableObjectId id = new MutableObjectId(); MutableObjectId id = new MutableObjectId();
for (String line; (line = br.readLine()) != null;) { for (String line; (line = br.readLine()) != null;) {

4
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java
View File

@ -46,7 +46,7 @@
package org.eclipse.jgit.internal.storage.file; 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.HEAD;
import static org.eclipse.jgit.lib.Constants.LOGS; import static org.eclipse.jgit.lib.Constants.LOGS;
import static org.eclipse.jgit.lib.Constants.OBJECT_ID_STRING_LENGTH; import static org.eclipse.jgit.lib.Constants.OBJECT_ID_STRING_LENGTH;
@ -945,7 +945,7 @@ private PackedRefList readPackedRefs() throws IOException {
try (BufferedReader br = new BufferedReader(new InputStreamReader( try (BufferedReader br = new BufferedReader(new InputStreamReader(
new DigestInputStream(new FileInputStream(packedRefsFile), new DigestInputStream(new FileInputStream(packedRefsFile),
digest), digest),
CHARSET))) { UTF_8))) {
try { try {
return new PackedRefList(parsePackedRefs(br), snapshot, return new PackedRefList(parsePackedRefs(br), snapshot,
ObjectId.fromRaw(digest.digest())); ObjectId.fromRaw(digest.digest()));

8
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/BlockReader.java
View File

@ -43,7 +43,7 @@
package org.eclipse.jgit.internal.storage.reftable; 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.BlockWriter.compare;
import static org.eclipse.jgit.internal.storage.reftable.ReftableConstants.FILE_BLOCK_TYPE; import static org.eclipse.jgit.internal.storage.reftable.ReftableConstants.FILE_BLOCK_TYPE;
import static org.eclipse.jgit.internal.storage.reftable.ReftableConstants.FILE_HEADER_LEN; import static org.eclipse.jgit.internal.storage.reftable.ReftableConstants.FILE_HEADER_LEN;
@ -138,7 +138,7 @@ String name() {
if (blockType == LOG_BLOCK_TYPE) { if (blockType == LOG_BLOCK_TYPE) {
len -= 9; len -= 9;
} }
return RawParseUtils.decode(CHARSET, nameBuf, 0, len); return RawParseUtils.decode(UTF_8, nameBuf, 0, len);
} }
boolean match(byte[] match, boolean matchIsPrefix) { boolean match(byte[] match, boolean matchIsPrefix) {
@ -171,7 +171,7 @@ long readUpdateIndexDelta() {
} }
Ref readRef() throws IOException { 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) { switch (valueType & VALUE_TYPE_MASK) {
case VALUE_NONE: // delete case VALUE_NONE: // delete
return newRef(name); return newRef(name);
@ -266,7 +266,7 @@ private ObjectId readValueId() {
private String readValueString() { private String readValueString() {
int len = readVarint32(); int len = readVarint32();
int end = ptr + len; int end = ptr + len;
String s = RawParseUtils.decode(CHARSET, buf, ptr, end); String s = RawParseUtils.decode(UTF_8, buf, ptr, end);
ptr = end; ptr = end;
return s; return s;
} }

12
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/BlockWriter.java
View File

@ -43,7 +43,7 @@
package org.eclipse.jgit.internal.storage.reftable; 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.FILE_HEADER_LEN;
import static org.eclipse.jgit.internal.storage.reftable.ReftableConstants.INDEX_BLOCK_TYPE; import static org.eclipse.jgit.internal.storage.reftable.ReftableConstants.INDEX_BLOCK_TYPE;
import static org.eclipse.jgit.internal.storage.reftable.ReftableConstants.LOG_BLOCK_TYPE; import static org.eclipse.jgit.internal.storage.reftable.ReftableConstants.LOG_BLOCK_TYPE;
@ -440,7 +440,7 @@ void writeValue(ReftableOutputStream os) throws IOException {
} }
private static byte[] nameUtf8(Ref ref) { private static byte[] nameUtf8(Ref ref) {
return ref.getName().getBytes(CHARSET); return ref.getName().getBytes(UTF_8);
} }
} }
@ -559,13 +559,13 @@ static class LogEntry extends Entry {
this.newId = newId; this.newId = newId;
this.timeSecs = who.getWhen().getTime() / 1000L; this.timeSecs = who.getWhen().getTime() / 1000L;
this.tz = (short) who.getTimeZoneOffset(); this.tz = (short) who.getTimeZoneOffset();
this.name = who.getName().getBytes(CHARSET); this.name = who.getName().getBytes(UTF_8);
this.email = who.getEmailAddress().getBytes(CHARSET); this.email = who.getEmailAddress().getBytes(UTF_8);
this.msg = message.getBytes(CHARSET); this.msg = message.getBytes(UTF_8);
} }
static byte[] key(String ref, long index) { 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); byte[] key = Arrays.copyOf(name, name.length + 1 + 8);
NB.encodeInt64(key, key.length - 8, reverseUpdateIndex(index)); NB.encodeInt64(key, key.length - 8, reverseUpdateIndex(index));
return key; return key;

4
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/ReftableOutputStream.java
View File

@ -43,7 +43,7 @@
package org.eclipse.jgit.internal.storage.reftable; 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.FILE_HEADER_LEN;
import static org.eclipse.jgit.internal.storage.reftable.ReftableConstants.INDEX_BLOCK_TYPE; import static org.eclipse.jgit.internal.storage.reftable.ReftableConstants.INDEX_BLOCK_TYPE;
import static org.eclipse.jgit.internal.storage.reftable.ReftableConstants.LOG_BLOCK_TYPE; import static org.eclipse.jgit.internal.storage.reftable.ReftableConstants.LOG_BLOCK_TYPE;
@ -160,7 +160,7 @@ void writeId(ObjectId id) {
} }
void writeVarintString(String s) { void writeVarintString(String s) {
writeVarintString(s.getBytes(CHARSET)); writeVarintString(s.getBytes(UTF_8));
} }
void writeVarintString(byte[] msg) { void writeVarintString(byte[] msg) {

8
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/ReftableReader.java
View File

@ -43,7 +43,7 @@
package org.eclipse.jgit.internal.storage.reftable; 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.BlockReader.decodeBlockLen;
import static org.eclipse.jgit.internal.storage.reftable.ReftableConstants.FILE_BLOCK_TYPE; import static org.eclipse.jgit.internal.storage.reftable.ReftableConstants.FILE_BLOCK_TYPE;
import static org.eclipse.jgit.internal.storage.reftable.ReftableConstants.FILE_FOOTER_LEN; import static org.eclipse.jgit.internal.storage.reftable.ReftableConstants.FILE_FOOTER_LEN;
@ -182,7 +182,7 @@ public RefCursor allRefs() throws IOException {
public RefCursor seekRef(String refName) throws IOException { public RefCursor seekRef(String refName) throws IOException {
initRefIndex(); initRefIndex();
byte[] key = refName.getBytes(CHARSET); byte[] key = refName.getBytes(UTF_8);
RefCursorImpl i = new RefCursorImpl(refEnd, key, false); RefCursorImpl i = new RefCursorImpl(refEnd, key, false);
i.block = seek(REF_BLOCK_TYPE, key, refIndex, 0, refEnd); i.block = seek(REF_BLOCK_TYPE, key, refIndex, 0, refEnd);
return i; return i;
@ -193,7 +193,7 @@ public RefCursor seekRef(String refName) throws IOException {
public RefCursor seekRefsWithPrefix(String prefix) throws IOException { public RefCursor seekRefsWithPrefix(String prefix) throws IOException {
initRefIndex(); initRefIndex();
byte[] key = prefix.getBytes(CHARSET); byte[] key = prefix.getBytes(UTF_8);
RefCursorImpl i = new RefCursorImpl(refEnd, key, true); RefCursorImpl i = new RefCursorImpl(refEnd, key, true);
i.block = seek(REF_BLOCK_TYPE, key, refIndex, 0, refEnd); i.block = seek(REF_BLOCK_TYPE, key, refIndex, 0, refEnd);
return i; return i;
@ -232,7 +232,7 @@ public LogCursor seekLog(String refName, long updateIndex)
initLogIndex(); initLogIndex();
if (logPosition > 0) { if (logPosition > 0) {
byte[] key = LogEntry.key(refName, updateIndex); byte[] key = LogEntry.key(refName, updateIndex);
byte[] match = refName.getBytes(CHARSET); byte[] match = refName.getBytes(UTF_8);
LogCursorImpl i = new LogCursorImpl(logEnd, match); LogCursorImpl i = new LogCursorImpl(logEnd, match);
i.block = seek(LOG_BLOCK_TYPE, key, logIndex, logPosition, logEnd); i.block = seek(LOG_BLOCK_TYPE, key, logIndex, logPosition, logEnd);
return i; return i;

4
org.eclipse.jgit/src/org/eclipse/jgit/lib/BlobBasedConfig.java
View File

@ -45,7 +45,7 @@
package org.eclipse.jgit.lib; 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.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
@ -83,7 +83,7 @@ public BlobBasedConfig(Config base, byte[] blob)
super(base); super(base);
final String decoded; final String decoded;
if (isUtf8(blob)) { if (isUtf8(blob)) {
decoded = RawParseUtils.decode(CHARSET, blob, 3, blob.length); decoded = RawParseUtils.decode(UTF_8, blob, 3, blob.length);
} else { } else {
decoded = RawParseUtils.decode(blob); decoded = RawParseUtils.decode(blob);
} }

8
org.eclipse.jgit/src/org/eclipse/jgit/lib/CommitBuilder.java
View File

@ -45,6 +45,8 @@
package org.eclipse.jgit.lib; package org.eclipse.jgit.lib;
import static java.nio.charset.StandardCharsets.UTF_8;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStreamWriter; import java.io.OutputStreamWriter;
@ -93,7 +95,7 @@ public class CommitBuilder {
*/ */
public CommitBuilder() { public CommitBuilder() {
parentIds = EMPTY_OBJECTID_LIST; parentIds = EMPTY_OBJECTID_LIST;
encoding = Constants.CHARSET; encoding = UTF_8;
} }
/** /**
@ -314,7 +316,7 @@ public byte[] build() throws UnsupportedEncodingException {
w.flush(); w.flush();
os.write('\n'); os.write('\n');
if (getEncoding() != Constants.CHARSET) { if (getEncoding() != UTF_8) {
os.write(hencoding); os.write(hencoding);
os.write(' '); os.write(' ');
os.write(Constants.encodeASCII(getEncoding().name())); os.write(Constants.encodeASCII(getEncoding().name()));
@ -375,7 +377,7 @@ public String toString() {
r.append(committer != null ? committer.toString() : "NOT_SET"); r.append(committer != null ? committer.toString() : "NOT_SET");
r.append("\n"); r.append("\n");
if (encoding != null && encoding != Constants.CHARSET) { if (encoding != null && encoding != UTF_8) {
r.append("encoding "); r.append("encoding ");
r.append(encoding.name()); r.append(encoding.name());
r.append("\n"); r.append("\n");

4
org.eclipse.jgit/src/org/eclipse/jgit/lib/Config.java
View File

@ -51,7 +51,7 @@
package org.eclipse.jgit.lib; 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.text.MessageFormat;
import java.util.ArrayList; import java.util.ArrayList;
@ -1168,7 +1168,7 @@ private void addIncludedConfig(final List<ConfigLine> newEntries,
String decoded; String decoded;
if (isUtf8(bytes)) { if (isUtf8(bytes)) {
decoded = RawParseUtils.decode(CHARSET, bytes, 3, bytes.length); decoded = RawParseUtils.decode(UTF_8, bytes, 3, bytes.length);
} else { } else {
decoded = RawParseUtils.decode(bytes); decoded = RawParseUtils.decode(bytes);
} }

12
org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java
View File

@ -227,7 +227,13 @@ public final class Constants {
*/ */
public static final byte[] PACK_SIGNATURE = { 'P', 'A', 'C', 'K' }; 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; public static final Charset CHARSET;
/** Native character encoding for commit messages, file names... */ /** Native character encoding for commit messages, file names... */
@ -638,7 +644,7 @@ public static byte[] encodeASCII(String s) {
* @see #CHARACTER_ENCODING * @see #CHARACTER_ENCODING
*/ */
public static byte[] encode(String str) { 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(); final int len = bb.limit();
if (bb.hasArray() && bb.arrayOffset() == 0) { if (bb.hasArray() && bb.arrayOffset() == 0) {
final byte[] arr = bb.array(); final byte[] arr = bb.array();
@ -655,7 +661,7 @@ public static byte[] encode(String str) {
if (OBJECT_ID_LENGTH != newMessageDigest().getDigestLength()) if (OBJECT_ID_LENGTH != newMessageDigest().getDigestLength())
throw new LinkageError(JGitText.get().incorrectOBJECT_ID_LENGTH); throw new LinkageError(JGitText.get().incorrectOBJECT_ID_LENGTH);
CHARSET = UTF_8; CHARSET = UTF_8;
CHARACTER_ENCODING = CHARSET.name(); CHARACTER_ENCODING = UTF_8.name();
} }
/** name of the file containing the commit msg for a merge commit */ /** name of the file containing the commit msg for a merge commit */

6
org.eclipse.jgit/src/org/eclipse/jgit/lib/RebaseTodoFile.java
View File

@ -43,7 +43,7 @@
package org.eclipse.jgit.lib; 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.BufferedOutputStream;
import java.io.File; import java.io.File;
@ -183,7 +183,7 @@ private static RebaseTodoLine parseLine(byte[] buf, int tokenBegin,
switch (tokenCount) { switch (tokenCount) {
case 0: case 0:
String actionToken = new String(buf, tokenBegin, String actionToken = new String(buf, tokenBegin,
nextSpace - tokenBegin - 1, CHARSET); nextSpace - tokenBegin - 1, UTF_8);
tokenBegin = nextSpace; tokenBegin = nextSpace;
action = RebaseTodoLine.Action.parse(actionToken); action = RebaseTodoLine.Action.parse(actionToken);
if (action == null) if (action == null)
@ -192,7 +192,7 @@ private static RebaseTodoLine parseLine(byte[] buf, int tokenBegin,
case 1: case 1:
nextSpace = RawParseUtils.next(buf, tokenBegin, ' '); nextSpace = RawParseUtils.next(buf, tokenBegin, ' ');
String commitToken = new String(buf, tokenBegin, String commitToken = new String(buf, tokenBegin,
nextSpace - tokenBegin - 1, CHARSET); nextSpace - tokenBegin - 1, UTF_8);
tokenBegin = nextSpace; tokenBegin = nextSpace;
commit = AbbreviatedObjectId.fromString(commitToken); commit = AbbreviatedObjectId.fromString(commitToken);
break; break;

4
org.eclipse.jgit/src/org/eclipse/jgit/lib/TagBuilder.java
View File

@ -45,6 +45,8 @@
package org.eclipse.jgit.lib; package org.eclipse.jgit.lib;
import static java.nio.charset.StandardCharsets.UTF_8;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStreamWriter; import java.io.OutputStreamWriter;
@ -181,7 +183,7 @@ public void setMessage(String newMessage) {
public byte[] build() { public byte[] build() {
ByteArrayOutputStream os = new ByteArrayOutputStream(); ByteArrayOutputStream os = new ByteArrayOutputStream();
try (OutputStreamWriter w = new OutputStreamWriter(os, try (OutputStreamWriter w = new OutputStreamWriter(os,
Constants.CHARSET)) { UTF_8)) {
w.write("object "); //$NON-NLS-1$ w.write("object "); //$NON-NLS-1$
getObjectId().copyTo(w); getObjectId().copyTo(w);
w.write('\n'); w.write('\n');

4
org.eclipse.jgit/src/org/eclipse/jgit/lib/TextProgressMonitor.java
View File

@ -44,7 +44,7 @@
package org.eclipse.jgit.lib; 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.IOException;
import java.io.OutputStreamWriter; import java.io.OutputStreamWriter;
@ -63,7 +63,7 @@ public class TextProgressMonitor extends BatchingProgressMonitor {
* Initialize a new progress monitor. * Initialize a new progress monitor.
*/ */
public TextProgressMonitor() { public TextProgressMonitor() {
this(new PrintWriter(new OutputStreamWriter(System.err, CHARSET))); this(new PrintWriter(new OutputStreamWriter(System.err, UTF_8)));
} }
/** /**

18
org.eclipse.jgit/src/org/eclipse/jgit/patch/FileHeader.java
View File

@ -43,6 +43,7 @@
package org.eclipse.jgit.patch; 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.lib.Constants.encodeASCII;
import static org.eclipse.jgit.util.RawParseUtils.decode; import static org.eclipse.jgit.util.RawParseUtils.decode;
import static org.eclipse.jgit.util.RawParseUtils.decodeNoFallback; import static org.eclipse.jgit.util.RawParseUtils.decodeNoFallback;
@ -63,7 +64,6 @@
import org.eclipse.jgit.diff.EditList; import org.eclipse.jgit.diff.EditList;
import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.internal.JGitText;
import org.eclipse.jgit.lib.AbbreviatedObjectId; import org.eclipse.jgit.lib.AbbreviatedObjectId;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.FileMode; import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.util.QuotedString; import org.eclipse.jgit.util.QuotedString;
import org.eclipse.jgit.util.RawParseUtils; import org.eclipse.jgit.util.RawParseUtils;
@ -198,7 +198,7 @@ public int getEndOffset() {
* Convert the patch script for this file into a string. * Convert the patch script for this file into a string.
* <p> * <p>
* The default character encoding * 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. * old and new files.
* *
* @return the patch script, as a Unicode string. * @return the patch script, as a Unicode string.
@ -240,8 +240,9 @@ String getScriptText(Charset[] charsetGuess) {
if (trySimpleConversion(charsetGuess)) { if (trySimpleConversion(charsetGuess)) {
Charset cs = charsetGuess != null ? charsetGuess[0] : null; Charset cs = charsetGuess != null ? charsetGuess[0] : null;
if (cs == null) if (cs == null) {
cs = Constants.CHARSET; cs = UTF_8;
}
try { try {
return decodeNoFallback(cs, buf, startOffset, endOffset); return decodeNoFallback(cs, buf, startOffset, endOffset);
} catch (CharacterCodingException cee) { } catch (CharacterCodingException cee) {
@ -290,8 +291,9 @@ private String[] extractFileLines(Charset[] csGuess) {
final String[] r = new String[tmp.length]; final String[] r = new String[tmp.length];
for (int i = 0; i < tmp.length; i++) { for (int i = 0; i < tmp.length; i++) {
Charset cs = csGuess != null ? csGuess[i] : null; Charset cs = csGuess != null ? csGuess[i] : null;
if (cs == null) if (cs == null) {
cs = Constants.CHARSET; cs = UTF_8;
}
r[i] = RawParseUtils.decode(cs, tmp[i].toByteArray()); r[i] = RawParseUtils.decode(cs, tmp[i].toByteArray());
} }
return r; return r;
@ -429,7 +431,7 @@ int parseGitFileName(int ptr, int end) {
oldPath = QuotedString.GIT_PATH.dequote(buf, bol, sp - 1); oldPath = QuotedString.GIT_PATH.dequote(buf, bol, sp - 1);
oldPath = p1(oldPath); oldPath = p1(oldPath);
} else { } else {
oldPath = decode(Constants.CHARSET, buf, aStart, sp - 1); oldPath = decode(UTF_8, buf, aStart, sp - 1);
} }
newPath = oldPath; newPath = oldPath;
return eol; return eol;
@ -572,7 +574,7 @@ private String parseName(String expect, int ptr, int end) {
tab--; tab--;
if (ptr == tab) if (ptr == tab)
tab = end; tab = end;
r = decode(Constants.CHARSET, buf, ptr, tab - 1); r = decode(UTF_8, buf, ptr, tab - 1);
} }
if (r.equals(DEV_NULL)) if (r.equals(DEV_NULL))

5
org.eclipse.jgit/src/org/eclipse/jgit/patch/FormatError.java
View File

@ -43,9 +43,10 @@
package org.eclipse.jgit.patch; package org.eclipse.jgit.patch;
import static java.nio.charset.StandardCharsets.UTF_8;
import java.util.Locale; import java.util.Locale;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.util.RawParseUtils; import org.eclipse.jgit.util.RawParseUtils;
/** /**
@ -120,7 +121,7 @@ public int getOffset() {
*/ */
public String getLineText() { public String getLineText() {
final int eol = RawParseUtils.nextLF(buf, offset); final int eol = RawParseUtils.nextLF(buf, offset);
return RawParseUtils.decode(Constants.CHARSET, buf, offset, eol); return RawParseUtils.decode(UTF_8, buf, offset, eol);
} }
/** {@inheritDoc} */ /** {@inheritDoc} */

4
org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommit.java
View File

@ -44,7 +44,7 @@
package org.eclipse.jgit.revwalk; 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.io.IOException;
import java.nio.charset.Charset; import java.nio.charset.Charset;
@ -541,7 +541,7 @@ private Charset guessEncoding() {
try { try {
return getEncoding(); return getEncoding();
} catch (IllegalCharsetNameException | UnsupportedCharsetException e) { } catch (IllegalCharsetNameException | UnsupportedCharsetException e) {
return CHARSET; return UTF_8;
} }
} }

6
org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevTag.java
View File

@ -45,7 +45,7 @@
package org.eclipse.jgit.revwalk; 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.io.IOException;
import java.nio.charset.Charset; import java.nio.charset.Charset;
@ -169,7 +169,7 @@ void parseCanonical(RevWalk walk, byte[] rawTag)
int p = pos.value += 4; // "tag " int p = pos.value += 4; // "tag "
final int nameEnd = RawParseUtils.nextLF(rawTag, p) - 1; 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()) if (walk.isRetainBody())
buffer = rawTag; buffer = rawTag;
@ -257,7 +257,7 @@ private Charset guessEncoding() {
try { try {
return RawParseUtils.parseEncoding(buffer); return RawParseUtils.parseEncoding(buffer);
} catch (IllegalCharsetNameException | UnsupportedCharsetException e) { } catch (IllegalCharsetNameException | UnsupportedCharsetException e) {
return CHARSET; return UTF_8;
} }
} }

6
org.eclipse.jgit/src/org/eclipse/jgit/storage/file/FileBasedConfig.java
View File

@ -49,7 +49,7 @@
package org.eclipse.jgit.storage.file; 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.ByteArrayOutputStream;
import java.io.File; import java.io.File;
@ -166,7 +166,7 @@ public void load() throws IOException, ConfigInvalidException {
} else { } else {
final String decoded; final String decoded;
if (isUtf8(in)) { if (isUtf8(in)) {
decoded = RawParseUtils.decode(CHARSET, decoded = RawParseUtils.decode(UTF_8,
in, 3, in.length); in, 3, in.length);
utf8Bom = true; utf8Bom = true;
} else { } else {
@ -224,7 +224,7 @@ public void save() throws IOException {
bos.write(0xEF); bos.write(0xEF);
bos.write(0xBB); bos.write(0xBB);
bos.write(0xBF); bos.write(0xBF);
bos.write(text.getBytes(CHARSET)); bos.write(text.getBytes(UTF_8));
out = bos.toByteArray(); out = bos.toByteArray();
} else { } else {
out = Constants.encode(text); out = Constants.encode(text);

4
org.eclipse.jgit/src/org/eclipse/jgit/transport/AmazonS3.java
View File

@ -43,7 +43,7 @@
package org.eclipse.jgit.transport; 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.ByteArrayOutputStream;
import java.io.File; import java.io.File;
@ -635,7 +635,7 @@ void authorize(HttpURLConnection c) throws IOException {
try { try {
final Mac m = Mac.getInstance(HMAC); final Mac m = Mac.getInstance(HMAC);
m.init(privateKey); 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) { } catch (NoSuchAlgorithmException e) {
throw new IOException(MessageFormat.format(JGitText.get().noHMACsupport, HMAC, e.getMessage())); throw new IOException(MessageFormat.format(JGitText.get().noHMACsupport, HMAC, e.getMessage()));
} catch (InvalidKeyException e) { } catch (InvalidKeyException e) {

5
org.eclipse.jgit/src/org/eclipse/jgit/transport/BundleFetchConnection.java
View File

@ -47,6 +47,8 @@
package org.eclipse.jgit.transport; package org.eclipse.jgit.transport;
import static java.nio.charset.StandardCharsets.UTF_8;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
@ -66,7 +68,6 @@
import org.eclipse.jgit.errors.TransportException; import org.eclipse.jgit.errors.TransportException;
import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.internal.JGitText;
import org.eclipse.jgit.internal.storage.file.PackLock; 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.NullProgressMonitor;
import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.ObjectIdRef; import org.eclipse.jgit.lib.ObjectIdRef;
@ -173,7 +174,7 @@ private String readLine(byte[] hdrbuf) throws IOException {
IO.skipFully(bin, 1); IO.skipFully(bin, 1);
done = true; done = true;
} }
line.append(RawParseUtils.decode(Constants.CHARSET, hdrbuf, 0, lf)); line.append(RawParseUtils.decode(UTF_8, hdrbuf, 0, lf));
} }
return line.toString(); return line.toString();
} }

4
org.eclipse.jgit/src/org/eclipse/jgit/transport/BundleWriter.java
View File

@ -43,6 +43,8 @@
package org.eclipse.jgit.transport; package org.eclipse.jgit.transport;
import static java.nio.charset.StandardCharsets.UTF_8;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.OutputStreamWriter; import java.io.OutputStreamWriter;
@ -231,7 +233,7 @@ public void writeBundle(ProgressMonitor monitor, OutputStream os)
packWriter.setTagTargets(tagTargets); packWriter.setTagTargets(tagTargets);
packWriter.preparePack(monitor, inc, exc); 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(TransportBundle.V2_BUNDLE_SIGNATURE);
w.write('\n'); w.write('\n');

4
org.eclipse.jgit/src/org/eclipse/jgit/transport/HMACSHA1NonceGenerator.java
View File

@ -43,7 +43,7 @@
package org.eclipse.jgit.transport; package org.eclipse.jgit.transport;
import static java.nio.charset.StandardCharsets.ISO_8859_1; 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.io.File;
import java.security.InvalidKeyException; import java.security.InvalidKeyException;
@ -102,7 +102,7 @@ public synchronized String createNonce(Repository repo, long timestamp)
} }
String input = path + ":" + String.valueOf(timestamp); //$NON-NLS-1$ 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$ return Long.toString(timestamp) + "-" + toHex(rawHmac); //$NON-NLS-1$
} }

10
org.eclipse.jgit/src/org/eclipse/jgit/transport/HttpAuthMethod.java
View File

@ -43,7 +43,7 @@
package org.eclipse.jgit.transport; 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_AUTHORIZATION;
import static org.eclipse.jgit.util.HttpSupport.HDR_WWW_AUTHENTICATE; import static org.eclipse.jgit.util.HttpSupport.HDR_WWW_AUTHENTICATE;
@ -315,7 +315,7 @@ void authorize(String username, String password) {
@Override @Override
void configureRequest(HttpConnection conn) throws IOException { void configureRequest(HttpConnection conn) throws IOException {
String ident = user + ":" + pass; //$NON-NLS-1$ 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() conn.setRequestProperty(HDR_AUTHORIZATION, type.getSchemeName()
+ " " + enc); //$NON-NLS-1$ + " " + enc); //$NON-NLS-1$
} }
@ -430,15 +430,15 @@ private static String uri(URL u) {
private static String H(String data) { private static String H(String data) {
MessageDigest md = newMD5(); MessageDigest md = newMD5();
md.update(data.getBytes(CHARSET)); md.update(data.getBytes(UTF_8));
return LHEX(md.digest()); return LHEX(md.digest());
} }
private static String KD(String secret, String data) { private static String KD(String secret, String data) {
MessageDigest md = newMD5(); MessageDigest md = newMD5();
md.update(secret.getBytes(CHARSET)); md.update(secret.getBytes(UTF_8));
md.update((byte) ':'); md.update((byte) ':');
md.update(data.getBytes(CHARSET)); md.update(data.getBytes(UTF_8));
return LHEX(md.digest()); return LHEX(md.digest());
} }

7
org.eclipse.jgit/src/org/eclipse/jgit/transport/PacketLineIn.java
View File

@ -45,13 +45,14 @@
package org.eclipse.jgit.transport; package org.eclipse.jgit.transport;
import static java.nio.charset.StandardCharsets.UTF_8;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.text.MessageFormat; import java.text.MessageFormat;
import org.eclipse.jgit.errors.PackProtocolException; import org.eclipse.jgit.errors.PackProtocolException;
import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.internal.JGitText;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.MutableObjectId; import org.eclipse.jgit.lib.MutableObjectId;
import org.eclipse.jgit.util.IO; import org.eclipse.jgit.util.IO;
import org.eclipse.jgit.util.RawParseUtils; import org.eclipse.jgit.util.RawParseUtils;
@ -186,7 +187,7 @@ public String readString() throws IOException {
if (raw[len - 1] == '\n') if (raw[len - 1] == '\n')
len--; 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$ log.debug("git< " + s); //$NON-NLS-1$
return s; return s;
} }
@ -218,7 +219,7 @@ public String readStringRaw() throws IOException {
IO.readFully(in, raw, 0, len); 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$ log.debug("git< " + s); //$NON-NLS-1$
return s; return s;
} }

4
org.eclipse.jgit/src/org/eclipse/jgit/transport/PacketLineOut.java
View File

@ -45,6 +45,8 @@
package org.eclipse.jgit.transport; package org.eclipse.jgit.transport;
import static java.nio.charset.StandardCharsets.UTF_8;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
@ -141,7 +143,7 @@ public void writePacket(byte[] buf, int pos, int len) throws IOException {
out.write(lenbuffer, 0, 4); out.write(lenbuffer, 0, 4);
out.write(buf, pos, len); out.write(buf, pos, len);
if (log.isDebugEnabled()) { 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$ log.debug("git> " + s); //$NON-NLS-1$
} }
} }

4
org.eclipse.jgit/src/org/eclipse/jgit/transport/ProgressSpinner.java
View File

@ -43,7 +43,7 @@
package org.eclipse.jgit.transport; 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.IOException;
import java.io.OutputStream; import java.io.OutputStream;
@ -141,7 +141,7 @@ public void endTask(String result) {
private void write(String s) { private void write(String s) {
if (write) { if (write) {
try { try {
out.write(s.getBytes(CHARSET)); out.write(s.getBytes(UTF_8));
out.flush(); out.flush();
} catch (IOException e) { } catch (IOException e) {
write = false; write = false;

6
org.eclipse.jgit/src/org/eclipse/jgit/transport/PushCertificateIdent.java
View File

@ -43,7 +43,7 @@
package org.eclipse.jgit.transport; 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 static org.eclipse.jgit.util.RawParseUtils.lastIndexOfTrim;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
@ -95,7 +95,7 @@ public class PushCertificateIdent {
*/ */
public static PushCertificateIdent parse(String str) { public static PushCertificateIdent parse(String str) {
MutableInteger p = new MutableInteger(); MutableInteger p = new MutableInteger();
byte[] raw = str.getBytes(CHARSET); byte[] raw = str.getBytes(UTF_8);
int tzBegin = raw.length - 1; int tzBegin = raw.length - 1;
tzBegin = lastIndexOfTrim(raw, ' ', tzBegin); tzBegin = lastIndexOfTrim(raw, ' ', tzBegin);
if (tzBegin < 0 || raw[tzBegin] != ' ') { if (tzBegin < 0 || raw[tzBegin] != ' ') {
@ -129,7 +129,7 @@ public static PushCertificateIdent parse(String str) {
idEnd = raw.length; 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); return new PushCertificateIdent(str, id, when * 1000L, tz);
} }

7
org.eclipse.jgit/src/org/eclipse/jgit/transport/PushCertificateStore.java
View File

@ -43,7 +43,7 @@
package org.eclipse.jgit.transport; 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_BLOB;
import static org.eclipse.jgit.lib.Constants.OBJ_COMMIT; import static org.eclipse.jgit.lib.Constants.OBJ_COMMIT;
import static org.eclipse.jgit.lib.FileMode.TYPE_FILE; import static org.eclipse.jgit.lib.FileMode.TYPE_FILE;
@ -292,7 +292,8 @@ static PushCertificate read(TreeWalk tw) throws IOException {
ObjectLoader loader = ObjectLoader loader =
tw.getObjectReader().open(tw.getObjectId(0), OBJ_BLOB); tw.getObjectReader().open(tw.getObjectId(0), OBJ_BLOB);
try (InputStream in = loader.openStream(); 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); return PushCertificateParser.fromReader(r);
} }
} }
@ -473,7 +474,7 @@ private ObjectId saveCert(ObjectInserter inserter, DirCache dc,
DirCacheEditor editor = dc.editor(); DirCacheEditor editor = dc.editor();
String certText = pc.cert.toText() + pc.cert.getSignature(); 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; boolean any = false;
for (ReceiveCommand cmd : pc.cert.getCommands()) { for (ReceiveCommand cmd : pc.cert.getCommands()) {
if (byRef != null && !commandsEqual(cmd, byRef.get(cmd.getRefName()))) { if (byRef != null && !commandsEqual(cmd, byRef.get(cmd.getRefName()))) {

4
org.eclipse.jgit/src/org/eclipse/jgit/transport/RefAdvertiser.java
View File

@ -43,7 +43,7 @@
package org.eclipse.jgit.transport; 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.lib.Constants.OBJECT_ID_STRING_LENGTH;
import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_SYMREF; import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_SYMREF;
@ -74,7 +74,7 @@
public abstract class RefAdvertiser { public abstract class RefAdvertiser {
/** Advertiser which frames lines in a {@link PacketLineOut} format. */ /** Advertiser which frames lines in a {@link PacketLineOut} format. */
public static class PacketLineOutRefAdvertiser extends RefAdvertiser { public static class PacketLineOutRefAdvertiser extends RefAdvertiser {
private final CharsetEncoder utf8 = CHARSET.newEncoder(); private final CharsetEncoder utf8 = UTF_8.newEncoder();
private final PacketLineOut pckOut; private final PacketLineOut pckOut;
private byte[] binArr = new byte[256]; private byte[] binArr = new byte[256];

4
org.eclipse.jgit/src/org/eclipse/jgit/transport/SideBandInputStream.java
View File

@ -44,6 +44,7 @@
package org.eclipse.jgit.transport; package org.eclipse.jgit.transport;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.eclipse.jgit.transport.SideBandOutputStream.HDR_SIZE; import static org.eclipse.jgit.transport.SideBandOutputStream.HDR_SIZE;
import java.io.IOException; import java.io.IOException;
@ -57,7 +58,6 @@
import org.eclipse.jgit.errors.PackProtocolException; import org.eclipse.jgit.errors.PackProtocolException;
import org.eclipse.jgit.errors.TransportException; import org.eclipse.jgit.errors.TransportException;
import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.internal.JGitText;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.ProgressMonitor; import org.eclipse.jgit.lib.ProgressMonitor;
import org.eclipse.jgit.util.IO; import org.eclipse.jgit.util.IO;
import org.eclipse.jgit.util.RawParseUtils; import org.eclipse.jgit.util.RawParseUtils;
@ -257,6 +257,6 @@ private static String remote(String msg) {
private String readString(int len) throws IOException { private String readString(int len) throws IOException {
final byte[] raw = new byte[len]; final byte[] raw = new byte[len];
IO.readFully(rawIn, raw, 0, len); IO.readFully(rawIn, raw, 0, len);
return RawParseUtils.decode(Constants.CHARSET, raw, 0, len); return RawParseUtils.decode(UTF_8, raw, 0, len);
} }
} }

4
org.eclipse.jgit/src/org/eclipse/jgit/transport/Transport.java
View File

@ -46,7 +46,7 @@
package org.eclipse.jgit.transport; 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.BufferedReader;
import java.io.IOException; import java.io.IOException;
@ -144,7 +144,7 @@ private static Enumeration<URL> catalogs(ClassLoader ldr) {
private static void scan(ClassLoader ldr, URL url) { private static void scan(ClassLoader ldr, URL url) {
try (BufferedReader br = new BufferedReader( try (BufferedReader br = new BufferedReader(
new InputStreamReader(url.openStream(), CHARSET))) { new InputStreamReader(url.openStream(), UTF_8))) {
String line; String line;
while ((line = br.readLine()) != null) { while ((line = br.readLine()) != null) {
line = line.trim(); line = line.trim();

5
org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportHttp.java
View File

@ -46,6 +46,7 @@
package org.eclipse.jgit.transport; 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.lib.Constants.HEAD;
import static org.eclipse.jgit.util.HttpSupport.ENCODING_GZIP; import static org.eclipse.jgit.util.HttpSupport.ENCODING_GZIP;
import static org.eclipse.jgit.util.HttpSupport.ENCODING_X_GZIP; import static org.eclipse.jgit.util.HttpSupport.ENCODING_X_GZIP;
@ -426,7 +427,7 @@ private WalkFetchConnection newDumbConnection(InputStream in)
} }
private BufferedReader toBufferedReader(InputStream in) { private BufferedReader toBufferedReader(InputStream in) {
return new BufferedReader(new InputStreamReader(in, Constants.CHARSET)); return new BufferedReader(new InputStreamReader(in, UTF_8));
} }
/** {@inheritDoc} */ /** {@inheritDoc} */
@ -952,7 +953,7 @@ BufferedReader openReader(String path) throws IOException {
// Line oriented readable content is likely to compress well. // Line oriented readable content is likely to compress well.
// Request gzip encoding. // Request gzip encoding.
InputStream is = open(path, AcceptEncoding.GZIP).in; InputStream is = open(path, AcceptEncoding.GZIP).in;
return new BufferedReader(new InputStreamReader(is, Constants.CHARSET)); return new BufferedReader(new InputStreamReader(is, UTF_8));
} }
@Override @Override

4
org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkRemoteObjectDatabase.java
View File

@ -43,6 +43,8 @@
package org.eclipse.jgit.transport; package org.eclipse.jgit.transport;
import static java.nio.charset.StandardCharsets.UTF_8;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
@ -363,7 +365,7 @@ void writeInfoPacks(Collection<String> packNames) throws IOException {
*/ */
BufferedReader openReader(String path) throws IOException { BufferedReader openReader(String path) throws IOException {
final InputStream is = open(path).in; final InputStream is = open(path).in;
return new BufferedReader(new InputStreamReader(is, Constants.CHARSET)); return new BufferedReader(new InputStreamReader(is, UTF_8));
} }
/** /**

4
org.eclipse.jgit/src/org/eclipse/jgit/treewalk/AbstractTreeIterator.java
View File

@ -45,6 +45,8 @@
package org.eclipse.jgit.treewalk; package org.eclipse.jgit.treewalk;
import static java.nio.charset.StandardCharsets.UTF_8;
import java.io.IOException; import java.io.IOException;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.CharBuffer; import java.nio.CharBuffer;
@ -182,7 +184,7 @@ protected AbstractTreeIterator(String prefix) {
if (prefix != null && prefix.length() > 0) { if (prefix != null && prefix.length() > 0) {
final ByteBuffer b; final ByteBuffer b;
b = Constants.CHARSET.encode(CharBuffer.wrap(prefix)); b = UTF_8.encode(CharBuffer.wrap(prefix));
pathLen = b.limit(); pathLen = b.limit();
path = new byte[Math.max(DEFAULT_PATH_SIZE, pathLen + 1)]; path = new byte[Math.max(DEFAULT_PATH_SIZE, pathLen + 1)];
b.get(path, 0, pathLen); b.get(path, 0, pathLen);

8
org.eclipse.jgit/src/org/eclipse/jgit/treewalk/TreeWalk.java
View File

@ -44,6 +44,8 @@
package org.eclipse.jgit.treewalk; package org.eclipse.jgit.treewalk;
import static java.nio.charset.StandardCharsets.UTF_8;
import java.io.IOException; import java.io.IOException;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -1045,7 +1047,7 @@ public String getNameString() {
final AbstractTreeIterator t = currentHead; final AbstractTreeIterator t = currentHead;
final int off = t.pathOffset; final int off = t.pathOffset;
final int end = t.pathLen; 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 @@ private CanonicalTreeParser parserFor(AnyObjectId id)
} }
static String pathOf(AbstractTreeIterator t) { 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) { 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);
} }
/** /**

4
org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java
View File

@ -46,6 +46,8 @@
package org.eclipse.jgit.treewalk; package org.eclipse.jgit.treewalk;
import static java.nio.charset.StandardCharsets.UTF_8;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
@ -1413,7 +1415,7 @@ private static final class IteratorState {
IteratorState(WorkingTreeOptions options) { IteratorState(WorkingTreeOptions options) {
this.options = options; this.options = options;
this.nameEncoder = Constants.CHARSET.newEncoder(); this.nameEncoder = UTF_8.newEncoder();
} }
void initializeReadBuffer() { void initializeReadBuffer() {

Some files were not shown because too many files have changed in this diff Show More