Author: centic
Date: Thu Jun 8 08:53:08 2023
New Revision: 1910300
URL: http://svn.apache.org/viewvc?rev=1910300&view=rev
Log:
Remove deprecation warnings reported with newer commons-io
Modified:
poi/trunk/osgi/src/test/java/org/apache/poi/osgi/OSGiExtractorsIT.java
poi/trunk/osgi/src/test/java/org/apache/poi/osgi/OSGiSlideShowIT.java
poi/trunk/osgi/src/test/java/org/apache/poi/osgi/OSGiSpreadsheetIT.java
poi/trunk/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/OfficeDrawing.java
poi/trunk/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CustomXMLMapping.java
poi/trunk/poi-examples/src/test/java/org/apache/poi/integration/TestXLSX2CSV.java
poi/trunk/poi-integration/src/test/java/org/apache/poi/stress/POIFSFileHandler.java
poi/trunk/poi-integration/src/test/java/org/apache/poi/stress/SlideShowHandler.java
poi/trunk/poi-integration/src/test/java/org/apache/poi/stress/SpreadsheetHandler.java
poi/trunk/poi-integration/src/test/java/org/apache/poi/stress/XSSFBFileHandler.java
poi/trunk/poi-integration/src/test/java/org/apache/poi/stress/XSSFFileHandler.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePart.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePartOutputStream.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipArchiveFakeEntry.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/DigestOutputStream.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/OOXMLURIDereferencer.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureLine.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/draw/SVGImageRenderer.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/draw/SVGRenderExtension.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFMetroShape.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPictureShape.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/util/DummyFormat.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFBuiltinTableStyle.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFChartSheet.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ooxml/TestPOIXMLDocument.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackage.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackageCoreProperties.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestRelationships.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/ZipFileAssert.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/compliance/TestOPCComplianceCoreProperties.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/internal/marshallers/TestZipPackagePropertiesMarshaller.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/DummyKeystore.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestAgileEncryptionParameters.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestDecryptor.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestEncryptor.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestHxxFEncryption.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/sl/tests/TestOleShape.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/sl/tests/TestSlide.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/sl/tests/TestTable.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/TestEmbedOLEPackage.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xslf/TestXSLFBugs.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xslf/TestXSLFSlideCopy.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xslf/XSLFTestDataSamples.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFShape.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/DeferredSXSSFITestDataProvider.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/SXSSFITestDataProvider.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/TestSSUtilVsXSSFColor.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/TestXSSFMemoryLeak.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/XSSFTestDataSamples.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/OpcZipTest.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFSheet.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFWorkbookWithCustomZipEntrySource.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFWorkbookWithNullAutoSizeTracker.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestSXSSFBugs.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFComment.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheet.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTable.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFVMLDrawing.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFBubbleChartData.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/util/TestEvilUnclosedBRFixingInputStream.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xwpf/XWPFTestDataSamples.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestChangeTracking.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/extractor/ole2/OLE2ScratchpadExtractorFactory.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hdgf/HDGFLZW.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/CompressedStreamStore.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hemf/draw/HemfImageRenderer.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfFill.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusBrush.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusImage.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hemf/usermodel/HemfEmbeddedIterator.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIAttribute.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIRtfAttribute.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/HPBFPart.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/Bitmap.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/EMF.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/Metafile.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/PICT.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/WMF.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/PPTXMLDump.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideIdListing.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideShowRecordDumper.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/UserEditAndPersistListing.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextPropCollection.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ColorSchemeAtom.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/CurrentUserAtom.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/EscherTextboxWrapper.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExOleObjStg.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/HSLFEscherClientDataRecord.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/PPDrawingGroup.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/RecordContainer.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/StyleTextPropAtom.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TextRulerAtom.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TextSpecInfoAtom.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TxMasterStyleAtom.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShow.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/PropertiesChunk.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfEmbeddedIterator.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/dev/HWPFLister.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Picture.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hdgf/dev/TestVSDDumper.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hemf/usermodel/TestHemfPicture.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hmef/TestHMEFMessage.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hmef/dev/TestHMEFDumper.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hmef/extractor/TestHMEFContentsExtractor.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/HSLFTestDataSamples.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/TestReWrite.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/TestReWriteSanity.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/dev/BaseTestPPTIterating.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSLWTListing.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestMovieShape.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestOleEmbedding.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestAnimationInfoAtom.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestCString.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestColorSchemeAtom.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestComment2000.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestComment2000Atom.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestCurrentUserAtom.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestDocumentAtom.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestDocumentEncryption.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExControl.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExHyperlink.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExHyperlinkAtom.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExMediaAtom.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExObjListAtom.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExOleObjAtom.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExOleObjStg.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExVideoContainer.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestFontCollection.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestHeadersFootersAtom.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestHeadersFootersContainer.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestInteractiveInfo.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestInteractiveInfoAtom.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestNotesAtom.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestSlideAtom.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestSlidePersistAtom.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestStyleTextPropAtom.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextBytesAtom.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextCharsAtom.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextHeaderAtom.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextRulerAtom.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextSpecInfoAtom.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestTxInteractiveInfoAtom.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestUserEditAtom.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestHSLFSlideShow.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestPictures.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestRichTextRun.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hsmf/TestExtractEmbeddedMSG.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hsmf/TestFileWithAttachmentsRead.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hsmf/TestFixedSizedProperties.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/HWPFTestCase.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/HWPFTestDataSamples.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/dev/TestHWPFLister.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestHWPFWrite.java
poi/trunk/poi/src/main/java/org/apache/poi/POIDocument.java
poi/trunk/poi/src/main/java/org/apache/poi/ddf/EscherMetafileBlip.java
poi/trunk/poi/src/main/java/org/apache/poi/hpsf/Property.java
poi/trunk/poi/src/main/java/org/apache/poi/hpsf/PropertySet.java
poi/trunk/poi/src/main/java/org/apache/poi/hpsf/Section.java
poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/DConRefRecord.java
poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/DrawingRecordForBiffViewer.java
poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java
poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/EscherAggregate.java
poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/FilePassRecord.java
poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/Record.java
poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/RecordInputStream.java
poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/SubRecord.java
poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFPicture.java
poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
poi/trunk/poi/src/main/java/org/apache/poi/poifs/filesystem/DocumentOutputStream.java
poi/trunk/poi/src/main/java/org/apache/poi/poifs/filesystem/Ole10Native.java
poi/trunk/poi/src/main/java/org/apache/poi/poifs/filesystem/POIFSFileSystem.java
poi/trunk/poi/src/main/java/org/apache/poi/poifs/macros/VBAMacroReader.java
poi/trunk/poi/src/main/java/org/apache/poi/sl/draw/BitmapImageRenderer.java
poi/trunk/poi/src/main/java/org/apache/poi/sl/image/ImageHeaderBitmap.java
poi/trunk/poi/src/main/java/org/apache/poi/sl/usermodel/ObjectShape.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/extractor/EmbeddedExtractor.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/util/ImageUtils.java
poi/trunk/poi/src/main/java/org/apache/poi/util/GenericRecordJsonWriter.java
poi/trunk/poi/src/main/java/org/apache/poi/util/GenericRecordXmlWriter.java
poi/trunk/poi/src/main/java/org/apache/poi/util/IOUtils.java
poi/trunk/poi/src/main/java/org/apache/poi/util/LZWDecompresser.java
poi/trunk/poi/src/main/java/org/apache/poi/util/RLEDecompressingInputStream.java
poi/trunk/poi/src/test/java/org/apache/poi/POIDataSamples.java
poi/trunk/poi/src/test/java/org/apache/poi/TestPOIDocumentMain.java
poi/trunk/poi/src/test/java/org/apache/poi/ddf/TestEscherDump.java
poi/trunk/poi/src/test/java/org/apache/poi/hpsf/basic/TestHPSFBugs.java
poi/trunk/poi/src/test/java/org/apache/poi/hpsf/basic/TestMetaDataIPI.java
poi/trunk/poi/src/test/java/org/apache/poi/hpsf/basic/TestReadAllFiles.java
poi/trunk/poi/src/test/java/org/apache/poi/hpsf/basic/TestWrite.java
poi/trunk/poi/src/test/java/org/apache/poi/hssf/HSSFTestDataSamples.java
poi/trunk/poi/src/test/java/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java
poi/trunk/poi/src/test/java/org/apache/poi/hssf/extractor/TestOldExcelExtractor.java
poi/trunk/poi/src/test/java/org/apache/poi/hssf/model/TestDrawingAggregate.java
poi/trunk/poi/src/test/java/org/apache/poi/hssf/model/TestEscherRecordFactory.java
poi/trunk/poi/src/test/java/org/apache/poi/hssf/record/TestDConRefRecord.java
poi/trunk/poi/src/test/java/org/apache/poi/hssf/record/TestDrawingRecord.java
poi/trunk/poi/src/test/java/org/apache/poi/hssf/record/TestLbsDataSubRecord.java
poi/trunk/poi/src/test/java/org/apache/poi/hssf/record/TestRecordFactory.java
poi/trunk/poi/src/test/java/org/apache/poi/hssf/record/TestSSTRecord.java
poi/trunk/poi/src/test/java/org/apache/poi/hssf/record/common/TestUnicodeString.java
poi/trunk/poi/src/test/java/org/apache/poi/hssf/usermodel/TestBugs.java
poi/trunk/poi/src/test/java/org/apache/poi/hssf/usermodel/TestDataValidation.java
poi/trunk/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFCell.java
poi/trunk/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java
poi/trunk/poi/src/test/java/org/apache/poi/hssf/usermodel/TestOLE2Embedding.java
poi/trunk/poi/src/test/java/org/apache/poi/hssf/usermodel/TestPOIFSProperties.java
poi/trunk/poi/src/test/java/org/apache/poi/poifs/crypt/agile/TestAgileDecryptor.java
poi/trunk/poi/src/test/java/org/apache/poi/poifs/dev/TestPOIFSDump.java
poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestDocument.java
poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestDocumentOutputStream.java
poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestEmptyDocument.java
poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestEntryUtils.java
poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java
poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestOle10Native.java
poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSFileSystem.java
poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSStream.java
poi/trunk/poi/src/test/java/org/apache/poi/poifs/property/TestDirectoryProperty.java
poi/trunk/poi/src/test/java/org/apache/poi/poifs/property/TestDocumentProperty.java
poi/trunk/poi/src/test/java/org/apache/poi/poifs/property/TestPropertyTable.java
poi/trunk/poi/src/test/java/org/apache/poi/poifs/property/TestRootProperty.java
poi/trunk/poi/src/test/java/org/apache/poi/poifs/storage/RawDataUtil.java
poi/trunk/poi/src/test/java/org/apache/poi/sl/usermodel/BaseTestSlideShowFactory.java
poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java
poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestPicture.java
poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestWorkbook.java
poi/trunk/poi/src/test/java/org/apache/poi/ss/util/NumberRenderingSpreadsheetGenerator.java
poi/trunk/poi/src/test/java/org/apache/poi/ss/util/TestCellRangeAddress.java
poi/trunk/poi/src/test/java/org/apache/poi/ss/util/TestDateFormatConverter.java
poi/trunk/poi/src/test/java/org/apache/poi/util/TestHexDump.java
poi/trunk/poi/src/test/java/org/apache/poi/util/TestIOUtils.java
poi/trunk/poi/src/test/java/org/apache/poi/util/TestLittleEndianInputStream.java
poi/trunk/poi/src/test/java/org/apache/poi/util/TestLittleEndianStreams.java
poi/trunk/poi/src/test/java/org/apache/poi/util/TestRLEDecompressingInputStream.java
Modified: poi/trunk/osgi/src/test/java/org/apache/poi/osgi/OSGiExtractorsIT.java
URL:
http://svn.apache.org/viewvc/poi/trunk/osgi/src/test/java/org/apache/poi/osgi/OSGiExtractorsIT.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
--- poi/trunk/osgi/src/test/java/org/apache/poi/osgi/OSGiExtractorsIT.java
(original)
+++ poi/trunk/osgi/src/test/java/org/apache/poi/osgi/OSGiExtractorsIT.java Thu
Jun 8 08:53:08 2023
@@ -57,7 +57,7 @@ public class OSGiExtractorsIT extends Ba
box.setText("Hello, World!");
box.setAnchor(new Rectangle(36, 15, 648, 65));
- UnsynchronizedByteArrayOutputStream out = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream out =
UnsynchronizedByteArrayOutputStream.builder().get();
ppt.write(out);
return out.toByteArray();
}
@@ -66,7 +66,7 @@ public class OSGiExtractorsIT extends Ba
Sheet s = wb.createSheet("OSGi");
s.createRow(0).createCell(0).setCellValue("Hello, World!");
- UnsynchronizedByteArrayOutputStream out = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream out =
UnsynchronizedByteArrayOutputStream.builder().get();
wb.write(out);
return out.toByteArray();
Modified: poi/trunk/osgi/src/test/java/org/apache/poi/osgi/OSGiSlideShowIT.java
URL:
http://svn.apache.org/viewvc/poi/trunk/osgi/src/test/java/org/apache/poi/osgi/OSGiSlideShowIT.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
--- poi/trunk/osgi/src/test/java/org/apache/poi/osgi/OSGiSlideShowIT.java
(original)
+++ poi/trunk/osgi/src/test/java/org/apache/poi/osgi/OSGiSlideShowIT.java Thu
Jun 8 08:53:08 2023
@@ -75,7 +75,7 @@ public class OSGiSlideShowIT extends Bas
}
box2.setAnchor(new Rectangle(36, 80, 648, 400));
- try (UnsynchronizedByteArrayOutputStream baos = new
UnsynchronizedByteArrayOutputStream()) {
+ try (UnsynchronizedByteArrayOutputStream baos =
UnsynchronizedByteArrayOutputStream.builder().get()) {
ppt.write(baos);
try (InputStream bais = baos.toInputStream()) {
ppt = SlideShowFactory.create(bais);
Modified:
poi/trunk/osgi/src/test/java/org/apache/poi/osgi/OSGiSpreadsheetIT.java
URL:
http://svn.apache.org/viewvc/poi/trunk/osgi/src/test/java/org/apache/poi/osgi/OSGiSpreadsheetIT.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
--- poi/trunk/osgi/src/test/java/org/apache/poi/osgi/OSGiSpreadsheetIT.java
(original)
+++ poi/trunk/osgi/src/test/java/org/apache/poi/osgi/OSGiSpreadsheetIT.java Thu
Jun 8 08:53:08 2023
@@ -48,7 +48,7 @@ public class OSGiSpreadsheetIT extends B
s.createRow(0).createCell(0).setCellValue("With OSGi");
s.createRow(1).createCell(0).setCellFormula("SUM(A1:B3)");
- try (UnsynchronizedByteArrayOutputStream baos = new
UnsynchronizedByteArrayOutputStream()) {
+ try (UnsynchronizedByteArrayOutputStream baos =
UnsynchronizedByteArrayOutputStream.builder().get()) {
wb.write(baos);
try (InputStream bais = baos.toInputStream()) {
wb = WorkbookFactory.create(bais);
Modified:
poi/trunk/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/OfficeDrawing.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/OfficeDrawing.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
---
poi/trunk/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/OfficeDrawing.java
(original)
+++
poi/trunk/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/OfficeDrawing.java
Thu Jun 8 08:53:08 2023
@@ -192,7 +192,7 @@ public final class OfficeDrawing {
private static int loadPicture( String path, HSSFWorkbook wb ) throws
IOException {
int pictureIndex;
try (FileInputStream fis = new FileInputStream(path);
- UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream()) {
+ UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get()) {
IOUtils.copy(fis, bos);
pictureIndex = wb.addPicture(bos.toByteArray(),
Workbook.PICTURE_TYPE_PNG);
}
Modified:
poi/trunk/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CustomXMLMapping.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CustomXMLMapping.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
---
poi/trunk/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CustomXMLMapping.java
(original)
+++
poi/trunk/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CustomXMLMapping.java
Thu Jun 8 08:53:08 2023
@@ -38,7 +38,7 @@ public final class CustomXMLMapping {
for (XSSFMap map : wb.getCustomXMLMappings()) {
XSSFExportToXml exporter = new XSSFExportToXml(map);
- UnsynchronizedByteArrayOutputStream os = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream os =
UnsynchronizedByteArrayOutputStream.builder().get();
exporter.exportToXML(os, true);
String xml = os.toString(StandardCharsets.UTF_8);
System.out.println(xml);
Modified:
poi/trunk/poi-examples/src/test/java/org/apache/poi/integration/TestXLSX2CSV.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-examples/src/test/java/org/apache/poi/integration/TestXLSX2CSV.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
---
poi/trunk/poi-examples/src/test/java/org/apache/poi/integration/TestXLSX2CSV.java
(original)
+++
poi/trunk/poi-examples/src/test/java/org/apache/poi/integration/TestXLSX2CSV.java
Thu Jun 8 08:53:08 2023
@@ -35,7 +35,7 @@ import org.junit.jupiter.api.Test;
public class TestXLSX2CSV {
private PrintStream err;
- private final UnsynchronizedByteArrayOutputStream errorBytes = new
UnsynchronizedByteArrayOutputStream();
+ private final UnsynchronizedByteArrayOutputStream errorBytes =
UnsynchronizedByteArrayOutputStream.builder().get();
@BeforeEach
public void setUp() throws UnsupportedEncodingException {
@@ -77,7 +77,7 @@ public class TestXLSX2CSV {
@Test
public void testSampleFile() throws Exception {
- final UnsynchronizedByteArrayOutputStream outputBytes = new
UnsynchronizedByteArrayOutputStream();
+ final UnsynchronizedByteArrayOutputStream outputBytes =
UnsynchronizedByteArrayOutputStream.builder().get();
PrintStream out = new PrintStream(outputBytes, true,
StandardCharsets.UTF_8.name());
// The package open is instantaneous, as it should be.
@@ -96,7 +96,7 @@ public class TestXLSX2CSV {
@Test
public void testMinColumns() throws Exception {
- final UnsynchronizedByteArrayOutputStream outputBytes = new
UnsynchronizedByteArrayOutputStream();
+ final UnsynchronizedByteArrayOutputStream outputBytes =
UnsynchronizedByteArrayOutputStream.builder().get();
PrintStream out = new PrintStream(outputBytes, true,
StandardCharsets.UTF_8.name());
// The package open is instantaneous, as it should be.
Modified:
poi/trunk/poi-integration/src/test/java/org/apache/poi/stress/POIFSFileHandler.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-integration/src/test/java/org/apache/poi/stress/POIFSFileHandler.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
---
poi/trunk/poi-integration/src/test/java/org/apache/poi/stress/POIFSFileHandler.java
(original)
+++
poi/trunk/poi-integration/src/test/java/org/apache/poi/stress/POIFSFileHandler.java
Thu Jun 8 08:53:08 2023
@@ -57,7 +57,7 @@ public class POIFSFileHandler extends Ab
}
protected void handlePOIDocument(POIDocument doc) throws Exception {
- try (UnsynchronizedByteArrayOutputStream out = new
UnsynchronizedByteArrayOutputStream()) {
+ try (UnsynchronizedByteArrayOutputStream out =
UnsynchronizedByteArrayOutputStream.builder().get()) {
doc.write(out);
try (InputStream in = out.toInputStream();
Modified:
poi/trunk/poi-integration/src/test/java/org/apache/poi/stress/SlideShowHandler.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-integration/src/test/java/org/apache/poi/stress/SlideShowHandler.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
---
poi/trunk/poi-integration/src/test/java/org/apache/poi/stress/SlideShowHandler.java
(original)
+++
poi/trunk/poi-integration/src/test/java/org/apache/poi/stress/SlideShowHandler.java
Thu Jun 8 08:53:08 2023
@@ -49,7 +49,7 @@ public abstract class SlideShowHandler e
readPictures(ss);
// write out the file
- UnsynchronizedByteArrayOutputStream out = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream out =
UnsynchronizedByteArrayOutputStream.builder().get();
ss.write(out);
readContent(ss);
Modified:
poi/trunk/poi-integration/src/test/java/org/apache/poi/stress/SpreadsheetHandler.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-integration/src/test/java/org/apache/poi/stress/SpreadsheetHandler.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
---
poi/trunk/poi-integration/src/test/java/org/apache/poi/stress/SpreadsheetHandler.java
(original)
+++
poi/trunk/poi-integration/src/test/java/org/apache/poi/stress/SpreadsheetHandler.java
Thu Jun 8 08:53:08 2023
@@ -61,7 +61,7 @@ public abstract class SpreadsheetHandler
}
private UnsynchronizedByteArrayOutputStream writeToArray(Workbook wb)
throws IOException {
- UnsynchronizedByteArrayOutputStream stream = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream stream =
UnsynchronizedByteArrayOutputStream.builder().get();
wb.write(stream);
return stream;
}
Modified:
poi/trunk/poi-integration/src/test/java/org/apache/poi/stress/XSSFBFileHandler.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-integration/src/test/java/org/apache/poi/stress/XSSFBFileHandler.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
---
poi/trunk/poi-integration/src/test/java/org/apache/poi/stress/XSSFBFileHandler.java
(original)
+++
poi/trunk/poi-integration/src/test/java/org/apache/poi/stress/XSSFBFileHandler.java
Thu Jun 8 08:53:08 2023
@@ -41,11 +41,11 @@ public class XSSFBFileHandler extends Ab
public void handleFile(InputStream stream, String path) throws Exception {
byte[] bytes = IOUtils.toByteArray(stream);
- try (OPCPackage opcPackage = OPCPackage.open(new
UnsynchronizedByteArrayInputStream(bytes))) {
+ try (OPCPackage opcPackage =
OPCPackage.open(UnsynchronizedByteArrayInputStream.builder().setByteArray(bytes).get()))
{
testOne(opcPackage);
}
- testNotHandledByWorkbookException(OPCPackage.open(new
UnsynchronizedByteArrayInputStream(bytes)));
+
testNotHandledByWorkbookException(OPCPackage.open(UnsynchronizedByteArrayInputStream.builder().setByteArray(bytes).get()));
}
private void testNotHandledByWorkbookException(OPCPackage pkg) throws
IOException {
Modified:
poi/trunk/poi-integration/src/test/java/org/apache/poi/stress/XSSFFileHandler.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-integration/src/test/java/org/apache/poi/stress/XSSFFileHandler.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
---
poi/trunk/poi-integration/src/test/java/org/apache/poi/stress/XSSFFileHandler.java
(original)
+++
poi/trunk/poi-integration/src/test/java/org/apache/poi/stress/XSSFFileHandler.java
Thu Jun 8 08:53:08 2023
@@ -16,7 +16,6 @@
==================================================================== */
package org.apache.poi.stress;
-import static org.apache.commons.io.output.NullOutputStream.NULL_OUTPUT_STREAM;
import static org.apache.poi.xssf.XSSFTestDataSamples.getSampleFile;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -36,6 +35,7 @@ import java.util.Set;
import javax.xml.transform.TransformerException;
+import org.apache.commons.io.output.NullOutputStream;
import org.apache.commons.io.output.UnsynchronizedByteArrayOutputStream;
import org.apache.poi.EncryptedDocumentException;
import org.apache.poi.examples.ss.ExcelComparator;
@@ -72,7 +72,7 @@ public class XSSFFileHandler extends Spr
// make sure the potentially large byte-array is freed up quickly again
{
- UnsynchronizedByteArrayOutputStream out = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream out =
UnsynchronizedByteArrayOutputStream.builder().get();
IOUtils.copy(stream, out);
if (pass != null) {
@@ -156,7 +156,7 @@ public class XSSFFileHandler extends Spr
TransformerException {
for (XSSFMap map : wb.getCustomXMLMappings()) {
XSSFExportToXml exporter = new XSSFExportToXml(map);
- exporter.exportToXML(NULL_OUTPUT_STREAM, true);
+ exporter.exportToXML(NullOutputStream.INSTANCE, true);
}
}
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePart.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePart.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePart.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePart.java
Thu Jun 8 08:53:08 2023
@@ -88,7 +88,12 @@ public final class MemoryPackagePart ext
if (data == null) {
data = new byte[0];
}
- return new UnsynchronizedByteArrayInputStream(data);
+ try {
+ return
UnsynchronizedByteArrayInputStream.builder().setByteArray(data).get();
+ } catch (IOException e) {
+ // not possible with ByteArray but still declared in the API
+ throw new IllegalStateException(e);
+ }
}
@Override
@@ -113,7 +118,7 @@ public final class MemoryPackagePart ext
@Override
public boolean load(InputStream is) throws InvalidFormatException {
- try (UnsynchronizedByteArrayOutputStream baos = new
UnsynchronizedByteArrayOutputStream()) {
+ try (UnsynchronizedByteArrayOutputStream baos =
UnsynchronizedByteArrayOutputStream.builder().get()) {
// Grab the data
IOUtils.copy(is, baos);
// Save it
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePartOutputStream.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePartOutputStream.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePartOutputStream.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePartOutputStream.java
Thu Jun 8 08:53:08 2023
@@ -33,7 +33,7 @@ public final class MemoryPackagePartOutp
public MemoryPackagePartOutputStream(MemoryPackagePart part) {
this._part = part;
- _buff = new UnsynchronizedByteArrayOutputStream();
+ _buff = UnsynchronizedByteArrayOutputStream.builder().get();
}
@Override
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipArchiveFakeEntry.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipArchiveFakeEntry.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipArchiveFakeEntry.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipArchiveFakeEntry.java
Thu Jun 8 08:53:08 2023
@@ -104,7 +104,7 @@ import org.apache.poi.util.TempFile;
throw new IOException("temp file " +
tempFile.getAbsolutePath() + " is missing");
}
} else if (data != null) {
- return new UnsynchronizedByteArrayInputStream(data);
+ return
UnsynchronizedByteArrayInputStream.builder().setByteArray(data).get();
} else {
throw new IOException("Cannot retrieve data from Zip Entry,
probably because the Zip Entry was closed before the data was requested.");
}
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/DigestOutputStream.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/DigestOutputStream.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/DigestOutputStream.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/DigestOutputStream.java
Thu Jun 8 08:53:08 2023
@@ -65,7 +65,7 @@ import org.ietf.jgss.Oid;
}
public byte[] sign() throws IOException, GeneralSecurityException {
- try (UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream()) {
+ try (UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get()) {
bos.write(getHashMagic());
bos.write(md.digest());
@@ -91,7 +91,7 @@ import org.ietf.jgss.Oid;
// in an earlier release the hashMagic (aka DigestAlgorithmIdentifier)
contained only
// an object identifier, but to conform with the header generated by
the
// javax-signature API, the empty <associated parameters> are also
included
- try (UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream()) {
+ try (UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get()) {
final byte[] oidBytes = new Oid(algo.rsaOid).getDER();
bos.write(0x30);
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/OOXMLURIDereferencer.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/OOXMLURIDereferencer.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/OOXMLURIDereferencer.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/OOXMLURIDereferencer.java
Thu Jun 8 08:53:08 2023
@@ -90,7 +90,7 @@ public class OOXMLURIDereferencer implem
if (part.getPartName().toString().endsWith(".rels")) {
// although xmlsec has an option to ignore line breaks,
currently this
// only affects .rels files, so we only modify these
- try (UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream()) {
+ try (UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get()) {
for (int ch; (ch = dataStream.read()) != -1; ) {
if (ch == 10 || ch == 13) continue;
bos.write(ch);
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureLine.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureLine.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureLine.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureLine.java
Thu Jun 8 08:53:08 2023
@@ -341,7 +341,7 @@ public abstract class SignatureLine {
rnd.drawImage(gfx, new Rectangle2D.Double(0, 0, defaultWidth,
defaultHeight));
gfx.dispose();
- UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get();
ImageIO.write(bi, "PNG", bos);
return bos.toByteArray();
}
@@ -426,7 +426,7 @@ public abstract class SignatureLine {
gfx.dispose();
- UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get();
ImageIO.write(bi, "PNG", bos);
return bos.toByteArray();
}
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java
Thu Jun 8 08:53:08 2023
@@ -223,9 +223,12 @@ public class XAdESXLSignatureFacet imple
X509CRL crl;
try {
crl = (X509CRL) this.certificateFactory
- .generateCRL(new
UnsynchronizedByteArrayInputStream(encodedCrl));
+
.generateCRL(UnsynchronizedByteArrayInputStream.builder().setByteArray(encodedCrl).get());
} catch (CRLException e) {
throw new IllegalStateException("CRL parse error: " +
e.getMessage(), e);
+ } catch (IOException e) {
+ // not possible with ByteArray but still declared in the
API
+ throw new IllegalStateException(e);
}
CRLIdentifierType crlIdentifier = crlRef.addNewCRLIdentifier();
@@ -299,7 +302,7 @@ public class XAdESXLSignatureFacet imple
}
private static byte[] getC14nValue(List<Node> nodeList, String c14nAlgoId)
{
- try (UnsynchronizedByteArrayOutputStream c14nValue = new
UnsynchronizedByteArrayOutputStream()) {
+ try (UnsynchronizedByteArrayOutputStream c14nValue =
UnsynchronizedByteArrayOutputStream.builder().get()) {
for (Node node : nodeList) {
/*
* Re-initialize the c14n else the namespaces will get cached
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/draw/SVGImageRenderer.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/draw/SVGImageRenderer.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/draw/SVGImageRenderer.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/draw/SVGImageRenderer.java
Thu Jun 8 08:53:08 2023
@@ -68,7 +68,7 @@ public class SVGImageRenderer implements
@Override
public void loadImage(byte[] data, String contentType) throws IOException {
- loadImage(new UnsynchronizedByteArrayInputStream(data), contentType);
+
loadImage(UnsynchronizedByteArrayInputStream.builder().setByteArray(data).get(),
contentType);
}
@Override
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/draw/SVGRenderExtension.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/draw/SVGRenderExtension.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/draw/SVGRenderExtension.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/draw/SVGRenderExtension.java
Thu Jun 8 08:53:08 2023
@@ -310,7 +310,7 @@ public class SVGRenderExtension extends
}
if (imgData == null) {
BufferedImage bi = imgRdr.getImage();
- UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get();
try {
ImageIO.write(bi, "PNG", bos);
} catch (IOException e) {
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFMetroShape.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFMetroShape.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFMetroShape.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFMetroShape.java
Thu Jun 8 08:53:08 2023
@@ -44,7 +44,7 @@ public class XSLFMetroShape implements M
/** parses the metro bytes to a XSLF shape */
@Override
public XSLFShape parseShape(byte[] metroBytes) throws IOException {
- try (OPCPackage pkg = OPCPackage.open(new
UnsynchronizedByteArrayInputStream(metroBytes))) {
+ try (OPCPackage pkg =
OPCPackage.open(UnsynchronizedByteArrayInputStream.builder().setByteArray(metroBytes).get()))
{
PackagePartName shapePN =
PackagingURIHelper.createPartName("/drs/shapexml.xml");
PackagePart shapePart = pkg.getPart(shapePN);
if (shapePart == null) {
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPictureShape.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPictureShape.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPictureShape.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPictureShape.java
Thu Jun 8 08:53:08 2023
@@ -372,7 +372,7 @@ public class XSLFPictureShape extends XS
}
BufferedImage thmBI = renderer.getImage(dim);
- try (UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream(100000)) {
+ try (UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().setBufferSize(100000).get()) {
// use extension instead of enum name, because of "jpeg"
ImageIO.write(thmBI, pt.extension.substring(1), bos);
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/util/DummyFormat.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/util/DummyFormat.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/util/DummyFormat.java
(original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/util/DummyFormat.java
Thu Jun 8 08:53:08 2023
@@ -34,7 +34,7 @@ public class DummyFormat implements Outp
public DummyFormat() {
try {
- bos = new UnsynchronizedByteArrayOutputStream();
+ bos = UnsynchronizedByteArrayOutputStream.builder().get();
dummy2d = new DummyGraphics2d(new PrintStream(bos, true,
StandardCharsets.UTF_8.name()));
} catch (UnsupportedEncodingException e) {
throw new IllegalStateException(e);
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java
Thu Jun 8 08:53:08 2023
@@ -1019,7 +1019,7 @@ public class SXSSFWorkbook implements Wo
flushSheets();
//Save the template
- try (UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream()) {
+ try (UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get()) {
_wb.write(bos);
//Substitute the template entries with the generated sheet data
files
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFBuiltinTableStyle.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFBuiltinTableStyle.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFBuiltinTableStyle.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFBuiltinTableStyle.java
Thu Jun 8 08:53:08 2023
@@ -409,8 +409,8 @@ 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();
- try (UnsynchronizedByteArrayInputStream bis = new
UnsynchronizedByteArrayInputStream(
- styleXML(dxfsNode,
tableStyleNode).getBytes(StandardCharsets.UTF_8))) {
+ try (UnsynchronizedByteArrayInputStream bis =
UnsynchronizedByteArrayInputStream.builder().setByteArray(
+ styleXML(dxfsNode,
tableStyleNode).getBytes(StandardCharsets.UTF_8)).get()) {
styles.readFrom(bis);
}
styleMap.put(builtIn, new XSSFBuiltinTypeStyleStyle(builtIn,
styles.getExplicitTableStyle(styleName)));
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFChartSheet.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFChartSheet.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFChartSheet.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFChartSheet.java
Thu Jun 8 08:53:08 2023
@@ -57,7 +57,7 @@ public class XSSFChartSheet extends XSSF
@Override
protected void read(InputStream is) throws IOException {
//initialize the supeclass with a blank worksheet
- super.read(new UnsynchronizedByteArrayInputStream(BLANK_WORKSHEET));
+
super.read(UnsynchronizedByteArrayInputStream.builder().setByteArray(BLANK_WORKSHEET).get());
try {
chartsheet = ChartsheetDocument.Factory.parse(is,
DEFAULT_XML_OPTIONS).getChartsheet();
@@ -95,7 +95,7 @@ public class XSSFChartSheet extends XSSF
}
private static byte[] blankWorksheet(){
- UnsynchronizedByteArrayOutputStream out = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream out =
UnsynchronizedByteArrayOutputStream.builder().get();
try {
new XSSFSheet().write(out);
} catch (IOException e){
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
Thu Jun 8 08:53:08 2023
@@ -511,7 +511,7 @@ public class XSSFWorkbook extends POIXML
protected static OPCPackage newPackage(XSSFWorkbookType workbookType) {
OPCPackage pkg = null;
try {
- pkg = OPCPackage.create(new
UnsynchronizedByteArrayOutputStream()); // NOSONAR - we do not want to close
this here
+ pkg =
OPCPackage.create(UnsynchronizedByteArrayOutputStream.builder().get()); //
NOSONAR - we do not want to close this here
// Main part
PackagePartName corePartName =
PackagingURIHelper.createPartName(XSSFRelation.WORKBOOK.getDefaultFileName());
// Create main part relationship
@@ -665,7 +665,7 @@ public class XSSFWorkbook extends POIXML
}
- try (UnsynchronizedByteArrayOutputStream out = new
UnsynchronizedByteArrayOutputStream()) {
+ try (UnsynchronizedByteArrayOutputStream out =
UnsynchronizedByteArrayOutputStream.builder().get()) {
srcSheet.write(out);
try (InputStream bis = out.toInputStream()) {
clonedSheet.read(bis);
@@ -2466,7 +2466,7 @@ public class XSSFWorkbook extends POIXML
Ole10Native ole10 = new Ole10Native(label, fileName, command, oleData);
- try (UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream(oleData.length+500)) {
+ try (UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().setBufferSize(oleData.length+500).get())
{
ole10.writeOut(bos);
try (POIFSFileSystem poifs = new POIFSFileSystem()) {
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
Thu Jun 8 08:53:08 2023
@@ -174,7 +174,7 @@ public class XWPFDocument extends POIXML
protected static OPCPackage newPackage() {
OPCPackage pkg = null;
try {
- pkg = OPCPackage.create(new
UnsynchronizedByteArrayOutputStream()); // NOSONAR - we do not want to close
this here
+ pkg =
OPCPackage.create(UnsynchronizedByteArrayOutputStream.builder().get()); //
NOSONAR - we do not want to close this here
// Main part
PackagePartName corePartName =
PackagingURIHelper.createPartName(XWPFRelation.DOCUMENT.getDefaultFileName());
// Create main part relationship
Modified:
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ooxml/TestPOIXMLDocument.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ooxml/TestPOIXMLDocument.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ooxml/TestPOIXMLDocument.java
(original)
+++
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ooxml/TestPOIXMLDocument.java
Thu Jun 8 08:53:08 2023
@@ -17,7 +17,6 @@
package org.apache.poi.ooxml;
-import static org.apache.commons.io.output.NullOutputStream.NULL_OUTPUT_STREAM;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -38,6 +37,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
+import org.apache.commons.io.output.NullOutputStream;
import org.apache.poi.POIDataSamples;
import org.apache.poi.ooxml.POIXMLDocumentPart.RelationPart;
import org.apache.poi.ooxml.util.PackageHelper;
@@ -141,7 +141,7 @@ public final class TestPOIXMLDocument {
// Should not be able to write a document that has been closed
doc.close();
- IOException e2 = assertThrows(IOException.class, () ->
doc.write(NULL_OUTPUT_STREAM),
+ IOException e2 = assertThrows(IOException.class, () ->
doc.write(NullOutputStream.INSTANCE),
"Should not be able to write a document that has been
closed.");
assertEquals("Cannot write data, document seems to have been
closed already", e2.getMessage());
Modified:
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackage.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackage.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackage.java
(original)
+++
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackage.java
Thu Jun 8 08:53:08 2023
@@ -218,7 +218,7 @@ public final class TestPackage {
*/
@Test
void createPackageWithCoreDocument() throws IOException,
InvalidFormatException, URISyntaxException, SAXException {
- UnsynchronizedByteArrayOutputStream baos = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream baos =
UnsynchronizedByteArrayOutputStream.builder().get();
try (OPCPackage pkg = OPCPackage.create(baos)) {
// Add a core document
@@ -676,7 +676,7 @@ public final class TestPackage {
@Test
void zipBombCreateAndHandle()
throws IOException, EncryptedDocumentException {
- UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream(2500000);
+ UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().setBufferSize(2500000).get();
try (ZipFile zipFile =
ZipHelper.openZipFile(getSampleFile("sample.xlsx"));
ZipArchiveOutputStream append = new ZipArchiveOutputStream(bos)) {
Modified:
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackageCoreProperties.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackageCoreProperties.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackageCoreProperties.java
(original)
+++
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackageCoreProperties.java
Thu Jun 8 08:53:08 2023
@@ -216,7 +216,7 @@ public final class TestPackageCoreProper
@Test
void testGetPropertiesLO() throws Exception {
- UnsynchronizedByteArrayOutputStream out = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream out =
UnsynchronizedByteArrayOutputStream.builder().get();
// Open the package
try (OPCPackage pkg1 =
OPCPackage.open(openSampleStream("51444.xlsx"))) {
PackageProperties props1 = pkg1.getPackageProperties();
@@ -284,7 +284,7 @@ public final class TestPackageCoreProper
SimpleDateFormat df = new
SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.ROOT);
df.setTimeZone(LocaleUtil.TIMEZONE_UTC);
- UnsynchronizedByteArrayOutputStream baos = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream baos =
UnsynchronizedByteArrayOutputStream.builder().get();
try (InputStream is =
openSampleStream("OPCCompliance_CoreProperties_AlternateTimezones.docx");
OPCPackage pkg1 = OPCPackage.open(is)) {
PackagePropertiesPart props1 = (PackagePropertiesPart)
pkg1.getPackageProperties();
Modified:
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestRelationships.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestRelationships.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestRelationships.java
(original)
+++
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestRelationships.java
Thu Jun 8 08:53:08 2023
@@ -198,7 +198,7 @@ class TestRelationships {
// Write out and re-load
- UnsynchronizedByteArrayOutputStream baos = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream baos =
UnsynchronizedByteArrayOutputStream.builder().get();
pkg.save(baos);
// use revert to not re-write the input file
@@ -226,7 +226,7 @@ class TestRelationships {
@Test
void testCreateRelationsFromScratch() throws Exception {
- UnsynchronizedByteArrayOutputStream baos = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream baos =
UnsynchronizedByteArrayOutputStream.builder().get();
OPCPackage pkg = OPCPackage.create(baos);
PackagePart partA =
@@ -298,7 +298,7 @@ class TestRelationships {
OPCPackage pkg = OPCPackage.open(filepath);
assert_50154(pkg);
- UnsynchronizedByteArrayOutputStream baos = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream baos =
UnsynchronizedByteArrayOutputStream.builder().get();
pkg.save(baos);
// use revert to not re-write the input file
@@ -353,7 +353,7 @@ class TestRelationships {
@Test
void testSelfRelations_bug51187() throws Exception {
- UnsynchronizedByteArrayOutputStream baos = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream baos =
UnsynchronizedByteArrayOutputStream.builder().get();
PackageRelationship rel1;
try (OPCPackage pkg = OPCPackage.create(baos)) {
@@ -399,7 +399,7 @@ class TestRelationships {
assertEquals("mailto:[email protected]%C2%A0",
targetUri.toASCIIString());
assertEquals("[email protected]\u00A0",
targetUri.getSchemeSpecificPart());
- UnsynchronizedByteArrayOutputStream out = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream out =
UnsynchronizedByteArrayOutputStream.builder().get();
pkg1.save(out);
try (OPCPackage pkg2 = OPCPackage.open(out.toInputStream())) {
Modified:
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/ZipFileAssert.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/ZipFileAssert.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/ZipFileAssert.java
(original)
+++
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/ZipFileAssert.java
Thu Jun 8 08:53:08 2023
@@ -106,7 +106,7 @@ public final class ZipFileAssert {
while ((entree = zis.getNextEntry()) != null) {
/* Create an array for the current entry */
- UnsynchronizedByteArrayOutputStream byteArray = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream byteArray =
UnsynchronizedByteArrayOutputStream.builder().get();
IOUtils.copy(zis, byteArray);
zipContent.put(entree.getName(), byteArray);
}
Modified:
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/compliance/TestOPCComplianceCoreProperties.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/compliance/TestOPCComplianceCoreProperties.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/compliance/TestOPCComplianceCoreProperties.java
(original)
+++
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/compliance/TestOPCComplianceCoreProperties.java
Thu Jun 8 08:53:08 2023
@@ -216,7 +216,7 @@ public final class TestOPCComplianceCore
@Test
void testNoCoreProperties_saveNew() throws Exception {
String sampleFileName = "OPCCompliance_NoCoreProperties.xlsx";
- UnsynchronizedByteArrayOutputStream baos = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream baos =
UnsynchronizedByteArrayOutputStream.builder().get();
try (OPCPackage pkg =
OPCPackage.open(getSampleFile(sampleFileName).getPath())) {
// Verify it has empty properties
Modified:
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/internal/marshallers/TestZipPackagePropertiesMarshaller.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/internal/marshallers/TestZipPackagePropertiesMarshaller.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/internal/marshallers/TestZipPackagePropertiesMarshaller.java
(original)
+++
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/internal/marshallers/TestZipPackagePropertiesMarshaller.java
Thu Jun 8 08:53:08 2023
@@ -17,7 +17,6 @@
package org.apache.poi.openxml4j.opc.internal.marshallers;
-import static org.apache.commons.io.output.NullOutputStream.NULL_OUTPUT_STREAM;
import static
org.apache.poi.openxml4j.opc.PackagingURIHelper.PACKAGE_RELATIONSHIPS_ROOT_URI;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -27,6 +26,7 @@ import java.io.OutputStream;
import org.apache.commons.compress.archivers.ArchiveEntry;
import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
+import org.apache.commons.io.output.NullOutputStream;
import org.apache.commons.io.output.UnsynchronizedByteArrayOutputStream;
import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
import org.apache.poi.openxml4j.opc.PackagePartName;
@@ -39,7 +39,7 @@ class TestZipPackagePropertiesMarshaller
private final PartMarshaller marshaller = new
ZipPackagePropertiesMarshaller();
private boolean marshall() throws OpenXML4JException {
- return marshall(new ZipArchiveOutputStream(new
UnsynchronizedByteArrayOutputStream()));
+ return marshall(new
ZipArchiveOutputStream(UnsynchronizedByteArrayOutputStream.builder().get()));
}
private boolean marshall(OutputStream zos) throws OpenXML4JException {
@@ -51,7 +51,7 @@ class TestZipPackagePropertiesMarshaller
@Test
void nonZipOutputStream() {
- assertThrows(IllegalArgumentException.class, () ->
marshall(NULL_OUTPUT_STREAM));
+ assertThrows(IllegalArgumentException.class, () ->
marshall(NullOutputStream.INSTANCE));
}
@Test
@@ -61,7 +61,7 @@ class TestZipPackagePropertiesMarshaller
@Test
void ioException() {
- ZipArchiveOutputStream zos = new ZipArchiveOutputStream(new
UnsynchronizedByteArrayOutputStream()) {
+ ZipArchiveOutputStream zos = new
ZipArchiveOutputStream(UnsynchronizedByteArrayOutputStream.builder().get()) {
@Override
public void putArchiveEntry(final ArchiveEntry archiveEntry)
throws IOException {
throw new IOException("TestException");
Modified:
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/DummyKeystore.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/DummyKeystore.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/DummyKeystore.java
(original)
+++
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/DummyKeystore.java
Thu Jun 8 08:53:08 2023
@@ -152,7 +152,7 @@ public class DummyKeystore {
public DummyKeystore(String pfxInput, String storePass) throws
GeneralSecurityException, IOException {
CryptoFunctions.registerBouncyCastle();
keystore = KeyStore.getInstance("PKCS12");
- try (InputStream fis = new
UnsynchronizedByteArrayInputStream(RawDataUtil.decompress(pfxInput))) {
+ try (InputStream fis =
UnsynchronizedByteArrayInputStream.builder().setByteArray(RawDataUtil.decompress(pfxInput)).get())
{
keystore.load(fis, storePass.toCharArray());
}
}
Modified:
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java
(original)
+++
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java
Thu Jun 8 08:53:08 2023
@@ -209,7 +209,7 @@ class TestSignatureInfo {
SignatureInfo si = new SignatureInfo();
si.setSignatureConfig(signatureConfig);
- UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream(100000);
+ UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().setBufferSize(100000).get();
try (XSSFWorkbook wb1 = new XSSFWorkbook()) {
wb1.createSheet().createRow(1).createCell(1).setCellValue("Test");
wb1.write(bos);
@@ -426,7 +426,7 @@ class TestSignatureInfo {
void testSignEnvelopingDocument() throws Exception {
String testFile = "hello-world-unsigned.xlsx";
File sigCopy = testdata.getFile(testFile);
- UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream(50000);
+ UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().setBufferSize(50000).get();
final String execTimestr;
@@ -698,7 +698,7 @@ class TestSignatureInfo {
DummyKeystore ks = new DummyKeystore(STORE_PASS);
KeyCertPair certPair = ks.createDummyKey();
- UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get();
try (XWPFDocument doc = new XWPFDocument()) {
XWPFHyperlinkRun r =
doc.createParagraph().createHyperlinkRun("http://poi.apache.org");
r.setText("Hyperlink");
@@ -743,7 +743,7 @@ class TestSignatureInfo {
try (SXSSFWorkbook wb1 = new
SXSSFWorkbook((XSSFWorkbook)WorkbookFactory.create(tpl), 10)) {
wb1.setCompressTempFiles(true);
wb1.removeSheetAt(0);
- UnsynchronizedByteArrayOutputStream os = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream os =
UnsynchronizedByteArrayOutputStream.builder().get();
wb1.write(os);
try (OPCPackage pkg = OPCPackage.open(os.toInputStream())) {
@@ -888,7 +888,7 @@ class TestSignatureInfo {
throw e;
}
- UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get();
try (XSSFWorkbook wb = new XSSFWorkbook()) {
wb.createSheet().createRow(0).createCell(0).setCellValue("Test");
wb.write(bos);
@@ -1075,7 +1075,7 @@ class TestSignatureInfo {
throw e;
}
- UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get();
try (XSSFWorkbook wb = new XSSFWorkbook()) {
wb.createSheet().createRow(0).createCell(0).setCellValue("test");
wb.write(bos);
Modified:
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestAgileEncryptionParameters.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestAgileEncryptionParameters.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestAgileEncryptionParameters.java
(original)
+++
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestAgileEncryptionParameters.java
Thu Jun 8 08:53:08 2023
@@ -93,7 +93,7 @@ class TestAgileEncryptionParameters {
}
// create a small sample workbook for encrypting
- UnsynchronizedByteArrayOutputStream bosOrig = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream bosOrig =
UnsynchronizedByteArrayOutputStream.builder().get();
try (XSSFWorkbook workbook = new XSSFWorkbook()) {
XSSFSheet sheet = workbook.createSheet();
XSSFRow row = sheet.createRow(0);
@@ -136,7 +136,7 @@ class TestAgileEncryptionParameters {
os.write(testData);
}
- try (UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream()) {
+ try (UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get()) {
fsEnc.writeFilesystem(bos);
bos.close();
Modified:
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestDecryptor.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestDecryptor.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestDecryptor.java
(original)
+++
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestDecryptor.java
Thu Jun 8 08:53:08 2023
@@ -142,7 +142,7 @@ class TestDecryptor {
Decryptor d = Decryptor.getInstance(info);
d.verifyPassword("pwd123");
- final UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream(10000);
+ final UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().setBufferSize(10000).get();
try (final ZipArchiveInputStream zis = new
ZipArchiveInputStream(d.getDataStream(fs))) {
int[] sizes = { 3711, 1155, 445, 9376, 450, 588, 1337, 2593,
304, 7910 };
for (int size : sizes) {
Modified:
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestEncryptor.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestEncryptor.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestEncryptor.java
(original)
+++
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestEncryptor.java
Thu Jun 8 08:53:08 2023
@@ -16,7 +16,6 @@
==================================================================== */
package org.apache.poi.poifs.crypt.tests;
-import static org.apache.commons.io.output.NullOutputStream.NULL_OUTPUT_STREAM;
import static org.apache.poi.poifs.crypt.CryptoFunctions.getMessageDigest;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -38,6 +37,7 @@ import java.util.Random;
import javax.crypto.Cipher;
+import org.apache.commons.io.output.NullOutputStream;
import org.apache.commons.io.output.UnsynchronizedByteArrayOutputStream;
import org.apache.poi.POIDataSamples;
import org.apache.poi.openxml4j.opc.ContentTypes;
@@ -76,7 +76,7 @@ class TestEncryptor {
payloadExpected = IOUtils.toByteArray(is);
}
- UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get();
try (POIFSFileSystem fs = new POIFSFileSystem()) {
EncryptionInfo ei = new EncryptionInfo(EncryptionMode.binaryRC4);
Encryptor enc = ei.getEncryptor();
@@ -113,7 +113,7 @@ class TestEncryptor {
payloadExpected = IOUtils.toByteArray(is);
}
- UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get();
try (POIFSFileSystem fs = new TempFilePOIFSFileSystem()) {
EncryptionInfo ei = new EncryptionInfo(EncryptionMode.agile);
Encryptor enc = ei.getEncryptor();
@@ -200,7 +200,7 @@ class TestEncryptor {
Encryptor e = Encryptor.getInstance(infoActual);
e.confirmPassword(pass, keySpec, keySalt, verifierExpected,
verifierSaltExpected, integritySalt);
- UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get();
try (POIFSFileSystem fs = new POIFSFileSystem()) {
try (OutputStream os = e.getDataStream(fs)) {
os.write(payloadExpected);
@@ -287,7 +287,7 @@ class TestEncryptor {
// now we use a newly generated salt/verifier and check
// if the file content is still the same
- final UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream(50000);
+ final UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().setBufferSize(50000).get();
try (POIFSFileSystem fs = new POIFSFileSystem()) {
final EncryptionInfo infoActual2 = new EncryptionInfo(
@@ -331,7 +331,7 @@ class TestEncryptor {
@Test
void encryptPackageWithoutCoreProperties() throws Exception {
// Open our file without core properties
- UnsynchronizedByteArrayOutputStream baos = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream baos =
UnsynchronizedByteArrayOutputStream.builder().get();
try (InputStream is =
POIDataSamples.getOpenXML4JInstance().openResourceAsStream("OPCCompliance_NoCoreProperties.xlsx");
OPCPackage pkg = OPCPackage.open(is)) {
@@ -530,7 +530,7 @@ class TestEncryptor {
os.write(zipInput);
}
- UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get();
fsNew.writeFilesystem(bos);
try (POIFSFileSystem fsReload = new
POIFSFileSystem(bos.toInputStream())) {
@@ -624,7 +624,7 @@ class TestEncryptor {
try (InputStream is = dec.getDataStream(poifs);
DigestInputStream dis = new DigestInputStream(is, md)) {
- IOUtils.copy(dis, NULL_OUTPUT_STREAM);
+ IOUtils.copy(dis, NullOutputStream.INSTANCE);
}
}
Modified:
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestHxxFEncryption.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestHxxFEncryption.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestHxxFEncryption.java
(original)
+++
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestHxxFEncryption.java
Thu Jun 8 08:53:08 2023
@@ -105,7 +105,7 @@ class TestHxxFEncryption {
File f = sampleDir.getFile(file);
Biff8EncryptionKey.setCurrentUserPassword(password);
try (POITextExtractor te1 = ExtractorFactory.createExtractor(f);
- UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream()) {
+ UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get()) {
Biff8EncryptionKey.setCurrentUserPassword(newPass);
try (POIDocument doc = (POIDocument) te1.getDocument()) {
doc.write(bos);
@@ -126,7 +126,7 @@ class TestHxxFEncryption {
File f = sampleDir.getFile(file);
Biff8EncryptionKey.setCurrentUserPassword(password);
try (POITextExtractor te1 = ExtractorFactory.createExtractor(f);
- UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream()) {
+ UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get()) {
// first remove encryption
Biff8EncryptionKey.setCurrentUserPassword(null);
try (POIDocument doc = (POIDocument) te1.getDocument()) {
@@ -174,7 +174,7 @@ class TestHxxFEncryption {
@Test
public void changeEncryptionMode() throws IOException {
- UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream(10_000);
+ UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().setBufferSize(10_000).get();
try (HSSFWorkbook wb = new HSSFWorkbook()) {
wb.createSheet().createRow(1).createCell(1).setCellValue("Test");
Modified:
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/sl/tests/TestOleShape.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/sl/tests/TestOleShape.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/sl/tests/TestOleShape.java
(original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/sl/tests/TestOleShape.java
Thu Jun 8 08:53:08 2023
@@ -113,7 +113,7 @@ class TestOleShape {
@ParameterizedTest
@MethodSource("data")
void embedData(Api api, ObjectMetaData.Application app) throws
IOException, ReflectiveOperationException {
- final UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream(50000);
+ final UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().setBufferSize(50000).get();
try (SlideShow<?,?> ppt = createSlideShow(api)) {
final PictureData picData = ppt.addPicture(pictureFile,
PictureType.EMF);
final Slide<?,?> slide = ppt.createSlide();
Modified:
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/sl/tests/TestSlide.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/sl/tests/TestSlide.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/sl/tests/TestSlide.java
(original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/sl/tests/TestSlide.java
Thu Jun 8 08:53:08 2023
@@ -55,7 +55,7 @@ class TestSlide {
ppt1.createSlide().setHidden(true);
ppt1.createSlide();
- try (UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream()) {
+ try (UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get()) {
ppt1.write(bos);
try (InputStream is = bos.toInputStream();
Modified:
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/sl/tests/TestTable.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/sl/tests/TestTable.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/sl/tests/TestTable.java
(original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/sl/tests/TestTable.java
Thu Jun 8 08:53:08 2023
@@ -125,7 +125,7 @@ class TestTable {
}
}
- UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get();
ppt1.write(bos);
try (SlideShow<?,?> ppt2 =
SlideShowFactory.create(bos.toInputStream())) {
Modified:
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/TestEmbedOLEPackage.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/TestEmbedOLEPackage.java?rev=1910300&r1=1910299&r2=1910300&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/TestEmbedOLEPackage.java
(original)
+++
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/TestEmbedOLEPackage.java
Thu Jun 8 08:53:08 2023
@@ -123,7 +123,7 @@ class TestEmbedOLEPackage {
try (POIFSFileSystem scratchFS = new POIFSFileSystem();
POIFSFileSystem ole1FS = new POIFSFileSystem(new
ByteArrayInputStream(oleShapes.get(0).getObjectData()))) {
- UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get();
scratch.writeOut(bos);
scratchFS.createDocument(bos.toInputStream(),
Ole10Native.OLE10_NATIVE);
scratchFS.getRoot().setStorageClsid(ClassIDPredefined.OLE_V1_PACKAGE.getClassID());
@@ -222,7 +222,7 @@ class TestEmbedOLEPackage {
sh1.setAnchor(new java.awt.Rectangle(50, 50, 100, 200));
sh1.setFillColor(java.awt.Color.red);
- UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get();
ppt.write(bos);
ppt.close();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]