This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new adf598a3fd Unit tests
adf598a3fd is described below
commit adf598a3fdaffc533d505ca4837934a0efac3456
Author: James Bognar <[email protected]>
AuthorDate: Wed Dec 3 16:13:22 2025 -0800
Unit tests
---
.../java/org/apache/juneau/bean/ResultSetList.java | 2 +-
.../org/apache/juneau/assertions/Assertions.java | 2 +-
.../assertions/FluentByteArrayAssertion.java | 2 +-
.../org/apache/juneau/commons/io/LocalFile.java | 2 +-
.../org/apache/juneau/commons/utils/FileUtils.java | 2 +-
.../commons/utils/{IOUtils.java => IoUtils.java} | 4 +-
.../apache/juneau/commons/utils/StringUtils.java | 2 +-
.../main/java/org/apache/juneau/config/Config.java | 2 +-
.../org/apache/juneau/config/mod/XorEncodeMod.java | 2 +-
.../apache/juneau/config/store/ClasspathStore.java | 2 +-
.../apache/juneau/jena/RdfSerializerSession.java | 2 +-
.../main/java/org/apache/juneau/BeanSession.java | 2 +-
.../java/org/apache/juneau/cp/BasicFileFinder.java | 2 +-
.../apache/juneau/html/HtmlSerializerSession.java | 2 +-
.../apache/juneau/json/JsonSerializerSession.java | 2 +-
.../apache/juneau/msgpack/MsgPackInputStream.java | 2 +-
.../apache/juneau/msgpack/MsgPackOutputStream.java | 2 +-
.../juneau/msgpack/MsgPackSerializerSession.java | 2 +-
.../java/org/apache/juneau/parser/ParserPipe.java | 4 +-
.../org/apache/juneau/parser/ReaderParser.java | 2 +-
.../juneau/plaintext/PlainTextParserSession.java | 2 +-
.../apache/juneau/serializer/SerializerPipe.java | 6 +-
.../apache/juneau/serializer/WriterSerializer.java | 2 +-
.../org/apache/juneau/swaps/InputStreamSwap.java | 2 +-
.../org/apache/juneau/swaps/ParsedReaderSwap.java | 2 +-
.../java/org/apache/juneau/swaps/ReaderSwap.java | 2 +-
.../apache/juneau/uon/UonSerializerSession.java | 2 +-
.../urlencoding/UrlEncodingSerializerSession.java | 2 +-
.../java/org/apache/juneau/utils/ManifestFile.java | 2 +-
.../apache/juneau/xml/XmlSerializerSession.java | 2 +-
.../org/apache/juneau/examples/rest/TestUtils.java | 2 +-
.../apache/juneau/microservice/Microservice.java | 2 +-
.../microservice/resources/DirectoryResource.java | 2 +-
.../jetty/BasicJettyServerFactory.java | 2 +-
.../microservice/jetty/JettyMicroservice.java | 2 +-
.../apache/juneau/rest/client/ResponseContent.java | 2 +-
.../org/apache/juneau/rest/client/RestRequest.java | 2 +-
.../apache/juneau/http/entity/BasicHttpEntity.java | 2 +-
.../org/apache/juneau/http/entity/FileEntity.java | 2 +-
.../apache/juneau/http/entity/ReaderEntity.java | 2 +-
.../juneau/http/entity/SerializedEntity.java | 2 +-
.../apache/juneau/http/entity/StreamEntity.java | 2 +-
.../apache/juneau/http/entity/StringEntity.java | 2 +-
.../juneau/rest/mock/MockServletRequest.java | 2 +-
.../java/org/apache/juneau/rest/RestContext.java | 2 +-
.../java/org/apache/juneau/rest/RestRequest.java | 2 +-
.../juneau/rest/httppart/RequestContent.java | 2 +-
.../juneau/rest/httppart/RequestFormParam.java | 4 +-
.../org/apache/juneau/rest/logger/CallLogger.java | 2 +-
.../rest/processor/InputStreamProcessor.java | 2 +-
.../juneau/rest/processor/ReaderProcessor.java | 2 +-
.../rest/util/CachingHttpServletRequest.java | 2 +-
.../apache/juneau/rest/widget/MenuItemWidget.java | 2 +-
.../a/rttests/ObjectsAsStrings_RoundTripTest.java | 2 +-
.../a/rttests/RoundTripTransformBeans_Test.java | 2 +-
.../juneau/assertions/ByteArrayAssertion_Test.java | 2 +-
.../juneau/commons/io/FileReaderBuilder_Test.java | 2 +-
.../apache/juneau/commons/io/LocalFile_Test.java | 2 +-
.../juneau/commons/io/PathReaderBuilder_Test.java | 2 +-
.../juneau/commons/utils/ClassUtils_Test.java | 98 ++++++------
.../juneau/commons/utils/CollectionUtils_Test.java | 172 ++++++++++-----------
.../utils/{IOUtils_Test.java => IoUtils_Test.java} | 10 +-
.../juneau/commons/utils/StringUtils_Test.java | 2 +-
.../juneau/config/store/ConfigFileStoreTest.java | 2 +-
.../http/remote/Remote_CommonInterfaces_Test.java | 2 +-
.../http/remote/Remote_ContentAnnotation_Test.java | 2 +-
.../remote/Remote_RemoteOpAnnotation_Test.java | 2 +-
.../http/remote/Remote_RequestAnnotation_Test.java | 2 +-
.../remote/Remote_ResponseAnnotation_Test.java | 2 +-
.../juneau/httppart/OpenApiPartParser_Test.java | 2 +-
.../org/apache/juneau/rest/RestOp_Params_Test.java | 2 +-
.../juneau/rest/annotation/Content_Test.java | 2 +-
.../rest/client/RestClient_Response_Body_Test.java | 2 +-
.../apache/juneau/rest/client/RestClient_Test.java | 2 +-
.../juneau/utest/utils/FakeStreamParser.java | 2 +-
75 files changed, 217 insertions(+), 217 deletions(-)
diff --git
a/juneau-bean/juneau-bean-common/src/main/java/org/apache/juneau/bean/ResultSetList.java
b/juneau-bean/juneau-bean-common/src/main/java/org/apache/juneau/bean/ResultSetList.java
index be3d945a87..c3700b8ea7 100644
---
a/juneau-bean/juneau-bean-common/src/main/java/org/apache/juneau/bean/ResultSetList.java
+++
b/juneau-bean/juneau-bean-common/src/main/java/org/apache/juneau/bean/ResultSetList.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import java.sql.*;
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Assertions.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Assertions.java
index a06c67e947..c6b8997d2c 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Assertions.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Assertions.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.assertions;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import java.io.*;
import java.time.*;
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentByteArrayAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentByteArrayAssertion.java
index 2fa9be0122..5d11c12abd 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentByteArrayAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentByteArrayAssertion.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.assertions;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.StringUtils.*;
import java.io.*;
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/io/LocalFile.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/io/LocalFile.java
index d322f4bef2..3558a56fd5 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/io/LocalFile.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/io/LocalFile.java
@@ -17,7 +17,7 @@
package org.apache.juneau.commons.io;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
import java.io.*;
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/FileUtils.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/FileUtils.java
index cbdc772547..5887c5eab9 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/FileUtils.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/FileUtils.java
@@ -17,7 +17,7 @@
package org.apache.juneau.commons.utils;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.StringUtils.*;
import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/IOUtils.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/IoUtils.java
similarity index 99%
rename from
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/IOUtils.java
rename to
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/IoUtils.java
index c8ffdd4f95..9df7b6430f 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/IOUtils.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/IoUtils.java
@@ -32,7 +32,7 @@ import org.apache.juneau.commons.io.*;
/**
* Various I/O related utility methods.
*/
-public class IOUtils {
+public class IoUtils {
/** UTF-8 charset */
public static final Charset UTF8 = StandardCharsets.UTF_8;
@@ -1067,5 +1067,5 @@ public class IOUtils {
/**
* Constructor.
*/
- protected IOUtils() {}
+ protected IoUtils() {}
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/StringUtils.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/StringUtils.java
index 33d487d3ac..941d0878bc 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/StringUtils.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/StringUtils.java
@@ -21,7 +21,7 @@ import static java.nio.charset.StandardCharsets.*;
import static java.util.stream.Collectors.*;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.StateEnum.*;
import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
index 369f52cadd..2130111223 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
@@ -18,7 +18,7 @@ package org.apache.juneau.config;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.StringUtils.*;
import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/mod/XorEncodeMod.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/mod/XorEncodeMod.java
index 75e51ba091..c66c15751f 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/mod/XorEncodeMod.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/mod/XorEncodeMod.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.config.mod;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.StringUtils.*;
/**
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ClasspathStore.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ClasspathStore.java
index 0a298e6b60..59e6a54f3f 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ClasspathStore.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ClasspathStore.java
@@ -190,7 +190,7 @@ public class ClasspathStore extends ConfigStore {
var cl = Thread.currentThread().getContextClassLoader();
try (var in = cl.getResourceAsStream(name)) {
if (nn(in))
- cache.put(name, IOUtils.read(in));
+ cache.put(name, IoUtils.read(in));
}
return emptyIfNull(cache.get(name));
}
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
index f2441708b4..da53123835 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
@@ -17,7 +17,7 @@
package org.apache.juneau.jena;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.StringUtils.*;
import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
index 8055479d86..50d0aa1e65 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
@@ -19,7 +19,7 @@ package org.apache.juneau;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.DateUtils.*;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.StringUtils.*;
import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BasicFileFinder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BasicFileFinder.java
index 7109e9cb23..19f52ff52f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BasicFileFinder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BasicFileFinder.java
@@ -19,7 +19,7 @@ package org.apache.juneau.cp;
import static org.apache.juneau.collections.JsonMap.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.FileUtils.*;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.StringUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
index 79db95abb8..241b611d86 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
@@ -17,7 +17,7 @@
package org.apache.juneau.html;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.StringUtils.*;
import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
index 166f6fb0a8..961fba6aeb 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.json;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
import java.io.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackInputStream.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackInputStream.java
index 298ae12e65..60d9d2b24b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackInputStream.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackInputStream.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.msgpack;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import static org.apache.juneau.msgpack.DataType.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackOutputStream.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackOutputStream.java
index 9dd37d4961..e4211650f7 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackOutputStream.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackOutputStream.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.msgpack;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.msgpack.DataType.*;
import java.io.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
index a53bbc9a2c..0702f9e0ba 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
@@ -17,7 +17,7 @@
package org.apache.juneau.msgpack;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
import java.io.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserPipe.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserPipe.java
index 310372d4f5..4b9907f7ad 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserPipe.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserPipe.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.parser;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.StringUtils.*;
import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
@@ -169,7 +169,7 @@ public class ParserPipe implements Closeable {
public void close() {
try {
if (doClose)
- IOUtils.close(reader, inputStream);
+ IoUtils.close(reader, inputStream);
} catch (IOException e) {
throw bex(e);
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParser.java
index 59932d4949..2b81f66b68 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParser.java
@@ -17,7 +17,7 @@
package org.apache.juneau.parser;
import static org.apache.juneau.collections.JsonMap.*;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
import java.lang.annotation.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParserSession.java
index 0b5077c4a3..c41676a93d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParserSession.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.plaintext;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import java.io.*;
import java.lang.reflect.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerPipe.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerPipe.java
index 6720f16c65..3401e997b1 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerPipe.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerPipe.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.serializer;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
@@ -90,9 +90,9 @@ public class SerializerPipe implements Closeable {
@Override /* Overridden from Closeable */
public void close() {
try {
- IOUtils.flush(writer, outputStream);
+ IoUtils.flush(writer, outputStream);
if (autoClose)
- IOUtils.close(writer, outputStream);
+ IoUtils.close(writer, outputStream);
} catch (IOException e) {
throw bex(e);
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializer.java
index af4b3bac13..31d53d012d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializer.java
@@ -17,7 +17,7 @@
package org.apache.juneau.serializer;
import static org.apache.juneau.collections.JsonMap.*;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/InputStreamSwap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/InputStreamSwap.java
index 9e076b563b..51dd3a6d73 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/InputStreamSwap.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/InputStreamSwap.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.swaps;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.StringUtils.*;
import java.io.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/ParsedReaderSwap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/ParsedReaderSwap.java
index 1dfb13431e..7302238eb2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/ParsedReaderSwap.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/ParsedReaderSwap.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.swaps;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import java.io.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/ReaderSwap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/ReaderSwap.java
index 32839a5c13..9f146ef9e2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/ReaderSwap.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/ReaderSwap.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.swaps;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import java.io.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java
index c80bed5a29..2cd0d29181 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.uon;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java
index 25920128ab..b38c6587bf 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.urlencoding;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
import java.io.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ManifestFile.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ManifestFile.java
index 7fa4a81c96..251b14dbb3 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ManifestFile.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ManifestFile.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.utils;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import java.io.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
index f507ec7eb4..6349ed7ef9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
@@ -17,7 +17,7 @@
package org.apache.juneau.xml;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
import static org.apache.juneau.xml.XmlSerializerSession.ContentResult.*;
import static org.apache.juneau.xml.XmlSerializerSession.JsonType.*;
diff --git
a/juneau-examples/juneau-examples-rest-jetty-ftest/src/test/java/org/apache/juneau/examples/rest/TestUtils.java
b/juneau-examples/juneau-examples-rest-jetty-ftest/src/test/java/org/apache/juneau/examples/rest/TestUtils.java
index 74c35e96ee..d7facd992e 100644
---
a/juneau-examples/juneau-examples-rest-jetty-ftest/src/test/java/org/apache/juneau/examples/rest/TestUtils.java
+++
b/juneau-examples/juneau-examples-rest-jetty-ftest/src/test/java/org/apache/juneau/examples/rest/TestUtils.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.examples.rest;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.StringUtils.*;
import java.io.*;
diff --git
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
index a7a099422f..eeab725878 100755
---
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
+++
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
@@ -18,7 +18,7 @@ package org.apache.juneau.microservice;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.FileUtils.*;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
diff --git
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java
index bd20152912..7a3b98a42b 100755
---
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java
+++
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java
@@ -17,7 +17,7 @@
package org.apache.juneau.microservice.resources;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.StringUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
diff --git
a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/BasicJettyServerFactory.java
b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/BasicJettyServerFactory.java
index 7903c9e2cf..fa00fa3550 100644
---
a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/BasicJettyServerFactory.java
+++
b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/BasicJettyServerFactory.java
@@ -17,7 +17,7 @@
package org.apache.juneau.microservice.jetty;
import static org.apache.juneau.commons.utils.FileUtils.*;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import java.io.*;
import java.util.*;
diff --git
a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
index 109783a8b4..cef5f46aff 100644
---
a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
+++
b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
@@ -19,7 +19,7 @@ package org.apache.juneau.microservice.jetty;
import static org.apache.juneau.collections.JsonMap.*;
import static org.apache.juneau.commons.reflect.ReflectionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.StringUtils.*;
import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseContent.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseContent.java
index 8a2ec31907..229192c438 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseContent.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseContent.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.rest.client;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.StringUtils.*;
import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
index 0109d34b61..52fa932147 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
@@ -20,7 +20,7 @@ import static java.util.stream.Collectors.toList;
import static org.apache.juneau.collections.JsonMap.*;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
import static org.apache.juneau.http.HttpEntities.*;
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/BasicHttpEntity.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/BasicHttpEntity.java
index 9ce2123c0b..014f84d42d 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/BasicHttpEntity.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/BasicHttpEntity.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.http.entity;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/FileEntity.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/FileEntity.java
index df1e631bbb..a8aa9d4b26 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/FileEntity.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/FileEntity.java
@@ -17,7 +17,7 @@
package org.apache.juneau.http.entity;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
import java.io.*;
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/ReaderEntity.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/ReaderEntity.java
index b8cceca963..ecd89aed54 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/ReaderEntity.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/ReaderEntity.java
@@ -17,7 +17,7 @@
package org.apache.juneau.http.entity;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
import java.io.*;
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/SerializedEntity.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/SerializedEntity.java
index 7048e890f7..57b3f14799 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/SerializedEntity.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/SerializedEntity.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.http.entity;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
import static org.apache.juneau.http.HttpHeaders.*;
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/StreamEntity.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/StreamEntity.java
index 85b8d81a96..2058eabcc3 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/StreamEntity.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/StreamEntity.java
@@ -17,7 +17,7 @@
package org.apache.juneau.http.entity;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
import java.io.*;
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/StringEntity.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/StringEntity.java
index d103c833f6..764f4f023a 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/StringEntity.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/StringEntity.java
@@ -17,7 +17,7 @@
package org.apache.juneau.http.entity;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
import java.io.*;
diff --git
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java
index 7ddff681e0..d8214a7f1d 100644
---
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java
+++
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java
@@ -18,7 +18,7 @@ package org.apache.juneau.rest.mock;
import static java.util.Collections.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.StringUtils.*;
import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
index 20e3f96d62..2d3a1c350d 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
@@ -22,7 +22,7 @@ import static org.apache.juneau.collections.JsonMap.*;
import static org.apache.juneau.commons.reflect.ReflectionUtils.*;
import static org.apache.juneau.commons.utils.ClassUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.StringUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
import static org.apache.juneau.http.HttpHeaders.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
index f24536b718..af368e0b3e 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
@@ -18,7 +18,7 @@ package org.apache.juneau.rest;
import static java.util.Optional.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.StringUtils.*;
import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestContent.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestContent.java
index 1c6d027ca7..d9515f08a0 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestContent.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestContent.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.rest.httppart;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.StringUtils.*;
import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestFormParam.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestFormParam.java
index 9f2e15430b..c51e709720 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestFormParam.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestFormParam.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.rest.httppart;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
import static org.apache.juneau.httppart.HttpPartType.*;
@@ -200,7 +200,7 @@ public class RequestFormParam extends RequestHttpPart
implements NameValuePair {
public String getValue() {
if (value == null && nn(part))
try {
- value = IOUtils.read(part.getInputStream());
+ value = IoUtils.read(part.getInputStream());
} catch (IOException e) {
throw toRex(e);
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/CallLogger.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/CallLogger.java
index d07b20e683..74ed858bde 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/CallLogger.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/CallLogger.java
@@ -20,7 +20,7 @@ import static java.util.logging.Level.*;
import static org.apache.juneau.Enablement.*;
import static org.apache.juneau.collections.JsonMap.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.StringUtils.*;
import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/InputStreamProcessor.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/InputStreamProcessor.java
index aad6a5ee0c..8d2d0f8309 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/InputStreamProcessor.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/InputStreamProcessor.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.rest.processor;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import java.io.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ReaderProcessor.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ReaderProcessor.java
index 3ca1f15afc..2e9e2b4dd0 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ReaderProcessor.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ReaderProcessor.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.rest.processor;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import java.io.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/CachingHttpServletRequest.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/CachingHttpServletRequest.java
index c37f651b3b..9b00b76475 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/CachingHttpServletRequest.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/CachingHttpServletRequest.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.rest.util;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import java.io.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/MenuItemWidget.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/MenuItemWidget.java
index 07a2f2bb06..98f411e363 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/MenuItemWidget.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/MenuItemWidget.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.rest.widget;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.StringUtils.*;
import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/ObjectsAsStrings_RoundTripTest.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/ObjectsAsStrings_RoundTripTest.java
index 1ebcaceef1..4ae2a5533a 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/ObjectsAsStrings_RoundTripTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/ObjectsAsStrings_RoundTripTest.java
@@ -17,7 +17,7 @@
package org.apache.juneau.a.rttests;
import static org.apache.juneau.TestUtils.*;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.junit.bct.BctAssertions.*;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeans_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeans_Test.java
index 8b21886b2b..6f041b43ed 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeans_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeans_Test.java
@@ -19,7 +19,7 @@ package org.apache.juneau.a.rttests;
import static org.apache.juneau.TestUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.DateUtils.*;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.junit.bct.BctAssertions.*;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/ByteArrayAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/ByteArrayAssertion_Test.java
index 7f1debe423..e69073d699 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/ByteArrayAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/ByteArrayAssertion_Test.java
@@ -18,7 +18,7 @@ package org.apache.juneau.assertions;
import static org.apache.juneau.assertions.AssertionPredicates.*;
import static org.apache.juneau.assertions.Assertions.*;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.junit.jupiter.api.Assertions.*;
import org.apache.juneau.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/io/FileReaderBuilder_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/io/FileReaderBuilder_Test.java
index 6a6ad4a891..8da97dd06e 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/io/FileReaderBuilder_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/io/FileReaderBuilder_Test.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.commons.io;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.junit.jupiter.api.Assertions.*;
import java.io.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/io/LocalFile_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/io/LocalFile_Test.java
index fa991a8bd2..f0fcfb1dff 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/io/LocalFile_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/io/LocalFile_Test.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.commons.io;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.junit.jupiter.api.Assertions.*;
import java.io.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/io/PathReaderBuilder_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/io/PathReaderBuilder_Test.java
index 476bfd2ba0..7dfe2aee3a 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/io/PathReaderBuilder_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/io/PathReaderBuilder_Test.java
@@ -17,7 +17,7 @@
package org.apache.juneau.commons.io;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.junit.jupiter.api.Assertions.*;
import java.io.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/ClassUtils_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/utils/ClassUtils_Test.java
index 26b416474e..1a04007d0c 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/ClassUtils_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/utils/ClassUtils_Test.java
@@ -30,7 +30,7 @@ import org.apache.juneau.commons.reflect.ClassInfo;
import org.apache.juneau.commons.utils.*;
import org.junit.jupiter.api.*;
-@SuppressWarnings({"serial","unused"})
+@SuppressWarnings({"unused"})
class ClassUtils_Test {
//====================================================================================================
@@ -56,19 +56,19 @@ class ClassUtils_Test {
assertTrue(canAddTo(new LinkedHashSet<>()));
assertTrue(canAddTo(new TreeSet<>()));
assertTrue(canAddTo(new Vector<>()));
-
+
// Unmodifiable collections
assertFalse(canAddTo(Collections.unmodifiableList(new
ArrayList<>())));
assertFalse(canAddTo(Collections.unmodifiableSet(new
HashSet<>())));
assertFalse(canAddTo(Collections.unmodifiableCollection(new
ArrayList<>())));
assertFalse(canAddTo(Arrays.asList("a", "b"))); //
Arrays$ArrayList
-
+
// Java 9+ immutable collections
if (List.of("a").getClass().getName().contains("Immutable")) {
assertFalse(canAddTo(List.of("a")));
assertFalse(canAddTo(Set.of("a")));
}
-
+
// Should throw when null
assertThrows(IllegalArgumentException.class, () -> {
canAddTo((Collection<?>)null);
@@ -85,15 +85,15 @@ class ClassUtils_Test {
assertTrue(canPutTo(new LinkedHashMap<>()));
assertTrue(canPutTo(new TreeMap<>()));
assertTrue(canPutTo(new Hashtable<>()));
-
+
// Unmodifiable maps
assertFalse(canPutTo(Collections.unmodifiableMap(new
HashMap<>())));
-
+
// Java 9+ immutable maps
if (Map.of("a",
"b").getClass().getName().contains("Immutable")) {
assertFalse(canPutTo(Map.of("a", "b")));
}
-
+
// Should throw when null
assertThrows(IllegalArgumentException.class, () -> {
canPutTo((Map<?,?>)null);
@@ -108,23 +108,23 @@ class ClassUtils_Test {
// With Class
assertEquals("java.lang.String", cn(String.class));
assertEquals("java.util.ArrayList", cn(ArrayList.class));
-
+
// With Object
assertEquals("java.util.HashMap", cn(new HashMap<>()));
assertEquals("java.lang.String", cn("test"));
-
+
// With primitive
assertEquals("int", cn(int.class));
assertEquals("boolean", cn(boolean.class));
-
+
// With array
assertEquals("[Ljava.lang.String;", cn(String[].class));
assertEquals("[I", cn(int[].class));
assertEquals("[[Ljava.lang.String;", cn(String[][].class));
-
+
// With inner class
assertEquals("java.util.Map$Entry", cn(Map.Entry.class));
-
+
// With null
assertNull(cn(null));
}
@@ -137,30 +137,30 @@ class ClassUtils_Test {
// With Class
assertEquals("String", cns(String.class));
assertEquals("ArrayList", cns(ArrayList.class));
-
+
// With Object
assertEquals("HashMap", cns(new HashMap<>()));
assertEquals("String", cns("test"));
-
+
// With primitive
assertEquals("int", cns(int.class));
assertEquals("boolean", cns(boolean.class));
-
+
// With array
assertEquals("String[]", cns(String[].class));
assertEquals("int[]", cns(int[].class));
assertEquals("String[][]", cns(String[][].class));
-
+
// With inner class
assertEquals("Entry", cns(Map.Entry.class));
-
+
// With null
assertNull(cns(null));
-
+
// With ClassInfo (line 188-189)
var classInfo = ClassInfo.of(String.class);
assertEquals("String", cns(classInfo));
-
+
var listClassInfo = ClassInfo.of(ArrayList.class);
assertEquals("ArrayList", cns(listClassInfo));
}
@@ -173,10 +173,10 @@ class ClassUtils_Test {
// Top-level class
assertEquals("String", cnsq(String.class));
assertEquals("ArrayList", cnsq(ArrayList.class));
-
+
// Inner class
assertEquals("Map.Entry", cnsq(Map.Entry.class));
-
+
// Nested inner class
class Outer {
class Inner {
@@ -188,14 +188,14 @@ class ClassUtils_Test {
// Result will be something like
"ClassUtils_2_Test.1Outer.Inner.Deep"
assertTrue(result.endsWith("Outer.Inner.Deep"), result);
assertFalse(result.contains("$"), result);
-
+
// With Object
var obj = new HashMap<>();
assertEquals("HashMap", cnsq(obj));
-
+
// With null
assertNull(cnsq(null));
-
+
// Anonymous class
var anon = new Object() {};
var anonResult = cnsq(anon);
@@ -203,20 +203,20 @@ class ClassUtils_Test {
// After conversion should be like "ClassUtils_2_Test.1"
assertNotNull(anonResult);
assertFalse(anonResult.contains("$"), anonResult);
-
+
// Array types
assertEquals("String[]", cnsq(String[].class));
assertEquals("String[][]", cnsq(String[][].class));
assertEquals("int[]", cnsq(int[].class));
assertEquals("Map.Entry[]", cnsq(Map.Entry[].class));
-
+
// Array objects
var stringArray = new String[]{"a", "b"};
assertEquals("String[]", cnsq(stringArray));
-
+
var intArray = new int[]{1, 2, 3};
assertEquals("int[]", cnsq(intArray));
-
+
var multiDimArray = new String[][]{{"a"}};
assertEquals("String[][]", cnsq(multiDimArray));
}
@@ -232,18 +232,18 @@ class ClassUtils_Test {
assertEquals(String.class, classes[0]);
assertEquals(Integer.class, classes[1]);
assertEquals(HashMap.class, classes[2]);
-
+
// With null
Class<?>[] classes2 = getClasses("test", null, 123);
assertEquals(3, classes2.length);
assertEquals(String.class, classes2[0]);
assertNull(classes2[1]);
assertEquals(Integer.class, classes2[2]);
-
+
// Empty
var classes3 = getClasses();
assertEquals(0, classes3.length);
-
+
// All null
var classes4 = getClasses(null, null, null);
assertEquals(3, classes4.length);
@@ -264,7 +264,7 @@ class ClassUtils_Test {
assertSame(args, result);
assertEquals("test", result[0]);
assertEquals(123, result[1]);
-
+
// Wrong order - method reorders them
var paramTypes2 = a(Integer.class, String.class);
var args2 = a("test", 123);
@@ -272,14 +272,14 @@ class ClassUtils_Test {
assertEquals(2, result2.length);
assertEquals(123, result2[0]);
assertEquals("test", result2[1]);
-
+
// Extra args - ignored
var paramTypes3 = a(String.class);
var args3 = a("test", 123, true);
var result3 = getMatchingArgs(paramTypes3, (Object[])args3);
assertEquals(1, result3.length);
assertEquals("test", result3[0]);
-
+
// Missing args - become null
var paramTypes4 = a(String.class, Integer.class, Boolean.class);
var args4 = a("test");
@@ -288,7 +288,7 @@ class ClassUtils_Test {
assertEquals("test", result4[0]);
assertNull(result4[1]);
assertNull(result4[2]);
-
+
// Primitive types
var paramTypes5 = a(int.class, String.class);
var args5 = a("test", 123);
@@ -296,7 +296,7 @@ class ClassUtils_Test {
assertEquals(2, result5.length);
assertEquals(123, result5[0]);
assertEquals("test", result5[1]);
-
+
// Type hierarchy
var paramTypes6 = a(Number.class, String.class);
var args6 = a("test", 123);
@@ -304,7 +304,7 @@ class ClassUtils_Test {
assertEquals(2, result6.length);
assertEquals(123, result6[0]);
assertEquals("test", result6[1]);
-
+
// Null args
var paramTypes7 = a(String.class, Integer.class);
var args7 = new Object[] {null, null};
@@ -312,7 +312,7 @@ class ClassUtils_Test {
assertEquals(2, result7.length);
assertNull(result7[0]);
assertNull(result7[1]);
-
+
// Null paramTypes - should throw
assertThrows(NullPointerException.class, () -> {
getMatchingArgs(null, "test");
@@ -326,11 +326,11 @@ class ClassUtils_Test {
void a008_getProxyFor() {
// Null
assertNull(getProxyFor(null));
-
+
// Regular object
var obj = "test";
assertNull(getProxyFor(obj));
-
+
// JDK dynamic proxy
var proxy = Proxy.newProxyInstance(
Thread.currentThread().getContextClassLoader(),
@@ -339,7 +339,7 @@ class ClassUtils_Test {
);
var result = getProxyFor(proxy);
assertEquals(List.class, result);
-
+
// JDK dynamic proxy with no interfaces
var proxy2 = Proxy.newProxyInstance(
Thread.currentThread().getContextClassLoader(),
@@ -359,12 +359,12 @@ class ClassUtils_Test {
assertFalse(isNotVoid(void.class));
assertFalse(isNotVoid(Void.class));
assertFalse(isNotVoid(null));
-
+
// Non-void classes
assertTrue(isNotVoid(String.class));
assertTrue(isNotVoid(int.class));
assertTrue(isNotVoid(Object.class));
-
+
// NOT_VOID predicate
assertFalse(NOT_VOID.test(void.class));
assertFalse(NOT_VOID.test(Void.class));
@@ -381,7 +381,7 @@ class ClassUtils_Test {
assertTrue(isVoid(void.class));
assertTrue(isVoid(Void.class));
assertTrue(isVoid(null));
-
+
// Non-void classes
assertFalse(isVoid(String.class));
assertFalse(isVoid(int.class));
@@ -396,7 +396,7 @@ class ClassUtils_Test {
var ctor = String.class.getDeclaredConstructor();
// Should succeed (no security manager in tests typically)
assertTrue(setAccessible(ctor));
-
+
// Should throw when null
assertThrowsWithMessage(IllegalArgumentException.class, l("x",
"cannot be null"), () -> {
setAccessible((Constructor<?>)null);
@@ -415,7 +415,7 @@ class ClassUtils_Test {
var field = TestClass.class.getDeclaredField("field");
// Should succeed (no security manager in tests typically)
assertTrue(setAccessible(field));
-
+
// Should throw when null
assertThrowsWithMessage(IllegalArgumentException.class, l("x",
"cannot be null"), () -> {
setAccessible((Field)null);
@@ -430,7 +430,7 @@ class ClassUtils_Test {
var method = String.class.getDeclaredMethod("indexOf",
String.class, int.class);
// Should succeed (no security manager in tests typically)
assertTrue(setAccessible(method));
-
+
// Should throw when null
assertThrowsWithMessage(IllegalArgumentException.class, l("x",
"cannot be null"), () -> {
setAccessible((Method)null);
@@ -445,7 +445,7 @@ class ClassUtils_Test {
// With Class
assertSame(String.class, toClass(String.class));
assertSame(Integer.class, toClass(Integer.class));
-
+
// With ParameterizedType
class TestClass {
List<String> field;
@@ -454,7 +454,7 @@ class ClassUtils_Test {
var genericType = field.getGenericType();
var result = toClass(genericType);
assertEquals(List.class, result);
-
+
// With TypeVariable - cannot be converted
class TestClass2<T> {
T field;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/CollectionUtils_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/utils/CollectionUtils_Test.java
index e43863bd5d..31bec0d685 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/CollectionUtils_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/utils/CollectionUtils_Test.java
@@ -50,7 +50,7 @@ class CollectionUtils_Test extends TestBase {
assertEquals("a", result[0]);
assertEquals("b", result[1]);
assertEquals("c", result[2]);
-
+
// Empty array
String[] empty = a();
assertNotNull(empty);
@@ -70,12 +70,12 @@ class CollectionUtils_Test extends TestBase {
assertEquals("b", result[0][1]);
assertEquals("c", result[1][0]);
assertEquals("d", result[1][1]);
-
+
// Single row
String[][] single = a2(a("x", "y", "z"));
assertEquals(1, single.length);
assertEquals(3, single[0].length);
-
+
// Empty
String[][] empty = a2();
assertNotNull(empty);
@@ -105,13 +105,13 @@ class CollectionUtils_Test extends TestBase {
var result1 = addAll((List<String>)null, "a", "b");
assertNotNull(result1);
assertEquals(list("a", "b"), result1);
-
+
// Existing list adds to it
var list = list("x");
var result2 = addAll(list, "a", "b");
assertSame(list, result2);
assertEquals(list("x", "a", "b"), result2);
-
+
// Null entries returns original
var list2 = list("a", "b");
var result3 = addAll(list2, (String[])null);
@@ -128,14 +128,14 @@ class CollectionUtils_Test extends TestBase {
var result1 = addAll(list, (List<String>)null);
assertSame(list, result1);
assertEquals(list("a", "b"), result1);
-
+
// Null value creates copy
var entries = list("x", "y", "z");
var result2 = addAll(null, entries);
assertNotNull(result2);
assertEquals(list("x", "y", "z"), result2);
assertNotSame(entries, result2);
-
+
// Both not null adds to existing
var list2 = list("a", "b");
var entries2 = list("c", "d");
@@ -154,12 +154,12 @@ class CollectionUtils_Test extends TestBase {
var result1 = addAll(set, (String[])null);
assertSame(set, result1);
assertEquals(set("a", "b"), result1);
-
+
// Null value creates new set
var result2 = addAll((Set<String>)null, "x", "y", "z");
assertNotNull(result2);
assertEquals(set("x", "y", "z"), result2);
-
+
// Both not null adds to existing
var set2 = set("a", "b");
var result3 = addAll(set2, "c", "d");
@@ -177,12 +177,12 @@ class CollectionUtils_Test extends TestBase {
var result1 = addAll(set, (String[])null);
assertSame(set, result1);
assertEquals(sortedSet("a", "b"), result1);
-
+
// Null value creates new sorted set
var result2 = addAll((SortedSet<String>)null, "x", "y", "z");
assertNotNull(result2);
assertEquals(sortedSet("x", "y", "z"), result2);
-
+
// Both not null adds to existing
var set2 = sortedSet("a", "b");
var result3 = addAll(set2, "c", "d");
@@ -198,16 +198,16 @@ class CollectionUtils_Test extends TestBase {
String[] s = {};
s = addAll(s, "a", "b");
assertList(s, "a", "b");
-
+
s = addAll(s, "c");
assertList(s, "a", "b", "c");
-
+
s = addAll(s);
assertList(s, "a", "b", "c");
-
+
var o = addAll((Object[])null);
assertEmpty(o);
-
+
s = addAll((String[])null, "a", "b");
assertList(s, "a", "b");
}
@@ -225,7 +225,7 @@ class CollectionUtils_Test extends TestBase {
assertEquals(true, result[2]);
assertEquals(3.14, result[3]);
assertNull(result[4]);
-
+
// Empty
Object[] empty = ao();
assertNotNull(empty);
@@ -271,7 +271,7 @@ class CollectionUtils_Test extends TestBase {
assertEquals("a", result.get(0));
assertEquals("b", result.get(1));
assertEquals("c", result.get(2));
-
+
// Primitive array
int[] intArr = {1, 2, 3};
List<Object> intResult = arrayToList(intArr);
@@ -279,7 +279,7 @@ class CollectionUtils_Test extends TestBase {
assertEquals(1, intResult.get(0));
assertEquals(2, intResult.get(1));
assertEquals(3, intResult.get(2));
-
+
// Test lines 431-433: char array
char[] charArr = {'a', 'b', 'c'};
List<Object> charResult = arrayToList(charArr);
@@ -335,7 +335,7 @@ class CollectionUtils_Test extends TestBase {
void a016_combine() {
var s1 = a("a");
var s2 = a("b");
-
+
assertList(combine(s1, s2), "a", "b");
assertList(combine(s1), "a");
assertList(combine(s2), "b");
@@ -365,13 +365,13 @@ class CollectionUtils_Test extends TestBase {
void a018_copyArrayToList() {
String[] arr = {"a", "b", "c"};
List<Object> list = new ArrayList<>();
- List result = copyArrayToList(arr, list);
+ var result = copyArrayToList(arr, list);
assertSame(list, result);
assertEquals(3, list.size());
assertEquals("a", list.get(0));
assertEquals("b", list.get(1));
assertEquals("c", list.get(2));
-
+
// Null array
List<Object> list2 = new ArrayList<>();
copyArrayToList(null, list2);
@@ -391,7 +391,7 @@ class CollectionUtils_Test extends TestBase {
assertTrue(result.contains("b"));
assertTrue(result.contains("c"));
assertNotSame(col, result);
-
+
assertNull(copyOf((Collection<String>)null));
}
@@ -408,7 +408,7 @@ class CollectionUtils_Test extends TestBase {
assertEquals("b", result.get(1));
assertEquals("c", result.get(2));
assertNotSame(list, result);
-
+
assertNull(copyOf((List<String>)null));
}
@@ -424,7 +424,7 @@ class CollectionUtils_Test extends TestBase {
assertEquals("A", result.get(0));
assertEquals("B", result.get(1));
assertEquals("C", result.get(2));
-
+
assertNull(copyOf((List<String>)null, s -> s));
}
@@ -454,7 +454,7 @@ class CollectionUtils_Test extends TestBase {
assertEquals(1, result.get("a"));
assertEquals(2, result.get("b"));
assertNotSame(map, result);
-
+
assertNull(copyOf((Map<String, Integer>)null));
}
@@ -481,7 +481,7 @@ class CollectionUtils_Test extends TestBase {
assertNotNull(result);
assertTrue(result instanceof TreeMap);
assertEquals(1, result.size());
-
+
// Test line 647: null map returns null
assertNull(copyOf((Map<String, Integer>)null, v -> v,
TreeMap::new));
}
@@ -497,7 +497,7 @@ class CollectionUtils_Test extends TestBase {
assertEquals(3, result.size());
assertTrue(result.contains("a"));
assertNotSame(set, result);
-
+
assertNull(copyOf((Set<String>)null));
}
@@ -537,7 +537,7 @@ class CollectionUtils_Test extends TestBase {
assertEquals(3, result.length);
assertEquals("a", result[0]);
assertNotSame(arr, result);
-
+
assertNull(copyOf((String[])null));
}
@@ -561,7 +561,7 @@ class CollectionUtils_Test extends TestBase {
void a031_first() {
List<String> list = list("a", "b", "c");
assertEquals("a", first(list));
-
+
assertNull(first(null));
assertNull(first(list()));
}
@@ -599,7 +599,7 @@ class CollectionUtils_Test extends TestBase {
List<String> result = new ArrayList<>();
forEachReverse(list, result::add);
assertEquals(list("c", "b", "a"), result);
-
+
// Test lines 762-764: non-ArrayList List uses ListIterator
LinkedList<String> linkedList = new LinkedList<>(list("x", "y",
"z"));
List<String> result2 = new ArrayList<>();
@@ -664,7 +664,7 @@ class CollectionUtils_Test extends TestBase {
assertEquals(3, result.size());
assertEquals("a", result.get(0));
assertThrows(UnsupportedOperationException.class, () ->
result.add("d"));
-
+
assertNull(l((String[])null));
}
@@ -807,68 +807,68 @@ class CollectionUtils_Test extends TestBase {
assertNotNull(empty);
assertTrue(empty.isEmpty());
assertThrows(UnsupportedOperationException.class, () ->
empty.put("x", 1));
-
+
// 1 pair
Map<String, Integer> m1 = m("a", 1);
assertEquals(1, m1.size());
assertEquals(1, m1.get("a"));
-
+
// 2 pairs
Map<String, Integer> m2 = m("a", 1, "b", 2);
assertEquals(2, m2.size());
assertEquals(1, m2.get("a"));
assertEquals(2, m2.get("b"));
-
+
// 3 pairs
Map<String, Integer> m3 = m("a", 1, "b", 2, "c", 3);
assertEquals(3, m3.size());
-
+
// 4 pairs
Map<String, Integer> m4 = m("a", 1, "b", 2, "c", 3, "d", 4);
assertEquals(4, m4.size());
-
+
// 5 pairs
Map<String, Integer> m5 = m("a", 1, "b", 2, "c", 3, "d", 4,
"e", 5);
assertEquals(5, m5.size());
-
+
// 6 pairs
Map<String, Integer> m6 = m("a", 1, "b", 2, "c", 3, "d", 4,
"e", 5, "f", 6);
assertEquals(6, m6.size());
-
+
// 7 pairs
Map<String, Integer> m7 = m("a", 1, "b", 2, "c", 3, "d", 4,
"e", 5, "f", 6, "g", 7);
assertEquals(7, m7.size());
-
+
// 8 pairs
Map<String, Integer> m8 = m("a", 1, "b", 2, "c", 3, "d", 4,
"e", 5, "f", 6, "g", 7, "h", 8);
assertEquals(8, m8.size());
-
+
// 9 pairs
Map<String, Integer> m9 = m("a", 1, "b", 2, "c", 3, "d", 4,
"e", 5, "f", 6, "g", 7, "h", 8, "i", 9);
assertEquals(9, m9.size());
-
+
// 10 pairs
Map<String, Integer> m10 = m("a", 1, "b", 2, "c", 3, "d", 4,
"e", 5, "f", 6, "g", 7, "h", 8, "i", 9, "j", 10);
assertEquals(10, m10.size());
-
+
// Null handling
Map<String, Integer> nullKey = m(null, 1);
assertEquals(1, nullKey.get(null));
-
+
Map<String, Integer> nullValue = m("a", null);
assertNull(nullValue.get("a"));
assertTrue(nullValue.containsKey("a"));
-
+
// Duplicate key detection
assertThrowsWithMessage(IllegalArgumentException.class,
"Duplicate key found: key1", () -> {
m("key1", "value1", "key2", "value2", "key1", "value3");
});
-
+
// Insertion order preservation
Map<String, Integer> ordered = m("z", 1, "a", 2, "m", 3, "b",
4);
var keys = new ArrayList<>(ordered.keySet());
assertEquals(list("z", "a", "m", "b"), keys);
-
+
// Immutability
assertThrows(UnsupportedOperationException.class, () ->
m1.put("x", 2));
assertThrows(UnsupportedOperationException.class, () ->
m1.remove("a"));
@@ -886,54 +886,54 @@ class CollectionUtils_Test extends TestBase {
assertTrue(empty.isEmpty());
empty.put("x", 1); // Modifiable
assertEquals(1, empty.size());
-
+
// 1 pair
LinkedHashMap<String, Integer> m1 = map("a", 1);
assertEquals(1, m1.size());
assertEquals(1, m1.get("a"));
-
+
// 2 pairs
LinkedHashMap<String, Integer> m2 = map("a", 1, "b", 2);
assertEquals(2, m2.size());
-
+
// 3 pairs
LinkedHashMap<String, Integer> m3 = map("a", 1, "b", 2, "c", 3);
assertEquals(3, m3.size());
-
+
// 4 pairs
LinkedHashMap<String, Integer> m4 = map("a", 1, "b", 2, "c", 3,
"d", 4);
assertEquals(4, m4.size());
var keys = new ArrayList<>(m4.keySet());
assertEquals(l("a", "b", "c", "d"), keys);
-
+
// 5 pairs
LinkedHashMap<String, Integer> m5 = map("a", 1, "b", 2, "c", 3,
"d", 4, "e", 5);
assertEquals(5, m5.size());
-
+
// 6 pairs
LinkedHashMap<String, Integer> m6 = map("a", 1, "b", 2, "c", 3,
"d", 4, "e", 5, "f", 6);
assertEquals(6, m6.size());
-
+
// 7 pairs - test lines 1400-1408
LinkedHashMap<String, Integer> m7 = map("a", 1, "b", 2, "c", 3,
"d", 4, "e", 5, "f", 6, "g", 7);
assertEquals(7, m7.size());
assertEquals(7, m7.get("g"));
-
+
// 8 pairs - test lines 1435-1444
LinkedHashMap<String, Integer> m8 = map("a", 1, "b", 2, "c", 3,
"d", 4, "e", 5, "f", 6, "g", 7, "h", 8);
assertEquals(8, m8.size());
assertEquals(8, m8.get("h"));
-
+
// 9 pairs - test lines 1473-1483
LinkedHashMap<String, Integer> m9 = map("a", 1, "b", 2, "c", 3,
"d", 4, "e", 5, "f", 6, "g", 7, "h", 8, "i", 9);
assertEquals(9, m9.size());
assertEquals(9, m9.get("i"));
-
+
// 10 pairs
LinkedHashMap<String, Integer> m10 = map("a", 1, "b", 2, "c",
3, "d", 4, "e", 5, "f", 6, "g", 7, "h", 8, "i", 9, "j", 10);
assertEquals(10, m10.size());
assertEquals(l("a", "b", "c", "d", "e", "f", "g", "h", "i",
"j"), new ArrayList<>(m10.keySet()));
-
+
// Null values
LinkedHashMap<String, String> nullVals = map("a", "val1", "b",
null, "c", "val3", "d", null);
assertEquals(4, nullVals.size());
@@ -1012,13 +1012,13 @@ class CollectionUtils_Test extends TestBase {
var result1 = prependAll((List<String>)null, "a", "b");
assertNotNull(result1);
assertEquals(list("a", "b"), result1);
-
+
// Existing list prepends to it
var list = list("x");
var result2 = prependAll(list, "a", "b");
assertSame(list, result2);
assertEquals(list("a", "b", "x"), result2);
-
+
// Null entries returns original
var list2 = list("a", "b");
var result3 = prependAll(list2, (String[])null);
@@ -1064,7 +1064,7 @@ class CollectionUtils_Test extends TestBase {
List<String> list = list("a", "b", "c");
List<String> result = rstream(list).toList();
assertEquals(list("c", "b", "a"), result);
-
+
assertTrue(rstream(null).toList().isEmpty());
assertTrue(rstream(list()).toList().isEmpty());
}
@@ -1174,16 +1174,16 @@ class CollectionUtils_Test extends TestBase {
assertNotNull(result);
assertEquals(3, result.size());
assertEquals(list("a", "b", "c"), new ArrayList<>(result));
-
+
// Empty
TreeSet<String> empty = sortedSet();
assertNotNull(empty);
assertTrue(empty.isEmpty());
-
+
// Single
TreeSet<String> single = sortedSet("a");
assertEquals(1, single.size());
-
+
// Numbers
TreeSet<Integer> numbers = sortedSet(3, 1, 2, 5, 4);
assertEquals(list(1, 2, 3, 4, 5), new ArrayList<>(numbers));
@@ -1197,7 +1197,7 @@ class CollectionUtils_Test extends TestBase {
String[] arr = {"a", "b", "c"};
List<String> result = stream(arr).toList();
assertEquals(list("a", "b", "c"), result);
-
+
assertTrue(stream(null).toList().isEmpty());
}
@@ -1277,11 +1277,11 @@ class CollectionUtils_Test extends TestBase {
ArrayList<String> result1 = toList(col, false);
assertNotNull(result1);
assertEquals(2, result1.size());
-
+
ArrayList<String> result2 = toList(col, true);
assertNotNull(result2);
assertEquals(2, result2.size());
-
+
Collection<String> empty = list();
assertNull(toList(empty, true));
assertNotNull(toList(empty, false));
@@ -1299,7 +1299,7 @@ class CollectionUtils_Test extends TestBase {
arrayList.add("b");
List<?> result1 = toList((Object)arrayList);
assertSame(arrayList, result1);
-
+
// Set converts to list
Set<String> set = set("a", "b", "c");
List<?> result2 = toList(set);
@@ -1308,33 +1308,33 @@ class CollectionUtils_Test extends TestBase {
assertTrue(result2.contains("a"));
assertTrue(result2.contains("b"));
assertTrue(result2.contains("c"));
-
+
// Array converts to list
String[] arr = {"a", "b", "c"};
List<?> result3 = toList(arr);
assertEquals(3, result3.size());
assertEquals("a", result3.get(0));
-
+
// Test lines 2001-2006: Stream, Map, Optional
// Stream
List<?> result4 = toList(java.util.stream.Stream.of("x", "y",
"z"));
assertEquals(3, result4.size());
assertEquals("x", result4.get(0));
-
+
// Map
Map<String, Integer> map = map("a", 1, "b", 2);
List<?> result5 = toList(map);
assertEquals(2, result5.size());
-
+
// Optional - empty
List<?> result6 = toList(Optional.empty());
assertTrue(result6.isEmpty());
-
+
// Optional - present
List<?> result7 = toList(Optional.of("test"));
assertEquals(1, result7.size());
assertEquals("test", result7.get(0));
-
+
// Test line 2009: unsupported type throws exception
assertThrows(RuntimeException.class, () -> {
toList(new Object() {}); // Unsupported type
@@ -1352,9 +1352,9 @@ class CollectionUtils_Test extends TestBase {
assertEquals(3, result.size());
assertTrue(result.contains("a"));
assertThrows(UnsupportedOperationException.class, () ->
result.add("d"));
-
+
assertThrows(IllegalArgumentException.class, () ->
toSet((String[])null));
-
+
// Test lines 2085, 2093: Iterator behavior
Iterator<String> it = result.iterator();
assertTrue(it.hasNext());
@@ -1362,12 +1362,12 @@ class CollectionUtils_Test extends TestBase {
assertEquals("b", it.next());
assertEquals("c", it.next());
assertFalse(it.hasNext());
-
+
// Test line 2085: NoSuchElementException when calling next()
after exhausted
assertThrows(java.util.NoSuchElementException.class, () -> {
it.next();
});
-
+
// Test line 2093: UnsupportedOperationException when calling
remove()
Iterator<String> it2 = result.iterator();
it2.next(); // Move to first element
@@ -1385,11 +1385,11 @@ class CollectionUtils_Test extends TestBase {
TreeSet<String> result = toSortedSet(input);
assertNotNull(result);
assertEquals(l("a", "b", "c"), new ArrayList<>(result));
-
+
LinkedHashSet<Integer> input2 = new LinkedHashSet<>(l(3, 1, 2));
TreeSet<Integer> result2 = toSortedSet(input2);
assertEquals(l(1, 2, 3), new ArrayList<>(result2));
-
+
assertNull(toSortedSet((Set<String>)null));
}
@@ -1405,12 +1405,12 @@ class CollectionUtils_Test extends TestBase {
assertTrue(result.contains("a"));
assertTrue(result.contains("b"));
assertTrue(result.contains("c"));
-
+
// Test line 2189: null object returns early
List<Object> result2 = new ArrayList<>();
traverse(null, result2::add);
assertTrue(result2.isEmpty());
-
+
// Test line 2194: Stream handling
List<Object> result3 = new ArrayList<>();
traverse(java.util.stream.Stream.of("x", "y", "z"),
result3::add);
@@ -1438,14 +1438,14 @@ class CollectionUtils_Test extends TestBase {
@Test
void a084_toObjectList() {
String[] arr = {"a", "b", "c"};
-
+
// Test line 2041: nested arrays (recursive call)
String[][] nestedArr = {{"a", "b"}, {"c", "d"}};
List<Object> nestedResult = toObjectList(nestedArr);
assertEquals(2, nestedResult.size());
assertTrue(nestedResult.get(0) instanceof List);
assertTrue(nestedResult.get(1) instanceof List);
-
+
String[] arr2 = {"a", "b", "c"};
List<Object> result = toObjectList(arr);
assertNotNull(result);
@@ -1476,11 +1476,11 @@ class CollectionUtils_Test extends TestBase {
TreeSet<String> result = toSortedSet(col);
assertNotNull(result);
assertEquals(l("a", "b", "c"), new ArrayList<>(result));
-
+
Collection<Integer> col2 = list(3, 1, 2);
TreeSet<Integer> result2 = toSortedSet(col2);
assertEquals(l(1, 2, 3), new ArrayList<>(result2));
-
+
// Test line 2117: null returns null
assertNull(toSortedSet((Collection<String>)null));
}
@@ -1494,7 +1494,7 @@ class CollectionUtils_Test extends TestBase {
TreeSet<String> result1 = toSortedSet(col, false);
assertNotNull(result1);
assertEquals(3, result1.size());
-
+
Collection<String> empty = list();
assertNull(toSortedSet(empty, true));
assertNotNull(toSortedSet(empty, false));
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/IOUtils_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/utils/IoUtils_Test.java
similarity index 99%
rename from
juneau-utest/src/test/java/org/apache/juneau/commons/utils/IOUtils_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/commons/utils/IoUtils_Test.java
index ac3017a9f0..95bbbd88cd 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/IOUtils_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/utils/IoUtils_Test.java
@@ -17,7 +17,7 @@
package org.apache.juneau.commons.utils;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.junit.jupiter.api.Assertions.*;
import java.io.*;
@@ -30,9 +30,9 @@ import org.apache.juneau.*;
import org.junit.jupiter.api.*;
/**
- * Tests {@link IOUtils}.
+ * Tests {@link IoUtils}.
*/
-class IOUtils_Test extends TestBase {
+class IoUtils_Test extends TestBase {
//====================================================================================================
// Constructor (line 35)
@@ -40,8 +40,8 @@ class IOUtils_Test extends TestBase {
@Test
void a00_constructor() {
// Test line 35: class instantiation
- // IOUtils has an implicit public no-arg constructor
- var instance = new IOUtils();
+ // IoUtils has an implicit public no-arg constructor
+ var instance = new IoUtils();
assertNotNull(instance);
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/StringUtils_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/utils/StringUtils_Test.java
index d3320df6d4..ac2ffe6c68 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/StringUtils_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/utils/StringUtils_Test.java
@@ -18,7 +18,7 @@ package org.apache.juneau.commons.utils;
import static org.apache.juneau.TestUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.StringUtils.*;
import static org.apache.juneau.junit.bct.BctAssertions.*;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/config/store/ConfigFileStoreTest.java
b/juneau-utest/src/test/java/org/apache/juneau/config/store/ConfigFileStoreTest.java
index 5a10730631..0cac1ab06e 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/config/store/ConfigFileStoreTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/config/store/ConfigFileStoreTest.java
@@ -18,7 +18,7 @@ package org.apache.juneau.config.store;
import static org.apache.juneau.TestUtils.*;
import static org.apache.juneau.commons.utils.FileUtils.*;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.junit.jupiter.api.Assertions.*;
import java.io.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_CommonInterfaces_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_CommonInterfaces_Test.java
index 012b05037c..1d437233ca 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_CommonInterfaces_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_CommonInterfaces_Test.java
@@ -17,7 +17,7 @@
package org.apache.juneau.http.remote;
import static org.apache.juneau.TestUtils.*;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.http.HttpResources.*;
import static org.apache.juneau.http.HttpResponses.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_ContentAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_ContentAnnotation_Test.java
index 030891c3d7..d17c4cbdd6 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_ContentAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_ContentAnnotation_Test.java
@@ -18,7 +18,7 @@ package org.apache.juneau.http.remote;
import static org.apache.juneau.TestUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.http.HttpParts.*;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_RemoteOpAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_RemoteOpAnnotation_Test.java
index 18774204ac..58ca09e598 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_RemoteOpAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_RemoteOpAnnotation_Test.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.http.remote;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.junit.jupiter.api.Assertions.*;
import java.io.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_RequestAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_RequestAnnotation_Test.java
index f832bff8d4..382e67fc6e 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_RequestAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_RequestAnnotation_Test.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.http.remote;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.junit.jupiter.api.Assertions.*;
import java.io.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_ResponseAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_ResponseAnnotation_Test.java
index 653086a2b4..3fa5c5b203 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_ResponseAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_ResponseAnnotation_Test.java
@@ -17,7 +17,7 @@
package org.apache.juneau.http.remote;
import static org.apache.juneau.TestUtils.*;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.junit.jupiter.api.Assertions.*;
import java.io.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartParser_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartParser_Test.java
index 0b2328262f..59fcb43e34 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartParser_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartParser_Test.java
@@ -17,7 +17,7 @@
package org.apache.juneau.httppart;
import static org.apache.juneau.TestUtils.*;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.StringUtils.*;
import static org.apache.juneau.httppart.HttpPartSchema.*;
import static org.apache.juneau.junit.bct.BctAssertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/RestOp_Params_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/RestOp_Params_Test.java
index 89914eb636..df3d27394d 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/RestOp_Params_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/RestOp_Params_Test.java
@@ -17,7 +17,7 @@
package org.apache.juneau.rest;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.http.HttpMethod.*;
import java.io.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Content_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Content_Test.java
index 147030b1fd..dca4499f1d 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Content_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Content_Test.java
@@ -18,7 +18,7 @@ package org.apache.juneau.rest.annotation;
import static org.apache.juneau.TestUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.http.header.ContentType.*;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Body_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Body_Test.java
index 6ff486f3fe..5a06d78aa8 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Body_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Body_Test.java
@@ -18,7 +18,7 @@ package org.apache.juneau.rest.client;
import static org.apache.juneau.TestUtils.*;
import static org.apache.juneau.assertions.Assertions.*;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.commons.utils.StringUtils.*;
import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.junit.bct.BctAssertions.assertBean;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Test.java
index 7ce53a9e2b..b9535ae489 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Test.java
@@ -18,7 +18,7 @@ package org.apache.juneau.rest.client;
import static org.apache.juneau.TestUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.http.HttpResponses.*;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/utest/utils/FakeStreamParser.java
b/juneau-utest/src/test/java/org/apache/juneau/utest/utils/FakeStreamParser.java
index 19451ec8bf..6a92aa844b 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/utest/utils/FakeStreamParser.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/utest/utils/FakeStreamParser.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.utest.utils;
-import static org.apache.juneau.commons.utils.IOUtils.*;
+import static org.apache.juneau.commons.utils.IoUtils.*;
import java.io.*;
