[refactor] Use new APIs from commons-io

dizzzz · dizzzz · commit ac11d8e09bbe · 2025-07-30T18:49:35.000+02:00
diff --git a/extensions/exiftool/src/main/java/org/exist/exiftool/xquery/MetadataFunctions.java b/extensions/exiftool/src/main/java/org/exist/exiftool/xquery/MetadataFunctions.java
@@ -156,7 +156,7 @@ private Sequence exifToolExtract(final Path binaryFile) throws XPathException {
         try {
             final Process p = Runtime.getRuntime().exec(module.getPerlPath() + " " + module.getExiftoolPath() + " -X -struct " + binaryFile.toAbsolutePath());
             try(final InputStream stdIn = p.getInputStream();
-                    final UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream()) {
+                    final UnsynchronizedByteArrayOutputStream baos =  UnsynchronizedByteArrayOutputStream.builder().get()) {
 
                 //buffer stdin
                 baos.write(stdIn);
@@ -179,7 +179,7 @@ private Sequence exifToolWebExtract(final URI uri) throws XPathException {
             final Process p = Runtime.getRuntime().exec(module.getExiftoolPath()+" -fast -X -");
 
             try(final InputStream stdIn = p.getInputStream();
-                    final UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream()) {
+                    final UnsynchronizedByteArrayOutputStream baos = UnsynchronizedByteArrayOutputStream.builder().get()) {
 
                 try(final OutputStream stdOut = p.getOutputStream()) {
                     final Source src = SourceFactory.getSource(context.getBroker(), null, uri.toString(), false);
diff --git a/extensions/expath/src/main/java/org/expath/exist/ZipFileFunctions.java b/extensions/expath/src/main/java/org/expath/exist/ZipFileFunctions.java
@@ -137,7 +137,7 @@ private Sequence updateZip(XmldbURI uri, String[] paths, BinaryValue[] binaries)
             binariesTable.put(paths[i], binaries[i]);
         }
 
-        try(final UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream())
+        try(final UnsynchronizedByteArrayOutputStream baos = UnsynchronizedByteArrayOutputStream.builder().get())
         {
             zis = zipFileSource.getStream();
             ZipOutputStream zos = new ZipOutputStream(baos); // zos is the output - the result
diff --git a/extensions/expath/src/main/java/org/expath/tools/model/exist/EXistSequence.java b/extensions/expath/src/main/java/org/expath/tools/model/exist/EXistSequence.java
@@ -82,7 +82,7 @@ public void serialize(final OutputStream out, final SerialParameters params) thr
         props.setProperty(Serializer.GENERATE_DOC_EVENTS, "false");
 
         final String encoding = props.getProperty(OutputKeys.ENCODING, StandardCharsets.UTF_8.name());
-        try(final Writer writer = new OutputStreamWriter(new CloseShieldOutputStream(out), encoding)) {
+        try(final Writer writer = new OutputStreamWriter(CloseShieldOutputStream.wrap(out), encoding)) {
             final XQuerySerializer xqSerializer = new XQuerySerializer(context.getBroker(), props, writer);
             xqSerializer.serialize(sequence);
         } catch(final SAXException | IOException | XPathException e) {
diff --git a/extensions/modules/compression/src/main/java/org/exist/xquery/modules/compression/AbstractCompressFunction.java b/extensions/modules/compression/src/main/java/org/exist/xquery/modules/compression/AbstractCompressFunction.java
@@ -120,7 +120,7 @@ public Sequence eval(Sequence[] args, Sequence contextSequence)
                 encoding = StandardCharsets.UTF_8;
             }
 
-            try(final UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream();
+            try(final UnsynchronizedByteArrayOutputStream baos = UnsynchronizedByteArrayOutputStream.builder().get();
                     OutputStream os = stream(baos, encoding)) {
 
                 // iterate through the argument sequence
@@ -140,7 +140,7 @@ public Sequence eval(Sequence[] args, Sequence contextSequence)
                     ((DeflaterOutputStream)os).finish();
                 }
 
-                return BinaryValueFromInputStream.getInstance(context, new Base64BinaryValueType(), new UnsynchronizedByteArrayInputStream(baos.toByteArray()), this);
+                return BinaryValueFromInputStream.getInstance(context, new Base64BinaryValueType(), UnsynchronizedByteArrayInputStream.builder().setByteArray(baos.toByteArray()).get(), this);
             }
 		} catch (final UnsupportedCharsetException | IOException e) {
 			throw new XPathException(this, e.getMessage(), e);
@@ -412,7 +412,8 @@ private void compressResource(OutputStream os, DocumentImpl doc, boolean useHier
         } else if (doc.getResourceType() == DocumentImpl.BINARY_FILE && doc.getContentLength() > 0) {
             // binary file
             try (final InputStream is = context.getBroker().getBinaryResource((BinaryDocument) doc);
-                 final UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream(doc.getContentLength() == -1 ? 1024 : (int) doc.getContentLength())) {
+
+                 final UnsynchronizedByteArrayOutputStream baos = UnsynchronizedByteArrayOutputStream.builder().setBufferSize(doc.getContentLength() == -1 ? 1024 : (int) doc.getContentLength()).get()) {
                 baos.write(is);
                 value = baos.toByteArray();
             }
diff --git a/extensions/modules/compression/src/main/java/org/exist/xquery/modules/compression/AbstractExtractFunction.java b/extensions/modules/compression/src/main/java/org/exist/xquery/modules/compression/AbstractExtractFunction.java
@@ -188,12 +188,12 @@ protected Sequence processCompressedEntry(String name, boolean isDirectory, Inpu
 
                     //copy the input data
                     final byte[] entryData;
-                    try (final UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream()) {
+                    try (final UnsynchronizedByteArrayOutputStream baos = UnsynchronizedByteArrayOutputStream.builder().get()) {
                         baos.write(is);
                         entryData = baos.toByteArray();
                     }
 
-                    try (final InputStream bis = new UnsynchronizedByteArrayInputStream(entryData)) {
+                    try (final InputStream bis = UnsynchronizedByteArrayInputStream.builder().setByteArray(entryData).get()) {
                         NodeValue content = ModuleUtils.streamToXML(context, bis, this);
                         try (Resource  resource = target.createResource(name, XMLResource.class)) {
                             ContentHandler handler = ((XMLResource) resource).setContentAsSAX();
@@ -214,17 +214,17 @@ protected Sequence processCompressedEntry(String name, boolean isDirectory, Inpu
 
                 //copy the input data
                 final byte[] entryData;
-                try (final UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream()) {
+                try (final UnsynchronizedByteArrayOutputStream baos = UnsynchronizedByteArrayOutputStream.builder().get()) {
                     baos.write(is);
                     entryData = baos.toByteArray();
                 }
 
                 //try and parse as xml, fall back to binary
-                try (final InputStream bis = new UnsynchronizedByteArrayInputStream(entryData)) {
+                try (final InputStream bis = UnsynchronizedByteArrayInputStream.builder().setByteArray(entryData).get()) {
                     uncompressedData = ModuleUtils.streamToXML(context, bis, this);
                 } catch (SAXException saxe) {
                     if (entryData.length > 0) {
-                        try (final InputStream bis = new UnsynchronizedByteArrayInputStream(entryData)) {
+                        try (final InputStream bis = UnsynchronizedByteArrayInputStream.builder().setByteArray(entryData).get()) {
                             uncompressedData = BinaryValueFromInputStream.getInstance(context, new Base64BinaryValueType(), bis, this);
                         }
                     }
diff --git a/extensions/modules/compression/src/main/java/org/exist/xquery/modules/compression/DeflateFunction.java b/extensions/modules/compression/src/main/java/org/exist/xquery/modules/compression/DeflateFunction.java
@@ -95,7 +95,7 @@ public Sequence eval(Sequence[] args, Sequence contextSequence) throws XPathExce
 	Deflater defl = new Deflater(java.util.zip.Deflater.DEFAULT_COMPRESSION, rawflag);
 
         // deflate the data
-        try(final UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream();
+        try(final UnsynchronizedByteArrayOutputStream baos = UnsynchronizedByteArrayOutputStream.builder().get();
 	    DeflaterOutputStream dos = new DeflaterOutputStream(baos, defl)) {
             bin.streamBinaryTo(dos);
             dos.flush();
diff --git a/extensions/modules/compression/src/main/java/org/exist/xquery/modules/compression/GZipFunction.java b/extensions/modules/compression/src/main/java/org/exist/xquery/modules/compression/GZipFunction.java
@@ -76,7 +76,7 @@ public Sequence eval(Sequence[] args, Sequence contextSequence) throws XPathExce
         BinaryValue bin = (BinaryValue) args[0].itemAt(0);
 
         // gzip the data
-        try(final UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream();
+        try(final UnsynchronizedByteArrayOutputStream baos = UnsynchronizedByteArrayOutputStream.builder().get();
                 final GZIPOutputStream gzos = new GZIPOutputStream(baos)) {
             bin.streamBinaryTo(gzos);
             
diff --git a/extensions/modules/compression/src/main/java/org/exist/xquery/modules/compression/InflateFunction.java b/extensions/modules/compression/src/main/java/org/exist/xquery/modules/compression/InflateFunction.java
@@ -92,7 +92,7 @@ public Sequence eval(Sequence[] args, Sequence contextSequence) throws XPathExce
 
         // uncompress the data
         try(final InflaterInputStream iis = new InflaterInputStream(bin.getInputStream(), infl);
-                final UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream()) {
+                final UnsynchronizedByteArrayOutputStream baos = UnsynchronizedByteArrayOutputStream.builder().get()) {
             int read = -1;
             final byte[] b = new byte[4096];
             while ((read = iis.read(b)) != -1) {
diff --git a/extensions/modules/compression/src/main/java/org/exist/xquery/modules/compression/UnGZipFunction.java b/extensions/modules/compression/src/main/java/org/exist/xquery/modules/compression/UnGZipFunction.java
@@ -77,7 +77,7 @@ public Sequence eval(Sequence[] args, Sequence contextSequence) throws XPathExce
         //TODO(AR) just pass the GZIPInputStream straight into BinaryValueFromInputStream.getInstance
         // ungzip the data
         try(final GZIPInputStream gzis = new GZIPInputStream(bin.getInputStream());
-                final UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream()) {
+                final UnsynchronizedByteArrayOutputStream baos = UnsynchronizedByteArrayOutputStream.builder().get()) {
             baos.write(gzis);
             return BinaryValueFromInputStream.getInstance(context, new Base64BinaryValueType(), baos.toInputStream(), this);
         } catch(final IOException ioe) {
diff --git a/extensions/modules/compression/src/main/java/org/exist/xquery/modules/compression/UnTarFunction.java b/extensions/modules/compression/src/main/java/org/exist/xquery/modules/compression/UnTarFunction.java
@@ -126,7 +126,7 @@ protected Sequence processCompressedData(final BinaryValue compressedData, final
 
             final Sequence results = new ValueSequence();
 
-            while((entry = tis.getNextTarEntry()) != null) {
+            while((entry = tis.getNextEntry()) != null) {
                 final Sequence processCompressedEntryResults = processCompressedEntry(entry.getName(), entry.isDirectory(), tis, filterParam, storeParam);
                 results.addAll(processCompressedEntryResults);
             }
diff --git a/extensions/modules/sql/src/main/java/org/exist/xquery/modules/sql/ExecuteFunction.java b/extensions/modules/sql/src/main/java/org/exist/xquery/modules/sql/ExecuteFunction.java
@@ -512,7 +512,7 @@ private ElementImpl sqlExceptionAsElement(final SQLException sqle, final String
             builder.endElement();
 
             builder.startElement(new QName("stack-trace", NAMESPACE_URI, PREFIX), null);
-            try (final UnsynchronizedByteArrayOutputStream bufStackTrace = new UnsynchronizedByteArrayOutputStream();
+            try (final UnsynchronizedByteArrayOutputStream bufStackTrace = UnsynchronizedByteArrayOutputStream.builder().get();
                  final PrintStream ps = new PrintStream(bufStackTrace)) {
                 sqle.printStackTrace(ps);
                 builder.characters(bufStackTrace.toString(UTF_8));
diff --git a/extensions/webdav/src/main/java/org/exist/webdav/MiltonDocument.java b/extensions/webdav/src/main/java/org/exist/webdav/MiltonDocument.java
@@ -277,7 +277,7 @@ public Long getContentLength() {
                 }
 
                 // Stream document to '/dev/null' and count bytes
-                try (final CountingOutputStream counter = new CountingOutputStream(NullOutputStream.NULL_OUTPUT_STREAM)) {
+                try (final CountingOutputStream counter = new CountingOutputStream(OutputStream.nullOutputStream())) {
                     existDocument.stream(counter);
                     size = counter.getByteCount();
                 } catch (Exception ex) {

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ private Sequence updateZip(XmldbURI uri, String[] paths, BinaryValue[] binaries)`
`137`	`137`	`binariesTable.put(paths[i], binaries[i]);`
`138`	`138`	`}`
`139`	`139`
`140`		`- try(final UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream())`
	`140`	`+ try(final UnsynchronizedByteArrayOutputStream baos = UnsynchronizedByteArrayOutputStream.builder().get())`
`141`	`141`	`{`
`142`	`142`	`zis = zipFileSource.getStream();`
`143`	`143`	`ZipOutputStream zos = new ZipOutputStream(baos); // zos is the output - the result`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ public Sequence eval(Sequence[] args, Sequence contextSequence)`
`120`	`120`	`encoding = StandardCharsets.UTF_8;`
`121`	`121`	`}`
`122`	`122`
`123`		`- try(final UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream();`
	`123`	`+ try(final UnsynchronizedByteArrayOutputStream baos = UnsynchronizedByteArrayOutputStream.builder().get();`
`124`	`124`	`OutputStream os = stream(baos, encoding)) {`
`125`	`125`
`126`	`126`	`// iterate through the argument sequence`
`@@ -140,7 +140,7 @@ public Sequence eval(Sequence[] args, Sequence contextSequence)`
`140`	`140`	`((DeflaterOutputStream)os).finish();`
`141`	`141`	`}`
`142`	`142`
`143`		`- return BinaryValueFromInputStream.getInstance(context, new Base64BinaryValueType(), new UnsynchronizedByteArrayInputStream(baos.toByteArray()), this);`
	`143`	`+ return BinaryValueFromInputStream.getInstance(context, new Base64BinaryValueType(), UnsynchronizedByteArrayInputStream.builder().setByteArray(baos.toByteArray()).get(), this);`
`144`	`144`	`}`
`145`	`145`	`} catch (final UnsupportedCharsetException \| IOException e) {`
`146`	`146`	`throw new XPathException(this, e.getMessage(), e);`
`@@ -412,7 +412,8 @@ private void compressResource(OutputStream os, DocumentImpl doc, boolean useHier`
`412`	`412`	`} else if (doc.getResourceType() == DocumentImpl.BINARY_FILE && doc.getContentLength() > 0) {`
`413`	`413`	`// binary file`
`414`	`414`	`try (final InputStream is = context.getBroker().getBinaryResource((BinaryDocument) doc);`
`415`		`- final UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream(doc.getContentLength() == -1 ? 1024 : (int) doc.getContentLength())) {`
	`415`	`+`
	`416`	`+ final UnsynchronizedByteArrayOutputStream baos = UnsynchronizedByteArrayOutputStream.builder().setBufferSize(doc.getContentLength() == -1 ? 1024 : (int) doc.getContentLength()).get()) {`
`416`	`417`	`baos.write(is);`
`417`	`418`	`value = baos.toByteArray();`
`418`	`419`	`}`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ protected Sequence processCompressedData(final BinaryValue compressedData, final`
`126`	`126`
`127`	`127`	`final Sequence results = new ValueSequence();`
`128`	`128`
`129`		`- while((entry = tis.getNextTarEntry()) != null) {`
	`129`	`+ while((entry = tis.getNextEntry()) != null) {`
`130`	`130`	`final Sequence processCompressedEntryResults = processCompressedEntry(entry.getName(), entry.isDirectory(), tis, filterParam, storeParam);`
`131`	`131`	`results.addAll(processCompressedEntryResults);`
`132`	`132`	`}`