From f10b16830ca54663999997bd9b7e87a90f1cbedf Mon Sep 17 00:00:00 2001 From: Javen O'Neal Date: Sun, 9 Oct 2016 18:06:46 +0000 Subject: [PATCH] bug 60153: java.nio.charset.StandardCharsets is not available until Java 7. Use Charset.forName for Java 6 compatibility git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1763997 13f79535-47bb-0310-9956-ffa450edef68 --- .../TestSXSSFWorkbookWithCustomZipEntrySource.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 751e5f9a36..31f29e2b7b 100644 --- a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbookWithCustomZipEntrySource.java +++ b/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbookWithCustomZipEntrySource.java @@ -19,7 +19,6 @@ package org.apache.poi.xssf.streaming; -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.assertTrue; @@ -32,9 +31,9 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.nio.charset.Charset; import java.security.GeneralSecurityException; import java.security.SecureRandom; -import java.util.ArrayList; import java.util.List; import javax.crypto.Cipher; @@ -115,6 +114,11 @@ 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(); -- 2.39.5