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 20300eb87 Test modernization, clean up utility classes.
20300eb87 is described below
commit 20300eb87e512cafb4c2f9e94f408f8f8472bfa3
Author: James Bognar <[email protected]>
AuthorDate: Mon Aug 25 11:05:23 2025 -0400
Test modernization, clean up utility classes.
---
.../src/main/java/org/apache/juneau/bean/LinkString.java | 3 ++-
.../java/org/apache/juneau/objecttools/ObjectSorter.java | 1 +
.../java/org/apache/juneau/http/header/BasicHeader.java | 2 +-
.../src/main/java/org/apache/juneau/rest/RestOpContext.java | 13 +++++++------
.../main/java/org/apache/juneau/rest/logger/CallLogger.java | 10 +++++-----
.../org/apache/juneau/rest/staticfile/BasicStaticFiles.java | 3 ++-
6 files changed, 18 insertions(+), 14 deletions(-)
diff --git
a/juneau-bean/juneau-bean-common/src/main/java/org/apache/juneau/bean/LinkString.java
b/juneau-bean/juneau-bean-common/src/main/java/org/apache/juneau/bean/LinkString.java
index 03b6e9e94..53d4b6948 100644
---
a/juneau-bean/juneau-bean-common/src/main/java/org/apache/juneau/bean/LinkString.java
+++
b/juneau-bean/juneau-bean-common/src/main/java/org/apache/juneau/bean/LinkString.java
@@ -19,6 +19,7 @@ import static org.apache.juneau.internal.ObjectUtils.eq;
import java.text.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.html.*;
import org.apache.juneau.html.annotation.*;
import org.apache.juneau.httppart.*;
@@ -182,7 +183,7 @@ public class LinkString implements Comparable<LinkString> {
@Override /* Object */
public boolean equals(Object o) {
- return (o instanceof LinkString o2) && eq(this, o2,
(x,y)->x.name.equals(y.name));
+ return (o instanceof LinkString o2) && Utils.eq(this, o2,
(x,y)->x.name.equals(y.name));
}
@Override /* Object */
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 9f420c458..2abf1c740 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
@@ -18,6 +18,7 @@ import java.lang.reflect.*;
import java.util.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
/**
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 739040a41..e9364f73d 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
@@ -266,7 +266,7 @@ public class BasicHeader implements Header, Cloneable,
Serializable {
// Not a perfect equality operator if using SVL vars.
if (! (o instanceof Header))
return false;
- return eq(this, (Header)o, (x,y)->eq(x.name,y.getName()) &&
eq(x.getValue(),y.getValue()));
+ return Utils.eq(this, (Header)o, (x,y)->eq(x.name,y.getName())
&& eq(x.getValue(),y.getValue()));
}
@Override /* Object */
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 aebb57423..4d57c9c47 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
@@ -36,6 +36,7 @@ import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.common.internal.*;
+import org.apache.juneau.common.internal.Utils;
import org.apache.juneau.cp.*;
import org.apache.juneau.encoders.*;
import org.apache.juneau.http.annotation.*;
@@ -2692,19 +2693,19 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
return c;
}
- c = compare(o.hierarchyDepth, hierarchyDepth);
+ c = ObjectUtils.compare(o.hierarchyDepth, hierarchyDepth);
if (c != 0)
return c;
- c = compare(o.requiredMatchers.length, requiredMatchers.length);
+ c = ObjectUtils.compare(o.requiredMatchers.length,
requiredMatchers.length);
if (c != 0)
return c;
- c = compare(o.optionalMatchers.length, optionalMatchers.length);
+ c = ObjectUtils.compare(o.optionalMatchers.length,
optionalMatchers.length);
if (c != 0)
return c;
- c = compare(o.guards.length, guards.length);
+ c = ObjectUtils.compare(o.guards.length, guards.length);
if (c != 0)
return c;
@@ -2713,7 +2714,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
if (c != 0)
return c;
- c = compare(method.getParameterCount(),
o.method.getParameterCount());
+ c = ObjectUtils.compare(method.getParameterCount(),
o.method.getParameterCount());
if (c != 0)
return c;
@@ -2732,7 +2733,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
@Override /* Object */
public boolean equals(Object o) {
- return (o instanceof RestOpContext) && eq(this,
(RestOpContext)o, (x,y)->x.method.equals(y.method));
+ return (o instanceof RestOpContext) && Utils.eq(this,
(RestOpContext)o, (x,y)->x.method.equals(y.method));
}
@Override /* Object */
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 d098f4f11..7091973cf 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
@@ -587,8 +587,8 @@ public class CallLogger {
if (level == Level.OFF)
return;
- Throwable e = castOrNull(req.getAttribute("Exception"),
Throwable.class);
- Long execTime = castOrNull(req.getAttribute("ExecTime"),
Long.class);
+ Throwable e =
ObjectUtils.castOrNull(req.getAttribute("Exception"), Throwable.class);
+ Long execTime =
ObjectUtils.castOrNull(req.getAttribute("ExecTime"), Long.class);
CallLoggingDetail reqd = firstNonNull(rule.getRequestDetail(),
requestDetail);
CallLoggingDetail resd = firstNonNull(rule.getResponseDetail(),
responseDetail);
@@ -721,7 +721,7 @@ public class CallLogger {
* @see RestOp#debug()
*/
protected boolean isDebug(HttpServletRequest req) {
- return firstNonNull(castOrNull(req.getAttribute("Debug"),
Boolean.class), false);
+ return
firstNonNull(ObjectUtils.castOrNull(req.getAttribute("Debug"), Boolean.class),
false);
}
/**
@@ -780,13 +780,13 @@ public class CallLogger {
private byte[] getRequestContent(HttpServletRequest req) {
if (req instanceof CachingHttpServletRequest)
return ((CachingHttpServletRequest)req).getContent();
- return castOrNull(req.getAttribute("RequestContent"),
byte[].class);
+ return
ObjectUtils.castOrNull(req.getAttribute("RequestContent"), byte[].class);
}
private byte[] getResponseContent(HttpServletRequest req,
HttpServletResponse res) {
if (res instanceof CachingHttpServletResponse)
return ((CachingHttpServletResponse)res).getContent();
- return castOrNull(req.getAttribute("ResponseContent"),
byte[].class);
+ return
ObjectUtils.castOrNull(req.getAttribute("ResponseContent"), byte[].class);
}
private ThrownStats getThrownStats(Throwable e) {
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 bcb424b5c..e791f7dec 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
@@ -25,6 +25,7 @@ import java.util.*;
import jakarta.activation.*;
import org.apache.http.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.cp.*;
import org.apache.juneau.http.resource.*;
import org.apache.juneau.http.response.*;
@@ -136,7 +137,7 @@ public class BasicStaticFiles implements StaticFiles {
@Override /* Object */
public boolean equals(Object o) {
- return super.equals(o) && o instanceof BasicStaticFiles &&
eq(this, (BasicStaticFiles)o, (x,y)->eq(x.headers, y.headers));
+ return super.equals(o) && o instanceof BasicStaticFiles &&
Utils.eq(this, (BasicStaticFiles)o, (x,y)->eq(x.headers, y.headers));
}
@Override /* FileFinder */
