(juneau) branch master updated: Test modernization, clean up utility classes.

[jamesbognar]

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 52e0f3cca Test modernization, clean up utility classes.
52e0f3cca is described below

commit 52e0f3ccad1a7c19a412395edc0181e9c6787037
Author: James Bognar <james.bog...@salesforce.com>
AuthorDate: Mon Aug 25 11:34:09 2025 -0400

    Test modernization, clean up utility classes.
---
 .../java/org/apache/juneau/bean/LinkString.java    |  1 -
 .../org/apache/juneau/internal/ObjectUtils.java    | 27 ----------------------
 .../juneau/rest/staticfile/BasicStaticFiles.java   |  2 +-
 3 files changed, 1 insertion(+), 29 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 53d4b6948..461925a23 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
@@ -14,7 +14,6 @@ package org.apache.juneau.bean;
 
 import static org.apache.juneau.common.internal.StringUtils.*;
 import static org.apache.juneau.common.internal.ThrowableUtils.*;
-import static org.apache.juneau.internal.ObjectUtils.eq;
 
 import java.text.*;
 
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/ObjectUtils.java
index b456339b9..a600801a9 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/ObjectUtils.java
@@ -30,29 +30,6 @@ import org.apache.juneau.reflect.*;
  */
 public class ObjectUtils {
 
-       /**
-        * Tests two arrays for equality, gracefully handling nulls.
-        *
-        * @param <T> The value types.
-        * @param o1 Array 1.
-        * @param o2 Array 2.
-        * @return <jk>true</jk> if both arrays are equal based on the {@link 
Object#equals(Object)} method on each element.
-        */
-       public static <T> boolean eq(T[] o1, T[] o2) {
-               if (o1 == null || o2 == null) {
-                       if (o1 != null || o2 != null)
-                               return false;
-                       return true;
-               }
-               if (o1.length != o2.length)
-                       return false;
-               for (int i = 0; i < o1.length; i++)
-                       if (! Utils.eq(o1[i], o2[i]))
-                               return false;
-               return true;
-
-       }
-
        /**
         * Tests two objects for equality, gracefully handling nulls and arrays.
         *
@@ -64,10 +41,6 @@ public class ObjectUtils {
                return ! Utils.eq(o1, o2);
        }
 
-       private static boolean isArray(Object o) {
-               return o != null && o.getClass().isArray();
-       }
-
        /**
         * If the specified object is a {@link Supplier} or {@link Value}, 
returns the inner value, otherwise the same value.
         *
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 e791f7dec..72dd5ecd3 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
@@ -137,7 +137,7 @@ public class BasicStaticFiles implements StaticFiles {
 
        @Override /* Object */
        public boolean equals(Object o) {
-               return super.equals(o) && o instanceof BasicStaticFiles && 
Utils.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)->Utils.eq(x.headers, y.headers));
        }
 
        @Override /* FileFinder */