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 22d75a8e9 Test modernization, clean up utility classes.
22d75a8e9 is described below
commit 22d75a8e9b82dd016b00b589ce0ea25b1dba9a7c
Author: James Bognar <[email protected]>
AuthorDate: Mon Aug 25 16:20:45 2025 -0400
Test modernization, clean up utility classes.
---
.../org/apache/juneau/common/internal/Utils.java | 18 +++++++++---------
.../juneau/config/internal/ConfigMapEntry.java | 2 +-
.../src/main/java/org/apache/juneau/MediaType.java | 2 +-
.../src/main/java/org/apache/juneau/Version.java | 2 +-
.../java/org/apache/juneau/collections/JsonList.java | 2 +-
.../org/apache/juneau/oapi/OpenApiParserSession.java | 20 ++++++++++----------
.../java/org/apache/juneau/svl/vars/SwitchVar.java | 2 +-
.../java/org/apache/juneau/rest/util/UrlPath.java | 2 +-
.../org/apache/juneau/utils/StringUtilsTest.java | 14 +++++++-------
9 files changed, 32 insertions(+), 32 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 6447a7f2e..8f759d1e0 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
@@ -890,7 +890,7 @@ public class Utils {
}
/**
- * Same as {@link #split3(String, char)} but limits the number of
tokens returned.
+ * Same as {@link #splita(String, char)} but limits the number of
tokens returned.
*
* @param s The string to split. Can be <jk>null</jk>.
* @param c The character to split on.
@@ -956,12 +956,12 @@ public class Utils {
* @param c The character to split on.
* @return The tokens, or <jk>null</jk> if the string was null.
*/
- public static String[] split3(String s, char c) {
- return split3(s, c, Integer.MAX_VALUE);
+ public static String[] splita(String s, char c) {
+ return splita(s, c, Integer.MAX_VALUE);
}
/**
- * Same as {@link #split3(String,char)} but consumes the tokens instead
of creating an array.
+ * Same as {@link #splita(String,char)} but consumes the tokens instead
of creating an array.
*
* @param s The string to split.
* @param c The character to split on.
@@ -998,14 +998,14 @@ public class Utils {
}
/**
- * Same as {@link #split3(String, char)} but limits the number of
tokens returned.
+ * Same as {@link #splita(String, char)} but limits the number of
tokens returned.
*
* @param s The string to split. Can be <jk>null</jk>.
* @param c The character to split on.
* @param limit The maximum number of tokens to return.
* @return The tokens, or <jk>null</jk> if the string was null.
*/
- public static String[] split3(String s, char c, int limit) {
+ public static String[] splita(String s, char c, int limit) {
var l = split(s, c, limit);
return l == null ? null : l.toArray(new String[l.size()]);
}
@@ -1021,7 +1021,7 @@ public class Utils {
}
/**
- * Same as {@link #split3(String, char)} except splits all strings in
the input and returns a single result.
+ * Same as {@link #splita(String, char)} except splits all strings in
the input and returns a single result.
*
* @param s The string to split. Can be <jk>null</jk>.
* @param c The character to split on.
@@ -1035,7 +1035,7 @@ public class Utils {
if (ss == null || ss.indexOf(c) == -1)
l.add(ss);
else
- Collections.addAll(l, split3(ss, c));
+ Collections.addAll(l, splita(ss, c));
}
return l.toArray(new String[l.size()]);
}
@@ -1044,7 +1044,7 @@ public class Utils {
* Splits a comma-delimited list into an array of strings.
*/
public static String[] splita(String s) {
- return split3(s, ',');
+ return splita(s, ',');
}
/**
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMapEntry.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMapEntry.java
index 0644ce979..8dfe8fe82 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMapEntry.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMapEntry.java
@@ -49,7 +49,7 @@ public class ConfigMapEntry {
i = line.indexOf('#');
if (i != -1) {
- var l2 = Utils.split3(line, '#', 2);
+ var l2 = Utils.splita(line, '#', 2);
line = l2[0];
if (l2.length == 2)
this.comment = l2[1].trim();
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaType.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaType.java
index 463d98b2a..90ef7de54 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaType.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaType.java
@@ -194,7 +194,7 @@ public class MediaType implements Comparable<MediaType> {
type = (i == -1 ? x : x.substring(0, i));
subType = (i == -1 ? "*" : x.substring(i+1));
- subTypes = Utils.split3(subType, '+');
+ subTypes = Utils.splita(subType, '+');
subTypesSorted = Arrays.copyOf(subTypes, subTypes.length);
Arrays.sort(this.subTypesSorted);
hasSubtypeMeta = ArrayUtils.contains("*", this.subTypes);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Version.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Version.java
index c28ce4a3f..7e0f9ad6c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Version.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Version.java
@@ -68,7 +68,7 @@ public class Version implements Comparable<Version> {
public Version(String value) {
if (Utils.isEmpty(value))
value = "0";
- String[] sParts = Utils.split3(value, '.');
+ String[] sParts = Utils.splita(value, '.');
parts = new int[sParts.length];
for (int i = 0; i < sParts.length; i++) {
try {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
index 898264735..6abc1ffd1 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
@@ -128,7 +128,7 @@ public class JsonList extends LinkedList<Object> {
if (Utils.isEmpty(s))
return null;
if (! StringUtils.isJsonArray(s, true))
- return new JsonList((Object[])Utils.split3(s.trim(),
','));
+ return new JsonList((Object[])Utils.splita(s.trim(),
','));
return new JsonList(s);
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserSession.java
index e9df1d403..eaf91005f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserSession.java
@@ -393,19 +393,19 @@ public class OpenApiParserSession extends
UonParserSession {
if (cf == MULTI)
ss = new String[]{in};
else if (cf == CSV)
- ss = Utils.split3(in, ',');
+ ss = Utils.splita(in, ',');
else if (cf == PIPES)
- ss = Utils.split3(in, '|');
+ ss = Utils.splita(in, '|');
else if (cf == SSV)
ss = Utils.splitQuoted(in);
else if (cf == TSV)
- ss = Utils.split3(in, '\t');
+ ss = Utils.splita(in, '\t');
else if (cf == HttpPartCollectionFormat.UONC)
return super.parse(partType, null, in,
type);
else if (cf == NO_COLLECTION_FORMAT) {
if (firstNonWhitespaceChar(in) == '@'
&& lastNonWhitespaceChar(in) == ')')
return super.parse(partType,
null, in, type);
- ss = Utils.split3(in, ',');
+ ss = Utils.splita(in, ',');
}
HttpPartSchema items = schema.getItems();
@@ -438,25 +438,25 @@ public class OpenApiParserSession extends
UonParserSession {
if (cf == MULTI)
ss = new String[]{in};
else if (cf == CSV)
- ss = Utils.split3(in, ',');
+ ss = Utils.splita(in, ',');
else if (cf == PIPES)
- ss = Utils.split3(in, '|');
+ ss = Utils.splita(in, '|');
else if (cf == SSV)
ss = Utils.splitQuoted(in);
else if (cf == TSV)
- ss = Utils.split3(in, '\t');
+ ss = Utils.splita(in, '\t');
else if (cf == HttpPartCollectionFormat.UONC)
return super.parse(partType, null, in,
type);
else if (cf == NO_COLLECTION_FORMAT) {
if (firstNonWhitespaceChar(in) == '@'
&& lastNonWhitespaceChar(in) == ')')
return super.parse(partType,
null, in, type);
- ss = Utils.split3(in, ',');
+ ss = Utils.splita(in, ',');
}
if (type.isBean()) {
BeanMap<T> m =
ctx.getBeanContext().newBeanMap(type.getInnerClass());
for (String s : ss) {
- String[] kv = Utils.split3(s,
'=', 2);
+ String[] kv = Utils.splita(s,
'=', 2);
if (kv.length != 2)
throw new
ParseException("Invalid input {0} for part type OBJECT.", in);
String key = kv[0], value =
kv[1];
@@ -480,7 +480,7 @@ public class OpenApiParserSession extends UonParserSession {
m = JsonMap.create();
for (String s : ss) {
- String[] kv = Utils.split3(s,
'=', 2);
+ String[] kv = Utils.splita(s,
'=', 2);
if (kv.length != 2)
throw new
ParseException("Invalid input {0} for part type OBJECT.", in);
String key = kv[0], value =
kv[1];
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/SwitchVar.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/SwitchVar.java
index 29c9801d3..c65200f53 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/SwitchVar.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/SwitchVar.java
@@ -69,7 +69,7 @@ public class SwitchVar extends MultipartVar {
for (int i = 1; i < args.length; i++) {
String pattern = args[i];
- String[] parts = Utils.split3(pattern, ':', 2);
+ String[] parts = Utils.splita(pattern, ':', 2);
assertArg(parts.length >= 2, "Invalid arguments passed
to $SW var. Each case statement must contains 'pattern:value'.");
Pattern p = Pattern.compile(parts[0].replace("*",
".*").replace("?", "."));
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/UrlPath.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/UrlPath.java
index 31227d4b0..58b83e874 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/UrlPath.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/UrlPath.java
@@ -48,7 +48,7 @@ public class UrlPath {
*/
UrlPath(String path) {
this.path = path;
- parts = path == null ? new String[0] :
Utils.split3(path.substring(1), '/');
+ parts = path == null ? new String[0] :
Utils.splita(path.substring(1), '/');
for (int i = 0; i < parts.length; i++)
parts[i] = urlDecode(parts[i]);
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/utils/StringUtilsTest.java
b/juneau-utest/src/test/java/org/apache/juneau/utils/StringUtilsTest.java
index a717d80e2..33514bb6a 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/utils/StringUtilsTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/utils/StringUtilsTest.java
@@ -434,13 +434,13 @@ class StringUtilsTest extends SimpleTestBase {
// split(String,char,int)
//====================================================================================================
@Test void a09_splitWithLimit() {
- TestUtils.assertString("[boo,and,foo]",
Utils.split3("boo:and:foo", ':', 10));
- TestUtils.assertString("[boo,and:foo]",
Utils.split3("boo:and:foo", ':', 2));
- TestUtils.assertString("[boo:and:foo]",
Utils.split3("boo:and:foo", ':', 1));
- TestUtils.assertString("[boo:and:foo]",
Utils.split3("boo:and:foo", ':', 0));
- TestUtils.assertString("[boo:and:foo]",
Utils.split3("boo:and:foo", ':', -1));
- TestUtils.assertString("[boo,and,foo]", Utils.split3("boo : and
: foo", ':', 10));
- TestUtils.assertString("[boo,and : foo]", Utils.split3("boo :
and : foo", ':', 2));
+ TestUtils.assertString("[boo,and,foo]",
Utils.splita("boo:and:foo", ':', 10));
+ TestUtils.assertString("[boo,and:foo]",
Utils.splita("boo:and:foo", ':', 2));
+ TestUtils.assertString("[boo:and:foo]",
Utils.splita("boo:and:foo", ':', 1));
+ TestUtils.assertString("[boo:and:foo]",
Utils.splita("boo:and:foo", ':', 0));
+ TestUtils.assertString("[boo:and:foo]",
Utils.splita("boo:and:foo", ':', -1));
+ TestUtils.assertString("[boo,and,foo]", Utils.splita("boo : and
: foo", ':', 10));
+ TestUtils.assertString("[boo,and : foo]", Utils.splita("boo :
and : foo", ':', 2));
}
//====================================================================================================
