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 db4d5ee4b Test modernization, clean up utility classes.
db4d5ee4b is described below
commit db4d5ee4bf79900a516ea098b15c56f6665f6357
Author: James Bognar <[email protected]>
AuthorDate: Mon Aug 25 12:57:06 2025 -0400
Test modernization, clean up utility classes.
---
.../src/main/java/org/apache/juneau/bean/openapi3/Discriminator.java | 1 -
.../src/main/java/org/apache/juneau/bean/openapi3/Encoding.java | 1 -
.../src/main/java/org/apache/juneau/bean/openapi3/Example.java | 1 -
.../src/main/java/org/apache/juneau/bean/openapi3/HeaderInfo.java | 1 -
.../src/main/java/org/apache/juneau/bean/openapi3/Info.java | 1 -
.../src/main/java/org/apache/juneau/bean/openapi3/Items.java | 1 -
.../src/main/java/org/apache/juneau/bean/openapi3/Link.java | 1 -
.../src/main/java/org/apache/juneau/bean/openapi3/OAuthFlow.java | 1 -
.../main/java/org/apache/juneau/bean/openapi3/RequestBodyInfo.java | 1 -
.../src/main/java/org/apache/juneau/bean/openapi3/Response.java | 1 -
.../src/main/java/org/apache/juneau/bean/openapi3/SchemaInfo.java | 1 -
.../main/java/org/apache/juneau/bean/openapi3/SecuritySchemeInfo.java | 1 -
.../src/main/java/org/apache/juneau/bean/openapi3/ServerVariable.java | 1 -
.../src/main/java/org/apache/juneau/bean/openapi3/Tag.java | 1 -
.../src/main/java/org/apache/juneau/bean/openapi3/Xml.java | 1 -
.../java/org/apache/juneau/bean/swagger/ExternalDocumentation.java | 1 -
.../src/main/java/org/apache/juneau/bean/swagger/HeaderInfo.java | 1 -
.../src/main/java/org/apache/juneau/bean/swagger/Info.java | 1 -
.../src/main/java/org/apache/juneau/bean/swagger/Items.java | 1 -
.../src/main/java/org/apache/juneau/bean/swagger/License.java | 1 -
.../src/main/java/org/apache/juneau/bean/swagger/ParameterInfo.java | 1 -
.../src/main/java/org/apache/juneau/bean/swagger/ResponseInfo.java | 1 -
.../src/main/java/org/apache/juneau/bean/swagger/SchemaInfo.java | 1 -
.../src/main/java/org/apache/juneau/bean/swagger/SecurityScheme.java | 1 -
.../src/main/java/org/apache/juneau/bean/swagger/Tag.java | 1 -
.../src/main/java/org/apache/juneau/bean/swagger/Xml.java | 1 -
.../main/java/org/apache/juneau/assertions/AssertionPredicates.java | 2 --
.../main/java/org/apache/juneau/assertions/FluentArrayAssertion.java | 1 -
.../main/java/org/apache/juneau/assertions/FluentDateAssertion.java | 2 --
.../main/java/org/apache/juneau/assertions/FluentObjectAssertion.java | 2 +-
.../org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java | 1 -
.../src/main/java/org/apache/juneau/assertions/StringAssertion.java | 2 --
.../juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java | 1 -
.../src/main/java/org/apache/juneau/BeanPropertyMeta.java | 2 --
.../juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java | 1 -
.../juneau-marshall/src/main/java/org/apache/juneau/Context.java | 2 +-
.../src/main/java/org/apache/juneau/ContextSession.java | 2 +-
.../main/java/org/apache/juneau/InvalidDataConversionException.java | 2 --
.../src/main/java/org/apache/juneau/cp/BasicFileFinder.java | 2 --
.../juneau-marshall/src/main/java/org/apache/juneau/cp/BeanStore.java | 4 ++--
.../src/main/java/org/apache/juneau/cp/BeanStoreEntry.java | 2 +-
.../juneau-marshall/src/main/java/org/apache/juneau/cp/LocalDir.java | 2 --
.../juneau-marshall/src/main/java/org/apache/juneau/cp/Messages.java | 1 -
.../src/main/java/org/apache/juneau/html/BasicHtmlDocTemplate.java | 2 --
.../src/main/java/org/apache/juneau/html/HtmlSerializerSession.java | 1 -
.../src/main/java/org/apache/juneau/internal/ArrayUtils.java | 2 --
.../src/main/java/org/apache/juneau/internal/DelegateMap.java | 2 --
.../java/org/apache/juneau/internal/{ObjectUtils.java => Utils2.java} | 4 +---
.../src/main/java/org/apache/juneau/objecttools/ObjectSearcher.java | 1 -
.../src/main/java/org/apache/juneau/objecttools/ObjectSorter.java | 1 -
.../src/main/java/org/apache/juneau/parser/ParserSet.java | 1 -
.../src/main/java/org/apache/juneau/reflect/AnnotationInfo.java | 2 --
.../src/main/java/org/apache/juneau/reflect/ClassInfo.java | 2 --
.../src/main/java/org/apache/juneau/serializer/SerializerSet.java | 2 --
.../juneau-marshall/src/main/java/org/apache/juneau/svl/MapVar.java | 2 --
.../org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java | 2 --
.../src/main/java/org/apache/juneau/utils/BeanDiff.java | 1 -
.../juneau-marshall/src/main/java/org/apache/juneau/utils/Tuple2.java | 2 --
.../juneau-marshall/src/main/java/org/apache/juneau/utils/Tuple3.java | 2 --
.../juneau-marshall/src/main/java/org/apache/juneau/utils/Tuple4.java | 2 --
.../juneau-marshall/src/main/java/org/apache/juneau/utils/Tuple5.java | 2 --
.../java/org/apache/juneau/examples/core/config/store/SqlStore.java | 2 +-
.../src/main/java/org/apache/juneau/microservice/Microservice.java | 3 ---
.../src/main/java/org/apache/juneau/rest/client/ResponseContent.java | 1 -
.../src/main/java/org/apache/juneau/http/BasicStatusLine.java | 2 --
.../src/main/java/org/apache/juneau/http/HttpHeaders.java | 1 -
.../main/java/org/apache/juneau/http/header/BasicEntityTagHeader.java | 1 -
.../java/org/apache/juneau/http/header/BasicEntityTagsHeader.java | 1 -
.../src/main/java/org/apache/juneau/http/header/BasicHeader.java | 1 -
.../main/java/org/apache/juneau/http/header/BasicIntegerHeader.java | 1 -
.../src/main/java/org/apache/juneau/http/header/BasicLongHeader.java | 1 -
.../java/org/apache/juneau/http/header/BasicMediaRangesHeader.java | 1 -
.../main/java/org/apache/juneau/http/header/BasicMediaTypeHeader.java | 1 -
.../main/java/org/apache/juneau/http/header/BasicStringHeader.java | 1 -
.../java/org/apache/juneau/http/header/BasicStringRangesHeader.java | 1 -
.../src/main/java/org/apache/juneau/http/header/ClientVersion.java | 1 -
.../src/main/java/org/apache/juneau/http/header/EntityTag.java | 2 +-
.../src/main/java/org/apache/juneau/http/header/HeaderBeanMeta.java | 1 -
.../src/main/java/org/apache/juneau/http/header/IfRange.java | 1 -
.../src/main/java/org/apache/juneau/http/part/BasicPart.java | 1 -
.../src/main/java/org/apache/juneau/http/part/PartBeanMeta.java | 1 -
.../src/main/java/org/apache/juneau/rest/RestOpContext.java | 1 -
.../main/java/org/apache/juneau/rest/beans/ResourceDescription.java | 2 --
.../src/main/java/org/apache/juneau/rest/debug/DebugEnablement.java | 1 -
.../main/java/org/apache/juneau/rest/httppart/RequestAttribute.java | 1 -
.../src/main/java/org/apache/juneau/rest/httppart/RequestHeaders.java | 1 -
.../src/main/java/org/apache/juneau/rest/logger/CallLogger.java | 1 -
.../java/org/apache/juneau/rest/processor/ResponseBeanProcessor.java | 1 -
.../main/java/org/apache/juneau/rest/staticfile/BasicStaticFiles.java | 2 --
.../src/main/java/org/apache/juneau/rest/stats/ThrownStore.java | 1 -
.../test/java/org/apache/juneau/assertions/BeanAssertion_Test.java | 1 -
.../java/org/apache/juneau/assertions/BeanListAssertion_Test.java | 1 -
juneau-utest/src/test/java/org/apache/juneau/cp/BeanStore_Test.java | 2 +-
.../test/java/org/apache/juneau/http/header/HeaderBeanMeta_Test.java | 1 -
.../src/test/java/org/apache/juneau/http/part/PartBeanMeta_Test.java | 1 -
.../src/test/java/org/apache/juneau/http/part/PartList_Test.java | 1 -
96 files changed, 10 insertions(+), 123 deletions(-)
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Discriminator.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Discriminator.java
index 396d36c8b..8bb80b048 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Discriminator.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Discriminator.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.bean.openapi3;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ConverterUtils.*;
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Encoding.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Encoding.java
index 7c4e11bca..af20639de 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Encoding.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Encoding.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.bean.openapi3;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ConverterUtils.*;
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Example.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Example.java
index 8d6385ff3..3201a6c90 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Example.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Example.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.bean.openapi3;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ConverterUtils.*;
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/HeaderInfo.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/HeaderInfo.java
index 847bd8fdf..0c57e985c 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/HeaderInfo.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/HeaderInfo.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.bean.openapi3;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ConverterUtils.*;
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Info.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Info.java
index fa6ed2bbc..7151ed04a 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Info.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Info.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.bean.openapi3;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ConverterUtils.*;
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Items.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Items.java
index 1813377a9..be5fc1c84 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Items.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Items.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.bean.openapi3;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.ArrayUtils.contains;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.CollectionUtils.copyOf;
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Link.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Link.java
index b191ce819..1dbb5eae2 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Link.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Link.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.bean.openapi3;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ConverterUtils.*;
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/OAuthFlow.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/OAuthFlow.java
index 92776082f..b17561491 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/OAuthFlow.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/OAuthFlow.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.bean.openapi3;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ConverterUtils.*;
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/RequestBodyInfo.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/RequestBodyInfo.java
index 99d3d0141..a29abf5bc 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/RequestBodyInfo.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/RequestBodyInfo.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.bean.openapi3;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ConverterUtils.*;
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Response.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Response.java
index 2826d132c..095888505 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Response.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Response.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.bean.openapi3;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ConverterUtils.*;
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/SchemaInfo.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/SchemaInfo.java
index 916d98b06..e1c51ca84 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/SchemaInfo.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/SchemaInfo.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.bean.openapi3;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ConverterUtils.*;
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/SecuritySchemeInfo.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/SecuritySchemeInfo.java
index 9ef044bb9..73fdad371 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/SecuritySchemeInfo.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/SecuritySchemeInfo.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.bean.openapi3;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.ArrayUtils.contains;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ConverterUtils.*;
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/ServerVariable.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/ServerVariable.java
index 2b492d553..a65b3775e 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/ServerVariable.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/ServerVariable.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.bean.openapi3;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ConverterUtils.*;
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Tag.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Tag.java
index ddb5e8ca7..1f2b932b0 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Tag.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Tag.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.bean.openapi3;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ConverterUtils.*;
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Xml.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Xml.java
index 4255783d2..86d0f50ec 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Xml.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Xml.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.bean.openapi3;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ConverterUtils.*;
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/ExternalDocumentation.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/ExternalDocumentation.java
index 0c4529723..9125e5afb 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/ExternalDocumentation.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/ExternalDocumentation.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.bean.swagger;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ConverterUtils.*;
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/HeaderInfo.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/HeaderInfo.java
index c754429e0..a36e2dab7 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/HeaderInfo.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/HeaderInfo.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.bean.swagger;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ConverterUtils.*;
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Info.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Info.java
index b2c76f92e..0ae8dbffe 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Info.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Info.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.bean.swagger;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ConverterUtils.*;
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Items.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Items.java
index f9e8386b1..2a0e593a4 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Items.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Items.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.bean.swagger;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ConverterUtils.*;
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/License.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/License.java
index ede2c8274..04946ad3b 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/License.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/License.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.bean.swagger;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ConverterUtils.*;
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/ParameterInfo.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/ParameterInfo.java
index 6cfb3ad12..04cc21418 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/ParameterInfo.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/ParameterInfo.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.bean.swagger;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.ArrayUtils.contains;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.CollectionUtils.copyOf;
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/ResponseInfo.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/ResponseInfo.java
index 9d569b6c7..764f95b25 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/ResponseInfo.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/ResponseInfo.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.bean.swagger;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ConverterUtils.*;
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/SchemaInfo.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/SchemaInfo.java
index 11dee9ccf..02f17fb44 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/SchemaInfo.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/SchemaInfo.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.bean.swagger;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ConverterUtils.*;
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/SecurityScheme.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/SecurityScheme.java
index c84d84e09..75979aee5 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/SecurityScheme.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/SecurityScheme.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.bean.swagger;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.ArrayUtils.contains;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.CollectionUtils.copyOf;
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Tag.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Tag.java
index b54daa1fc..383e26305 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Tag.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Tag.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.bean.swagger;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ConverterUtils.*;
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Xml.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Xml.java
index 1ff57f1ac..e5bb33d33 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Xml.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Xml.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.bean.swagger;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ConverterUtils.*;
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicates.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicates.java
index 0c4df3eb3..5973b8839 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicates.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicates.java
@@ -14,8 +14,6 @@ package org.apache.juneau.assertions;
import static org.apache.juneau.assertions.AssertionPredicate.*;
import static org.apache.juneau.common.internal.ArgUtils.*;
-import static org.apache.juneau.common.internal.StringUtils.*;
-
import java.text.*;
import java.util.*;
import java.util.function.*;
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
index cb9b6f058..6865819c0 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
@@ -15,7 +15,6 @@ package org.apache.juneau.assertions;
import static org.apache.juneau.common.internal.ArgUtils.*;
import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
-import static org.apache.juneau.internal.ObjectUtils.*;
import static java.util.Arrays.*;
import java.io.*;
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java
index 289bef8b5..4f51e12c9 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java
@@ -13,8 +13,6 @@
package org.apache.juneau.assertions;
import static org.apache.juneau.common.internal.ArgUtils.*;
-import static org.apache.juneau.internal.ObjectUtils.*;
-
import java.io.*;
import java.time.temporal.*;
import java.util.*;
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
index 9838aaa7e..2584426d2 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
@@ -413,7 +413,7 @@ public class FluentObjectAssertion<T,R> extends
FluentAssertion<R> {
public R isSame(T value) throws AssertionError {
if (this.value == value)
return returns();
- throw error(MSG_notTheSameValue, value,
ObjectUtils.identity(value), this.value, ObjectUtils.identity(this.value));
+ throw error(MSG_notTheSameValue, value, Utils2.identity(value),
this.value, Utils2.identity(this.value));
}
/**
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
index 3356aa5b6..274821fac 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
@@ -13,7 +13,6 @@
package org.apache.juneau.assertions;
import static org.apache.juneau.common.internal.ArgUtils.*;
-import static org.apache.juneau.internal.ObjectUtils.*;
import static java.util.Arrays.*;
import java.io.*;
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/StringAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/StringAssertion.java
index 0526efe25..82f7fb127 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/StringAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/StringAssertion.java
@@ -12,8 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.assertions;
-import static org.apache.juneau.common.internal.StringUtils.*;
-
import java.io.*;
import java.util.function.*;
import java.util.regex.*;
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 c2c6a231a..c0767a2a4 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
@@ -14,7 +14,6 @@ package org.apache.juneau;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ConsumerUtils.*;
-import static org.apache.juneau.internal.ObjectUtils.*;
import static org.apache.juneau.BeanMeta.MethodType.*;
import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.common.internal.ThrowableUtils.*;
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 fa1bec06e..48a6f0c80 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
@@ -17,8 +17,6 @@ import static
org.apache.juneau.common.internal.ThrowableUtils.*;
import static org.apache.juneau.internal.ArrayUtils.*;
import static org.apache.juneau.internal.ClassUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
-import static org.apache.juneau.internal.ObjectUtils.*;
-
import java.lang.annotation.*;
import java.lang.reflect.*;
import java.net.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
index af2245d9d..c8406b3e2 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
@@ -16,7 +16,6 @@ import static org.apache.juneau.ClassMeta.ClassCategory.*;
import static org.apache.juneau.common.internal.ThrowableUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ConsumerUtils.*;
-import static org.apache.juneau.internal.ObjectUtils.*;
import static java.util.Arrays.*;
import java.io.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
index e31ea7c38..4a2a2fbcc 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
@@ -1139,6 +1139,6 @@ public abstract class Context implements
AnnotationProvider {
@Override /* Object */
public String toString() {
- return ObjectUtils.toPropertyMap(this).asReadableString();
+ return Utils2.toPropertyMap(this).asReadableString();
}
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextSession.java
index 3e4b66f3f..ac86d5859 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextSession.java
@@ -270,6 +270,6 @@ public abstract class ContextSession {
@Override /* Object */
public String toString() {
- return ObjectUtils.toPropertyMap(this).asReadableString();
+ return Utils2.toPropertyMap(this).asReadableString();
}
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/InvalidDataConversionException.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/InvalidDataConversionException.java
index 2402fdc88..53cdadd2f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/InvalidDataConversionException.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/InvalidDataConversionException.java
@@ -12,8 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau;
-import static org.apache.juneau.common.internal.StringUtils.*;
-
import java.text.*;
import org.apache.juneau.common.internal.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BasicFileFinder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BasicFileFinder.java
index 48cca4fa8..0f0679284 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BasicFileFinder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BasicFileFinder.java
@@ -17,8 +17,6 @@ import static org.apache.juneau.common.internal.IOUtils.*;
import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.FileUtils.*;
-import static org.apache.juneau.internal.ObjectUtils.*;
-
import java.io.*;
import java.util.*;
import java.util.ResourceBundle.*;
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 687771936..37a9ffa52 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
@@ -701,9 +701,9 @@ public class BeanStore {
private JsonMap properties() {
Predicate<Boolean> nf = Utils::isTrue;
return filteredMap()
- .append("identity", ObjectUtils.identity(this))
+ .append("identity", Utils2.identity(this))
.append("entries",
entries.stream().map(BeanStoreEntry::properties).collect(toList()))
- .append("outer",
ObjectUtils.identity(outer.orElse(null)))
+ .append("outer", Utils2.identity(outer.orElse(null)))
.append("parent",
parent.map(BeanStore::properties).orElse(null))
.appendIf(nf, "readOnly", readOnly)
.appendIf(nf, "threadSafe", threadSafe)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanStoreEntry.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanStoreEntry.java
index c699b686a..c2e59b577 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanStoreEntry.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanStoreEntry.java
@@ -133,7 +133,7 @@ public class BeanStoreEntry<T> {
protected JsonMap properties() {
return filteredMap()
.append("type", simpleClassName(getType()))
- .append("bean", ObjectUtils.identity(get()))
+ .append("bean", Utils2.identity(get()))
.append("name", getName());
}
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/LocalDir.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/LocalDir.java
index a5b37337f..8df9473bd 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/LocalDir.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/LocalDir.java
@@ -14,8 +14,6 @@ package org.apache.juneau.cp;
import static org.apache.juneau.common.internal.ArgUtils.*;
import static org.apache.juneau.common.internal.StringUtils.*;
-import static org.apache.juneau.internal.ObjectUtils.*;
-
import java.net.*;
import java.nio.file.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/Messages.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/Messages.java
index e737bca9c..ac71c72a9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/Messages.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/Messages.java
@@ -15,7 +15,6 @@ package org.apache.juneau.cp;
import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.common.internal.ThrowableUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
-import static org.apache.juneau.internal.ObjectUtils.*;
import static org.apache.juneau.internal.ResourceBundleUtils.*;
import java.text.*;
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 9b7f6828d..7a7ae776b 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
@@ -16,8 +16,6 @@ import static org.apache.juneau.html.AsideFloat.*;
import org.apache.juneau.common.internal.*;
-import static org.apache.juneau.common.internal.StringUtils.*;
-
import org.apache.juneau.internal.*;
/**
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 54fdc35a2..e9c1bfba8 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
@@ -14,7 +14,6 @@ package org.apache.juneau.html;
import static org.apache.juneau.common.internal.IOUtils.*;
import static org.apache.juneau.common.internal.StringUtils.*;
-import static org.apache.juneau.internal.ObjectUtils.*;
import static org.apache.juneau.xml.XmlSerializerSession.ContentResult.*;
import java.io.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ArrayUtils.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ArrayUtils.java
index cbff34e55..05123ab2d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ArrayUtils.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ArrayUtils.java
@@ -13,8 +13,6 @@
package org.apache.juneau.internal;
import static org.apache.juneau.common.internal.ArgUtils.*;
-import static org.apache.juneau.common.internal.StringUtils.*;
-
import java.lang.reflect.*;
import java.util.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DelegateMap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DelegateMap.java
index f9b97fa50..57b7dc67a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DelegateMap.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DelegateMap.java
@@ -12,8 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.internal;
-import static org.apache.juneau.common.internal.StringUtils.*;
-
import java.util.*;
import org.apache.juneau.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ObjectUtils.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/Utils2.java
similarity index 97%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ObjectUtils.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/Utils2.java
index 2d0bf0d9b..756fc2903 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ObjectUtils.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/Utils2.java
@@ -12,14 +12,12 @@
//
***************************************************************************************************************************
package org.apache.juneau.internal;
-import java.lang.reflect.*;
import java.util.*;
import java.util.concurrent.*;
import java.util.function.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
-import org.apache.juneau.common.internal.*;
import org.apache.juneau.reflect.*;
/**
@@ -28,7 +26,7 @@ import org.apache.juneau.reflect.*;
* <h5 class='section'>See Also:</h5><ul>
* </ul>
*/
-public class ObjectUtils {
+public class Utils2 {
/**
* If the specified object is a {@link Supplier} or {@link Value},
returns the inner value, otherwise the same value.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSearcher.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSearcher.java
index f579d39e3..7879b5387 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSearcher.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSearcher.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.objecttools;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import java.lang.reflect.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSorter.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSorter.java
index 6adcdea3b..0329a2b1c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSorter.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSorter.java
@@ -19,7 +19,6 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.common.internal.*;
-import org.apache.juneau.internal.*;
/**
* POJO model sorter.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSet.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSet.java
index 47357fd85..b4f1b3c5c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSet.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSet.java
@@ -13,7 +13,6 @@
package org.apache.juneau.parser;
import static org.apache.juneau.internal.CollectionUtils.*;
-import static org.apache.juneau.internal.ObjectUtils.*;
import static java.util.stream.Collectors.*;
import java.util.*;
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 2e92e710c..42967737d 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
@@ -15,8 +15,6 @@ package org.apache.juneau.reflect;
import static org.apache.juneau.common.internal.ThrowableUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ConsumerUtils.*;
-import static org.apache.juneau.internal.ObjectUtils.*;
-
import java.lang.annotation.*;
import java.lang.reflect.*;
import java.util.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
index 418622f39..2118714f2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
@@ -12,9 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.reflect;
-import static org.apache.juneau.internal.ObjectUtils.*;
import static org.apache.juneau.common.internal.ArgUtils.*;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.common.internal.ThrowableUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ConsumerUtils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSet.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSet.java
index 538d48332..88af8e5ac 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSet.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSet.java
@@ -14,8 +14,6 @@ package org.apache.juneau.serializer;
import static java.util.stream.Collectors.*;
import static org.apache.juneau.internal.CollectionUtils.*;
-import static org.apache.juneau.internal.ObjectUtils.*;
-
import java.util.*;
import java.util.concurrent.*;
import java.util.function.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/MapVar.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/MapVar.java
index 426c19771..73a109a80 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/MapVar.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/MapVar.java
@@ -13,8 +13,6 @@
package org.apache.juneau.svl;
import static org.apache.juneau.common.internal.ArgUtils.*;
-import static org.apache.juneau.common.internal.StringUtils.*;
-
import java.util.*;
import org.apache.juneau.common.internal.*;
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 f93fc7998..5cb66a0e9 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
@@ -13,8 +13,6 @@
package org.apache.juneau.urlencoding;
import static org.apache.juneau.common.internal.IOUtils.*;
-import static org.apache.juneau.common.internal.StringUtils.*;
-
import java.io.*;
import java.lang.reflect.*;
import java.nio.charset.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/BeanDiff.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/BeanDiff.java
index c15bbbb30..f5dd2fd2b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/BeanDiff.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/BeanDiff.java
@@ -13,7 +13,6 @@
package org.apache.juneau.utils;
import static org.apache.juneau.internal.CollectionUtils.*;
-import static org.apache.juneau.internal.ObjectUtils.*;
import java.util.*;
import org.apache.juneau.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/Tuple2.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/Tuple2.java
index c3cf3c44f..f0b070e6c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/Tuple2.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/Tuple2.java
@@ -12,8 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.utils;
-import static org.apache.juneau.internal.ObjectUtils.*;
-
import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/Tuple3.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/Tuple3.java
index 7c7580c5d..e59fdc31d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/Tuple3.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/Tuple3.java
@@ -12,8 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.utils;
-import static org.apache.juneau.internal.ObjectUtils.*;
-
import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/Tuple4.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/Tuple4.java
index e27b4fc65..cade93f19 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/Tuple4.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/Tuple4.java
@@ -12,8 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.utils;
-import static org.apache.juneau.internal.ObjectUtils.*;
-
import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/Tuple5.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/Tuple5.java
index 6f1310905..04d1971e1 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/Tuple5.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/Tuple5.java
@@ -12,8 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.utils;
-import static org.apache.juneau.internal.ObjectUtils.*;
-
import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
diff --git
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/config/store/SqlStore.java
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/config/store/SqlStore.java
index 53628559c..7882a67ae 100644
---
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/config/store/SqlStore.java
+++
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/config/store/SqlStore.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.examples.core.config.store;
-import static org.apache.juneau.internal.ObjectUtils.*;
+import static org.apache.juneau.internal.Utils2.*;
import static org.apache.juneau.common.internal.Utils.*;
import java.util.*;
diff --git
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
index 915bbd04e..3dd2b1e8f 100755
---
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
+++
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
@@ -17,8 +17,6 @@ import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.ClassUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.FileUtils.*;
-import static org.apache.juneau.internal.ObjectUtils.*;
-
import java.io.*;
import java.io.Console;
import java.net.*;
@@ -39,7 +37,6 @@ import org.apache.juneau.config.store.*;
import org.apache.juneau.config.store.FileStore;
import org.apache.juneau.config.vars.*;
import org.apache.juneau.cp.*;
-import org.apache.juneau.internal.*;
import org.apache.juneau.microservice.console.*;
import org.apache.juneau.microservice.resources.*;
import org.apache.juneau.parser.ParseException;
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseContent.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseContent.java
index 0f020aae0..1da596c50 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseContent.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseContent.java
@@ -32,7 +32,6 @@ import org.apache.juneau.common.internal.*;
import org.apache.juneau.http.entity.*;
import org.apache.juneau.http.resource.*;
import org.apache.juneau.httppart.*;
-import org.apache.juneau.internal.*;
import org.apache.juneau.oapi.*;
import org.apache.juneau.objecttools.*;
import org.apache.juneau.parser.*;
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/BasicStatusLine.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/BasicStatusLine.java
index d67fea189..7bc8fe36d 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/BasicStatusLine.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/BasicStatusLine.java
@@ -12,8 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.http;
-import static org.apache.juneau.internal.ObjectUtils.*;
-
import java.util.*;
import org.apache.http.*;
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 505b61e0b..de59defee 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.http;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.ClassUtils.*;
import java.net.*;
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicEntityTagHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicEntityTagHeader.java
index 99e6f6945..44a6fb876 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicEntityTagHeader.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicEntityTagHeader.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import java.util.*;
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicEntityTagsHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicEntityTagsHeader.java
index f2de8ee6d..1269ee7a9 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicEntityTagsHeader.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicEntityTagsHeader.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import java.util.*;
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicHeader.java
index cca056179..11c231dc0 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicHeader.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicHeader.java
@@ -15,7 +15,6 @@ package org.apache.juneau.http.header;
import static org.apache.juneau.common.internal.ArgUtils.*;
import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
-import static org.apache.juneau.internal.ObjectUtils.*;
import java.io.*;
import java.util.*;
import java.util.function.*;
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicIntegerHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicIntegerHeader.java
index 376a9bfb8..ba233b001 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicIntegerHeader.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicIntegerHeader.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import java.util.*;
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicLongHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicLongHeader.java
index 4f45b0d4c..f1aaaccd5 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicLongHeader.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicLongHeader.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import java.util.*;
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicMediaRangesHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicMediaRangesHeader.java
index c0b2fd4f9..bd27a74f6 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicMediaRangesHeader.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicMediaRangesHeader.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import java.util.*;
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicMediaTypeHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicMediaTypeHeader.java
index 112c3c60b..71f279999 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicMediaTypeHeader.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicMediaTypeHeader.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import java.util.*;
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicStringHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicStringHeader.java
index ec03ea356..71fee37b2 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicStringHeader.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicStringHeader.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import java.util.*;
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicStringRangesHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicStringRangesHeader.java
index 0d0b3c7d3..9661d9880 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicStringRangesHeader.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicStringRangesHeader.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import java.util.*;
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 e217a98d5..6e613d9e1 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import java.util.*;
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/EntityTag.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/EntityTag.java
index 3226aff87..2faab3aaa 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/EntityTag.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/EntityTag.java
@@ -14,7 +14,7 @@ package org.apache.juneau.http.header;
import static org.apache.juneau.common.internal.ArgUtils.*;
import static org.apache.juneau.common.internal.Utils.*;
-import static org.apache.juneau.internal.ObjectUtils.*;
+import static org.apache.juneau.internal.Utils2.*;
import org.apache.juneau.common.internal.*;
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HeaderBeanMeta.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HeaderBeanMeta.java
index 0cfdee1c4..0786ce17f 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HeaderBeanMeta.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HeaderBeanMeta.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.common.internal.ThrowableUtils.*;
import java.lang.reflect.*;
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/IfRange.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/IfRange.java
index 21cc41597..1b191e90c 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/IfRange.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/IfRange.java
@@ -13,7 +13,6 @@
package org.apache.juneau.http.header;
import static java.time.format.DateTimeFormatter.*;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.ClassUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import java.time.*;
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicPart.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicPart.java
index 92d4d1f2d..ea20bb8c7 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicPart.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicPart.java
@@ -13,7 +13,6 @@
package org.apache.juneau.http.part;
import static org.apache.juneau.common.internal.ArgUtils.*;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.ClassUtils.*;
import java.util.*;
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/PartBeanMeta.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/PartBeanMeta.java
index 2f23cc0a0..41a853f89 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/PartBeanMeta.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/PartBeanMeta.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.part;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.common.internal.ThrowableUtils.*;
import java.lang.reflect.*;
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 c3effd5fd..365a671d3 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
@@ -13,7 +13,6 @@
package org.apache.juneau.rest;
import static org.apache.juneau.internal.CollectionUtils.*;
-import static org.apache.juneau.internal.ObjectUtils.*;
import static org.apache.juneau.collections.JsonMap.*;
import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.common.internal.ThrowableUtils.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/beans/ResourceDescription.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/beans/ResourceDescription.java
index 289103d4e..27f30ce1a 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/beans/ResourceDescription.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/beans/ResourceDescription.java
@@ -12,8 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.beans;
-import static org.apache.juneau.internal.ObjectUtils.*;
-
import org.apache.juneau.annotation.*;
import org.apache.juneau.common.internal.*;
import org.apache.juneau.html.annotation.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/debug/DebugEnablement.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/debug/DebugEnablement.java
index 77f935611..65c85c5d8 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/debug/DebugEnablement.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/debug/DebugEnablement.java
@@ -14,7 +14,6 @@ package org.apache.juneau.rest.debug;
import static org.apache.juneau.Enablement.*;
import static org.apache.juneau.collections.JsonMap.*;
-import static org.apache.juneau.internal.ObjectUtils.*;
import java.lang.reflect.Method;
import java.util.function.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestAttribute.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestAttribute.java
index 9f5feb8ac..7d658f090 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestAttribute.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestAttribute.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.httppart;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import java.util.*;
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 a5280acce..df0f6cc93 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
@@ -16,7 +16,6 @@ import static org.apache.juneau.internal.ClassUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static java.util.stream.Collectors.*;
import static org.apache.juneau.common.internal.ArgUtils.*;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.httppart.HttpPartType.*;
import java.util.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/CallLogger.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/CallLogger.java
index 9f2d67640..25778ae41 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/CallLogger.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/CallLogger.java
@@ -17,7 +17,6 @@ import static org.apache.juneau.Enablement.*;
import static org.apache.juneau.collections.JsonMap.*;
import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.common.internal.Utils.*;
-import static org.apache.juneau.internal.ObjectUtils.*;
import static org.apache.juneau.rest.logger.CallLoggingDetail.*;
import java.util.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseBeanProcessor.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseBeanProcessor.java
index 6a9fabe55..e399df1de 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseBeanProcessor.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseBeanProcessor.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.processor;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.ClassUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
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 72dd5ecd3..ffdacf56c 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
@@ -17,8 +17,6 @@ import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.http.HttpResources.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.FileUtils.*;
-import static org.apache.juneau.internal.ObjectUtils.*;
-
import java.io.*;
import java.util.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/stats/ThrownStore.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/stats/ThrownStore.java
index 2e1efbcb7..ffddb0022 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/stats/ThrownStore.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/stats/ThrownStore.java
@@ -14,7 +14,6 @@ package org.apache.juneau.rest.stats;
import static java.util.stream.Collectors.*;
import static org.apache.juneau.internal.CollectionUtils.*;
-import static org.apache.juneau.internal.ObjectUtils.*;
import static java.util.Comparator.*;
import java.util.*;
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 1001a4a2e..a0a598505 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
@@ -19,7 +19,6 @@ import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.*;
import org.apache.juneau.common.internal.*;
-import org.apache.juneau.internal.*;
import org.apache.juneau.json.*;
import org.apache.juneau.serializer.*;
import org.junit.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/BeanListAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/BeanListAssertion_Test.java
index 700cc30f9..c735b12e3 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/BeanListAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/BeanListAssertion_Test.java
@@ -22,7 +22,6 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.common.internal.*;
-import org.apache.juneau.internal.*;
import org.apache.juneau.json.*;
import org.apache.juneau.serializer.*;
import org.junit.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/cp/BeanStore_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/cp/BeanStore_Test.java
index b33e8d2a2..c380864d0 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/cp/BeanStore_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/cp/BeanStore_Test.java
@@ -15,7 +15,7 @@ package org.apache.juneau.cp;
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.*;
import static org.apache.juneau.TestUtils.*;
-import static org.apache.juneau.internal.ObjectUtils.*;
+import static org.apache.juneau.internal.Utils2.*;
import static org.junit.Assert.*;
import java.lang.annotation.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/HeaderBeanMeta_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/HeaderBeanMeta_Test.java
index 03932dc79..a556cc357 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/HeaderBeanMeta_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/HeaderBeanMeta_Test.java
@@ -13,7 +13,6 @@
package org.apache.juneau.http.header;
import static org.apache.juneau.TestUtils.*;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/part/PartBeanMeta_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/part/PartBeanMeta_Test.java
index 7275b52a1..335374a72 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/part/PartBeanMeta_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/part/PartBeanMeta_Test.java
@@ -13,7 +13,6 @@
package org.apache.juneau.http.part;
import static org.apache.juneau.TestUtils.*;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/part/PartList_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/part/PartList_Test.java
index 8265c1829..55176c2a0 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/part/PartList_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/part/PartList_Test.java
@@ -13,7 +13,6 @@
package org.apache.juneau.http.part;
import static org.apache.juneau.TestUtils.*;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.http.HttpParts.*;
import static org.junit.jupiter.api.Assertions.*;
