[refactor] Use new APIs from commons-io

dizzzz · dizzzz · commit 1a7a43bb95c6 · 2025-07-30T18:49:35.000+02:00
diff --git a/extensions/exquery/restxq/src/main/java/org/exist/extensions/exquery/restxq/impl/RestXqServiceImpl.java b/extensions/exquery/restxq/src/main/java/org/exist/extensions/exquery/restxq/impl/RestXqServiceImpl.java
@@ -135,7 +135,7 @@ protected Sequence extractRequestBody(final HttpRequest request) throws RestXqSe
         try {
 
             //first, get the content of the request
-            is = new CloseShieldInputStream(request.getInputStream());
+            is = CloseShieldInputStream.wrap(request.getInputStream());
 
             //if marking is not supported, we have to cache the input stream, so we can reread it, as we may use it twice (once for xml attempt and once for string attempt)
             if (!is.markSupported()) {
@@ -261,7 +261,7 @@ private DocumentImpl parseAsXml(final InputStream is) {
             //try and construct xml document from input stream, we use eXist's in-memory DOM implementation
 
             //we have to use CloseShieldInputStream otherwise the parser closes the stream and we cant later reread
-            final InputSource src = new InputSource(new CloseShieldInputStream(is));
+            final InputSource src = new InputSource(CloseShieldInputStream.wrap(is));
 
             reader = getBrokerPool().getParserPool().borrowXMLReader();
             final MemTreeBuilder builder = new MemTreeBuilder();
@@ -287,7 +287,7 @@ private DocumentImpl parseAsXml(final InputStream is) {
 
     private static StringValue parseAsString(final InputStream is, final String encoding) throws IOException {
         final String s;
-        try (final UnsynchronizedByteArrayOutputStream bos = new UnsynchronizedByteArrayOutputStream(4096)) {
+        try (final UnsynchronizedByteArrayOutputStream bos = UnsynchronizedByteArrayOutputStream.builder().setBufferSize(4096).get()) {
             bos.write(is);
             s = new String(bos.toByteArray(), encoding);
         }
diff --git a/extensions/indexes/spatial/src/main/java/org/exist/xquery/modules/spatial/FunGeometricProperties.java b/extensions/indexes/spatial/src/main/java/org/exist/xquery/modules/spatial/FunGeometricProperties.java
@@ -51,6 +51,8 @@
 import org.locationtech.jts.io.WKBWriter;
 import org.locationtech.jts.io.WKTWriter;
 
+import java.io.IOException;
+
 /**
   * @author <a href="mailto:pierrick.brihaye@free.fr">Pierrick Brihaye</a>
   * @author ljo
@@ -341,7 +343,7 @@ public Sequence eval(Sequence[] args, Sequence contextSequence) throws XPathExce
                             result = new StringValue(this, wktWriter.write(geometry));
                         } else if (isCalledAs("getEPSG4326WKB")) {
                             byte data[] = wkbWriter.write(geometry);
-                            return BinaryValueFromInputStream.getInstance(context, new Base64BinaryValueType(), new UnsynchronizedByteArrayInputStream(data), this);
+                            return BinaryValueFromInputStream.getInstance(context, new Base64BinaryValueType(), UnsynchronizedByteArrayInputStream.builder().setByteArray(data).get(), this);
                         } else if (isCalledAs("getEPSG4326MinX")) {
                             result = new DoubleValue(this, geometry.getEnvelopeInternal().getMinX());
                         } else if (isCalledAs("getEPSG4326MaxX")) {
@@ -361,7 +363,7 @@ public Sequence eval(Sequence[] args, Sequence contextSequence) throws XPathExce
                         result = new StringValue(this, wktWriter.write(geometry));
                     } else if (isCalledAs("getWKB")) {
                         byte data[] = wkbWriter.write(geometry);
-                        return BinaryValueFromInputStream.getInstance(context, new Base64BinaryValueType(), new UnsynchronizedByteArrayInputStream(data), this);
+                        return BinaryValueFromInputStream.getInstance(context, new Base64BinaryValueType(), UnsynchronizedByteArrayInputStream.builder().setByteArray(data).get(), this);
                     } else if (isCalledAs("getMinX")) {
                         result = new DoubleValue(this, geometry.getEnvelopeInternal().getMinX());
                     } else if (isCalledAs("getMaxX")) {
@@ -391,7 +393,7 @@ public Sequence eval(Sequence[] args, Sequence contextSequence) throws XPathExce
                         throw new XPathException(this, "Unknown spatial property: " + getName().getLocalPart());
                     }
                 }
-            } catch (SpatialIndexException e) {
+            } catch (SpatialIndexException | IOException e) {
                 logger.error(e.getMessage());
                 throw new XPathException(this, e);
             }
diff --git a/extensions/modules/exi/src/main/java/org/exist/xquery/modules/exi/EncodeExiFunction.java b/extensions/modules/exi/src/main/java/org/exist/xquery/modules/exi/EncodeExiFunction.java
@@ -87,7 +87,7 @@ public Sequence eval(Sequence[] args, Sequence contextSequence)
 		if(args[0].isEmpty()) {
             return Sequence.EMPTY_SEQUENCE;
         }
-		try (final UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream()) {
+		try (final UnsynchronizedByteArrayOutputStream baos = UnsynchronizedByteArrayOutputStream.builder().get()) {
 			EXISerializer exiSerializer;
 			if(args.length > 1) {
 				if(!args[1].isEmpty()) {
diff --git a/extensions/modules/file/src/test/java/org/exist/xquery/modules/file/EmbeddedBinariesTest.java b/extensions/modules/file/src/test/java/org/exist/xquery/modules/file/EmbeddedBinariesTest.java
@@ -144,13 +144,13 @@ protected boolean isBooleanType(final Item item) throws IOException {
     @Override
     protected byte[] getBytes(final Item item) throws IOException {
         if (item instanceof Base64BinaryDocument doc) {
-            try (final UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream()) {
+            try (final UnsynchronizedByteArrayOutputStream baos = UnsynchronizedByteArrayOutputStream.builder().get()) {
                 doc.streamBinaryTo(baos);
                 return baos.toByteArray();
             }
         } else {
             final BinaryValueFromFile file = (BinaryValueFromFile) item;
-            try (final UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream()) {
+            try (final UnsynchronizedByteArrayOutputStream baos = UnsynchronizedByteArrayOutputStream.builder().get()) {
                 file.streamBinaryTo(baos);
                 return baos.toByteArray();
             }
diff --git a/extensions/modules/file/src/test/java/org/exist/xquery/modules/file/RestBinariesTest.java b/extensions/modules/file/src/test/java/org/exist/xquery/modules/file/RestBinariesTest.java
@@ -88,7 +88,7 @@ public void readAndStreamBinarySax() throws IOException, JAXBException {
         final HttpResponse response = postXquery(query);
 
         final HttpEntity entity = response.getEntity();
-        try(final UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream()) {
+        try(final UnsynchronizedByteArrayOutputStream baos = UnsynchronizedByteArrayOutputStream.builder().get()) {
             entity.writeTo(baos);
 
             assertArrayEquals(Files.readAllBytes(tmpInFile), Base64.decodeBase64(baos.toByteArray()));
@@ -113,7 +113,7 @@ public void readAndStreamBinaryRaw() throws IOException, JAXBException {
         final HttpResponse response = postXquery(query);
 
         final HttpEntity entity = response.getEntity();
-        try(final UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream()) {
+        try(final UnsynchronizedByteArrayOutputStream baos = UnsynchronizedByteArrayOutputStream.builder().get()) {
             entity.writeTo(baos);
 
             assertArrayEquals(Files.readAllBytes(tmpInFile), baos.toByteArray());
@@ -168,7 +168,7 @@ private HttpResponse postXquery(final String xquery) throws JAXBException, IOExc
         final Marshaller marshaller = jaxbContext.createMarshaller();
 
         final HttpResponse response;
-        try(final UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream()) {
+        try(final UnsynchronizedByteArrayOutputStream baos = UnsynchronizedByteArrayOutputStream.builder().get()) {
             marshaller.marshal(query, baos);
             response = executor.execute(Request.Post(getRestUrl() + "/db/")
                     .bodyByteArray(baos.toByteArray(), ContentType.APPLICATION_XML)
diff --git a/extensions/modules/image/src/main/java/org/exist/xquery/modules/image/CropFunction.java b/extensions/modules/image/src/main/java/org/exist/xquery/modules/image/CropFunction.java
@@ -168,7 +168,7 @@ public Sequence eval(Sequence[] args, Sequence contextSequence) throws XPathExce
                 g.dispose();
             }
 
-            try (final UnsynchronizedByteArrayOutputStream os = new UnsynchronizedByteArrayOutputStream()) {
+            try (final UnsynchronizedByteArrayOutputStream os = UnsynchronizedByteArrayOutputStream.builder().get()) {
                 ImageIO.write(bImage, formatName, os);
 
                 //return the new croped image data
diff --git a/extensions/modules/image/src/main/java/org/exist/xquery/modules/image/GetThumbnailsFunction.java b/extensions/modules/image/src/main/java/org/exist/xquery/modules/image/GetThumbnailsFunction.java
@@ -270,7 +270,7 @@ public Sequence eval(Sequence[] args, Sequence contextSequence)
                                 }
 
                                 if (isSaveToDataBase) {
-                                    os = new UnsynchronizedByteArrayOutputStream();
+                                    os = UnsynchronizedByteArrayOutputStream.builder().get();
                                     try {
                                         ImageIO.write(bImage, "jpg", os);
                                     } catch (Exception e) {
diff --git a/extensions/modules/image/src/main/java/org/exist/xquery/modules/image/ScaleFunction.java b/extensions/modules/image/src/main/java/org/exist/xquery/modules/image/ScaleFunction.java
@@ -187,7 +187,7 @@ public Sequence eval(final Sequence[] args, final Sequence contextSequence) thro
             final BufferedImage bImage = ImageModule.createThumb(image, maxHeight, maxWidth, renderingHints);
 
             //get the new scaled image
-            try (final UnsynchronizedByteArrayOutputStream os = new UnsynchronizedByteArrayOutputStream()) {
+            try (final UnsynchronizedByteArrayOutputStream os = UnsynchronizedByteArrayOutputStream.builder().get()) {
                 ImageIO.write(bImage, formatName, os);
 
                 //return the new scaled image data
diff --git a/extensions/modules/xslfo/src/main/java/org/exist/xquery/modules/xslfo/RenderFunction.java b/extensions/modules/xslfo/src/main/java/org/exist/xquery/modules/xslfo/RenderFunction.java
@@ -122,7 +122,7 @@ public Sequence eval(final Sequence[] args, final Sequence contextSequence) thro
         }
 
         ProcessorAdapter adapter = null;
-        try (final UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream()) {
+        try (final UnsynchronizedByteArrayOutputStream baos = UnsynchronizedByteArrayOutputStream.builder().get()) {
             adapter = ((XSLFOModule) getParentModule()).getProcessorAdapter();
 
             final NodeValue processorConfig = args.length == 4 ? (NodeValue) args[3].itemAt(0) : null;
diff --git a/extensions/security/ldap/src/test/java/org/exist/security/realm/ldap/LDAPRealmTest.java b/extensions/security/ldap/src/test/java/org/exist/security/realm/ldap/LDAPRealmTest.java
@@ -58,7 +58,7 @@ public class LDAPRealmTest {
 	 */
 	@BeforeClass
 	public static void setUpBeforeClass() throws Exception {
-		try (final InputStream is = new UnsynchronizedByteArrayInputStream(config.getBytes(UTF_8))) {
+		try (final InputStream is = UnsynchronizedByteArrayInputStream.builder().setByteArray(config.getBytes(UTF_8)).get()) {
 			Configuration config = Configurator.parse(is);
 			realm = new LDAPRealm(null, config);
 		}
diff --git a/extensions/webdav/src/main/java/org/exist/webdav/ExistCollection.java b/extensions/webdav/src/main/java/org/exist/webdav/ExistCollection.java
@@ -287,7 +287,7 @@ public XmldbURI createFile(String newName, InputStream is, Long length, String c
             if (LOG.isDebugEnabled()) {
                 LOG.debug("Creating dummy XML file for null resource lock '{}'", newNameUri);
             }
-            is = new UnsynchronizedByteArrayInputStream("<null_resource/>".getBytes(StandardCharsets.UTF_8));
+            is = UnsynchronizedByteArrayInputStream.builder().setByteArray("<null_resource/>".getBytes(StandardCharsets.UTF_8)).get();
         }
 
         final TransactionManager txnManager = brokerPool.getTransactionManager();
diff --git a/extensions/xqdoc/src/main/java/org/exist/xqdoc/xquery/Scan.java b/extensions/xqdoc/src/main/java/org/exist/xqdoc/xquery/Scan.java
@@ -89,7 +89,7 @@ public Scan(XQueryContext context, FunctionSignature signature) {
 
     //TODO ideally should be replaced by changing BinarySource to a streaming approach
     private byte[] binaryValueToByteArray(BinaryValue binaryValue) throws IOException {
-        try (final UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream()) {
+        try (final UnsynchronizedByteArrayOutputStream baos = UnsynchronizedByteArrayOutputStream.builder().get()) {
             binaryValue.streamBinaryTo(baos);
             return baos.toByteArray();
         }

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public Sequence eval(Sequence[] args, Sequence contextSequence)`
`87`	`87`	`if(args[0].isEmpty()) {`
`88`	`88`	`return Sequence.EMPTY_SEQUENCE;`
`89`	`89`	`}`
`90`		`- try (final UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream()) {`
	`90`	`+ try (final UnsynchronizedByteArrayOutputStream baos = UnsynchronizedByteArrayOutputStream.builder().get()) {`
`91`	`91`	`EXISerializer exiSerializer;`
`92`	`92`	`if(args.length > 1) {`
`93`	`93`	`if(!args[1].isEmpty()) {`
Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ public Sequence eval(Sequence[] args, Sequence contextSequence) throws XPathExce`
`168`	`168`	`g.dispose();`
`169`	`169`	`}`
`170`	`170`
`171`		`- try (final UnsynchronizedByteArrayOutputStream os = new UnsynchronizedByteArrayOutputStream()) {`
	`171`	`+ try (final UnsynchronizedByteArrayOutputStream os = UnsynchronizedByteArrayOutputStream.builder().get()) {`
`172`	`172`	`ImageIO.write(bImage, formatName, os);`
`173`	`173`
`174`	`174`	`//return the new croped image data`
Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ public Sequence eval(Sequence[] args, Sequence contextSequence)`
`270`	`270`	`}`
`271`	`271`
`272`	`272`	`if (isSaveToDataBase) {`
`273`		`- os = new UnsynchronizedByteArrayOutputStream();`
	`273`	`+ os = UnsynchronizedByteArrayOutputStream.builder().get();`
`274`	`274`	`try {`
`275`	`275`	`ImageIO.write(bImage, "jpg", os);`
`276`	`276`	`} catch (Exception e) {`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ public Sequence eval(final Sequence[] args, final Sequence contextSequence) thro`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`ProcessorAdapter adapter = null;`
`125`		`- try (final UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream()) {`
	`125`	`+ try (final UnsynchronizedByteArrayOutputStream baos = UnsynchronizedByteArrayOutputStream.builder().get()) {`
`126`	`126`	`adapter = ((XSLFOModule) getParentModule()).getProcessorAdapter();`
`127`	`127`
`128`	`128`	`final NodeValue processorConfig = args.length == 4 ? (NodeValue) args[3].itemAt(0) : null;`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public class LDAPRealmTest {`
`58`	`58`	`*/`
`59`	`59`	`@BeforeClass`
`60`	`60`	`public static void setUpBeforeClass() throws Exception {`
`61`		`- try (final InputStream is = new UnsynchronizedByteArrayInputStream(config.getBytes(UTF_8))) {`
	`61`	`+ try (final InputStream is = UnsynchronizedByteArrayInputStream.builder().setByteArray(config.getBytes(UTF_8)).get()) {`
`62`	`62`	`Configuration config = Configurator.parse(is);`
`63`	`63`	`realm = new LDAPRealm(null, config);`
`64`	`64`	`}`