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 3ec22f846 Test modernization, clean up utility classes.
3ec22f846 is described below
commit 3ec22f846e8a8f305507960a6ccf31e386ed7f02
Author: James Bognar <[email protected]>
AuthorDate: Mon Aug 25 16:12:02 2025 -0400
Test modernization, clean up utility classes.
---
.../src/main/java/org/apache/juneau/common/internal/Utils.java | 6 +++---
.../src/main/java/org/apache/juneau/BeanFilter.java | 8 ++++----
.../src/main/java/org/apache/juneau/httppart/HttpPartSchema.java | 2 +-
.../java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java | 2 +-
.../src/main/java/org/apache/juneau/jsonschema/TypeCategory.java | 4 ++--
.../src/main/java/org/apache/juneau/http/header/Thrown.java | 2 +-
.../src/main/java/org/apache/juneau/rest/RestContext.java | 2 +-
.../apache/juneau/rest/swagger/BasicSwaggerProviderSession.java | 2 +-
.../src/test/java/org/apache/juneau/utils/StringUtilsTest.java | 2 +-
9 files changed, 15 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 6e0049f54..44d1f289d 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
@@ -977,7 +977,7 @@ public class Utils {
* @param c The character to split on.
* @param consumer The consumer of the tokens.
*/
- public static void split3(String s, char c, Consumer<String> consumer) {
+ public static void split(String s, char c, Consumer<String> consumer) {
var escapeChars = StringUtils.getEscapeSet(c);
if (isEmpty(s))
@@ -1026,8 +1026,8 @@ public class Utils {
* @param s The string to split.
* @param consumer The consumer of the tokens.
*/
- public static void split3(String s, Consumer<String> consumer) {
- split3(s, ',', consumer);
+ public static void split(String s, Consumer<String> consumer) {
+ split(s, ',', consumer);
}
/**
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 ce3670ead..45fd85fe0 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
@@ -453,7 +453,7 @@ public final class BeanFilter {
public Builder properties(String...value) {
this.properties = set();
for (String v : value)
- Utils.split3(v, x -> properties.add(x));
+ Utils.split(v, x -> properties.add(x));
return this;
}
@@ -497,7 +497,7 @@ public final class BeanFilter {
public Builder excludeProperties(String...value) {
this.excludeProperties = set();
for (String v : value)
- Utils.split3(v, x -> excludeProperties.add(x));
+ Utils.split(v, x -> excludeProperties.add(x));
return this;
}
@@ -543,7 +543,7 @@ public final class BeanFilter {
public Builder readOnlyProperties(String...value) {
this.readOnlyProperties = set();
for (String v : value)
- Utils.split3(v, x -> readOnlyProperties.add(x));
+ Utils.split(v, x -> readOnlyProperties.add(x));
return this;
}
@@ -589,7 +589,7 @@ public final class BeanFilter {
public Builder writeOnlyProperties(String...value) {
this.writeOnlyProperties = set();
for (String v : value)
- Utils.split3(v, x ->
writeOnlyProperties.add(x));
+ Utils.split(v, x -> writeOnlyProperties.add(x));
return this;
}
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 a97e695ec..7d51ae246 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
@@ -4045,7 +4045,7 @@ public class HttpPartSchema {
for (String[] ss : s)
if (ss != null)
for (String ss2 : ss)
- Utils.split3(ss2, x -> set.add(x));
+ Utils.split(ss2, x -> set.add(x));
return set.isEmpty() ? null : set;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
index 235fb17ed..b4a2c4a22 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
@@ -885,7 +885,7 @@ public class JsonSchemaGenerator extends
BeanTraverseContext implements JsonSche
ignoreTypes = builder.ignoreTypes == null ? emptySet() : new
TreeSet<>(builder.ignoreTypes);
Set<Pattern> ignoreTypePatterns = Utils.set();
- ignoreTypes.forEach(y -> Utils.split3(y, x ->
ignoreTypePatterns.add(Pattern.compile(x.replace(".", "\\.").replace("*",
".*")))));
+ ignoreTypes.forEach(y -> Utils.split(y, x ->
ignoreTypePatterns.add(Pattern.compile(x.replace(".", "\\.").replace("*",
".*")))));
this.ignoreTypePatterns = ignoreTypePatterns.toArray(new
Pattern[ignoreTypePatterns.size()]);
try {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/TypeCategory.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/TypeCategory.java
index 3af7984ca..451802ec2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/TypeCategory.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/TypeCategory.java
@@ -72,7 +72,7 @@ public enum TypeCategory {
if (s == null || s.isEmpty())
return Collections.emptySet();
Set<TypeCategory> set = set();
- Utils.split3(s, x -> set.add(valueOf(x.toUpperCase())));
+ Utils.split(s, x -> set.add(valueOf(x.toUpperCase())));
return set;
}
@@ -86,7 +86,7 @@ public enum TypeCategory {
if (s == null || s.isEmpty())
return new TypeCategory[0];
List<TypeCategory> list = list();
- Utils.split3(s, x -> list.add(valueOf(x.toUpperCase())));
+ Utils.split(s, x -> list.add(valueOf(x.toUpperCase())));
return list.toArray(new TypeCategory[list.size()]);
}
}
\ No newline at end of file
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 ffadb9bb6..8a57eded0 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
@@ -109,7 +109,7 @@ public class Thrown extends BasicCsvHeader {
public Thrown(String value) {
super(NAME, value);
List<Part> l = Utils.list();
- Utils.split3(value, x -> l.add(new Part(x)));
+ Utils.split(value, x -> l.add(new Part(x)));
this.value = value == null ? null : u(l);
}
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 5e01f3641..1170ad3ee 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
@@ -5569,7 +5569,7 @@ public class RestContext extends Context {
return v == null ? false : super.contains(v);
}
};
- Utils.split3(value, x -> s.add(x));
+ Utils.split(value, x -> s.add(x));
return u(s);
}
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 0af5568d7..6267eccd6 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
@@ -1128,7 +1128,7 @@ public class BasicSwaggerProviderSession {
return null;
Set<String> set = set();
for (String s : ss)
- Utils.split3(s, x -> set.add(x));
+ Utils.split(s, x -> set.add(x));
return set.isEmpty() ? null : set;
}
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 a6b6a8259..e1b9432bf 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
@@ -426,7 +426,7 @@ class StringUtilsTest extends SimpleTestBase {
private List<String> split2test(String s) {
List<String> l = TestUtils.list();
- Utils.split3(s, l::add);
+ Utils.split(s, l::add);
return l;
}
