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 3b81284094 juneau-commons improvements
3b81284094 is described below
commit 3b81284094644648d5449143bd32004e42e30eff
Author: James Bognar <[email protected]>
AuthorDate: Tue Dec 23 09:58:15 2025 -0500
juneau-commons improvements
---
.../src/main/java/org/apache/juneau/assertions/Assertions.java | 2 +-
.../org/apache/juneau/assertions/FluentVersionAssertion.java | 2 +-
.../java/org/apache/juneau/assertions/VersionAssertion.java | 2 +-
.../juneau/commons/{utils => concurrent}/SimpleLock.java | 2 +-
.../commons/{utils => concurrent}/SimpleReadWriteLock.java | 2 +-
.../apache/juneau/commons/{utils => conversion}/Converter.java | 2 +-
.../main/java/org/apache/juneau/commons/function/Tuple1.java | 2 +-
.../main/java/org/apache/juneau/commons/function/Tuple2.java | 2 +-
.../main/java/org/apache/juneau/commons/function/Tuple3.java | 2 +-
.../main/java/org/apache/juneau/commons/function/Tuple4.java | 2 +-
.../main/java/org/apache/juneau/commons/function/Tuple5.java | 2 +-
.../java/org/apache/juneau/commons/{utils => io}/Console.java | 2 +-
.../apache/juneau/commons/{utils => io}/MimeTypeDetector.java | 2 +-
.../org/apache/juneau/commons/{utils => lang}/AsciiMap.java | 2 +-
.../org/apache/juneau/commons/{utils => lang}/AsciiSet.java | 2 +-
.../juneau/commons/{collections => lang}/BooleanValue.java | 2 +-
.../apache/juneau/commons/{collections => lang}/ByteValue.java | 2 +-
.../apache/juneau/commons/{collections => lang}/CharValue.java | 2 +-
.../juneau/commons/{collections => lang}/DoubleValue.java | 2 +-
.../org/apache/juneau/commons/{collections => lang}/Flag.java | 2 +-
.../juneau/commons/{collections => lang}/FloatValue.java | 2 +-
.../org/apache/juneau/commons/{utils => lang}/HashCode.java | 4 +++-
.../juneau/commons/{collections => lang}/IntegerValue.java | 2 +-
.../apache/juneau/commons/{collections => lang}/LongValue.java | 2 +-
.../juneau/commons/{collections => lang}/ShortValue.java | 2 +-
.../org/apache/juneau/commons/{utils => lang}/StateEnum.java | 2 +-
.../apache/juneau/commons/{utils => lang}/StringFormat.java | 5 +++--
.../juneau/commons/{collections => lang}/StringValue.java | 2 +-
.../org/apache/juneau/commons/{collections => lang}/Value.java | 2 +-
.../juneau/commons/{collections => lang}/ValueListener.java | 2 +-
.../org/apache/juneau/commons/{utils => lang}/Version.java | 2 +-
.../apache/juneau/commons/{utils => lang}/VersionRange.java | 2 +-
.../apache/juneau/commons/{utils => lang}/WeightedAverage.java | 2 +-
.../org/apache/juneau/commons/reflect/AnnotationProvider.java | 1 +
.../main/java/org/apache/juneau/commons/reflect/ClassInfo.java | 1 +
.../org/apache/juneau/commons/time/GranularZonedDateTime.java | 2 +-
.../main/java/org/apache/juneau/commons/utils/ClassUtils.java | 1 +
.../main/java/org/apache/juneau/commons/utils/StringUtils.java | 3 ++-
.../src/main/java/org/apache/juneau/commons/utils/Utils.java | 2 +-
.../main/java/org/apache/juneau/config/internal/ConfigMap.java | 3 ++-
.../java/org/apache/juneau/config/internal/ConfigMapEntry.java | 2 +-
.../src/main/java/org/apache/juneau/BeanMeta.java | 1 +
.../src/main/java/org/apache/juneau/BeanPropertyMeta.java | 1 +
.../src/main/java/org/apache/juneau/BeanSession.java | 2 +-
.../src/main/java/org/apache/juneau/cp/BeanCreator.java | 2 +-
.../src/main/java/org/apache/juneau/cp/BeanStore.java | 2 +-
.../main/java/org/apache/juneau/csv/CsvSerializerSession.java | 2 +-
.../main/java/org/apache/juneau/html/BasicHtmlDocTemplate.java | 2 +-
.../src/main/java/org/apache/juneau/html/HtmlClassMeta.java | 2 +-
.../main/java/org/apache/juneau/html/HtmlParserSession.java | 2 +-
.../java/org/apache/juneau/html/HtmlSerializerSession.java | 2 +-
.../java/org/apache/juneau/http/annotation/StatusCode.java | 2 +-
.../main/java/org/apache/juneau/httppart/HttpPartSchema.java | 1 +
.../java/org/apache/juneau/httppart/bean/ResponseBeanMeta.java | 2 +-
.../src/main/java/org/apache/juneau/json/JsonClassMeta.java | 2 +-
.../main/java/org/apache/juneau/json/JsonParserSession.java | 3 ++-
.../java/org/apache/juneau/json/JsonSerializerSession.java | 2 +-
.../src/main/java/org/apache/juneau/json/JsonWriter.java | 2 +-
.../java/org/apache/juneau/oapi/OpenApiSerializerSession.java | 1 +
.../org/apache/juneau/objecttools/NumberMatcherFactory.java | 4 ++--
.../org/apache/juneau/objecttools/StringMatcherFactory.java | 1 +
.../java/org/apache/juneau/objecttools/TimeMatcherFactory.java | 4 ++--
.../main/java/org/apache/juneau/svl/VarResolverSession.java | 4 ++--
.../src/main/java/org/apache/juneau/swap/BuilderSwap.java | 2 +-
.../src/main/java/org/apache/juneau/uon/UonParserSession.java | 3 ++-
.../main/java/org/apache/juneau/uon/UonSerializerSession.java | 2 +-
.../src/main/java/org/apache/juneau/uon/UonUtils.java | 2 +-
.../src/main/java/org/apache/juneau/uon/UonWriter.java | 2 +-
.../org/apache/juneau/urlencoding/UrlEncodingClassMeta.java | 2 +-
.../apache/juneau/urlencoding/UrlEncodingParserSession.java | 2 +-
.../juneau/urlencoding/UrlEncodingSerializerSession.java | 2 +-
.../main/java/org/apache/juneau/utils/GenericConverter.java | 2 +-
.../java/org/apache/juneau/utils/StringExpressionMatcher.java | 3 ++-
.../src/main/java/org/apache/juneau/xml/XmlBeanMeta.java | 2 +-
.../main/java/org/apache/juneau/xml/XmlSerializerSession.java | 2 +-
.../src/main/java/org/apache/juneau/xml/XmlUtils.java | 2 +-
.../juneau/microservice/resources/LogEntryFormatter.java | 2 +-
.../java/org/apache/juneau/rest/client/ResponseHeader.java | 2 +-
.../main/java/org/apache/juneau/rest/client/RestClient.java | 2 +-
.../apache/juneau/rest/client/remote/RemoteOperationMeta.java | 2 +-
.../juneau/rest/client/remote/RemoteOperationReturn.java | 2 +-
.../src/main/java/org/apache/juneau/http/HttpHeaders.java | 2 +-
.../src/main/java/org/apache/juneau/http/HttpParts.java | 2 +-
.../main/java/org/apache/juneau/http/header/ClientVersion.java | 2 +-
.../java/org/apache/juneau/http/remote/RrpcInterfaceMeta.java | 2 +-
.../java/org/apache/juneau/rest/mock/MockPathResolver.java | 4 ++--
.../src/main/java/org/apache/juneau/rest/RestContext.java | 1 +
.../src/main/java/org/apache/juneau/rest/RestOpContext.java | 1 +
.../src/main/java/org/apache/juneau/rest/RestSession.java | 2 +-
.../src/main/java/org/apache/juneau/rest/arg/HeaderArg.java | 2 +-
.../main/java/org/apache/juneau/rest/arg/ResponseBeanArg.java | 2 +-
.../main/java/org/apache/juneau/rest/arg/ResponseCodeArg.java | 2 +-
.../java/org/apache/juneau/rest/arg/ResponseHeaderArg.java | 2 +-
.../main/java/org/apache/juneau/rest/converter/Queryable.java | 2 +-
.../main/java/org/apache/juneau/rest/guard/RoleMatcher.java | 3 ++-
.../org/apache/juneau/rest/httppart/RequestFormParams.java | 1 +
.../java/org/apache/juneau/rest/httppart/RequestHeaders.java | 1 +
.../org/apache/juneau/rest/httppart/RequestPathParams.java | 1 +
.../org/apache/juneau/rest/httppart/RequestQueryParams.java | 1 +
.../org/apache/juneau/rest/matcher/ClientVersionMatcher.java | 3 +--
.../org/apache/juneau/rest/staticfile/BasicStaticFiles.java | 2 +-
.../java/org/apache/juneau/rest/staticfile/StaticFiles.java | 2 +-
.../juneau/rest/swagger/BasicSwaggerProviderSession.java | 2 +-
.../src/main/java/org/apache/juneau/rest/util/RestUtils.java | 2 +-
.../java/org/apache/juneau/assertions/Assertions_Test.java | 2 +-
.../org/apache/juneau/assertions/VersionAssertion_Test.java | 10 +++++-----
.../java/org/apache/juneau/commons/collections/Lists_Test.java | 6 +++---
.../java/org/apache/juneau/commons/collections/Sets_Test.java | 6 +++---
.../{utils => concurrent}/SimpleReadWriteLock_Test.java | 2 +-
.../org/apache/juneau/commons/{utils => io}/Console_Test.java | 2 +-
.../juneau/commons/{utils => io}/MimeTypeDetector_Test.java | 2 +-
.../apache/juneau/commons/{utils => lang}/AsciiMap_Test.java | 2 +-
.../apache/juneau/commons/{utils => lang}/AsciiSet_Test.java | 2 +-
.../commons/{collections => lang}/BooleanValue_Test.java | 2 +-
.../juneau/commons/{collections => lang}/ByteValue_Test.java | 2 +-
.../juneau/commons/{collections => lang}/CharValue_Test.java | 2 +-
.../juneau/commons/{collections => lang}/DoubleValue_Test.java | 2 +-
.../apache/juneau/commons/{collections => lang}/Flag_Test.java | 2 +-
.../juneau/commons/{collections => lang}/FloatValue_Test.java | 2 +-
.../apache/juneau/commons/{utils => lang}/HashCode_Test.java | 2 +-
.../commons/{collections => lang}/IntegerValue_Test.java | 2 +-
.../juneau/commons/{collections => lang}/LongValue_Test.java | 2 +-
.../juneau/commons/{collections => lang}/ShortValue_Test.java | 2 +-
.../apache/juneau/commons/{utils => lang}/StateEnum_Test.java | 4 ++--
.../juneau/commons/{utils => lang}/StringFormat_Test.java | 2 +-
.../juneau/commons/{collections => lang}/StringValue_Test.java | 2 +-
.../juneau/commons/{collections => lang}/Value_Test.java | 2 +-
.../juneau/commons/{utils => lang}/VersionRange_Test.java | 2 +-
.../apache/juneau/commons/{utils => lang}/Version_Test.java | 4 ++--
.../juneau/commons/{utils => lang}/WeightedAverage_Test.java | 2 +-
.../java/org/apache/juneau/commons/reflect/ClassInfo_Test.java | 2 +-
.../java/org/apache/juneau/commons/utils/StringUtils_Test.java | 1 +
.../test/java/org/apache/juneau/commons/utils/Utils_Test.java | 2 +-
.../src/test/java/org/apache/juneau/http/BasicHeader_Test.java | 2 +-
.../java/org/apache/juneau/http/header/ClientVersion_Test.java | 2 +-
.../src/test/java/org/apache/juneau/rest/Swagger_Test.java | 2 +-
.../org/apache/juneau/rest/annotation/ResponseHeader_Test.java | 2 +-
.../org/apache/juneau/rest/annotation/ResponseStatus_Test.java | 2 +-
.../java/org/apache/juneau/rest/annotation/Response_Test.java | 2 +-
.../apache/juneau/rest/annotation/Swagger_Response_Test.java | 2 +-
.../juneau/rest/client/RestClient_Response_Headers_Test.java | 2 +-
.../test/java/org/apache/juneau/utils/WeightedAverageTest.java | 2 +-
142 files changed, 166 insertions(+), 143 deletions(-)
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 c6b8997d2c..0b6dc709e4 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
@@ -24,7 +24,7 @@ import java.util.*;
import java.util.stream.*;
import org.apache.juneau.commons.function.*;
-import org.apache.juneau.commons.utils.*;
+import org.apache.juneau.commons.lang.*;
/**
* 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 3a9976bd1e..7a7c0d77cf 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.commons.utils.*;
+import org.apache.juneau.commons.lang.*;
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 f21c17bff1..02ab38d432 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.commons.utils.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.serializer.*;
/**
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/SimpleLock.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/concurrent/SimpleLock.java
similarity index 96%
rename from
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/SimpleLock.java
rename to
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/concurrent/SimpleLock.java
index 5fb80736a6..cb5c0fdcdb 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/SimpleLock.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/concurrent/SimpleLock.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.utils;
+package org.apache.juneau.commons.concurrent;
import static org.apache.juneau.commons.utils.Utils.*;
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/SimpleReadWriteLock.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/concurrent/SimpleReadWriteLock.java
similarity index 97%
rename from
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/SimpleReadWriteLock.java
rename to
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/concurrent/SimpleReadWriteLock.java
index 4592427172..5d6d222c9d 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/SimpleReadWriteLock.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/concurrent/SimpleReadWriteLock.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.utils;
+package org.apache.juneau.commons.concurrent;
import java.util.concurrent.locks.*;
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/Converter.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/conversion/Converter.java
similarity index 96%
rename from
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/Converter.java
rename to
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/conversion/Converter.java
index 12bf45ec1d..0bcf6da49c 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/Converter.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/conversion/Converter.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.utils;
+package org.apache.juneau.commons.conversion;
/**
* Temporary interface. To be replaced with Mutator once that's part of the
common module.
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/function/Tuple1.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/function/Tuple1.java
index 7edc1872a3..1eb0449583 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/function/Tuple1.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/function/Tuple1.java
@@ -20,7 +20,7 @@ import static org.apache.juneau.commons.utils.Utils.*;
import java.util.Optional;
-import org.apache.juneau.commons.utils.*;
+import org.apache.juneau.commons.lang.*;
/**
* Represents an immutable tuple containing a single value.
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/function/Tuple2.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/function/Tuple2.java
index fcdf0aca1d..00caa64eac 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/function/Tuple2.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/function/Tuple2.java
@@ -20,7 +20,7 @@ import static org.apache.juneau.commons.utils.Utils.*;
import java.util.Optional;
-import org.apache.juneau.commons.utils.*;
+import org.apache.juneau.commons.lang.*;
/**
* Represents an immutable tuple containing two values.
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/function/Tuple3.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/function/Tuple3.java
index c8f151b690..29c98ba3e5 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/function/Tuple3.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/function/Tuple3.java
@@ -20,7 +20,7 @@ import static org.apache.juneau.commons.utils.Utils.*;
import java.util.Optional;
-import org.apache.juneau.commons.utils.*;
+import org.apache.juneau.commons.lang.*;
/**
* Represents a simple tuple of 3 objects.
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/function/Tuple4.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/function/Tuple4.java
index 5a67f01e9f..a88e123d30 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/function/Tuple4.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/function/Tuple4.java
@@ -20,7 +20,7 @@ import static org.apache.juneau.commons.utils.Utils.*;
import java.util.Optional;
-import org.apache.juneau.commons.utils.*;
+import org.apache.juneau.commons.lang.*;
/**
* Represents a simple tuple of 4 objects.
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/function/Tuple5.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/function/Tuple5.java
index 717bf85a13..41cf448310 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/function/Tuple5.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/function/Tuple5.java
@@ -20,7 +20,7 @@ import static org.apache.juneau.commons.utils.Utils.*;
import java.util.Optional;
-import org.apache.juneau.commons.utils.*;
+import org.apache.juneau.commons.lang.*;
/**
* Represents a simple tuple of 5 objects.
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/Console.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/io/Console.java
similarity index 98%
rename from
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/Console.java
rename to
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/io/Console.java
index eeaf864edd..85cf95bf52 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/Console.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/io/Console.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.utils;
+package org.apache.juneau.commons.io;
import static org.apache.juneau.commons.utils.Utils.*;
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/MimeTypeDetector.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/io/MimeTypeDetector.java
similarity index 99%
rename from
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/MimeTypeDetector.java
rename to
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/io/MimeTypeDetector.java
index c564888b27..0eaf635f88 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/MimeTypeDetector.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/io/MimeTypeDetector.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.utils;
+package org.apache.juneau.commons.io;
import static org.apache.juneau.commons.collections.CacheMode.*;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/AsciiMap.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/AsciiMap.java
similarity index 98%
rename from
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/AsciiMap.java
rename to
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/AsciiMap.java
index e16ca21bb4..26583fe7f7 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/AsciiMap.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/AsciiMap.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.utils;
+package org.apache.juneau.commons.lang;
import static org.apache.juneau.commons.utils.Utils.*;
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/AsciiSet.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/AsciiSet.java
similarity index 99%
rename from
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/AsciiSet.java
rename to
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/AsciiSet.java
index 6275557f86..091a99fcda 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/AsciiSet.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/AsciiSet.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.utils;
+package org.apache.juneau.commons.lang;
import static org.apache.juneau.commons.utils.ThrowableUtils.*;
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/BooleanValue.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/BooleanValue.java
similarity index 99%
rename from
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/BooleanValue.java
rename to
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/BooleanValue.java
index 68dac24c6f..4e57a8bd2e 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/BooleanValue.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/BooleanValue.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.collections;
+package org.apache.juneau.commons.lang;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/ByteValue.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/ByteValue.java
similarity index 99%
rename from
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/ByteValue.java
rename to
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/ByteValue.java
index 0cc71830ca..9dea780c78 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/ByteValue.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/ByteValue.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.collections;
+package org.apache.juneau.commons.lang;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/CharValue.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/CharValue.java
similarity index 99%
rename from
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/CharValue.java
rename to
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/CharValue.java
index d01696d56c..0a77af0d8e 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/CharValue.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/CharValue.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.collections;
+package org.apache.juneau.commons.lang;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/DoubleValue.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/DoubleValue.java
similarity index 99%
rename from
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/DoubleValue.java
rename to
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/DoubleValue.java
index ac6c154d0e..71434ee20b 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/DoubleValue.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/DoubleValue.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.collections;
+package org.apache.juneau.commons.lang;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Flag.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/Flag.java
similarity index 99%
rename from
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Flag.java
rename to
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/Flag.java
index 52decbedc1..d0bdef60f4 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Flag.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/Flag.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.collections;
+package org.apache.juneau.commons.lang;
import static org.apache.juneau.commons.utils.Utils.*;
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/FloatValue.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/FloatValue.java
similarity index 99%
rename from
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/FloatValue.java
rename to
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/FloatValue.java
index f36f33a7c7..c3e3bb8132 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/FloatValue.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/FloatValue.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.collections;
+package org.apache.juneau.commons.lang;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/HashCode.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/HashCode.java
similarity index 98%
rename from
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/HashCode.java
rename to
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/HashCode.java
index 5d291a7ec2..b3e77774fe 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/HashCode.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/HashCode.java
@@ -14,10 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.utils;
+package org.apache.juneau.commons.lang;
import java.lang.annotation.*;
+import org.apache.juneau.commons.utils.*;
+
/**
* Utility class for generating integer hash codes.
*
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/IntegerValue.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/IntegerValue.java
similarity index 99%
rename from
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/IntegerValue.java
rename to
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/IntegerValue.java
index 77be31ab8c..4e0e9fb7ec 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/IntegerValue.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/IntegerValue.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.collections;
+package org.apache.juneau.commons.lang;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/LongValue.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/LongValue.java
similarity index 99%
rename from
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/LongValue.java
rename to
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/LongValue.java
index c102255afd..5a8190b627 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/LongValue.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/LongValue.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.collections;
+package org.apache.juneau.commons.lang;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/ShortValue.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/ShortValue.java
similarity index 99%
rename from
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/ShortValue.java
rename to
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/ShortValue.java
index fcaf61a20e..266166c9f8 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/ShortValue.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/ShortValue.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.collections;
+package org.apache.juneau.commons.lang;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/StateEnum.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/StateEnum.java
similarity index 98%
rename from
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/StateEnum.java
rename to
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/StateEnum.java
index 1a0876c7a8..0a59673b8a 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/StateEnum.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/StateEnum.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.utils;
+package org.apache.juneau.commons.lang;
/**
* Enumeration of state machine states for use in parsing operations.
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/StringFormat.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/StringFormat.java
similarity index 99%
rename from
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/StringFormat.java
rename to
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/StringFormat.java
index 62331574cc..0716efd780 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/StringFormat.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/StringFormat.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.utils;
+package org.apache.juneau.commons.lang;
+import static org.apache.juneau.commons.lang.StateEnum.*;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
-import static org.apache.juneau.commons.utils.StateEnum.*;
import static org.apache.juneau.commons.utils.Utils.*;
import java.text.*;
@@ -26,6 +26,7 @@ import java.util.*;
import java.util.stream.*;
import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.utils.*;
import java.util.MissingFormatArgumentException;
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/StringValue.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/StringValue.java
similarity index 99%
rename from
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/StringValue.java
rename to
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/StringValue.java
index 43f8b24b62..94685179d8 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/StringValue.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/StringValue.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.collections;
+package org.apache.juneau.commons.lang;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Value.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/Value.java
similarity index 99%
rename from
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Value.java
rename to
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/Value.java
index 53e4523225..85441d58b4 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Value.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/Value.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.collections;
+package org.apache.juneau.commons.lang;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/ValueListener.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/ValueListener.java
similarity index 99%
rename from
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/ValueListener.java
rename to
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/ValueListener.java
index 62c97db1a0..77b651a86e 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/ValueListener.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/ValueListener.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.collections;
+package org.apache.juneau.commons.lang;
/**
* Listener interface for monitoring value changes in {@link Value} objects.
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/Version.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/Version.java
similarity index 99%
rename from
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/Version.java
rename to
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/Version.java
index 8c79cc20bb..35ece574b2 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/Version.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/Version.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.utils;
+package org.apache.juneau.commons.lang;
import static org.apache.juneau.commons.utils.StringUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/VersionRange.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/VersionRange.java
similarity index 98%
rename from
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/VersionRange.java
rename to
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/VersionRange.java
index b62f376cc5..db671fa152 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/VersionRange.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/VersionRange.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.utils;
+package org.apache.juneau.commons.lang;
import static org.apache.juneau.commons.utils.Utils.*;
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/WeightedAverage.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/WeightedAverage.java
similarity index 97%
rename from
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/WeightedAverage.java
rename to
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/WeightedAverage.java
index 23f1b2342a..eb190392f0 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/WeightedAverage.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/WeightedAverage.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.utils;
+package org.apache.juneau.commons.lang;
import static org.apache.juneau.commons.utils.Utils.*;
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/AnnotationProvider.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/AnnotationProvider.java
index c940392447..77d4ee2750 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/AnnotationProvider.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/AnnotationProvider.java
@@ -28,6 +28,7 @@ import java.lang.reflect.*;
import java.util.*;
import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
/**
* Enhanced annotation provider that returns {@link AnnotationInfo} objects
and supports runtime annotations.
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ClassInfo.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ClassInfo.java
index 411abc63ca..f1605f3dc2 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ClassInfo.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ClassInfo.java
@@ -36,6 +36,7 @@ import java.util.function.*;
import java.util.stream.*;
import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
/**
* Lightweight utility class for introspecting information about a class.
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/time/GranularZonedDateTime.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/time/GranularZonedDateTime.java
index e01f5cd639..ea065a6558 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/time/GranularZonedDateTime.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/time/GranularZonedDateTime.java
@@ -16,8 +16,8 @@
*/
package org.apache.juneau.commons.time;
+import static org.apache.juneau.commons.lang.StateEnum.*;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
-import static org.apache.juneau.commons.utils.StateEnum.*;
import java.time.*;
import java.time.format.*;
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/ClassUtils.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/ClassUtils.java
index b1f09277b4..bb6c2f4a6a 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/ClassUtils.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/ClassUtils.java
@@ -25,6 +25,7 @@ import java.util.*;
import java.util.function.*;
import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.commons.reflect.*;
/**
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 44dabe0153..f53b08a8fd 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
@@ -19,10 +19,10 @@ package org.apache.juneau.commons.utils;
import static java.lang.Character.*;
import static java.nio.charset.StandardCharsets.*;
import static java.util.stream.Collectors.*;
+import static org.apache.juneau.commons.lang.StateEnum.*;
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.StateEnum.*;
import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
@@ -43,6 +43,7 @@ import java.util.stream.*;
import java.util.zip.*;
import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.commons.reflect.*;
/**
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/Utils.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/Utils.java
index 8e16f77dc5..d0906e4a99 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/Utils.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/Utils.java
@@ -26,8 +26,8 @@ import java.util.*;
import java.util.concurrent.atomic.*;
import java.util.function.*;
-import org.apache.juneau.commons.collections.*;
import org.apache.juneau.commons.function.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.commons.settings.*;
/**
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java
index f7a5ef2fff..a1a24ae4c4 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java
@@ -16,8 +16,8 @@
*/
package org.apache.juneau.config.internal;
+import static org.apache.juneau.commons.lang.StateEnum.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
-import static org.apache.juneau.commons.utils.StateEnum.*;
import static org.apache.juneau.commons.utils.StringUtils.*;
import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
@@ -30,6 +30,7 @@ import java.util.stream.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
+import org.apache.juneau.commons.concurrent.*;
import org.apache.juneau.commons.utils.*;
import org.apache.juneau.config.event.*;
import org.apache.juneau.config.store.*;
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMapEntry.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMapEntry.java
index 1f15cbd0a3..a2aa7efdb3 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMapEntry.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMapEntry.java
@@ -23,7 +23,7 @@ import static org.apache.juneau.commons.utils.Utils.*;
import java.io.*;
import java.util.*;
-import org.apache.juneau.commons.utils.*;
+import org.apache.juneau.commons.lang.*;
/**
* Represents a single entry in a configuration.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
index bf1a543e4a..b02fec5a6a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
@@ -33,6 +33,7 @@ import java.util.function.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.commons.collections.*;
import org.apache.juneau.commons.function.OptionalSupplier;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.commons.reflect.*;
import org.apache.juneau.commons.reflect.Visibility;
import org.apache.juneau.commons.utils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
index a833496b54..3776edfcc3 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
@@ -35,6 +35,7 @@ import java.util.stream.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.commons.reflect.*;
import org.apache.juneau.commons.reflect.ReflectionUtils;
import org.apache.juneau.cp.*;
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 4f78668014..59fd6d1038 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
@@ -35,8 +35,8 @@ import java.util.logging.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.collections.*;
-import org.apache.juneau.commons.collections.*;
import org.apache.juneau.commons.collections.FluentMap;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.commons.reflect.*;
import org.apache.juneau.commons.time.*;
import org.apache.juneau.commons.utils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanCreator.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanCreator.java
index 19263000a3..e4d6365638 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanCreator.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanCreator.java
@@ -25,7 +25,7 @@ import java.util.*;
import java.util.function.*;
import org.apache.juneau.annotation.*;
-import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.commons.reflect.*;
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanStore.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanStore.java
index e4146f788b..89619de464 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanStore.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanStore.java
@@ -30,8 +30,8 @@ import java.util.function.*;
import java.util.stream.*;
import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.concurrent.*;
import org.apache.juneau.commons.reflect.*;
-import org.apache.juneau.commons.utils.*;
/**
* Java bean store.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
index 25284e1b03..30ee2135ed 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
@@ -28,7 +28,7 @@ import java.util.*;
import java.util.function.*;
import org.apache.juneau.*;
-import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.serializer.*;
import org.apache.juneau.svl.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/BasicHtmlDocTemplate.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/BasicHtmlDocTemplate.java
index 0199bd025a..aa2ea9cc26 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/BasicHtmlDocTemplate.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/BasicHtmlDocTemplate.java
@@ -23,7 +23,7 @@ import static org.apache.juneau.html.AsideFloat.*;
import java.util.Collection;
import java.util.Map;
-import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.commons.utils.*;
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlClassMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlClassMeta.java
index 2092cd942e..2dbd5937d2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlClassMeta.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlClassMeta.java
@@ -21,7 +21,7 @@ import static
org.apache.juneau.commons.utils.ThrowableUtils.*;
import java.util.function.*;
import org.apache.juneau.*;
-import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.html.annotation.*;
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
index 781ee52e9d..39a3928c8e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
@@ -33,7 +33,7 @@ import javax.xml.stream.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
-import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.commons.reflect.*;
import org.apache.juneau.html.annotation.*;
import org.apache.juneau.httppart.*;
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 3d8fa6f740..05e32c2aa6 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
@@ -32,7 +32,7 @@ import java.util.function.*;
import java.util.regex.*;
import org.apache.juneau.*;
-import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.html.annotation.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.serializer.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/StatusCode.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/StatusCode.java
index 1c410b384c..34672d1659 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/StatusCode.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/StatusCode.java
@@ -22,7 +22,7 @@ import static java.lang.annotation.RetentionPolicy.*;
import java.lang.annotation.*;
import org.apache.juneau.annotation.*;
-import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
/**
* REST response status annotation.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
index 6f4828aa1f..bdbf78df6d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
@@ -39,6 +39,7 @@ import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.commons.reflect.*;
import org.apache.juneau.commons.utils.*;
import org.apache.juneau.http.annotation.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanMeta.java
index 0dd530fdd3..2a1814e2fa 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanMeta.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanMeta.java
@@ -31,7 +31,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.httppart.*;
-import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.commons.reflect.*;
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonClassMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonClassMeta.java
index 2f63db32da..d29bc398bb 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonClassMeta.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonClassMeta.java
@@ -19,7 +19,7 @@ package org.apache.juneau.json;
import static org.apache.juneau.commons.utils.Utils.*;
import org.apache.juneau.*;
-import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.json.annotation.*;
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
index 1f43291336..8bd4ca435d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
@@ -16,8 +16,8 @@
*/
package org.apache.juneau.json;
+import static org.apache.juneau.commons.lang.StateEnum.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
-import static org.apache.juneau.commons.utils.StateEnum.*;
import static org.apache.juneau.commons.utils.StringUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
@@ -29,6 +29,7 @@ import java.util.function.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.commons.reflect.*;
import org.apache.juneau.commons.utils.*;
import org.apache.juneau.httppart.*;
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 92d8c01a71..9830c243a1 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
@@ -27,7 +27,7 @@ import java.util.*;
import java.util.function.*;
import org.apache.juneau.*;
-import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.serializer.*;
import org.apache.juneau.svl.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonWriter.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonWriter.java
index 7fb55b433d..8667fc2c44 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonWriter.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonWriter.java
@@ -22,7 +22,7 @@ import java.io.*;
import org.apache.juneau.*;
import org.apache.juneau.commons.collections.*;
-import org.apache.juneau.commons.utils.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.serializer.*;
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerSession.java
index 26d83cf096..226be48132 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerSession.java
@@ -31,6 +31,7 @@ import java.util.function.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.commons.utils.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.serializer.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/NumberMatcherFactory.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/NumberMatcherFactory.java
index 7e05859ea3..55473ded54 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/NumberMatcherFactory.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/NumberMatcherFactory.java
@@ -16,12 +16,12 @@
*/
package org.apache.juneau.objecttools;
-import static org.apache.juneau.commons.utils.StateEnum.*;
+import static org.apache.juneau.commons.lang.StateEnum.*;
import java.util.*;
import org.apache.juneau.*;
-import org.apache.juneau.commons.utils.*;
+import org.apache.juneau.commons.lang.*;
/**
* Number matcher factory for the {@link ObjectSearcher} class.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/StringMatcherFactory.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/StringMatcherFactory.java
index 0c42685adb..ee31823353 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/StringMatcherFactory.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/StringMatcherFactory.java
@@ -22,6 +22,7 @@ import java.util.*;
import java.util.regex.*;
import org.apache.juneau.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.commons.utils.*;
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/TimeMatcherFactory.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/TimeMatcherFactory.java
index 52f09f3f6e..d54d1787f5 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/TimeMatcherFactory.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/TimeMatcherFactory.java
@@ -17,14 +17,14 @@
package org.apache.juneau.objecttools;
import static java.time.temporal.ChronoField.*;
-import static org.apache.juneau.commons.utils.StateEnum.*;
+import static org.apache.juneau.commons.lang.StateEnum.*;
import java.time.*;
import java.util.*;
import org.apache.juneau.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.commons.time.*;
-import org.apache.juneau.commons.utils.*;
/**
* Date/time matcher factory for the {@link ObjectSearcher} class.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolverSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolverSession.java
index 4e6d85c1d3..d80a8e5f0a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolverSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolverSession.java
@@ -16,9 +16,9 @@
*/
package org.apache.juneau.svl;
+import static org.apache.juneau.commons.lang.StateEnum.*;
import static org.apache.juneau.commons.reflect.ReflectionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
-import static org.apache.juneau.commons.utils.StateEnum.*;
import static org.apache.juneau.commons.utils.StringUtils.*;
import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
@@ -28,7 +28,7 @@ import java.lang.reflect.*;
import java.util.*;
import org.apache.juneau.commons.collections.*;
-import org.apache.juneau.commons.utils.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.cp.*;
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/BuilderSwap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/BuilderSwap.java
index 3b57b573b9..a961f6eaa1 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/BuilderSwap.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/BuilderSwap.java
@@ -22,7 +22,7 @@ import static org.apache.juneau.commons.utils.Utils.*;
import java.lang.reflect.*;
import org.apache.juneau.*;
-import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.commons.reflect.*;
import org.apache.juneau.commons.utils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java
index b3b3bf3379..fc01122fe9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java
@@ -16,8 +16,8 @@
*/
package org.apache.juneau.uon;
+import static org.apache.juneau.commons.lang.StateEnum.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
-import static org.apache.juneau.commons.utils.StateEnum.*;
import static org.apache.juneau.commons.utils.StringUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
@@ -30,6 +30,7 @@ import java.util.function.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.commons.collections.FluentMap;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.commons.reflect.*;
import org.apache.juneau.commons.utils.*;
import org.apache.juneau.httppart.*;
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 7d00636cde..6e310f0b16 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
@@ -28,7 +28,7 @@ import java.util.*;
import java.util.function.*;
import org.apache.juneau.*;
-import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.serializer.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonUtils.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonUtils.java
index 5005f2afc7..ef18f50d01 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonUtils.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonUtils.java
@@ -18,7 +18,7 @@ package org.apache.juneau.uon;
import static org.apache.juneau.commons.utils.StringUtils.*;
-import org.apache.juneau.commons.utils.*;
+import org.apache.juneau.commons.lang.*;
/**
* Utility methods for the UON and UrlEncoding serializers and parsers.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonWriter.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonWriter.java
index 10b2b8892d..d08e25ee57 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonWriter.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonWriter.java
@@ -21,7 +21,7 @@ import static
org.apache.juneau.commons.utils.ThrowableUtils.*;
import java.io.*;
import org.apache.juneau.*;
-import org.apache.juneau.commons.utils.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.serializer.*;
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingClassMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingClassMeta.java
index 876527966a..2f11c8706c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingClassMeta.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingClassMeta.java
@@ -17,7 +17,7 @@
package org.apache.juneau.urlencoding;
import org.apache.juneau.*;
-import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.urlencoding.annotation.*;
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserSession.java
index 43c7156314..1bd0ed77f2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserSession.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.urlencoding;
-import static org.apache.juneau.commons.utils.StateEnum.*;
+import static org.apache.juneau.commons.lang.StateEnum.*;
import static org.apache.juneau.commons.utils.Utils.*;
import java.io.*;
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 9322580068..b1cf83a394 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
@@ -26,7 +26,7 @@ import java.util.*;
import java.util.function.*;
import org.apache.juneau.*;
-import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.serializer.*;
import org.apache.juneau.svl.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/GenericConverter.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/GenericConverter.java
index 4a0228be14..7778c8fa34 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/GenericConverter.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/GenericConverter.java
@@ -17,7 +17,7 @@
package org.apache.juneau.utils;
import org.apache.juneau.*;
-import org.apache.juneau.commons.utils.*;
+import org.apache.juneau.commons.conversion.*;
/**
* Generic object converter implementation.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/StringExpressionMatcher.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/StringExpressionMatcher.java
index 0abc2cb0d9..dfc15fe22a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/StringExpressionMatcher.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/StringExpressionMatcher.java
@@ -16,8 +16,8 @@
*/
package org.apache.juneau.utils;
+import static org.apache.juneau.commons.lang.StateEnum.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
-import static org.apache.juneau.commons.utils.StateEnum.*;
import static org.apache.juneau.commons.utils.StringUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
@@ -25,6 +25,7 @@ import java.text.*;
import java.util.*;
import java.util.regex.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.commons.utils.*;
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlBeanMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlBeanMeta.java
index 49ea30bcf6..7b0c3f0386 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlBeanMeta.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlBeanMeta.java
@@ -24,7 +24,7 @@ import static org.apache.juneau.xml.annotation.XmlFormat.*;
import java.util.*;
import org.apache.juneau.*;
-import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.commons.reflect.*;
import org.apache.juneau.xml.annotation.*;
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 584f66ae1e..d67513ffeb 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
@@ -31,7 +31,7 @@ import java.util.*;
import java.util.function.*;
import org.apache.juneau.*;
-import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.serializer.*;
import org.apache.juneau.svl.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlUtils.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlUtils.java
index db0b01ac72..1b280d8c61 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlUtils.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlUtils.java
@@ -26,7 +26,7 @@ import java.util.*;
import javax.xml.stream.*;
import org.apache.juneau.commons.io.*;
-import org.apache.juneau.commons.utils.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.xml.annotation.*;
/**
diff --git
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogEntryFormatter.java
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogEntryFormatter.java
index 197983cf7f..510e39223f 100644
---
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogEntryFormatter.java
+++
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogEntryFormatter.java
@@ -16,8 +16,8 @@
*/
package org.apache.juneau.microservice.resources;
+import static org.apache.juneau.commons.lang.StateEnum.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
-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-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseHeader.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseHeader.java
index f1df7974cd..0c1b44e380 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseHeader.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseHeader.java
@@ -28,7 +28,7 @@ import java.util.regex.*;
import org.apache.http.*;
import org.apache.juneau.*;
import org.apache.juneau.assertions.*;
-import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.commons.reflect.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.httppart.*;
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 a932d3de18..da9ce83c3c 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
@@ -18,9 +18,9 @@ package org.apache.juneau.rest.client;
import static java.lang.Character.isWhitespace;
import static java.util.logging.Level.*;
+import static org.apache.juneau.commons.lang.StateEnum.*;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
-import static org.apache.juneau.commons.utils.StateEnum.*;
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/remote/RemoteOperationMeta.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteOperationMeta.java
index bcca0f1716..5eac232792 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteOperationMeta.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteOperationMeta.java
@@ -28,7 +28,7 @@ import java.util.*;
import java.util.function.*;
import org.apache.juneau.*;
-import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.commons.reflect.*;
import org.apache.juneau.commons.utils.*;
import org.apache.juneau.http.annotation.*;
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteOperationReturn.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteOperationReturn.java
index a6b7bff115..d3c21b8655 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteOperationReturn.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteOperationReturn.java
@@ -25,7 +25,7 @@ import org.apache.juneau.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.http.remote.*;
import org.apache.juneau.httppart.bean.*;
-import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.commons.reflect.*;
/**
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/HttpHeaders.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/HttpHeaders.java
index 35b6731bfc..8a8adfd75b 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/HttpHeaders.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/HttpHeaders.java
@@ -26,8 +26,8 @@ import java.util.function.*;
import org.apache.http.*;
import org.apache.juneau.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.commons.reflect.*;
-import org.apache.juneau.commons.utils.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.http.header.Date;
import org.apache.juneau.http.part.*;
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/HttpParts.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/HttpParts.java
index 0f0acb255e..34b7eadbde 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/HttpParts.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/HttpParts.java
@@ -29,7 +29,7 @@ import org.apache.juneau.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.http.part.*;
import org.apache.juneau.httppart.*;
-import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.commons.reflect.*;
/**
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 87c7402e91..a0ef4e4f22 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
@@ -23,7 +23,7 @@ import java.util.function.*;
import org.apache.juneau.assertions.*;
import org.apache.juneau.commons.collections.*;
-import org.apache.juneau.commons.utils.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.http.annotation.*;
/**
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/remote/RrpcInterfaceMeta.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/remote/RrpcInterfaceMeta.java
index 87a60a00a6..0dcc983b96 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/remote/RrpcInterfaceMeta.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/remote/RrpcInterfaceMeta.java
@@ -22,7 +22,7 @@ import static org.apache.juneau.commons.utils.StringUtils.*;
import java.lang.reflect.*;
import java.util.*;
-import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.commons.reflect.*;
import org.apache.juneau.commons.utils.*;
diff --git
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockPathResolver.java
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockPathResolver.java
index 447c2f06bc..b2fd202e17 100644
---
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockPathResolver.java
+++
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockPathResolver.java
@@ -16,8 +16,8 @@
*/
package org.apache.juneau.rest.mock;
+import static org.apache.juneau.commons.lang.StateEnum.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
-import static org.apache.juneau.commons.utils.StateEnum.*;
import static org.apache.juneau.commons.utils.StringUtils.*;
import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
@@ -25,7 +25,7 @@ import static org.apache.juneau.commons.utils.Utils.*;
import java.util.*;
import org.apache.juneau.commons.collections.*;
-import org.apache.juneau.commons.utils.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.rest.util.*;
/**
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 f8eafc4c70..908a39ef41 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
@@ -47,6 +47,7 @@ import org.apache.juneau.*;
import org.apache.juneau.bean.swagger.Swagger;
import org.apache.juneau.commons.collections.*;
import org.apache.juneau.commons.collections.FluentMap;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.commons.reflect.*;
import org.apache.juneau.commons.utils.*;
import org.apache.juneau.config.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
index c34b8fa9bc..5a97d4264d 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
@@ -38,6 +38,7 @@ import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.commons.collections.*;
import org.apache.juneau.commons.collections.FluentMap;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.commons.reflect.*;
import org.apache.juneau.commons.utils.*;
import org.apache.juneau.cp.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestSession.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestSession.java
index d7d0a1096f..f17ca79836 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestSession.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestSession.java
@@ -26,7 +26,7 @@ import java.util.*;
import org.apache.http.*;
import org.apache.juneau.*;
import org.apache.juneau.commons.collections.FluentMap;
-import org.apache.juneau.commons.utils.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.cp.*;
import org.apache.juneau.http.response.*;
import org.apache.juneau.rest.annotation.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HeaderArg.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HeaderArg.java
index fdd6fbbbb4..7d35e50550 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HeaderArg.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HeaderArg.java
@@ -29,7 +29,7 @@ import org.apache.juneau.collections.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.httppart.*;
-import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.commons.reflect.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.annotation.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseBeanArg.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseBeanArg.java
index b93656efea..49da42e239 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseBeanArg.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseBeanArg.java
@@ -21,7 +21,7 @@ import java.lang.reflect.*;
import org.apache.juneau.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.httppart.bean.*;
-import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.commons.reflect.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.annotation.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseCodeArg.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseCodeArg.java
index 6ecdac1951..e0ab0f956a 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseCodeArg.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseCodeArg.java
@@ -19,7 +19,7 @@ package org.apache.juneau.rest.arg;
import java.lang.reflect.*;
import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.commons.reflect.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.annotation.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseHeaderArg.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseHeaderArg.java
index 68db151164..f063d7c9a4 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseHeaderArg.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseHeaderArg.java
@@ -25,7 +25,7 @@ import org.apache.juneau.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.httppart.*;
-import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.commons.reflect.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.annotation.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converter/Queryable.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converter/Queryable.java
index 8867e7aea7..02998c6a5b 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converter/Queryable.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converter/Queryable.java
@@ -17,7 +17,7 @@
package org.apache.juneau.rest.converter;
import org.apache.juneau.*;
-import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.objecttools.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.httppart.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/guard/RoleMatcher.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/guard/RoleMatcher.java
index 4777379409..f418227c8f 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/guard/RoleMatcher.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/guard/RoleMatcher.java
@@ -16,8 +16,8 @@
*/
package org.apache.juneau.rest.guard;
+import static org.apache.juneau.commons.lang.StateEnum.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
-import static org.apache.juneau.commons.utils.StateEnum.*;
import static org.apache.juneau.commons.utils.StringUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
@@ -25,6 +25,7 @@ import java.text.*;
import java.util.*;
import java.util.regex.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.commons.utils.*;
/**
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestFormParams.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestFormParams.java
index f86e6bf5ea..dd475600fd 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestFormParams.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestFormParams.java
@@ -29,6 +29,7 @@ import java.util.stream.*;
import org.apache.http.*;
import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.commons.utils.*;
import org.apache.juneau.http.*;
import org.apache.juneau.http.header.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHeaders.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHeaders.java
index 314c9df65e..12a2352204 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHeaders.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHeaders.java
@@ -28,6 +28,7 @@ import java.util.stream.*;
import org.apache.http.*;
import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.commons.utils.*;
import org.apache.juneau.http.*;
import org.apache.juneau.http.header.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestPathParams.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestPathParams.java
index 0bc35013be..74f28e28be 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestPathParams.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestPathParams.java
@@ -29,6 +29,7 @@ import java.util.stream.*;
import org.apache.http.*;
import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.commons.utils.*;
import org.apache.juneau.http.*;
import org.apache.juneau.http.part.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestQueryParams.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestQueryParams.java
index e97f89022a..927720dd42 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestQueryParams.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestQueryParams.java
@@ -29,6 +29,7 @@ import java.util.stream.*;
import org.apache.http.*;
import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.commons.utils.*;
import org.apache.juneau.http.*;
import org.apache.juneau.http.part.*;
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 f5bfb22227..24292eafd8 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
@@ -20,9 +20,8 @@ import static org.apache.juneau.commons.utils.StringUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
import static org.apache.juneau.rest.annotation.RestOpAnnotation.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.commons.reflect.*;
-import org.apache.juneau.commons.utils.*;
-
import jakarta.servlet.http.*;
/**
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/BasicStaticFiles.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/BasicStaticFiles.java
index 2f99aa7a0c..a5b41bb821 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/BasicStaticFiles.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/BasicStaticFiles.java
@@ -27,7 +27,7 @@ import java.util.*;
import org.apache.http.*;
import org.apache.juneau.commons.collections.*;
-import org.apache.juneau.commons.utils.*;
+import org.apache.juneau.commons.io.*;
import org.apache.juneau.cp.*;
import org.apache.juneau.http.resource.*;
import org.apache.juneau.http.response.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/StaticFiles.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/StaticFiles.java
index 940d66f6ee..d57d105e52 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/StaticFiles.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/StaticFiles.java
@@ -23,7 +23,7 @@ import java.util.*;
import org.apache.http.*;
import org.apache.juneau.*;
-import org.apache.juneau.commons.utils.*;
+import org.apache.juneau.commons.io.*;
import org.apache.juneau.cp.*;
import org.apache.juneau.http.resource.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/BasicSwaggerProviderSession.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/BasicSwaggerProviderSession.java
index 1abbe16b6a..1de2f6cf7b 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/BasicSwaggerProviderSession.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/BasicSwaggerProviderSession.java
@@ -31,7 +31,7 @@ import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.bean.swagger.Swagger;
import org.apache.juneau.collections.*;
-import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.commons.reflect.*;
import org.apache.juneau.commons.utils.*;
import org.apache.juneau.cp.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/RestUtils.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/RestUtils.java
index 53b77ea460..f2ff9ee9f5 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/RestUtils.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/RestUtils.java
@@ -16,8 +16,8 @@
*/
package org.apache.juneau.rest.util;
+import static org.apache.juneau.commons.lang.StateEnum.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
-import static org.apache.juneau.commons.utils.StateEnum.*;
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/assertions/Assertions_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/Assertions_Test.java
index 92fc94aaaf..eae8a90104 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
@@ -27,7 +27,7 @@ import java.time.*;
import java.util.*;
import org.apache.juneau.*;
-import org.apache.juneau.commons.utils.*;
+import org.apache.juneau.commons.lang.*;
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 d3f4a75184..7c1d4a89f0 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
@@ -18,12 +18,12 @@ package org.apache.juneau.assertions;
import static org.apache.juneau.assertions.AssertionPredicates.ne;
import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.commons.lang.Version.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.commons.utils.Version.*;
import static org.junit.jupiter.api.Assertions.*;
import org.apache.juneau.*;
-import org.apache.juneau.commons.utils.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.json.*;
import org.junit.jupiter.api.*;
@@ -260,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.commons.utils.Version'.");
+
assertThrown(()->test(x).isType(String.class)).asMessage().asOneLine().is("Unexpected
type. Expect='java.lang.String'.
Actual='org.apache.juneau.commons.lang.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.");
}
@@ -269,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.commons.utils.Version'.");
-
assertThrown(()->test(x).isExactType(String.class)).asMessage().asOneLine().is("Unexpected
type. Expect='java.lang.String'.
Actual='org.apache.juneau.commons.utils.Version'.");
+
assertThrown(()->test(x).isExactType(Object.class)).asMessage().asOneLine().is("Unexpected
type. Expect='java.lang.Object'.
Actual='org.apache.juneau.commons.lang.Version'.");
+
assertThrown(()->test(x).isExactType(String.class)).asMessage().asOneLine().is("Unexpected
type. Expect='java.lang.String'.
Actual='org.apache.juneau.commons.lang.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/commons/collections/Lists_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/Lists_Test.java
index 48f0f51a8e..18da3046b2 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/Lists_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/Lists_Test.java
@@ -334,7 +334,7 @@ class Lists_Test extends TestBase {
@Test
void k02_elementFunction_withConverter() {
- var converter = new org.apache.juneau.commons.utils.Converter()
{
+ var converter = new
org.apache.juneau.commons.conversion.Converter() {
@Override
public <T> T convertTo(Class<T> type, Object o) {
if (type == Integer.class && o instanceof
String) {
@@ -354,14 +354,14 @@ class Lists_Test extends TestBase {
@Test
void k03_elementFunction_multipleConverters() {
- var converter1 = new
org.apache.juneau.commons.utils.Converter() {
+ var converter1 = new
org.apache.juneau.commons.conversion.Converter() {
@Override
public <T> T convertTo(Class<T> type, Object o) {
return null; // Doesn't handle this
}
};
- var converter2 = new
org.apache.juneau.commons.utils.Converter() {
+ var converter2 = new
org.apache.juneau.commons.conversion.Converter() {
@Override
public <T> T convertTo(Class<T> type, Object o) {
if (type == Integer.class && o instanceof
String) {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/Sets_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/Sets_Test.java
index b394fcab34..1f291dd843 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/Sets_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/Sets_Test.java
@@ -359,7 +359,7 @@ class Sets_Test extends TestBase {
@Test
void l02_elementFunction_withConverter() {
- var converter = new org.apache.juneau.commons.utils.Converter()
{
+ var converter = new
org.apache.juneau.commons.conversion.Converter() {
@Override
public <T> T convertTo(Class<T> type, Object o) {
if (type == Integer.class && o instanceof
String) {
@@ -379,14 +379,14 @@ class Sets_Test extends TestBase {
@Test
void l03_elementFunction_multipleConverters() {
- var converter1 = new
org.apache.juneau.commons.utils.Converter() {
+ var converter1 = new
org.apache.juneau.commons.conversion.Converter() {
@Override
public <T> T convertTo(Class<T> type, Object o) {
return null; // Doesn't handle this
}
};
- var converter2 = new
org.apache.juneau.commons.utils.Converter() {
+ var converter2 = new
org.apache.juneau.commons.conversion.Converter() {
@Override
public <T> T convertTo(Class<T> type, Object o) {
if (type == Integer.class && o instanceof
String) {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/SimpleReadWriteLock_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/concurrent/SimpleReadWriteLock_Test.java
similarity index 99%
rename from
juneau-utest/src/test/java/org/apache/juneau/commons/utils/SimpleReadWriteLock_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/commons/concurrent/SimpleReadWriteLock_Test.java
index 23d88570ba..20e8ed3da8 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/SimpleReadWriteLock_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/concurrent/SimpleReadWriteLock_Test.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.utils;
+package org.apache.juneau.commons.concurrent;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/Console_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/io/Console_Test.java
similarity index 99%
rename from
juneau-utest/src/test/java/org/apache/juneau/commons/utils/Console_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/commons/io/Console_Test.java
index e7543fd62d..ca3f66fb01 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/Console_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/commons/io/Console_Test.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.utils;
+package org.apache.juneau.commons.io;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/MimeTypeDetector_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/io/MimeTypeDetector_Test.java
similarity index 99%
rename from
juneau-utest/src/test/java/org/apache/juneau/commons/utils/MimeTypeDetector_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/commons/io/MimeTypeDetector_Test.java
index e5bf514aad..62187377c6 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/MimeTypeDetector_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/io/MimeTypeDetector_Test.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.utils;
+package org.apache.juneau.commons.io;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/AsciiMap_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/lang/AsciiMap_Test.java
similarity index 99%
rename from
juneau-utest/src/test/java/org/apache/juneau/commons/utils/AsciiMap_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/commons/lang/AsciiMap_Test.java
index 5272b1adc4..463eba08d7 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/AsciiMap_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/lang/AsciiMap_Test.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.utils;
+package org.apache.juneau.commons.lang;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/AsciiSet_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/lang/AsciiSet_Test.java
similarity index 99%
rename from
juneau-utest/src/test/java/org/apache/juneau/commons/utils/AsciiSet_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/commons/lang/AsciiSet_Test.java
index 42d8b681e6..d3a8ec5f37 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/AsciiSet_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/lang/AsciiSet_Test.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.utils;
+package org.apache.juneau.commons.lang;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/BooleanValue_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/lang/BooleanValue_Test.java
similarity index 99%
rename from
juneau-utest/src/test/java/org/apache/juneau/commons/collections/BooleanValue_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/commons/lang/BooleanValue_Test.java
index 6af64a2b1d..574f83787d 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/BooleanValue_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/lang/BooleanValue_Test.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.collections;
+package org.apache.juneau.commons.lang;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.junit.bct.BctAssertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/ByteValue_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/lang/ByteValue_Test.java
similarity index 99%
rename from
juneau-utest/src/test/java/org/apache/juneau/commons/collections/ByteValue_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/commons/lang/ByteValue_Test.java
index f359a14d75..9b89b42bff 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/ByteValue_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/lang/ByteValue_Test.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.collections;
+package org.apache.juneau.commons.lang;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/CharValue_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/lang/CharValue_Test.java
similarity index 99%
rename from
juneau-utest/src/test/java/org/apache/juneau/commons/collections/CharValue_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/commons/lang/CharValue_Test.java
index eb3ce981d8..8a72b2ec0a 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/CharValue_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/lang/CharValue_Test.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.collections;
+package org.apache.juneau.commons.lang;
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/commons/collections/DoubleValue_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/lang/DoubleValue_Test.java
similarity index 99%
rename from
juneau-utest/src/test/java/org/apache/juneau/commons/collections/DoubleValue_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/commons/lang/DoubleValue_Test.java
index b6d3d43f6a..6fe3769bb3 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/DoubleValue_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/lang/DoubleValue_Test.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.collections;
+package org.apache.juneau.commons.lang;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.junit.bct.BctAssertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/Flag_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/lang/Flag_Test.java
similarity index 99%
rename from
juneau-utest/src/test/java/org/apache/juneau/commons/collections/Flag_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/commons/lang/Flag_Test.java
index 0061eb2a8d..e4047113b7 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/Flag_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/commons/lang/Flag_Test.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.collections;
+package org.apache.juneau.commons.lang;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/FloatValue_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/lang/FloatValue_Test.java
similarity index 99%
rename from
juneau-utest/src/test/java/org/apache/juneau/commons/collections/FloatValue_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/commons/lang/FloatValue_Test.java
index 3658110c59..fb4c172a4d 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/FloatValue_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/lang/FloatValue_Test.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.collections;
+package org.apache.juneau.commons.lang;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.junit.bct.BctAssertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/HashCode_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/lang/HashCode_Test.java
similarity index 99%
rename from
juneau-utest/src/test/java/org/apache/juneau/commons/utils/HashCode_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/commons/lang/HashCode_Test.java
index 8ce5bfb149..036ebedba9 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/HashCode_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/lang/HashCode_Test.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.utils;
+package org.apache.juneau.commons.lang;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/IntegerValue_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/lang/IntegerValue_Test.java
similarity index 99%
rename from
juneau-utest/src/test/java/org/apache/juneau/commons/collections/IntegerValue_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/commons/lang/IntegerValue_Test.java
index 7f47c9580c..d1aa12806a 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/IntegerValue_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/lang/IntegerValue_Test.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.collections;
+package org.apache.juneau.commons.lang;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.junit.bct.BctAssertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/LongValue_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/lang/LongValue_Test.java
similarity index 99%
rename from
juneau-utest/src/test/java/org/apache/juneau/commons/collections/LongValue_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/commons/lang/LongValue_Test.java
index ca44e29cea..933255dbcc 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/LongValue_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/lang/LongValue_Test.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.collections;
+package org.apache.juneau.commons.lang;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.junit.bct.BctAssertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/ShortValue_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/lang/ShortValue_Test.java
similarity index 99%
rename from
juneau-utest/src/test/java/org/apache/juneau/commons/collections/ShortValue_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/commons/lang/ShortValue_Test.java
index 7bb5aacad9..a8aa51e4e3 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/ShortValue_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/lang/ShortValue_Test.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.collections;
+package org.apache.juneau.commons.lang;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.junit.bct.BctAssertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/StateEnum_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/lang/StateEnum_Test.java
similarity index 98%
rename from
juneau-utest/src/test/java/org/apache/juneau/commons/utils/StateEnum_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/commons/lang/StateEnum_Test.java
index dd648922e0..b4df8a6903 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/StateEnum_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/lang/StateEnum_Test.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.utils;
+package org.apache.juneau.commons.lang;
-import static org.apache.juneau.commons.utils.StateEnum.*;
+import static org.apache.juneau.commons.lang.StateEnum.*;
import static org.junit.jupiter.api.Assertions.*;
import org.apache.juneau.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/StringFormat_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/lang/StringFormat_Test.java
similarity index 99%
rename from
juneau-utest/src/test/java/org/apache/juneau/commons/utils/StringFormat_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/commons/lang/StringFormat_Test.java
index 6872299042..a8edb818be 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/StringFormat_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/lang/StringFormat_Test.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.utils;
+package org.apache.juneau.commons.lang;
import static org.apache.juneau.commons.utils.Utils.*;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/StringValue_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/lang/StringValue_Test.java
similarity index 99%
rename from
juneau-utest/src/test/java/org/apache/juneau/commons/collections/StringValue_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/commons/lang/StringValue_Test.java
index e61278d906..056407aeea 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/StringValue_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/lang/StringValue_Test.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.collections;
+package org.apache.juneau.commons.lang;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/Value_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/lang/Value_Test.java
similarity index 99%
rename from
juneau-utest/src/test/java/org/apache/juneau/commons/collections/Value_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/commons/lang/Value_Test.java
index 1f14679788..e5d7f00a30 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/Value_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/commons/lang/Value_Test.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.collections;
+package org.apache.juneau.commons.lang;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/VersionRange_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/lang/VersionRange_Test.java
similarity index 99%
rename from
juneau-utest/src/test/java/org/apache/juneau/commons/utils/VersionRange_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/commons/lang/VersionRange_Test.java
index 059c33777e..56dafbc4c9 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/VersionRange_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/lang/VersionRange_Test.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.utils;
+package org.apache.juneau.commons.lang;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/Version_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/lang/Version_Test.java
similarity index 98%
rename from
juneau-utest/src/test/java/org/apache/juneau/commons/utils/Version_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/commons/lang/Version_Test.java
index a432148450..fa8a184bce 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/Version_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/lang/Version_Test.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.utils;
+package org.apache.juneau.commons.lang;
+import static org.apache.juneau.commons.lang.Version.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
-import static org.apache.juneau.commons.utils.Version.*;
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/commons/utils/WeightedAverage_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/lang/WeightedAverage_Test.java
similarity index 97%
rename from
juneau-utest/src/test/java/org/apache/juneau/commons/utils/WeightedAverage_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/commons/lang/WeightedAverage_Test.java
index ce7924e667..28dacaa840 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/WeightedAverage_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/lang/WeightedAverage_Test.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.commons.utils;
+package org.apache.juneau.commons.lang;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ClassInfo_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ClassInfo_Test.java
index d746eb435d..f630d33bed 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ClassInfo_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ClassInfo_Test.java
@@ -35,7 +35,7 @@ import java.util.stream.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
-import org.apache.juneau.commons.collections.Value;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.svl.*;
import org.junit.jupiter.api.*;
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 b3d5e120dc..9e2ffc3dec 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
@@ -29,6 +29,7 @@ import java.util.concurrent.atomic.*;
import java.util.*;
import org.apache.juneau.*;
+import org.apache.juneau.commons.lang.*;
import org.junit.jupiter.api.*;
class StringUtils_Test extends TestBase {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/Utils_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/utils/Utils_Test.java
index f66ef1559f..90252f0e27 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/Utils_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/commons/utils/Utils_Test.java
@@ -26,8 +26,8 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.*;
import org.apache.juneau.*;
-import org.apache.juneau.commons.collections.*;
import org.apache.juneau.commons.function.*;
+import org.apache.juneau.commons.lang.*;
import org.junit.jupiter.api.*;
@Retention(RetentionPolicy.RUNTIME)
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/BasicHeader_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/BasicHeader_Test.java
index 177c772eac..ea3f825fcc 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/BasicHeader_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/BasicHeader_Test.java
@@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.*;
import java.util.function.*;
import org.apache.juneau.*;
-import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.http.header.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/ClientVersion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/ClientVersion_Test.java
index 3538ee2f6e..0d204cae10 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/ClientVersion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/ClientVersion_Test.java
@@ -25,7 +25,7 @@ import java.util.function.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
-import org.apache.juneau.commons.utils.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.client.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/Swagger_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/Swagger_Test.java
index 1f8e528a4f..796a4d65d6 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/Swagger_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/Swagger_Test.java
@@ -25,7 +25,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
-import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.cp.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.http.annotation.Tag;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/ResponseHeader_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/ResponseHeader_Test.java
index 82d51315a3..b02c1d37ec 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/ResponseHeader_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/ResponseHeader_Test.java
@@ -21,7 +21,7 @@ import static org.junit.jupiter.api.Assertions.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
-import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/ResponseStatus_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/ResponseStatus_Test.java
index 6b26517d1c..78af614314 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/ResponseStatus_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/ResponseStatus_Test.java
@@ -17,7 +17,7 @@
package org.apache.juneau.rest.annotation;
import org.apache.juneau.*;
-import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Response_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Response_Test.java
index c9bfe516f4..833abb2d66 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Response_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Response_Test.java
@@ -22,7 +22,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
-import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.commons.utils.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.json.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Response_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Response_Test.java
index cbd7be3b25..b9a036e851 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Response_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Response_Test.java
@@ -24,7 +24,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
-import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.http.annotation.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Headers_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Headers_Test.java
index fefbd310d0..e69bade205 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Headers_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Headers_Test.java
@@ -28,7 +28,7 @@ import java.util.*;
import java.util.regex.*;
import org.apache.juneau.*;
-import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.commons.lang.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.httppart.*;
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 7345e9a2c4..7968491016 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,7 +19,7 @@ package org.apache.juneau.utils;
import static org.junit.jupiter.api.Assertions.*;
import org.apache.juneau.*;
-import org.apache.juneau.commons.utils.*;
+import org.apache.juneau.commons.lang.*;
import org.junit.jupiter.api.*;
class WeightedAverageTest extends TestBase {
