This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch asf-staging
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/asf-staging by this push:
new 910c340447 Deploy documentation staging from
40cb15d915a8ee222d38af75d4139f12c8ef8f8e
40cb15d915a8ee222d38af75d4139f12c8ef8f8e
910c340447 is described below
commit 910c340447cb508125ea07627d58c41929ff106a
Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
AuthorDate: Sat Dec 13 15:09:33 2025 +0000
Deploy documentation staging from 40cb15d915a8ee222d38af75d4139f12c8ef8f8e
40cb15d915a8ee222d38af75d4139f12c8ef8f8e
---
site/xref-test/allclasses-frame.html | 2 +-
.../juneau/assertions/MapAssertion_Test.html | 2 +-
...modifiableMap_Test.html => SimpleMap_Test.html} | 68 +++++++++++-----------
.../juneau/commons/collections/package-frame.html | 2 +-
.../commons/collections/package-summary.html | 2 +-
site/xref/allclasses-frame.html | 4 +-
.../xref/org/apache/juneau/bean/ResultSetList.html | 2 +-
.../{SimpleUnmodifiableMap.html => SimpleMap.html} | 30 +++++-----
.../juneau/commons/collections/package-frame.html | 4 +-
.../commons/collections/package-summary.html | 4 +-
.../juneau/commons/utils/CollectionUtils.html | 20 +++----
.../org/apache/juneau/rest/util/UrlPathMatch.html | 2 +-
12 files changed, 71 insertions(+), 71 deletions(-)
diff --git a/site/xref-test/allclasses-frame.html
b/site/xref-test/allclasses-frame.html
index 1c2f266c30..842c41a50c 100644
--- a/site/xref-test/allclasses-frame.html
+++ b/site/xref-test/allclasses-frame.html
@@ -2679,9 +2679,9 @@
<li><a
href="org/apache/juneau/commons/settings/Settings_Test.html#Settings_Test"
target="classFrame">Settings_Test</a></li>
<li><a
href="org/apache/juneau/commons/collections/ShortValue_Test.html#ShortValue_Test"
target="classFrame">ShortValue_Test</a></li>
<li><a
href="org/apache/juneau/html/SimpleHtmlWriter_Test.html#SimpleHtmlWriter_Test"
target="classFrame">SimpleHtmlWriter_Test</a></li>
+ <li><a
href="org/apache/juneau/commons/collections/SimpleMap_Test.html#SimpleMap_Test"
target="classFrame">SimpleMap_Test</a></li>
<li><a
href="org/apache/juneau/a/rttests/SimpleObjects_RoundTripTest.html#SimpleObjects_RoundTripTest"
target="classFrame">SimpleObjects_RoundTripTest</a></li>
<li><a
href="org/apache/juneau/commons/utils/SimpleReadWriteLock_Test.html#SimpleReadWriteLock_Test"
target="classFrame">SimpleReadWriteLock_Test</a></li>
- <li><a
href="org/apache/juneau/commons/collections/SimpleUnmodifiableMap_Test.html#SimpleUnmodifiableMap_Test"
target="classFrame">SimpleUnmodifiableMap_Test</a></li>
<li><a
href="org/apache/juneau/bean/html5/Small_Test.html#Small_Test"
target="classFrame">Small_Test</a></li>
<li><a
href="org/apache/juneau/soap/annotation/SoapXmlAnnotation_Test.html#SoapXmlAnnotation_Test"
target="classFrame">SoapXmlAnnotation_Test</a></li>
<li><a
href="org/apache/juneau/soap/SoapXmlConfigAnnotationTest.html#SoapXmlConfigAnnotationTest"
target="classFrame">SoapXmlConfigAnnotationTest</a></li>
diff --git a/site/xref-test/org/apache/juneau/assertions/MapAssertion_Test.html
b/site/xref-test/org/apache/juneau/assertions/MapAssertion_Test.html
index e21b3c71bb..a2e86d2a1d 100644
--- a/site/xref-test/org/apache/juneau/assertions/MapAssertion_Test.html
+++ b/site/xref-test/org/apache/juneau/assertions/MapAssertion_Test.html
@@ -276,7 +276,7 @@
<a class="jxr_linenumber" name="L268" href="#L268">268</a> @Test <strong
class="jxr_keyword">void</strong> ca13_isExactType() {
<a class="jxr_linenumber" name="L269" href="#L269">269</a> <strong
class="jxr_keyword">var</strong> x = m(1,2);
<a class="jxr_linenumber" name="L270" href="#L270">270</a> <strong
class="jxr_keyword">var</strong> nil = mapn(Object.<strong
class="jxr_keyword">class</strong>, Object.<strong
class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L271" href="#L271">271</a>
test(x).isExactType(SimpleUnmodifiableMap.<strong
class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L271" href="#L271">271</a>
test(x).isExactType(SimpleMap.<strong class="jxr_keyword">class</strong>);
<a class="jxr_linenumber" name="L272" href="#L272">272</a>
assertThrown(()->test(x).isExactType(Object.<strong
class="jxr_keyword">class</strong>)).asMessage().asOneLine().isMatches(<span
class="jxr_string">"Unexpected type. Expect='java.lang.Object'.
Actual='*'."</span>);
<a class="jxr_linenumber" name="L273" href="#L273">273</a>
assertThrown(()->test(x).isExactType(String.<strong
class="jxr_keyword">class</strong>)).asMessage().asOneLine().isMatches(<span
class="jxr_string">"Unexpected type. Expect='java.lang.String'.
Actual='*'."</span>);
<a class="jxr_linenumber" name="L274" href="#L274">274</a>
assertThrown(()->test(nil).isExactType(String.<strong
class="jxr_keyword">class</strong>)).asMessage().asOneLine().is(<span
class="jxr_string">"Value was null."</span>);
diff --git
a/site/xref-test/org/apache/juneau/commons/collections/SimpleUnmodifiableMap_Test.html
b/site/xref-test/org/apache/juneau/commons/collections/SimpleMap_Test.html
similarity index 93%
rename from
site/xref-test/org/apache/juneau/commons/collections/SimpleUnmodifiableMap_Test.html
rename to
site/xref-test/org/apache/juneau/commons/collections/SimpleMap_Test.html
index 65c745b04c..831084ccdf 100644
---
a/site/xref-test/org/apache/juneau/commons/collections/SimpleUnmodifiableMap_Test.html
+++ b/site/xref-test/org/apache/juneau/commons/collections/SimpleMap_Test.html
@@ -1,11 +1,11 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="" lang="">
<head><meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-<title>SimpleUnmodifiableMap_Test xref</title>
+<title>SimpleMap_Test xref</title>
<link type="text/css" rel="stylesheet" href="../../../../../stylesheet.css" />
</head>
<body>
-<div id="overview"><a
href="../../../../../../testapidocs/org/apache/juneau/commons/collections/SimpleUnmodifiableMap_Test.html">View
Javadoc</a></div><pre>
+<div id="overview"><a
href="../../../../../../testapidocs/org/apache/juneau/commons/collections/SimpleMap_Test.html">View
Javadoc</a></div><pre>
<a class="jxr_linenumber" name="L1" href="#L1">1</a> <em
class="jxr_comment">/*</em>
<a class="jxr_linenumber" name="L2" href="#L2">2</a> <em
class="jxr_comment"> * Licensed to the Apache Software Foundation (ASF) under
one or more</em>
<a class="jxr_linenumber" name="L3" href="#L3">3</a> <em
class="jxr_comment"> * contributor license agreements. See the NOTICE file
distributed with</em>
@@ -34,7 +34,7 @@
<a class="jxr_linenumber" name="L26" href="#L26">26</a> <strong
class="jxr_keyword">import</strong> org.apache.juneau.*;
<a class="jxr_linenumber" name="L27" href="#L27">27</a> <strong
class="jxr_keyword">import</strong> org.junit.jupiter.api.*;
<a class="jxr_linenumber" name="L28" href="#L28">28</a>
-<a class="jxr_linenumber" name="L29" href="#L29">29</a> <strong
class="jxr_keyword">class</strong> <a name="SimpleUnmodifiableMap_Test"
href="../../../../../org/apache/juneau/commons/collections/SimpleUnmodifiableMap_Test.html#SimpleUnmodifiableMap_Test">SimpleUnmodifiableMap_Test</a>
<strong class="jxr_keyword">extends</strong> <a name="TestBase"
href="../../../../../org/apache/juneau/TestBase.html#TestBase">TestBase</a> {
+<a class="jxr_linenumber" name="L29" href="#L29">29</a> <strong
class="jxr_keyword">class</strong> <a name="SimpleMap_Test"
href="../../../../../org/apache/juneau/commons/collections/SimpleMap_Test.html#SimpleMap_Test">SimpleMap_Test</a>
<strong class="jxr_keyword">extends</strong> <a name="TestBase"
href="../../../../../org/apache/juneau/TestBase.html#TestBase">TestBase</a> {
<a class="jxr_linenumber" name="L30" href="#L30">30</a>
<a class="jxr_linenumber" name="L31" href="#L31">31</a> <em
class="jxr_comment">//====================================================================================================</em>
<a class="jxr_linenumber" name="L32" href="#L32">32</a> <em
class="jxr_comment">// Null key support</em>
@@ -44,7 +44,7 @@
<a class="jxr_linenumber" name="L36" href="#L36">36</a> <strong
class="jxr_keyword">var</strong> keys = a((String)<strong
class="jxr_keyword">null</strong>);
<a class="jxr_linenumber" name="L37" href="#L37">37</a> <strong
class="jxr_keyword">var</strong> values = a(<span
class="jxr_string">"value1"</span>);
<a class="jxr_linenumber" name="L38" href="#L38">38</a>
-<a class="jxr_linenumber" name="L39" href="#L39">39</a> <strong
class="jxr_keyword">var</strong> map = <strong class="jxr_keyword">new</strong>
SimpleUnmodifiableMap<>(keys, values);
+<a class="jxr_linenumber" name="L39" href="#L39">39</a> <strong
class="jxr_keyword">var</strong> map = <strong class="jxr_keyword">new</strong>
SimpleMap<>(keys, values);
<a class="jxr_linenumber" name="L40" href="#L40">40</a>
<a class="jxr_linenumber" name="L41" href="#L41">41</a>
assertSize(1, map);
<a class="jxr_linenumber" name="L42" href="#L42">42</a>
assertEquals(<span class="jxr_string">"value1"</span>, map.get(<strong
class="jxr_keyword">null</strong>));
@@ -56,7 +56,7 @@
<a class="jxr_linenumber" name="L48" href="#L48">48</a> <strong
class="jxr_keyword">var</strong> keys = a(<span
class="jxr_string">"key1"</span>, <strong class="jxr_keyword">null</strong>,
<span class="jxr_string">"key3"</span>);
<a class="jxr_linenumber" name="L49" href="#L49">49</a> <strong
class="jxr_keyword">var</strong> values = a(<span
class="jxr_string">"value1"</span>, <span class="jxr_string">"value2"</span>,
<span class="jxr_string">"value3"</span>);
<a class="jxr_linenumber" name="L50" href="#L50">50</a>
-<a class="jxr_linenumber" name="L51" href="#L51">51</a> <strong
class="jxr_keyword">var</strong> map = <strong class="jxr_keyword">new</strong>
SimpleUnmodifiableMap<>(keys, values);
+<a class="jxr_linenumber" name="L51" href="#L51">51</a> <strong
class="jxr_keyword">var</strong> map = <strong class="jxr_keyword">new</strong>
SimpleMap<>(keys, values);
<a class="jxr_linenumber" name="L52" href="#L52">52</a>
<a class="jxr_linenumber" name="L53" href="#L53">53</a>
assertSize(3, map);
<a class="jxr_linenumber" name="L54" href="#L54">54</a>
assertEquals(<span class="jxr_string">"value1"</span>, map.get(<span
class="jxr_string">"key1"</span>));
@@ -70,7 +70,7 @@
<a class="jxr_linenumber" name="L62" href="#L62">62</a> <strong
class="jxr_keyword">var</strong> keys = a(<span
class="jxr_string">"key1"</span>, <strong class="jxr_keyword">null</strong>);
<a class="jxr_linenumber" name="L63" href="#L63">63</a> <strong
class="jxr_keyword">var</strong> values = a(<span
class="jxr_string">"value1"</span>, <span class="jxr_string">"value2"</span>);
<a class="jxr_linenumber" name="L64" href="#L64">64</a>
-<a class="jxr_linenumber" name="L65" href="#L65">65</a> <strong
class="jxr_keyword">var</strong> map = <strong class="jxr_keyword">new</strong>
SimpleUnmodifiableMap<>(keys, values);
+<a class="jxr_linenumber" name="L65" href="#L65">65</a> <strong
class="jxr_keyword">var</strong> map = <strong class="jxr_keyword">new</strong>
SimpleMap<>(keys, values);
<a class="jxr_linenumber" name="L66" href="#L66">66</a>
<a class="jxr_linenumber" name="L67" href="#L67">67</a>
assertThrows(UnsupportedOperationException.<strong
class="jxr_keyword">class</strong>, () -> {
<a class="jxr_linenumber" name="L68" href="#L68">68</a>
map.put(<strong class="jxr_keyword">null</strong>, <span
class="jxr_string">"newValue"</span>);
@@ -85,7 +85,7 @@
<a class="jxr_linenumber" name="L77" href="#L77">77</a> <strong
class="jxr_keyword">var</strong> keys = a((String)<strong
class="jxr_keyword">null</strong>);
<a class="jxr_linenumber" name="L78" href="#L78">78</a> <strong
class="jxr_keyword">var</strong> values = a((String)<strong
class="jxr_keyword">null</strong>);
<a class="jxr_linenumber" name="L79" href="#L79">79</a>
-<a class="jxr_linenumber" name="L80" href="#L80">80</a>
SimpleUnmodifiableMap<String,String> map = <strong
class="jxr_keyword">new</strong> SimpleUnmodifiableMap<>(keys, values);
+<a class="jxr_linenumber" name="L80" href="#L80">80</a>
SimpleMap<String,String> map = <strong class="jxr_keyword">new</strong>
SimpleMap<>(keys, values);
<a class="jxr_linenumber" name="L81" href="#L81">81</a>
<a class="jxr_linenumber" name="L82" href="#L82">82</a>
assertSize(1, map);
<a class="jxr_linenumber" name="L83" href="#L83">83</a>
assertNull(map.get(<strong class="jxr_keyword">null</strong>));
@@ -97,7 +97,7 @@
<a class="jxr_linenumber" name="L89" href="#L89">89</a> <strong
class="jxr_keyword">var</strong> keys = a(<span
class="jxr_string">"key1"</span>, <strong class="jxr_keyword">null</strong>,
<span class="jxr_string">"key3"</span>);
<a class="jxr_linenumber" name="L90" href="#L90">90</a> <strong
class="jxr_keyword">var</strong> values = a(<span
class="jxr_string">"value1"</span>, <span class="jxr_string">"value2"</span>,
<span class="jxr_string">"value3"</span>);
<a class="jxr_linenumber" name="L91" href="#L91">91</a>
-<a class="jxr_linenumber" name="L92" href="#L92">92</a> <strong
class="jxr_keyword">var</strong> map = <strong class="jxr_keyword">new</strong>
SimpleUnmodifiableMap<>(keys, values);
+<a class="jxr_linenumber" name="L92" href="#L92">92</a> <strong
class="jxr_keyword">var</strong> map = <strong class="jxr_keyword">new</strong>
SimpleMap<>(keys, values);
<a class="jxr_linenumber" name="L93" href="#L93">93</a>
<a class="jxr_linenumber" name="L94" href="#L94">94</a> <strong
class="jxr_keyword">var</strong> foundNullKey = false;
<a class="jxr_linenumber" name="L95" href="#L95">95</a> <strong
class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong>
entry : map.entrySet()) {
@@ -119,7 +119,7 @@
<a class="jxr_linenumber" name="L111" href="#L111">111</a> <strong
class="jxr_keyword">var</strong> keys = a(<span
class="jxr_string">"key1"</span>, <strong class="jxr_keyword">null</strong>,
<span class="jxr_string">"key3"</span>);
<a class="jxr_linenumber" name="L112" href="#L112">112</a> <strong
class="jxr_keyword">var</strong> values = a(<span
class="jxr_string">"value1"</span>, <span class="jxr_string">"value2"</span>,
<span class="jxr_string">"value3"</span>);
<a class="jxr_linenumber" name="L113" href="#L113">113</a>
-<a class="jxr_linenumber" name="L114" href="#L114">114</a> <strong
class="jxr_keyword">var</strong> map = <strong class="jxr_keyword">new</strong>
SimpleUnmodifiableMap<>(keys, values);
+<a class="jxr_linenumber" name="L114" href="#L114">114</a> <strong
class="jxr_keyword">var</strong> map = <strong class="jxr_keyword">new</strong>
SimpleMap<>(keys, values);
<a class="jxr_linenumber" name="L115" href="#L115">115</a>
<a class="jxr_linenumber" name="L116" href="#L116">116</a>
assertTrue(map.keySet().contains(<strong class="jxr_keyword">null</strong>),
<span class="jxr_string">"Null key not found in keySet"</span>);
<a class="jxr_linenumber" name="L117" href="#L117">117</a>
assertSize(3, map.keySet());
@@ -134,7 +134,7 @@
<a class="jxr_linenumber" name="L126" href="#L126">126</a> <strong
class="jxr_keyword">var</strong> values = a(<span
class="jxr_string">"value1"</span>, <span class="jxr_string">"value2"</span>,
<span class="jxr_string">"value3"</span>);
<a class="jxr_linenumber" name="L127" href="#L127">127</a>
<a class="jxr_linenumber" name="L128" href="#L128">128</a>
assertThrowsWithMessage(IllegalArgumentException.<strong
class="jxr_keyword">class</strong>, <span class="jxr_string">"Duplicate key
found: key1"</span>, () -> {
-<a class="jxr_linenumber" name="L129" href="#L129">129</a>
<strong class="jxr_keyword">new</strong> SimpleUnmodifiableMap<>(keys,
values);
+<a class="jxr_linenumber" name="L129" href="#L129">129</a>
<strong class="jxr_keyword">new</strong> SimpleMap<>(keys, values);
<a class="jxr_linenumber" name="L130" href="#L130">130</a> });
<a class="jxr_linenumber" name="L131" href="#L131">131</a> }
<a class="jxr_linenumber" name="L132" href="#L132">132</a>
@@ -144,7 +144,7 @@
<a class="jxr_linenumber" name="L136" href="#L136">136</a> <strong
class="jxr_keyword">var</strong> values = a(<span
class="jxr_string">"value1"</span>, <span class="jxr_string">"value2"</span>,
<span class="jxr_string">"value3"</span>);
<a class="jxr_linenumber" name="L137" href="#L137">137</a>
<a class="jxr_linenumber" name="L138" href="#L138">138</a>
assertThrowsWithMessage(IllegalArgumentException.<strong
class="jxr_keyword">class</strong>, <span class="jxr_string">"Duplicate key
found: null"</span>, () -> {
-<a class="jxr_linenumber" name="L139" href="#L139">139</a>
<strong class="jxr_keyword">new</strong> SimpleUnmodifiableMap<>(keys,
values);
+<a class="jxr_linenumber" name="L139" href="#L139">139</a>
<strong class="jxr_keyword">new</strong> SimpleMap<>(keys, values);
<a class="jxr_linenumber" name="L140" href="#L140">140</a> });
<a class="jxr_linenumber" name="L141" href="#L141">141</a> }
<a class="jxr_linenumber" name="L142" href="#L142">142</a>
@@ -154,7 +154,7 @@
<a class="jxr_linenumber" name="L146" href="#L146">146</a> <strong
class="jxr_keyword">var</strong> values = a(<span
class="jxr_string">"value1"</span>, <span class="jxr_string">"value2"</span>,
<span class="jxr_string">"value3"</span>, <span
class="jxr_string">"value4"</span>);
<a class="jxr_linenumber" name="L147" href="#L147">147</a>
<a class="jxr_linenumber" name="L148" href="#L148">148</a>
assertThrowsWithMessage(IllegalArgumentException.<strong
class="jxr_keyword">class</strong>, <span class="jxr_string">"Duplicate key
found: key1"</span>, () -> {
-<a class="jxr_linenumber" name="L149" href="#L149">149</a>
<strong class="jxr_keyword">new</strong> SimpleUnmodifiableMap<>(keys,
values);
+<a class="jxr_linenumber" name="L149" href="#L149">149</a>
<strong class="jxr_keyword">new</strong> SimpleMap<>(keys, values);
<a class="jxr_linenumber" name="L150" href="#L150">150</a> });
<a class="jxr_linenumber" name="L151" href="#L151">151</a> }
<a class="jxr_linenumber" name="L152" href="#L152">152</a>
@@ -163,7 +163,7 @@
<a class="jxr_linenumber" name="L155" href="#L155">155</a> <strong
class="jxr_keyword">var</strong> keys = a(<span
class="jxr_string">"key1"</span>, <strong class="jxr_keyword">null</strong>,
<span class="jxr_string">"key2"</span>, <span class="jxr_string">"key3"</span>);
<a class="jxr_linenumber" name="L156" href="#L156">156</a> <strong
class="jxr_keyword">var</strong> values = a(<span
class="jxr_string">"value1"</span>, <span class="jxr_string">"value2"</span>,
<span class="jxr_string">"value3"</span>, <span
class="jxr_string">"value4"</span>);
<a class="jxr_linenumber" name="L157" href="#L157">157</a>
-<a class="jxr_linenumber" name="L158" href="#L158">158</a> <strong
class="jxr_keyword">var</strong> map = assertDoesNotThrow(() -> <strong
class="jxr_keyword">new</strong> SimpleUnmodifiableMap<>(keys, values));
+<a class="jxr_linenumber" name="L158" href="#L158">158</a> <strong
class="jxr_keyword">var</strong> map = assertDoesNotThrow(() -> <strong
class="jxr_keyword">new</strong> SimpleMap<>(keys, values));
<a class="jxr_linenumber" name="L159" href="#L159">159</a>
<a class="jxr_linenumber" name="L160" href="#L160">160</a>
assertSize(4, map);
<a class="jxr_linenumber" name="L161" href="#L161">161</a>
assertEquals(<span class="jxr_string">"value1"</span>, map.get(<span
class="jxr_string">"key1"</span>));
@@ -180,7 +180,7 @@
<a class="jxr_linenumber" name="L172" href="#L172">172</a> <strong
class="jxr_keyword">var</strong> keys = a(<span
class="jxr_string">"key1"</span>);
<a class="jxr_linenumber" name="L173" href="#L173">173</a> <strong
class="jxr_keyword">var</strong> values = a(<span
class="jxr_string">"value1"</span>);
<a class="jxr_linenumber" name="L174" href="#L174">174</a>
-<a class="jxr_linenumber" name="L175" href="#L175">175</a> <strong
class="jxr_keyword">var</strong> map = <strong class="jxr_keyword">new</strong>
SimpleUnmodifiableMap<>(keys, values);
+<a class="jxr_linenumber" name="L175" href="#L175">175</a> <strong
class="jxr_keyword">var</strong> map = <strong class="jxr_keyword">new</strong>
SimpleMap<>(keys, values);
<a class="jxr_linenumber" name="L176" href="#L176">176</a>
<a class="jxr_linenumber" name="L177" href="#L177">177</a>
assertThrows(UnsupportedOperationException.<strong
class="jxr_keyword">class</strong>, () -> {
<a class="jxr_linenumber" name="L178" href="#L178">178</a>
map.put(<span class="jxr_string">"key1"</span>, <span
class="jxr_string">"newValue"</span>);
@@ -194,7 +194,7 @@
<a class="jxr_linenumber" name="L186" href="#L186">186</a> <strong
class="jxr_keyword">var</strong> keys = a(<span
class="jxr_string">"key1"</span>, <span class="jxr_string">"key2"</span>);
<a class="jxr_linenumber" name="L187" href="#L187">187</a> <strong
class="jxr_keyword">var</strong> values = a(<span
class="jxr_string">"value1"</span>, <span class="jxr_string">"value2"</span>);
<a class="jxr_linenumber" name="L188" href="#L188">188</a>
-<a class="jxr_linenumber" name="L189" href="#L189">189</a> <strong
class="jxr_keyword">var</strong> map = <strong class="jxr_keyword">new</strong>
SimpleUnmodifiableMap<>(keys, values);
+<a class="jxr_linenumber" name="L189" href="#L189">189</a> <strong
class="jxr_keyword">var</strong> map = <strong class="jxr_keyword">new</strong>
SimpleMap<>(keys, values);
<a class="jxr_linenumber" name="L190" href="#L190">190</a>
<a class="jxr_linenumber" name="L191" href="#L191">191</a> <strong
class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong>
entry : map.entrySet()) {
<a class="jxr_linenumber" name="L192" href="#L192">192</a>
assertThrows(UnsupportedOperationException.<strong
class="jxr_keyword">class</strong>, () -> {
@@ -212,7 +212,7 @@
<a class="jxr_linenumber" name="L204" href="#L204">204</a> <strong
class="jxr_keyword">var</strong> values = a(<span
class="jxr_string">"value1"</span>, <span class="jxr_string">"value2"</span>);
<a class="jxr_linenumber" name="L205" href="#L205">205</a>
<a class="jxr_linenumber" name="L206" href="#L206">206</a>
assertThrowsWithMessage(IllegalArgumentException.<strong
class="jxr_keyword">class</strong>, java.util.List.of(<span
class="jxr_string">"array lengths differ"</span>, <span
class="jxr_string">"3"</span>, <span class="jxr_string">"2"</span>), () -> {
-<a class="jxr_linenumber" name="L207" href="#L207">207</a>
<strong class="jxr_keyword">new</strong> SimpleUnmodifiableMap<>(keys,
values);
+<a class="jxr_linenumber" name="L207" href="#L207">207</a>
<strong class="jxr_keyword">new</strong> SimpleMap<>(keys, values);
<a class="jxr_linenumber" name="L208" href="#L208">208</a> });
<a class="jxr_linenumber" name="L209" href="#L209">209</a> }
<a class="jxr_linenumber" name="L210" href="#L210">210</a>
@@ -222,7 +222,7 @@
<a class="jxr_linenumber" name="L214" href="#L214">214</a> <strong
class="jxr_keyword">var</strong> values = a(<span
class="jxr_string">"value1"</span>, <span class="jxr_string">"value2"</span>,
<span class="jxr_string">"value3"</span>, <span
class="jxr_string">"value4"</span>);
<a class="jxr_linenumber" name="L215" href="#L215">215</a>
<a class="jxr_linenumber" name="L216" href="#L216">216</a>
assertThrowsWithMessage(IllegalArgumentException.<strong
class="jxr_keyword">class</strong>, java.util.List.of(<span
class="jxr_string">"array lengths differ"</span>, <span
class="jxr_string">"2"</span>, <span class="jxr_string">"4"</span>), () -> {
-<a class="jxr_linenumber" name="L217" href="#L217">217</a>
<strong class="jxr_keyword">new</strong> SimpleUnmodifiableMap<>(keys,
values);
+<a class="jxr_linenumber" name="L217" href="#L217">217</a>
<strong class="jxr_keyword">new</strong> SimpleMap<>(keys, values);
<a class="jxr_linenumber" name="L218" href="#L218">218</a> });
<a class="jxr_linenumber" name="L219" href="#L219">219</a> }
<a class="jxr_linenumber" name="L220" href="#L220">220</a>
@@ -232,7 +232,7 @@
<a class="jxr_linenumber" name="L224" href="#L224">224</a> <strong
class="jxr_keyword">var</strong> values = a(<span
class="jxr_string">"value1"</span>);
<a class="jxr_linenumber" name="L225" href="#L225">225</a>
<a class="jxr_linenumber" name="L226" href="#L226">226</a>
assertThrowsWithMessage(IllegalArgumentException.<strong
class="jxr_keyword">class</strong>, <span class="jxr_string">"array lengths
differ"</span>, () -> {
-<a class="jxr_linenumber" name="L227" href="#L227">227</a>
<strong class="jxr_keyword">new</strong> SimpleUnmodifiableMap<>(keys,
values);
+<a class="jxr_linenumber" name="L227" href="#L227">227</a>
<strong class="jxr_keyword">new</strong> SimpleMap<>(keys, values);
<a class="jxr_linenumber" name="L228" href="#L228">228</a> });
<a class="jxr_linenumber" name="L229" href="#L229">229</a> }
<a class="jxr_linenumber" name="L230" href="#L230">230</a>
@@ -242,7 +242,7 @@
<a class="jxr_linenumber" name="L234" href="#L234">234</a> <strong
class="jxr_keyword">var</strong> values = <strong
class="jxr_keyword">new</strong> String[0];
<a class="jxr_linenumber" name="L235" href="#L235">235</a>
<a class="jxr_linenumber" name="L236" href="#L236">236</a>
assertThrowsWithMessage(IllegalArgumentException.<strong
class="jxr_keyword">class</strong>, <span class="jxr_string">"array lengths
differ"</span>, () -> {
-<a class="jxr_linenumber" name="L237" href="#L237">237</a>
<strong class="jxr_keyword">new</strong> SimpleUnmodifiableMap<>(keys,
values);
+<a class="jxr_linenumber" name="L237" href="#L237">237</a>
<strong class="jxr_keyword">new</strong> SimpleMap<>(keys, values);
<a class="jxr_linenumber" name="L238" href="#L238">238</a> });
<a class="jxr_linenumber" name="L239" href="#L239">239</a> }
<a class="jxr_linenumber" name="L240" href="#L240">240</a>
@@ -254,7 +254,7 @@
<a class="jxr_linenumber" name="L246" href="#L246">246</a> <strong
class="jxr_keyword">var</strong> keys = <strong
class="jxr_keyword">new</strong> String[0];
<a class="jxr_linenumber" name="L247" href="#L247">247</a> <strong
class="jxr_keyword">var</strong> values = <strong
class="jxr_keyword">new</strong> String[0];
<a class="jxr_linenumber" name="L248" href="#L248">248</a>
-<a class="jxr_linenumber" name="L249" href="#L249">249</a> <strong
class="jxr_keyword">var</strong> map = <strong class="jxr_keyword">new</strong>
SimpleUnmodifiableMap<>(keys, values);
+<a class="jxr_linenumber" name="L249" href="#L249">249</a> <strong
class="jxr_keyword">var</strong> map = <strong class="jxr_keyword">new</strong>
SimpleMap<>(keys, values);
<a class="jxr_linenumber" name="L250" href="#L250">250</a>
<a class="jxr_linenumber" name="L251" href="#L251">251</a>
assertEmpty(map);
<a class="jxr_linenumber" name="L252" href="#L252">252</a>
assertNull(map.get(<strong class="jxr_keyword">null</strong>));
@@ -266,7 +266,7 @@
<a class="jxr_linenumber" name="L258" href="#L258">258</a> <strong
class="jxr_keyword">var</strong> keys = a(<span
class="jxr_string">"key1"</span>, <span class="jxr_string">"key2"</span>);
<a class="jxr_linenumber" name="L259" href="#L259">259</a> <strong
class="jxr_keyword">var</strong> values = a(<span
class="jxr_string">"value1"</span>, <span class="jxr_string">"value2"</span>);
<a class="jxr_linenumber" name="L260" href="#L260">260</a>
-<a class="jxr_linenumber" name="L261" href="#L261">261</a> <strong
class="jxr_keyword">var</strong> map = <strong class="jxr_keyword">new</strong>
SimpleUnmodifiableMap<>(keys, values);
+<a class="jxr_linenumber" name="L261" href="#L261">261</a> <strong
class="jxr_keyword">var</strong> map = <strong class="jxr_keyword">new</strong>
SimpleMap<>(keys, values);
<a class="jxr_linenumber" name="L262" href="#L262">262</a>
<a class="jxr_linenumber" name="L263" href="#L263">263</a>
assertNull(map.get(<strong class="jxr_keyword">null</strong>));
<a class="jxr_linenumber" name="L264" href="#L264">264</a>
assertFalse(map.containsKey(<strong class="jxr_keyword">null</strong>));
@@ -277,7 +277,7 @@
<a class="jxr_linenumber" name="L269" href="#L269">269</a> <strong
class="jxr_keyword">var</strong> keys = a(1, <strong
class="jxr_keyword">null</strong>, 3);
<a class="jxr_linenumber" name="L270" href="#L270">270</a> <strong
class="jxr_keyword">var</strong> values = a(<span
class="jxr_string">"one"</span>, <span class="jxr_string">"null-key"</span>,
<span class="jxr_string">"three"</span>);
<a class="jxr_linenumber" name="L271" href="#L271">271</a>
-<a class="jxr_linenumber" name="L272" href="#L272">272</a> <strong
class="jxr_keyword">var</strong> map = <strong class="jxr_keyword">new</strong>
SimpleUnmodifiableMap<>(keys, values);
+<a class="jxr_linenumber" name="L272" href="#L272">272</a> <strong
class="jxr_keyword">var</strong> map = <strong class="jxr_keyword">new</strong>
SimpleMap<>(keys, values);
<a class="jxr_linenumber" name="L273" href="#L273">273</a>
<a class="jxr_linenumber" name="L274" href="#L274">274</a>
assertEquals(<span class="jxr_string">"one"</span>, map.get(1));
<a class="jxr_linenumber" name="L275" href="#L275">275</a>
assertEquals(<span class="jxr_string">"null-key"</span>, map.get(<strong
class="jxr_keyword">null</strong>));
@@ -292,7 +292,7 @@
<a class="jxr_linenumber" name="L284" href="#L284">284</a> <strong
class="jxr_keyword">var</strong> keys = a(<span
class="jxr_string">"key1"</span>, <strong class="jxr_keyword">null</strong>,
<span class="jxr_string">"key3"</span>);
<a class="jxr_linenumber" name="L285" href="#L285">285</a> <strong
class="jxr_keyword">var</strong> values = a(<span
class="jxr_string">"value1"</span>, <span class="jxr_string">"value2"</span>,
<span class="jxr_string">"value3"</span>);
<a class="jxr_linenumber" name="L286" href="#L286">286</a>
-<a class="jxr_linenumber" name="L287" href="#L287">287</a> <strong
class="jxr_keyword">var</strong> map = <strong class="jxr_keyword">new</strong>
SimpleUnmodifiableMap<>(keys, values);
+<a class="jxr_linenumber" name="L287" href="#L287">287</a> <strong
class="jxr_keyword">var</strong> map = <strong class="jxr_keyword">new</strong>
SimpleMap<>(keys, values);
<a class="jxr_linenumber" name="L288" href="#L288">288</a>
<a class="jxr_linenumber" name="L289" href="#L289">289</a> <em
class="jxr_comment">// Create multiple threads reading from the map</em>
<a class="jxr_linenumber" name="L290" href="#L290">290</a> <strong
class="jxr_keyword">var</strong> threads = <strong
class="jxr_keyword">new</strong> Thread[10];
@@ -327,7 +327,7 @@
<a class="jxr_linenumber" name="L319" href="#L319">319</a> <strong
class="jxr_keyword">void</strong> e01_toString_standardFormat() {
<a class="jxr_linenumber" name="L320" href="#L320">320</a>
String[] keys = { <span class="jxr_string">"key1"</span>, <span
class="jxr_string">"key2"</span>, <span class="jxr_string">"key3"</span> };
<a class="jxr_linenumber" name="L321" href="#L321">321</a>
Object[] values = { <span class="jxr_string">"value1"</span>, <span
class="jxr_string">"value2"</span>, <span class="jxr_string">"value3"</span> };
-<a class="jxr_linenumber" name="L322" href="#L322">322</a>
SimpleUnmodifiableMap<String,Object> map = <strong
class="jxr_keyword">new</strong> SimpleUnmodifiableMap<>(keys, values);
+<a class="jxr_linenumber" name="L322" href="#L322">322</a>
SimpleMap<String,Object> map = <strong class="jxr_keyword">new</strong>
SimpleMap<>(keys, values);
<a class="jxr_linenumber" name="L323" href="#L323">323</a>
<a class="jxr_linenumber" name="L324" href="#L324">324</a> <strong
class="jxr_keyword">var</strong> result = map.toString();
<a class="jxr_linenumber" name="L325" href="#L325">325</a>
assertTrue(result.startsWith(<span class="jxr_string">"{"</span>));
@@ -341,7 +341,7 @@
<a class="jxr_linenumber" name="L333" href="#L333">333</a> <strong
class="jxr_keyword">void</strong> e02_toString_emptyMap() {
<a class="jxr_linenumber" name="L334" href="#L334">334</a>
String[] keys = {};
<a class="jxr_linenumber" name="L335" href="#L335">335</a>
Object[] values = {};
-<a class="jxr_linenumber" name="L336" href="#L336">336</a>
SimpleUnmodifiableMap<String,Object> map = <strong
class="jxr_keyword">new</strong> SimpleUnmodifiableMap<>(keys, values);
+<a class="jxr_linenumber" name="L336" href="#L336">336</a>
SimpleMap<String,Object> map = <strong class="jxr_keyword">new</strong>
SimpleMap<>(keys, values);
<a class="jxr_linenumber" name="L337" href="#L337">337</a>
<a class="jxr_linenumber" name="L338" href="#L338">338</a>
assertEquals(<span class="jxr_string">"{}"</span>, map.toString());
<a class="jxr_linenumber" name="L339" href="#L339">339</a> }
@@ -350,11 +350,11 @@
<a class="jxr_linenumber" name="L342" href="#L342">342</a> <strong
class="jxr_keyword">void</strong> e03_equals_sameContents() {
<a class="jxr_linenumber" name="L343" href="#L343">343</a>
String[] keys1 = { <span class="jxr_string">"key1"</span>, <span
class="jxr_string">"key2"</span> };
<a class="jxr_linenumber" name="L344" href="#L344">344</a>
Object[] values1 = { <span class="jxr_string">"value1"</span>, <span
class="jxr_string">"value2"</span> };
-<a class="jxr_linenumber" name="L345" href="#L345">345</a>
SimpleUnmodifiableMap<String,Object> map1 = <strong
class="jxr_keyword">new</strong> SimpleUnmodifiableMap<>(keys1, values1);
+<a class="jxr_linenumber" name="L345" href="#L345">345</a>
SimpleMap<String,Object> map1 = <strong class="jxr_keyword">new</strong>
SimpleMap<>(keys1, values1);
<a class="jxr_linenumber" name="L346" href="#L346">346</a>
<a class="jxr_linenumber" name="L347" href="#L347">347</a>
String[] keys2 = { <span class="jxr_string">"key1"</span>, <span
class="jxr_string">"key2"</span> };
<a class="jxr_linenumber" name="L348" href="#L348">348</a>
Object[] values2 = { <span class="jxr_string">"value1"</span>, <span
class="jxr_string">"value2"</span> };
-<a class="jxr_linenumber" name="L349" href="#L349">349</a>
SimpleUnmodifiableMap<String,Object> map2 = <strong
class="jxr_keyword">new</strong> SimpleUnmodifiableMap<>(keys2, values2);
+<a class="jxr_linenumber" name="L349" href="#L349">349</a>
SimpleMap<String,Object> map2 = <strong class="jxr_keyword">new</strong>
SimpleMap<>(keys2, values2);
<a class="jxr_linenumber" name="L350" href="#L350">350</a>
<a class="jxr_linenumber" name="L351" href="#L351">351</a>
assertTrue(map1.equals(map2));
<a class="jxr_linenumber" name="L352" href="#L352">352</a>
assertTrue(map2.equals(map1));
@@ -364,11 +364,11 @@
<a class="jxr_linenumber" name="L356" href="#L356">356</a> <strong
class="jxr_keyword">void</strong> e04_equals_differentContents() {
<a class="jxr_linenumber" name="L357" href="#L357">357</a>
String[] keys1 = { <span class="jxr_string">"key1"</span>, <span
class="jxr_string">"key2"</span> };
<a class="jxr_linenumber" name="L358" href="#L358">358</a>
Object[] values1 = { <span class="jxr_string">"value1"</span>, <span
class="jxr_string">"value2"</span> };
-<a class="jxr_linenumber" name="L359" href="#L359">359</a>
SimpleUnmodifiableMap<String,Object> map1 = <strong
class="jxr_keyword">new</strong> SimpleUnmodifiableMap<>(keys1, values1);
+<a class="jxr_linenumber" name="L359" href="#L359">359</a>
SimpleMap<String,Object> map1 = <strong class="jxr_keyword">new</strong>
SimpleMap<>(keys1, values1);
<a class="jxr_linenumber" name="L360" href="#L360">360</a>
<a class="jxr_linenumber" name="L361" href="#L361">361</a>
String[] keys2 = { <span class="jxr_string">"key1"</span>, <span
class="jxr_string">"key2"</span> };
<a class="jxr_linenumber" name="L362" href="#L362">362</a>
Object[] values2 = { <span class="jxr_string">"value1"</span>, <span
class="jxr_string">"value3"</span> };
-<a class="jxr_linenumber" name="L363" href="#L363">363</a>
SimpleUnmodifiableMap<String,Object> map2 = <strong
class="jxr_keyword">new</strong> SimpleUnmodifiableMap<>(keys2, values2);
+<a class="jxr_linenumber" name="L363" href="#L363">363</a>
SimpleMap<String,Object> map2 = <strong class="jxr_keyword">new</strong>
SimpleMap<>(keys2, values2);
<a class="jxr_linenumber" name="L364" href="#L364">364</a>
<a class="jxr_linenumber" name="L365" href="#L365">365</a>
assertFalse(map1.equals(map2));
<a class="jxr_linenumber" name="L366" href="#L366">366</a>
assertFalse(map2.equals(map1));
@@ -378,7 +378,7 @@
<a class="jxr_linenumber" name="L370" href="#L370">370</a> <strong
class="jxr_keyword">void</strong> e05_equals_regularMap() {
<a class="jxr_linenumber" name="L371" href="#L371">371</a>
String[] keys = { <span class="jxr_string">"key1"</span>, <span
class="jxr_string">"key2"</span> };
<a class="jxr_linenumber" name="L372" href="#L372">372</a>
Object[] values = { <span class="jxr_string">"value1"</span>, <span
class="jxr_string">"value2"</span> };
-<a class="jxr_linenumber" name="L373" href="#L373">373</a>
SimpleUnmodifiableMap<String,Object> map = <strong
class="jxr_keyword">new</strong> SimpleUnmodifiableMap<>(keys, values);
+<a class="jxr_linenumber" name="L373" href="#L373">373</a>
SimpleMap<String,Object> map = <strong class="jxr_keyword">new</strong>
SimpleMap<>(keys, values);
<a class="jxr_linenumber" name="L374" href="#L374">374</a>
<a class="jxr_linenumber" name="L375" href="#L375">375</a> <strong
class="jxr_keyword">var</strong> regularMap = <strong
class="jxr_keyword">new</strong> LinkedHashMap<String, Object>();
<a class="jxr_linenumber" name="L376" href="#L376">376</a>
regularMap.put(<span class="jxr_string">"key1"</span>, <span
class="jxr_string">"value1"</span>);
@@ -392,7 +392,7 @@
<a class="jxr_linenumber" name="L384" href="#L384">384</a> <strong
class="jxr_keyword">void</strong> e06_equals_notAMap() {
<a class="jxr_linenumber" name="L385" href="#L385">385</a>
String[] keys = { <span class="jxr_string">"key1"</span> };
<a class="jxr_linenumber" name="L386" href="#L386">386</a>
Object[] values = { <span class="jxr_string">"value1"</span> };
-<a class="jxr_linenumber" name="L387" href="#L387">387</a>
SimpleUnmodifiableMap<String,Object> map = <strong
class="jxr_keyword">new</strong> SimpleUnmodifiableMap<>(keys, values);
+<a class="jxr_linenumber" name="L387" href="#L387">387</a>
SimpleMap<String,Object> map = <strong class="jxr_keyword">new</strong>
SimpleMap<>(keys, values);
<a class="jxr_linenumber" name="L388" href="#L388">388</a>
<a class="jxr_linenumber" name="L389" href="#L389">389</a>
assertFalse(map.equals(<span class="jxr_string">"not a map"</span>));
<a class="jxr_linenumber" name="L390" href="#L390">390</a>
assertFalse(map.equals(<strong class="jxr_keyword">null</strong>));
@@ -402,11 +402,11 @@
<a class="jxr_linenumber" name="L394" href="#L394">394</a> <strong
class="jxr_keyword">void</strong> e07_hashCode_sameContents() {
<a class="jxr_linenumber" name="L395" href="#L395">395</a>
String[] keys1 = { <span class="jxr_string">"key1"</span>, <span
class="jxr_string">"key2"</span> };
<a class="jxr_linenumber" name="L396" href="#L396">396</a>
Object[] values1 = { <span class="jxr_string">"value1"</span>, <span
class="jxr_string">"value2"</span> };
-<a class="jxr_linenumber" name="L397" href="#L397">397</a>
SimpleUnmodifiableMap<String,Object> map1 = <strong
class="jxr_keyword">new</strong> SimpleUnmodifiableMap<>(keys1, values1);
+<a class="jxr_linenumber" name="L397" href="#L397">397</a>
SimpleMap<String,Object> map1 = <strong class="jxr_keyword">new</strong>
SimpleMap<>(keys1, values1);
<a class="jxr_linenumber" name="L398" href="#L398">398</a>
<a class="jxr_linenumber" name="L399" href="#L399">399</a>
String[] keys2 = { <span class="jxr_string">"key1"</span>, <span
class="jxr_string">"key2"</span> };
<a class="jxr_linenumber" name="L400" href="#L400">400</a>
Object[] values2 = { <span class="jxr_string">"value1"</span>, <span
class="jxr_string">"value2"</span> };
-<a class="jxr_linenumber" name="L401" href="#L401">401</a>
SimpleUnmodifiableMap<String,Object> map2 = <strong
class="jxr_keyword">new</strong> SimpleUnmodifiableMap<>(keys2, values2);
+<a class="jxr_linenumber" name="L401" href="#L401">401</a>
SimpleMap<String,Object> map2 = <strong class="jxr_keyword">new</strong>
SimpleMap<>(keys2, values2);
<a class="jxr_linenumber" name="L402" href="#L402">402</a>
<a class="jxr_linenumber" name="L403" href="#L403">403</a>
assertEquals(map1.hashCode(), map2.hashCode());
<a class="jxr_linenumber" name="L404" href="#L404">404</a> }
@@ -415,7 +415,7 @@
<a class="jxr_linenumber" name="L407" href="#L407">407</a> <strong
class="jxr_keyword">void</strong> e08_hashCode_regularMap() {
<a class="jxr_linenumber" name="L408" href="#L408">408</a>
String[] keys = { <span class="jxr_string">"key1"</span>, <span
class="jxr_string">"key2"</span> };
<a class="jxr_linenumber" name="L409" href="#L409">409</a>
Object[] values = { <span class="jxr_string">"value1"</span>, <span
class="jxr_string">"value2"</span> };
-<a class="jxr_linenumber" name="L410" href="#L410">410</a>
SimpleUnmodifiableMap<String,Object> map = <strong
class="jxr_keyword">new</strong> SimpleUnmodifiableMap<>(keys, values);
+<a class="jxr_linenumber" name="L410" href="#L410">410</a>
SimpleMap<String,Object> map = <strong class="jxr_keyword">new</strong>
SimpleMap<>(keys, values);
<a class="jxr_linenumber" name="L411" href="#L411">411</a>
<a class="jxr_linenumber" name="L412" href="#L412">412</a> <strong
class="jxr_keyword">var</strong> regularMap = <strong
class="jxr_keyword">new</strong> LinkedHashMap<String, Object>();
<a class="jxr_linenumber" name="L413" href="#L413">413</a>
regularMap.put(<span class="jxr_string">"key1"</span>, <span
class="jxr_string">"value1"</span>);
diff --git
a/site/xref-test/org/apache/juneau/commons/collections/package-frame.html
b/site/xref-test/org/apache/juneau/commons/collections/package-frame.html
index 2292d621cc..d74376ac93 100644
--- a/site/xref-test/org/apache/juneau/commons/collections/package-frame.html
+++ b/site/xref-test/org/apache/juneau/commons/collections/package-frame.html
@@ -124,7 +124,7 @@
<a href="ShortValue_Test.html#ShortValue_Test"
target="classFrame">ShortValue_Test</a>
</li>
<li>
- <a
href="SimpleUnmodifiableMap_Test.html#SimpleUnmodifiableMap_Test"
target="classFrame">SimpleUnmodifiableMap_Test</a>
+ <a href="SimpleMap_Test.html#SimpleMap_Test"
target="classFrame">SimpleMap_Test</a>
</li>
<li>
<a href="StringValue_Test.html#StringValue_Test"
target="classFrame">StringValue_Test</a>
diff --git
a/site/xref-test/org/apache/juneau/commons/collections/package-summary.html
b/site/xref-test/org/apache/juneau/commons/collections/package-summary.html
index 7245132491..89a9c02129 100644
--- a/site/xref-test/org/apache/juneau/commons/collections/package-summary.html
+++ b/site/xref-test/org/apache/juneau/commons/collections/package-summary.html
@@ -243,7 +243,7 @@
</tr>
<tr class="rowColor">
<td class="colFirst colLast">
- <a
href="SimpleUnmodifiableMap_Test.html#SimpleUnmodifiableMap_Test"
target="classFrame" title="class in
org.apache.juneau.commons.collections">SimpleUnmodifiableMap_Test</a>
+ <a
href="SimpleMap_Test.html#SimpleMap_Test" target="classFrame" title="class in
org.apache.juneau.commons.collections">SimpleMap_Test</a>
</td>
</tr>
<tr class="altColor">
diff --git a/site/xref/allclasses-frame.html b/site/xref/allclasses-frame.html
index 72da38b7c2..f345f977e5 100644
--- a/site/xref/allclasses-frame.html
+++ b/site/xref/allclasses-frame.html
@@ -1454,6 +1454,8 @@
<li><a
href="org/apache/juneau/microservice/resources/ShutdownResource.html#ShutdownResource"
target="classFrame">ShutdownResource</a></li>
<li><a
href="org/apache/juneau/html/SimpleHtmlWriter.html#SimpleHtmlWriter"
target="classFrame">SimpleHtmlWriter</a></li>
<li><a
href="org/apache/juneau/commons/utils/SimpleLock.html#SimpleLock"
target="classFrame">SimpleLock</a></li>
+ <li><a
href="org/apache/juneau/commons/collections/SimpleMap.html#SimpleMap"
target="classFrame">SimpleMap</a></li>
+ <li><a
href="org/apache/juneau/commons/collections/SimpleMap.html#SimpleMap.SimpleUnmodifiableMapEntry"
target="classFrame">SimpleMap.SimpleUnmodifiableMapEntry</a></li>
<li><a
href="org/apache/juneau/httppart/SimplePartParser.html#SimplePartParser"
target="classFrame">SimplePartParser</a></li>
<li><a
href="org/apache/juneau/httppart/SimplePartParser.html#SimplePartParser.Builder"
target="classFrame">SimplePartParser.Builder</a></li>
<li><a
href="org/apache/juneau/httppart/SimplePartParserSession.html#SimplePartParserSession"
target="classFrame">SimplePartParserSession</a></li>
@@ -1462,8 +1464,6 @@
<li><a
href="org/apache/juneau/httppart/SimplePartSerializerSession.html#SimplePartSerializerSession"
target="classFrame">SimplePartSerializerSession</a></li>
<li><a
href="org/apache/juneau/commons/utils/SimpleReadWriteLock.html#SimpleReadWriteLock"
target="classFrame">SimpleReadWriteLock</a></li>
<li><a
href="org/apache/juneau/rest/arg/SimpleRestOperationArg.html#SimpleRestOperationArg"
target="classFrame">SimpleRestOperationArg</a></li>
- <li><a
href="org/apache/juneau/commons/collections/SimpleUnmodifiableMap.html#SimpleUnmodifiableMap"
target="classFrame">SimpleUnmodifiableMap</a></li>
- <li><a
href="org/apache/juneau/commons/collections/SimpleUnmodifiableMap.html#SimpleUnmodifiableMap.SimpleUnmodifiableMapEntry"
target="classFrame">SimpleUnmodifiableMap.SimpleUnmodifiableMapEntry</a></li>
<li><a href="org/apache/juneau/svl/SimpleVar.html#SimpleVar"
target="classFrame">SimpleVar</a></li>
<li><a href="org/apache/juneau/junit/bct/Sizer.html#Sizer"
target="classFrame">Sizer</a></li>
<li><a href="org/apache/juneau/bean/html5/Small.html#Small"
target="classFrame">Small</a></li>
diff --git a/site/xref/org/apache/juneau/bean/ResultSetList.html
b/site/xref/org/apache/juneau/bean/ResultSetList.html
index ea5a9ec9dd..af4327ce78 100644
--- a/site/xref/org/apache/juneau/bean/ResultSetList.html
+++ b/site/xref/org/apache/juneau/bean/ResultSetList.html
@@ -115,7 +115,7 @@
<a class="jxr_linenumber" name="L107" href="#L107">107</a>
<strong class="jxr_keyword">var</strong> o = readEntry(rs, i +
1, colTypes[i]);
<a class="jxr_linenumber" name="L108" href="#L108">108</a>
row[i + offset] = o;
<a class="jxr_linenumber" name="L109" href="#L109">109</a>
}
-<a class="jxr_linenumber" name="L110" href="#L110">110</a>
add(<strong class="jxr_keyword">new</strong>
SimpleUnmodifiableMap<>(columns, row));
+<a class="jxr_linenumber" name="L110" href="#L110">110</a>
add(<strong class="jxr_keyword">new</strong> SimpleMap<>(columns,
row));
<a class="jxr_linenumber" name="L111" href="#L111">111</a>
}
<a class="jxr_linenumber" name="L112" href="#L112">112</a> }
<strong class="jxr_keyword">finally</strong> {
<a class="jxr_linenumber" name="L113" href="#L113">113</a>
rs.close();
diff --git
a/site/xref/org/apache/juneau/commons/collections/SimpleUnmodifiableMap.html
b/site/xref/org/apache/juneau/commons/collections/SimpleMap.html
similarity index 95%
rename from
site/xref/org/apache/juneau/commons/collections/SimpleUnmodifiableMap.html
rename to site/xref/org/apache/juneau/commons/collections/SimpleMap.html
index 87341eb1ae..a4d1a41f77 100644
--- a/site/xref/org/apache/juneau/commons/collections/SimpleUnmodifiableMap.html
+++ b/site/xref/org/apache/juneau/commons/collections/SimpleMap.html
@@ -1,11 +1,11 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="" lang="">
<head><meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-<title>SimpleUnmodifiableMap xref</title>
+<title>SimpleMap xref</title>
<link type="text/css" rel="stylesheet" href="../../../../../stylesheet.css" />
</head>
<body>
-<div id="overview"><a
href="../../../../../../apidocs/org/apache/juneau/commons/collections/SimpleUnmodifiableMap.html">View
Javadoc</a></div><pre>
+<div id="overview"><a
href="../../../../../../apidocs/org/apache/juneau/commons/collections/SimpleMap.html">View
Javadoc</a></div><pre>
<a class="jxr_linenumber" name="L1" href="#L1">1</a> <em
class="jxr_comment">/*</em>
<a class="jxr_linenumber" name="L2" href="#L2">2</a> <em
class="jxr_comment"> * Licensed to the Apache Software Foundation (ASF) under
one or more</em>
<a class="jxr_linenumber" name="L3" href="#L3">3</a> <em
class="jxr_comment"> * contributor license agreements. See the NOTICE file
distributed with</em>
@@ -68,7 +68,7 @@
<a class="jxr_linenumber" name="L60" href="#L60">60</a> <em
class="jxr_javadoccomment"> * String[] <jv>keys</jv> =
{<js>"host"</js>, <js>"port"</js>,
<js>"timeout"</js>};</em>
<a class="jxr_linenumber" name="L61" href="#L61">61</a> <em
class="jxr_javadoccomment"> * Object[] <jv>values</jv> =
{<js>"localhost"</js>, 8080, 30000};</em>
<a class="jxr_linenumber" name="L62" href="#L62">62</a> <em
class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L63" href="#L63">63</a> <em
class="jxr_javadoccomment"> *
SimpleUnmodifiableMap&lt;String,Object&gt; <jv>config</jv>
= <jk>new</jk>
SimpleUnmodifiableMap&lt;&gt;(<jv>keys</jv>,
<jv>values</jv>);</em>
+<a class="jxr_linenumber" name="L63" href="#L63">63</a> <em
class="jxr_javadoccomment"> * SimpleMap&lt;String,Object&gt;
<jv>config</jv> = <jk>new</jk>
SimpleMap&lt;&gt;(<jv>keys</jv>,
<jv>values</jv>);</em>
<a class="jxr_linenumber" name="L64" href="#L64">64</a> <em
class="jxr_javadoccomment"> *</em>
<a class="jxr_linenumber" name="L65" href="#L65">65</a> <em
class="jxr_javadoccomment"> * <jc>// Get values</jc></em>
<a class="jxr_linenumber" name="L66" href="#L66">66</a> <em
class="jxr_javadoccomment"> * String <jv>host</jv> =
(String)<jv>config</jv>.get(<js>"host"</js>);
<jc>// Returns: "localhost"</jc></em>
@@ -96,12 +96,12 @@
<a class="jxr_linenumber" name="L88" href="#L88">88</a> <em
class="jxr_javadoccomment"> * <h5 class='section'>Thread
Safety:</h5></em>
<a class="jxr_linenumber" name="L89" href="#L89">89</a> <em
class="jxr_javadoccomment"> * <p></em>
<a class="jxr_linenumber" name="L90" href="#L90">90</a> <em
class="jxr_javadoccomment"> * This class is thread-safe since it's immutable
after construction. Multiple threads can safely</em>
-<a class="jxr_linenumber" name="L91" href="#L91">91</a> <em
class="jxr_javadoccomment"> * read from a SimpleUnmodifiableMap concurrently
without synchronization.</em>
+<a class="jxr_linenumber" name="L91" href="#L91">91</a> <em
class="jxr_javadoccomment"> * read from a SimpleMap concurrently without
synchronization.</em>
<a class="jxr_linenumber" name="L92" href="#L92">92</a> <em
class="jxr_javadoccomment"> *</em>
<a class="jxr_linenumber" name="L93" href="#L93">93</a> <em
class="jxr_javadoccomment"> * <h5 class='section'>Example - Configuration
Map:</h5></em>
<a class="jxr_linenumber" name="L94" href="#L94">94</a> <em
class="jxr_javadoccomment"> * <p class='bjava'></em>
<a class="jxr_linenumber" name="L95" href="#L95">95</a> <em
class="jxr_javadoccomment"> * <jc>// Create immutable
configuration</jc></em>
-<a class="jxr_linenumber" name="L96" href="#L96">96</a> <em
class="jxr_javadoccomment"> *
SimpleUnmodifiableMap&lt;String,Object&gt;
<jv>defaults</jv> = <jk>new</jk>
SimpleUnmodifiableMap&lt;&gt;(</em>
+<a class="jxr_linenumber" name="L96" href="#L96">96</a> <em
class="jxr_javadoccomment"> * SimpleMap&lt;String,Object&gt;
<jv>defaults</jv> = <jk>new</jk>
SimpleMap&lt;&gt;(</em>
<a class="jxr_linenumber" name="L97" href="#L97">97</a> <em
class="jxr_javadoccomment"> * <jk>new</jk>
String[]{<js>"maxConnections"</js>, <js>"timeout"</js>,
<js>"retries"</js>},</em>
<a class="jxr_linenumber" name="L98" href="#L98">98</a> <em
class="jxr_javadoccomment"> * <jk>new</jk>
Object[]{100, 5000, 3}</em>
<a class="jxr_linenumber" name="L99" href="#L99">99</a> <em
class="jxr_javadoccomment"> * );</em>
@@ -112,9 +112,9 @@
<a class="jxr_linenumber" name="L104" href="#L104">104</a> <em
class="jxr_javadoccomment"> *</em>
<a class="jxr_linenumber" name="L105" href="#L105">105</a> <em
class="jxr_javadoccomment"> * <h5 class='section'>Comparison with
Map.of():</h5></em>
<a class="jxr_linenumber" name="L106" href="#L106">106</a> <em
class="jxr_javadoccomment"> * <ul class='spaced-list'></em>
-<a class="jxr_linenumber" name="L107" href="#L107">107</a> <em
class="jxr_javadoccomment"> * <li><b>Null Support:</b>
SimpleUnmodifiableMap supports null keys/values, Map.of() does not</em>
-<a class="jxr_linenumber" name="L108" href="#L108">108</a> <em
class="jxr_javadoccomment"> * <li><b>Insertion Order:</b>
SimpleUnmodifiableMap preserves insertion order, Map.of() does not</em>
-<a class="jxr_linenumber" name="L109" href="#L109">109</a> <em
class="jxr_javadoccomment"> * <li><b>Size Limit:</b>
Map.of() limited to 10 entries, SimpleUnmodifiableMap has no limit</em>
+<a class="jxr_linenumber" name="L107" href="#L107">107</a> <em
class="jxr_javadoccomment"> * <li><b>Null Support:</b>
SimpleMap supports null keys/values, Map.of() does not</em>
+<a class="jxr_linenumber" name="L108" href="#L108">108</a> <em
class="jxr_javadoccomment"> * <li><b>Insertion Order:</b>
SimpleMap preserves insertion order, Map.of() does not</em>
+<a class="jxr_linenumber" name="L109" href="#L109">109</a> <em
class="jxr_javadoccomment"> * <li><b>Size Limit:</b>
Map.of() limited to 10 entries, SimpleMap has no limit</em>
<a class="jxr_linenumber" name="L110" href="#L110">110</a> <em
class="jxr_javadoccomment"> * </ul></em>
<a class="jxr_linenumber" name="L111" href="#L111">111</a> <em
class="jxr_javadoccomment"> *</em>
<a class="jxr_linenumber" name="L112" href="#L112">112</a> <em
class="jxr_javadoccomment"> * <h5 class='section'>See
Also:</h5></em>
@@ -126,7 +126,7 @@
<a class="jxr_linenumber" name="L118" href="#L118">118</a> <em
class="jxr_javadoccomment"> * @param <K> The key type.</em>
<a class="jxr_linenumber" name="L119" href="#L119">119</a> <em
class="jxr_javadoccomment"> * @param <V> The value type.</em>
<a class="jxr_linenumber" name="L120" href="#L120">120</a> <em
class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L121" href="#L121">121</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong>
SimpleUnmodifiableMap<K,V> <strong class="jxr_keyword">extends</strong>
AbstractMap<K,V> {
+<a class="jxr_linenumber" name="L121" href="#L121">121</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong>
SimpleMap<K,V> <strong class="jxr_keyword">extends</strong>
AbstractMap<K,V> {
<a class="jxr_linenumber" name="L122" href="#L122">122</a>
<a class="jxr_linenumber" name="L123" href="#L123">123</a> <em
class="jxr_javadoccomment">/**</em>
<a class="jxr_linenumber" name="L124" href="#L124">124</a> <em
class="jxr_javadoccomment"> * Inner class representing a single key-value
entry in this map.</em>
@@ -186,7 +186,7 @@
<a class="jxr_linenumber" name="L178" href="#L178">178</a> <strong
class="jxr_keyword">final</strong> SimpleUnmodifiableMapEntry[] entries;
<a class="jxr_linenumber" name="L179" href="#L179">179</a>
<a class="jxr_linenumber" name="L180" href="#L180">180</a> <em
class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L181" href="#L181">181</a> <em
class="jxr_javadoccomment"> * Constructs a new SimpleUnmodifiableMap with
the specified keys and values.</em>
+<a class="jxr_linenumber" name="L181" href="#L181">181</a> <em
class="jxr_javadoccomment"> * Constructs a new SimpleMap with the
specified keys and values.</em>
<a class="jxr_linenumber" name="L182" href="#L182">182</a> <em
class="jxr_javadoccomment"> *</em>
<a class="jxr_linenumber" name="L183" href="#L183">183</a> <em
class="jxr_javadoccomment"> * <p></em>
<a class="jxr_linenumber" name="L184" href="#L184">184</a> <em
class="jxr_javadoccomment"> * The keys and values arrays are stored by
reference (not copied), so external</em>
@@ -199,7 +199,7 @@
<a class="jxr_linenumber" name="L191" href="#L191">191</a> <em
class="jxr_javadoccomment"> * String[] <jv>keys</jv> =
{<js>"name"</js>, <js>"age"</js>,
<js>"city"</js>};</em>
<a class="jxr_linenumber" name="L192" href="#L192">192</a> <em
class="jxr_javadoccomment"> * Object[] <jv>values</jv> =
{<js>"John"</js>, 30, <js>"NYC"</js>};</em>
<a class="jxr_linenumber" name="L193" href="#L193">193</a> <em
class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L194" href="#L194">194</a> <em
class="jxr_javadoccomment"> *
SimpleUnmodifiableMap&lt;String,Object&gt; <jv>person</jv>
= <jk>new</jk>
SimpleUnmodifiableMap&lt;&gt;(<jv>keys</jv>,
<jv>values</jv>);</em>
+<a class="jxr_linenumber" name="L194" href="#L194">194</a> <em
class="jxr_javadoccomment"> * SimpleMap&lt;String,Object&gt;
<jv>person</jv> = <jk>new</jk>
SimpleMap&lt;&gt;(<jv>keys</jv>,
<jv>values</jv>);</em>
<a class="jxr_linenumber" name="L195" href="#L195">195</a> <em
class="jxr_javadoccomment"> * </p></em>
<a class="jxr_linenumber" name="L196" href="#L196">196</a> <em
class="jxr_javadoccomment"> *</em>
<a class="jxr_linenumber" name="L197" href="#L197">197</a> <em
class="jxr_javadoccomment"> * @param keys The map keys. Must not be
<jk>null</jk>. Individual keys can be
<jk>null</jk>.</em>
@@ -214,7 +214,7 @@
<a class="jxr_linenumber" name="L206" href="#L206">206</a> <em
class="jxr_javadoccomment"> * </ul></em>
<a class="jxr_linenumber" name="L207" href="#L207">207</a> <em
class="jxr_javadoccomment"> */</em>
<a class="jxr_linenumber" name="L208" href="#L208">208</a>
@SuppressWarnings(<span class="jxr_string">"unchecked"</span>)
-<a class="jxr_linenumber" name="L209" href="#L209">209</a> <strong
class="jxr_keyword">public</strong> <a name="SimpleUnmodifiableMap"
href="../../../../../org/apache/juneau/commons/collections/SimpleUnmodifiableMap.html#SimpleUnmodifiableMap">SimpleUnmodifiableMap</a>(K[]
keys, V[] values) {
+<a class="jxr_linenumber" name="L209" href="#L209">209</a> <strong
class="jxr_keyword">public</strong> <a name="SimpleMap"
href="../../../../../org/apache/juneau/commons/collections/SimpleMap.html#SimpleMap">SimpleMap</a>(K[]
keys, V[] values) {
<a class="jxr_linenumber" name="L210" href="#L210">210</a>
assertArgsNotNull(<span class="jxr_string">"keys"</span>, keys, <span
class="jxr_string">"values"</span>, values);
<a class="jxr_linenumber" name="L211" href="#L211">211</a>
assertArg(keys.length == values.length, <span class="jxr_string">"keys ''{0}''
and values ''{1}'' array lengths differ"</span>, keys.length, values.length);
<a class="jxr_linenumber" name="L212" href="#L212">212</a>
@@ -243,7 +243,7 @@
<a class="jxr_linenumber" name="L235" href="#L235">235</a> <em
class="jxr_javadoccomment"> *</em>
<a class="jxr_linenumber" name="L236" href="#L236">236</a> <em
class="jxr_javadoccomment"> * <h5
class='section'>Example:</h5></em>
<a class="jxr_linenumber" name="L237" href="#L237">237</a> <em
class="jxr_javadoccomment"> * <p class='bjava'></em>
-<a class="jxr_linenumber" name="L238" href="#L238">238</a> <em
class="jxr_javadoccomment"> *
SimpleUnmodifiableMap&lt;String,Integer&gt; <jv>map</jv> =
<jk>new</jk> SimpleUnmodifiableMap&lt;&gt;(</em>
+<a class="jxr_linenumber" name="L238" href="#L238">238</a> <em
class="jxr_javadoccomment"> * SimpleMap&lt;String,Integer&gt;
<jv>map</jv> = <jk>new</jk>
SimpleMap&lt;&gt;(</em>
<a class="jxr_linenumber" name="L239" href="#L239">239</a> <em
class="jxr_javadoccomment"> * <jk>new</jk>
String[]{<js>"a"</js>, <js>"b"</js>},</em>
<a class="jxr_linenumber" name="L240" href="#L240">240</a> <em
class="jxr_javadoccomment"> * <jk>new</jk>
Integer[]{1, 2}</em>
<a class="jxr_linenumber" name="L241" href="#L241">241</a> <em
class="jxr_javadoccomment"> * );</em>
@@ -270,7 +270,7 @@
<a class="jxr_linenumber" name="L262" href="#L262">262</a> <em
class="jxr_javadoccomment"> *</em>
<a class="jxr_linenumber" name="L263" href="#L263">263</a> <em
class="jxr_javadoccomment"> * <h5
class='section'>Example:</h5></em>
<a class="jxr_linenumber" name="L264" href="#L264">264</a> <em
class="jxr_javadoccomment"> * <p class='bjava'></em>
-<a class="jxr_linenumber" name="L265" href="#L265">265</a> <em
class="jxr_javadoccomment"> *
SimpleUnmodifiableMap&lt;String,Integer&gt; <jv>map</jv> =
<jk>new</jk> SimpleUnmodifiableMap&lt;&gt;(</em>
+<a class="jxr_linenumber" name="L265" href="#L265">265</a> <em
class="jxr_javadoccomment"> * SimpleMap&lt;String,Integer&gt;
<jv>map</jv> = <jk>new</jk>
SimpleMap&lt;&gt;(</em>
<a class="jxr_linenumber" name="L266" href="#L266">266</a> <em
class="jxr_javadoccomment"> * <jk>new</jk>
String[]{<js>"age"</js>, <js>"score"</js>},</em>
<a class="jxr_linenumber" name="L267" href="#L267">267</a> <em
class="jxr_javadoccomment"> * <jk>new</jk>
Integer[]{25, 100}</em>
<a class="jxr_linenumber" name="L268" href="#L268">268</a> <em
class="jxr_javadoccomment"> * );</em>
@@ -299,7 +299,7 @@
<a class="jxr_linenumber" name="L291" href="#L291">291</a> <em
class="jxr_javadoccomment"> *</em>
<a class="jxr_linenumber" name="L292" href="#L292">292</a> <em
class="jxr_javadoccomment"> * <h5
class='section'>Example:</h5></em>
<a class="jxr_linenumber" name="L293" href="#L293">293</a> <em
class="jxr_javadoccomment"> * <p class='bjava'></em>
-<a class="jxr_linenumber" name="L294" href="#L294">294</a> <em
class="jxr_javadoccomment"> *
SimpleUnmodifiableMap&lt;String,Integer&gt; <jv>map</jv> =
<jk>new</jk> SimpleUnmodifiableMap&lt;&gt;(</em>
+<a class="jxr_linenumber" name="L294" href="#L294">294</a> <em
class="jxr_javadoccomment"> * SimpleMap&lt;String,Integer&gt;
<jv>map</jv> = <jk>new</jk>
SimpleMap&lt;&gt;(</em>
<a class="jxr_linenumber" name="L295" href="#L295">295</a> <em
class="jxr_javadoccomment"> * <jk>new</jk>
String[]{<js>"x"</js>, <js>"y"</js>,
<js>"z"</js>},</em>
<a class="jxr_linenumber" name="L296" href="#L296">296</a> <em
class="jxr_javadoccomment"> * <jk>new</jk>
Integer[]{1, 2, 3}</em>
<a class="jxr_linenumber" name="L297" href="#L297">297</a> <em
class="jxr_javadoccomment"> * );</em>
diff --git a/site/xref/org/apache/juneau/commons/collections/package-frame.html
b/site/xref/org/apache/juneau/commons/collections/package-frame.html
index bc43f98722..f8454fd05d 100644
--- a/site/xref/org/apache/juneau/commons/collections/package-frame.html
+++ b/site/xref/org/apache/juneau/commons/collections/package-frame.html
@@ -121,10 +121,10 @@
<a href="ShortValue.html#ShortValue"
target="classFrame">ShortValue</a>
</li>
<li>
- <a href="SimpleUnmodifiableMap.html#SimpleUnmodifiableMap"
target="classFrame">SimpleUnmodifiableMap</a>
+ <a href="SimpleMap.html#SimpleMap"
target="classFrame">SimpleMap</a>
</li>
<li>
- <a
href="SimpleUnmodifiableMap.html#SimpleUnmodifiableMap.SimpleUnmodifiableMapEntry"
target="classFrame">SimpleUnmodifiableMap.SimpleUnmodifiableMapEntry</a>
+ <a
href="SimpleMap.html#SimpleMap.SimpleUnmodifiableMapEntry"
target="classFrame">SimpleMap.SimpleUnmodifiableMapEntry</a>
</li>
<li>
<a href="StringValue.html#StringValue"
target="classFrame">StringValue</a>
diff --git
a/site/xref/org/apache/juneau/commons/collections/package-summary.html
b/site/xref/org/apache/juneau/commons/collections/package-summary.html
index 3b393b596c..673c99c69e 100644
--- a/site/xref/org/apache/juneau/commons/collections/package-summary.html
+++ b/site/xref/org/apache/juneau/commons/collections/package-summary.html
@@ -238,12 +238,12 @@
</tr>
<tr class="altColor">
<td class="colFirst colLast">
- <a
href="SimpleUnmodifiableMap.html#SimpleUnmodifiableMap" target="classFrame"
title="class in org.apache.juneau.commons.collections">SimpleUnmodifiableMap</a>
+ <a href="SimpleMap.html#SimpleMap"
target="classFrame" title="class in
org.apache.juneau.commons.collections">SimpleMap</a>
</td>
</tr>
<tr class="rowColor">
<td class="colFirst colLast">
- <a
href="SimpleUnmodifiableMap.html#SimpleUnmodifiableMap.SimpleUnmodifiableMapEntry"
target="classFrame" title="class in
org.apache.juneau.commons.collections">SimpleUnmodifiableMap.SimpleUnmodifiableMapEntry</a>
+ <a
href="SimpleMap.html#SimpleMap.SimpleUnmodifiableMapEntry" target="classFrame"
title="class in
org.apache.juneau.commons.collections">SimpleMap.SimpleUnmodifiableMapEntry</a>
</td>
</tr>
<tr class="altColor">
diff --git a/site/xref/org/apache/juneau/commons/utils/CollectionUtils.html
b/site/xref/org/apache/juneau/commons/utils/CollectionUtils.html
index 0c01e79293..87aa32290a 100644
--- a/site/xref/org/apache/juneau/commons/utils/CollectionUtils.html
+++ b/site/xref/org/apache/juneau/commons/utils/CollectionUtils.html
@@ -1013,7 +1013,7 @@
<a class="jxr_linenumber" name="L1005" href="#L1005">1005</a> <em
class="jxr_javadoccomment"> * @return A new unmodifiable map.</em>
<a class="jxr_linenumber" name="L1006" href="#L1006">1006</a> <em
class="jxr_javadoccomment"> */</em>
<a class="jxr_linenumber" name="L1007" href="#L1007">1007</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong>
<K,V> Map<K,V> m(K k1, V v1) {
-<a class="jxr_linenumber" name="L1008" href="#L1008">1008</a> <strong
class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong>
SimpleUnmodifiableMap<>(a(k1), a(v1));
+<a class="jxr_linenumber" name="L1008" href="#L1008">1008</a> <strong
class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong>
SimpleMap<>(a(k1), a(v1));
<a class="jxr_linenumber" name="L1009" href="#L1009">1009</a> }
<a class="jxr_linenumber" name="L1010" href="#L1010">1010</a>
<a class="jxr_linenumber" name="L1011" href="#L1011">1011</a> <em
class="jxr_javadoccomment">/**</em>
@@ -1029,7 +1029,7 @@
<a class="jxr_linenumber" name="L1021" href="#L1021">1021</a> <em
class="jxr_javadoccomment"> * @return A new unmodifiable map.</em>
<a class="jxr_linenumber" name="L1022" href="#L1022">1022</a> <em
class="jxr_javadoccomment"> */</em>
<a class="jxr_linenumber" name="L1023" href="#L1023">1023</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong>
<K,V> Map<K,V> m(K k1, V v1, K k2, V v2) {
-<a class="jxr_linenumber" name="L1024" href="#L1024">1024</a> <strong
class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong>
SimpleUnmodifiableMap<>(a(k1, k2), a(v1, v2));
+<a class="jxr_linenumber" name="L1024" href="#L1024">1024</a> <strong
class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong>
SimpleMap<>(a(k1, k2), a(v1, v2));
<a class="jxr_linenumber" name="L1025" href="#L1025">1025</a> }
<a class="jxr_linenumber" name="L1026" href="#L1026">1026</a>
<a class="jxr_linenumber" name="L1027" href="#L1027">1027</a> <em
class="jxr_javadoccomment">/**</em>
@@ -1047,7 +1047,7 @@
<a class="jxr_linenumber" name="L1039" href="#L1039">1039</a> <em
class="jxr_javadoccomment"> * @return A new unmodifiable map.</em>
<a class="jxr_linenumber" name="L1040" href="#L1040">1040</a> <em
class="jxr_javadoccomment"> */</em>
<a class="jxr_linenumber" name="L1041" href="#L1041">1041</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong>
<K,V> Map<K,V> m(K k1, V v1, K k2, V v2, K k3, V v3) {
-<a class="jxr_linenumber" name="L1042" href="#L1042">1042</a> <strong
class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong>
SimpleUnmodifiableMap<>(a(k1, k2, k3), a(v1, v2, v3));
+<a class="jxr_linenumber" name="L1042" href="#L1042">1042</a> <strong
class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong>
SimpleMap<>(a(k1, k2, k3), a(v1, v2, v3));
<a class="jxr_linenumber" name="L1043" href="#L1043">1043</a> }
<a class="jxr_linenumber" name="L1044" href="#L1044">1044</a>
<a class="jxr_linenumber" name="L1045" href="#L1045">1045</a> <em
class="jxr_javadoccomment">/**</em>
@@ -1067,7 +1067,7 @@
<a class="jxr_linenumber" name="L1059" href="#L1059">1059</a> <em
class="jxr_javadoccomment"> * @return A new unmodifiable map.</em>
<a class="jxr_linenumber" name="L1060" href="#L1060">1060</a> <em
class="jxr_javadoccomment"> */</em>
<a class="jxr_linenumber" name="L1061" href="#L1061">1061</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong>
<K,V> Map<K,V> m(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4) {
-<a class="jxr_linenumber" name="L1062" href="#L1062">1062</a> <strong
class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong>
SimpleUnmodifiableMap<>(a(k1, k2, k3, k4), a(v1, v2, v3, v4));
+<a class="jxr_linenumber" name="L1062" href="#L1062">1062</a> <strong
class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong>
SimpleMap<>(a(k1, k2, k3, k4), a(v1, v2, v3, v4));
<a class="jxr_linenumber" name="L1063" href="#L1063">1063</a> }
<a class="jxr_linenumber" name="L1064" href="#L1064">1064</a>
<a class="jxr_linenumber" name="L1065" href="#L1065">1065</a> <em
class="jxr_javadoccomment">/**</em>
@@ -1089,7 +1089,7 @@
<a class="jxr_linenumber" name="L1081" href="#L1081">1081</a> <em
class="jxr_javadoccomment"> * @return A new unmodifiable map.</em>
<a class="jxr_linenumber" name="L1082" href="#L1082">1082</a> <em
class="jxr_javadoccomment"> */</em>
<a class="jxr_linenumber" name="L1083" href="#L1083">1083</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong>
<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) {
-<a class="jxr_linenumber" name="L1084" href="#L1084">1084</a> <strong
class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong>
SimpleUnmodifiableMap<>(a(k1, k2, k3, k4, k5), a(v1, v2, v3, v4, v5));
+<a class="jxr_linenumber" name="L1084" href="#L1084">1084</a> <strong
class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong>
SimpleMap<>(a(k1, k2, k3, k4, k5), a(v1, v2, v3, v4, v5));
<a class="jxr_linenumber" name="L1085" href="#L1085">1085</a> }
<a class="jxr_linenumber" name="L1086" href="#L1086">1086</a>
<a class="jxr_linenumber" name="L1087" href="#L1087">1087</a> <em
class="jxr_javadoccomment">/**</em>
@@ -1113,7 +1113,7 @@
<a class="jxr_linenumber" name="L1105" href="#L1105">1105</a> <em
class="jxr_javadoccomment"> * @return A new unmodifiable map.</em>
<a class="jxr_linenumber" name="L1106" href="#L1106">1106</a> <em
class="jxr_javadoccomment"> */</em>
<a class="jxr_linenumber" name="L1107" href="#L1107">1107</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong>
<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) {
-<a class="jxr_linenumber" name="L1108" href="#L1108">1108</a> <strong
class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong>
SimpleUnmodifiableMap<>(a(k1, k2, k3, k4, k5, k6), a(v1, v2, v3, v4, v5,
v6));
+<a class="jxr_linenumber" name="L1108" href="#L1108">1108</a> <strong
class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong>
SimpleMap<>(a(k1, k2, k3, k4, k5, k6), a(v1, v2, v3, v4, v5, v6));
<a class="jxr_linenumber" name="L1109" href="#L1109">1109</a> }
<a class="jxr_linenumber" name="L1110" href="#L1110">1110</a>
<a class="jxr_linenumber" name="L1111" href="#L1111">1111</a> <em
class="jxr_javadoccomment">/**</em>
@@ -1139,7 +1139,7 @@
<a class="jxr_linenumber" name="L1131" href="#L1131">1131</a> <em
class="jxr_javadoccomment"> * @return A new unmodifiable map.</em>
<a class="jxr_linenumber" name="L1132" href="#L1132">1132</a> <em
class="jxr_javadoccomment"> */</em>
<a class="jxr_linenumber" name="L1133" href="#L1133">1133</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong>
<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) {
-<a class="jxr_linenumber" name="L1134" href="#L1134">1134</a> <strong
class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong>
SimpleUnmodifiableMap<>(a(k1, k2, k3, k4, k5, k6, k7), a(v1, v2, v3, v4,
v5, v6, v7));
+<a class="jxr_linenumber" name="L1134" href="#L1134">1134</a> <strong
class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong>
SimpleMap<>(a(k1, k2, k3, k4, k5, k6, k7), a(v1, v2, v3, v4, v5, v6, v7));
<a class="jxr_linenumber" name="L1135" href="#L1135">1135</a> }
<a class="jxr_linenumber" name="L1136" href="#L1136">1136</a>
<a class="jxr_linenumber" name="L1137" href="#L1137">1137</a> <em
class="jxr_javadoccomment">/**</em>
@@ -1167,7 +1167,7 @@
<a class="jxr_linenumber" name="L1159" href="#L1159">1159</a> <em
class="jxr_javadoccomment"> * @return A new unmodifiable map.</em>
<a class="jxr_linenumber" name="L1160" href="#L1160">1160</a> <em
class="jxr_javadoccomment"> */</em>
<a class="jxr_linenumber" name="L1161" href="#L1161">1161</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong>
<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) {
-<a class="jxr_linenumber" name="L1162" href="#L1162">1162</a> <strong
class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong>
SimpleUnmodifiableMap<>(a(k1, k2, k3, k4, k5, k6, k7, k8), a(v1, v2, v3,
v4, v5, v6, v7, v8));
+<a class="jxr_linenumber" name="L1162" href="#L1162">1162</a> <strong
class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong>
SimpleMap<>(a(k1, k2, k3, k4, k5, k6, k7, k8), a(v1, v2, v3, v4, v5, v6,
v7, v8));
<a class="jxr_linenumber" name="L1163" href="#L1163">1163</a> }
<a class="jxr_linenumber" name="L1164" href="#L1164">1164</a>
<a class="jxr_linenumber" name="L1165" href="#L1165">1165</a> <em
class="jxr_javadoccomment">/**</em>
@@ -1197,7 +1197,7 @@
<a class="jxr_linenumber" name="L1189" href="#L1189">1189</a> <em
class="jxr_javadoccomment"> * @return A new unmodifiable map.</em>
<a class="jxr_linenumber" name="L1190" href="#L1190">1190</a> <em
class="jxr_javadoccomment"> */</em>
<a class="jxr_linenumber" name="L1191" href="#L1191">1191</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong>
<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) {
-<a class="jxr_linenumber" name="L1192" href="#L1192">1192</a> <strong
class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong>
SimpleUnmodifiableMap<>(a(k1, k2, k3, k4, k5, k6, k7, k8, k9), a(v1, v2,
v3, v4, v5, v6, v7, v8, v9));
+<a class="jxr_linenumber" name="L1192" href="#L1192">1192</a> <strong
class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong>
SimpleMap<>(a(k1, k2, k3, k4, k5, k6, k7, k8, k9), a(v1, v2, v3, v4, v5,
v6, v7, v8, v9));
<a class="jxr_linenumber" name="L1193" href="#L1193">1193</a> }
<a class="jxr_linenumber" name="L1194" href="#L1194">1194</a>
<a class="jxr_linenumber" name="L1195" href="#L1195">1195</a> <em
class="jxr_javadoccomment">/**</em>
@@ -1229,7 +1229,7 @@
<a class="jxr_linenumber" name="L1221" href="#L1221">1221</a> <em
class="jxr_javadoccomment"> * @return A new unmodifiable map.</em>
<a class="jxr_linenumber" name="L1222" href="#L1222">1222</a> <em
class="jxr_javadoccomment"> */</em>
<a class="jxr_linenumber" name="L1223" href="#L1223">1223</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong>
<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) {
-<a class="jxr_linenumber" name="L1224" href="#L1224">1224</a> <strong
class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong>
SimpleUnmodifiableMap<>(a(k1, k2, k3, k4, k5, k6, k7, k8, k9, k10), a(v1,
v2, v3, v4, v5, v6, v7, v8, v9, v10));
+<a class="jxr_linenumber" name="L1224" href="#L1224">1224</a> <strong
class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong>
SimpleMap<>(a(k1, k2, k3, k4, k5, k6, k7, k8, k9, k10), a(v1, v2, v3, v4,
v5, v6, v7, v8, v9, v10));
<a class="jxr_linenumber" name="L1225" href="#L1225">1225</a> }
<a class="jxr_linenumber" name="L1226" href="#L1226">1226</a>
<a class="jxr_linenumber" name="L1227" href="#L1227">1227</a> <em
class="jxr_javadoccomment">/**</em>
diff --git a/site/xref/org/apache/juneau/rest/util/UrlPathMatch.html
b/site/xref/org/apache/juneau/rest/util/UrlPathMatch.html
index 30a60dc481..278d5ac35a 100644
--- a/site/xref/org/apache/juneau/rest/util/UrlPathMatch.html
+++ b/site/xref/org/apache/juneau/rest/util/UrlPathMatch.html
@@ -57,7 +57,7 @@
<a class="jxr_linenumber" name="L49" href="#L49">49</a> <strong
class="jxr_keyword">protected</strong> <a name="UrlPathMatch"
href="../../../../../org/apache/juneau/rest/util/UrlPathMatch.html#UrlPathMatch">UrlPathMatch</a>(String
path, <strong class="jxr_keyword">int</strong> matchedParts, String[] keys,
String[] values) {
<a class="jxr_linenumber" name="L50" href="#L50">50</a> <strong
class="jxr_keyword">this</strong>.path = path;
<a class="jxr_linenumber" name="L51" href="#L51">51</a> <strong
class="jxr_keyword">this</strong>.matchedParts = matchedParts;
-<a class="jxr_linenumber" name="L52" href="#L52">52</a> <strong
class="jxr_keyword">this</strong>.vars = keys == <strong
class="jxr_keyword">null</strong> ? mape() : <strong
class="jxr_keyword">new</strong> SimpleUnmodifiableMap<>(keys, values);
+<a class="jxr_linenumber" name="L52" href="#L52">52</a> <strong
class="jxr_keyword">this</strong>.vars = keys == <strong
class="jxr_keyword">null</strong> ? mape() : <strong
class="jxr_keyword">new</strong> SimpleMap<>(keys, values);
<a class="jxr_linenumber" name="L53" href="#L53">53</a> }
<a class="jxr_linenumber" name="L54" href="#L54">54</a>
<a class="jxr_linenumber" name="L55" href="#L55">55</a> <em
class="jxr_javadoccomment">/**</em>
