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

commit ec2548df76dff9812e7b938a3bfc89339c7c9a7c
Author: James Bognar <james.bog...@salesforce.com>
AuthorDate: Mon Aug 25 16:11:10 2025 -0400

    Test modernization, clean up utility classes.
---
 .../org/apache/juneau/common/internal/Utils.java     | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git 
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/Utils.java
 
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/Utils.java
index eef03cd08..6e0049f54 100644
--- 
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/Utils.java
+++ 
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/Utils.java
@@ -859,17 +859,7 @@ public class Utils {
         * Splits a comma-delimited list into a list of strings.
         */
        public static List<String> split(String s) {
-               return s == null ? Collections.emptyList() : Utils.split2(s);
-       }
-
-       /**
-        * Shortcut for calling <code>split(s, <js>','</js>)</code>
-        *
-        * @param s The string to split.  Can be <jk>null</jk>.
-        * @return The tokens, or <jk>null</jk> if the string was null.
-        */
-       public static List<String> split2(String s) {
-               return split2(s, ',');
+               return s == null ? Collections.emptyList() : split(s, ',');
        }
 
        /**
@@ -895,8 +885,8 @@ public class Utils {
         * @param c The character to split on.
         * @return The tokens, or <jk>null</jk> if the string was null.
         */
-       public static List<String> split2(String s, char c) {
-               return split2(s, c, Integer.MAX_VALUE);
+       public static List<String> split(String s, char c) {
+               return split(s, c, Integer.MAX_VALUE);
        }
 
        /**
@@ -907,7 +897,7 @@ public class Utils {
         * @param limit The maximum number of tokens to return.
         * @return The tokens, or <jk>null</jk> if the string was null.
         */
-       public static List<String> split2(String s, char c, int limit) {
+       public static List<String> split(String s, char c, int limit) {
 
                var escapeChars = StringUtils.getEscapeSet(c);
 
@@ -1026,7 +1016,7 @@ public class Utils {
         * @return The tokens, or <jk>null</jk> if the string was null.
         */
        public static String[] split3(String s, char c, int limit) {
-               var l = split2(s, c, limit);
+               var l = split(s, c, limit);
                return l == null ? null : l.toArray(new String[l.size()]);
        }