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 d067a33949 FilteredMap/MapBuilder improvements
d067a33949 is described below
commit d067a33949fcd607270264f6151950fe7dfdb3ae
Author: James Bognar <[email protected]>
AuthorDate: Sun Dec 14 17:58:50 2025 -0500
FilteredMap/MapBuilder improvements
---
.../collections/{ListBuilder.java => Lists.java} | 76 +++++------
.../collections/{MapBuilder.java => Maps.java} | 54 ++++----
.../collections/{SetBuilder.java => Sets.java} | 86 ++++++------
.../juneau/commons/utils/CollectionUtils.java | 28 ++--
.../org/apache/juneau/internal/ConverterUtils.java | 18 +--
.../{ListBuilder_Test.java => Lists_Test.java} | 98 +++++++-------
.../{MapBuilder_Test.java => Maps_Test.java} | 144 ++++++++++-----------
.../{SetBuilder_Test.java => Sets_Test.java} | 102 +++++++--------
.../juneau/commons/utils/CollectionUtils_Test.java | 8 +-
9 files changed, 307 insertions(+), 307 deletions(-)
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/ListBuilder.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Lists.java
similarity index 86%
rename from
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/ListBuilder.java
rename to
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Lists.java
index baf787e04a..1eaec4469a 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/ListBuilder.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Lists.java
@@ -50,47 +50,47 @@ import java.util.function.*;
* <h5 class='section'>Examples:</h5>
* <p class='bjava'>
* <jc>// Basic usage</jc>
- * List<String> <jv>list</jv> =
ListBuilder.<jsm>create</jsm>(String.<jk>class</jk>)
+ * List<String> <jv>list</jv> =
Lists.<jsm>create</jsm>(String.<jk>class</jk>)
* .add(<js>"apple"</js>, <js>"banana"</js>, <js>"cherry"</js>)
* .build();
*
* <jc>// With sorting</jc>
- * List<Integer> <jv>sorted</jv> =
ListBuilder.<jsm>create</jsm>(Integer.<jk>class</jk>)
+ * List<Integer> <jv>sorted</jv> =
Lists.<jsm>create</jsm>(Integer.<jk>class</jk>)
* .add(3, 1, 4, 1, 5, 9, 2, 6)
* .sorted()
* .build();
*
* <jc>// Conditional elements</jc>
- * List<String> <jv>filtered</jv> =
ListBuilder.<jsm>create</jsm>(String.<jk>class</jk>)
+ * List<String> <jv>filtered</jv> =
Lists.<jsm>create</jsm>(String.<jk>class</jk>)
* .add(<js>"always"</js>)
* .addIf(<jv>includeOptional</jv>, <js>"optional"</js>)
* .build();
*
* <jc>// Immutable list</jc>
- * List<String> <jv>immutable</jv> =
ListBuilder.<jsm>create</jsm>(String.<jk>class</jk>)
+ * List<String> <jv>immutable</jv> =
Lists.<jsm>create</jsm>(String.<jk>class</jk>)
* .add(<js>"read"</js>, <js>"only"</js>)
* .unmodifiable()
* .build();
*
* <jc>// Sparse mode - returns null when empty</jc>
- * List<String> <jv>maybeNull</jv> =
ListBuilder.<jsm>create</jsm>(String.<jk>class</jk>)
+ * List<String> <jv>maybeNull</jv> =
Lists.<jsm>create</jsm>(String.<jk>class</jk>)
* .sparse()
* .build(); <jc>// Returns null, not empty list</jc>
*
* <jc>// From multiple sources</jc>
* List<Integer> <jv>existing</jv> = l(1, 2, 3);
- * List<Integer> <jv>combined</jv> =
ListBuilder.<jsm>create</jsm>(Integer.<jk>class</jk>)
+ * List<Integer> <jv>combined</jv> =
Lists.<jsm>create</jsm>(Integer.<jk>class</jk>)
* .addAll(<jv>existing</jv>)
* .add(4, 5, 6)
* .build();
*
* <jc>// FluentList wrapper - use buildFluent()</jc>
- * FluentList<String> <jv>fluent</jv> =
ListBuilder.<jsm>create</jsm>(String.<jk>class</jk>)
+ * FluentList<String> <jv>fluent</jv> =
Lists.<jsm>create</jsm>(String.<jk>class</jk>)
* .add(<js>"one"</js>, <js>"two"</js>)
* .buildFluent();
*
* <jc>// FilteredList - use buildFiltered()</jc>
- * FilteredList<Integer> <jv>filtered</jv> =
ListBuilder.<jsm>create</jsm>(Integer.<jk>class</jk>)
+ * FilteredList<Integer> <jv>filtered</jv> =
Lists.<jsm>create</jsm>(Integer.<jk>class</jk>)
* .filtered(v -> v > 0)
* .add(5)
* .add(-1) <jc>// Filtered out</jc>
@@ -104,20 +104,20 @@ import java.util.function.*;
*
* <h5 class='section'>See Also:</h5><ul>
* <li class='link'><a class="doclink"
href="https://juneau.apache.org/docs/topics/JuneauCommonsCollections";>juneau-commons-collections</a>
- * <li class='jc'>{@link MapBuilder}
- * <li class='jc'>{@link SetBuilder}
+ * <li class='jc'>{@link Maps}
+ * <li class='jc'>{@link Sets}
* </ul>
*
* @param <E> The element type.
*/
-public class ListBuilder<E> {
+public class Lists<E> {
/**
* Creates a new list builder for the specified element type.
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * List<String> <jv>list</jv> =
ListBuilder.<jsm>create</jsm>(String.<jk>class</jk>)
+ * List<String> <jv>list</jv> =
Lists.<jsm>create</jsm>(String.<jk>class</jk>)
* .add(<js>"a"</js>, <js>"b"</js>, <js>"c"</js>)
* .build();
* </p>
@@ -126,8 +126,8 @@ public class ListBuilder<E> {
* @param elementType The element type class. Required for type-safe
operations. Must not be <jk>null</jk>.
* @return A new list builder instance.
*/
- public static <E> ListBuilder<E> create(Class<E> elementType) {
- return new ListBuilder<>(assertArgNotNull("elementType",
elementType));
+ public static <E> Lists<E> create(Class<E> elementType) {
+ return new Lists<>(assertArgNotNull("elementType",
elementType));
}
private List<E> list;
@@ -143,7 +143,7 @@ public class ListBuilder<E> {
*
* @param elementType The element type. Must not be <jk>null</jk>.
*/
- public ListBuilder(Class<E> elementType) {
+ public Lists(Class<E> elementType) {
this.elementType = assertArgNotNull("elementType", elementType);
}
@@ -156,7 +156,7 @@ public class ListBuilder<E> {
* @param value The value to add to this list.
* @return This object.
*/
- public ListBuilder<E> add(E value) {
+ public Lists<E> add(E value) {
if (list == null)
list = list();
list.add(value);
@@ -170,7 +170,7 @@ public class ListBuilder<E> {
* @return This object.
*/
@SuppressWarnings("unchecked")
- public ListBuilder<E> add(E...values) {
+ public Lists<E> add(E...values) {
assertArgNotNull("values", values);
for (var v : values)
add(v);
@@ -186,7 +186,7 @@ public class ListBuilder<E> {
* @param value The collection to add to this list.
* @return This object.
*/
- public ListBuilder<E> addAll(Collection<E> value) {
+ public Lists<E> addAll(Collection<E> value) {
if (nn(value)) {
if (list == null)
list = new LinkedList<>(value);
@@ -211,7 +211,7 @@ public class ListBuilder<E> {
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
* <jc>// Mix different input types</jc>
- * List<Integer> <jv>list</jv> =
ListBuilder.<jsm>create</jsm>(Integer.<jk>class</jk>)
+ * List<Integer> <jv>list</jv> =
Lists.<jsm>create</jsm>(Integer.<jk>class</jk>)
* .addAny(1, 2, 3) <jc>//
Direct values</jc>
* .addAny(l(4, 5, 6)) <jc>// Collection</jc>
* .addAny(<jk>new int</jk>[]{7, 8, 9})
<jc>// Array</jc>
@@ -223,7 +223,7 @@ public class ListBuilder<E> {
* @throws IllegalStateException if element type is unknown.
* @throws RuntimeException if a value cannot be converted to the
element type.
*/
- public ListBuilder<E> addAny(Object...values) {
+ public Lists<E> addAny(Object...values) {
if (nn(values)) {
for (var o : values) {
if (nn(o)) {
@@ -255,7 +255,7 @@ public class ListBuilder<E> {
* @param value The value.
* @return This object.
*/
- public ListBuilder<E> addIf(boolean flag, E value) {
+ public Lists<E> addIf(boolean flag, E value) {
if (flag)
add(value);
return this;
@@ -318,7 +318,7 @@ public class ListBuilder<E> {
* <p class='bjava'>
* <jk>import static</jk>
org.apache.juneau.commons.utils.CollectionUtils.*;
*
- * FluentList<String> <jv>list</jv> =
ListBuilder.<jsm>create</jsm>(String.<jk>class</jk>)
+ * FluentList<String> <jv>list</jv> =
Lists.<jsm>create</jsm>(String.<jk>class</jk>)
* .add(<js>"one"</js>, <js>"two"</js>)
* .buildFluent();
* </p>
@@ -337,7 +337,7 @@ public class ListBuilder<E> {
* <p class='bjava'>
* <jk>import static</jk>
org.apache.juneau.commons.utils.CollectionUtils.*;
*
- * FilteredList<Integer> <jv>list</jv> =
ListBuilder.<jsm>create</jsm>(Integer.<jk>class</jk>)
+ * FilteredList<Integer> <jv>list</jv> =
Lists.<jsm>create</jsm>(Integer.<jk>class</jk>)
* .filtered(v -> v != <jk>null</jk> && v >
0)
* .add(5)
* .add(-1) <jc>// Will be filtered out</jc>
@@ -371,7 +371,7 @@ public class ListBuilder<E> {
* @param elementFunction The function to convert elements. Must not be
<jk>null</jk>.
* @return This object.
*/
- public ListBuilder<E> elementFunction(Function<Object,E>
elementFunction) {
+ public Lists<E> elementFunction(Function<Object,E> elementFunction) {
this.elementFunction = assertArgNotNull("elementFunction",
elementFunction);
return this;
}
@@ -382,7 +382,7 @@ public class ListBuilder<E> {
* @param value The element type. Must not be <jk>null</jk>.
* @return This object.
*/
- public ListBuilder<E> elementType(Class<E> value) {
+ public Lists<E> elementType(Class<E> value) {
elementType = assertArgNotNull("value", value);
return this;
}
@@ -405,7 +405,7 @@ public class ListBuilder<E> {
* <p class='bjava'>
* <jk>import static</jk>
org.apache.juneau.commons.utils.CollectionUtils.*;
*
- * List<Object> <jv>list</jv> =
ListBuilder.<jsm>create</jsm>(Object.<jk>class</jk>)
+ * List<Object> <jv>list</jv> =
Lists.<jsm>create</jsm>(Object.<jk>class</jk>)
* .filtered()
* .add(<js>"name"</js>)
* .add(-1) <jc>// Filtered out at build
time</jc>
@@ -416,7 +416,7 @@ public class ListBuilder<E> {
*
* @return This object.
*/
- public ListBuilder<E> filtered() {
+ public Lists<E> filtered() {
// @formatter:off
return filtered(v -> ! (
v == null
@@ -448,7 +448,7 @@ public class ListBuilder<E> {
* <jk>import static</jk>
org.apache.juneau.commons.utils.CollectionUtils.*;
*
* <jc>// Keep only non-null, positive integers</jc>
- * List<Integer> <jv>list</jv> =
ListBuilder.<jsm>create</jsm>(Integer.<jk>class</jk>)
+ * List<Integer> <jv>list</jv> =
Lists.<jsm>create</jsm>(Integer.<jk>class</jk>)
* .filtered(v -> v != <jk>null</jk> && v >
0)
* .add(5)
* .add(-1) <jc>// Filtered out at build time</jc>
@@ -456,7 +456,7 @@ public class ListBuilder<E> {
* .build();
*
* <jc>// Multiple filters combined with AND</jc>
- * List<Integer> <jv>list2</jv> =
ListBuilder.<jsm>create</jsm>(Integer.<jk>class</jk>)
+ * List<Integer> <jv>list2</jv> =
Lists.<jsm>create</jsm>(Integer.<jk>class</jk>)
* .filtered(v -> v != <jk>null</jk>) <jc>//
First filter</jc>
* .filtered(v -> v > 0) <jc>//
Second filter (ANDed with first)</jc>
* .filtered(v -> v < 100); <jc>//
Third filter (ANDed with previous)</jc>
@@ -469,7 +469,7 @@ public class ListBuilder<E> {
* @param filter The filter predicate. Must not be <jk>null</jk>.
* @return This object.
*/
- public ListBuilder<E> filtered(Predicate<E> filter) {
+ public Lists<E> filtered(Predicate<E> filter) {
Predicate<E> newFilter = assertArgNotNull("filter", filter);
if (this.filter == null)
this.filter = newFilter;
@@ -484,7 +484,7 @@ public class ListBuilder<E> {
* @return This object.
*/
@SuppressWarnings("unchecked")
- public ListBuilder<E> sorted() {
+ public Lists<E> sorted() {
return sorted((Comparator<E>)Comparator.naturalOrder());
}
@@ -494,7 +494,7 @@ public class ListBuilder<E> {
* @param comparator The comparator to use for sorting. Must not be
<jk>null</jk>.
* @return This object.
*/
- public ListBuilder<E> sorted(Comparator<E> comparator) {
+ public Lists<E> sorted(Comparator<E> comparator) {
this.comparator = assertArgNotNull("comparator", comparator);
return this;
}
@@ -507,7 +507,7 @@ public class ListBuilder<E> {
*
* @return This object.
*/
- public ListBuilder<E> sparse() {
+ public Lists<E> sparse() {
sparse = true;
return this;
}
@@ -518,7 +518,7 @@ public class ListBuilder<E> {
*
* @return This object.
*/
- public ListBuilder<E> unmodifiable() {
+ public Lists<E> unmodifiable() {
this.unmodifiable = true;
return this;
}
@@ -533,7 +533,7 @@ public class ListBuilder<E> {
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
* <jc>// Create a thread-safe list</jc>
- * List<String> <jv>list</jv> =
ListBuilder.<jsm>create</jsm>(String.<jk>class</jk>)
+ * List<String> <jv>list</jv> =
Lists.<jsm>create</jsm>(String.<jk>class</jk>)
* .add(<js>"one"</js>, <js>"two"</js>)
* .concurrent()
* .build();
@@ -541,7 +541,7 @@ public class ListBuilder<E> {
*
* @return This object.
*/
- public ListBuilder<E> concurrent() {
+ public Lists<E> concurrent() {
concurrent = true;
return this;
}
@@ -556,7 +556,7 @@ public class ListBuilder<E> {
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
* <jc>// Conditionally create a thread-safe list</jc>
- * List<String> <jv>list</jv> =
ListBuilder.<jsm>create</jsm>(String.<jk>class</jk>)
+ * List<String> <jv>list</jv> =
Lists.<jsm>create</jsm>(String.<jk>class</jk>)
* .add(<js>"one"</js>, <js>"two"</js>)
* .concurrent(<jv>needsThreadSafety</jv>)
* .build();
@@ -565,7 +565,7 @@ public class ListBuilder<E> {
* @param value Whether to make the list thread-safe.
* @return This object.
*/
- public ListBuilder<E> concurrent(boolean value) {
+ public Lists<E> concurrent(boolean value) {
concurrent = value;
return this;
}
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/MapBuilder.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Maps.java
similarity index 94%
rename from
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/MapBuilder.java
rename to
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Maps.java
index 12a3ef1dc4..59dd501560 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/MapBuilder.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Maps.java
@@ -113,14 +113,14 @@ import java.util.function.*;
*
* <h5 class='section'>See Also:</h5><ul>
* <li class='link'><a class="doclink"
href="https://juneau.apache.org/docs/topics/JuneauCommonsCollections";>juneau-commons-collections</a>
- * <li class='jc'>{@link ListBuilder}
- * <li class='jc'>{@link SetBuilder}
+ * <li class='jc'>{@link Lists}
+ * <li class='jc'>{@link Sets}
* </ul>
*
* @param <K> The key type.
* @param <V> The value type.
*/
-public class MapBuilder<K,V> {
+public class Maps<K,V> {
/**
* Static creator.
@@ -131,8 +131,8 @@ public class MapBuilder<K,V> {
* @param valueType The value type. Must not be <jk>null</jk>.
* @return A new builder.
*/
- public static <K,V> MapBuilder<K,V> create(Class<K> keyType, Class<V>
valueType) {
- return new MapBuilder<>(assertArgNotNull("keyType", keyType),
assertArgNotNull("valueType", valueType));
+ public static <K,V> Maps<K,V> create(Class<K> keyType, Class<V>
valueType) {
+ return new Maps<>(assertArgNotNull("keyType", keyType),
assertArgNotNull("valueType", valueType));
}
/**
@@ -145,7 +145,7 @@ public class MapBuilder<K,V> {
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * Map<String, Integer> <jv>map</jv> =
MapBuilder.<jsm>create</jsm>()
+ * Map<String, Integer> <jv>map</jv> =
Maps.<jsm>create</jsm>()
* .add(<js>"one"</js>, 1)
* .add(<js>"two"</js>, 2)
* .build();
@@ -156,8 +156,8 @@ public class MapBuilder<K,V> {
* @return A new builder.
*/
@SuppressWarnings({ "unchecked", "rawtypes" })
- public static <K,V> MapBuilder<K,V> create() {
- return new MapBuilder(Object.class, Object.class);
+ public static <K,V> Maps<K,V> create() {
+ return new Maps(Object.class, Object.class);
}
private Map<K,V> map;
@@ -177,7 +177,7 @@ public class MapBuilder<K,V> {
* @param keyType The key type. Must not be <jk>null</jk>.
* @param valueType The value type. Must not be <jk>null</jk>.
*/
- public MapBuilder(Class<K> keyType, Class<V> valueType) {
+ public Maps(Class<K> keyType, Class<V> valueType) {
this.keyType = assertArgNotNull("keyType", keyType);
this.valueType = assertArgNotNull("valueType", valueType);
}
@@ -192,7 +192,7 @@ public class MapBuilder<K,V> {
* @param value The map value.
* @return This object.
*/
- public MapBuilder<K,V> add(K key, V value) {
+ public Maps<K,V> add(K key, V value) {
if (map == null)
map = new LinkedHashMap<>();
map.put(key, value);
@@ -211,7 +211,7 @@ public class MapBuilder<K,V> {
* @param value The map to add to this map.
* @return This object.
*/
- public MapBuilder<K,V> addAll(Map<K,V> value) {
+ public Maps<K,V> addAll(Map<K,V> value) {
if (nn(value)) {
if (map == null)
map = new LinkedHashMap<>();
@@ -238,7 +238,7 @@ public class MapBuilder<K,V> {
* @throws RuntimeException If a non-Map object is provided.
*/
@SuppressWarnings("unchecked")
- public MapBuilder<K,V> addAny(Object...values) {
+ public Maps<K,V> addAny(Object...values) {
for (var o : values) {
if (nn(o)) {
if (o instanceof Map o2) {
@@ -262,10 +262,10 @@ public class MapBuilder<K,V> {
* @return This object.
*/
@SuppressWarnings("unchecked")
- public MapBuilder<K,V> addPairs(Object...pairs) {
+ public Maps<K,V> addPairs(Object...pairs) {
assertArgNotNull("pairs", pairs);
if (pairs.length % 2 != 0)
- throw illegalArg("Odd number of parameters passed into
MapBuilder.addPairs(...)");
+ throw illegalArg("Odd number of parameters passed into
Maps.addPairs(...)");
for (var i = 0; i < pairs.length; i += 2)
add((K)pairs[i], (V)pairs[i + 1]);
return this;
@@ -399,7 +399,7 @@ public class MapBuilder<K,V> {
* @param keyFunction The function to convert keys. Must not be
<jk>null</jk>.
* @return This object.
*/
- public MapBuilder<K,V> keyFunction(Function<Object,K> keyFunction) {
+ public Maps<K,V> keyFunction(Function<Object,K> keyFunction) {
this.keyFunction = assertArgNotNull("keyFunction", keyFunction);
return this;
}
@@ -413,7 +413,7 @@ public class MapBuilder<K,V> {
* @param valueFunction The function to convert values. Must not be
<jk>null</jk>.
* @return This object.
*/
- public MapBuilder<K,V> valueFunction(Function<Object,V> valueFunction) {
+ public Maps<K,V> valueFunction(Function<Object,V> valueFunction) {
this.valueFunction = assertArgNotNull("valueFunction",
valueFunction);
return this;
}
@@ -428,7 +428,7 @@ public class MapBuilder<K,V> {
* @param valueFunction The function to convert values. Must not be
<jk>null</jk>.
* @return This object.
*/
- public MapBuilder<K,V> functions(Function<Object,K> keyFunction,
Function<Object,V> valueFunction) {
+ public Maps<K,V> functions(Function<Object,K> keyFunction,
Function<Object,V> valueFunction) {
this.keyFunction = assertArgNotNull("keyFunction", keyFunction);
this.valueFunction = assertArgNotNull("valueFunction",
valueFunction);
return this;
@@ -463,7 +463,7 @@ public class MapBuilder<K,V> {
*
* @return This object.
*/
- public MapBuilder<K,V> filtered() {
+ public Maps<K,V> filtered() {
// @formatter:off
return filtered((k, v) -> ! (
v == null
@@ -516,7 +516,7 @@ public class MapBuilder<K,V> {
* @param filter The filter predicate. Must not be <jk>null</jk>.
* @return This object.
*/
- public MapBuilder<K,V> filtered(BiPredicate<K,V> filter) {
+ public Maps<K,V> filtered(BiPredicate<K,V> filter) {
BiPredicate<K,V> newFilter = assertArgNotNull("filter", filter);
if (this.filter == null)
this.filter = newFilter;
@@ -535,7 +535,7 @@ public class MapBuilder<K,V> {
* @return This object.
*/
@SuppressWarnings("unchecked")
- public MapBuilder<K,V> sorted() {
+ public Maps<K,V> sorted() {
return sorted((Comparator<K>)Comparator.naturalOrder());
}
@@ -549,7 +549,7 @@ public class MapBuilder<K,V> {
* @param comparator The comparator to use for sorting. Must not be
<jk>null</jk>.
* @return This object.
*/
- public MapBuilder<K,V> sorted(Comparator<K> comparator) {
+ public Maps<K,V> sorted(Comparator<K> comparator) {
this.comparator = assertArgNotNull("comparator", comparator);
ordered = false;
return this;
@@ -563,7 +563,7 @@ public class MapBuilder<K,V> {
*
* @return This object.
*/
- public MapBuilder<K,V> sparse() {
+ public Maps<K,V> sparse() {
sparse = true;
return this;
}
@@ -573,7 +573,7 @@ public class MapBuilder<K,V> {
*
* @return This object.
*/
- public MapBuilder<K,V> unmodifiable() {
+ public Maps<K,V> unmodifiable() {
unmodifiable = true;
return this;
}
@@ -613,7 +613,7 @@ public class MapBuilder<K,V> {
*
* @return This object.
*/
- public MapBuilder<K,V> concurrent() {
+ public Maps<K,V> concurrent() {
concurrent = true;
return this;
}
@@ -646,7 +646,7 @@ public class MapBuilder<K,V> {
* @param value Whether to make the map thread-safe.
* @return This object.
*/
- public MapBuilder<K,V> concurrent(boolean value) {
+ public Maps<K,V> concurrent(boolean value) {
concurrent = value;
return this;
}
@@ -675,7 +675,7 @@ public class MapBuilder<K,V> {
*
* @return This object.
*/
- public MapBuilder<K,V> ordered() {
+ public Maps<K,V> ordered() {
return ordered(true);
}
@@ -704,7 +704,7 @@ public class MapBuilder<K,V> {
* @param value Whether to preserve insertion order.
* @return This object.
*/
- public MapBuilder<K,V> ordered(boolean value) {
+ public Maps<K,V> ordered(boolean value) {
ordered = value;
if (ordered)
comparator = null;
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/SetBuilder.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Sets.java
similarity index 87%
rename from
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/SetBuilder.java
rename to
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Sets.java
index 651e67974c..b1aebe4e0a 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/SetBuilder.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Sets.java
@@ -50,53 +50,53 @@ import java.util.function.*;
* <h5 class='section'>Examples:</h5>
* <p class='bjava'>
* <jc>// Basic usage</jc>
- * Set<String> <jv>set</jv> =
SetBuilder.<jsm>create</jsm>(String.<jk>class</jk>)
+ * Set<String> <jv>set</jv> =
Sets.<jsm>create</jsm>(String.<jk>class</jk>)
* .add(<js>"apple"</js>, <js>"banana"</js>, <js>"cherry"</js>)
* .build();
*
* <jc>// Automatic deduplication</jc>
- * Set<Integer> <jv>unique</jv> =
SetBuilder.<jsm>create</jsm>(Integer.<jk>class</jk>)
+ * Set<Integer> <jv>unique</jv> =
Sets.<jsm>create</jsm>(Integer.<jk>class</jk>)
* .add(1, 2, 3, 2, 1) <jc>// Duplicates ignored</jc>
* .build(); <jc>// Contains: 1, 2, 3</jc>
*
* <jc>// With sorting</jc>
- * Set<String> <jv>sorted</jv> =
SetBuilder.<jsm>create</jsm>(String.<jk>class</jk>)
+ * Set<String> <jv>sorted</jv> =
Sets.<jsm>create</jsm>(String.<jk>class</jk>)
* .add(<js>"zebra"</js>, <js>"apple"</js>, <js>"banana"</js>)
* .sorted()
* .build(); <jc>// Returns TreeSet in natural order</jc>
*
* <jc>// Conditional elements</jc>
- * Set<String> <jv>features</jv> =
SetBuilder.<jsm>create</jsm>(String.<jk>class</jk>)
+ * Set<String> <jv>features</jv> =
Sets.<jsm>create</jsm>(String.<jk>class</jk>)
* .add(<js>"basic"</js>)
* .addIf(<jv>hasPremium</jv>, <js>"premium"</js>)
* .addIf(<jv>hasEnterprise</jv>, <js>"enterprise"</js>)
* .build();
*
* <jc>// Immutable set</jc>
- * Set<String> <jv>immutable</jv> =
SetBuilder.<jsm>create</jsm>(String.<jk>class</jk>)
+ * Set<String> <jv>immutable</jv> =
Sets.<jsm>create</jsm>(String.<jk>class</jk>)
* .add(<js>"read"</js>, <js>"only"</js>)
* .unmodifiable()
* .build();
*
* <jc>// From multiple sources</jc>
* Set<Integer> <jv>existing</jv> = Set.of(1, 2, 3);
- * Set<Integer> <jv>combined</jv> =
SetBuilder.<jsm>create</jsm>(Integer.<jk>class</jk>)
+ * Set<Integer> <jv>combined</jv> =
Sets.<jsm>create</jsm>(Integer.<jk>class</jk>)
* .addAll(<jv>existing</jv>)
* .add(4, 5, 6)
* .build();
*
* <jc>// Sparse mode - returns null when empty</jc>
- * Set<String> <jv>maybeNull</jv> =
SetBuilder.<jsm>create</jsm>(String.<jk>class</jk>)
+ * Set<String> <jv>maybeNull</jv> =
Sets.<jsm>create</jsm>(String.<jk>class</jk>)
* .sparse()
* .build(); <jc>// Returns null, not empty set</jc>
*
* <jc>// FluentSet wrapper - use buildFluent()</jc>
- * FluentSet<String> <jv>fluent</jv> =
SetBuilder.<jsm>create</jsm>(String.<jk>class</jk>)
+ * FluentSet<String> <jv>fluent</jv> =
Sets.<jsm>create</jsm>(String.<jk>class</jk>)
* .add(<js>"one"</js>, <js>"two"</js>)
* .buildFluent();
*
* <jc>// FilteredSet - use buildFiltered()</jc>
- * FilteredSet<Integer> <jv>filtered</jv> =
SetBuilder.<jsm>create</jsm>(Integer.<jk>class</jk>)
+ * FilteredSet<Integer> <jv>filtered</jv> =
Sets.<jsm>create</jsm>(Integer.<jk>class</jk>)
* .filtered(v -> v > 0)
* .add(5)
* .add(-1) <jc>// Filtered out</jc>
@@ -110,13 +110,13 @@ import java.util.function.*;
*
* <h5 class='section'>See Also:</h5><ul>
* <li class='link'><a class="doclink"
href="https://juneau.apache.org/docs/topics/JuneauCommonsCollections";>juneau-commons-collections</a>
- * <li class='jc'>{@link ListBuilder}
- * <li class='jc'>{@link MapBuilder}
+ * <li class='jc'>{@link Lists}
+ * <li class='jc'>{@link Maps}
* </ul>
*
* @param <E> The element type.
*/
-public class SetBuilder<E> {
+public class Sets<E> {
/**
* Static creator.
@@ -126,8 +126,8 @@ public class SetBuilder<E> {
* @param elementTypeArgs Optional element type arguments.
* @return A new builder.
*/
- public static <E> SetBuilder<E> create(Class<E> elementType) {
- return new SetBuilder<>(assertArgNotNull("elementType",
elementType));
+ public static <E> Sets<E> create(Class<E> elementType) {
+ return new Sets<>(assertArgNotNull("elementType", elementType));
}
private Set<E> set;
@@ -144,7 +144,7 @@ public class SetBuilder<E> {
* @param elementType The element type. Must not be <jk>null</jk>.
* @param elementTypeArgs The element type generic arguments if there
are any.
*/
- public SetBuilder(Class<E> elementType) {
+ public Sets(Class<E> elementType) {
this.elementType = assertArgNotNull("elementType", elementType);
}
@@ -157,7 +157,7 @@ public class SetBuilder<E> {
* @param value The value to add to this set.
* @return This object.
*/
- public SetBuilder<E> add(E value) {
+ public Sets<E> add(E value) {
if (set == null) {
if (ordered)
set = new LinkedHashSet<>();
@@ -177,7 +177,7 @@ public class SetBuilder<E> {
* @return This object.
*/
@SuppressWarnings("unchecked")
- public SetBuilder<E> add(E...values) {
+ public Sets<E> add(E...values) {
assertArgNotNull("values", values);
for (var v : values)
add(v);
@@ -193,7 +193,7 @@ public class SetBuilder<E> {
* @param value The collection to add to this set.
* @return This object.
*/
- public SetBuilder<E> addAll(Collection<E> value) {
+ public Sets<E> addAll(Collection<E> value) {
if (nn(value)) {
if (set == null) {
if (ordered)
@@ -223,7 +223,7 @@ public class SetBuilder<E> {
* @param values The values to add.
* @return This object.
*/
- public SetBuilder<E> addAny(Object...values) {
+ public Sets<E> addAny(Object...values) {
if (nn(values)) {
for (var o : values) {
if (nn(o)) {
@@ -255,7 +255,7 @@ public class SetBuilder<E> {
* @param value The value.
* @return This object.
*/
- public SetBuilder<E> addIf(boolean flag, E value) {
+ public Sets<E> addIf(boolean flag, E value) {
if (flag)
add(value);
return this;
@@ -267,7 +267,7 @@ public class SetBuilder<E> {
* @param values The JSON array strings to parse and add to this set.
* @return This object.
*/
- public SetBuilder<E> addJson(String...values) {
+ public Sets<E> addJson(String...values) {
return addAny((Object[])values);
}
@@ -340,7 +340,7 @@ public class SetBuilder<E> {
* <p class='bjava'>
* <jk>import static</jk>
org.apache.juneau.commons.utils.CollectionUtils.*;
*
- * FluentSet<String> <jv>set</jv> =
SetBuilder.<jsm>create</jsm>(String.<jk>class</jk>)
+ * FluentSet<String> <jv>set</jv> =
Sets.<jsm>create</jsm>(String.<jk>class</jk>)
* .add(<js>"one"</js>, <js>"two"</js>)
* .buildFluent();
* </p>
@@ -367,7 +367,7 @@ public class SetBuilder<E> {
* <p class='bjava'>
* <jk>import static</jk>
org.apache.juneau.commons.utils.CollectionUtils.*;
*
- * FilteredSet<Integer> <jv>set</jv> =
SetBuilder.<jsm>create</jsm>(Integer.<jk>class</jk>)
+ * FilteredSet<Integer> <jv>set</jv> =
Sets.<jsm>create</jsm>(Integer.<jk>class</jk>)
* .filtered(v -> v != <jk>null</jk> && v >
0)
* .add(5)
* .add(-1) <jc>// Will be filtered out</jc>
@@ -401,7 +401,7 @@ public class SetBuilder<E> {
* @param elementFunction The function to convert elements. Must not be
<jk>null</jk>.
* @return This object.
*/
- public SetBuilder<E> elementFunction(Function<Object,E>
elementFunction) {
+ public Sets<E> elementFunction(Function<Object,E> elementFunction) {
this.elementFunction = assertArgNotNull("elementFunction",
elementFunction);
return this;
}
@@ -412,7 +412,7 @@ public class SetBuilder<E> {
* @param value The element type. Must not be <jk>null</jk>.
* @return This object.
*/
- public SetBuilder<E> elementType(Class<E> value) {
+ public Sets<E> elementType(Class<E> value) {
elementType = assertArgNotNull("value", value);
return this;
}
@@ -435,7 +435,7 @@ public class SetBuilder<E> {
* <p class='bjava'>
* <jk>import static</jk>
org.apache.juneau.commons.utils.CollectionUtils.*;
*
- * Set<Object> <jv>set</jv> =
SetBuilder.<jsm>create</jsm>(Object.<jk>class</jk>)
+ * Set<Object> <jv>set</jv> =
Sets.<jsm>create</jsm>(Object.<jk>class</jk>)
* .filtered()
* .add(<js>"name"</js>)
* .add(-1) <jc>// Filtered out at build
time</jc>
@@ -446,7 +446,7 @@ public class SetBuilder<E> {
*
* @return This object.
*/
- public SetBuilder<E> filtered() {
+ public Sets<E> filtered() {
// @formatter:off
return filtered(v -> ! (
v == null
@@ -478,7 +478,7 @@ public class SetBuilder<E> {
* <jk>import static</jk>
org.apache.juneau.commons.utils.CollectionUtils.*;
*
* <jc>// Keep only non-null, positive integers</jc>
- * Set<Integer> <jv>set</jv> =
SetBuilder.<jsm>create</jsm>(Integer.<jk>class</jk>)
+ * Set<Integer> <jv>set</jv> =
Sets.<jsm>create</jsm>(Integer.<jk>class</jk>)
* .filtered(v -> v != <jk>null</jk> && v >
0)
* .add(5)
* .add(-1) <jc>// Filtered out at build time</jc>
@@ -486,7 +486,7 @@ public class SetBuilder<E> {
* .build();
*
* <jc>// Multiple filters combined with AND</jc>
- * Set<Integer> <jv>set2</jv> =
SetBuilder.<jsm>create</jsm>(Integer.<jk>class</jk>)
+ * Set<Integer> <jv>set2</jv> =
Sets.<jsm>create</jsm>(Integer.<jk>class</jk>)
* .filtered(v -> v != <jk>null</jk>) <jc>//
First filter</jc>
* .filtered(v -> v > 0) <jc>//
Second filter (ANDed with first)</jc>
* .filtered(v -> v < 100); <jc>//
Third filter (ANDed with previous)</jc>
@@ -499,7 +499,7 @@ public class SetBuilder<E> {
* @param filter The filter predicate. Must not be <jk>null</jk>.
* @return This object.
*/
- public SetBuilder<E> filtered(Predicate<E> filter) {
+ public Sets<E> filtered(Predicate<E> filter) {
Predicate<E> newFilter = assertArgNotNull("filter", filter);
if (this.filter == null)
this.filter = newFilter;
@@ -518,7 +518,7 @@ public class SetBuilder<E> {
* @return This object.
*/
@SuppressWarnings("unchecked")
- public SetBuilder<E> sorted() {
+ public Sets<E> sorted() {
return sorted((Comparator<E>)Comparator.naturalOrder());
}
@@ -532,7 +532,7 @@ public class SetBuilder<E> {
* @param comparator The comparator to use for sorting. Must not be
<jk>null</jk>.
* @return This object.
*/
- public SetBuilder<E> sorted(Comparator<E> comparator) {
+ public Sets<E> sorted(Comparator<E> comparator) {
this.comparator = assertArgNotNull("comparator", comparator);
ordered = false;
return this;
@@ -546,7 +546,7 @@ public class SetBuilder<E> {
*
* @return This object.
*/
- public SetBuilder<E> sparse() {
+ public Sets<E> sparse() {
sparse = true;
return this;
}
@@ -557,7 +557,7 @@ public class SetBuilder<E> {
*
* @return This object.
*/
- public SetBuilder<E> unmodifiable() {
+ public Sets<E> unmodifiable() {
unmodifiable = true;
return this;
}
@@ -579,13 +579,13 @@ public class SetBuilder<E> {
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
* <jc>// Create a thread-safe set using synchronized HashSet</jc>
- * Set<String> <jv>set</jv> =
SetBuilder.<jsm>create</jsm>(String.<jk>class</jk>)
+ * Set<String> <jv>set</jv> =
Sets.<jsm>create</jsm>(String.<jk>class</jk>)
* .add(<js>"one"</js>, <js>"two"</js>)
* .concurrent()
* .build();
*
* <jc>// Create a thread-safe ordered set</jc>
- * Set<String> <jv>set2</jv> =
SetBuilder.<jsm>create</jsm>(String.<jk>class</jk>)
+ * Set<String> <jv>set2</jv> =
Sets.<jsm>create</jsm>(String.<jk>class</jk>)
* .ordered()
* .concurrent()
* .add(<js>"one"</js>)
@@ -594,7 +594,7 @@ public class SetBuilder<E> {
*
* @return This object.
*/
- public SetBuilder<E> concurrent() {
+ public Sets<E> concurrent() {
concurrent = true;
return this;
}
@@ -616,7 +616,7 @@ public class SetBuilder<E> {
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
* <jc>// Conditionally create a thread-safe set</jc>
- * Set<String> <jv>set</jv> =
SetBuilder.<jsm>create</jsm>(String.<jk>class</jk>)
+ * Set<String> <jv>set</jv> =
Sets.<jsm>create</jsm>(String.<jk>class</jk>)
* .add(<js>"one"</js>, <js>"two"</js>)
* .concurrent(<jv>needsThreadSafety</jv>)
* .build();
@@ -625,7 +625,7 @@ public class SetBuilder<E> {
* @param value Whether to make the set thread-safe.
* @return This object.
*/
- public SetBuilder<E> concurrent(boolean value) {
+ public Sets<E> concurrent(boolean value) {
concurrent = value;
return this;
}
@@ -643,7 +643,7 @@ public class SetBuilder<E> {
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
* <jc>// Create an ordered set (preserves insertion order)</jc>
- * Set<String> <jv>set</jv> =
SetBuilder.<jsm>create</jsm>(String.<jk>class</jk>)
+ * Set<String> <jv>set</jv> =
Sets.<jsm>create</jsm>(String.<jk>class</jk>)
* .ordered()
* .add(<js>"one"</js>)
* .add(<js>"two"</js>)
@@ -652,7 +652,7 @@ public class SetBuilder<E> {
*
* @return This object.
*/
- public SetBuilder<E> ordered() {
+ public Sets<E> ordered() {
return ordered(true);
}
@@ -670,7 +670,7 @@ public class SetBuilder<E> {
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
* <jc>// Conditionally create an ordered set</jc>
- * Set<String> <jv>set</jv> =
SetBuilder.<jsm>create</jsm>(String.<jk>class</jk>)
+ * Set<String> <jv>set</jv> =
Sets.<jsm>create</jsm>(String.<jk>class</jk>)
* .ordered(<jv>preserveOrder</jv>)
* .add(<js>"one"</js>)
* .build();
@@ -679,7 +679,7 @@ public class SetBuilder<E> {
* @param value Whether to preserve insertion order.
* @return This object.
*/
- public SetBuilder<E> ordered(boolean value) {
+ public Sets<E> ordered(boolean value) {
ordered = value;
if (ordered)
comparator = null;
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/CollectionUtils.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/CollectionUtils.java
index d14057aee5..06f75b285d 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/CollectionUtils.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/CollectionUtils.java
@@ -892,14 +892,14 @@ public class CollectionUtils {
}
/**
- * Convenience factory for a {@link ListBuilder}.
+ * Convenience factory for a {@link Lists}.
*
* @param <E> The element type.
* @param type The element type.
* @return A new list builder.
*/
- public static <E> ListBuilder<E> listb(Class<E> type) {
- return ListBuilder.create(type);
+ public static <E> Lists<E> listb(Class<E> type) {
+ return Lists.create(type);
}
/**
@@ -1525,10 +1525,10 @@ public class CollectionUtils {
}
/**
- * Convenience factory for a {@link MapBuilder} with {@link String}
keys and {@link Object} values.
+ * Convenience factory for a {@link Maps} with {@link String} keys and
{@link Object} values.
*
* <p>
- * This is a shortcut for <c>MapBuilder.create(String.<jk>class</jk>,
Object.<jk>class</jk>)</c>.
+ * This is a shortcut for <c>Maps.create(String.<jk>class</jk>,
Object.<jk>class</jk>)</c>.
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
@@ -1550,14 +1550,14 @@ public class CollectionUtils {
* </p>
*
* @return A new map builder.
- * @see MapBuilder
+ * @see Maps
*/
- public static MapBuilder<String,Object> mapb() {
- return MapBuilder.create(String.class, Object.class).ordered();
+ public static Maps<String,Object> mapb() {
+ return Maps.create(String.class, Object.class).ordered();
}
/**
- * Convenience factory for a {@link MapBuilder}.
+ * Convenience factory for a {@link Maps}.
*
* @param <K> The key type.
* @param <V> The value type.
@@ -1566,8 +1566,8 @@ public class CollectionUtils {
* @param converters Optional converters to use for converting values.
* @return A new map builder.
*/
- public static <K,V> MapBuilder<K,V> mapb(Class<K> keyType, Class<V>
valueType) {
- return MapBuilder.create(keyType, valueType).ordered();
+ public static <K,V> Maps<K,V> mapb(Class<K> keyType, Class<V>
valueType) {
+ return Maps.create(keyType, valueType).ordered();
}
/**
@@ -1744,14 +1744,14 @@ public class CollectionUtils {
}
/**
- * Convenience factory for a {@link SetBuilder}.
+ * Convenience factory for a {@link Sets}.
*
* @param <E> The element type.
* @param type The element type.
* @return A new set builder.
*/
- public static <E> SetBuilder<E> setb(Class<E> type) {
- return SetBuilder.create(type).ordered();
+ public static <E> Sets<E> setb(Class<E> type) {
+ return Sets.create(type).ordered();
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ConverterUtils.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ConverterUtils.java
index 47adcb878c..2586d2666b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ConverterUtils.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ConverterUtils.java
@@ -216,7 +216,7 @@ public class ConverterUtils {
}
/**
- * Converts the specified object to a {@link ListBuilder} with elements
of the specified type.
+ * Converts the specified object to a {@link Lists} with elements of
the specified type.
*
* <p>
* The input value can be any of the following:
@@ -230,14 +230,14 @@ public class ConverterUtils {
* @param <T> The element type.
* @param value The value to convert. Can be <jk>null</jk>.
* @param type The element type class.
- * @return A new {@link ListBuilder} containing the converted elements.
+ * @return A new {@link Lists} containing the converted elements.
*/
- public static <T> ListBuilder<T> toListBuilder(Object value, Class<T>
type) {
+ public static <T> Lists<T> toListBuilder(Object value, Class<T> type) {
return listb(type).elementFunction(o ->
GenericConverter.INSTANCE.convertTo(type, o)).addAny(value);
}
/**
- * Converts the specified object to a {@link MapBuilder} with keys and
values of the specified types.
+ * Converts the specified object to a {@link Maps} with keys and values
of the specified types.
*
* <p>
* The input value can be any of the following:
@@ -252,9 +252,9 @@ public class ConverterUtils {
* @param value The value to convert. Can be <jk>null</jk>.
* @param keyType The key type class.
* @param valueType The value type class.
- * @return A new {@link MapBuilder} containing the converted entries.
+ * @return A new {@link Maps} containing the converted entries.
*/
- public static <K,V> MapBuilder<K,V> toMapBuilder(Object value, Class<K>
keyType, Class<V> valueType) {
+ public static <K,V> Maps<K,V> toMapBuilder(Object value, Class<K>
keyType, Class<V> valueType) {
return mapb(keyType, valueType)
.keyFunction(o ->
GenericConverter.INSTANCE.convertTo(keyType, o))
.valueFunction(o ->
GenericConverter.INSTANCE.convertTo(valueType, o))
@@ -262,7 +262,7 @@ public class ConverterUtils {
}
/**
- * Converts the specified object to a {@link SetBuilder} with elements
of the specified type.
+ * Converts the specified object to a {@link Sets} with elements of the
specified type.
*
* <p>
* The input value can be any of the following:
@@ -279,9 +279,9 @@ public class ConverterUtils {
* @param <T> The element type.
* @param value The value to convert. Can be <jk>null</jk>.
* @param type The element type class.
- * @return A new {@link SetBuilder} containing the converted elements.
+ * @return A new {@link Sets} containing the converted elements.
*/
- public static <T> SetBuilder<T> toSetBuilder(Object value, Class<T>
type) {
+ public static <T> Sets<T> toSetBuilder(Object value, Class<T> type) {
return setb(type).elementFunction(o ->
GenericConverter.INSTANCE.convertTo(type, o)).addAny(value);
}
}
\ No newline at end of file
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/ListBuilder_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/Lists_Test.java
similarity index 85%
rename from
juneau-utest/src/test/java/org/apache/juneau/commons/collections/ListBuilder_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/commons/collections/Lists_Test.java
index b97a04935d..7ab9a1188d 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/ListBuilder_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/Lists_Test.java
@@ -25,7 +25,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.junit.jupiter.api.*;
-class ListBuilder_Test extends TestBase {
+class Lists_Test extends TestBase {
//-----------------------------------------------------------------------------------------------------------------
// Basic tests
@@ -33,13 +33,13 @@ class ListBuilder_Test extends TestBase {
@Test
void a01_create() {
- var b = ListBuilder.create(String.class);
+ var b = Lists.create(String.class);
assertNotNull(b);
}
@Test
void a02_addSingle() {
- var list = ListBuilder.create(String.class)
+ var list = Lists.create(String.class)
.add("a")
.build();
@@ -48,7 +48,7 @@ class ListBuilder_Test extends TestBase {
@Test
void a03_addMultiple() {
- var list = ListBuilder.create(String.class)
+ var list = Lists.create(String.class)
.add("a", "b", "c")
.build();
@@ -58,7 +58,7 @@ class ListBuilder_Test extends TestBase {
@Test
void a04_addAll() {
var existing = l("x", "y", "z");
- var list = ListBuilder.create(String.class)
+ var list = Lists.create(String.class)
.add("a")
.addAll(existing)
.add("b")
@@ -69,7 +69,7 @@ class ListBuilder_Test extends TestBase {
@Test
void a05_addAllNull() {
- var list = ListBuilder.create(String.class)
+ var list = Lists.create(String.class)
.add("a")
.addAll(null)
.add("b")
@@ -84,7 +84,7 @@ class ListBuilder_Test extends TestBase {
@Test
void b01_addIf_true() {
- var list = ListBuilder.create(String.class)
+ var list = Lists.create(String.class)
.add("a")
.addIf(true, "b")
.add("c")
@@ -95,7 +95,7 @@ class ListBuilder_Test extends TestBase {
@Test
void b02_addIf_false() {
- var list = ListBuilder.create(String.class)
+ var list = Lists.create(String.class)
.add("a")
.addIf(false, "b")
.add("c")
@@ -110,7 +110,7 @@ class ListBuilder_Test extends TestBase {
@Test
void c01_sorted_naturalOrder() {
- var list = ListBuilder.create(String.class)
+ var list = Lists.create(String.class)
.add("c", "a", "b")
.sorted()
.build();
@@ -120,7 +120,7 @@ class ListBuilder_Test extends TestBase {
@Test
void c02_sorted_customComparator() {
- var list = ListBuilder.create(String.class)
+ var list = Lists.create(String.class)
.add("a", "bb", "ccc")
.sorted(Comparator.comparing(String::length))
.build();
@@ -130,7 +130,7 @@ class ListBuilder_Test extends TestBase {
@Test
void c03_sorted_integers() {
- var list = ListBuilder.create(Integer.class)
+ var list = Lists.create(Integer.class)
.add(5, 2, 8, 1, 9)
.sorted()
.build();
@@ -144,7 +144,7 @@ class ListBuilder_Test extends TestBase {
@Test
void d01_sparse_empty() {
- var list = ListBuilder.create(String.class)
+ var list = Lists.create(String.class)
.sparse()
.build();
@@ -153,7 +153,7 @@ class ListBuilder_Test extends TestBase {
@Test
void d02_sparse_notEmpty() {
- var list = ListBuilder.create(String.class)
+ var list = Lists.create(String.class)
.add("a")
.sparse()
.build();
@@ -164,7 +164,7 @@ class ListBuilder_Test extends TestBase {
@Test
void d03_notSparse_empty() {
- var list = ListBuilder.create(String.class)
+ var list = Lists.create(String.class)
.build();
assertNotNull(list);
@@ -177,7 +177,7 @@ class ListBuilder_Test extends TestBase {
@Test
void e01_unmodifiable() {
- var list = ListBuilder.create(String.class)
+ var list = Lists.create(String.class)
.add("a", "b", "c")
.unmodifiable()
.build();
@@ -188,7 +188,7 @@ class ListBuilder_Test extends TestBase {
@Test
void e02_modifiable() {
- var list = ListBuilder.create(String.class)
+ var list = Lists.create(String.class)
.add("a", "b", "c")
.build();
@@ -206,7 +206,7 @@ class ListBuilder_Test extends TestBase {
@Test
void g01_elementType() {
- var b = new ListBuilder<>(String.class);
+ var b = new Lists<>(String.class);
b.elementType(String.class);
var list = b.add("a", "b").build();
@@ -220,7 +220,7 @@ class ListBuilder_Test extends TestBase {
@Test
void h01_multipleOperations() {
var existing = l("x", "y");
- var list = ListBuilder.create(String.class)
+ var list = Lists.create(String.class)
.add("a")
.addAll(existing)
.addIf(true, "b")
@@ -235,7 +235,7 @@ class ListBuilder_Test extends TestBase {
@Test
void h02_sortedAndUnmodifiable() {
- var list = ListBuilder.create(Integer.class)
+ var list = Lists.create(Integer.class)
.add(3, 1, 2)
.sorted()
.unmodifiable()
@@ -247,7 +247,7 @@ class ListBuilder_Test extends TestBase {
@Test
void h03_sparseAndSorted() {
- var list1 = ListBuilder.create(String.class)
+ var list1 = Lists.create(String.class)
.add("c", "a", "b")
.sorted()
.sparse()
@@ -256,7 +256,7 @@ class ListBuilder_Test extends TestBase {
assertNotNull(list1);
assertList(list1, "a", "b", "c");
- var list2 = ListBuilder.create(String.class)
+ var list2 = Lists.create(String.class)
.sorted()
.sparse()
.build();
@@ -270,7 +270,7 @@ class ListBuilder_Test extends TestBase {
@Test
void i01_buildEmptyList() {
- var list = ListBuilder.create(String.class)
+ var list = Lists.create(String.class)
.build();
assertNotNull(list);
@@ -279,7 +279,7 @@ class ListBuilder_Test extends TestBase {
@Test
void i02_addNullElement() {
- var list = ListBuilder.create(String.class)
+ var list = Lists.create(String.class)
.add("a")
.add((String)null)
.add("b")
@@ -290,7 +290,7 @@ class ListBuilder_Test extends TestBase {
@Test
void i03_duplicateElements() {
- var list = ListBuilder.create(String.class)
+ var list = Lists.create(String.class)
.add("a", "a", "b", "a")
.build();
@@ -306,7 +306,7 @@ class ListBuilder_Test extends TestBase {
void j01_addAll_whenListIsNull() {
// Test addAll when list is null (should create new LinkedList
from collection)
var existing = l("a", "b", "c");
- var list = ListBuilder.create(String.class)
+ var list = Lists.create(String.class)
.addAll(existing)
.build();
@@ -319,7 +319,7 @@ class ListBuilder_Test extends TestBase {
@Test
void k01_elementFunction_withFunction() {
- var list = ListBuilder.create(Integer.class)
+ var list = Lists.create(Integer.class)
.elementFunction(o -> {
if (o instanceof String) {
return Integer.parseInt((String)o);
@@ -344,7 +344,7 @@ class ListBuilder_Test extends TestBase {
}
};
- var list = ListBuilder.create(Integer.class)
+ var list = Lists.create(Integer.class)
.elementFunction(o ->
converter.convertTo(Integer.class, o))
.addAny("1", "2", "3")
.build();
@@ -371,7 +371,7 @@ class ListBuilder_Test extends TestBase {
}
};
- var list = ListBuilder.create(Integer.class)
+ var list = Lists.create(Integer.class)
.elementFunction(o -> {
Integer result =
converter1.convertTo(Integer.class, o);
if (result != null) return result;
@@ -389,7 +389,7 @@ class ListBuilder_Test extends TestBase {
@Test
void l01_addAny_withDirectValues() {
- var list = ListBuilder.create(String.class)
+ var list = Lists.create(String.class)
.addAny("a", "b", "c")
.build();
@@ -399,7 +399,7 @@ class ListBuilder_Test extends TestBase {
@Test
void l02_addAny_withCollection() {
var collection = l("a", "b", "c");
- var list = ListBuilder.create(String.class)
+ var list = Lists.create(String.class)
.addAny(collection)
.build();
@@ -409,7 +409,7 @@ class ListBuilder_Test extends TestBase {
@Test
void l03_addAny_withArray() {
var array = new String[]{"a", "b", "c"};
- var list = ListBuilder.create(String.class)
+ var list = Lists.create(String.class)
.addAny((Object)array)
.build();
@@ -419,7 +419,7 @@ class ListBuilder_Test extends TestBase {
@Test
void l04_addAny_withNestedCollection() {
var nested = l(l("a", "b"), l("c", "d"));
- var list = ListBuilder.create(String.class)
+ var list = Lists.create(String.class)
.addAny(nested)
.build();
@@ -429,7 +429,7 @@ class ListBuilder_Test extends TestBase {
@Test
void l05_addAny_withNestedArray() {
var nested = new Object[]{new String[]{"a", "b"}, new
String[]{"c", "d"}};
- var list = ListBuilder.create(String.class)
+ var list = Lists.create(String.class)
.addAny(nested)
.build();
@@ -438,7 +438,7 @@ class ListBuilder_Test extends TestBase {
@Test
void l06_addAny_withNullValues() {
- var list = ListBuilder.create(String.class)
+ var list = Lists.create(String.class)
.addAny("a", null, "b", null, "c")
.build();
@@ -447,7 +447,7 @@ class ListBuilder_Test extends TestBase {
@Test
void l07_addAny_withTypeConversion() {
- var list = ListBuilder.create(Integer.class)
+ var list = Lists.create(Integer.class)
.elementFunction(o -> {
if (o instanceof String) {
return Integer.parseInt((String)o);
@@ -465,7 +465,7 @@ class ListBuilder_Test extends TestBase {
// This test verifies that addAny works with collections
directly.
// Note: elementFunction is for converting to the element type,
not to collections,
// so we test that addAny works with collections directly.
- var list = ListBuilder.create(String.class)
+ var list = Lists.create(String.class)
.addAny(l("a", "b", "c"))
.build();
assertList(list, "a", "b", "c");
@@ -473,14 +473,14 @@ class ListBuilder_Test extends TestBase {
@Test
void l09_addAny_noElementType() {
- assertThrows(IllegalArgumentException.class, () -> new
ListBuilder<String>(null));
+ assertThrows(IllegalArgumentException.class, () -> new
Lists<String>(null));
}
@Test
void l10_addAny_noElementFunction_throwsException() {
// When elementFunction is null and we try to add a
non-matching type, it should throw
assertThrows(RuntimeException.class, () -> {
- ListBuilder.create(Integer.class)
+ Lists.create(Integer.class)
.addAny("not-an-integer")
.build();
});
@@ -491,7 +491,7 @@ class ListBuilder_Test extends TestBase {
// ElementFunction exists but returns null (can't convert)
// Should throw RuntimeException when elementFunction can't
convert
assertThrows(RuntimeException.class, () -> {
- ListBuilder.create(Integer.class)
+ Lists.create(Integer.class)
.elementFunction(o -> null) // Can't convert
.addAny("not-an-integer")
.build();
@@ -500,7 +500,7 @@ class ListBuilder_Test extends TestBase {
@Test
void l12_addAny_withNullArray() {
- var list = ListBuilder.create(String.class)
+ var list = Lists.create(String.class)
.addAny((Object[])null)
.build();
@@ -513,7 +513,7 @@ class ListBuilder_Test extends TestBase {
@Test
void m01_build_sparseWithNullList() {
- var list = ListBuilder.create(String.class)
+ var list = Lists.create(String.class)
.sparse()
.build();
@@ -523,7 +523,7 @@ class ListBuilder_Test extends TestBase {
@Test
void m03_build_notSparseWithNullList() {
- var list = ListBuilder.create(String.class)
+ var list = Lists.create(String.class)
.build();
assertNotNull(list);
@@ -532,7 +532,7 @@ class ListBuilder_Test extends TestBase {
@Test
void m04_build_sortedWithNullList() {
- var list = ListBuilder.create(String.class)
+ var list = Lists.create(String.class)
.sorted()
.build();
@@ -542,7 +542,7 @@ class ListBuilder_Test extends TestBase {
@Test
void m05_build_unmodifiableWithNullList() {
- var list = ListBuilder.create(String.class)
+ var list = Lists.create(String.class)
.unmodifiable()
.build();
@@ -556,7 +556,7 @@ class ListBuilder_Test extends TestBase {
@Test
void n01_buildFluent_returnsFluentList() {
- var list = ListBuilder.create(String.class)
+ var list = Lists.create(String.class)
.add("a", "b", "c")
.buildFluent();
@@ -567,7 +567,7 @@ class ListBuilder_Test extends TestBase {
@Test
void n02_buildFluent_sparseEmpty() {
- var list = ListBuilder.create(String.class)
+ var list = Lists.create(String.class)
.sparse()
.buildFluent();
@@ -576,7 +576,7 @@ class ListBuilder_Test extends TestBase {
@Test
void n03_buildFluent_withSorted() {
- var list = ListBuilder.create(String.class)
+ var list = Lists.create(String.class)
.add("c", "a", "b")
.sorted()
.buildFluent();
@@ -587,7 +587,7 @@ class ListBuilder_Test extends TestBase {
@Test
void n04_buildFluent_withUnmodifiable() {
- var list = ListBuilder.create(String.class)
+ var list = Lists.create(String.class)
.add("a", "b", "c")
.unmodifiable()
.buildFluent();
@@ -599,7 +599,7 @@ class ListBuilder_Test extends TestBase {
@Test
void n05_buildFluent_fluentMethods() {
- var list = ListBuilder.create(String.class)
+ var list = Lists.create(String.class)
.add("a", "b")
.buildFluent();
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/MapBuilder_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/Maps_Test.java
similarity index 83%
rename from
juneau-utest/src/test/java/org/apache/juneau/commons/collections/MapBuilder_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/commons/collections/Maps_Test.java
index f51badb145..4e87a0f9c2 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/MapBuilder_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/Maps_Test.java
@@ -24,7 +24,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.junit.jupiter.api.*;
-class MapBuilder_Test extends TestBase {
+class Maps_Test extends TestBase {
//-----------------------------------------------------------------------------------------------------------------
// Basic tests
@@ -32,13 +32,13 @@ class MapBuilder_Test extends TestBase {
@Test
void a01_create() {
- var b = MapBuilder.create(String.class, Integer.class);
+ var b = Maps.create(String.class, Integer.class);
assertNotNull(b);
}
@Test
void a02_addSingle() {
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.add("a", 1)
.build();
@@ -47,7 +47,7 @@ class MapBuilder_Test extends TestBase {
@Test
void a03_addMultiple() {
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.add("a", 1)
.add("b", 2)
.add("c", 3)
@@ -62,7 +62,7 @@ class MapBuilder_Test extends TestBase {
existing.put("x", 10);
existing.put("y", 20);
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.add("a", 1)
.addAll(existing)
.add("b", 2)
@@ -78,7 +78,7 @@ class MapBuilder_Test extends TestBase {
@Test
void a05_addAllNull() {
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.add("a", 1)
.addAll(null)
.add("b", 2)
@@ -93,7 +93,7 @@ class MapBuilder_Test extends TestBase {
@Test
void b01_addPairs() {
- var map = MapBuilder.create(String.class, String.class)
+ var map = Maps.create(String.class, String.class)
.addPairs("host", "localhost", "port", "8080",
"protocol", "https")
.build();
@@ -102,7 +102,7 @@ class MapBuilder_Test extends TestBase {
@Test
void b02_addPairs_oddNumber() {
- var b = MapBuilder.create(String.class, String.class);
+ var b = Maps.create(String.class, String.class);
assertThrows(IllegalArgumentException.class, () ->
b.addPairs("a", "b", "c"));
}
@@ -112,7 +112,7 @@ class MapBuilder_Test extends TestBase {
@Test
void c00_ordered_preservesInsertionOrder() {
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.ordered()
.add("c", 3)
.add("a", 1)
@@ -130,7 +130,7 @@ class MapBuilder_Test extends TestBase {
@Test
void c00b_ordered_defaultIsHashMap() {
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.add("a", 1)
.add("b", 2)
.build();
@@ -147,13 +147,13 @@ class MapBuilder_Test extends TestBase {
@Test
void c00c_ordered_boolean() {
- var map1 = MapBuilder.create(String.class, Integer.class)
+ var map1 = Maps.create(String.class, Integer.class)
.ordered(true)
.add("a", 1)
.build();
assertTrue(map1 instanceof LinkedHashMap);
- var map2 = MapBuilder.create(String.class, Integer.class)
+ var map2 = Maps.create(String.class, Integer.class)
.ordered(false)
.add("a", 1)
.build();
@@ -163,7 +163,7 @@ class MapBuilder_Test extends TestBase {
@Test
void c00d_ordered_lastOneWins() {
// If ordered() is called first, then sorted(), sorted() wins
- var map1 = MapBuilder.create(String.class, Integer.class)
+ var map1 = Maps.create(String.class, Integer.class)
.ordered()
.add("c", 3)
.add("a", 1)
@@ -174,7 +174,7 @@ class MapBuilder_Test extends TestBase {
assertList(map1.keySet(), "a", "b", "c");
// If sorted() is called first, then ordered(), ordered() wins
- var map2 = MapBuilder.create(String.class, Integer.class)
+ var map2 = Maps.create(String.class, Integer.class)
.sorted()
.add("c", 3)
.add("a", 1)
@@ -194,7 +194,7 @@ class MapBuilder_Test extends TestBase {
@Test
void c01_sorted_naturalOrder() {
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.add("c", 3)
.add("a", 1)
.add("b", 2)
@@ -208,7 +208,7 @@ class MapBuilder_Test extends TestBase {
@Test
void c02_sorted_customComparator() {
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.add("a", 1)
.add("bb", 2)
.add("ccc", 3)
@@ -224,7 +224,7 @@ class MapBuilder_Test extends TestBase {
@Test
void d01_sparse_empty() {
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.sparse()
.build();
@@ -233,7 +233,7 @@ class MapBuilder_Test extends TestBase {
@Test
void d02_sparse_notEmpty() {
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.add("a", 1)
.sparse()
.build();
@@ -244,7 +244,7 @@ class MapBuilder_Test extends TestBase {
@Test
void d03_notSparse_empty() {
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.build();
assertNotNull(map);
@@ -257,7 +257,7 @@ class MapBuilder_Test extends TestBase {
@Test
void e01_unmodifiable() {
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.add("a", 1)
.add("b", 2)
.unmodifiable()
@@ -269,7 +269,7 @@ class MapBuilder_Test extends TestBase {
@Test
void e02_modifiable() {
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.add("a", 1)
.build();
@@ -291,7 +291,7 @@ class MapBuilder_Test extends TestBase {
existing.put("x", 10);
existing.put("y", 20);
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.add("a", 1)
.addAll(existing)
.add("b", 2)
@@ -309,7 +309,7 @@ class MapBuilder_Test extends TestBase {
existing.put("x", 10);
existing.put("y", 20);
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.ordered()
.add("a", 1)
.addAll(existing)
@@ -328,7 +328,7 @@ class MapBuilder_Test extends TestBase {
@Test
void g02_sortedAndUnmodifiable() {
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.add("c", 3)
.add("a", 1)
.add("b", 2)
@@ -343,7 +343,7 @@ class MapBuilder_Test extends TestBase {
@Test
void g03_sparseAndSorted() {
- var map1 = MapBuilder.create(String.class, Integer.class)
+ var map1 = Maps.create(String.class, Integer.class)
.add("c", 3)
.add("a", 1)
.add("b", 2)
@@ -354,7 +354,7 @@ class MapBuilder_Test extends TestBase {
assertNotNull(map1);
assertSize(3, map1);
- var map2 = MapBuilder.create(String.class, Integer.class)
+ var map2 = Maps.create(String.class, Integer.class)
.sorted()
.sparse()
.build();
@@ -368,7 +368,7 @@ class MapBuilder_Test extends TestBase {
@Test
void h01_buildEmptyMap() {
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.build();
assertNotNull(map);
@@ -377,7 +377,7 @@ class MapBuilder_Test extends TestBase {
@Test
void h02_addNullKey() {
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.add(null, 1)
.add("a", 2)
.build();
@@ -387,7 +387,7 @@ class MapBuilder_Test extends TestBase {
@Test
void h03_addNullValue() {
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.add("a", 1)
.add("b", null)
.add("c", 3)
@@ -398,7 +398,7 @@ class MapBuilder_Test extends TestBase {
@Test
void h04_duplicateKeys() {
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.add("a", 1)
.add("a", 2) // Overwrites first value
.add("a", 3) // Overwrites again
@@ -414,7 +414,7 @@ class MapBuilder_Test extends TestBase {
@Test
void i01_filtered_customPredicate() {
- var map = MapBuilder.create(String.class, String.class)
+ var map = Maps.create(String.class, String.class)
.filtered((k, v) -> v != null && !v.equals(""))
.add("a", "foo")
.add("b", null) // Not added
@@ -427,7 +427,7 @@ class MapBuilder_Test extends TestBase {
@Test
void i02_filtered_defaultFilter() {
- var map = MapBuilder.create(String.class, Object.class)
+ var map = Maps.create(String.class, Object.class)
.filtered()
.add("name", "John")
.add("age", -1) // Not added
@@ -443,7 +443,7 @@ class MapBuilder_Test extends TestBase {
@Test
void i03_filtered_rejectsValue() {
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.filtered((k, v) -> v != null && v > 0)
.add("a", 1)
.add("b", -1) // Not added
@@ -456,7 +456,7 @@ class MapBuilder_Test extends TestBase {
@Test
void i04_add_withFilter() {
- var map = MapBuilder.create(String.class, String.class)
+ var map = Maps.create(String.class, String.class)
.filtered((k, v) -> v != null && v.length() > 2)
.add("a", "foo") // Added
.add("b", "ab") // Not added (length <= 2)
@@ -473,7 +473,7 @@ class MapBuilder_Test extends TestBase {
existing.put("y", "ab"); // Will be filtered out
existing.put("z", "another");
- var map = MapBuilder.create(String.class, String.class)
+ var map = Maps.create(String.class, String.class)
.filtered((k, v) -> v != null && v.length() > 2)
.addAll(existing)
.build();
@@ -487,7 +487,7 @@ class MapBuilder_Test extends TestBase {
@Test
void j01_keyValueFunctions_notSet() {
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.add("a", 1)
.build();
@@ -500,7 +500,7 @@ class MapBuilder_Test extends TestBase {
inputMap.put("a", "1");
inputMap.put("b", "2");
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.valueFunction(o -> o instanceof String ?
Integer.parseInt((String)o) : (Integer)o)
.addAny(inputMap)
.build();
@@ -514,7 +514,7 @@ class MapBuilder_Test extends TestBase {
inputMap.put(1, "10");
inputMap.put(2, "20");
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.keyFunction(o -> String.valueOf(o))
.valueFunction(o -> o instanceof String ?
Integer.parseInt((String)o) : (Integer)o)
.addAny(inputMap)
@@ -529,7 +529,7 @@ class MapBuilder_Test extends TestBase {
inputMap.put(1, "10");
inputMap.put(2, "20");
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.functions(
o -> String.valueOf(o), // key function
o -> o instanceof String ?
Integer.parseInt((String)o) : (Integer)o // value function
@@ -550,7 +550,7 @@ class MapBuilder_Test extends TestBase {
inputMap.put("a", 1);
inputMap.put("b", 2);
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.addAny(inputMap)
.build();
@@ -567,7 +567,7 @@ class MapBuilder_Test extends TestBase {
map2.put("c", 3);
map2.put("d", 4);
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.addAny(map1, map2)
.build();
@@ -580,7 +580,7 @@ class MapBuilder_Test extends TestBase {
inputMap.put("a", 1);
inputMap.put("b", 2);
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.addAny(inputMap, null) // null map should be ignored
.build();
@@ -595,7 +595,7 @@ class MapBuilder_Test extends TestBase {
inputMap.put("b", null);
assertThrows(RuntimeException.class, () -> {
- MapBuilder.create(String.class, Integer.class)
+ Maps.create(String.class, Integer.class)
.addAny(inputMap)
.build();
});
@@ -607,7 +607,7 @@ class MapBuilder_Test extends TestBase {
inputMap.put(1, "10");
inputMap.put(2, "20");
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.keyFunction(o -> String.valueOf(o))
.valueFunction(o -> o instanceof String ?
Integer.parseInt((String)o) : (Integer)o)
.addAny(inputMap)
@@ -628,7 +628,7 @@ class MapBuilder_Test extends TestBase {
}
}
- var map = MapBuilder.create(String.class, String.class)
+ var map = Maps.create(String.class, String.class)
.addAny(parsedMap)
.build();
@@ -642,7 +642,7 @@ class MapBuilder_Test extends TestBase {
var map2 = new LinkedHashMap<String,String>();
map2.put("y", "bar");
- var map = MapBuilder.create(String.class, String.class)
+ var map = Maps.create(String.class, String.class)
.addAny(map1, map2)
.build();
@@ -651,16 +651,16 @@ class MapBuilder_Test extends TestBase {
@Test
void k07_addAny_noKeyOrValueType() {
- assertThrows(IllegalArgumentException.class, () -> new
MapBuilder<String,Integer>(null, null));
- assertThrows(IllegalArgumentException.class, () -> new
MapBuilder<String,Integer>(String.class, null));
- assertThrows(IllegalArgumentException.class, () -> new
MapBuilder<String,Integer>(null, Integer.class));
+ assertThrows(IllegalArgumentException.class, () -> new
Maps<String,Integer>(null, null));
+ assertThrows(IllegalArgumentException.class, () -> new
Maps<String,Integer>(String.class, null));
+ assertThrows(IllegalArgumentException.class, () -> new
Maps<String,Integer>(null, Integer.class));
}
@Test
void k08_addAny_nonMapObject() {
// addAny only accepts Map instances, non-Map objects throw
exception
assertThrows(RuntimeException.class, () -> {
- MapBuilder.create(String.class, Integer.class)
+ Maps.create(String.class, Integer.class)
.addAny("not-a-map")
.build();
});
@@ -673,7 +673,7 @@ class MapBuilder_Test extends TestBase {
inputMap.put("a", "not-an-integer");
assertThrows(RuntimeException.class, () -> {
- MapBuilder.create(String.class, Integer.class)
+ Maps.create(String.class, Integer.class)
.valueFunction(o -> {
if (o instanceof String) {
try {
@@ -695,7 +695,7 @@ class MapBuilder_Test extends TestBase {
inputMap.put(new Object(), "value"); // Object can't be
converted to String
assertThrows(RuntimeException.class, () -> {
- MapBuilder.create(String.class, String.class)
+ Maps.create(String.class, String.class)
.keyFunction(o -> {
if (o instanceof String)
return (String)o;
@@ -712,7 +712,7 @@ class MapBuilder_Test extends TestBase {
@Test
void o01_concurrent_defaultHashMap() {
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.concurrent()
.add("a", 1)
.add("b", 2)
@@ -724,7 +724,7 @@ class MapBuilder_Test extends TestBase {
@Test
void o02_concurrent_ordered() {
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.ordered()
.concurrent()
.add("a", 1)
@@ -742,7 +742,7 @@ class MapBuilder_Test extends TestBase {
@Test
void o03_concurrent_sorted() {
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.sorted()
.concurrent()
.add("c", 3)
@@ -757,13 +757,13 @@ class MapBuilder_Test extends TestBase {
@Test
void o04_concurrent_boolean() {
- var map1 = MapBuilder.create(String.class, Integer.class)
+ var map1 = Maps.create(String.class, Integer.class)
.concurrent(true)
.add("a", 1)
.build();
assertTrue(map1 instanceof
java.util.concurrent.ConcurrentHashMap);
- var map2 = MapBuilder.create(String.class, Integer.class)
+ var map2 = Maps.create(String.class, Integer.class)
.concurrent(false)
.add("a", 1)
.build();
@@ -772,7 +772,7 @@ class MapBuilder_Test extends TestBase {
@Test
void o05_concurrent_unmodifiable() {
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.concurrent()
.unmodifiable()
.add("a", 1)
@@ -788,7 +788,7 @@ class MapBuilder_Test extends TestBase {
@Test
void l01_build_sparseWithNullMap() {
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.sparse()
.build();
@@ -797,7 +797,7 @@ class MapBuilder_Test extends TestBase {
@Test
void l03_build_notSparseWithNullMap() {
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.build();
assertNotNull(map);
@@ -806,7 +806,7 @@ class MapBuilder_Test extends TestBase {
@Test
void l04_build_sortedWithNullMap() {
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.sorted()
.build();
@@ -817,7 +817,7 @@ class MapBuilder_Test extends TestBase {
@Test
void l06_build_orderedWithNullMap() {
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.ordered()
.build();
@@ -828,7 +828,7 @@ class MapBuilder_Test extends TestBase {
@Test
void l07_build_defaultHashMap() {
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.build();
assertNotNull(map);
@@ -840,7 +840,7 @@ class MapBuilder_Test extends TestBase {
@Test
void l05_build_unmodifiableWithNullMap() {
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.unmodifiable()
.build();
@@ -854,7 +854,7 @@ class MapBuilder_Test extends TestBase {
@Test
void m01_buildFluent_returnsFluentMap() {
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.add("a", 1)
.add("b", 2)
.buildFluent();
@@ -866,7 +866,7 @@ class MapBuilder_Test extends TestBase {
@Test
void m02_buildFluent_sparseEmpty() {
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.sparse()
.buildFluent();
@@ -875,7 +875,7 @@ class MapBuilder_Test extends TestBase {
@Test
void m03_buildFluent_withFiltering() {
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.filtered((k, v) -> v != null && v > 0)
.add("a", 1)
.add("b", -1) // Filtered out
@@ -892,7 +892,7 @@ class MapBuilder_Test extends TestBase {
@Test
void n01_buildFiltered_withFilter() {
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.filtered((k, v) -> v != null && v > 0)
.add("a", 1)
.add("b", -1) // Filtered out
@@ -907,7 +907,7 @@ class MapBuilder_Test extends TestBase {
@Test
void n02_buildFiltered_withoutFilter() {
// buildFiltered() should work even without explicit filter
(uses default filter)
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.add("a", 1)
.add("b", 2)
.buildFiltered();
@@ -918,7 +918,7 @@ class MapBuilder_Test extends TestBase {
@Test
void n03_buildFiltered_sparseEmpty() {
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.filtered((k, v) -> v != null && v > 0)
.sparse()
.buildFiltered();
@@ -928,7 +928,7 @@ class MapBuilder_Test extends TestBase {
@Test
void n04_buildFiltered_withSorted() {
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.filtered((k, v) -> v != null && v > 0)
.add("c", 3)
.add("a", 1)
@@ -942,7 +942,7 @@ class MapBuilder_Test extends TestBase {
@Test
void n05_buildFiltered_multipleFilters() {
- var map = MapBuilder.create(String.class, Integer.class)
+ var map = Maps.create(String.class, Integer.class)
.filtered((k, v) -> v != null)
.filtered((k, v) -> v > 0)
.filtered((k, v) -> !k.startsWith("_"))
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/SetBuilder_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/Sets_Test.java
similarity index 86%
rename from
juneau-utest/src/test/java/org/apache/juneau/commons/collections/SetBuilder_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/commons/collections/Sets_Test.java
index f41dd0b414..528eb43e33 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/SetBuilder_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/Sets_Test.java
@@ -25,7 +25,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.junit.jupiter.api.*;
-class SetBuilder_Test extends TestBase {
+class Sets_Test extends TestBase {
//-----------------------------------------------------------------------------------------------------------------
// Basic tests
@@ -33,13 +33,13 @@ class SetBuilder_Test extends TestBase {
@Test
void a01_create() {
- var b = SetBuilder.create(String.class);
+ var b = Sets.create(String.class);
assertNotNull(b);
}
@Test
void a02_addSingle() {
- var set = SetBuilder.create(String.class)
+ var set = Sets.create(String.class)
.add("a")
.build();
@@ -48,7 +48,7 @@ class SetBuilder_Test extends TestBase {
@Test
void a03_addMultiple() {
- var set = SetBuilder.create(String.class)
+ var set = Sets.create(String.class)
.add("a", "b", "c")
.build();
@@ -58,7 +58,7 @@ class SetBuilder_Test extends TestBase {
@Test
void a04_addAll() {
var existing = l("x", "y", "z");
- var set = SetBuilder.create(String.class)
+ var set = Sets.create(String.class)
.ordered()
.add("a")
.addAll(existing)
@@ -70,7 +70,7 @@ class SetBuilder_Test extends TestBase {
@Test
void a05_addAllNull() {
- var set = SetBuilder.create(String.class)
+ var set = Sets.create(String.class)
.add("a")
.addAll(null)
.add("b")
@@ -85,7 +85,7 @@ class SetBuilder_Test extends TestBase {
@Test
void b01_duplicates() {
- var set = SetBuilder.create(String.class)
+ var set = Sets.create(String.class)
.add("a", "b", "a", "c", "b", "a")
.build();
@@ -95,7 +95,7 @@ class SetBuilder_Test extends TestBase {
@Test
void b02_addAllWithDuplicates() {
var existing = l("a", "b", "c");
- var set = SetBuilder.create(String.class)
+ var set = Sets.create(String.class)
.add("a", "b") // a and b already in next collection
.addAll(existing)
.add("c", "d") // c already exists
@@ -110,7 +110,7 @@ class SetBuilder_Test extends TestBase {
@Test
void c01_addIf_true() {
- var set = SetBuilder.create(String.class)
+ var set = Sets.create(String.class)
.add("a")
.addIf(true, "b")
.add("c")
@@ -122,7 +122,7 @@ class SetBuilder_Test extends TestBase {
@Test
void c02_addIf_false() {
- var set = SetBuilder.create(String.class)
+ var set = Sets.create(String.class)
.add("a")
.addIf(false, "b")
.add("c")
@@ -140,7 +140,7 @@ class SetBuilder_Test extends TestBase {
@Test
void d01_sorted_naturalOrder() {
- var set = SetBuilder.create(String.class)
+ var set = Sets.create(String.class)
.add("c", "a", "b")
.sorted()
.build();
@@ -151,7 +151,7 @@ class SetBuilder_Test extends TestBase {
@Test
void d02_sorted_customComparator() {
- var set = SetBuilder.create(String.class)
+ var set = Sets.create(String.class)
.add("a", "bb", "ccc")
.sorted(Comparator.comparing(String::length))
.build();
@@ -161,7 +161,7 @@ class SetBuilder_Test extends TestBase {
@Test
void d03_sorted_integers() {
- var set = SetBuilder.create(Integer.class)
+ var set = Sets.create(Integer.class)
.add(5, 2, 8, 1, 9)
.sorted()
.build();
@@ -175,7 +175,7 @@ class SetBuilder_Test extends TestBase {
@Test
void e01_sparse_empty() {
- var set = SetBuilder.create(String.class)
+ var set = Sets.create(String.class)
.sparse()
.build();
@@ -184,7 +184,7 @@ class SetBuilder_Test extends TestBase {
@Test
void e02_sparse_notEmpty() {
- var set = SetBuilder.create(String.class)
+ var set = Sets.create(String.class)
.add("a")
.sparse()
.build();
@@ -195,7 +195,7 @@ class SetBuilder_Test extends TestBase {
@Test
void e03_notSparse_empty() {
- var set = SetBuilder.create(String.class)
+ var set = Sets.create(String.class)
.build();
assertNotNull(set);
@@ -208,7 +208,7 @@ class SetBuilder_Test extends TestBase {
@Test
void f01_unmodifiable() {
- var set = SetBuilder.create(String.class)
+ var set = Sets.create(String.class)
.add("a", "b", "c")
.unmodifiable()
.build();
@@ -219,7 +219,7 @@ class SetBuilder_Test extends TestBase {
@Test
void f02_modifiable() {
- var set = SetBuilder.create(String.class)
+ var set = Sets.create(String.class)
.add("a", "b", "c")
.build();
@@ -237,7 +237,7 @@ class SetBuilder_Test extends TestBase {
@Test
void h01_elementType() {
- var b = new SetBuilder<>(String.class);
+ var b = new Sets<>(String.class);
b.elementType(String.class);
var set = b.add("a", "b").build();
@@ -251,7 +251,7 @@ class SetBuilder_Test extends TestBase {
@Test
void i01_multipleOperations() {
var existing = l("x", "y");
- var set = SetBuilder.create(String.class)
+ var set = Sets.create(String.class)
.add("a")
.addAll(existing)
.addIf(true, "b")
@@ -266,7 +266,7 @@ class SetBuilder_Test extends TestBase {
@Test
void i02_sortedAndUnmodifiable() {
- var set = SetBuilder.create(Integer.class)
+ var set = Sets.create(Integer.class)
.add(3, 1, 2)
.sorted()
.unmodifiable()
@@ -278,7 +278,7 @@ class SetBuilder_Test extends TestBase {
@Test
void i03_sparseAndSorted() {
- var set1 = SetBuilder.create(String.class)
+ var set1 = Sets.create(String.class)
.add("c", "a", "b")
.sorted()
.sparse()
@@ -287,7 +287,7 @@ class SetBuilder_Test extends TestBase {
assertNotNull(set1);
assertList(set1, "a", "b", "c");
- var set2 = SetBuilder.create(String.class)
+ var set2 = Sets.create(String.class)
.sorted()
.sparse()
.build();
@@ -301,7 +301,7 @@ class SetBuilder_Test extends TestBase {
@Test
void j01_buildEmptySet() {
- var set = SetBuilder.create(String.class)
+ var set = Sets.create(String.class)
.build();
assertNotNull(set);
@@ -310,7 +310,7 @@ class SetBuilder_Test extends TestBase {
@Test
void j02_addNullElement() {
- var set = SetBuilder.create(String.class)
+ var set = Sets.create(String.class)
.ordered()
.add("a")
.add((String)null)
@@ -329,7 +329,7 @@ class SetBuilder_Test extends TestBase {
void k01_addAll_whenSetIsNull() {
// Test addAll when set is null (should create new
LinkedHashSet from collection)
var existing = l("a", "b", "c");
- var set = SetBuilder.create(String.class)
+ var set = Sets.create(String.class)
.addAll(existing)
.build();
@@ -342,7 +342,7 @@ class SetBuilder_Test extends TestBase {
@Test
void l01_elementFunction_withFunction() {
- var set = SetBuilder.create(Integer.class)
+ var set = Sets.create(Integer.class)
.elementFunction(o -> {
if (o instanceof String) {
return Integer.parseInt((String)o);
@@ -367,7 +367,7 @@ class SetBuilder_Test extends TestBase {
}
};
- var set = SetBuilder.create(Integer.class)
+ var set = Sets.create(Integer.class)
.elementFunction(o ->
converter.convertTo(Integer.class, o))
.addAny("1", "2", "3")
.build();
@@ -394,7 +394,7 @@ class SetBuilder_Test extends TestBase {
}
};
- var set = SetBuilder.create(Integer.class)
+ var set = Sets.create(Integer.class)
.elementFunction(o -> {
Integer result =
converter1.convertTo(Integer.class, o);
if (result != null) return result;
@@ -412,7 +412,7 @@ class SetBuilder_Test extends TestBase {
@Test
void m01_addAny_withDirectValues() {
- var set = SetBuilder.create(String.class)
+ var set = Sets.create(String.class)
.addAny("a", "b", "c")
.build();
@@ -422,7 +422,7 @@ class SetBuilder_Test extends TestBase {
@Test
void m02_addAny_withCollection() {
var collection = l("a", "b", "c");
- var set = SetBuilder.create(String.class)
+ var set = Sets.create(String.class)
.addAny(collection)
.build();
@@ -432,7 +432,7 @@ class SetBuilder_Test extends TestBase {
@Test
void m03_addAny_withArray() {
var array = new String[]{"a", "b", "c"};
- var set = SetBuilder.create(String.class)
+ var set = Sets.create(String.class)
.addAny((Object)array)
.build();
@@ -442,7 +442,7 @@ class SetBuilder_Test extends TestBase {
@Test
void m04_addAny_withNestedCollection() {
var nested = l(l("a", "b"), l("c", "d"));
- var set = SetBuilder.create(String.class)
+ var set = Sets.create(String.class)
.addAny(nested)
.build();
@@ -452,7 +452,7 @@ class SetBuilder_Test extends TestBase {
@Test
void m05_addAny_withNestedArray() {
var nested = new Object[]{new String[]{"a", "b"}, new
String[]{"c", "d"}};
- var set = SetBuilder.create(String.class)
+ var set = Sets.create(String.class)
.addAny(nested)
.build();
@@ -461,7 +461,7 @@ class SetBuilder_Test extends TestBase {
@Test
void m06_addAny_withNullValues() {
- var set = SetBuilder.create(String.class)
+ var set = Sets.create(String.class)
.addAny("a", null, "b", null, "c")
.build();
@@ -470,7 +470,7 @@ class SetBuilder_Test extends TestBase {
@Test
void m07_addAny_withTypeConversion() {
- var set = SetBuilder.create(Integer.class)
+ var set = Sets.create(Integer.class)
.elementFunction(o -> {
if (o instanceof String) {
return Integer.parseInt((String)o);
@@ -488,7 +488,7 @@ class SetBuilder_Test extends TestBase {
// This test verifies that addAny can handle collections
directly.
// Since elementFunction is for converting to the element type,
not to collections,
// we test that addAny works with collections directly.
- var set = SetBuilder.create(String.class)
+ var set = Sets.create(String.class)
.addAny(l("a", "b", "c"))
.build();
@@ -497,14 +497,14 @@ class SetBuilder_Test extends TestBase {
@Test
void m09_addAny_noElementType() {
- assertThrows(IllegalArgumentException.class, () -> new
SetBuilder<String>(null));
+ assertThrows(IllegalArgumentException.class, () -> new
Sets<String>(null));
}
@Test
void m10_addAny_noElementFunction_throwsException() {
// When elementFunction is null and we try to add a
non-matching type, it should throw
assertThrows(RuntimeException.class, () -> {
- SetBuilder.create(Integer.class)
+ Sets.create(Integer.class)
.addAny("not-an-integer")
.build();
});
@@ -515,7 +515,7 @@ class SetBuilder_Test extends TestBase {
// ElementFunction exists but returns null (can't convert)
// Should throw RuntimeException when elementFunction can't
convert
assertThrows(RuntimeException.class, () -> {
- SetBuilder.create(Integer.class)
+ Sets.create(Integer.class)
.elementFunction(o -> null) // Can't convert
.addAny("not-an-integer")
.build();
@@ -524,7 +524,7 @@ class SetBuilder_Test extends TestBase {
@Test
void m12_addAny_withNullArray() {
- var set = SetBuilder.create(String.class)
+ var set = Sets.create(String.class)
.addAny((Object[])null)
.build();
@@ -540,7 +540,7 @@ class SetBuilder_Test extends TestBase {
// addJson is a wrapper around addAny, so it should work
similarly
// Note: This will depend on converters being able to parse
JSON strings
// For now, we'll test that it calls addAny correctly
- var set = SetBuilder.create(String.class)
+ var set = Sets.create(String.class)
.addJson("a", "b", "c")
.build();
@@ -554,7 +554,7 @@ class SetBuilder_Test extends TestBase {
@Test
void o01_build_sparseWithNullSet() {
- var set = SetBuilder.create(String.class)
+ var set = Sets.create(String.class)
.sparse()
.build();
@@ -564,7 +564,7 @@ class SetBuilder_Test extends TestBase {
@Test
void o03_build_notSparseWithNullSet() {
- var set = SetBuilder.create(String.class)
+ var set = Sets.create(String.class)
.build();
assertNotNull(set);
@@ -573,7 +573,7 @@ class SetBuilder_Test extends TestBase {
@Test
void o04_build_sortedWithNullSet() {
- var set = SetBuilder.create(String.class)
+ var set = Sets.create(String.class)
.sorted()
.build();
@@ -584,7 +584,7 @@ class SetBuilder_Test extends TestBase {
@Test
void o05_build_unmodifiableWithNullSet() {
- var set = SetBuilder.create(String.class)
+ var set = Sets.create(String.class)
.unmodifiable()
.build();
@@ -598,7 +598,7 @@ class SetBuilder_Test extends TestBase {
@Test
void p01_buildFluent_returnsFluentSet() {
- var set = SetBuilder.create(String.class)
+ var set = Sets.create(String.class)
.add("a", "b", "c")
.buildFluent();
@@ -609,7 +609,7 @@ class SetBuilder_Test extends TestBase {
@Test
void p02_buildFluent_sparseEmpty() {
- var set = SetBuilder.create(String.class)
+ var set = Sets.create(String.class)
.sparse()
.buildFluent();
@@ -618,7 +618,7 @@ class SetBuilder_Test extends TestBase {
@Test
void p03_buildFluent_withSorted() {
- var set = SetBuilder.create(String.class)
+ var set = Sets.create(String.class)
.add("c", "a", "b")
.sorted()
.buildFluent();
@@ -629,7 +629,7 @@ class SetBuilder_Test extends TestBase {
@Test
void p04_buildFluent_withUnmodifiable() {
- var set = SetBuilder.create(String.class)
+ var set = Sets.create(String.class)
.add("a", "b", "c")
.unmodifiable()
.buildFluent();
@@ -641,7 +641,7 @@ class SetBuilder_Test extends TestBase {
@Test
void p05_buildFluent_fluentMethods() {
- var set = SetBuilder.create(String.class)
+ var set = Sets.create(String.class)
.add("a", "b")
.buildFluent();
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/CollectionUtils_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/utils/CollectionUtils_Test.java
index c463bb23b6..5a4b79d258 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/CollectionUtils_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/utils/CollectionUtils_Test.java
@@ -723,7 +723,7 @@ class CollectionUtils_Test extends TestBase {
//====================================================================================================
@Test
void a044_listb() {
- ListBuilder<String> builder = listb(String.class);
+ Lists<String> builder = listb(String.class);
assertNotNull(builder);
List<String> result = builder.add("a").add("b").build();
assertEquals(2, result.size());
@@ -945,7 +945,7 @@ class CollectionUtils_Test extends TestBase {
//====================================================================================================
@Test
void a053_mapb() {
- MapBuilder<String, Object> builder = mapb();
+ Maps<String, Object> builder = mapb();
assertNotNull(builder);
Map<String, Object> result = builder.add("a", 1).add("b",
2).build();
assertEquals(2, result.size());
@@ -958,7 +958,7 @@ class CollectionUtils_Test extends TestBase {
//====================================================================================================
@Test
void a054_mapb_class() {
- MapBuilder<String, Integer> builder = mapb(String.class,
Integer.class);
+ Maps<String, Integer> builder = mapb(String.class,
Integer.class);
assertNotNull(builder);
Map<String, Integer> result = builder.add("a", 1).build();
assertEquals(1, result.size());
@@ -1089,7 +1089,7 @@ class CollectionUtils_Test extends TestBase {
//====================================================================================================
@Test
void a064_setb() {
- SetBuilder<String> builder = setb(String.class);
+ Sets<String> builder = setb(String.class);
assertNotNull(builder);
Set<String> result = builder.add("a").add("b").build();
assertEquals(2, result.size());
