From 819eac1f82887c09acfa8be05fbe633acddc052b Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Tue, 19 Dec 2017 00:23:52 +0000 Subject: [PATCH] use StandardCharsets git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1818628 13f79535-47bb-0310-9956-ffa450edef68 --- src/examples/src/org/apache/poi/hwpf/Word2Forrest.java | 4 ++-- .../org/apache/poi/stress/HPSFFileHandler.java | 4 ++-- src/java/org/apache/poi/poifs/crypt/DataSpaceMapUtils.java | 6 +++--- src/java/org/apache/poi/poifs/filesystem/FileMagic.java | 4 ++-- src/java/org/apache/poi/util/HexDump.java | 5 ++--- src/java/org/apache/poi/util/ReplacingInputStream.java | 7 +++---- src/java/org/apache/poi/util/StringUtil.java | 7 ++++--- .../org/apache/poi/openxml4j/opc/PackagingURIHelper.java | 4 ++-- .../poi/poifs/crypt/dsig/services/TSPTimeStampService.java | 4 ++-- src/ooxml/java/org/apache/poi/xssf/binary/XSSFBUtils.java | 6 +++--- .../apache/poi/xssf/usermodel/XSSFBuiltinTableStyle.java | 4 ++-- .../org/apache/poi/poifs/crypt/TestHxxFEncryption.java | 4 ++-- .../TestSXSSFWorkbookWithCustomZipEntrySource.java | 6 +----- .../org/apache/poi/xssf/usermodel/TestUnfixedBugs.java | 7 ++----- .../poi/xssf/util/TestEvilUnclosedBRFixingInputStream.java | 4 ++-- .../src/org/apache/poi/hdgf/chunks/ChunkHeaderV11.java | 3 ++- .../src/org/apache/poi/hemf/record/HemfText.java | 6 +++--- src/scratchpad/src/org/apache/poi/hslf/dev/PPTXMLDump.java | 4 ++-- .../src/org/apache/poi/hwmf/record/HwmfFont.java | 4 ++-- 19 files changed, 43 insertions(+), 50 deletions(-) diff --git a/src/examples/src/org/apache/poi/hwpf/Word2Forrest.java b/src/examples/src/org/apache/poi/hwpf/Word2Forrest.java index 4a8ef5ad1f..e773efb5d1 100644 --- a/src/examples/src/org/apache/poi/hwpf/Word2Forrest.java +++ b/src/examples/src/org/apache/poi/hwpf/Word2Forrest.java @@ -24,7 +24,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.Writer; -import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import org.apache.poi.hwpf.model.StyleDescription; import org.apache.poi.hwpf.model.StyleSheet; @@ -40,7 +40,7 @@ public final class Word2Forrest @SuppressWarnings("unused") public Word2Forrest(HWPFDocument doc, OutputStream stream) throws IOException { - _out = new OutputStreamWriter (stream, Charset.forName("UTF-8")); + _out = new OutputStreamWriter (stream, StandardCharsets.UTF_8); _doc = doc; init (); diff --git a/src/integrationtest/org/apache/poi/stress/HPSFFileHandler.java b/src/integrationtest/org/apache/poi/stress/HPSFFileHandler.java index e348d964e0..cf0ebd0943 100644 --- a/src/integrationtest/org/apache/poi/stress/HPSFFileHandler.java +++ b/src/integrationtest/org/apache/poi/stress/HPSFFileHandler.java @@ -24,7 +24,7 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.io.PrintStream; -import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.Collections; import java.util.HashSet; @@ -110,7 +110,7 @@ public class HPSFFileHandler extends POIFSFileHandler { try { System.setOut(psNew); CopyCompare.main(new String[]{file.getAbsolutePath(), copyOutput.getAbsolutePath()}); - assertEquals("Equal" + NL, new String(bos.toByteArray(), Charset.forName("UTF-8"))); + assertEquals("Equal" + NL, new String(bos.toByteArray(), StandardCharsets.UTF_8)); } finally { System.setOut(ps); } diff --git a/src/java/org/apache/poi/poifs/crypt/DataSpaceMapUtils.java b/src/java/org/apache/poi/poifs/crypt/DataSpaceMapUtils.java index 38f0b533c4..5f21b52b90 100644 --- a/src/java/org/apache/poi/poifs/crypt/DataSpaceMapUtils.java +++ b/src/java/org/apache/poi/poifs/crypt/DataSpaceMapUtils.java @@ -18,7 +18,7 @@ package org.apache.poi.poifs.crypt; import java.io.IOException; -import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import org.apache.poi.EncryptedDocumentException; import org.apache.poi.poifs.crypt.standard.EncryptionRecord; @@ -352,7 +352,7 @@ public class DataSpaceMapUtils { } } - return new String(data, 0, data.length, Charset.forName("UTF-8")); + return new String(data, 0, data.length, StandardCharsets.UTF_8); } public static void writeUtf8LPP4(LittleEndianOutput os, String str) { @@ -360,7 +360,7 @@ public class DataSpaceMapUtils { os.writeInt(str == null ? 0 : 4); os.writeInt(0); } else { - byte buf[] = str.getBytes(Charset.forName("UTF-8")); + byte buf[] = str.getBytes(StandardCharsets.UTF_8); os.writeInt(buf.length); os.write(buf); int scratchBytes = buf.length%4; diff --git a/src/java/org/apache/poi/poifs/filesystem/FileMagic.java b/src/java/org/apache/poi/poifs/filesystem/FileMagic.java index c7fe7ca99c..6bde1ced8e 100644 --- a/src/java/org/apache/poi/poifs/filesystem/FileMagic.java +++ b/src/java/org/apache/poi/poifs/filesystem/FileMagic.java @@ -19,11 +19,11 @@ package org.apache.poi.poifs.filesystem; import static org.apache.poi.poifs.common.POIFSConstants.OOXML_FILE_HEADER; import static org.apache.poi.poifs.common.POIFSConstants.RAW_XML_FILE_HEADER; +import static java.nio.charset.StandardCharsets.UTF_8; import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; -import java.nio.charset.Charset; import org.apache.poi.poifs.storage.HeaderBlockConstants; import org.apache.poi.util.IOUtils; @@ -76,7 +76,7 @@ public enum FileMagic { /** PDF document */ PDF("%PDF"), /** Some different HTML documents */ - HTML(" data.length) { throw new XSSFBParseException("trying to read beyond data length"); } - sb.append(new String(data, offset, numBytes, Charset.forName("UTF-16LE"))); + sb.append(new String(data, offset, numBytes, StandardCharsets.UTF_16LE)); numBytes+=4; return numBytes; } diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFBuiltinTableStyle.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFBuiltinTableStyle.java index 84a5e916b3..b44d4286ac 100644 --- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFBuiltinTableStyle.java +++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFBuiltinTableStyle.java @@ -19,7 +19,7 @@ package org.apache.poi.xssf.usermodel; import java.io.ByteArrayInputStream; import java.io.InputStream; -import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.EnumMap; import java.util.Map; @@ -403,7 +403,7 @@ public enum XSSFBuiltinTableStyle { // hack because I can't figure out how to get XMLBeans to parse a sub-element in a standalone manner // - build a fake styles.xml file with just this built-in StylesTable styles = new StylesTable(); - styles.readFrom(new ByteArrayInputStream(styleXML(dxfsNode, tableStyleNode).getBytes(Charset.forName("UTF-8")))); + styles.readFrom(new ByteArrayInputStream(styleXML(dxfsNode, tableStyleNode).getBytes(StandardCharsets.UTF_8))); styleMap.put(builtIn, new XSSFBuiltinTypeStyleStyle(builtIn, styles.getExplicitTableStyle(styleName))); } } finally { diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestHxxFEncryption.java b/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestHxxFEncryption.java index eda48b6eee..68c8bfa054 100644 --- a/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestHxxFEncryption.java +++ b/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestHxxFEncryption.java @@ -28,7 +28,7 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; -import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.Collection; @@ -94,7 +94,7 @@ public class TestHxxFEncryption { } private static String x(String base64) throws IOException { - return new String(RawDataUtil.decompress(base64), Charset.forName("UTF-8")); + return new String(RawDataUtil.decompress(base64), StandardCharsets.UTF_8); } @Test diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbookWithCustomZipEntrySource.java b/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbookWithCustomZipEntrySource.java index 43c3f22ff5..e9f2669397 100644 --- a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbookWithCustomZipEntrySource.java +++ b/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbookWithCustomZipEntrySource.java @@ -22,6 +22,7 @@ package org.apache.poi.xssf.streaming; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import static java.nio.charset.StandardCharsets.UTF_8; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -102,11 +103,6 @@ public final class TestSXSSFWorkbookWithCustomZipEntrySource { opc.close(); } - // Java 7 and above: - // import static java.nio.charset.StandardCharsets.UTF_8; - // Java 6 and below: - private static final Charset UTF_8 = Charset.forName("UTF-8"); - @Test public void validateTempFilesAreEncrypted() throws IOException { TempFileRecordingSXSSFWorkbookWithCustomZipEntrySource workbook = new TempFileRecordingSXSSFWorkbookWithCustomZipEntrySource(); diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java index 2971c2666d..c9fdf64819 100644 --- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java +++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java @@ -23,11 +23,8 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileOutputStream; import java.io.IOException; -import java.io.OutputStream; -import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.Calendar; import java.util.Date; @@ -86,7 +83,7 @@ public final class TestUnfixedBugs { private void verifyBug54084Unicode(Workbook wb) { // expected data is stored in UTF-8 in a text-file byte data[] = HSSFTestDataSamples.getTestDataFileContent("54084 - Greek - beyond BMP.txt"); - String testData = new String(data, Charset.forName("UTF-8")).trim(); + String testData = new String(data, StandardCharsets.UTF_8).trim(); Sheet sheet = wb.getSheetAt(0); Row row = sheet.getRow(0); diff --git a/src/ooxml/testcases/org/apache/poi/xssf/util/TestEvilUnclosedBRFixingInputStream.java b/src/ooxml/testcases/org/apache/poi/xssf/util/TestEvilUnclosedBRFixingInputStream.java index d9010fbbc2..c4a8b52f9a 100644 --- a/src/ooxml/testcases/org/apache/poi/xssf/util/TestEvilUnclosedBRFixingInputStream.java +++ b/src/ooxml/testcases/org/apache/poi/xssf/util/TestEvilUnclosedBRFixingInputStream.java @@ -22,7 +22,7 @@ import static org.junit.Assert.assertArrayEquals; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import org.apache.poi.util.IOUtils; import org.apache.poi.util.ReplacingInputStream; @@ -89,6 +89,6 @@ public final class TestEvilUnclosedBRFixingInputStream { } private static byte[] getBytes(String str) { - return str.getBytes(Charset.forName("UTF-8")); + return str.getBytes(StandardCharsets.UTF_8); } } diff --git a/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeaderV11.java b/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeaderV11.java index ca243c9963..3dc1e8113e 100644 --- a/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeaderV11.java +++ b/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeaderV11.java @@ -18,6 +18,7 @@ package org.apache.poi.hdgf.chunks; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; /** * A chunk header from v11+ @@ -62,6 +63,6 @@ public final class ChunkHeaderV11 extends ChunkHeaderV6 { @Override public Charset getChunkCharset() { - return Charset.forName("UTF-16LE"); + return StandardCharsets.UTF_16LE; } } diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/HemfText.java b/src/scratchpad/src/org/apache/poi/hemf/record/HemfText.java index 6d3a1b297d..74b8212846 100644 --- a/src/scratchpad/src/org/apache/poi/hemf/record/HemfText.java +++ b/src/scratchpad/src/org/apache/poi/hemf/record/HemfText.java @@ -17,6 +17,7 @@ package org.apache.poi.hemf.record; +import static java.nio.charset.StandardCharsets.UTF_16LE; import java.io.ByteArrayInputStream; import java.io.EOFException; @@ -39,7 +40,6 @@ import org.apache.poi.util.RecordFormatException; @Internal public class HemfText { - private static final Charset UTF16LE = Charset.forName("UTF-16LE"); private static final int MAX_RECORD_LENGTH = 1_000_000; public static class ExtCreateFontIndirectW extends UnimplementedHemfRecord { @@ -162,11 +162,11 @@ public class HemfText { @Override protected Charset getEncodingHint() { - return UTF16LE; + return UTF_16LE; } public String getText() throws IOException { - return getText(UTF16LE); + return getText(UTF_16LE); } } diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/PPTXMLDump.java b/src/scratchpad/src/org/apache/poi/hslf/dev/PPTXMLDump.java index a14a09bea4..b2c84af24f 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/dev/PPTXMLDump.java +++ b/src/scratchpad/src/org/apache/poi/hslf/dev/PPTXMLDump.java @@ -25,7 +25,7 @@ import java.io.InputStream; import java.io.OutputStreamWriter; import java.io.StringWriter; import java.io.Writer; -import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import org.apache.poi.hslf.record.RecordTypes; import org.apache.poi.hslf.usermodel.HSLFSlideShow; @@ -212,7 +212,7 @@ public final class PPTXMLDump { if (outFile){ FileOutputStream fos = new FileOutputStream(ppt.getName() + ".xml"); - OutputStreamWriter out = new OutputStreamWriter(fos, Charset.forName("UTF8")); + OutputStreamWriter out = new OutputStreamWriter(fos, StandardCharsets.UTF_8); dump.dump(out); out.close(); } else { diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfFont.java b/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfFont.java index ac667f73fc..f094ae1959 100644 --- a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfFont.java +++ b/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfFont.java @@ -18,7 +18,7 @@ package org.apache.poi.hwmf.record; import java.io.IOException; -import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import org.apache.poi.common.usermodel.fonts.FontCharset; import org.apache.poi.common.usermodel.fonts.FontFamily; @@ -369,7 +369,7 @@ public class HwmfFont implements FontInfo { buf[readBytes++] = b = leis.readByte(); } while (b != 0 && b != -1 && readBytes <= 32); - facename = new String(buf, 0, readBytes-1, Charset.forName("ISO-8859-1")); + facename = new String(buf, 0, readBytes-1, StandardCharsets.ISO_8859_1); return 5*LittleEndianConsts.SHORT_SIZE+8*LittleEndianConsts.BYTE_SIZE+readBytes; }