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 1dad3fda75 Utility class cleanup
1dad3fda75 is described below
commit 1dad3fda759ee208cc0f890da3f6a370409ab93f
Author: James Bognar <[email protected]>
AuthorDate: Tue Oct 28 13:15:40 2025 -0400
Utility class cleanup
---
.../java/org/apache/juneau/bean/openapi3/ui/OpenApiUI.java | 2 +-
.../java/org/apache/juneau/bean/swagger/ui/SwaggerUI.java | 2 +-
.../org/apache/juneau/assertions/AssertionPredicate.java | 1 +
.../java/org/apache/juneau/common/utils/CollectionUtils.java | 12 ++++++++++++
.../src/main/java/org/apache/juneau/common/utils/Utils.java | 12 ------------
.../src/main/java/org/apache/juneau/config/Section.java | 1 +
.../main/java/org/apache/juneau/config/store/FileStore.java | 1 +
.../src/main/java/org/apache/juneau/BeanDictionaryMap.java | 1 +
.../main/java/org/apache/juneau/encoders/GzipEncoder.java | 1 +
.../java/org/apache/juneau/encoders/IdentityEncoder.java | 1 +
.../org/apache/juneau/jsonschema/BasicBeanDefMapper.java | 1 +
.../java/org/apache/juneau/oapi/OpenApiParserSession.java | 1 +
.../java/org/apache/juneau/objecttools/ObjectMerger.java | 1 +
.../main/java/org/apache/juneau/reflect/AnnotationInfo.java | 1 +
.../main/java/org/apache/juneau/serializer/Serializer.java | 1 +
.../src/main/java/org/apache/juneau/svl/MultipartVar.java | 1 +
.../java/org/apache/juneau/rest/client/RestResponse.java | 1 +
.../src/main/java/org/apache/juneau/rest/RestRequest.java | 1 +
.../src/test/java/org/apache/juneau/DataConversion_Test.java | 1 +
.../java/org/apache/juneau/DynaBean_ComboRoundTripTest.java | 1 +
.../src/test/java/org/apache/juneau/JacocoDummy_Test.java | 1 +
.../src/test/java/org/apache/juneau/JsonList_Test.java | 1 +
.../apache/juneau/a/rttests/RoundTripAddClassAttrs_Test.java | 1 +
.../juneau/a/rttests/RoundTripBeansWithBuilders_Test.java | 1 +
.../java/org/apache/juneau/a/rttests/RoundTrip_Tester.java | 2 ++
.../apache/juneau/a/rttests/TrimStrings_RoundTripTest.java | 1 +
.../org/apache/juneau/assertions/BeanAssertion_Test.java | 1 +
.../src/test/java/org/apache/juneau/bean/html5/A_Test.java | 2 +-
.../apache/juneau/bean/html5/Html5_ComboRoundTripTest.java | 2 +-
.../test/java/org/apache/juneau/collections/Args_Test.java | 2 +-
.../org/apache/juneau/common/collections/MultiSet_Test.java | 2 +-
.../org/apache/juneau/common/collections/SimpleMap_Test.java | 1 +
.../test/java/org/apache/juneau/config/ConfigMap_Test.java | 1 +
.../java/org/apache/juneau/encoders/EncoderSet_Test.java | 1 +
.../src/test/java/org/apache/juneau/html/Html_Test.java | 1 +
.../apache/juneau/http/annotation/AnnotationUtils_Test.java | 2 +-
.../src/test/java/org/apache/juneau/json/Json_Test.java | 1 +
.../org/apache/juneau/junit/bct/PropertyExtractors_Test.java | 1 +
.../test/java/org/apache/juneau/mstat/ThrownStore_Test.java | 1 +
.../org/apache/juneau/objecttools/ObjectSearcher_Test.java | 2 +-
.../org/apache/juneau/rest/Header_AcceptEncoding_Test.java | 1 +
.../test/java/org/apache/juneau/rest/RestOp_Params_Test.java | 1 +
.../org/apache/juneau/rest/annotation/Response_Test.java | 4 ++--
.../apache/juneau/rest/annotation/Rest_Encoders_Test.java | 1 +
.../juneau/rest/client/RestClient_Config_OpenApi_Test.java | 1 +
.../rest/client/RestClient_Config_RestClient_Test.java | 1 +
.../org/apache/juneau/rest/client/RestClient_Paths_Test.java | 1 +
.../apache/juneau/rest/client/RestClient_Response_Test.java | 1 +
.../java/org/apache/juneau/rest/client/RestClient_Test.java | 1 +
.../java/org/apache/juneau/rest/util/RestUtils_Test.java | 1 +
.../apache/juneau/serializer/WriterFluentSetters_Test.java | 1 +
.../src/test/java/org/apache/juneau/svl/vars/IfVarTest.java | 1 +
.../org/apache/juneau/transforms/EnumerationSwapTest.java | 1 +
.../java/org/apache/juneau/transforms/IteratorSwapTest.java | 1 +
.../test/java/org/apache/juneau/uon/UonSerializer_Test.java | 1 +
.../test/java/org/apache/juneau/utils/FilteredMapTest.java | 1 +
.../apache/juneau/utils/StringExpressionMatcher_Test.java | 1 +
.../java/org/apache/juneau/utils/StringVarResolver_Test.java | 1 +
58 files changed, 70 insertions(+), 22 deletions(-)
diff --git
a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/ui/OpenApiUI.java
b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/ui/OpenApiUI.java
index 7be79bbd26..73c5d1f3f7 100644
---
a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/ui/OpenApiUI.java
+++
b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/ui/OpenApiUI.java
@@ -85,7 +85,7 @@ public class OpenApiUI extends ObjectSwap<OpenApi,Div> {
*/
@Override
public org.apache.juneau.MediaType[] forMediaTypes() {
- return Utils.a(HTML);
+ return CollectionUtils.a(HTML);
}
@Override
diff --git
a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/ui/SwaggerUI.java
b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/ui/SwaggerUI.java
index 0459306c14..2ff2733c3e 100644
---
a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/ui/SwaggerUI.java
+++
b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/ui/SwaggerUI.java
@@ -86,7 +86,7 @@ public class SwaggerUI extends ObjectSwap<Swagger,Div> {
*/
@Override
public MediaType[] forMediaTypes() {
- return Utils.a(MediaType.HTML);
+ return CollectionUtils.a(MediaType.HTML);
}
@Override
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java
index 1ee973e65b..5c55115ae6 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau.assertions;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.StringUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/CollectionUtils.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/CollectionUtils.java
index 1b481e9a0a..c8f31af0bd 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/CollectionUtils.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/CollectionUtils.java
@@ -988,6 +988,18 @@ public class CollectionUtils {
return value.toArray(array);
}
+ /**
+ * Creates an array of objects.
+ *
+ * @param <T> The component type of the array.
+ * @param x The objects to place in the array.
+ * @return A new array containing the specified objects.
+ */
+ @SafeVarargs
+ public static <T> T[] a(T...x) {
+ return x;
+ }
+
public static <E> E[][] a2(E[]...value) {
return value;
}
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/Utils.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/Utils.java
index 4d6abd9900..cc6cf571fb 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/Utils.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/Utils.java
@@ -61,18 +61,6 @@ public class Utils {
private static final ConcurrentHashMap<String,String> PROPERTY_TO_ENV =
new ConcurrentHashMap<>();
- /**
- * Creates an array of objects.
- *
- * @param <T> The component type of the array.
- * @param x The objects to place in the array.
- * @return A new array containing the specified objects.
- */
- @SafeVarargs
- public static <T> T[] a(T...x) {
- return x;
- }
-
/**
* Casts an object to a specific type if it's an instance of that type.
*
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Section.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Section.java
index 6c7f7e4cc8..581100f0f8 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Section.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Section.java
@@ -17,6 +17,7 @@
package org.apache.juneau.config;
import static org.apache.juneau.common.utils.AssertionUtils.*;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import java.beans.*;
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/FileStore.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/FileStore.java
index 737b2a54bf..2c653556c7 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/FileStore.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/FileStore.java
@@ -19,6 +19,7 @@ package org.apache.juneau.config.store;
import static java.nio.file.StandardOpenOption.*;
import static java.nio.file.StandardWatchEventKinds.*;
import static org.apache.juneau.collections.JsonMap.*;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.ThrowableUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanDictionaryMap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanDictionaryMap.java
index a8448b811e..4097c7d04f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanDictionaryMap.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanDictionaryMap.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import java.lang.reflect.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/GzipEncoder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/GzipEncoder.java
index 044ec4d2b8..6d4c7cd658 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/GzipEncoder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/GzipEncoder.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau.encoders;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import java.io.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/IdentityEncoder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/IdentityEncoder.java
index 183f73dd99..4bdd9f3451 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/IdentityEncoder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/IdentityEncoder.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau.encoders;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import java.io.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/BasicBeanDefMapper.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/BasicBeanDefMapper.java
index 13d64e4e2c..e76b37e7b7 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/BasicBeanDefMapper.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/BasicBeanDefMapper.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau.jsonschema;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import java.net.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserSession.java
index 4f91bccee2..322c9ac0b8 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserSession.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau.oapi;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.StringUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import static org.apache.juneau.httppart.HttpPartCollectionFormat.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectMerger.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectMerger.java
index 9142a3f14d..2982e5b5a9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectMerger.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectMerger.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau.objecttools;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import java.lang.reflect.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/AnnotationInfo.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/AnnotationInfo.java
index 94bc0afc00..f95876ab04 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/AnnotationInfo.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/AnnotationInfo.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau.reflect;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import java.lang.annotation.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
index a49037a492..6cad9d226b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
@@ -17,6 +17,7 @@
package org.apache.juneau.serializer;
import static org.apache.juneau.collections.JsonMap.*;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import java.io.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/MultipartVar.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/MultipartVar.java
index 1399d256a9..e92e0ba48e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/MultipartVar.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/MultipartVar.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau.svl;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import org.apache.juneau.common.utils.*;
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestResponse.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestResponse.java
index 1c6305352f..956e567592 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestResponse.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestResponse.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau.rest.client;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import static org.apache.juneau.httppart.HttpPartType.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
index a1d175a5e9..80cc0841a8 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
@@ -17,6 +17,7 @@
package org.apache.juneau.rest;
import static java.util.Optional.*;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.IOUtils.*;
import static org.apache.juneau.common.utils.ThrowableUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/DataConversion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/DataConversion_Test.java
index 706e581c58..b56e84d281 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/DataConversion_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/DataConversion_Test.java
@@ -17,6 +17,7 @@
package org.apache.juneau;
import static org.apache.juneau.TestUtils.*;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.junit.jupiter.api.Assertions.*;
import java.util.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/DynaBean_ComboRoundTripTest.java
b/juneau-utest/src/test/java/org/apache/juneau/DynaBean_ComboRoundTripTest.java
index 925744dad9..41ede2c4b2 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/DynaBean_ComboRoundTripTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/DynaBean_ComboRoundTripTest.java
@@ -17,6 +17,7 @@
package org.apache.juneau;
import static org.apache.juneau.assertions.Verify.*;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import java.util.*;
diff --git a/juneau-utest/src/test/java/org/apache/juneau/JacocoDummy_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/JacocoDummy_Test.java
index ac0708f9f0..f3abae7314 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/JacocoDummy_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/JacocoDummy_Test.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import static org.junit.jupiter.api.Assertions.*;
diff --git a/juneau-utest/src/test/java/org/apache/juneau/JsonList_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/JsonList_Test.java
index 67e4459d16..396ee8f63b 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/JsonList_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/JsonList_Test.java
@@ -17,6 +17,7 @@
package org.apache.juneau;
import static org.apache.juneau.TestUtils.*;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.junit.bct.BctAssertions.*;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripAddClassAttrs_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripAddClassAttrs_Test.java
index a3d4f1a563..f80b29708b 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripAddClassAttrs_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripAddClassAttrs_Test.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau.a.rttests;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import static org.apache.juneau.junit.bct.BctAssertions.*;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeansWithBuilders_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeansWithBuilders_Test.java
index 079cbbff9e..41337fc280 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeansWithBuilders_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeansWithBuilders_Test.java
@@ -18,6 +18,7 @@ package org.apache.juneau.a.rttests;
import static java.util.Collections.*;
import static org.apache.juneau.TestUtils.*;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.junit.bct.BctAssertions.*;
import java.util.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTrip_Tester.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTrip_Tester.java
index c2a8bbee0b..27ae7a3416 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTrip_Tester.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTrip_Tester.java
@@ -19,6 +19,8 @@ package org.apache.juneau.a.rttests;
import static java.util.Collections.*;
import static java.util.Optional.*;
import static org.apache.juneau.TestUtils.*;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
+
import java.lang.reflect.*;
import java.util.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/TrimStrings_RoundTripTest.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/TrimStrings_RoundTripTest.java
index cd3b5e9d58..d3f264945a 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/TrimStrings_RoundTripTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/TrimStrings_RoundTripTest.java
@@ -17,6 +17,7 @@
package org.apache.juneau.a.rttests;
import static org.apache.juneau.TestUtils.*;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.junit.jupiter.api.Assertions.*;
import org.apache.juneau.collections.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/BeanAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/BeanAssertion_Test.java
index b03d506974..f25d9a4c4a 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/BeanAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/BeanAssertion_Test.java
@@ -18,6 +18,7 @@ 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.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import static org.apache.juneau.common.utils.Utils.eq;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/bean/html5/A_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/bean/html5/A_Test.java
index 28a143e1e8..1876c2c386 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/bean/html5/A_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/bean/html5/A_Test.java
@@ -108,7 +108,7 @@ class A_Test extends TestBase {
}
@Test void a03_otherConstructors() {
- A x1 = new A("a", Utils.a("b1", strong("b2")));
+ A x1 = new A("a", CollectionUtils.a("b1", strong("b2")));
assertString("<a href='a'>b1<strong>b2</strong></a>", x1);
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/bean/html5/Html5_ComboRoundTripTest.java
b/juneau-utest/src/test/java/org/apache/juneau/bean/html5/Html5_ComboRoundTripTest.java
index 22056d4108..d1b7f25000 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/bean/html5/Html5_ComboRoundTripTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/bean/html5/Html5_ComboRoundTripTest.java
@@ -22,7 +22,7 @@ import static org.apache.juneau.bean.html5.HtmlBuilder.map;
import static org.apache.juneau.bean.html5.HtmlBuilder.u;
import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.CollectionUtils.map;
-import static org.apache.juneau.common.utils.Utils.a;
+import static org.apache.juneau.common.utils.CollectionUtils.a;
import java.lang.reflect.*;
import java.util.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/collections/Args_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/collections/Args_Test.java
index 038307d8e5..9d62cd5a0e 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/collections/Args_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/collections/Args_Test.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.collections;
-import static org.apache.juneau.common.utils.Utils.*;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.junit.jupiter.api.Assertions.*;
import java.util.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/common/collections/MultiSet_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/common/collections/MultiSet_Test.java
index f177df4eda..e4f5d45fb6 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/common/collections/MultiSet_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/common/collections/MultiSet_Test.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.common.collections;
-import static org.apache.juneau.common.utils.Utils.*;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
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/common/collections/SimpleMap_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/common/collections/SimpleMap_Test.java
index cb2b7c8772..7b3aa5e81a 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/common/collections/SimpleMap_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/common/collections/SimpleMap_Test.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau.common.collections;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import static org.apache.juneau.junit.bct.BctAssertions.*;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigMap_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigMap_Test.java
index 8229e74a2a..f5573ae600 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigMap_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigMap_Test.java
@@ -17,6 +17,7 @@
package org.apache.juneau.config;
import static org.apache.juneau.TestUtils.*;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.junit.jupiter.api.Assertions.*;
import java.util.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/encoders/EncoderSet_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/encoders/EncoderSet_Test.java
index 35219e728e..ad8f1f4838 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/encoders/EncoderSet_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/encoders/EncoderSet_Test.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau.encoders;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
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/html/Html_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/html/Html_Test.java
index 19abd8f539..18c43a70e9 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/html/Html_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/html/Html_Test.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau.html;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import static org.apache.juneau.html.annotation.HtmlFormat.*;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/AnnotationUtils_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/AnnotationUtils_Test.java
index c85679f92a..448ec8cc50 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/AnnotationUtils_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/AnnotationUtils_Test.java
@@ -193,7 +193,7 @@ class AnnotationUtils_Test extends TestBase {
assertTrue(ResponseAnnotation.empty((Response)null));
assertFalse(ResponseAnnotation.empty(response().examples(a("foo")).build()));
-
assertFalse(ResponseAnnotation.empty(response().headers(Utils.a(header().name("foo").build())).build()));
+
assertFalse(ResponseAnnotation.empty(response().headers(CollectionUtils.a(header().name("foo").build())).build()));
assertFalse(ResponseAnnotation.empty(response().parser(OpenApiParser.class).build()));
assertFalse(ResponseAnnotation.empty(response().schema(schema().$ref("foo").build()).build()));
assertFalse(ResponseAnnotation.empty(response().serializer(OpenApiSerializer.class).build()));
diff --git a/juneau-utest/src/test/java/org/apache/juneau/json/Json_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/json/Json_Test.java
index 0f859abed7..07b7519a37 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/json/Json_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/json/Json_Test.java
@@ -17,6 +17,7 @@
package org.apache.juneau.json;
import static org.apache.juneau.TestUtils.*;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.junit.jupiter.api.Assertions.*;
import java.util.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/junit/bct/PropertyExtractors_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/PropertyExtractors_Test.java
index 16ffdbd1c8..2cae28d542 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/junit/bct/PropertyExtractors_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/PropertyExtractors_Test.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau.junit.bct;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
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/mstat/ThrownStore_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/mstat/ThrownStore_Test.java
index 8a4a7c7098..49da22c510 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/mstat/ThrownStore_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/mstat/ThrownStore_Test.java
@@ -17,6 +17,7 @@
package org.apache.juneau.mstat;
import static org.apache.juneau.TestUtils.*;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
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/objecttools/ObjectSearcher_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectSearcher_Test.java
index fd6b49f58b..8aa26860d1 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectSearcher_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectSearcher_Test.java
@@ -649,7 +649,7 @@ public class ObjectSearcher_Test extends TestBase {
}
@Test void d03_d2ArrayOfMaps() {
- var in = Utils.a(
+ var in = CollectionUtils.a(
map("f","foo"),
map("f","bar"),
null,
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/Header_AcceptEncoding_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/Header_AcceptEncoding_Test.java
index 15e5f5a3b1..4dda65f586 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/Header_AcceptEncoding_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/Header_AcceptEncoding_Test.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau.rest;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/RestOp_Params_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/RestOp_Params_Test.java
index 98b22f633a..6447de2d62 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/RestOp_Params_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/RestOp_Params_Test.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau.rest;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.IOUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import static org.apache.juneau.http.HttpMethod.*;
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 7190f504f7..e9a954ad38 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
@@ -139,7 +139,7 @@ class Response_Test extends TestBase {
@Response(schema=@Schema(collectionFormat="pipes"))
@RestGet
public String[] a() {
- return Utils.a("foo","bar");
+ return CollectionUtils.a("foo","bar");
}
@Response(schema=@Schema(type="string",format="byte"))
@RestGet
@@ -164,7 +164,7 @@ class Response_Test extends TestBase {
}
@RestGet
public void
g(@Response(schema=@Schema(collectionFormat="pipes")) Value<String[]> value) {
- value.set(Utils.a("foo","bar"));
+ value.set(CollectionUtils.a("foo","bar"));
}
@RestGet
public void
h(@Response(schema=@Schema(type="string",format="byte")) Value<byte[]> value) {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Encoders_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Encoders_Test.java
index 29cab6e042..e679bb03b2 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Encoders_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Encoders_Test.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau.rest.annotation;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import org.apache.juneau.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_OpenApi_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_OpenApi_Test.java
index ed418e8c12..21fd8224db 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_OpenApi_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_OpenApi_Test.java
@@ -17,6 +17,7 @@
package org.apache.juneau.rest.client;
import static org.apache.juneau.TestUtils.*;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.httppart.HttpPartCollectionFormat.*;
import static org.apache.juneau.uon.ParamFormat.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_RestClient_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_RestClient_Test.java
index d8dee16fa7..f747795e92 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_RestClient_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_RestClient_Test.java
@@ -17,6 +17,7 @@
package org.apache.juneau.rest.client;
import static org.apache.juneau.TestUtils.*;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.ThrowableUtils.*;
import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.http.HttpResponses.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Paths_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Paths_Test.java
index 865b481978..fcdd68156a 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Paths_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Paths_Test.java
@@ -17,6 +17,7 @@
package org.apache.juneau.rest.client;
import static org.apache.juneau.TestUtils.*;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.http.HttpParts.*;
import static org.apache.juneau.httppart.HttpPartSchema.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Test.java
index b4e0cd8df7..70310c798d 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Test.java
@@ -19,6 +19,7 @@ package org.apache.juneau.rest.client;
import static java.time.format.DateTimeFormatter.*;
import static java.time.temporal.ChronoUnit.*;
import static org.apache.juneau.TestUtils.*;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Test.java
index 9a1dab173a..0d46bbf55e 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Test.java
@@ -17,6 +17,7 @@
package org.apache.juneau.rest.client;
import static org.apache.juneau.TestUtils.*;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.http.HttpResponses.*;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/util/RestUtils_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/util/RestUtils_Test.java
index 9248721c7e..6c8fffb439 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/util/RestUtils_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/util/RestUtils_Test.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau.rest.util;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.StringUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import static org.apache.juneau.junit.bct.BctAssertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/serializer/WriterFluentSetters_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/serializer/WriterFluentSetters_Test.java
index 396c3570f3..f797d272f6 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/serializer/WriterFluentSetters_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/serializer/WriterFluentSetters_Test.java
@@ -12,6 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.serializer;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/svl/vars/IfVarTest.java
b/juneau-utest/src/test/java/org/apache/juneau/svl/vars/IfVarTest.java
index c76263cf17..fae1cb4fa2 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/svl/vars/IfVarTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/svl/vars/IfVarTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau.svl.vars;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/transforms/EnumerationSwapTest.java
b/juneau-utest/src/test/java/org/apache/juneau/transforms/EnumerationSwapTest.java
index 26d23bc0e4..8038870c29 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/transforms/EnumerationSwapTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/transforms/EnumerationSwapTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau.transforms;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/transforms/IteratorSwapTest.java
b/juneau-utest/src/test/java/org/apache/juneau/transforms/IteratorSwapTest.java
index ee55a7a93d..0c55c553f8 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/transforms/IteratorSwapTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/transforms/IteratorSwapTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau.transforms;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/uon/UonSerializer_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/uon/UonSerializer_Test.java
index 81c79e6d69..2ac1ef91bf 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/uon/UonSerializer_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/uon/UonSerializer_Test.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau.uon;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/utils/FilteredMapTest.java
b/juneau-utest/src/test/java/org/apache/juneau/utils/FilteredMapTest.java
index 24cb3383e6..08847462fd 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/utils/FilteredMapTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/utils/FilteredMapTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau.utils;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
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/utils/StringExpressionMatcher_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/utils/StringExpressionMatcher_Test.java
index b46f67c5cc..b2735b3991 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/utils/StringExpressionMatcher_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/utils/StringExpressionMatcher_Test.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau.utils;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/utils/StringVarResolver_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/utils/StringVarResolver_Test.java
index 30459c0674..9afe58aec3 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/utils/StringVarResolver_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/utils/StringVarResolver_Test.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau.utils;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import static org.junit.jupiter.api.Assertions.*;
