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 40cb15d915 Marshall module improvements
40cb15d915 is described below
commit 40cb15d915a8ee222d38af75d4139f12c8ef8f8e
Author: James Bognar <[email protected]>
AuthorDate: Sat Dec 13 10:01:43 2025 -0500
Marshall module improvements
---
.../java/org/apache/juneau/bean/ResultSetList.java | 2 +-
.../{SimpleUnmodifiableMap.java => SimpleMap.java} | 26 ++++-----
.../juneau/commons/utils/CollectionUtils.java | 20 +++----
.../org/apache/juneau/rest/util/UrlPathMatch.java | 2 +-
.../juneau/assertions/MapAssertion_Test.java | 2 +-
...modifiableMap_Test.java => SimpleMap_Test.java} | 64 +++++++++++-----------
6 files changed, 58 insertions(+), 58 deletions(-)
diff --git
a/juneau-bean/juneau-bean-common/src/main/java/org/apache/juneau/bean/ResultSetList.java
b/juneau-bean/juneau-bean-common/src/main/java/org/apache/juneau/bean/ResultSetList.java
index 5b18309805..c3700b8ea7 100644
---
a/juneau-bean/juneau-bean-common/src/main/java/org/apache/juneau/bean/ResultSetList.java
+++
b/juneau-bean/juneau-bean-common/src/main/java/org/apache/juneau/bean/ResultSetList.java
@@ -107,7 +107,7 @@ public class ResultSetList extends
LinkedList<Map<String,Object>> {
var o = readEntry(rs, i + 1,
colTypes[i]);
row[i + offset] = o;
}
- add(new SimpleUnmodifiableMap<>(columns, row));
+ add(new SimpleMap<>(columns, row));
}
} finally {
rs.close();
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/SimpleUnmodifiableMap.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/SimpleMap.java
similarity index 91%
rename from
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/SimpleUnmodifiableMap.java
rename to
juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/SimpleMap.java
index 72cbe62e07..2f634b2f3e 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/SimpleUnmodifiableMap.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/SimpleMap.java
@@ -60,7 +60,7 @@ import org.apache.juneau.commons.utils.Utils;
* String[] <jv>keys</jv> = {<js>"host"</js>, <js>"port"</js>,
<js>"timeout"</js>};
* Object[] <jv>values</jv> = {<js>"localhost"</js>, 8080, 30000};
*
- * SimpleUnmodifiableMap<String,Object> <jv>config</jv> =
<jk>new</jk> SimpleUnmodifiableMap<>(<jv>keys</jv>, <jv>values</jv>);
+ * SimpleMap<String,Object> <jv>config</jv> = <jk>new</jk>
SimpleMap<>(<jv>keys</jv>, <jv>values</jv>);
*
* <jc>// Get values</jc>
* String <jv>host</jv> = (String)<jv>config</jv>.get(<js>"host"</js>);
<jc>// Returns: "localhost"</jc>
@@ -88,12 +88,12 @@ import org.apache.juneau.commons.utils.Utils;
* <h5 class='section'>Thread Safety:</h5>
* <p>
* This class is thread-safe since it's immutable after construction. Multiple
threads can safely
- * read from a SimpleUnmodifiableMap concurrently without synchronization.
+ * read from a SimpleMap concurrently without synchronization.
*
* <h5 class='section'>Example - Configuration Map:</h5>
* <p class='bjava'>
* <jc>// Create immutable configuration</jc>
- * SimpleUnmodifiableMap<String,Object> <jv>defaults</jv> =
<jk>new</jk> SimpleUnmodifiableMap<>(
+ * SimpleMap<String,Object> <jv>defaults</jv> = <jk>new</jk>
SimpleMap<>(
* <jk>new</jk> String[]{<js>"maxConnections"</js>,
<js>"timeout"</js>, <js>"retries"</js>},
* <jk>new</jk> Object[]{100, 5000, 3}
* );
@@ -104,9 +104,9 @@ import org.apache.juneau.commons.utils.Utils;
*
* <h5 class='section'>Comparison with Map.of():</h5>
* <ul class='spaced-list'>
- * <li><b>Null Support:</b> SimpleUnmodifiableMap supports null
keys/values, Map.of() does not
- * <li><b>Insertion Order:</b> SimpleUnmodifiableMap preserves insertion
order, Map.of() does not
- * <li><b>Size Limit:</b> Map.of() limited to 10 entries,
SimpleUnmodifiableMap has no limit
+ * <li><b>Null Support:</b> SimpleMap supports null keys/values, Map.of()
does not
+ * <li><b>Insertion Order:</b> SimpleMap preserves insertion order,
Map.of() does not
+ * <li><b>Size Limit:</b> Map.of() limited to 10 entries, SimpleMap has no
limit
* </ul>
*
* <h5 class='section'>See Also:</h5>
@@ -118,7 +118,7 @@ import org.apache.juneau.commons.utils.Utils;
* @param <K> The key type.
* @param <V> The value type.
*/
-public class SimpleUnmodifiableMap<K,V> extends AbstractMap<K,V> {
+public class SimpleMap<K,V> extends AbstractMap<K,V> {
/**
* Inner class representing a single key-value entry in this map.
@@ -178,7 +178,7 @@ public class SimpleUnmodifiableMap<K,V> extends
AbstractMap<K,V> {
final SimpleUnmodifiableMapEntry[] entries;
/**
- * Constructs a new SimpleUnmodifiableMap with the specified keys and
values.
+ * Constructs a new SimpleMap with the specified keys and values.
*
* <p>
* The keys and values arrays are stored by reference (not copied), so
external
@@ -191,7 +191,7 @@ public class SimpleUnmodifiableMap<K,V> extends
AbstractMap<K,V> {
* String[] <jv>keys</jv> = {<js>"name"</js>, <js>"age"</js>,
<js>"city"</js>};
* Object[] <jv>values</jv> = {<js>"John"</js>, 30,
<js>"NYC"</js>};
*
- * SimpleUnmodifiableMap<String,Object> <jv>person</jv> =
<jk>new</jk> SimpleUnmodifiableMap<>(<jv>keys</jv>, <jv>values</jv>);
+ * SimpleMap<String,Object> <jv>person</jv> = <jk>new</jk>
SimpleMap<>(<jv>keys</jv>, <jv>values</jv>);
* </p>
*
* @param keys The map keys. Must not be <jk>null</jk>. Individual keys
can be <jk>null</jk>.
@@ -206,7 +206,7 @@ public class SimpleUnmodifiableMap<K,V> extends
AbstractMap<K,V> {
* </ul>
*/
@SuppressWarnings("unchecked")
- public SimpleUnmodifiableMap(K[] keys, V[] values) {
+ public SimpleMap(K[] keys, V[] values) {
assertArgsNotNull("keys", keys, "values", values);
assertArg(keys.length == values.length, "keys ''{0}'' and
values ''{1}'' array lengths differ", keys.length, values.length);
@@ -235,7 +235,7 @@ public class SimpleUnmodifiableMap<K,V> extends
AbstractMap<K,V> {
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * SimpleUnmodifiableMap<String,Integer> <jv>map</jv> =
<jk>new</jk> SimpleUnmodifiableMap<>(
+ * SimpleMap<String,Integer> <jv>map</jv> = <jk>new</jk>
SimpleMap<>(
* <jk>new</jk> String[]{<js>"a"</js>, <js>"b"</js>},
* <jk>new</jk> Integer[]{1, 2}
* );
@@ -262,7 +262,7 @@ public class SimpleUnmodifiableMap<K,V> extends
AbstractMap<K,V> {
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * SimpleUnmodifiableMap<String,Integer> <jv>map</jv> =
<jk>new</jk> SimpleUnmodifiableMap<>(
+ * SimpleMap<String,Integer> <jv>map</jv> = <jk>new</jk>
SimpleMap<>(
* <jk>new</jk> String[]{<js>"age"</js>, <js>"score"</js>},
* <jk>new</jk> Integer[]{25, 100}
* );
@@ -291,7 +291,7 @@ public class SimpleUnmodifiableMap<K,V> extends
AbstractMap<K,V> {
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * SimpleUnmodifiableMap<String,Integer> <jv>map</jv> =
<jk>new</jk> SimpleUnmodifiableMap<>(
+ * SimpleMap<String,Integer> <jv>map</jv> = <jk>new</jk>
SimpleMap<>(
* <jk>new</jk> String[]{<js>"x"</js>, <js>"y"</js>,
<js>"z"</js>},
* <jk>new</jk> Integer[]{1, 2, 3}
* );
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 7103207f32..6bd5a35391 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
@@ -1005,7 +1005,7 @@ public class CollectionUtils {
* @return A new unmodifiable map.
*/
public static <K,V> Map<K,V> m(K k1, V v1) {
- return new SimpleUnmodifiableMap<>(a(k1), a(v1));
+ return new SimpleMap<>(a(k1), a(v1));
}
/**
@@ -1021,7 +1021,7 @@ public class CollectionUtils {
* @return A new unmodifiable map.
*/
public static <K,V> Map<K,V> m(K k1, V v1, K k2, V v2) {
- return new SimpleUnmodifiableMap<>(a(k1, k2), a(v1, v2));
+ return new SimpleMap<>(a(k1, k2), a(v1, v2));
}
/**
@@ -1039,7 +1039,7 @@ public class CollectionUtils {
* @return A new unmodifiable map.
*/
public static <K,V> Map<K,V> m(K k1, V v1, K k2, V v2, K k3, V v3) {
- return new SimpleUnmodifiableMap<>(a(k1, k2, k3), a(v1, v2,
v3));
+ return new SimpleMap<>(a(k1, k2, k3), a(v1, v2, v3));
}
/**
@@ -1059,7 +1059,7 @@ public class CollectionUtils {
* @return A new unmodifiable map.
*/
public static <K,V> Map<K,V> m(K k1, V v1, K k2, V v2, K k3, V v3, K
k4, V v4) {
- return new SimpleUnmodifiableMap<>(a(k1, k2, k3, k4), a(v1, v2,
v3, v4));
+ return new SimpleMap<>(a(k1, k2, k3, k4), a(v1, v2, v3, v4));
}
/**
@@ -1081,7 +1081,7 @@ public class CollectionUtils {
* @return A new unmodifiable map.
*/
public static <K,V> Map<K,V> m(K k1, V v1, K k2, V v2, K k3, V v3, K
k4, V v4, K k5, V v5) {
- return new SimpleUnmodifiableMap<>(a(k1, k2, k3, k4, k5), a(v1,
v2, v3, v4, v5));
+ return new SimpleMap<>(a(k1, k2, k3, k4, k5), a(v1, v2, v3, v4,
v5));
}
/**
@@ -1105,7 +1105,7 @@ public class CollectionUtils {
* @return A new unmodifiable map.
*/
public static <K,V> Map<K,V> m(K k1, V v1, K k2, V v2, K k3, V v3, K
k4, V v4, K k5, V v5, K k6, V v6) {
- return new SimpleUnmodifiableMap<>(a(k1, k2, k3, k4, k5, k6),
a(v1, v2, v3, v4, v5, v6));
+ return new SimpleMap<>(a(k1, k2, k3, k4, k5, k6), a(v1, v2, v3,
v4, v5, v6));
}
/**
@@ -1131,7 +1131,7 @@ public class CollectionUtils {
* @return A new unmodifiable map.
*/
public static <K,V> Map<K,V> m(K k1, V v1, K k2, V v2, K k3, V v3, K
k4, V v4, K k5, V v5, K k6, V v6, K k7, V v7) {
- return new SimpleUnmodifiableMap<>(a(k1, k2, k3, k4, k5, k6,
k7), a(v1, v2, v3, v4, v5, v6, v7));
+ return new SimpleMap<>(a(k1, k2, k3, k4, k5, k6, k7), a(v1, v2,
v3, v4, v5, v6, v7));
}
/**
@@ -1159,7 +1159,7 @@ public class CollectionUtils {
* @return A new unmodifiable map.
*/
public static <K,V> Map<K,V> m(K k1, V v1, K k2, V v2, K k3, V v3, K
k4, V v4, K k5, V v5, K k6, V v6, K k7, V v7, K k8, V v8) {
- return new SimpleUnmodifiableMap<>(a(k1, k2, k3, k4, k5, k6,
k7, k8), a(v1, v2, v3, v4, v5, v6, v7, v8));
+ return new SimpleMap<>(a(k1, k2, k3, k4, k5, k6, k7, k8), a(v1,
v2, v3, v4, v5, v6, v7, v8));
}
/**
@@ -1189,7 +1189,7 @@ public class CollectionUtils {
* @return A new unmodifiable map.
*/
public static <K,V> Map<K,V> m(K k1, V v1, K k2, V v2, K k3, V v3, K
k4, V v4, K k5, V v5, K k6, V v6, K k7, V v7, K k8, V v8, K k9, V v9) {
- return new SimpleUnmodifiableMap<>(a(k1, k2, k3, k4, k5, k6,
k7, k8, k9), a(v1, v2, v3, v4, v5, v6, v7, v8, v9));
+ return new SimpleMap<>(a(k1, k2, k3, k4, k5, k6, k7, k8, k9),
a(v1, v2, v3, v4, v5, v6, v7, v8, v9));
}
/**
@@ -1221,7 +1221,7 @@ public class CollectionUtils {
* @return A new unmodifiable map.
*/
public static <K,V> Map<K,V> m(K k1, V v1, K k2, V v2, K k3, V v3, K
k4, V v4, K k5, V v5, K k6, V v6, K k7, V v7, K k8, V v8, K k9, V v9, K k10, V
v10) {
- return new SimpleUnmodifiableMap<>(a(k1, k2, k3, k4, k5, k6,
k7, k8, k9, k10), a(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10));
+ return new SimpleMap<>(a(k1, k2, k3, k4, k5, k6, k7, k8, k9,
k10), a(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10));
}
/**
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/UrlPathMatch.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/UrlPathMatch.java
index bb17c70c56..14bb810a8a 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/UrlPathMatch.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/UrlPathMatch.java
@@ -49,7 +49,7 @@ public class UrlPathMatch {
protected UrlPathMatch(String path, int matchedParts, String[] keys,
String[] values) {
this.path = path;
this.matchedParts = matchedParts;
- this.vars = keys == null ? mape() : new
SimpleUnmodifiableMap<>(keys, values);
+ this.vars = keys == null ? mape() : new SimpleMap<>(keys,
values);
}
/**
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/MapAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/MapAssertion_Test.java
index 476a16c29f..16ce4e4b77 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/MapAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/MapAssertion_Test.java
@@ -268,7 +268,7 @@ class MapAssertion_Test extends TestBase {
@Test void ca13_isExactType() {
var x = m(1,2);
var nil = mapn(Object.class, Object.class);
- test(x).isExactType(SimpleUnmodifiableMap.class);
+ test(x).isExactType(SimpleMap.class);
assertThrown(()->test(x).isExactType(Object.class)).asMessage().asOneLine().isMatches("Unexpected
type. Expect='java.lang.Object'. Actual='*'.");
assertThrown(()->test(x).isExactType(String.class)).asMessage().asOneLine().isMatches("Unexpected
type. Expect='java.lang.String'. Actual='*'.");
assertThrown(()->test(nil).isExactType(String.class)).asMessage().asOneLine().is("Value
was null.");
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/SimpleUnmodifiableMap_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/SimpleMap_Test.java
similarity index 83%
rename from
juneau-utest/src/test/java/org/apache/juneau/commons/collections/SimpleUnmodifiableMap_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/commons/collections/SimpleMap_Test.java
index 145ca8d5e2..c0918ca342 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/SimpleUnmodifiableMap_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/SimpleMap_Test.java
@@ -26,7 +26,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.junit.jupiter.api.*;
-class SimpleUnmodifiableMap_Test extends TestBase {
+class SimpleMap_Test extends TestBase {
//====================================================================================================
// Null key support
@@ -36,7 +36,7 @@ class SimpleUnmodifiableMap_Test extends TestBase {
var keys = a((String)null);
var values = a("value1");
- var map = new SimpleUnmodifiableMap<>(keys, values);
+ var map = new SimpleMap<>(keys, values);
assertSize(1, map);
assertEquals("value1", map.get(null));
@@ -48,7 +48,7 @@ class SimpleUnmodifiableMap_Test extends TestBase {
var keys = a("key1", null, "key3");
var values = a("value1", "value2", "value3");
- var map = new SimpleUnmodifiableMap<>(keys, values);
+ var map = new SimpleMap<>(keys, values);
assertSize(3, map);
assertEquals("value1", map.get("key1"));
@@ -62,7 +62,7 @@ class SimpleUnmodifiableMap_Test extends TestBase {
var keys = a("key1", null);
var values = a("value1", "value2");
- var map = new SimpleUnmodifiableMap<>(keys, values);
+ var map = new SimpleMap<>(keys, values);
assertThrows(UnsupportedOperationException.class, () -> {
map.put(null, "newValue");
@@ -77,7 +77,7 @@ class SimpleUnmodifiableMap_Test extends TestBase {
var keys = a((String)null);
var values = a((String)null);
- SimpleUnmodifiableMap<String,String> map = new
SimpleUnmodifiableMap<>(keys, values);
+ SimpleMap<String,String> map = new SimpleMap<>(keys, values);
assertSize(1, map);
assertNull(map.get(null));
@@ -89,7 +89,7 @@ class SimpleUnmodifiableMap_Test extends TestBase {
var keys = a("key1", null, "key3");
var values = a("value1", "value2", "value3");
- var map = new SimpleUnmodifiableMap<>(keys, values);
+ var map = new SimpleMap<>(keys, values);
var foundNullKey = false;
for (var entry : map.entrySet()) {
@@ -111,7 +111,7 @@ class SimpleUnmodifiableMap_Test extends TestBase {
var keys = a("key1", null, "key3");
var values = a("value1", "value2", "value3");
- var map = new SimpleUnmodifiableMap<>(keys, values);
+ var map = new SimpleMap<>(keys, values);
assertTrue(map.keySet().contains(null), "Null key not found in
keySet");
assertSize(3, map.keySet());
@@ -126,7 +126,7 @@ class SimpleUnmodifiableMap_Test extends TestBase {
var values = a("value1", "value2", "value3");
assertThrowsWithMessage(IllegalArgumentException.class,
"Duplicate key found: key1", () -> {
- new SimpleUnmodifiableMap<>(keys, values);
+ new SimpleMap<>(keys, values);
});
}
@@ -136,7 +136,7 @@ class SimpleUnmodifiableMap_Test extends TestBase {
var values = a("value1", "value2", "value3");
assertThrowsWithMessage(IllegalArgumentException.class,
"Duplicate key found: null", () -> {
- new SimpleUnmodifiableMap<>(keys, values);
+ new SimpleMap<>(keys, values);
});
}
@@ -146,7 +146,7 @@ class SimpleUnmodifiableMap_Test extends TestBase {
var values = a("value1", "value2", "value3", "value4");
assertThrowsWithMessage(IllegalArgumentException.class,
"Duplicate key found: key1", () -> {
- new SimpleUnmodifiableMap<>(keys, values);
+ new SimpleMap<>(keys, values);
});
}
@@ -155,7 +155,7 @@ class SimpleUnmodifiableMap_Test extends TestBase {
var keys = a("key1", null, "key2", "key3");
var values = a("value1", "value2", "value3", "value4");
- var map = assertDoesNotThrow(() -> new
SimpleUnmodifiableMap<>(keys, values));
+ var map = assertDoesNotThrow(() -> new SimpleMap<>(keys,
values));
assertSize(4, map);
assertEquals("value1", map.get("key1"));
@@ -172,7 +172,7 @@ class SimpleUnmodifiableMap_Test extends TestBase {
var keys = a("key1");
var values = a("value1");
- var map = new SimpleUnmodifiableMap<>(keys, values);
+ var map = new SimpleMap<>(keys, values);
assertThrows(UnsupportedOperationException.class, () -> {
map.put("key1", "newValue");
@@ -186,7 +186,7 @@ class SimpleUnmodifiableMap_Test extends TestBase {
var keys = a("key1", "key2");
var values = a("value1", "value2");
- var map = new SimpleUnmodifiableMap<>(keys, values);
+ var map = new SimpleMap<>(keys, values);
for (var entry : map.entrySet()) {
assertThrows(UnsupportedOperationException.class, () ->
{
@@ -204,7 +204,7 @@ class SimpleUnmodifiableMap_Test extends TestBase {
var values = a("value1", "value2");
assertThrowsWithMessage(IllegalArgumentException.class,
java.util.List.of("array lengths differ", "3", "2"), () -> {
- new SimpleUnmodifiableMap<>(keys, values);
+ new SimpleMap<>(keys, values);
});
}
@@ -214,7 +214,7 @@ class SimpleUnmodifiableMap_Test extends TestBase {
var values = a("value1", "value2", "value3", "value4");
assertThrowsWithMessage(IllegalArgumentException.class,
java.util.List.of("array lengths differ", "2", "4"), () -> {
- new SimpleUnmodifiableMap<>(keys, values);
+ new SimpleMap<>(keys, values);
});
}
@@ -224,7 +224,7 @@ class SimpleUnmodifiableMap_Test extends TestBase {
var values = a("value1");
assertThrowsWithMessage(IllegalArgumentException.class, "array
lengths differ", () -> {
- new SimpleUnmodifiableMap<>(keys, values);
+ new SimpleMap<>(keys, values);
});
}
@@ -234,7 +234,7 @@ class SimpleUnmodifiableMap_Test extends TestBase {
var values = new String[0];
assertThrowsWithMessage(IllegalArgumentException.class, "array
lengths differ", () -> {
- new SimpleUnmodifiableMap<>(keys, values);
+ new SimpleMap<>(keys, values);
});
}
@@ -246,7 +246,7 @@ class SimpleUnmodifiableMap_Test extends TestBase {
var keys = new String[0];
var values = new String[0];
- var map = new SimpleUnmodifiableMap<>(keys, values);
+ var map = new SimpleMap<>(keys, values);
assertEmpty(map);
assertNull(map.get(null));
@@ -258,7 +258,7 @@ class SimpleUnmodifiableMap_Test extends TestBase {
var keys = a("key1", "key2");
var values = a("value1", "value2");
- var map = new SimpleUnmodifiableMap<>(keys, values);
+ var map = new SimpleMap<>(keys, values);
assertNull(map.get(null));
assertFalse(map.containsKey(null));
@@ -269,7 +269,7 @@ class SimpleUnmodifiableMap_Test extends TestBase {
var keys = a(1, null, 3);
var values = a("one", "null-key", "three");
- var map = new SimpleUnmodifiableMap<>(keys, values);
+ var map = new SimpleMap<>(keys, values);
assertEquals("one", map.get(1));
assertEquals("null-key", map.get(null));
@@ -284,7 +284,7 @@ class SimpleUnmodifiableMap_Test extends TestBase {
var keys = a("key1", null, "key3");
var values = a("value1", "value2", "value3");
- var map = new SimpleUnmodifiableMap<>(keys, values);
+ var map = new SimpleMap<>(keys, values);
// Create multiple threads reading from the map
var threads = new Thread[10];
@@ -319,7 +319,7 @@ class SimpleUnmodifiableMap_Test extends TestBase {
void e01_toString_standardFormat() {
String[] keys = { "key1", "key2", "key3" };
Object[] values = { "value1", "value2", "value3" };
- SimpleUnmodifiableMap<String,Object> map = new
SimpleUnmodifiableMap<>(keys, values);
+ SimpleMap<String,Object> map = new SimpleMap<>(keys, values);
var result = map.toString();
assertTrue(result.startsWith("{"));
@@ -333,7 +333,7 @@ class SimpleUnmodifiableMap_Test extends TestBase {
void e02_toString_emptyMap() {
String[] keys = {};
Object[] values = {};
- SimpleUnmodifiableMap<String,Object> map = new
SimpleUnmodifiableMap<>(keys, values);
+ SimpleMap<String,Object> map = new SimpleMap<>(keys, values);
assertEquals("{}", map.toString());
}
@@ -342,11 +342,11 @@ class SimpleUnmodifiableMap_Test extends TestBase {
void e03_equals_sameContents() {
String[] keys1 = { "key1", "key2" };
Object[] values1 = { "value1", "value2" };
- SimpleUnmodifiableMap<String,Object> map1 = new
SimpleUnmodifiableMap<>(keys1, values1);
+ SimpleMap<String,Object> map1 = new SimpleMap<>(keys1, values1);
String[] keys2 = { "key1", "key2" };
Object[] values2 = { "value1", "value2" };
- SimpleUnmodifiableMap<String,Object> map2 = new
SimpleUnmodifiableMap<>(keys2, values2);
+ SimpleMap<String,Object> map2 = new SimpleMap<>(keys2, values2);
assertTrue(map1.equals(map2));
assertTrue(map2.equals(map1));
@@ -356,11 +356,11 @@ class SimpleUnmodifiableMap_Test extends TestBase {
void e04_equals_differentContents() {
String[] keys1 = { "key1", "key2" };
Object[] values1 = { "value1", "value2" };
- SimpleUnmodifiableMap<String,Object> map1 = new
SimpleUnmodifiableMap<>(keys1, values1);
+ SimpleMap<String,Object> map1 = new SimpleMap<>(keys1, values1);
String[] keys2 = { "key1", "key2" };
Object[] values2 = { "value1", "value3" };
- SimpleUnmodifiableMap<String,Object> map2 = new
SimpleUnmodifiableMap<>(keys2, values2);
+ SimpleMap<String,Object> map2 = new SimpleMap<>(keys2, values2);
assertFalse(map1.equals(map2));
assertFalse(map2.equals(map1));
@@ -370,7 +370,7 @@ class SimpleUnmodifiableMap_Test extends TestBase {
void e05_equals_regularMap() {
String[] keys = { "key1", "key2" };
Object[] values = { "value1", "value2" };
- SimpleUnmodifiableMap<String,Object> map = new
SimpleUnmodifiableMap<>(keys, values);
+ SimpleMap<String,Object> map = new SimpleMap<>(keys, values);
var regularMap = new LinkedHashMap<String, Object>();
regularMap.put("key1", "value1");
@@ -384,7 +384,7 @@ class SimpleUnmodifiableMap_Test extends TestBase {
void e06_equals_notAMap() {
String[] keys = { "key1" };
Object[] values = { "value1" };
- SimpleUnmodifiableMap<String,Object> map = new
SimpleUnmodifiableMap<>(keys, values);
+ SimpleMap<String,Object> map = new SimpleMap<>(keys, values);
assertFalse(map.equals("not a map"));
assertFalse(map.equals(null));
@@ -394,11 +394,11 @@ class SimpleUnmodifiableMap_Test extends TestBase {
void e07_hashCode_sameContents() {
String[] keys1 = { "key1", "key2" };
Object[] values1 = { "value1", "value2" };
- SimpleUnmodifiableMap<String,Object> map1 = new
SimpleUnmodifiableMap<>(keys1, values1);
+ SimpleMap<String,Object> map1 = new SimpleMap<>(keys1, values1);
String[] keys2 = { "key1", "key2" };
Object[] values2 = { "value1", "value2" };
- SimpleUnmodifiableMap<String,Object> map2 = new
SimpleUnmodifiableMap<>(keys2, values2);
+ SimpleMap<String,Object> map2 = new SimpleMap<>(keys2, values2);
assertEquals(map1.hashCode(), map2.hashCode());
}
@@ -407,7 +407,7 @@ class SimpleUnmodifiableMap_Test extends TestBase {
void e08_hashCode_regularMap() {
String[] keys = { "key1", "key2" };
Object[] values = { "value1", "value2" };
- SimpleUnmodifiableMap<String,Object> map = new
SimpleUnmodifiableMap<>(keys, values);
+ SimpleMap<String,Object> map = new SimpleMap<>(keys, values);
var regularMap = new LinkedHashMap<String, Object>();
regularMap.put("key1", "value1");
