Modified: poi/trunk/poi/src/test/java/org/apache/poi/hssf/usermodel/TestOLE2Embedding.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/hssf/usermodel/TestOLE2Embedding.java?rev=1910300&r1=1910299&r2=1910300&view=diff ============================================================================== --- poi/trunk/poi/src/test/java/org/apache/poi/hssf/usermodel/TestOLE2Embedding.java (original) +++ poi/trunk/poi/src/test/java/org/apache/poi/hssf/usermodel/TestOLE2Embedding.java Thu Jun 8 08:53:08 2023 @@ -105,7 +105,7 @@ final class TestOLE2Embedding { circle.setNoFill(true); try (HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1)) { - UnsynchronizedByteArrayOutputStream bos = new UnsynchronizedByteArrayOutputStream(); + UnsynchronizedByteArrayOutputStream bos = UnsynchronizedByteArrayOutputStream.builder().get(); HSSFObjectData od = wb2.getAllEmbeddedObjects().get(0); Ole10Native ole10 = Ole10Native.createFromEmbeddedOleObject((DirectoryNode) od.getDirectory()); bos.reset(); @@ -135,7 +135,7 @@ final class TestOLE2Embedding { } static POIFSFileSystem getSampleXLS() throws IOException { - UnsynchronizedByteArrayOutputStream bos = new UnsynchronizedByteArrayOutputStream(); + UnsynchronizedByteArrayOutputStream bos = UnsynchronizedByteArrayOutputStream.builder().get(); try (HSSFWorkbook wb = new HSSFWorkbook()) { HSSFSheet sheet = wb.createSheet(); sheet.createRow(5).createCell(2).setCellValue("yo dawg i herd you like embeddet objekts, so we put an ole in your ole so you can save a file while you save a file");
Modified: poi/trunk/poi/src/test/java/org/apache/poi/hssf/usermodel/TestPOIFSProperties.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/hssf/usermodel/TestPOIFSProperties.java?rev=1910300&r1=1910299&r2=1910300&view=diff ============================================================================== --- poi/trunk/poi/src/test/java/org/apache/poi/hssf/usermodel/TestPOIFSProperties.java (original) +++ poi/trunk/poi/src/test/java/org/apache/poi/hssf/usermodel/TestPOIFSProperties.java Thu Jun 8 08:53:08 2023 @@ -42,7 +42,7 @@ class TestPOIFSProperties { @Test void testFail() throws IOException, NoPropertySetStreamException, WritingNotSupportedException { - UnsynchronizedByteArrayOutputStream out = new UnsynchronizedByteArrayOutputStream(); + UnsynchronizedByteArrayOutputStream out = UnsynchronizedByteArrayOutputStream.builder().get(); // read the workbook, adjust the SummaryInformation and write the data to a byte array try (POIFSFileSystem fs = openFileSystem(); HSSFWorkbook wb = new HSSFWorkbook(fs)) { @@ -61,7 +61,7 @@ class TestPOIFSProperties { @Test void testOK() throws Exception { - UnsynchronizedByteArrayOutputStream out = new UnsynchronizedByteArrayOutputStream(); + UnsynchronizedByteArrayOutputStream out = UnsynchronizedByteArrayOutputStream.builder().get(); // read the workbook, adjust the SummaryInformation and write the data to a byte array try (POIFSFileSystem fs = openFileSystem()) { Modified: poi/trunk/poi/src/test/java/org/apache/poi/poifs/crypt/agile/TestAgileDecryptor.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/poifs/crypt/agile/TestAgileDecryptor.java?rev=1910300&r1=1910299&r2=1910300&view=diff ============================================================================== --- poi/trunk/poi/src/test/java/org/apache/poi/poifs/crypt/agile/TestAgileDecryptor.java (original) +++ poi/trunk/poi/src/test/java/org/apache/poi/poifs/crypt/agile/TestAgileDecryptor.java Thu Jun 8 08:53:08 2023 @@ -69,7 +69,7 @@ class TestAgileDecryptor { os.write(testData); } - UnsynchronizedByteArrayOutputStream bos = new UnsynchronizedByteArrayOutputStream(); + UnsynchronizedByteArrayOutputStream bos = UnsynchronizedByteArrayOutputStream.builder().get(); fsEnc.writeFilesystem(bos); bos.close(); Modified: poi/trunk/poi/src/test/java/org/apache/poi/poifs/dev/TestPOIFSDump.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/poifs/dev/TestPOIFSDump.java?rev=1910300&r1=1910299&r2=1910300&view=diff ============================================================================== --- poi/trunk/poi/src/test/java/org/apache/poi/poifs/dev/TestPOIFSDump.java (original) +++ poi/trunk/poi/src/test/java/org/apache/poi/poifs/dev/TestPOIFSDump.java Thu Jun 8 08:53:08 2023 @@ -51,7 +51,7 @@ public class TestPOIFSDump { @BeforeAll public static void setUp() throws UnsupportedEncodingException { SYSTEM = System.out; - System.setOut(new NullPrintStream()); + System.setOut(NullPrintStream.INSTANCE); } @AfterAll Modified: poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestDocument.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestDocument.java?rev=1910300&r1=1910299&r2=1910300&view=diff ============================================================================== --- poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestDocument.java (original) +++ poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestDocument.java Thu Jun 8 08:53:08 2023 @@ -68,7 +68,7 @@ class TestDocument { // verify that output is correct POIFSDocument document = checkDocument(poifs, LARGER_BIG_BLOCK_SIZE + 1); DocumentProperty property = document.getDocumentProperty(); - UnsynchronizedByteArrayOutputStream stream = new UnsynchronizedByteArrayOutputStream(); + UnsynchronizedByteArrayOutputStream stream = UnsynchronizedByteArrayOutputStream.builder().get(); property.writeData(stream); byte[] output = stream.toByteArray(); @@ -135,7 +135,7 @@ class TestDocument { assertEquals(blockCountExp, blockCountAct); - UnsynchronizedByteArrayOutputStream stream = new UnsynchronizedByteArrayOutputStream(); + UnsynchronizedByteArrayOutputStream stream = UnsynchronizedByteArrayOutputStream.builder().get(); try (DocumentInputStream dis = document.getFileSystem().createDocumentInputStream( document.getDocumentProperty().getName())) { IOUtils.copy(dis, stream); Modified: poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestDocumentOutputStream.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestDocumentOutputStream.java?rev=1910300&r1=1910299&r2=1910300&view=diff ============================================================================== --- poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestDocumentOutputStream.java (original) +++ poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestDocumentOutputStream.java Thu Jun 8 08:53:08 2023 @@ -97,7 +97,7 @@ final class TestDocumentOutputStream { root.createDocument("foo", expected.length, l); try (DocumentInputStream is = root.createDocumentInputStream("foo")) { - final UnsynchronizedByteArrayOutputStream bos = new UnsynchronizedByteArrayOutputStream(expected.length); + final UnsynchronizedByteArrayOutputStream bos = UnsynchronizedByteArrayOutputStream.builder().setBufferSize(expected.length).get(); IOUtils.copy(is, bos); assertArrayEquals(expected, bos.toByteArray()); } Modified: poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestEmptyDocument.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestEmptyDocument.java?rev=1910300&r1=1910299&r2=1910300&view=diff ============================================================================== --- poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestEmptyDocument.java (original) +++ poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestEmptyDocument.java Thu Jun 8 08:53:08 2023 @@ -82,7 +82,7 @@ final class TestEmptyDocument { DirectoryEntry dir = fs.getRoot(); emptyDoc.handle(dir); - UnsynchronizedByteArrayOutputStream out = new UnsynchronizedByteArrayOutputStream(); + UnsynchronizedByteArrayOutputStream out = UnsynchronizedByteArrayOutputStream.builder().get(); fs.writeFilesystem(out); assertDoesNotThrow(() -> new POIFSFileSystem(out.toInputStream())); } @@ -92,7 +92,7 @@ final class TestEmptyDocument { void testEmptyDocumentBug11744() throws Exception { byte[] testData = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; - UnsynchronizedByteArrayOutputStream out = new UnsynchronizedByteArrayOutputStream(); + UnsynchronizedByteArrayOutputStream out = UnsynchronizedByteArrayOutputStream.builder().get(); try (POIFSFileSystem fs = new POIFSFileSystem()) { fs.createDocument(new ByteArrayInputStream(new byte[0]), "Empty"); fs.createDocument(new ByteArrayInputStream(testData), "NotEmpty"); Modified: poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestEntryUtils.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestEntryUtils.java?rev=1910300&r1=1910299&r2=1910300&view=diff ============================================================================== --- poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestEntryUtils.java (original) +++ poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestEntryUtils.java Thu Jun 8 08:53:08 2023 @@ -125,7 +125,7 @@ class TestEntryUtils { // Can work with POIFS - try (UnsynchronizedByteArrayOutputStream tmpO = new UnsynchronizedByteArrayOutputStream()) { + try (UnsynchronizedByteArrayOutputStream tmpO = UnsynchronizedByteArrayOutputStream.builder().get()) { fs.writeFilesystem(tmpO); try (InputStream tmpI = tmpO.toInputStream(); Modified: poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java?rev=1910300&r1=1910299&r2=1910300&view=diff ============================================================================== --- poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java (original) +++ poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java Thu Jun 8 08:53:08 2023 @@ -140,7 +140,7 @@ final class TestFileSystemBugs { EntryUtils.copyNodes(root, dest); // Re-load - UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream(); + UnsynchronizedByteArrayOutputStream baos = UnsynchronizedByteArrayOutputStream.builder().get(); root.getFileSystem().writeFilesystem(baos); POIFSFileSystem read = new POIFSFileSystem(baos.toInputStream()); Modified: poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestOle10Native.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestOle10Native.java?rev=1910300&r1=1910299&r2=1910300&view=diff ============================================================================== --- poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestOle10Native.java (original) +++ poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestOle10Native.java Thu Jun 8 08:53:08 2023 @@ -67,14 +67,14 @@ class TestOle10Native { findOle10(entries, fs.getRoot(), "/"); for (Entry e : entries) { - UnsynchronizedByteArrayOutputStream bosExp = new UnsynchronizedByteArrayOutputStream(); + UnsynchronizedByteArrayOutputStream bosExp = UnsynchronizedByteArrayOutputStream.builder().get(); try (InputStream is = ((DirectoryNode) e.getParent()).createDocumentInputStream(e)) { IOUtils.copy(is, bosExp); } Ole10Native ole = Ole10Native.createFromEmbeddedOleObject((DirectoryNode) e.getParent()); - UnsynchronizedByteArrayOutputStream bosAct = new UnsynchronizedByteArrayOutputStream(); + UnsynchronizedByteArrayOutputStream bosAct = UnsynchronizedByteArrayOutputStream.builder().get(); ole.writeOut(bosAct); assertThat(bosExp.toByteArray(), equalTo(bosAct.toByteArray())); Modified: poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSFileSystem.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSFileSystem.java?rev=1910300&r1=1910299&r2=1910300&view=diff ============================================================================== --- poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSFileSystem.java (original) +++ poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSFileSystem.java Thu Jun 8 08:53:08 2023 @@ -142,7 +142,7 @@ final class TestPOIFSFileSystem { try (POIFSFileSystem fs = new POIFSFileSystem(_samples.openResourceAsStream(file))) { // Write it into a temp output array - UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream(); + UnsynchronizedByteArrayOutputStream baos = UnsynchronizedByteArrayOutputStream.builder().get(); fs.writeFilesystem(baos); // Check sizes @@ -181,7 +181,7 @@ final class TestPOIFSFileSystem { "BIG", new ByteArrayInputStream(hugeStream) ); - UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream(); + UnsynchronizedByteArrayOutputStream baos = UnsynchronizedByteArrayOutputStream.builder().get(); fs.writeFilesystem(baos); byte[] fsData = baos.toByteArray(); Modified: poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSStream.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSStream.java?rev=1910300&r1=1910299&r2=1910300&view=diff ============================================================================== --- poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSStream.java (original) +++ poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSStream.java Thu Jun 8 08:53:08 2023 @@ -1190,7 +1190,7 @@ final class TestPOIFSStream { } private static HeaderBlock writeOutAndReadHeader(POIFSFileSystem fs) throws IOException { - UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream(); + UnsynchronizedByteArrayOutputStream baos = UnsynchronizedByteArrayOutputStream.builder().get(); fs.writeFilesystem(baos); return new HeaderBlock(baos.toInputStream()); } Modified: poi/trunk/poi/src/test/java/org/apache/poi/poifs/property/TestDirectoryProperty.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/poifs/property/TestDirectoryProperty.java?rev=1910300&r1=1910299&r2=1910300&view=diff ============================================================================== --- poi/trunk/poi/src/test/java/org/apache/poi/poifs/property/TestDirectoryProperty.java (original) +++ poi/trunk/poi/src/test/java/org/apache/poi/poifs/property/TestDirectoryProperty.java Thu Jun 8 08:53:08 2023 @@ -188,7 +188,7 @@ final class TestDirectoryProperty { } private void verifyProperty() throws IOException { - UnsynchronizedByteArrayOutputStream stream = new UnsynchronizedByteArrayOutputStream(512); + UnsynchronizedByteArrayOutputStream stream = UnsynchronizedByteArrayOutputStream.builder().setBufferSize(512).get(); _property.writeData(stream); byte[] output = stream.toByteArray(); @@ -254,7 +254,7 @@ final class TestDirectoryProperty { private static void verifyReadingProperty(int index, byte[] input, int offset, String name) { DirectoryProperty property = new DirectoryProperty(index, input, offset); - UnsynchronizedByteArrayOutputStream stream = new UnsynchronizedByteArrayOutputStream(128); + UnsynchronizedByteArrayOutputStream stream = UnsynchronizedByteArrayOutputStream.builder().setBufferSize(128).get(); byte[] expected = Arrays.copyOfRange(input, offset, offset+128); try { property.writeData(stream); Modified: poi/trunk/poi/src/test/java/org/apache/poi/poifs/property/TestDocumentProperty.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/poifs/property/TestDocumentProperty.java?rev=1910300&r1=1910299&r2=1910300&view=diff ============================================================================== --- poi/trunk/poi/src/test/java/org/apache/poi/poifs/property/TestDocumentProperty.java (original) +++ poi/trunk/poi/src/test/java/org/apache/poi/poifs/property/TestDocumentProperty.java Thu Jun 8 08:53:08 2023 @@ -83,7 +83,7 @@ final class TestDocumentProperty { throws IOException { DocumentProperty property = new DocumentProperty(index, input, offset); - UnsynchronizedByteArrayOutputStream stream = new UnsynchronizedByteArrayOutputStream(128); + UnsynchronizedByteArrayOutputStream stream = UnsynchronizedByteArrayOutputStream.builder().setBufferSize(128).get(); byte[] expected = Arrays.copyOfRange(input, offset, offset+128); property.writeData(stream); byte[] output = stream.toByteArray(); @@ -145,7 +145,7 @@ final class TestDocumentProperty { { testblock[ index * 2 ] = name_bytes[ index ]; } - UnsynchronizedByteArrayOutputStream stream = new UnsynchronizedByteArrayOutputStream(512); + UnsynchronizedByteArrayOutputStream stream = UnsynchronizedByteArrayOutputStream.builder().setBufferSize(512).get(); property.writeData(stream); byte[] output = stream.toByteArray(); Modified: poi/trunk/poi/src/test/java/org/apache/poi/poifs/property/TestPropertyTable.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/poifs/property/TestPropertyTable.java?rev=1910300&r1=1910299&r2=1910300&view=diff ============================================================================== --- poi/trunk/poi/src/test/java/org/apache/poi/poifs/property/TestPropertyTable.java (original) +++ poi/trunk/poi/src/test/java/org/apache/poi/poifs/property/TestPropertyTable.java Thu Jun 8 08:53:08 2023 @@ -45,7 +45,7 @@ import org.junit.jupiter.api.Test; final class TestPropertyTable { private static void confirmBlockEncoding(String expectedDataStr, PropertyTable table) throws IOException { - final UnsynchronizedByteArrayOutputStream bos = new UnsynchronizedByteArrayOutputStream(); + final UnsynchronizedByteArrayOutputStream bos = UnsynchronizedByteArrayOutputStream.builder().get(); byte[] expectedData = RawDataUtil.decompress(expectedDataStr); POIFSStream stream = new POIFSStream(null) { Modified: poi/trunk/poi/src/test/java/org/apache/poi/poifs/property/TestRootProperty.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/poifs/property/TestRootProperty.java?rev=1910300&r1=1910299&r2=1910300&view=diff ============================================================================== --- poi/trunk/poi/src/test/java/org/apache/poi/poifs/property/TestRootProperty.java (original) +++ poi/trunk/poi/src/test/java/org/apache/poi/poifs/property/TestRootProperty.java Thu Jun 8 08:53:08 2023 @@ -42,7 +42,7 @@ final class TestRootProperty { void testConstructor() throws IOException { createBasicRootProperty(); - UnsynchronizedByteArrayOutputStream stream = new UnsynchronizedByteArrayOutputStream(512); + UnsynchronizedByteArrayOutputStream stream = UnsynchronizedByteArrayOutputStream.builder().setBufferSize(512).get(); _property.writeData(stream); assertArrayEquals(_testblock, stream.toByteArray()); @@ -105,7 +105,7 @@ final class TestRootProperty { int offset = 0; RootProperty property = new RootProperty(index, input, offset); - UnsynchronizedByteArrayOutputStream stream = new UnsynchronizedByteArrayOutputStream(128); + UnsynchronizedByteArrayOutputStream stream = UnsynchronizedByteArrayOutputStream.builder().setBufferSize(128).get(); byte[] expected = Arrays.copyOfRange(input, offset, offset+128); property.writeData(stream); byte[] output = stream.toByteArray(); Modified: poi/trunk/poi/src/test/java/org/apache/poi/poifs/storage/RawDataUtil.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/poifs/storage/RawDataUtil.java?rev=1910300&r1=1910299&r2=1910300&view=diff ============================================================================== --- poi/trunk/poi/src/test/java/org/apache/poi/poifs/storage/RawDataUtil.java (original) +++ poi/trunk/poi/src/test/java/org/apache/poi/poifs/storage/RawDataUtil.java Thu Jun 8 08:53:08 2023 @@ -37,7 +37,7 @@ public final class RawDataUtil { public static byte[] decode(String[] hexDataLines) { try (UnsynchronizedByteArrayOutputStream baos = - new UnsynchronizedByteArrayOutputStream(hexDataLines.length * 32 + 32)) { + UnsynchronizedByteArrayOutputStream.builder().setBufferSize(hexDataLines.length * 32 + 32).get()) { for (String hexDataLine : hexDataLines) { byte[] lineData = HexRead.readFromString(hexDataLine); baos.write(lineData, 0, lineData.length); @@ -58,7 +58,7 @@ public final class RawDataUtil { public static byte[] decompress(String data) throws IOException { byte[] base64Bytes = Base64.getDecoder().decode(data); try ( - InputStream is = new UnsynchronizedByteArrayInputStream(base64Bytes); + InputStream is = UnsynchronizedByteArrayInputStream.builder().setByteArray(base64Bytes).get(); GZIPInputStream gzis = new GZIPInputStream(is); ) { return IOUtils.toByteArray(gzis); @@ -74,7 +74,7 @@ public final class RawDataUtil { */ public static String compress(byte[] data) throws IOException { try ( - UnsynchronizedByteArrayOutputStream bos = new UnsynchronizedByteArrayOutputStream(); + UnsynchronizedByteArrayOutputStream bos = UnsynchronizedByteArrayOutputStream.builder().get(); java.util.zip.GZIPOutputStream gz = new java.util.zip.GZIPOutputStream(bos) ) { gz.write(data); Modified: poi/trunk/poi/src/test/java/org/apache/poi/sl/usermodel/BaseTestSlideShowFactory.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/sl/usermodel/BaseTestSlideShowFactory.java?rev=1910300&r1=1910299&r2=1910300&view=diff ============================================================================== --- poi/trunk/poi/src/test/java/org/apache/poi/sl/usermodel/BaseTestSlideShowFactory.java (original) +++ poi/trunk/poi/src/test/java/org/apache/poi/sl/usermodel/BaseTestSlideShowFactory.java Thu Jun 8 08:53:08 2023 @@ -133,7 +133,7 @@ public abstract class BaseTestSlideShowF } private static byte[] readExternalFile(String path) { - UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream(); + UnsynchronizedByteArrayOutputStream baos = UnsynchronizedByteArrayOutputStream.builder().get(); try (InputStream fis = new FileInputStream(path)) { byte[] buf = new byte[512]; Modified: poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java?rev=1910300&r1=1910299&r2=1910300&view=diff ============================================================================== --- poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java (original) +++ poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java Thu Jun 8 08:53:08 2023 @@ -1815,8 +1815,8 @@ public abstract class BaseTestBugzillaIs cell.setCellValue("Ernie & Bert are cool!"); cell.setCellFormula("A1 & \" are cool!\""); - try (UnsynchronizedByteArrayOutputStream out1 = new UnsynchronizedByteArrayOutputStream(); - UnsynchronizedByteArrayOutputStream out2 = new UnsynchronizedByteArrayOutputStream()) { + try (UnsynchronizedByteArrayOutputStream out1 = UnsynchronizedByteArrayOutputStream.builder().get(); + UnsynchronizedByteArrayOutputStream out2 = UnsynchronizedByteArrayOutputStream.builder().get()) { wb.write(out1); wb.write(out2); Modified: poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestPicture.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestPicture.java?rev=1910300&r1=1910299&r2=1910300&view=diff ============================================================================== --- poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestPicture.java (original) +++ poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestPicture.java Thu Jun 8 08:53:08 2023 @@ -272,7 +272,7 @@ public abstract class BaseTestPicture { g.draw(ell); g.dispose(); - UnsynchronizedByteArrayOutputStream bos = new UnsynchronizedByteArrayOutputStream(2000); + UnsynchronizedByteArrayOutputStream bos = UnsynchronizedByteArrayOutputStream.builder().setBufferSize(2000).get(); ImageIO.write(bi, "PNG", bos); return bos.toByteArray(); } Modified: poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestWorkbook.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestWorkbook.java?rev=1910300&r1=1910299&r2=1910300&view=diff ============================================================================== --- poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestWorkbook.java (original) +++ poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestWorkbook.java Thu Jun 8 08:53:08 2023 @@ -17,7 +17,6 @@ package org.apache.poi.ss.usermodel; -import static org.apache.commons.io.output.NullOutputStream.NULL_OUTPUT_STREAM; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -33,6 +32,7 @@ import java.util.ConcurrentModificationE import java.util.Iterator; import java.util.Spliterator; +import org.apache.commons.io.output.NullOutputStream; import org.apache.poi.hssf.HSSFTestDataSamples; import org.apache.poi.ss.ITestDataProvider; import org.apache.poi.ss.usermodel.ClientAnchor.AnchorType; @@ -784,7 +784,7 @@ public abstract class BaseTestWorkbook { c.setCellStyle(cs); c.setCellValue("AAA"); } - assertDoesNotThrow(() -> workbook.write(NULL_OUTPUT_STREAM)); + assertDoesNotThrow(() -> workbook.write(NullOutputStream.INSTANCE)); } } Modified: poi/trunk/poi/src/test/java/org/apache/poi/ss/util/NumberRenderingSpreadsheetGenerator.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/util/NumberRenderingSpreadsheetGenerator.java?rev=1910300&r1=1910299&r2=1910300&view=diff ============================================================================== --- poi/trunk/poi/src/test/java/org/apache/poi/ss/util/NumberRenderingSpreadsheetGenerator.java (original) +++ poi/trunk/poi/src/test/java/org/apache/poi/ss/util/NumberRenderingSpreadsheetGenerator.java Thu Jun 8 08:53:08 2023 @@ -150,7 +150,7 @@ public class NumberRenderingSpreadsheetG File outputFile = new File("ExcelNumberRendering.xls"); - try (UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream(); + try (UnsynchronizedByteArrayOutputStream baos = UnsynchronizedByteArrayOutputStream.builder().get(); FileOutputStream os = new FileOutputStream(outputFile)) { wb.write(baos); @@ -212,7 +212,7 @@ public class NumberRenderingSpreadsheetG } private static String interpretLong(byte[] fileContent, int offset) { - try (InputStream is = new UnsynchronizedByteArrayInputStream(fileContent, offset, 8)) { + try (InputStream is = UnsynchronizedByteArrayInputStream.builder().setByteArray(fileContent).setOffset(offset).setLength(8).get()) { long l = new DataInputStream(is).readLong(); return "0x" + Long.toHexString(l).toUpperCase(Locale.ROOT); } catch (IOException e) { Modified: poi/trunk/poi/src/test/java/org/apache/poi/ss/util/TestCellRangeAddress.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/util/TestCellRangeAddress.java?rev=1910300&r1=1910299&r2=1910300&view=diff ============================================================================== --- poi/trunk/poi/src/test/java/org/apache/poi/ss/util/TestCellRangeAddress.java (original) +++ poi/trunk/poi/src/test/java/org/apache/poi/ss/util/TestCellRangeAddress.java Thu Jun 8 08:53:08 2023 @@ -67,7 +67,7 @@ final class TestCellRangeAddress { CellRangeAddress ref = new CellRangeAddress(0, 0, 0, 0); byte[] recordBytes; - UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream(); + UnsynchronizedByteArrayOutputStream baos = UnsynchronizedByteArrayOutputStream.builder().get(); try (LittleEndianOutputStream out = new LittleEndianOutputStream(baos)) { // With nothing set ref.serialize(out); Modified: poi/trunk/poi/src/test/java/org/apache/poi/ss/util/TestDateFormatConverter.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/util/TestDateFormatConverter.java?rev=1910300&r1=1910299&r2=1910300&view=diff ============================================================================== --- poi/trunk/poi/src/test/java/org/apache/poi/ss/util/TestDateFormatConverter.java (original) +++ poi/trunk/poi/src/test/java/org/apache/poi/ss/util/TestDateFormatConverter.java Thu Jun 8 08:53:08 2023 @@ -22,7 +22,6 @@ package org.apache.poi.ss.util; import static java.text.DateFormat.getDateInstance; import static java.text.DateFormat.getDateTimeInstance; import static java.text.DateFormat.getTimeInstance; -import static org.apache.commons.io.output.NullOutputStream.NULL_OUTPUT_STREAM; import static org.apache.poi.ss.util.DateFormatConverter.getPrefixForLocale; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -43,6 +42,7 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import java.util.stream.Stream; +import org.apache.commons.io.output.NullOutputStream; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.CellStyle; @@ -122,7 +122,7 @@ final class TestDateFormatConverter { cell[6].setCellValue(excelFormatPattern); } - assertDoesNotThrow(() -> workbook.write(NULL_OUTPUT_STREAM)); + assertDoesNotThrow(() -> workbook.write(NullOutputStream.INSTANCE)); } } Modified: poi/trunk/poi/src/test/java/org/apache/poi/util/TestHexDump.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/util/TestHexDump.java?rev=1910300&r1=1910299&r2=1910300&view=diff ============================================================================== --- poi/trunk/poi/src/test/java/org/apache/poi/util/TestHexDump.java (original) +++ poi/trunk/poi/src/test/java/org/apache/poi/util/TestHexDump.java Thu Jun 8 08:53:08 2023 @@ -41,7 +41,7 @@ class TestHexDump { @BeforeAll public static void setUp() throws UnsupportedEncodingException { SYSTEM_OUT = System.out; - System.setOut(new NullPrintStream()); + System.setOut(NullPrintStream.INSTANCE); } @AfterAll @@ -52,7 +52,7 @@ class TestHexDump { @Test void testDump() throws IOException { byte[] testArray = testArray(); - UnsynchronizedByteArrayOutputStream streamAct = new UnsynchronizedByteArrayOutputStream(); + UnsynchronizedByteArrayOutputStream streamAct = UnsynchronizedByteArrayOutputStream.builder().get(); HexDump.dump(testArray, 0, streamAct, 0); byte[] bytesAct = streamAct.toByteArray(); byte[] bytesExp = toHexDump(0, 0); Modified: poi/trunk/poi/src/test/java/org/apache/poi/util/TestIOUtils.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/util/TestIOUtils.java?rev=1910300&r1=1910299&r2=1910300&view=diff ============================================================================== --- poi/trunk/poi/src/test/java/org/apache/poi/util/TestIOUtils.java (original) +++ poi/trunk/poi/src/test/java/org/apache/poi/util/TestIOUtils.java Thu Jun 8 08:53:08 2023 @@ -229,7 +229,7 @@ final class TestIOUtils { @Test void testSkipFullyByteArray() throws IOException { - UnsynchronizedByteArrayOutputStream bos = new UnsynchronizedByteArrayOutputStream(); + UnsynchronizedByteArrayOutputStream bos = UnsynchronizedByteArrayOutputStream.builder().get(); try (InputStream is = new FileInputStream(TMP)) { assertEquals(LENGTH, IOUtils.copy(is, bos)); long skipped = IOUtils.skipFully(bos.toInputStream(), 20000L); @@ -239,7 +239,7 @@ final class TestIOUtils { @Test void testSkipFullyByteArrayGtIntMax() throws IOException { - UnsynchronizedByteArrayOutputStream bos = new UnsynchronizedByteArrayOutputStream(); + UnsynchronizedByteArrayOutputStream bos = UnsynchronizedByteArrayOutputStream.builder().get(); try (InputStream is = new FileInputStream(TMP)) { assertEquals(LENGTH, IOUtils.copy(is, bos)); long skipped = IOUtils.skipFully(bos.toInputStream(), Integer.MAX_VALUE + 20000L); Modified: poi/trunk/poi/src/test/java/org/apache/poi/util/TestLittleEndianInputStream.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/util/TestLittleEndianInputStream.java?rev=1910300&r1=1910299&r2=1910300&view=diff ============================================================================== --- poi/trunk/poi/src/test/java/org/apache/poi/util/TestLittleEndianInputStream.java (original) +++ poi/trunk/poi/src/test/java/org/apache/poi/util/TestLittleEndianInputStream.java Thu Jun 8 08:53:08 2023 @@ -34,7 +34,7 @@ class TestLittleEndianInputStream { assertEquals(4, fr.getCharacterPos()); assertEquals(0x15c, fr.getFontIndex()); - UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream(); + UnsynchronizedByteArrayOutputStream baos = UnsynchronizedByteArrayOutputStream.builder().get(); LittleEndianOutputStream out = new LittleEndianOutputStream(baos); fr.serialize(out); Modified: poi/trunk/poi/src/test/java/org/apache/poi/util/TestLittleEndianStreams.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/util/TestLittleEndianStreams.java?rev=1910300&r1=1910299&r2=1910300&view=diff ============================================================================== --- poi/trunk/poi/src/test/java/org/apache/poi/util/TestLittleEndianStreams.java (original) +++ poi/trunk/poi/src/test/java/org/apache/poi/util/TestLittleEndianStreams.java Thu Jun 8 08:53:08 2023 @@ -35,7 +35,7 @@ final class TestLittleEndianStreams { @Test void testRead() throws IOException { - UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream(); + UnsynchronizedByteArrayOutputStream baos = UnsynchronizedByteArrayOutputStream.builder().get(); try (LittleEndianOutputStream leo = new LittleEndianOutputStream(baos)) { leo.writeInt(12345678); leo.writeShort(12345); Modified: poi/trunk/poi/src/test/java/org/apache/poi/util/TestRLEDecompressingInputStream.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/util/TestRLEDecompressingInputStream.java?rev=1910300&r1=1910299&r2=1910300&view=diff ============================================================================== --- poi/trunk/poi/src/test/java/org/apache/poi/util/TestRLEDecompressingInputStream.java (original) +++ poi/trunk/poi/src/test/java/org/apache/poi/util/TestRLEDecompressingInputStream.java Thu Jun 8 08:53:08 2023 @@ -148,7 +148,7 @@ class TestRLEDecompressingInputStream { private static void checkRLEDecompression(String expected, byte[] runLengthEncodedData) throws IOException { InputStream compressedStream = new ByteArrayInputStream(runLengthEncodedData); - UnsynchronizedByteArrayOutputStream out = new UnsynchronizedByteArrayOutputStream(); + UnsynchronizedByteArrayOutputStream out = UnsynchronizedByteArrayOutputStream.builder().get(); try (InputStream stream = new RLEDecompressingInputStream(compressedStream)) { IOUtils.copy(stream, out); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
