motiejus
/
jgit
1
Fork 0
Code Releases Activity

Use constants from StandardCharsets instead of hard-coded strings 

Instead of hard-coding the charset strings "US-ASCII", "UTF-8", and
"ISO-8859-1", use the corresponding constants from StandardCharsets.

UnsupportedEncodingException is not thrown when the StandardCharset
constants are used, so remove the now redundant handling.

Because the encoding names are no longer hard-coded strings, also
remove redundant $NON-NLS warning suppressions.

Also replace existing usages of the constants with static imports.

Change-Id: I0a4510d3d992db5e277f009a41434276f95bda4e
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
This commit is contained in:
David Pursehouse 2017-12-07 10:23:38 +09:00
parent 5f94e44308
commit 171f84a041
36 changed files with 235 additions and 282 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,6 +43,7 @@
package org.eclipse.jgit.http.test;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.eclipse.jgit.util.HttpSupport.HDR_CONTENT_ENCODING;
import static org.eclipse.jgit.util.HttpSupport.HDR_CONTENT_LENGTH;
import static org.eclipse.jgit.util.HttpSupport.HDR_CONTENT_TYPE;
@ -56,7 +57,6 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.net.URISyntaxException;
import java.nio.charset.StandardCharsets;
import java.text.MessageFormat;
import java.util.Arrays;
import java.util.Collection;
@ -1084,7 +1084,7 @@ public void testInitialClone_BrokenServer() throws Exception {
public void testInvalidWant() throws Exception {
@SuppressWarnings("resource")
ObjectId id = new ObjectInserter.Formatter().idFor(Constants.OBJ_BLOB,
"testInvalidWant".getBytes(StandardCharsets.UTF_8));
"testInvalidWant".getBytes(UTF_8));
Repository dst = createBareRepository();
try (Transport t = Transport.open(dst, remoteURI);

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

@ -43,6 +43,7 @@
package org.eclipse.jgit.junit;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
@ -246,7 +247,7 @@ public void setAuthorAndCommitter(org.eclipse.jgit.lib.CommitBuilder c) {
* @throws Exception
*/
public RevBlob blob(final String content) throws Exception {
return blob(content.getBytes("UTF-8"));
return blob(content.getBytes(UTF_8));
}
/**

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

@ -43,12 +43,12 @@
*/
package org.eclipse.jgit.lfs.server.s3;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.eclipse.jgit.util.HttpSupport.HDR_AUTHORIZATION;
import java.io.UnsupportedEncodingException;
import java.net.URL;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.text.MessageFormat;
import java.text.SimpleDateFormat;
@ -359,13 +359,13 @@ private static String canonicalizeResourcePath(URL endpoint) {
private static byte[] hash(String s) {
MessageDigest md = Constants.newMessageDigest();
md.update(s.getBytes(StandardCharsets.UTF_8));
md.update(s.getBytes(UTF_8));
return md.digest();
}
private static byte[] sign(String stringData, byte[] key) {
try {
byte[] data = stringData.getBytes("UTF-8"); //$NON-NLS-1$
byte[] data = stringData.getBytes(UTF_8);
Mac mac = Mac.getInstance(HMACSHA256);
mac.init(new SecretKeySpec(key, HMACSHA256));
return mac.doFinal(data);
@ -395,7 +395,7 @@ private static String toHex(byte[] bytes) {
private static String urlEncode(String url, boolean keepPathSlash) {
String encoded;
try {
encoded = URLEncoder.encode(url, StandardCharsets.UTF_8.name());
encoded = URLEncoder.encode(url, UTF_8.name());
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(LfsServerText.get().unsupportedUtf8, e);
}

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

@ -42,11 +42,12 @@
*/
package org.eclipse.jgit.lfs.test;
import static java.nio.charset.StandardCharsets.UTF_8;
import java.io.BufferedInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.security.MessageDigest;
@ -65,7 +66,7 @@ public class LongObjectIdTestUtils {
*/
public static LongObjectId hash(String s) {
MessageDigest md = Constants.newMessageDigest();
md.update(s.getBytes(StandardCharsets.UTF_8));
md.update(s.getBytes(UTF_8));
return LongObjectId.fromRaw(md.digest());
}

4
org.eclipse.jgit.lfs.test/tst/org/eclipse/jgit/lfs/lib/LFSPointerTest.java
View File

@ -43,11 +43,11 @@
package org.eclipse.jgit.lfs.lib;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import org.eclipse.jgit.lfs.LfsPointer;
import org.junit.Test;
@ -66,6 +66,6 @@ public void testEncoding() throws IOException {
baos.close();
assertEquals("version https://git-lfs.github.com/spec/v1\noid sha256:"
+ s + "\nsize 4\n",
baos.toString(StandardCharsets.UTF_8.name()));
baos.toString(UTF_8.name()));
}
}

4
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;
import static java.nio.charset.StandardCharsets.US_ASCII;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
@ -54,7 +55,6 @@
import java.io.OutputStreamWriter;
import java.nio.ByteBuffer;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Locale;
@ -270,7 +270,7 @@ public void testCopyFromStringInvalid() {
public void testCopyFromStringByte() {
AnyLongObjectId id1 = LongObjectIdTestUtils.hash("test");
byte[] buf = new byte[64];
Charset cs = StandardCharsets.US_ASCII;
Charset cs = US_ASCII;
cs.encode(id1.name()).get(buf);
AnyLongObjectId id2 = LongObjectId.fromString(buf, 0);
assertEquals("objects should be equals", id1, id2);

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

@ -42,6 +42,8 @@
*/
package org.eclipse.jgit.lfs;
import static java.nio.charset.StandardCharsets.UTF_8;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
@ -49,7 +51,6 @@
import java.io.OutputStream;
import java.io.PrintStream;
import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
import java.nio.charset.UnsupportedCharsetException;
import java.util.Locale;
@ -120,7 +121,7 @@ public long getSize() {
*/
public void encode(OutputStream out) {
try (PrintStream ps = new PrintStream(out, false,
StandardCharsets.UTF_8.name())) {
UTF_8.name())) {
ps.print("version "); //$NON-NLS-1$
ps.print(VERSION + "\n"); //$NON-NLS-1$
ps.print("oid " + HASH_FUNCTION_NAME + ":"); //$NON-NLS-1$ //$NON-NLS-2$
@ -129,8 +130,7 @@ public void encode(OutputStream out) {
ps.print(size + "\n"); //$NON-NLS-1$
} catch (UnsupportedEncodingException e) {
// should not happen, we are using a standard charset
throw new UnsupportedCharsetException(
StandardCharsets.UTF_8.name());
throw new UnsupportedCharsetException(UTF_8.name());
}
}
@ -152,7 +152,7 @@ public static LfsPointer parseLfsPointer(InputStream in)
long sz = -1;
try (BufferedReader br = new BufferedReader(
new InputStreamReader(in, StandardCharsets.UTF_8.name()))) {
new InputStreamReader(in, UTF_8))) {
for (String s = br.readLine(); s != null; s = br.readLine()) {
if (s.startsWith("#") || s.length() == 0) { //$NON-NLS-1$
continue;

9
org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/errors/InvalidLongObjectIdException.java
View File

@ -45,7 +45,8 @@
package org.eclipse.jgit.lfs.errors;
import java.io.UnsupportedEncodingException;
import static java.nio.charset.StandardCharsets.US_ASCII;
import java.text.MessageFormat;
import org.eclipse.jgit.lfs.internal.LfsText;
@ -80,10 +81,8 @@ public InvalidLongObjectIdException(String idString) {
private static String asAscii(byte[] bytes, int offset, int length) {
try {
return new String(bytes, offset, length, "US-ASCII"); //$NON-NLS-1$
} catch (UnsupportedEncodingException e2) {
return ""; //$NON-NLS-1$
} catch (StringIndexOutOfBoundsException e2) {
return new String(bytes, offset, length, US_ASCII);
} catch (StringIndexOutOfBoundsException e) {
return ""; //$NON-NLS-1$
}
}

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

@ -42,13 +42,14 @@
*/
package org.eclipse.jgit.ignore;
import static java.nio.charset.StandardCharsets.UTF_8;
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
import java.nio.file.Files;
import java.nio.file.StandardOpenOption;
import java.util.Arrays;
@ -153,13 +154,11 @@ public static class CGitIgnoreRule {
private String pattern;
public CGitIgnoreRule(File gitDir, String pattern)
throws UnsupportedEncodingException, IOException {
public CGitIgnoreRule(File gitDir, String pattern) throws IOException {
this.gitDir = gitDir;
this.pattern = pattern;
Files.write(FileUtils.toPath(new File(gitDir, ".gitignore")),
(pattern + "\n").getBytes("UTF-8"),
StandardOpenOption.CREATE,
(pattern + "\n").getBytes(UTF_8), StandardOpenOption.CREATE,
StandardOpenOption.TRUNCATE_EXISTING,
StandardOpenOption.WRITE);
}
@ -189,7 +188,7 @@ private Process startCgitCheckIgnore(String path) throws IOException {
Process proc = Runtime.getRuntime().exec(command, new String[0],
gitDir);
OutputStream out = proc.getOutputStream();
out.write((path + "\n").getBytes("UTF-8"));
out.write((path + "\n").getBytes(UTF_8));
out.flush();
out.close();
return proc;

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

@ -43,6 +43,7 @@
package org.eclipse.jgit.patch;
import static java.nio.charset.StandardCharsets.ISO_8859_1;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@ -218,7 +219,7 @@ void read() throws IOException, InterruptedException {
commitId = line.substring("commit ".length());
buf = new TemporaryBuffer.LocalFile(null);
} else if (buf != null) {
buf.write(line.getBytes("ISO-8859-1"));
buf.write(line.getBytes(ISO_8859_1));
buf.write('\n');
}
}

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

@ -42,6 +42,7 @@
package org.eclipse.jgit.api;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.eclipse.jgit.lib.CoreConfig.EolStreamType.AUTO_CRLF;
import static org.eclipse.jgit.lib.CoreConfig.EolStreamType.AUTO_LF;
import static org.eclipse.jgit.lib.CoreConfig.EolStreamType.DIRECT;
@ -53,7 +54,6 @@
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import org.eclipse.jgit.lib.CoreConfig.EolStreamType;
@ -150,9 +150,8 @@ private void testCheckout(EolStreamType streamTypeText,
EolStreamType streamTypeWithBinaryCheck, String output,
String expectedConversion) throws Exception {
ByteArrayOutputStream b;
byte[] outputBytes = output.getBytes(StandardCharsets.UTF_8);
byte[] expectedConversionBytes = expectedConversion
.getBytes(StandardCharsets.UTF_8);
byte[] outputBytes = output.getBytes(UTF_8);
byte[] expectedConversionBytes = expectedConversion.getBytes(UTF_8);
// test using output text and assuming it was declared TEXT
b = new ByteArrayOutputStream();
@ -278,9 +277,8 @@ public void testCheckinCRLF() throws Exception {
private void testCheckin(EolStreamType streamTypeText,
EolStreamType streamTypeWithBinaryCheck, String input,
String expectedConversion) throws Exception {
byte[] inputBytes = input.getBytes(StandardCharsets.UTF_8);
byte[] expectedConversionBytes = expectedConversion
.getBytes(StandardCharsets.UTF_8);
byte[] inputBytes = input.getBytes(UTF_8);
byte[] expectedConversionBytes = expectedConversion.getBytes(UTF_8);
// test using input text and assuming it was declared TEXT
try (InputStream in = EolStreamTypeUtil.wrapInputStream(

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

@ -42,6 +42,7 @@
*/
package org.eclipse.jgit.api;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@ -593,7 +594,7 @@ private static void writeToFile(File actFile, String string)
FileOutputStream fos = null;
try {
fos = new FileOutputStream(actFile);
fos.write(string.getBytes("UTF-8"));
fos.write(string.getBytes(UTF_8));
fos.close();
} finally {
if (fos != null)

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

@ -42,6 +42,7 @@
*/
package org.eclipse.jgit.api;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@ -397,7 +398,7 @@ private static void writeToFile(File actFile, String string)
FileOutputStream fos = null;
try {
fos = new FileOutputStream(actFile);
fos.write(string.getBytes("UTF-8"));
fos.write(string.getBytes(UTF_8));
fos.close();
} finally {
if (fos != null)

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

@ -42,6 +42,7 @@
*/
package org.eclipse.jgit.api;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.MatcherAssert.assertThat;
@ -1463,7 +1464,7 @@ public void testAuthorScriptConverter() throws Exception {
assertEquals("GIT_AUTHOR_DATE='@123456789 -0100'", lines[2]);
PersonIdent parsedIdent = git.rebase().parseAuthor(
convertedAuthor.getBytes("UTF-8"));
convertedAuthor.getBytes(UTF_8));
assertEquals(ident.getName(), parsedIdent.getName());
assertEquals(ident.getEmailAddress(), parsedIdent.getEmailAddress());
// this is rounded to the last second
@ -1480,7 +1481,7 @@ public void testAuthorScriptConverter() throws Exception {
assertEquals("GIT_AUTHOR_DATE='@123456789 +0930'", lines[2]);
parsedIdent = git.rebase().parseAuthor(
convertedAuthor.getBytes("UTF-8"));
convertedAuthor.getBytes(UTF_8));
assertEquals(ident.getName(), parsedIdent.getName());
assertEquals(ident.getEmailAddress(), parsedIdent.getEmailAddress());
assertEquals(123456789000L, parsedIdent.getWhen().getTime());

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

@ -43,11 +43,10 @@
package org.eclipse.jgit.diff;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import java.io.UnsupportedEncodingException;
import org.junit.Test;
public abstract class AbstractDiffTestCase {
@ -241,10 +240,6 @@ public static RawText t(String text) {
r.append(text.charAt(i));
r.append('\n');
}
try {
return new RawText(r.toString().getBytes("UTF-8"));
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
return new RawText(r.toString().getBytes(UTF_8));
}
}

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

@ -44,6 +44,7 @@
package org.eclipse.jgit.diff;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
@ -51,7 +52,6 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.util.RawParseUtils;
@ -110,8 +110,7 @@ public void testWriteLine3() throws IOException {
}
@Test
public void testComparatorReduceCommonStartEnd()
throws UnsupportedEncodingException {
public void testComparatorReduceCommonStartEnd() {
final RawTextComparator c = RawTextComparator.DEFAULT;
Edit e;
@ -137,54 +136,51 @@ public void testComparatorReduceCommonStartEnd()
e = c.reduceCommonStartEnd(t("abQxy"), t("abRxy"), e);
assertEquals(new Edit(2, 3, 2, 3), e);
RawText a = new RawText("p\na b\nQ\nc d\n".getBytes("UTF-8"));
RawText b = new RawText("p\na b \nR\n c d \n".getBytes("UTF-8"));
RawText a = new RawText("p\na b\nQ\nc d\n".getBytes(UTF_8));
RawText b = new RawText("p\na b \nR\n c d \n".getBytes(UTF_8));
e = new Edit(0, 4, 0, 4);
e = RawTextComparator.WS_IGNORE_ALL.reduceCommonStartEnd(a, b, e);
assertEquals(new Edit(2, 3, 2, 3), e);
}
@Test
public void testComparatorReduceCommonStartEnd_EmptyLine()
throws UnsupportedEncodingException {
public void testComparatorReduceCommonStartEnd_EmptyLine() {
RawText a;
RawText b;
Edit e;
a = new RawText("R\n y\n".getBytes("UTF-8"));
b = new RawText("S\n\n y\n".getBytes("UTF-8"));
a = new RawText("R\n y\n".getBytes(UTF_8));
b = new RawText("S\n\n y\n".getBytes(UTF_8));
e = new Edit(0, 2, 0, 3);
e = RawTextComparator.DEFAULT.reduceCommonStartEnd(a, b, e);
assertEquals(new Edit(0, 1, 0, 2), e);
a = new RawText("S\n\n y\n".getBytes("UTF-8"));
b = new RawText("R\n y\n".getBytes("UTF-8"));
a = new RawText("S\n\n y\n".getBytes(UTF_8));
b = new RawText("R\n y\n".getBytes(UTF_8));
e = new Edit(0, 3, 0, 2);
e = RawTextComparator.DEFAULT.reduceCommonStartEnd(a, b, e);
assertEquals(new Edit(0, 2, 0, 1), e);
}
@Test
public void testComparatorReduceCommonStartButLastLineNoEol()
throws UnsupportedEncodingException {
public void testComparatorReduceCommonStartButLastLineNoEol() {
RawText a;
RawText b;
Edit e;
a = new RawText("start".getBytes("UTF-8"));
b = new RawText("start of line".getBytes("UTF-8"));
a = new RawText("start".getBytes(UTF_8));
b = new RawText("start of line".getBytes(UTF_8));
e = new Edit(0, 1, 0, 1);
e = RawTextComparator.DEFAULT.reduceCommonStartEnd(a, b, e);
assertEquals(new Edit(0, 1, 0, 1), e);
}
@Test
public void testComparatorReduceCommonStartButLastLineNoEol_2()
throws UnsupportedEncodingException {
public void testComparatorReduceCommonStartButLastLineNoEol_2() {
RawText a;
RawText b;
Edit e;
a = new RawText("start".getBytes("UTF-8"));
b = new RawText("start of\nlastline".getBytes("UTF-8"));
a = new RawText("start".getBytes(UTF_8));
b = new RawText("start of\nlastline".getBytes(UTF_8));
e = new Edit(0, 1, 0, 2);
e = RawTextComparator.DEFAULT.reduceCommonStartEnd(a, b, e);
assertEquals(new Edit(0, 1, 0, 2), e);
@ -243,10 +239,6 @@ private static RawText t(String text) {
r.append(text.charAt(i));
r.append('\n');
}
try {
return new RawText(r.toString().getBytes("UTF-8"));
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
return new RawText(r.toString().getBytes(UTF_8));
}
}

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

@ -43,6 +43,7 @@
package org.eclipse.jgit.diff;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@ -81,7 +82,7 @@ public void testIndexingLargeObject() throws IOException,
+ "A\n" //
+ "B\n" //
+ "B\n" //
+ "B\n").getBytes("UTF-8");
+ "B\n").getBytes(UTF_8);
SimilarityIndex si = new SimilarityIndex();
si.hash(new ByteArrayInputStream(in), in.length, false);
assertEquals(2, si.size());
@ -129,12 +130,12 @@ public void testCommonScoreLargeObject_SameFiles_CR_canonicalization()
+ "D\r\n" //
+ "B\r\n";
SimilarityIndex src = new SimilarityIndex();
byte[] bytes1 = text.getBytes("UTF-8");
byte[] bytes1 = text.getBytes(UTF_8);
src.hash(new ByteArrayInputStream(bytes1), bytes1.length, true);
src.sort();
SimilarityIndex dst = new SimilarityIndex();
byte[] bytes2 = text.replace("\r", "").getBytes("UTF-8");
byte[] bytes2 = text.replace("\r", "").getBytes(UTF_8);
dst.hash(new ByteArrayInputStream(bytes2), bytes2.length, true);
dst.sort();

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

@ -42,6 +42,7 @@
*/
package org.eclipse.jgit.gitrepo;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
@ -54,7 +55,6 @@
import java.io.FileReader;
import java.io.IOException;
import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Map;
@ -213,7 +213,8 @@ public void androidSetup() throws Exception {
repos.put("platform/base", child);
RevCommit commit = cmd
.setInputStream(new ByteArrayInputStream(xmlContent.toString().getBytes(StandardCharsets.UTF_8)))
.setInputStream(new ByteArrayInputStream(
xmlContent.toString().getBytes(UTF_8)))
.setRemoteReader(repos)
.setURI("platform/")
.setTargetURI("platform/superproject")
@ -263,7 +264,7 @@ public void gerritSetup() throws Exception {
repos.put("plugins/cookbook", child);
RevCommit commit = cmd
.setInputStream(new ByteArrayInputStream(xmlContent.toString().getBytes(StandardCharsets.UTF_8)))
.setInputStream(new ByteArrayInputStream(xmlContent.toString().getBytes(UTF_8)))
.setRemoteReader(repos)
.setURI("")
.setTargetURI("gerrit")
@ -317,7 +318,7 @@ public void absoluteRemoteURL() throws Exception {
repos.put(repoUrl, child);
RevCommit commit = cmd
.setInputStream(new ByteArrayInputStream(xmlContent.toString().getBytes(StandardCharsets.UTF_8)))
.setInputStream(new ByteArrayInputStream(xmlContent.toString().getBytes(UTF_8)))
.setRemoteReader(repos)
.setURI(baseUrl)
.setTargetURI("gerrit")

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

@ -42,6 +42,7 @@
*/
package org.eclipse.jgit.ignore;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.eclipse.jgit.junit.Assert.assertEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@ -541,11 +542,11 @@ private void writeIgnoreFile(String name, String... rules)
writeTrashFile(name, data.toString());
}
private InputStream writeToString(String... rules) throws IOException {
private InputStream writeToString(String... rules) {
StringBuilder data = new StringBuilder();
for (String line : rules) {
data.append(line + "\n");
}
return new ByteArrayInputStream(data.toString().getBytes("UTF-8"));
return new ByteArrayInputStream(data.toString().getBytes(UTF_8));
}
}

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

@ -41,6 +41,7 @@
*/
package org.eclipse.jgit.indexdiff;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@ -60,7 +61,6 @@
import java.io.Writer;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
@ -130,8 +130,7 @@ private File restoreGitRepo(InputStream in, File testDir, String name)
File restoreScript = new File(testDir, name + ".sh");
try (OutputStream out = new BufferedOutputStream(
new FileOutputStream(restoreScript));
Writer writer = new OutputStreamWriter(out,
StandardCharsets.UTF_8)) {
Writer writer = new OutputStreamWriter(out, UTF_8)) {
writer.write("echo `which git` 1>&2\n");
writer.write("echo `git --version` 1>&2\n");
writer.write("git init " + name + " && \\\n");

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

@ -46,6 +46,7 @@
package org.eclipse.jgit.internal.storage.file;
import static java.nio.charset.StandardCharsets.ISO_8859_1;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@ -544,9 +545,9 @@ public void test024_createCommitNonAscii() throws IOException {
}
@Test
public void test025_computeSha1NoStore() throws IOException {
public void test025_computeSha1NoStore() {
byte[] data = "test025 some data, more than 16 bytes to get good coverage"
.getBytes("ISO-8859-1");
.getBytes(ISO_8859_1);
try (ObjectInserter.Formatter formatter = new ObjectInserter.Formatter()) {
final ObjectId id = formatter.idFor(Constants.OBJ_BLOB, data);
assertEquals("4f561df5ecf0dfbd53a0dc0f37262fef075d9dde", id.name());

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

@ -45,6 +45,7 @@
package org.eclipse.jgit.lib;
import static java.lang.Integer.valueOf;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.eclipse.jgit.junit.JGitTestUtil.concat;
import static org.eclipse.jgit.lib.Constants.OBJECT_ID_LENGTH;
import static org.eclipse.jgit.lib.Constants.OBJ_BAD;
@ -68,7 +69,6 @@
import static org.junit.Assert.assertSame;
import static org.junit.Assert.fail;
import java.io.UnsupportedEncodingException;
import java.text.MessageFormat;
import org.eclipse.jgit.errors.CorruptObjectException;
@ -1450,11 +1450,11 @@ public void testInvalidTreeDuplicateNames4() throws CorruptObjectException {
@Test
public void testInvalidTreeDuplicateNames5()
throws UnsupportedEncodingException, CorruptObjectException {
throws CorruptObjectException {
StringBuilder b = new StringBuilder();
entry(b, "100644 A");
entry(b, "100644 a");
byte[] data = b.toString().getBytes("UTF-8");
byte[] data = b.toString().getBytes(UTF_8);
checker.setSafeForWindows(true);
assertCorrupt("duplicate entry names", OBJ_TREE, data);
assertSkipListAccepts(OBJ_TREE, data);
@ -1464,11 +1464,11 @@ public void testInvalidTreeDuplicateNames5()
@Test
public void testInvalidTreeDuplicateNames6()
throws UnsupportedEncodingException, CorruptObjectException {
throws CorruptObjectException {
StringBuilder b = new StringBuilder();
entry(b, "100644 A");
entry(b, "100644 a");
byte[] data = b.toString().getBytes("UTF-8");
byte[] data = b.toString().getBytes(UTF_8);
checker.setSafeForMacOS(true);
assertCorrupt("duplicate entry names", OBJ_TREE, data);
assertSkipListAccepts(OBJ_TREE, data);
@ -1478,11 +1478,11 @@ public void testInvalidTreeDuplicateNames6()
@Test
public void testInvalidTreeDuplicateNames7()
throws UnsupportedEncodingException, CorruptObjectException {
throws CorruptObjectException {
StringBuilder b = new StringBuilder();
entry(b, "100644 \u0065\u0301");
entry(b, "100644 \u00e9");
byte[] data = b.toString().getBytes("UTF-8");
byte[] data = b.toString().getBytes(UTF_8);
checker.setSafeForMacOS(true);
assertCorrupt("duplicate entry names", OBJ_TREE, data);
assertSkipListAccepts(OBJ_TREE, data);
@ -1492,11 +1492,11 @@ public void testInvalidTreeDuplicateNames7()
@Test
public void testInvalidTreeDuplicateNames8()
throws UnsupportedEncodingException, CorruptObjectException {
throws CorruptObjectException {
StringBuilder b = new StringBuilder();
entry(b, "100644 A");
checker.setSafeForMacOS(true);
checker.checkTree(b.toString().getBytes("UTF-8"));
checker.checkTree(b.toString().getBytes(UTF_8));
}
@Test

7
org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.java
View File

@ -52,7 +52,6 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import org.eclipse.jgit.api.Git;
@ -714,7 +713,7 @@ public void checkContentMergeLargeBinaries(MergeStrategy strategy) throws Except
}
binary[50] = '\0';
writeTrashFile("file", new String(binary, StandardCharsets.UTF_8));
writeTrashFile("file", new String(binary, UTF_8));
git.add().addFilepattern("file").call();
RevCommit first = git.commit().setMessage("added file").call();
@ -722,7 +721,7 @@ public void checkContentMergeLargeBinaries(MergeStrategy strategy) throws Except
int idx = LINELEN * 1200 + 1;
byte save = binary[idx];
binary[idx] = '@';
writeTrashFile("file", new String(binary, StandardCharsets.UTF_8));
writeTrashFile("file", new String(binary, UTF_8));
binary[idx] = save;
git.add().addFilepattern("file").call();
@ -731,7 +730,7 @@ public void checkContentMergeLargeBinaries(MergeStrategy strategy) throws Except
git.checkout().setCreateBranch(true).setStartPoint(first).setName("side").call();
binary[LINELEN * 1500 + 1] = '!';
writeTrashFile("file", new String(binary, StandardCharsets.UTF_8));
writeTrashFile("file", new String(binary, UTF_8));
git.add().addFilepattern("file").call();
RevCommit sideCommit = git.commit().setAll(true)
.setMessage("modified file l 1500").call();

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

@ -43,6 +43,7 @@
package org.eclipse.jgit.revwalk;
import static java.nio.charset.StandardCharsets.ISO_8859_1;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@ -113,7 +114,7 @@ public void testParse_NoParents() throws Exception {
assertNull(c.getTree());
assertNull(c.parents);
c.parseCanonical(rw, body.toString().getBytes("UTF-8"));
c.parseCanonical(rw, body.toString().getBytes(UTF_8));
assertNotNull(c.getTree());
assertEquals(treeId, c.getTree().getId());
assertSame(rw.lookupTree(treeId), c.getTree());
@ -147,7 +148,7 @@ private RevCommit create(final String msg) throws Exception {
final RevCommit c;
c = new RevCommit(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67"));
c.parseCanonical(new RevWalk(db), b.toString().getBytes("UTF-8"));
c.parseCanonical(new RevWalk(db), b.toString().getBytes(UTF_8));
return c;
}
@ -160,7 +161,7 @@ public void testParse_WeirdHeaderOnlyCommit() throws Exception {
final RevCommit c;
c = new RevCommit(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67"));
c.parseCanonical(new RevWalk(db), b.toString().getBytes("UTF-8"));
c.parseCanonical(new RevWalk(db), b.toString().getBytes(UTF_8));
assertEquals("", c.getFullMessage());
assertEquals("", c.getShortMessage());
@ -175,7 +176,7 @@ public void testParse_incompleteAuthorAndCommitter() throws Exception {
final RevCommit c;
c = new RevCommit(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67"));
c.parseCanonical(new RevWalk(db), b.toString().getBytes("UTF-8"));
c.parseCanonical(new RevWalk(db), b.toString().getBytes(UTF_8));
assertEquals(new PersonIdent("", "a_u_thor@example.com", 1218123387000l, 7), c.getAuthorIdent());
assertEquals(new PersonIdent("", "", 1218123390000l, -5), c.getCommitterIdent());
@ -184,13 +185,13 @@ public void testParse_incompleteAuthorAndCommitter() throws Exception {
@Test
public void testParse_implicit_UTF8_encoded() throws Exception {
final ByteArrayOutputStream b = new ByteArrayOutputStream();
b.write("tree 9788669ad918b6fcce64af8882fc9a81cb6aba67\n".getBytes("UTF-8"));
b.write("author F\u00f6r fattare <a_u_thor@example.com> 1218123387 +0700\n".getBytes("UTF-8"));
b.write("committer C O. Miter <c@example.com> 1218123390 -0500\n".getBytes("UTF-8"));
b.write("\n".getBytes("UTF-8"));
b.write("Sm\u00f6rg\u00e5sbord\n".getBytes("UTF-8"));
b.write("\n".getBytes("UTF-8"));
b.write("\u304d\u308c\u3044\n".getBytes("UTF-8"));
b.write("tree 9788669ad918b6fcce64af8882fc9a81cb6aba67\n".getBytes(UTF_8));
b.write("author F\u00f6r fattare <a_u_thor@example.com> 1218123387 +0700\n".getBytes(UTF_8));
b.write("committer C O. Miter <c@example.com> 1218123390 -0500\n".getBytes(UTF_8));
b.write("\n".getBytes(UTF_8));
b.write("Sm\u00f6rg\u00e5sbord\n".getBytes(UTF_8));
b.write("\n".getBytes(UTF_8));
b.write("\u304d\u308c\u3044\n".getBytes(UTF_8));
final RevCommit c;
c = new RevCommit(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67")); // bogus id
c.parseCanonical(new RevWalk(db), b.toByteArray());
@ -204,13 +205,13 @@ public void testParse_implicit_UTF8_encoded() throws Exception {
@Test
public void testParse_implicit_mixed_encoded() throws Exception {
final ByteArrayOutputStream b = new ByteArrayOutputStream();
b.write("tree 9788669ad918b6fcce64af8882fc9a81cb6aba67\n".getBytes("UTF-8"));
b.write("author F\u00f6r fattare <a_u_thor@example.com> 1218123387 +0700\n".getBytes("ISO-8859-1"));
b.write("committer C O. Miter <c@example.com> 1218123390 -0500\n".getBytes("UTF-8"));
b.write("\n".getBytes("UTF-8"));
b.write("Sm\u00f6rg\u00e5sbord\n".getBytes("UTF-8"));
b.write("\n".getBytes("UTF-8"));
b.write("\u304d\u308c\u3044\n".getBytes("UTF-8"));
b.write("tree 9788669ad918b6fcce64af8882fc9a81cb6aba67\n".getBytes(UTF_8));
b.write("author F\u00f6r fattare <a_u_thor@example.com> 1218123387 +0700\n".getBytes(ISO_8859_1));
b.write("committer C O. Miter <c@example.com> 1218123390 -0500\n".getBytes(UTF_8));
b.write("\n".getBytes(UTF_8));
b.write("Sm\u00f6rg\u00e5sbord\n".getBytes(UTF_8));
b.write("\n".getBytes(UTF_8));
b.write("\u304d\u308c\u3044\n".getBytes(UTF_8));
final RevCommit c;
c = new RevCommit(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67")); // bogus id
c.parseCanonical(new RevWalk(db), b.toByteArray());
@ -259,14 +260,14 @@ public void testParse_explicit_encoded() throws Exception {
@Test
public void testParse_explicit_bad_encoded() throws Exception {
final ByteArrayOutputStream b = new ByteArrayOutputStream();
b.write("tree 9788669ad918b6fcce64af8882fc9a81cb6aba67\n".getBytes("UTF-8"));
b.write("author F\u00f6r fattare <a_u_thor@example.com> 1218123387 +0700\n".getBytes("ISO-8859-1"));
b.write("committer C O. Miter <c@example.com> 1218123390 -0500\n".getBytes("UTF-8"));
b.write("encoding EUC-JP\n".getBytes("UTF-8"));
b.write("\n".getBytes("UTF-8"));
b.write("\u304d\u308c\u3044\n".getBytes("UTF-8"));
b.write("\n".getBytes("UTF-8"));
b.write("Hi\n".getBytes("UTF-8"));
b.write("tree 9788669ad918b6fcce64af8882fc9a81cb6aba67\n".getBytes(UTF_8));
b.write("author F\u00f6r fattare <a_u_thor@example.com> 1218123387 +0700\n".getBytes(ISO_8859_1));
b.write("committer C O. Miter <c@example.com> 1218123390 -0500\n".getBytes(UTF_8));
b.write("encoding EUC-JP\n".getBytes(UTF_8));
b.write("\n".getBytes(UTF_8));
b.write("\u304d\u308c\u3044\n".getBytes(UTF_8));
b.write("\n".getBytes(UTF_8));
b.write("Hi\n".getBytes(UTF_8));
final RevCommit c;
c = new RevCommit(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67")); // bogus id
c.parseCanonical(new RevWalk(db), b.toByteArray());
@ -290,14 +291,14 @@ public void testParse_explicit_bad_encoded() throws Exception {
@Test
public void testParse_explicit_bad_encoded2() throws Exception {
final ByteArrayOutputStream b = new ByteArrayOutputStream();
b.write("tree 9788669ad918b6fcce64af8882fc9a81cb6aba67\n".getBytes("UTF-8"));
b.write("author F\u00f6r fattare <a_u_thor@example.com> 1218123387 +0700\n".getBytes("UTF-8"));
b.write("committer C O. Miter <c@example.com> 1218123390 -0500\n".getBytes("UTF-8"));
b.write("encoding ISO-8859-1\n".getBytes("UTF-8"));
b.write("\n".getBytes("UTF-8"));
b.write("\u304d\u308c\u3044\n".getBytes("UTF-8"));
b.write("\n".getBytes("UTF-8"));
b.write("Hi\n".getBytes("UTF-8"));
b.write("tree 9788669ad918b6fcce64af8882fc9a81cb6aba67\n".getBytes(UTF_8));
b.write("author F\u00f6r fattare <a_u_thor@example.com> 1218123387 +0700\n".getBytes(UTF_8));
b.write("committer C O. Miter <c@example.com> 1218123390 -0500\n".getBytes(UTF_8));
b.write("encoding ISO-8859-1\n".getBytes(UTF_8));
b.write("\n".getBytes(UTF_8));
b.write("\u304d\u308c\u3044\n".getBytes(UTF_8));
b.write("\n".getBytes(UTF_8));
b.write("Hi\n".getBytes(UTF_8));
final RevCommit c;
c = new RevCommit(id("9473095c4cb2f12aefe1db8a355fe3fafba42f67")); // bogus id
c.parseCanonical(new RevWalk(db), b.toByteArray());

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

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

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

@ -42,6 +42,7 @@
*/
package org.eclipse.jgit.storage.file;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.eclipse.jgit.util.FileUtils.pathToString;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
@ -104,7 +105,7 @@ public void testSystemEncoding() throws IOException, ConfigInvalidException {
@Test
public void testUTF8withoutBOM() throws IOException, ConfigInvalidException {
final File file = createFile(CONTENT1.getBytes("UTF-8"));
final File file = createFile(CONTENT1.getBytes(UTF_8));
final FileBasedConfig config = new FileBasedConfig(file, FS.DETECTED);
config.load();
assertEquals(ALICE, config.getString(USER, null, NAME));
@ -120,7 +121,7 @@ public void testUTF8withBOM() throws IOException, ConfigInvalidException {
bos1.write(0xEF);
bos1.write(0xBB);
bos1.write(0xBF);
bos1.write(CONTENT1.getBytes("UTF-8"));
bos1.write(CONTENT1.getBytes(UTF_8));
final File file = createFile(bos1.toByteArray());
final FileBasedConfig config = new FileBasedConfig(file, FS.DETECTED);
@ -134,7 +135,7 @@ public void testUTF8withBOM() throws IOException, ConfigInvalidException {
bos2.write(0xEF);
bos2.write(0xBB);
bos2.write(0xBF);
bos2.write(CONTENT2.getBytes("UTF-8"));
bos2.write(CONTENT2.getBytes(UTF_8));
assertArrayEquals(bos2.toByteArray(), IO.readFully(file));
}

10
org.eclipse.jgit.test/tst/org/eclipse/jgit/util/QuotedStringGitPathStyleTest.java
View File

@ -43,14 +43,13 @@
package org.eclipse.jgit.util;
import static java.nio.charset.StandardCharsets.ISO_8859_1;
import static org.eclipse.jgit.util.QuotedString.GIT_PATH;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertSame;
import java.io.UnsupportedEncodingException;
import org.eclipse.jgit.lib.Constants;
import org.junit.Test;
@ -63,12 +62,7 @@ private static void assertQuote(final String exp, final String in) {
}
private static void assertDequote(final String exp, final String in) {
final byte[] b;
try {
b = ('"' + in + '"').getBytes("ISO-8859-1");
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
final byte[] b = ('"' + in + '"').getBytes(ISO_8859_1);
final String r = GIT_PATH.dequote(b, 0, b.length);
assertEquals(exp, r);
}

41
org.eclipse.jgit.test/tst/org/eclipse/jgit/util/RawCharUtilTest.java
View File

@ -43,6 +43,7 @@
package org.eclipse.jgit.util;
import static java.nio.charset.StandardCharsets.US_ASCII;
import static org.eclipse.jgit.util.RawCharUtil.isWhitespace;
import static org.eclipse.jgit.util.RawCharUtil.trimLeadingWhitespace;
import static org.eclipse.jgit.util.RawCharUtil.trimTrailingWhitespace;
@ -50,8 +51,6 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.io.UnsupportedEncodingException;
import org.junit.Test;
public class RawCharUtilTest {
@ -78,37 +77,31 @@ public void testIsWhitespace() {
/**
* Test method for
* {@link RawCharUtil#trimTrailingWhitespace(byte[], int, int)}.
*
* @throws UnsupportedEncodingException
*/
@Test
public void testTrimTrailingWhitespace()
throws UnsupportedEncodingException {
assertEquals(0, trimTrailingWhitespace("".getBytes("US-ASCII"), 0, 0));
assertEquals(0, trimTrailingWhitespace(" ".getBytes("US-ASCII"), 0, 1));
assertEquals(1, trimTrailingWhitespace("a ".getBytes("US-ASCII"), 0, 2));
assertEquals(2,
trimTrailingWhitespace(" a ".getBytes("US-ASCII"), 0, 3));
assertEquals(3,
trimTrailingWhitespace(" a".getBytes("US-ASCII"), 0, 3));
assertEquals(6, trimTrailingWhitespace(
" test ".getBytes("US-ASCII"), 2, 9));
public void testTrimTrailingWhitespace() {
assertEquals(0, trimTrailingWhitespace("".getBytes(US_ASCII), 0, 0));
assertEquals(0, trimTrailingWhitespace(" ".getBytes(US_ASCII), 0, 1));
assertEquals(1, trimTrailingWhitespace("a ".getBytes(US_ASCII), 0, 2));
assertEquals(2, trimTrailingWhitespace(" a ".getBytes(US_ASCII), 0, 3));
assertEquals(3, trimTrailingWhitespace(" a".getBytes(US_ASCII), 0, 3));
assertEquals(6,
trimTrailingWhitespace(" test ".getBytes(US_ASCII), 2, 9));
}
/**
* Test method for
* {@link RawCharUtil#trimLeadingWhitespace(byte[], int, int)}.
*
* @throws UnsupportedEncodingException
*/
@Test
public void testTrimLeadingWhitespace() throws UnsupportedEncodingException {
assertEquals(0, trimLeadingWhitespace("".getBytes("US-ASCII"), 0, 0));
assertEquals(1, trimLeadingWhitespace(" ".getBytes("US-ASCII"), 0, 1));
assertEquals(0, trimLeadingWhitespace("a ".getBytes("US-ASCII"), 0, 2));
assertEquals(1, trimLeadingWhitespace(" a ".getBytes("US-ASCII"), 0, 3));
assertEquals(2, trimLeadingWhitespace(" a".getBytes("US-ASCII"), 0, 3));
assertEquals(2, trimLeadingWhitespace(" test ".getBytes("US-ASCII"),
public void testTrimLeadingWhitespace() {
assertEquals(0, trimLeadingWhitespace("".getBytes(US_ASCII), 0, 0));
assertEquals(1, trimLeadingWhitespace(" ".getBytes(US_ASCII), 0, 1));
assertEquals(0, trimLeadingWhitespace("a ".getBytes(US_ASCII), 0, 2));
assertEquals(1, trimLeadingWhitespace(" a ".getBytes(US_ASCII), 0, 3));
assertEquals(2, trimLeadingWhitespace(" a".getBytes(US_ASCII), 0, 3));
assertEquals(2,
trimLeadingWhitespace(" test ".getBytes(US_ASCII),
2, 9));
}

19
org.eclipse.jgit.test/tst/org/eclipse/jgit/util/RawParseUtils_LineMapTest.java
View File

@ -43,11 +43,10 @@
package org.eclipse.jgit.util;
import static java.nio.charset.StandardCharsets.ISO_8859_1;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertNotNull;
import java.io.UnsupportedEncodingException;
import org.junit.Test;
public class RawParseUtils_LineMapTest {
@ -65,29 +64,29 @@ public void testOneBlankLine() {
}
@Test
public void testTwoLineFooBar() throws UnsupportedEncodingException {
final byte[] buf = "foo\nbar\n".getBytes("ISO-8859-1");
public void testTwoLineFooBar() {
final byte[] buf = "foo\nbar\n".getBytes(ISO_8859_1);
final IntList map = RawParseUtils.lineMap(buf, 0, buf.length);
assertArrayEquals(new int[]{Integer.MIN_VALUE, 0, 4, buf.length}, asInts(map));
}
@Test
public void testTwoLineNoLF() throws UnsupportedEncodingException {
final byte[] buf = "foo\nbar".getBytes("ISO-8859-1");
public void testTwoLineNoLF() {
final byte[] buf = "foo\nbar".getBytes(ISO_8859_1);
final IntList map = RawParseUtils.lineMap(buf, 0, buf.length);
assertArrayEquals(new int[]{Integer.MIN_VALUE, 0, 4, buf.length}, asInts(map));
}
@Test
public void testBinary() throws UnsupportedEncodingException {
final byte[] buf = "xxxfoo\nb\0ar".getBytes("ISO-8859-1");
public void testBinary() {
final byte[] buf = "xxxfoo\nb\0ar".getBytes(ISO_8859_1);
final IntList map = RawParseUtils.lineMap(buf, 3, buf.length);
assertArrayEquals(new int[]{Integer.MIN_VALUE, 3, buf.length}, asInts(map));
}
@Test
public void testFourLineBlanks() throws UnsupportedEncodingException {
final byte[] buf = "foo\n\n\nbar\n".getBytes("ISO-8859-1");
public void testFourLineBlanks() {
final byte[] buf = "foo\n\n\nbar\n".getBytes(ISO_8859_1);
final IntList map = RawParseUtils.lineMap(buf, 0, buf.length);
assertArrayEquals(new int[]{

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

@ -42,11 +42,10 @@
*/
package org.eclipse.jgit.util;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import java.io.UnsupportedEncodingException;
import org.eclipse.jgit.junit.RepositoryTestCase;
import org.junit.Test;
@ -94,11 +93,7 @@ private static void assertMatchResult(String pattern, String input, int position
}
private static RawCharSequence raw(String text) {
try {
byte[] bytes = text.getBytes("UTF-8");
return new RawCharSequence(bytes, 0, bytes.length);
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
byte[] bytes = text.getBytes(UTF_8);
return new RawCharSequence(bytes, 0, bytes.length);
}
}

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

@ -44,12 +44,12 @@
package org.eclipse.jgit.util.io;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import org.junit.Test;
@ -129,10 +129,6 @@ private static void test(byte[] input, byte[] expected,
}
private static byte[] asBytes(String in) {
try {
return in.getBytes("UTF-8");
} catch (UnsupportedEncodingException ex) {
throw new AssertionError();
}
return in.getBytes(UTF_8);
}
}

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

@ -43,6 +43,7 @@
package org.eclipse.jgit.util.sha1;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@ -51,7 +52,6 @@
import java.io.IOException;
import java.io.InputStream;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
@ -95,15 +95,15 @@ public void test1() throws NoSuchAlgorithmException {
.fromString("a9993e364706816aba3e25717850c26c9cd0d89d");
MessageDigest m = MessageDigest.getInstance("SHA-1");
m.update(TEST1.getBytes(StandardCharsets.UTF_8));
m.update(TEST1.getBytes(UTF_8));
ObjectId m1 = ObjectId.fromRaw(m.digest());
SHA1 s = SHA1.newInstance();
s.update(TEST1.getBytes(StandardCharsets.UTF_8));
s.update(TEST1.getBytes(UTF_8));
ObjectId s1 = ObjectId.fromRaw(s.digest());
s.reset();
s.update(TEST1.getBytes(StandardCharsets.UTF_8));
s.update(TEST1.getBytes(UTF_8));
ObjectId s2 = s.toObjectId();
assertEquals(m1, s1);
@ -117,15 +117,15 @@ public void test2() throws NoSuchAlgorithmException {
.fromString("84983e441c3bd26ebaae4aa1f95129e5e54670f1");
MessageDigest m = MessageDigest.getInstance("SHA-1");
m.update(TEST2.getBytes(StandardCharsets.UTF_8));
m.update(TEST2.getBytes(UTF_8));
ObjectId m1 = ObjectId.fromRaw(m.digest());
SHA1 s = SHA1.newInstance();
s.update(TEST2.getBytes(StandardCharsets.UTF_8));
s.update(TEST2.getBytes(UTF_8));
ObjectId s1 = ObjectId.fromRaw(s.digest());
s.reset();
s.update(TEST2.getBytes(StandardCharsets.UTF_8));
s.update(TEST2.getBytes(UTF_8));
ObjectId s2 = s.toObjectId();
assertEquals(m1, s1);

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

@ -43,6 +43,8 @@
package org.eclipse.jgit.transport;
import static java.nio.charset.StandardCharsets.UTF_8;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
@ -642,7 +644,7 @@ void authorize(final HttpURLConnection c) throws IOException {
try {
final Mac m = Mac.getInstance(HMAC);
m.init(privateKey);
sec = Base64.encodeBytes(m.doFinal(s.toString().getBytes("UTF-8"))); //$NON-NLS-1$
sec = Base64.encodeBytes(m.doFinal(s.toString().getBytes(UTF_8)));
} catch (NoSuchAlgorithmException e) {
throw new IOException(MessageFormat.format(JGitText.get().noHMACsupport, HMAC, e.getMessage()));
} catch (InvalidKeyException e) {

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

@ -42,8 +42,10 @@
*/
package org.eclipse.jgit.transport;
import static java.nio.charset.StandardCharsets.ISO_8859_1;
import static java.nio.charset.StandardCharsets.UTF_8;
import java.io.File;
import java.io.UnsupportedEncodingException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
@ -69,7 +71,7 @@ public class HMACSHA1NonceGenerator implements NonceGenerator {
*/
public HMACSHA1NonceGenerator(String seed) throws IllegalStateException {
try {
byte[] keyBytes = seed.getBytes("ISO-8859-1"); //$NON-NLS-1$
byte[] keyBytes = seed.getBytes(ISO_8859_1);
SecretKeySpec signingKey = new SecretKeySpec(keyBytes, "HmacSHA1"); //$NON-NLS-1$
mac = Mac.getInstance("HmacSHA1"); //$NON-NLS-1$
mac.init(signingKey);
@ -77,8 +79,6 @@ public HMACSHA1NonceGenerator(String seed) throws IllegalStateException {
throw new IllegalStateException(e);
} catch (NoSuchAlgorithmException e) {
throw new IllegalStateException(e);
} catch (UnsupportedEncodingException e) {
throw new IllegalStateException(e);
}
}
@ -98,12 +98,7 @@ public synchronized String createNonce(Repository repo, long timestamp)
}
String input = path + ":" + String.valueOf(timestamp); //$NON-NLS-1$
byte[] rawHmac;
try {
rawHmac = mac.doFinal(input.getBytes("UTF-8")); //$NON-NLS-1$
} catch (UnsupportedEncodingException e) {
throw new IllegalStateException(e);
}
byte[] rawHmac = mac.doFinal(input.getBytes(UTF_8));
return Long.toString(timestamp) + "-" + toHex(rawHmac); //$NON-NLS-1$
}

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

@ -43,11 +43,11 @@
package org.eclipse.jgit.transport;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.eclipse.jgit.util.HttpSupport.HDR_AUTHORIZATION;
import static org.eclipse.jgit.util.HttpSupport.HDR_WWW_AUTHENTICATE;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URL;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
@ -309,7 +309,7 @@ void authorize(final String username, final String password) {
@Override
void configureRequest(final HttpConnection conn) throws IOException {
String ident = user + ":" + pass; //$NON-NLS-1$
String enc = Base64.encodeBytes(ident.getBytes("UTF-8")); //$NON-NLS-1$
String enc = Base64.encodeBytes(ident.getBytes(UTF_8));
conn.setRequestProperty(HDR_AUTHORIZATION, type.getSchemeName()
+ " " + enc); //$NON-NLS-1$
}
@ -423,25 +423,17 @@ private static String uri(URL u) {
}
private static String H(String data) {
try {
MessageDigest md = newMD5();
md.update(data.getBytes("UTF-8")); //$NON-NLS-1$
return LHEX(md.digest());
} catch (UnsupportedEncodingException e) {
throw new RuntimeException("UTF-8 encoding not available", e); //$NON-NLS-1$
}
MessageDigest md = newMD5();
md.update(data.getBytes(UTF_8));
return LHEX(md.digest());
}
private static String KD(String secret, String data) {
try {
MessageDigest md = newMD5();
md.update(secret.getBytes("UTF-8")); //$NON-NLS-1$
md.update((byte) ':');
md.update(data.getBytes("UTF-8")); //$NON-NLS-1$
return LHEX(md.digest());
} catch (UnsupportedEncodingException e) {
throw new RuntimeException("UTF-8 encoding not available", e); //$NON-NLS-1$
}
MessageDigest md = newMD5();
md.update(secret.getBytes(UTF_8));
md.update((byte) ':');
md.update(data.getBytes(UTF_8));
return LHEX(md.digest());
}
private static MessageDigest newMD5() {

22
org.eclipse.jgit/src/org/eclipse/jgit/util/Base64.java
View File

@ -6,7 +6,8 @@
package org.eclipse.jgit.util;
import java.io.UnsupportedEncodingException;
import static java.nio.charset.StandardCharsets.UTF_8;
import java.nio.charset.StandardCharsets;
import java.text.MessageFormat;
import java.util.Arrays;
@ -40,9 +41,6 @@ public class Base64 {
/** Indicates an invalid byte during decoding. */
private final static byte INVALID_DEC = -3;
/** Preferred encoding. */
private final static String UTF_8 = "UTF-8"; //$NON-NLS-1$
/** The 64 valid Base64 values. */
private final static byte[] ENC;
@ -54,15 +52,11 @@ public class Base64 {
private final static byte[] DEC;
static {
try {
ENC = ("ABCDEFGHIJKLMNOPQRSTUVWXYZ" // //$NON-NLS-1$
+ "abcdefghijklmnopqrstuvwxyz" // //$NON-NLS-1$
+ "0123456789" // //$NON-NLS-1$
+ "+/" // //$NON-NLS-1$
).getBytes(UTF_8);
} catch (UnsupportedEncodingException uee) {
throw new RuntimeException(uee.getMessage(), uee);
}
ENC = ("ABCDEFGHIJKLMNOPQRSTUVWXYZ" // //$NON-NLS-1$
+ "abcdefghijklmnopqrstuvwxyz" // //$NON-NLS-1$
+ "0123456789" // //$NON-NLS-1$
+ "+/" // //$NON-NLS-1$
).getBytes(UTF_8);
DEC = new byte[128];
Arrays.fill(DEC, INVALID_DEC);
@ -301,7 +295,7 @@ public static byte[] decode(byte[] source, int off, int len) {
* @return the decoded data
*/
public static byte[] decode(String s) {
byte[] bytes = s.getBytes(StandardCharsets.UTF_8);
byte[] bytes = s.getBytes(UTF_8);
return decode(bytes, 0, bytes.length);
}
}