Deprecate Constants.CHARACTER_ENCODING in favor of StandardCharsets.UTF_8
Change-Id: I621ba174235a6fb56236e54d24bce704bb5afb28 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
This commit is contained in:
parent
f5d7f93b52
commit
fbf6ce65ba
|
@ -42,7 +42,7 @@
|
|||
*/
|
||||
package org.eclipse.jgit.archive;
|
||||
|
||||
import static org.eclipse.jgit.lib.Constants.CHARACTER_ENCODING;
|
||||
import static java.nio.charset.StandardCharsets.UTF_8;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.OutputStream;
|
||||
|
@ -85,7 +85,7 @@ public ArchiveOutputStream createArchiveOutputStream(OutputStream s)
|
|||
public ArchiveOutputStream createArchiveOutputStream(OutputStream s,
|
||||
Map<String, Object> o) throws IOException {
|
||||
TarArchiveOutputStream out = new TarArchiveOutputStream(s,
|
||||
CHARACTER_ENCODING);
|
||||
UTF_8.name());
|
||||
out.setLongFileMode(TarArchiveOutputStream.LONGFILE_POSIX);
|
||||
out.setBigNumberMode(TarArchiveOutputStream.BIGNUMBER_POSIX);
|
||||
return applyFormatOptions(out, o);
|
||||
|
@ -99,8 +99,7 @@ public void putEntry(ArchiveOutputStream out,
|
|||
if (mode == FileMode.SYMLINK) {
|
||||
final TarArchiveEntry entry = new TarArchiveEntry(
|
||||
path, TarConstants.LF_SYMLINK);
|
||||
entry.setLinkName(new String(
|
||||
loader.getCachedBytes(100), CHARACTER_ENCODING));
|
||||
entry.setLinkName(new String(loader.getCachedBytes(100), UTF_8));
|
||||
out.putArchiveEntry(entry);
|
||||
out.closeArchiveEntry();
|
||||
return;
|
||||
|
|
|
@ -69,7 +69,7 @@ public void doGet(final HttpServletRequest req,
|
|||
// Assume a dumb client and send back the dumb client
|
||||
// version of the info/refs file.
|
||||
rsp.setContentType(HttpSupport.TEXT_PLAIN);
|
||||
rsp.setCharacterEncoding(Constants.CHARACTER_ENCODING);
|
||||
rsp.setCharacterEncoding(UTF_8.name());
|
||||
|
||||
final Repository db = getRepository(req);
|
||||
try (OutputStreamWriter out = new OutputStreamWriter(
|
||||
|
|
|
@ -43,6 +43,7 @@
|
|||
|
||||
package org.eclipse.jgit.http.server;
|
||||
|
||||
import static java.nio.charset.StandardCharsets.UTF_8;
|
||||
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.HDR_ACCEPT_ENCODING;
|
||||
|
@ -191,9 +192,9 @@ public static void consumeRequestBody(InputStream in) {
|
|||
public static void sendPlainText(final String content,
|
||||
final HttpServletRequest req, final HttpServletResponse rsp)
|
||||
throws IOException {
|
||||
final byte[] raw = content.getBytes(Constants.CHARACTER_ENCODING);
|
||||
final byte[] raw = content.getBytes(UTF_8);
|
||||
rsp.setContentType(TEXT_PLAIN);
|
||||
rsp.setCharacterEncoding(Constants.CHARACTER_ENCODING);
|
||||
rsp.setCharacterEncoding(UTF_8.name());
|
||||
send(raw, req, rsp);
|
||||
}
|
||||
|
||||
|
|
|
@ -266,7 +266,7 @@ public void doFilter(ServletRequest request,
|
|||
throws IOException, ServletException {
|
||||
final HttpServletResponse r = (HttpServletResponse) response;
|
||||
r.setContentType("text/plain");
|
||||
r.setCharacterEncoding(Constants.CHARACTER_ENCODING);
|
||||
r.setCharacterEncoding(UTF_8.name());
|
||||
try (PrintWriter w = r.getWriter()) {
|
||||
w.print("OK");
|
||||
}
|
||||
|
|
|
@ -43,7 +43,7 @@
|
|||
|
||||
package org.eclipse.jgit.lfs.lib;
|
||||
|
||||
import static org.eclipse.jgit.lib.Constants.CHARACTER_ENCODING;
|
||||
import static java.nio.charset.StandardCharsets.UTF_8;
|
||||
import static org.junit.Assert.assertEquals;
|
||||
|
||||
import java.io.ByteArrayOutputStream;
|
||||
|
@ -66,7 +66,7 @@ public void testEncoding() throws IOException {
|
|||
assertEquals(
|
||||
"version https://git-lfs.github.com/spec/v1\noid sha256:"
|
||||
+ s + "\nsize 4\n",
|
||||
baos.toString(CHARACTER_ENCODING));
|
||||
baos.toString(UTF_8.name()));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -37,6 +37,7 @@
|
|||
*/
|
||||
package org.eclipse.jgit.pgm;
|
||||
|
||||
import static java.nio.charset.StandardCharsets.UTF_8;
|
||||
import static org.junit.Assert.assertEquals;
|
||||
|
||||
import java.io.ByteArrayOutputStream;
|
||||
|
@ -47,7 +48,6 @@
|
|||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.eclipse.jgit.lib.Constants;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
|
@ -204,7 +204,7 @@ private static String getOutput(Process p)
|
|||
while ((length = inputStream.read(buffer)) != -1) {
|
||||
result.write(buffer, 0, length);
|
||||
}
|
||||
return result.toString(Constants.CHARACTER_ENCODING);
|
||||
return result.toString(UTF_8.name());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -42,6 +42,7 @@
|
|||
*/
|
||||
package org.eclipse.jgit.lib;
|
||||
|
||||
import static java.nio.charset.StandardCharsets.UTF_8;
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertFalse;
|
||||
|
||||
|
@ -72,7 +73,9 @@ public void testReadWriteMergeHeads() throws IOException {
|
|||
// same test again, this time with lower-level io
|
||||
try (FileOutputStream fos = new FileOutputStream(
|
||||
new File(db.getDirectory(), "MERGE_HEAD"));) {
|
||||
fos.write("0000000000000000000000000000000000000000\n1c6db447abdbb291b25f07be38ea0b1bf94947c5\n".getBytes(Constants.CHARACTER_ENCODING));
|
||||
fos.write(
|
||||
"0000000000000000000000000000000000000000\n1c6db447abdbb291b25f07be38ea0b1bf94947c5\n"
|
||||
.getBytes(UTF_8));
|
||||
}
|
||||
assertEquals(db.readMergeHeads().size(), 2);
|
||||
assertEquals(db.readMergeHeads().get(0), ObjectId.zeroId());
|
||||
|
@ -82,7 +85,7 @@ public void testReadWriteMergeHeads() throws IOException {
|
|||
assertEquals(db.readMergeHeads(), null);
|
||||
try (FileOutputStream fos = new FileOutputStream(
|
||||
new File(db.getDirectory(), "MERGE_HEAD"))) {
|
||||
fos.write(sampleId.getBytes(Constants.CHARACTER_ENCODING));
|
||||
fos.write(sampleId.getBytes(UTF_8));
|
||||
}
|
||||
assertEquals(db.readMergeHeads().size(), 1);
|
||||
assertEquals(db.readMergeHeads().get(0), ObjectId.fromString(sampleId));
|
||||
|
@ -100,7 +103,7 @@ public void testReadWriteMergeMsg() throws IOException {
|
|||
assertFalse(new File(db.getDirectory(), "MERGE_MSG").exists());
|
||||
try (FileOutputStream fos = new FileOutputStream(
|
||||
new File(db.getDirectory(), Constants.MERGE_MSG))) {
|
||||
fos.write(mergeMsg.getBytes(Constants.CHARACTER_ENCODING));
|
||||
fos.write(mergeMsg.getBytes(UTF_8));
|
||||
}
|
||||
assertEquals(db.readMergeCommitMsg(), mergeMsg);
|
||||
}
|
||||
|
|
|
@ -43,6 +43,7 @@
|
|||
package org.eclipse.jgit.lib;
|
||||
|
||||
import static java.lang.Long.valueOf;
|
||||
import static java.nio.charset.StandardCharsets.UTF_8;
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
import static org.junit.Assume.assumeTrue;
|
||||
|
@ -181,7 +182,7 @@ public void testRacyGitDetection() throws Exception {
|
|||
private File addToWorkDir(String path, String content) throws IOException {
|
||||
File f = new File(db.getWorkTree(), path);
|
||||
try (FileOutputStream fos = new FileOutputStream(f)) {
|
||||
fos.write(content.getBytes(Constants.CHARACTER_ENCODING));
|
||||
fos.write(content.getBytes(UTF_8));
|
||||
return f;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -42,6 +42,7 @@
|
|||
*/
|
||||
package org.eclipse.jgit.lib;
|
||||
|
||||
import static java.nio.charset.StandardCharsets.UTF_8;
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertFalse;
|
||||
|
||||
|
@ -68,7 +69,7 @@ public void testReadWriteMergeMsg() throws IOException {
|
|||
assertFalse(new File(db.getDirectory(), Constants.SQUASH_MSG).exists());
|
||||
try (FileOutputStream fos = new FileOutputStream(
|
||||
new File(db.getDirectory(), Constants.SQUASH_MSG))) {
|
||||
fos.write(squashMsg.getBytes(Constants.CHARACTER_ENCODING));
|
||||
fos.write(squashMsg.getBytes(UTF_8));
|
||||
}
|
||||
assertEquals(db.readSquashCommitMsg(), squashMsg);
|
||||
}
|
||||
|
|
|
@ -43,6 +43,7 @@
|
|||
|
||||
package org.eclipse.jgit.merge;
|
||||
|
||||
import static java.nio.charset.StandardCharsets.UTF_8;
|
||||
import static org.junit.Assert.assertEquals;
|
||||
|
||||
import java.io.ByteArrayOutputStream;
|
||||
|
@ -302,7 +303,7 @@ private String merge(String commonBase, String ours, String theirs) throws IOExc
|
|||
T(commonBase), T(ours), T(theirs));
|
||||
ByteArrayOutputStream bo=new ByteArrayOutputStream(50);
|
||||
fmt.formatMerge(bo, r, "B", "O", "T", Constants.CHARACTER_ENCODING);
|
||||
return new String(bo.toByteArray(), Constants.CHARACTER_ENCODING);
|
||||
return new String(bo.toByteArray(), UTF_8);
|
||||
}
|
||||
|
||||
public String t(String text) {
|
||||
|
|
|
@ -43,6 +43,7 @@
|
|||
|
||||
package org.eclipse.jgit.transport;
|
||||
|
||||
import static java.nio.charset.StandardCharsets.UTF_8;
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.fail;
|
||||
|
||||
|
@ -50,7 +51,6 @@
|
|||
import java.io.IOException;
|
||||
import java.io.OutputStream;
|
||||
|
||||
import org.eclipse.jgit.lib.Constants;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
|
@ -173,8 +173,8 @@ public void flush() throws IOException {
|
|||
assertEquals(1, flushCnt[0]);
|
||||
}
|
||||
|
||||
private void assertBuffer(String exp) throws IOException {
|
||||
private void assertBuffer(String exp) {
|
||||
assertEquals(exp, new String(rawOut.toByteArray(),
|
||||
Constants.CHARACTER_ENCODING));
|
||||
UTF_8));
|
||||
}
|
||||
}
|
||||
|
|
|
@ -44,6 +44,7 @@
|
|||
package org.eclipse.jgit.transport;
|
||||
|
||||
import static java.lang.Integer.valueOf;
|
||||
import static java.nio.charset.StandardCharsets.UTF_8;
|
||||
import static org.eclipse.jgit.transport.SideBandOutputStream.CH_DATA;
|
||||
import static org.eclipse.jgit.transport.SideBandOutputStream.CH_ERROR;
|
||||
import static org.eclipse.jgit.transport.SideBandOutputStream.CH_PROGRESS;
|
||||
|
@ -59,7 +60,6 @@
|
|||
import java.text.MessageFormat;
|
||||
|
||||
import org.eclipse.jgit.internal.JGitText;
|
||||
import org.eclipse.jgit.lib.Constants;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
|
@ -259,8 +259,7 @@ public void testConstructor_RejectsBadBufferSize() throws Exception {
|
|||
}
|
||||
}
|
||||
|
||||
private void assertBuffer(String exp) throws IOException {
|
||||
assertEquals(exp, new String(rawOut.toByteArray(),
|
||||
Constants.CHARACTER_ENCODING));
|
||||
private void assertBuffer(String exp) {
|
||||
assertEquals(exp, new String(rawOut.toByteArray(), UTF_8));
|
||||
}
|
||||
}
|
||||
|
|
|
@ -43,6 +43,8 @@
|
|||
*/
|
||||
package org.eclipse.jgit.api;
|
||||
|
||||
import static java.nio.charset.StandardCharsets.UTF_8;
|
||||
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.File;
|
||||
import java.io.FileNotFoundException;
|
||||
|
@ -1015,8 +1017,7 @@ private RebaseResult stop(RevCommit commitToPick, RebaseResult.Status status)
|
|||
df.setRepository(repo);
|
||||
df.format(commitToPick.getParent(0), commitToPick);
|
||||
}
|
||||
rebaseState.createFile(PATCH, new String(bos.toByteArray(),
|
||||
Constants.CHARACTER_ENCODING));
|
||||
rebaseState.createFile(PATCH, new String(bos.toByteArray(), UTF_8));
|
||||
rebaseState.createFile(STOPPED_SHA,
|
||||
repo.newObjectReader()
|
||||
.abbreviate(
|
||||
|
@ -1733,7 +1734,7 @@ private static void createFile(File parentDir, String name,
|
|||
throws IOException {
|
||||
File file = new File(parentDir, name);
|
||||
try (FileOutputStream fos = new FileOutputStream(file)) {
|
||||
fos.write(content.getBytes(Constants.CHARACTER_ENCODING));
|
||||
fos.write(content.getBytes(UTF_8));
|
||||
fos.write('\n');
|
||||
}
|
||||
}
|
||||
|
@ -1741,7 +1742,7 @@ private static void createFile(File parentDir, String name,
|
|||
private static void appendToFile(File file, String content)
|
||||
throws IOException {
|
||||
try (FileOutputStream fos = new FileOutputStream(file, true)) {
|
||||
fos.write(content.getBytes(Constants.CHARACTER_ENCODING));
|
||||
fos.write(content.getBytes(UTF_8));
|
||||
fos.write('\n');
|
||||
}
|
||||
}
|
||||
|
|
|
@ -42,6 +42,7 @@
|
|||
*/
|
||||
package org.eclipse.jgit.gitrepo;
|
||||
|
||||
import static java.nio.charset.StandardCharsets.UTF_8;
|
||||
import static org.eclipse.jgit.lib.Constants.DEFAULT_REMOTE_NAME;
|
||||
import static org.eclipse.jgit.lib.Constants.R_REMOTES;
|
||||
|
||||
|
@ -606,8 +607,7 @@ public RevCommit call() throws GitAPIException {
|
|||
}
|
||||
|
||||
objectId = inserter.insert(Constants.OBJ_BLOB,
|
||||
link.getBytes(
|
||||
Constants.CHARACTER_ENCODING));
|
||||
link.getBytes(UTF_8));
|
||||
dcEntry = new DirCacheEntry(linkfile.dest);
|
||||
dcEntry.setObjectId(objectId);
|
||||
dcEntry.setFileMode(FileMode.SYMLINK);
|
||||
|
@ -620,7 +620,7 @@ public RevCommit call() throws GitAPIException {
|
|||
// create a new DirCacheEntry for .gitmodules file.
|
||||
final DirCacheEntry dcEntry = new DirCacheEntry(Constants.DOT_GIT_MODULES);
|
||||
ObjectId objectId = inserter.insert(Constants.OBJ_BLOB,
|
||||
content.getBytes(Constants.CHARACTER_ENCODING));
|
||||
content.getBytes(UTF_8));
|
||||
dcEntry.setObjectId(objectId);
|
||||
dcEntry.setFileMode(FileMode.REGULAR_FILE);
|
||||
builder.add(dcEntry);
|
||||
|
@ -629,7 +629,7 @@ public RevCommit call() throws GitAPIException {
|
|||
// create a new DirCacheEntry for .gitattributes file.
|
||||
final DirCacheEntry dcEntryAttr = new DirCacheEntry(Constants.DOT_GIT_ATTRIBUTES);
|
||||
ObjectId attrId = inserter.insert(Constants.OBJ_BLOB,
|
||||
attributes.toString().getBytes(Constants.CHARACTER_ENCODING));
|
||||
attributes.toString().getBytes(UTF_8));
|
||||
dcEntryAttr.setObjectId(attrId);
|
||||
dcEntryAttr.setFileMode(FileMode.REGULAR_FILE);
|
||||
builder.add(dcEntryAttr);
|
||||
|
|
|
@ -232,11 +232,17 @@ public final class Constants {
|
|||
*
|
||||
* @deprecated Use {@link java.nio.charset.StandardCharsets#UTF_8} directly
|
||||
* instead.
|
||||
**/
|
||||
*/
|
||||
@Deprecated
|
||||
public static final Charset CHARSET;
|
||||
|
||||
/** Native character encoding for commit messages, file names... */
|
||||
/**
|
||||
* Native character encoding for commit messages, file names...
|
||||
*
|
||||
* @deprecated Use {@link java.nio.charset.StandardCharsets#UTF_8} directly
|
||||
* instead.
|
||||
*/
|
||||
@Deprecated
|
||||
public static final String CHARACTER_ENCODING;
|
||||
|
||||
/** Default main branch name */
|
||||
|
|
|
@ -49,6 +49,7 @@
|
|||
package org.eclipse.jgit.lib;
|
||||
|
||||
import static org.eclipse.jgit.lib.Constants.LOCK_SUFFIX;
|
||||
import static java.nio.charset.StandardCharsets.UTF_8;
|
||||
|
||||
import java.io.BufferedOutputStream;
|
||||
import java.io.File;
|
||||
|
@ -1965,7 +1966,7 @@ private String readCommitMsgFile(String msgFilename) throws IOException {
|
|||
private void writeCommitMsg(File msgFile, String msg) throws IOException {
|
||||
if (msg != null) {
|
||||
try (FileOutputStream fos = new FileOutputStream(msgFile)) {
|
||||
fos.write(msg.getBytes(Constants.CHARACTER_ENCODING));
|
||||
fos.write(msg.getBytes(UTF_8));
|
||||
}
|
||||
} else {
|
||||
FileUtils.delete(msgFile, FileUtils.SKIP_MISSING);
|
||||
|
|
|
@ -48,10 +48,11 @@
|
|||
|
||||
package org.eclipse.jgit.transport;
|
||||
|
||||
import static java.nio.charset.StandardCharsets.UTF_8;
|
||||
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.File;
|
||||
import java.io.Serializable;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.net.URISyntaxException;
|
||||
import java.net.URL;
|
||||
import java.util.BitSet;
|
||||
|
@ -282,12 +283,7 @@ private static String unescape(String s) throws URISyntaxException {
|
|||
if (s.indexOf('%') < 0)
|
||||
return s;
|
||||
|
||||
byte[] bytes;
|
||||
try {
|
||||
bytes = s.getBytes(Constants.CHARACTER_ENCODING);
|
||||
} catch (UnsupportedEncodingException e) {
|
||||
throw new RuntimeException(e); // can't happen
|
||||
}
|
||||
byte[] bytes = s.getBytes(UTF_8);
|
||||
|
||||
byte[] os = new byte[bytes.length];
|
||||
int j = 0;
|
||||
|
@ -335,12 +331,7 @@ private static String escape(String s, boolean escapeReservedChars,
|
|||
if (s == null)
|
||||
return null;
|
||||
ByteArrayOutputStream os = new ByteArrayOutputStream(s.length());
|
||||
byte[] bytes;
|
||||
try {
|
||||
bytes = s.getBytes(Constants.CHARACTER_ENCODING);
|
||||
} catch (UnsupportedEncodingException e) {
|
||||
throw new RuntimeException(e); // cannot happen
|
||||
}
|
||||
byte[] bytes = s.getBytes(UTF_8);
|
||||
for (int i = 0; i < bytes.length; ++i) {
|
||||
int b = bytes[i] & 0xFF;
|
||||
if (b <= 32 || (encodeNonAscii && b > 127) || b == '%'
|
||||
|
|
|
@ -46,6 +46,8 @@
|
|||
|
||||
package org.eclipse.jgit.treewalk;
|
||||
|
||||
import static java.nio.charset.StandardCharsets.UTF_8;
|
||||
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
|
@ -412,7 +414,7 @@ public long getLastModified() {
|
|||
public InputStream openInputStream() throws IOException {
|
||||
if (attributes.isSymbolicLink()) {
|
||||
return new ByteArrayInputStream(fs.readSymLink(getFile())
|
||||
.getBytes(Constants.CHARACTER_ENCODING));
|
||||
.getBytes(UTF_8));
|
||||
} else {
|
||||
return new FileInputStream(getFile());
|
||||
}
|
||||
|
|
|
@ -43,6 +43,8 @@
|
|||
|
||||
package org.eclipse.jgit.util;
|
||||
|
||||
import static java.nio.charset.StandardCharsets.UTF_8;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.Closeable;
|
||||
|
@ -1172,7 +1174,7 @@ public int runProcess(ProcessBuilder processBuilder,
|
|||
OutputStream outRedirect, OutputStream errRedirect, String stdinArgs)
|
||||
throws IOException, InterruptedException {
|
||||
InputStream in = (stdinArgs == null) ? null : new ByteArrayInputStream(
|
||||
stdinArgs.getBytes(Constants.CHARACTER_ENCODING));
|
||||
stdinArgs.getBytes(UTF_8));
|
||||
return runProcess(processBuilder, outRedirect, errRedirect, in);
|
||||
}
|
||||
|
||||
|
|
|
@ -44,7 +44,7 @@
|
|||
|
||||
package org.eclipse.jgit.util;
|
||||
|
||||
import static org.eclipse.jgit.lib.Constants.CHARACTER_ENCODING;
|
||||
import static java.nio.charset.StandardCharsets.UTF_8;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
|
@ -181,7 +181,7 @@ public static void encode(StringBuilder urlstr, String key) {
|
|||
if (key == null || key.length() == 0)
|
||||
return;
|
||||
try {
|
||||
urlstr.append(URLEncoder.encode(key, CHARACTER_ENCODING));
|
||||
urlstr.append(URLEncoder.encode(key, UTF_8.name()));
|
||||
} catch (UnsupportedEncodingException e) {
|
||||
throw new RuntimeException(JGitText.get().couldNotURLEncodeToUTF8, e);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue