This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git
The following commit(s) were added to refs/heads/master by this push:
new 18b80a3 Minor improvement: (#177)
18b80a3 is described below
commit 18b80a32fc9979dbd23cc971093ac308e5fd77cc
Author: Arturo Bernal <arturobern...@gmail.com>
AuthorDate: Wed Dec 23 03:52:14 2020 +0100
Minor improvement: (#177)
* Unnecessary conversion to String
* Add final
* Use Standard Charset object
* Redundant 'close()'
---
src/main/java/org/apache/commons/io/FileUtils.java | 14 ++--
.../apache/commons/io/file/NoopPathVisitor.java | 2 +-
.../commons/io/filefilter/AndFileFilter.java | 2 +-
.../apache/commons/io/filefilter/OrFileFilter.java | 2 +-
.../apache/commons/io/output/TeeOutputStream.java | 2 +-
.../org/apache/commons/io/CharsetsTestCase.java | 3 +-
.../java/org/apache/commons/io/CopyUtilsTest.java | 17 ++---
.../org/apache/commons/io/FileUtilsTestCase.java | 16 ++---
.../org/apache/commons/io/IOUtilsCopyTestCase.java | 41 +++++------
.../org/apache/commons/io/IOUtilsTestCase.java | 12 ++--
.../apache/commons/io/IOUtilsWriteTestCase.java | 79 +++++++++++-----------
.../commons/io/input/ReaderInputStreamTest.java | 3 +-
.../io/input/UnixLineEndingInputStreamTest.java | 5 +-
.../io/input/WindowsLineEndingInputStreamTest.java | 5 +-
.../commons/io/input/XmlStreamReaderTest.java | 3 +-
.../io/monitor/AbstractMonitorTestCase.java | 2 +-
.../apache/commons/io/output/ProxyWriterTest.java | 2 -
.../commons/io/output/WriterOutputStreamTest.java | 5 +-
.../java/org/apache/commons/io/test/TestUtils.java | 3 +-
19 files changed, 113 insertions(+), 105 deletions(-)
diff --git a/src/main/java/org/apache/commons/io/FileUtils.java
b/src/main/java/org/apache/commons/io/FileUtils.java
index 9cc8b96..1c526c6 100644
--- a/src/main/java/org/apache/commons/io/FileUtils.java
+++ b/src/main/java/org/apache/commons/io/FileUtils.java
@@ -201,19 +201,19 @@ public class FileUtils {
final String displaySize;
if (size.divide(ONE_EB_BI).compareTo(BigInteger.ZERO) > 0) {
- displaySize = String.valueOf(size.divide(ONE_EB_BI)) + " EB";
+ displaySize = size.divide(ONE_EB_BI) + " EB";
} else if (size.divide(ONE_PB_BI).compareTo(BigInteger.ZERO) > 0) {
- displaySize = String.valueOf(size.divide(ONE_PB_BI)) + " PB";
+ displaySize = size.divide(ONE_PB_BI) + " PB";
} else if (size.divide(ONE_TB_BI).compareTo(BigInteger.ZERO) > 0) {
- displaySize = String.valueOf(size.divide(ONE_TB_BI)) + " TB";
+ displaySize = size.divide(ONE_TB_BI) + " TB";
} else if (size.divide(ONE_GB_BI).compareTo(BigInteger.ZERO) > 0) {
- displaySize = String.valueOf(size.divide(ONE_GB_BI)) + " GB";
+ displaySize = size.divide(ONE_GB_BI) + " GB";
} else if (size.divide(ONE_MB_BI).compareTo(BigInteger.ZERO) > 0) {
- displaySize = String.valueOf(size.divide(ONE_MB_BI)) + " MB";
+ displaySize = size.divide(ONE_MB_BI) + " MB";
} else if (size.divide(ONE_KB_BI).compareTo(BigInteger.ZERO) > 0) {
- displaySize = String.valueOf(size.divide(ONE_KB_BI)) + " KB";
+ displaySize = size.divide(ONE_KB_BI) + " KB";
} else {
- displaySize = String.valueOf(size) + " bytes";
+ displaySize = size + " bytes";
}
return displaySize;
}
diff --git a/src/main/java/org/apache/commons/io/file/NoopPathVisitor.java
b/src/main/java/org/apache/commons/io/file/NoopPathVisitor.java
index b10201d..48a1323 100644
--- a/src/main/java/org/apache/commons/io/file/NoopPathVisitor.java
+++ b/src/main/java/org/apache/commons/io/file/NoopPathVisitor.java
@@ -27,5 +27,5 @@ public class NoopPathVisitor extends SimplePathVisitor {
/**
* The singleton instance.
*/
- public static NoopPathVisitor INSTANCE = new NoopPathVisitor();
+ public static final NoopPathVisitor INSTANCE = new NoopPathVisitor();
}
diff --git a/src/main/java/org/apache/commons/io/filefilter/AndFileFilter.java
b/src/main/java/org/apache/commons/io/filefilter/AndFileFilter.java
index 090b0a6..25c66ea 100644
--- a/src/main/java/org/apache/commons/io/filefilter/AndFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/AndFileFilter.java
@@ -219,7 +219,7 @@ public class AndFileFilter
if (i > 0) {
buffer.append(",");
}
- buffer.append(Objects.toString(fileFilters.get(i)));
+ buffer.append(fileFilters.get(i));
}
buffer.append(")");
return buffer.toString();
diff --git a/src/main/java/org/apache/commons/io/filefilter/OrFileFilter.java
b/src/main/java/org/apache/commons/io/filefilter/OrFileFilter.java
index 01c1e32..9f6e960 100644
--- a/src/main/java/org/apache/commons/io/filefilter/OrFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/OrFileFilter.java
@@ -201,7 +201,7 @@ public class OrFileFilter extends AbstractFileFilter
implements ConditionalFileF
if (i > 0) {
buffer.append(",");
}
- buffer.append(Objects.toString(fileFilters.get(i)));
+ buffer.append(fileFilters.get(i));
}
}
buffer.append(")");
diff --git a/src/main/java/org/apache/commons/io/output/TeeOutputStream.java
b/src/main/java/org/apache/commons/io/output/TeeOutputStream.java
index 23fa696..3f6ef5a 100644
--- a/src/main/java/org/apache/commons/io/output/TeeOutputStream.java
+++ b/src/main/java/org/apache/commons/io/output/TeeOutputStream.java
@@ -26,7 +26,7 @@ import java.io.OutputStream;
public class TeeOutputStream extends ProxyOutputStream {
/** the second OutputStream to write to */
- protected OutputStream branch; //TODO consider making this private
+ protected final OutputStream branch; //TODO consider making this private
/**
* Constructs a TeeOutputStream.
diff --git a/src/test/java/org/apache/commons/io/CharsetsTestCase.java
b/src/test/java/org/apache/commons/io/CharsetsTestCase.java
index d1b2251..56f51f7 100644
--- a/src/test/java/org/apache/commons/io/CharsetsTestCase.java
+++ b/src/test/java/org/apache/commons/io/CharsetsTestCase.java
@@ -20,6 +20,7 @@ package org.apache.commons.io;
import static org.junit.jupiter.api.Assertions.assertEquals;
import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.SortedMap;
import org.junit.jupiter.api.Test;
@@ -53,7 +54,7 @@ public class CharsetsTestCase {
assertEquals(Charset.defaultCharset(), Charsets.toCharset((String)
null));
assertEquals(Charset.defaultCharset(), Charsets.toCharset((Charset)
null));
assertEquals(Charset.defaultCharset(),
Charsets.toCharset(Charset.defaultCharset()));
- assertEquals(Charset.forName("UTF-8"),
Charsets.toCharset(Charset.forName("UTF-8")));
+ assertEquals(StandardCharsets.UTF_8,
Charsets.toCharset(StandardCharsets.UTF_8));
}
@Test
diff --git a/src/test/java/org/apache/commons/io/CopyUtilsTest.java
b/src/test/java/org/apache/commons/io/CopyUtilsTest.java
index 9536af0..708765e 100644
--- a/src/test/java/org/apache/commons/io/CopyUtilsTest.java
+++ b/src/test/java/org/apache/commons/io/CopyUtilsTest.java
@@ -25,6 +25,7 @@ import java.io.OutputStream;
import java.io.Reader;
import java.io.StringWriter;
import java.io.Writer;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import org.apache.commons.io.output.ByteArrayOutputStream;
@@ -78,7 +79,7 @@ public class CopyUtilsTest {
public void copy_byteArrayToWriter() throws Exception {
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final OutputStream out = new ThrowOnFlushAndCloseOutputStream(baout,
false, true);
- final Writer writer = new java.io.OutputStreamWriter(out, "US-ASCII");
+ final Writer writer = new java.io.OutputStreamWriter(out,
StandardCharsets.US_ASCII);
CopyUtils.copy(inData, writer);
writer.flush();
@@ -121,7 +122,7 @@ public class CopyUtilsTest {
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final OutputStream out = new ThrowOnFlushAndCloseOutputStream(baout,
false, true);
- final Writer writer = new java.io.OutputStreamWriter(out, "US-ASCII");
+ final Writer writer = new java.io.OutputStreamWriter(out,
StandardCharsets.US_ASCII);
CopyUtils.copy(in, writer);
writer.flush();
@@ -145,7 +146,7 @@ public class CopyUtilsTest {
public void testCopy_readerToOutputStream() throws Exception {
InputStream in = new ByteArrayInputStream(inData);
in = new ThrowOnCloseInputStream(in);
- final Reader reader = new java.io.InputStreamReader(in, "US-ASCII");
+ final Reader reader = new java.io.InputStreamReader(in,
StandardCharsets.US_ASCII);
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final OutputStream out = new ThrowOnFlushAndCloseOutputStream(baout,
false, true);
@@ -167,11 +168,11 @@ public class CopyUtilsTest {
public void copy_readerToWriter() throws Exception {
InputStream in = new ByteArrayInputStream(inData);
in = new ThrowOnCloseInputStream(in);
- final Reader reader = new java.io.InputStreamReader(in, "US-ASCII");
+ final Reader reader = new java.io.InputStreamReader(in,
StandardCharsets.US_ASCII);
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final OutputStream out = new ThrowOnFlushAndCloseOutputStream(baout,
false, true);
- final Writer writer = new java.io.OutputStreamWriter(out, "US-ASCII");
+ final Writer writer = new java.io.OutputStreamWriter(out,
StandardCharsets.US_ASCII);
final int count = CopyUtils.copy(reader, writer);
writer.flush();
@@ -182,7 +183,7 @@ public class CopyUtilsTest {
@Test
public void copy_stringToOutputStream() throws Exception {
- final String str = new String(inData, "US-ASCII");
+ final String str = new String(inData, StandardCharsets.US_ASCII);
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final OutputStream out = new ThrowOnFlushAndCloseOutputStream(baout,
false, true);
@@ -201,11 +202,11 @@ public class CopyUtilsTest {
@Test
public void copy_stringToWriter() throws Exception {
- final String str = new String(inData, "US-ASCII");
+ final String str = new String(inData, StandardCharsets.US_ASCII);
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final OutputStream out = new ThrowOnFlushAndCloseOutputStream(baout,
false, true);
- final Writer writer = new java.io.OutputStreamWriter(out, "US-ASCII");
+ final Writer writer = new java.io.OutputStreamWriter(out,
StandardCharsets.US_ASCII);
CopyUtils.copy(str, writer);
writer.flush();
diff --git a/src/test/java/org/apache/commons/io/FileUtilsTestCase.java
b/src/test/java/org/apache/commons/io/FileUtilsTestCase.java
index 5c843ee..e6aa9c4 100644
--- a/src/test/java/org/apache/commons/io/FileUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/io/FileUtilsTestCase.java
@@ -473,7 +473,7 @@ public class FileUtilsTestCase {
// compute the expected checksum
final Checksum expectedChecksum = new CRC32();
- expectedChecksum.update(text.getBytes("US-ASCII"), 0, text.length());
+ expectedChecksum.update(text.getBytes(StandardCharsets.US_ASCII), 0,
text.length());
final long expectedValue = expectedChecksum.getValue();
// compute the checksum of the file
@@ -495,7 +495,7 @@ public class FileUtilsTestCase {
// compute the expected checksum
final Checksum expectedChecksum = new CRC32();
- expectedChecksum.update(text.getBytes("US-ASCII"), 0, text.length());
+ expectedChecksum.update(text.getBytes(StandardCharsets.US_ASCII), 0,
text.length());
final long expectedValue = expectedChecksum.getValue();
// compute the checksum of the file
@@ -518,8 +518,8 @@ public class FileUtilsTestCase {
// compute the expected checksum
final Checksum expectedChecksum = new CRC32();
- expectedChecksum.update(text1.getBytes("US-ASCII"), 0, text1.length());
- expectedChecksum.update(text2.getBytes("US-ASCII"), 0, text2.length());
+ expectedChecksum.update(text1.getBytes(StandardCharsets.US_ASCII), 0,
text1.length());
+ expectedChecksum.update(text2.getBytes(StandardCharsets.US_ASCII), 0,
text2.length());
final long expectedValue = expectedChecksum.getValue();
// compute the checksum of the file
@@ -1409,7 +1409,7 @@ public class FileUtilsTestCase {
//Create test file on-the-fly (used to be in CVS)
try (OutputStream out = new FileOutputStream(file1)) {
- out.write("This is a test".getBytes("UTF-8"));
+ out.write("This is a test".getBytes(StandardCharsets.UTF_8));
}
final File file2 = new File(temporaryFolder, "test2.txt");
@@ -2530,7 +2530,7 @@ public class FileUtilsTestCase {
public void testReadFileToStringWithEncoding() throws Exception {
final File file = new File(temporaryFolder, "read.obj");
final FileOutputStream out = new FileOutputStream(file);
- final byte[] text = "Hello /u1234".getBytes("UTF8");
+ final byte[] text = "Hello /u1234".getBytes(StandardCharsets.UTF_8);
out.write(text);
out.close();
@@ -2957,7 +2957,7 @@ public class FileUtilsTestCase {
public void testWriteCharSequence1() throws Exception {
final File file = new File(temporaryFolder, "write.txt");
FileUtils.write(file, "Hello /u1234", "UTF8");
- final byte[] text = "Hello /u1234".getBytes("UTF8");
+ final byte[] text = "Hello /u1234".getBytes(StandardCharsets.UTF_8);
TestUtils.assertEqualContent(text, file);
}
@@ -3177,7 +3177,7 @@ public class FileUtilsTestCase {
public void testWriteStringToFile1() throws Exception {
final File file = new File(temporaryFolder, "write.txt");
FileUtils.writeStringToFile(file, "Hello /u1234", "UTF8");
- final byte[] text = "Hello /u1234".getBytes("UTF8");
+ final byte[] text = "Hello /u1234".getBytes(StandardCharsets.UTF_8);
TestUtils.assertEqualContent(text, file);
}
diff --git a/src/test/java/org/apache/commons/io/IOUtilsCopyTestCase.java
b/src/test/java/org/apache/commons/io/IOUtilsCopyTestCase.java
index af9a664..93b6997 100644
--- a/src/test/java/org/apache/commons/io/IOUtilsCopyTestCase.java
+++ b/src/test/java/org/apache/commons/io/IOUtilsCopyTestCase.java
@@ -27,6 +27,7 @@ import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Reader;
import java.io.Writer;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import org.apache.commons.io.input.NullInputStream;
@@ -151,7 +152,7 @@ public class IOUtilsCopyTestCase {
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final ThrowOnFlushAndCloseOutputStream out = new
ThrowOnFlushAndCloseOutputStream(baout, true, true);
- final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
+ final Writer writer = new OutputStreamWriter(baout,
StandardCharsets.US_ASCII);
IOUtils.copy(in, writer); // deliberately testing deprecated method
out.off();
@@ -171,7 +172,7 @@ public class IOUtilsCopyTestCase {
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final ThrowOnFlushAndCloseOutputStream out = new
ThrowOnFlushAndCloseOutputStream(baout, true, true);
- final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
+ final Writer writer = new OutputStreamWriter(baout,
StandardCharsets.US_ASCII);
IOUtils.copy(in, writer, "UTF8");
out.off();
@@ -179,7 +180,7 @@ public class IOUtilsCopyTestCase {
assertEquals(0, in.available(), "Not all bytes were read");
byte[] bytes = baout.toByteArray();
- bytes = new String(bytes, "UTF8").getBytes("US-ASCII");
+ bytes = new String(bytes,
StandardCharsets.UTF_8).getBytes(StandardCharsets.US_ASCII);
assertTrue(Arrays.equals(inData, bytes), "Content differs");
}
@@ -191,7 +192,7 @@ public class IOUtilsCopyTestCase {
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final ThrowOnFlushAndCloseOutputStream out = new
ThrowOnFlushAndCloseOutputStream(baout, true, true);
- final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
+ final Writer writer = new OutputStreamWriter(baout,
StandardCharsets.US_ASCII);
IOUtils.copy(in, writer, (String) null);
out.off();
@@ -206,7 +207,7 @@ public class IOUtilsCopyTestCase {
public void testCopy_inputStreamToWriter_Encoding_nullIn() throws
Exception {
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final OutputStream out = new ThrowOnFlushAndCloseOutputStream(baout,
true, true);
- final Writer writer = new OutputStreamWriter(out, "US-ASCII");
+ final Writer writer = new OutputStreamWriter(out,
StandardCharsets.US_ASCII);
assertThrows(NullPointerException.class, () -> IOUtils.copy(null,
writer, "UTF8"));
}
@@ -221,7 +222,7 @@ public class IOUtilsCopyTestCase {
public void testCopy_inputStreamToWriter_nullIn() throws Exception {
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final OutputStream out = new ThrowOnFlushAndCloseOutputStream(baout,
true, true);
- final Writer writer = new OutputStreamWriter(out, "US-ASCII");
+ final Writer writer = new OutputStreamWriter(out,
StandardCharsets.US_ASCII);
assertThrows(NullPointerException.class, () ->
IOUtils.copy((InputStream) null, writer));
}
@@ -237,11 +238,11 @@ public class IOUtilsCopyTestCase {
public void testCopy_readerToAppendable() throws Exception {
InputStream in = new ByteArrayInputStream(inData);
in = new ThrowOnCloseInputStream(in);
- final Reader reader = new InputStreamReader(in, "US-ASCII");
+ final Reader reader = new InputStreamReader(in,
StandardCharsets.US_ASCII);
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final ThrowOnFlushAndCloseOutputStream out = new
ThrowOnFlushAndCloseOutputStream(baout, true, true);
- final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
+ final Writer writer = new OutputStreamWriter(baout,
StandardCharsets.US_ASCII);
final long count = IOUtils.copy(reader, (Appendable) writer);
out.off();
@@ -272,7 +273,7 @@ public class IOUtilsCopyTestCase {
public void testCopy_readerToAppendable_nullIn() throws Exception {
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final OutputStream out = new ThrowOnFlushAndCloseOutputStream(baout,
true, true);
- final Appendable writer = new OutputStreamWriter(out, "US-ASCII");
+ final Appendable writer = new OutputStreamWriter(out,
StandardCharsets.US_ASCII);
assertThrows(NullPointerException.class, () -> IOUtils.copy((Reader)
null, writer));
}
@@ -281,7 +282,7 @@ public class IOUtilsCopyTestCase {
public void testCopy_readerToAppendable_nullOut() throws Exception {
InputStream in = new ByteArrayInputStream(inData);
in = new ThrowOnCloseInputStream(in);
- final Reader reader = new InputStreamReader(in, "US-ASCII");
+ final Reader reader = new InputStreamReader(in,
StandardCharsets.US_ASCII);
assertThrows(NullPointerException.class, () -> IOUtils.copy(reader,
(Appendable) null));
}
@@ -291,7 +292,7 @@ public class IOUtilsCopyTestCase {
public void testCopy_readerToOutputStream() throws Exception {
InputStream in = new ByteArrayInputStream(inData);
in = new ThrowOnCloseInputStream(in);
- final Reader reader = new InputStreamReader(in, "US-ASCII");
+ final Reader reader = new InputStreamReader(in,
StandardCharsets.US_ASCII);
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final OutputStream out = new ThrowOnFlushAndCloseOutputStream(baout,
false, true);
@@ -314,7 +315,7 @@ public class IOUtilsCopyTestCase {
public void testCopy_readerToOutputStream_Encoding() throws Exception {
InputStream in = new ByteArrayInputStream(inData);
in = new ThrowOnCloseInputStream(in);
- final Reader reader = new InputStreamReader(in, "US-ASCII");
+ final Reader reader = new InputStreamReader(in,
StandardCharsets.US_ASCII);
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final OutputStream out = new ThrowOnFlushAndCloseOutputStream(baout,
false, true);
@@ -324,7 +325,7 @@ public class IOUtilsCopyTestCase {
// note: we don't flush here; this IOUtils method does it for us
byte[] bytes = baout.toByteArray();
- bytes = new String(bytes, "UTF16").getBytes("US-ASCII");
+ bytes = new String(bytes,
StandardCharsets.UTF_16).getBytes(StandardCharsets.US_ASCII);
assertTrue(Arrays.equals(inData, bytes), "Content differs");
}
@@ -333,7 +334,7 @@ public class IOUtilsCopyTestCase {
public void testCopy_readerToOutputStream_Encoding_nullEncoding() throws
Exception {
InputStream in = new ByteArrayInputStream(inData);
in = new ThrowOnCloseInputStream(in);
- final Reader reader = new InputStreamReader(in, "US-ASCII");
+ final Reader reader = new InputStreamReader(in,
StandardCharsets.US_ASCII);
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final OutputStream out = new ThrowOnFlushAndCloseOutputStream(baout,
false, true);
@@ -358,7 +359,7 @@ public class IOUtilsCopyTestCase {
public void testCopy_readerToOutputStream_Encoding_nullOut() throws
Exception {
InputStream in = new ByteArrayInputStream(inData);
in = new ThrowOnCloseInputStream(in);
- final Reader reader = new InputStreamReader(in, "US-ASCII");
+ final Reader reader = new InputStreamReader(in,
StandardCharsets.US_ASCII);
assertThrows(NullPointerException.class, () -> IOUtils.copy(reader,
null, "UTF16"));
}
@@ -375,7 +376,7 @@ public class IOUtilsCopyTestCase {
public void testCopy_readerToOutputStream_nullOut() throws Exception {
InputStream in = new ByteArrayInputStream(inData);
in = new ThrowOnCloseInputStream(in);
- final Reader reader = new InputStreamReader(in, "US-ASCII");
+ final Reader reader = new InputStreamReader(in,
StandardCharsets.US_ASCII);
assertThrows(NullPointerException.class, () -> IOUtils.copy(reader,
(OutputStream) null)); // deliberately testing deprecated method
}
@@ -385,11 +386,11 @@ public class IOUtilsCopyTestCase {
public void testCopy_readerToWriter() throws Exception {
InputStream in = new ByteArrayInputStream(inData);
in = new ThrowOnCloseInputStream(in);
- final Reader reader = new InputStreamReader(in, "US-ASCII");
+ final Reader reader = new InputStreamReader(in,
StandardCharsets.US_ASCII);
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final ThrowOnFlushAndCloseOutputStream out = new
ThrowOnFlushAndCloseOutputStream(baout, true, true);
- final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
+ final Writer writer = new OutputStreamWriter(baout,
StandardCharsets.US_ASCII);
final int count = IOUtils.copy(reader, writer);
out.off();
@@ -423,7 +424,7 @@ public class IOUtilsCopyTestCase {
public void testCopy_readerToWriter_nullIn() throws Exception {
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final OutputStream out = new ThrowOnFlushAndCloseOutputStream(baout,
true, true);
- final Writer writer = new OutputStreamWriter(out, "US-ASCII");
+ final Writer writer = new OutputStreamWriter(out,
StandardCharsets.US_ASCII);
assertThrows(NullPointerException.class, () -> IOUtils.copy((Reader)
null, writer));
}
@@ -432,7 +433,7 @@ public class IOUtilsCopyTestCase {
public void testCopy_readerToWriter_nullOut() throws Exception {
InputStream in = new ByteArrayInputStream(inData);
in = new ThrowOnCloseInputStream(in);
- final Reader reader = new InputStreamReader(in, "US-ASCII");
+ final Reader reader = new InputStreamReader(in,
StandardCharsets.US_ASCII);
assertThrows(NullPointerException.class, () -> IOUtils.copy(reader,
(Writer) null));
}
diff --git a/src/test/java/org/apache/commons/io/IOUtilsTestCase.java
b/src/test/java/org/apache/commons/io/IOUtilsTestCase.java
index 591f47b..cde08b3 100644
--- a/src/test/java/org/apache/commons/io/IOUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/io/IOUtilsTestCase.java
@@ -871,7 +871,7 @@ public class IOUtilsTestCase {
}}
@Test public void testReadFully_InputStream__ReturnByteArray() throws
Exception {
- final byte[] bytes = "abcd1234".getBytes("UTF-8");
+ final byte[] bytes = "abcd1234".getBytes(StandardCharsets.UTF_8);
final ByteArrayInputStream stream = new ByteArrayInputStream(bytes);
final byte[] result = IOUtils.readFully(stream, bytes.length);
@@ -906,11 +906,11 @@ public class IOUtilsTestCase {
}
@Test public void testReadFully_InputStream_Offset() throws Exception {
- final byte[] bytes = "abcd1234".getBytes("UTF-8");
+ final byte[] bytes = "abcd1234".getBytes(StandardCharsets.UTF_8);
final ByteArrayInputStream stream = new ByteArrayInputStream(bytes);
- final byte[] buffer = "wx00000000".getBytes("UTF-8");
+ final byte[] buffer = "wx00000000".getBytes(StandardCharsets.UTF_8);
IOUtils.readFully(stream, buffer, 2, 8);
- assertEquals("wxabcd1234", new String(buffer, 0, buffer.length,
"UTF-8"));
+ assertEquals("wxabcd1234", new String(buffer, 0, buffer.length,
StandardCharsets.UTF_8));
IOUtils.closeQuietly(stream);
}
@@ -1475,7 +1475,7 @@ public class IOUtilsTestCase {
assertEqualContent(csq.toString().getBytes(), bytes);
inStream = IOUtils.toInputStream(csq, "UTF-8");
bytes = IOUtils.toByteArray(inStream);
- assertEqualContent(csq.toString().getBytes("UTF-8"), bytes);
+ assertEqualContent(csq.toString().getBytes(StandardCharsets.UTF_8),
bytes);
}
/**
@@ -1496,7 +1496,7 @@ public class IOUtilsTestCase {
assertEqualContent(str.getBytes(), bytes);
inStream = IOUtils.toInputStream(str, "UTF-8");
bytes = IOUtils.toByteArray(inStream);
- assertEqualContent(str.getBytes("UTF-8"), bytes);
+ assertEqualContent(str.getBytes(StandardCharsets.UTF_8), bytes);
}
@Test public void testToString_ByteArray() throws Exception {
diff --git a/src/test/java/org/apache/commons/io/IOUtilsWriteTestCase.java
b/src/test/java/org/apache/commons/io/IOUtilsWriteTestCase.java
index 6d22f88..978907b 100644
--- a/src/test/java/org/apache/commons/io/IOUtilsWriteTestCase.java
+++ b/src/test/java/org/apache/commons/io/IOUtilsWriteTestCase.java
@@ -23,6 +23,7 @@ import static org.junit.jupiter.api.Assertions.fail;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Writer;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.List;
@@ -88,7 +89,7 @@ public class IOUtilsWriteTestCase {
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
@SuppressWarnings("resource") // deliberately not closed
final ThrowOnFlushAndCloseOutputStream out = new
ThrowOnFlushAndCloseOutputStream(baout, true, true);
- final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
+ final Writer writer = new OutputStreamWriter(baout,
StandardCharsets.US_ASCII);
IOUtils.write(inData, writer);
out.off();
@@ -103,7 +104,7 @@ public class IOUtilsWriteTestCase {
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
@SuppressWarnings("resource") // deliberately not closed
final ThrowOnFlushAndCloseOutputStream out = new
ThrowOnFlushAndCloseOutputStream(baout, true, true);
- final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
+ final Writer writer = new OutputStreamWriter(baout,
StandardCharsets.US_ASCII);
IOUtils.write((byte[]) null, writer);
out.off();
@@ -127,14 +128,14 @@ public class IOUtilsWriteTestCase {
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
@SuppressWarnings("resource") // deliberately not closed
final ThrowOnFlushAndCloseOutputStream out = new
ThrowOnFlushAndCloseOutputStream(baout, true, true);
- final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
+ final Writer writer = new OutputStreamWriter(baout,
StandardCharsets.US_ASCII);
IOUtils.write(inData, writer, "UTF8");
out.off();
writer.flush();
byte[] bytes = baout.toByteArray();
- bytes = new String(bytes, "UTF8").getBytes("US-ASCII");
+ bytes = new String(bytes,
StandardCharsets.UTF_8).getBytes(StandardCharsets.US_ASCII);
assertTrue(Arrays.equals(inData, bytes), "Content differs");
}
@@ -143,7 +144,7 @@ public class IOUtilsWriteTestCase {
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
@SuppressWarnings("resource") // deliberately not closed
final ThrowOnFlushAndCloseOutputStream out = new
ThrowOnFlushAndCloseOutputStream(baout, true, true);
- final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
+ final Writer writer = new OutputStreamWriter(baout,
StandardCharsets.US_ASCII);
IOUtils.write(null, writer, "UTF8");
out.off();
@@ -166,7 +167,7 @@ public class IOUtilsWriteTestCase {
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
@SuppressWarnings("resource") // deliberately not closed
final ThrowOnFlushAndCloseOutputStream out = new
ThrowOnFlushAndCloseOutputStream(baout, true, true);
- final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
+ final Writer writer = new OutputStreamWriter(baout,
StandardCharsets.US_ASCII);
IOUtils.write(inData, writer, (String) null);
out.off();
@@ -179,7 +180,7 @@ public class IOUtilsWriteTestCase {
//-----------------------------------------------------------------------
@Test
public void testWrite_charSequenceToOutputStream() throws Exception {
- final CharSequence csq = new StringBuilder(new String(inData,
"US-ASCII"));
+ final CharSequence csq = new StringBuilder(new String(inData,
StandardCharsets.US_ASCII));
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final ThrowOnFlushAndCloseOutputStream out = new
ThrowOnFlushAndCloseOutputStream(baout, true, true);
@@ -206,7 +207,7 @@ public class IOUtilsWriteTestCase {
@Test
public void testWrite_charSequenceToOutputStream_nullStream() throws
Exception {
- final CharSequence csq = new StringBuilder(new String(inData,
"US-ASCII"));
+ final CharSequence csq = new StringBuilder(new String(inData,
StandardCharsets.US_ASCII));
try {
IOUtils.write(csq, (OutputStream) null);
fail();
@@ -217,7 +218,7 @@ public class IOUtilsWriteTestCase {
//-----------------------------------------------------------------------
@Test
public void testWrite_charSequenceToOutputStream_Encoding() throws
Exception {
- final CharSequence csq = new StringBuilder(new String(inData,
"US-ASCII"));
+ final CharSequence csq = new StringBuilder(new String(inData,
StandardCharsets.US_ASCII));
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final ThrowOnFlushAndCloseOutputStream out = new
ThrowOnFlushAndCloseOutputStream(baout, true, true);
@@ -227,7 +228,7 @@ public class IOUtilsWriteTestCase {
out.flush();
byte[] bytes = baout.toByteArray();
- bytes = new String(bytes, "UTF16").getBytes("US-ASCII");
+ bytes = new String(bytes,
StandardCharsets.UTF_16).getBytes(StandardCharsets.US_ASCII);
assertTrue(Arrays.equals(inData, bytes), "Content differs");
}
@@ -245,7 +246,7 @@ public class IOUtilsWriteTestCase {
@Test
public void testWrite_charSequenceToOutputStream_Encoding_nullStream()
throws Exception {
- final CharSequence csq = new StringBuilder(new String(inData,
"US-ASCII"));
+ final CharSequence csq = new StringBuilder(new String(inData,
StandardCharsets.US_ASCII));
try {
IOUtils.write(csq, (OutputStream) null);
fail();
@@ -255,7 +256,7 @@ public class IOUtilsWriteTestCase {
@Test
public void testWrite_charSequenceToOutputStream_nullEncoding() throws
Exception {
- final CharSequence csq = new StringBuilder(new String(inData,
"US-ASCII"));
+ final CharSequence csq = new StringBuilder(new String(inData,
StandardCharsets.US_ASCII));
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final ThrowOnFlushAndCloseOutputStream out = new
ThrowOnFlushAndCloseOutputStream(baout, true, true);
@@ -271,12 +272,12 @@ public class IOUtilsWriteTestCase {
//-----------------------------------------------------------------------
@Test
public void testWrite_charSequenceToWriter() throws Exception {
- final CharSequence csq = new StringBuilder(new String(inData,
"US-ASCII"));
+ final CharSequence csq = new StringBuilder(new String(inData,
StandardCharsets.US_ASCII));
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
@SuppressWarnings("resource") // deliberately not closed
final ThrowOnFlushAndCloseOutputStream out = new
ThrowOnFlushAndCloseOutputStream(baout, true, true);
- final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
+ final Writer writer = new OutputStreamWriter(baout,
StandardCharsets.US_ASCII);
IOUtils.write(csq, writer);
out.off();
@@ -291,7 +292,7 @@ public class IOUtilsWriteTestCase {
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
@SuppressWarnings("resource") // deliberately not closed
final ThrowOnFlushAndCloseOutputStream out = new
ThrowOnFlushAndCloseOutputStream(baout, true, true);
- final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
+ final Writer writer = new OutputStreamWriter(baout,
StandardCharsets.US_ASCII);
IOUtils.write((CharSequence) null, writer);
out.off();
@@ -302,7 +303,7 @@ public class IOUtilsWriteTestCase {
@Test
public void testWrite_charSequenceToWriter_Encoding_nullStream() throws
Exception {
- final CharSequence csq = new StringBuilder(new String(inData,
"US-ASCII"));
+ final CharSequence csq = new StringBuilder(new String(inData,
StandardCharsets.US_ASCII));
try {
IOUtils.write(csq, (Writer) null);
fail();
@@ -313,7 +314,7 @@ public class IOUtilsWriteTestCase {
//-----------------------------------------------------------------------
@Test
public void testWrite_stringToOutputStream() throws Exception {
- final String str = new String(inData, "US-ASCII");
+ final String str = new String(inData, StandardCharsets.US_ASCII);
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final ThrowOnFlushAndCloseOutputStream out = new
ThrowOnFlushAndCloseOutputStream(baout, true, true);
@@ -340,7 +341,7 @@ public class IOUtilsWriteTestCase {
@Test
public void testWrite_stringToOutputStream_nullStream() throws Exception {
- final String str = new String(inData, "US-ASCII");
+ final String str = new String(inData, StandardCharsets.US_ASCII);
try {
IOUtils.write(str, (OutputStream) null);
fail();
@@ -351,7 +352,7 @@ public class IOUtilsWriteTestCase {
//-----------------------------------------------------------------------
@Test
public void testWrite_stringToOutputStream_Encoding() throws Exception {
- final String str = new String(inData, "US-ASCII");
+ final String str = new String(inData, StandardCharsets.US_ASCII);
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final ThrowOnFlushAndCloseOutputStream out = new
ThrowOnFlushAndCloseOutputStream(baout, true, true);
@@ -361,7 +362,7 @@ public class IOUtilsWriteTestCase {
out.flush();
byte[] bytes = baout.toByteArray();
- bytes = new String(bytes, "UTF16").getBytes("US-ASCII");
+ bytes = new String(bytes,
StandardCharsets.UTF_16).getBytes(StandardCharsets.US_ASCII);
assertTrue(Arrays.equals(inData, bytes), "Content differs");
}
@@ -379,7 +380,7 @@ public class IOUtilsWriteTestCase {
@Test
public void testWrite_stringToOutputStream_Encoding_nullStream() throws
Exception {
- final String str = new String(inData, "US-ASCII");
+ final String str = new String(inData, StandardCharsets.US_ASCII);
try {
IOUtils.write(str, (OutputStream) null);
fail();
@@ -389,7 +390,7 @@ public class IOUtilsWriteTestCase {
@Test
public void testWrite_stringToOutputStream_nullEncoding() throws Exception
{
- final String str = new String(inData, "US-ASCII");
+ final String str = new String(inData, StandardCharsets.US_ASCII);
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final ThrowOnFlushAndCloseOutputStream out = new
ThrowOnFlushAndCloseOutputStream(baout, true, true);
@@ -405,12 +406,12 @@ public class IOUtilsWriteTestCase {
//-----------------------------------------------------------------------
@Test
public void testWrite_stringToWriter() throws Exception {
- final String str = new String(inData, "US-ASCII");
+ final String str = new String(inData, StandardCharsets.US_ASCII);
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
@SuppressWarnings("resource") // deliberately not closed
final ThrowOnFlushAndCloseOutputStream out = new
ThrowOnFlushAndCloseOutputStream(baout, true, true);
- final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
+ final Writer writer = new OutputStreamWriter(baout,
StandardCharsets.US_ASCII);
IOUtils.write(str, writer);
out.off();
@@ -425,7 +426,7 @@ public class IOUtilsWriteTestCase {
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
@SuppressWarnings("resource") // deliberately not closed
final ThrowOnFlushAndCloseOutputStream out = new
ThrowOnFlushAndCloseOutputStream(baout, true, true);
- final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
+ final Writer writer = new OutputStreamWriter(baout,
StandardCharsets.US_ASCII);
IOUtils.write((String) null, writer);
out.off();
@@ -436,7 +437,7 @@ public class IOUtilsWriteTestCase {
@Test
public void testWrite_stringToWriter_Encoding_nullStream() throws
Exception {
- final String str = new String(inData, "US-ASCII");
+ final String str = new String(inData, StandardCharsets.US_ASCII);
try {
IOUtils.write(str, (Writer) null);
fail();
@@ -447,7 +448,7 @@ public class IOUtilsWriteTestCase {
//-----------------------------------------------------------------------
@Test
public void testWrite_charArrayToOutputStream() throws Exception {
- final String str = new String(inData, "US-ASCII");
+ final String str = new String(inData, StandardCharsets.US_ASCII);
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final ThrowOnFlushAndCloseOutputStream out = new
ThrowOnFlushAndCloseOutputStream(baout, true, true);
@@ -474,7 +475,7 @@ public class IOUtilsWriteTestCase {
@Test
public void testWrite_charArrayToOutputStream_nullStream() throws
Exception {
- final String str = new String(inData, "US-ASCII");
+ final String str = new String(inData, StandardCharsets.US_ASCII);
try {
IOUtils.write(str.toCharArray(), (OutputStream) null);
fail();
@@ -485,7 +486,7 @@ public class IOUtilsWriteTestCase {
//-----------------------------------------------------------------------
@Test
public void testWrite_charArrayToOutputStream_Encoding() throws Exception {
- final String str = new String(inData, "US-ASCII");
+ final String str = new String(inData, StandardCharsets.US_ASCII);
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final ThrowOnFlushAndCloseOutputStream out = new
ThrowOnFlushAndCloseOutputStream(baout, true, true);
@@ -495,7 +496,7 @@ public class IOUtilsWriteTestCase {
out.flush();
byte[] bytes = baout.toByteArray();
- bytes = new String(bytes, "UTF16").getBytes("US-ASCII");
+ bytes = new String(bytes,
StandardCharsets.UTF_16).getBytes(StandardCharsets.US_ASCII);
assertTrue(Arrays.equals(inData, bytes), "Content differs");
}
@@ -513,7 +514,7 @@ public class IOUtilsWriteTestCase {
@Test
public void testWrite_charArrayToOutputStream_Encoding_nullStream() throws
Exception {
- final String str = new String(inData, "US-ASCII");
+ final String str = new String(inData, StandardCharsets.US_ASCII);
try {
IOUtils.write(str.toCharArray(), (OutputStream) null);
fail();
@@ -523,7 +524,7 @@ public class IOUtilsWriteTestCase {
@Test
public void testWrite_charArrayToOutputStream_nullEncoding() throws
Exception {
- final String str = new String(inData, "US-ASCII");
+ final String str = new String(inData, StandardCharsets.US_ASCII);
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final ThrowOnFlushAndCloseOutputStream out = new
ThrowOnFlushAndCloseOutputStream(baout, true, true);
@@ -539,12 +540,12 @@ public class IOUtilsWriteTestCase {
//-----------------------------------------------------------------------
@Test
public void testWrite_charArrayToWriter() throws Exception {
- final String str = new String(inData, "US-ASCII");
+ final String str = new String(inData, StandardCharsets.US_ASCII);
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
@SuppressWarnings("resource") // deliberately not closed
final ThrowOnFlushAndCloseOutputStream out = new
ThrowOnFlushAndCloseOutputStream(baout, true, true);
- final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
+ final Writer writer = new OutputStreamWriter(baout,
StandardCharsets.US_ASCII);
IOUtils.write(str.toCharArray(), writer);
out.off();
@@ -559,7 +560,7 @@ public class IOUtilsWriteTestCase {
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
@SuppressWarnings("resource") // deliberately not closed
final ThrowOnFlushAndCloseOutputStream out = new
ThrowOnFlushAndCloseOutputStream(baout, true, true);
- final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
+ final Writer writer = new OutputStreamWriter(baout,
StandardCharsets.US_ASCII);
IOUtils.write((char[]) null, writer);
out.off();
@@ -570,7 +571,7 @@ public class IOUtilsWriteTestCase {
@Test
public void testWrite_charArrayToWriter_Encoding_nullStream() throws
Exception {
- final String str = new String(inData, "US-ASCII");
+ final String str = new String(inData, StandardCharsets.US_ASCII);
try {
IOUtils.write(str.toCharArray(), (Writer) null);
fail();
@@ -727,7 +728,7 @@ public class IOUtilsWriteTestCase {
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
@SuppressWarnings("resource") // deliberately not closed
final ThrowOnFlushAndCloseOutputStream out = new
ThrowOnFlushAndCloseOutputStream(baout, true, true);
- final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
+ final Writer writer = new OutputStreamWriter(baout,
StandardCharsets.US_ASCII);
IOUtils.writeLines(list, "*", writer);
@@ -744,7 +745,7 @@ public class IOUtilsWriteTestCase {
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
@SuppressWarnings("resource") // deliberately not closed
final ThrowOnFlushAndCloseOutputStream out = new
ThrowOnFlushAndCloseOutputStream(baout, true, true);
- final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
+ final Writer writer = new OutputStreamWriter(baout,
StandardCharsets.US_ASCII);
IOUtils.writeLines(null, "*", writer);
out.off();
@@ -761,7 +762,7 @@ public class IOUtilsWriteTestCase {
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
@SuppressWarnings("resource") // deliberately not closed
final ThrowOnFlushAndCloseOutputStream out = new
ThrowOnFlushAndCloseOutputStream(baout, true, true);
- final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
+ final Writer writer = new OutputStreamWriter(baout,
StandardCharsets.US_ASCII);
IOUtils.writeLines(list, null, writer);
out.off();
diff --git
a/src/test/java/org/apache/commons/io/input/ReaderInputStreamTest.java
b/src/test/java/org/apache/commons/io/input/ReaderInputStreamTest.java
index eb7349c..9f7a556 100644
--- a/src/test/java/org/apache/commons/io/input/ReaderInputStreamTest.java
+++ b/src/test/java/org/apache/commons/io/input/ReaderInputStreamTest.java
@@ -23,6 +23,7 @@ import java.io.CharArrayReader;
import java.io.IOException;
import java.io.StringReader;
import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.Random;
import org.junit.jupiter.api.Test;
@@ -138,7 +139,7 @@ public class ReaderInputStreamTest {
// Input is UTF-8 bytes: 0xE0 0xB2 0xA0
final char[] inputChars = new char[] { (char) 0xE0, (char) 0xB2,
(char) 0xA0 };
// Charset charset = Charset.forName("UTF-8"); // works
- final Charset charset = Charset.forName("ASCII"); // infinite loop
+ final Charset charset = StandardCharsets.US_ASCII; // infinite loop
try (ReaderInputStream stream = new ReaderInputStream(new
CharArrayReader(inputChars), charset)) {
while (stream.read() != -1) {
}
diff --git
a/src/test/java/org/apache/commons/io/input/UnixLineEndingInputStreamTest.java
b/src/test/java/org/apache/commons/io/input/UnixLineEndingInputStreamTest.java
index e7b78ab..3314559 100644
---
a/src/test/java/org/apache/commons/io/input/UnixLineEndingInputStreamTest.java
+++
b/src/test/java/org/apache/commons/io/input/UnixLineEndingInputStreamTest.java
@@ -20,6 +20,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.ByteArrayInputStream;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import org.junit.jupiter.api.Test;
@@ -77,12 +78,12 @@ public class UnixLineEndingInputStreamTest
}
private String roundtrip( final String msg, final boolean ensure ) throws
IOException {
- final ByteArrayInputStream baos = new ByteArrayInputStream(
msg.getBytes( "UTF-8" ) );
+ final ByteArrayInputStream baos = new ByteArrayInputStream(
msg.getBytes(StandardCharsets.UTF_8) );
final UnixLineEndingInputStream lf = new UnixLineEndingInputStream(
baos, ensure );
final byte[] buf = new byte[100];
final int read = lf.read( buf );
lf.close();
- return new String( buf, 0, read, "UTF-8" );
+ return new String( buf, 0, read, StandardCharsets.UTF_8);
}
}
\ No newline at end of file
diff --git
a/src/test/java/org/apache/commons/io/input/WindowsLineEndingInputStreamTest.java
b/src/test/java/org/apache/commons/io/input/WindowsLineEndingInputStreamTest.java
index 6ecbbdf..e7e1255 100644
---
a/src/test/java/org/apache/commons/io/input/WindowsLineEndingInputStreamTest.java
+++
b/src/test/java/org/apache/commons/io/input/WindowsLineEndingInputStreamTest.java
@@ -20,6 +20,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.ByteArrayInputStream;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import org.junit.jupiter.api.Test;
@@ -67,11 +68,11 @@ public class WindowsLineEndingInputStreamTest {
}
private String roundtrip( final String msg, final boolean ensure ) throws
IOException {
- final ByteArrayInputStream baos = new ByteArrayInputStream(
msg.getBytes( "UTF-8" ) );
+ final ByteArrayInputStream baos = new ByteArrayInputStream(
msg.getBytes(StandardCharsets.UTF_8) );
final WindowsLineEndingInputStream lf = new
WindowsLineEndingInputStream( baos, ensure );
final byte[] buf = new byte[100];
final int read = lf.read( buf );
lf.close();
- return new String( buf, 0, read, "UTF-8" );
+ return new String( buf, 0, read, StandardCharsets.UTF_8);
}
}
\ No newline at end of file
diff --git a/src/test/java/org/apache/commons/io/input/XmlStreamReaderTest.java
b/src/test/java/org/apache/commons/io/input/XmlStreamReaderTest.java
index fcf2fc8..9a40762 100644
--- a/src/test/java/org/apache/commons/io/input/XmlStreamReaderTest.java
+++ b/src/test/java/org/apache/commons/io/input/XmlStreamReaderTest.java
@@ -30,6 +30,7 @@ import java.io.OutputStreamWriter;
import java.io.Writer;
import java.net.URL;
import java.net.URLConnection;
+import java.nio.charset.StandardCharsets;
import java.text.MessageFormat;
import java.util.HashMap;
import java.util.Map;
@@ -407,7 +408,7 @@ public class XmlStreamReaderTest {
@Test
public void testEncodingAttributeXML() throws Exception {
final InputStream is = new ByteArrayInputStream(ENCODING_ATTRIBUTE_XML
- .getBytes("UTF-8"));
+ .getBytes(StandardCharsets.UTF_8));
final XmlStreamReader xmlReader = new XmlStreamReader(is, "", true);
assertEquals(xmlReader.getEncoding(), "UTF-8");
xmlReader.close();
diff --git
a/src/test/java/org/apache/commons/io/monitor/AbstractMonitorTestCase.java
b/src/test/java/org/apache/commons/io/monitor/AbstractMonitorTestCase.java
index cc4e246..5b06469 100644
--- a/src/test/java/org/apache/commons/io/monitor/AbstractMonitorTestCase.java
+++ b/src/test/java/org/apache/commons/io/monitor/AbstractMonitorTestCase.java
@@ -46,7 +46,7 @@ public abstract class AbstractMonitorTestCase {
protected File testDir;
/** Time in milliseconds to pause in tests */
- protected long pauseTime = 100L;
+ protected final long pauseTime = 100L;
@BeforeEach
public void setUp() throws Exception {
diff --git a/src/test/java/org/apache/commons/io/output/ProxyWriterTest.java
b/src/test/java/org/apache/commons/io/output/ProxyWriterTest.java
index d77b787..531d00c 100644
--- a/src/test/java/org/apache/commons/io/output/ProxyWriterTest.java
+++ b/src/test/java/org/apache/commons/io/output/ProxyWriterTest.java
@@ -110,7 +110,6 @@ public class ProxyWriterTest {
try (final ProxyWriter proxy = new
ProxyWriter(NullWriter.NULL_WRITER)) {
proxy.write((String) null);
proxy.write((String) null, 0, 0);
- proxy.close();
}
}
@@ -126,7 +125,6 @@ public class ProxyWriterTest {
public void nullCharSequence() throws Exception {
try (final ProxyWriter proxy = new
ProxyWriter(NullWriter.NULL_WRITER)) {
proxy.append(null);
- proxy.close();
}
}
diff --git
a/src/test/java/org/apache/commons/io/output/WriterOutputStreamTest.java
b/src/test/java/org/apache/commons/io/output/WriterOutputStreamTest.java
index e50e1c9..5f22562 100644
--- a/src/test/java/org/apache/commons/io/output/WriterOutputStreamTest.java
+++ b/src/test/java/org/apache/commons/io/output/WriterOutputStreamTest.java
@@ -21,6 +21,7 @@ import static org.junit.jupiter.api.Assertions.fail;
import java.io.IOException;
import java.io.StringWriter;
+import java.nio.charset.StandardCharsets;
import java.util.Random;
import org.junit.jupiter.api.Test;
@@ -131,7 +132,7 @@ public class WriterOutputStreamTest {
public void testFlush() throws IOException {
final StringWriter writer = new StringWriter();
try (final WriterOutputStream out = new WriterOutputStream(writer,
"us-ascii", 1024, false)) {
- out.write("abc".getBytes("us-ascii"));
+ out.write("abc".getBytes(StandardCharsets.US_ASCII));
assertEquals(0, writer.getBuffer().length());
out.flush();
assertEquals("abc", writer.toString());
@@ -142,7 +143,7 @@ public class WriterOutputStreamTest {
public void testWriteImmediately() throws IOException {
final StringWriter writer = new StringWriter();
try (final WriterOutputStream out = new WriterOutputStream(writer,
"us-ascii", 1024, true)) {
- out.write("abc".getBytes("us-ascii"));
+ out.write("abc".getBytes(StandardCharsets.US_ASCII));
assertEquals("abc", writer.toString());
}
}
diff --git a/src/test/java/org/apache/commons/io/test/TestUtils.java
b/src/test/java/org/apache/commons/io/test/TestUtils.java
index ad9ef1d..a17fb92 100644
--- a/src/test/java/org/apache/commons/io/test/TestUtils.java
+++ b/src/test/java/org/apache/commons/io/test/TestUtils.java
@@ -33,6 +33,7 @@ import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.io.Reader;
import java.io.Writer;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import org.apache.commons.io.FileUtils;
@@ -157,7 +158,7 @@ public abstract class TestUtils {
if (file.getParentFile() != null && !file.getParentFile().exists()) {
throw new IOException("Cannot create file " + file + " as the
parent directory does not exist");
}
- try (final PrintWriter output = new PrintWriter(new
OutputStreamWriter(new FileOutputStream(file), "UTF-8"))) {
+ try (final PrintWriter output = new PrintWriter(new
OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8))) {
for (final String element : data) {
output.println(element);
}
