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 de9c49fd12 Utility class cleanup
de9c49fd12 is described below
commit de9c49fd12a46a4a15571a81199fd1bc20ed6824
Author: James Bognar <[email protected]>
AuthorDate: Tue Oct 21 15:30:30 2025 -0400
Utility class cleanup
---
.../src/main/java/org/apache/juneau/bean/ResultSetList.java | 2 +-
.../src/main/java/org/apache/juneau/assertions/Assertions.java | 2 +-
.../org/apache/juneau/assertions/FluentVersionAssertion.java | 2 +-
.../main/java/org/apache/juneau/assertions/VersionAssertion.java | 2 +-
.../apache/juneau/common/{utils => collections}/SimpleMap.java | 4 +++-
.../org/apache/juneau/common/function}/ThrowingConsumer.java | 2 +-
.../org/apache/juneau/common/function}/ThrowingFunction.java | 2 +-
.../apache/juneau/common/{utils => io}/CharSequenceReader.java | 2 +-
.../apache/juneau/common/{utils => io}/FileReaderBuilder.java | 2 +-
.../apache/juneau/common/{utils => io}/FileWriterBuilder.java | 2 +-
.../apache/juneau/common/{utils => io}/NoCloseOutputStream.java | 2 +-
.../org/apache/juneau/common/{utils => io}/NoCloseWriter.java | 2 +-
.../apache/juneau/common/{utils => io}/PathReaderBuilder.java | 2 +-
.../apache/juneau/common/{utils => io}/ReaderInputStream.java | 2 +-
.../juneau/common/{utils => reflect}/ThrowingSupplier.java | 2 +-
.../src/main/java/org/apache/juneau/common/utils/IOUtils.java | 2 ++
.../src/main/java/org/apache/juneau/common/utils/Utils.java | 1 +
.../src/main/java/org/apache/juneau/common/utils}/Version.java | 4 +---
.../main/java/org/apache/juneau/common/utils}/VersionRange.java | 5 +----
.../java/org/apache/juneau/common}/utils/WeightedAverage.java | 2 +-
.../src/main/java/org/apache/juneau/jena/RdfParser.java | 1 +
.../src/main/java/org/apache/juneau/jena/RdfSerializer.java | 1 +
.../src/main/java/org/apache/juneau/BeanContext.java | 1 +
.../src/main/java/org/apache/juneau/BeanContextable.java | 1 +
.../src/main/java/org/apache/juneau/BeanTraverseContext.java | 1 +
.../src/main/java/org/apache/juneau/csv/CsvParser.java | 1 +
.../src/main/java/org/apache/juneau/csv/CsvSerializer.java | 1 +
.../src/main/java/org/apache/juneau/html/HtmlDocSerializer.java | 1 +
.../src/main/java/org/apache/juneau/html/HtmlParser.java | 1 +
.../java/org/apache/juneau/html/HtmlSchemaDocSerializer.java | 1 +
.../main/java/org/apache/juneau/html/HtmlSchemaSerializer.java | 1 +
.../src/main/java/org/apache/juneau/html/HtmlSerializer.java | 1 +
.../java/org/apache/juneau/html/HtmlStrippedDocSerializer.java | 1 +
.../src/main/java/org/apache/juneau/json/JsonParser.java | 1 +
.../main/java/org/apache/juneau/json/JsonSchemaSerializer.java | 1 +
.../src/main/java/org/apache/juneau/json/JsonSerializer.java | 1 +
.../java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java | 1 +
.../src/main/java/org/apache/juneau/msgpack/MsgPackParser.java | 1 +
.../main/java/org/apache/juneau/msgpack/MsgPackSerializer.java | 1 +
.../src/main/java/org/apache/juneau/oapi/OpenApiParser.java | 1 +
.../src/main/java/org/apache/juneau/oapi/OpenApiSerializer.java | 1 +
.../main/java/org/apache/juneau/parser/InputStreamParser.java | 1 +
.../src/main/java/org/apache/juneau/parser/Parser.java | 1 +
.../src/main/java/org/apache/juneau/parser/ParserReader.java | 1 +
.../src/main/java/org/apache/juneau/parser/ReaderParser.java | 1 +
.../main/java/org/apache/juneau/plaintext/PlainTextParser.java | 1 +
.../java/org/apache/juneau/plaintext/PlainTextSerializer.java | 1 +
.../org/apache/juneau/serializer/OutputStreamSerializer.java | 1 +
.../src/main/java/org/apache/juneau/serializer/Serializer.java | 1 +
.../main/java/org/apache/juneau/serializer/SerializerPipe.java | 1 +
.../main/java/org/apache/juneau/serializer/WriterSerializer.java | 1 +
.../src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java | 1 +
.../src/main/java/org/apache/juneau/swap/FunctionalSwap.java | 2 +-
.../src/main/java/org/apache/juneau/uon/UonParser.java | 1 +
.../src/main/java/org/apache/juneau/uon/UonSerializer.java | 1 +
.../java/org/apache/juneau/urlencoding/UrlEncodingParser.java | 1 +
.../org/apache/juneau/urlencoding/UrlEncodingSerializer.java | 1 +
.../src/main/java/org/apache/juneau/xml/XmlParser.java | 1 +
.../src/main/java/org/apache/juneau/xml/XmlSerializer.java | 1 +
.../src/main/java/org/apache/juneau/rest/client/RestClient.java | 1 +
.../main/java/org/apache/juneau/http/entity/ReaderEntity.java | 1 +
.../java/org/apache/juneau/http/entity/SerializedEntity.java | 2 +-
.../main/java/org/apache/juneau/http/entity/StringEntity.java | 1 +
.../main/java/org/apache/juneau/http/header/ClientVersion.java | 1 -
.../main/java/org/apache/juneau/rest/mock/MockRestClient.java | 1 +
.../java/org/apache/juneau/rest/arg/HttpServletRequestArgs.java | 2 +-
.../java/org/apache/juneau/rest/arg/HttpServletResponseArgs.java | 2 +-
.../main/java/org/apache/juneau/rest/arg/HttpSessionArgs.java | 2 +-
.../main/java/org/apache/juneau/rest/arg/RestContextArgs.java | 2 +-
.../main/java/org/apache/juneau/rest/arg/RestOpContextArgs.java | 2 +-
.../main/java/org/apache/juneau/rest/arg/RestOpSessionArgs.java | 2 +-
.../main/java/org/apache/juneau/rest/arg/RestRequestArgs.java | 2 +-
.../main/java/org/apache/juneau/rest/arg/RestResponseArgs.java | 2 +-
.../main/java/org/apache/juneau/rest/arg/RestSessionArgs.java | 2 +-
.../java/org/apache/juneau/rest/arg/SimpleRestOperationArg.java | 2 +-
.../java/org/apache/juneau/rest/httppart/RequestContent.java | 1 +
.../org/apache/juneau/rest/matcher/ClientVersionMatcher.java | 1 -
.../src/main/java/org/apache/juneau/rest/util/UrlPathMatch.java | 1 +
.../src/test/java/org/apache/juneau/BenchmarkRunner.java | 2 +-
juneau-utest/src/test/java/org/apache/juneau/Version_Test.java | 2 +-
.../test/java/org/apache/juneau/assertions/Assertions_Test.java | 1 +
.../java/org/apache/juneau/assertions/VersionAssertion_Test.java | 9 +++++----
.../org/apache/juneau/common/internal/PathReaderBuilderTest.java | 1 +
.../test/java/org/apache/juneau/internal/VersionRange_Test.java | 1 +
.../src/test/java/org/apache/juneau/utils/SimpleMap_Test.java | 2 +-
.../test/java/org/apache/juneau/utils/WeightedAverageTest.java | 1 +
86 files changed, 91 insertions(+), 44 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 38dfa2a720..08aadbf2eb 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
@@ -21,7 +21,7 @@ import static org.apache.juneau.common.utils.IOUtils.*;
import java.sql.*;
import java.util.*;
-import org.apache.juneau.common.utils.*;
+import org.apache.juneau.common.collections.*;
/**
* Transforms an SQL {@link ResultSet ResultSet} into a list of maps.
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 4e616d8570..3b04306293 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
@@ -23,8 +23,8 @@ import java.time.*;
import java.util.*;
import java.util.stream.*;
-import org.apache.juneau.*;
import org.apache.juneau.common.function.*;
+import org.apache.juneau.common.utils.*;
/**
* Main class for creation of assertions for stand-alone testing.
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentVersionAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentVersionAssertion.java
index 4cf592a801..53ebffa76d 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentVersionAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentVersionAssertion.java
@@ -19,7 +19,7 @@ package org.apache.juneau.assertions;
import java.io.*;
import java.util.function.*;
-import org.apache.juneau.*;
+import org.apache.juneau.common.utils.*;
import org.apache.juneau.serializer.*;
/**
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/VersionAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/VersionAssertion.java
index e01598da87..f34317c4e9 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/VersionAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/VersionAssertion.java
@@ -19,7 +19,7 @@ package org.apache.juneau.assertions;
import java.io.*;
import java.util.function.*;
-import org.apache.juneau.*;
+import org.apache.juneau.common.utils.*;
import org.apache.juneau.serializer.*;
/**
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/SimpleMap.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/SimpleMap.java
similarity index 97%
rename from
juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/SimpleMap.java
rename to
juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/SimpleMap.java
index f0e4335f0f..273afa9fb3 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/SimpleMap.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/SimpleMap.java
@@ -14,12 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.common.utils;
+package org.apache.juneau.common.collections;
import java.lang.reflect.*;
import java.util.*;
+import org.apache.juneau.common.utils.*;
+
/**
* An instance of a <c>Map</c> where the keys and values are simple arrays.
*
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ThrowingConsumer.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/function/ThrowingConsumer.java
similarity index 97%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ThrowingConsumer.java
rename to
juneau-core/juneau-common/src/main/java/org/apache/juneau/common/function/ThrowingConsumer.java
index 454727bb3e..bf5704a41f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ThrowingConsumer.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/function/ThrowingConsumer.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.utils;
+package org.apache.juneau.common.function;
import static org.apache.juneau.common.utils.ThrowableUtils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ThrowingFunction.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/function/ThrowingFunction.java
similarity index 97%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ThrowingFunction.java
rename to
juneau-core/juneau-common/src/main/java/org/apache/juneau/common/function/ThrowingFunction.java
index fdbe0a1325..97b0513a5b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ThrowingFunction.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/function/ThrowingFunction.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.utils;
+package org.apache.juneau.common.function;
import static org.apache.juneau.common.utils.ThrowableUtils.*;
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/CharSequenceReader.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/io/CharSequenceReader.java
similarity index 98%
rename from
juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/CharSequenceReader.java
rename to
juneau-core/juneau-common/src/main/java/org/apache/juneau/common/io/CharSequenceReader.java
index d4680eaae8..d11faa0706 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/CharSequenceReader.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/io/CharSequenceReader.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.common.utils;
+package org.apache.juneau.common.io;
import java.io.*;
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/FileReaderBuilder.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/io/FileReaderBuilder.java
similarity index 98%
rename from
juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/FileReaderBuilder.java
rename to
juneau-core/juneau-common/src/main/java/org/apache/juneau/common/io/FileReaderBuilder.java
index f390deeea5..44b8b34616 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/FileReaderBuilder.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/io/FileReaderBuilder.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.common.utils;
+package org.apache.juneau.common.io;
import java.io.*;
import java.nio.charset.*;
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/FileWriterBuilder.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/io/FileWriterBuilder.java
similarity index 98%
rename from
juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/FileWriterBuilder.java
rename to
juneau-core/juneau-common/src/main/java/org/apache/juneau/common/io/FileWriterBuilder.java
index e3e0fbea62..7a28b44bbe 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/FileWriterBuilder.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/io/FileWriterBuilder.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.common.utils;
+package org.apache.juneau.common.io;
import java.io.*;
import java.nio.charset.*;
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/NoCloseOutputStream.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/io/NoCloseOutputStream.java
similarity index 97%
rename from
juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/NoCloseOutputStream.java
rename to
juneau-core/juneau-common/src/main/java/org/apache/juneau/common/io/NoCloseOutputStream.java
index 8d75d0b139..8bd3950944 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/NoCloseOutputStream.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/io/NoCloseOutputStream.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.common.utils;
+package org.apache.juneau.common.io;
import java.io.*;
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/NoCloseWriter.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/io/NoCloseWriter.java
similarity index 98%
rename from
juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/NoCloseWriter.java
rename to
juneau-core/juneau-common/src/main/java/org/apache/juneau/common/io/NoCloseWriter.java
index f761abc566..5ba02afeab 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/NoCloseWriter.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/io/NoCloseWriter.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.common.utils;
+package org.apache.juneau.common.io;
import java.io.*;
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/PathReaderBuilder.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/io/PathReaderBuilder.java
similarity index 98%
rename from
juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/PathReaderBuilder.java
rename to
juneau-core/juneau-common/src/main/java/org/apache/juneau/common/io/PathReaderBuilder.java
index f5af1d9a65..fe4072be35 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/PathReaderBuilder.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/io/PathReaderBuilder.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.common.utils;
+package org.apache.juneau.common.io;
import static java.util.Optional.*;
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/ReaderInputStream.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/io/ReaderInputStream.java
similarity index 99%
rename from
juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/ReaderInputStream.java
rename to
juneau-core/juneau-common/src/main/java/org/apache/juneau/common/io/ReaderInputStream.java
index 1913f0d530..dee48a81e4 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/ReaderInputStream.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/io/ReaderInputStream.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.common.utils;
+package org.apache.juneau.common.io;
import java.io.*;
import java.nio.*;
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/ThrowingSupplier.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/reflect/ThrowingSupplier.java
similarity index 96%
rename from
juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/ThrowingSupplier.java
rename to
juneau-core/juneau-common/src/main/java/org/apache/juneau/common/reflect/ThrowingSupplier.java
index 61423141d9..6894958eec 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/ThrowingSupplier.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/reflect/ThrowingSupplier.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.common.utils;
+package org.apache.juneau.common.reflect;
/**
* A supplier that throws an exception.
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/IOUtils.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/IOUtils.java
index 40f4378fbe..e21a0c3cb9 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/IOUtils.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/IOUtils.java
@@ -23,6 +23,8 @@ import java.util.*;
import java.util.concurrent.atomic.*;
import java.util.function.*;
+import org.apache.juneau.common.io.*;
+
/**
* Various I/O related utility methods.
*/
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/Utils.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/Utils.java
index ad615d619c..4bba1e2b42 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/Utils.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/Utils.java
@@ -31,6 +31,7 @@ import java.util.stream.*;
import org.apache.juneau.common.collections.*;
import org.apache.juneau.common.function.*;
+import org.apache.juneau.common.reflect.*;
/**
* Common utility methods.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Version.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/Version.java
similarity index 99%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Version.java
rename to
juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/Version.java
index 37264d8d39..86416f8767 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Version.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/Version.java
@@ -14,12 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau;
+package org.apache.juneau.common.utils;
import java.util.*;
-import org.apache.juneau.common.utils.*;
-
/**
* Represents a version string such as <js>"1.2"</js> or <js>"1.2.3"</js>
*
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/VersionRange.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/VersionRange.java
similarity index 96%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/VersionRange.java
rename to
juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/VersionRange.java
index 8fa2a377b9..0ab1862abb 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/VersionRange.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/VersionRange.java
@@ -14,10 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.internal;
-
-import org.apache.juneau.*;
-import org.apache.juneau.common.utils.*;
+package org.apache.juneau.common.utils;
/**
* Represents an OSGi-style version range like <js>"1.2"</js> or
<js>"[1.0,2.0)"</js>.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/WeightedAverage.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/WeightedAverage.java
similarity index 97%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/WeightedAverage.java
rename to
juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/WeightedAverage.java
index f136742edd..ead0732056 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/WeightedAverage.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/WeightedAverage.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.utils;
+package org.apache.juneau.common.utils;
/**
* A simple weighted average of numbers.
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
index c0210acd13..638f0c1dc2 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
@@ -27,6 +27,7 @@ import java.util.concurrent.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.common.collections.*;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.jena.annotation.*;
import org.apache.juneau.parser.*;
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
index 85a45c61db..72801a2578 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
@@ -27,6 +27,7 @@ import java.util.concurrent.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.common.collections.*;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.common.utils.*;
import org.apache.juneau.jena.annotation.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
index fce11152ad..5472f9df25 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
@@ -32,6 +32,7 @@ import java.util.stream.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.common.collections.*;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.common.reflect.Visibility;
import org.apache.juneau.common.utils.*;
import org.apache.juneau.cp.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextable.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextable.java
index 0083f51249..2f1fa557e6 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextable.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextable.java
@@ -28,6 +28,7 @@ import java.util.function.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.common.collections.*;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.common.reflect.Visibility;
import org.apache.juneau.swap.*;
import org.apache.juneau.utils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseContext.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseContext.java
index 0a498f139b..3980e57927 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseContext.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseContext.java
@@ -24,6 +24,7 @@ import java.util.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.common.collections.*;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.utils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParser.java
index abadea2fa5..49175fc1dd 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParser.java
@@ -23,6 +23,7 @@ import java.util.concurrent.*;
import org.apache.juneau.*;
import org.apache.juneau.common.collections.*;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.utils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializer.java
index fa5218bad2..ccbc32a169 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializer.java
@@ -23,6 +23,7 @@ import java.util.concurrent.*;
import org.apache.juneau.*;
import org.apache.juneau.common.collections.*;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.serializer.*;
import org.apache.juneau.utils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
index fede1eb983..f926303f66 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
@@ -29,6 +29,7 @@ import java.util.regex.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.common.collections.*;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.common.utils.*;
import org.apache.juneau.svl.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParser.java
index 128e48df52..c44dc378a5 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParser.java
@@ -23,6 +23,7 @@ import java.util.concurrent.*;
import org.apache.juneau.*;
import org.apache.juneau.common.collections.*;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.utils.*;
import org.apache.juneau.xml.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java
index 1ff1aee872..f57e89fa9a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java
@@ -23,6 +23,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.common.collections.*;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.json.*;
import org.apache.juneau.jsonschema.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializer.java
index 6bfb043cd3..8d3418717b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializer.java
@@ -26,6 +26,7 @@ import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.common.collections.*;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.json.*;
import org.apache.juneau.jsonschema.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
index 1b856ec23b..f843be600f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
@@ -27,6 +27,7 @@ import java.util.concurrent.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.common.collections.*;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.html.annotation.*;
import org.apache.juneau.serializer.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializer.java
index 593ecaec5e..5d207cf4a3 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializer.java
@@ -22,6 +22,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.common.collections.*;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.utils.*;
import org.apache.juneau.xml.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java
index 0ef67219d5..2049e6cdb1 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java
@@ -26,6 +26,7 @@ import java.util.concurrent.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.common.collections.*;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.utils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
index dc9d567ac7..1d55108a8a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
@@ -27,6 +27,7 @@ import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.common.collections.*;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.jsonschema.*;
import org.apache.juneau.utils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
index ef9dbdd0f2..578c778c93 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
@@ -27,6 +27,7 @@ import java.util.concurrent.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.common.collections.*;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.serializer.*;
import org.apache.juneau.utils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
index 8f4e2c4726..468667d922 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
@@ -30,6 +30,7 @@ import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.common.collections.*;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.common.utils.*;
import org.apache.juneau.json.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
index c06a7bc1b8..ad3f714749 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
@@ -22,6 +22,7 @@ import java.util.concurrent.*;
import org.apache.juneau.*;
import org.apache.juneau.common.collections.*;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.utils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
index dc100f3e18..664df95cc7 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
@@ -26,6 +26,7 @@ import java.util.concurrent.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.common.collections.*;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.serializer.*;
import org.apache.juneau.utils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParser.java
index 1d49e1b485..3463e8fcb5 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParser.java
@@ -24,6 +24,7 @@ import java.util.concurrent.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.common.collections.*;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.uon.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializer.java
index eeacc8a4e6..0ff921aa7a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializer.java
@@ -24,6 +24,7 @@ import java.util.concurrent.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.common.collections.*;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.uon.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParser.java
index 9e5301e123..d694b37f4e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParser.java
@@ -25,6 +25,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.common.collections.*;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.utils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java
index 1bfa71d8c3..a95c75a740 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java
@@ -28,6 +28,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.common.collections.*;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.common.utils.*;
import org.apache.juneau.html.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserReader.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserReader.java
index 90b1ac2ac8..bc93503db9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserReader.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserReader.java
@@ -18,6 +18,7 @@ package org.apache.juneau.parser;
import java.io.*;
+import org.apache.juneau.common.io.*;
import org.apache.juneau.common.utils.*;
/**
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 ee8fd6fb85..de01f29cce 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
@@ -26,6 +26,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.common.collections.*;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.common.utils.*;
import org.apache.juneau.utils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java
index 4d28996cf9..024198e6d1 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java
@@ -23,6 +23,7 @@ import java.util.concurrent.*;
import org.apache.juneau.*;
import org.apache.juneau.common.collections.*;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.swap.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java
index 834eea5b18..3d09c700d3 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java
@@ -23,6 +23,7 @@ import java.util.concurrent.*;
import org.apache.juneau.*;
import org.apache.juneau.common.collections.*;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.serializer.*;
import org.apache.juneau.swap.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializer.java
index 0f28e81a7e..8f9a59e96a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializer.java
@@ -25,6 +25,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.common.collections.*;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.utils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
index 8ac09e5d5c..0fb18b3d87 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
@@ -28,6 +28,7 @@ import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.common.collections.*;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.common.utils.*;
import org.apache.juneau.soap.*;
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 80b43aae0e..4463db774d 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
@@ -23,6 +23,7 @@ import java.io.*;
import java.nio.charset.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.io.*;
import org.apache.juneau.common.utils.*;
import org.apache.juneau.internal.*;
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 12a5d72e33..446a465c02 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
@@ -27,6 +27,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.common.collections.*;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.common.utils.*;
import org.apache.juneau.json.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java
index 4d8bcbea3f..4a9bdd6d47 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java
@@ -26,6 +26,7 @@ import java.util.concurrent.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.common.collections.*;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.utils.*;
import org.apache.juneau.xml.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/FunctionalSwap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/FunctionalSwap.java
index e2e2f2cefc..7ae7a5ee1a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/FunctionalSwap.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/FunctionalSwap.java
@@ -17,7 +17,7 @@
package org.apache.juneau.swap;
import org.apache.juneau.*;
-import org.apache.juneau.utils.*;
+import org.apache.juneau.common.function.*;
/**
* A subclass of {@link ObjectSwap} that allows swap and unswap methods to be
defined as functions.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java
index 271a0ec32f..42cf5a5f52 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java
@@ -28,6 +28,7 @@ import java.util.concurrent.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.common.collections.*;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.parser.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
index fc79c27b3f..dd4d6c0321 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
@@ -27,6 +27,7 @@ import java.util.concurrent.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.common.collections.*;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.serializer.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
index 36aa095a0f..cd62dc6831 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
@@ -27,6 +27,7 @@ import java.util.concurrent.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.common.collections.*;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.uon.*;
import org.apache.juneau.utils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
index 162889cfea..cdfbf16dc9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
@@ -27,6 +27,7 @@ import java.util.concurrent.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.common.collections.*;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.uon.*;
import org.apache.juneau.utils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
index bb8e320e5a..83d9bfd7d6 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
@@ -31,6 +31,7 @@ import javax.xml.stream.util.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.common.collections.*;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.utils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
index 0926b0b25d..3ffbab0441 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
@@ -27,6 +27,7 @@ import java.util.concurrent.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.common.collections.*;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.common.utils.*;
import org.apache.juneau.json.*;
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
index 9ba203f500..9510501f3d 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
@@ -66,6 +66,7 @@ import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.common.collections.*;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.common.utils.*;
import org.apache.juneau.cp.*;
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 000bbc8610..34eeab89d2 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
@@ -23,6 +23,7 @@ import java.nio.charset.*;
import java.util.*;
import java.util.function.*;
+import org.apache.juneau.common.io.*;
import org.apache.juneau.common.utils.*;
import org.apache.juneau.http.header.*;
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 05b045b67b..3be2f54514 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
@@ -26,7 +26,7 @@ import java.util.function.*;
import org.apache.http.*;
import org.apache.juneau.*;
-import org.apache.juneau.common.utils.*;
+import org.apache.juneau.common.io.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.serializer.*;
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 522f237339..082806a619 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
@@ -22,6 +22,7 @@ import java.io.*;
import java.nio.charset.*;
import java.util.function.*;
+import org.apache.juneau.common.io.*;
import org.apache.juneau.common.utils.*;
import org.apache.juneau.http.header.*;
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/ClientVersion.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/ClientVersion.java
index e016fcb469..5feba03504 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/ClientVersion.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/ClientVersion.java
@@ -19,7 +19,6 @@ package org.apache.juneau.http.header;
import java.util.*;
import java.util.function.*;
-import org.apache.juneau.*;
import org.apache.juneau.assertions.*;
import org.apache.juneau.common.collections.*;
import org.apache.juneau.common.utils.*;
diff --git
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
index a142e3b9ce..fbbe7d4fac 100644
---
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
+++
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
@@ -51,6 +51,7 @@ import org.apache.http.message.*;
import org.apache.http.protocol.*;
import org.apache.juneau.*;
import org.apache.juneau.common.collections.*;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.common.utils.*;
import org.apache.juneau.http.header.ContentType;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HttpServletRequestArgs.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HttpServletRequestArgs.java
index 13c608fc1f..f62e6f985c 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HttpServletRequestArgs.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HttpServletRequestArgs.java
@@ -18,9 +18,9 @@ package org.apache.juneau.rest.arg;
import java.security.*;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.utils.*;
import jakarta.servlet.*;
import jakarta.servlet.http.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HttpServletResponseArgs.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HttpServletResponseArgs.java
index 5d1de72551..03a8149090 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HttpServletResponseArgs.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HttpServletResponseArgs.java
@@ -16,9 +16,9 @@
*/
package org.apache.juneau.rest.arg;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.utils.*;
import jakarta.servlet.http.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HttpSessionArgs.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HttpSessionArgs.java
index 7eba8311ff..3d933a016c 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HttpSessionArgs.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HttpSessionArgs.java
@@ -16,9 +16,9 @@
*/
package org.apache.juneau.rest.arg;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.utils.*;
import jakarta.servlet.http.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestContextArgs.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestContextArgs.java
index 22d6eda20e..1b35ab6e5f 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestContextArgs.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestContextArgs.java
@@ -19,6 +19,7 @@ package org.apache.juneau.rest.arg;
import java.util.logging.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.config.*;
import org.apache.juneau.cp.*;
import org.apache.juneau.encoders.*;
@@ -29,7 +30,6 @@ import org.apache.juneau.rest.debug.*;
import org.apache.juneau.rest.logger.*;
import org.apache.juneau.rest.staticfile.*;
import org.apache.juneau.rest.stats.*;
-import org.apache.juneau.utils.*;
/**
* Resolves method parameters on {@link RestOp}-annotated Java methods of
types found on the {@link RestContext} object.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpContextArgs.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpContextArgs.java
index c376daa465..3feeb0afaa 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpContextArgs.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpContextArgs.java
@@ -16,13 +16,13 @@
*/
package org.apache.juneau.rest.arg;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.jsonschema.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.serializer.*;
-import org.apache.juneau.utils.*;
/**
* Resolves method parameters on {@link RestOp}-annotated Java methods of
types found on the {@link RestOpContext} object.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpSessionArgs.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpSessionArgs.java
index 4fa05bd546..42e3c4e39e 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpSessionArgs.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpSessionArgs.java
@@ -16,11 +16,11 @@
*/
package org.apache.juneau.rest.arg;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.cp.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.utils.*;
/**
* Resolves method parameters on {@link RestOp}-annotated Java methods of
types found on the {@link RestOpSession} object.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestRequestArgs.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestRequestArgs.java
index 7f33df3f53..ea26c164ac 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestRequestArgs.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestRequestArgs.java
@@ -21,6 +21,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.bean.swagger.Swagger;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.cp.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.reflect.*;
@@ -28,7 +29,6 @@ import org.apache.juneau.rest.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.httppart.*;
import org.apache.juneau.svl.*;
-import org.apache.juneau.utils.*;
import jakarta.servlet.*;
import jakarta.servlet.http.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestResponseArgs.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestResponseArgs.java
index b6b65ac715..7627f4f6d5 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestResponseArgs.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestResponseArgs.java
@@ -18,10 +18,10 @@ package org.apache.juneau.rest.arg;
import java.io.*;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.utils.*;
import jakarta.servlet.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestSessionArgs.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestSessionArgs.java
index 2b665e4898..ca9c93a388 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestSessionArgs.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestSessionArgs.java
@@ -16,11 +16,11 @@
*/
package org.apache.juneau.rest.arg;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.util.*;
-import org.apache.juneau.utils.*;
/**
* Resolves method parameters on {@link RestOp}-annotated Java methods of
types found on the {@link RestSession} object.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/SimpleRestOperationArg.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/SimpleRestOperationArg.java
index d4e09761de..c6c335a92b 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/SimpleRestOperationArg.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/SimpleRestOperationArg.java
@@ -18,8 +18,8 @@ package org.apache.juneau.rest.arg;
import java.util.function.*;
+import org.apache.juneau.common.function.*;
import org.apache.juneau.rest.*;
-import org.apache.juneau.utils.*;
/**
* An implementation of a {@link RestOpArg} that takes in a {@link
ThrowingFunction} for resolving a parameter value.
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 82b75b6088..3c83f69db8 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
@@ -26,6 +26,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
+import org.apache.juneau.common.io.*;
import org.apache.juneau.common.utils.*;
import org.apache.juneau.encoders.*;
import org.apache.juneau.http.header.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/matcher/ClientVersionMatcher.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/matcher/ClientVersionMatcher.java
index 7c948edb35..7094d15de7 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/matcher/ClientVersionMatcher.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/matcher/ClientVersionMatcher.java
@@ -21,7 +21,6 @@ import static
org.apache.juneau.rest.annotation.RestOpAnnotation.*;
import org.apache.juneau.common.collections.*;
import org.apache.juneau.common.utils.*;
-import org.apache.juneau.internal.*;
import org.apache.juneau.reflect.*;
import jakarta.servlet.http.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/UrlPathMatch.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/UrlPathMatch.java
index 82283bd1a0..55c77e432c 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/UrlPathMatch.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/UrlPathMatch.java
@@ -21,6 +21,7 @@ import static org.apache.juneau.common.utils.Utils.*;
import java.util.*;
+import org.apache.juneau.common.collections.*;
import org.apache.juneau.common.utils.*;
/**
diff --git a/juneau-utest/src/test/java/org/apache/juneau/BenchmarkRunner.java
b/juneau-utest/src/test/java/org/apache/juneau/BenchmarkRunner.java
index 3b82cfde78..38b09258c7 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/BenchmarkRunner.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/BenchmarkRunner.java
@@ -21,7 +21,7 @@ import java.util.Map.*;
import java.util.concurrent.*;
import java.util.function.*;
-import org.apache.juneau.utils.*;
+import org.apache.juneau.common.function.*;
import org.openjdk.jmh.annotations.*;
import org.openjdk.jmh.infra.*;
import org.openjdk.jmh.runner.*;
diff --git a/juneau-utest/src/test/java/org/apache/juneau/Version_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/Version_Test.java
index dd1b075e1c..dd498785cd 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/Version_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/Version_Test.java
@@ -17,8 +17,8 @@
package org.apache.juneau;
import static org.apache.juneau.TestUtils.*;
-import static org.apache.juneau.Version.*;
import static org.apache.juneau.common.utils.Utils.*;
+import static org.apache.juneau.common.utils.Version.*;
import static org.junit.jupiter.api.Assertions.*;
import java.util.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/Assertions_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/Assertions_Test.java
index 38405cb81e..f0a9082a5f 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/Assertions_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/Assertions_Test.java
@@ -30,6 +30,7 @@ import java.time.*;
import java.util.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.utils.*;
import org.apache.juneau.testutils.pojos.*;
import org.junit.jupiter.api.*;
import org.junit.jupiter.api.MethodOrderer.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/VersionAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/VersionAssertion_Test.java
index 4b8e599744..8537c1f6c1 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/VersionAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/VersionAssertion_Test.java
@@ -16,13 +16,14 @@
*/
package org.apache.juneau.assertions;
-import static org.apache.juneau.Version.*;
import static org.apache.juneau.assertions.AssertionPredicates.ne;
import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.common.utils.Utils.*;
+import static org.apache.juneau.common.utils.Version.*;
import static org.junit.jupiter.api.Assertions.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.utils.*;
import org.apache.juneau.json.*;
import org.junit.jupiter.api.*;
@@ -259,7 +260,7 @@ class VersionAssertion_Test extends TestBase {
var nil = n(Version.class);
test(x).isType(Version.class);
test(x).isType(Object.class);
-
assertThrown(()->test(x).isType(String.class)).asMessage().asOneLine().is("Unexpected
type. Expect='java.lang.String'. Actual='org.apache.juneau.Version'.");
+
assertThrown(()->test(x).isType(String.class)).asMessage().asOneLine().is("Unexpected
type. Expect='java.lang.String'.
Actual='org.apache.juneau.common.utils.Version'.");
assertThrown(()->test(nil).isType(String.class)).asMessage().asOneLine().is("Value
was null.");
assertThrown(()->test(x).isType(null)).asMessage().asOneLine().is("Argument
'parent' cannot be null.");
}
@@ -268,8 +269,8 @@ class VersionAssertion_Test extends TestBase {
var x = of("1");
var nil = n(Version.class);
test(x).isExactType(Version.class);
-
assertThrown(()->test(x).isExactType(Object.class)).asMessage().asOneLine().is("Unexpected
type. Expect='java.lang.Object'. Actual='org.apache.juneau.Version'.");
-
assertThrown(()->test(x).isExactType(String.class)).asMessage().asOneLine().is("Unexpected
type. Expect='java.lang.String'. Actual='org.apache.juneau.Version'.");
+
assertThrown(()->test(x).isExactType(Object.class)).asMessage().asOneLine().is("Unexpected
type. Expect='java.lang.Object'.
Actual='org.apache.juneau.common.utils.Version'.");
+
assertThrown(()->test(x).isExactType(String.class)).asMessage().asOneLine().is("Unexpected
type. Expect='java.lang.String'.
Actual='org.apache.juneau.common.utils.Version'.");
assertThrown(()->test(nil).isExactType(String.class)).asMessage().asOneLine().is("Value
was null.");
assertThrown(()->test(x).isExactType(null)).asMessage().asOneLine().is("Argument
'parent' cannot be null.");
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/common/internal/PathReaderBuilderTest.java
b/juneau-utest/src/test/java/org/apache/juneau/common/internal/PathReaderBuilderTest.java
index 39d2222b60..570887e4a3 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/common/internal/PathReaderBuilderTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/common/internal/PathReaderBuilderTest.java
@@ -25,6 +25,7 @@ import java.nio.file.*;
import java.util.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.io.*;
import org.apache.juneau.common.utils.*;
import org.junit.jupiter.api.*;
/**
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/internal/VersionRange_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/internal/VersionRange_Test.java
index 576d038b63..0309325fcb 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/internal/VersionRange_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/internal/VersionRange_Test.java
@@ -19,6 +19,7 @@ package org.apache.juneau.internal;
import static org.junit.jupiter.api.Assertions.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.utils.*;
import org.junit.jupiter.params.*;
import org.junit.jupiter.params.provider.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/utils/SimpleMap_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/utils/SimpleMap_Test.java
index 77fb56572c..9af2f0a9a3 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/utils/SimpleMap_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/utils/SimpleMap_Test.java
@@ -21,7 +21,7 @@ import static org.apache.juneau.common.utils.Utils.*;
import static org.junit.jupiter.api.Assertions.*;
import org.apache.juneau.*;
-import org.apache.juneau.common.utils.*;
+import org.apache.juneau.common.collections.*;
import org.junit.jupiter.api.*;
class SimpleMap_Test extends TestBase {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/utils/WeightedAverageTest.java
b/juneau-utest/src/test/java/org/apache/juneau/utils/WeightedAverageTest.java
index 075fc48c13..46f84a05ea 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/utils/WeightedAverageTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/utils/WeightedAverageTest.java
@@ -19,6 +19,7 @@ package org.apache.juneau.utils;
import static org.junit.jupiter.api.Assertions.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.utils.*;
import org.junit.jupiter.api.*;
class WeightedAverageTest extends TestBase {
