This is an automated email from the ASF dual-hosted git repository. tallison pushed a commit to branch TIKA-4145 in repository https://gitbox.apache.org/repos/asf/tika.git
commit 0e5e173eae3c3f30ee4e7a767f08ed05867ea873 Author: tballison <[email protected]> AuthorDate: Thu Sep 28 11:18:45 2023 -0400 TIKA-4145 -- revert CloseShieldInputStream.wrap --- tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java | 2 +- .../src/main/java/org/apache/tika/detect/XmlRootExtractor.java | 2 +- .../org/apache/tika/extractor/ParsingEmbeddedDocumentExtractor.java | 2 +- tika-core/src/main/java/org/apache/tika/parser/NetworkParser.java | 2 +- .../src/main/java/org/apache/tika/parser/envi/EnviHeaderParser.java | 2 +- .../src/main/java/org/apache/tika/parser/isatab/ISATabUtils.java | 6 +++--- .../java/org/apache/tika/parser/apple/AppleSingleFileParser.java | 2 +- .../main/java/org/apache/tika/parser/iwork/IWorkPackageParser.java | 2 +- .../org/apache/tika/parser/iwork/iwana/IWork13PackageParser.java | 2 +- .../src/main/java/org/apache/tika/parser/dgn/DGN8Parser.java | 4 ++-- .../src/main/java/org/apache/tika/parser/code/SourceCodeParser.java | 2 +- .../src/main/java/org/apache/tika/parser/crypto/Pkcs7Parser.java | 2 +- .../src/main/java/org/apache/tika/parser/html/HtmlParser.java | 2 +- .../src/main/java/org/apache/tika/parser/image/ImageParser.java | 2 +- .../main/java/org/apache/tika/parser/microsoft/HSLFExtractor.java | 2 +- .../main/java/org/apache/tika/parser/microsoft/OfficeParser.java | 4 ++-- .../apache/tika/parser/microsoft/ooxml/OOXMLExtractorFactory.java | 2 +- .../parser/microsoft/ooxml/SXSLFPowerPointExtractorDecorator.java | 4 ++-- .../tika/parser/microsoft/ooxml/SXWPFWordExtractorDecorator.java | 2 +- .../tika/parser/microsoft/ooxml/xps/XPSExtractorDecorator.java | 6 +++--- .../parser/microsoft/ooxml/xwpf/XWPFEventBasedWordExtractor.java | 2 +- .../tika/parser/microsoft/ooxml/xwpf/ml2006/Word2006MLParser.java | 2 +- .../org/apache/tika/parser/microsoft/xml/AbstractXML2003Parser.java | 2 +- .../src/main/java/org/apache/tika/parser/dif/DIFParser.java | 2 +- .../main/java/org/apache/tika/parser/epub/EpubContentParser.java | 2 +- .../src/main/java/org/apache/tika/parser/epub/EpubParser.java | 2 +- .../main/java/org/apache/tika/parser/hwp/HwpTextExtractorV5.java | 2 +- .../apache/tika/parser/indesign/ContentAndMetadataExtractor.java | 2 +- .../src/main/java/org/apache/tika/parser/mif/MIFParser.java | 2 +- .../java/org/apache/tika/parser/odf/FlatOpenDocumentParser.java | 2 +- .../java/org/apache/tika/parser/odf/OpenDocumentContentParser.java | 2 +- .../main/java/org/apache/tika/parser/odf/OpenDocumentParser.java | 4 ++-- .../src/main/java/org/apache/tika/parser/feed/FeedParser.java | 2 +- .../src/main/java/org/apache/tika/parser/pdf/PDFParser.java | 4 ++-- .../src/main/java/org/apache/tika/parser/pkg/CompressorParser.java | 4 ++-- .../src/main/java/org/apache/tika/parser/pkg/PackageParser.java | 4 ++-- .../src/main/java/org/apache/tika/parser/csv/TextAndCSVParser.java | 6 +++--- .../src/main/java/org/apache/tika/parser/txt/TXTParser.java | 2 +- .../src/main/java/org/apache/tika/parser/http/HttpParser.java | 2 +- .../src/main/java/org/apache/tika/parser/wacz/WACZParser.java | 2 +- .../src/main/java/org/apache/tika/parser/tmx/TMXParser.java | 2 +- .../src/main/java/org/apache/tika/parser/xliff/XLIFF12Parser.java | 2 +- .../src/main/java/org/apache/tika/parser/xml/XMLParser.java | 2 +- .../src/main/java/org/apache/tika/parser/xml/XMLProfiler.java | 2 +- .../main/java/org/apache/tika/parser/xmp/XMPMetadataExtractor.java | 2 +- .../org/apache/tika/detect/zip/DefaultZipContainerDetector.java | 2 +- .../tika/detect/zip/DeprecatedStreamingZipContainerDetector.java | 2 +- .../src/main/java/org/apache/tika/zip/utils/ZipSalvager.java | 2 +- 48 files changed, 61 insertions(+), 61 deletions(-) diff --git a/tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java b/tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java index 97ec89629..eac0e4f9b 100644 --- a/tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java +++ b/tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java @@ -474,7 +474,7 @@ public class TikaCLI { if (arg.equals("-")) { try (InputStream stream = TikaInputStream - .get(CloseShieldInputStream.wrap(System.in))) { + .get(new CloseShieldInputStream(System.in))) { type.process(stream, System.out, new Metadata()); } } else { diff --git a/tika-core/src/main/java/org/apache/tika/detect/XmlRootExtractor.java b/tika-core/src/main/java/org/apache/tika/detect/XmlRootExtractor.java index 94d853149..61fcedbe9 100644 --- a/tika-core/src/main/java/org/apache/tika/detect/XmlRootExtractor.java +++ b/tika-core/src/main/java/org/apache/tika/detect/XmlRootExtractor.java @@ -70,7 +70,7 @@ public class XmlRootExtractor { private QName extractRootElement(InputStream stream, boolean throwMalformed) { ExtractorHandler handler = new ExtractorHandler(); try { - XMLReaderUtils.parseSAX(CloseShieldInputStream.wrap(stream), + XMLReaderUtils.parseSAX(new CloseShieldInputStream(stream), handler, EMPTY_CONTEXT); } catch (SecurityException e) { throw e; diff --git a/tika-core/src/main/java/org/apache/tika/extractor/ParsingEmbeddedDocumentExtractor.java b/tika-core/src/main/java/org/apache/tika/extractor/ParsingEmbeddedDocumentExtractor.java index d1b25f17c..8391624a3 100644 --- a/tika-core/src/main/java/org/apache/tika/extractor/ParsingEmbeddedDocumentExtractor.java +++ b/tika-core/src/main/java/org/apache/tika/extractor/ParsingEmbeddedDocumentExtractor.java @@ -99,7 +99,7 @@ public class ParsingEmbeddedDocumentExtractor implements EmbeddedDocumentExtract // Use the delegate parser to parse this entry try (TemporaryResources tmp = new TemporaryResources()) { final TikaInputStream newStream = - TikaInputStream.get(CloseShieldInputStream.wrap(stream), tmp, metadata); + TikaInputStream.get(new CloseShieldInputStream(stream), tmp, metadata); if (stream instanceof TikaInputStream) { final Object container = ((TikaInputStream) stream).getOpenContainer(); if (container != null) { diff --git a/tika-core/src/main/java/org/apache/tika/parser/NetworkParser.java b/tika-core/src/main/java/org/apache/tika/parser/NetworkParser.java index 7ffb409ab..3582a70f7 100644 --- a/tika-core/src/main/java/org/apache/tika/parser/NetworkParser.java +++ b/tika-core/src/main/java/org/apache/tika/parser/NetworkParser.java @@ -92,7 +92,7 @@ public class NetworkParser extends AbstractParser { connection.connect(); try (InputStream input = connection.getInputStream()) { new ParsingTask(stream, connection.getOutputStream()) - .parse(CloseShieldInputStream.wrap(input), handler, metadata, context); + .parse(new CloseShieldInputStream(input), handler, metadata, context); } } diff --git a/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/envi/EnviHeaderParser.java b/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/envi/EnviHeaderParser.java index 2a3a493d6..95a2d6218 100644 --- a/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/envi/EnviHeaderParser.java +++ b/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/envi/EnviHeaderParser.java @@ -74,7 +74,7 @@ public class EnviHeaderParser extends AbstractEncodingDetectorParser { // The following code was taken from the TXTParser // Automatically detect the character encoding - try (AutoDetectReader reader = new AutoDetectReader(CloseShieldInputStream.wrap(stream), + try (AutoDetectReader reader = new AutoDetectReader(new CloseShieldInputStream(stream), metadata, getEncodingDetector(context))) { Charset charset = reader.getCharset(); // deprecated, see TIKA-431 diff --git a/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/isatab/ISATabUtils.java b/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/isatab/ISATabUtils.java index 94f4c2232..6ffb98dd2 100644 --- a/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/isatab/ISATabUtils.java +++ b/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/isatab/ISATabUtils.java @@ -62,7 +62,7 @@ public class ISATabUtils { throws IOException, TikaException, SAXException { // Automatically detect the character encoding - try (AutoDetectReader reader = new AutoDetectReader(CloseShieldInputStream.wrap(stream), + try (AutoDetectReader reader = new AutoDetectReader(new CloseShieldInputStream(stream), metadata)) { extractMetadata(reader, metadata, studyFileName); } @@ -83,7 +83,7 @@ public class ISATabUtils { if (tikaConfig == null) { tikaConfig = TikaConfig.getDefaultConfig(); } - try (AutoDetectReader reader = new AutoDetectReader(CloseShieldInputStream.wrap(tis), + try (AutoDetectReader reader = new AutoDetectReader(new CloseShieldInputStream(tis), metadata, tikaConfig.getEncodingDetector()); CSVParser csvParser = new CSVParser(reader, CSVFormat.TDF)) { Iterator<CSVRecord> iterator = csvParser.iterator(); @@ -129,7 +129,7 @@ public class ISATabUtils { if (tikaConfig == null) { tikaConfig = TikaConfig.getDefaultConfig(); } - try (AutoDetectReader reader = new AutoDetectReader(CloseShieldInputStream.wrap(tis), + try (AutoDetectReader reader = new AutoDetectReader(new CloseShieldInputStream(tis), metadata, tikaConfig.getEncodingDetector()); CSVParser csvParser = new CSVParser(reader, CSVFormat.TDF)) { xhtml.startElement("table"); diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/main/java/org/apache/tika/parser/apple/AppleSingleFileParser.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/main/java/org/apache/tika/parser/apple/AppleSingleFileParser.java index 3801faee2..cf1fa8c3f 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/main/java/org/apache/tika/parser/apple/AppleSingleFileParser.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/main/java/org/apache/tika/parser/apple/AppleSingleFileParser.java @@ -99,7 +99,7 @@ public class AppleSingleFileParser extends AbstractParser { // TODO: we should probably add a readlimiting wrapper around this // stream to ensure that not more than contentFieldInfo.length bytes // are read - ex.parseEmbedded(CloseShieldInputStream.wrap(stream), xhtml, embeddedMetadata, + ex.parseEmbedded(new CloseShieldInputStream(stream), xhtml, embeddedMetadata, true); } } diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/main/java/org/apache/tika/parser/iwork/IWorkPackageParser.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/main/java/org/apache/tika/parser/iwork/IWorkPackageParser.java index de2d93bfe..4c120f30e 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/main/java/org/apache/tika/parser/iwork/IWorkPackageParser.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/main/java/org/apache/tika/parser/iwork/IWorkPackageParser.java @@ -121,7 +121,7 @@ public class IWorkPackageParser extends AbstractParser { metadata.add(Metadata.CONTENT_TYPE, type.getType().toString()); xhtml.startDocument(); if (contentHandler != null) { - XMLReaderUtils.parseSAX(CloseShieldInputStream.wrap(entryStream), + XMLReaderUtils.parseSAX(new CloseShieldInputStream(entryStream), contentHandler, context); } xhtml.endDocument(); diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/main/java/org/apache/tika/parser/iwork/iwana/IWork13PackageParser.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/main/java/org/apache/tika/parser/iwork/iwana/IWork13PackageParser.java index 8fe7dc607..59619d8b5 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/main/java/org/apache/tika/parser/iwork/iwana/IWork13PackageParser.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/main/java/org/apache/tika/parser/iwork/iwana/IWork13PackageParser.java @@ -128,7 +128,7 @@ public class IWork13PackageParser extends AbstractParser { if (type == null) { type = IWork13DocumentType.detectIfPossible(entry); } - processZipEntry(entry, CloseShieldInputStream.wrap(zipStream), metadata, xhtml, + processZipEntry(entry, new CloseShieldInputStream(zipStream), metadata, xhtml, parseContext, embeddedDocumentExtractor); entry = zipStream.getNextEntry(); diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-cad-module/src/main/java/org/apache/tika/parser/dgn/DGN8Parser.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-cad-module/src/main/java/org/apache/tika/parser/dgn/DGN8Parser.java index e9dae2281..edb2488a3 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-cad-module/src/main/java/org/apache/tika/parser/dgn/DGN8Parser.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-cad-module/src/main/java/org/apache/tika/parser/dgn/DGN8Parser.java @@ -60,7 +60,7 @@ public class DGN8Parser extends AbstractParser { POIFSFileSystem mustCloseFs = null; try { if (tstream == null) { - mustCloseFs = new POIFSFileSystem(CloseShieldInputStream.wrap(stream)); + mustCloseFs = new POIFSFileSystem(new CloseShieldInputStream(stream)); root = mustCloseFs.getRoot(); } else { final Object container = tstream.getOpenContainer(); @@ -73,7 +73,7 @@ public class DGN8Parser extends AbstractParser { if (tstream.hasFile()) { fs = new POIFSFileSystem(tstream.getFile(), true); } else { - fs = new POIFSFileSystem(CloseShieldInputStream.wrap(tstream)); + fs = new POIFSFileSystem(new CloseShieldInputStream(tstream)); } // tstream will close the fs, no need to close this below tstream.setOpenContainer(fs); diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-code-module/src/main/java/org/apache/tika/parser/code/SourceCodeParser.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-code-module/src/main/java/org/apache/tika/parser/code/SourceCodeParser.java index 65452b5d1..1b675b087 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-code-module/src/main/java/org/apache/tika/parser/code/SourceCodeParser.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-code-module/src/main/java/org/apache/tika/parser/code/SourceCodeParser.java @@ -91,7 +91,7 @@ public class SourceCodeParser extends AbstractEncodingDetectorParser { @Override public void parse(InputStream stream, ContentHandler handler, Metadata metadata, ParseContext context) throws IOException, SAXException, TikaException { - try (AutoDetectReader reader = new AutoDetectReader(CloseShieldInputStream.wrap(stream), + try (AutoDetectReader reader = new AutoDetectReader(new CloseShieldInputStream(stream), metadata, getEncodingDetector(context))) { Charset charset = reader.getCharset(); String mediaType = metadata.get(Metadata.CONTENT_TYPE); diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-crypto-module/src/main/java/org/apache/tika/parser/crypto/Pkcs7Parser.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-crypto-module/src/main/java/org/apache/tika/parser/crypto/Pkcs7Parser.java index 13e46f825..7e42be877 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-crypto-module/src/main/java/org/apache/tika/parser/crypto/Pkcs7Parser.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-crypto-module/src/main/java/org/apache/tika/parser/crypto/Pkcs7Parser.java @@ -65,7 +65,7 @@ public class Pkcs7Parser extends AbstractParser { DigestCalculatorProvider digestCalculatorProvider = new JcaDigestCalculatorProviderBuilder().setProvider("BC").build(); CMSSignedDataParser parser = new CMSSignedDataParser(digestCalculatorProvider, - CloseShieldInputStream.wrap(stream)); + new CloseShieldInputStream(stream)); try { CMSTypedStream content = parser.getSignedContent(); if (content == null) { diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/HtmlParser.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/HtmlParser.java index ccf2711c1..d72f4865e 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/HtmlParser.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/HtmlParser.java @@ -109,7 +109,7 @@ public class HtmlParser extends AbstractEncodingDetectorParser { private void parseImpl(InputStream stream, ContentHandler handler, Metadata metadata, ParseContext context) throws IOException, SAXException, TikaException { // Automatically detect the character encoding - try (AutoDetectReader reader = new AutoDetectReader(CloseShieldInputStream.wrap(stream), + try (AutoDetectReader reader = new AutoDetectReader(new CloseShieldInputStream(stream), metadata, getEncodingDetector(context))) { Charset charset = reader.getCharset(); String previous = metadata.get(Metadata.CONTENT_TYPE); diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/ImageParser.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/ImageParser.java index 9fea04e16..3a75b6d89 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/ImageParser.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/ImageParser.java @@ -169,7 +169,7 @@ public class ImageParser extends AbstractImageParser { ImageReader reader = iterator.next(); try { try (ImageInputStream imageStream = ImageIO - .createImageInputStream(CloseShieldInputStream.wrap(stream))) { + .createImageInputStream(new CloseShieldInputStream(stream))) { reader.setInput(imageStream); try { int numImages = reader.getNumImages(true); diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/HSLFExtractor.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/HSLFExtractor.java index 31588d1c9..8a442383b 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/HSLFExtractor.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/HSLFExtractor.java @@ -586,7 +586,7 @@ public class HSLFExtractor extends AbstractPOIFSExtractor { if (mediaType .equals("application/x-tika-msoffice-embedded; format=comp_obj") || mediaType.equals("application/x-tika-msoffice")) { - POIFSFileSystem poifs = new POIFSFileSystem(CloseShieldInputStream.wrap(stream)); + POIFSFileSystem poifs = new POIFSFileSystem(new CloseShieldInputStream(stream)); try { handleEmbeddedOfficeDoc(poifs.getRoot(), objID, xhtml, false); diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/OfficeParser.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/OfficeParser.java index c082b30d0..d771846fd 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/OfficeParser.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/OfficeParser.java @@ -158,7 +158,7 @@ public class OfficeParser extends AbstractOfficeParser { boolean isDirectoryNode = false; try { if (tstream == null) { - mustCloseFs = new POIFSFileSystem(CloseShieldInputStream.wrap(stream)); + mustCloseFs = new POIFSFileSystem(new CloseShieldInputStream(stream)); root = mustCloseFs.getRoot(); } else { final Object container = tstream.getOpenContainer(); @@ -172,7 +172,7 @@ public class OfficeParser extends AbstractOfficeParser { if (tstream.hasFile()) { fs = new POIFSFileSystem(tstream.getFile(), true); } else { - fs = new POIFSFileSystem(CloseShieldInputStream.wrap(tstream)); + fs = new POIFSFileSystem(new CloseShieldInputStream(tstream)); } //tstream will close the fs, no need to close this below tstream.setOpenContainer(fs); diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLExtractorFactory.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLExtractorFactory.java index 35cbbb6d2..6ea9d5a5f 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLExtractorFactory.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLExtractorFactory.java @@ -124,7 +124,7 @@ public class OOXMLExtractorFactory { try (RereadableInputStream rereadableInputStream = new RereadableInputStream(stream, MAX_BUFFER_LENGTH, false)) { try { - pkg = OPCPackage.open(CloseShieldInputStream.wrap(rereadableInputStream)); + pkg = OPCPackage.open(new CloseShieldInputStream(rereadableInputStream)); } catch (UnsupportedZipFeatureException e) { if (e.getFeature() != UnsupportedZipFeatureException.Feature.DATA_DESCRIPTOR) { diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/SXSLFPowerPointExtractorDecorator.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/SXSLFPowerPointExtractorDecorator.java index c036f086f..ac6b4a9ca 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/SXSLFPowerPointExtractorDecorator.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/SXSLFPowerPointExtractorDecorator.java @@ -159,7 +159,7 @@ public class SXSLFPowerPointExtractorDecorator extends AbstractOOXMLExtractor { continue; } try (InputStream stream = commentAuthorsPart.getInputStream()) { - XMLReaderUtils.parseSAX(CloseShieldInputStream.wrap(stream), + XMLReaderUtils.parseSAX(new CloseShieldInputStream(stream), new XSLFCommentAuthorHandler(), context); } catch (TikaException | SAXException | IOException e) { @@ -178,7 +178,7 @@ public class SXSLFPowerPointExtractorDecorator extends AbstractOOXMLExtractor { // Map<String, String> hyperlinks = loadHyperlinkRelationships(packagePart); xhtml.startElement("div", "class", "slide-content"); try (InputStream stream = slidePart.getInputStream()) { - XMLReaderUtils.parseSAX(CloseShieldInputStream.wrap(stream), + XMLReaderUtils.parseSAX(new CloseShieldInputStream(stream), new EmbeddedContentHandler(new OOXMLWordAndPowerPointTextHandler( new OOXMLTikaBodyPartHandler(xhtml), linkedRelationships)), context); diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/SXWPFWordExtractorDecorator.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/SXWPFWordExtractorDecorator.java index 2b4c52748..92d232cd4 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/SXWPFWordExtractorDecorator.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/SXWPFWordExtractorDecorator.java @@ -191,7 +191,7 @@ public class SXWPFWordExtractorDecorator extends AbstractOOXMLExtractor { Map<String, String> linkedRelationships = loadLinkedRelationships(packagePart, true, metadata); try (InputStream stream = packagePart.getInputStream()) { - XMLReaderUtils.parseSAX(CloseShieldInputStream.wrap(stream), + XMLReaderUtils.parseSAX(new CloseShieldInputStream(stream), new EmbeddedContentHandler(new OOXMLWordAndPowerPointTextHandler( new OOXMLTikaBodyPartHandler(xhtml, styles, listManager, config), linkedRelationships, config.isIncludeShapeBasedContent(), diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xps/XPSExtractorDecorator.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xps/XPSExtractorDecorator.java index 30a19c9b2..1bae10b03 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xps/XPSExtractorDecorator.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xps/XPSExtractorDecorator.java @@ -149,7 +149,7 @@ public class XPSExtractorDecorator extends AbstractOOXMLExtractor { private void handleDocuments(PackageRelationship packageRelationship, XHTMLContentHandler xhtml) throws IOException, SAXException, TikaException { try (InputStream stream = pkg.getPart(packageRelationship).getInputStream()) { - XMLReaderUtils.parseSAX(CloseShieldInputStream.wrap(stream), + XMLReaderUtils.parseSAX(new CloseShieldInputStream(stream), new EmbeddedContentHandler(new FixedDocSeqHandler(xhtml)), context); } } @@ -198,7 +198,7 @@ public class XPSExtractorDecorator extends AbstractOOXMLExtractor { String zipPath = (docRef.startsWith("/") ? docRef.substring(1) : docRef); if (pkg instanceof ZipPackage) { try (InputStream stream = getZipStream(zipPath, pkg)) { - XMLReaderUtils.parseSAX(CloseShieldInputStream.wrap(stream), + XMLReaderUtils.parseSAX(new CloseShieldInputStream(stream), new EmbeddedContentHandler( new PageContentPartHandler(relativeRoot, xhtml)), context); @@ -246,7 +246,7 @@ public class XPSExtractorDecorator extends AbstractOOXMLExtractor { pagePath = pagePath.substring(1); } try (InputStream stream = getZipStream(pagePath, pkg)) { - XMLReaderUtils.parseSAX(CloseShieldInputStream.wrap(stream), + XMLReaderUtils.parseSAX(new CloseShieldInputStream(stream), new XPSPageContentHandler(xhtml, embeddedImages), context); } catch (TikaException | IOException e) { throw new SAXException(e); diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/XWPFEventBasedWordExtractor.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/XWPFEventBasedWordExtractor.java index 62f54ad5e..02c8cd240 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/XWPFEventBasedWordExtractor.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/XWPFEventBasedWordExtractor.java @@ -205,7 +205,7 @@ public class XWPFEventBasedWordExtractor implements POIXMLTextExtractor { Map<String, String> hyperlinks = loadHyperlinkRelationships(packagePart); try (InputStream stream = packagePart.getInputStream()) { - XMLReaderUtils.parseSAX(CloseShieldInputStream.wrap(stream), + XMLReaderUtils.parseSAX(new CloseShieldInputStream(stream), new OOXMLWordAndPowerPointTextHandler(new XWPFToTextContentHandler(buffer), hyperlinks), new ParseContext()); } diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/Word2006MLParser.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/Word2006MLParser.java index e2fe9d080..77a0c7be1 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/Word2006MLParser.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/Word2006MLParser.java @@ -59,7 +59,7 @@ public class Word2006MLParser extends AbstractOfficeParser { //need to get new SAXParser because //an attachment might require another SAXParser //mid-parse - XMLReaderUtils.getSAXParser().parse(CloseShieldInputStream.wrap(stream), + XMLReaderUtils.getSAXParser().parse(new CloseShieldInputStream(stream), new EmbeddedContentHandler( new Word2006MLDocHandler(xhtml, metadata, context))); } catch (SAXException e) { diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/xml/AbstractXML2003Parser.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/xml/AbstractXML2003Parser.java index ea6f295e3..676d4e064 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/xml/AbstractXML2003Parser.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/xml/AbstractXML2003Parser.java @@ -94,7 +94,7 @@ public abstract class AbstractXML2003Parser extends AbstractParser { //need to get new SAXParser because //an attachment might require another SAXParser //mid-parse - XMLReaderUtils.getSAXParser().parse(CloseShieldInputStream.wrap(stream), + XMLReaderUtils.getSAXParser().parse(new CloseShieldInputStream(stream), new EmbeddedContentHandler( getContentHandler(tagged, metadata, context))); } catch (SAXException e) { diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dif/DIFParser.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dif/DIFParser.java index 328a3da32..0919c5569 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dif/DIFParser.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dif/DIFParser.java @@ -60,7 +60,7 @@ public class DIFParser extends AbstractParser { xhtml.startElement("p"); TaggedContentHandler tagged = new TaggedContentHandler(handler); try { - XMLReaderUtils.parseSAX(CloseShieldInputStream.wrap(stream), + XMLReaderUtils.parseSAX(new CloseShieldInputStream(stream), new EmbeddedContentHandler( getContentHandler(tagged, metadata, context)), context); diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/epub/EpubContentParser.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/epub/EpubContentParser.java index c29eb7c20..b837f667a 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/epub/EpubContentParser.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/epub/EpubContentParser.java @@ -47,7 +47,7 @@ public class EpubContentParser extends AbstractParser { ParseContext context) throws IOException, SAXException, TikaException { XMLReaderUtils - .parseSAX(CloseShieldInputStream.wrap(stream), handler, + .parseSAX(new CloseShieldInputStream(stream), handler, context); } diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/epub/EpubParser.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/epub/EpubParser.java index d0a7dab25..75e5eaf69 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/epub/EpubParser.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/epub/EpubParser.java @@ -178,7 +178,7 @@ public class EpubParser extends AbstractParser { } } else { temporaryResources = new TemporaryResources(); - tis = TikaInputStream.get(CloseShieldInputStream.wrap(stream), temporaryResources, metadata); + tis = TikaInputStream.get(new CloseShieldInputStream(stream), temporaryResources, metadata); } ZipFile zipFile = null; try { diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/hwp/HwpTextExtractorV5.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/hwp/HwpTextExtractorV5.java index 7a517f84e..aaab29d96 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/hwp/HwpTextExtractorV5.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/hwp/HwpTextExtractorV5.java @@ -95,7 +95,7 @@ public class HwpTextExtractorV5 implements Serializable { POIFSFileSystem fs = null; try { - fs = new POIFSFileSystem(CloseShieldInputStream.wrap(source)); + fs = new POIFSFileSystem(new CloseShieldInputStream(source)); DirectoryNode root = fs.getRoot(); extract0(root, metadata, xhtml); diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/indesign/ContentAndMetadataExtractor.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/indesign/ContentAndMetadataExtractor.java index cf70e29cf..f8ef48e26 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/indesign/ContentAndMetadataExtractor.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/indesign/ContentAndMetadataExtractor.java @@ -56,7 +56,7 @@ class ContentAndMetadataExtractor { // Parse the content using inner content handler XMLReaderUtils.parseSAX( - CloseShieldInputStream.wrap(stream), new ContentAndMetadataHandler(handler, metadata), context + new CloseShieldInputStream(stream), new ContentAndMetadataHandler(handler, metadata), context ); } diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/mif/MIFParser.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/mif/MIFParser.java index fe200e429..448276986 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/mif/MIFParser.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/mif/MIFParser.java @@ -62,7 +62,7 @@ public class MIFParser extends AbstractEncodingDetectorParser { public void parse(InputStream stream, ContentHandler handler, Metadata metadata, ParseContext context) throws IOException, SAXException, TikaException { - try (AutoDetectReader reader = new AutoDetectReader(CloseShieldInputStream.wrap(stream), + try (AutoDetectReader reader = new AutoDetectReader(new CloseShieldInputStream(stream), metadata, getEncodingDetector(context))) { Charset charset = reader.getCharset(); diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/FlatOpenDocumentParser.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/FlatOpenDocumentParser.java index 2467febfc..e943bc9a9 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/FlatOpenDocumentParser.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/FlatOpenDocumentParser.java @@ -71,7 +71,7 @@ public class FlatOpenDocumentParser extends AbstractParser { xhtml.startDocument(); try { ContentHandler fodHandler = getContentHandler(xhtml, metadata, context); - XMLReaderUtils.parseSAX(CloseShieldInputStream.wrap(stream), + XMLReaderUtils.parseSAX(new CloseShieldInputStream(stream), new EmbeddedContentHandler(fodHandler), context); //can only detect subtype (text/pres/sheet) during parse. //update it here. diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/OpenDocumentContentParser.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/OpenDocumentContentParser.java index f6d310ca8..231b5807a 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/OpenDocumentContentParser.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/OpenDocumentContentParser.java @@ -54,7 +54,7 @@ public class OpenDocumentContentParser extends AbstractParser { DefaultHandler dh = new OpenDocumentBodyHandler(handler, context); - XMLReaderUtils.parseSAX(CloseShieldInputStream.wrap(stream), + XMLReaderUtils.parseSAX(new CloseShieldInputStream(stream), new NSNormalizerContentHandler(dh), context); } diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/OpenDocumentParser.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/OpenDocumentParser.java index 42d37e150..3886af599 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/OpenDocumentParser.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/OpenDocumentParser.java @@ -337,14 +337,14 @@ public class OpenDocumentParser extends AbstractParser { embeddedMetadata.set(TikaCoreProperties.EMBEDDED_RESOURCE_TYPE, TikaCoreProperties.EmbeddedResourceType.MACRO.toString()); handler = new OpenDocumentMacroHandler(handler, context); - XMLReaderUtils.parseSAX(CloseShieldInputStream.wrap(is), + XMLReaderUtils.parseSAX(new CloseShieldInputStream(is), new EmbeddedContentHandler(handler), context); } private void checkForEncryption(InputStream stream, ParseContext context) throws SAXException, TikaException, IOException { try { - XMLReaderUtils.parseSAX(CloseShieldInputStream.wrap(stream), + XMLReaderUtils.parseSAX(new CloseShieldInputStream(stream), new EmbeddedContentHandler( new OpenDocumentManifestHandler()), context); } catch (SAXException e) { diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-news-module/src/main/java/org/apache/tika/parser/feed/FeedParser.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-news-module/src/main/java/org/apache/tika/parser/feed/FeedParser.java index b42f371fc..f4d99dd8f 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-news-module/src/main/java/org/apache/tika/parser/feed/FeedParser.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-news-module/src/main/java/org/apache/tika/parser/feed/FeedParser.java @@ -88,7 +88,7 @@ public class FeedParser extends AbstractParser { SyndFeedInput input = new SyndFeedInput(); input.setAllowDoctypes(false); SyndFeed feed = - input.build(new InputSource(CloseShieldInputStream.wrap(stream))); + input.build(new InputSource(new CloseShieldInputStream(stream))); String title = stripTags(feed.getTitleEx()); String description = stripTags(feed.getDescriptionEx()); diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/PDFParser.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/PDFParser.java index 0be92429a..9972d62db 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/PDFParser.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/PDFParser.java @@ -167,7 +167,7 @@ public class PDFParser extends AbstractParser implements RenderingParser, Initia if (stream instanceof TikaInputStream) { tstream = (TikaInputStream) stream; } else { - tstream = TikaInputStream.get(CloseShieldInputStream.wrap(stream)); + tstream = TikaInputStream.get(new CloseShieldInputStream(stream)); shouldClose = true; } context.set(PDFRenderingState.class, new PDFRenderingState(tstream)); @@ -474,7 +474,7 @@ public class PDFParser extends AbstractParser implements RenderingParser, Initia getPDDocument(tstream.getPath(), password, memoryUsageSetting, metadata, context); } else { - pdDocument = getPDDocument(CloseShieldInputStream.wrap(stream), password, + pdDocument = getPDDocument(new CloseShieldInputStream(stream), password, memoryUsageSetting, metadata, context); } if (tstream != null) { diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/main/java/org/apache/tika/parser/pkg/CompressorParser.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/main/java/org/apache/tika/parser/pkg/CompressorParser.java index 77f5b9647..791a368ce 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/main/java/org/apache/tika/parser/pkg/CompressorParser.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/main/java/org/apache/tika/parser/pkg/CompressorParser.java @@ -170,10 +170,10 @@ public class CompressorParser extends AbstractParser { // any associated resources, but the underlying document stream // should not be closed if (stream.markSupported()) { - stream = CloseShieldInputStream.wrap(stream); + stream = new CloseShieldInputStream(stream); } else { // Ensure that the stream supports the mark feature - stream = new BufferedInputStream(CloseShieldInputStream.wrap(stream)); + stream = new BufferedInputStream(new CloseShieldInputStream(stream)); } CompressorInputStream cis; diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/main/java/org/apache/tika/parser/pkg/PackageParser.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/main/java/org/apache/tika/parser/pkg/PackageParser.java index f6c1f622f..3817f4cfb 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/main/java/org/apache/tika/parser/pkg/PackageParser.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/main/java/org/apache/tika/parser/pkg/PackageParser.java @@ -262,7 +262,7 @@ public class PackageParser extends AbstractEncodingDetectorParser { // any associated resources, but the underlying document stream // should not be closed - ais = factory.createArchiveInputStream(CloseShieldInputStream.wrap(stream)); + ais = factory.createArchiveInputStream(new CloseShieldInputStream(stream)); } catch (StreamingNotSupportedException sne) { // Most archive formats work on streams, but a few need files @@ -322,7 +322,7 @@ public class PackageParser extends AbstractEncodingDetectorParser { ais.close(); // An exception would be thrown if MARK_LIMIT is not big enough stream.reset(); - ais = new ZipArchiveInputStream(CloseShieldInputStream.wrap(stream), encoding, true, + ais = new ZipArchiveInputStream(new CloseShieldInputStream(stream), encoding, true, true); parseEntries(ais, metadata, extractor, xhtml, true, entryCnt); } diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/csv/TextAndCSVParser.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/csv/TextAndCSVParser.java index 462167d14..0f23f9254 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/csv/TextAndCSVParser.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/csv/TextAndCSVParser.java @@ -290,13 +290,13 @@ public class TextAndCSVParser extends AbstractEncodingDetectorParser { MediaType mediaType = MediaType.parse(mediaString); if (!SUPPORTED_TYPES.contains(mediaType.getBaseType())) { params.setMediaType(mediaType); - return new AutoDetectReader(CloseShieldInputStream.wrap(stream), metadata, + return new AutoDetectReader(new CloseShieldInputStream(stream), metadata, getEncodingDetector(context)); } } Reader reader = null; if (params.getCharset() == null) { - reader = new AutoDetectReader(CloseShieldInputStream.wrap(stream), metadata, + reader = new AutoDetectReader(new CloseShieldInputStream(stream), metadata, getEncodingDetector(context)); params.setCharset(((AutoDetectReader) reader).getCharset()); if (params.isComplete()) { @@ -304,7 +304,7 @@ public class TextAndCSVParser extends AbstractEncodingDetectorParser { } } else { reader = new BufferedReader( - new InputStreamReader(CloseShieldInputStream.wrap(stream), params.getCharset())); + new InputStreamReader(new CloseShieldInputStream(stream), params.getCharset())); } if (params.getDelimiter() == null && diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/TXTParser.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/TXTParser.java index e8a1ae0a7..c6e743091 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/TXTParser.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/TXTParser.java @@ -74,7 +74,7 @@ public class TXTParser extends AbstractEncodingDetectorParser { ParseContext context) throws IOException, SAXException, TikaException { // Automatically detect the character encoding - try (AutoDetectReader reader = new AutoDetectReader(CloseShieldInputStream.wrap(stream), + try (AutoDetectReader reader = new AutoDetectReader(new CloseShieldInputStream(stream), metadata, getEncodingDetector(context))) { //try to get detected content type; could be a subclass of text/plain //such as vcal, etc. diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-webarchive-module/src/main/java/org/apache/tika/parser/http/HttpParser.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-webarchive-module/src/main/java/org/apache/tika/parser/http/HttpParser.java index 8e6061284..35c1ea977 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-webarchive-module/src/main/java/org/apache/tika/parser/http/HttpParser.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-webarchive-module/src/main/java/org/apache/tika/parser/http/HttpParser.java @@ -61,7 +61,7 @@ public class HttpParser extends AbstractParser { xhtml.startDocument(); try (ReadableByteChannel channel = - Channels.newChannel(CloseShieldInputStream.wrap(stream))) { + Channels.newChannel(new CloseShieldInputStream(stream))) { int len = channel.read(buffer); buffer.flip(); diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-webarchive-module/src/main/java/org/apache/tika/parser/wacz/WACZParser.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-webarchive-module/src/main/java/org/apache/tika/parser/wacz/WACZParser.java index 0d414aac1..7697a98b8 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-webarchive-module/src/main/java/org/apache/tika/parser/wacz/WACZParser.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-webarchive-module/src/main/java/org/apache/tika/parser/wacz/WACZParser.java @@ -86,7 +86,7 @@ public class WACZParser extends AbstractParser { private void processStream(InputStream stream, XHTMLContentHandler xhtml, Metadata metadata, EmbeddedDocumentExtractor ex) throws SAXException, IOException { try (ZipArchiveInputStream zais = new ZipArchiveInputStream( - CloseShieldInputStream.wrap(stream))) { + new CloseShieldInputStream(stream))) { ZipArchiveEntry zae = zais.getNextZipEntry(); while (zae != null) { String name = zae.getName(); diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/tmx/TMXParser.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/tmx/TMXParser.java index a16619356..bf4af0d3f 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/tmx/TMXParser.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/tmx/TMXParser.java @@ -65,7 +65,7 @@ public class TMXParser extends AbstractParser { metadata.set(Metadata.CONTENT_TYPE, TMX_CONTENT_TYPE.toString()); final XHTMLContentHandler xhtml = new XHTMLContentHandler(handler, metadata); - XMLReaderUtils.parseSAX(CloseShieldInputStream.wrap(stream), new TMXContentHandler(xhtml, metadata), context); + XMLReaderUtils.parseSAX(new CloseShieldInputStream(stream), new TMXContentHandler(xhtml, metadata), context); } diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xliff/XLIFF12Parser.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xliff/XLIFF12Parser.java index f5acbc1aa..57a547e82 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xliff/XLIFF12Parser.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xliff/XLIFF12Parser.java @@ -66,7 +66,7 @@ public class XLIFF12Parser extends AbstractParser { final XHTMLContentHandler xhtml = new XHTMLContentHandler(handler, metadata); - XMLReaderUtils.parseSAX(CloseShieldInputStream.wrap(stream), + XMLReaderUtils.parseSAX(new CloseShieldInputStream(stream), new XLIFF12ContentHandler(xhtml, metadata), context); } diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/XMLParser.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/XMLParser.java index 4fa57fbb9..9e72915f8 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/XMLParser.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/XMLParser.java @@ -68,7 +68,7 @@ public class XMLParser extends AbstractParser { TaggedContentHandler tagged = new TaggedContentHandler(handler); try { - XMLReaderUtils.parseSAX(CloseShieldInputStream.wrap(stream), + XMLReaderUtils.parseSAX(new CloseShieldInputStream(stream), new EmbeddedContentHandler( getContentHandler(tagged, metadata, context)), context); diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/XMLProfiler.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/XMLProfiler.java index bfe8d5790..dc3cba21a 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/XMLProfiler.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/XMLProfiler.java @@ -89,7 +89,7 @@ public class XMLProfiler extends AbstractParser { @Override public void parse(InputStream stream, ContentHandler handler, Metadata metadata, ParseContext context) throws IOException, SAXException, TikaException { - XMLReaderUtils.parseSAX(CloseShieldInputStream.wrap(stream), + XMLReaderUtils.parseSAX(new CloseShieldInputStream(stream), new XMLProfileHandler(metadata), context); } diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xmp-commons/src/main/java/org/apache/tika/parser/xmp/XMPMetadataExtractor.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xmp-commons/src/main/java/org/apache/tika/parser/xmp/XMPMetadataExtractor.java index e5e710688..a64fb1088 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xmp-commons/src/main/java/org/apache/tika/parser/xmp/XMPMetadataExtractor.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xmp-commons/src/main/java/org/apache/tika/parser/xmp/XMPMetadataExtractor.java @@ -52,7 +52,7 @@ public class XMPMetadataExtractor { try { DomXmpParser xmpParser = new DomXmpParser(); xmpParser.setStrictParsing(false); - xmp = xmpParser.parse(CloseShieldInputStream.wrap(stream)); + xmp = xmpParser.parse(new CloseShieldInputStream(stream)); } catch (Throwable ex) { //swallow return; diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/DefaultZipContainerDetector.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/DefaultZipContainerDetector.java index 292051259..d2f28e0a0 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/DefaultZipContainerDetector.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/DefaultZipContainerDetector.java @@ -265,7 +265,7 @@ public class DefaultZipContainerDetector implements Detector { throws IOException { StreamingDetectContext detectContext = new StreamingDetectContext(); try (ZipArchiveInputStream zis = new ZipArchiveInputStream( - CloseShieldInputStream.wrap(input), "UTF8", false, allowStoredEntries)) { + new CloseShieldInputStream(input), "UTF8", false, allowStoredEntries)) { ZipArchiveEntry zae = zis.getNextZipEntry(); while (zae != null) { MediaType mt = detect(zae, zis, detectContext); diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/DeprecatedStreamingZipContainerDetector.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/DeprecatedStreamingZipContainerDetector.java index 1cc56d423..2773e722d 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/DeprecatedStreamingZipContainerDetector.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/DeprecatedStreamingZipContainerDetector.java @@ -44,7 +44,7 @@ public class DeprecatedStreamingZipContainerDetector extends ZipContainerDetecto Set<String> fileNames = new HashSet<>(); Set<String> directoryNames = new HashSet<>(); try (ZipArchiveInputStream zipArchiveInputStream = - new ZipArchiveInputStream(CloseShieldInputStream.wrap(is))) { + new ZipArchiveInputStream(new CloseShieldInputStream(is))) { ZipArchiveEntry zae = zipArchiveInputStream.getNextZipEntry(); while (zae != null) { String name = zae.getName(); diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/zip/utils/ZipSalvager.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/zip/utils/ZipSalvager.java index 4b36d5455..9c2716309 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/zip/utils/ZipSalvager.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/zip/utils/ZipSalvager.java @@ -60,7 +60,7 @@ public class ZipSalvager { try (ZipArchiveOutputStream outputStream = new ZipArchiveOutputStream(salvagedZip); ZipArchiveInputStream zipArchiveInputStream = new ZipArchiveInputStream( - CloseShieldInputStream.wrap(brokenZip), "UTF8", false, + new CloseShieldInputStream(brokenZip), "UTF8", false, allowStoredEntries)) { ZipArchiveEntry zae = zipArchiveInputStream.getNextZipEntry(); try {
