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 c8d8cb202e Utility class cleanup
c8d8cb202e is described below
commit c8d8cb202e5d0367b5bf387060da62d70931fd1c
Author: James Bognar <[email protected]>
AuthorDate: Mon Oct 27 14:30:45 2025 -0400
Utility class cleanup
---
TODO.md | 2 ++
.../java/org/apache/juneau/bean/jsonschema/JsonSchema.java | 10 ++++------
.../main/java/org/apache/juneau/bean/openapi3/OpenApi.java | 2 +-
.../main/java/org/apache/juneau/bean/swagger/Swagger.java | 2 +-
.../java/org/apache/juneau/common/collections/Value.java | 5 ++---
.../src/main/java/org/apache/juneau/AnnotationApplier.java | 3 ++-
.../src/main/java/org/apache/juneau/BeanContext.java | 3 ++-
.../src/main/java/org/apache/juneau/BeanFilter.java | 11 ++++++-----
.../src/main/java/org/apache/juneau/BeanMap.java | 3 ++-
.../src/main/java/org/apache/juneau/BeanPropertyMeta.java | 13 +++++++------
.../src/main/java/org/apache/juneau/BeanRegistry.java | 7 +++----
.../src/main/java/org/apache/juneau/BeanSession.java | 2 +-
.../main/java/org/apache/juneau/BeanTraverseSession.java | 2 +-
.../src/main/java/org/apache/juneau/Context.java | 4 ++--
.../src/main/java/org/apache/juneau/MarshalledFilter.java | 4 ++--
.../java/org/apache/juneau/httppart/HttpPartSchema.java | 9 +++++----
.../org/apache/juneau/httppart/bean/RequestBeanMeta.java | 5 +++--
.../org/apache/juneau/httppart/bean/ResponseBeanMeta.java | 7 ++++---
.../main/java/org/apache/juneau/jsonschema/SchemaUtils.java | 2 +-
.../src/main/java/org/apache/juneau/parser/ParserPipe.java | 4 ++--
.../main/java/org/apache/juneau/parser/ParserSession.java | 5 ++---
.../src/main/java/org/apache/juneau/reflect/ClassInfo.java | 3 ++-
.../java/org/apache/juneau/serializer/SerializerPipe.java | 7 ++++---
.../src/main/java/org/apache/juneau/swap/BuilderSwap.java | 4 ++--
.../src/main/java/org/apache/juneau/swap/ObjectSwap.java | 5 ++---
.../src/main/java/org/apache/juneau/swap/SurrogateSwap.java | 3 +--
.../src/main/java/org/apache/juneau/xml/Namespace.java | 2 +-
.../java/org/apache/juneau/microservice/Microservice.java | 2 +-
.../apache/juneau/microservice/jetty/JettyMicroservice.java | 2 +-
.../java/org/apache/juneau/rest/client/ResponseHeader.java | 3 +--
.../java/org/apache/juneau/rest/client/RestRequest.java | 5 ++---
.../org/apache/juneau/rest/client/remote/RemoteMeta.java | 3 ++-
.../src/main/java/org/apache/juneau/http/HttpHeaders.java | 2 +-
.../main/java/org/apache/juneau/http/header/IfRange.java | 3 +--
.../main/java/org/apache/juneau/http/header/RetryAfter.java | 3 +--
.../src/main/java/org/apache/juneau/http/header/Thrown.java | 2 +-
.../main/java/org/apache/juneau/http/part/BasicPart.java | 3 +--
.../src/main/java/org/apache/juneau/rest/RestContext.java | 11 ++++++-----
.../main/java/org/apache/juneau/rest/RestOperations.java | 2 +-
.../java/org/apache/juneau/rest/arg/ResponseCodeArg.java | 5 +++--
.../org/apache/juneau/rest/httppart/RequestFormParams.java | 2 +-
.../org/apache/juneau/rest/httppart/RequestHeaders.java | 2 +-
.../org/apache/juneau/rest/httppart/RequestPathParams.java | 2 +-
.../org/apache/juneau/rest/httppart/RequestQueryParams.java | 2 +-
.../apache/juneau/rest/processor/ResponseBeanProcessor.java | 5 ++---
.../java/org/apache/juneau/rest/servlet/RestObject.java | 4 +++-
.../java/org/apache/juneau/rest/servlet/RestServlet.java | 10 +++++-----
.../juneau/rest/swagger/BasicSwaggerProviderSession.java | 2 +-
.../org/apache/juneau/common/collections/Value_Test.java | 4 ++--
49 files changed, 106 insertions(+), 102 deletions(-)
diff --git a/TODO.md b/TODO.md
index c63385dddf..ed3320a67a 100644
--- a/TODO.md
+++ b/TODO.md
@@ -32,6 +32,8 @@ This file tracks pending tasks for the Apache Juneau project.
For completed item
- [ ] TODO-53 Use static imports for all method calls to BctUtils.
- [ ] TODO-54 Search for places in code where Calendar should be replaced with
ZonedDateTime.
- [ ] TODO-66 There are two ArrayUtilsTest classes whose tests should be
merged into CollectionUtils_Test.
+- [ ] TODO-67 Add to ThrowableUtils: unsupportedOp, ioException.
+- [ ] TODO-68 Replace BasicRuntimeException with
ThrowableUtils.runtimeException.
## Framework Improvements
diff --git
a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchema.java
b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchema.java
index 52f5ab0ce0..b19976154d 100644
---
a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchema.java
+++
b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchema.java
@@ -476,7 +476,7 @@ public class JsonSchema {
else if (type instanceof JsonTypeArray x)
this.typeJsonTypeArray = x;
else
- throw new
BeanRuntimeException(JsonSchemaProperty.class, "Invalid attribute type ''{0}''
passed in. Must be one of the following: SimpleType, SimpleTypeArray",
ClassUtils.className(type));
+ throw new
BeanRuntimeException(JsonSchemaProperty.class, "Invalid attribute type ''{0}''
passed in. Must be one of the following: SimpleType, SimpleTypeArray",
cn(type));
}
return this;
}
@@ -816,7 +816,7 @@ public class JsonSchema {
this.itemsSchemaArray = x;
setMasterOn(this.itemsSchemaArray);
} else {
- throw new
BeanRuntimeException(JsonSchemaProperty.class, "Invalid attribute type ''{0}''
passed in. Must be one of the following: JsonSchema, JsonSchemaArray",
ClassUtils.className(items));
+ throw new
BeanRuntimeException(JsonSchemaProperty.class, "Invalid attribute type ''{0}''
passed in. Must be one of the following: JsonSchema, JsonSchemaArray",
cn(items));
}
}
return this;
@@ -1058,8 +1058,7 @@ public class JsonSchema {
this.additionalItemsSchemaArray = x;
setMasterOn(this.additionalItemsSchemaArray);
} else {
- throw new
BeanRuntimeException(JsonSchemaProperty.class, "Invalid attribute type ''{0}''
passed in. Must be one of the following: Boolean, JsonSchemaArray",
- ClassUtils.className(additionalItems));
+ throw new
BeanRuntimeException(JsonSchemaProperty.class, "Invalid attribute type ''{0}''
passed in. Must be one of the following: Boolean, JsonSchemaArray",
cn(additionalItems));
}
}
return this;
@@ -1318,8 +1317,7 @@ public class JsonSchema {
this.additionalPropertiesSchema = x;
setMasterOn(this.additionalPropertiesSchema);
} else
- throw new
BeanRuntimeException(JsonSchemaProperty.class, "Invalid attribute type ''{0}''
passed in. Must be one of the following: Boolean, JsonSchema",
-
ClassUtils.className(additionalProperties));
+ throw new
BeanRuntimeException(JsonSchemaProperty.class, "Invalid attribute type ''{0}''
passed in. Must be one of the following: Boolean, JsonSchema",
cn(additionalProperties));
}
return this;
}
diff --git
a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/OpenApi.java
b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/OpenApi.java
index df40dfe7b0..174f31f442 100644
---
a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/OpenApi.java
+++
b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/OpenApi.java
@@ -249,7 +249,7 @@ public class OpenApi extends OpenApiElement {
try {
return new ObjectRest(this).get(ref.substring(1), c);
} catch (Exception e) {
- throw new BeanRuntimeException(e, c, "Reference ''{0}''
could not be converted to type ''{1}''.", ref, ClassUtils.className(c));
+ throw new BeanRuntimeException(e, c, "Reference ''{0}''
could not be converted to type ''{1}''.", ref, cn(c));
}
}
diff --git
a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Swagger.java
b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Swagger.java
index a3b585d7be..7a992270e3 100644
---
a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Swagger.java
+++
b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Swagger.java
@@ -462,7 +462,7 @@ public class Swagger extends SwaggerElement {
try {
return new ObjectRest(this).get(ref.substring(1), c);
} catch (Exception e) {
- throw new BeanRuntimeException(e, c, "Reference ''{0}''
could not be converted to type ''{1}''.", ref, ClassUtils.className(c));
+ throw new BeanRuntimeException(e, c, "Reference ''{0}''
could not be converted to type ''{1}''.", ref, cn(c));
}
}
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/Value.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/Value.java
index 5c9cc7d5ff..c6eabbdf4e 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/Value.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/Value.java
@@ -16,14 +16,13 @@
*/
package org.apache.juneau.common.collections;
+import static org.apache.juneau.common.utils.ClassUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import java.lang.reflect.*;
import java.util.*;
import java.util.function.*;
-import org.apache.juneau.common.utils.*;
-
/**
* A generic mutable value wrapper.
*
@@ -156,7 +155,7 @@ public class Value<T> {
* @return The unwrapped type, or the same type if the type isn't
{@link Value}.
*/
public static Type unwrap(Type t) {
- var x = ClassUtils.getParameterType(t);
+ var x = getParameterType(t);
return nn(x) ? x : t;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationApplier.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationApplier.java
index 6dceacd1cd..40a7d69a27 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationApplier.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationApplier.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau;
+import static org.apache.juneau.common.utils.ClassUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import java.lang.annotation.*;
@@ -265,7 +266,7 @@ public abstract class AnnotationApplier<A extends
Annotation,B> {
* @return An optional containing the specified value.
*/
protected <T> Optional<Class<T>> type(Class<T> in) {
- return opt(in).filter(ClassUtils.NOT_VOID);
+ return opt(in).filter(NOT_VOID);
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
index f0706d154a..0c04d7fab5 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
@@ -18,6 +18,7 @@ package org.apache.juneau;
import static org.apache.juneau.collections.JsonMap.*;
import static org.apache.juneau.common.reflect.Visibility.*;
+import static org.apache.juneau.common.utils.ClassUtils.*;
import static org.apache.juneau.common.utils.ThrowableUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
@@ -4260,7 +4261,7 @@ public class BeanContext extends Context {
if (nn(p)) {
- if (ClassUtils.isNotVoid(p.type()))
+ if (isNotVoid(p.type()))
cm2 = resolveClassMeta(p.type(), typeVarImpls);
if (cm2.isMap()) {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanFilter.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanFilter.java
index 5dc5ba14de..96039d4a35 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanFilter.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanFilter.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau;
+import static org.apache.juneau.common.utils.ClassUtils.*;
import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
@@ -89,15 +90,15 @@ public class BeanFilter {
writeOnlyProperties(x.writeOnlyProperties(), x.wo());
if (isNotEmpty(x.typeName()))
typeName(x.typeName());
- if (ClassUtils.isNotVoid(x.propertyNamer()))
+ if (isNotVoid(x.propertyNamer()))
propertyNamer(x.propertyNamer());
- if (ClassUtils.isNotVoid(x.interfaceClass()))
+ if (isNotVoid(x.interfaceClass()))
interfaceClass(x.interfaceClass());
- if (ClassUtils.isNotVoid(x.stopClass()))
+ if (isNotVoid(x.stopClass()))
stopClass(x.stopClass());
- if (ClassUtils.isNotVoid(x.interceptor()))
+ if (isNotVoid(x.interceptor()))
interceptor(x.interceptor());
- if (ClassUtils.isNotVoid(x.implClass()))
+ if (isNotVoid(x.implClass()))
implClass(x.implClass());
if (isNotEmptyArray(x.dictionary()))
dictionary(x.dictionary());
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java
index dba0f22334..ce40bf391a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau;
+import static org.apache.juneau.common.utils.ClassUtils.*;
import static org.apache.juneau.common.utils.ThrowableUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
@@ -433,7 +434,7 @@ public class BeanMap<T> extends AbstractMap<String,Object>
implements Delegate<T
propertyCache = null;
} catch (IllegalArgumentException e) {
throw new BeanRuntimeException(e,
meta.classMeta.innerClass, "IllegalArgumentException occurred on call to class
constructor ''{0}'' with argument types ''{1}''", c.getSimpleName(),
-
Json5Serializer.DEFAULT.toString(ClassUtils.getClasses(args)));
+
Json5Serializer.DEFAULT.toString(getClasses(args)));
} catch (Exception e) {
throw new BeanRuntimeException(e);
}
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 ef8c1d0553..f04cf77a28 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
@@ -16,6 +16,7 @@
*/
package org.apache.juneau;
+import static org.apache.juneau.common.utils.ClassUtils.*;
import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
@@ -139,9 +140,9 @@ public class BeanPropertyMeta implements
Comparable<BeanPropertyMeta> {
private static ObjectSwap getPropertySwap(Swap s) throws
RuntimeException {
Class<?> c = s.value();
- if (ClassUtils.isVoid(c))
+ if (isVoid(c))
c = s.impl();
- if (ClassUtils.isVoid(c))
+ if (isVoid(c))
return null;
ClassInfo ci = ClassInfo.of(c);
if (ci.isChildOf(ObjectSwap.class)) {
@@ -173,20 +174,20 @@ public class BeanPropertyMeta implements
Comparable<BeanPropertyMeta> {
}
BeanPropertyMeta.Builder setExtraKeys(Method extraKeys) {
- ClassUtils.setAccessible(extraKeys);
+ setAccessible(extraKeys);
this.extraKeys = extraKeys;
return this;
}
BeanPropertyMeta.Builder setField(Field field) {
- ClassUtils.setAccessible(field);
+ setAccessible(field);
this.field = field;
this.innerField = field;
return this;
}
BeanPropertyMeta.Builder setGetter(Method getter) {
- ClassUtils.setAccessible(getter);
+ setAccessible(getter);
this.getter = getter;
return this;
}
@@ -197,7 +198,7 @@ public class BeanPropertyMeta implements
Comparable<BeanPropertyMeta> {
}
BeanPropertyMeta.Builder setSetter(Method setter) {
- ClassUtils.setAccessible(setter);
+ setAccessible(setter);
this.setter = setter;
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanRegistry.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanRegistry.java
index 967b22c926..63708cef42 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanRegistry.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanRegistry.java
@@ -24,7 +24,6 @@ import java.util.concurrent.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.common.collections.*;
-import org.apache.juneau.common.utils.*;
import org.apache.juneau.cp.*;
import org.apache.juneau.reflect.*;
@@ -134,7 +133,7 @@ public class BeanRegistry {
if (x instanceof Class)
addClass((Class<?>)x);
else
- throw new
BeanRuntimeException("Collection class ''{0}'' passed to BeanRegistry does not
contain Class objects.", ClassUtils.className(c));
+ throw new
BeanRuntimeException("Collection class ''{0}'' passed to BeanRegistry does not
contain Class objects.", cn(c));
});
} else if (ci.isChildOf(Map.class)) {
Map<?,?> m =
BeanCreator.of(Map.class).type(c).run();
@@ -146,13 +145,13 @@ public class BeanRegistry {
else if (isArray(v))
val =
getTypedClassMeta(v);
else
- throw new
BeanRuntimeException("Class ''{0}'' was passed to BeanRegistry but value of
type ''{1}'' found in map is not a Type object.", ClassUtils.className(c),
ClassUtils.className(v));
+ throw new
BeanRuntimeException("Class ''{0}'' was passed to BeanRegistry but value of
type ''{1}'' found in map is not a Type object.", cn(c), cn(v));
addToMap(typeName, val);
});
} else {
Value<String> typeName = Value.empty();
ci.forEachAnnotation(beanContext,
Bean.class, x -> isNotEmpty(x.typeName()), x -> typeName.set(x.typeName()));
- addToMap(typeName.orElseThrow(() -> new
BeanRuntimeException("Class ''{0}'' was passed to BeanRegistry but it doesn't
have a @Bean(typeName) annotation defined.", ClassUtils.className(c))),
+ addToMap(typeName.orElseThrow(() -> new
BeanRuntimeException("Class ''{0}'' was passed to BeanRegistry but it doesn't
have a @Bean(typeName) annotation defined.", cn(c))),
beanContext.getClassMeta(c));
}
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
index f589b3b8b8..c9db0fc6cd 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
@@ -1110,7 +1110,7 @@ public class BeanSession extends ContextSession {
public final <T> BeanMap<T> toBeanMap(T o, Class<? super T> c) throws
BeanRuntimeException {
assertArgNotNull("o", o);
assertArgNotNull("c", c);
- assertArg(c.isInstance(o), "The specified object is not an
instance of the specified class. class=''{0}'', objectClass=''{1}'',
object=''{2}''", ClassUtils.className(c), ClassUtils.className(o), 0);
+ assertArg(c.isInstance(o), "The specified object is not an
instance of the specified class. class=''{0}'', objectClass=''{1}'',
object=''{2}''", cn(c), cn(o), 0);
ClassMeta cm = getClassMeta(c);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseSession.java
index dbc18a7eb6..235e695726 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseSession.java
@@ -334,7 +334,7 @@ public class BeanTraverseSession extends BeanSession {
Object o = stack.removeLast().o;
Object o2 = set.remove(o);
if (o2 == null)
- onError(null, "Couldn't remove object of type
''{0}'' on attribute ''{1}'' from object stack.", ClassUtils.className(o),
stack);
+ onError(null, "Couldn't remove object of type
''{0}'' on attribute ''{1}'' from object stack.", cn(o), stack);
}
isBottom = false;
}
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 3420bfa143..d47b687258 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
@@ -654,7 +654,7 @@ public abstract class Context implements AnnotationProvider
{
);
// @formatter:on
if (cci == null)
- throw new BasicRuntimeException("Public
constructor not found: {0}({1})", ClassUtils.className(type),
ClassUtils.className(this));
+ throw new BasicRuntimeException("Public
constructor not found: {0}({1})", cn(type), cn(this));
CONTEXT_CONSTRUCTORS.put(type, cci);
}
return cci;
@@ -800,7 +800,7 @@ public abstract class Context implements AnnotationProvider
{
}
} catch (Exception e) {
- throw new ConfigException(e, "Invalid
annotation @{0} used in BEAN_annotations property.", ClassUtils.className(a));
+ throw new ConfigException(e, "Invalid
annotation @{0} used in BEAN_annotations property.", cn(a));
}
});
this.annotationMap = rmb.build();
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MarshalledFilter.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MarshalledFilter.java
index d08399cff3..dadf7ce6b4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MarshalledFilter.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MarshalledFilter.java
@@ -16,12 +16,12 @@
*/
package org.apache.juneau;
+import static org.apache.juneau.common.utils.ClassUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import java.util.*;
import org.apache.juneau.annotation.*;
-import org.apache.juneau.common.utils.*;
/**
* Parent class for all non-bean filters.
@@ -66,7 +66,7 @@ public class MarshalledFilter {
public Builder applyAnnotations(List<Marshalled> annotations) {
annotations.forEach(x -> {
- if (ClassUtils.isNotVoid(x.implClass()))
+ if (isNotVoid(x.implClass()))
implClass(x.implClass());
if (isNotEmpty(x.example()))
example(x.example());
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
index 7f41ced092..019d3ce571 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
@@ -17,6 +17,7 @@
package org.apache.juneau.httppart;
import static java.util.Collections.*;
+import static org.apache.juneau.common.utils.ClassUtils.*;
import static org.apache.juneau.common.utils.StringUtils.*;
import static org.apache.juneau.common.utils.ThrowableUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
@@ -381,7 +382,7 @@ public class HttpPartSchema {
else if
(a.annotationType().getName().startsWith("jakarta.validation.constraints."))
applyJakartaValidation(a);
else
- throw new
BasicRuntimeException("Builder.apply(@{0}) not defined",
ClassUtils.className(a));
+ throw new
BasicRuntimeException("Builder.apply(@{0}) not defined", cn(a));
return this;
}
@@ -1885,7 +1886,7 @@ public class HttpPartSchema {
* @return This object.
*/
public Builder parser(Class<? extends HttpPartParser> value) {
- if (ClassUtils.isNotVoid(value))
+ if (isNotVoid(value))
parser = value;
return this;
}
@@ -2067,7 +2068,7 @@ public class HttpPartSchema {
* @return This object.
*/
public Builder serializer(Class<? extends HttpPartSerializer>
value) {
- if (ClassUtils.isNotVoid(value))
+ if (isNotVoid(value))
serializer = value;
return this;
}
@@ -2547,7 +2548,7 @@ public class HttpPartSchema {
if (t instanceof Class<?>) {
ClassInfo.of((Class<?>)t).forEachAnnotation(c,
x -> true, this::apply);
} else if (Value.isType(t)) {
- apply(c, ClassUtils.getParameterType(t));
+ apply(c, getParameterType(t));
}
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/RequestBeanMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/RequestBeanMeta.java
index 638c940498..357b4405cb 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/RequestBeanMeta.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/RequestBeanMeta.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau.httppart.bean;
+import static org.apache.juneau.common.utils.ClassUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import static org.apache.juneau.httppart.HttpPartType.*;
import static org.apache.juneau.httppart.bean.MethodInfoUtils.*;
@@ -85,9 +86,9 @@ public class RequestBeanMeta {
Builder apply(Request a) {
if (nn(a)) {
- if (ClassUtils.isNotVoid(a.serializer()))
+ if (isNotVoid(a.serializer()))
serializer.type(a.serializer());
- if (ClassUtils.isNotVoid(a.parser()))
+ if (isNotVoid(a.parser()))
parser.type(a.parser());
}
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanMeta.java
index dcb7e01e7f..d81ebc2543 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanMeta.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanMeta.java
@@ -17,6 +17,7 @@
package org.apache.juneau.httppart.bean;
import static org.apache.juneau.annotation.InvalidAnnotationException.*;
+import static org.apache.juneau.common.utils.ClassUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import static org.apache.juneau.httppart.HttpPartType.*;
import static org.apache.juneau.httppart.bean.MethodInfoUtils.*;
@@ -59,9 +60,9 @@ public class ResponseBeanMeta {
Builder apply(Response a) {
if (nn(a)) {
- if (ClassUtils.isNotVoid(a.serializer()))
+ if (isNotVoid(a.serializer()))
partSerializer = a.serializer();
- if (ClassUtils.isNotVoid(a.parser()))
+ if (isNotVoid(a.parser()))
partParser = a.parser();
schema.apply(a.schema());
}
@@ -77,7 +78,7 @@ public class ResponseBeanMeta {
}
Builder apply(Type t) {
- Class<?> c = ClassUtils.toClass(t);
+ Class<?> c = toClass(t);
this.cm = BeanContext.DEFAULT.getClassMeta(c);
ClassInfo ci = cm.getInfo();
ci.forEachPublicMethod(x -> true, x -> {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/SchemaUtils.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/SchemaUtils.java
index bc2374fc49..3da867d1aa 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/SchemaUtils.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/SchemaUtils.java
@@ -72,7 +72,7 @@ public class SchemaUtils {
}
if (o instanceof JsonMap)
return (JsonMap)o;
- throw new ParseException("Unexpected data type ''{0}''.
Expected JsonMap or String.", ClassUtils.className(o));
+ throw new ParseException("Unexpected data type ''{0}''.
Expected JsonMap or String.", cn(o));
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserPipe.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserPipe.java
index 5d3bb21f77..6386eeafac 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserPipe.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserPipe.java
@@ -236,7 +236,7 @@ public class ParserPipe implements Closeable {
doClose = true;
}
} else {
- throw new IOException("Cannot convert object of type "
+ ClassUtils.className(input) + " to an InputStream.");
+ throw new IOException("Cannot convert object of type "
+ cn(input) + " to an InputStream.");
}
return inputStream;
@@ -315,7 +315,7 @@ public class ParserPipe implements Closeable {
}
doClose = true;
} else {
- throw new IOException("Cannot convert object of type "
+ ClassUtils.className(input) + " to an InputStream.");
+ throw new IOException("Cannot convert object of type "
+ cn(input) + " to an InputStream.");
}
return reader;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSession.java
index 7a151381bf..9bf2d66238 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSession.java
@@ -30,7 +30,6 @@ import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.common.reflect.*;
-import org.apache.juneau.common.utils.*;
import org.apache.juneau.cp.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.internal.*;
@@ -889,7 +888,7 @@ public class ParserSession extends BeanSession {
* @throws Exception If thrown from underlying stream, or if the input
contains a syntax error or is malformed.
*/
protected <E> Collection<E> doParseIntoCollection(ParserPipe pipe,
Collection<E> c, Type elementType) throws Exception {
- throw new UnsupportedOperationException("Parser '" +
ClassUtils.className(getClass()) + "' does not support this method.");
+ throw new UnsupportedOperationException("Parser '" +
cn(getClass()) + "' does not support this method.");
}
/**
@@ -908,7 +907,7 @@ public class ParserSession extends BeanSession {
* @throws Exception If thrown from underlying stream, or if the input
contains a syntax error or is malformed.
*/
protected <K,V> Map<K,V> doParseIntoMap(ParserPipe pipe, Map<K,V> m,
Type keyType, Type valueType) throws Exception {
- throw new UnsupportedOperationException("Parser '" +
ClassUtils.className(getClass()) + "' does not support this method.");
+ throw new UnsupportedOperationException("Parser '" +
cn(getClass()) + "' does not support this method.");
}
/**
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 5ae3213afe..9a174bdc51 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
@@ -17,6 +17,7 @@
package org.apache.juneau.reflect;
import static org.apache.juneau.common.utils.AssertionUtils.*;
+import static org.apache.juneau.common.utils.ClassUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import java.lang.annotation.*;
@@ -160,7 +161,7 @@ public class ClassInfo {
return null;
if (t instanceof Class)
return of((Class<?>)t);
- return new ClassInfo(ClassUtils.toClass(t), t);
+ return new ClassInfo(toClass(t), t);
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerPipe.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerPipe.java
index 4463db774d..020ceeab6f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerPipe.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerPipe.java
@@ -17,7 +17,8 @@
package org.apache.juneau.serializer;
import static org.apache.juneau.common.utils.IOUtils.*;
-import static org.apache.juneau.common.utils.ThrowableUtils.*;
+import static org.apache.juneau.common.utils.ThrowableUtils.cast;
+import static org.apache.juneau.common.utils.Utils.*;
import java.io.*;
import java.nio.charset.*;
@@ -127,7 +128,7 @@ public class SerializerPipe implements Closeable {
else if (output instanceof File)
outputStream = new BufferedOutputStream(new
FileOutputStream((File)output));
else
- throw new IOException("Cannot convert object of type "
+ ClassUtils.className(output) + " to an OutputStream.");
+ throw new IOException("Cannot convert object of type "
+ cn(output) + " to an OutputStream.");
return new NoCloseOutputStream(outputStream);
}
@@ -173,7 +174,7 @@ public class SerializerPipe implements Closeable {
else if (output instanceof StringBuilder)
writer = new
StringBuilderWriter((StringBuilder)output);
else
- throw new SerializeException("Cannot convert
object of type " + ClassUtils.className(output) + " to a Writer.");
+ throw new SerializeException("Cannot convert
object of type " + cn(output) + " to a Writer.");
} catch (FileNotFoundException e) {
throw cast(SerializeException.class, e);
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/BuilderSwap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/BuilderSwap.java
index 1cdc9c6a26..9f011c4a0d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/BuilderSwap.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/BuilderSwap.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau.swap;
+import static org.apache.juneau.common.utils.ClassUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import java.lang.reflect.*;
@@ -23,7 +24,6 @@ import java.lang.reflect.*;
import org.apache.juneau.*;
import org.apache.juneau.common.collections.*;
import org.apache.juneau.common.reflect.*;
-import org.apache.juneau.common.utils.*;
import org.apache.juneau.reflect.*;
/**
@@ -98,7 +98,7 @@ public class BuilderSwap<T,B> {
ConstructorInfo objectConstructor = null;
ConstructorInfo builderConstructor;
-
bc.forEachAnnotation(org.apache.juneau.annotation.Builder.class, objectClass, x
-> ClassUtils.isNotVoid(x.value()), x -> builderClass.set(x.value()));
+
bc.forEachAnnotation(org.apache.juneau.annotation.Builder.class, objectClass, x
-> isNotVoid(x.value()), x -> builderClass.set(x.value()));
var pci = ClassInfo.of(objectClass);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/ObjectSwap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/ObjectSwap.java
index 93dbce653a..84237183c7 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/ObjectSwap.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/ObjectSwap.java
@@ -22,7 +22,6 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
-import org.apache.juneau.common.utils.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.serializer.*;
@@ -324,7 +323,7 @@ public abstract class ObjectSwap<T,S> {
* @throws Exception If a problem occurred trying to convert the output.
*/
public S swap(BeanSession session, T o, String template) throws
Exception {
- throw new SerializeException("Swap method not implemented on
ObjectSwap ''{0}''", ClassUtils.className(this));
+ throw new SerializeException("Swap method not implemented on
ObjectSwap ''{0}''", cn(this));
}
@Override /* Overridden from Object */
@@ -369,7 +368,7 @@ public abstract class ObjectSwap<T,S> {
* @throws Exception If a problem occurred trying to convert the output.
*/
public T unswap(BeanSession session, S f, ClassMeta<?> hint, String
template) throws Exception {
- throw new ParseException("Unswap method not implemented on
ObjectSwap ''{0}''", ClassUtils.className(this));
+ throw new ParseException("Unswap method not implemented on
ObjectSwap ''{0}''", cn(this));
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/SurrogateSwap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/SurrogateSwap.java
index 19b9ce2cb0..2d4bbaa7b7 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/SurrogateSwap.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/SurrogateSwap.java
@@ -23,7 +23,6 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
-import org.apache.juneau.common.utils.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.serializer.*;
@@ -97,7 +96,7 @@ public class SurrogateSwap<T,F> extends ObjectSwap<T,F> {
@SuppressWarnings("unchecked")
public T unswap(BeanSession session, F f, ClassMeta<?> hint) throws
ParseException {
if (unswapMethod == null)
- throw new ParseException("unswap() method not implement
on surrogate class ''{1}'': {0}", ClassUtils.className(f),
getNormalClass().getFullName());
+ throw new ParseException("unswap() method not implement
on surrogate class ''{1}'': {0}", cn(f), getNormalClass().getFullName());
try {
return (T)unswapMethod.invoke(f);
} catch (Exception e) {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/Namespace.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/Namespace.java
index 8b990b48d0..4db20580f9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/Namespace.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/Namespace.java
@@ -61,7 +61,7 @@ public class Namespace {
return (Namespace)o;
if (o instanceof CharSequence)
return of(o.toString());
- throw new BasicRuntimeException("Invalid object type passed to
Namespace.create(Object): ''{0}''", ClassUtils.className(o));
+ throw new BasicRuntimeException("Invalid object type passed to
Namespace.create(Object): ''{0}''", cn(o));
}
/**
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 e6e682d568..de9f718d7e 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
@@ -424,7 +424,7 @@ public class Microservice implements ConfigEventListener {
else if (value instanceof Class clazz)
this.manifest = new ManifestFile(clazz);
else
- throw new BasicRuntimeException("Invalid type
passed to Builder.manifest(Object). Type=[{0}]", ClassUtils.className(value));
+ throw new BasicRuntimeException("Invalid type
passed to Builder.manifest(Object). Type=[{0}]", cn(value));
return this;
}
diff --git
a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
index 7a887bbf12..1b0fed6d71 100644
---
a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
+++
b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
@@ -217,7 +217,7 @@ public class JettyMicroservice extends Microservice {
else if (jettyXml instanceof Reader reader)
this.jettyXml = read(reader);
else
- throw new BasicRuntimeException("Invalid object
type passed to jettyXml(Object): {0}", ClassUtils.className(jettyXml));
+ throw new BasicRuntimeException("Invalid object
type passed to jettyXml(Object): {0}", cn(jettyXml));
this.jettyXmlResolveVars = resolveVars;
return this;
}
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseHeader.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseHeader.java
index da5c3b2377..22ab7766b6 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseHeader.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseHeader.java
@@ -30,7 +30,6 @@ import org.apache.juneau.*;
import org.apache.juneau.assertions.*;
import org.apache.juneau.common.collections.*;
import org.apache.juneau.common.reflect.*;
-import org.apache.juneau.common.utils.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.oapi.*;
@@ -265,7 +264,7 @@ public class ResponseHeader extends BasicHeader {
e = e.getCause();
throw asRuntimeException(e);
}
- throw new BasicRuntimeException("Could not determine a method
to construct type {0}", ClassUtils.className(c));
+ throw new BasicRuntimeException("Could not determine a method
to construct type {0}", cn(c));
}
/**
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
index 0f6cf58a7f..c88b15549c 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
@@ -46,7 +46,6 @@ import org.apache.http.params.*;
import org.apache.http.protocol.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
-import org.apache.juneau.common.utils.*;
import org.apache.juneau.html.*;
import org.apache.juneau.http.*;
import org.apache.juneau.http.HttpHeaders;
@@ -2515,7 +2514,7 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
} else if (isBean(value)) {
toBeanMap(value).forEach((k, v) ->
l.add(createHeader(k, v, serializer, schema, skipIfEmpty)));
} else if (nn(value)) {
- throw new BasicRuntimeException("Invalid value type for
header arg ''{0}'': {1}", name, ClassUtils.className(value));
+ throw new BasicRuntimeException("Invalid value type for
header arg ''{0}'': {1}", name, cn(value));
}
if (skipIfEmpty)
@@ -2550,7 +2549,7 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
} else if (isBean(value)) {
toBeanMap(value).forEach((k, v) -> l.add(createPart(k,
v, PATH, serializer, schema, false)));
} else if (nn(value)) {
- throw new BasicRuntimeException("Invalid value type for
path arg ''{0}'': {1}", name, ClassUtils.className(value));
+ throw new BasicRuntimeException("Invalid value type for
path arg ''{0}'': {1}", name, cn(value));
}
pathData.append(l);
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMeta.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMeta.java
index 1f64614ed6..e8aaff071a 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMeta.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMeta.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau.rest.client.remote;
+import static org.apache.juneau.common.utils.ClassUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import static org.apache.juneau.http.HttpHeaders.*;
@@ -75,7 +76,7 @@ public class RemoteMeta {
clientVersion = resolve(r.version());
if (isNotEmpty(r.versionHeader()))
versionHeader = resolve(r.versionHeader());
- if (ClassUtils.isNotVoid(r.headerList())) {
+ if (isNotVoid(r.headerList())) {
try {
headers.append(r.headerList().getDeclaredConstructor().newInstance().getAll());
} catch (Exception e) {
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 2b8ad7228a..28bc40e974 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
@@ -526,7 +526,7 @@ public class HttpHeaders {
Map.Entry e = (Map.Entry)o;
return BasicHeader.of(s(e.getKey()), s(e.getValue()));
}
- throw new BasicRuntimeException("Object of type {0} could not
be converted to a Header.", ClassUtils.className(o));
+ throw new BasicRuntimeException("Object of type {0} could not
be converted to a Header.", cn(o));
}
/**
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 180c786cc8..7540d27bdb 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
@@ -24,7 +24,6 @@ import java.util.*;
import java.util.function.*;
import org.apache.juneau.*;
-import org.apache.juneau.common.utils.*;
import org.apache.juneau.http.annotation.*;
/**
@@ -221,7 +220,7 @@ public class IfRange extends BasicDateHeader {
} else if (o instanceof ZonedDateTime) {
return
RFC_1123_DATE_TIME.format((ZonedDateTime)o);
}
- throw new BasicRuntimeException("Invalid object type
returned by supplier: {0}", ClassUtils.className(o));
+ throw new BasicRuntimeException("Invalid object type
returned by supplier: {0}", cn(o));
}
if (nn(value))
return s(value);
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/RetryAfter.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/RetryAfter.java
index ad5345453a..b0e6cf810f 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/RetryAfter.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/RetryAfter.java
@@ -25,7 +25,6 @@ import java.util.*;
import java.util.function.*;
import org.apache.juneau.*;
-import org.apache.juneau.common.utils.*;
import org.apache.juneau.http.annotation.*;
/**
@@ -213,7 +212,7 @@ public class RetryAfter extends BasicDateHeader {
} else if (o instanceof ZonedDateTime) {
return
RFC_1123_DATE_TIME.format((ZonedDateTime)o);
}
- throw new BasicRuntimeException("Invalid object type
returned by supplier: {0}", ClassUtils.className(o));
+ throw new BasicRuntimeException("Invalid object type
returned by supplier: {0}", cn(o));
}
if (nn(value))
return s(value);
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Thrown.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Thrown.java
index 5bc5fe1ef3..9c36b1a3ce 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Thrown.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Thrown.java
@@ -87,7 +87,7 @@ public class Thrown extends BasicCsvHeader {
* @param value The throwable to create the header part value
from.
*/
public Part(Throwable value) {
- this.className = ClassUtils.className(value);
+ this.className = cn(value);
this.message = value.getMessage();
this.value = urlEncode(className) + ';' +
urlEncode(value.getMessage());
}
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 6f02fb0295..274f6e50ff 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
@@ -26,7 +26,6 @@ import org.apache.http.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.assertions.*;
-import org.apache.juneau.common.utils.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.reflect.*;
@@ -87,7 +86,7 @@ public class BasicPart implements NameValuePair, Headerable {
Map.Entry e = (Map.Entry)o;
return BasicPart.of(s(e.getKey()), e.getValue());
}
- throw new BasicRuntimeException("Object of type {0} could not
be converted to a Part.", ClassUtils.className(o));
+ throw new BasicRuntimeException("Object of type {0} could not
be converted to a Part.", cn(o));
}
/**
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
index abb32706e2..6178763a21 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
@@ -20,6 +20,7 @@ import static jakarta.servlet.http.HttpServletResponse.*;
import static java.util.Collections.*;
import static java.util.Optional.*;
import static org.apache.juneau.collections.JsonMap.*;
+import static org.apache.juneau.common.utils.ClassUtils.*;
import static org.apache.juneau.common.utils.IOUtils.*;
import static org.apache.juneau.common.utils.StringUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
@@ -2231,7 +2232,7 @@ public class RestContext extends Context {
* @return This object.
*/
public Builder parserListener(Class<? extends ParserListener>
value) {
- if (ClassUtils.isNotVoid(value))
+ if (isNotVoid(value))
parsers.forEach(x -> x.listener(value));
return this;
}
@@ -3088,7 +3089,7 @@ public class RestContext extends Context {
* @return This object.
*/
public Builder serializerListener(Class<? extends
SerializerListener> value) {
- if (ClassUtils.isNotVoid(value))
+ if (isNotVoid(value))
serializers.forEach(x -> x.listener(value));
return this;
}
@@ -3848,7 +3849,7 @@ public class RestContext extends Context {
// @formatter:on
// Apply @Rest(beanStore).
-
ClassInfo.of(resourceClass).forEachAnnotation(Rest.class, x ->
ClassUtils.isNotVoid(x.beanStore()), x -> v.get().type(x.beanStore()));
+
ClassInfo.of(resourceClass).forEachAnnotation(Rest.class, x ->
isNotVoid(x.beanStore()), x -> v.get().type(x.beanStore()));
// Replace with bean from: @RestInject public [static]
BeanStore xxx(<args>)
// @formatter:off
@@ -5866,7 +5867,7 @@ public class RestContext extends Context {
if (ci.isChildOf(ParseException.class) ||
ci.is(InvalidDataConversionException.class))
return new BadRequest(t);
- String n = ClassUtils.className(t);
+ String n = cn(t);
if (n.contains("AccessDenied") || n.contains("Unauthorized"))
return new Unauthorized(t);
@@ -6100,7 +6101,7 @@ public class RestContext extends Context {
}
var output = opSession.getResponse().getContent().orElse(null);
- throw new NotImplemented("No response processors found to
process output of type ''{0}''", ClassUtils.className(output));
+ throw new NotImplemented("No response processors found to
process output of type ''{0}''", cn(output));
}
@Override /* Overridden from Context */
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperations.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperations.java
index cac075aa67..08644792fd 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperations.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperations.java
@@ -178,7 +178,7 @@ public class RestOperations {
if (rc == 1)
throw new PreconditionFailed("Method ''{0}'' not found
on resource on path ''{1}'' with matching matcher.", m, session.getPathInfo());
- throw new NotFound("Java method matching path ''{0}'' not found
on resource ''{1}''.", session.getPathInfo(),
ClassUtils.className(session.getResource()));
+ throw new NotFound("Java method matching path ''{0}'' not found
on resource ''{1}''.", session.getPathInfo(), cn(session.getResource()));
}
/**
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseCodeArg.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseCodeArg.java
index d1d03da72e..6384907b20 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseCodeArg.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseCodeArg.java
@@ -16,10 +16,11 @@
*/
package org.apache.juneau.rest.arg;
+import static org.apache.juneau.common.utils.ClassUtils.*;
+
import java.lang.reflect.*;
import org.apache.juneau.common.collections.*;
-import org.apache.juneau.common.utils.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.*;
@@ -56,7 +57,7 @@ public class ResponseCodeArg implements RestOpArg {
protected ResponseCodeArg(ParamInfo paramInfo) {
this.type = paramInfo.getParameterType().innerType();
Class<?> c = type instanceof Class ? (Class<?>)type : type
instanceof ParameterizedType ? (Class<?>)((ParameterizedType)type).getRawType()
: null;
- if (c != Value.class || ClassUtils.getParameterType(type) !=
Integer.class)
+ if (c != Value.class || getParameterType(type) != Integer.class)
throw new ArgException(paramInfo, "Type must be
Value<Integer> on parameter annotated with @StatusCode annotation");
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestFormParams.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestFormParams.java
index 1ecaa27653..434caf13d5 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestFormParams.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestFormParams.java
@@ -371,7 +371,7 @@ public class RequestFormParams extends
ArrayList<RequestFormParam> {
*/
public <T> Optional<T> get(Class<T> type) {
ClassMeta<T> cm = req.getBeanSession().getClassMeta(type);
- String name = HttpParts.getName(FORMDATA, cm).orElseThrow(() ->
new BasicRuntimeException("@FormData(name) not found on class {0}",
ClassUtils.className(type)));
+ String name = HttpParts.getName(FORMDATA, cm).orElseThrow(() ->
new BasicRuntimeException("@FormData(name) not found on class {0}", cn(type)));
return get(name).as(type);
}
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 9a148b03df..884c2aac92 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
@@ -310,7 +310,7 @@ public class RequestHeaders extends
ArrayList<RequestHeader> {
*/
public <T> Optional<T> get(Class<T> type) {
ClassMeta<T> cm = req.getBeanSession().getClassMeta(type);
- String name = HttpParts.getName(HEADER, cm).orElseThrow(() ->
new BasicRuntimeException("@Header(name) not found on class {0}",
ClassUtils.className(type)));
+ String name = HttpParts.getName(HEADER, cm).orElseThrow(() ->
new BasicRuntimeException("@Header(name) not found on class {0}", cn(type)));
return get(name).as(type);
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestPathParams.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestPathParams.java
index e88b63ad62..9622451352 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestPathParams.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestPathParams.java
@@ -309,7 +309,7 @@ public class RequestPathParams extends
ArrayList<RequestPathParam> {
*/
public <T> Optional<T> get(Class<T> type) {
ClassMeta<T> cm = req.getBeanSession().getClassMeta(type);
- String name = HttpParts.getName(PATH, cm).orElseThrow(() -> new
BasicRuntimeException("@Path(name) not found on class {0}",
ClassUtils.className(type)));
+ String name = HttpParts.getName(PATH, cm).orElseThrow(() -> new
BasicRuntimeException("@Path(name) not found on class {0}", cn(type)));
return get(name).as(type);
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestQueryParams.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestQueryParams.java
index 99d41f4fb8..9a56de1713 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestQueryParams.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestQueryParams.java
@@ -345,7 +345,7 @@ public class RequestQueryParams extends
ArrayList<RequestQueryParam> {
*/
public <T> Optional<T> get(Class<T> type) {
ClassMeta<T> cm = req.getBeanSession().getClassMeta(type);
- String name = HttpParts.getName(QUERY, cm).orElseThrow(() ->
new BasicRuntimeException("@Query(name) not found on class {0}",
ClassUtils.className(type)));
+ String name = HttpParts.getName(QUERY, cm).orElseThrow(() ->
new BasicRuntimeException("@Query(name) not found on class {0}", cn(type)));
return get(name).as(type);
}
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 9a866632e0..e2f5fd81a3 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
@@ -24,7 +24,6 @@ import java.util.*;
import org.apache.http.*;
import org.apache.http.Header;
-import org.apache.juneau.common.utils.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.http.response.*;
@@ -87,7 +86,7 @@ public class ResponseBeanProcessor implements
ResponseProcessor {
} else if (o2 instanceof
NameValuePair) {
h =
BasicHeader.of((NameValuePair)o2);
} else {
- throw new
InternalServerError("Invalid type ''{0}'' for header ''{1}''",
ClassUtils.className(o2), n);
+ throw new
InternalServerError("Invalid type ''{0}'' for header ''{1}''", cn(o2), n);
}
res.addHeader(h);
}
@@ -138,6 +137,6 @@ public class ResponseBeanProcessor implements
ResponseProcessor {
return alist((Object[])o);
if (o instanceof Collection)
return (Collection<?>)o;
- throw new InternalServerError("Could not iterate over Headers
of type ''{0}''", ClassUtils.className(o));
+ throw new InternalServerError("Could not iterate over Headers
of type ''{0}''", cn(o));
}
}
\ No newline at end of file
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/RestObject.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/RestObject.java
index 9b67bacdbb..a13b74e2a2 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/RestObject.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/RestObject.java
@@ -16,6 +16,8 @@
*/
package org.apache.juneau.rest.servlet;
+import static org.apache.juneau.common.utils.Utils.*;
+
import java.text.*;
import java.util.concurrent.atomic.*;
import java.util.function.*;
@@ -103,7 +105,7 @@ public abstract class RestObject {
RestContext c = context.get();
Logger logger = c == null ? null : c.getLogger();
if (logger == null)
- logger = Logger.getLogger(ClassUtils.className(this));
+ logger = Logger.getLogger(cn(this));
logger.log(level, cause, msg);
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/RestServlet.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/RestServlet.java
index fda8f22297..616463132a 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/RestServlet.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/RestServlet.java
@@ -141,14 +141,14 @@ public abstract class RestServlet extends HttpServlet {
context.get().postInitChildFirst();
} catch (ServletException e) {
initException.set(e);
- log(SEVERE, e, "Servlet init error on class ''{0}''",
ClassUtils.className(this));
+ log(SEVERE, e, "Servlet init error on class ''{0}''",
cn(this));
throw e;
} catch (BasicHttpException e) {
initException.set(e);
- log(SEVERE, e, "Servlet init error on class ''{0}''",
ClassUtils.className(this));
+ log(SEVERE, e, "Servlet init error on class ''{0}''",
cn(this));
} catch (Throwable e) {
initException.set(new InternalServerError(e));
- log(SEVERE, e, "Servlet init error on class ''{0}''",
ClassUtils.className(this));
+ log(SEVERE, e, "Servlet init error on class ''{0}''",
cn(this));
}
}
@@ -194,7 +194,7 @@ public abstract class RestServlet extends HttpServlet {
throw initException.get();
if (context.get() == null)
throw new InternalServerError(
- "Servlet {0} not initialized.
init(ServletConfig) was not called. This can occur if you've overridden this
method but didn't call super.init(RestConfig).", ClassUtils.className(this));
+ "Servlet {0} not initialized.
init(ServletConfig) was not called. This can occur if you've overridden this
method but didn't call super.init(RestConfig).", cn(this));
getContext().execute(this, r1, r2);
} catch (Throwable e) {
@@ -219,7 +219,7 @@ public abstract class RestServlet extends HttpServlet {
RestContext c = context.get();
Logger logger = c == null ? null : c.getLogger();
if (logger == null)
- logger = Logger.getLogger(ClassUtils.className(this));
+ logger = Logger.getLogger(cn(this));
logger.log(level, cause, msg);
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/BasicSwaggerProviderSession.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/BasicSwaggerProviderSession.java
index d9f3441fa6..6878df1a80 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/BasicSwaggerProviderSession.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/BasicSwaggerProviderSession.java
@@ -983,7 +983,7 @@ public class BasicSwaggerProviderSession {
}
if (o instanceof JsonMap)
return (JsonMap)o;
- throw new SwaggerException(null, "Unexpected data type ''{0}''.
Expected JsonMap or String.", ClassUtils.className(o));
+ throw new SwaggerException(null, "Unexpected data type ''{0}''.
Expected JsonMap or String.", cn(o));
}
private JsonMap parseMap(String o, String location, Object...args)
throws ParseException {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/common/collections/Value_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/common/collections/Value_Test.java
index 3e87be2584..a105771393 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/common/collections/Value_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/common/collections/Value_Test.java
@@ -16,11 +16,11 @@
*/
package org.apache.juneau.common.collections;
+import static org.apache.juneau.common.utils.ClassUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import static org.junit.jupiter.api.Assertions.*;
import org.apache.juneau.*;
-import org.apache.juneau.common.utils.*;
import org.junit.jupiter.api.*;
class Value_Test extends TestBase {
@@ -33,7 +33,7 @@ class Value_Test extends TestBase {
public static class A1 {}
@Test void a01_testSubclass() {
- assertEquals(A1.class, ClassUtils.getParameterType(A.class));
+ assertEquals(A1.class, getParameterType(A.class));
}
//-----------------------------------------------------------------------------------------------------------------
