This is an automated email from the ASF dual-hosted git repository.
tilman pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/main by this push:
new b558a0d5e TIKA-4238: replace deprecated
b558a0d5e is described below
commit b558a0d5e384aedfb66f0582f783a3a2010e45f8
Author: Tilman Hausherr <[email protected]>
AuthorDate: Sat Apr 6 13:29:45 2024 +0200
TIKA-4238: replace deprecated
---
.../src/main/java/org/apache/tika/embedder/ExternalEmbedder.java | 2 +-
tika-core/src/main/java/org/apache/tika/pipes/PipesClient.java | 4 ++--
tika-core/src/main/java/org/apache/tika/pipes/PipesServer.java | 4 ++--
.../src/test/java/org/apache/tika/pipes/PipesServerTest.java | 6 +++---
.../src/main/java/org/apache/tika/parser/hdf/HDFParser.java | 2 +-
.../java/org/apache/tika/parser/pot/PooledTimeSeriesParser.java | 2 +-
.../main/java/org/apache/tika/parser/mail/MailContentHandler.java | 4 ++--
.../tika/extractor/microsoft/MSEmbeddedStreamTranslator.java | 4 ++--
.../org/apache/tika/parser/microsoft/AbstractPOIFSExtractor.java | 2 +-
.../java/org/apache/tika/parser/microsoft/chm/ChmExtractor.java | 2 +-
.../tika/parser/microsoft/onenote/OneNoteLegacyDumpStrings.java | 4 ++--
.../org/apache/tika/parser/microsoft/rtf/RTFEmbObjHandler.java | 2 +-
.../org/apache/tika/parser/microsoft/rtf/RTFObjDataParser.java | 4 ++--
.../org/apache/tika/parser/pdf/image/ImageGraphicsEngine.java | 2 +-
.../org/apache/tika/detect/gzip/GZipSpecializationDetector.java | 4 ++--
.../src/test/java/org/apache/tika/parser/txt/BOMDetectorTest.java | 2 +-
.../main/java/org/apache/tika/parser/xmp/JempboxExtractor.java | 2 +-
.../java/org/apache/tika/detect/zip/OpenDocumentDetector.java | 2 +-
.../main/java/org/apache/tika/detect/zip/StarOfficeDetector.java | 2 +-
.../java/org/apache/tika/pipes/emitter/azblob/AZBlobEmitter.java | 4 ++--
.../main/java/org/apache/tika/pipes/emitter/gcs/GCSEmitter.java | 4 ++--
.../src/main/java/org/apache/tika/pipes/emitter/s3/S3Emitter.java | 2 +-
.../main/java/org/apache/tika/pipes/fetcher/http/HttpFetcher.java | 2 +-
.../org/apache/tika/server/core/resource/UnpackerResource.java | 8 ++++----
24 files changed, 38 insertions(+), 38 deletions(-)
diff --git
a/tika-core/src/main/java/org/apache/tika/embedder/ExternalEmbedder.java
b/tika-core/src/main/java/org/apache/tika/embedder/ExternalEmbedder.java
index bc8331807..b2411d7a8 100644
--- a/tika-core/src/main/java/org/apache/tika/embedder/ExternalEmbedder.java
+++ b/tika-core/src/main/java/org/apache/tika/embedder/ExternalEmbedder.java
@@ -404,7 +404,7 @@ public class ExternalEmbedder implements Embedder {
process = Runtime.getRuntime().exec(cmd.toArray(new String[]{}));
}
- UnsynchronizedByteArrayOutputStream stdErrOutputStream = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream stdErrOutputStream =
UnsynchronizedByteArrayOutputStream.builder().get();
try {
sendStdErrToOutputStream(process, stdErrOutputStream);
diff --git a/tika-core/src/main/java/org/apache/tika/pipes/PipesClient.java
b/tika-core/src/main/java/org/apache/tika/pipes/PipesClient.java
index 1e3147370..52e72df85 100644
--- a/tika-core/src/main/java/org/apache/tika/pipes/PipesClient.java
+++ b/tika-core/src/main/java/org/apache/tika/pipes/PipesClient.java
@@ -152,7 +152,7 @@ public class PipesClient implements Closeable {
final PipesResult[] intermediateResult = new PipesResult[1];
FutureTask<PipesResult> futureTask = new FutureTask<>(() -> {
- UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get();
try (ObjectOutputStream objectOutputStream = new
ObjectOutputStream(bos)) {
objectOutputStream.writeObject(t);
}
@@ -438,7 +438,7 @@ public class PipesClient implements Closeable {
output = new DataOutputStream(process.getOutputStream());
//wait for ready signal
- final UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream();
+ final UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get();
FutureTask<Integer> futureTask = new FutureTask<>(() -> {
int b = input.read();
int read = 1;
diff --git a/tika-core/src/main/java/org/apache/tika/pipes/PipesServer.java
b/tika-core/src/main/java/org/apache/tika/pipes/PipesServer.java
index d8957368d..991694f88 100644
--- a/tika-core/src/main/java/org/apache/tika/pipes/PipesServer.java
+++ b/tika-core/src/main/java/org/apache/tika/pipes/PipesServer.java
@@ -782,7 +782,7 @@ public class PipesServer implements Runnable {
private void writeIntermediate(EmitKey emitKey, Metadata metadata) {
try {
- UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get();
try (ObjectOutputStream objectOutputStream = new
ObjectOutputStream(bos)) {
objectOutputStream.writeObject(metadata);
}
@@ -795,7 +795,7 @@ public class PipesServer implements Runnable {
private void write(EmitData emitData) {
try {
- UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get();
try (ObjectOutputStream objectOutputStream = new
ObjectOutputStream(bos)) {
objectOutputStream.writeObject(emitData);
}
diff --git a/tika-core/src/test/java/org/apache/tika/pipes/PipesServerTest.java
b/tika-core/src/test/java/org/apache/tika/pipes/PipesServerTest.java
index 66f54272b..4aca5207e 100644
--- a/tika-core/src/test/java/org/apache/tika/pipes/PipesServerTest.java
+++ b/tika-core/src/test/java/org/apache/tika/pipes/PipesServerTest.java
@@ -61,7 +61,7 @@ public class PipesServerTest extends TikaTest {
PipesServer pipesServer = new PipesServer(tikaConfig,
new UnsynchronizedByteArrayInputStream(new byte[0]),
- new PrintStream(new UnsynchronizedByteArrayOutputStream(),
true,
+ new
PrintStream(UnsynchronizedByteArrayOutputStream.builder().get(), true,
StandardCharsets.UTF_8.name()),
-1, 30000, 30000);
@@ -96,7 +96,7 @@ public class PipesServerTest extends TikaTest {
PipesServer pipesServer = new PipesServer(tikaConfig,
new UnsynchronizedByteArrayInputStream(new byte[0]),
- new PrintStream(new UnsynchronizedByteArrayOutputStream(),
true,
+ new
PrintStream(UnsynchronizedByteArrayOutputStream.builder().get(), true,
StandardCharsets.UTF_8.name()),
-1, 30000, 30000);
@@ -152,7 +152,7 @@ public class PipesServerTest extends TikaTest {
PipesServer pipesServer = new PipesServer(tikaConfig,
new UnsynchronizedByteArrayInputStream(new byte[0]),
- new PrintStream(new UnsynchronizedByteArrayOutputStream(),
true,
+ new
PrintStream(UnsynchronizedByteArrayOutputStream.builder().get(), true,
StandardCharsets.UTF_8.name()),
-1, 30000, 30000);
diff --git
a/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/hdf/HDFParser.java
b/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/hdf/HDFParser.java
index e324a4bd6..14098f3b6 100644
---
a/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/hdf/HDFParser.java
+++
b/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/hdf/HDFParser.java
@@ -79,7 +79,7 @@ public class HDFParser implements Parser {
*/
public void parse(InputStream stream, ContentHandler handler, Metadata
metadata,
ParseContext context) throws IOException, SAXException,
TikaException {
- UnsynchronizedByteArrayOutputStream os = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream os =
UnsynchronizedByteArrayOutputStream.builder().get();
IOUtils.copy(stream, os);
String name = metadata.get(TikaCoreProperties.RESOURCE_NAME_KEY);
diff --git
a/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/pot/PooledTimeSeriesParser.java
b/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/pot/PooledTimeSeriesParser.java
index ef6990fb5..7f61963eb 100644
---
a/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/pot/PooledTimeSeriesParser.java
+++
b/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/pot/PooledTimeSeriesParser.java
@@ -156,7 +156,7 @@ public class PooledTimeSeriesParser implements Parser {
private String computePoT(File input) throws IOException {
CommandLine cmdLine = new CommandLine("pooled-time-series");
- try (UnsynchronizedByteArrayOutputStream outputStream = new
UnsynchronizedByteArrayOutputStream()) {
+ try (UnsynchronizedByteArrayOutputStream outputStream =
UnsynchronizedByteArrayOutputStream.builder().get()) {
cmdLine.addArgument("-f");
cmdLine.addArgument(input.getAbsolutePath());
LOG.trace("Executing: {}", cmdLine);
diff --git
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-mail-module/src/main/java/org/apache/tika/parser/mail/MailContentHandler.java
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-mail-module/src/main/java/org/apache/tika/parser/mail/MailContentHandler.java
index 117dfe2fd..d75bf2991 100644
---
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-mail-module/src/main/java/org/apache/tika/parser/mail/MailContentHandler.java
+++
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-mail-module/src/main/java/org/apache/tika/parser/mail/MailContentHandler.java
@@ -127,7 +127,7 @@ class MailContentHandler implements ContentHandler {
//if we're in a multipart/alternative or any one of its children
//add the bodypart to the latest that was added
if (!extractAllAlternatives && alternativePartBuffer.size() > 0) {
- UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get();
IOUtils.copy(is, bos);
alternativePartBuffer.peek().children.add(new BodyContents(submd,
bos.toByteArray()));
} else if (!extractAllAlternatives && parts.size() < 2) {
@@ -135,7 +135,7 @@ class MailContentHandler implements ContentHandler {
//and you're not in an alternative part block
//and you're text/html, put that in the body of the email
//otherwise treat as a regular attachment
- UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get();
IOUtils.copy(is, bos);
final byte[] bytes = bos.toByteArray();
if (detectInlineTextOrHtml(submd, bytes)) {
diff --git
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/extractor/microsoft/MSEmbeddedStreamTranslator.java
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/extractor/microsoft/MSEmbeddedStreamTranslator.java
index 0a242ee7f..95eb6260d 100644
---
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/extractor/microsoft/MSEmbeddedStreamTranslator.java
+++
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/extractor/microsoft/MSEmbeddedStreamTranslator.java
@@ -61,7 +61,7 @@ public class MSEmbeddedStreamTranslator implements
EmbeddedStreamTranslator {
public InputStream translate(InputStream inputStream, Metadata metadata)
throws IOException {
String contentType =
metadata.get(org.apache.tika.metadata.HttpHeaders.CONTENT_TYPE);
if
("application/vnd.openxmlformats-officedocument.oleObject".equals(contentType))
{
- UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get();
IOUtils.copy(inputStream, bos);
POIFSFileSystem poifs = new POIFSFileSystem(bos.toInputStream());
OfficeParser.POIFSDocumentType type =
OfficeParser.POIFSDocumentType.detectType(poifs);
@@ -90,7 +90,7 @@ public class MSEmbeddedStreamTranslator implements
EmbeddedStreamTranslator {
tin.getOpenContainer() instanceof DirectoryEntry) {
POIFSFileSystem fs = new POIFSFileSystem();
copy((DirectoryEntry) tin.getOpenContainer(), fs.getRoot());
- try (UnsynchronizedByteArrayOutputStream bos2 = new
UnsynchronizedByteArrayOutputStream()) {
+ try (UnsynchronizedByteArrayOutputStream bos2 =
UnsynchronizedByteArrayOutputStream.builder().get()) {
fs.writeFilesystem(bos2);
return bos2.toInputStream();
}
diff --git
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/AbstractPOIFSExtractor.java
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/AbstractPOIFSExtractor.java
index f04c72e62..bbebde63d 100644
---
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/AbstractPOIFSExtractor.java
+++
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/AbstractPOIFSExtractor.java
@@ -224,7 +224,7 @@ abstract class AbstractPOIFSExtractor {
if (!e.isDocumentEntry()) {
return;
}
- UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get();
try (DocumentInputStream dis = new
DocumentInputStream((DocumentEntry) e)) {
IOUtils.copy(dis, bos);
}
diff --git
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmExtractor.java
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmExtractor.java
index abe44405a..f63e0f30f 100644
---
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmExtractor.java
+++
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmExtractor.java
@@ -252,7 +252,7 @@ public class ChmExtractor {
*/
public byte[] extractChmEntry(DirectoryListingEntry directoryListingEntry)
throws TikaException {
- UnsynchronizedByteArrayOutputStream buffer = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream buffer =
UnsynchronizedByteArrayOutputStream.builder().get();
ChmLzxBlock lzxBlock = null;
try {
/* UNCOMPRESSED type is easiest one */
diff --git
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteLegacyDumpStrings.java
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteLegacyDumpStrings.java
index 35e4613ca..d4d464dfa 100644
---
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteLegacyDumpStrings.java
+++
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteLegacyDumpStrings.java
@@ -71,7 +71,7 @@ class OneNoteLegacyDumpStrings {
private void dumpAscii() throws SAXException, TikaException {
try {
oneNoteDirectFileResource.position(0);
- UnsynchronizedByteArrayOutputStream os = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream os =
UnsynchronizedByteArrayOutputStream.builder().get();
long sz = oneNoteDirectFileResource.size();
long pos;
while ((pos = oneNoteDirectFileResource.position()) != sz) {
@@ -108,7 +108,7 @@ class OneNoteLegacyDumpStrings {
private void dumpUtf16LE() throws SAXException, TikaException {
try {
oneNoteDirectFileResource.position(0);
- UnsynchronizedByteArrayOutputStream os = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream os =
UnsynchronizedByteArrayOutputStream.builder().get();
long sz = oneNoteDirectFileResource.size();
long bufSize = BUFFER_SIZE;
// Make sure the buffer size is a multiple of 2.
diff --git
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/rtf/RTFEmbObjHandler.java
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/rtf/RTFEmbObjHandler.java
index 040e78eae..e5e0c6caf 100644
---
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/rtf/RTFEmbObjHandler.java
+++
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/rtf/RTFEmbObjHandler.java
@@ -81,7 +81,7 @@ class RTFEmbObjHandler {
int memoryLimitInKb) {
this.handler = handler;
this.embeddedDocumentUtil = new EmbeddedDocumentUtil(context);
- os = new UnsynchronizedByteArrayOutputStream();
+ os = UnsynchronizedByteArrayOutputStream.builder().get();
this.memoryLimitInKb = memoryLimitInKb;
}
diff --git
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/rtf/RTFObjDataParser.java
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/rtf/RTFObjDataParser.java
index 871e37a91..f33a922d4 100644
---
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/rtf/RTFObjDataParser.java
+++
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/rtf/RTFObjDataParser.java
@@ -155,7 +155,7 @@ class RTFObjDataParser {
if (root.hasEntry("Package")) {
Entry ooxml = root.getEntry("Package");
- UnsynchronizedByteArrayOutputStream out = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream out =
UnsynchronizedByteArrayOutputStream.builder().get();
try (BoundedInputStream bis = new
BoundedInputStream(memoryLimitInKb * 1024,
new DocumentInputStream((DocumentEntry) ooxml))) {
IOUtils.copy(bis, out);
@@ -191,7 +191,7 @@ class RTFObjDataParser {
}
} else {
- UnsynchronizedByteArrayOutputStream out = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream out =
UnsynchronizedByteArrayOutputStream.builder().get();
is.reset();
BoundedInputStream bis = new
BoundedInputStream(memoryLimitInKb * 1024, is);
IOUtils.copy(is, out);
diff --git
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/image/ImageGraphicsEngine.java
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/image/ImageGraphicsEngine.java
index b0e6e26bb..7a441e3fc 100644
---
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/image/ImageGraphicsEngine.java
+++
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/image/ImageGraphicsEngine.java
@@ -410,7 +410,7 @@ public class ImageGraphicsEngine extends
PDFGraphicsStreamEngine {
}
if (embeddedDocumentExtractor.shouldParseEmbedded(metadata)) {
- UnsynchronizedByteArrayOutputStream buffer = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream buffer =
UnsynchronizedByteArrayOutputStream.builder().get();
if (pdImage instanceof PDImageXObject) {
//extract the metadata contained outside of the image
PDMetadataExtractor
diff --git
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/main/java/org/apache/tika/detect/gzip/GZipSpecializationDetector.java
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/main/java/org/apache/tika/detect/gzip/GZipSpecializationDetector.java
index b87115b3b..1e199f9ff 100644
---
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/main/java/org/apache/tika/detect/gzip/GZipSpecializationDetector.java
+++
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/main/java/org/apache/tika/detect/gzip/GZipSpecializationDetector.java
@@ -62,7 +62,7 @@ public class GZipSpecializationDetector implements Detector {
private MediaType detectSpecialization(InputStream input, Metadata
metadata) throws IOException {
int buffSize = 1024;
- UnsynchronizedByteArrayOutputStream gzippedBytes = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream gzippedBytes =
UnsynchronizedByteArrayOutputStream.builder().get();
try {
IOUtils.copyRange(input, buffSize, gzippedBytes);
} catch (IOException e) {
@@ -70,7 +70,7 @@ public class GZipSpecializationDetector implements Detector {
} finally {
input.reset();
}
- UnsynchronizedByteArrayOutputStream bytes = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream bytes =
UnsynchronizedByteArrayOutputStream.builder().get();
try (InputStream is = new
GzipCompressorInputStream(new
UnsynchronizedByteArrayInputStream(gzippedBytes.toByteArray()))) {
int c = is.read();
diff --git
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/txt/BOMDetectorTest.java
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/txt/BOMDetectorTest.java
index b008607dc..599b5df46 100644
---
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/txt/BOMDetectorTest.java
+++
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/txt/BOMDetectorTest.java
@@ -81,7 +81,7 @@ public class BOMDetectorTest extends TikaTest {
}
private UnsynchronizedByteArrayOutputStream createStream(ByteOrderMark
bom) throws IOException {
- UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get();
IOUtils.write(bom.getBytes(), bos);
for (int i = 0; i < 100; i++) {
bos.write(' ');
diff --git
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xmp-commons/src/main/java/org/apache/tika/parser/xmp/JempboxExtractor.java
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xmp-commons/src/main/java/org/apache/tika/parser/xmp/JempboxExtractor.java
index 6f791b3d5..f2c19992a 100644
---
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xmp-commons/src/main/java/org/apache/tika/parser/xmp/JempboxExtractor.java
+++
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xmp-commons/src/main/java/org/apache/tika/parser/xmp/JempboxExtractor.java
@@ -220,7 +220,7 @@ public class JempboxExtractor {
}
public void parse(InputStream file) throws IOException, TikaException {
- UnsynchronizedByteArrayOutputStream xmpraw = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream xmpraw =
UnsynchronizedByteArrayOutputStream.builder().get();
if (!scanner.parse(file, xmpraw)) {
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/OpenDocumentDetector.java
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/OpenDocumentDetector.java
index a287c4b0b..23e00a83f 100644
---
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/OpenDocumentDetector.java
+++
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/OpenDocumentDetector.java
@@ -57,7 +57,7 @@ public class OpenDocumentDetector implements
ZipContainerDetector {
if ("mimetype".equals(name)) {
//can't rely on zae.getSize to determine if there is any
//content here. :(
- UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get();
BoundedInputStream bis = new BoundedInputStream(MAX_MIME_TYPE,
zis);
IOUtils.copy(bis, bos);
//do anything with an inputstream > MAX_MIME_TYPE?
diff --git
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/StarOfficeDetector.java
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/StarOfficeDetector.java
index 028f6f3b3..cec9ce5e5 100644
---
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/StarOfficeDetector.java
+++
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/StarOfficeDetector.java
@@ -91,7 +91,7 @@ public class StarOfficeDetector implements
ZipContainerDetector {
//"as is" can cause the iteration of the entries to stop early
//without exception or warning. So, copy the full stream, then
//process. TIKA-3061
- UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get();
BoundedInputStream bis = new BoundedInputStream(MAX_MANIFEST, zis);
IOUtils.copy(bis, bos);
diff --git
a/tika-pipes/tika-emitters/tika-emitter-az-blob/src/main/java/org/apache/tika/pipes/emitter/azblob/AZBlobEmitter.java
b/tika-pipes/tika-emitters/tika-emitter-az-blob/src/main/java/org/apache/tika/pipes/emitter/azblob/AZBlobEmitter.java
index 83c18e3c4..180bc204a 100644
---
a/tika-pipes/tika-emitters/tika-emitter-az-blob/src/main/java/org/apache/tika/pipes/emitter/azblob/AZBlobEmitter.java
+++
b/tika-pipes/tika-emitters/tika-emitter-az-blob/src/main/java/org/apache/tika/pipes/emitter/azblob/AZBlobEmitter.java
@@ -87,7 +87,7 @@ public class AZBlobEmitter extends AbstractEmitter implements
Initializable, Str
}
//TODO: estimate size of metadata list. Above a certain size,
//create a temp file?
- UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get();
try (Writer writer = new OutputStreamWriter(bos,
StandardCharsets.UTF_8)) {
JsonMetadataList.toJson(metadataList, writer);
} catch (IOException e) {
@@ -126,7 +126,7 @@ public class AZBlobEmitter extends AbstractEmitter
implements Initializable, Str
LOGGER.debug("relying on the content-length set in the metadata
object: {}", length);
write(path, userMetadata, is, length);
} else {
- try (UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream()) {
+ try (UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get()) {
IOUtils.copy(is, bos);
write(path, userMetadata, bos.toByteArray());
}
diff --git
a/tika-pipes/tika-emitters/tika-emitter-gcs/src/main/java/org/apache/tika/pipes/emitter/gcs/GCSEmitter.java
b/tika-pipes/tika-emitters/tika-emitter-gcs/src/main/java/org/apache/tika/pipes/emitter/gcs/GCSEmitter.java
index 38757a87a..9121190d6 100644
---
a/tika-pipes/tika-emitters/tika-emitter-gcs/src/main/java/org/apache/tika/pipes/emitter/gcs/GCSEmitter.java
+++
b/tika-pipes/tika-emitters/tika-emitter-gcs/src/main/java/org/apache/tika/pipes/emitter/gcs/GCSEmitter.java
@@ -74,7 +74,7 @@ public class GCSEmitter extends AbstractEmitter implements
Initializable, Stream
if (metadataList == null || metadataList.size() == 0) {
throw new TikaEmitterException("metadata list must not be null or
of size 0");
}
- try (UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream()) {
+ try (UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get()) {
try (Writer writer = new OutputStreamWriter(bos,
StandardCharsets.UTF_8)) {
JsonMetadataList.toJson(metadataList, writer);
} catch (IOException e) {
@@ -99,7 +99,7 @@ public class GCSEmitter extends AbstractEmitter implements
Initializable, Stream
if (is instanceof TikaInputStream && ((TikaInputStream) is).hasFile())
{
write(path, userMetadata, Files.readAllBytes(((TikaInputStream)
is).getPath()));
} else {
- try (UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream()) {
+ try (UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get()) {
IOUtils.copy(is, bos);
write(path, userMetadata, bos.toByteArray());
}
diff --git
a/tika-pipes/tika-emitters/tika-emitter-s3/src/main/java/org/apache/tika/pipes/emitter/s3/S3Emitter.java
b/tika-pipes/tika-emitters/tika-emitter-s3/src/main/java/org/apache/tika/pipes/emitter/s3/S3Emitter.java
index d03c3c9be..fe2f27aed 100644
---
a/tika-pipes/tika-emitters/tika-emitter-s3/src/main/java/org/apache/tika/pipes/emitter/s3/S3Emitter.java
+++
b/tika-pipes/tika-emitters/tika-emitter-s3/src/main/java/org/apache/tika/pipes/emitter/s3/S3Emitter.java
@@ -127,7 +127,7 @@ public class S3Emitter extends AbstractEmitter implements
Initializable, StreamE
}
if (!spoolToTemp) {
- UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get();
try (Writer writer = new BufferedWriter(
new OutputStreamWriter(bos, StandardCharsets.UTF_8))) {
JsonMetadataList.toJson(metadataList, writer);
diff --git
a/tika-pipes/tika-fetchers/tika-fetcher-http/src/main/java/org/apache/tika/pipes/fetcher/http/HttpFetcher.java
b/tika-pipes/tika-fetchers/tika-fetcher-http/src/main/java/org/apache/tika/pipes/fetcher/http/HttpFetcher.java
index 35e6f3e82..26b45f8bf 100644
---
a/tika-pipes/tika-fetchers/tika-fetcher-http/src/main/java/org/apache/tika/pipes/fetcher/http/HttpFetcher.java
+++
b/tika-pipes/tika-fetchers/tika-fetcher-http/src/main/java/org/apache/tika/pipes/fetcher/http/HttpFetcher.java
@@ -311,7 +311,7 @@ public class HttpFetcher extends AbstractFetcher implements
Initializable, Range
return "";
}
try (InputStream is = response.getEntity().getContent()) {
- UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get();
IOUtils.copyLarge(is, bos, 0, maxErrMsgSize);
return bos.toString(StandardCharsets.UTF_8);
} catch (IOException e) {
diff --git
a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/UnpackerResource.java
b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/UnpackerResource.java
index 2d251ab11..18316e9f1 100644
---
a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/UnpackerResource.java
+++
b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/UnpackerResource.java
@@ -141,7 +141,7 @@ public class UnpackerResource {
//we need to add this to allow for "inline" use of other parsers.
pc.set(Parser.class, parser);
ContentHandler ch;
- UnsynchronizedByteArrayOutputStream text = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream text =
UnsynchronizedByteArrayOutputStream.builder().get();
if (saveAll) {
ch = new BodyContentHandler(
@@ -166,7 +166,7 @@ public class UnpackerResource {
files.put(TEXT_FILENAME, text.toByteArray());
UnsynchronizedByteArrayOutputStream metaStream =
- new UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream.builder().get();
metadataToCsv(metadata, metaStream);
files.put(META_FILENAME, metaStream.toByteArray());
@@ -196,7 +196,7 @@ public class UnpackerResource {
public void parseEmbedded(InputStream inputStream, ContentHandler
contentHandler,
Metadata metadata, boolean b) throws
SAXException, IOException {
- UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream bos =
UnsynchronizedByteArrayOutputStream.builder().get();
BoundedInputStream bis = new BoundedInputStream(unpackMaxBytes,
inputStream);
IOUtils.copy(bis, bos);
@@ -233,7 +233,7 @@ public class UnpackerResource {
InputStream translated =
embeddedStreamTranslator.translate(
new UnsynchronizedByteArrayInputStream(data),
metadata);
UnsynchronizedByteArrayOutputStream bos2 =
- new UnsynchronizedByteArrayOutputStream();
+
UnsynchronizedByteArrayOutputStream.builder().get();
IOUtils.copy(translated, bos2);
data = bos2.toByteArray();
}
