You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by gi...@apache.org on 2025/12/14 18:39:49 UTC

(juneau) branch asf-staging updated: Deploy documentation staging from 3e96bb14931ca99f1efa02e0d3bdc76cee4b2872 3e96bb14931ca99f1efa02e0d3bdc76cee4b2872

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 209d598c8b Deploy documentation staging from 3e96bb14931ca99f1efa02e0d3bdc76cee4b2872 3e96bb14931ca99f1efa02e0d3bdc76cee4b2872
209d598c8b is described below

commit 209d598c8b13b652afa0f15b95c877b2dd77944a
Author: github-actions[bot] <gi...@users.noreply.github.com>
AuthorDate: Sun Dec 14 18:39:44 2025 +0000

    Deploy documentation staging from 3e96bb14931ca99f1efa02e0d3bdc76cee4b2872 3e96bb14931ca99f1efa02e0d3bdc76cee4b2872
---
 site/dependency-convergence.html                   |    2 +-
 site/dependency-info.html                          |    2 +-
 site/distribution-management.html                  |    2 +-
 site/index.html                                    |    2 +-
 site/issue-management.html                         |    2 +-
 site/licenses.html                                 |    2 +-
 site/mailing-lists.html                            |    2 +-
 site/modules.html                                  |    2 +-
 site/plugin-management.html                        |    2 +-
 site/plugins.html                                  |    2 +-
 site/project-info.html                             |    2 +-
 site/project-reports.html                          |    2 +-
 site/scm.html                                      |    2 +-
 site/summary.html                                  |    2 +-
 site/surefire.html                                 |    2 +-
 site/team.html                                     |    2 +-
 .../juneau/commons/collections/BidiMap_Test.html   |   65 +-
 .../commons/collections/FilteredMap_Test.html      | 1277 ++++++++---------
 .../juneau/commons/collections/Flag_Test.html      |   53 +-
 .../commons/collections/KeywordSet_Test.html       |   77 +-
 .../commons/collections/MapBuilder_Test.html       | 1473 ++++++++++----------
 .../juneau/commons/collections/MultiList_Test.html |   50 +-
 .../juneau/commons/collections/MultiMap_Test.html  |   55 +-
 .../juneau/commons/collections/MultiSet_Test.html  |   51 +-
 .../commons/collections/ReversedList_Test.html     |   53 +-
 .../juneau/commons/collections/SimpleMap_Test.html |   59 +-
 .../juneau/commons/collections/FilteredMap.html    | 1192 ++++++++--------
 .../juneau/commons/collections/MapBuilder.html     | 1016 ++++++++------
 .../juneau/commons/utils/CollectionUtils.html      |    4 +-
 .../org/apache/juneau/internal/ConverterUtils.html |   55 +-
 30 files changed, 2917 insertions(+), 2595 deletions(-)

diff --git a/site/dependency-convergence.html b/site/dependency-convergence.html
index 7c6de11528..840be05d5b 100644
--- a/site/dependency-convergence.html
+++ b/site/dependency-convergence.html
@@ -2,7 +2,7 @@
 
 
 <!--
- | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:dependency-convergence at 2025-12-13
+ | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:dependency-convergence at 2025-12-14
  | Rendered using Apache Maven Fluido Skin 2.0.0-M9
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
diff --git a/site/dependency-info.html b/site/dependency-info.html
index d848ae3f8e..93cdd4925e 100644
--- a/site/dependency-info.html
+++ b/site/dependency-info.html
@@ -2,7 +2,7 @@
 
 
 <!--
- | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:dependency-info at 2025-12-13
+ | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:dependency-info at 2025-12-14
  | Rendered using Apache Maven Fluido Skin 2.0.0-M9
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
diff --git a/site/distribution-management.html b/site/distribution-management.html
index edb423391b..b7400cbb07 100644
--- a/site/distribution-management.html
+++ b/site/distribution-management.html
@@ -2,7 +2,7 @@
 
 
 <!--
- | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:distribution-management at 2025-12-13
+ | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:distribution-management at 2025-12-14
  | Rendered using Apache Maven Fluido Skin 2.0.0-M9
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
diff --git a/site/index.html b/site/index.html
index 85b872a2ad..2fc3d36cc7 100644
--- a/site/index.html
+++ b/site/index.html
@@ -2,7 +2,7 @@
 
 
 <!--
- | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:index at 2025-12-13
+ | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:index at 2025-12-14
  | Rendered using Apache Maven Fluido Skin 2.0.0-M9
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
diff --git a/site/issue-management.html b/site/issue-management.html
index d929191077..abac51f0c8 100644
--- a/site/issue-management.html
+++ b/site/issue-management.html
@@ -2,7 +2,7 @@
 
 
 <!--
- | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:issue-management at 2025-12-13
+ | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:issue-management at 2025-12-14
  | Rendered using Apache Maven Fluido Skin 2.0.0-M9
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
diff --git a/site/licenses.html b/site/licenses.html
index 23e353455a..71a1913038 100644
--- a/site/licenses.html
+++ b/site/licenses.html
@@ -2,7 +2,7 @@
 
 
 <!--
- | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:licenses at 2025-12-13
+ | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:licenses at 2025-12-14
  | Rendered using Apache Maven Fluido Skin 2.0.0-M9
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
diff --git a/site/mailing-lists.html b/site/mailing-lists.html
index 9d8e1c4a29..328897337e 100644
--- a/site/mailing-lists.html
+++ b/site/mailing-lists.html
@@ -2,7 +2,7 @@
 
 
 <!--
- | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:mailing-lists at 2025-12-13
+ | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:mailing-lists at 2025-12-14
  | Rendered using Apache Maven Fluido Skin 2.0.0-M9
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
diff --git a/site/modules.html b/site/modules.html
index 4a156700ac..094ab7ba57 100644
--- a/site/modules.html
+++ b/site/modules.html
@@ -2,7 +2,7 @@
 
 
 <!--
- | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:modules at 2025-12-13
+ | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:modules at 2025-12-14
  | Rendered using Apache Maven Fluido Skin 2.0.0-M9
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
diff --git a/site/plugin-management.html b/site/plugin-management.html
index 791b311745..f3bfa71b7f 100644
--- a/site/plugin-management.html
+++ b/site/plugin-management.html
@@ -2,7 +2,7 @@
 
 
 <!--
- | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:plugin-management at 2025-12-13
+ | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:plugin-management at 2025-12-14
  | Rendered using Apache Maven Fluido Skin 2.0.0-M9
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
diff --git a/site/plugins.html b/site/plugins.html
index 6072bc9169..9a04da0eba 100644
--- a/site/plugins.html
+++ b/site/plugins.html
@@ -2,7 +2,7 @@
 
 
 <!--
- | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:plugins at 2025-12-13
+ | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:plugins at 2025-12-14
  | Rendered using Apache Maven Fluido Skin 2.0.0-M9
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
diff --git a/site/project-info.html b/site/project-info.html
index 0ced015ad9..aac9e2e78d 100644
--- a/site/project-info.html
+++ b/site/project-info.html
@@ -2,7 +2,7 @@
 
 
 <!--
- | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-site-plugin:3.21.0:project-info at 2025-12-13
+ | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-site-plugin:3.21.0:project-info at 2025-12-14
  | Rendered using Apache Maven Fluido Skin 2.0.0-M9
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
diff --git a/site/project-reports.html b/site/project-reports.html
index 26d210fbae..43e457b864 100644
--- a/site/project-reports.html
+++ b/site/project-reports.html
@@ -2,7 +2,7 @@
 
 
 <!--
- | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-site-plugin:3.21.0:project-reports at 2025-12-13
+ | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-site-plugin:3.21.0:project-reports at 2025-12-14
  | Rendered using Apache Maven Fluido Skin 2.0.0-M9
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
diff --git a/site/scm.html b/site/scm.html
index 954f36c9bd..bb5dbb53d6 100644
--- a/site/scm.html
+++ b/site/scm.html
@@ -2,7 +2,7 @@
 
 
 <!--
- | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:scm at 2025-12-13
+ | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:scm at 2025-12-14
  | Rendered using Apache Maven Fluido Skin 2.0.0-M9
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
diff --git a/site/summary.html b/site/summary.html
index d02747352a..fda15c07b6 100644
--- a/site/summary.html
+++ b/site/summary.html
@@ -2,7 +2,7 @@
 
 
 <!--
- | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:summary at 2025-12-13
+ | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:summary at 2025-12-14
  | Rendered using Apache Maven Fluido Skin 2.0.0-M9
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
diff --git a/site/surefire.html b/site/surefire.html
index cc306a08e8..900fdc7efa 100644
--- a/site/surefire.html
+++ b/site/surefire.html
@@ -2,7 +2,7 @@
 
 
 <!--
- | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-surefire-report-plugin:3.5.3:report at 2025-12-13
+ | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-surefire-report-plugin:3.5.3:report at 2025-12-14
  | Rendered using Apache Maven Fluido Skin 2.0.0-M9
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
diff --git a/site/team.html b/site/team.html
index f43a3988b1..30215fa7e6 100644
--- a/site/team.html
+++ b/site/team.html
@@ -2,7 +2,7 @@
 
 
 <!--
- | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:team at 2025-12-13
+ | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:team at 2025-12-14
  | Rendered using Apache Maven Fluido Skin 2.0.0-M9
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
diff --git a/site/xref-test/org/apache/juneau/commons/collections/BidiMap_Test.html b/site/xref-test/org/apache/juneau/commons/collections/BidiMap_Test.html
index a44be8894b..910db7ec43 100644
--- a/site/xref-test/org/apache/juneau/commons/collections/BidiMap_Test.html
+++ b/site/xref-test/org/apache/juneau/commons/collections/BidiMap_Test.html
@@ -658,39 +658,38 @@
 <a class="jxr_linenumber" name="L650" href="#L650">650</a> 			.add(<span class="jxr_string">"one"</span>, 1)
 <a class="jxr_linenumber" name="L651" href="#L651">651</a> 			.build();
 <a class="jxr_linenumber" name="L652" href="#L652">652</a> 
-<a class="jxr_linenumber" name="L653" href="#L653">653</a> 		assertFalse(map.equals(<span class="jxr_string">"not a map"</span>));
-<a class="jxr_linenumber" name="L654" href="#L654">654</a> 		assertFalse(map.equals(<strong class="jxr_keyword">null</strong>));
-<a class="jxr_linenumber" name="L655" href="#L655">655</a> 	}
-<a class="jxr_linenumber" name="L656" href="#L656">656</a> 
-<a class="jxr_linenumber" name="L657" href="#L657">657</a> 	@Test
-<a class="jxr_linenumber" name="L658" href="#L658">658</a> 	<strong class="jxr_keyword">void</strong> w06_hashCode_sameContents() {
-<a class="jxr_linenumber" name="L659" href="#L659">659</a> 		<strong class="jxr_keyword">var</strong> map1 = BidiMap.&lt;String,Integer&gt;create()
-<a class="jxr_linenumber" name="L660" href="#L660">660</a> 			.add(<span class="jxr_string">"one"</span>, 1)
-<a class="jxr_linenumber" name="L661" href="#L661">661</a> 			.add(<span class="jxr_string">"two"</span>, 2)
-<a class="jxr_linenumber" name="L662" href="#L662">662</a> 			.build();
-<a class="jxr_linenumber" name="L663" href="#L663">663</a> 
-<a class="jxr_linenumber" name="L664" href="#L664">664</a> 		<strong class="jxr_keyword">var</strong> map2 = BidiMap.&lt;String,Integer&gt;create()
-<a class="jxr_linenumber" name="L665" href="#L665">665</a> 			.add(<span class="jxr_string">"one"</span>, 1)
-<a class="jxr_linenumber" name="L666" href="#L666">666</a> 			.add(<span class="jxr_string">"two"</span>, 2)
-<a class="jxr_linenumber" name="L667" href="#L667">667</a> 			.build();
-<a class="jxr_linenumber" name="L668" href="#L668">668</a> 
-<a class="jxr_linenumber" name="L669" href="#L669">669</a> 		assertEquals(map1.hashCode(), map2.hashCode());
-<a class="jxr_linenumber" name="L670" href="#L670">670</a> 	}
-<a class="jxr_linenumber" name="L671" href="#L671">671</a> 
-<a class="jxr_linenumber" name="L672" href="#L672">672</a> 	@Test
-<a class="jxr_linenumber" name="L673" href="#L673">673</a> 	<strong class="jxr_keyword">void</strong> w07_hashCode_regularMap() {
-<a class="jxr_linenumber" name="L674" href="#L674">674</a> 		<strong class="jxr_keyword">var</strong> map = BidiMap.&lt;String,Integer&gt;create()
-<a class="jxr_linenumber" name="L675" href="#L675">675</a> 			.add(<span class="jxr_string">"one"</span>, 1)
-<a class="jxr_linenumber" name="L676" href="#L676">676</a> 			.add(<span class="jxr_string">"two"</span>, 2)
-<a class="jxr_linenumber" name="L677" href="#L677">677</a> 			.build();
-<a class="jxr_linenumber" name="L678" href="#L678">678</a> 
-<a class="jxr_linenumber" name="L679" href="#L679">679</a> 		<strong class="jxr_keyword">var</strong> regularMap = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String, Integer&gt;();
-<a class="jxr_linenumber" name="L680" href="#L680">680</a> 		regularMap.put(<span class="jxr_string">"one"</span>, 1);
-<a class="jxr_linenumber" name="L681" href="#L681">681</a> 		regularMap.put(<span class="jxr_string">"two"</span>, 2);
-<a class="jxr_linenumber" name="L682" href="#L682">682</a> 
-<a class="jxr_linenumber" name="L683" href="#L683">683</a> 		assertEquals(map.hashCode(), regularMap.hashCode());
-<a class="jxr_linenumber" name="L684" href="#L684">684</a> 	}
-<a class="jxr_linenumber" name="L685" href="#L685">685</a> }
+<a class="jxr_linenumber" name="L653" href="#L653">653</a> 		assertFalse(map.equals(<strong class="jxr_keyword">null</strong>));
+<a class="jxr_linenumber" name="L654" href="#L654">654</a> 	}
+<a class="jxr_linenumber" name="L655" href="#L655">655</a> 
+<a class="jxr_linenumber" name="L656" href="#L656">656</a> 	@Test
+<a class="jxr_linenumber" name="L657" href="#L657">657</a> 	<strong class="jxr_keyword">void</strong> w06_hashCode_sameContents() {
+<a class="jxr_linenumber" name="L658" href="#L658">658</a> 		<strong class="jxr_keyword">var</strong> map1 = BidiMap.&lt;String,Integer&gt;create()
+<a class="jxr_linenumber" name="L659" href="#L659">659</a> 			.add(<span class="jxr_string">"one"</span>, 1)
+<a class="jxr_linenumber" name="L660" href="#L660">660</a> 			.add(<span class="jxr_string">"two"</span>, 2)
+<a class="jxr_linenumber" name="L661" href="#L661">661</a> 			.build();
+<a class="jxr_linenumber" name="L662" href="#L662">662</a> 
+<a class="jxr_linenumber" name="L663" href="#L663">663</a> 		<strong class="jxr_keyword">var</strong> map2 = BidiMap.&lt;String,Integer&gt;create()
+<a class="jxr_linenumber" name="L664" href="#L664">664</a> 			.add(<span class="jxr_string">"one"</span>, 1)
+<a class="jxr_linenumber" name="L665" href="#L665">665</a> 			.add(<span class="jxr_string">"two"</span>, 2)
+<a class="jxr_linenumber" name="L666" href="#L666">666</a> 			.build();
+<a class="jxr_linenumber" name="L667" href="#L667">667</a> 
+<a class="jxr_linenumber" name="L668" href="#L668">668</a> 		assertEquals(map1.hashCode(), map2.hashCode());
+<a class="jxr_linenumber" name="L669" href="#L669">669</a> 	}
+<a class="jxr_linenumber" name="L670" href="#L670">670</a> 
+<a class="jxr_linenumber" name="L671" href="#L671">671</a> 	@Test
+<a class="jxr_linenumber" name="L672" href="#L672">672</a> 	<strong class="jxr_keyword">void</strong> w07_hashCode_regularMap() {
+<a class="jxr_linenumber" name="L673" href="#L673">673</a> 		<strong class="jxr_keyword">var</strong> map = BidiMap.&lt;String,Integer&gt;create()
+<a class="jxr_linenumber" name="L674" href="#L674">674</a> 			.add(<span class="jxr_string">"one"</span>, 1)
+<a class="jxr_linenumber" name="L675" href="#L675">675</a> 			.add(<span class="jxr_string">"two"</span>, 2)
+<a class="jxr_linenumber" name="L676" href="#L676">676</a> 			.build();
+<a class="jxr_linenumber" name="L677" href="#L677">677</a> 
+<a class="jxr_linenumber" name="L678" href="#L678">678</a> 		<strong class="jxr_keyword">var</strong> regularMap = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String, Integer&gt;();
+<a class="jxr_linenumber" name="L679" href="#L679">679</a> 		regularMap.put(<span class="jxr_string">"one"</span>, 1);
+<a class="jxr_linenumber" name="L680" href="#L680">680</a> 		regularMap.put(<span class="jxr_string">"two"</span>, 2);
+<a class="jxr_linenumber" name="L681" href="#L681">681</a> 
+<a class="jxr_linenumber" name="L682" href="#L682">682</a> 		assertEquals(map.hashCode(), regularMap.hashCode());
+<a class="jxr_linenumber" name="L683" href="#L683">683</a> 	}
+<a class="jxr_linenumber" name="L684" href="#L684">684</a> }
 </pre>
 <hr/>
 <div id="footer">© 2016–2025 <a href="https://www.apache.org/">The Apache Software Foundation</a></div>
diff --git a/site/xref-test/org/apache/juneau/commons/collections/FilteredMap_Test.html b/site/xref-test/org/apache/juneau/commons/collections/FilteredMap_Test.html
index 1c44dce910..97cf41279e 100644
--- a/site/xref-test/org/apache/juneau/commons/collections/FilteredMap_Test.html
+++ b/site/xref-test/org/apache/juneau/commons/collections/FilteredMap_Test.html
@@ -172,7 +172,7 @@
 <a class="jxr_linenumber" name="L164" href="#L164">164</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
 <a class="jxr_linenumber" name="L165" href="#L165">165</a> 			.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
 <a class="jxr_linenumber" name="L166" href="#L166">166</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong> &amp;&amp; v &gt; 0)
-<a class="jxr_linenumber" name="L167" href="#L167">167</a> 			.creator(() -&gt; <strong class="jxr_keyword">new</strong> TreeMap&lt;&gt;())
+<a class="jxr_linenumber" name="L167" href="#L167">167</a> 			.<strong class="jxr_keyword">inner</strong>(<strong class="jxr_keyword">new</strong> TreeMap&lt;&gt;())
 <a class="jxr_linenumber" name="L168" href="#L168">168</a> 			.build();
 <a class="jxr_linenumber" name="L169" href="#L169">169</a> 
 <a class="jxr_linenumber" name="L170" href="#L170">170</a> 		map.put(<span class="jxr_string">"zebra"</span>, 3);
@@ -193,7 +193,7 @@
 <a class="jxr_linenumber" name="L185" href="#L185">185</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
 <a class="jxr_linenumber" name="L186" href="#L186">186</a> 			.create(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
 <a class="jxr_linenumber" name="L187" href="#L187">187</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L188" href="#L188">188</a> 			.creator(() -&gt; <strong class="jxr_keyword">new</strong> ConcurrentHashMap&lt;&gt;())
+<a class="jxr_linenumber" name="L188" href="#L188">188</a> 			.<strong class="jxr_keyword">inner</strong>(<strong class="jxr_keyword">new</strong> ConcurrentHashMap&lt;&gt;())
 <a class="jxr_linenumber" name="L189" href="#L189">189</a> 			.build();
 <a class="jxr_linenumber" name="L190" href="#L190">190</a> 
 <a class="jxr_linenumber" name="L191" href="#L191">191</a> 		map.put(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>);
@@ -428,659 +428,670 @@
 <a class="jxr_linenumber" name="L420" href="#L420">420</a> 	<em class="jxr_comment">//====================================================================================================</em>
 <a class="jxr_linenumber" name="L421" href="#L421">421</a> 
 <a class="jxr_linenumber" name="L422" href="#L422">422</a> 	@Test
-<a class="jxr_linenumber" name="L423" href="#L423">423</a> 	<strong class="jxr_keyword">void</strong> i01_builder_noFilter_throwsException() {
-<a class="jxr_linenumber" name="L424" href="#L424">424</a> 		assertThrowsWithMessage(IllegalArgumentException.<strong class="jxr_keyword">class</strong>, <span class="jxr_string">"filter"</span>, () -&gt; {
-<a class="jxr_linenumber" name="L425" href="#L425">425</a> 			FilteredMap.create(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L426" href="#L426">426</a> 		});
-<a class="jxr_linenumber" name="L427" href="#L427">427</a> 	}
-<a class="jxr_linenumber" name="L428" href="#L428">428</a> 
-<a class="jxr_linenumber" name="L429" href="#L429">429</a> 	@Test
-<a class="jxr_linenumber" name="L430" href="#L430">430</a> 	<strong class="jxr_keyword">void</strong> i02_builder_nullFilter_throwsException() {
-<a class="jxr_linenumber" name="L431" href="#L431">431</a> 		assertThrowsWithMessage(IllegalArgumentException.<strong class="jxr_keyword">class</strong>, <span class="jxr_string">"value"</span>, () -&gt; {
-<a class="jxr_linenumber" name="L432" href="#L432">432</a> 			FilteredMap.create(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).filter(<strong class="jxr_keyword">null</strong>);
-<a class="jxr_linenumber" name="L433" href="#L433">433</a> 		});
-<a class="jxr_linenumber" name="L434" href="#L434">434</a> 	}
-<a class="jxr_linenumber" name="L435" href="#L435">435</a> 
-<a class="jxr_linenumber" name="L436" href="#L436">436</a> 	@Test
-<a class="jxr_linenumber" name="L437" href="#L437">437</a> 	<strong class="jxr_keyword">void</strong> i03_builder_nullCreator_throwsException() {
-<a class="jxr_linenumber" name="L438" href="#L438">438</a> 		assertThrowsWithMessage(IllegalArgumentException.<strong class="jxr_keyword">class</strong>, <span class="jxr_string">"value"</span>, () -&gt; {
-<a class="jxr_linenumber" name="L439" href="#L439">439</a> 			FilteredMap.create(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L440" href="#L440">440</a> 				.filter((k, v) -&gt; <strong class="jxr_keyword">true</strong>)
-<a class="jxr_linenumber" name="L441" href="#L441">441</a> 				.creator(<strong class="jxr_keyword">null</strong>);
-<a class="jxr_linenumber" name="L442" href="#L442">442</a> 		});
-<a class="jxr_linenumber" name="L443" href="#L443">443</a> 	}
-<a class="jxr_linenumber" name="L444" href="#L444">444</a> 
-<a class="jxr_linenumber" name="L445" href="#L445">445</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L446" href="#L446">446</a> 	<em class="jxr_comment">// Builder - create() without parameters</em>
-<a class="jxr_linenumber" name="L447" href="#L447">447</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L448" href="#L448">448</a> 
-<a class="jxr_linenumber" name="L449" href="#L449">449</a> 	@Test
-<a class="jxr_linenumber" name="L450" href="#L450">450</a> 	<strong class="jxr_keyword">void</strong> j01_builder_createWithoutParameters() {
-<a class="jxr_linenumber" name="L451" href="#L451">451</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
-<a class="jxr_linenumber" name="L452" href="#L452">452</a> 			.&lt;String,String&gt;create()
-<a class="jxr_linenumber" name="L453" href="#L453">453</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L454" href="#L454">454</a> 			.build();
-<a class="jxr_linenumber" name="L455" href="#L455">455</a> 
-<a class="jxr_linenumber" name="L456" href="#L456">456</a> 		map.put(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L457" href="#L457">457</a> 		map.put(<span class="jxr_string">"key2"</span>, <strong class="jxr_keyword">null</strong>);  <em class="jxr_comment">// Filtered out</em>
-<a class="jxr_linenumber" name="L458" href="#L458">458</a> 
-<a class="jxr_linenumber" name="L459" href="#L459">459</a> 		assertSize(1, map);
-<a class="jxr_linenumber" name="L460" href="#L460">460</a> 		assertEquals(<span class="jxr_string">"value1"</span>, map.get(<span class="jxr_string">"key1"</span>));
-<a class="jxr_linenumber" name="L461" href="#L461">461</a> 	}
-<a class="jxr_linenumber" name="L462" href="#L462">462</a> 
-<a class="jxr_linenumber" name="L463" href="#L463">463</a> 	@Test
-<a class="jxr_linenumber" name="L464" href="#L464">464</a> 	<strong class="jxr_keyword">void</strong> j02_builder_createWithoutParameters_usesObjectClass() {
-<a class="jxr_linenumber" name="L465" href="#L465">465</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
-<a class="jxr_linenumber" name="L466" href="#L466">466</a> 			.create()
-<a class="jxr_linenumber" name="L467" href="#L467">467</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L468" href="#L468">468</a> 			.build();
-<a class="jxr_linenumber" name="L469" href="#L469">469</a> 
-<a class="jxr_linenumber" name="L470" href="#L470">470</a> 		<em class="jxr_comment">// Object.class accepts any type</em>
-<a class="jxr_linenumber" name="L471" href="#L471">471</a> 		map.add(<span class="jxr_string">"string"</span>, 123);           <em class="jxr_comment">// String key, Integer value</em>
-<a class="jxr_linenumber" name="L472" href="#L472">472</a> 		map.add(456, <span class="jxr_string">"value"</span>);            <em class="jxr_comment">// Integer key, String value</em>
-<a class="jxr_linenumber" name="L473" href="#L473">473</a> 		map.add(List.of(1, 2), Map.of()); <em class="jxr_comment">// List key, Map value</em>
-<a class="jxr_linenumber" name="L474" href="#L474">474</a> 
-<a class="jxr_linenumber" name="L475" href="#L475">475</a> 		assertSize(3, map);
-<a class="jxr_linenumber" name="L476" href="#L476">476</a> 		assertEquals(123, map.get(<span class="jxr_string">"string"</span>));
-<a class="jxr_linenumber" name="L477" href="#L477">477</a> 		assertEquals(<span class="jxr_string">"value"</span>, map.get(456));
-<a class="jxr_linenumber" name="L478" href="#L478">478</a> 		assertEquals(Map.of(), map.get(List.of(1, 2)));
-<a class="jxr_linenumber" name="L479" href="#L479">479</a> 	}
-<a class="jxr_linenumber" name="L480" href="#L480">480</a> 
-<a class="jxr_linenumber" name="L481" href="#L481">481</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L482" href="#L482">482</a> 	<em class="jxr_comment">// Complex filter - string length</em>
-<a class="jxr_linenumber" name="L483" href="#L483">483</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L484" href="#L484">484</a> 
-<a class="jxr_linenumber" name="L485" href="#L485">485</a> 	@Test
-<a class="jxr_linenumber" name="L486" href="#L486">486</a> 	<strong class="jxr_keyword">void</strong> k01_filterStringLength() {
-<a class="jxr_linenumber" name="L487" href="#L487">487</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
-<a class="jxr_linenumber" name="L488" href="#L488">488</a> 			.create(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L489" href="#L489">489</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong> &amp;&amp; v.length() &gt; 3)
-<a class="jxr_linenumber" name="L490" href="#L490">490</a> 			.build();
-<a class="jxr_linenumber" name="L491" href="#L491">491</a> 
-<a class="jxr_linenumber" name="L492" href="#L492">492</a> 		map.put(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"short"</span>);   <em class="jxr_comment">// Added</em>
-<a class="jxr_linenumber" name="L493" href="#L493">493</a> 		map.put(<span class="jxr_string">"key2"</span>, <span class="jxr_string">"ab"</span>);      <em class="jxr_comment">// Filtered out (length &lt;= 3)</em>
-<a class="jxr_linenumber" name="L494" href="#L494">494</a> 		map.put(<span class="jxr_string">"key3"</span>, <span class="jxr_string">"longer"</span>);  <em class="jxr_comment">// Added</em>
-<a class="jxr_linenumber" name="L495" href="#L495">495</a> 		map.put(<span class="jxr_string">"key4"</span>, <strong class="jxr_keyword">null</strong>);      <em class="jxr_comment">// Filtered out</em>
-<a class="jxr_linenumber" name="L496" href="#L496">496</a> 
-<a class="jxr_linenumber" name="L497" href="#L497">497</a> 		assertSize(2, map);
-<a class="jxr_linenumber" name="L498" href="#L498">498</a> 		assertEquals(<span class="jxr_string">"short"</span>, map.get(<span class="jxr_string">"key1"</span>));
-<a class="jxr_linenumber" name="L499" href="#L499">499</a> 		assertEquals(<span class="jxr_string">"longer"</span>, map.get(<span class="jxr_string">"key3"</span>));
-<a class="jxr_linenumber" name="L500" href="#L500">500</a> 	}
-<a class="jxr_linenumber" name="L501" href="#L501">501</a> 
-<a class="jxr_linenumber" name="L502" href="#L502">502</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L503" href="#L503">503</a> 	<em class="jxr_comment">// add() method - type validation with types specified</em>
-<a class="jxr_linenumber" name="L504" href="#L504">504</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L505" href="#L505">505</a> 
-<a class="jxr_linenumber" name="L506" href="#L506">506</a> 	@Test
-<a class="jxr_linenumber" name="L507" href="#L507">507</a> 	<strong class="jxr_keyword">void</strong> l01_add_withTypeValidation_validTypes() {
-<a class="jxr_linenumber" name="L508" href="#L508">508</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
-<a class="jxr_linenumber" name="L509" href="#L509">509</a> 			.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L510" href="#L510">510</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong> &amp;&amp; v &gt; 0)
-<a class="jxr_linenumber" name="L511" href="#L511">511</a> 			.build();
-<a class="jxr_linenumber" name="L512" href="#L512">512</a> 
-<a class="jxr_linenumber" name="L513" href="#L513">513</a> 		map.add(<span class="jxr_string">"key1"</span>, 5);   <em class="jxr_comment">// Valid types, added</em>
-<a class="jxr_linenumber" name="L514" href="#L514">514</a> 		map.add(<span class="jxr_string">"key2"</span>, 10);  <em class="jxr_comment">// Valid types, added</em>
-<a class="jxr_linenumber" name="L515" href="#L515">515</a> 		map.add(<span class="jxr_string">"key3"</span>, -1);  <em class="jxr_comment">// Valid types, but filtered out</em>
-<a class="jxr_linenumber" name="L516" href="#L516">516</a> 
-<a class="jxr_linenumber" name="L517" href="#L517">517</a> 		assertSize(2, map);
-<a class="jxr_linenumber" name="L518" href="#L518">518</a> 		assertEquals(5, map.get(<span class="jxr_string">"key1"</span>));
-<a class="jxr_linenumber" name="L519" href="#L519">519</a> 		assertEquals(10, map.get(<span class="jxr_string">"key2"</span>));
-<a class="jxr_linenumber" name="L520" href="#L520">520</a> 	}
-<a class="jxr_linenumber" name="L521" href="#L521">521</a> 
-<a class="jxr_linenumber" name="L522" href="#L522">522</a> 	@Test
-<a class="jxr_linenumber" name="L523" href="#L523">523</a> 	<strong class="jxr_keyword">void</strong> l02_add_withTypeValidation_invalidKeyType() {
-<a class="jxr_linenumber" name="L524" href="#L524">524</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
-<a class="jxr_linenumber" name="L525" href="#L525">525</a> 			.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L526" href="#L526">526</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L527" href="#L527">527</a> 			.build();
-<a class="jxr_linenumber" name="L528" href="#L528">528</a> 
-<a class="jxr_linenumber" name="L529" href="#L529">529</a> 		assertThrowsWithMessage(RuntimeException.<strong class="jxr_keyword">class</strong>, <span class="jxr_string">"could not be converted to key type"</span>, () -&gt; {
-<a class="jxr_linenumber" name="L530" href="#L530">530</a> 			map.add(123, 5);  <em class="jxr_comment">// Invalid key type (Integer instead of String)</em>
-<a class="jxr_linenumber" name="L531" href="#L531">531</a> 		});
-<a class="jxr_linenumber" name="L532" href="#L532">532</a> 	}
-<a class="jxr_linenumber" name="L533" href="#L533">533</a> 
-<a class="jxr_linenumber" name="L534" href="#L534">534</a> 	@Test
-<a class="jxr_linenumber" name="L535" href="#L535">535</a> 	<strong class="jxr_keyword">void</strong> l03_add_withTypeValidation_invalidValueType() {
-<a class="jxr_linenumber" name="L536" href="#L536">536</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
-<a class="jxr_linenumber" name="L537" href="#L537">537</a> 			.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L538" href="#L538">538</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L539" href="#L539">539</a> 			.build();
-<a class="jxr_linenumber" name="L540" href="#L540">540</a> 
-<a class="jxr_linenumber" name="L541" href="#L541">541</a> 		assertThrowsWithMessage(RuntimeException.<strong class="jxr_keyword">class</strong>, <span class="jxr_string">"could not be converted to value type"</span>, () -&gt; {
-<a class="jxr_linenumber" name="L542" href="#L542">542</a> 			map.add(<span class="jxr_string">"key"</span>, <span class="jxr_string">"value"</span>);  <em class="jxr_comment">// Invalid value type (String instead of Integer)</em>
-<a class="jxr_linenumber" name="L543" href="#L543">543</a> 		});
-<a class="jxr_linenumber" name="L544" href="#L544">544</a> 	}
-<a class="jxr_linenumber" name="L545" href="#L545">545</a> 
-<a class="jxr_linenumber" name="L546" href="#L546">546</a> 	@Test
-<a class="jxr_linenumber" name="L547" href="#L547">547</a> 	<strong class="jxr_keyword">void</strong> l04_add_withTypeValidation_noTypesSpecified() {
-<a class="jxr_linenumber" name="L548" href="#L548">548</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
-<a class="jxr_linenumber" name="L549" href="#L549">549</a> 			.&lt;Object,Object&gt;create()
-<a class="jxr_linenumber" name="L550" href="#L550">550</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L551" href="#L551">551</a> 			.build();
-<a class="jxr_linenumber" name="L552" href="#L552">552</a> 
-<a class="jxr_linenumber" name="L553" href="#L553">553</a> 		<em class="jxr_comment">// Object.class is used when types not specified, which accepts any type</em>
-<a class="jxr_linenumber" name="L554" href="#L554">554</a> 		map.add(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L555" href="#L555">555</a> 		map.add(123, 456);  <em class="jxr_comment">// Different types, but Object.class accepts any type</em>
-<a class="jxr_linenumber" name="L556" href="#L556">556</a> 
-<a class="jxr_linenumber" name="L557" href="#L557">557</a> 		assertSize(2, map);
-<a class="jxr_linenumber" name="L558" href="#L558">558</a> 		assertEquals(<span class="jxr_string">"value1"</span>, map.get(<span class="jxr_string">"key1"</span>));
-<a class="jxr_linenumber" name="L559" href="#L559">559</a> 		assertEquals(456, map.get(123));
-<a class="jxr_linenumber" name="L560" href="#L560">560</a> 	}
-<a class="jxr_linenumber" name="L561" href="#L561">561</a> 
-<a class="jxr_linenumber" name="L562" href="#L562">562</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L563" href="#L563">563</a> 	<em class="jxr_comment">// add() method - with keyFunction</em>
-<a class="jxr_linenumber" name="L564" href="#L564">564</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L565" href="#L565">565</a> 
-<a class="jxr_linenumber" name="L566" href="#L566">566</a> 	@Test
-<a class="jxr_linenumber" name="L567" href="#L567">567</a> 	<strong class="jxr_keyword">void</strong> m01_add_withKeyFunction() {
-<a class="jxr_linenumber" name="L568" href="#L568">568</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
-<a class="jxr_linenumber" name="L569" href="#L569">569</a> 			.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L570" href="#L570">570</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong> &amp;&amp; v &gt; 0)
-<a class="jxr_linenumber" name="L571" href="#L571">571</a> 			.keyFunction(o -&gt; o.toString())
-<a class="jxr_linenumber" name="L572" href="#L572">572</a> 			.build();
+<a class="jxr_linenumber" name="L423" href="#L423">423</a> 	<strong class="jxr_keyword">void</strong> i01_builder_noFilter_acceptsAllEntries() {
+<a class="jxr_linenumber" name="L424" href="#L424">424</a> 		<em class="jxr_comment">// Filter is optional - defaults to (k,v) -&gt; true (accepts all entries)</em>
+<a class="jxr_linenumber" name="L425" href="#L425">425</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap.create(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L426" href="#L426">426</a> 			.build();
+<a class="jxr_linenumber" name="L427" href="#L427">427</a> 
+<a class="jxr_linenumber" name="L428" href="#L428">428</a> 		assertNotNull(map);
+<a class="jxr_linenumber" name="L429" href="#L429">429</a> 		map.put(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>);
+<a class="jxr_linenumber" name="L430" href="#L430">430</a> 		map.put(<span class="jxr_string">"key2"</span>, <strong class="jxr_keyword">null</strong>);  <em class="jxr_comment">// Should be accepted (no filter)</em>
+<a class="jxr_linenumber" name="L431" href="#L431">431</a> 		map.put(<span class="jxr_string">"key3"</span>, <span class="jxr_string">"value3"</span>);
+<a class="jxr_linenumber" name="L432" href="#L432">432</a> 
+<a class="jxr_linenumber" name="L433" href="#L433">433</a> 		assertSize(3, map);
+<a class="jxr_linenumber" name="L434" href="#L434">434</a> 		assertMap(map, <span class="jxr_string">"key1=value1"</span>, <span class="jxr_string">"key2=&lt;null&gt;"</span>, <span class="jxr_string">"key3=value3"</span>);
+<a class="jxr_linenumber" name="L435" href="#L435">435</a> 	}
+<a class="jxr_linenumber" name="L436" href="#L436">436</a> 
+<a class="jxr_linenumber" name="L437" href="#L437">437</a> 	@Test
+<a class="jxr_linenumber" name="L438" href="#L438">438</a> 	<strong class="jxr_keyword">void</strong> i02_builder_nullFilter_throwsException() {
+<a class="jxr_linenumber" name="L439" href="#L439">439</a> 		assertThrowsWithMessage(IllegalArgumentException.<strong class="jxr_keyword">class</strong>, <span class="jxr_string">"value"</span>, () -&gt; {
+<a class="jxr_linenumber" name="L440" href="#L440">440</a> 			FilteredMap.create(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).filter(<strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="L441" href="#L441">441</a> 		});
+<a class="jxr_linenumber" name="L442" href="#L442">442</a> 	}
+<a class="jxr_linenumber" name="L443" href="#L443">443</a> 
+<a class="jxr_linenumber" name="L444" href="#L444">444</a> 	@Test
+<a class="jxr_linenumber" name="L445" href="#L445">445</a> 	<strong class="jxr_keyword">void</strong> i03_builder_nullInner_throwsException() {
+<a class="jxr_linenumber" name="L446" href="#L446">446</a> 		assertThrowsWithMessage(IllegalArgumentException.<strong class="jxr_keyword">class</strong>, <span class="jxr_string">"value"</span>, () -&gt; {
+<a class="jxr_linenumber" name="L447" href="#L447">447</a> 			FilteredMap.create(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L448" href="#L448">448</a> 				.filter((k, v) -&gt; <strong class="jxr_keyword">true</strong>)
+<a class="jxr_linenumber" name="L449" href="#L449">449</a> 				.<strong class="jxr_keyword">inner</strong>(<strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="L450" href="#L450">450</a> 		});
+<a class="jxr_linenumber" name="L451" href="#L451">451</a> 	}
+<a class="jxr_linenumber" name="L452" href="#L452">452</a> 
+<a class="jxr_linenumber" name="L453" href="#L453">453</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L454" href="#L454">454</a> 	<em class="jxr_comment">// Builder - create() without parameters</em>
+<a class="jxr_linenumber" name="L455" href="#L455">455</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L456" href="#L456">456</a> 
+<a class="jxr_linenumber" name="L457" href="#L457">457</a> 	@Test
+<a class="jxr_linenumber" name="L458" href="#L458">458</a> 	<strong class="jxr_keyword">void</strong> j01_builder_createWithoutParameters() {
+<a class="jxr_linenumber" name="L459" href="#L459">459</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
+<a class="jxr_linenumber" name="L460" href="#L460">460</a> 			.&lt;String,String&gt;create()
+<a class="jxr_linenumber" name="L461" href="#L461">461</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L462" href="#L462">462</a> 			.build();
+<a class="jxr_linenumber" name="L463" href="#L463">463</a> 
+<a class="jxr_linenumber" name="L464" href="#L464">464</a> 		map.put(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>);
+<a class="jxr_linenumber" name="L465" href="#L465">465</a> 		map.put(<span class="jxr_string">"key2"</span>, <strong class="jxr_keyword">null</strong>);  <em class="jxr_comment">// Filtered out</em>
+<a class="jxr_linenumber" name="L466" href="#L466">466</a> 
+<a class="jxr_linenumber" name="L467" href="#L467">467</a> 		assertSize(1, map);
+<a class="jxr_linenumber" name="L468" href="#L468">468</a> 		assertEquals(<span class="jxr_string">"value1"</span>, map.get(<span class="jxr_string">"key1"</span>));
+<a class="jxr_linenumber" name="L469" href="#L469">469</a> 	}
+<a class="jxr_linenumber" name="L470" href="#L470">470</a> 
+<a class="jxr_linenumber" name="L471" href="#L471">471</a> 	@Test
+<a class="jxr_linenumber" name="L472" href="#L472">472</a> 	<strong class="jxr_keyword">void</strong> j02_builder_createWithoutParameters_usesObjectClass() {
+<a class="jxr_linenumber" name="L473" href="#L473">473</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
+<a class="jxr_linenumber" name="L474" href="#L474">474</a> 			.create()
+<a class="jxr_linenumber" name="L475" href="#L475">475</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L476" href="#L476">476</a> 			.build();
+<a class="jxr_linenumber" name="L477" href="#L477">477</a> 
+<a class="jxr_linenumber" name="L478" href="#L478">478</a> 		<em class="jxr_comment">// Object.class accepts any type</em>
+<a class="jxr_linenumber" name="L479" href="#L479">479</a> 		map.add(<span class="jxr_string">"string"</span>, 123);           <em class="jxr_comment">// String key, Integer value</em>
+<a class="jxr_linenumber" name="L480" href="#L480">480</a> 		map.add(456, <span class="jxr_string">"value"</span>);            <em class="jxr_comment">// Integer key, String value</em>
+<a class="jxr_linenumber" name="L481" href="#L481">481</a> 		map.add(List.of(1, 2), Map.of()); <em class="jxr_comment">// List key, Map value</em>
+<a class="jxr_linenumber" name="L482" href="#L482">482</a> 
+<a class="jxr_linenumber" name="L483" href="#L483">483</a> 		assertSize(3, map);
+<a class="jxr_linenumber" name="L484" href="#L484">484</a> 		assertEquals(123, map.get(<span class="jxr_string">"string"</span>));
+<a class="jxr_linenumber" name="L485" href="#L485">485</a> 		assertEquals(<span class="jxr_string">"value"</span>, map.get(456));
+<a class="jxr_linenumber" name="L486" href="#L486">486</a> 		assertEquals(Map.of(), map.get(List.of(1, 2)));
+<a class="jxr_linenumber" name="L487" href="#L487">487</a> 	}
+<a class="jxr_linenumber" name="L488" href="#L488">488</a> 
+<a class="jxr_linenumber" name="L489" href="#L489">489</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L490" href="#L490">490</a> 	<em class="jxr_comment">// Complex filter - string length</em>
+<a class="jxr_linenumber" name="L491" href="#L491">491</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L492" href="#L492">492</a> 
+<a class="jxr_linenumber" name="L493" href="#L493">493</a> 	@Test
+<a class="jxr_linenumber" name="L494" href="#L494">494</a> 	<strong class="jxr_keyword">void</strong> k01_filterStringLength() {
+<a class="jxr_linenumber" name="L495" href="#L495">495</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
+<a class="jxr_linenumber" name="L496" href="#L496">496</a> 			.create(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L497" href="#L497">497</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong> &amp;&amp; v.length() &gt; 3)
+<a class="jxr_linenumber" name="L498" href="#L498">498</a> 			.build();
+<a class="jxr_linenumber" name="L499" href="#L499">499</a> 
+<a class="jxr_linenumber" name="L500" href="#L500">500</a> 		map.put(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"short"</span>);   <em class="jxr_comment">// Added</em>
+<a class="jxr_linenumber" name="L501" href="#L501">501</a> 		map.put(<span class="jxr_string">"key2"</span>, <span class="jxr_string">"ab"</span>);      <em class="jxr_comment">// Filtered out (length &lt;= 3)</em>
+<a class="jxr_linenumber" name="L502" href="#L502">502</a> 		map.put(<span class="jxr_string">"key3"</span>, <span class="jxr_string">"longer"</span>);  <em class="jxr_comment">// Added</em>
+<a class="jxr_linenumber" name="L503" href="#L503">503</a> 		map.put(<span class="jxr_string">"key4"</span>, <strong class="jxr_keyword">null</strong>);      <em class="jxr_comment">// Filtered out</em>
+<a class="jxr_linenumber" name="L504" href="#L504">504</a> 
+<a class="jxr_linenumber" name="L505" href="#L505">505</a> 		assertSize(2, map);
+<a class="jxr_linenumber" name="L506" href="#L506">506</a> 		assertEquals(<span class="jxr_string">"short"</span>, map.get(<span class="jxr_string">"key1"</span>));
+<a class="jxr_linenumber" name="L507" href="#L507">507</a> 		assertEquals(<span class="jxr_string">"longer"</span>, map.get(<span class="jxr_string">"key3"</span>));
+<a class="jxr_linenumber" name="L508" href="#L508">508</a> 	}
+<a class="jxr_linenumber" name="L509" href="#L509">509</a> 
+<a class="jxr_linenumber" name="L510" href="#L510">510</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L511" href="#L511">511</a> 	<em class="jxr_comment">// add() method - type validation with types specified</em>
+<a class="jxr_linenumber" name="L512" href="#L512">512</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L513" href="#L513">513</a> 
+<a class="jxr_linenumber" name="L514" href="#L514">514</a> 	@Test
+<a class="jxr_linenumber" name="L515" href="#L515">515</a> 	<strong class="jxr_keyword">void</strong> l01_add_withTypeValidation_validTypes() {
+<a class="jxr_linenumber" name="L516" href="#L516">516</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
+<a class="jxr_linenumber" name="L517" href="#L517">517</a> 			.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L518" href="#L518">518</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong> &amp;&amp; v &gt; 0)
+<a class="jxr_linenumber" name="L519" href="#L519">519</a> 			.build();
+<a class="jxr_linenumber" name="L520" href="#L520">520</a> 
+<a class="jxr_linenumber" name="L521" href="#L521">521</a> 		map.add(<span class="jxr_string">"key1"</span>, 5);   <em class="jxr_comment">// Valid types, added</em>
+<a class="jxr_linenumber" name="L522" href="#L522">522</a> 		map.add(<span class="jxr_string">"key2"</span>, 10);  <em class="jxr_comment">// Valid types, added</em>
+<a class="jxr_linenumber" name="L523" href="#L523">523</a> 		map.add(<span class="jxr_string">"key3"</span>, -1);  <em class="jxr_comment">// Valid types, but filtered out</em>
+<a class="jxr_linenumber" name="L524" href="#L524">524</a> 
+<a class="jxr_linenumber" name="L525" href="#L525">525</a> 		assertSize(2, map);
+<a class="jxr_linenumber" name="L526" href="#L526">526</a> 		assertEquals(5, map.get(<span class="jxr_string">"key1"</span>));
+<a class="jxr_linenumber" name="L527" href="#L527">527</a> 		assertEquals(10, map.get(<span class="jxr_string">"key2"</span>));
+<a class="jxr_linenumber" name="L528" href="#L528">528</a> 	}
+<a class="jxr_linenumber" name="L529" href="#L529">529</a> 
+<a class="jxr_linenumber" name="L530" href="#L530">530</a> 	@Test
+<a class="jxr_linenumber" name="L531" href="#L531">531</a> 	<strong class="jxr_keyword">void</strong> l02_add_withTypeValidation_invalidKeyType() {
+<a class="jxr_linenumber" name="L532" href="#L532">532</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
+<a class="jxr_linenumber" name="L533" href="#L533">533</a> 			.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L534" href="#L534">534</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L535" href="#L535">535</a> 			.build();
+<a class="jxr_linenumber" name="L536" href="#L536">536</a> 
+<a class="jxr_linenumber" name="L537" href="#L537">537</a> 		assertThrowsWithMessage(RuntimeException.<strong class="jxr_keyword">class</strong>, <span class="jxr_string">"could not be converted to key type"</span>, () -&gt; {
+<a class="jxr_linenumber" name="L538" href="#L538">538</a> 			map.add(123, 5);  <em class="jxr_comment">// Invalid key type (Integer instead of String)</em>
+<a class="jxr_linenumber" name="L539" href="#L539">539</a> 		});
+<a class="jxr_linenumber" name="L540" href="#L540">540</a> 	}
+<a class="jxr_linenumber" name="L541" href="#L541">541</a> 
+<a class="jxr_linenumber" name="L542" href="#L542">542</a> 	@Test
+<a class="jxr_linenumber" name="L543" href="#L543">543</a> 	<strong class="jxr_keyword">void</strong> l03_add_withTypeValidation_invalidValueType() {
+<a class="jxr_linenumber" name="L544" href="#L544">544</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
+<a class="jxr_linenumber" name="L545" href="#L545">545</a> 			.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L546" href="#L546">546</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L547" href="#L547">547</a> 			.build();
+<a class="jxr_linenumber" name="L548" href="#L548">548</a> 
+<a class="jxr_linenumber" name="L549" href="#L549">549</a> 		assertThrowsWithMessage(RuntimeException.<strong class="jxr_keyword">class</strong>, <span class="jxr_string">"could not be converted to value type"</span>, () -&gt; {
+<a class="jxr_linenumber" name="L550" href="#L550">550</a> 			map.add(<span class="jxr_string">"key"</span>, <span class="jxr_string">"value"</span>);  <em class="jxr_comment">// Invalid value type (String instead of Integer)</em>
+<a class="jxr_linenumber" name="L551" href="#L551">551</a> 		});
+<a class="jxr_linenumber" name="L552" href="#L552">552</a> 	}
+<a class="jxr_linenumber" name="L553" href="#L553">553</a> 
+<a class="jxr_linenumber" name="L554" href="#L554">554</a> 	@Test
+<a class="jxr_linenumber" name="L555" href="#L555">555</a> 	<strong class="jxr_keyword">void</strong> l04_add_withTypeValidation_noTypesSpecified() {
+<a class="jxr_linenumber" name="L556" href="#L556">556</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
+<a class="jxr_linenumber" name="L557" href="#L557">557</a> 			.&lt;Object,Object&gt;create()
+<a class="jxr_linenumber" name="L558" href="#L558">558</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L559" href="#L559">559</a> 			.build();
+<a class="jxr_linenumber" name="L560" href="#L560">560</a> 
+<a class="jxr_linenumber" name="L561" href="#L561">561</a> 		<em class="jxr_comment">// Object.class is used when types not specified, which accepts any type</em>
+<a class="jxr_linenumber" name="L562" href="#L562">562</a> 		map.add(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>);
+<a class="jxr_linenumber" name="L563" href="#L563">563</a> 		map.add(123, 456);  <em class="jxr_comment">// Different types, but Object.class accepts any type</em>
+<a class="jxr_linenumber" name="L564" href="#L564">564</a> 
+<a class="jxr_linenumber" name="L565" href="#L565">565</a> 		assertSize(2, map);
+<a class="jxr_linenumber" name="L566" href="#L566">566</a> 		assertEquals(<span class="jxr_string">"value1"</span>, map.get(<span class="jxr_string">"key1"</span>));
+<a class="jxr_linenumber" name="L567" href="#L567">567</a> 		assertEquals(456, map.get(123));
+<a class="jxr_linenumber" name="L568" href="#L568">568</a> 	}
+<a class="jxr_linenumber" name="L569" href="#L569">569</a> 
+<a class="jxr_linenumber" name="L570" href="#L570">570</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L571" href="#L571">571</a> 	<em class="jxr_comment">// add() method - with keyFunction</em>
+<a class="jxr_linenumber" name="L572" href="#L572">572</a> 	<em class="jxr_comment">//====================================================================================================</em>
 <a class="jxr_linenumber" name="L573" href="#L573">573</a> 
-<a class="jxr_linenumber" name="L574" href="#L574">574</a> 		map.add(123, 5);   <em class="jxr_comment">// Key converted from Integer to String</em>
-<a class="jxr_linenumber" name="L575" href="#L575">575</a> 		map.add(456, 10);  <em class="jxr_comment">// Key converted from Integer to String</em>
-<a class="jxr_linenumber" name="L576" href="#L576">576</a> 		map.add(789, -1);  <em class="jxr_comment">// Key converted, but value filtered out</em>
-<a class="jxr_linenumber" name="L577" href="#L577">577</a> 
-<a class="jxr_linenumber" name="L578" href="#L578">578</a> 		assertSize(2, map);
-<a class="jxr_linenumber" name="L579" href="#L579">579</a> 		assertEquals(5, map.get(<span class="jxr_string">"123"</span>));
-<a class="jxr_linenumber" name="L580" href="#L580">580</a> 		assertEquals(10, map.get(<span class="jxr_string">"456"</span>));
-<a class="jxr_linenumber" name="L581" href="#L581">581</a> 		assertFalse(map.containsKey(<span class="jxr_string">"789"</span>));
-<a class="jxr_linenumber" name="L582" href="#L582">582</a> 	}
-<a class="jxr_linenumber" name="L583" href="#L583">583</a> 
-<a class="jxr_linenumber" name="L584" href="#L584">584</a> 	@Test
-<a class="jxr_linenumber" name="L585" href="#L585">585</a> 	<strong class="jxr_keyword">void</strong> m02_add_withKeyFunction_noTypeSpecified() {
-<a class="jxr_linenumber" name="L586" href="#L586">586</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
-<a class="jxr_linenumber" name="L587" href="#L587">587</a> 			.&lt;String,String&gt;create()
-<a class="jxr_linenumber" name="L588" href="#L588">588</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L589" href="#L589">589</a> 			.keyFunction(o -&gt; o.toString())
-<a class="jxr_linenumber" name="L590" href="#L590">590</a> 			.build();
+<a class="jxr_linenumber" name="L574" href="#L574">574</a> 	@Test
+<a class="jxr_linenumber" name="L575" href="#L575">575</a> 	<strong class="jxr_keyword">void</strong> m01_add_withKeyFunction() {
+<a class="jxr_linenumber" name="L576" href="#L576">576</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
+<a class="jxr_linenumber" name="L577" href="#L577">577</a> 			.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L578" href="#L578">578</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong> &amp;&amp; v &gt; 0)
+<a class="jxr_linenumber" name="L579" href="#L579">579</a> 			.keyFunction(o -&gt; o.toString())
+<a class="jxr_linenumber" name="L580" href="#L580">580</a> 			.build();
+<a class="jxr_linenumber" name="L581" href="#L581">581</a> 
+<a class="jxr_linenumber" name="L582" href="#L582">582</a> 		map.add(123, 5);   <em class="jxr_comment">// Key converted from Integer to String</em>
+<a class="jxr_linenumber" name="L583" href="#L583">583</a> 		map.add(456, 10);  <em class="jxr_comment">// Key converted from Integer to String</em>
+<a class="jxr_linenumber" name="L584" href="#L584">584</a> 		map.add(789, -1);  <em class="jxr_comment">// Key converted, but value filtered out</em>
+<a class="jxr_linenumber" name="L585" href="#L585">585</a> 
+<a class="jxr_linenumber" name="L586" href="#L586">586</a> 		assertSize(2, map);
+<a class="jxr_linenumber" name="L587" href="#L587">587</a> 		assertEquals(5, map.get(<span class="jxr_string">"123"</span>));
+<a class="jxr_linenumber" name="L588" href="#L588">588</a> 		assertEquals(10, map.get(<span class="jxr_string">"456"</span>));
+<a class="jxr_linenumber" name="L589" href="#L589">589</a> 		assertFalse(map.containsKey(<span class="jxr_string">"789"</span>));
+<a class="jxr_linenumber" name="L590" href="#L590">590</a> 	}
 <a class="jxr_linenumber" name="L591" href="#L591">591</a> 
-<a class="jxr_linenumber" name="L592" href="#L592">592</a> 		map.add(123, <span class="jxr_string">"value1"</span>);  <em class="jxr_comment">// Key converted using function</em>
-<a class="jxr_linenumber" name="L593" href="#L593">593</a> 
-<a class="jxr_linenumber" name="L594" href="#L594">594</a> 		assertSize(1, map);
-<a class="jxr_linenumber" name="L595" href="#L595">595</a> 		assertEquals(<span class="jxr_string">"value1"</span>, map.get(<span class="jxr_string">"123"</span>));
-<a class="jxr_linenumber" name="L596" href="#L596">596</a> 	}
-<a class="jxr_linenumber" name="L597" href="#L597">597</a> 
-<a class="jxr_linenumber" name="L598" href="#L598">598</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L599" href="#L599">599</a> 	<em class="jxr_comment">// add() method - with valueFunction</em>
-<a class="jxr_linenumber" name="L600" href="#L600">600</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L592" href="#L592">592</a> 	@Test
+<a class="jxr_linenumber" name="L593" href="#L593">593</a> 	<strong class="jxr_keyword">void</strong> m02_add_withKeyFunction_noTypeSpecified() {
+<a class="jxr_linenumber" name="L594" href="#L594">594</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
+<a class="jxr_linenumber" name="L595" href="#L595">595</a> 			.&lt;String,String&gt;create()
+<a class="jxr_linenumber" name="L596" href="#L596">596</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L597" href="#L597">597</a> 			.keyFunction(o -&gt; o.toString())
+<a class="jxr_linenumber" name="L598" href="#L598">598</a> 			.build();
+<a class="jxr_linenumber" name="L599" href="#L599">599</a> 
+<a class="jxr_linenumber" name="L600" href="#L600">600</a> 		map.add(123, <span class="jxr_string">"value1"</span>);  <em class="jxr_comment">// Key converted using function</em>
 <a class="jxr_linenumber" name="L601" href="#L601">601</a> 
-<a class="jxr_linenumber" name="L602" href="#L602">602</a> 	@Test
-<a class="jxr_linenumber" name="L603" href="#L603">603</a> 	<strong class="jxr_keyword">void</strong> n01_add_withValueFunction() {
-<a class="jxr_linenumber" name="L604" href="#L604">604</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
-<a class="jxr_linenumber" name="L605" href="#L605">605</a> 			.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L606" href="#L606">606</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong> &amp;&amp; v &gt; 0)
-<a class="jxr_linenumber" name="L607" href="#L607">607</a> 			.valueFunction(o -&gt; Integer.parseInt(o.toString()))
-<a class="jxr_linenumber" name="L608" href="#L608">608</a> 			.build();
+<a class="jxr_linenumber" name="L602" href="#L602">602</a> 		assertSize(1, map);
+<a class="jxr_linenumber" name="L603" href="#L603">603</a> 		assertEquals(<span class="jxr_string">"value1"</span>, map.get(<span class="jxr_string">"123"</span>));
+<a class="jxr_linenumber" name="L604" href="#L604">604</a> 	}
+<a class="jxr_linenumber" name="L605" href="#L605">605</a> 
+<a class="jxr_linenumber" name="L606" href="#L606">606</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L607" href="#L607">607</a> 	<em class="jxr_comment">// add() method - with valueFunction</em>
+<a class="jxr_linenumber" name="L608" href="#L608">608</a> 	<em class="jxr_comment">//====================================================================================================</em>
 <a class="jxr_linenumber" name="L609" href="#L609">609</a> 
-<a class="jxr_linenumber" name="L610" href="#L610">610</a> 		map.add(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"5"</span>);   <em class="jxr_comment">// Value converted from String to Integer</em>
-<a class="jxr_linenumber" name="L611" href="#L611">611</a> 		map.add(<span class="jxr_string">"key2"</span>, <span class="jxr_string">"10"</span>);  <em class="jxr_comment">// Value converted from String to Integer</em>
-<a class="jxr_linenumber" name="L612" href="#L612">612</a> 		map.add(<span class="jxr_string">"key3"</span>, <span class="jxr_string">"-1"</span>);  <em class="jxr_comment">// Value converted, but filtered out</em>
-<a class="jxr_linenumber" name="L613" href="#L613">613</a> 
-<a class="jxr_linenumber" name="L614" href="#L614">614</a> 		assertSize(2, map);
-<a class="jxr_linenumber" name="L615" href="#L615">615</a> 		assertEquals(5, map.get(<span class="jxr_string">"key1"</span>));
-<a class="jxr_linenumber" name="L616" href="#L616">616</a> 		assertEquals(10, map.get(<span class="jxr_string">"key2"</span>));
-<a class="jxr_linenumber" name="L617" href="#L617">617</a> 		assertFalse(map.containsKey(<span class="jxr_string">"key3"</span>));
-<a class="jxr_linenumber" name="L618" href="#L618">618</a> 	}
-<a class="jxr_linenumber" name="L619" href="#L619">619</a> 
-<a class="jxr_linenumber" name="L620" href="#L620">620</a> 	@Test
-<a class="jxr_linenumber" name="L621" href="#L621">621</a> 	<strong class="jxr_keyword">void</strong> n02_add_withValueFunction_noTypeSpecified() {
-<a class="jxr_linenumber" name="L622" href="#L622">622</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
-<a class="jxr_linenumber" name="L623" href="#L623">623</a> 			.&lt;String,Integer&gt;create()
-<a class="jxr_linenumber" name="L624" href="#L624">624</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong> &amp;&amp; v &gt; 0)
-<a class="jxr_linenumber" name="L625" href="#L625">625</a> 			.valueFunction(o -&gt; Integer.parseInt(o.toString()))
-<a class="jxr_linenumber" name="L626" href="#L626">626</a> 			.build();
+<a class="jxr_linenumber" name="L610" href="#L610">610</a> 	@Test
+<a class="jxr_linenumber" name="L611" href="#L611">611</a> 	<strong class="jxr_keyword">void</strong> n01_add_withValueFunction() {
+<a class="jxr_linenumber" name="L612" href="#L612">612</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
+<a class="jxr_linenumber" name="L613" href="#L613">613</a> 			.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L614" href="#L614">614</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong> &amp;&amp; v &gt; 0)
+<a class="jxr_linenumber" name="L615" href="#L615">615</a> 			.valueFunction(o -&gt; Integer.parseInt(o.toString()))
+<a class="jxr_linenumber" name="L616" href="#L616">616</a> 			.build();
+<a class="jxr_linenumber" name="L617" href="#L617">617</a> 
+<a class="jxr_linenumber" name="L618" href="#L618">618</a> 		map.add(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"5"</span>);   <em class="jxr_comment">// Value converted from String to Integer</em>
+<a class="jxr_linenumber" name="L619" href="#L619">619</a> 		map.add(<span class="jxr_string">"key2"</span>, <span class="jxr_string">"10"</span>);  <em class="jxr_comment">// Value converted from String to Integer</em>
+<a class="jxr_linenumber" name="L620" href="#L620">620</a> 		map.add(<span class="jxr_string">"key3"</span>, <span class="jxr_string">"-1"</span>);  <em class="jxr_comment">// Value converted, but filtered out</em>
+<a class="jxr_linenumber" name="L621" href="#L621">621</a> 
+<a class="jxr_linenumber" name="L622" href="#L622">622</a> 		assertSize(2, map);
+<a class="jxr_linenumber" name="L623" href="#L623">623</a> 		assertEquals(5, map.get(<span class="jxr_string">"key1"</span>));
+<a class="jxr_linenumber" name="L624" href="#L624">624</a> 		assertEquals(10, map.get(<span class="jxr_string">"key2"</span>));
+<a class="jxr_linenumber" name="L625" href="#L625">625</a> 		assertFalse(map.containsKey(<span class="jxr_string">"key3"</span>));
+<a class="jxr_linenumber" name="L626" href="#L626">626</a> 	}
 <a class="jxr_linenumber" name="L627" href="#L627">627</a> 
-<a class="jxr_linenumber" name="L628" href="#L628">628</a> 		map.add(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"5"</span>);  <em class="jxr_comment">// Value converted using function</em>
-<a class="jxr_linenumber" name="L629" href="#L629">629</a> 
-<a class="jxr_linenumber" name="L630" href="#L630">630</a> 		assertSize(1, map);
-<a class="jxr_linenumber" name="L631" href="#L631">631</a> 		assertEquals(5, map.get(<span class="jxr_string">"key1"</span>));
-<a class="jxr_linenumber" name="L632" href="#L632">632</a> 	}
-<a class="jxr_linenumber" name="L633" href="#L633">633</a> 
-<a class="jxr_linenumber" name="L634" href="#L634">634</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L635" href="#L635">635</a> 	<em class="jxr_comment">// add() method - with both keyFunction and valueFunction</em>
-<a class="jxr_linenumber" name="L636" href="#L636">636</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L628" href="#L628">628</a> 	@Test
+<a class="jxr_linenumber" name="L629" href="#L629">629</a> 	<strong class="jxr_keyword">void</strong> n02_add_withValueFunction_noTypeSpecified() {
+<a class="jxr_linenumber" name="L630" href="#L630">630</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
+<a class="jxr_linenumber" name="L631" href="#L631">631</a> 			.&lt;String,Integer&gt;create()
+<a class="jxr_linenumber" name="L632" href="#L632">632</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong> &amp;&amp; v &gt; 0)
+<a class="jxr_linenumber" name="L633" href="#L633">633</a> 			.valueFunction(o -&gt; Integer.parseInt(o.toString()))
+<a class="jxr_linenumber" name="L634" href="#L634">634</a> 			.build();
+<a class="jxr_linenumber" name="L635" href="#L635">635</a> 
+<a class="jxr_linenumber" name="L636" href="#L636">636</a> 		map.add(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"5"</span>);  <em class="jxr_comment">// Value converted using function</em>
 <a class="jxr_linenumber" name="L637" href="#L637">637</a> 
-<a class="jxr_linenumber" name="L638" href="#L638">638</a> 	@Test
-<a class="jxr_linenumber" name="L639" href="#L639">639</a> 	<strong class="jxr_keyword">void</strong> o01_add_withBothFunctions() {
-<a class="jxr_linenumber" name="L640" href="#L640">640</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
-<a class="jxr_linenumber" name="L641" href="#L641">641</a> 			.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L642" href="#L642">642</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong> &amp;&amp; v &gt; 0)
-<a class="jxr_linenumber" name="L643" href="#L643">643</a> 			.keyFunction(o -&gt; o.toString())
-<a class="jxr_linenumber" name="L644" href="#L644">644</a> 			.valueFunction(o -&gt; Integer.parseInt(o.toString()))
-<a class="jxr_linenumber" name="L645" href="#L645">645</a> 			.build();
-<a class="jxr_linenumber" name="L646" href="#L646">646</a> 
-<a class="jxr_linenumber" name="L647" href="#L647">647</a> 		map.add(123, <span class="jxr_string">"5"</span>);   <em class="jxr_comment">// Both key and value converted</em>
-<a class="jxr_linenumber" name="L648" href="#L648">648</a> 		map.add(456, <span class="jxr_string">"10"</span>);  <em class="jxr_comment">// Both key and value converted</em>
-<a class="jxr_linenumber" name="L649" href="#L649">649</a> 		map.add(789, <span class="jxr_string">"-1"</span>);  <em class="jxr_comment">// Both converted, but value filtered out</em>
-<a class="jxr_linenumber" name="L650" href="#L650">650</a> 
-<a class="jxr_linenumber" name="L651" href="#L651">651</a> 		assertSize(2, map);
-<a class="jxr_linenumber" name="L652" href="#L652">652</a> 		assertEquals(5, map.get(<span class="jxr_string">"123"</span>));
-<a class="jxr_linenumber" name="L653" href="#L653">653</a> 		assertEquals(10, map.get(<span class="jxr_string">"456"</span>));
-<a class="jxr_linenumber" name="L654" href="#L654">654</a> 		assertFalse(map.containsKey(<span class="jxr_string">"789"</span>));
-<a class="jxr_linenumber" name="L655" href="#L655">655</a> 	}
-<a class="jxr_linenumber" name="L656" href="#L656">656</a> 
-<a class="jxr_linenumber" name="L657" href="#L657">657</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L658" href="#L658">658</a> 	<em class="jxr_comment">// addAll() method</em>
-<a class="jxr_linenumber" name="L659" href="#L659">659</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L660" href="#L660">660</a> 
-<a class="jxr_linenumber" name="L661" href="#L661">661</a> 	@Test
-<a class="jxr_linenumber" name="L662" href="#L662">662</a> 	<strong class="jxr_keyword">void</strong> p01_addAll_withTypeValidation() {
-<a class="jxr_linenumber" name="L663" href="#L663">663</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
-<a class="jxr_linenumber" name="L664" href="#L664">664</a> 			.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L665" href="#L665">665</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong> &amp;&amp; v &gt; 0)
-<a class="jxr_linenumber" name="L666" href="#L666">666</a> 			.build();
-<a class="jxr_linenumber" name="L667" href="#L667">667</a> 
-<a class="jxr_linenumber" name="L668" href="#L668">668</a> 		<strong class="jxr_keyword">var</strong> source = Map.of(
-<a class="jxr_linenumber" name="L669" href="#L669">669</a> 			<span class="jxr_string">"key1"</span>, 5,
-<a class="jxr_linenumber" name="L670" href="#L670">670</a> 			<span class="jxr_string">"key2"</span>, -1,  <em class="jxr_comment">// Filtered out</em>
-<a class="jxr_linenumber" name="L671" href="#L671">671</a> 			<span class="jxr_string">"key3"</span>, 10
-<a class="jxr_linenumber" name="L672" href="#L672">672</a> 		);
-<a class="jxr_linenumber" name="L673" href="#L673">673</a> 
-<a class="jxr_linenumber" name="L674" href="#L674">674</a> 		map.addAll(source);
+<a class="jxr_linenumber" name="L638" href="#L638">638</a> 		assertSize(1, map);
+<a class="jxr_linenumber" name="L639" href="#L639">639</a> 		assertEquals(5, map.get(<span class="jxr_string">"key1"</span>));
+<a class="jxr_linenumber" name="L640" href="#L640">640</a> 	}
+<a class="jxr_linenumber" name="L641" href="#L641">641</a> 
+<a class="jxr_linenumber" name="L642" href="#L642">642</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L643" href="#L643">643</a> 	<em class="jxr_comment">// add() method - with both keyFunction and valueFunction</em>
+<a class="jxr_linenumber" name="L644" href="#L644">644</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L645" href="#L645">645</a> 
+<a class="jxr_linenumber" name="L646" href="#L646">646</a> 	@Test
+<a class="jxr_linenumber" name="L647" href="#L647">647</a> 	<strong class="jxr_keyword">void</strong> o01_add_withBothFunctions() {
+<a class="jxr_linenumber" name="L648" href="#L648">648</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
+<a class="jxr_linenumber" name="L649" href="#L649">649</a> 			.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L650" href="#L650">650</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong> &amp;&amp; v &gt; 0)
+<a class="jxr_linenumber" name="L651" href="#L651">651</a> 			.keyFunction(o -&gt; o.toString())
+<a class="jxr_linenumber" name="L652" href="#L652">652</a> 			.valueFunction(o -&gt; Integer.parseInt(o.toString()))
+<a class="jxr_linenumber" name="L653" href="#L653">653</a> 			.build();
+<a class="jxr_linenumber" name="L654" href="#L654">654</a> 
+<a class="jxr_linenumber" name="L655" href="#L655">655</a> 		map.add(123, <span class="jxr_string">"5"</span>);   <em class="jxr_comment">// Both key and value converted</em>
+<a class="jxr_linenumber" name="L656" href="#L656">656</a> 		map.add(456, <span class="jxr_string">"10"</span>);  <em class="jxr_comment">// Both key and value converted</em>
+<a class="jxr_linenumber" name="L657" href="#L657">657</a> 		map.add(789, <span class="jxr_string">"-1"</span>);  <em class="jxr_comment">// Both converted, but value filtered out</em>
+<a class="jxr_linenumber" name="L658" href="#L658">658</a> 
+<a class="jxr_linenumber" name="L659" href="#L659">659</a> 		assertSize(2, map);
+<a class="jxr_linenumber" name="L660" href="#L660">660</a> 		assertEquals(5, map.get(<span class="jxr_string">"123"</span>));
+<a class="jxr_linenumber" name="L661" href="#L661">661</a> 		assertEquals(10, map.get(<span class="jxr_string">"456"</span>));
+<a class="jxr_linenumber" name="L662" href="#L662">662</a> 		assertFalse(map.containsKey(<span class="jxr_string">"789"</span>));
+<a class="jxr_linenumber" name="L663" href="#L663">663</a> 	}
+<a class="jxr_linenumber" name="L664" href="#L664">664</a> 
+<a class="jxr_linenumber" name="L665" href="#L665">665</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L666" href="#L666">666</a> 	<em class="jxr_comment">// addAll() method</em>
+<a class="jxr_linenumber" name="L667" href="#L667">667</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L668" href="#L668">668</a> 
+<a class="jxr_linenumber" name="L669" href="#L669">669</a> 	@Test
+<a class="jxr_linenumber" name="L670" href="#L670">670</a> 	<strong class="jxr_keyword">void</strong> p01_addAll_withTypeValidation() {
+<a class="jxr_linenumber" name="L671" href="#L671">671</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
+<a class="jxr_linenumber" name="L672" href="#L672">672</a> 			.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L673" href="#L673">673</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong> &amp;&amp; v &gt; 0)
+<a class="jxr_linenumber" name="L674" href="#L674">674</a> 			.build();
 <a class="jxr_linenumber" name="L675" href="#L675">675</a> 
-<a class="jxr_linenumber" name="L676" href="#L676">676</a> 		assertSize(2, map);
-<a class="jxr_linenumber" name="L677" href="#L677">677</a> 		assertEquals(5, map.get(<span class="jxr_string">"key1"</span>));
-<a class="jxr_linenumber" name="L678" href="#L678">678</a> 		assertEquals(10, map.get(<span class="jxr_string">"key3"</span>));
-<a class="jxr_linenumber" name="L679" href="#L679">679</a> 		assertFalse(map.containsKey(<span class="jxr_string">"key2"</span>));
-<a class="jxr_linenumber" name="L680" href="#L680">680</a> 	}
+<a class="jxr_linenumber" name="L676" href="#L676">676</a> 		<strong class="jxr_keyword">var</strong> source = Map.of(
+<a class="jxr_linenumber" name="L677" href="#L677">677</a> 			<span class="jxr_string">"key1"</span>, 5,
+<a class="jxr_linenumber" name="L678" href="#L678">678</a> 			<span class="jxr_string">"key2"</span>, -1,  <em class="jxr_comment">// Filtered out</em>
+<a class="jxr_linenumber" name="L679" href="#L679">679</a> 			<span class="jxr_string">"key3"</span>, 10
+<a class="jxr_linenumber" name="L680" href="#L680">680</a> 		);
 <a class="jxr_linenumber" name="L681" href="#L681">681</a> 
-<a class="jxr_linenumber" name="L682" href="#L682">682</a> 	@Test
-<a class="jxr_linenumber" name="L683" href="#L683">683</a> 	<strong class="jxr_keyword">void</strong> p02_addAll_withValueFunction() {
-<a class="jxr_linenumber" name="L684" href="#L684">684</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
-<a class="jxr_linenumber" name="L685" href="#L685">685</a> 			.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L686" href="#L686">686</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong> &amp;&amp; v &gt; 0)
-<a class="jxr_linenumber" name="L687" href="#L687">687</a> 			.valueFunction(o -&gt; Integer.parseInt(o.toString()))
-<a class="jxr_linenumber" name="L688" href="#L688">688</a> 			.build();
+<a class="jxr_linenumber" name="L682" href="#L682">682</a> 		map.addAll(source);
+<a class="jxr_linenumber" name="L683" href="#L683">683</a> 
+<a class="jxr_linenumber" name="L684" href="#L684">684</a> 		assertSize(2, map);
+<a class="jxr_linenumber" name="L685" href="#L685">685</a> 		assertEquals(5, map.get(<span class="jxr_string">"key1"</span>));
+<a class="jxr_linenumber" name="L686" href="#L686">686</a> 		assertEquals(10, map.get(<span class="jxr_string">"key3"</span>));
+<a class="jxr_linenumber" name="L687" href="#L687">687</a> 		assertFalse(map.containsKey(<span class="jxr_string">"key2"</span>));
+<a class="jxr_linenumber" name="L688" href="#L688">688</a> 	}
 <a class="jxr_linenumber" name="L689" href="#L689">689</a> 
-<a class="jxr_linenumber" name="L690" href="#L690">690</a> 		<strong class="jxr_keyword">var</strong> source = Map.of(
-<a class="jxr_linenumber" name="L691" href="#L691">691</a> 			<span class="jxr_string">"key1"</span>, <span class="jxr_string">"5"</span>,
-<a class="jxr_linenumber" name="L692" href="#L692">692</a> 			<span class="jxr_string">"key2"</span>, <span class="jxr_string">"-1"</span>,  <em class="jxr_comment">// Converted then filtered out</em>
-<a class="jxr_linenumber" name="L693" href="#L693">693</a> 			<span class="jxr_string">"key3"</span>, <span class="jxr_string">"10"</span>
-<a class="jxr_linenumber" name="L694" href="#L694">694</a> 		);
-<a class="jxr_linenumber" name="L695" href="#L695">695</a> 
-<a class="jxr_linenumber" name="L696" href="#L696">696</a> 		map.addAll(source);
+<a class="jxr_linenumber" name="L690" href="#L690">690</a> 	@Test
+<a class="jxr_linenumber" name="L691" href="#L691">691</a> 	<strong class="jxr_keyword">void</strong> p02_addAll_withValueFunction() {
+<a class="jxr_linenumber" name="L692" href="#L692">692</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
+<a class="jxr_linenumber" name="L693" href="#L693">693</a> 			.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L694" href="#L694">694</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong> &amp;&amp; v &gt; 0)
+<a class="jxr_linenumber" name="L695" href="#L695">695</a> 			.valueFunction(o -&gt; Integer.parseInt(o.toString()))
+<a class="jxr_linenumber" name="L696" href="#L696">696</a> 			.build();
 <a class="jxr_linenumber" name="L697" href="#L697">697</a> 
-<a class="jxr_linenumber" name="L698" href="#L698">698</a> 		assertSize(2, map);
-<a class="jxr_linenumber" name="L699" href="#L699">699</a> 		assertEquals(5, map.get(<span class="jxr_string">"key1"</span>));
-<a class="jxr_linenumber" name="L700" href="#L700">700</a> 		assertEquals(10, map.get(<span class="jxr_string">"key3"</span>));
-<a class="jxr_linenumber" name="L701" href="#L701">701</a> 		assertFalse(map.containsKey(<span class="jxr_string">"key2"</span>));
-<a class="jxr_linenumber" name="L702" href="#L702">702</a> 	}
+<a class="jxr_linenumber" name="L698" href="#L698">698</a> 		<strong class="jxr_keyword">var</strong> source = Map.of(
+<a class="jxr_linenumber" name="L699" href="#L699">699</a> 			<span class="jxr_string">"key1"</span>, <span class="jxr_string">"5"</span>,
+<a class="jxr_linenumber" name="L700" href="#L700">700</a> 			<span class="jxr_string">"key2"</span>, <span class="jxr_string">"-1"</span>,  <em class="jxr_comment">// Converted then filtered out</em>
+<a class="jxr_linenumber" name="L701" href="#L701">701</a> 			<span class="jxr_string">"key3"</span>, <span class="jxr_string">"10"</span>
+<a class="jxr_linenumber" name="L702" href="#L702">702</a> 		);
 <a class="jxr_linenumber" name="L703" href="#L703">703</a> 
-<a class="jxr_linenumber" name="L704" href="#L704">704</a> 	@Test
-<a class="jxr_linenumber" name="L705" href="#L705">705</a> 	<strong class="jxr_keyword">void</strong> p03_addAll_withKeyFunction() {
-<a class="jxr_linenumber" name="L706" href="#L706">706</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
-<a class="jxr_linenumber" name="L707" href="#L707">707</a> 			.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L708" href="#L708">708</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong> &amp;&amp; v &gt; 0)
-<a class="jxr_linenumber" name="L709" href="#L709">709</a> 			.keyFunction(o -&gt; o.toString())
-<a class="jxr_linenumber" name="L710" href="#L710">710</a> 			.build();
+<a class="jxr_linenumber" name="L704" href="#L704">704</a> 		map.addAll(source);
+<a class="jxr_linenumber" name="L705" href="#L705">705</a> 
+<a class="jxr_linenumber" name="L706" href="#L706">706</a> 		assertSize(2, map);
+<a class="jxr_linenumber" name="L707" href="#L707">707</a> 		assertEquals(5, map.get(<span class="jxr_string">"key1"</span>));
+<a class="jxr_linenumber" name="L708" href="#L708">708</a> 		assertEquals(10, map.get(<span class="jxr_string">"key3"</span>));
+<a class="jxr_linenumber" name="L709" href="#L709">709</a> 		assertFalse(map.containsKey(<span class="jxr_string">"key2"</span>));
+<a class="jxr_linenumber" name="L710" href="#L710">710</a> 	}
 <a class="jxr_linenumber" name="L711" href="#L711">711</a> 
-<a class="jxr_linenumber" name="L712" href="#L712">712</a> 		<strong class="jxr_keyword">var</strong> source = Map.of(
-<a class="jxr_linenumber" name="L713" href="#L713">713</a> 			123, 5,
-<a class="jxr_linenumber" name="L714" href="#L714">714</a> 			456, -1,  <em class="jxr_comment">// Filtered out</em>
-<a class="jxr_linenumber" name="L715" href="#L715">715</a> 			789, 10
-<a class="jxr_linenumber" name="L716" href="#L716">716</a> 		);
-<a class="jxr_linenumber" name="L717" href="#L717">717</a> 
-<a class="jxr_linenumber" name="L718" href="#L718">718</a> 		map.addAll(source);
+<a class="jxr_linenumber" name="L712" href="#L712">712</a> 	@Test
+<a class="jxr_linenumber" name="L713" href="#L713">713</a> 	<strong class="jxr_keyword">void</strong> p03_addAll_withKeyFunction() {
+<a class="jxr_linenumber" name="L714" href="#L714">714</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
+<a class="jxr_linenumber" name="L715" href="#L715">715</a> 			.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L716" href="#L716">716</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong> &amp;&amp; v &gt; 0)
+<a class="jxr_linenumber" name="L717" href="#L717">717</a> 			.keyFunction(o -&gt; o.toString())
+<a class="jxr_linenumber" name="L718" href="#L718">718</a> 			.build();
 <a class="jxr_linenumber" name="L719" href="#L719">719</a> 
-<a class="jxr_linenumber" name="L720" href="#L720">720</a> 		assertSize(2, map);
-<a class="jxr_linenumber" name="L721" href="#L721">721</a> 		assertEquals(5, map.get(<span class="jxr_string">"123"</span>));
-<a class="jxr_linenumber" name="L722" href="#L722">722</a> 		assertEquals(10, map.get(<span class="jxr_string">"789"</span>));
-<a class="jxr_linenumber" name="L723" href="#L723">723</a> 		assertFalse(map.containsKey(<span class="jxr_string">"456"</span>));
-<a class="jxr_linenumber" name="L724" href="#L724">724</a> 	}
+<a class="jxr_linenumber" name="L720" href="#L720">720</a> 		<strong class="jxr_keyword">var</strong> source = Map.of(
+<a class="jxr_linenumber" name="L721" href="#L721">721</a> 			123, 5,
+<a class="jxr_linenumber" name="L722" href="#L722">722</a> 			456, -1,  <em class="jxr_comment">// Filtered out</em>
+<a class="jxr_linenumber" name="L723" href="#L723">723</a> 			789, 10
+<a class="jxr_linenumber" name="L724" href="#L724">724</a> 		);
 <a class="jxr_linenumber" name="L725" href="#L725">725</a> 
-<a class="jxr_linenumber" name="L726" href="#L726">726</a> 	@Test
-<a class="jxr_linenumber" name="L727" href="#L727">727</a> 	<strong class="jxr_keyword">void</strong> p04_addAll_nullSource() {
-<a class="jxr_linenumber" name="L728" href="#L728">728</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
-<a class="jxr_linenumber" name="L729" href="#L729">729</a> 			.create(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L730" href="#L730">730</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L731" href="#L731">731</a> 			.build();
-<a class="jxr_linenumber" name="L732" href="#L732">732</a> 
-<a class="jxr_linenumber" name="L733" href="#L733">733</a> 		map.addAll(<strong class="jxr_keyword">null</strong>);  <em class="jxr_comment">// Should be no-op</em>
-<a class="jxr_linenumber" name="L734" href="#L734">734</a> 
-<a class="jxr_linenumber" name="L735" href="#L735">735</a> 		assertTrue(map.isEmpty());
-<a class="jxr_linenumber" name="L736" href="#L736">736</a> 		assertSize(0, map);
-<a class="jxr_linenumber" name="L737" href="#L737">737</a> 	}
-<a class="jxr_linenumber" name="L738" href="#L738">738</a> 
-<a class="jxr_linenumber" name="L739" href="#L739">739</a> 	@Test
-<a class="jxr_linenumber" name="L740" href="#L740">740</a> 	<strong class="jxr_keyword">void</strong> p05_addAll_emptySource() {
-<a class="jxr_linenumber" name="L741" href="#L741">741</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
-<a class="jxr_linenumber" name="L742" href="#L742">742</a> 			.create(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L743" href="#L743">743</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L744" href="#L744">744</a> 			.build();
-<a class="jxr_linenumber" name="L745" href="#L745">745</a> 
-<a class="jxr_linenumber" name="L746" href="#L746">746</a> 		map.addAll(Map.of());  <em class="jxr_comment">// Empty map</em>
-<a class="jxr_linenumber" name="L747" href="#L747">747</a> 
-<a class="jxr_linenumber" name="L748" href="#L748">748</a> 		assertTrue(map.isEmpty());
-<a class="jxr_linenumber" name="L749" href="#L749">749</a> 		assertSize(0, map);
-<a class="jxr_linenumber" name="L750" href="#L750">750</a> 	}
-<a class="jxr_linenumber" name="L751" href="#L751">751</a> 
-<a class="jxr_linenumber" name="L752" href="#L752">752</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L753" href="#L753">753</a> 	<em class="jxr_comment">// add() method - return value</em>
-<a class="jxr_linenumber" name="L754" href="#L754">754</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L726" href="#L726">726</a> 		map.addAll(source);
+<a class="jxr_linenumber" name="L727" href="#L727">727</a> 
+<a class="jxr_linenumber" name="L728" href="#L728">728</a> 		assertSize(2, map);
+<a class="jxr_linenumber" name="L729" href="#L729">729</a> 		assertEquals(5, map.get(<span class="jxr_string">"123"</span>));
+<a class="jxr_linenumber" name="L730" href="#L730">730</a> 		assertEquals(10, map.get(<span class="jxr_string">"789"</span>));
+<a class="jxr_linenumber" name="L731" href="#L731">731</a> 		assertFalse(map.containsKey(<span class="jxr_string">"456"</span>));
+<a class="jxr_linenumber" name="L732" href="#L732">732</a> 	}
+<a class="jxr_linenumber" name="L733" href="#L733">733</a> 
+<a class="jxr_linenumber" name="L734" href="#L734">734</a> 	@Test
+<a class="jxr_linenumber" name="L735" href="#L735">735</a> 	<strong class="jxr_keyword">void</strong> p04_addAll_nullSource() {
+<a class="jxr_linenumber" name="L736" href="#L736">736</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
+<a class="jxr_linenumber" name="L737" href="#L737">737</a> 			.create(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L738" href="#L738">738</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L739" href="#L739">739</a> 			.build();
+<a class="jxr_linenumber" name="L740" href="#L740">740</a> 
+<a class="jxr_linenumber" name="L741" href="#L741">741</a> 		map.addAll(<strong class="jxr_keyword">null</strong>);  <em class="jxr_comment">// Should be no-op</em>
+<a class="jxr_linenumber" name="L742" href="#L742">742</a> 
+<a class="jxr_linenumber" name="L743" href="#L743">743</a> 		assertTrue(map.isEmpty());
+<a class="jxr_linenumber" name="L744" href="#L744">744</a> 		assertSize(0, map);
+<a class="jxr_linenumber" name="L745" href="#L745">745</a> 	}
+<a class="jxr_linenumber" name="L746" href="#L746">746</a> 
+<a class="jxr_linenumber" name="L747" href="#L747">747</a> 	@Test
+<a class="jxr_linenumber" name="L748" href="#L748">748</a> 	<strong class="jxr_keyword">void</strong> p05_addAll_emptySource() {
+<a class="jxr_linenumber" name="L749" href="#L749">749</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
+<a class="jxr_linenumber" name="L750" href="#L750">750</a> 			.create(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L751" href="#L751">751</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L752" href="#L752">752</a> 			.build();
+<a class="jxr_linenumber" name="L753" href="#L753">753</a> 
+<a class="jxr_linenumber" name="L754" href="#L754">754</a> 		map.addAll(Map.of());  <em class="jxr_comment">// Empty map</em>
 <a class="jxr_linenumber" name="L755" href="#L755">755</a> 
-<a class="jxr_linenumber" name="L756" href="#L756">756</a> 	@Test
-<a class="jxr_linenumber" name="L757" href="#L757">757</a> 	<strong class="jxr_keyword">void</strong> q01_add_returnValue_newEntry() {
-<a class="jxr_linenumber" name="L758" href="#L758">758</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
-<a class="jxr_linenumber" name="L759" href="#L759">759</a> 			.create(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L760" href="#L760">760</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L761" href="#L761">761</a> 			.build();
-<a class="jxr_linenumber" name="L762" href="#L762">762</a> 
-<a class="jxr_linenumber" name="L763" href="#L763">763</a> 		assertNull(map.add(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>));  <em class="jxr_comment">// New entry, returns null</em>
-<a class="jxr_linenumber" name="L764" href="#L764">764</a> 	}
-<a class="jxr_linenumber" name="L765" href="#L765">765</a> 
-<a class="jxr_linenumber" name="L766" href="#L766">766</a> 	@Test
-<a class="jxr_linenumber" name="L767" href="#L767">767</a> 	<strong class="jxr_keyword">void</strong> q02_add_returnValue_updateExisting() {
-<a class="jxr_linenumber" name="L768" href="#L768">768</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
-<a class="jxr_linenumber" name="L769" href="#L769">769</a> 			.create(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L770" href="#L770">770</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L771" href="#L771">771</a> 			.build();
-<a class="jxr_linenumber" name="L772" href="#L772">772</a> 
-<a class="jxr_linenumber" name="L773" href="#L773">773</a> 		map.add(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L774" href="#L774">774</a> 		assertEquals(<span class="jxr_string">"value1"</span>, map.add(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value2"</span>));  <em class="jxr_comment">// Update, returns old value</em>
-<a class="jxr_linenumber" name="L775" href="#L775">775</a> 	}
-<a class="jxr_linenumber" name="L776" href="#L776">776</a> 
-<a class="jxr_linenumber" name="L777" href="#L777">777</a> 	@Test
-<a class="jxr_linenumber" name="L778" href="#L778">778</a> 	<strong class="jxr_keyword">void</strong> q03_add_returnValue_filteredOut() {
-<a class="jxr_linenumber" name="L779" href="#L779">779</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
-<a class="jxr_linenumber" name="L780" href="#L780">780</a> 			.create(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L781" href="#L781">781</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L782" href="#L782">782</a> 			.build();
-<a class="jxr_linenumber" name="L783" href="#L783">783</a> 
-<a class="jxr_linenumber" name="L784" href="#L784">784</a> 		map.add(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L785" href="#L785">785</a> 		assertNull(map.add(<span class="jxr_string">"key1"</span>, <strong class="jxr_keyword">null</strong>));  <em class="jxr_comment">// Filtered out, returns null (not old value)</em>
-<a class="jxr_linenumber" name="L786" href="#L786">786</a> 		assertEquals(<span class="jxr_string">"value1"</span>, map.get(<span class="jxr_string">"key1"</span>));  <em class="jxr_comment">// Old value still there</em>
-<a class="jxr_linenumber" name="L787" href="#L787">787</a> 	}
-<a class="jxr_linenumber" name="L788" href="#L788">788</a> 
-<a class="jxr_linenumber" name="L789" href="#L789">789</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L790" href="#L790">790</a> 	<em class="jxr_comment">// add() method - edge cases with functions</em>
-<a class="jxr_linenumber" name="L791" href="#L791">791</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L792" href="#L792">792</a> 
-<a class="jxr_linenumber" name="L793" href="#L793">793</a> 	@Test
-<a class="jxr_linenumber" name="L794" href="#L794">794</a> 	<strong class="jxr_keyword">void</strong> r01_add_keyFunctionThrowsException() {
-<a class="jxr_linenumber" name="L795" href="#L795">795</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
-<a class="jxr_linenumber" name="L796" href="#L796">796</a> 			.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L797" href="#L797">797</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L798" href="#L798">798</a> 			.keyFunction(o -&gt; {
-<a class="jxr_linenumber" name="L799" href="#L799">799</a> 				<strong class="jxr_keyword">if</strong> (o == <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L800" href="#L800">800</a> 					<strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> IllegalArgumentException(<span class="jxr_string">"Key cannot be null"</span>);
-<a class="jxr_linenumber" name="L801" href="#L801">801</a> 				<strong class="jxr_keyword">return</strong> o.toString();
-<a class="jxr_linenumber" name="L802" href="#L802">802</a> 			})
-<a class="jxr_linenumber" name="L803" href="#L803">803</a> 			.build();
-<a class="jxr_linenumber" name="L804" href="#L804">804</a> 
-<a class="jxr_linenumber" name="L805" href="#L805">805</a> 		assertThrows(IllegalArgumentException.<strong class="jxr_keyword">class</strong>, () -&gt; {
-<a class="jxr_linenumber" name="L806" href="#L806">806</a> 			map.add(<strong class="jxr_keyword">null</strong>, 5);
-<a class="jxr_linenumber" name="L807" href="#L807">807</a> 		});
-<a class="jxr_linenumber" name="L808" href="#L808">808</a> 	}
-<a class="jxr_linenumber" name="L809" href="#L809">809</a> 
-<a class="jxr_linenumber" name="L810" href="#L810">810</a> 	@Test
-<a class="jxr_linenumber" name="L811" href="#L811">811</a> 	<strong class="jxr_keyword">void</strong> r02_add_valueFunctionThrowsException() {
-<a class="jxr_linenumber" name="L812" href="#L812">812</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
-<a class="jxr_linenumber" name="L813" href="#L813">813</a> 			.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L814" href="#L814">814</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L815" href="#L815">815</a> 			.valueFunction(o -&gt; {
-<a class="jxr_linenumber" name="L816" href="#L816">816</a> 				<strong class="jxr_keyword">if</strong> (o == <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L817" href="#L817">817</a> 					<strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> IllegalArgumentException(<span class="jxr_string">"Value cannot be null"</span>);
-<a class="jxr_linenumber" name="L818" href="#L818">818</a> 				<strong class="jxr_keyword">return</strong> Integer.parseInt(o.toString());
-<a class="jxr_linenumber" name="L819" href="#L819">819</a> 			})
-<a class="jxr_linenumber" name="L820" href="#L820">820</a> 			.build();
-<a class="jxr_linenumber" name="L821" href="#L821">821</a> 
-<a class="jxr_linenumber" name="L822" href="#L822">822</a> 		assertThrows(IllegalArgumentException.<strong class="jxr_keyword">class</strong>, () -&gt; {
-<a class="jxr_linenumber" name="L823" href="#L823">823</a> 			map.add(<span class="jxr_string">"key"</span>, <strong class="jxr_keyword">null</strong>);
-<a class="jxr_linenumber" name="L824" href="#L824">824</a> 		});
-<a class="jxr_linenumber" name="L825" href="#L825">825</a> 	}
-<a class="jxr_linenumber" name="L826" href="#L826">826</a> 
-<a class="jxr_linenumber" name="L827" href="#L827">827</a> 	@Test
-<a class="jxr_linenumber" name="L828" href="#L828">828</a> 	<strong class="jxr_keyword">void</strong> r03_add_valueFunctionReturnsNull() {
-<a class="jxr_linenumber" name="L829" href="#L829">829</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
-<a class="jxr_linenumber" name="L830" href="#L830">830</a> 			.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L831" href="#L831">831</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong> &amp;&amp; v &gt; 0)
-<a class="jxr_linenumber" name="L832" href="#L832">832</a> 			.valueFunction(o -&gt; {
-<a class="jxr_linenumber" name="L833" href="#L833">833</a> 				<strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="L834" href="#L834">834</a> 					<strong class="jxr_keyword">return</strong> Integer.parseInt(o.toString());
-<a class="jxr_linenumber" name="L835" href="#L835">835</a> 				} <strong class="jxr_keyword">catch</strong> (NumberFormatException e) {
-<a class="jxr_linenumber" name="L836" href="#L836">836</a> 					<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;  <em class="jxr_comment">// Return null for invalid numbers</em>
-<a class="jxr_linenumber" name="L837" href="#L837">837</a> 				}
-<a class="jxr_linenumber" name="L838" href="#L838">838</a> 			})
-<a class="jxr_linenumber" name="L839" href="#L839">839</a> 			.build();
-<a class="jxr_linenumber" name="L840" href="#L840">840</a> 
-<a class="jxr_linenumber" name="L841" href="#L841">841</a> 		map.add(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"5"</span>);   <em class="jxr_comment">// Valid, added</em>
-<a class="jxr_linenumber" name="L842" href="#L842">842</a> 		map.add(<span class="jxr_string">"key2"</span>, <span class="jxr_string">"abc"</span>); <em class="jxr_comment">// Function returns null, filtered out</em>
-<a class="jxr_linenumber" name="L843" href="#L843">843</a> 
-<a class="jxr_linenumber" name="L844" href="#L844">844</a> 		assertSize(1, map);
-<a class="jxr_linenumber" name="L845" href="#L845">845</a> 		assertEquals(5, map.get(<span class="jxr_string">"key1"</span>));
-<a class="jxr_linenumber" name="L846" href="#L846">846</a> 		assertFalse(map.containsKey(<span class="jxr_string">"key2"</span>));
-<a class="jxr_linenumber" name="L847" href="#L847">847</a> 	}
+<a class="jxr_linenumber" name="L756" href="#L756">756</a> 		assertTrue(map.isEmpty());
+<a class="jxr_linenumber" name="L757" href="#L757">757</a> 		assertSize(0, map);
+<a class="jxr_linenumber" name="L758" href="#L758">758</a> 	}
+<a class="jxr_linenumber" name="L759" href="#L759">759</a> 
+<a class="jxr_linenumber" name="L760" href="#L760">760</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L761" href="#L761">761</a> 	<em class="jxr_comment">// add() method - return value</em>
+<a class="jxr_linenumber" name="L762" href="#L762">762</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L763" href="#L763">763</a> 
+<a class="jxr_linenumber" name="L764" href="#L764">764</a> 	@Test
+<a class="jxr_linenumber" name="L765" href="#L765">765</a> 	<strong class="jxr_keyword">void</strong> q01_add_returnValue_newEntry() {
+<a class="jxr_linenumber" name="L766" href="#L766">766</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
+<a class="jxr_linenumber" name="L767" href="#L767">767</a> 			.create(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L768" href="#L768">768</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L769" href="#L769">769</a> 			.build();
+<a class="jxr_linenumber" name="L770" href="#L770">770</a> 
+<a class="jxr_linenumber" name="L771" href="#L771">771</a> 		assertNull(map.add(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>));  <em class="jxr_comment">// New entry, returns null</em>
+<a class="jxr_linenumber" name="L772" href="#L772">772</a> 	}
+<a class="jxr_linenumber" name="L773" href="#L773">773</a> 
+<a class="jxr_linenumber" name="L774" href="#L774">774</a> 	@Test
+<a class="jxr_linenumber" name="L775" href="#L775">775</a> 	<strong class="jxr_keyword">void</strong> q02_add_returnValue_updateExisting() {
+<a class="jxr_linenumber" name="L776" href="#L776">776</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
+<a class="jxr_linenumber" name="L777" href="#L777">777</a> 			.create(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L778" href="#L778">778</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L779" href="#L779">779</a> 			.build();
+<a class="jxr_linenumber" name="L780" href="#L780">780</a> 
+<a class="jxr_linenumber" name="L781" href="#L781">781</a> 		map.add(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>);
+<a class="jxr_linenumber" name="L782" href="#L782">782</a> 		assertEquals(<span class="jxr_string">"value1"</span>, map.add(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value2"</span>));  <em class="jxr_comment">// Update, returns old value</em>
+<a class="jxr_linenumber" name="L783" href="#L783">783</a> 	}
+<a class="jxr_linenumber" name="L784" href="#L784">784</a> 
+<a class="jxr_linenumber" name="L785" href="#L785">785</a> 	@Test
+<a class="jxr_linenumber" name="L786" href="#L786">786</a> 	<strong class="jxr_keyword">void</strong> q03_add_returnValue_filteredOut() {
+<a class="jxr_linenumber" name="L787" href="#L787">787</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
+<a class="jxr_linenumber" name="L788" href="#L788">788</a> 			.create(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L789" href="#L789">789</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L790" href="#L790">790</a> 			.build();
+<a class="jxr_linenumber" name="L791" href="#L791">791</a> 
+<a class="jxr_linenumber" name="L792" href="#L792">792</a> 		map.add(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>);
+<a class="jxr_linenumber" name="L793" href="#L793">793</a> 		assertNull(map.add(<span class="jxr_string">"key1"</span>, <strong class="jxr_keyword">null</strong>));  <em class="jxr_comment">// Filtered out, returns null (not old value)</em>
+<a class="jxr_linenumber" name="L794" href="#L794">794</a> 		assertEquals(<span class="jxr_string">"value1"</span>, map.get(<span class="jxr_string">"key1"</span>));  <em class="jxr_comment">// Old value still there</em>
+<a class="jxr_linenumber" name="L795" href="#L795">795</a> 	}
+<a class="jxr_linenumber" name="L796" href="#L796">796</a> 
+<a class="jxr_linenumber" name="L797" href="#L797">797</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L798" href="#L798">798</a> 	<em class="jxr_comment">// add() method - edge cases with functions</em>
+<a class="jxr_linenumber" name="L799" href="#L799">799</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L800" href="#L800">800</a> 
+<a class="jxr_linenumber" name="L801" href="#L801">801</a> 	@Test
+<a class="jxr_linenumber" name="L802" href="#L802">802</a> 	<strong class="jxr_keyword">void</strong> r01_add_keyFunctionThrowsException() {
+<a class="jxr_linenumber" name="L803" href="#L803">803</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
+<a class="jxr_linenumber" name="L804" href="#L804">804</a> 			.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L805" href="#L805">805</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L806" href="#L806">806</a> 			.keyFunction(o -&gt; {
+<a class="jxr_linenumber" name="L807" href="#L807">807</a> 				<strong class="jxr_keyword">if</strong> (o == <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L808" href="#L808">808</a> 					<strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> IllegalArgumentException(<span class="jxr_string">"Key cannot be null"</span>);
+<a class="jxr_linenumber" name="L809" href="#L809">809</a> 				<strong class="jxr_keyword">return</strong> o.toString();
+<a class="jxr_linenumber" name="L810" href="#L810">810</a> 			})
+<a class="jxr_linenumber" name="L811" href="#L811">811</a> 			.build();
+<a class="jxr_linenumber" name="L812" href="#L812">812</a> 
+<a class="jxr_linenumber" name="L813" href="#L813">813</a> 		assertThrows(IllegalArgumentException.<strong class="jxr_keyword">class</strong>, () -&gt; {
+<a class="jxr_linenumber" name="L814" href="#L814">814</a> 			map.add(<strong class="jxr_keyword">null</strong>, 5);
+<a class="jxr_linenumber" name="L815" href="#L815">815</a> 		});
+<a class="jxr_linenumber" name="L816" href="#L816">816</a> 	}
+<a class="jxr_linenumber" name="L817" href="#L817">817</a> 
+<a class="jxr_linenumber" name="L818" href="#L818">818</a> 	@Test
+<a class="jxr_linenumber" name="L819" href="#L819">819</a> 	<strong class="jxr_keyword">void</strong> r02_add_valueFunctionThrowsException() {
+<a class="jxr_linenumber" name="L820" href="#L820">820</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
+<a class="jxr_linenumber" name="L821" href="#L821">821</a> 			.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L822" href="#L822">822</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L823" href="#L823">823</a> 			.valueFunction(o -&gt; {
+<a class="jxr_linenumber" name="L824" href="#L824">824</a> 				<strong class="jxr_keyword">if</strong> (o == <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L825" href="#L825">825</a> 					<strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> IllegalArgumentException(<span class="jxr_string">"Value cannot be null"</span>);
+<a class="jxr_linenumber" name="L826" href="#L826">826</a> 				<strong class="jxr_keyword">return</strong> Integer.parseInt(o.toString());
+<a class="jxr_linenumber" name="L827" href="#L827">827</a> 			})
+<a class="jxr_linenumber" name="L828" href="#L828">828</a> 			.build();
+<a class="jxr_linenumber" name="L829" href="#L829">829</a> 
+<a class="jxr_linenumber" name="L830" href="#L830">830</a> 		assertThrows(IllegalArgumentException.<strong class="jxr_keyword">class</strong>, () -&gt; {
+<a class="jxr_linenumber" name="L831" href="#L831">831</a> 			map.add(<span class="jxr_string">"key"</span>, <strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="L832" href="#L832">832</a> 		});
+<a class="jxr_linenumber" name="L833" href="#L833">833</a> 	}
+<a class="jxr_linenumber" name="L834" href="#L834">834</a> 
+<a class="jxr_linenumber" name="L835" href="#L835">835</a> 	@Test
+<a class="jxr_linenumber" name="L836" href="#L836">836</a> 	<strong class="jxr_keyword">void</strong> r03_add_valueFunctionReturnsNull() {
+<a class="jxr_linenumber" name="L837" href="#L837">837</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
+<a class="jxr_linenumber" name="L838" href="#L838">838</a> 			.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L839" href="#L839">839</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong> &amp;&amp; v &gt; 0)
+<a class="jxr_linenumber" name="L840" href="#L840">840</a> 			.valueFunction(o -&gt; {
+<a class="jxr_linenumber" name="L841" href="#L841">841</a> 				<strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="L842" href="#L842">842</a> 					<strong class="jxr_keyword">return</strong> Integer.parseInt(o.toString());
+<a class="jxr_linenumber" name="L843" href="#L843">843</a> 				} <strong class="jxr_keyword">catch</strong> (NumberFormatException e) {
+<a class="jxr_linenumber" name="L844" href="#L844">844</a> 					<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;  <em class="jxr_comment">// Return null for invalid numbers</em>
+<a class="jxr_linenumber" name="L845" href="#L845">845</a> 				}
+<a class="jxr_linenumber" name="L846" href="#L846">846</a> 			})
+<a class="jxr_linenumber" name="L847" href="#L847">847</a> 			.build();
 <a class="jxr_linenumber" name="L848" href="#L848">848</a> 
-<a class="jxr_linenumber" name="L849" href="#L849">849</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L850" href="#L850">850</a> 	<em class="jxr_comment">// wouldAccept() method</em>
-<a class="jxr_linenumber" name="L851" href="#L851">851</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L852" href="#L852">852</a> 
-<a class="jxr_linenumber" name="L853" href="#L853">853</a> 	@Test
-<a class="jxr_linenumber" name="L854" href="#L854">854</a> 	<strong class="jxr_keyword">void</strong> s01_wouldAccept_returnsTrue() {
-<a class="jxr_linenumber" name="L855" href="#L855">855</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
-<a class="jxr_linenumber" name="L856" href="#L856">856</a> 			.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L857" href="#L857">857</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong> &amp;&amp; v &gt; 0)
-<a class="jxr_linenumber" name="L858" href="#L858">858</a> 			.build();
-<a class="jxr_linenumber" name="L859" href="#L859">859</a> 
-<a class="jxr_linenumber" name="L860" href="#L860">860</a> 		assertTrue(map.wouldAccept(<span class="jxr_string">"key1"</span>, 5));
-<a class="jxr_linenumber" name="L861" href="#L861">861</a> 		assertTrue(map.wouldAccept(<span class="jxr_string">"key2"</span>, 10));
-<a class="jxr_linenumber" name="L862" href="#L862">862</a> 	}
-<a class="jxr_linenumber" name="L863" href="#L863">863</a> 
-<a class="jxr_linenumber" name="L864" href="#L864">864</a> 	@Test
-<a class="jxr_linenumber" name="L865" href="#L865">865</a> 	<strong class="jxr_keyword">void</strong> s02_wouldAccept_returnsFalse() {
-<a class="jxr_linenumber" name="L866" href="#L866">866</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
-<a class="jxr_linenumber" name="L867" href="#L867">867</a> 			.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L868" href="#L868">868</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong> &amp;&amp; v &gt; 0)
-<a class="jxr_linenumber" name="L869" href="#L869">869</a> 			.build();
-<a class="jxr_linenumber" name="L870" href="#L870">870</a> 
-<a class="jxr_linenumber" name="L871" href="#L871">871</a> 		assertFalse(map.wouldAccept(<span class="jxr_string">"key1"</span>, <strong class="jxr_keyword">null</strong>));
-<a class="jxr_linenumber" name="L872" href="#L872">872</a> 		assertFalse(map.wouldAccept(<span class="jxr_string">"key2"</span>, -1));
-<a class="jxr_linenumber" name="L873" href="#L873">873</a> 		assertFalse(map.wouldAccept(<span class="jxr_string">"key3"</span>, 0));
-<a class="jxr_linenumber" name="L874" href="#L874">874</a> 	}
-<a class="jxr_linenumber" name="L875" href="#L875">875</a> 
-<a class="jxr_linenumber" name="L876" href="#L876">876</a> 	@Test
-<a class="jxr_linenumber" name="L877" href="#L877">877</a> 	<strong class="jxr_keyword">void</strong> s03_wouldAccept_usedForPreValidation() {
-<a class="jxr_linenumber" name="L878" href="#L878">878</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
-<a class="jxr_linenumber" name="L879" href="#L879">879</a> 			.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L880" href="#L880">880</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong> &amp;&amp; v &gt; 0)
-<a class="jxr_linenumber" name="L881" href="#L881">881</a> 			.build();
-<a class="jxr_linenumber" name="L882" href="#L882">882</a> 
-<a class="jxr_linenumber" name="L883" href="#L883">883</a> 		<em class="jxr_comment">// Pre-validate before adding</em>
-<a class="jxr_linenumber" name="L884" href="#L884">884</a> 		<strong class="jxr_keyword">if</strong> (map.wouldAccept(<span class="jxr_string">"key1"</span>, 5)) {
-<a class="jxr_linenumber" name="L885" href="#L885">885</a> 			map.put(<span class="jxr_string">"key1"</span>, 5);
-<a class="jxr_linenumber" name="L886" href="#L886">886</a> 		}
-<a class="jxr_linenumber" name="L887" href="#L887">887</a> 		<strong class="jxr_keyword">if</strong> (map.wouldAccept(<span class="jxr_string">"key2"</span>, -1)) {
-<a class="jxr_linenumber" name="L888" href="#L888">888</a> 			map.put(<span class="jxr_string">"key2"</span>, -1);
-<a class="jxr_linenumber" name="L889" href="#L889">889</a> 		}
+<a class="jxr_linenumber" name="L849" href="#L849">849</a> 		map.add(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"5"</span>);   <em class="jxr_comment">// Valid, added</em>
+<a class="jxr_linenumber" name="L850" href="#L850">850</a> 		map.add(<span class="jxr_string">"key2"</span>, <span class="jxr_string">"abc"</span>); <em class="jxr_comment">// Function returns null, filtered out</em>
+<a class="jxr_linenumber" name="L851" href="#L851">851</a> 
+<a class="jxr_linenumber" name="L852" href="#L852">852</a> 		assertSize(1, map);
+<a class="jxr_linenumber" name="L853" href="#L853">853</a> 		assertEquals(5, map.get(<span class="jxr_string">"key1"</span>));
+<a class="jxr_linenumber" name="L854" href="#L854">854</a> 		assertFalse(map.containsKey(<span class="jxr_string">"key2"</span>));
+<a class="jxr_linenumber" name="L855" href="#L855">855</a> 	}
+<a class="jxr_linenumber" name="L856" href="#L856">856</a> 
+<a class="jxr_linenumber" name="L857" href="#L857">857</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L858" href="#L858">858</a> 	<em class="jxr_comment">// wouldAccept() method</em>
+<a class="jxr_linenumber" name="L859" href="#L859">859</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L860" href="#L860">860</a> 
+<a class="jxr_linenumber" name="L861" href="#L861">861</a> 	@Test
+<a class="jxr_linenumber" name="L862" href="#L862">862</a> 	<strong class="jxr_keyword">void</strong> s01_wouldAccept_returnsTrue() {
+<a class="jxr_linenumber" name="L863" href="#L863">863</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
+<a class="jxr_linenumber" name="L864" href="#L864">864</a> 			.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L865" href="#L865">865</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong> &amp;&amp; v &gt; 0)
+<a class="jxr_linenumber" name="L866" href="#L866">866</a> 			.build();
+<a class="jxr_linenumber" name="L867" href="#L867">867</a> 
+<a class="jxr_linenumber" name="L868" href="#L868">868</a> 		assertTrue(map.wouldAccept(<span class="jxr_string">"key1"</span>, 5));
+<a class="jxr_linenumber" name="L869" href="#L869">869</a> 		assertTrue(map.wouldAccept(<span class="jxr_string">"key2"</span>, 10));
+<a class="jxr_linenumber" name="L870" href="#L870">870</a> 	}
+<a class="jxr_linenumber" name="L871" href="#L871">871</a> 
+<a class="jxr_linenumber" name="L872" href="#L872">872</a> 	@Test
+<a class="jxr_linenumber" name="L873" href="#L873">873</a> 	<strong class="jxr_keyword">void</strong> s02_wouldAccept_returnsFalse() {
+<a class="jxr_linenumber" name="L874" href="#L874">874</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
+<a class="jxr_linenumber" name="L875" href="#L875">875</a> 			.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L876" href="#L876">876</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong> &amp;&amp; v &gt; 0)
+<a class="jxr_linenumber" name="L877" href="#L877">877</a> 			.build();
+<a class="jxr_linenumber" name="L878" href="#L878">878</a> 
+<a class="jxr_linenumber" name="L879" href="#L879">879</a> 		assertFalse(map.wouldAccept(<span class="jxr_string">"key1"</span>, <strong class="jxr_keyword">null</strong>));
+<a class="jxr_linenumber" name="L880" href="#L880">880</a> 		assertFalse(map.wouldAccept(<span class="jxr_string">"key2"</span>, -1));
+<a class="jxr_linenumber" name="L881" href="#L881">881</a> 		assertFalse(map.wouldAccept(<span class="jxr_string">"key3"</span>, 0));
+<a class="jxr_linenumber" name="L882" href="#L882">882</a> 	}
+<a class="jxr_linenumber" name="L883" href="#L883">883</a> 
+<a class="jxr_linenumber" name="L884" href="#L884">884</a> 	@Test
+<a class="jxr_linenumber" name="L885" href="#L885">885</a> 	<strong class="jxr_keyword">void</strong> s03_wouldAccept_usedForPreValidation() {
+<a class="jxr_linenumber" name="L886" href="#L886">886</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
+<a class="jxr_linenumber" name="L887" href="#L887">887</a> 			.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L888" href="#L888">888</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong> &amp;&amp; v &gt; 0)
+<a class="jxr_linenumber" name="L889" href="#L889">889</a> 			.build();
 <a class="jxr_linenumber" name="L890" href="#L890">890</a> 
-<a class="jxr_linenumber" name="L891" href="#L891">891</a> 		assertSize(1, map);
-<a class="jxr_linenumber" name="L892" href="#L892">892</a> 		assertTrue(map.containsKey(<span class="jxr_string">"key1"</span>));
-<a class="jxr_linenumber" name="L893" href="#L893">893</a> 		assertFalse(map.containsKey(<span class="jxr_string">"key2"</span>));
-<a class="jxr_linenumber" name="L894" href="#L894">894</a> 	}
-<a class="jxr_linenumber" name="L895" href="#L895">895</a> 
-<a class="jxr_linenumber" name="L896" href="#L896">896</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L897" href="#L897">897</a> 	<em class="jxr_comment">// getFilter() method</em>
-<a class="jxr_linenumber" name="L898" href="#L898">898</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L899" href="#L899">899</a> 
-<a class="jxr_linenumber" name="L900" href="#L900">900</a> 	@Test
-<a class="jxr_linenumber" name="L901" href="#L901">901</a> 	<strong class="jxr_keyword">void</strong> t01_getFilter_returnsFilter() {
-<a class="jxr_linenumber" name="L902" href="#L902">902</a> 		<strong class="jxr_keyword">var</strong> originalFilter = (BiPredicate&lt;String, Integer&gt;)((k, v) -&gt; v != <strong class="jxr_keyword">null</strong> &amp;&amp; v &gt; 0);
-<a class="jxr_linenumber" name="L903" href="#L903">903</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
-<a class="jxr_linenumber" name="L904" href="#L904">904</a> 			.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L905" href="#L905">905</a> 			.filter(originalFilter)
-<a class="jxr_linenumber" name="L906" href="#L906">906</a> 			.build();
+<a class="jxr_linenumber" name="L891" href="#L891">891</a> 		<em class="jxr_comment">// Pre-validate before adding</em>
+<a class="jxr_linenumber" name="L892" href="#L892">892</a> 		<strong class="jxr_keyword">if</strong> (map.wouldAccept(<span class="jxr_string">"key1"</span>, 5)) {
+<a class="jxr_linenumber" name="L893" href="#L893">893</a> 			map.put(<span class="jxr_string">"key1"</span>, 5);
+<a class="jxr_linenumber" name="L894" href="#L894">894</a> 		}
+<a class="jxr_linenumber" name="L895" href="#L895">895</a> 		<strong class="jxr_keyword">if</strong> (map.wouldAccept(<span class="jxr_string">"key2"</span>, -1)) {
+<a class="jxr_linenumber" name="L896" href="#L896">896</a> 			map.put(<span class="jxr_string">"key2"</span>, -1);
+<a class="jxr_linenumber" name="L897" href="#L897">897</a> 		}
+<a class="jxr_linenumber" name="L898" href="#L898">898</a> 
+<a class="jxr_linenumber" name="L899" href="#L899">899</a> 		assertSize(1, map);
+<a class="jxr_linenumber" name="L900" href="#L900">900</a> 		assertTrue(map.containsKey(<span class="jxr_string">"key1"</span>));
+<a class="jxr_linenumber" name="L901" href="#L901">901</a> 		assertFalse(map.containsKey(<span class="jxr_string">"key2"</span>));
+<a class="jxr_linenumber" name="L902" href="#L902">902</a> 	}
+<a class="jxr_linenumber" name="L903" href="#L903">903</a> 
+<a class="jxr_linenumber" name="L904" href="#L904">904</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L905" href="#L905">905</a> 	<em class="jxr_comment">// getFilter() method</em>
+<a class="jxr_linenumber" name="L906" href="#L906">906</a> 	<em class="jxr_comment">//====================================================================================================</em>
 <a class="jxr_linenumber" name="L907" href="#L907">907</a> 
-<a class="jxr_linenumber" name="L908" href="#L908">908</a> 		<strong class="jxr_keyword">var</strong> retrievedFilter = map.getFilter();
-<a class="jxr_linenumber" name="L909" href="#L909">909</a> 		assertNotNull(retrievedFilter);
-<a class="jxr_linenumber" name="L910" href="#L910">910</a> 		assertSame(originalFilter, retrievedFilter);  <em class="jxr_comment">// Should be the same instance</em>
-<a class="jxr_linenumber" name="L911" href="#L911">911</a> 	}
-<a class="jxr_linenumber" name="L912" href="#L912">912</a> 
-<a class="jxr_linenumber" name="L913" href="#L913">913</a> 	@Test
-<a class="jxr_linenumber" name="L914" href="#L914">914</a> 	<strong class="jxr_keyword">void</strong> t02_getFilter_canBeUsedForOtherPurposes() {
-<a class="jxr_linenumber" name="L915" href="#L915">915</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
-<a class="jxr_linenumber" name="L916" href="#L916">916</a> 			.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L917" href="#L917">917</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong> &amp;&amp; v &gt; 0)
-<a class="jxr_linenumber" name="L918" href="#L918">918</a> 			.build();
-<a class="jxr_linenumber" name="L919" href="#L919">919</a> 
-<a class="jxr_linenumber" name="L920" href="#L920">920</a> 		<strong class="jxr_keyword">var</strong> filter = map.getFilter();
-<a class="jxr_linenumber" name="L921" href="#L921">921</a> 
-<a class="jxr_linenumber" name="L922" href="#L922">922</a> 		<em class="jxr_comment">// Use the filter independently</em>
-<a class="jxr_linenumber" name="L923" href="#L923">923</a> 		assertTrue(filter.test(<span class="jxr_string">"key1"</span>, 5));
-<a class="jxr_linenumber" name="L924" href="#L924">924</a> 		assertFalse(filter.test(<span class="jxr_string">"key2"</span>, -1));
-<a class="jxr_linenumber" name="L925" href="#L925">925</a> 	}
-<a class="jxr_linenumber" name="L926" href="#L926">926</a> 
-<a class="jxr_linenumber" name="L927" href="#L927">927</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L928" href="#L928">928</a> 	<em class="jxr_comment">// Builder.functions() convenience method</em>
-<a class="jxr_linenumber" name="L929" href="#L929">929</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L908" href="#L908">908</a> 	@Test
+<a class="jxr_linenumber" name="L909" href="#L909">909</a> 	<strong class="jxr_keyword">void</strong> t01_getFilter_returnsFilter() {
+<a class="jxr_linenumber" name="L910" href="#L910">910</a> 		<strong class="jxr_keyword">var</strong> originalFilter = (BiPredicate&lt;String, Integer&gt;)((k, v) -&gt; v != <strong class="jxr_keyword">null</strong> &amp;&amp; v &gt; 0);
+<a class="jxr_linenumber" name="L911" href="#L911">911</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
+<a class="jxr_linenumber" name="L912" href="#L912">912</a> 			.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L913" href="#L913">913</a> 			.filter(originalFilter)
+<a class="jxr_linenumber" name="L914" href="#L914">914</a> 			.build();
+<a class="jxr_linenumber" name="L915" href="#L915">915</a> 
+<a class="jxr_linenumber" name="L916" href="#L916">916</a> 		<strong class="jxr_keyword">var</strong> retrievedFilter = map.getFilter();
+<a class="jxr_linenumber" name="L917" href="#L917">917</a> 		assertNotNull(retrievedFilter);
+<a class="jxr_linenumber" name="L918" href="#L918">918</a> 		<em class="jxr_comment">// The filter may be combined with the default filter, so test behavior instead of instance equality</em>
+<a class="jxr_linenumber" name="L919" href="#L919">919</a> 		assertTrue(retrievedFilter.test(<span class="jxr_string">"key1"</span>, 5));   <em class="jxr_comment">// Should accept positive values</em>
+<a class="jxr_linenumber" name="L920" href="#L920">920</a> 		assertFalse(retrievedFilter.test(<span class="jxr_string">"key2"</span>, -1)); <em class="jxr_comment">// Should reject negative values</em>
+<a class="jxr_linenumber" name="L921" href="#L921">921</a> 		assertFalse(retrievedFilter.test(<span class="jxr_string">"key3"</span>, <strong class="jxr_keyword">null</strong>)); <em class="jxr_comment">// Should reject null values</em>
+<a class="jxr_linenumber" name="L922" href="#L922">922</a> 	}
+<a class="jxr_linenumber" name="L923" href="#L923">923</a> 
+<a class="jxr_linenumber" name="L924" href="#L924">924</a> 	@Test
+<a class="jxr_linenumber" name="L925" href="#L925">925</a> 	<strong class="jxr_keyword">void</strong> t02_getFilter_canBeUsedForOtherPurposes() {
+<a class="jxr_linenumber" name="L926" href="#L926">926</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
+<a class="jxr_linenumber" name="L927" href="#L927">927</a> 			.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L928" href="#L928">928</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong> &amp;&amp; v &gt; 0)
+<a class="jxr_linenumber" name="L929" href="#L929">929</a> 			.build();
 <a class="jxr_linenumber" name="L930" href="#L930">930</a> 
-<a class="jxr_linenumber" name="L931" href="#L931">931</a> 	@Test
-<a class="jxr_linenumber" name="L932" href="#L932">932</a> 	<strong class="jxr_keyword">void</strong> u01_builder_functions_setsBothAtOnce() {
-<a class="jxr_linenumber" name="L933" href="#L933">933</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
-<a class="jxr_linenumber" name="L934" href="#L934">934</a> 			.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L935" href="#L935">935</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong> &amp;&amp; v &gt; 0)
-<a class="jxr_linenumber" name="L936" href="#L936">936</a> 			.functions(
-<a class="jxr_linenumber" name="L937" href="#L937">937</a> 				o -&gt; o.toString(),                    <em class="jxr_comment">// Key function</em>
-<a class="jxr_linenumber" name="L938" href="#L938">938</a> 				o -&gt; Integer.parseInt(o.toString())   <em class="jxr_comment">// Value function</em>
-<a class="jxr_linenumber" name="L939" href="#L939">939</a> 			)
-<a class="jxr_linenumber" name="L940" href="#L940">940</a> 			.build();
+<a class="jxr_linenumber" name="L931" href="#L931">931</a> 		<strong class="jxr_keyword">var</strong> filter = map.getFilter();
+<a class="jxr_linenumber" name="L932" href="#L932">932</a> 
+<a class="jxr_linenumber" name="L933" href="#L933">933</a> 		<em class="jxr_comment">// Use the filter independently</em>
+<a class="jxr_linenumber" name="L934" href="#L934">934</a> 		assertTrue(filter.test(<span class="jxr_string">"key1"</span>, 5));
+<a class="jxr_linenumber" name="L935" href="#L935">935</a> 		assertFalse(filter.test(<span class="jxr_string">"key2"</span>, -1));
+<a class="jxr_linenumber" name="L936" href="#L936">936</a> 	}
+<a class="jxr_linenumber" name="L937" href="#L937">937</a> 
+<a class="jxr_linenumber" name="L938" href="#L938">938</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L939" href="#L939">939</a> 	<em class="jxr_comment">// Builder.functions() convenience method</em>
+<a class="jxr_linenumber" name="L940" href="#L940">940</a> 	<em class="jxr_comment">//====================================================================================================</em>
 <a class="jxr_linenumber" name="L941" href="#L941">941</a> 
-<a class="jxr_linenumber" name="L942" href="#L942">942</a> 		map.add(123, <span class="jxr_string">"5"</span>);   <em class="jxr_comment">// Both key and value converted</em>
-<a class="jxr_linenumber" name="L943" href="#L943">943</a> 		map.add(456, <span class="jxr_string">"10"</span>);  <em class="jxr_comment">// Both key and value converted</em>
-<a class="jxr_linenumber" name="L944" href="#L944">944</a> 
-<a class="jxr_linenumber" name="L945" href="#L945">945</a> 		assertSize(2, map);
-<a class="jxr_linenumber" name="L946" href="#L946">946</a> 		assertEquals(5, map.get(<span class="jxr_string">"123"</span>));
-<a class="jxr_linenumber" name="L947" href="#L947">947</a> 		assertEquals(10, map.get(<span class="jxr_string">"456"</span>));
-<a class="jxr_linenumber" name="L948" href="#L948">948</a> 	}
-<a class="jxr_linenumber" name="L949" href="#L949">949</a> 
-<a class="jxr_linenumber" name="L950" href="#L950">950</a> 	@Test
-<a class="jxr_linenumber" name="L951" href="#L951">951</a> 	<strong class="jxr_keyword">void</strong> u02_builder_functions_withNullFunctions() {
-<a class="jxr_linenumber" name="L952" href="#L952">952</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
-<a class="jxr_linenumber" name="L953" href="#L953">953</a> 			.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L954" href="#L954">954</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L955" href="#L955">955</a> 			.functions(<strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>)  <em class="jxr_comment">// Both functions null</em>
-<a class="jxr_linenumber" name="L956" href="#L956">956</a> 			.build();
-<a class="jxr_linenumber" name="L957" href="#L957">957</a> 
-<a class="jxr_linenumber" name="L958" href="#L958">958</a> 		map.add(<span class="jxr_string">"key1"</span>, 5);  <em class="jxr_comment">// No conversion, direct add</em>
-<a class="jxr_linenumber" name="L959" href="#L959">959</a> 
-<a class="jxr_linenumber" name="L960" href="#L960">960</a> 		assertSize(1, map);
-<a class="jxr_linenumber" name="L961" href="#L961">961</a> 		assertEquals(5, map.get(<span class="jxr_string">"key1"</span>));
-<a class="jxr_linenumber" name="L962" href="#L962">962</a> 	}
-<a class="jxr_linenumber" name="L963" href="#L963">963</a> 
-<a class="jxr_linenumber" name="L964" href="#L964">964</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L965" href="#L965">965</a> 	<em class="jxr_comment">// Null handling for primitive types</em>
-<a class="jxr_linenumber" name="L966" href="#L966">966</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L967" href="#L967">967</a> 
-<a class="jxr_linenumber" name="L968" href="#L968">968</a> 	@Test
-<a class="jxr_linenumber" name="L969" href="#L969">969</a> 	<strong class="jxr_keyword">void</strong> v01_add_nullKeyForPrimitiveType_throwsException() {
-<a class="jxr_linenumber" name="L970" href="#L970">970</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
-<a class="jxr_linenumber" name="L971" href="#L971">971</a> 			.create(<strong class="jxr_keyword">int</strong>.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L972" href="#L972">972</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L973" href="#L973">973</a> 			.build();
+<a class="jxr_linenumber" name="L942" href="#L942">942</a> 	@Test
+<a class="jxr_linenumber" name="L943" href="#L943">943</a> 	<strong class="jxr_keyword">void</strong> u01_builder_functions_setsBothAtOnce() {
+<a class="jxr_linenumber" name="L944" href="#L944">944</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
+<a class="jxr_linenumber" name="L945" href="#L945">945</a> 			.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L946" href="#L946">946</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong> &amp;&amp; v &gt; 0)
+<a class="jxr_linenumber" name="L947" href="#L947">947</a> 			.functions(
+<a class="jxr_linenumber" name="L948" href="#L948">948</a> 				o -&gt; o.toString(),                    <em class="jxr_comment">// Key function</em>
+<a class="jxr_linenumber" name="L949" href="#L949">949</a> 				o -&gt; Integer.parseInt(o.toString())   <em class="jxr_comment">// Value function</em>
+<a class="jxr_linenumber" name="L950" href="#L950">950</a> 			)
+<a class="jxr_linenumber" name="L951" href="#L951">951</a> 			.build();
+<a class="jxr_linenumber" name="L952" href="#L952">952</a> 
+<a class="jxr_linenumber" name="L953" href="#L953">953</a> 		map.add(123, <span class="jxr_string">"5"</span>);   <em class="jxr_comment">// Both key and value converted</em>
+<a class="jxr_linenumber" name="L954" href="#L954">954</a> 		map.add(456, <span class="jxr_string">"10"</span>);  <em class="jxr_comment">// Both key and value converted</em>
+<a class="jxr_linenumber" name="L955" href="#L955">955</a> 
+<a class="jxr_linenumber" name="L956" href="#L956">956</a> 		assertSize(2, map);
+<a class="jxr_linenumber" name="L957" href="#L957">957</a> 		assertEquals(5, map.get(<span class="jxr_string">"123"</span>));
+<a class="jxr_linenumber" name="L958" href="#L958">958</a> 		assertEquals(10, map.get(<span class="jxr_string">"456"</span>));
+<a class="jxr_linenumber" name="L959" href="#L959">959</a> 	}
+<a class="jxr_linenumber" name="L960" href="#L960">960</a> 
+<a class="jxr_linenumber" name="L961" href="#L961">961</a> 	@Test
+<a class="jxr_linenumber" name="L962" href="#L962">962</a> 	<strong class="jxr_keyword">void</strong> u02_builder_functions_withNullFunctions() {
+<a class="jxr_linenumber" name="L963" href="#L963">963</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
+<a class="jxr_linenumber" name="L964" href="#L964">964</a> 			.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L965" href="#L965">965</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L966" href="#L966">966</a> 			.functions(<strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>)  <em class="jxr_comment">// Both functions null</em>
+<a class="jxr_linenumber" name="L967" href="#L967">967</a> 			.build();
+<a class="jxr_linenumber" name="L968" href="#L968">968</a> 
+<a class="jxr_linenumber" name="L969" href="#L969">969</a> 		map.add(<span class="jxr_string">"key1"</span>, 5);  <em class="jxr_comment">// No conversion, direct add</em>
+<a class="jxr_linenumber" name="L970" href="#L970">970</a> 
+<a class="jxr_linenumber" name="L971" href="#L971">971</a> 		assertSize(1, map);
+<a class="jxr_linenumber" name="L972" href="#L972">972</a> 		assertEquals(5, map.get(<span class="jxr_string">"key1"</span>));
+<a class="jxr_linenumber" name="L973" href="#L973">973</a> 	}
 <a class="jxr_linenumber" name="L974" href="#L974">974</a> 
-<a class="jxr_linenumber" name="L975" href="#L975">975</a> 		assertThrowsWithMessage(RuntimeException.<strong class="jxr_keyword">class</strong>, <span class="jxr_string">"Cannot set null key for primitive type"</span>, () -&gt; {
-<a class="jxr_linenumber" name="L976" href="#L976">976</a> 			map.add(<strong class="jxr_keyword">null</strong>, <span class="jxr_string">"value"</span>);
-<a class="jxr_linenumber" name="L977" href="#L977">977</a> 		});
-<a class="jxr_linenumber" name="L978" href="#L978">978</a> 	}
-<a class="jxr_linenumber" name="L979" href="#L979">979</a> 
-<a class="jxr_linenumber" name="L980" href="#L980">980</a> 	@Test
-<a class="jxr_linenumber" name="L981" href="#L981">981</a> 	<strong class="jxr_keyword">void</strong> v02_add_nullValueForPrimitiveType_throwsException() {
-<a class="jxr_linenumber" name="L982" href="#L982">982</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
-<a class="jxr_linenumber" name="L983" href="#L983">983</a> 			.create(String.<strong class="jxr_keyword">class</strong>, <strong class="jxr_keyword">int</strong>.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L984" href="#L984">984</a> 			.filter((k, v) -&gt; <strong class="jxr_keyword">true</strong>)
-<a class="jxr_linenumber" name="L985" href="#L985">985</a> 			.build();
-<a class="jxr_linenumber" name="L986" href="#L986">986</a> 
-<a class="jxr_linenumber" name="L987" href="#L987">987</a> 		assertThrowsWithMessage(RuntimeException.<strong class="jxr_keyword">class</strong>, <span class="jxr_string">"Cannot set null value for primitive type"</span>, () -&gt; {
-<a class="jxr_linenumber" name="L988" href="#L988">988</a> 			map.add(<span class="jxr_string">"key"</span>, <strong class="jxr_keyword">null</strong>);
-<a class="jxr_linenumber" name="L989" href="#L989">989</a> 		});
-<a class="jxr_linenumber" name="L990" href="#L990">990</a> 	}
-<a class="jxr_linenumber" name="L991" href="#L991">991</a> 
-<a class="jxr_linenumber" name="L992" href="#L992">992</a> 	@Test
-<a class="jxr_linenumber" name="L993" href="#L993">993</a> 	<strong class="jxr_keyword">void</strong> v03_add_nullForWrapperType_allowed() {
-<a class="jxr_linenumber" name="L994" href="#L994">994</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
-<a class="jxr_linenumber" name="L995" href="#L995">995</a> 			.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L996" href="#L996">996</a> 			.filter((k, v) -&gt; <strong class="jxr_keyword">true</strong>)  <em class="jxr_comment">// Accept all, including null</em>
-<a class="jxr_linenumber" name="L997" href="#L997">997</a> 			.build();
-<a class="jxr_linenumber" name="L998" href="#L998">998</a> 
-<a class="jxr_linenumber" name="L999" href="#L999">999</a> 		map.add(<span class="jxr_string">"key1"</span>, <strong class="jxr_keyword">null</strong>);  <em class="jxr_comment">// Should work for wrapper types</em>
-<a class="jxr_linenumber" name="L1000" href="#L1000">1000</a> 		map.add(<strong class="jxr_keyword">null</strong>, 5);       <em class="jxr_comment">// Should work for wrapper types</em>
-<a class="jxr_linenumber" name="L1001" href="#L1001">1001</a> 
-<a class="jxr_linenumber" name="L1002" href="#L1002">1002</a> 		assertSize(2, map);
-<a class="jxr_linenumber" name="L1003" href="#L1003">1003</a> 		assertNull(map.get(<span class="jxr_string">"key1"</span>));
-<a class="jxr_linenumber" name="L1004" href="#L1004">1004</a> 		assertEquals(5, map.get(<strong class="jxr_keyword">null</strong>));
-<a class="jxr_linenumber" name="L1005" href="#L1005">1005</a> 	}
-<a class="jxr_linenumber" name="L1006" href="#L1006">1006</a> 
-<a class="jxr_linenumber" name="L1007" href="#L1007">1007</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L1008" href="#L1008">1008</a> 	<em class="jxr_comment">// toString(), equals(), hashCode()</em>
-<a class="jxr_linenumber" name="L1009" href="#L1009">1009</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L1010" href="#L1010">1010</a> 
-<a class="jxr_linenumber" name="L1011" href="#L1011">1011</a> 	@Test
-<a class="jxr_linenumber" name="L1012" href="#L1012">1012</a> 	<strong class="jxr_keyword">void</strong> w01_toString_delegatesToUnderlyingMap() {
-<a class="jxr_linenumber" name="L1013" href="#L1013">1013</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
-<a class="jxr_linenumber" name="L1014" href="#L1014">1014</a> 			.create(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L1015" href="#L1015">1015</a> 			.filter((k, v) -&gt; <strong class="jxr_keyword">true</strong>)
-<a class="jxr_linenumber" name="L1016" href="#L1016">1016</a> 			.build();
-<a class="jxr_linenumber" name="L1017" href="#L1017">1017</a> 		map.put(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L1018" href="#L1018">1018</a> 		map.put(<span class="jxr_string">"key2"</span>, <span class="jxr_string">"value2"</span>);
-<a class="jxr_linenumber" name="L1019" href="#L1019">1019</a> 
-<a class="jxr_linenumber" name="L1020" href="#L1020">1020</a> 		<strong class="jxr_keyword">var</strong> underlyingMap = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String, String&gt;();
-<a class="jxr_linenumber" name="L1021" href="#L1021">1021</a> 		underlyingMap.put(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L1022" href="#L1022">1022</a> 		underlyingMap.put(<span class="jxr_string">"key2"</span>, <span class="jxr_string">"value2"</span>);
-<a class="jxr_linenumber" name="L1023" href="#L1023">1023</a> 
-<a class="jxr_linenumber" name="L1024" href="#L1024">1024</a> 		assertEquals(underlyingMap.toString(), map.toString());
-<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> 	@Test
-<a class="jxr_linenumber" name="L1028" href="#L1028">1028</a> 	<strong class="jxr_keyword">void</strong> w02_equals_delegatesToUnderlyingMap() {
-<a class="jxr_linenumber" name="L1029" href="#L1029">1029</a> 		<strong class="jxr_keyword">var</strong> map1 = FilteredMap
-<a class="jxr_linenumber" name="L1030" href="#L1030">1030</a> 			.create(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L1031" href="#L1031">1031</a> 			.filter((k, v) -&gt; <strong class="jxr_keyword">true</strong>)
-<a class="jxr_linenumber" name="L1032" href="#L1032">1032</a> 			.build();
-<a class="jxr_linenumber" name="L1033" href="#L1033">1033</a> 		map1.put(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L1034" href="#L1034">1034</a> 		map1.put(<span class="jxr_string">"key2"</span>, <span class="jxr_string">"value2"</span>);
-<a class="jxr_linenumber" name="L1035" href="#L1035">1035</a> 
-<a class="jxr_linenumber" name="L1036" href="#L1036">1036</a> 		<strong class="jxr_keyword">var</strong> map2 = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String, String&gt;();
-<a class="jxr_linenumber" name="L1037" href="#L1037">1037</a> 		map2.put(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L1038" href="#L1038">1038</a> 		map2.put(<span class="jxr_string">"key2"</span>, <span class="jxr_string">"value2"</span>);
-<a class="jxr_linenumber" name="L1039" href="#L1039">1039</a> 
-<a class="jxr_linenumber" name="L1040" href="#L1040">1040</a> 		assertTrue(map1.equals(map2));
-<a class="jxr_linenumber" name="L1041" href="#L1041">1041</a> 		assertTrue(map2.equals(map1));
-<a class="jxr_linenumber" name="L1042" href="#L1042">1042</a> 	}
-<a class="jxr_linenumber" name="L1043" href="#L1043">1043</a> 
-<a class="jxr_linenumber" name="L1044" href="#L1044">1044</a> 	@Test
-<a class="jxr_linenumber" name="L1045" href="#L1045">1045</a> 	<strong class="jxr_keyword">void</strong> w03_equals_differentContents_returnsFalse() {
-<a class="jxr_linenumber" name="L1046" href="#L1046">1046</a> 		<strong class="jxr_keyword">var</strong> map1 = FilteredMap
-<a class="jxr_linenumber" name="L1047" href="#L1047">1047</a> 			.create(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L1048" href="#L1048">1048</a> 			.filter((k, v) -&gt; <strong class="jxr_keyword">true</strong>)
-<a class="jxr_linenumber" name="L1049" href="#L1049">1049</a> 			.build();
-<a class="jxr_linenumber" name="L1050" href="#L1050">1050</a> 		map1.put(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L1051" href="#L1051">1051</a> 
-<a class="jxr_linenumber" name="L1052" href="#L1052">1052</a> 		<strong class="jxr_keyword">var</strong> map2 = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String, String&gt;();
-<a class="jxr_linenumber" name="L1053" href="#L1053">1053</a> 		map2.put(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value2"</span>);
+<a class="jxr_linenumber" name="L975" href="#L975">975</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L976" href="#L976">976</a> 	<em class="jxr_comment">// Null handling for primitive types</em>
+<a class="jxr_linenumber" name="L977" href="#L977">977</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L978" href="#L978">978</a> 
+<a class="jxr_linenumber" name="L979" href="#L979">979</a> 	@Test
+<a class="jxr_linenumber" name="L980" href="#L980">980</a> 	<strong class="jxr_keyword">void</strong> v01_add_nullKeyForPrimitiveType_throwsException() {
+<a class="jxr_linenumber" name="L981" href="#L981">981</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
+<a class="jxr_linenumber" name="L982" href="#L982">982</a> 			.create(<strong class="jxr_keyword">int</strong>.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L983" href="#L983">983</a> 			.filter((k, v) -&gt; v != <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L984" href="#L984">984</a> 			.build();
+<a class="jxr_linenumber" name="L985" href="#L985">985</a> 
+<a class="jxr_linenumber" name="L986" href="#L986">986</a> 		assertThrowsWithMessage(RuntimeException.<strong class="jxr_keyword">class</strong>, <span class="jxr_string">"Cannot set null key for primitive type"</span>, () -&gt; {
+<a class="jxr_linenumber" name="L987" href="#L987">987</a> 			map.add(<strong class="jxr_keyword">null</strong>, <span class="jxr_string">"value"</span>);
+<a class="jxr_linenumber" name="L988" href="#L988">988</a> 		});
+<a class="jxr_linenumber" name="L989" href="#L989">989</a> 	}
+<a class="jxr_linenumber" name="L990" href="#L990">990</a> 
+<a class="jxr_linenumber" name="L991" href="#L991">991</a> 	@Test
+<a class="jxr_linenumber" name="L992" href="#L992">992</a> 	<strong class="jxr_keyword">void</strong> v02_add_nullValueForPrimitiveType_throwsException() {
+<a class="jxr_linenumber" name="L993" href="#L993">993</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
+<a class="jxr_linenumber" name="L994" href="#L994">994</a> 			.create(String.<strong class="jxr_keyword">class</strong>, <strong class="jxr_keyword">int</strong>.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L995" href="#L995">995</a> 			.filter((k, v) -&gt; <strong class="jxr_keyword">true</strong>)
+<a class="jxr_linenumber" name="L996" href="#L996">996</a> 			.build();
+<a class="jxr_linenumber" name="L997" href="#L997">997</a> 
+<a class="jxr_linenumber" name="L998" href="#L998">998</a> 		assertThrowsWithMessage(RuntimeException.<strong class="jxr_keyword">class</strong>, <span class="jxr_string">"Cannot set null value for primitive type"</span>, () -&gt; {
+<a class="jxr_linenumber" name="L999" href="#L999">999</a> 			map.add(<span class="jxr_string">"key"</span>, <strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="L1000" href="#L1000">1000</a> 		});
+<a class="jxr_linenumber" name="L1001" href="#L1001">1001</a> 	}
+<a class="jxr_linenumber" name="L1002" href="#L1002">1002</a> 
+<a class="jxr_linenumber" name="L1003" href="#L1003">1003</a> 	@Test
+<a class="jxr_linenumber" name="L1004" href="#L1004">1004</a> 	<strong class="jxr_keyword">void</strong> v03_add_nullForWrapperType_allowed() {
+<a class="jxr_linenumber" name="L1005" href="#L1005">1005</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
+<a class="jxr_linenumber" name="L1006" href="#L1006">1006</a> 			.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L1007" href="#L1007">1007</a> 			.filter((k, v) -&gt; <strong class="jxr_keyword">true</strong>)  <em class="jxr_comment">// Accept all, including null</em>
+<a class="jxr_linenumber" name="L1008" href="#L1008">1008</a> 			.build();
+<a class="jxr_linenumber" name="L1009" href="#L1009">1009</a> 
+<a class="jxr_linenumber" name="L1010" href="#L1010">1010</a> 		map.add(<span class="jxr_string">"key1"</span>, <strong class="jxr_keyword">null</strong>);  <em class="jxr_comment">// Should work for wrapper types</em>
+<a class="jxr_linenumber" name="L1011" href="#L1011">1011</a> 		map.add(<strong class="jxr_keyword">null</strong>, 5);       <em class="jxr_comment">// Should work for wrapper types</em>
+<a class="jxr_linenumber" name="L1012" href="#L1012">1012</a> 
+<a class="jxr_linenumber" name="L1013" href="#L1013">1013</a> 		assertSize(2, map);
+<a class="jxr_linenumber" name="L1014" href="#L1014">1014</a> 		assertNull(map.get(<span class="jxr_string">"key1"</span>));
+<a class="jxr_linenumber" name="L1015" href="#L1015">1015</a> 		assertEquals(5, map.get(<strong class="jxr_keyword">null</strong>));
+<a class="jxr_linenumber" name="L1016" href="#L1016">1016</a> 	}
+<a class="jxr_linenumber" name="L1017" href="#L1017">1017</a> 
+<a class="jxr_linenumber" name="L1018" href="#L1018">1018</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L1019" href="#L1019">1019</a> 	<em class="jxr_comment">// toString(), equals(), hashCode()</em>
+<a class="jxr_linenumber" name="L1020" href="#L1020">1020</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L1021" href="#L1021">1021</a> 
+<a class="jxr_linenumber" name="L1022" href="#L1022">1022</a> 	@Test
+<a class="jxr_linenumber" name="L1023" href="#L1023">1023</a> 	<strong class="jxr_keyword">void</strong> w01_toString_delegatesToUnderlyingMap() {
+<a class="jxr_linenumber" name="L1024" href="#L1024">1024</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
+<a class="jxr_linenumber" name="L1025" href="#L1025">1025</a> 			.create(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L1026" href="#L1026">1026</a> 			.filter((k, v) -&gt; <strong class="jxr_keyword">true</strong>)
+<a class="jxr_linenumber" name="L1027" href="#L1027">1027</a> 			.build();
+<a class="jxr_linenumber" name="L1028" href="#L1028">1028</a> 		map.put(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>);
+<a class="jxr_linenumber" name="L1029" href="#L1029">1029</a> 		map.put(<span class="jxr_string">"key2"</span>, <span class="jxr_string">"value2"</span>);
+<a class="jxr_linenumber" name="L1030" href="#L1030">1030</a> 
+<a class="jxr_linenumber" name="L1031" href="#L1031">1031</a> 		<strong class="jxr_keyword">var</strong> underlyingMap = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String, String&gt;();
+<a class="jxr_linenumber" name="L1032" href="#L1032">1032</a> 		underlyingMap.put(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>);
+<a class="jxr_linenumber" name="L1033" href="#L1033">1033</a> 		underlyingMap.put(<span class="jxr_string">"key2"</span>, <span class="jxr_string">"value2"</span>);
+<a class="jxr_linenumber" name="L1034" href="#L1034">1034</a> 
+<a class="jxr_linenumber" name="L1035" href="#L1035">1035</a> 		assertEquals(underlyingMap.toString(), map.toString());
+<a class="jxr_linenumber" name="L1036" href="#L1036">1036</a> 	}
+<a class="jxr_linenumber" name="L1037" href="#L1037">1037</a> 
+<a class="jxr_linenumber" name="L1038" href="#L1038">1038</a> 	@Test
+<a class="jxr_linenumber" name="L1039" href="#L1039">1039</a> 	<strong class="jxr_keyword">void</strong> w02_equals_delegatesToUnderlyingMap() {
+<a class="jxr_linenumber" name="L1040" href="#L1040">1040</a> 		<strong class="jxr_keyword">var</strong> map1 = FilteredMap
+<a class="jxr_linenumber" name="L1041" href="#L1041">1041</a> 			.create(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L1042" href="#L1042">1042</a> 			.filter((k, v) -&gt; <strong class="jxr_keyword">true</strong>)
+<a class="jxr_linenumber" name="L1043" href="#L1043">1043</a> 			.build();
+<a class="jxr_linenumber" name="L1044" href="#L1044">1044</a> 		map1.put(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>);
+<a class="jxr_linenumber" name="L1045" href="#L1045">1045</a> 		map1.put(<span class="jxr_string">"key2"</span>, <span class="jxr_string">"value2"</span>);
+<a class="jxr_linenumber" name="L1046" href="#L1046">1046</a> 
+<a class="jxr_linenumber" name="L1047" href="#L1047">1047</a> 		<strong class="jxr_keyword">var</strong> map2 = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String, String&gt;();
+<a class="jxr_linenumber" name="L1048" href="#L1048">1048</a> 		map2.put(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>);
+<a class="jxr_linenumber" name="L1049" href="#L1049">1049</a> 		map2.put(<span class="jxr_string">"key2"</span>, <span class="jxr_string">"value2"</span>);
+<a class="jxr_linenumber" name="L1050" href="#L1050">1050</a> 
+<a class="jxr_linenumber" name="L1051" href="#L1051">1051</a> 		assertTrue(map1.equals(map2));
+<a class="jxr_linenumber" name="L1052" href="#L1052">1052</a> 		assertTrue(map2.equals(map1));
+<a class="jxr_linenumber" name="L1053" href="#L1053">1053</a> 	}
 <a class="jxr_linenumber" name="L1054" href="#L1054">1054</a> 
-<a class="jxr_linenumber" name="L1055" href="#L1055">1055</a> 		assertFalse(map1.equals(map2));
-<a class="jxr_linenumber" name="L1056" href="#L1056">1056</a> 		assertFalse(map2.equals(map1));
-<a class="jxr_linenumber" name="L1057" href="#L1057">1057</a> 	}
-<a class="jxr_linenumber" name="L1058" href="#L1058">1058</a> 
-<a class="jxr_linenumber" name="L1059" href="#L1059">1059</a> 	@Test
-<a class="jxr_linenumber" name="L1060" href="#L1060">1060</a> 	<strong class="jxr_keyword">void</strong> w04_hashCode_delegatesToUnderlyingMap() {
-<a class="jxr_linenumber" name="L1061" href="#L1061">1061</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
-<a class="jxr_linenumber" name="L1062" href="#L1062">1062</a> 			.create(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L1063" href="#L1063">1063</a> 			.filter((k, v) -&gt; <strong class="jxr_keyword">true</strong>)
-<a class="jxr_linenumber" name="L1064" href="#L1064">1064</a> 			.build();
-<a class="jxr_linenumber" name="L1065" href="#L1065">1065</a> 		map.put(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L1066" href="#L1066">1066</a> 		map.put(<span class="jxr_string">"key2"</span>, <span class="jxr_string">"value2"</span>);
-<a class="jxr_linenumber" name="L1067" href="#L1067">1067</a> 
-<a class="jxr_linenumber" name="L1068" href="#L1068">1068</a> 		<strong class="jxr_keyword">var</strong> underlyingMap = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String, String&gt;();
-<a class="jxr_linenumber" name="L1069" href="#L1069">1069</a> 		underlyingMap.put(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L1070" href="#L1070">1070</a> 		underlyingMap.put(<span class="jxr_string">"key2"</span>, <span class="jxr_string">"value2"</span>);
-<a class="jxr_linenumber" name="L1071" href="#L1071">1071</a> 
-<a class="jxr_linenumber" name="L1072" href="#L1072">1072</a> 		assertEquals(underlyingMap.hashCode(), map.hashCode());
-<a class="jxr_linenumber" name="L1073" href="#L1073">1073</a> 	}
-<a class="jxr_linenumber" name="L1074" href="#L1074">1074</a> }
-<a class="jxr_linenumber" name="L1075" href="#L1075">1075</a> 
+<a class="jxr_linenumber" name="L1055" href="#L1055">1055</a> 	@Test
+<a class="jxr_linenumber" name="L1056" href="#L1056">1056</a> 	<strong class="jxr_keyword">void</strong> w03_equals_differentContents_returnsFalse() {
+<a class="jxr_linenumber" name="L1057" href="#L1057">1057</a> 		<strong class="jxr_keyword">var</strong> map1 = FilteredMap
+<a class="jxr_linenumber" name="L1058" href="#L1058">1058</a> 			.create(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L1059" href="#L1059">1059</a> 			.filter((k, v) -&gt; <strong class="jxr_keyword">true</strong>)
+<a class="jxr_linenumber" name="L1060" href="#L1060">1060</a> 			.build();
+<a class="jxr_linenumber" name="L1061" href="#L1061">1061</a> 		map1.put(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>);
+<a class="jxr_linenumber" name="L1062" href="#L1062">1062</a> 
+<a class="jxr_linenumber" name="L1063" href="#L1063">1063</a> 		<strong class="jxr_keyword">var</strong> map2 = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String, String&gt;();
+<a class="jxr_linenumber" name="L1064" href="#L1064">1064</a> 		map2.put(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value2"</span>);
+<a class="jxr_linenumber" name="L1065" href="#L1065">1065</a> 
+<a class="jxr_linenumber" name="L1066" href="#L1066">1066</a> 		assertFalse(map1.equals(map2));
+<a class="jxr_linenumber" name="L1067" href="#L1067">1067</a> 		assertFalse(map2.equals(map1));
+<a class="jxr_linenumber" name="L1068" href="#L1068">1068</a> 	}
+<a class="jxr_linenumber" name="L1069" href="#L1069">1069</a> 
+<a class="jxr_linenumber" name="L1070" href="#L1070">1070</a> 	@Test
+<a class="jxr_linenumber" name="L1071" href="#L1071">1071</a> 	<strong class="jxr_keyword">void</strong> w04_hashCode_delegatesToUnderlyingMap() {
+<a class="jxr_linenumber" name="L1072" href="#L1072">1072</a> 		<strong class="jxr_keyword">var</strong> map = FilteredMap
+<a class="jxr_linenumber" name="L1073" href="#L1073">1073</a> 			.create(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L1074" href="#L1074">1074</a> 			.filter((k, v) -&gt; <strong class="jxr_keyword">true</strong>)
+<a class="jxr_linenumber" name="L1075" href="#L1075">1075</a> 			.build();
+<a class="jxr_linenumber" name="L1076" href="#L1076">1076</a> 		map.put(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>);
+<a class="jxr_linenumber" name="L1077" href="#L1077">1077</a> 		map.put(<span class="jxr_string">"key2"</span>, <span class="jxr_string">"value2"</span>);
+<a class="jxr_linenumber" name="L1078" href="#L1078">1078</a> 
+<a class="jxr_linenumber" name="L1079" href="#L1079">1079</a> 		<strong class="jxr_keyword">var</strong> underlyingMap = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String, String&gt;();
+<a class="jxr_linenumber" name="L1080" href="#L1080">1080</a> 		underlyingMap.put(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>);
+<a class="jxr_linenumber" name="L1081" href="#L1081">1081</a> 		underlyingMap.put(<span class="jxr_string">"key2"</span>, <span class="jxr_string">"value2"</span>);
+<a class="jxr_linenumber" name="L1082" href="#L1082">1082</a> 
+<a class="jxr_linenumber" name="L1083" href="#L1083">1083</a> 		assertEquals(underlyingMap.hashCode(), map.hashCode());
+<a class="jxr_linenumber" name="L1084" href="#L1084">1084</a> 	}
+<a class="jxr_linenumber" name="L1085" href="#L1085">1085</a> }
+<a class="jxr_linenumber" name="L1086" href="#L1086">1086</a> 
 </pre>
 <hr/>
 <div id="footer">© 2016–2025 <a href="https://www.apache.org/">The Apache Software Foundation</a></div>
diff --git a/site/xref-test/org/apache/juneau/commons/collections/Flag_Test.html b/site/xref-test/org/apache/juneau/commons/collections/Flag_Test.html
index 0895c22354..c66be358a9 100644
--- a/site/xref-test/org/apache/juneau/commons/collections/Flag_Test.html
+++ b/site/xref-test/org/apache/juneau/commons/collections/Flag_Test.html
@@ -289,33 +289,32 @@
 <a class="jxr_linenumber" name="L281" href="#L281">281</a> 	@Test
 <a class="jxr_linenumber" name="L282" href="#L282">282</a> 	<strong class="jxr_keyword">void</strong> d06_equals_notAFlag() {
 <a class="jxr_linenumber" name="L283" href="#L283">283</a> 		<strong class="jxr_keyword">var</strong> flag = Flag.of(<strong class="jxr_keyword">true</strong>);
-<a class="jxr_linenumber" name="L284" href="#L284">284</a> 		assertFalse(flag.equals(<span class="jxr_string">"not a flag"</span>));
-<a class="jxr_linenumber" name="L285" href="#L285">285</a> 		assertFalse(flag.equals(<strong class="jxr_keyword">null</strong>));
-<a class="jxr_linenumber" name="L286" href="#L286">286</a> 	}
-<a class="jxr_linenumber" name="L287" href="#L287">287</a> 
-<a class="jxr_linenumber" name="L288" href="#L288">288</a> 	@Test
-<a class="jxr_linenumber" name="L289" href="#L289">289</a> 	<strong class="jxr_keyword">void</strong> d07_hashCode_sameValue() {
-<a class="jxr_linenumber" name="L290" href="#L290">290</a> 		<strong class="jxr_keyword">var</strong> flag1 = Flag.of(<strong class="jxr_keyword">true</strong>);
-<a class="jxr_linenumber" name="L291" href="#L291">291</a> 		<strong class="jxr_keyword">var</strong> flag2 = Flag.of(<strong class="jxr_keyword">true</strong>);
-<a class="jxr_linenumber" name="L292" href="#L292">292</a> 		assertEquals(flag1.hashCode(), flag2.hashCode());
-<a class="jxr_linenumber" name="L293" href="#L293">293</a> 	}
-<a class="jxr_linenumber" name="L294" href="#L294">294</a> 
-<a class="jxr_linenumber" name="L295" href="#L295">295</a> 	@Test
-<a class="jxr_linenumber" name="L296" href="#L296">296</a> 	<strong class="jxr_keyword">void</strong> d08_hashCode_differentValue() {
-<a class="jxr_linenumber" name="L297" href="#L297">297</a> 		<strong class="jxr_keyword">var</strong> flag1 = Flag.of(<strong class="jxr_keyword">true</strong>);
-<a class="jxr_linenumber" name="L298" href="#L298">298</a> 		<strong class="jxr_keyword">var</strong> flag2 = Flag.of(false);
-<a class="jxr_linenumber" name="L299" href="#L299">299</a> 		<em class="jxr_comment">// Different values should have different hash codes (though not guaranteed)</em>
-<a class="jxr_linenumber" name="L300" href="#L300">300</a> 		assertNotEquals(flag1.hashCode(), flag2.hashCode());
-<a class="jxr_linenumber" name="L301" href="#L301">301</a> 	}
-<a class="jxr_linenumber" name="L302" href="#L302">302</a> 
-<a class="jxr_linenumber" name="L303" href="#L303">303</a> 	@Test
-<a class="jxr_linenumber" name="L304" href="#L304">304</a> 	<strong class="jxr_keyword">void</strong> d09_hashCode_booleanHashCode() {
-<a class="jxr_linenumber" name="L305" href="#L305">305</a> 		<strong class="jxr_keyword">var</strong> flagTrue = Flag.of(<strong class="jxr_keyword">true</strong>);
-<a class="jxr_linenumber" name="L306" href="#L306">306</a> 		<strong class="jxr_keyword">var</strong> flagFalse = Flag.of(false);
-<a class="jxr_linenumber" name="L307" href="#L307">307</a> 		assertEquals(Boolean.hashCode(<strong class="jxr_keyword">true</strong>), flagTrue.hashCode());
-<a class="jxr_linenumber" name="L308" href="#L308">308</a> 		assertEquals(Boolean.hashCode(false), flagFalse.hashCode());
-<a class="jxr_linenumber" name="L309" href="#L309">309</a> 	}
-<a class="jxr_linenumber" name="L310" href="#L310">310</a> }
+<a class="jxr_linenumber" name="L284" href="#L284">284</a> 		assertFalse(flag.equals(<strong class="jxr_keyword">null</strong>));
+<a class="jxr_linenumber" name="L285" href="#L285">285</a> 	}
+<a class="jxr_linenumber" name="L286" href="#L286">286</a> 
+<a class="jxr_linenumber" name="L287" href="#L287">287</a> 	@Test
+<a class="jxr_linenumber" name="L288" href="#L288">288</a> 	<strong class="jxr_keyword">void</strong> d07_hashCode_sameValue() {
+<a class="jxr_linenumber" name="L289" href="#L289">289</a> 		<strong class="jxr_keyword">var</strong> flag1 = Flag.of(<strong class="jxr_keyword">true</strong>);
+<a class="jxr_linenumber" name="L290" href="#L290">290</a> 		<strong class="jxr_keyword">var</strong> flag2 = Flag.of(<strong class="jxr_keyword">true</strong>);
+<a class="jxr_linenumber" name="L291" href="#L291">291</a> 		assertEquals(flag1.hashCode(), flag2.hashCode());
+<a class="jxr_linenumber" name="L292" href="#L292">292</a> 	}
+<a class="jxr_linenumber" name="L293" href="#L293">293</a> 
+<a class="jxr_linenumber" name="L294" href="#L294">294</a> 	@Test
+<a class="jxr_linenumber" name="L295" href="#L295">295</a> 	<strong class="jxr_keyword">void</strong> d08_hashCode_differentValue() {
+<a class="jxr_linenumber" name="L296" href="#L296">296</a> 		<strong class="jxr_keyword">var</strong> flag1 = Flag.of(<strong class="jxr_keyword">true</strong>);
+<a class="jxr_linenumber" name="L297" href="#L297">297</a> 		<strong class="jxr_keyword">var</strong> flag2 = Flag.of(false);
+<a class="jxr_linenumber" name="L298" href="#L298">298</a> 		<em class="jxr_comment">// Different values should have different hash codes (though not guaranteed)</em>
+<a class="jxr_linenumber" name="L299" href="#L299">299</a> 		assertNotEquals(flag1.hashCode(), flag2.hashCode());
+<a class="jxr_linenumber" name="L300" href="#L300">300</a> 	}
+<a class="jxr_linenumber" name="L301" href="#L301">301</a> 
+<a class="jxr_linenumber" name="L302" href="#L302">302</a> 	@Test
+<a class="jxr_linenumber" name="L303" href="#L303">303</a> 	<strong class="jxr_keyword">void</strong> d09_hashCode_booleanHashCode() {
+<a class="jxr_linenumber" name="L304" href="#L304">304</a> 		<strong class="jxr_keyword">var</strong> flagTrue = Flag.of(<strong class="jxr_keyword">true</strong>);
+<a class="jxr_linenumber" name="L305" href="#L305">305</a> 		<strong class="jxr_keyword">var</strong> flagFalse = Flag.of(false);
+<a class="jxr_linenumber" name="L306" href="#L306">306</a> 		assertEquals(Boolean.hashCode(<strong class="jxr_keyword">true</strong>), flagTrue.hashCode());
+<a class="jxr_linenumber" name="L307" href="#L307">307</a> 		assertEquals(Boolean.hashCode(false), flagFalse.hashCode());
+<a class="jxr_linenumber" name="L308" href="#L308">308</a> 	}
+<a class="jxr_linenumber" name="L309" href="#L309">309</a> }
 </pre>
 <hr/>
 <div id="footer">© 2016–2025 <a href="https://www.apache.org/">The Apache Software Foundation</a></div>
diff --git a/site/xref-test/org/apache/juneau/commons/collections/KeywordSet_Test.html b/site/xref-test/org/apache/juneau/commons/collections/KeywordSet_Test.html
index 42430291ed..9586fbe5cd 100644
--- a/site/xref-test/org/apache/juneau/commons/collections/KeywordSet_Test.html
+++ b/site/xref-test/org/apache/juneau/commons/collections/KeywordSet_Test.html
@@ -120,45 +120,44 @@
 <a class="jxr_linenumber" name="L112" href="#L112">112</a> 	<strong class="jxr_keyword">void</strong> w08_equals_notAKeywordSet() {
 <a class="jxr_linenumber" name="L113" href="#L113">113</a> 		<strong class="jxr_keyword">var</strong> ks = <strong class="jxr_keyword">new</strong> KeywordSet(<span class="jxr_string">"apple"</span>, <span class="jxr_string">"banana"</span>);
 <a class="jxr_linenumber" name="L114" href="#L114">114</a> 
-<a class="jxr_linenumber" name="L115" href="#L115">115</a> 		assertFalse(ks.equals(<span class="jxr_string">"not a keyword set"</span>));
-<a class="jxr_linenumber" name="L116" href="#L116">116</a> 		assertFalse(ks.equals(<strong class="jxr_keyword">null</strong>));
-<a class="jxr_linenumber" name="L117" href="#L117">117</a> 	}
-<a class="jxr_linenumber" name="L118" href="#L118">118</a> 
-<a class="jxr_linenumber" name="L119" href="#L119">119</a> 	@Test
-<a class="jxr_linenumber" name="L120" href="#L120">120</a> 	<strong class="jxr_keyword">void</strong> w09_equals_emptySets() {
-<a class="jxr_linenumber" name="L121" href="#L121">121</a> 		<strong class="jxr_keyword">var</strong> ks1 = <strong class="jxr_keyword">new</strong> KeywordSet();
-<a class="jxr_linenumber" name="L122" href="#L122">122</a> 		<strong class="jxr_keyword">var</strong> ks2 = <strong class="jxr_keyword">new</strong> KeywordSet();
-<a class="jxr_linenumber" name="L123" href="#L123">123</a> 
-<a class="jxr_linenumber" name="L124" href="#L124">124</a> 		assertTrue(ks1.equals(ks2));
-<a class="jxr_linenumber" name="L125" href="#L125">125</a> 		assertTrue(ks2.equals(ks1));
-<a class="jxr_linenumber" name="L126" href="#L126">126</a> 	}
-<a class="jxr_linenumber" name="L127" href="#L127">127</a> 
-<a class="jxr_linenumber" name="L128" href="#L128">128</a> 	@Test
-<a class="jxr_linenumber" name="L129" href="#L129">129</a> 	<strong class="jxr_keyword">void</strong> w10_hashCode_sameContents() {
-<a class="jxr_linenumber" name="L130" href="#L130">130</a> 		<strong class="jxr_keyword">var</strong> ks1 = <strong class="jxr_keyword">new</strong> KeywordSet(<span class="jxr_string">"apple"</span>, <span class="jxr_string">"banana"</span>, <span class="jxr_string">"cherry"</span>);
-<a class="jxr_linenumber" name="L131" href="#L131">131</a> 		<strong class="jxr_keyword">var</strong> ks2 = <strong class="jxr_keyword">new</strong> KeywordSet(<span class="jxr_string">"apple"</span>, <span class="jxr_string">"banana"</span>, <span class="jxr_string">"cherry"</span>);
-<a class="jxr_linenumber" name="L132" href="#L132">132</a> 
-<a class="jxr_linenumber" name="L133" href="#L133">133</a> 		assertEquals(ks1.hashCode(), ks2.hashCode());
-<a class="jxr_linenumber" name="L134" href="#L134">134</a> 	}
-<a class="jxr_linenumber" name="L135" href="#L135">135</a> 
-<a class="jxr_linenumber" name="L136" href="#L136">136</a> 	@Test
-<a class="jxr_linenumber" name="L137" href="#L137">137</a> 	<strong class="jxr_keyword">void</strong> w11_hashCode_differentOrder() {
-<a class="jxr_linenumber" name="L138" href="#L138">138</a> 		<strong class="jxr_keyword">var</strong> ks1 = <strong class="jxr_keyword">new</strong> KeywordSet(<span class="jxr_string">"apple"</span>, <span class="jxr_string">"banana"</span>, <span class="jxr_string">"cherry"</span>);
-<a class="jxr_linenumber" name="L139" href="#L139">139</a> 		<strong class="jxr_keyword">var</strong> ks2 = <strong class="jxr_keyword">new</strong> KeywordSet(<span class="jxr_string">"cherry"</span>, <span class="jxr_string">"apple"</span>, <span class="jxr_string">"banana"</span>);
-<a class="jxr_linenumber" name="L140" href="#L140">140</a> 
-<a class="jxr_linenumber" name="L141" href="#L141">141</a> 		<em class="jxr_comment">// Should have same hash code because both are sorted internally</em>
-<a class="jxr_linenumber" name="L142" href="#L142">142</a> 		assertEquals(ks1.hashCode(), ks2.hashCode());
-<a class="jxr_linenumber" name="L143" href="#L143">143</a> 	}
-<a class="jxr_linenumber" name="L144" href="#L144">144</a> 
-<a class="jxr_linenumber" name="L145" href="#L145">145</a> 	@Test
-<a class="jxr_linenumber" name="L146" href="#L146">146</a> 	<strong class="jxr_keyword">void</strong> w12_hashCode_emptySets() {
-<a class="jxr_linenumber" name="L147" href="#L147">147</a> 		<strong class="jxr_keyword">var</strong> ks1 = <strong class="jxr_keyword">new</strong> KeywordSet();
-<a class="jxr_linenumber" name="L148" href="#L148">148</a> 		<strong class="jxr_keyword">var</strong> ks2 = <strong class="jxr_keyword">new</strong> KeywordSet();
-<a class="jxr_linenumber" name="L149" href="#L149">149</a> 
-<a class="jxr_linenumber" name="L150" href="#L150">150</a> 		assertEquals(ks1.hashCode(), ks2.hashCode());
-<a class="jxr_linenumber" name="L151" href="#L151">151</a> 	}
-<a class="jxr_linenumber" name="L152" href="#L152">152</a> }
-<a class="jxr_linenumber" name="L153" href="#L153">153</a> 
+<a class="jxr_linenumber" name="L115" href="#L115">115</a> 		assertFalse(ks.equals(<strong class="jxr_keyword">null</strong>));
+<a class="jxr_linenumber" name="L116" href="#L116">116</a> 	}
+<a class="jxr_linenumber" name="L117" href="#L117">117</a> 
+<a class="jxr_linenumber" name="L118" href="#L118">118</a> 	@Test
+<a class="jxr_linenumber" name="L119" href="#L119">119</a> 	<strong class="jxr_keyword">void</strong> w09_equals_emptySets() {
+<a class="jxr_linenumber" name="L120" href="#L120">120</a> 		<strong class="jxr_keyword">var</strong> ks1 = <strong class="jxr_keyword">new</strong> KeywordSet();
+<a class="jxr_linenumber" name="L121" href="#L121">121</a> 		<strong class="jxr_keyword">var</strong> ks2 = <strong class="jxr_keyword">new</strong> KeywordSet();
+<a class="jxr_linenumber" name="L122" href="#L122">122</a> 
+<a class="jxr_linenumber" name="L123" href="#L123">123</a> 		assertTrue(ks1.equals(ks2));
+<a class="jxr_linenumber" name="L124" href="#L124">124</a> 		assertTrue(ks2.equals(ks1));
+<a class="jxr_linenumber" name="L125" href="#L125">125</a> 	}
+<a class="jxr_linenumber" name="L126" href="#L126">126</a> 
+<a class="jxr_linenumber" name="L127" href="#L127">127</a> 	@Test
+<a class="jxr_linenumber" name="L128" href="#L128">128</a> 	<strong class="jxr_keyword">void</strong> w10_hashCode_sameContents() {
+<a class="jxr_linenumber" name="L129" href="#L129">129</a> 		<strong class="jxr_keyword">var</strong> ks1 = <strong class="jxr_keyword">new</strong> KeywordSet(<span class="jxr_string">"apple"</span>, <span class="jxr_string">"banana"</span>, <span class="jxr_string">"cherry"</span>);
+<a class="jxr_linenumber" name="L130" href="#L130">130</a> 		<strong class="jxr_keyword">var</strong> ks2 = <strong class="jxr_keyword">new</strong> KeywordSet(<span class="jxr_string">"apple"</span>, <span class="jxr_string">"banana"</span>, <span class="jxr_string">"cherry"</span>);
+<a class="jxr_linenumber" name="L131" href="#L131">131</a> 
+<a class="jxr_linenumber" name="L132" href="#L132">132</a> 		assertEquals(ks1.hashCode(), ks2.hashCode());
+<a class="jxr_linenumber" name="L133" href="#L133">133</a> 	}
+<a class="jxr_linenumber" name="L134" href="#L134">134</a> 
+<a class="jxr_linenumber" name="L135" href="#L135">135</a> 	@Test
+<a class="jxr_linenumber" name="L136" href="#L136">136</a> 	<strong class="jxr_keyword">void</strong> w11_hashCode_differentOrder() {
+<a class="jxr_linenumber" name="L137" href="#L137">137</a> 		<strong class="jxr_keyword">var</strong> ks1 = <strong class="jxr_keyword">new</strong> KeywordSet(<span class="jxr_string">"apple"</span>, <span class="jxr_string">"banana"</span>, <span class="jxr_string">"cherry"</span>);
+<a class="jxr_linenumber" name="L138" href="#L138">138</a> 		<strong class="jxr_keyword">var</strong> ks2 = <strong class="jxr_keyword">new</strong> KeywordSet(<span class="jxr_string">"cherry"</span>, <span class="jxr_string">"apple"</span>, <span class="jxr_string">"banana"</span>);
+<a class="jxr_linenumber" name="L139" href="#L139">139</a> 
+<a class="jxr_linenumber" name="L140" href="#L140">140</a> 		<em class="jxr_comment">// Should have same hash code because both are sorted internally</em>
+<a class="jxr_linenumber" name="L141" href="#L141">141</a> 		assertEquals(ks1.hashCode(), ks2.hashCode());
+<a class="jxr_linenumber" name="L142" href="#L142">142</a> 	}
+<a class="jxr_linenumber" name="L143" href="#L143">143</a> 
+<a class="jxr_linenumber" name="L144" href="#L144">144</a> 	@Test
+<a class="jxr_linenumber" name="L145" href="#L145">145</a> 	<strong class="jxr_keyword">void</strong> w12_hashCode_emptySets() {
+<a class="jxr_linenumber" name="L146" href="#L146">146</a> 		<strong class="jxr_keyword">var</strong> ks1 = <strong class="jxr_keyword">new</strong> KeywordSet();
+<a class="jxr_linenumber" name="L147" href="#L147">147</a> 		<strong class="jxr_keyword">var</strong> ks2 = <strong class="jxr_keyword">new</strong> KeywordSet();
+<a class="jxr_linenumber" name="L148" href="#L148">148</a> 
+<a class="jxr_linenumber" name="L149" href="#L149">149</a> 		assertEquals(ks1.hashCode(), ks2.hashCode());
+<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> 
 </pre>
 <hr/>
 <div id="footer">© 2016–2025 <a href="https://www.apache.org/">The Apache Software Foundation</a></div>
diff --git a/site/xref-test/org/apache/juneau/commons/collections/MapBuilder_Test.html b/site/xref-test/org/apache/juneau/commons/collections/MapBuilder_Test.html
index 2c2d13d0f4..90d05a9edb 100644
--- a/site/xref-test/org/apache/juneau/commons/collections/MapBuilder_Test.html
+++ b/site/xref-test/org/apache/juneau/commons/collections/MapBuilder_Test.html
@@ -30,727 +30,790 @@
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> java.util.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.*;
-<a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.commons.utils.*;
-<a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">import</strong> org.junit.jupiter.api.*;
-<a class="jxr_linenumber" name="L27" href="#L27">27</a>  
-<a class="jxr_linenumber" name="L28" href="#L28">28</a>  <strong class="jxr_keyword">class</strong> <a name="MapBuilder_Test" href="../../../../../org/apache/juneau/commons/collections/MapBuilder_Test.html#MapBuilder_Test">MapBuilder_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>  
-<a class="jxr_linenumber" name="L30" href="#L30">30</a>  	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L31" href="#L31">31</a>  	<em class="jxr_comment">// Basic tests</em>
-<a class="jxr_linenumber" name="L32" href="#L32">32</a>  	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L33" href="#L33">33</a>  
-<a class="jxr_linenumber" name="L34" href="#L34">34</a>  	@Test
-<a class="jxr_linenumber" name="L35" href="#L35">35</a>  	<strong class="jxr_keyword">void</strong> a01_create() {
-<a class="jxr_linenumber" name="L36" href="#L36">36</a>  		<strong class="jxr_keyword">var</strong> b = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L37" href="#L37">37</a>  		assertNotNull(b);
-<a class="jxr_linenumber" name="L38" href="#L38">38</a>  	}
-<a class="jxr_linenumber" name="L39" href="#L39">39</a>  
-<a class="jxr_linenumber" name="L40" href="#L40">40</a>  	@Test
-<a class="jxr_linenumber" name="L41" href="#L41">41</a>  	<strong class="jxr_keyword">void</strong> a02_addSingle() {
-<a class="jxr_linenumber" name="L42" href="#L42">42</a>  		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L43" href="#L43">43</a>  			.add(<span class="jxr_string">"a"</span>, 1)
-<a class="jxr_linenumber" name="L44" href="#L44">44</a>  			.build();
-<a class="jxr_linenumber" name="L45" href="#L45">45</a>  
-<a class="jxr_linenumber" name="L46" href="#L46">46</a>  		assertMap(map, <span class="jxr_string">"a=1"</span>);
-<a class="jxr_linenumber" name="L47" href="#L47">47</a>  	}
-<a class="jxr_linenumber" name="L48" href="#L48">48</a>  
-<a class="jxr_linenumber" name="L49" href="#L49">49</a>  	@Test
-<a class="jxr_linenumber" name="L50" href="#L50">50</a>  	<strong class="jxr_keyword">void</strong> a03_addMultiple() {
-<a class="jxr_linenumber" name="L51" href="#L51">51</a>  		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L52" href="#L52">52</a>  			.add(<span class="jxr_string">"a"</span>, 1)
-<a class="jxr_linenumber" name="L53" href="#L53">53</a>  			.add(<span class="jxr_string">"b"</span>, 2)
-<a class="jxr_linenumber" name="L54" href="#L54">54</a>  			.add(<span class="jxr_string">"c"</span>, 3)
-<a class="jxr_linenumber" name="L55" href="#L55">55</a>  			.build();
-<a class="jxr_linenumber" name="L56" href="#L56">56</a>  
-<a class="jxr_linenumber" name="L57" href="#L57">57</a>  		assertMap(map, <span class="jxr_string">"a=1"</span>, <span class="jxr_string">"b=2"</span>, <span class="jxr_string">"c=3"</span>);
-<a class="jxr_linenumber" name="L58" href="#L58">58</a>  	}
-<a class="jxr_linenumber" name="L59" href="#L59">59</a>  
-<a class="jxr_linenumber" name="L60" href="#L60">60</a>  	@Test
-<a class="jxr_linenumber" name="L61" href="#L61">61</a>  	<strong class="jxr_keyword">void</strong> a04_addAll() {
-<a class="jxr_linenumber" name="L62" href="#L62">62</a>  		<strong class="jxr_keyword">var</strong> existing = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String,Integer&gt;();
-<a class="jxr_linenumber" name="L63" href="#L63">63</a>  		existing.put(<span class="jxr_string">"x"</span>, 10);
-<a class="jxr_linenumber" name="L64" href="#L64">64</a>  		existing.put(<span class="jxr_string">"y"</span>, 20);
-<a class="jxr_linenumber" name="L65" href="#L65">65</a>  
-<a class="jxr_linenumber" name="L66" href="#L66">66</a>  		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L67" href="#L67">67</a>  			.add(<span class="jxr_string">"a"</span>, 1)
-<a class="jxr_linenumber" name="L68" href="#L68">68</a>  			.addAll(existing)
-<a class="jxr_linenumber" name="L69" href="#L69">69</a>  			.add(<span class="jxr_string">"b"</span>, 2)
-<a class="jxr_linenumber" name="L70" href="#L70">70</a>  			.build();
-<a class="jxr_linenumber" name="L71" href="#L71">71</a>  
-<a class="jxr_linenumber" name="L72" href="#L72">72</a>  		assertMap(map, <span class="jxr_string">"a=1"</span>, <span class="jxr_string">"x=10"</span>, <span class="jxr_string">"y=20"</span>, <span class="jxr_string">"b=2"</span>);
-<a class="jxr_linenumber" name="L73" href="#L73">73</a>  	}
-<a class="jxr_linenumber" name="L74" href="#L74">74</a>  
-<a class="jxr_linenumber" name="L75" href="#L75">75</a>  	@Test
-<a class="jxr_linenumber" name="L76" href="#L76">76</a>  	<strong class="jxr_keyword">void</strong> a05_addAllNull() {
-<a class="jxr_linenumber" name="L77" href="#L77">77</a>  		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L78" href="#L78">78</a>  			.add(<span class="jxr_string">"a"</span>, 1)
-<a class="jxr_linenumber" name="L79" href="#L79">79</a>  			.addAll(<strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L80" href="#L80">80</a>  			.add(<span class="jxr_string">"b"</span>, 2)
-<a class="jxr_linenumber" name="L81" href="#L81">81</a>  			.build();
-<a class="jxr_linenumber" name="L82" href="#L82">82</a>  
-<a class="jxr_linenumber" name="L83" href="#L83">83</a>  		assertMap(map, <span class="jxr_string">"a=1"</span>, <span class="jxr_string">"b=2"</span>);
-<a class="jxr_linenumber" name="L84" href="#L84">84</a>  	}
-<a class="jxr_linenumber" name="L85" href="#L85">85</a>  
-<a class="jxr_linenumber" name="L86" href="#L86">86</a>  	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L87" href="#L87">87</a>  	<em class="jxr_comment">// Add pairs</em>
-<a class="jxr_linenumber" name="L88" href="#L88">88</a>  	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L89" href="#L89">89</a>  
-<a class="jxr_linenumber" name="L90" href="#L90">90</a>  	@Test
-<a class="jxr_linenumber" name="L91" href="#L91">91</a>  	<strong class="jxr_keyword">void</strong> b01_addPairs() {
-<a class="jxr_linenumber" name="L92" href="#L92">92</a>  		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L93" href="#L93">93</a>  			.addPairs(<span class="jxr_string">"host"</span>, <span class="jxr_string">"localhost"</span>, <span class="jxr_string">"port"</span>, <span class="jxr_string">"8080"</span>, <span class="jxr_string">"protocol"</span>, <span class="jxr_string">"https"</span>)
-<a class="jxr_linenumber" name="L94" href="#L94">94</a>  			.build();
-<a class="jxr_linenumber" name="L95" href="#L95">95</a>  
-<a class="jxr_linenumber" name="L96" href="#L96">96</a>  		assertMap(map, <span class="jxr_string">"host=localhost"</span>, <span class="jxr_string">"port=8080"</span>, <span class="jxr_string">"protocol=https"</span>);
-<a class="jxr_linenumber" name="L97" href="#L97">97</a>  	}
-<a class="jxr_linenumber" name="L98" href="#L98">98</a>  
-<a class="jxr_linenumber" name="L99" href="#L99">99</a>  	@Test
-<a class="jxr_linenumber" name="L100" href="#L100">100</a> 	<strong class="jxr_keyword">void</strong> b02_addPairs_oddNumber() {
-<a class="jxr_linenumber" name="L101" href="#L101">101</a> 		<strong class="jxr_keyword">var</strong> b = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L102" href="#L102">102</a> 		assertThrows(IllegalArgumentException.<strong class="jxr_keyword">class</strong>, () -&gt; b.addPairs(<span class="jxr_string">"a"</span>, <span class="jxr_string">"b"</span>, <span class="jxr_string">"c"</span>));
-<a class="jxr_linenumber" name="L103" href="#L103">103</a> 	}
-<a class="jxr_linenumber" name="L104" href="#L104">104</a> 
-<a class="jxr_linenumber" name="L105" href="#L105">105</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L106" href="#L106">106</a> 	<em class="jxr_comment">// Sorting</em>
-<a class="jxr_linenumber" name="L107" href="#L107">107</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L108" href="#L108">108</a> 
-<a class="jxr_linenumber" name="L109" href="#L109">109</a> 	@Test
-<a class="jxr_linenumber" name="L110" href="#L110">110</a> 	<strong class="jxr_keyword">void</strong> c01_sorted_naturalOrder() {
-<a class="jxr_linenumber" name="L111" href="#L111">111</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L112" href="#L112">112</a> 			.add(<span class="jxr_string">"c"</span>, 3)
-<a class="jxr_linenumber" name="L113" href="#L113">113</a> 			.add(<span class="jxr_string">"a"</span>, 1)
-<a class="jxr_linenumber" name="L114" href="#L114">114</a> 			.add(<span class="jxr_string">"b"</span>, 2)
-<a class="jxr_linenumber" name="L115" href="#L115">115</a> 			.sorted()
-<a class="jxr_linenumber" name="L116" href="#L116">116</a> 			.build();
-<a class="jxr_linenumber" name="L117" href="#L117">117</a> 
-<a class="jxr_linenumber" name="L118" href="#L118">118</a> 		assertSize(3, map);
-<a class="jxr_linenumber" name="L119" href="#L119">119</a> 		assertList(map.keySet(), <span class="jxr_string">"a"</span>, <span class="jxr_string">"b"</span>, <span class="jxr_string">"c"</span>);
-<a class="jxr_linenumber" name="L120" href="#L120">120</a> 		assertTrue(map instanceof TreeMap);
-<a class="jxr_linenumber" name="L121" href="#L121">121</a> 	}
-<a class="jxr_linenumber" name="L122" href="#L122">122</a> 
-<a class="jxr_linenumber" name="L123" href="#L123">123</a> 	@Test
-<a class="jxr_linenumber" name="L124" href="#L124">124</a> 	<strong class="jxr_keyword">void</strong> c02_sorted_customComparator() {
-<a class="jxr_linenumber" name="L125" href="#L125">125</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L126" href="#L126">126</a> 			.add(<span class="jxr_string">"a"</span>, 1)
-<a class="jxr_linenumber" name="L127" href="#L127">127</a> 			.add(<span class="jxr_string">"bb"</span>, 2)
-<a class="jxr_linenumber" name="L128" href="#L128">128</a> 			.add(<span class="jxr_string">"ccc"</span>, 3)
-<a class="jxr_linenumber" name="L129" href="#L129">129</a> 			.sorted(Comparator.comparing(String::length))
-<a class="jxr_linenumber" name="L130" href="#L130">130</a> 			.build();
-<a class="jxr_linenumber" name="L131" href="#L131">131</a> 
-<a class="jxr_linenumber" name="L132" href="#L132">132</a> 		assertList(map.keySet(), <span class="jxr_string">"a"</span>, <span class="jxr_string">"bb"</span>, <span class="jxr_string">"ccc"</span>);
-<a class="jxr_linenumber" name="L133" href="#L133">133</a> 	}
-<a class="jxr_linenumber" name="L134" href="#L134">134</a> 
-<a class="jxr_linenumber" name="L135" href="#L135">135</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L136" href="#L136">136</a> 	<em class="jxr_comment">// Sparse mode</em>
-<a class="jxr_linenumber" name="L137" href="#L137">137</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L138" href="#L138">138</a> 
-<a class="jxr_linenumber" name="L139" href="#L139">139</a> 	@Test
-<a class="jxr_linenumber" name="L140" href="#L140">140</a> 	<strong class="jxr_keyword">void</strong> d01_sparse_empty() {
-<a class="jxr_linenumber" name="L141" href="#L141">141</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L142" href="#L142">142</a> 			.sparse()
-<a class="jxr_linenumber" name="L143" href="#L143">143</a> 			.build();
-<a class="jxr_linenumber" name="L144" href="#L144">144</a> 
-<a class="jxr_linenumber" name="L145" href="#L145">145</a> 		assertNull(map);
-<a class="jxr_linenumber" name="L146" href="#L146">146</a> 	}
-<a class="jxr_linenumber" name="L147" href="#L147">147</a> 
-<a class="jxr_linenumber" name="L148" href="#L148">148</a> 	@Test
-<a class="jxr_linenumber" name="L149" href="#L149">149</a> 	<strong class="jxr_keyword">void</strong> d02_sparse_notEmpty() {
-<a class="jxr_linenumber" name="L150" href="#L150">150</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L151" href="#L151">151</a> 			.add(<span class="jxr_string">"a"</span>, 1)
-<a class="jxr_linenumber" name="L152" href="#L152">152</a> 			.sparse()
-<a class="jxr_linenumber" name="L153" href="#L153">153</a> 			.build();
-<a class="jxr_linenumber" name="L154" href="#L154">154</a> 
-<a class="jxr_linenumber" name="L155" href="#L155">155</a> 		assertNotNull(map);
-<a class="jxr_linenumber" name="L156" href="#L156">156</a> 		assertSize(1, map);
-<a class="jxr_linenumber" name="L157" href="#L157">157</a> 	}
-<a class="jxr_linenumber" name="L158" href="#L158">158</a> 
-<a class="jxr_linenumber" name="L159" href="#L159">159</a> 	@Test
-<a class="jxr_linenumber" name="L160" href="#L160">160</a> 	<strong class="jxr_keyword">void</strong> d03_notSparse_empty() {
-<a class="jxr_linenumber" name="L161" href="#L161">161</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L162" href="#L162">162</a> 			.build();
-<a class="jxr_linenumber" name="L163" href="#L163">163</a> 
-<a class="jxr_linenumber" name="L164" href="#L164">164</a> 		assertNotNull(map);
-<a class="jxr_linenumber" name="L165" href="#L165">165</a> 		assertEmpty(map);
-<a class="jxr_linenumber" name="L166" href="#L166">166</a> 	}
-<a class="jxr_linenumber" name="L167" href="#L167">167</a> 
-<a class="jxr_linenumber" name="L168" href="#L168">168</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L169" href="#L169">169</a> 	<em class="jxr_comment">// Unmodifiable</em>
-<a class="jxr_linenumber" name="L170" href="#L170">170</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L171" href="#L171">171</a> 
-<a class="jxr_linenumber" name="L172" href="#L172">172</a> 	@Test
-<a class="jxr_linenumber" name="L173" href="#L173">173</a> 	<strong class="jxr_keyword">void</strong> e01_unmodifiable() {
-<a class="jxr_linenumber" name="L174" href="#L174">174</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L175" href="#L175">175</a> 			.add(<span class="jxr_string">"a"</span>, 1)
-<a class="jxr_linenumber" name="L176" href="#L176">176</a> 			.add(<span class="jxr_string">"b"</span>, 2)
-<a class="jxr_linenumber" name="L177" href="#L177">177</a> 			.unmodifiable()
-<a class="jxr_linenumber" name="L178" href="#L178">178</a> 			.build();
-<a class="jxr_linenumber" name="L179" href="#L179">179</a> 
-<a class="jxr_linenumber" name="L180" href="#L180">180</a> 		assertSize(2, map);
-<a class="jxr_linenumber" name="L181" href="#L181">181</a> 		assertThrows(UnsupportedOperationException.<strong class="jxr_keyword">class</strong>, () -&gt; map.put(<span class="jxr_string">"c"</span>, 3));
-<a class="jxr_linenumber" name="L182" href="#L182">182</a> 	}
-<a class="jxr_linenumber" name="L183" href="#L183">183</a> 
-<a class="jxr_linenumber" name="L184" href="#L184">184</a> 	@Test
-<a class="jxr_linenumber" name="L185" href="#L185">185</a> 	<strong class="jxr_keyword">void</strong> e02_modifiable() {
-<a class="jxr_linenumber" name="L186" href="#L186">186</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L187" href="#L187">187</a> 			.add(<span class="jxr_string">"a"</span>, 1)
-<a class="jxr_linenumber" name="L188" href="#L188">188</a> 			.build();
-<a class="jxr_linenumber" name="L189" href="#L189">189</a> 
-<a class="jxr_linenumber" name="L190" href="#L190">190</a> 		map.put(<span class="jxr_string">"b"</span>, 2);
-<a class="jxr_linenumber" name="L191" href="#L191">191</a> 		assertSize(2, map);
-<a class="jxr_linenumber" name="L192" href="#L192">192</a> 	}
-<a class="jxr_linenumber" name="L193" href="#L193">193</a> 
-<a class="jxr_linenumber" name="L194" href="#L194">194</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L195" href="#L195">195</a> 	<em class="jxr_comment">// Copy mode</em>
-<a class="jxr_linenumber" name="L196" href="#L196">196</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L197" href="#L197">197</a> 
-<a class="jxr_linenumber" name="L198" href="#L198">198</a> 	@Test
-<a class="jxr_linenumber" name="L199" href="#L199">199</a> 	<strong class="jxr_keyword">void</strong> f01_copy() {
-<a class="jxr_linenumber" name="L200" href="#L200">200</a> 		<strong class="jxr_keyword">var</strong> original = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String,Integer&gt;();
-<a class="jxr_linenumber" name="L201" href="#L201">201</a> 		original.put(<span class="jxr_string">"a"</span>, 1);
-<a class="jxr_linenumber" name="L202" href="#L202">202</a> 
-<a class="jxr_linenumber" name="L203" href="#L203">203</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L204" href="#L204">204</a> 			.to(original)
-<a class="jxr_linenumber" name="L205" href="#L205">205</a> 			.add(<span class="jxr_string">"b"</span>, 2)
-<a class="jxr_linenumber" name="L206" href="#L206">206</a> 			.copy()
-<a class="jxr_linenumber" name="L207" href="#L207">207</a> 			.add(<span class="jxr_string">"c"</span>, 3)
-<a class="jxr_linenumber" name="L208" href="#L208">208</a> 			.build();
-<a class="jxr_linenumber" name="L209" href="#L209">209</a> 
-<a class="jxr_linenumber" name="L210" href="#L210">210</a> 		assertSize(3, map);
-<a class="jxr_linenumber" name="L211" href="#L211">211</a> 		assertSize(2, original);  <em class="jxr_comment">// Original has "a" and "b" added before copy()</em>
-<a class="jxr_linenumber" name="L212" href="#L212">212</a> 		assertNotSame(original, map);  <em class="jxr_comment">// After copy(), they're different maps</em>
-<a class="jxr_linenumber" name="L213" href="#L213">213</a> 	}
-<a class="jxr_linenumber" name="L214" href="#L214">214</a> 
-<a class="jxr_linenumber" name="L215" href="#L215">215</a> 	@Test
-<a class="jxr_linenumber" name="L216" href="#L216">216</a> 	<strong class="jxr_keyword">void</strong> f02_noCopy() {
-<a class="jxr_linenumber" name="L217" href="#L217">217</a> 		<strong class="jxr_keyword">var</strong> original = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String,Integer&gt;();
-<a class="jxr_linenumber" name="L218" href="#L218">218</a> 		original.put(<span class="jxr_string">"a"</span>, 1);
-<a class="jxr_linenumber" name="L219" href="#L219">219</a> 
-<a class="jxr_linenumber" name="L220" href="#L220">220</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L221" href="#L221">221</a> 			.to(original)
-<a class="jxr_linenumber" name="L222" href="#L222">222</a> 			.add(<span class="jxr_string">"b"</span>, 2)
-<a class="jxr_linenumber" name="L223" href="#L223">223</a> 			.build();
-<a class="jxr_linenumber" name="L224" href="#L224">224</a> 
-<a class="jxr_linenumber" name="L225" href="#L225">225</a> 		assertSize(2, map);
-<a class="jxr_linenumber" name="L226" href="#L226">226</a> 		assertSize(2, original);  <em class="jxr_comment">// Original modified</em>
-<a class="jxr_linenumber" name="L227" href="#L227">227</a> 		assertSame(original, map);
-<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> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L231" href="#L231">231</a> 	<em class="jxr_comment">// Complex scenarios</em>
-<a class="jxr_linenumber" name="L232" href="#L232">232</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L233" href="#L233">233</a> 
-<a class="jxr_linenumber" name="L234" href="#L234">234</a> 	@Test
-<a class="jxr_linenumber" name="L235" href="#L235">235</a> 	<strong class="jxr_keyword">void</strong> g01_multipleOperations() {
-<a class="jxr_linenumber" name="L236" href="#L236">236</a> 		<strong class="jxr_keyword">var</strong> existing = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String,Integer&gt;();
-<a class="jxr_linenumber" name="L237" href="#L237">237</a> 		existing.put(<span class="jxr_string">"x"</span>, 10);
-<a class="jxr_linenumber" name="L238" href="#L238">238</a> 		existing.put(<span class="jxr_string">"y"</span>, 20);
-<a class="jxr_linenumber" name="L239" href="#L239">239</a> 
-<a class="jxr_linenumber" name="L240" href="#L240">240</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L241" href="#L241">241</a> 			.add(<span class="jxr_string">"a"</span>, 1)
-<a class="jxr_linenumber" name="L242" href="#L242">242</a> 			.addAll(existing)
-<a class="jxr_linenumber" name="L243" href="#L243">243</a> 			.add(<span class="jxr_string">"b"</span>, 2)
-<a class="jxr_linenumber" name="L244" href="#L244">244</a> 			.sorted()
-<a class="jxr_linenumber" name="L245" href="#L245">245</a> 			.build();
-<a class="jxr_linenumber" name="L246" href="#L246">246</a> 
-<a class="jxr_linenumber" name="L247" href="#L247">247</a> 		assertSize(4, map);
-<a class="jxr_linenumber" name="L248" href="#L248">248</a> 		<em class="jxr_comment">// Should be sorted by key</em>
-<a class="jxr_linenumber" name="L249" href="#L249">249</a> 		assertList(map.keySet(), <span class="jxr_string">"a"</span>, <span class="jxr_string">"b"</span>, <span class="jxr_string">"x"</span>, <span class="jxr_string">"y"</span>);
-<a class="jxr_linenumber" name="L250" href="#L250">250</a> 	}
-<a class="jxr_linenumber" name="L251" href="#L251">251</a> 
-<a class="jxr_linenumber" name="L252" href="#L252">252</a> 	@Test
-<a class="jxr_linenumber" name="L253" href="#L253">253</a> 	<strong class="jxr_keyword">void</strong> g02_sortedAndUnmodifiable() {
-<a class="jxr_linenumber" name="L254" href="#L254">254</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L255" href="#L255">255</a> 			.add(<span class="jxr_string">"c"</span>, 3)
-<a class="jxr_linenumber" name="L256" href="#L256">256</a> 			.add(<span class="jxr_string">"a"</span>, 1)
-<a class="jxr_linenumber" name="L257" href="#L257">257</a> 			.add(<span class="jxr_string">"b"</span>, 2)
-<a class="jxr_linenumber" name="L258" href="#L258">258</a> 			.sorted()
-<a class="jxr_linenumber" name="L259" href="#L259">259</a> 			.unmodifiable()
-<a class="jxr_linenumber" name="L260" href="#L260">260</a> 			.build();
-<a class="jxr_linenumber" name="L261" href="#L261">261</a> 
-<a class="jxr_linenumber" name="L262" href="#L262">262</a> 		assertSize(3, map);
-<a class="jxr_linenumber" name="L263" href="#L263">263</a> 		assertList(map.keySet(), <span class="jxr_string">"a"</span>, <span class="jxr_string">"b"</span>, <span class="jxr_string">"c"</span>);
-<a class="jxr_linenumber" name="L264" href="#L264">264</a> 		assertThrows(UnsupportedOperationException.<strong class="jxr_keyword">class</strong>, () -&gt; map.put(<span class="jxr_string">"d"</span>, 4));
-<a class="jxr_linenumber" name="L265" href="#L265">265</a> 	}
-<a class="jxr_linenumber" name="L266" href="#L266">266</a> 
-<a class="jxr_linenumber" name="L267" href="#L267">267</a> 	@Test
-<a class="jxr_linenumber" name="L268" href="#L268">268</a> 	<strong class="jxr_keyword">void</strong> g03_sparseAndSorted() {
-<a class="jxr_linenumber" name="L269" href="#L269">269</a> 		<strong class="jxr_keyword">var</strong> map1 = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L270" href="#L270">270</a> 			.add(<span class="jxr_string">"c"</span>, 3)
-<a class="jxr_linenumber" name="L271" href="#L271">271</a> 			.add(<span class="jxr_string">"a"</span>, 1)
-<a class="jxr_linenumber" name="L272" href="#L272">272</a> 			.add(<span class="jxr_string">"b"</span>, 2)
-<a class="jxr_linenumber" name="L273" href="#L273">273</a> 			.sorted()
-<a class="jxr_linenumber" name="L274" href="#L274">274</a> 			.sparse()
-<a class="jxr_linenumber" name="L275" href="#L275">275</a> 			.build();
-<a class="jxr_linenumber" name="L276" href="#L276">276</a> 
-<a class="jxr_linenumber" name="L277" href="#L277">277</a> 		assertNotNull(map1);
-<a class="jxr_linenumber" name="L278" href="#L278">278</a> 		assertSize(3, map1);
-<a class="jxr_linenumber" name="L279" href="#L279">279</a> 
-<a class="jxr_linenumber" name="L280" href="#L280">280</a> 		<strong class="jxr_keyword">var</strong> map2 = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L281" href="#L281">281</a> 			.sorted()
-<a class="jxr_linenumber" name="L282" href="#L282">282</a> 			.sparse()
-<a class="jxr_linenumber" name="L283" href="#L283">283</a> 			.build();
-<a class="jxr_linenumber" name="L284" href="#L284">284</a> 
-<a class="jxr_linenumber" name="L285" href="#L285">285</a> 		assertNull(map2);
-<a class="jxr_linenumber" name="L286" href="#L286">286</a> 	}
-<a class="jxr_linenumber" name="L287" href="#L287">287</a> 
-<a class="jxr_linenumber" name="L288" href="#L288">288</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L289" href="#L289">289</a> 	<em class="jxr_comment">// Edge cases</em>
-<a class="jxr_linenumber" name="L290" href="#L290">290</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L291" href="#L291">291</a> 
-<a class="jxr_linenumber" name="L292" href="#L292">292</a> 	@Test
-<a class="jxr_linenumber" name="L293" href="#L293">293</a> 	<strong class="jxr_keyword">void</strong> h01_buildEmptyMap() {
-<a class="jxr_linenumber" name="L294" href="#L294">294</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L295" href="#L295">295</a> 			.build();
-<a class="jxr_linenumber" name="L296" href="#L296">296</a> 
-<a class="jxr_linenumber" name="L297" href="#L297">297</a> 		assertNotNull(map);
-<a class="jxr_linenumber" name="L298" href="#L298">298</a> 		assertEmpty(map);
-<a class="jxr_linenumber" name="L299" href="#L299">299</a> 	}
-<a class="jxr_linenumber" name="L300" href="#L300">300</a> 
-<a class="jxr_linenumber" name="L301" href="#L301">301</a> 	@Test
-<a class="jxr_linenumber" name="L302" href="#L302">302</a> 	<strong class="jxr_keyword">void</strong> h02_addNullKey() {
-<a class="jxr_linenumber" name="L303" href="#L303">303</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L304" href="#L304">304</a> 			.add(<strong class="jxr_keyword">null</strong>, 1)
-<a class="jxr_linenumber" name="L305" href="#L305">305</a> 			.add(<span class="jxr_string">"a"</span>, 2)
-<a class="jxr_linenumber" name="L306" href="#L306">306</a> 			.build();
-<a class="jxr_linenumber" name="L307" href="#L307">307</a> 
-<a class="jxr_linenumber" name="L308" href="#L308">308</a> 		assertMap(map, <span class="jxr_string">"&lt;null&gt;=1"</span>, <span class="jxr_string">"a=2"</span>);
-<a class="jxr_linenumber" name="L309" href="#L309">309</a> 	}
-<a class="jxr_linenumber" name="L310" href="#L310">310</a> 
-<a class="jxr_linenumber" name="L311" href="#L311">311</a> 	@Test
-<a class="jxr_linenumber" name="L312" href="#L312">312</a> 	<strong class="jxr_keyword">void</strong> h03_addNullValue() {
-<a class="jxr_linenumber" name="L313" href="#L313">313</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L314" href="#L314">314</a> 			.add(<span class="jxr_string">"a"</span>, 1)
-<a class="jxr_linenumber" name="L315" href="#L315">315</a> 			.add(<span class="jxr_string">"b"</span>, <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L316" href="#L316">316</a> 			.add(<span class="jxr_string">"c"</span>, 3)
-<a class="jxr_linenumber" name="L317" href="#L317">317</a> 			.build();
-<a class="jxr_linenumber" name="L318" href="#L318">318</a> 
-<a class="jxr_linenumber" name="L319" href="#L319">319</a> 		assertMap(map, <span class="jxr_string">"a=1"</span>, <span class="jxr_string">"b=&lt;null&gt;"</span>, <span class="jxr_string">"c=3"</span>);
-<a class="jxr_linenumber" name="L320" href="#L320">320</a> 	}
-<a class="jxr_linenumber" name="L321" href="#L321">321</a> 
-<a class="jxr_linenumber" name="L322" href="#L322">322</a> 	@Test
-<a class="jxr_linenumber" name="L323" href="#L323">323</a> 	<strong class="jxr_keyword">void</strong> h04_duplicateKeys() {
-<a class="jxr_linenumber" name="L324" href="#L324">324</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L325" href="#L325">325</a> 			.add(<span class="jxr_string">"a"</span>, 1)
-<a class="jxr_linenumber" name="L326" href="#L326">326</a> 			.add(<span class="jxr_string">"a"</span>, 2)  <em class="jxr_comment">// Overwrites first value</em>
-<a class="jxr_linenumber" name="L327" href="#L327">327</a> 			.add(<span class="jxr_string">"a"</span>, 3)  <em class="jxr_comment">// Overwrites again</em>
-<a class="jxr_linenumber" name="L328" href="#L328">328</a> 			.build();
-<a class="jxr_linenumber" name="L329" href="#L329">329</a> 
-<a class="jxr_linenumber" name="L330" href="#L330">330</a> 		assertSize(1, map);  <em class="jxr_comment">// Only one entry for key "a"</em>
-<a class="jxr_linenumber" name="L331" href="#L331">331</a> 		assertMap(map, <span class="jxr_string">"a=3"</span>);  <em class="jxr_comment">// Last value wins</em>
-<a class="jxr_linenumber" name="L332" href="#L332">332</a> 	}
-<a class="jxr_linenumber" name="L333" href="#L333">333</a> 
-<a class="jxr_linenumber" name="L334" href="#L334">334</a> 	@Test
-<a class="jxr_linenumber" name="L335" href="#L335">335</a> 	<strong class="jxr_keyword">void</strong> h05_toExistingMap() {
-<a class="jxr_linenumber" name="L336" href="#L336">336</a> 		<strong class="jxr_keyword">var</strong> existing = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String,Integer&gt;();
-<a class="jxr_linenumber" name="L337" href="#L337">337</a> 		existing.put(<span class="jxr_string">"x"</span>, 10);
-<a class="jxr_linenumber" name="L338" href="#L338">338</a> 
-<a class="jxr_linenumber" name="L339" href="#L339">339</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L340" href="#L340">340</a> 			.to(existing)
-<a class="jxr_linenumber" name="L341" href="#L341">341</a> 			.add(<span class="jxr_string">"y"</span>, 20)
-<a class="jxr_linenumber" name="L342" href="#L342">342</a> 			.build();
-<a class="jxr_linenumber" name="L343" href="#L343">343</a> 
-<a class="jxr_linenumber" name="L344" href="#L344">344</a> 		assertSize(2, map);
-<a class="jxr_linenumber" name="L345" href="#L345">345</a> 		assertMap(map, <span class="jxr_string">"x=10"</span>, <span class="jxr_string">"y=20"</span>);
-<a class="jxr_linenumber" name="L346" href="#L346">346</a> 		assertSame(existing, map);
-<a class="jxr_linenumber" name="L347" href="#L347">347</a> 	}
-<a class="jxr_linenumber" name="L348" href="#L348">348</a> 
-<a class="jxr_linenumber" name="L349" href="#L349">349</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L350" href="#L350">350</a> 	<em class="jxr_comment">// Filtering</em>
-<a class="jxr_linenumber" name="L351" href="#L351">351</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L352" href="#L352">352</a> 
-<a class="jxr_linenumber" name="L353" href="#L353">353</a> 	@Test
-<a class="jxr_linenumber" name="L354" href="#L354">354</a> 	<strong class="jxr_keyword">void</strong> i01_filtered_customPredicate() {
-<a class="jxr_linenumber" name="L355" href="#L355">355</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L356" href="#L356">356</a> 			.filtered(x -&gt; x != <strong class="jxr_keyword">null</strong> &amp;&amp; !x.equals(<span class="jxr_string">""</span>))
-<a class="jxr_linenumber" name="L357" href="#L357">357</a> 			.add(<span class="jxr_string">"a"</span>, <span class="jxr_string">"foo"</span>)
-<a class="jxr_linenumber" name="L358" href="#L358">358</a> 			.add(<span class="jxr_string">"b"</span>, <strong class="jxr_keyword">null</strong>)     <em class="jxr_comment">// Not added</em>
-<a class="jxr_linenumber" name="L359" href="#L359">359</a> 			.add(<span class="jxr_string">"c"</span>, <span class="jxr_string">""</span>)       <em class="jxr_comment">// Not added</em>
-<a class="jxr_linenumber" name="L360" href="#L360">360</a> 			.add(<span class="jxr_string">"d"</span>, <span class="jxr_string">"bar"</span>)
-<a class="jxr_linenumber" name="L361" href="#L361">361</a> 			.build();
-<a class="jxr_linenumber" name="L362" href="#L362">362</a> 
-<a class="jxr_linenumber" name="L363" href="#L363">363</a> 		assertMap(map, <span class="jxr_string">"a=foo"</span>, <span class="jxr_string">"d=bar"</span>);
-<a class="jxr_linenumber" name="L364" href="#L364">364</a> 	}
-<a class="jxr_linenumber" name="L365" href="#L365">365</a> 
-<a class="jxr_linenumber" name="L366" href="#L366">366</a> 	@Test
-<a class="jxr_linenumber" name="L367" href="#L367">367</a> 	<strong class="jxr_keyword">void</strong> i02_filtered_defaultFilter() {
-<a class="jxr_linenumber" name="L368" href="#L368">368</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Object.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L369" href="#L369">369</a> 			.filtered()
-<a class="jxr_linenumber" name="L370" href="#L370">370</a> 			.add(<span class="jxr_string">"name"</span>, <span class="jxr_string">"John"</span>)
-<a class="jxr_linenumber" name="L371" href="#L371">371</a> 			.add(<span class="jxr_string">"age"</span>, -1)              <em class="jxr_comment">// Not added</em>
-<a class="jxr_linenumber" name="L372" href="#L372">372</a> 			.add(<span class="jxr_string">"enabled"</span>, false)       <em class="jxr_comment">// Not added</em>
-<a class="jxr_linenumber" name="L373" href="#L373">373</a> 			.add(<span class="jxr_string">"tags"</span>, <strong class="jxr_keyword">new</strong> String[0])  <em class="jxr_comment">// Not added</em>
-<a class="jxr_linenumber" name="L374" href="#L374">374</a> 			.add(<span class="jxr_string">"emptyMap"</span>, <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;&gt;())  <em class="jxr_comment">// Not added</em>
-<a class="jxr_linenumber" name="L375" href="#L375">375</a> 			.add(<span class="jxr_string">"emptyList"</span>, <strong class="jxr_keyword">new</strong> ArrayList&lt;&gt;())     <em class="jxr_comment">// Not added</em>
-<a class="jxr_linenumber" name="L376" href="#L376">376</a> 			.add(<span class="jxr_string">"value"</span>, 42)
-<a class="jxr_linenumber" name="L377" href="#L377">377</a> 			.build();
-<a class="jxr_linenumber" name="L378" href="#L378">378</a> 
-<a class="jxr_linenumber" name="L379" href="#L379">379</a> 		assertMap(map, <span class="jxr_string">"name=John"</span>, <span class="jxr_string">"value=42"</span>);
-<a class="jxr_linenumber" name="L380" href="#L380">380</a> 	}
-<a class="jxr_linenumber" name="L381" href="#L381">381</a> 
-<a class="jxr_linenumber" name="L382" href="#L382">382</a> 	@Test
-<a class="jxr_linenumber" name="L383" href="#L383">383</a> 	<strong class="jxr_keyword">void</strong> i03_filtered_rejectsValue() {
-<a class="jxr_linenumber" name="L384" href="#L384">384</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L385" href="#L385">385</a> 			.filtered(x -&gt; x != <strong class="jxr_keyword">null</strong> &amp;&amp; (Integer)x &gt; 0)
-<a class="jxr_linenumber" name="L386" href="#L386">386</a> 			.add(<span class="jxr_string">"a"</span>, 1)
-<a class="jxr_linenumber" name="L387" href="#L387">387</a> 			.add(<span class="jxr_string">"b"</span>, -1)  <em class="jxr_comment">// Not added</em>
-<a class="jxr_linenumber" name="L388" href="#L388">388</a> 			.add(<span class="jxr_string">"c"</span>, 0)   <em class="jxr_comment">// Not added</em>
-<a class="jxr_linenumber" name="L389" href="#L389">389</a> 			.add(<span class="jxr_string">"d"</span>, 2)
-<a class="jxr_linenumber" name="L390" href="#L390">390</a> 			.build();
-<a class="jxr_linenumber" name="L391" href="#L391">391</a> 
-<a class="jxr_linenumber" name="L392" href="#L392">392</a> 		assertMap(map, <span class="jxr_string">"a=1"</span>, <span class="jxr_string">"d=2"</span>);
-<a class="jxr_linenumber" name="L393" href="#L393">393</a> 	}
-<a class="jxr_linenumber" name="L394" href="#L394">394</a> 
-<a class="jxr_linenumber" name="L395" href="#L395">395</a> 	@Test
-<a class="jxr_linenumber" name="L396" href="#L396">396</a> 	<strong class="jxr_keyword">void</strong> i04_add_withFilter() {
-<a class="jxr_linenumber" name="L397" href="#L397">397</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L398" href="#L398">398</a> 			.filtered(x -&gt; x != <strong class="jxr_keyword">null</strong> &amp;&amp; x instanceof String &amp;&amp; ((String)x).length() &gt; 2)
-<a class="jxr_linenumber" name="L399" href="#L399">399</a> 			.add(<span class="jxr_string">"a"</span>, <span class="jxr_string">"foo"</span>)   <em class="jxr_comment">// Added</em>
-<a class="jxr_linenumber" name="L400" href="#L400">400</a> 			.add(<span class="jxr_string">"b"</span>, <span class="jxr_string">"ab"</span>)    <em class="jxr_comment">// Not added (length &lt;= 2)</em>
-<a class="jxr_linenumber" name="L401" href="#L401">401</a> 			.add(<span class="jxr_string">"c"</span>, <span class="jxr_string">"bar"</span>)   <em class="jxr_comment">// Added</em>
-<a class="jxr_linenumber" name="L402" href="#L402">402</a> 			.build();
-<a class="jxr_linenumber" name="L403" href="#L403">403</a> 
-<a class="jxr_linenumber" name="L404" href="#L404">404</a> 		assertMap(map, <span class="jxr_string">"a=foo"</span>, <span class="jxr_string">"c=bar"</span>);
-<a class="jxr_linenumber" name="L405" href="#L405">405</a> 	}
-<a class="jxr_linenumber" name="L406" href="#L406">406</a> 
-<a class="jxr_linenumber" name="L407" href="#L407">407</a> 	@Test
-<a class="jxr_linenumber" name="L408" href="#L408">408</a> 	<strong class="jxr_keyword">void</strong> i05_addAll_withFilter() {
-<a class="jxr_linenumber" name="L409" href="#L409">409</a> 		<strong class="jxr_keyword">var</strong> existing = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String,String&gt;();
-<a class="jxr_linenumber" name="L410" href="#L410">410</a> 		existing.put(<span class="jxr_string">"x"</span>, <span class="jxr_string">"longvalue"</span>);
-<a class="jxr_linenumber" name="L411" href="#L411">411</a> 		existing.put(<span class="jxr_string">"y"</span>, <span class="jxr_string">"ab"</span>);  <em class="jxr_comment">// Will be filtered out</em>
-<a class="jxr_linenumber" name="L412" href="#L412">412</a> 		existing.put(<span class="jxr_string">"z"</span>, <span class="jxr_string">"another"</span>);
-<a class="jxr_linenumber" name="L413" href="#L413">413</a> 
-<a class="jxr_linenumber" name="L414" href="#L414">414</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L415" href="#L415">415</a> 			.filtered(x -&gt; x != <strong class="jxr_keyword">null</strong> &amp;&amp; x instanceof String &amp;&amp; ((String)x).length() &gt; 2)
-<a class="jxr_linenumber" name="L416" href="#L416">416</a> 			.addAll(existing)
-<a class="jxr_linenumber" name="L417" href="#L417">417</a> 			.build();
-<a class="jxr_linenumber" name="L418" href="#L418">418</a> 
-<a class="jxr_linenumber" name="L419" href="#L419">419</a> 		assertMap(map, <span class="jxr_string">"x=longvalue"</span>, <span class="jxr_string">"z=another"</span>);
-<a class="jxr_linenumber" name="L420" href="#L420">420</a> 	}
-<a class="jxr_linenumber" name="L421" href="#L421">421</a> 
-<a class="jxr_linenumber" name="L422" href="#L422">422</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L423" href="#L423">423</a> 	<em class="jxr_comment">// Converters</em>
-<a class="jxr_linenumber" name="L424" href="#L424">424</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L425" href="#L425">425</a> 
-<a class="jxr_linenumber" name="L426" href="#L426">426</a> 	@Test
-<a class="jxr_linenumber" name="L427" href="#L427">427</a> 	<strong class="jxr_keyword">void</strong> j01_converters_emptyArray() {
-<a class="jxr_linenumber" name="L428" href="#L428">428</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L429" href="#L429">429</a> 			.converters()  <em class="jxr_comment">// Empty array</em>
-<a class="jxr_linenumber" name="L430" href="#L430">430</a> 			.add(<span class="jxr_string">"a"</span>, 1)
-<a class="jxr_linenumber" name="L431" href="#L431">431</a> 			.build();
-<a class="jxr_linenumber" name="L432" href="#L432">432</a> 
-<a class="jxr_linenumber" name="L433" href="#L433">433</a> 		assertMap(map, <span class="jxr_string">"a=1"</span>);
-<a class="jxr_linenumber" name="L434" href="#L434">434</a> 	}
-<a class="jxr_linenumber" name="L435" href="#L435">435</a> 
-<a class="jxr_linenumber" name="L436" href="#L436">436</a> 	@Test
-<a class="jxr_linenumber" name="L437" href="#L437">437</a> 	<strong class="jxr_keyword">void</strong> j02_converters_withConverter() {
-<a class="jxr_linenumber" name="L438" href="#L438">438</a> 		Converter converter = <strong class="jxr_keyword">new</strong> Converter() {
-<a class="jxr_linenumber" name="L439" href="#L439">439</a> 			@Override
-<a class="jxr_linenumber" name="L440" href="#L440">440</a> 			<strong class="jxr_keyword">public</strong> &lt;T&gt; T convertTo(Class&lt;T&gt; type, Object o) {
-<a class="jxr_linenumber" name="L441" href="#L441">441</a> 				<strong class="jxr_keyword">if</strong> (type == Integer.<strong class="jxr_keyword">class</strong> &amp;&amp; o instanceof String) {
-<a class="jxr_linenumber" name="L442" href="#L442">442</a> 					<strong class="jxr_keyword">return</strong> type.<strong class="jxr_keyword">cast</strong>(Integer.parseInt((String)o));
-<a class="jxr_linenumber" name="L443" href="#L443">443</a> 				}
-<a class="jxr_linenumber" name="L444" href="#L444">444</a> 				<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L445" href="#L445">445</a> 			}
-<a class="jxr_linenumber" name="L446" href="#L446">446</a> 		};
+<a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> org.junit.jupiter.api.*;
+<a class="jxr_linenumber" name="L26" href="#L26">26</a>  
+<a class="jxr_linenumber" name="L27" href="#L27">27</a>  <strong class="jxr_keyword">class</strong> <a name="MapBuilder_Test" href="../../../../../org/apache/juneau/commons/collections/MapBuilder_Test.html#MapBuilder_Test">MapBuilder_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="L28" href="#L28">28</a>  
+<a class="jxr_linenumber" name="L29" href="#L29">29</a>  	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L30" href="#L30">30</a>  	<em class="jxr_comment">// Basic tests</em>
+<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>  
+<a class="jxr_linenumber" name="L33" href="#L33">33</a>  	@Test
+<a class="jxr_linenumber" name="L34" href="#L34">34</a>  	<strong class="jxr_keyword">void</strong> a01_create() {
+<a class="jxr_linenumber" name="L35" href="#L35">35</a>  		<strong class="jxr_keyword">var</strong> b = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L36" href="#L36">36</a>  		assertNotNull(b);
+<a class="jxr_linenumber" name="L37" href="#L37">37</a>  	}
+<a class="jxr_linenumber" name="L38" href="#L38">38</a>  
+<a class="jxr_linenumber" name="L39" href="#L39">39</a>  	@Test
+<a class="jxr_linenumber" name="L40" href="#L40">40</a>  	<strong class="jxr_keyword">void</strong> a02_addSingle() {
+<a class="jxr_linenumber" name="L41" href="#L41">41</a>  		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L42" href="#L42">42</a>  			.add(<span class="jxr_string">"a"</span>, 1)
+<a class="jxr_linenumber" name="L43" href="#L43">43</a>  			.build();
+<a class="jxr_linenumber" name="L44" href="#L44">44</a>  
+<a class="jxr_linenumber" name="L45" href="#L45">45</a>  		assertMap(map, <span class="jxr_string">"a=1"</span>);
+<a class="jxr_linenumber" name="L46" href="#L46">46</a>  	}
+<a class="jxr_linenumber" name="L47" href="#L47">47</a>  
+<a class="jxr_linenumber" name="L48" href="#L48">48</a>  	@Test
+<a class="jxr_linenumber" name="L49" href="#L49">49</a>  	<strong class="jxr_keyword">void</strong> a03_addMultiple() {
+<a class="jxr_linenumber" name="L50" href="#L50">50</a>  		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L51" href="#L51">51</a>  			.add(<span class="jxr_string">"a"</span>, 1)
+<a class="jxr_linenumber" name="L52" href="#L52">52</a>  			.add(<span class="jxr_string">"b"</span>, 2)
+<a class="jxr_linenumber" name="L53" href="#L53">53</a>  			.add(<span class="jxr_string">"c"</span>, 3)
+<a class="jxr_linenumber" name="L54" href="#L54">54</a>  			.build();
+<a class="jxr_linenumber" name="L55" href="#L55">55</a>  
+<a class="jxr_linenumber" name="L56" href="#L56">56</a>  		assertMap(map, <span class="jxr_string">"a=1"</span>, <span class="jxr_string">"b=2"</span>, <span class="jxr_string">"c=3"</span>);
+<a class="jxr_linenumber" name="L57" href="#L57">57</a>  	}
+<a class="jxr_linenumber" name="L58" href="#L58">58</a>  
+<a class="jxr_linenumber" name="L59" href="#L59">59</a>  	@Test
+<a class="jxr_linenumber" name="L60" href="#L60">60</a>  	<strong class="jxr_keyword">void</strong> a04_addAll() {
+<a class="jxr_linenumber" name="L61" href="#L61">61</a>  		<strong class="jxr_keyword">var</strong> existing = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String,Integer&gt;();
+<a class="jxr_linenumber" name="L62" href="#L62">62</a>  		existing.put(<span class="jxr_string">"x"</span>, 10);
+<a class="jxr_linenumber" name="L63" href="#L63">63</a>  		existing.put(<span class="jxr_string">"y"</span>, 20);
+<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 = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L66" href="#L66">66</a>  			.add(<span class="jxr_string">"a"</span>, 1)
+<a class="jxr_linenumber" name="L67" href="#L67">67</a>  			.addAll(existing)
+<a class="jxr_linenumber" name="L68" href="#L68">68</a>  			.add(<span class="jxr_string">"b"</span>, 2)
+<a class="jxr_linenumber" name="L69" href="#L69">69</a>  			.build();
+<a class="jxr_linenumber" name="L70" href="#L70">70</a>  
+<a class="jxr_linenumber" name="L71" href="#L71">71</a>  		assertMap(map, <span class="jxr_string">"a=1"</span>, <span class="jxr_string">"x=10"</span>, <span class="jxr_string">"y=20"</span>, <span class="jxr_string">"b=2"</span>);
+<a class="jxr_linenumber" name="L72" href="#L72">72</a>  	}
+<a class="jxr_linenumber" name="L73" href="#L73">73</a>  
+<a class="jxr_linenumber" name="L74" href="#L74">74</a>  	@Test
+<a class="jxr_linenumber" name="L75" href="#L75">75</a>  	<strong class="jxr_keyword">void</strong> a05_addAllNull() {
+<a class="jxr_linenumber" name="L76" href="#L76">76</a>  		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L77" href="#L77">77</a>  			.add(<span class="jxr_string">"a"</span>, 1)
+<a class="jxr_linenumber" name="L78" href="#L78">78</a>  			.addAll(<strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L79" href="#L79">79</a>  			.add(<span class="jxr_string">"b"</span>, 2)
+<a class="jxr_linenumber" name="L80" href="#L80">80</a>  			.build();
+<a class="jxr_linenumber" name="L81" href="#L81">81</a>  
+<a class="jxr_linenumber" name="L82" href="#L82">82</a>  		assertMap(map, <span class="jxr_string">"a=1"</span>, <span class="jxr_string">"b=2"</span>);
+<a class="jxr_linenumber" name="L83" href="#L83">83</a>  	}
+<a class="jxr_linenumber" name="L84" href="#L84">84</a>  
+<a class="jxr_linenumber" name="L85" href="#L85">85</a>  	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L86" href="#L86">86</a>  	<em class="jxr_comment">// Add pairs</em>
+<a class="jxr_linenumber" name="L87" href="#L87">87</a>  	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L88" href="#L88">88</a>  
+<a class="jxr_linenumber" name="L89" href="#L89">89</a>  	@Test
+<a class="jxr_linenumber" name="L90" href="#L90">90</a>  	<strong class="jxr_keyword">void</strong> b01_addPairs() {
+<a class="jxr_linenumber" name="L91" href="#L91">91</a>  		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L92" href="#L92">92</a>  			.addPairs(<span class="jxr_string">"host"</span>, <span class="jxr_string">"localhost"</span>, <span class="jxr_string">"port"</span>, <span class="jxr_string">"8080"</span>, <span class="jxr_string">"protocol"</span>, <span class="jxr_string">"https"</span>)
+<a class="jxr_linenumber" name="L93" href="#L93">93</a>  			.build();
+<a class="jxr_linenumber" name="L94" href="#L94">94</a>  
+<a class="jxr_linenumber" name="L95" href="#L95">95</a>  		assertMap(map, <span class="jxr_string">"host=localhost"</span>, <span class="jxr_string">"port=8080"</span>, <span class="jxr_string">"protocol=https"</span>);
+<a class="jxr_linenumber" name="L96" href="#L96">96</a>  	}
+<a class="jxr_linenumber" name="L97" href="#L97">97</a>  
+<a class="jxr_linenumber" name="L98" href="#L98">98</a>  	@Test
+<a class="jxr_linenumber" name="L99" href="#L99">99</a>  	<strong class="jxr_keyword">void</strong> b02_addPairs_oddNumber() {
+<a class="jxr_linenumber" name="L100" href="#L100">100</a> 		<strong class="jxr_keyword">var</strong> b = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L101" href="#L101">101</a> 		assertThrows(IllegalArgumentException.<strong class="jxr_keyword">class</strong>, () -&gt; b.addPairs(<span class="jxr_string">"a"</span>, <span class="jxr_string">"b"</span>, <span class="jxr_string">"c"</span>));
+<a class="jxr_linenumber" name="L102" href="#L102">102</a> 	}
+<a class="jxr_linenumber" name="L103" href="#L103">103</a> 
+<a class="jxr_linenumber" name="L104" href="#L104">104</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L105" href="#L105">105</a> 	<em class="jxr_comment">// Sorting</em>
+<a class="jxr_linenumber" name="L106" href="#L106">106</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L107" href="#L107">107</a> 
+<a class="jxr_linenumber" name="L108" href="#L108">108</a> 	@Test
+<a class="jxr_linenumber" name="L109" href="#L109">109</a> 	<strong class="jxr_keyword">void</strong> c01_sorted_naturalOrder() {
+<a class="jxr_linenumber" name="L110" href="#L110">110</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L111" href="#L111">111</a> 			.add(<span class="jxr_string">"c"</span>, 3)
+<a class="jxr_linenumber" name="L112" href="#L112">112</a> 			.add(<span class="jxr_string">"a"</span>, 1)
+<a class="jxr_linenumber" name="L113" href="#L113">113</a> 			.add(<span class="jxr_string">"b"</span>, 2)
+<a class="jxr_linenumber" name="L114" href="#L114">114</a> 			.sorted()
+<a class="jxr_linenumber" name="L115" href="#L115">115</a> 			.build();
+<a class="jxr_linenumber" name="L116" href="#L116">116</a> 
+<a class="jxr_linenumber" name="L117" href="#L117">117</a> 		assertSize(3, map);
+<a class="jxr_linenumber" name="L118" href="#L118">118</a> 		assertList(map.keySet(), <span class="jxr_string">"a"</span>, <span class="jxr_string">"b"</span>, <span class="jxr_string">"c"</span>);
+<a class="jxr_linenumber" name="L119" href="#L119">119</a> 		assertTrue(map instanceof TreeMap);
+<a class="jxr_linenumber" name="L120" href="#L120">120</a> 	}
+<a class="jxr_linenumber" name="L121" href="#L121">121</a> 
+<a class="jxr_linenumber" name="L122" href="#L122">122</a> 	@Test
+<a class="jxr_linenumber" name="L123" href="#L123">123</a> 	<strong class="jxr_keyword">void</strong> c02_sorted_customComparator() {
+<a class="jxr_linenumber" name="L124" href="#L124">124</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L125" href="#L125">125</a> 			.add(<span class="jxr_string">"a"</span>, 1)
+<a class="jxr_linenumber" name="L126" href="#L126">126</a> 			.add(<span class="jxr_string">"bb"</span>, 2)
+<a class="jxr_linenumber" name="L127" href="#L127">127</a> 			.add(<span class="jxr_string">"ccc"</span>, 3)
+<a class="jxr_linenumber" name="L128" href="#L128">128</a> 			.sorted(Comparator.comparing(String::length))
+<a class="jxr_linenumber" name="L129" href="#L129">129</a> 			.build();
+<a class="jxr_linenumber" name="L130" href="#L130">130</a> 
+<a class="jxr_linenumber" name="L131" href="#L131">131</a> 		assertList(map.keySet(), <span class="jxr_string">"a"</span>, <span class="jxr_string">"bb"</span>, <span class="jxr_string">"ccc"</span>);
+<a class="jxr_linenumber" name="L132" href="#L132">132</a> 	}
+<a class="jxr_linenumber" name="L133" href="#L133">133</a> 
+<a class="jxr_linenumber" name="L134" href="#L134">134</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L135" href="#L135">135</a> 	<em class="jxr_comment">// Sparse mode</em>
+<a class="jxr_linenumber" name="L136" href="#L136">136</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L137" href="#L137">137</a> 
+<a class="jxr_linenumber" name="L138" href="#L138">138</a> 	@Test
+<a class="jxr_linenumber" name="L139" href="#L139">139</a> 	<strong class="jxr_keyword">void</strong> d01_sparse_empty() {
+<a class="jxr_linenumber" name="L140" href="#L140">140</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L141" href="#L141">141</a> 			.sparse()
+<a class="jxr_linenumber" name="L142" href="#L142">142</a> 			.build();
+<a class="jxr_linenumber" name="L143" href="#L143">143</a> 
+<a class="jxr_linenumber" name="L144" href="#L144">144</a> 		assertNull(map);
+<a class="jxr_linenumber" name="L145" href="#L145">145</a> 	}
+<a class="jxr_linenumber" name="L146" href="#L146">146</a> 
+<a class="jxr_linenumber" name="L147" href="#L147">147</a> 	@Test
+<a class="jxr_linenumber" name="L148" href="#L148">148</a> 	<strong class="jxr_keyword">void</strong> d02_sparse_notEmpty() {
+<a class="jxr_linenumber" name="L149" href="#L149">149</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L150" href="#L150">150</a> 			.add(<span class="jxr_string">"a"</span>, 1)
+<a class="jxr_linenumber" name="L151" href="#L151">151</a> 			.sparse()
+<a class="jxr_linenumber" name="L152" href="#L152">152</a> 			.build();
+<a class="jxr_linenumber" name="L153" href="#L153">153</a> 
+<a class="jxr_linenumber" name="L154" href="#L154">154</a> 		assertNotNull(map);
+<a class="jxr_linenumber" name="L155" href="#L155">155</a> 		assertSize(1, map);
+<a class="jxr_linenumber" name="L156" href="#L156">156</a> 	}
+<a class="jxr_linenumber" name="L157" href="#L157">157</a> 
+<a class="jxr_linenumber" name="L158" href="#L158">158</a> 	@Test
+<a class="jxr_linenumber" name="L159" href="#L159">159</a> 	<strong class="jxr_keyword">void</strong> d03_notSparse_empty() {
+<a class="jxr_linenumber" name="L160" href="#L160">160</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L161" href="#L161">161</a> 			.build();
+<a class="jxr_linenumber" name="L162" href="#L162">162</a> 
+<a class="jxr_linenumber" name="L163" href="#L163">163</a> 		assertNotNull(map);
+<a class="jxr_linenumber" name="L164" href="#L164">164</a> 		assertEmpty(map);
+<a class="jxr_linenumber" name="L165" href="#L165">165</a> 	}
+<a class="jxr_linenumber" name="L166" href="#L166">166</a> 
+<a class="jxr_linenumber" name="L167" href="#L167">167</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L168" href="#L168">168</a> 	<em class="jxr_comment">// Unmodifiable</em>
+<a class="jxr_linenumber" name="L169" href="#L169">169</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L170" href="#L170">170</a> 
+<a class="jxr_linenumber" name="L171" href="#L171">171</a> 	@Test
+<a class="jxr_linenumber" name="L172" href="#L172">172</a> 	<strong class="jxr_keyword">void</strong> e01_unmodifiable() {
+<a class="jxr_linenumber" name="L173" href="#L173">173</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L174" href="#L174">174</a> 			.add(<span class="jxr_string">"a"</span>, 1)
+<a class="jxr_linenumber" name="L175" href="#L175">175</a> 			.add(<span class="jxr_string">"b"</span>, 2)
+<a class="jxr_linenumber" name="L176" href="#L176">176</a> 			.unmodifiable()
+<a class="jxr_linenumber" name="L177" href="#L177">177</a> 			.build();
+<a class="jxr_linenumber" name="L178" href="#L178">178</a> 
+<a class="jxr_linenumber" name="L179" href="#L179">179</a> 		assertSize(2, map);
+<a class="jxr_linenumber" name="L180" href="#L180">180</a> 		assertThrows(UnsupportedOperationException.<strong class="jxr_keyword">class</strong>, () -&gt; map.put(<span class="jxr_string">"c"</span>, 3));
+<a class="jxr_linenumber" name="L181" href="#L181">181</a> 	}
+<a class="jxr_linenumber" name="L182" href="#L182">182</a> 
+<a class="jxr_linenumber" name="L183" href="#L183">183</a> 	@Test
+<a class="jxr_linenumber" name="L184" href="#L184">184</a> 	<strong class="jxr_keyword">void</strong> e02_modifiable() {
+<a class="jxr_linenumber" name="L185" href="#L185">185</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L186" href="#L186">186</a> 			.add(<span class="jxr_string">"a"</span>, 1)
+<a class="jxr_linenumber" name="L187" href="#L187">187</a> 			.build();
+<a class="jxr_linenumber" name="L188" href="#L188">188</a> 
+<a class="jxr_linenumber" name="L189" href="#L189">189</a> 		map.put(<span class="jxr_string">"b"</span>, 2);
+<a class="jxr_linenumber" name="L190" href="#L190">190</a> 		assertSize(2, map);
+<a class="jxr_linenumber" name="L191" href="#L191">191</a> 	}
+<a class="jxr_linenumber" name="L192" href="#L192">192</a> 
+<a class="jxr_linenumber" name="L193" href="#L193">193</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L194" href="#L194">194</a> 	<em class="jxr_comment">// Copy mode</em>
+<a class="jxr_linenumber" name="L195" href="#L195">195</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L196" href="#L196">196</a> 
+<a class="jxr_linenumber" name="L197" href="#L197">197</a> 	@Test
+<a class="jxr_linenumber" name="L198" href="#L198">198</a> 	<strong class="jxr_keyword">void</strong> f01_copy() {
+<a class="jxr_linenumber" name="L199" href="#L199">199</a> 		<strong class="jxr_keyword">var</strong> original = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String,Integer&gt;();
+<a class="jxr_linenumber" name="L200" href="#L200">200</a> 		original.put(<span class="jxr_string">"a"</span>, 1);
+<a class="jxr_linenumber" name="L201" href="#L201">201</a> 
+<a class="jxr_linenumber" name="L202" href="#L202">202</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L203" href="#L203">203</a> 			.to(original)
+<a class="jxr_linenumber" name="L204" href="#L204">204</a> 			.add(<span class="jxr_string">"b"</span>, 2)
+<a class="jxr_linenumber" name="L205" href="#L205">205</a> 			.copy()
+<a class="jxr_linenumber" name="L206" href="#L206">206</a> 			.add(<span class="jxr_string">"c"</span>, 3)
+<a class="jxr_linenumber" name="L207" href="#L207">207</a> 			.build();
+<a class="jxr_linenumber" name="L208" href="#L208">208</a> 
+<a class="jxr_linenumber" name="L209" href="#L209">209</a> 		assertSize(3, map);
+<a class="jxr_linenumber" name="L210" href="#L210">210</a> 		assertSize(2, original);  <em class="jxr_comment">// Original has "a" and "b" added before copy()</em>
+<a class="jxr_linenumber" name="L211" href="#L211">211</a> 		assertNotSame(original, map);  <em class="jxr_comment">// After copy(), they're different maps</em>
+<a class="jxr_linenumber" name="L212" href="#L212">212</a> 	}
+<a class="jxr_linenumber" name="L213" href="#L213">213</a> 
+<a class="jxr_linenumber" name="L214" href="#L214">214</a> 	@Test
+<a class="jxr_linenumber" name="L215" href="#L215">215</a> 	<strong class="jxr_keyword">void</strong> f02_noCopy() {
+<a class="jxr_linenumber" name="L216" href="#L216">216</a> 		<strong class="jxr_keyword">var</strong> original = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String,Integer&gt;();
+<a class="jxr_linenumber" name="L217" href="#L217">217</a> 		original.put(<span class="jxr_string">"a"</span>, 1);
+<a class="jxr_linenumber" name="L218" href="#L218">218</a> 
+<a class="jxr_linenumber" name="L219" href="#L219">219</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L220" href="#L220">220</a> 			.to(original)
+<a class="jxr_linenumber" name="L221" href="#L221">221</a> 			.add(<span class="jxr_string">"b"</span>, 2)
+<a class="jxr_linenumber" name="L222" href="#L222">222</a> 			.build();
+<a class="jxr_linenumber" name="L223" href="#L223">223</a> 
+<a class="jxr_linenumber" name="L224" href="#L224">224</a> 		assertSize(2, map);
+<a class="jxr_linenumber" name="L225" href="#L225">225</a> 		assertSize(2, original);  <em class="jxr_comment">// Original modified</em>
+<a class="jxr_linenumber" name="L226" href="#L226">226</a> 		assertSame(original, map);
+<a class="jxr_linenumber" name="L227" href="#L227">227</a> 	}
+<a class="jxr_linenumber" name="L228" href="#L228">228</a> 
+<a class="jxr_linenumber" name="L229" href="#L229">229</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L230" href="#L230">230</a> 	<em class="jxr_comment">// Complex scenarios</em>
+<a class="jxr_linenumber" name="L231" href="#L231">231</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L232" href="#L232">232</a> 
+<a class="jxr_linenumber" name="L233" href="#L233">233</a> 	@Test
+<a class="jxr_linenumber" name="L234" href="#L234">234</a> 	<strong class="jxr_keyword">void</strong> g01_multipleOperations() {
+<a class="jxr_linenumber" name="L235" href="#L235">235</a> 		<strong class="jxr_keyword">var</strong> existing = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String,Integer&gt;();
+<a class="jxr_linenumber" name="L236" href="#L236">236</a> 		existing.put(<span class="jxr_string">"x"</span>, 10);
+<a class="jxr_linenumber" name="L237" href="#L237">237</a> 		existing.put(<span class="jxr_string">"y"</span>, 20);
+<a class="jxr_linenumber" name="L238" href="#L238">238</a> 
+<a class="jxr_linenumber" name="L239" href="#L239">239</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L240" href="#L240">240</a> 			.add(<span class="jxr_string">"a"</span>, 1)
+<a class="jxr_linenumber" name="L241" href="#L241">241</a> 			.addAll(existing)
+<a class="jxr_linenumber" name="L242" href="#L242">242</a> 			.add(<span class="jxr_string">"b"</span>, 2)
+<a class="jxr_linenumber" name="L243" href="#L243">243</a> 			.sorted()
+<a class="jxr_linenumber" name="L244" href="#L244">244</a> 			.build();
+<a class="jxr_linenumber" name="L245" href="#L245">245</a> 
+<a class="jxr_linenumber" name="L246" href="#L246">246</a> 		assertSize(4, map);
+<a class="jxr_linenumber" name="L247" href="#L247">247</a> 		<em class="jxr_comment">// Should be sorted by key</em>
+<a class="jxr_linenumber" name="L248" href="#L248">248</a> 		assertList(map.keySet(), <span class="jxr_string">"a"</span>, <span class="jxr_string">"b"</span>, <span class="jxr_string">"x"</span>, <span class="jxr_string">"y"</span>);
+<a class="jxr_linenumber" name="L249" href="#L249">249</a> 	}
+<a class="jxr_linenumber" name="L250" href="#L250">250</a> 
+<a class="jxr_linenumber" name="L251" href="#L251">251</a> 	@Test
+<a class="jxr_linenumber" name="L252" href="#L252">252</a> 	<strong class="jxr_keyword">void</strong> g02_sortedAndUnmodifiable() {
+<a class="jxr_linenumber" name="L253" href="#L253">253</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L254" href="#L254">254</a> 			.add(<span class="jxr_string">"c"</span>, 3)
+<a class="jxr_linenumber" name="L255" href="#L255">255</a> 			.add(<span class="jxr_string">"a"</span>, 1)
+<a class="jxr_linenumber" name="L256" href="#L256">256</a> 			.add(<span class="jxr_string">"b"</span>, 2)
+<a class="jxr_linenumber" name="L257" href="#L257">257</a> 			.sorted()
+<a class="jxr_linenumber" name="L258" href="#L258">258</a> 			.unmodifiable()
+<a class="jxr_linenumber" name="L259" href="#L259">259</a> 			.build();
+<a class="jxr_linenumber" name="L260" href="#L260">260</a> 
+<a class="jxr_linenumber" name="L261" href="#L261">261</a> 		assertSize(3, map);
+<a class="jxr_linenumber" name="L262" href="#L262">262</a> 		assertList(map.keySet(), <span class="jxr_string">"a"</span>, <span class="jxr_string">"b"</span>, <span class="jxr_string">"c"</span>);
+<a class="jxr_linenumber" name="L263" href="#L263">263</a> 		assertThrows(UnsupportedOperationException.<strong class="jxr_keyword">class</strong>, () -&gt; map.put(<span class="jxr_string">"d"</span>, 4));
+<a class="jxr_linenumber" name="L264" href="#L264">264</a> 	}
+<a class="jxr_linenumber" name="L265" href="#L265">265</a> 
+<a class="jxr_linenumber" name="L266" href="#L266">266</a> 	@Test
+<a class="jxr_linenumber" name="L267" href="#L267">267</a> 	<strong class="jxr_keyword">void</strong> g03_sparseAndSorted() {
+<a class="jxr_linenumber" name="L268" href="#L268">268</a> 		<strong class="jxr_keyword">var</strong> map1 = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L269" href="#L269">269</a> 			.add(<span class="jxr_string">"c"</span>, 3)
+<a class="jxr_linenumber" name="L270" href="#L270">270</a> 			.add(<span class="jxr_string">"a"</span>, 1)
+<a class="jxr_linenumber" name="L271" href="#L271">271</a> 			.add(<span class="jxr_string">"b"</span>, 2)
+<a class="jxr_linenumber" name="L272" href="#L272">272</a> 			.sorted()
+<a class="jxr_linenumber" name="L273" href="#L273">273</a> 			.sparse()
+<a class="jxr_linenumber" name="L274" href="#L274">274</a> 			.build();
+<a class="jxr_linenumber" name="L275" href="#L275">275</a> 
+<a class="jxr_linenumber" name="L276" href="#L276">276</a> 		assertNotNull(map1);
+<a class="jxr_linenumber" name="L277" href="#L277">277</a> 		assertSize(3, map1);
+<a class="jxr_linenumber" name="L278" href="#L278">278</a> 
+<a class="jxr_linenumber" name="L279" href="#L279">279</a> 		<strong class="jxr_keyword">var</strong> map2 = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L280" href="#L280">280</a> 			.sorted()
+<a class="jxr_linenumber" name="L281" href="#L281">281</a> 			.sparse()
+<a class="jxr_linenumber" name="L282" href="#L282">282</a> 			.build();
+<a class="jxr_linenumber" name="L283" href="#L283">283</a> 
+<a class="jxr_linenumber" name="L284" href="#L284">284</a> 		assertNull(map2);
+<a class="jxr_linenumber" name="L285" href="#L285">285</a> 	}
+<a class="jxr_linenumber" name="L286" href="#L286">286</a> 
+<a class="jxr_linenumber" name="L287" href="#L287">287</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L288" href="#L288">288</a> 	<em class="jxr_comment">// Edge cases</em>
+<a class="jxr_linenumber" name="L289" href="#L289">289</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L290" href="#L290">290</a> 
+<a class="jxr_linenumber" name="L291" href="#L291">291</a> 	@Test
+<a class="jxr_linenumber" name="L292" href="#L292">292</a> 	<strong class="jxr_keyword">void</strong> h01_buildEmptyMap() {
+<a class="jxr_linenumber" name="L293" href="#L293">293</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L294" href="#L294">294</a> 			.build();
+<a class="jxr_linenumber" name="L295" href="#L295">295</a> 
+<a class="jxr_linenumber" name="L296" href="#L296">296</a> 		assertNotNull(map);
+<a class="jxr_linenumber" name="L297" href="#L297">297</a> 		assertEmpty(map);
+<a class="jxr_linenumber" name="L298" href="#L298">298</a> 	}
+<a class="jxr_linenumber" name="L299" href="#L299">299</a> 
+<a class="jxr_linenumber" name="L300" href="#L300">300</a> 	@Test
+<a class="jxr_linenumber" name="L301" href="#L301">301</a> 	<strong class="jxr_keyword">void</strong> h02_addNullKey() {
+<a class="jxr_linenumber" name="L302" href="#L302">302</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L303" href="#L303">303</a> 			.add(<strong class="jxr_keyword">null</strong>, 1)
+<a class="jxr_linenumber" name="L304" href="#L304">304</a> 			.add(<span class="jxr_string">"a"</span>, 2)
+<a class="jxr_linenumber" name="L305" href="#L305">305</a> 			.build();
+<a class="jxr_linenumber" name="L306" href="#L306">306</a> 
+<a class="jxr_linenumber" name="L307" href="#L307">307</a> 		assertMap(map, <span class="jxr_string">"&lt;null&gt;=1"</span>, <span class="jxr_string">"a=2"</span>);
+<a class="jxr_linenumber" name="L308" href="#L308">308</a> 	}
+<a class="jxr_linenumber" name="L309" href="#L309">309</a> 
+<a class="jxr_linenumber" name="L310" href="#L310">310</a> 	@Test
+<a class="jxr_linenumber" name="L311" href="#L311">311</a> 	<strong class="jxr_keyword">void</strong> h03_addNullValue() {
+<a class="jxr_linenumber" name="L312" href="#L312">312</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L313" href="#L313">313</a> 			.add(<span class="jxr_string">"a"</span>, 1)
+<a class="jxr_linenumber" name="L314" href="#L314">314</a> 			.add(<span class="jxr_string">"b"</span>, <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L315" href="#L315">315</a> 			.add(<span class="jxr_string">"c"</span>, 3)
+<a class="jxr_linenumber" name="L316" href="#L316">316</a> 			.build();
+<a class="jxr_linenumber" name="L317" href="#L317">317</a> 
+<a class="jxr_linenumber" name="L318" href="#L318">318</a> 		assertMap(map, <span class="jxr_string">"a=1"</span>, <span class="jxr_string">"b=&lt;null&gt;"</span>, <span class="jxr_string">"c=3"</span>);
+<a class="jxr_linenumber" name="L319" href="#L319">319</a> 	}
+<a class="jxr_linenumber" name="L320" href="#L320">320</a> 
+<a class="jxr_linenumber" name="L321" href="#L321">321</a> 	@Test
+<a class="jxr_linenumber" name="L322" href="#L322">322</a> 	<strong class="jxr_keyword">void</strong> h04_duplicateKeys() {
+<a class="jxr_linenumber" name="L323" href="#L323">323</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L324" href="#L324">324</a> 			.add(<span class="jxr_string">"a"</span>, 1)
+<a class="jxr_linenumber" name="L325" href="#L325">325</a> 			.add(<span class="jxr_string">"a"</span>, 2)  <em class="jxr_comment">// Overwrites first value</em>
+<a class="jxr_linenumber" name="L326" href="#L326">326</a> 			.add(<span class="jxr_string">"a"</span>, 3)  <em class="jxr_comment">// Overwrites again</em>
+<a class="jxr_linenumber" name="L327" href="#L327">327</a> 			.build();
+<a class="jxr_linenumber" name="L328" href="#L328">328</a> 
+<a class="jxr_linenumber" name="L329" href="#L329">329</a> 		assertSize(1, map);  <em class="jxr_comment">// Only one entry for key "a"</em>
+<a class="jxr_linenumber" name="L330" href="#L330">330</a> 		assertMap(map, <span class="jxr_string">"a=3"</span>);  <em class="jxr_comment">// Last value wins</em>
+<a class="jxr_linenumber" name="L331" href="#L331">331</a> 	}
+<a class="jxr_linenumber" name="L332" href="#L332">332</a> 
+<a class="jxr_linenumber" name="L333" href="#L333">333</a> 	@Test
+<a class="jxr_linenumber" name="L334" href="#L334">334</a> 	<strong class="jxr_keyword">void</strong> h05_toExistingMap() {
+<a class="jxr_linenumber" name="L335" href="#L335">335</a> 		<strong class="jxr_keyword">var</strong> existing = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String,Integer&gt;();
+<a class="jxr_linenumber" name="L336" href="#L336">336</a> 		existing.put(<span class="jxr_string">"x"</span>, 10);
+<a class="jxr_linenumber" name="L337" href="#L337">337</a> 
+<a class="jxr_linenumber" name="L338" href="#L338">338</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L339" href="#L339">339</a> 			.to(existing)
+<a class="jxr_linenumber" name="L340" href="#L340">340</a> 			.add(<span class="jxr_string">"y"</span>, 20)
+<a class="jxr_linenumber" name="L341" href="#L341">341</a> 			.build();
+<a class="jxr_linenumber" name="L342" href="#L342">342</a> 
+<a class="jxr_linenumber" name="L343" href="#L343">343</a> 		assertSize(2, map);
+<a class="jxr_linenumber" name="L344" href="#L344">344</a> 		assertMap(map, <span class="jxr_string">"x=10"</span>, <span class="jxr_string">"y=20"</span>);
+<a class="jxr_linenumber" name="L345" href="#L345">345</a> 		assertSame(existing, map);
+<a class="jxr_linenumber" name="L346" href="#L346">346</a> 	}
+<a class="jxr_linenumber" name="L347" href="#L347">347</a> 
+<a class="jxr_linenumber" name="L348" href="#L348">348</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L349" href="#L349">349</a> 	<em class="jxr_comment">// Filtering</em>
+<a class="jxr_linenumber" name="L350" href="#L350">350</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L351" href="#L351">351</a> 
+<a class="jxr_linenumber" name="L352" href="#L352">352</a> 	@Test
+<a class="jxr_linenumber" name="L353" href="#L353">353</a> 	<strong class="jxr_keyword">void</strong> i01_filtered_customPredicate() {
+<a class="jxr_linenumber" name="L354" href="#L354">354</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L355" href="#L355">355</a> 			.filtered((k, v) -&gt; v != <strong class="jxr_keyword">null</strong> &amp;&amp; !v.equals(<span class="jxr_string">""</span>))
+<a class="jxr_linenumber" name="L356" href="#L356">356</a> 			.add(<span class="jxr_string">"a"</span>, <span class="jxr_string">"foo"</span>)
+<a class="jxr_linenumber" name="L357" href="#L357">357</a> 			.add(<span class="jxr_string">"b"</span>, <strong class="jxr_keyword">null</strong>)     <em class="jxr_comment">// Not added</em>
+<a class="jxr_linenumber" name="L358" href="#L358">358</a> 			.add(<span class="jxr_string">"c"</span>, <span class="jxr_string">""</span>)       <em class="jxr_comment">// Not added</em>
+<a class="jxr_linenumber" name="L359" href="#L359">359</a> 			.add(<span class="jxr_string">"d"</span>, <span class="jxr_string">"bar"</span>)
+<a class="jxr_linenumber" name="L360" href="#L360">360</a> 			.build();
+<a class="jxr_linenumber" name="L361" href="#L361">361</a> 
+<a class="jxr_linenumber" name="L362" href="#L362">362</a> 		assertMap(map, <span class="jxr_string">"a=foo"</span>, <span class="jxr_string">"d=bar"</span>);
+<a class="jxr_linenumber" name="L363" href="#L363">363</a> 	}
+<a class="jxr_linenumber" name="L364" href="#L364">364</a> 
+<a class="jxr_linenumber" name="L365" href="#L365">365</a> 	@Test
+<a class="jxr_linenumber" name="L366" href="#L366">366</a> 	<strong class="jxr_keyword">void</strong> i02_filtered_defaultFilter() {
+<a class="jxr_linenumber" name="L367" href="#L367">367</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Object.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L368" href="#L368">368</a> 			.filtered()
+<a class="jxr_linenumber" name="L369" href="#L369">369</a> 			.add(<span class="jxr_string">"name"</span>, <span class="jxr_string">"John"</span>)
+<a class="jxr_linenumber" name="L370" href="#L370">370</a> 			.add(<span class="jxr_string">"age"</span>, -1)              <em class="jxr_comment">// Not added</em>
+<a class="jxr_linenumber" name="L371" href="#L371">371</a> 			.add(<span class="jxr_string">"enabled"</span>, false)       <em class="jxr_comment">// Not added</em>
+<a class="jxr_linenumber" name="L372" href="#L372">372</a> 			.add(<span class="jxr_string">"tags"</span>, <strong class="jxr_keyword">new</strong> String[0])  <em class="jxr_comment">// Not added</em>
+<a class="jxr_linenumber" name="L373" href="#L373">373</a> 			.add(<span class="jxr_string">"emptyMap"</span>, <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;&gt;())  <em class="jxr_comment">// Not added</em>
+<a class="jxr_linenumber" name="L374" href="#L374">374</a> 			.add(<span class="jxr_string">"emptyList"</span>, <strong class="jxr_keyword">new</strong> ArrayList&lt;&gt;())     <em class="jxr_comment">// Not added</em>
+<a class="jxr_linenumber" name="L375" href="#L375">375</a> 			.add(<span class="jxr_string">"value"</span>, 42)
+<a class="jxr_linenumber" name="L376" href="#L376">376</a> 			.build();
+<a class="jxr_linenumber" name="L377" href="#L377">377</a> 
+<a class="jxr_linenumber" name="L378" href="#L378">378</a> 		assertMap(map, <span class="jxr_string">"name=John"</span>, <span class="jxr_string">"value=42"</span>);
+<a class="jxr_linenumber" name="L379" href="#L379">379</a> 	}
+<a class="jxr_linenumber" name="L380" href="#L380">380</a> 
+<a class="jxr_linenumber" name="L381" href="#L381">381</a> 	@Test
+<a class="jxr_linenumber" name="L382" href="#L382">382</a> 	<strong class="jxr_keyword">void</strong> i03_filtered_rejectsValue() {
+<a class="jxr_linenumber" name="L383" href="#L383">383</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L384" href="#L384">384</a> 			.filtered((k, v) -&gt; v != <strong class="jxr_keyword">null</strong> &amp;&amp; v &gt; 0)
+<a class="jxr_linenumber" name="L385" href="#L385">385</a> 			.add(<span class="jxr_string">"a"</span>, 1)
+<a class="jxr_linenumber" name="L386" href="#L386">386</a> 			.add(<span class="jxr_string">"b"</span>, -1)  <em class="jxr_comment">// Not added</em>
+<a class="jxr_linenumber" name="L387" href="#L387">387</a> 			.add(<span class="jxr_string">"c"</span>, 0)   <em class="jxr_comment">// Not added</em>
+<a class="jxr_linenumber" name="L388" href="#L388">388</a> 			.add(<span class="jxr_string">"d"</span>, 2)
+<a class="jxr_linenumber" name="L389" href="#L389">389</a> 			.build();
+<a class="jxr_linenumber" name="L390" href="#L390">390</a> 
+<a class="jxr_linenumber" name="L391" href="#L391">391</a> 		assertMap(map, <span class="jxr_string">"a=1"</span>, <span class="jxr_string">"d=2"</span>);
+<a class="jxr_linenumber" name="L392" href="#L392">392</a> 	}
+<a class="jxr_linenumber" name="L393" href="#L393">393</a> 
+<a class="jxr_linenumber" name="L394" href="#L394">394</a> 	@Test
+<a class="jxr_linenumber" name="L395" href="#L395">395</a> 	<strong class="jxr_keyword">void</strong> i04_add_withFilter() {
+<a class="jxr_linenumber" name="L396" href="#L396">396</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L397" href="#L397">397</a> 			.filtered((k, v) -&gt; v != <strong class="jxr_keyword">null</strong> &amp;&amp; v.length() &gt; 2)
+<a class="jxr_linenumber" name="L398" href="#L398">398</a> 			.add(<span class="jxr_string">"a"</span>, <span class="jxr_string">"foo"</span>)   <em class="jxr_comment">// Added</em>
+<a class="jxr_linenumber" name="L399" href="#L399">399</a> 			.add(<span class="jxr_string">"b"</span>, <span class="jxr_string">"ab"</span>)    <em class="jxr_comment">// Not added (length &lt;= 2)</em>
+<a class="jxr_linenumber" name="L400" href="#L400">400</a> 			.add(<span class="jxr_string">"c"</span>, <span class="jxr_string">"bar"</span>)   <em class="jxr_comment">// Added</em>
+<a class="jxr_linenumber" name="L401" href="#L401">401</a> 			.build();
+<a class="jxr_linenumber" name="L402" href="#L402">402</a> 
+<a class="jxr_linenumber" name="L403" href="#L403">403</a> 		assertMap(map, <span class="jxr_string">"a=foo"</span>, <span class="jxr_string">"c=bar"</span>);
+<a class="jxr_linenumber" name="L404" href="#L404">404</a> 	}
+<a class="jxr_linenumber" name="L405" href="#L405">405</a> 
+<a class="jxr_linenumber" name="L406" href="#L406">406</a> 	@Test
+<a class="jxr_linenumber" name="L407" href="#L407">407</a> 	<strong class="jxr_keyword">void</strong> i05_addAll_withFilter() {
+<a class="jxr_linenumber" name="L408" href="#L408">408</a> 		<strong class="jxr_keyword">var</strong> existing = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String,String&gt;();
+<a class="jxr_linenumber" name="L409" href="#L409">409</a> 		existing.put(<span class="jxr_string">"x"</span>, <span class="jxr_string">"longvalue"</span>);
+<a class="jxr_linenumber" name="L410" href="#L410">410</a> 		existing.put(<span class="jxr_string">"y"</span>, <span class="jxr_string">"ab"</span>);  <em class="jxr_comment">// Will be filtered out</em>
+<a class="jxr_linenumber" name="L411" href="#L411">411</a> 		existing.put(<span class="jxr_string">"z"</span>, <span class="jxr_string">"another"</span>);
+<a class="jxr_linenumber" name="L412" href="#L412">412</a> 
+<a class="jxr_linenumber" name="L413" href="#L413">413</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L414" href="#L414">414</a> 			.filtered((k, v) -&gt; v != <strong class="jxr_keyword">null</strong> &amp;&amp; v.length() &gt; 2)
+<a class="jxr_linenumber" name="L415" href="#L415">415</a> 			.addAll(existing)
+<a class="jxr_linenumber" name="L416" href="#L416">416</a> 			.build();
+<a class="jxr_linenumber" name="L417" href="#L417">417</a> 
+<a class="jxr_linenumber" name="L418" href="#L418">418</a> 		assertMap(map, <span class="jxr_string">"x=longvalue"</span>, <span class="jxr_string">"z=another"</span>);
+<a class="jxr_linenumber" name="L419" href="#L419">419</a> 	}
+<a class="jxr_linenumber" name="L420" href="#L420">420</a> 
+<a class="jxr_linenumber" name="L421" href="#L421">421</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L422" href="#L422">422</a> 	<em class="jxr_comment">// Key/Value Functions</em>
+<a class="jxr_linenumber" name="L423" href="#L423">423</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L424" href="#L424">424</a> 
+<a class="jxr_linenumber" name="L425" href="#L425">425</a> 	@Test
+<a class="jxr_linenumber" name="L426" href="#L426">426</a> 	<strong class="jxr_keyword">void</strong> j01_keyValueFunctions_notSet() {
+<a class="jxr_linenumber" name="L427" href="#L427">427</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L428" href="#L428">428</a> 			.add(<span class="jxr_string">"a"</span>, 1)
+<a class="jxr_linenumber" name="L429" href="#L429">429</a> 			.build();
+<a class="jxr_linenumber" name="L430" href="#L430">430</a> 
+<a class="jxr_linenumber" name="L431" href="#L431">431</a> 		assertMap(map, <span class="jxr_string">"a=1"</span>);
+<a class="jxr_linenumber" name="L432" href="#L432">432</a> 	}
+<a class="jxr_linenumber" name="L433" href="#L433">433</a> 
+<a class="jxr_linenumber" name="L434" href="#L434">434</a> 	@Test
+<a class="jxr_linenumber" name="L435" href="#L435">435</a> 	<strong class="jxr_keyword">void</strong> j02_keyValueFunctions_withValueFunction() {
+<a class="jxr_linenumber" name="L436" href="#L436">436</a> 		<strong class="jxr_keyword">var</strong> inputMap = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String,String&gt;();
+<a class="jxr_linenumber" name="L437" href="#L437">437</a> 		inputMap.put(<span class="jxr_string">"a"</span>, <span class="jxr_string">"1"</span>);
+<a class="jxr_linenumber" name="L438" href="#L438">438</a> 		inputMap.put(<span class="jxr_string">"b"</span>, <span class="jxr_string">"2"</span>);
+<a class="jxr_linenumber" name="L439" href="#L439">439</a> 
+<a class="jxr_linenumber" name="L440" href="#L440">440</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L441" href="#L441">441</a> 			.valueFunction(o -&gt; o instanceof String ? Integer.parseInt((String)o) : (Integer)o)
+<a class="jxr_linenumber" name="L442" href="#L442">442</a> 			.addAny(inputMap)
+<a class="jxr_linenumber" name="L443" href="#L443">443</a> 			.build();
+<a class="jxr_linenumber" name="L444" href="#L444">444</a> 
+<a class="jxr_linenumber" name="L445" href="#L445">445</a> 		assertMap(map, <span class="jxr_string">"a=1"</span>, <span class="jxr_string">"b=2"</span>);
+<a class="jxr_linenumber" name="L446" href="#L446">446</a> 	}
 <a class="jxr_linenumber" name="L447" href="#L447">447</a> 
-<a class="jxr_linenumber" name="L448" href="#L448">448</a> 		<strong class="jxr_keyword">var</strong> inputMap = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String,String&gt;();
-<a class="jxr_linenumber" name="L449" href="#L449">449</a> 		inputMap.put(<span class="jxr_string">"a"</span>, <span class="jxr_string">"1"</span>);
-<a class="jxr_linenumber" name="L450" href="#L450">450</a> 		inputMap.put(<span class="jxr_string">"b"</span>, <span class="jxr_string">"2"</span>);
-<a class="jxr_linenumber" name="L451" href="#L451">451</a> 
-<a class="jxr_linenumber" name="L452" href="#L452">452</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L453" href="#L453">453</a> 			.converters(converter)
-<a class="jxr_linenumber" name="L454" href="#L454">454</a> 			.addAny(inputMap)
-<a class="jxr_linenumber" name="L455" href="#L455">455</a> 			.build();
-<a class="jxr_linenumber" name="L456" href="#L456">456</a> 
-<a class="jxr_linenumber" name="L457" href="#L457">457</a> 		assertMap(map, <span class="jxr_string">"a=1"</span>, <span class="jxr_string">"b=2"</span>);
-<a class="jxr_linenumber" name="L458" href="#L458">458</a> 	}
+<a class="jxr_linenumber" name="L448" href="#L448">448</a> 	@Test
+<a class="jxr_linenumber" name="L449" href="#L449">449</a> 	<strong class="jxr_keyword">void</strong> j03_keyValueFunctions_withBothFunctions() {
+<a class="jxr_linenumber" name="L450" href="#L450">450</a> 		<strong class="jxr_keyword">var</strong> inputMap = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;Integer,String&gt;();
+<a class="jxr_linenumber" name="L451" href="#L451">451</a> 		inputMap.put(1, <span class="jxr_string">"10"</span>);
+<a class="jxr_linenumber" name="L452" href="#L452">452</a> 		inputMap.put(2, <span class="jxr_string">"20"</span>);
+<a class="jxr_linenumber" name="L453" href="#L453">453</a> 
+<a class="jxr_linenumber" name="L454" href="#L454">454</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L455" href="#L455">455</a> 			.keyFunction(o -&gt; String.valueOf(o))
+<a class="jxr_linenumber" name="L456" href="#L456">456</a> 			.valueFunction(o -&gt; o instanceof String ? Integer.parseInt((String)o) : (Integer)o)
+<a class="jxr_linenumber" name="L457" href="#L457">457</a> 			.addAny(inputMap)
+<a class="jxr_linenumber" name="L458" href="#L458">458</a> 			.build();
 <a class="jxr_linenumber" name="L459" href="#L459">459</a> 
-<a class="jxr_linenumber" name="L460" href="#L460">460</a> 	@Test
-<a class="jxr_linenumber" name="L461" href="#L461">461</a> 	<strong class="jxr_keyword">void</strong> j03_converters_multipleConverters() {
-<a class="jxr_linenumber" name="L462" href="#L462">462</a> 		Converter converter1 = <strong class="jxr_keyword">new</strong> Converter() {
-<a class="jxr_linenumber" name="L463" href="#L463">463</a> 			@Override
-<a class="jxr_linenumber" name="L464" href="#L464">464</a> 			<strong class="jxr_keyword">public</strong> &lt;T&gt; T convertTo(Class&lt;T&gt; type, Object o) {
-<a class="jxr_linenumber" name="L465" href="#L465">465</a> 				<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;  <em class="jxr_comment">// Doesn't handle this</em>
-<a class="jxr_linenumber" name="L466" href="#L466">466</a> 			}
-<a class="jxr_linenumber" name="L467" href="#L467">467</a> 		};
+<a class="jxr_linenumber" name="L460" href="#L460">460</a> 		assertMap(map, <span class="jxr_string">"1=10"</span>, <span class="jxr_string">"2=20"</span>);
+<a class="jxr_linenumber" name="L461" href="#L461">461</a> 	}
+<a class="jxr_linenumber" name="L462" href="#L462">462</a> 
+<a class="jxr_linenumber" name="L463" href="#L463">463</a> 	@Test
+<a class="jxr_linenumber" name="L464" href="#L464">464</a> 	<strong class="jxr_keyword">void</strong> j04_keyValueFunctions_functionsConvenienceMethod() {
+<a class="jxr_linenumber" name="L465" href="#L465">465</a> 		<strong class="jxr_keyword">var</strong> inputMap = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;Integer,String&gt;();
+<a class="jxr_linenumber" name="L466" href="#L466">466</a> 		inputMap.put(1, <span class="jxr_string">"10"</span>);
+<a class="jxr_linenumber" name="L467" href="#L467">467</a> 		inputMap.put(2, <span class="jxr_string">"20"</span>);
 <a class="jxr_linenumber" name="L468" href="#L468">468</a> 
-<a class="jxr_linenumber" name="L469" href="#L469">469</a> 		Converter converter2 = <strong class="jxr_keyword">new</strong> Converter() {
-<a class="jxr_linenumber" name="L470" href="#L470">470</a> 			@Override
-<a class="jxr_linenumber" name="L471" href="#L471">471</a> 			<strong class="jxr_keyword">public</strong> &lt;T&gt; T convertTo(Class&lt;T&gt; type, Object o) {
-<a class="jxr_linenumber" name="L472" href="#L472">472</a> 				<strong class="jxr_keyword">if</strong> (type == Integer.<strong class="jxr_keyword">class</strong> &amp;&amp; o instanceof String) {
-<a class="jxr_linenumber" name="L473" href="#L473">473</a> 					<strong class="jxr_keyword">return</strong> type.<strong class="jxr_keyword">cast</strong>(Integer.parseInt((String)o));
-<a class="jxr_linenumber" name="L474" href="#L474">474</a> 				}
-<a class="jxr_linenumber" name="L475" href="#L475">475</a> 				<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L476" href="#L476">476</a> 			}
-<a class="jxr_linenumber" name="L477" href="#L477">477</a> 		};
-<a class="jxr_linenumber" name="L478" href="#L478">478</a> 
-<a class="jxr_linenumber" name="L479" href="#L479">479</a> 		<strong class="jxr_keyword">var</strong> inputMap = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String,String&gt;();
-<a class="jxr_linenumber" name="L480" href="#L480">480</a> 		inputMap.put(<span class="jxr_string">"a"</span>, <span class="jxr_string">"1"</span>);
-<a class="jxr_linenumber" name="L481" href="#L481">481</a> 
-<a class="jxr_linenumber" name="L482" href="#L482">482</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L483" href="#L483">483</a> 			.converters(converter1, converter2)
-<a class="jxr_linenumber" name="L484" href="#L484">484</a> 			.addAny(inputMap)
-<a class="jxr_linenumber" name="L485" href="#L485">485</a> 			.build();
-<a class="jxr_linenumber" name="L486" href="#L486">486</a> 
-<a class="jxr_linenumber" name="L487" href="#L487">487</a> 		assertMap(map, <span class="jxr_string">"a=1"</span>);
-<a class="jxr_linenumber" name="L488" href="#L488">488</a> 	}
+<a class="jxr_linenumber" name="L469" href="#L469">469</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L470" href="#L470">470</a> 			.functions(
+<a class="jxr_linenumber" name="L471" href="#L471">471</a> 				o -&gt; String.valueOf(o),  <em class="jxr_comment">// key function</em>
+<a class="jxr_linenumber" name="L472" href="#L472">472</a> 				o -&gt; o instanceof String ? Integer.parseInt((String)o) : (Integer)o  <em class="jxr_comment">// value function</em>
+<a class="jxr_linenumber" name="L473" href="#L473">473</a> 			)
+<a class="jxr_linenumber" name="L474" href="#L474">474</a> 			.addAny(inputMap)
+<a class="jxr_linenumber" name="L475" href="#L475">475</a> 			.build();
+<a class="jxr_linenumber" name="L476" href="#L476">476</a> 
+<a class="jxr_linenumber" name="L477" href="#L477">477</a> 		assertMap(map, <span class="jxr_string">"1=10"</span>, <span class="jxr_string">"2=20"</span>);
+<a class="jxr_linenumber" name="L478" href="#L478">478</a> 	}
+<a class="jxr_linenumber" name="L479" href="#L479">479</a> 
+<a class="jxr_linenumber" name="L480" href="#L480">480</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L481" href="#L481">481</a> 	<em class="jxr_comment">// AddAny</em>
+<a class="jxr_linenumber" name="L482" href="#L482">482</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L483" href="#L483">483</a> 
+<a class="jxr_linenumber" name="L484" href="#L484">484</a> 	@Test
+<a class="jxr_linenumber" name="L485" href="#L485">485</a> 	<strong class="jxr_keyword">void</strong> k01_addAny_withMap() {
+<a class="jxr_linenumber" name="L486" href="#L486">486</a> 		<strong class="jxr_keyword">var</strong> inputMap = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String,Integer&gt;();
+<a class="jxr_linenumber" name="L487" href="#L487">487</a> 		inputMap.put(<span class="jxr_string">"a"</span>, 1);
+<a class="jxr_linenumber" name="L488" href="#L488">488</a> 		inputMap.put(<span class="jxr_string">"b"</span>, 2);
 <a class="jxr_linenumber" name="L489" href="#L489">489</a> 
-<a class="jxr_linenumber" name="L490" href="#L490">490</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L491" href="#L491">491</a> 	<em class="jxr_comment">// AddAny</em>
-<a class="jxr_linenumber" name="L492" href="#L492">492</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L490" href="#L490">490</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L491" href="#L491">491</a> 			.addAny(inputMap)
+<a class="jxr_linenumber" name="L492" href="#L492">492</a> 			.build();
 <a class="jxr_linenumber" name="L493" href="#L493">493</a> 
-<a class="jxr_linenumber" name="L494" href="#L494">494</a> 	@Test
-<a class="jxr_linenumber" name="L495" href="#L495">495</a> 	<strong class="jxr_keyword">void</strong> k01_addAny_withMap() {
-<a class="jxr_linenumber" name="L496" href="#L496">496</a> 		<strong class="jxr_keyword">var</strong> inputMap = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String,Integer&gt;();
-<a class="jxr_linenumber" name="L497" href="#L497">497</a> 		inputMap.put(<span class="jxr_string">"a"</span>, 1);
-<a class="jxr_linenumber" name="L498" href="#L498">498</a> 		inputMap.put(<span class="jxr_string">"b"</span>, 2);
-<a class="jxr_linenumber" name="L499" href="#L499">499</a> 
-<a class="jxr_linenumber" name="L500" href="#L500">500</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L501" href="#L501">501</a> 			.addAny(inputMap)
-<a class="jxr_linenumber" name="L502" href="#L502">502</a> 			.build();
-<a class="jxr_linenumber" name="L503" href="#L503">503</a> 
-<a class="jxr_linenumber" name="L504" href="#L504">504</a> 		assertMap(map, <span class="jxr_string">"a=1"</span>, <span class="jxr_string">"b=2"</span>);
-<a class="jxr_linenumber" name="L505" href="#L505">505</a> 	}
+<a class="jxr_linenumber" name="L494" href="#L494">494</a> 		assertMap(map, <span class="jxr_string">"a=1"</span>, <span class="jxr_string">"b=2"</span>);
+<a class="jxr_linenumber" name="L495" href="#L495">495</a> 	}
+<a class="jxr_linenumber" name="L496" href="#L496">496</a> 
+<a class="jxr_linenumber" name="L497" href="#L497">497</a> 	@Test
+<a class="jxr_linenumber" name="L498" href="#L498">498</a> 	<strong class="jxr_keyword">void</strong> k02_addAny_withMultipleMaps() {
+<a class="jxr_linenumber" name="L499" href="#L499">499</a> 		<strong class="jxr_keyword">var</strong> map1 = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String,Integer&gt;();
+<a class="jxr_linenumber" name="L500" href="#L500">500</a> 		map1.put(<span class="jxr_string">"a"</span>, 1);
+<a class="jxr_linenumber" name="L501" href="#L501">501</a> 		map1.put(<span class="jxr_string">"b"</span>, 2);
+<a class="jxr_linenumber" name="L502" href="#L502">502</a> 
+<a class="jxr_linenumber" name="L503" href="#L503">503</a> 		<strong class="jxr_keyword">var</strong> map2 = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String,Integer&gt;();
+<a class="jxr_linenumber" name="L504" href="#L504">504</a> 		map2.put(<span class="jxr_string">"c"</span>, 3);
+<a class="jxr_linenumber" name="L505" href="#L505">505</a> 		map2.put(<span class="jxr_string">"d"</span>, 4);
 <a class="jxr_linenumber" name="L506" href="#L506">506</a> 
-<a class="jxr_linenumber" name="L507" href="#L507">507</a> 	@Test
-<a class="jxr_linenumber" name="L508" href="#L508">508</a> 	<strong class="jxr_keyword">void</strong> k02_addAny_withMultipleMaps() {
-<a class="jxr_linenumber" name="L509" href="#L509">509</a> 		<strong class="jxr_keyword">var</strong> map1 = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String,Integer&gt;();
-<a class="jxr_linenumber" name="L510" href="#L510">510</a> 		map1.put(<span class="jxr_string">"a"</span>, 1);
-<a class="jxr_linenumber" name="L511" href="#L511">511</a> 		map1.put(<span class="jxr_string">"b"</span>, 2);
-<a class="jxr_linenumber" name="L512" href="#L512">512</a> 
-<a class="jxr_linenumber" name="L513" href="#L513">513</a> 		<strong class="jxr_keyword">var</strong> map2 = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String,Integer&gt;();
-<a class="jxr_linenumber" name="L514" href="#L514">514</a> 		map2.put(<span class="jxr_string">"c"</span>, 3);
-<a class="jxr_linenumber" name="L515" href="#L515">515</a> 		map2.put(<span class="jxr_string">"d"</span>, 4);
-<a class="jxr_linenumber" name="L516" href="#L516">516</a> 
-<a class="jxr_linenumber" name="L517" href="#L517">517</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L518" href="#L518">518</a> 			.addAny(map1, map2)
-<a class="jxr_linenumber" name="L519" href="#L519">519</a> 			.build();
-<a class="jxr_linenumber" name="L520" href="#L520">520</a> 
-<a class="jxr_linenumber" name="L521" href="#L521">521</a> 		assertMap(map, <span class="jxr_string">"a=1"</span>, <span class="jxr_string">"b=2"</span>, <span class="jxr_string">"c=3"</span>, <span class="jxr_string">"d=4"</span>);
-<a class="jxr_linenumber" name="L522" href="#L522">522</a> 	}
+<a class="jxr_linenumber" name="L507" href="#L507">507</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L508" href="#L508">508</a> 			.addAny(map1, map2)
+<a class="jxr_linenumber" name="L509" href="#L509">509</a> 			.build();
+<a class="jxr_linenumber" name="L510" href="#L510">510</a> 
+<a class="jxr_linenumber" name="L511" href="#L511">511</a> 		assertMap(map, <span class="jxr_string">"a=1"</span>, <span class="jxr_string">"b=2"</span>, <span class="jxr_string">"c=3"</span>, <span class="jxr_string">"d=4"</span>);
+<a class="jxr_linenumber" name="L512" href="#L512">512</a> 	}
+<a class="jxr_linenumber" name="L513" href="#L513">513</a> 
+<a class="jxr_linenumber" name="L514" href="#L514">514</a> 	@Test
+<a class="jxr_linenumber" name="L515" href="#L515">515</a> 	<strong class="jxr_keyword">void</strong> k03_addAny_withNullMap() {
+<a class="jxr_linenumber" name="L516" href="#L516">516</a> 		<strong class="jxr_keyword">var</strong> inputMap = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String,Integer&gt;();
+<a class="jxr_linenumber" name="L517" href="#L517">517</a> 		inputMap.put(<span class="jxr_string">"a"</span>, 1);
+<a class="jxr_linenumber" name="L518" href="#L518">518</a> 		inputMap.put(<span class="jxr_string">"b"</span>, 2);
+<a class="jxr_linenumber" name="L519" href="#L519">519</a> 
+<a class="jxr_linenumber" name="L520" href="#L520">520</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L521" href="#L521">521</a> 			.addAny(inputMap, <strong class="jxr_keyword">null</strong>)  <em class="jxr_comment">// null map should be ignored</em>
+<a class="jxr_linenumber" name="L522" href="#L522">522</a> 			.build();
 <a class="jxr_linenumber" name="L523" href="#L523">523</a> 
-<a class="jxr_linenumber" name="L524" href="#L524">524</a> 	@Test
-<a class="jxr_linenumber" name="L525" href="#L525">525</a> 	<strong class="jxr_keyword">void</strong> k03_addAny_withNullMap() {
-<a class="jxr_linenumber" name="L526" href="#L526">526</a> 		<strong class="jxr_keyword">var</strong> inputMap = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String,Integer&gt;();
-<a class="jxr_linenumber" name="L527" href="#L527">527</a> 		inputMap.put(<span class="jxr_string">"a"</span>, 1);
-<a class="jxr_linenumber" name="L528" href="#L528">528</a> 		inputMap.put(<span class="jxr_string">"b"</span>, 2);
-<a class="jxr_linenumber" name="L529" href="#L529">529</a> 
-<a class="jxr_linenumber" name="L530" href="#L530">530</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L531" href="#L531">531</a> 			.addAny(inputMap, <strong class="jxr_keyword">null</strong>)  <em class="jxr_comment">// null map should be ignored</em>
-<a class="jxr_linenumber" name="L532" href="#L532">532</a> 			.build();
+<a class="jxr_linenumber" name="L524" href="#L524">524</a> 		assertMap(map, <span class="jxr_string">"a=1"</span>, <span class="jxr_string">"b=2"</span>);
+<a class="jxr_linenumber" name="L525" href="#L525">525</a> 	}
+<a class="jxr_linenumber" name="L526" href="#L526">526</a> 
+<a class="jxr_linenumber" name="L527" href="#L527">527</a> 	@Test
+<a class="jxr_linenumber" name="L528" href="#L528">528</a> 	<strong class="jxr_keyword">void</strong> k03b_addAny_withNullValueInMap() {
+<a class="jxr_linenumber" name="L529" href="#L529">529</a> 		<em class="jxr_comment">// addAny uses toType which doesn't handle null values</em>
+<a class="jxr_linenumber" name="L530" href="#L530">530</a> 		<strong class="jxr_keyword">var</strong> inputMap = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String,Integer&gt;();
+<a class="jxr_linenumber" name="L531" href="#L531">531</a> 		inputMap.put(<span class="jxr_string">"a"</span>, 1);
+<a class="jxr_linenumber" name="L532" href="#L532">532</a> 		inputMap.put(<span class="jxr_string">"b"</span>, <strong class="jxr_keyword">null</strong>);
 <a class="jxr_linenumber" name="L533" href="#L533">533</a> 
-<a class="jxr_linenumber" name="L534" href="#L534">534</a> 		assertMap(map, <span class="jxr_string">"a=1"</span>, <span class="jxr_string">"b=2"</span>);
-<a class="jxr_linenumber" name="L535" href="#L535">535</a> 	}
-<a class="jxr_linenumber" name="L536" href="#L536">536</a> 
-<a class="jxr_linenumber" name="L537" href="#L537">537</a> 	@Test
-<a class="jxr_linenumber" name="L538" href="#L538">538</a> 	<strong class="jxr_keyword">void</strong> k03b_addAny_withNullValueInMap() {
-<a class="jxr_linenumber" name="L539" href="#L539">539</a> 		<em class="jxr_comment">// addAny uses toType which doesn't handle null values</em>
-<a class="jxr_linenumber" name="L540" href="#L540">540</a> 		<strong class="jxr_keyword">var</strong> inputMap = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String,Integer&gt;();
-<a class="jxr_linenumber" name="L541" href="#L541">541</a> 		inputMap.put(<span class="jxr_string">"a"</span>, 1);
-<a class="jxr_linenumber" name="L542" href="#L542">542</a> 		inputMap.put(<span class="jxr_string">"b"</span>, <strong class="jxr_keyword">null</strong>);
-<a class="jxr_linenumber" name="L543" href="#L543">543</a> 
-<a class="jxr_linenumber" name="L544" href="#L544">544</a> 		assertThrows(RuntimeException.<strong class="jxr_keyword">class</strong>, () -&gt; {
-<a class="jxr_linenumber" name="L545" href="#L545">545</a> 			MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L546" href="#L546">546</a> 				.addAny(inputMap)
-<a class="jxr_linenumber" name="L547" href="#L547">547</a> 				.build();
-<a class="jxr_linenumber" name="L548" href="#L548">548</a> 		});
-<a class="jxr_linenumber" name="L549" href="#L549">549</a> 	}
-<a class="jxr_linenumber" name="L550" href="#L550">550</a> 
-<a class="jxr_linenumber" name="L551" href="#L551">551</a> 	@Test
-<a class="jxr_linenumber" name="L552" href="#L552">552</a> 	<strong class="jxr_keyword">void</strong> k04_addAny_withTypeConversion() {
-<a class="jxr_linenumber" name="L553" href="#L553">553</a> 		<strong class="jxr_keyword">var</strong> converter = <strong class="jxr_keyword">new</strong> Converter() {
-<a class="jxr_linenumber" name="L554" href="#L554">554</a> 			@Override
-<a class="jxr_linenumber" name="L555" href="#L555">555</a> 			<strong class="jxr_keyword">public</strong> &lt;T&gt; T convertTo(Class&lt;T&gt; type, Object o) {
-<a class="jxr_linenumber" name="L556" href="#L556">556</a> 				<strong class="jxr_keyword">if</strong> (type == String.<strong class="jxr_keyword">class</strong> &amp;&amp; o instanceof Integer) {
-<a class="jxr_linenumber" name="L557" href="#L557">557</a> 					<strong class="jxr_keyword">return</strong> type.<strong class="jxr_keyword">cast</strong>(String.valueOf(o));
-<a class="jxr_linenumber" name="L558" href="#L558">558</a> 				}
-<a class="jxr_linenumber" name="L559" href="#L559">559</a> 				<strong class="jxr_keyword">if</strong> (type == Integer.<strong class="jxr_keyword">class</strong> &amp;&amp; o instanceof String) {
-<a class="jxr_linenumber" name="L560" href="#L560">560</a> 					<strong class="jxr_keyword">return</strong> type.<strong class="jxr_keyword">cast</strong>(Integer.parseInt((String)o));
-<a class="jxr_linenumber" name="L561" href="#L561">561</a> 				}
-<a class="jxr_linenumber" name="L562" href="#L562">562</a> 				<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L563" href="#L563">563</a> 			}
-<a class="jxr_linenumber" name="L564" href="#L564">564</a> 		};
-<a class="jxr_linenumber" name="L565" href="#L565">565</a> 
-<a class="jxr_linenumber" name="L566" href="#L566">566</a> 		<strong class="jxr_keyword">var</strong> inputMap = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;Integer,String&gt;();
-<a class="jxr_linenumber" name="L567" href="#L567">567</a> 		inputMap.put(1, <span class="jxr_string">"10"</span>);
-<a class="jxr_linenumber" name="L568" href="#L568">568</a> 		inputMap.put(2, <span class="jxr_string">"20"</span>);
-<a class="jxr_linenumber" name="L569" href="#L569">569</a> 
-<a class="jxr_linenumber" name="L570" href="#L570">570</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L571" href="#L571">571</a> 			.converters(converter)
-<a class="jxr_linenumber" name="L572" href="#L572">572</a> 			.addAny(inputMap)
-<a class="jxr_linenumber" name="L573" href="#L573">573</a> 			.build();
+<a class="jxr_linenumber" name="L534" href="#L534">534</a> 		assertThrows(RuntimeException.<strong class="jxr_keyword">class</strong>, () -&gt; {
+<a class="jxr_linenumber" name="L535" href="#L535">535</a> 			MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L536" href="#L536">536</a> 				.addAny(inputMap)
+<a class="jxr_linenumber" name="L537" href="#L537">537</a> 				.build();
+<a class="jxr_linenumber" name="L538" href="#L538">538</a> 		});
+<a class="jxr_linenumber" name="L539" href="#L539">539</a> 	}
+<a class="jxr_linenumber" name="L540" href="#L540">540</a> 
+<a class="jxr_linenumber" name="L541" href="#L541">541</a> 	@Test
+<a class="jxr_linenumber" name="L542" href="#L542">542</a> 	<strong class="jxr_keyword">void</strong> k04_addAny_withTypeConversion() {
+<a class="jxr_linenumber" name="L543" href="#L543">543</a> 		<strong class="jxr_keyword">var</strong> inputMap = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;Integer,String&gt;();
+<a class="jxr_linenumber" name="L544" href="#L544">544</a> 		inputMap.put(1, <span class="jxr_string">"10"</span>);
+<a class="jxr_linenumber" name="L545" href="#L545">545</a> 		inputMap.put(2, <span class="jxr_string">"20"</span>);
+<a class="jxr_linenumber" name="L546" href="#L546">546</a> 
+<a class="jxr_linenumber" name="L547" href="#L547">547</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L548" href="#L548">548</a> 			.keyFunction(o -&gt; String.valueOf(o))
+<a class="jxr_linenumber" name="L549" href="#L549">549</a> 			.valueFunction(o -&gt; o instanceof String ? Integer.parseInt((String)o) : (Integer)o)
+<a class="jxr_linenumber" name="L550" href="#L550">550</a> 			.addAny(inputMap)
+<a class="jxr_linenumber" name="L551" href="#L551">551</a> 			.build();
+<a class="jxr_linenumber" name="L552" href="#L552">552</a> 
+<a class="jxr_linenumber" name="L553" href="#L553">553</a> 		assertMap(map, <span class="jxr_string">"1=10"</span>, <span class="jxr_string">"2=20"</span>);
+<a class="jxr_linenumber" name="L554" href="#L554">554</a> 	}
+<a class="jxr_linenumber" name="L555" href="#L555">555</a> 
+<a class="jxr_linenumber" name="L556" href="#L556">556</a> 	@Test
+<a class="jxr_linenumber" name="L557" href="#L557">557</a> 	<strong class="jxr_keyword">void</strong> k05_addAny_withStringToMapConversion() {
+<a class="jxr_linenumber" name="L558" href="#L558">558</a> 		<em class="jxr_comment">// This test is no longer applicable since addAny only accepts Map instances</em>
+<a class="jxr_linenumber" name="L559" href="#L559">559</a> 		<em class="jxr_comment">// If we want to parse strings, we'd need to do it before calling addAny</em>
+<a class="jxr_linenumber" name="L560" href="#L560">560</a> 		<strong class="jxr_keyword">var</strong> parsedMap = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String,String&gt;();
+<a class="jxr_linenumber" name="L561" href="#L561">561</a> 		<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> pair : <span class="jxr_string">"a=1,b=2"</span>.split(<span class="jxr_string">","</span>)) {
+<a class="jxr_linenumber" name="L562" href="#L562">562</a> 			<strong class="jxr_keyword">var</strong> kv = pair.split(<span class="jxr_string">"="</span>);
+<a class="jxr_linenumber" name="L563" href="#L563">563</a> 			<strong class="jxr_keyword">if</strong> (kv.length == 2) {
+<a class="jxr_linenumber" name="L564" href="#L564">564</a> 				parsedMap.put(kv[0], kv[1]);
+<a class="jxr_linenumber" name="L565" href="#L565">565</a> 			}
+<a class="jxr_linenumber" name="L566" href="#L566">566</a> 		}
+<a class="jxr_linenumber" name="L567" href="#L567">567</a> 
+<a class="jxr_linenumber" name="L568" href="#L568">568</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L569" href="#L569">569</a> 			.addAny(parsedMap)
+<a class="jxr_linenumber" name="L570" href="#L570">570</a> 			.build();
+<a class="jxr_linenumber" name="L571" href="#L571">571</a> 
+<a class="jxr_linenumber" name="L572" href="#L572">572</a> 		assertMap(map, <span class="jxr_string">"a=1"</span>, <span class="jxr_string">"b=2"</span>);
+<a class="jxr_linenumber" name="L573" href="#L573">573</a> 	}
 <a class="jxr_linenumber" name="L574" href="#L574">574</a> 
-<a class="jxr_linenumber" name="L575" href="#L575">575</a> 		assertMap(map, <span class="jxr_string">"1=10"</span>, <span class="jxr_string">"2=20"</span>);
-<a class="jxr_linenumber" name="L576" href="#L576">576</a> 	}
-<a class="jxr_linenumber" name="L577" href="#L577">577</a> 
-<a class="jxr_linenumber" name="L578" href="#L578">578</a> 	@Test
-<a class="jxr_linenumber" name="L579" href="#L579">579</a> 	<strong class="jxr_keyword">void</strong> k05_addAny_withConverterToMap() {
-<a class="jxr_linenumber" name="L580" href="#L580">580</a> 		<strong class="jxr_keyword">var</strong> converter = <strong class="jxr_keyword">new</strong> Converter() {
-<a class="jxr_linenumber" name="L581" href="#L581">581</a> 			@Override
-<a class="jxr_linenumber" name="L582" href="#L582">582</a> 			<strong class="jxr_keyword">public</strong> &lt;T&gt; T convertTo(Class&lt;T&gt; type, Object o) {
-<a class="jxr_linenumber" name="L583" href="#L583">583</a> 				<strong class="jxr_keyword">if</strong> (type == Map.<strong class="jxr_keyword">class</strong> &amp;&amp; o instanceof String) {
-<a class="jxr_linenumber" name="L584" href="#L584">584</a> 					<strong class="jxr_keyword">var</strong> m = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String,String&gt;();
-<a class="jxr_linenumber" name="L585" href="#L585">585</a> 					<em class="jxr_comment">// Simple parsing: "key1=value1,key2=value2"</em>
-<a class="jxr_linenumber" name="L586" href="#L586">586</a> 					<strong class="jxr_keyword">var</strong> s = (String)o;
-<a class="jxr_linenumber" name="L587" href="#L587">587</a> 					<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> pair : s.split(<span class="jxr_string">","</span>)) {
-<a class="jxr_linenumber" name="L588" href="#L588">588</a> 						<strong class="jxr_keyword">var</strong> kv = pair.split(<span class="jxr_string">"="</span>);
-<a class="jxr_linenumber" name="L589" href="#L589">589</a> 						<strong class="jxr_keyword">if</strong> (kv.length == 2) {
-<a class="jxr_linenumber" name="L590" href="#L590">590</a> 							m.put(kv[0], kv[1]);
-<a class="jxr_linenumber" name="L591" href="#L591">591</a> 						}
-<a class="jxr_linenumber" name="L592" href="#L592">592</a> 					}
-<a class="jxr_linenumber" name="L593" href="#L593">593</a> 					<strong class="jxr_keyword">return</strong> type.<strong class="jxr_keyword">cast</strong>(m);
-<a class="jxr_linenumber" name="L594" href="#L594">594</a> 				}
-<a class="jxr_linenumber" name="L595" href="#L595">595</a> 				<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L596" href="#L596">596</a> 			}
-<a class="jxr_linenumber" name="L597" href="#L597">597</a> 		};
-<a class="jxr_linenumber" name="L598" href="#L598">598</a> 
-<a class="jxr_linenumber" name="L599" href="#L599">599</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L600" href="#L600">600</a> 			.converters(converter)
-<a class="jxr_linenumber" name="L601" href="#L601">601</a> 			.addAny(<span class="jxr_string">"a=1,b=2"</span>)
-<a class="jxr_linenumber" name="L602" href="#L602">602</a> 			.build();
-<a class="jxr_linenumber" name="L603" href="#L603">603</a> 
-<a class="jxr_linenumber" name="L604" href="#L604">604</a> 		assertMap(map, <span class="jxr_string">"a=1"</span>, <span class="jxr_string">"b=2"</span>);
-<a class="jxr_linenumber" name="L605" href="#L605">605</a> 	}
-<a class="jxr_linenumber" name="L606" href="#L606">606</a> 
-<a class="jxr_linenumber" name="L607" href="#L607">607</a> 	@Test
-<a class="jxr_linenumber" name="L608" href="#L608">608</a> 	<strong class="jxr_keyword">void</strong> k06_addAny_withConverterToMap_recursive() {
-<a class="jxr_linenumber" name="L609" href="#L609">609</a> 		<strong class="jxr_keyword">var</strong> converter = <strong class="jxr_keyword">new</strong> Converter() {
-<a class="jxr_linenumber" name="L610" href="#L610">610</a> 			@Override
-<a class="jxr_linenumber" name="L611" href="#L611">611</a> 			<strong class="jxr_keyword">public</strong> &lt;T&gt; T convertTo(Class&lt;T&gt; type, Object o) {
-<a class="jxr_linenumber" name="L612" href="#L612">612</a> 				<strong class="jxr_keyword">if</strong> (type == Map.<strong class="jxr_keyword">class</strong> &amp;&amp; o instanceof String) {
-<a class="jxr_linenumber" name="L613" href="#L613">613</a> 					<strong class="jxr_keyword">var</strong> m = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String,String&gt;();
-<a class="jxr_linenumber" name="L614" href="#L614">614</a> 					<strong class="jxr_keyword">var</strong> s = (String)o;
-<a class="jxr_linenumber" name="L615" href="#L615">615</a> 					<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> pair : s.split(<span class="jxr_string">","</span>)) {
-<a class="jxr_linenumber" name="L616" href="#L616">616</a> 						<strong class="jxr_keyword">var</strong> kv = pair.split(<span class="jxr_string">"="</span>);
-<a class="jxr_linenumber" name="L617" href="#L617">617</a> 						<strong class="jxr_keyword">if</strong> (kv.length == 2) {
-<a class="jxr_linenumber" name="L618" href="#L618">618</a> 							m.put(kv[0], kv[1]);
-<a class="jxr_linenumber" name="L619" href="#L619">619</a> 						}
-<a class="jxr_linenumber" name="L620" href="#L620">620</a> 					}
-<a class="jxr_linenumber" name="L621" href="#L621">621</a> 					<strong class="jxr_keyword">return</strong> type.<strong class="jxr_keyword">cast</strong>(m);
-<a class="jxr_linenumber" name="L622" href="#L622">622</a> 				}
-<a class="jxr_linenumber" name="L623" href="#L623">623</a> 				<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L624" href="#L624">624</a> 			}
-<a class="jxr_linenumber" name="L625" href="#L625">625</a> 		};
-<a class="jxr_linenumber" name="L626" href="#L626">626</a> 
-<a class="jxr_linenumber" name="L627" href="#L627">627</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L628" href="#L628">628</a> 			.converters(converter)
-<a class="jxr_linenumber" name="L629" href="#L629">629</a> 			.addAny(<span class="jxr_string">"x=foo"</span>, <span class="jxr_string">"y=bar"</span>)
-<a class="jxr_linenumber" name="L630" href="#L630">630</a> 			.build();
-<a class="jxr_linenumber" name="L631" href="#L631">631</a> 
-<a class="jxr_linenumber" name="L632" href="#L632">632</a> 		assertMap(map, <span class="jxr_string">"x=foo"</span>, <span class="jxr_string">"y=bar"</span>);
-<a class="jxr_linenumber" name="L633" href="#L633">633</a> 	}
-<a class="jxr_linenumber" name="L634" href="#L634">634</a> 
-<a class="jxr_linenumber" name="L635" href="#L635">635</a> 	@Test
-<a class="jxr_linenumber" name="L636" href="#L636">636</a> 	<strong class="jxr_keyword">void</strong> k07_addAny_noKeyOrValueType() {
-<a class="jxr_linenumber" name="L637" href="#L637">637</a> 		assertThrows(IllegalArgumentException.<strong class="jxr_keyword">class</strong>, () -&gt; <strong class="jxr_keyword">new</strong> MapBuilder&lt;String,Integer&gt;(<strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>));
-<a class="jxr_linenumber" name="L638" href="#L638">638</a> 		assertThrows(IllegalArgumentException.<strong class="jxr_keyword">class</strong>, () -&gt; <strong class="jxr_keyword">new</strong> MapBuilder&lt;String,Integer&gt;(String.<strong class="jxr_keyword">class</strong>, <strong class="jxr_keyword">null</strong>));
-<a class="jxr_linenumber" name="L639" href="#L639">639</a> 		assertThrows(IllegalArgumentException.<strong class="jxr_keyword">class</strong>, () -&gt; <strong class="jxr_keyword">new</strong> MapBuilder&lt;String,Integer&gt;(<strong class="jxr_keyword">null</strong>, Integer.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="L640" href="#L640">640</a> 	}
-<a class="jxr_linenumber" name="L641" href="#L641">641</a> 
-<a class="jxr_linenumber" name="L642" href="#L642">642</a> 	@Test
-<a class="jxr_linenumber" name="L643" href="#L643">643</a> 	<strong class="jxr_keyword">void</strong> k08_addAny_conversionFailure() {
-<a class="jxr_linenumber" name="L644" href="#L644">644</a> 		<em class="jxr_comment">// When converters is null and we try to add a non-Map, it will throw NPE</em>
-<a class="jxr_linenumber" name="L645" href="#L645">645</a> 		assertThrows(NullPointerException.<strong class="jxr_keyword">class</strong>, () -&gt; {
-<a class="jxr_linenumber" name="L646" href="#L646">646</a> 			MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L647" href="#L647">647</a> 				.addAny(<span class="jxr_string">"not-a-map"</span>)
-<a class="jxr_linenumber" name="L648" href="#L648">648</a> 				.build();
-<a class="jxr_linenumber" name="L649" href="#L649">649</a> 		});
-<a class="jxr_linenumber" name="L650" href="#L650">650</a> 	}
-<a class="jxr_linenumber" name="L651" href="#L651">651</a> 
-<a class="jxr_linenumber" name="L652" href="#L652">652</a> 	@Test
-<a class="jxr_linenumber" name="L653" href="#L653">653</a> 	<strong class="jxr_keyword">void</strong> k09_addAny_converterReturnsNull() {
-<a class="jxr_linenumber" name="L654" href="#L654">654</a> 		<em class="jxr_comment">// Converter exists but returns null (can't convert)</em>
-<a class="jxr_linenumber" name="L655" href="#L655">655</a> 		<strong class="jxr_keyword">var</strong> converter = <strong class="jxr_keyword">new</strong> Converter() {
-<a class="jxr_linenumber" name="L656" href="#L656">656</a> 			@Override
-<a class="jxr_linenumber" name="L657" href="#L657">657</a> 			<strong class="jxr_keyword">public</strong> &lt;T&gt; T convertTo(Class&lt;T&gt; type, Object o) {
-<a class="jxr_linenumber" name="L658" href="#L658">658</a> 				<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;  <em class="jxr_comment">// Can't convert</em>
-<a class="jxr_linenumber" name="L659" href="#L659">659</a> 			}
-<a class="jxr_linenumber" name="L660" href="#L660">660</a> 		};
-<a class="jxr_linenumber" name="L661" href="#L661">661</a> 
-<a class="jxr_linenumber" name="L662" href="#L662">662</a> 		<em class="jxr_comment">// Should throw RuntimeException when converter can't convert non-Map object</em>
-<a class="jxr_linenumber" name="L663" href="#L663">663</a> 		assertThrows(RuntimeException.<strong class="jxr_keyword">class</strong>, () -&gt; {
-<a class="jxr_linenumber" name="L664" href="#L664">664</a> 			MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L665" href="#L665">665</a> 				.converters(converter)
-<a class="jxr_linenumber" name="L666" href="#L666">666</a> 				.addAny(<span class="jxr_string">"not-a-map"</span>)
-<a class="jxr_linenumber" name="L667" href="#L667">667</a> 				.build();
-<a class="jxr_linenumber" name="L668" href="#L668">668</a> 		});
+<a class="jxr_linenumber" name="L575" href="#L575">575</a> 	@Test
+<a class="jxr_linenumber" name="L576" href="#L576">576</a> 	<strong class="jxr_keyword">void</strong> k06_addAny_withMultipleMaps_parsedFromStrings() {
+<a class="jxr_linenumber" name="L577" href="#L577">577</a> 		<strong class="jxr_keyword">var</strong> map1 = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String,String&gt;();
+<a class="jxr_linenumber" name="L578" href="#L578">578</a> 		map1.put(<span class="jxr_string">"x"</span>, <span class="jxr_string">"foo"</span>);
+<a class="jxr_linenumber" name="L579" href="#L579">579</a> 		<strong class="jxr_keyword">var</strong> map2 = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String,String&gt;();
+<a class="jxr_linenumber" name="L580" href="#L580">580</a> 		map2.put(<span class="jxr_string">"y"</span>, <span class="jxr_string">"bar"</span>);
+<a class="jxr_linenumber" name="L581" href="#L581">581</a> 
+<a class="jxr_linenumber" name="L582" href="#L582">582</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L583" href="#L583">583</a> 			.addAny(map1, map2)
+<a class="jxr_linenumber" name="L584" href="#L584">584</a> 			.build();
+<a class="jxr_linenumber" name="L585" href="#L585">585</a> 
+<a class="jxr_linenumber" name="L586" href="#L586">586</a> 		assertMap(map, <span class="jxr_string">"x=foo"</span>, <span class="jxr_string">"y=bar"</span>);
+<a class="jxr_linenumber" name="L587" href="#L587">587</a> 	}
+<a class="jxr_linenumber" name="L588" href="#L588">588</a> 
+<a class="jxr_linenumber" name="L589" href="#L589">589</a> 	@Test
+<a class="jxr_linenumber" name="L590" href="#L590">590</a> 	<strong class="jxr_keyword">void</strong> k07_addAny_noKeyOrValueType() {
+<a class="jxr_linenumber" name="L591" href="#L591">591</a> 		assertThrows(IllegalArgumentException.<strong class="jxr_keyword">class</strong>, () -&gt; <strong class="jxr_keyword">new</strong> MapBuilder&lt;String,Integer&gt;(<strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>));
+<a class="jxr_linenumber" name="L592" href="#L592">592</a> 		assertThrows(IllegalArgumentException.<strong class="jxr_keyword">class</strong>, () -&gt; <strong class="jxr_keyword">new</strong> MapBuilder&lt;String,Integer&gt;(String.<strong class="jxr_keyword">class</strong>, <strong class="jxr_keyword">null</strong>));
+<a class="jxr_linenumber" name="L593" href="#L593">593</a> 		assertThrows(IllegalArgumentException.<strong class="jxr_keyword">class</strong>, () -&gt; <strong class="jxr_keyword">new</strong> MapBuilder&lt;String,Integer&gt;(<strong class="jxr_keyword">null</strong>, Integer.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="L594" href="#L594">594</a> 	}
+<a class="jxr_linenumber" name="L595" href="#L595">595</a> 
+<a class="jxr_linenumber" name="L596" href="#L596">596</a> 	@Test
+<a class="jxr_linenumber" name="L597" href="#L597">597</a> 	<strong class="jxr_keyword">void</strong> k08_addAny_nonMapObject() {
+<a class="jxr_linenumber" name="L598" href="#L598">598</a> 		<em class="jxr_comment">// addAny only accepts Map instances, non-Map objects throw exception</em>
+<a class="jxr_linenumber" name="L599" href="#L599">599</a> 		assertThrows(RuntimeException.<strong class="jxr_keyword">class</strong>, () -&gt; {
+<a class="jxr_linenumber" name="L600" href="#L600">600</a> 			MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L601" href="#L601">601</a> 				.addAny(<span class="jxr_string">"not-a-map"</span>)
+<a class="jxr_linenumber" name="L602" href="#L602">602</a> 				.build();
+<a class="jxr_linenumber" name="L603" href="#L603">603</a> 		});
+<a class="jxr_linenumber" name="L604" href="#L604">604</a> 	}
+<a class="jxr_linenumber" name="L605" href="#L605">605</a> 
+<a class="jxr_linenumber" name="L606" href="#L606">606</a> 	@Test
+<a class="jxr_linenumber" name="L607" href="#L607">607</a> 	<strong class="jxr_keyword">void</strong> k09_addAny_valueFunctionReturnsNull() {
+<a class="jxr_linenumber" name="L608" href="#L608">608</a> 		<em class="jxr_comment">// Value function that can't convert should throw exception</em>
+<a class="jxr_linenumber" name="L609" href="#L609">609</a> 		<strong class="jxr_keyword">var</strong> inputMap = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String,String&gt;();
+<a class="jxr_linenumber" name="L610" href="#L610">610</a> 		inputMap.put(<span class="jxr_string">"a"</span>, <span class="jxr_string">"not-an-integer"</span>);
+<a class="jxr_linenumber" name="L611" href="#L611">611</a> 
+<a class="jxr_linenumber" name="L612" href="#L612">612</a> 		assertThrows(RuntimeException.<strong class="jxr_keyword">class</strong>, () -&gt; {
+<a class="jxr_linenumber" name="L613" href="#L613">613</a> 			MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L614" href="#L614">614</a> 				.valueFunction(o -&gt; {
+<a class="jxr_linenumber" name="L615" href="#L615">615</a> 					<strong class="jxr_keyword">if</strong> (o instanceof String) {
+<a class="jxr_linenumber" name="L616" href="#L616">616</a> 						<strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="L617" href="#L617">617</a> 							<strong class="jxr_keyword">return</strong> Integer.parseInt((String)o);
+<a class="jxr_linenumber" name="L618" href="#L618">618</a> 						} <strong class="jxr_keyword">catch</strong> (NumberFormatException e) {
+<a class="jxr_linenumber" name="L619" href="#L619">619</a> 							<strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> RuntimeException(<span class="jxr_string">"Cannot convert"</span>, e);
+<a class="jxr_linenumber" name="L620" href="#L620">620</a> 						}
+<a class="jxr_linenumber" name="L621" href="#L621">621</a> 					}
+<a class="jxr_linenumber" name="L622" href="#L622">622</a> 					<strong class="jxr_keyword">return</strong> (Integer)o;
+<a class="jxr_linenumber" name="L623" href="#L623">623</a> 				})
+<a class="jxr_linenumber" name="L624" href="#L624">624</a> 				.addAny(inputMap)
+<a class="jxr_linenumber" name="L625" href="#L625">625</a> 				.build();
+<a class="jxr_linenumber" name="L626" href="#L626">626</a> 		});
+<a class="jxr_linenumber" name="L627" href="#L627">627</a> 	}
+<a class="jxr_linenumber" name="L628" href="#L628">628</a> 
+<a class="jxr_linenumber" name="L629" href="#L629">629</a> 	@Test
+<a class="jxr_linenumber" name="L630" href="#L630">630</a> 	<strong class="jxr_keyword">void</strong> k10_addAny_keyFunctionConversionFailure() {
+<a class="jxr_linenumber" name="L631" href="#L631">631</a> 		<strong class="jxr_keyword">var</strong> inputMap = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;Object,String&gt;();
+<a class="jxr_linenumber" name="L632" href="#L632">632</a> 		inputMap.put(<strong class="jxr_keyword">new</strong> Object(), <span class="jxr_string">"value"</span>);  <em class="jxr_comment">// Object can't be converted to String</em>
+<a class="jxr_linenumber" name="L633" href="#L633">633</a> 
+<a class="jxr_linenumber" name="L634" href="#L634">634</a> 		assertThrows(RuntimeException.<strong class="jxr_keyword">class</strong>, () -&gt; {
+<a class="jxr_linenumber" name="L635" href="#L635">635</a> 			MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L636" href="#L636">636</a> 				.keyFunction(o -&gt; {
+<a class="jxr_linenumber" name="L637" href="#L637">637</a> 					<strong class="jxr_keyword">if</strong> (o instanceof String)
+<a class="jxr_linenumber" name="L638" href="#L638">638</a> 						<strong class="jxr_keyword">return</strong> (String)o;
+<a class="jxr_linenumber" name="L639" href="#L639">639</a> 					<strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> RuntimeException(<span class="jxr_string">"Cannot convert key"</span>);
+<a class="jxr_linenumber" name="L640" href="#L640">640</a> 				})
+<a class="jxr_linenumber" name="L641" href="#L641">641</a> 				.addAny(inputMap)
+<a class="jxr_linenumber" name="L642" href="#L642">642</a> 				.build();
+<a class="jxr_linenumber" name="L643" href="#L643">643</a> 		});
+<a class="jxr_linenumber" name="L644" href="#L644">644</a> 	}
+<a class="jxr_linenumber" name="L645" href="#L645">645</a> 
+<a class="jxr_linenumber" name="L646" href="#L646">646</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L647" href="#L647">647</a> 	<em class="jxr_comment">// Build edge cases</em>
+<a class="jxr_linenumber" name="L648" href="#L648">648</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L649" href="#L649">649</a> 
+<a class="jxr_linenumber" name="L650" href="#L650">650</a> 	@Test
+<a class="jxr_linenumber" name="L651" href="#L651">651</a> 	<strong class="jxr_keyword">void</strong> l01_build_sparseWithNullMap() {
+<a class="jxr_linenumber" name="L652" href="#L652">652</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L653" href="#L653">653</a> 			.sparse()
+<a class="jxr_linenumber" name="L654" href="#L654">654</a> 			.build();
+<a class="jxr_linenumber" name="L655" href="#L655">655</a> 
+<a class="jxr_linenumber" name="L656" href="#L656">656</a> 		assertNull(map);
+<a class="jxr_linenumber" name="L657" href="#L657">657</a> 	}
+<a class="jxr_linenumber" name="L658" href="#L658">658</a> 
+<a class="jxr_linenumber" name="L659" href="#L659">659</a> 	@Test
+<a class="jxr_linenumber" name="L660" href="#L660">660</a> 	<strong class="jxr_keyword">void</strong> l02_build_sparseWithEmptyMap() {
+<a class="jxr_linenumber" name="L661" href="#L661">661</a> 		<strong class="jxr_keyword">var</strong> existing = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String,Integer&gt;();
+<a class="jxr_linenumber" name="L662" href="#L662">662</a> 
+<a class="jxr_linenumber" name="L663" href="#L663">663</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L664" href="#L664">664</a> 			.to(existing)
+<a class="jxr_linenumber" name="L665" href="#L665">665</a> 			.sparse()
+<a class="jxr_linenumber" name="L666" href="#L666">666</a> 			.build();
+<a class="jxr_linenumber" name="L667" href="#L667">667</a> 
+<a class="jxr_linenumber" name="L668" href="#L668">668</a> 		assertNull(map);
 <a class="jxr_linenumber" name="L669" href="#L669">669</a> 	}
 <a class="jxr_linenumber" name="L670" href="#L670">670</a> 
 <a class="jxr_linenumber" name="L671" href="#L671">671</a> 	@Test
-<a class="jxr_linenumber" name="L672" href="#L672">672</a> 	<strong class="jxr_keyword">void</strong> k10_addAny_toType_conversionFailure() {
-<a class="jxr_linenumber" name="L673" href="#L673">673</a> 		<strong class="jxr_keyword">var</strong> converter = <strong class="jxr_keyword">new</strong> Converter() {
-<a class="jxr_linenumber" name="L674" href="#L674">674</a> 			@Override
-<a class="jxr_linenumber" name="L675" href="#L675">675</a> 			<strong class="jxr_keyword">public</strong> &lt;T&gt; T convertTo(Class&lt;T&gt; type, Object o) {
-<a class="jxr_linenumber" name="L676" href="#L676">676</a> 				<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;  <em class="jxr_comment">// Can't convert</em>
-<a class="jxr_linenumber" name="L677" href="#L677">677</a> 			}
-<a class="jxr_linenumber" name="L678" href="#L678">678</a> 		};
+<a class="jxr_linenumber" name="L672" href="#L672">672</a> 	<strong class="jxr_keyword">void</strong> l03_build_notSparseWithNullMap() {
+<a class="jxr_linenumber" name="L673" href="#L673">673</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L674" href="#L674">674</a> 			.build();
+<a class="jxr_linenumber" name="L675" href="#L675">675</a> 
+<a class="jxr_linenumber" name="L676" href="#L676">676</a> 		assertNotNull(map);
+<a class="jxr_linenumber" name="L677" href="#L677">677</a> 		assertEmpty(map);
+<a class="jxr_linenumber" name="L678" href="#L678">678</a> 	}
 <a class="jxr_linenumber" name="L679" href="#L679">679</a> 
-<a class="jxr_linenumber" name="L680" href="#L680">680</a> 		<strong class="jxr_keyword">var</strong> inputMap = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String,String&gt;();
-<a class="jxr_linenumber" name="L681" href="#L681">681</a> 		inputMap.put(<span class="jxr_string">"a"</span>, <span class="jxr_string">"not-an-integer"</span>);
-<a class="jxr_linenumber" name="L682" href="#L682">682</a> 
-<a class="jxr_linenumber" name="L683" href="#L683">683</a> 		assertThrows(RuntimeException.<strong class="jxr_keyword">class</strong>, () -&gt; {
-<a class="jxr_linenumber" name="L684" href="#L684">684</a> 			MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L685" href="#L685">685</a> 				.converters(converter)
-<a class="jxr_linenumber" name="L686" href="#L686">686</a> 				.addAny(inputMap)
-<a class="jxr_linenumber" name="L687" href="#L687">687</a> 				.build();
-<a class="jxr_linenumber" name="L688" href="#L688">688</a> 		});
+<a class="jxr_linenumber" name="L680" href="#L680">680</a> 	@Test
+<a class="jxr_linenumber" name="L681" href="#L681">681</a> 	<strong class="jxr_keyword">void</strong> l04_build_sortedWithNullMap() {
+<a class="jxr_linenumber" name="L682" href="#L682">682</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L683" href="#L683">683</a> 			.sorted()
+<a class="jxr_linenumber" name="L684" href="#L684">684</a> 			.build();
+<a class="jxr_linenumber" name="L685" href="#L685">685</a> 
+<a class="jxr_linenumber" name="L686" href="#L686">686</a> 		assertNotNull(map);
+<a class="jxr_linenumber" name="L687" href="#L687">687</a> 		assertTrue(map instanceof TreeMap);
+<a class="jxr_linenumber" name="L688" href="#L688">688</a> 		assertEmpty(map);
 <a class="jxr_linenumber" name="L689" href="#L689">689</a> 	}
 <a class="jxr_linenumber" name="L690" href="#L690">690</a> 
-<a class="jxr_linenumber" name="L691" href="#L691">691</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L692" href="#L692">692</a> 	<em class="jxr_comment">// Build edge cases</em>
-<a class="jxr_linenumber" name="L693" href="#L693">693</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L694" href="#L694">694</a> 
-<a class="jxr_linenumber" name="L695" href="#L695">695</a> 	@Test
-<a class="jxr_linenumber" name="L696" href="#L696">696</a> 	<strong class="jxr_keyword">void</strong> l01_build_sparseWithNullMap() {
-<a class="jxr_linenumber" name="L697" href="#L697">697</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L698" href="#L698">698</a> 			.sparse()
-<a class="jxr_linenumber" name="L699" href="#L699">699</a> 			.build();
+<a class="jxr_linenumber" name="L691" href="#L691">691</a> 	@Test
+<a class="jxr_linenumber" name="L692" href="#L692">692</a> 	<strong class="jxr_keyword">void</strong> l05_build_unmodifiableWithNullMap() {
+<a class="jxr_linenumber" name="L693" href="#L693">693</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L694" href="#L694">694</a> 			.unmodifiable()
+<a class="jxr_linenumber" name="L695" href="#L695">695</a> 			.build();
+<a class="jxr_linenumber" name="L696" href="#L696">696</a> 
+<a class="jxr_linenumber" name="L697" href="#L697">697</a> 		assertNotNull(map);
+<a class="jxr_linenumber" name="L698" href="#L698">698</a> 		assertThrows(UnsupportedOperationException.<strong class="jxr_keyword">class</strong>, () -&gt; map.put(<span class="jxr_string">"a"</span>, 1));
+<a class="jxr_linenumber" name="L699" href="#L699">699</a> 	}
 <a class="jxr_linenumber" name="L700" href="#L700">700</a> 
-<a class="jxr_linenumber" name="L701" href="#L701">701</a> 		assertNull(map);
-<a class="jxr_linenumber" name="L702" href="#L702">702</a> 	}
-<a class="jxr_linenumber" name="L703" href="#L703">703</a> 
-<a class="jxr_linenumber" name="L704" href="#L704">704</a> 	@Test
-<a class="jxr_linenumber" name="L705" href="#L705">705</a> 	<strong class="jxr_keyword">void</strong> l02_build_sparseWithEmptyMap() {
-<a class="jxr_linenumber" name="L706" href="#L706">706</a> 		<strong class="jxr_keyword">var</strong> existing = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String,Integer&gt;();
-<a class="jxr_linenumber" name="L707" href="#L707">707</a> 
-<a class="jxr_linenumber" name="L708" href="#L708">708</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L709" href="#L709">709</a> 			.to(existing)
-<a class="jxr_linenumber" name="L710" href="#L710">710</a> 			.sparse()
-<a class="jxr_linenumber" name="L711" href="#L711">711</a> 			.build();
-<a class="jxr_linenumber" name="L712" href="#L712">712</a> 
-<a class="jxr_linenumber" name="L713" href="#L713">713</a> 		assertNull(map);
-<a class="jxr_linenumber" name="L714" href="#L714">714</a> 	}
-<a class="jxr_linenumber" name="L715" href="#L715">715</a> 
-<a class="jxr_linenumber" name="L716" href="#L716">716</a> 	@Test
-<a class="jxr_linenumber" name="L717" href="#L717">717</a> 	<strong class="jxr_keyword">void</strong> l03_build_notSparseWithNullMap() {
-<a class="jxr_linenumber" name="L718" href="#L718">718</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L719" href="#L719">719</a> 			.build();
-<a class="jxr_linenumber" name="L720" href="#L720">720</a> 
-<a class="jxr_linenumber" name="L721" href="#L721">721</a> 		assertNotNull(map);
-<a class="jxr_linenumber" name="L722" href="#L722">722</a> 		assertEmpty(map);
-<a class="jxr_linenumber" name="L723" href="#L723">723</a> 	}
-<a class="jxr_linenumber" name="L724" href="#L724">724</a> 
-<a class="jxr_linenumber" name="L725" href="#L725">725</a> 	@Test
-<a class="jxr_linenumber" name="L726" href="#L726">726</a> 	<strong class="jxr_keyword">void</strong> l04_build_sortedWithNullMap() {
-<a class="jxr_linenumber" name="L727" href="#L727">727</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L728" href="#L728">728</a> 			.sorted()
-<a class="jxr_linenumber" name="L729" href="#L729">729</a> 			.build();
-<a class="jxr_linenumber" name="L730" href="#L730">730</a> 
-<a class="jxr_linenumber" name="L731" href="#L731">731</a> 		assertNotNull(map);
-<a class="jxr_linenumber" name="L732" href="#L732">732</a> 		assertTrue(map instanceof TreeMap);
-<a class="jxr_linenumber" name="L733" href="#L733">733</a> 		assertEmpty(map);
-<a class="jxr_linenumber" name="L734" href="#L734">734</a> 	}
-<a class="jxr_linenumber" name="L735" href="#L735">735</a> 
-<a class="jxr_linenumber" name="L736" href="#L736">736</a> 	@Test
-<a class="jxr_linenumber" name="L737" href="#L737">737</a> 	<strong class="jxr_keyword">void</strong> l05_build_unmodifiableWithNullMap() {
-<a class="jxr_linenumber" name="L738" href="#L738">738</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L739" href="#L739">739</a> 			.unmodifiable()
-<a class="jxr_linenumber" name="L740" href="#L740">740</a> 			.build();
-<a class="jxr_linenumber" name="L741" href="#L741">741</a> 
-<a class="jxr_linenumber" name="L742" href="#L742">742</a> 		assertNotNull(map);
-<a class="jxr_linenumber" name="L743" href="#L743">743</a> 		assertThrows(UnsupportedOperationException.<strong class="jxr_keyword">class</strong>, () -&gt; map.put(<span class="jxr_string">"a"</span>, 1));
-<a class="jxr_linenumber" name="L744" href="#L744">744</a> 	}
-<a class="jxr_linenumber" name="L745" href="#L745">745</a> }
+<a class="jxr_linenumber" name="L701" href="#L701">701</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L702" href="#L702">702</a> 	<em class="jxr_comment">// BuildFluent</em>
+<a class="jxr_linenumber" name="L703" href="#L703">703</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L704" href="#L704">704</a> 
+<a class="jxr_linenumber" name="L705" href="#L705">705</a> 	@Test
+<a class="jxr_linenumber" name="L706" href="#L706">706</a> 	<strong class="jxr_keyword">void</strong> m01_buildFluent_returnsFluentMap() {
+<a class="jxr_linenumber" name="L707" href="#L707">707</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L708" href="#L708">708</a> 			.add(<span class="jxr_string">"a"</span>, 1)
+<a class="jxr_linenumber" name="L709" href="#L709">709</a> 			.add(<span class="jxr_string">"b"</span>, 2)
+<a class="jxr_linenumber" name="L710" href="#L710">710</a> 			.buildFluent();
+<a class="jxr_linenumber" name="L711" href="#L711">711</a> 
+<a class="jxr_linenumber" name="L712" href="#L712">712</a> 		assertNotNull(map);
+<a class="jxr_linenumber" name="L713" href="#L713">713</a> 		assertSize(2, map);
+<a class="jxr_linenumber" name="L714" href="#L714">714</a> 		assertMap(map, <span class="jxr_string">"a=1"</span>, <span class="jxr_string">"b=2"</span>);
+<a class="jxr_linenumber" name="L715" href="#L715">715</a> 	}
+<a class="jxr_linenumber" name="L716" href="#L716">716</a> 
+<a class="jxr_linenumber" name="L717" href="#L717">717</a> 	@Test
+<a class="jxr_linenumber" name="L718" href="#L718">718</a> 	<strong class="jxr_keyword">void</strong> m02_buildFluent_sparseEmpty() {
+<a class="jxr_linenumber" name="L719" href="#L719">719</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L720" href="#L720">720</a> 			.sparse()
+<a class="jxr_linenumber" name="L721" href="#L721">721</a> 			.buildFluent();
+<a class="jxr_linenumber" name="L722" href="#L722">722</a> 
+<a class="jxr_linenumber" name="L723" href="#L723">723</a> 		assertNull(map);
+<a class="jxr_linenumber" name="L724" href="#L724">724</a> 	}
+<a class="jxr_linenumber" name="L725" href="#L725">725</a> 
+<a class="jxr_linenumber" name="L726" href="#L726">726</a> 	@Test
+<a class="jxr_linenumber" name="L727" href="#L727">727</a> 	<strong class="jxr_keyword">void</strong> m03_buildFluent_withFiltering() {
+<a class="jxr_linenumber" name="L728" href="#L728">728</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L729" href="#L729">729</a> 			.filtered((k, v) -&gt; v != <strong class="jxr_keyword">null</strong> &amp;&amp; v &gt; 0)
+<a class="jxr_linenumber" name="L730" href="#L730">730</a> 			.add(<span class="jxr_string">"a"</span>, 1)
+<a class="jxr_linenumber" name="L731" href="#L731">731</a> 			.add(<span class="jxr_string">"b"</span>, -1)  <em class="jxr_comment">// Filtered out</em>
+<a class="jxr_linenumber" name="L732" href="#L732">732</a> 			.buildFluent();
+<a class="jxr_linenumber" name="L733" href="#L733">733</a> 
+<a class="jxr_linenumber" name="L734" href="#L734">734</a> 		assertNotNull(map);
+<a class="jxr_linenumber" name="L735" href="#L735">735</a> 		assertSize(1, map);
+<a class="jxr_linenumber" name="L736" href="#L736">736</a> 		assertMap(map, <span class="jxr_string">"a=1"</span>);
+<a class="jxr_linenumber" name="L737" href="#L737">737</a> 	}
+<a class="jxr_linenumber" name="L738" href="#L738">738</a> 
+<a class="jxr_linenumber" name="L739" href="#L739">739</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L740" href="#L740">740</a> 	<em class="jxr_comment">// BuildFiltered</em>
+<a class="jxr_linenumber" name="L741" href="#L741">741</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L742" href="#L742">742</a> 
+<a class="jxr_linenumber" name="L743" href="#L743">743</a> 	@Test
+<a class="jxr_linenumber" name="L744" href="#L744">744</a> 	<strong class="jxr_keyword">void</strong> n01_buildFiltered_withFilter() {
+<a class="jxr_linenumber" name="L745" href="#L745">745</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L746" href="#L746">746</a> 			.filtered((k, v) -&gt; v != <strong class="jxr_keyword">null</strong> &amp;&amp; v &gt; 0)
+<a class="jxr_linenumber" name="L747" href="#L747">747</a> 			.add(<span class="jxr_string">"a"</span>, 1)
+<a class="jxr_linenumber" name="L748" href="#L748">748</a> 			.add(<span class="jxr_string">"b"</span>, -1)  <em class="jxr_comment">// Filtered out</em>
+<a class="jxr_linenumber" name="L749" href="#L749">749</a> 			.add(<span class="jxr_string">"c"</span>, 2)
+<a class="jxr_linenumber" name="L750" href="#L750">750</a> 			.buildFiltered();
+<a class="jxr_linenumber" name="L751" href="#L751">751</a> 
+<a class="jxr_linenumber" name="L752" href="#L752">752</a> 		assertNotNull(map);
+<a class="jxr_linenumber" name="L753" href="#L753">753</a> 		assertSize(2, map);
+<a class="jxr_linenumber" name="L754" href="#L754">754</a> 		assertMap(map, <span class="jxr_string">"a=1"</span>, <span class="jxr_string">"c=2"</span>);
+<a class="jxr_linenumber" name="L755" href="#L755">755</a> 	}
+<a class="jxr_linenumber" name="L756" href="#L756">756</a> 
+<a class="jxr_linenumber" name="L757" href="#L757">757</a> 	@Test
+<a class="jxr_linenumber" name="L758" href="#L758">758</a> 	<strong class="jxr_keyword">void</strong> n02_buildFiltered_withoutFilter() {
+<a class="jxr_linenumber" name="L759" href="#L759">759</a> 		<em class="jxr_comment">// buildFiltered() should work even without explicit filter (uses default filter)</em>
+<a class="jxr_linenumber" name="L760" href="#L760">760</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L761" href="#L761">761</a> 			.add(<span class="jxr_string">"a"</span>, 1)
+<a class="jxr_linenumber" name="L762" href="#L762">762</a> 			.add(<span class="jxr_string">"b"</span>, 2)
+<a class="jxr_linenumber" name="L763" href="#L763">763</a> 			.buildFiltered();
+<a class="jxr_linenumber" name="L764" href="#L764">764</a> 
+<a class="jxr_linenumber" name="L765" href="#L765">765</a> 		assertNotNull(map);
+<a class="jxr_linenumber" name="L766" href="#L766">766</a> 		assertSize(2, map);
+<a class="jxr_linenumber" name="L767" href="#L767">767</a> 	}
+<a class="jxr_linenumber" name="L768" href="#L768">768</a> 
+<a class="jxr_linenumber" name="L769" href="#L769">769</a> 	@Test
+<a class="jxr_linenumber" name="L770" href="#L770">770</a> 	<strong class="jxr_keyword">void</strong> n03_buildFiltered_sparseEmpty() {
+<a class="jxr_linenumber" name="L771" href="#L771">771</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L772" href="#L772">772</a> 			.filtered((k, v) -&gt; v != <strong class="jxr_keyword">null</strong> &amp;&amp; v &gt; 0)
+<a class="jxr_linenumber" name="L773" href="#L773">773</a> 			.sparse()
+<a class="jxr_linenumber" name="L774" href="#L774">774</a> 			.buildFiltered();
+<a class="jxr_linenumber" name="L775" href="#L775">775</a> 
+<a class="jxr_linenumber" name="L776" href="#L776">776</a> 		assertNull(map);
+<a class="jxr_linenumber" name="L777" href="#L777">777</a> 	}
+<a class="jxr_linenumber" name="L778" href="#L778">778</a> 
+<a class="jxr_linenumber" name="L779" href="#L779">779</a> 	@Test
+<a class="jxr_linenumber" name="L780" href="#L780">780</a> 	<strong class="jxr_keyword">void</strong> n04_buildFiltered_withSorted() {
+<a class="jxr_linenumber" name="L781" href="#L781">781</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L782" href="#L782">782</a> 			.filtered((k, v) -&gt; v != <strong class="jxr_keyword">null</strong> &amp;&amp; v &gt; 0)
+<a class="jxr_linenumber" name="L783" href="#L783">783</a> 			.add(<span class="jxr_string">"c"</span>, 3)
+<a class="jxr_linenumber" name="L784" href="#L784">784</a> 			.add(<span class="jxr_string">"a"</span>, 1)
+<a class="jxr_linenumber" name="L785" href="#L785">785</a> 			.add(<span class="jxr_string">"b"</span>, 2)
+<a class="jxr_linenumber" name="L786" href="#L786">786</a> 			.sorted()
+<a class="jxr_linenumber" name="L787" href="#L787">787</a> 			.buildFiltered();
+<a class="jxr_linenumber" name="L788" href="#L788">788</a> 
+<a class="jxr_linenumber" name="L789" href="#L789">789</a> 		assertNotNull(map);
+<a class="jxr_linenumber" name="L790" href="#L790">790</a> 		assertList(map.keySet(), <span class="jxr_string">"a"</span>, <span class="jxr_string">"b"</span>, <span class="jxr_string">"c"</span>);
+<a class="jxr_linenumber" name="L791" href="#L791">791</a> 	}
+<a class="jxr_linenumber" name="L792" href="#L792">792</a> 
+<a class="jxr_linenumber" name="L793" href="#L793">793</a> 	@Test
+<a class="jxr_linenumber" name="L794" href="#L794">794</a> 	<strong class="jxr_keyword">void</strong> n05_buildFiltered_multipleFilters() {
+<a class="jxr_linenumber" name="L795" href="#L795">795</a> 		<strong class="jxr_keyword">var</strong> map = MapBuilder.create(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L796" href="#L796">796</a> 			.filtered((k, v) -&gt; v != <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L797" href="#L797">797</a> 			.filtered((k, v) -&gt; v &gt; 0)
+<a class="jxr_linenumber" name="L798" href="#L798">798</a> 			.filtered((k, v) -&gt; !k.startsWith(<span class="jxr_string">"_"</span>))
+<a class="jxr_linenumber" name="L799" href="#L799">799</a> 			.add(<span class="jxr_string">"a"</span>, 1)
+<a class="jxr_linenumber" name="L800" href="#L800">800</a> 			.add(<span class="jxr_string">"_b"</span>, 2)  <em class="jxr_comment">// Filtered out (starts with _)</em>
+<a class="jxr_linenumber" name="L801" href="#L801">801</a> 			.add(<span class="jxr_string">"c"</span>, -1)  <em class="jxr_comment">// Filtered out (not &gt; 0)</em>
+<a class="jxr_linenumber" name="L802" href="#L802">802</a> 			.add(<span class="jxr_string">"d"</span>, 3)
+<a class="jxr_linenumber" name="L803" href="#L803">803</a> 			.buildFiltered();
+<a class="jxr_linenumber" name="L804" href="#L804">804</a> 
+<a class="jxr_linenumber" name="L805" href="#L805">805</a> 		assertNotNull(map);
+<a class="jxr_linenumber" name="L806" href="#L806">806</a> 		assertMap(map, <span class="jxr_string">"a=1"</span>, <span class="jxr_string">"d=3"</span>);
+<a class="jxr_linenumber" name="L807" href="#L807">807</a> 	}
+<a class="jxr_linenumber" name="L808" href="#L808">808</a> }
 </pre>
 <hr/>
 <div id="footer">© 2016–2025 <a href="https://www.apache.org/">The Apache Software Foundation</a></div>
diff --git a/site/xref-test/org/apache/juneau/commons/collections/MultiList_Test.html b/site/xref-test/org/apache/juneau/commons/collections/MultiList_Test.html
index 23d5bea300..54f40b1c63 100644
--- a/site/xref-test/org/apache/juneau/commons/collections/MultiList_Test.html
+++ b/site/xref-test/org/apache/juneau/commons/collections/MultiList_Test.html
@@ -601,33 +601,31 @@
 <a class="jxr_linenumber" name="L593" href="#L593">593</a> 	<strong class="jxr_keyword">void</strong> g05_equals_notAList() {
 <a class="jxr_linenumber" name="L594" href="#L594">594</a> 		<strong class="jxr_keyword">var</strong> l1 = l(a(<span class="jxr_string">"1"</span>, <span class="jxr_string">"2"</span>));
 <a class="jxr_linenumber" name="L595" href="#L595">595</a> 		<strong class="jxr_keyword">var</strong> multiList = <strong class="jxr_keyword">new</strong> MultiList&lt;&gt;(l1);
-<a class="jxr_linenumber" name="L596" href="#L596">596</a> 
-<a class="jxr_linenumber" name="L597" href="#L597">597</a> 		assertFalse(multiList.equals(<span class="jxr_string">"not a list"</span>));
-<a class="jxr_linenumber" name="L598" href="#L598">598</a> 		assertFalse(multiList.equals(<strong class="jxr_keyword">null</strong>));
-<a class="jxr_linenumber" name="L599" href="#L599">599</a> 	}
-<a class="jxr_linenumber" name="L600" href="#L600">600</a> 
-<a class="jxr_linenumber" name="L601" href="#L601">601</a> 	@Test
-<a class="jxr_linenumber" name="L602" href="#L602">602</a> 	<strong class="jxr_keyword">void</strong> g06_hashCode_sameContents() {
-<a class="jxr_linenumber" name="L603" href="#L603">603</a> 		<strong class="jxr_keyword">var</strong> l1 = l(a(<span class="jxr_string">"1"</span>, <span class="jxr_string">"2"</span>, <span class="jxr_string">"3"</span>));
-<a class="jxr_linenumber" name="L604" href="#L604">604</a> 		<strong class="jxr_keyword">var</strong> multiList1 = <strong class="jxr_keyword">new</strong> MultiList&lt;&gt;(l1);
-<a class="jxr_linenumber" name="L605" href="#L605">605</a> 
-<a class="jxr_linenumber" name="L606" href="#L606">606</a> 		<strong class="jxr_keyword">var</strong> l2 = l(a(<span class="jxr_string">"1"</span>, <span class="jxr_string">"2"</span>, <span class="jxr_string">"3"</span>));
-<a class="jxr_linenumber" name="L607" href="#L607">607</a> 		<strong class="jxr_keyword">var</strong> multiList2 = <strong class="jxr_keyword">new</strong> MultiList&lt;&gt;(l2);
-<a class="jxr_linenumber" name="L608" href="#L608">608</a> 
-<a class="jxr_linenumber" name="L609" href="#L609">609</a> 		assertEquals(multiList1.hashCode(), multiList2.hashCode());
-<a class="jxr_linenumber" name="L610" href="#L610">610</a> 	}
-<a class="jxr_linenumber" name="L611" href="#L611">611</a> 
-<a class="jxr_linenumber" name="L612" href="#L612">612</a> 	@Test
-<a class="jxr_linenumber" name="L613" href="#L613">613</a> 	<strong class="jxr_keyword">void</strong> g07_hashCode_regularList() {
-<a class="jxr_linenumber" name="L614" href="#L614">614</a> 		<strong class="jxr_keyword">var</strong> l1 = l(a(<span class="jxr_string">"1"</span>, <span class="jxr_string">"2"</span>, <span class="jxr_string">"3"</span>));
-<a class="jxr_linenumber" name="L615" href="#L615">615</a> 		<strong class="jxr_keyword">var</strong> multiList = <strong class="jxr_keyword">new</strong> MultiList&lt;&gt;(l1);
+<a class="jxr_linenumber" name="L596" href="#L596">596</a> 		assertFalse(multiList.equals(<strong class="jxr_keyword">null</strong>));
+<a class="jxr_linenumber" name="L597" href="#L597">597</a> 	}
+<a class="jxr_linenumber" name="L598" href="#L598">598</a> 
+<a class="jxr_linenumber" name="L599" href="#L599">599</a> 	@Test
+<a class="jxr_linenumber" name="L600" href="#L600">600</a> 	<strong class="jxr_keyword">void</strong> g06_hashCode_sameContents() {
+<a class="jxr_linenumber" name="L601" href="#L601">601</a> 		<strong class="jxr_keyword">var</strong> l1 = l(a(<span class="jxr_string">"1"</span>, <span class="jxr_string">"2"</span>, <span class="jxr_string">"3"</span>));
+<a class="jxr_linenumber" name="L602" href="#L602">602</a> 		<strong class="jxr_keyword">var</strong> multiList1 = <strong class="jxr_keyword">new</strong> MultiList&lt;&gt;(l1);
+<a class="jxr_linenumber" name="L603" href="#L603">603</a> 
+<a class="jxr_linenumber" name="L604" href="#L604">604</a> 		<strong class="jxr_keyword">var</strong> l2 = l(a(<span class="jxr_string">"1"</span>, <span class="jxr_string">"2"</span>, <span class="jxr_string">"3"</span>));
+<a class="jxr_linenumber" name="L605" href="#L605">605</a> 		<strong class="jxr_keyword">var</strong> multiList2 = <strong class="jxr_keyword">new</strong> MultiList&lt;&gt;(l2);
+<a class="jxr_linenumber" name="L606" href="#L606">606</a> 
+<a class="jxr_linenumber" name="L607" href="#L607">607</a> 		assertEquals(multiList1.hashCode(), multiList2.hashCode());
+<a class="jxr_linenumber" name="L608" href="#L608">608</a> 	}
+<a class="jxr_linenumber" name="L609" href="#L609">609</a> 
+<a class="jxr_linenumber" name="L610" href="#L610">610</a> 	@Test
+<a class="jxr_linenumber" name="L611" href="#L611">611</a> 	<strong class="jxr_keyword">void</strong> g07_hashCode_regularList() {
+<a class="jxr_linenumber" name="L612" href="#L612">612</a> 		<strong class="jxr_keyword">var</strong> l1 = l(a(<span class="jxr_string">"1"</span>, <span class="jxr_string">"2"</span>, <span class="jxr_string">"3"</span>));
+<a class="jxr_linenumber" name="L613" href="#L613">613</a> 		<strong class="jxr_keyword">var</strong> multiList = <strong class="jxr_keyword">new</strong> MultiList&lt;&gt;(l1);
+<a class="jxr_linenumber" name="L614" href="#L614">614</a> 
+<a class="jxr_linenumber" name="L615" href="#L615">615</a> 		<strong class="jxr_keyword">var</strong> regularList = <strong class="jxr_keyword">new</strong> ArrayList&lt;&gt;(l(a(<span class="jxr_string">"1"</span>, <span class="jxr_string">"2"</span>, <span class="jxr_string">"3"</span>)));
 <a class="jxr_linenumber" name="L616" href="#L616">616</a> 
-<a class="jxr_linenumber" name="L617" href="#L617">617</a> 		<strong class="jxr_keyword">var</strong> regularList = <strong class="jxr_keyword">new</strong> ArrayList&lt;&gt;(l(a(<span class="jxr_string">"1"</span>, <span class="jxr_string">"2"</span>, <span class="jxr_string">"3"</span>)));
-<a class="jxr_linenumber" name="L618" href="#L618">618</a> 
-<a class="jxr_linenumber" name="L619" href="#L619">619</a> 		assertEquals(multiList.hashCode(), regularList.hashCode());
-<a class="jxr_linenumber" name="L620" href="#L620">620</a> 	}
-<a class="jxr_linenumber" name="L621" href="#L621">621</a> }
-<a class="jxr_linenumber" name="L622" href="#L622">622</a> 
+<a class="jxr_linenumber" name="L617" href="#L617">617</a> 		assertEquals(multiList.hashCode(), regularList.hashCode());
+<a class="jxr_linenumber" name="L618" href="#L618">618</a> 	}
+<a class="jxr_linenumber" name="L619" href="#L619">619</a> }
+<a class="jxr_linenumber" name="L620" href="#L620">620</a> 
 </pre>
 <hr/>
 <div id="footer">© 2016–2025 <a href="https://www.apache.org/">The Apache Software Foundation</a></div>
diff --git a/site/xref-test/org/apache/juneau/commons/collections/MultiMap_Test.html b/site/xref-test/org/apache/juneau/commons/collections/MultiMap_Test.html
index 65aeda984b..23a88bf53d 100644
--- a/site/xref-test/org/apache/juneau/commons/collections/MultiMap_Test.html
+++ b/site/xref-test/org/apache/juneau/commons/collections/MultiMap_Test.html
@@ -496,34 +496,33 @@
 <a class="jxr_linenumber" name="L488" href="#L488">488</a> 		<strong class="jxr_keyword">var</strong> map1 = map(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>);
 <a class="jxr_linenumber" name="L489" href="#L489">489</a> 		<strong class="jxr_keyword">var</strong> multiMap = <strong class="jxr_keyword">new</strong> MultiMap&lt;&gt;(map1);
 <a class="jxr_linenumber" name="L490" href="#L490">490</a> 
-<a class="jxr_linenumber" name="L491" href="#L491">491</a> 		assertFalse(multiMap.equals(<span class="jxr_string">"not a map"</span>));
-<a class="jxr_linenumber" name="L492" href="#L492">492</a> 		assertFalse(multiMap.equals(<strong class="jxr_keyword">null</strong>));
-<a class="jxr_linenumber" name="L493" href="#L493">493</a> 	}
-<a class="jxr_linenumber" name="L494" href="#L494">494</a> 
-<a class="jxr_linenumber" name="L495" href="#L495">495</a> 	@Test
-<a class="jxr_linenumber" name="L496" href="#L496">496</a> 	<strong class="jxr_keyword">void</strong> l05_hashCode_sameContents() {
-<a class="jxr_linenumber" name="L497" href="#L497">497</a> 		<strong class="jxr_keyword">var</strong> map1 = map(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>, <span class="jxr_string">"key2"</span>, <span class="jxr_string">"value2"</span>);
-<a class="jxr_linenumber" name="L498" href="#L498">498</a> 		<strong class="jxr_keyword">var</strong> map2 = map(<span class="jxr_string">"key3"</span>, <span class="jxr_string">"value3"</span>);
-<a class="jxr_linenumber" name="L499" href="#L499">499</a> 		<strong class="jxr_keyword">var</strong> multiMap1 = <strong class="jxr_keyword">new</strong> MultiMap&lt;&gt;(map1, map2);
-<a class="jxr_linenumber" name="L500" href="#L500">500</a> 
-<a class="jxr_linenumber" name="L501" href="#L501">501</a> 		<strong class="jxr_keyword">var</strong> map3 = map(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>, <span class="jxr_string">"key2"</span>, <span class="jxr_string">"value2"</span>);
-<a class="jxr_linenumber" name="L502" href="#L502">502</a> 		<strong class="jxr_keyword">var</strong> map4 = map(<span class="jxr_string">"key3"</span>, <span class="jxr_string">"value3"</span>);
-<a class="jxr_linenumber" name="L503" href="#L503">503</a> 		<strong class="jxr_keyword">var</strong> multiMap2 = <strong class="jxr_keyword">new</strong> MultiMap&lt;&gt;(map3, map4);
-<a class="jxr_linenumber" name="L504" href="#L504">504</a> 
-<a class="jxr_linenumber" name="L505" href="#L505">505</a> 		assertEquals(multiMap1.hashCode(), multiMap2.hashCode());
-<a class="jxr_linenumber" name="L506" href="#L506">506</a> 	}
-<a class="jxr_linenumber" name="L507" href="#L507">507</a> 
-<a class="jxr_linenumber" name="L508" href="#L508">508</a> 	@Test
-<a class="jxr_linenumber" name="L509" href="#L509">509</a> 	<strong class="jxr_keyword">void</strong> l06_hashCode_regularMap() {
-<a class="jxr_linenumber" name="L510" href="#L510">510</a> 		<strong class="jxr_keyword">var</strong> map1 = map(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>, <span class="jxr_string">"key2"</span>, <span class="jxr_string">"value2"</span>);
-<a class="jxr_linenumber" name="L511" href="#L511">511</a> 		<strong class="jxr_keyword">var</strong> multiMap = <strong class="jxr_keyword">new</strong> MultiMap&lt;&gt;(map1);
-<a class="jxr_linenumber" name="L512" href="#L512">512</a> 
-<a class="jxr_linenumber" name="L513" href="#L513">513</a> 		<strong class="jxr_keyword">var</strong> regularMap = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;&gt;(map(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>, <span class="jxr_string">"key2"</span>, <span class="jxr_string">"value2"</span>));
-<a class="jxr_linenumber" name="L514" href="#L514">514</a> 
-<a class="jxr_linenumber" name="L515" href="#L515">515</a> 		assertEquals(multiMap.hashCode(), regularMap.hashCode());
-<a class="jxr_linenumber" name="L516" href="#L516">516</a> 	}
-<a class="jxr_linenumber" name="L517" href="#L517">517</a> }
-<a class="jxr_linenumber" name="L518" href="#L518">518</a> 
+<a class="jxr_linenumber" name="L491" href="#L491">491</a> 		assertFalse(multiMap.equals(<strong class="jxr_keyword">null</strong>));
+<a class="jxr_linenumber" name="L492" href="#L492">492</a> 	}
+<a class="jxr_linenumber" name="L493" href="#L493">493</a> 
+<a class="jxr_linenumber" name="L494" href="#L494">494</a> 	@Test
+<a class="jxr_linenumber" name="L495" href="#L495">495</a> 	<strong class="jxr_keyword">void</strong> l05_hashCode_sameContents() {
+<a class="jxr_linenumber" name="L496" href="#L496">496</a> 		<strong class="jxr_keyword">var</strong> map1 = map(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>, <span class="jxr_string">"key2"</span>, <span class="jxr_string">"value2"</span>);
+<a class="jxr_linenumber" name="L497" href="#L497">497</a> 		<strong class="jxr_keyword">var</strong> map2 = map(<span class="jxr_string">"key3"</span>, <span class="jxr_string">"value3"</span>);
+<a class="jxr_linenumber" name="L498" href="#L498">498</a> 		<strong class="jxr_keyword">var</strong> multiMap1 = <strong class="jxr_keyword">new</strong> MultiMap&lt;&gt;(map1, map2);
+<a class="jxr_linenumber" name="L499" href="#L499">499</a> 
+<a class="jxr_linenumber" name="L500" href="#L500">500</a> 		<strong class="jxr_keyword">var</strong> map3 = map(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>, <span class="jxr_string">"key2"</span>, <span class="jxr_string">"value2"</span>);
+<a class="jxr_linenumber" name="L501" href="#L501">501</a> 		<strong class="jxr_keyword">var</strong> map4 = map(<span class="jxr_string">"key3"</span>, <span class="jxr_string">"value3"</span>);
+<a class="jxr_linenumber" name="L502" href="#L502">502</a> 		<strong class="jxr_keyword">var</strong> multiMap2 = <strong class="jxr_keyword">new</strong> MultiMap&lt;&gt;(map3, map4);
+<a class="jxr_linenumber" name="L503" href="#L503">503</a> 
+<a class="jxr_linenumber" name="L504" href="#L504">504</a> 		assertEquals(multiMap1.hashCode(), multiMap2.hashCode());
+<a class="jxr_linenumber" name="L505" href="#L505">505</a> 	}
+<a class="jxr_linenumber" name="L506" href="#L506">506</a> 
+<a class="jxr_linenumber" name="L507" href="#L507">507</a> 	@Test
+<a class="jxr_linenumber" name="L508" href="#L508">508</a> 	<strong class="jxr_keyword">void</strong> l06_hashCode_regularMap() {
+<a class="jxr_linenumber" name="L509" href="#L509">509</a> 		<strong class="jxr_keyword">var</strong> map1 = map(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>, <span class="jxr_string">"key2"</span>, <span class="jxr_string">"value2"</span>);
+<a class="jxr_linenumber" name="L510" href="#L510">510</a> 		<strong class="jxr_keyword">var</strong> multiMap = <strong class="jxr_keyword">new</strong> MultiMap&lt;&gt;(map1);
+<a class="jxr_linenumber" name="L511" href="#L511">511</a> 
+<a class="jxr_linenumber" name="L512" href="#L512">512</a> 		<strong class="jxr_keyword">var</strong> regularMap = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;&gt;(map(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>, <span class="jxr_string">"key2"</span>, <span class="jxr_string">"value2"</span>));
+<a class="jxr_linenumber" name="L513" href="#L513">513</a> 
+<a class="jxr_linenumber" name="L514" href="#L514">514</a> 		assertEquals(multiMap.hashCode(), regularMap.hashCode());
+<a class="jxr_linenumber" name="L515" href="#L515">515</a> 	}
+<a class="jxr_linenumber" name="L516" href="#L516">516</a> }
+<a class="jxr_linenumber" name="L517" href="#L517">517</a> 
 </pre>
 <hr/>
 <div id="footer">© 2016–2025 <a href="https://www.apache.org/">The Apache Software Foundation</a></div>
diff --git a/site/xref-test/org/apache/juneau/commons/collections/MultiSet_Test.html b/site/xref-test/org/apache/juneau/commons/collections/MultiSet_Test.html
index 23beeec2f8..7509de86a0 100644
--- a/site/xref-test/org/apache/juneau/commons/collections/MultiSet_Test.html
+++ b/site/xref-test/org/apache/juneau/commons/collections/MultiSet_Test.html
@@ -291,32 +291,31 @@
 <a class="jxr_linenumber" name="L283" href="#L283">283</a> 		<strong class="jxr_keyword">var</strong> l1 = l(a(<span class="jxr_string">"1"</span>, <span class="jxr_string">"2"</span>));
 <a class="jxr_linenumber" name="L284" href="#L284">284</a> 		<strong class="jxr_keyword">var</strong> multiSet = <strong class="jxr_keyword">new</strong> MultiSet&lt;&gt;(l1);
 <a class="jxr_linenumber" name="L285" href="#L285">285</a> 
-<a class="jxr_linenumber" name="L286" href="#L286">286</a> 		assertFalse(multiSet.equals(<span class="jxr_string">"not a set"</span>));
-<a class="jxr_linenumber" name="L287" href="#L287">287</a> 		assertFalse(multiSet.equals(<strong class="jxr_keyword">null</strong>));
-<a class="jxr_linenumber" name="L288" href="#L288">288</a> 	}
-<a class="jxr_linenumber" name="L289" href="#L289">289</a> 
-<a class="jxr_linenumber" name="L290" href="#L290">290</a> 	@Test
-<a class="jxr_linenumber" name="L291" href="#L291">291</a> 	<strong class="jxr_keyword">void</strong> hashCode_sameContents() {
-<a class="jxr_linenumber" name="L292" href="#L292">292</a> 		<strong class="jxr_keyword">var</strong> l1 = l(a(<span class="jxr_string">"1"</span>, <span class="jxr_string">"2"</span>, <span class="jxr_string">"3"</span>));
-<a class="jxr_linenumber" name="L293" href="#L293">293</a> 		<strong class="jxr_keyword">var</strong> multiSet1 = <strong class="jxr_keyword">new</strong> MultiSet&lt;&gt;(l1);
-<a class="jxr_linenumber" name="L294" href="#L294">294</a> 
-<a class="jxr_linenumber" name="L295" href="#L295">295</a> 		<strong class="jxr_keyword">var</strong> l2 = l(a(<span class="jxr_string">"1"</span>, <span class="jxr_string">"2"</span>, <span class="jxr_string">"3"</span>));
-<a class="jxr_linenumber" name="L296" href="#L296">296</a> 		<strong class="jxr_keyword">var</strong> multiSet2 = <strong class="jxr_keyword">new</strong> MultiSet&lt;&gt;(l2);
-<a class="jxr_linenumber" name="L297" href="#L297">297</a> 
-<a class="jxr_linenumber" name="L298" href="#L298">298</a> 		assertEquals(multiSet1.hashCode(), multiSet2.hashCode());
-<a class="jxr_linenumber" name="L299" href="#L299">299</a> 	}
-<a class="jxr_linenumber" name="L300" href="#L300">300</a> 
-<a class="jxr_linenumber" name="L301" href="#L301">301</a> 	@Test
-<a class="jxr_linenumber" name="L302" href="#L302">302</a> 	<strong class="jxr_keyword">void</strong> hashCode_regularSet() {
-<a class="jxr_linenumber" name="L303" href="#L303">303</a> 		<strong class="jxr_keyword">var</strong> l1 = l(a(<span class="jxr_string">"1"</span>, <span class="jxr_string">"2"</span>, <span class="jxr_string">"3"</span>));
-<a class="jxr_linenumber" name="L304" href="#L304">304</a> 		<strong class="jxr_keyword">var</strong> multiSet = <strong class="jxr_keyword">new</strong> MultiSet&lt;&gt;(l1);
-<a class="jxr_linenumber" name="L305" href="#L305">305</a> 
-<a class="jxr_linenumber" name="L306" href="#L306">306</a> 		<strong class="jxr_keyword">var</strong> regularSet = <strong class="jxr_keyword">new</strong> LinkedHashSet&lt;&gt;(l(a(<span class="jxr_string">"1"</span>, <span class="jxr_string">"2"</span>, <span class="jxr_string">"3"</span>)));
-<a class="jxr_linenumber" name="L307" href="#L307">307</a> 
-<a class="jxr_linenumber" name="L308" href="#L308">308</a> 		assertEquals(multiSet.hashCode(), regularSet.hashCode());
-<a class="jxr_linenumber" name="L309" href="#L309">309</a> 	}
-<a class="jxr_linenumber" name="L310" href="#L310">310</a> }
-<a class="jxr_linenumber" name="L311" href="#L311">311</a> 
+<a class="jxr_linenumber" name="L286" href="#L286">286</a> 		assertFalse(multiSet.equals(<strong class="jxr_keyword">null</strong>));
+<a class="jxr_linenumber" name="L287" href="#L287">287</a> 	}
+<a class="jxr_linenumber" name="L288" href="#L288">288</a> 
+<a class="jxr_linenumber" name="L289" href="#L289">289</a> 	@Test
+<a class="jxr_linenumber" name="L290" href="#L290">290</a> 	<strong class="jxr_keyword">void</strong> hashCode_sameContents() {
+<a class="jxr_linenumber" name="L291" href="#L291">291</a> 		<strong class="jxr_keyword">var</strong> l1 = l(a(<span class="jxr_string">"1"</span>, <span class="jxr_string">"2"</span>, <span class="jxr_string">"3"</span>));
+<a class="jxr_linenumber" name="L292" href="#L292">292</a> 		<strong class="jxr_keyword">var</strong> multiSet1 = <strong class="jxr_keyword">new</strong> MultiSet&lt;&gt;(l1);
+<a class="jxr_linenumber" name="L293" href="#L293">293</a> 
+<a class="jxr_linenumber" name="L294" href="#L294">294</a> 		<strong class="jxr_keyword">var</strong> l2 = l(a(<span class="jxr_string">"1"</span>, <span class="jxr_string">"2"</span>, <span class="jxr_string">"3"</span>));
+<a class="jxr_linenumber" name="L295" href="#L295">295</a> 		<strong class="jxr_keyword">var</strong> multiSet2 = <strong class="jxr_keyword">new</strong> MultiSet&lt;&gt;(l2);
+<a class="jxr_linenumber" name="L296" href="#L296">296</a> 
+<a class="jxr_linenumber" name="L297" href="#L297">297</a> 		assertEquals(multiSet1.hashCode(), multiSet2.hashCode());
+<a class="jxr_linenumber" name="L298" href="#L298">298</a> 	}
+<a class="jxr_linenumber" name="L299" href="#L299">299</a> 
+<a class="jxr_linenumber" name="L300" href="#L300">300</a> 	@Test
+<a class="jxr_linenumber" name="L301" href="#L301">301</a> 	<strong class="jxr_keyword">void</strong> hashCode_regularSet() {
+<a class="jxr_linenumber" name="L302" href="#L302">302</a> 		<strong class="jxr_keyword">var</strong> l1 = l(a(<span class="jxr_string">"1"</span>, <span class="jxr_string">"2"</span>, <span class="jxr_string">"3"</span>));
+<a class="jxr_linenumber" name="L303" href="#L303">303</a> 		<strong class="jxr_keyword">var</strong> multiSet = <strong class="jxr_keyword">new</strong> MultiSet&lt;&gt;(l1);
+<a class="jxr_linenumber" name="L304" href="#L304">304</a> 
+<a class="jxr_linenumber" name="L305" href="#L305">305</a> 		<strong class="jxr_keyword">var</strong> regularSet = <strong class="jxr_keyword">new</strong> LinkedHashSet&lt;&gt;(l(a(<span class="jxr_string">"1"</span>, <span class="jxr_string">"2"</span>, <span class="jxr_string">"3"</span>)));
+<a class="jxr_linenumber" name="L306" href="#L306">306</a> 
+<a class="jxr_linenumber" name="L307" href="#L307">307</a> 		assertEquals(multiSet.hashCode(), regularSet.hashCode());
+<a class="jxr_linenumber" name="L308" href="#L308">308</a> 	}
+<a class="jxr_linenumber" name="L309" href="#L309">309</a> }
+<a class="jxr_linenumber" name="L310" href="#L310">310</a> 
 </pre>
 <hr/>
 <div id="footer">© 2016–2025 <a href="https://www.apache.org/">The Apache Software Foundation</a></div>
diff --git a/site/xref-test/org/apache/juneau/commons/collections/ReversedList_Test.html b/site/xref-test/org/apache/juneau/commons/collections/ReversedList_Test.html
index a9ab37c0aa..a975366fac 100644
--- a/site/xref-test/org/apache/juneau/commons/collections/ReversedList_Test.html
+++ b/site/xref-test/org/apache/juneau/commons/collections/ReversedList_Test.html
@@ -575,33 +575,32 @@
 <a class="jxr_linenumber" name="L567" href="#L567">567</a> 		<strong class="jxr_keyword">var</strong> original = <strong class="jxr_keyword">new</strong> ArrayList&lt;&gt;(List.of(<span class="jxr_string">"a"</span>, <span class="jxr_string">"b"</span>, <span class="jxr_string">"c"</span>));
 <a class="jxr_linenumber" name="L568" href="#L568">568</a> 		<strong class="jxr_keyword">var</strong> reversed = <strong class="jxr_keyword">new</strong> ReversedList&lt;&gt;(original);
 <a class="jxr_linenumber" name="L569" href="#L569">569</a> 
-<a class="jxr_linenumber" name="L570" href="#L570">570</a> 		assertFalse(reversed.equals(<span class="jxr_string">"not a list"</span>));
-<a class="jxr_linenumber" name="L571" href="#L571">571</a> 		assertFalse(reversed.equals(<strong class="jxr_keyword">null</strong>));
-<a class="jxr_linenumber" name="L572" href="#L572">572</a> 	}
-<a class="jxr_linenumber" name="L573" href="#L573">573</a> 
-<a class="jxr_linenumber" name="L574" href="#L574">574</a> 	@Test
-<a class="jxr_linenumber" name="L575" href="#L575">575</a> 	<strong class="jxr_keyword">void</strong> k06_hashCode_sameContents() {
-<a class="jxr_linenumber" name="L576" href="#L576">576</a> 		<strong class="jxr_keyword">var</strong> original1 = <strong class="jxr_keyword">new</strong> ArrayList&lt;&gt;(List.of(<span class="jxr_string">"a"</span>, <span class="jxr_string">"b"</span>, <span class="jxr_string">"c"</span>));
-<a class="jxr_linenumber" name="L577" href="#L577">577</a> 		<strong class="jxr_keyword">var</strong> reversed1 = <strong class="jxr_keyword">new</strong> ReversedList&lt;&gt;(original1);
-<a class="jxr_linenumber" name="L578" href="#L578">578</a> 
-<a class="jxr_linenumber" name="L579" href="#L579">579</a> 		<strong class="jxr_keyword">var</strong> original2 = <strong class="jxr_keyword">new</strong> ArrayList&lt;&gt;(List.of(<span class="jxr_string">"a"</span>, <span class="jxr_string">"b"</span>, <span class="jxr_string">"c"</span>));
-<a class="jxr_linenumber" name="L580" href="#L580">580</a> 		<strong class="jxr_keyword">var</strong> reversed2 = <strong class="jxr_keyword">new</strong> ReversedList&lt;&gt;(original2);
-<a class="jxr_linenumber" name="L581" href="#L581">581</a> 
-<a class="jxr_linenumber" name="L582" href="#L582">582</a> 		assertEquals(reversed1.hashCode(), reversed2.hashCode());
-<a class="jxr_linenumber" name="L583" href="#L583">583</a> 	}
-<a class="jxr_linenumber" name="L584" href="#L584">584</a> 
-<a class="jxr_linenumber" name="L585" href="#L585">585</a> 	@Test
-<a class="jxr_linenumber" name="L586" href="#L586">586</a> 	<strong class="jxr_keyword">void</strong> k07_hashCode_regularList() {
-<a class="jxr_linenumber" name="L587" href="#L587">587</a> 		<strong class="jxr_keyword">var</strong> original = <strong class="jxr_keyword">new</strong> ArrayList&lt;&gt;(List.of(<span class="jxr_string">"a"</span>, <span class="jxr_string">"b"</span>, <span class="jxr_string">"c"</span>));
-<a class="jxr_linenumber" name="L588" href="#L588">588</a> 		<strong class="jxr_keyword">var</strong> reversed = <strong class="jxr_keyword">new</strong> ReversedList&lt;&gt;(original);
-<a class="jxr_linenumber" name="L589" href="#L589">589</a> 
-<a class="jxr_linenumber" name="L590" href="#L590">590</a> 		<em class="jxr_comment">// A reversed list ["c", "b", "a"] should have same hash as a regular list ["c", "b", "a"]</em>
-<a class="jxr_linenumber" name="L591" href="#L591">591</a> 		<strong class="jxr_keyword">var</strong> regularList = <strong class="jxr_keyword">new</strong> ArrayList&lt;&gt;(List.of(<span class="jxr_string">"c"</span>, <span class="jxr_string">"b"</span>, <span class="jxr_string">"a"</span>));
-<a class="jxr_linenumber" name="L592" href="#L592">592</a> 
-<a class="jxr_linenumber" name="L593" href="#L593">593</a> 		assertEquals(reversed.hashCode(), regularList.hashCode());
-<a class="jxr_linenumber" name="L594" href="#L594">594</a> 	}
-<a class="jxr_linenumber" name="L595" href="#L595">595</a> }
-<a class="jxr_linenumber" name="L596" href="#L596">596</a> 
+<a class="jxr_linenumber" name="L570" href="#L570">570</a> 		assertFalse(reversed.equals(<strong class="jxr_keyword">null</strong>));
+<a class="jxr_linenumber" name="L571" href="#L571">571</a> 	}
+<a class="jxr_linenumber" name="L572" href="#L572">572</a> 
+<a class="jxr_linenumber" name="L573" href="#L573">573</a> 	@Test
+<a class="jxr_linenumber" name="L574" href="#L574">574</a> 	<strong class="jxr_keyword">void</strong> k06_hashCode_sameContents() {
+<a class="jxr_linenumber" name="L575" href="#L575">575</a> 		<strong class="jxr_keyword">var</strong> original1 = <strong class="jxr_keyword">new</strong> ArrayList&lt;&gt;(List.of(<span class="jxr_string">"a"</span>, <span class="jxr_string">"b"</span>, <span class="jxr_string">"c"</span>));
+<a class="jxr_linenumber" name="L576" href="#L576">576</a> 		<strong class="jxr_keyword">var</strong> reversed1 = <strong class="jxr_keyword">new</strong> ReversedList&lt;&gt;(original1);
+<a class="jxr_linenumber" name="L577" href="#L577">577</a> 
+<a class="jxr_linenumber" name="L578" href="#L578">578</a> 		<strong class="jxr_keyword">var</strong> original2 = <strong class="jxr_keyword">new</strong> ArrayList&lt;&gt;(List.of(<span class="jxr_string">"a"</span>, <span class="jxr_string">"b"</span>, <span class="jxr_string">"c"</span>));
+<a class="jxr_linenumber" name="L579" href="#L579">579</a> 		<strong class="jxr_keyword">var</strong> reversed2 = <strong class="jxr_keyword">new</strong> ReversedList&lt;&gt;(original2);
+<a class="jxr_linenumber" name="L580" href="#L580">580</a> 
+<a class="jxr_linenumber" name="L581" href="#L581">581</a> 		assertEquals(reversed1.hashCode(), reversed2.hashCode());
+<a class="jxr_linenumber" name="L582" href="#L582">582</a> 	}
+<a class="jxr_linenumber" name="L583" href="#L583">583</a> 
+<a class="jxr_linenumber" name="L584" href="#L584">584</a> 	@Test
+<a class="jxr_linenumber" name="L585" href="#L585">585</a> 	<strong class="jxr_keyword">void</strong> k07_hashCode_regularList() {
+<a class="jxr_linenumber" name="L586" href="#L586">586</a> 		<strong class="jxr_keyword">var</strong> original = <strong class="jxr_keyword">new</strong> ArrayList&lt;&gt;(List.of(<span class="jxr_string">"a"</span>, <span class="jxr_string">"b"</span>, <span class="jxr_string">"c"</span>));
+<a class="jxr_linenumber" name="L587" href="#L587">587</a> 		<strong class="jxr_keyword">var</strong> reversed = <strong class="jxr_keyword">new</strong> ReversedList&lt;&gt;(original);
+<a class="jxr_linenumber" name="L588" href="#L588">588</a> 
+<a class="jxr_linenumber" name="L589" href="#L589">589</a> 		<em class="jxr_comment">// A reversed list ["c", "b", "a"] should have same hash as a regular list ["c", "b", "a"]</em>
+<a class="jxr_linenumber" name="L590" href="#L590">590</a> 		<strong class="jxr_keyword">var</strong> regularList = <strong class="jxr_keyword">new</strong> ArrayList&lt;&gt;(List.of(<span class="jxr_string">"c"</span>, <span class="jxr_string">"b"</span>, <span class="jxr_string">"a"</span>));
+<a class="jxr_linenumber" name="L591" href="#L591">591</a> 
+<a class="jxr_linenumber" name="L592" href="#L592">592</a> 		assertEquals(reversed.hashCode(), regularList.hashCode());
+<a class="jxr_linenumber" name="L593" href="#L593">593</a> 	}
+<a class="jxr_linenumber" name="L594" href="#L594">594</a> }
+<a class="jxr_linenumber" name="L595" href="#L595">595</a> 
 </pre>
 <hr/>
 <div id="footer">© 2016–2025 <a href="https://www.apache.org/">The Apache Software Foundation</a></div>
diff --git a/site/xref-test/org/apache/juneau/commons/collections/SimpleMap_Test.html b/site/xref-test/org/apache/juneau/commons/collections/SimpleMap_Test.html
index 831084ccdf..b51d4ce03d 100644
--- a/site/xref-test/org/apache/juneau/commons/collections/SimpleMap_Test.html
+++ b/site/xref-test/org/apache/juneau/commons/collections/SimpleMap_Test.html
@@ -394,36 +394,35 @@
 <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> 		SimpleMap&lt;String,Object&gt; map = <strong class="jxr_keyword">new</strong> SimpleMap&lt;&gt;(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>));
-<a class="jxr_linenumber" name="L391" href="#L391">391</a> 	}
-<a class="jxr_linenumber" name="L392" href="#L392">392</a> 
-<a class="jxr_linenumber" name="L393" href="#L393">393</a> 	@Test
-<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> 		SimpleMap&lt;String,Object&gt; map1 = <strong class="jxr_keyword">new</strong> SimpleMap&lt;&gt;(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> 		SimpleMap&lt;String,Object&gt; map2 = <strong class="jxr_keyword">new</strong> SimpleMap&lt;&gt;(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> 	}
-<a class="jxr_linenumber" name="L405" href="#L405">405</a> 
-<a class="jxr_linenumber" name="L406" href="#L406">406</a> 	@Test
-<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> 		SimpleMap&lt;String,Object&gt; map = <strong class="jxr_keyword">new</strong> SimpleMap&lt;&gt;(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&lt;String, Object&gt;();
-<a class="jxr_linenumber" name="L413" href="#L413">413</a> 		regularMap.put(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L414" href="#L414">414</a> 		regularMap.put(<span class="jxr_string">"key2"</span>, <span class="jxr_string">"value2"</span>);
-<a class="jxr_linenumber" name="L415" href="#L415">415</a> 
-<a class="jxr_linenumber" name="L416" href="#L416">416</a> 		assertEquals(map.hashCode(), regularMap.hashCode());
-<a class="jxr_linenumber" name="L417" href="#L417">417</a> 	}
-<a class="jxr_linenumber" name="L418" href="#L418">418</a> }
+<a class="jxr_linenumber" name="L389" href="#L389">389</a> 		assertFalse(map.equals(<strong class="jxr_keyword">null</strong>));
+<a class="jxr_linenumber" name="L390" href="#L390">390</a> 	}
+<a class="jxr_linenumber" name="L391" href="#L391">391</a> 
+<a class="jxr_linenumber" name="L392" href="#L392">392</a> 	@Test
+<a class="jxr_linenumber" name="L393" href="#L393">393</a> 	<strong class="jxr_keyword">void</strong> e07_hashCode_sameContents() {
+<a class="jxr_linenumber" name="L394" href="#L394">394</a> 		String[] keys1 = { <span class="jxr_string">"key1"</span>, <span class="jxr_string">"key2"</span> };
+<a class="jxr_linenumber" name="L395" href="#L395">395</a> 		Object[] values1 = { <span class="jxr_string">"value1"</span>, <span class="jxr_string">"value2"</span> };
+<a class="jxr_linenumber" name="L396" href="#L396">396</a> 		SimpleMap&lt;String,Object&gt; map1 = <strong class="jxr_keyword">new</strong> SimpleMap&lt;&gt;(keys1, values1);
+<a class="jxr_linenumber" name="L397" href="#L397">397</a> 
+<a class="jxr_linenumber" name="L398" href="#L398">398</a> 		String[] keys2 = { <span class="jxr_string">"key1"</span>, <span class="jxr_string">"key2"</span> };
+<a class="jxr_linenumber" name="L399" href="#L399">399</a> 		Object[] values2 = { <span class="jxr_string">"value1"</span>, <span class="jxr_string">"value2"</span> };
+<a class="jxr_linenumber" name="L400" href="#L400">400</a> 		SimpleMap&lt;String,Object&gt; map2 = <strong class="jxr_keyword">new</strong> SimpleMap&lt;&gt;(keys2, values2);
+<a class="jxr_linenumber" name="L401" href="#L401">401</a> 
+<a class="jxr_linenumber" name="L402" href="#L402">402</a> 		assertEquals(map1.hashCode(), map2.hashCode());
+<a class="jxr_linenumber" name="L403" href="#L403">403</a> 	}
+<a class="jxr_linenumber" name="L404" href="#L404">404</a> 
+<a class="jxr_linenumber" name="L405" href="#L405">405</a> 	@Test
+<a class="jxr_linenumber" name="L406" href="#L406">406</a> 	<strong class="jxr_keyword">void</strong> e08_hashCode_regularMap() {
+<a class="jxr_linenumber" name="L407" href="#L407">407</a> 		String[] keys = { <span class="jxr_string">"key1"</span>, <span class="jxr_string">"key2"</span> };
+<a class="jxr_linenumber" name="L408" href="#L408">408</a> 		Object[] values = { <span class="jxr_string">"value1"</span>, <span class="jxr_string">"value2"</span> };
+<a class="jxr_linenumber" name="L409" href="#L409">409</a> 		SimpleMap&lt;String,Object&gt; map = <strong class="jxr_keyword">new</strong> SimpleMap&lt;&gt;(keys, values);
+<a class="jxr_linenumber" name="L410" href="#L410">410</a> 
+<a class="jxr_linenumber" name="L411" href="#L411">411</a> 		<strong class="jxr_keyword">var</strong> regularMap = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String, Object&gt;();
+<a class="jxr_linenumber" name="L412" href="#L412">412</a> 		regularMap.put(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>);
+<a class="jxr_linenumber" name="L413" href="#L413">413</a> 		regularMap.put(<span class="jxr_string">"key2"</span>, <span class="jxr_string">"value2"</span>);
+<a class="jxr_linenumber" name="L414" href="#L414">414</a> 
+<a class="jxr_linenumber" name="L415" href="#L415">415</a> 		assertEquals(map.hashCode(), regularMap.hashCode());
+<a class="jxr_linenumber" name="L416" href="#L416">416</a> 	}
+<a class="jxr_linenumber" name="L417" href="#L417">417</a> }
 </pre>
 <hr/>
 <div id="footer">© 2016–2025 <a href="https://www.apache.org/">The Apache Software Foundation</a></div>
diff --git a/site/xref/org/apache/juneau/commons/collections/FilteredMap.html b/site/xref/org/apache/juneau/commons/collections/FilteredMap.html
index 1510e75077..b3fb37c0f8 100644
--- a/site/xref/org/apache/juneau/commons/collections/FilteredMap.html
+++ b/site/xref/org/apache/juneau/commons/collections/FilteredMap.html
@@ -42,573 +42,675 @@
 <a class="jxr_linenumber" name="L34" href="#L34">34</a>  <em class="jxr_javadoccomment"> * &lt;h5 class='section'&gt;Features:&lt;/h5&gt;</em>
 <a class="jxr_linenumber" name="L35" href="#L35">35</a>  <em class="jxr_javadoccomment"> * &lt;ul class='spaced-list'&gt;</em>
 <a class="jxr_linenumber" name="L36" href="#L36">36</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;&lt;b&gt;Flexible Filtering:&lt;/b&gt; Use any {@link BiPredicate} to filter entries based on key, value, or both</em>
-<a class="jxr_linenumber" name="L37" href="#L37">37</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;&lt;b&gt;Custom Map Types:&lt;/b&gt; Works with any map implementation via the builder's &lt;c&gt;creator&lt;/c&gt; function</em>
-<a class="jxr_linenumber" name="L38" href="#L38">38</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;&lt;b&gt;Transparent Interface:&lt;/b&gt; Implements the full {@link Map} interface, so it can be used anywhere a map is expected</em>
-<a class="jxr_linenumber" name="L39" href="#L39">39</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;&lt;b&gt;Filter on Add:&lt;/b&gt; Filtering happens when entries are added via {@link #put(Object, Object)}, {@link #putAll(Map)}, etc.</em>
-<a class="jxr_linenumber" name="L40" href="#L40">40</a>  <em class="jxr_javadoccomment"> * &lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L41" href="#L41">41</a>  <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L42" href="#L42">42</a>  <em class="jxr_javadoccomment"> * &lt;h5 class='section'&gt;Usage:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L43" href="#L43">43</a>  <em class="jxr_javadoccomment"> * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L44" href="#L44">44</a>  <em class="jxr_javadoccomment"> * 	&lt;jc&gt;// Create a filtered map that only accepts non-null values&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L45" href="#L45">45</a>  <em class="jxr_javadoccomment"> * 	FilteredMap&amp;lt;String, String&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = FilteredMap</em>
-<a class="jxr_linenumber" name="L46" href="#L46">46</a>  <em class="jxr_javadoccomment"> * 		.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, String.&lt;jk&gt;class&lt;/jk&gt;)</em>
-<a class="jxr_linenumber" name="L47" href="#L47">47</a>  <em class="jxr_javadoccomment"> * 		.filter((k, v) -&amp;gt; v != &lt;jk&gt;null&lt;/jk&gt;)</em>
-<a class="jxr_linenumber" name="L48" href="#L48">48</a>  <em class="jxr_javadoccomment"> * 		.build();</em>
-<a class="jxr_linenumber" name="L49" href="#L49">49</a>  <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L50" href="#L50">50</a>  <em class="jxr_javadoccomment"> * 	&lt;jv&gt;map&lt;/jv&gt;.put(&lt;js&gt;"key1"&lt;/js&gt;, &lt;js&gt;"value1"&lt;/js&gt;);  &lt;jc&gt;// Added&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L51" href="#L51">51</a>  <em class="jxr_javadoccomment"> * 	&lt;jv&gt;map&lt;/jv&gt;.put(&lt;js&gt;"key2"&lt;/js&gt;, &lt;jk&gt;null&lt;/jk&gt;);      &lt;jc&gt;// Filtered out&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L52" href="#L52">52</a>  <em class="jxr_javadoccomment"> * 	&lt;jv&gt;map&lt;/jv&gt;.put(&lt;js&gt;"key3"&lt;/js&gt;, &lt;js&gt;"value3"&lt;/js&gt;);  &lt;jc&gt;// Added&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L37" href="#L37">37</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;&lt;b&gt;Optional Filter:&lt;/b&gt; Filter is optional when using the builder - defaults to accepting all entries</em>
+<a class="jxr_linenumber" name="L38" href="#L38">38</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;&lt;b&gt;Multiple Filters:&lt;/b&gt; Can combine multiple filters using AND logic</em>
+<a class="jxr_linenumber" name="L39" href="#L39">39</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;&lt;b&gt;Custom Map Types:&lt;/b&gt; Works with any map implementation via the builder's &lt;c&gt;inner&lt;/c&gt; method</em>
+<a class="jxr_linenumber" name="L40" href="#L40">40</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;&lt;b&gt;Type Conversion:&lt;/b&gt; Supports automatic type conversion via key/value functions</em>
+<a class="jxr_linenumber" name="L41" href="#L41">41</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;&lt;b&gt;Convenience Methods:&lt;/b&gt; Provides {@link #add(Object, Object)}, {@link #addAll(Map)}, {@link #addAny(Object...)}, and {@link #addPairs(Object...)} for easy entry addition</em>
+<a class="jxr_linenumber" name="L42" href="#L42">42</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;&lt;b&gt;Transparent Interface:&lt;/b&gt; Implements the full {@link Map} interface, so it can be used anywhere a map is expected</em>
+<a class="jxr_linenumber" name="L43" href="#L43">43</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;&lt;b&gt;Filter on Add:&lt;/b&gt; Filtering happens when entries are added via {@link #put(Object, Object)}, {@link #putAll(Map)}, etc.</em>
+<a class="jxr_linenumber" name="L44" href="#L44">44</a>  <em class="jxr_javadoccomment"> * &lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L45" href="#L45">45</a>  <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L46" href="#L46">46</a>  <em class="jxr_javadoccomment"> * &lt;h5 class='section'&gt;Usage:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L47" href="#L47">47</a>  <em class="jxr_javadoccomment"> * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L48" href="#L48">48</a>  <em class="jxr_javadoccomment"> * 	&lt;jc&gt;// Create a filtered map that only accepts non-null values&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L49" href="#L49">49</a>  <em class="jxr_javadoccomment"> * 	FilteredMap&amp;lt;String, String&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = FilteredMap</em>
+<a class="jxr_linenumber" name="L50" href="#L50">50</a>  <em class="jxr_javadoccomment"> * 		.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, String.&lt;jk&gt;class&lt;/jk&gt;)</em>
+<a class="jxr_linenumber" name="L51" href="#L51">51</a>  <em class="jxr_javadoccomment"> * 		.filter((k, v) -&amp;gt; v != &lt;jk&gt;null&lt;/jk&gt;)</em>
+<a class="jxr_linenumber" name="L52" href="#L52">52</a>  <em class="jxr_javadoccomment"> * 		.build();</em>
 <a class="jxr_linenumber" name="L53" href="#L53">53</a>  <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L54" href="#L54">54</a>  <em class="jxr_javadoccomment"> * 	&lt;jc&gt;// map now contains: {"key1"="value1", "key3"="value3"}&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L55" href="#L55">55</a>  <em class="jxr_javadoccomment"> * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L56" href="#L56">56</a>  <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L57" href="#L57">57</a>  <em class="jxr_javadoccomment"> * &lt;h5 class='section'&gt;Example - Custom Map Type:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L58" href="#L58">58</a>  <em class="jxr_javadoccomment"> * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L59" href="#L59">59</a>  <em class="jxr_javadoccomment"> * 	&lt;jc&gt;// Create a filtered TreeMap that only accepts positive values&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L60" href="#L60">60</a>  <em class="jxr_javadoccomment"> * 	FilteredMap&amp;lt;String, Integer&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = FilteredMap</em>
-<a class="jxr_linenumber" name="L61" href="#L61">61</a>  <em class="jxr_javadoccomment"> * 		.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, Integer.&lt;jk&gt;class&lt;/jk&gt;)</em>
-<a class="jxr_linenumber" name="L62" href="#L62">62</a>  <em class="jxr_javadoccomment"> * 		.filter((k, v) -&amp;gt; v != &lt;jk&gt;null&lt;/jk&gt; &amp;amp;&amp;amp; v &amp;gt; 0)</em>
-<a class="jxr_linenumber" name="L63" href="#L63">63</a>  <em class="jxr_javadoccomment"> * 		.creator(() -&amp;gt; &lt;jk&gt;new&lt;/jk&gt; TreeMap&amp;lt;&amp;gt;())</em>
-<a class="jxr_linenumber" name="L64" href="#L64">64</a>  <em class="jxr_javadoccomment"> * 		.build();</em>
-<a class="jxr_linenumber" name="L65" href="#L65">65</a>  <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L66" href="#L66">66</a>  <em class="jxr_javadoccomment"> * 	&lt;jv&gt;map&lt;/jv&gt;.put(&lt;js&gt;"a"&lt;/js&gt;, 5);   &lt;jc&gt;// Added&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L67" href="#L67">67</a>  <em class="jxr_javadoccomment"> * 	&lt;jv&gt;map&lt;/jv&gt;.put(&lt;js&gt;"b"&lt;/js&gt;, -1);  &lt;jc&gt;// Filtered out&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L68" href="#L68">68</a>  <em class="jxr_javadoccomment"> * 	&lt;jv&gt;map&lt;/jv&gt;.put(&lt;js&gt;"c"&lt;/js&gt;, 10);  &lt;jc&gt;// Added&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L69" href="#L69">69</a>  <em class="jxr_javadoccomment"> * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L70" href="#L70">70</a>  <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L71" href="#L71">71</a>  <em class="jxr_javadoccomment"> * &lt;h5 class='section'&gt;Behavior Notes:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L72" href="#L72">72</a>  <em class="jxr_javadoccomment"> * &lt;ul class='spaced-list'&gt;</em>
-<a class="jxr_linenumber" name="L73" href="#L73">73</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;Filtering is applied to all entry addition methods: {@link #put(Object, Object)}, {@link #putAll(Map)}, etc.</em>
-<a class="jxr_linenumber" name="L74" href="#L74">74</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;If the filter returns &lt;jk&gt;false&lt;/jk&gt;, the entry is silently ignored (not added)</em>
-<a class="jxr_linenumber" name="L75" href="#L75">75</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;When {@link #put(Object, Object)} filters out an entry, it returns the previous value associated with the key</em>
-<a class="jxr_linenumber" name="L76" href="#L76">76</a>  <em class="jxr_javadoccomment"> * 		(if any), or &lt;jk&gt;null&lt;/jk&gt; if the key did not exist. This allows callers to distinguish between a new entry</em>
-<a class="jxr_linenumber" name="L77" href="#L77">77</a>  <em class="jxr_javadoccomment"> * 		being filtered out versus an existing entry being filtered out.</em>
-<a class="jxr_linenumber" name="L78" href="#L78">78</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;The filter is not applied when reading from the map (e.g., {@link #get(Object)}, {@link #containsKey(Object)})</em>
-<a class="jxr_linenumber" name="L79" href="#L79">79</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;All other map operations behave as expected on the underlying map</em>
-<a class="jxr_linenumber" name="L80" href="#L80">80</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;The underlying map type is determined by the &lt;c&gt;creator&lt;/c&gt; function (defaults to {@link LinkedHashMap})</em>
-<a class="jxr_linenumber" name="L81" href="#L81">81</a>  <em class="jxr_javadoccomment"> * &lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L82" href="#L82">82</a>  <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L83" href="#L83">83</a>  <em class="jxr_javadoccomment"> * &lt;h5 class='section'&gt;Thread Safety:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L84" href="#L84">84</a>  <em class="jxr_javadoccomment"> * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L85" href="#L85">85</a>  <em class="jxr_javadoccomment"> * This class is not thread-safe unless the underlying map is thread-safe. If thread safety is required,</em>
-<a class="jxr_linenumber" name="L86" href="#L86">86</a>  <em class="jxr_javadoccomment"> * use a thread-safe map type (e.g., {@link java.util.concurrent.ConcurrentHashMap}) via the &lt;c&gt;creator&lt;/c&gt; function.</em>
-<a class="jxr_linenumber" name="L87" href="#L87">87</a>  <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L88" href="#L88">88</a>  <em class="jxr_javadoccomment"> * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L89" href="#L89">89</a>  <em class="jxr_javadoccomment"> * &lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L90" href="#L90">90</a>  <em class="jxr_javadoccomment"> * 	&lt;li class='link'&gt;&lt;a class="doclink" href="../../../../../index.html#juneau-commons"&gt;Overview &amp;gt; juneau-commons&lt;/a&gt;</em>
-<a class="jxr_linenumber" name="L91" href="#L91">91</a>  <em class="jxr_javadoccomment"> * &lt;/ul&gt;</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"> * @param &lt;K&gt; The key type.</em>
-<a class="jxr_linenumber" name="L94" href="#L94">94</a>  <em class="jxr_javadoccomment"> * @param &lt;V&gt; The value type.</em>
-<a class="jxr_linenumber" name="L95" href="#L95">95</a>  <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L96" href="#L96">96</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> FilteredMap&lt;K,V&gt; <strong class="jxr_keyword">extends</strong> AbstractMap&lt;K,V&gt; {
-<a class="jxr_linenumber" name="L97" href="#L97">97</a>  
-<a class="jxr_linenumber" name="L98" href="#L98">98</a>  	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L99" href="#L99">99</a>  <em class="jxr_javadoccomment">	 * Builder for creating {@link FilteredMap} instances.</em>
-<a class="jxr_linenumber" name="L100" href="#L100">100</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L101" href="#L101">101</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L102" href="#L102">102</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L103" href="#L103">103</a> <em class="jxr_javadoccomment">	 * 	FilteredMap&amp;lt;String, Integer&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = FilteredMap</em>
-<a class="jxr_linenumber" name="L104" href="#L104">104</a> <em class="jxr_javadoccomment">	 * 		.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, Integer.&lt;jk&gt;class&lt;/jk&gt;)</em>
-<a class="jxr_linenumber" name="L105" href="#L105">105</a> <em class="jxr_javadoccomment">	 * 		.filter((k, v) -&amp;gt; v != &lt;jk&gt;null&lt;/jk&gt; &amp;amp;&amp;amp; v &amp;gt; 0)</em>
-<a class="jxr_linenumber" name="L106" href="#L106">106</a> <em class="jxr_javadoccomment">	 * 		.creator(() -&amp;gt; &lt;jk&gt;new&lt;/jk&gt; TreeMap&amp;lt;&amp;gt;())</em>
-<a class="jxr_linenumber" name="L107" href="#L107">107</a> <em class="jxr_javadoccomment">	 * 		.build();</em>
-<a class="jxr_linenumber" name="L108" href="#L108">108</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L109" href="#L109">109</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L110" href="#L110">110</a> <em class="jxr_javadoccomment">	 * @param &lt;K&gt; The key type.</em>
-<a class="jxr_linenumber" name="L111" href="#L111">111</a> <em class="jxr_javadoccomment">	 * @param &lt;V&gt; The value type.</em>
-<a class="jxr_linenumber" name="L112" href="#L112">112</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L113" href="#L113">113</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> Builder&lt;K,V&gt; {
-<a class="jxr_linenumber" name="L114" href="#L114">114</a> 		<strong class="jxr_keyword">private</strong> BiPredicate&lt;K,V&gt; filter;
-<a class="jxr_linenumber" name="L115" href="#L115">115</a> 		<strong class="jxr_keyword">private</strong> Supplier&lt;Map&lt;K,V&gt;&gt; creator = LinkedHashMap::<strong class="jxr_keyword">new</strong>;
-<a class="jxr_linenumber" name="L116" href="#L116">116</a> 		<strong class="jxr_keyword">private</strong> Class&lt;K&gt; keyType;
-<a class="jxr_linenumber" name="L117" href="#L117">117</a> 		<strong class="jxr_keyword">private</strong> Class&lt;V&gt; valueType;
-<a class="jxr_linenumber" name="L118" href="#L118">118</a> 		<strong class="jxr_keyword">private</strong> Function&lt;Object,K&gt; keyFunction;
-<a class="jxr_linenumber" name="L119" href="#L119">119</a> 		<strong class="jxr_keyword">private</strong> Function&lt;Object,V&gt; valueFunction;
-<a class="jxr_linenumber" name="L120" href="#L120">120</a> 
-<a class="jxr_linenumber" name="L121" href="#L121">121</a> 		<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L122" href="#L122">122</a> <em class="jxr_javadoccomment">		 * Sets the filter predicate that determines whether entries should be added.</em>
-<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">		 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L125" href="#L125">125</a> <em class="jxr_javadoccomment">		 * The predicate receives both the key and value of each entry. If it returns &lt;jk&gt;true&lt;/jk&gt;,</em>
-<a class="jxr_linenumber" name="L126" href="#L126">126</a> <em class="jxr_javadoccomment">		 * the entry is added to the map. If it returns &lt;jk&gt;false&lt;/jk&gt;, the entry is silently ignored.</em>
+<a class="jxr_linenumber" name="L54" href="#L54">54</a>  <em class="jxr_javadoccomment"> * 	&lt;jv&gt;map&lt;/jv&gt;.put(&lt;js&gt;"key1"&lt;/js&gt;, &lt;js&gt;"value1"&lt;/js&gt;);  &lt;jc&gt;// Added&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L55" href="#L55">55</a>  <em class="jxr_javadoccomment"> * 	&lt;jv&gt;map&lt;/jv&gt;.put(&lt;js&gt;"key2"&lt;/js&gt;, &lt;jk&gt;null&lt;/jk&gt;);      &lt;jc&gt;// Filtered out&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L56" href="#L56">56</a>  <em class="jxr_javadoccomment"> * 	&lt;jv&gt;map&lt;/jv&gt;.put(&lt;js&gt;"key3"&lt;/js&gt;, &lt;js&gt;"value3"&lt;/js&gt;);  &lt;jc&gt;// Added&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L57" href="#L57">57</a>  <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L58" href="#L58">58</a>  <em class="jxr_javadoccomment"> * 	&lt;jc&gt;// map now contains: {"key1"="value1", "key3"="value3"}&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L59" href="#L59">59</a>  <em class="jxr_javadoccomment"> * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L60" href="#L60">60</a>  <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L61" href="#L61">61</a>  <em class="jxr_javadoccomment"> * &lt;h5 class='section'&gt;Example - Custom Map Type:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L62" href="#L62">62</a>  <em class="jxr_javadoccomment"> * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L63" href="#L63">63</a>  <em class="jxr_javadoccomment"> * 	&lt;jc&gt;// Create a filtered TreeMap that only accepts positive values&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L64" href="#L64">64</a>  <em class="jxr_javadoccomment"> * 	FilteredMap&amp;lt;String, Integer&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = FilteredMap</em>
+<a class="jxr_linenumber" name="L65" href="#L65">65</a>  <em class="jxr_javadoccomment"> * 		.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, Integer.&lt;jk&gt;class&lt;/jk&gt;)</em>
+<a class="jxr_linenumber" name="L66" href="#L66">66</a>  <em class="jxr_javadoccomment"> * 		.filter((k, v) -&amp;gt; v != &lt;jk&gt;null&lt;/jk&gt; &amp;amp;&amp;amp; v &amp;gt; 0)</em>
+<a class="jxr_linenumber" name="L67" href="#L67">67</a>  <em class="jxr_javadoccomment"> * 		.inner(&lt;jk&gt;new&lt;/jk&gt; TreeMap&amp;lt;&amp;gt;())</em>
+<a class="jxr_linenumber" name="L68" href="#L68">68</a>  <em class="jxr_javadoccomment"> * 		.build();</em>
+<a class="jxr_linenumber" name="L69" href="#L69">69</a>  <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L70" href="#L70">70</a>  <em class="jxr_javadoccomment"> * 	&lt;jv&gt;map&lt;/jv&gt;.put(&lt;js&gt;"a"&lt;/js&gt;, 5);   &lt;jc&gt;// Added&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L71" href="#L71">71</a>  <em class="jxr_javadoccomment"> * 	&lt;jv&gt;map&lt;/jv&gt;.put(&lt;js&gt;"b"&lt;/js&gt;, -1);  &lt;jc&gt;// Filtered out&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L72" href="#L72">72</a>  <em class="jxr_javadoccomment"> * 	&lt;jv&gt;map&lt;/jv&gt;.put(&lt;js&gt;"c"&lt;/js&gt;, 10);  &lt;jc&gt;// Added&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L73" href="#L73">73</a>  <em class="jxr_javadoccomment"> * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L74" href="#L74">74</a>  <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L75" href="#L75">75</a>  <em class="jxr_javadoccomment"> * &lt;h5 class='section'&gt;Behavior Notes:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L76" href="#L76">76</a>  <em class="jxr_javadoccomment"> * &lt;ul class='spaced-list'&gt;</em>
+<a class="jxr_linenumber" name="L77" href="#L77">77</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;Filtering is applied to all entry addition methods: {@link #put(Object, Object)}, {@link #putAll(Map)}, etc.</em>
+<a class="jxr_linenumber" name="L78" href="#L78">78</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;If the filter returns &lt;jk&gt;false&lt;/jk&gt;, the entry is silently ignored (not added)</em>
+<a class="jxr_linenumber" name="L79" href="#L79">79</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;When {@link #put(Object, Object)} filters out an entry, it returns the previous value associated with the key</em>
+<a class="jxr_linenumber" name="L80" href="#L80">80</a>  <em class="jxr_javadoccomment"> * 		(if any), or &lt;jk&gt;null&lt;/jk&gt; if the key did not exist. This allows callers to distinguish between a new entry</em>
+<a class="jxr_linenumber" name="L81" href="#L81">81</a>  <em class="jxr_javadoccomment"> * 		being filtered out versus an existing entry being filtered out.</em>
+<a class="jxr_linenumber" name="L82" href="#L82">82</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;The filter is not applied when reading from the map (e.g., {@link #get(Object)}, {@link #containsKey(Object)})</em>
+<a class="jxr_linenumber" name="L83" href="#L83">83</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;All other map operations behave as expected on the underlying map</em>
+<a class="jxr_linenumber" name="L84" href="#L84">84</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;The underlying map type is determined by the &lt;c&gt;inner&lt;/c&gt; method (defaults to {@link LinkedHashMap})</em>
+<a class="jxr_linenumber" name="L85" href="#L85">85</a>  <em class="jxr_javadoccomment"> * &lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L86" href="#L86">86</a>  <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L87" href="#L87">87</a>  <em class="jxr_javadoccomment"> * &lt;h5 class='section'&gt;Thread Safety:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L88" href="#L88">88</a>  <em class="jxr_javadoccomment"> * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L89" href="#L89">89</a>  <em class="jxr_javadoccomment"> * This class is not thread-safe unless the underlying map is thread-safe. If thread safety is required,</em>
+<a class="jxr_linenumber" name="L90" href="#L90">90</a>  <em class="jxr_javadoccomment"> * use a thread-safe map type (e.g., {@link java.util.concurrent.ConcurrentHashMap}) via the &lt;c&gt;inner&lt;/c&gt; method.</em>
+<a class="jxr_linenumber" name="L91" href="#L91">91</a>  <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L92" href="#L92">92</a>  <em class="jxr_javadoccomment"> * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L93" href="#L93">93</a>  <em class="jxr_javadoccomment"> * &lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L94" href="#L94">94</a>  <em class="jxr_javadoccomment"> * 	&lt;li class='link'&gt;&lt;a class="doclink" href="../../../../../index.html#juneau-commons"&gt;Overview &amp;gt; juneau-commons&lt;/a&gt;</em>
+<a class="jxr_linenumber" name="L95" href="#L95">95</a>  <em class="jxr_javadoccomment"> * &lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L96" href="#L96">96</a>  <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L97" href="#L97">97</a>  <em class="jxr_javadoccomment"> * @param &lt;K&gt; The key type.</em>
+<a class="jxr_linenumber" name="L98" href="#L98">98</a>  <em class="jxr_javadoccomment"> * @param &lt;V&gt; The value type.</em>
+<a class="jxr_linenumber" name="L99" href="#L99">99</a>  <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L100" href="#L100">100</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> FilteredMap&lt;K,V&gt; <strong class="jxr_keyword">extends</strong> AbstractMap&lt;K,V&gt; {
+<a class="jxr_linenumber" name="L101" href="#L101">101</a> 
+<a class="jxr_linenumber" name="L102" href="#L102">102</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L103" href="#L103">103</a> <em class="jxr_javadoccomment">	 * Builder for creating {@link FilteredMap} instances.</em>
+<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">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L106" href="#L106">106</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L107" href="#L107">107</a> <em class="jxr_javadoccomment">	 * 	FilteredMap&amp;lt;String, Integer&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = FilteredMap</em>
+<a class="jxr_linenumber" name="L108" href="#L108">108</a> <em class="jxr_javadoccomment">	 * 		.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, Integer.&lt;jk&gt;class&lt;/jk&gt;)</em>
+<a class="jxr_linenumber" name="L109" href="#L109">109</a> <em class="jxr_javadoccomment">	 * 		.filter((k, v) -&amp;gt; v != &lt;jk&gt;null&lt;/jk&gt; &amp;amp;&amp;amp; v &amp;gt; 0)</em>
+<a class="jxr_linenumber" name="L110" href="#L110">110</a> <em class="jxr_javadoccomment">	 * 		.inner(&lt;jk&gt;new&lt;/jk&gt; TreeMap&amp;lt;&amp;gt;())</em>
+<a class="jxr_linenumber" name="L111" href="#L111">111</a> <em class="jxr_javadoccomment">	 * 		.build();</em>
+<a class="jxr_linenumber" name="L112" href="#L112">112</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L113" href="#L113">113</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L114" href="#L114">114</a> <em class="jxr_javadoccomment">	 * @param &lt;K&gt; The key type.</em>
+<a class="jxr_linenumber" name="L115" href="#L115">115</a> <em class="jxr_javadoccomment">	 * @param &lt;V&gt; The value type.</em>
+<a class="jxr_linenumber" name="L116" href="#L116">116</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L117" href="#L117">117</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> Builder&lt;K,V&gt; {
+<a class="jxr_linenumber" name="L118" href="#L118">118</a> 		<strong class="jxr_keyword">private</strong> BiPredicate&lt;K,V&gt; filter = (k,v) -&gt; <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="L119" href="#L119">119</a> 		<strong class="jxr_keyword">private</strong> Map&lt;K,V&gt; <strong class="jxr_keyword">inner</strong>;
+<a class="jxr_linenumber" name="L120" href="#L120">120</a> 		<strong class="jxr_keyword">private</strong> Class&lt;K&gt; keyType;
+<a class="jxr_linenumber" name="L121" href="#L121">121</a> 		<strong class="jxr_keyword">private</strong> Class&lt;V&gt; valueType;
+<a class="jxr_linenumber" name="L122" href="#L122">122</a> 		<strong class="jxr_keyword">private</strong> Function&lt;Object,K&gt; keyFunction;
+<a class="jxr_linenumber" name="L123" href="#L123">123</a> 		<strong class="jxr_keyword">private</strong> Function&lt;Object,V&gt; valueFunction;
+<a class="jxr_linenumber" name="L124" href="#L124">124</a> 
+<a class="jxr_linenumber" name="L125" href="#L125">125</a> 		<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L126" href="#L126">126</a> <em class="jxr_javadoccomment">		 * Sets the filter predicate that determines whether entries should be added.</em>
 <a class="jxr_linenumber" name="L127" href="#L127">127</a> <em class="jxr_javadoccomment">		 *</em>
-<a class="jxr_linenumber" name="L128" href="#L128">128</a> <em class="jxr_javadoccomment">		 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L129" href="#L129">129</a> <em class="jxr_javadoccomment">		 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L130" href="#L130">130</a> <em class="jxr_javadoccomment">		 * 	&lt;jc&gt;// Filter out null values&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L131" href="#L131">131</a> <em class="jxr_javadoccomment">		 * 	Builder&amp;lt;String, String&amp;gt; &lt;jv&gt;b&lt;/jv&gt; = FilteredMap.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, String.&lt;jk&gt;class&lt;/jk&gt;)</em>
-<a class="jxr_linenumber" name="L132" href="#L132">132</a> <em class="jxr_javadoccomment">		 * 		.filter((k, v) -&amp;gt; v != &lt;jk&gt;null&lt;/jk&gt;);</em>
-<a class="jxr_linenumber" name="L133" href="#L133">133</a> <em class="jxr_javadoccomment">		 *</em>
-<a class="jxr_linenumber" name="L134" href="#L134">134</a> <em class="jxr_javadoccomment">		 * 	&lt;jc&gt;// Filter based on both key and value&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L135" href="#L135">135</a> <em class="jxr_javadoccomment">		 * 	Builder&amp;lt;String, Integer&amp;gt; &lt;jv&gt;b2&lt;/jv&gt; = FilteredMap.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, Integer.&lt;jk&gt;class&lt;/jk&gt;)</em>
-<a class="jxr_linenumber" name="L136" href="#L136">136</a> <em class="jxr_javadoccomment">		 * 		.filter((k, v) -&amp;gt; ! k.startsWith(&lt;js&gt;"_"&lt;/js&gt;) &amp;amp;&amp;amp; v != &lt;jk&gt;null&lt;/jk&gt; &amp;amp;&amp;amp; v &amp;gt; 0);</em>
-<a class="jxr_linenumber" name="L137" href="#L137">137</a> <em class="jxr_javadoccomment">		 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L128" href="#L128">128</a> <em class="jxr_javadoccomment">		 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L129" href="#L129">129</a> <em class="jxr_javadoccomment">		 * The predicate receives both the key and value of each entry. If it returns &lt;jk&gt;true&lt;/jk&gt;,</em>
+<a class="jxr_linenumber" name="L130" href="#L130">130</a> <em class="jxr_javadoccomment">		 * the entry is added to the map. If it returns &lt;jk&gt;false&lt;/jk&gt;, the entry is silently ignored.</em>
+<a class="jxr_linenumber" name="L131" href="#L131">131</a> <em class="jxr_javadoccomment">		 *</em>
+<a class="jxr_linenumber" name="L132" href="#L132">132</a> <em class="jxr_javadoccomment">		 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L133" href="#L133">133</a> <em class="jxr_javadoccomment">		 * This method is optional. If not called, the map will accept all entries (defaults to &lt;c&gt;(k,v) -&amp;gt; true&lt;/c&gt;).</em>
+<a class="jxr_linenumber" name="L134" href="#L134">134</a> <em class="jxr_javadoccomment">		 *</em>
+<a class="jxr_linenumber" name="L135" href="#L135">135</a> <em class="jxr_javadoccomment">		 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L136" href="#L136">136</a> <em class="jxr_javadoccomment">		 * This method can be called multiple times. When called multiple times, all filters are combined</em>
+<a class="jxr_linenumber" name="L137" href="#L137">137</a> <em class="jxr_javadoccomment">		 * using AND logic - an entry must pass all filters to be added to the map.</em>
 <a class="jxr_linenumber" name="L138" href="#L138">138</a> <em class="jxr_javadoccomment">		 *</em>
-<a class="jxr_linenumber" name="L139" href="#L139">139</a> <em class="jxr_javadoccomment">		 * @param value The filter predicate. Must not be &lt;jk&gt;null&lt;/jk&gt;.</em>
-<a class="jxr_linenumber" name="L140" href="#L140">140</a> <em class="jxr_javadoccomment">		 * @return This object for method chaining.</em>
-<a class="jxr_linenumber" name="L141" href="#L141">141</a> <em class="jxr_javadoccomment">		 */</em>
-<a class="jxr_linenumber" name="L142" href="#L142">142</a> 		<strong class="jxr_keyword">public</strong> Builder&lt;K,V&gt; filter(BiPredicate&lt;K,V&gt; value) {
-<a class="jxr_linenumber" name="L143" href="#L143">143</a> 			filter = assertArgNotNull(<span class="jxr_string">"value"</span>, value);
-<a class="jxr_linenumber" name="L144" href="#L144">144</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
-<a class="jxr_linenumber" name="L145" href="#L145">145</a> 		}
-<a class="jxr_linenumber" name="L146" href="#L146">146</a> 
-<a class="jxr_linenumber" name="L147" href="#L147">147</a> 		<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L148" href="#L148">148</a> <em class="jxr_javadoccomment">		 * Sets the supplier that creates the underlying map instance.</em>
-<a class="jxr_linenumber" name="L149" href="#L149">149</a> <em class="jxr_javadoccomment">		 *</em>
-<a class="jxr_linenumber" name="L150" href="#L150">150</a> <em class="jxr_javadoccomment">		 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L151" href="#L151">151</a> <em class="jxr_javadoccomment">		 * This supplier is called once during {@link #build()} to create the underlying map that will</em>
-<a class="jxr_linenumber" name="L152" href="#L152">152</a> <em class="jxr_javadoccomment">		 * store the filtered entries. The default implementation creates a {@link LinkedHashMap}.</em>
-<a class="jxr_linenumber" name="L153" href="#L153">153</a> <em class="jxr_javadoccomment">		 *</em>
-<a class="jxr_linenumber" name="L154" href="#L154">154</a> <em class="jxr_javadoccomment">		 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L155" href="#L155">155</a> <em class="jxr_javadoccomment">		 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L156" href="#L156">156</a> <em class="jxr_javadoccomment">		 * 	&lt;jc&gt;// Use a TreeMap for sorted keys&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L157" href="#L157">157</a> <em class="jxr_javadoccomment">		 * 	Builder&amp;lt;String, Integer&amp;gt; &lt;jv&gt;b&lt;/jv&gt; = FilteredMap.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, Integer.&lt;jk&gt;class&lt;/jk&gt;)</em>
-<a class="jxr_linenumber" name="L158" href="#L158">158</a> <em class="jxr_javadoccomment">		 * 		.creator(() -&amp;gt; &lt;jk&gt;new&lt;/jk&gt; TreeMap&amp;lt;&amp;gt;());</em>
-<a class="jxr_linenumber" name="L159" href="#L159">159</a> <em class="jxr_javadoccomment">		 *</em>
-<a class="jxr_linenumber" name="L160" href="#L160">160</a> <em class="jxr_javadoccomment">		 * 	&lt;jc&gt;// Use a ConcurrentHashMap for thread safety&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L161" href="#L161">161</a> <em class="jxr_javadoccomment">		 * 	Builder&amp;lt;String, Integer&amp;gt; &lt;jv&gt;b2&lt;/jv&gt; = FilteredMap.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, Integer.&lt;jk&gt;class&lt;/jk&gt;)</em>
-<a class="jxr_linenumber" name="L162" href="#L162">162</a> <em class="jxr_javadoccomment">		 * 		.creator(() -&amp;gt; &lt;jk&gt;new&lt;/jk&gt; ConcurrentHashMap&amp;lt;&amp;gt;());</em>
-<a class="jxr_linenumber" name="L163" href="#L163">163</a> <em class="jxr_javadoccomment">		 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L164" href="#L164">164</a> <em class="jxr_javadoccomment">		 *</em>
-<a class="jxr_linenumber" name="L165" href="#L165">165</a> <em class="jxr_javadoccomment">		 * @param value The creator supplier. Must not be &lt;jk&gt;null&lt;/jk&gt;.</em>
-<a class="jxr_linenumber" name="L166" href="#L166">166</a> <em class="jxr_javadoccomment">		 * @return This object for method chaining.</em>
-<a class="jxr_linenumber" name="L167" href="#L167">167</a> <em class="jxr_javadoccomment">		 */</em>
-<a class="jxr_linenumber" name="L168" href="#L168">168</a> 		<strong class="jxr_keyword">public</strong> Builder&lt;K,V&gt; creator(Supplier&lt;Map&lt;K,V&gt;&gt; value) {
-<a class="jxr_linenumber" name="L169" href="#L169">169</a> 			creator = assertArgNotNull(<span class="jxr_string">"value"</span>, value);
-<a class="jxr_linenumber" name="L170" href="#L170">170</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
-<a class="jxr_linenumber" name="L171" href="#L171">171</a> 		}
-<a class="jxr_linenumber" name="L172" href="#L172">172</a> 
-<a class="jxr_linenumber" name="L173" href="#L173">173</a> 		<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L174" href="#L174">174</a> <em class="jxr_javadoccomment">		 * Sets the function to use for converting keys when using {@link FilteredMap#add(Object, Object)}.</em>
-<a class="jxr_linenumber" name="L175" href="#L175">175</a> <em class="jxr_javadoccomment">		 *</em>
-<a class="jxr_linenumber" name="L176" href="#L176">176</a> <em class="jxr_javadoccomment">		 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L177" href="#L177">177</a> <em class="jxr_javadoccomment">		 * If specified, keys passed to {@link FilteredMap#add(Object, Object)} will be converted using</em>
-<a class="jxr_linenumber" name="L178" href="#L178">178</a> <em class="jxr_javadoccomment">		 * this function before being added to the map. If not specified, keys must already be of the</em>
-<a class="jxr_linenumber" name="L179" href="#L179">179</a> <em class="jxr_javadoccomment">		 * correct type (or &lt;c&gt;Object.class&lt;/c&gt; is used if types were not specified, which accepts any type).</em>
-<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">		 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L182" href="#L182">182</a> <em class="jxr_javadoccomment">		 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L183" href="#L183">183</a> <em class="jxr_javadoccomment">		 * 	FilteredMap&amp;lt;String, Integer&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = FilteredMap</em>
-<a class="jxr_linenumber" name="L184" href="#L184">184</a> <em class="jxr_javadoccomment">		 * 		.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, Integer.&lt;jk&gt;class&lt;/jk&gt;)</em>
-<a class="jxr_linenumber" name="L185" href="#L185">185</a> <em class="jxr_javadoccomment">		 * 		.filter((k, v) -&amp;gt; v != &lt;jk&gt;null&lt;/jk&gt;)</em>
-<a class="jxr_linenumber" name="L186" href="#L186">186</a> <em class="jxr_javadoccomment">		 * 		.keyFunction(o -&amp;gt; o.toString())</em>
-<a class="jxr_linenumber" name="L187" href="#L187">187</a> <em class="jxr_javadoccomment">		 * 		.build();</em>
-<a class="jxr_linenumber" name="L188" href="#L188">188</a> <em class="jxr_javadoccomment">		 *</em>
-<a class="jxr_linenumber" name="L189" href="#L189">189</a> <em class="jxr_javadoccomment">		 * 	&lt;jv&gt;map&lt;/jv&gt;.add(123, 5);  &lt;jc&gt;// Key will be converted from Integer to String&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L190" href="#L190">190</a> <em class="jxr_javadoccomment">		 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L191" href="#L191">191</a> <em class="jxr_javadoccomment">		 *</em>
-<a class="jxr_linenumber" name="L192" href="#L192">192</a> <em class="jxr_javadoccomment">		 * @param value The key conversion function. Can be &lt;jk&gt;null&lt;/jk&gt;.</em>
-<a class="jxr_linenumber" name="L193" href="#L193">193</a> <em class="jxr_javadoccomment">		 * @return This object for method chaining.</em>
-<a class="jxr_linenumber" name="L194" href="#L194">194</a> <em class="jxr_javadoccomment">		 */</em>
-<a class="jxr_linenumber" name="L195" href="#L195">195</a> 		<strong class="jxr_keyword">public</strong> Builder&lt;K,V&gt; keyFunction(Function&lt;Object,K&gt; value) {
-<a class="jxr_linenumber" name="L196" href="#L196">196</a> 			keyFunction = value;
-<a class="jxr_linenumber" name="L197" href="#L197">197</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
-<a class="jxr_linenumber" name="L198" href="#L198">198</a> 		}
-<a class="jxr_linenumber" name="L199" href="#L199">199</a> 
-<a class="jxr_linenumber" name="L200" href="#L200">200</a> 		<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L201" href="#L201">201</a> <em class="jxr_javadoccomment">		 * Sets the function to use for converting values when using {@link FilteredMap#add(Object, Object)}.</em>
-<a class="jxr_linenumber" name="L202" href="#L202">202</a> <em class="jxr_javadoccomment">		 *</em>
-<a class="jxr_linenumber" name="L203" href="#L203">203</a> <em class="jxr_javadoccomment">		 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L204" href="#L204">204</a> <em class="jxr_javadoccomment">		 * If specified, values passed to {@link FilteredMap#add(Object, Object)} will be converted using</em>
-<a class="jxr_linenumber" name="L205" href="#L205">205</a> <em class="jxr_javadoccomment">		 * this function before being added to the map. If not specified, values must already be of the</em>
-<a class="jxr_linenumber" name="L206" href="#L206">206</a> <em class="jxr_javadoccomment">		 * correct type (or &lt;c&gt;Object.class&lt;/c&gt; is used if types were not specified, which accepts any type).</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> <em class="jxr_javadoccomment">		 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L209" href="#L209">209</a> <em class="jxr_javadoccomment">		 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L210" href="#L210">210</a> <em class="jxr_javadoccomment">		 * 	FilteredMap&amp;lt;String, Integer&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = FilteredMap</em>
-<a class="jxr_linenumber" name="L211" href="#L211">211</a> <em class="jxr_javadoccomment">		 * 		.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, Integer.&lt;jk&gt;class&lt;/jk&gt;)</em>
-<a class="jxr_linenumber" name="L212" href="#L212">212</a> <em class="jxr_javadoccomment">		 * 		.filter((k, v) -&amp;gt; v != &lt;jk&gt;null&lt;/jk&gt; &amp;amp;&amp;amp; v &amp;gt; 0)</em>
-<a class="jxr_linenumber" name="L213" href="#L213">213</a> <em class="jxr_javadoccomment">		 * 		.valueFunction(o -&amp;gt; Integer.parseInt(o.toString()))</em>
-<a class="jxr_linenumber" name="L214" href="#L214">214</a> <em class="jxr_javadoccomment">		 * 		.build();</em>
-<a class="jxr_linenumber" name="L215" href="#L215">215</a> <em class="jxr_javadoccomment">		 *</em>
-<a class="jxr_linenumber" name="L216" href="#L216">216</a> <em class="jxr_javadoccomment">		 * 	&lt;jv&gt;map&lt;/jv&gt;.add(&lt;js&gt;"key"&lt;/js&gt;, &lt;js&gt;"123"&lt;/js&gt;);  &lt;jc&gt;// Value will be converted from String to Integer&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L217" href="#L217">217</a> <em class="jxr_javadoccomment">		 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L218" href="#L218">218</a> <em class="jxr_javadoccomment">		 *</em>
-<a class="jxr_linenumber" name="L219" href="#L219">219</a> <em class="jxr_javadoccomment">		 * @param value The value conversion function. Can be &lt;jk&gt;null&lt;/jk&gt;.</em>
-<a class="jxr_linenumber" name="L220" href="#L220">220</a> <em class="jxr_javadoccomment">		 * @return This object for method chaining.</em>
-<a class="jxr_linenumber" name="L221" href="#L221">221</a> <em class="jxr_javadoccomment">		 */</em>
-<a class="jxr_linenumber" name="L222" href="#L222">222</a> 		<strong class="jxr_keyword">public</strong> Builder&lt;K,V&gt; valueFunction(Function&lt;Object,V&gt; value) {
-<a class="jxr_linenumber" name="L223" href="#L223">223</a> 			valueFunction = value;
-<a class="jxr_linenumber" name="L224" href="#L224">224</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
-<a class="jxr_linenumber" name="L225" href="#L225">225</a> 		}
-<a class="jxr_linenumber" name="L226" href="#L226">226</a> 
-<a class="jxr_linenumber" name="L227" href="#L227">227</a> 		<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L228" href="#L228">228</a> <em class="jxr_javadoccomment">		 * Sets both the key and value conversion functions at once.</em>
-<a class="jxr_linenumber" name="L229" href="#L229">229</a> <em class="jxr_javadoccomment">		 *</em>
-<a class="jxr_linenumber" name="L230" href="#L230">230</a> <em class="jxr_javadoccomment">		 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L231" href="#L231">231</a> <em class="jxr_javadoccomment">		 * This is a convenience method for setting both conversion functions in a single call.</em>
+<a class="jxr_linenumber" name="L139" href="#L139">139</a> <em class="jxr_javadoccomment">		 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L140" href="#L140">140</a> <em class="jxr_javadoccomment">		 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L141" href="#L141">141</a> <em class="jxr_javadoccomment">		 * 	&lt;jc&gt;// Filter out null values&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L142" href="#L142">142</a> <em class="jxr_javadoccomment">		 * 	Builder&amp;lt;String, String&amp;gt; &lt;jv&gt;b&lt;/jv&gt; = FilteredMap.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, String.&lt;jk&gt;class&lt;/jk&gt;)</em>
+<a class="jxr_linenumber" name="L143" href="#L143">143</a> <em class="jxr_javadoccomment">		 * 		.filter((k, v) -&amp;gt; v != &lt;jk&gt;null&lt;/jk&gt;);</em>
+<a class="jxr_linenumber" name="L144" href="#L144">144</a> <em class="jxr_javadoccomment">		 *</em>
+<a class="jxr_linenumber" name="L145" href="#L145">145</a> <em class="jxr_javadoccomment">		 * 	&lt;jc&gt;// Filter based on both key and value&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L146" href="#L146">146</a> <em class="jxr_javadoccomment">		 * 	Builder&amp;lt;String, Integer&amp;gt; &lt;jv&gt;b2&lt;/jv&gt; = FilteredMap.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, Integer.&lt;jk&gt;class&lt;/jk&gt;)</em>
+<a class="jxr_linenumber" name="L147" href="#L147">147</a> <em class="jxr_javadoccomment">		 * 		.filter((k, v) -&amp;gt; ! k.startsWith(&lt;js&gt;"_"&lt;/js&gt;) &amp;amp;&amp;amp; v != &lt;jk&gt;null&lt;/jk&gt; &amp;amp;&amp;amp; v &amp;gt; 0);</em>
+<a class="jxr_linenumber" name="L148" href="#L148">148</a> <em class="jxr_javadoccomment">		 *</em>
+<a class="jxr_linenumber" name="L149" href="#L149">149</a> <em class="jxr_javadoccomment">		 * 	&lt;jc&gt;// Multiple filters combined with AND&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L150" href="#L150">150</a> <em class="jxr_javadoccomment">		 * 	Builder&amp;lt;String, Integer&amp;gt; &lt;jv&gt;b3&lt;/jv&gt; = FilteredMap.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, Integer.&lt;jk&gt;class&lt;/jk&gt;)</em>
+<a class="jxr_linenumber" name="L151" href="#L151">151</a> <em class="jxr_javadoccomment">		 * 		.filter((k, v) -&amp;gt; v != &lt;jk&gt;null&lt;/jk&gt;)           &lt;jc&gt;// First filter&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L152" href="#L152">152</a> <em class="jxr_javadoccomment">		 * 		.filter((k, v) -&amp;gt; v &amp;gt; 0)                    &lt;jc&gt;// Second filter (ANDed with first)&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L153" href="#L153">153</a> <em class="jxr_javadoccomment">		 * 		.filter((k, v) -&amp;gt; ! k.startsWith(&lt;js&gt;"_"&lt;/js&gt;)); &lt;jc&gt;// Third filter (ANDed with previous)&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L154" href="#L154">154</a> <em class="jxr_javadoccomment">		 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L155" href="#L155">155</a> <em class="jxr_javadoccomment">		 *</em>
+<a class="jxr_linenumber" name="L156" href="#L156">156</a> <em class="jxr_javadoccomment">		 * @param value The filter predicate. Must not be &lt;jk&gt;null&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L157" href="#L157">157</a> <em class="jxr_javadoccomment">		 * @return This object for method chaining.</em>
+<a class="jxr_linenumber" name="L158" href="#L158">158</a> <em class="jxr_javadoccomment">		 */</em>
+<a class="jxr_linenumber" name="L159" href="#L159">159</a> 		<strong class="jxr_keyword">public</strong> Builder&lt;K,V&gt; filter(BiPredicate&lt;K,V&gt; value) {
+<a class="jxr_linenumber" name="L160" href="#L160">160</a> 			BiPredicate&lt;K,V&gt; newFilter = assertArgNotNull(<span class="jxr_string">"value"</span>, value);
+<a class="jxr_linenumber" name="L161" href="#L161">161</a> 			<strong class="jxr_keyword">if</strong> (filter == <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L162" href="#L162">162</a> 				filter = newFilter;
+<a class="jxr_linenumber" name="L163" href="#L163">163</a> 			<strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L164" href="#L164">164</a> 				filter = filter.and(newFilter);
+<a class="jxr_linenumber" name="L165" href="#L165">165</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
+<a class="jxr_linenumber" name="L166" href="#L166">166</a> 		}
+<a class="jxr_linenumber" name="L167" href="#L167">167</a> 
+<a class="jxr_linenumber" name="L168" href="#L168">168</a> 		<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L169" href="#L169">169</a> <em class="jxr_javadoccomment">		 * Sets the underlying map instance that will store the filtered entries.</em>
+<a class="jxr_linenumber" name="L170" href="#L170">170</a> <em class="jxr_javadoccomment">		 *</em>
+<a class="jxr_linenumber" name="L171" href="#L171">171</a> <em class="jxr_javadoccomment">		 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L172" href="#L172">172</a> <em class="jxr_javadoccomment">		 * If not specified, a new {@link LinkedHashMap} will be created during {@link #build()}.</em>
+<a class="jxr_linenumber" name="L173" href="#L173">173</a> <em class="jxr_javadoccomment">		 *</em>
+<a class="jxr_linenumber" name="L174" href="#L174">174</a> <em class="jxr_javadoccomment">		 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L175" href="#L175">175</a> <em class="jxr_javadoccomment">		 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L176" href="#L176">176</a> <em class="jxr_javadoccomment">		 * 	&lt;jc&gt;// Use a TreeMap for sorted keys&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L177" href="#L177">177</a> <em class="jxr_javadoccomment">		 * 	Builder&amp;lt;String, Integer&amp;gt; &lt;jv&gt;b&lt;/jv&gt; = FilteredMap.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, Integer.&lt;jk&gt;class&lt;/jk&gt;)</em>
+<a class="jxr_linenumber" name="L178" href="#L178">178</a> <em class="jxr_javadoccomment">		 * 		.inner(&lt;jk&gt;new&lt;/jk&gt; TreeMap&amp;lt;&amp;gt;());</em>
+<a class="jxr_linenumber" name="L179" href="#L179">179</a> <em class="jxr_javadoccomment">		 *</em>
+<a class="jxr_linenumber" name="L180" href="#L180">180</a> <em class="jxr_javadoccomment">		 * 	&lt;jc&gt;// Use a ConcurrentHashMap for thread safety&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L181" href="#L181">181</a> <em class="jxr_javadoccomment">		 * 	Builder&amp;lt;String, Integer&amp;gt; &lt;jv&gt;b2&lt;/jv&gt; = FilteredMap.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, Integer.&lt;jk&gt;class&lt;/jk&gt;)</em>
+<a class="jxr_linenumber" name="L182" href="#L182">182</a> <em class="jxr_javadoccomment">		 * 		.inner(&lt;jk&gt;new&lt;/jk&gt; ConcurrentHashMap&amp;lt;&amp;gt;());</em>
+<a class="jxr_linenumber" name="L183" href="#L183">183</a> <em class="jxr_javadoccomment">		 *</em>
+<a class="jxr_linenumber" name="L184" href="#L184">184</a> <em class="jxr_javadoccomment">		 * 	&lt;jc&gt;// Use an existing map&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L185" href="#L185">185</a> <em class="jxr_javadoccomment">		 * 	Map&amp;lt;String, Integer&amp;gt; &lt;jv&gt;existing&lt;/jv&gt; = &lt;jk&gt;new&lt;/jk&gt; LinkedHashMap&amp;lt;&amp;gt;();</em>
+<a class="jxr_linenumber" name="L186" href="#L186">186</a> <em class="jxr_javadoccomment">		 * 	Builder&amp;lt;String, Integer&amp;gt; &lt;jv&gt;b3&lt;/jv&gt; = FilteredMap.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, Integer.&lt;jk&gt;class&lt;/jk&gt;)</em>
+<a class="jxr_linenumber" name="L187" href="#L187">187</a> <em class="jxr_javadoccomment">		 * 		.inner(&lt;jv&gt;existing&lt;/jv&gt;);</em>
+<a class="jxr_linenumber" name="L188" href="#L188">188</a> <em class="jxr_javadoccomment">		 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L189" href="#L189">189</a> <em class="jxr_javadoccomment">		 *</em>
+<a class="jxr_linenumber" name="L190" href="#L190">190</a> <em class="jxr_javadoccomment">		 * @param value The underlying map instance. Must not be &lt;jk&gt;null&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L191" href="#L191">191</a> <em class="jxr_javadoccomment">		 * @return This object for method chaining.</em>
+<a class="jxr_linenumber" name="L192" href="#L192">192</a> <em class="jxr_javadoccomment">		 */</em>
+<a class="jxr_linenumber" name="L193" href="#L193">193</a> 		<strong class="jxr_keyword">public</strong> Builder&lt;K,V&gt; <strong class="jxr_keyword">inner</strong>(Map&lt;K,V&gt; value) {
+<a class="jxr_linenumber" name="L194" href="#L194">194</a> 			<strong class="jxr_keyword">inner</strong> = assertArgNotNull(<span class="jxr_string">"value"</span>, value);
+<a class="jxr_linenumber" name="L195" href="#L195">195</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
+<a class="jxr_linenumber" name="L196" href="#L196">196</a> 		}
+<a class="jxr_linenumber" name="L197" href="#L197">197</a> 
+<a class="jxr_linenumber" name="L198" href="#L198">198</a> 		<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L199" href="#L199">199</a> <em class="jxr_javadoccomment">		 * Sets the function to use for converting keys when using {@link FilteredMap#add(Object, Object)}.</em>
+<a class="jxr_linenumber" name="L200" href="#L200">200</a> <em class="jxr_javadoccomment">		 *</em>
+<a class="jxr_linenumber" name="L201" href="#L201">201</a> <em class="jxr_javadoccomment">		 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L202" href="#L202">202</a> <em class="jxr_javadoccomment">		 * If specified, keys passed to {@link FilteredMap#add(Object, Object)} will be converted using</em>
+<a class="jxr_linenumber" name="L203" href="#L203">203</a> <em class="jxr_javadoccomment">		 * this function before being added to the map. If not specified, keys must already be of the</em>
+<a class="jxr_linenumber" name="L204" href="#L204">204</a> <em class="jxr_javadoccomment">		 * correct type (or &lt;c&gt;Object.class&lt;/c&gt; is used if types were not specified, which accepts any type).</em>
+<a class="jxr_linenumber" name="L205" href="#L205">205</a> <em class="jxr_javadoccomment">		 *</em>
+<a class="jxr_linenumber" name="L206" href="#L206">206</a> <em class="jxr_javadoccomment">		 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L207" href="#L207">207</a> <em class="jxr_javadoccomment">		 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L208" href="#L208">208</a> <em class="jxr_javadoccomment">		 * 	FilteredMap&amp;lt;String, Integer&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = FilteredMap</em>
+<a class="jxr_linenumber" name="L209" href="#L209">209</a> <em class="jxr_javadoccomment">		 * 		.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, Integer.&lt;jk&gt;class&lt;/jk&gt;)</em>
+<a class="jxr_linenumber" name="L210" href="#L210">210</a> <em class="jxr_javadoccomment">		 * 		.filter((k, v) -&amp;gt; v != &lt;jk&gt;null&lt;/jk&gt;)</em>
+<a class="jxr_linenumber" name="L211" href="#L211">211</a> <em class="jxr_javadoccomment">		 * 		.keyFunction(o -&amp;gt; o.toString())</em>
+<a class="jxr_linenumber" name="L212" href="#L212">212</a> <em class="jxr_javadoccomment">		 * 		.build();</em>
+<a class="jxr_linenumber" name="L213" href="#L213">213</a> <em class="jxr_javadoccomment">		 *</em>
+<a class="jxr_linenumber" name="L214" href="#L214">214</a> <em class="jxr_javadoccomment">		 * 	&lt;jv&gt;map&lt;/jv&gt;.add(123, 5);  &lt;jc&gt;// Key will be converted from Integer to String&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L215" href="#L215">215</a> <em class="jxr_javadoccomment">		 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L216" href="#L216">216</a> <em class="jxr_javadoccomment">		 *</em>
+<a class="jxr_linenumber" name="L217" href="#L217">217</a> <em class="jxr_javadoccomment">		 * @param value The key conversion function. Can be &lt;jk&gt;null&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L218" href="#L218">218</a> <em class="jxr_javadoccomment">		 * @return This object for method chaining.</em>
+<a class="jxr_linenumber" name="L219" href="#L219">219</a> <em class="jxr_javadoccomment">		 */</em>
+<a class="jxr_linenumber" name="L220" href="#L220">220</a> 		<strong class="jxr_keyword">public</strong> Builder&lt;K,V&gt; keyFunction(Function&lt;Object,K&gt; value) {
+<a class="jxr_linenumber" name="L221" href="#L221">221</a> 			keyFunction = value;
+<a class="jxr_linenumber" name="L222" href="#L222">222</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
+<a class="jxr_linenumber" name="L223" href="#L223">223</a> 		}
+<a class="jxr_linenumber" name="L224" href="#L224">224</a> 
+<a class="jxr_linenumber" name="L225" href="#L225">225</a> 		<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L226" href="#L226">226</a> <em class="jxr_javadoccomment">		 * Sets the function to use for converting values when using {@link FilteredMap#add(Object, Object)}.</em>
+<a class="jxr_linenumber" name="L227" href="#L227">227</a> <em class="jxr_javadoccomment">		 *</em>
+<a class="jxr_linenumber" name="L228" href="#L228">228</a> <em class="jxr_javadoccomment">		 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L229" href="#L229">229</a> <em class="jxr_javadoccomment">		 * If specified, values passed to {@link FilteredMap#add(Object, Object)} will be converted using</em>
+<a class="jxr_linenumber" name="L230" href="#L230">230</a> <em class="jxr_javadoccomment">		 * this function before being added to the map. If not specified, values must already be of the</em>
+<a class="jxr_linenumber" name="L231" href="#L231">231</a> <em class="jxr_javadoccomment">		 * correct type (or &lt;c&gt;Object.class&lt;/c&gt; is used if types were not specified, which accepts any type).</em>
 <a class="jxr_linenumber" name="L232" href="#L232">232</a> <em class="jxr_javadoccomment">		 *</em>
 <a class="jxr_linenumber" name="L233" href="#L233">233</a> <em class="jxr_javadoccomment">		 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
 <a class="jxr_linenumber" name="L234" href="#L234">234</a> <em class="jxr_javadoccomment">		 * &lt;p class='bjava'&gt;</em>
 <a class="jxr_linenumber" name="L235" href="#L235">235</a> <em class="jxr_javadoccomment">		 * 	FilteredMap&amp;lt;String, Integer&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = FilteredMap</em>
 <a class="jxr_linenumber" name="L236" href="#L236">236</a> <em class="jxr_javadoccomment">		 * 		.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, Integer.&lt;jk&gt;class&lt;/jk&gt;)</em>
 <a class="jxr_linenumber" name="L237" href="#L237">237</a> <em class="jxr_javadoccomment">		 * 		.filter((k, v) -&amp;gt; v != &lt;jk&gt;null&lt;/jk&gt; &amp;amp;&amp;amp; v &amp;gt; 0)</em>
-<a class="jxr_linenumber" name="L238" href="#L238">238</a> <em class="jxr_javadoccomment">		 * 		.functions(</em>
-<a class="jxr_linenumber" name="L239" href="#L239">239</a> <em class="jxr_javadoccomment">		 * 			o -&amp;gt; o.toString(),                    &lt;jc&gt;// Key function&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L240" href="#L240">240</a> <em class="jxr_javadoccomment">		 * 			o -&amp;gt; Integer.parseInt(o.toString())   &lt;jc&gt;// Value function&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L241" href="#L241">241</a> <em class="jxr_javadoccomment">		 * 		)</em>
-<a class="jxr_linenumber" name="L242" href="#L242">242</a> <em class="jxr_javadoccomment">		 * 		.build();</em>
-<a class="jxr_linenumber" name="L243" href="#L243">243</a> <em class="jxr_javadoccomment">		 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L244" href="#L244">244</a> <em class="jxr_javadoccomment">		 *</em>
-<a class="jxr_linenumber" name="L245" href="#L245">245</a> <em class="jxr_javadoccomment">		 * @param keyFunction The key conversion function. Can be &lt;jk&gt;null&lt;/jk&gt;.</em>
-<a class="jxr_linenumber" name="L246" href="#L246">246</a> <em class="jxr_javadoccomment">		 * @param valueFunction The value conversion function. Can be &lt;jk&gt;null&lt;/jk&gt;.</em>
-<a class="jxr_linenumber" name="L247" href="#L247">247</a> <em class="jxr_javadoccomment">		 * @return This object for method chaining.</em>
-<a class="jxr_linenumber" name="L248" href="#L248">248</a> <em class="jxr_javadoccomment">		 */</em>
-<a class="jxr_linenumber" name="L249" href="#L249">249</a> 		<strong class="jxr_keyword">public</strong> Builder&lt;K,V&gt; functions(Function&lt;Object,K&gt; keyFunction, Function&lt;Object,V&gt; valueFunction) {
-<a class="jxr_linenumber" name="L250" href="#L250">250</a> 			<strong class="jxr_keyword">this</strong>.keyFunction = keyFunction;
-<a class="jxr_linenumber" name="L251" href="#L251">251</a> 			<strong class="jxr_keyword">this</strong>.valueFunction = valueFunction;
-<a class="jxr_linenumber" name="L252" href="#L252">252</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
-<a class="jxr_linenumber" name="L253" href="#L253">253</a> 		}
-<a class="jxr_linenumber" name="L254" href="#L254">254</a> 
-<a class="jxr_linenumber" name="L255" href="#L255">255</a> 		<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L256" href="#L256">256</a> <em class="jxr_javadoccomment">		 * Builds a new {@link FilteredMap} instance.</em>
+<a class="jxr_linenumber" name="L238" href="#L238">238</a> <em class="jxr_javadoccomment">		 * 		.valueFunction(o -&amp;gt; Integer.parseInt(o.toString()))</em>
+<a class="jxr_linenumber" name="L239" href="#L239">239</a> <em class="jxr_javadoccomment">		 * 		.build();</em>
+<a class="jxr_linenumber" name="L240" href="#L240">240</a> <em class="jxr_javadoccomment">		 *</em>
+<a class="jxr_linenumber" name="L241" href="#L241">241</a> <em class="jxr_javadoccomment">		 * 	&lt;jv&gt;map&lt;/jv&gt;.add(&lt;js&gt;"key"&lt;/js&gt;, &lt;js&gt;"123"&lt;/js&gt;);  &lt;jc&gt;// Value will be converted from String to Integer&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L242" href="#L242">242</a> <em class="jxr_javadoccomment">		 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L243" href="#L243">243</a> <em class="jxr_javadoccomment">		 *</em>
+<a class="jxr_linenumber" name="L244" href="#L244">244</a> <em class="jxr_javadoccomment">		 * @param value The value conversion function. Can be &lt;jk&gt;null&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L245" href="#L245">245</a> <em class="jxr_javadoccomment">		 * @return This object for method chaining.</em>
+<a class="jxr_linenumber" name="L246" href="#L246">246</a> <em class="jxr_javadoccomment">		 */</em>
+<a class="jxr_linenumber" name="L247" href="#L247">247</a> 		<strong class="jxr_keyword">public</strong> Builder&lt;K,V&gt; valueFunction(Function&lt;Object,V&gt; value) {
+<a class="jxr_linenumber" name="L248" href="#L248">248</a> 			valueFunction = value;
+<a class="jxr_linenumber" name="L249" href="#L249">249</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
+<a class="jxr_linenumber" name="L250" href="#L250">250</a> 		}
+<a class="jxr_linenumber" name="L251" href="#L251">251</a> 
+<a class="jxr_linenumber" name="L252" href="#L252">252</a> 		<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L253" href="#L253">253</a> <em class="jxr_javadoccomment">		 * Sets both the key and value conversion functions at once.</em>
+<a class="jxr_linenumber" name="L254" href="#L254">254</a> <em class="jxr_javadoccomment">		 *</em>
+<a class="jxr_linenumber" name="L255" href="#L255">255</a> <em class="jxr_javadoccomment">		 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L256" href="#L256">256</a> <em class="jxr_javadoccomment">		 * This is a convenience method for setting both conversion functions in a single call.</em>
 <a class="jxr_linenumber" name="L257" href="#L257">257</a> <em class="jxr_javadoccomment">		 *</em>
-<a class="jxr_linenumber" name="L258" href="#L258">258</a> <em class="jxr_javadoccomment">		 * @return A new filtered map instance.</em>
-<a class="jxr_linenumber" name="L259" href="#L259">259</a> <em class="jxr_javadoccomment">		 * @throws IllegalArgumentException If the filter has not been set.</em>
-<a class="jxr_linenumber" name="L260" href="#L260">260</a> <em class="jxr_javadoccomment">		 */</em>
-<a class="jxr_linenumber" name="L261" href="#L261">261</a> 		<strong class="jxr_keyword">public</strong> FilteredMap&lt;K,V&gt; build() {
-<a class="jxr_linenumber" name="L262" href="#L262">262</a> 			assertArgNotNull(<span class="jxr_string">"filter"</span>, filter);
-<a class="jxr_linenumber" name="L263" href="#L263">263</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> FilteredMap&lt;&gt;(filter, creator.get(), keyType, valueType, keyFunction, valueFunction);
-<a class="jxr_linenumber" name="L264" href="#L264">264</a> 		}
-<a class="jxr_linenumber" name="L265" href="#L265">265</a> 	}
-<a class="jxr_linenumber" name="L266" href="#L266">266</a> 
-<a class="jxr_linenumber" name="L267" href="#L267">267</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L268" href="#L268">268</a> <em class="jxr_javadoccomment">	 * Creates a new builder for constructing a filtered map.</em>
-<a class="jxr_linenumber" name="L269" href="#L269">269</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L270" href="#L270">270</a> <em class="jxr_javadoccomment">	 * @param &lt;K&gt; The key type.</em>
-<a class="jxr_linenumber" name="L271" href="#L271">271</a> <em class="jxr_javadoccomment">	 * @param &lt;V&gt; The value type.</em>
-<a class="jxr_linenumber" name="L272" href="#L272">272</a> <em class="jxr_javadoccomment">	 * @param keyType The key type class. Must not be &lt;jk&gt;null&lt;/jk&gt;.</em>
-<a class="jxr_linenumber" name="L273" href="#L273">273</a> <em class="jxr_javadoccomment">	 * @param valueType The value type class. Must not be &lt;jk&gt;null&lt;/jk&gt;.</em>
-<a class="jxr_linenumber" name="L274" href="#L274">274</a> <em class="jxr_javadoccomment">	 * @return A new builder.</em>
-<a class="jxr_linenumber" name="L275" href="#L275">275</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L276" href="#L276">276</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;K,V&gt; Builder&lt;K,V&gt; create(Class&lt;K&gt; keyType, Class&lt;V&gt; valueType) {
-<a class="jxr_linenumber" name="L277" href="#L277">277</a> 		assertArgNotNull(<span class="jxr_string">"keyType"</span>, keyType);
-<a class="jxr_linenumber" name="L278" href="#L278">278</a> 		assertArgNotNull(<span class="jxr_string">"valueType"</span>, valueType);
-<a class="jxr_linenumber" name="L279" href="#L279">279</a> 		<strong class="jxr_keyword">var</strong> builder = <strong class="jxr_keyword">new</strong> Builder&lt;K,V&gt;();
-<a class="jxr_linenumber" name="L280" href="#L280">280</a> 		builder.keyType = keyType;
-<a class="jxr_linenumber" name="L281" href="#L281">281</a> 		builder.valueType = valueType;
-<a class="jxr_linenumber" name="L282" href="#L282">282</a> 		<strong class="jxr_keyword">return</strong> builder;
-<a class="jxr_linenumber" name="L283" href="#L283">283</a> 	}
-<a class="jxr_linenumber" name="L284" href="#L284">284</a> 
-<a class="jxr_linenumber" name="L285" href="#L285">285</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L286" href="#L286">286</a> <em class="jxr_javadoccomment">	 * Creates a new builder for constructing a filtered map with generic types.</em>
-<a class="jxr_linenumber" name="L287" href="#L287">287</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L288" href="#L288">288</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L289" href="#L289">289</a> <em class="jxr_javadoccomment">	 * This is a convenience method that creates a builder without requiring explicit type class parameters.</em>
-<a class="jxr_linenumber" name="L290" href="#L290">290</a> <em class="jxr_javadoccomment">	 * The generic types must be explicitly specified using the diamond operator syntax.</em>
-<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">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L293" href="#L293">293</a> <em class="jxr_javadoccomment">	 * When using this method, type checking is effectively disabled (using &lt;c&gt;Object.class&lt;/c&gt; as the type),</em>
-<a class="jxr_linenumber" name="L294" href="#L294">294</a> <em class="jxr_javadoccomment">	 * allowing any key and value types to be added. However, the generic type parameters should still be</em>
-<a class="jxr_linenumber" name="L295" href="#L295">295</a> <em class="jxr_javadoccomment">	 * specified for type safety.</em>
-<a class="jxr_linenumber" name="L296" href="#L296">296</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L297" href="#L297">297</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L298" href="#L298">298</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L299" href="#L299">299</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Explicitly specify generic types using diamond operator&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L300" href="#L300">300</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;var&lt;/jk&gt; &lt;jv&gt;map&lt;/jv&gt; = FilteredMap</em>
-<a class="jxr_linenumber" name="L301" href="#L301">301</a> <em class="jxr_javadoccomment">	 * 		.&amp;lt;String, String&amp;gt;&lt;jsm&gt;create&lt;/jsm&gt;()</em>
-<a class="jxr_linenumber" name="L302" href="#L302">302</a> <em class="jxr_javadoccomment">	 * 		.filter((&lt;jv&gt;k&lt;/jv&gt;, &lt;jv&gt;v&lt;/jv&gt;) -&amp;gt; &lt;jv&gt;v&lt;/jv&gt; != &lt;jk&gt;null&lt;/jk&gt;)</em>
-<a class="jxr_linenumber" name="L303" href="#L303">303</a> <em class="jxr_javadoccomment">	 * 		.build();</em>
-<a class="jxr_linenumber" name="L304" href="#L304">304</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L305" href="#L305">305</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L306" href="#L306">306</a> <em class="jxr_javadoccomment">	 * @param &lt;K&gt; The key type.</em>
-<a class="jxr_linenumber" name="L307" href="#L307">307</a> <em class="jxr_javadoccomment">	 * @param &lt;V&gt; The value type.</em>
-<a class="jxr_linenumber" name="L308" href="#L308">308</a> <em class="jxr_javadoccomment">	 * @return A new builder.</em>
-<a class="jxr_linenumber" name="L309" href="#L309">309</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L310" href="#L310">310</a> 	@SuppressWarnings(<span class="jxr_string">"unchecked"</span>)
-<a class="jxr_linenumber" name="L311" href="#L311">311</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;K,V&gt; Builder&lt;K,V&gt; create() {
-<a class="jxr_linenumber" name="L312" href="#L312">312</a> 		<strong class="jxr_keyword">var</strong> builder = <strong class="jxr_keyword">new</strong> Builder&lt;K,V&gt;();
-<a class="jxr_linenumber" name="L313" href="#L313">313</a> 		builder.keyType = (Class&lt;K&gt;)Object.<strong class="jxr_keyword">class</strong>;
-<a class="jxr_linenumber" name="L314" href="#L314">314</a> 		builder.valueType = (Class&lt;V&gt;)Object.<strong class="jxr_keyword">class</strong>;
-<a class="jxr_linenumber" name="L315" href="#L315">315</a> 		<strong class="jxr_keyword">return</strong> builder;
-<a class="jxr_linenumber" name="L316" href="#L316">316</a> 	}
-<a class="jxr_linenumber" name="L317" href="#L317">317</a> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> BiPredicate&lt;K,V&gt; filter;
-<a class="jxr_linenumber" name="L318" href="#L318">318</a> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Map&lt;K,V&gt; map;
-<a class="jxr_linenumber" name="L319" href="#L319">319</a> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Class&lt;K&gt; keyType;
-<a class="jxr_linenumber" name="L320" href="#L320">320</a> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Class&lt;V&gt; valueType;
-<a class="jxr_linenumber" name="L321" href="#L321">321</a> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Function&lt;Object,K&gt; keyFunction;
-<a class="jxr_linenumber" name="L322" href="#L322">322</a> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Function&lt;Object,V&gt; valueFunction;
-<a class="jxr_linenumber" name="L323" href="#L323">323</a> 
-<a class="jxr_linenumber" name="L324" href="#L324">324</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L325" href="#L325">325</a> <em class="jxr_javadoccomment">	 * Constructor.</em>
-<a class="jxr_linenumber" name="L326" href="#L326">326</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L327" href="#L327">327</a> <em class="jxr_javadoccomment">	 * @param filter The filter predicate. Must not be &lt;jk&gt;null&lt;/jk&gt;.</em>
-<a class="jxr_linenumber" name="L328" href="#L328">328</a> <em class="jxr_javadoccomment">	 * @param map The underlying map. Must not be &lt;jk&gt;null&lt;/jk&gt;.</em>
-<a class="jxr_linenumber" name="L329" href="#L329">329</a> <em class="jxr_javadoccomment">	 * @param keyType The key type. Must not be &lt;jk&gt;null&lt;/jk&gt; (use &lt;c&gt;Object.class&lt;/c&gt; to disable type checking).</em>
-<a class="jxr_linenumber" name="L330" href="#L330">330</a> <em class="jxr_javadoccomment">	 * @param valueType The value type. Must not be &lt;jk&gt;null&lt;/jk&gt; (use &lt;c&gt;Object.class&lt;/c&gt; to disable type checking).</em>
-<a class="jxr_linenumber" name="L331" href="#L331">331</a> <em class="jxr_javadoccomment">	 * @param keyFunction The key conversion function, or &lt;jk&gt;null&lt;/jk&gt; if not specified.</em>
-<a class="jxr_linenumber" name="L332" href="#L332">332</a> <em class="jxr_javadoccomment">	 * @param valueFunction The value conversion function, or &lt;jk&gt;null&lt;/jk&gt; if not specified.</em>
-<a class="jxr_linenumber" name="L333" href="#L333">333</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L334" href="#L334">334</a> 	<strong class="jxr_keyword">protected</strong> <a name="FilteredMap" href="../../../../../org/apache/juneau/commons/collections/FilteredMap.html#FilteredMap">FilteredMap</a>(BiPredicate&lt;K,V&gt; filter, Map&lt;K,V&gt; map, Class&lt;K&gt; keyType, Class&lt;V&gt; valueType, Function&lt;Object,K&gt; keyFunction, Function&lt;Object,V&gt; valueFunction) {
-<a class="jxr_linenumber" name="L335" href="#L335">335</a> 		<strong class="jxr_keyword">this</strong>.filter = assertArgNotNull(<span class="jxr_string">"filter"</span>, filter);
-<a class="jxr_linenumber" name="L336" href="#L336">336</a> 		<strong class="jxr_keyword">this</strong>.map = assertArgNotNull(<span class="jxr_string">"map"</span>, map);
-<a class="jxr_linenumber" name="L337" href="#L337">337</a> 		<strong class="jxr_keyword">this</strong>.keyType = assertArgNotNull(<span class="jxr_string">"keyType"</span>, keyType);
-<a class="jxr_linenumber" name="L338" href="#L338">338</a> 		<strong class="jxr_keyword">this</strong>.valueType = assertArgNotNull(<span class="jxr_string">"valueType"</span>, valueType);
-<a class="jxr_linenumber" name="L339" href="#L339">339</a> 		<strong class="jxr_keyword">this</strong>.keyFunction = keyFunction;
-<a class="jxr_linenumber" name="L340" href="#L340">340</a> 		<strong class="jxr_keyword">this</strong>.valueFunction = valueFunction;
-<a class="jxr_linenumber" name="L341" href="#L341">341</a> 	}
-<a class="jxr_linenumber" name="L342" href="#L342">342</a> 
-<a class="jxr_linenumber" name="L343" href="#L343">343</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L344" href="#L344">344</a> <em class="jxr_javadoccomment">	 * Associates the specified value with the specified key in this map, if the entry passes the filter.</em>
-<a class="jxr_linenumber" name="L345" href="#L345">345</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L346" href="#L346">346</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L347" href="#L347">347</a> <em class="jxr_javadoccomment">	 * If the entry passes the filter, it is added to the map and this method returns the previous value</em>
-<a class="jxr_linenumber" name="L348" href="#L348">348</a> <em class="jxr_javadoccomment">	 * associated with the key (or &lt;jk&gt;null&lt;/jk&gt; if there was no mapping).</em>
-<a class="jxr_linenumber" name="L349" href="#L349">349</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L350" href="#L350">350</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L351" href="#L351">351</a> <em class="jxr_javadoccomment">	 * If the entry is filtered out, it is not added to the map. This method returns the previous value</em>
-<a class="jxr_linenumber" name="L352" href="#L352">352</a> <em class="jxr_javadoccomment">	 * associated with the key (or &lt;jk&gt;null&lt;/jk&gt; if there was no mapping). This allows callers to distinguish</em>
-<a class="jxr_linenumber" name="L353" href="#L353">353</a> <em class="jxr_javadoccomment">	 * between a new entry being filtered out versus an existing entry being filtered out.</em>
+<a class="jxr_linenumber" name="L258" href="#L258">258</a> <em class="jxr_javadoccomment">		 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L259" href="#L259">259</a> <em class="jxr_javadoccomment">		 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L260" href="#L260">260</a> <em class="jxr_javadoccomment">		 * 	FilteredMap&amp;lt;String, Integer&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = FilteredMap</em>
+<a class="jxr_linenumber" name="L261" href="#L261">261</a> <em class="jxr_javadoccomment">		 * 		.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, Integer.&lt;jk&gt;class&lt;/jk&gt;)</em>
+<a class="jxr_linenumber" name="L262" href="#L262">262</a> <em class="jxr_javadoccomment">		 * 		.filter((k, v) -&amp;gt; v != &lt;jk&gt;null&lt;/jk&gt; &amp;amp;&amp;amp; v &amp;gt; 0)</em>
+<a class="jxr_linenumber" name="L263" href="#L263">263</a> <em class="jxr_javadoccomment">		 * 		.functions(</em>
+<a class="jxr_linenumber" name="L264" href="#L264">264</a> <em class="jxr_javadoccomment">		 * 			o -&amp;gt; o.toString(),                    &lt;jc&gt;// Key function&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L265" href="#L265">265</a> <em class="jxr_javadoccomment">		 * 			o -&amp;gt; Integer.parseInt(o.toString())   &lt;jc&gt;// Value function&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L266" href="#L266">266</a> <em class="jxr_javadoccomment">		 * 		)</em>
+<a class="jxr_linenumber" name="L267" href="#L267">267</a> <em class="jxr_javadoccomment">		 * 		.build();</em>
+<a class="jxr_linenumber" name="L268" href="#L268">268</a> <em class="jxr_javadoccomment">		 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L269" href="#L269">269</a> <em class="jxr_javadoccomment">		 *</em>
+<a class="jxr_linenumber" name="L270" href="#L270">270</a> <em class="jxr_javadoccomment">		 * @param keyFunction The key conversion function. Can be &lt;jk&gt;null&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L271" href="#L271">271</a> <em class="jxr_javadoccomment">		 * @param valueFunction The value conversion function. Can be &lt;jk&gt;null&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L272" href="#L272">272</a> <em class="jxr_javadoccomment">		 * @return This object for method chaining.</em>
+<a class="jxr_linenumber" name="L273" href="#L273">273</a> <em class="jxr_javadoccomment">		 */</em>
+<a class="jxr_linenumber" name="L274" href="#L274">274</a> 		<strong class="jxr_keyword">public</strong> Builder&lt;K,V&gt; functions(Function&lt;Object,K&gt; keyFunction, Function&lt;Object,V&gt; valueFunction) {
+<a class="jxr_linenumber" name="L275" href="#L275">275</a> 			<strong class="jxr_keyword">this</strong>.keyFunction = keyFunction;
+<a class="jxr_linenumber" name="L276" href="#L276">276</a> 			<strong class="jxr_keyword">this</strong>.valueFunction = valueFunction;
+<a class="jxr_linenumber" name="L277" href="#L277">277</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
+<a class="jxr_linenumber" name="L278" href="#L278">278</a> 		}
+<a class="jxr_linenumber" name="L279" href="#L279">279</a> 
+<a class="jxr_linenumber" name="L280" href="#L280">280</a> 		<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L281" href="#L281">281</a> <em class="jxr_javadoccomment">		 * Builds a new {@link FilteredMap} instance.</em>
+<a class="jxr_linenumber" name="L282" href="#L282">282</a> <em class="jxr_javadoccomment">		 *</em>
+<a class="jxr_linenumber" name="L283" href="#L283">283</a> <em class="jxr_javadoccomment">		 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L284" href="#L284">284</a> <em class="jxr_javadoccomment">		 * If {@link #filter(BiPredicate)} was not called, the map will accept all entries</em>
+<a class="jxr_linenumber" name="L285" href="#L285">285</a> <em class="jxr_javadoccomment">		 * (defaults to &lt;c&gt;(k,v) -&amp;gt; true&lt;/c&gt;).</em>
+<a class="jxr_linenumber" name="L286" href="#L286">286</a> <em class="jxr_javadoccomment">		 *</em>
+<a class="jxr_linenumber" name="L287" href="#L287">287</a> <em class="jxr_javadoccomment">		 * @return A new filtered map instance.</em>
+<a class="jxr_linenumber" name="L288" href="#L288">288</a> <em class="jxr_javadoccomment">		 */</em>
+<a class="jxr_linenumber" name="L289" href="#L289">289</a> 		<strong class="jxr_keyword">public</strong> FilteredMap&lt;K,V&gt; build() {
+<a class="jxr_linenumber" name="L290" href="#L290">290</a> 			Map&lt;K,V&gt; map = <strong class="jxr_keyword">inner</strong> != <strong class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">inner</strong> : <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;&gt;();
+<a class="jxr_linenumber" name="L291" href="#L291">291</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> FilteredMap&lt;&gt;(filter, map, keyType, valueType, keyFunction, valueFunction);
+<a class="jxr_linenumber" name="L292" href="#L292">292</a> 		}
+<a class="jxr_linenumber" name="L293" href="#L293">293</a> 	}
+<a class="jxr_linenumber" name="L294" href="#L294">294</a> 
+<a class="jxr_linenumber" name="L295" href="#L295">295</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L296" href="#L296">296</a> <em class="jxr_javadoccomment">	 * Creates a new builder for constructing a filtered map.</em>
+<a class="jxr_linenumber" name="L297" href="#L297">297</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L298" href="#L298">298</a> <em class="jxr_javadoccomment">	 * @param &lt;K&gt; The key type.</em>
+<a class="jxr_linenumber" name="L299" href="#L299">299</a> <em class="jxr_javadoccomment">	 * @param &lt;V&gt; The value type.</em>
+<a class="jxr_linenumber" name="L300" href="#L300">300</a> <em class="jxr_javadoccomment">	 * @param keyType The key type class. Must not be &lt;jk&gt;null&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L301" href="#L301">301</a> <em class="jxr_javadoccomment">	 * @param valueType The value type class. Must not be &lt;jk&gt;null&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L302" href="#L302">302</a> <em class="jxr_javadoccomment">	 * @return A new builder.</em>
+<a class="jxr_linenumber" name="L303" href="#L303">303</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L304" href="#L304">304</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;K,V&gt; Builder&lt;K,V&gt; create(Class&lt;K&gt; keyType, Class&lt;V&gt; valueType) {
+<a class="jxr_linenumber" name="L305" href="#L305">305</a> 		assertArgNotNull(<span class="jxr_string">"keyType"</span>, keyType);
+<a class="jxr_linenumber" name="L306" href="#L306">306</a> 		assertArgNotNull(<span class="jxr_string">"valueType"</span>, valueType);
+<a class="jxr_linenumber" name="L307" href="#L307">307</a> 		<strong class="jxr_keyword">var</strong> builder = <strong class="jxr_keyword">new</strong> Builder&lt;K,V&gt;();
+<a class="jxr_linenumber" name="L308" href="#L308">308</a> 		builder.keyType = keyType;
+<a class="jxr_linenumber" name="L309" href="#L309">309</a> 		builder.valueType = valueType;
+<a class="jxr_linenumber" name="L310" href="#L310">310</a> 		<strong class="jxr_keyword">return</strong> builder;
+<a class="jxr_linenumber" name="L311" href="#L311">311</a> 	}
+<a class="jxr_linenumber" name="L312" href="#L312">312</a> 
+<a class="jxr_linenumber" name="L313" href="#L313">313</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L314" href="#L314">314</a> <em class="jxr_javadoccomment">	 * Creates a new builder for constructing a filtered map with generic types.</em>
+<a class="jxr_linenumber" name="L315" href="#L315">315</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L316" href="#L316">316</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L317" href="#L317">317</a> <em class="jxr_javadoccomment">	 * This is a convenience method that creates a builder without requiring explicit type class parameters.</em>
+<a class="jxr_linenumber" name="L318" href="#L318">318</a> <em class="jxr_javadoccomment">	 * The generic types must be explicitly specified using the diamond operator syntax.</em>
+<a class="jxr_linenumber" name="L319" href="#L319">319</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L320" href="#L320">320</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L321" href="#L321">321</a> <em class="jxr_javadoccomment">	 * When using this method, type checking is effectively disabled (using &lt;c&gt;Object.class&lt;/c&gt; as the type),</em>
+<a class="jxr_linenumber" name="L322" href="#L322">322</a> <em class="jxr_javadoccomment">	 * allowing any key and value types to be added. However, the generic type parameters should still be</em>
+<a class="jxr_linenumber" name="L323" href="#L323">323</a> <em class="jxr_javadoccomment">	 * specified for type safety.</em>
+<a class="jxr_linenumber" name="L324" href="#L324">324</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L325" href="#L325">325</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L326" href="#L326">326</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L327" href="#L327">327</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Explicitly specify generic types using diamond operator&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L328" href="#L328">328</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;var&lt;/jk&gt; &lt;jv&gt;map&lt;/jv&gt; = FilteredMap</em>
+<a class="jxr_linenumber" name="L329" href="#L329">329</a> <em class="jxr_javadoccomment">	 * 		.&amp;lt;String, String&amp;gt;&lt;jsm&gt;create&lt;/jsm&gt;()</em>
+<a class="jxr_linenumber" name="L330" href="#L330">330</a> <em class="jxr_javadoccomment">	 * 		.filter((&lt;jv&gt;k&lt;/jv&gt;, &lt;jv&gt;v&lt;/jv&gt;) -&amp;gt; &lt;jv&gt;v&lt;/jv&gt; != &lt;jk&gt;null&lt;/jk&gt;)</em>
+<a class="jxr_linenumber" name="L331" href="#L331">331</a> <em class="jxr_javadoccomment">	 * 		.build();</em>
+<a class="jxr_linenumber" name="L332" href="#L332">332</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L333" href="#L333">333</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L334" href="#L334">334</a> <em class="jxr_javadoccomment">	 * @param &lt;K&gt; The key type.</em>
+<a class="jxr_linenumber" name="L335" href="#L335">335</a> <em class="jxr_javadoccomment">	 * @param &lt;V&gt; The value type.</em>
+<a class="jxr_linenumber" name="L336" href="#L336">336</a> <em class="jxr_javadoccomment">	 * @return A new builder.</em>
+<a class="jxr_linenumber" name="L337" href="#L337">337</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L338" href="#L338">338</a> 	@SuppressWarnings(<span class="jxr_string">"unchecked"</span>)
+<a class="jxr_linenumber" name="L339" href="#L339">339</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;K,V&gt; Builder&lt;K,V&gt; create() {
+<a class="jxr_linenumber" name="L340" href="#L340">340</a> 		<strong class="jxr_keyword">var</strong> builder = <strong class="jxr_keyword">new</strong> Builder&lt;K,V&gt;();
+<a class="jxr_linenumber" name="L341" href="#L341">341</a> 		builder.keyType = (Class&lt;K&gt;)Object.<strong class="jxr_keyword">class</strong>;
+<a class="jxr_linenumber" name="L342" href="#L342">342</a> 		builder.valueType = (Class&lt;V&gt;)Object.<strong class="jxr_keyword">class</strong>;
+<a class="jxr_linenumber" name="L343" href="#L343">343</a> 		<strong class="jxr_keyword">return</strong> builder;
+<a class="jxr_linenumber" name="L344" href="#L344">344</a> 	}
+<a class="jxr_linenumber" name="L345" href="#L345">345</a> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> BiPredicate&lt;K,V&gt; filter;
+<a class="jxr_linenumber" name="L346" href="#L346">346</a> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Map&lt;K,V&gt; map;
+<a class="jxr_linenumber" name="L347" href="#L347">347</a> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Class&lt;K&gt; keyType;
+<a class="jxr_linenumber" name="L348" href="#L348">348</a> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Class&lt;V&gt; valueType;
+<a class="jxr_linenumber" name="L349" href="#L349">349</a> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Function&lt;Object,K&gt; keyFunction;
+<a class="jxr_linenumber" name="L350" href="#L350">350</a> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Function&lt;Object,V&gt; valueFunction;
+<a class="jxr_linenumber" name="L351" href="#L351">351</a> 
+<a class="jxr_linenumber" name="L352" href="#L352">352</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L353" href="#L353">353</a> <em class="jxr_javadoccomment">	 * Constructor.</em>
 <a class="jxr_linenumber" name="L354" href="#L354">354</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L355" href="#L355">355</a> <em class="jxr_javadoccomment">	 * @param key The key with which the specified value is to be associated.</em>
-<a class="jxr_linenumber" name="L356" href="#L356">356</a> <em class="jxr_javadoccomment">	 * @param value The value to be associated with the specified key.</em>
-<a class="jxr_linenumber" name="L357" href="#L357">357</a> <em class="jxr_javadoccomment">	 * @return The previous value associated with &lt;c&gt;key&lt;/c&gt;, or &lt;jk&gt;null&lt;/jk&gt; if there was no mapping for &lt;c&gt;key&lt;/c&gt;.</em>
-<a class="jxr_linenumber" name="L358" href="#L358">358</a> <em class="jxr_javadoccomment">	 * 	This applies whether the entry was added or filtered out.</em>
-<a class="jxr_linenumber" name="L359" href="#L359">359</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L360" href="#L360">360</a> 	@Override
-<a class="jxr_linenumber" name="L361" href="#L361">361</a> 	<strong class="jxr_keyword">public</strong> V put(K key, V value) {
-<a class="jxr_linenumber" name="L362" href="#L362">362</a> 		<strong class="jxr_keyword">if</strong> (filter.test(key, value))
-<a class="jxr_linenumber" name="L363" href="#L363">363</a> 			<strong class="jxr_keyword">return</strong> map.put(key, value);
-<a class="jxr_linenumber" name="L364" href="#L364">364</a> 		<strong class="jxr_keyword">return</strong> map.get(key);  <em class="jxr_comment">// Return previous value if exists, null otherwise</em>
-<a class="jxr_linenumber" name="L365" href="#L365">365</a> 	}
-<a class="jxr_linenumber" name="L366" href="#L366">366</a> 
-<a class="jxr_linenumber" name="L367" href="#L367">367</a> 	@Override
-<a class="jxr_linenumber" name="L368" href="#L368">368</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> putAll(Map&lt;? <strong class="jxr_keyword">extends</strong> K, ? <strong class="jxr_keyword">extends</strong> V&gt; m) {
-<a class="jxr_linenumber" name="L369" href="#L369">369</a> 		<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> entry : m.entrySet()) {
-<a class="jxr_linenumber" name="L370" href="#L370">370</a> 			<strong class="jxr_keyword">if</strong> (filter.test(entry.getKey(), entry.getValue()))
-<a class="jxr_linenumber" name="L371" href="#L371">371</a> 				map.put(entry.getKey(), entry.getValue());
-<a class="jxr_linenumber" name="L372" href="#L372">372</a> 		}
-<a class="jxr_linenumber" name="L373" href="#L373">373</a> 	}
-<a class="jxr_linenumber" name="L374" href="#L374">374</a> 
-<a class="jxr_linenumber" name="L375" href="#L375">375</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L376" href="#L376">376</a> <em class="jxr_javadoccomment">	 * Tests whether the specified key-value pair would pass the filter and be added to this map.</em>
+<a class="jxr_linenumber" name="L355" href="#L355">355</a> <em class="jxr_javadoccomment">	 * @param filter The filter predicate. Can be &lt;jk&gt;null&lt;/jk&gt; (if null, all entries are accepted).</em>
+<a class="jxr_linenumber" name="L356" href="#L356">356</a> <em class="jxr_javadoccomment">	 * @param map The underlying map. Must not be &lt;jk&gt;null&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L357" href="#L357">357</a> <em class="jxr_javadoccomment">	 * @param keyType The key type. Must not be &lt;jk&gt;null&lt;/jk&gt; (use &lt;c&gt;Object.class&lt;/c&gt; to disable type checking).</em>
+<a class="jxr_linenumber" name="L358" href="#L358">358</a> <em class="jxr_javadoccomment">	 * @param valueType The value type. Must not be &lt;jk&gt;null&lt;/jk&gt; (use &lt;c&gt;Object.class&lt;/c&gt; to disable type checking).</em>
+<a class="jxr_linenumber" name="L359" href="#L359">359</a> <em class="jxr_javadoccomment">	 * @param keyFunction The key conversion function, or &lt;jk&gt;null&lt;/jk&gt; if not specified.</em>
+<a class="jxr_linenumber" name="L360" href="#L360">360</a> <em class="jxr_javadoccomment">	 * @param valueFunction The value conversion function, or &lt;jk&gt;null&lt;/jk&gt; if not specified.</em>
+<a class="jxr_linenumber" name="L361" href="#L361">361</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L362" href="#L362">362</a> 	<strong class="jxr_keyword">protected</strong> <a name="FilteredMap" href="../../../../../org/apache/juneau/commons/collections/FilteredMap.html#FilteredMap">FilteredMap</a>(BiPredicate&lt;K,V&gt; filter, Map&lt;K,V&gt; map, Class&lt;K&gt; keyType, Class&lt;V&gt; valueType, Function&lt;Object,K&gt; keyFunction, Function&lt;Object,V&gt; valueFunction) {
+<a class="jxr_linenumber" name="L363" href="#L363">363</a> 		<strong class="jxr_keyword">this</strong>.filter = assertArgNotNull(<span class="jxr_string">"filter"</span>, filter);
+<a class="jxr_linenumber" name="L364" href="#L364">364</a> 		<strong class="jxr_keyword">this</strong>.map = assertArgNotNull(<span class="jxr_string">"map"</span>, map);
+<a class="jxr_linenumber" name="L365" href="#L365">365</a> 		<strong class="jxr_keyword">this</strong>.keyType = assertArgNotNull(<span class="jxr_string">"keyType"</span>, keyType);
+<a class="jxr_linenumber" name="L366" href="#L366">366</a> 		<strong class="jxr_keyword">this</strong>.valueType = assertArgNotNull(<span class="jxr_string">"valueType"</span>, valueType);
+<a class="jxr_linenumber" name="L367" href="#L367">367</a> 		<strong class="jxr_keyword">this</strong>.keyFunction = keyFunction;
+<a class="jxr_linenumber" name="L368" href="#L368">368</a> 		<strong class="jxr_keyword">this</strong>.valueFunction = valueFunction;
+<a class="jxr_linenumber" name="L369" href="#L369">369</a> 	}
+<a class="jxr_linenumber" name="L370" href="#L370">370</a> 
+<a class="jxr_linenumber" name="L371" href="#L371">371</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L372" href="#L372">372</a> <em class="jxr_javadoccomment">	 * Associates the specified value with the specified key in this map, if the entry passes the filter.</em>
+<a class="jxr_linenumber" name="L373" href="#L373">373</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L374" href="#L374">374</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L375" href="#L375">375</a> <em class="jxr_javadoccomment">	 * If the entry passes the filter, it is added to the map and this method returns the previous value</em>
+<a class="jxr_linenumber" name="L376" href="#L376">376</a> <em class="jxr_javadoccomment">	 * associated with the key (or &lt;jk&gt;null&lt;/jk&gt; if there was no mapping).</em>
 <a class="jxr_linenumber" name="L377" href="#L377">377</a> <em class="jxr_javadoccomment">	 *</em>
 <a class="jxr_linenumber" name="L378" href="#L378">378</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L379" href="#L379">379</a> <em class="jxr_javadoccomment">	 * This method can be used to check if an entry would be accepted by the filter without actually</em>
-<a class="jxr_linenumber" name="L380" href="#L380">380</a> <em class="jxr_javadoccomment">	 * adding it to the map. This is useful for validation, debugging, or pre-checking entries before</em>
-<a class="jxr_linenumber" name="L381" href="#L381">381</a> <em class="jxr_javadoccomment">	 * attempting to add them.</em>
+<a class="jxr_linenumber" name="L379" href="#L379">379</a> <em class="jxr_javadoccomment">	 * If the entry is filtered out, it is not added to the map. This method returns the previous value</em>
+<a class="jxr_linenumber" name="L380" href="#L380">380</a> <em class="jxr_javadoccomment">	 * associated with the key (or &lt;jk&gt;null&lt;/jk&gt; if there was no mapping). This allows callers to distinguish</em>
+<a class="jxr_linenumber" name="L381" href="#L381">381</a> <em class="jxr_javadoccomment">	 * between a new entry being filtered out versus an existing entry being filtered out.</em>
 <a class="jxr_linenumber" name="L382" href="#L382">382</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L383" href="#L383">383</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L384" href="#L384">384</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L385" href="#L385">385</a> <em class="jxr_javadoccomment">	 * 	FilteredMap&amp;lt;String, Integer&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = FilteredMap</em>
-<a class="jxr_linenumber" name="L386" href="#L386">386</a> <em class="jxr_javadoccomment">	 * 		.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, Integer.&lt;jk&gt;class&lt;/jk&gt;)</em>
-<a class="jxr_linenumber" name="L387" href="#L387">387</a> <em class="jxr_javadoccomment">	 * 		.filter((k, v) -&amp;gt; v != &lt;jk&gt;null&lt;/jk&gt; &amp;amp;&amp;amp; v &amp;gt; 0)</em>
-<a class="jxr_linenumber" name="L388" href="#L388">388</a> <em class="jxr_javadoccomment">	 * 		.build();</em>
-<a class="jxr_linenumber" name="L389" href="#L389">389</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L390" href="#L390">390</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;if&lt;/jk&gt; (&lt;jv&gt;map&lt;/jv&gt;.wouldAccept(&lt;js&gt;"key"&lt;/js&gt;, 5)) {</em>
-<a class="jxr_linenumber" name="L391" href="#L391">391</a> <em class="jxr_javadoccomment">	 * 		&lt;jv&gt;map&lt;/jv&gt;.put(&lt;js&gt;"key"&lt;/js&gt;, 5);  &lt;jc&gt;// Will be added&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L392" href="#L392">392</a> <em class="jxr_javadoccomment">	 * 	}</em>
-<a class="jxr_linenumber" name="L393" href="#L393">393</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L394" href="#L394">394</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L395" href="#L395">395</a> <em class="jxr_javadoccomment">	 * @param key The key to test.</em>
-<a class="jxr_linenumber" name="L396" href="#L396">396</a> <em class="jxr_javadoccomment">	 * @param value The value to test.</em>
-<a class="jxr_linenumber" name="L397" href="#L397">397</a> <em class="jxr_javadoccomment">	 * @return &lt;jk&gt;true&lt;/jk&gt; if the entry would be added to the map, &lt;jk&gt;false&lt;/jk&gt; if it would be filtered out.</em>
-<a class="jxr_linenumber" name="L398" href="#L398">398</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L399" href="#L399">399</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> wouldAccept(K key, V value) {
-<a class="jxr_linenumber" name="L400" href="#L400">400</a> 		<strong class="jxr_keyword">return</strong> filter.test(key, value);
+<a class="jxr_linenumber" name="L383" href="#L383">383</a> <em class="jxr_javadoccomment">	 * @param key The key with which the specified value is to be associated.</em>
+<a class="jxr_linenumber" name="L384" href="#L384">384</a> <em class="jxr_javadoccomment">	 * @param value The value to be associated with the specified key.</em>
+<a class="jxr_linenumber" name="L385" href="#L385">385</a> <em class="jxr_javadoccomment">	 * @return The previous value associated with &lt;c&gt;key&lt;/c&gt;, or &lt;jk&gt;null&lt;/jk&gt; if there was no mapping for &lt;c&gt;key&lt;/c&gt;.</em>
+<a class="jxr_linenumber" name="L386" href="#L386">386</a> <em class="jxr_javadoccomment">	 * 	This applies whether the entry was added or filtered out.</em>
+<a class="jxr_linenumber" name="L387" href="#L387">387</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L388" href="#L388">388</a> 	@Override
+<a class="jxr_linenumber" name="L389" href="#L389">389</a> 	<strong class="jxr_keyword">public</strong> V put(K key, V value) {
+<a class="jxr_linenumber" name="L390" href="#L390">390</a> 		<strong class="jxr_keyword">if</strong> (filter.test(key, value))
+<a class="jxr_linenumber" name="L391" href="#L391">391</a> 			<strong class="jxr_keyword">return</strong> map.put(key, value);
+<a class="jxr_linenumber" name="L392" href="#L392">392</a> 		<strong class="jxr_keyword">return</strong> map.get(key);  <em class="jxr_comment">// Return previous value if exists, null otherwise</em>
+<a class="jxr_linenumber" name="L393" href="#L393">393</a> 	}
+<a class="jxr_linenumber" name="L394" href="#L394">394</a> 
+<a class="jxr_linenumber" name="L395" href="#L395">395</a> 	@Override
+<a class="jxr_linenumber" name="L396" href="#L396">396</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> putAll(Map&lt;? <strong class="jxr_keyword">extends</strong> K, ? <strong class="jxr_keyword">extends</strong> V&gt; m) {
+<a class="jxr_linenumber" name="L397" href="#L397">397</a> 		<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> entry : m.entrySet()) {
+<a class="jxr_linenumber" name="L398" href="#L398">398</a> 			<strong class="jxr_keyword">if</strong> (filter.test(entry.getKey(), entry.getValue()))
+<a class="jxr_linenumber" name="L399" href="#L399">399</a> 				map.put(entry.getKey(), entry.getValue());
+<a class="jxr_linenumber" name="L400" href="#L400">400</a> 		}
 <a class="jxr_linenumber" name="L401" href="#L401">401</a> 	}
 <a class="jxr_linenumber" name="L402" href="#L402">402</a> 
 <a class="jxr_linenumber" name="L403" href="#L403">403</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L404" href="#L404">404</a> <em class="jxr_javadoccomment">	 * Returns the filter predicate used by this map.</em>
+<a class="jxr_linenumber" name="L404" href="#L404">404</a> <em class="jxr_javadoccomment">	 * Tests whether the specified key-value pair would pass the filter and be added to this map.</em>
 <a class="jxr_linenumber" name="L405" href="#L405">405</a> <em class="jxr_javadoccomment">	 *</em>
 <a class="jxr_linenumber" name="L406" href="#L406">406</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L407" href="#L407">407</a> <em class="jxr_javadoccomment">	 * This method provides access to the filter for debugging, inspection, or advanced use cases.</em>
-<a class="jxr_linenumber" name="L408" href="#L408">408</a> <em class="jxr_javadoccomment">	 * The returned predicate is the same instance used internally by this map.</em>
-<a class="jxr_linenumber" name="L409" href="#L409">409</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L410" href="#L410">410</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L411" href="#L411">411</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L412" href="#L412">412</a> <em class="jxr_javadoccomment">	 * 	FilteredMap&amp;lt;String, Integer&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = FilteredMap</em>
-<a class="jxr_linenumber" name="L413" href="#L413">413</a> <em class="jxr_javadoccomment">	 * 		.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, Integer.&lt;jk&gt;class&lt;/jk&gt;)</em>
-<a class="jxr_linenumber" name="L414" href="#L414">414</a> <em class="jxr_javadoccomment">	 * 		.filter((k, v) -&amp;gt; v != &lt;jk&gt;null&lt;/jk&gt; &amp;amp;&amp;amp; v &amp;gt; 0)</em>
-<a class="jxr_linenumber" name="L415" href="#L415">415</a> <em class="jxr_javadoccomment">	 * 		.build();</em>
-<a class="jxr_linenumber" name="L416" href="#L416">416</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L417" href="#L417">417</a> <em class="jxr_javadoccomment">	 * 	BiPredicate&amp;lt;String, Integer&amp;gt; &lt;jv&gt;filter&lt;/jv&gt; = &lt;jv&gt;map&lt;/jv&gt;.getFilter();</em>
-<a class="jxr_linenumber" name="L418" href="#L418">418</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Use filter for other purposes&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L419" href="#L419">419</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L420" href="#L420">420</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L421" href="#L421">421</a> <em class="jxr_javadoccomment">	 * @return The filter predicate. Never &lt;jk&gt;null&lt;/jk&gt;.</em>
-<a class="jxr_linenumber" name="L422" href="#L422">422</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L423" href="#L423">423</a> 	<strong class="jxr_keyword">public</strong> BiPredicate&lt;K,V&gt; getFilter() {
-<a class="jxr_linenumber" name="L424" href="#L424">424</a> 		<strong class="jxr_keyword">return</strong> filter;
-<a class="jxr_linenumber" name="L425" href="#L425">425</a> 	}
-<a class="jxr_linenumber" name="L426" href="#L426">426</a> 
-<a class="jxr_linenumber" name="L427" href="#L427">427</a> 	@Override
-<a class="jxr_linenumber" name="L428" href="#L428">428</a> 	<strong class="jxr_keyword">public</strong> Set&lt;Entry&lt;K,V&gt;&gt; entrySet() {
-<a class="jxr_linenumber" name="L429" href="#L429">429</a> 		<strong class="jxr_keyword">return</strong> map.entrySet();
-<a class="jxr_linenumber" name="L430" href="#L430">430</a> 	}
-<a class="jxr_linenumber" name="L431" href="#L431">431</a> 
-<a class="jxr_linenumber" name="L432" href="#L432">432</a> 	@Override
-<a class="jxr_linenumber" name="L433" href="#L433">433</a> 	<strong class="jxr_keyword">public</strong> V get(Object key) {
-<a class="jxr_linenumber" name="L434" href="#L434">434</a> 		<strong class="jxr_keyword">return</strong> map.get(key);
-<a class="jxr_linenumber" name="L435" href="#L435">435</a> 	}
-<a class="jxr_linenumber" name="L436" href="#L436">436</a> 
-<a class="jxr_linenumber" name="L437" href="#L437">437</a> 	@Override
-<a class="jxr_linenumber" name="L438" href="#L438">438</a> 	<strong class="jxr_keyword">public</strong> V remove(Object key) {
-<a class="jxr_linenumber" name="L439" href="#L439">439</a> 		<strong class="jxr_keyword">return</strong> map.remove(key);
-<a class="jxr_linenumber" name="L440" href="#L440">440</a> 	}
-<a class="jxr_linenumber" name="L441" href="#L441">441</a> 
-<a class="jxr_linenumber" name="L442" href="#L442">442</a> 	@Override
-<a class="jxr_linenumber" name="L443" href="#L443">443</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> containsKey(Object key) {
-<a class="jxr_linenumber" name="L444" href="#L444">444</a> 		<strong class="jxr_keyword">return</strong> map.containsKey(key);
-<a class="jxr_linenumber" name="L445" href="#L445">445</a> 	}
-<a class="jxr_linenumber" name="L446" href="#L446">446</a> 
-<a class="jxr_linenumber" name="L447" href="#L447">447</a> 	@Override
-<a class="jxr_linenumber" name="L448" href="#L448">448</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> containsValue(Object value) {
-<a class="jxr_linenumber" name="L449" href="#L449">449</a> 		<strong class="jxr_keyword">return</strong> map.containsValue(value);
-<a class="jxr_linenumber" name="L450" href="#L450">450</a> 	}
-<a class="jxr_linenumber" name="L451" href="#L451">451</a> 
-<a class="jxr_linenumber" name="L452" href="#L452">452</a> 	@Override
-<a class="jxr_linenumber" name="L453" href="#L453">453</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> size() {
-<a class="jxr_linenumber" name="L454" href="#L454">454</a> 		<strong class="jxr_keyword">return</strong> map.size();
-<a class="jxr_linenumber" name="L455" href="#L455">455</a> 	}
-<a class="jxr_linenumber" name="L456" href="#L456">456</a> 
-<a class="jxr_linenumber" name="L457" href="#L457">457</a> 	@Override
-<a class="jxr_linenumber" name="L458" href="#L458">458</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> isEmpty() {
-<a class="jxr_linenumber" name="L459" href="#L459">459</a> 		<strong class="jxr_keyword">return</strong> map.isEmpty();
-<a class="jxr_linenumber" name="L460" href="#L460">460</a> 	}
-<a class="jxr_linenumber" name="L461" href="#L461">461</a> 
-<a class="jxr_linenumber" name="L462" href="#L462">462</a> 	@Override
-<a class="jxr_linenumber" name="L463" href="#L463">463</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> clear() {
-<a class="jxr_linenumber" name="L464" href="#L464">464</a> 		map.clear();
-<a class="jxr_linenumber" name="L465" href="#L465">465</a> 	}
-<a class="jxr_linenumber" name="L466" href="#L466">466</a> 
-<a class="jxr_linenumber" name="L467" href="#L467">467</a> 	@Override
-<a class="jxr_linenumber" name="L468" href="#L468">468</a> 	<strong class="jxr_keyword">public</strong> Set&lt;K&gt; keySet() {
-<a class="jxr_linenumber" name="L469" href="#L469">469</a> 		<strong class="jxr_keyword">return</strong> map.keySet();
-<a class="jxr_linenumber" name="L470" href="#L470">470</a> 	}
-<a class="jxr_linenumber" name="L471" href="#L471">471</a> 
-<a class="jxr_linenumber" name="L472" href="#L472">472</a> 	@Override
-<a class="jxr_linenumber" name="L473" href="#L473">473</a> 	<strong class="jxr_keyword">public</strong> Collection&lt;V&gt; values() {
-<a class="jxr_linenumber" name="L474" href="#L474">474</a> 		<strong class="jxr_keyword">return</strong> map.values();
-<a class="jxr_linenumber" name="L475" href="#L475">475</a> 	}
-<a class="jxr_linenumber" name="L476" href="#L476">476</a> 
-<a class="jxr_linenumber" name="L477" href="#L477">477</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L478" href="#L478">478</a> <em class="jxr_javadoccomment">	 * Adds an entry to this map with automatic type conversion.</em>
-<a class="jxr_linenumber" name="L479" href="#L479">479</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L480" href="#L480">480</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L481" href="#L481">481</a> <em class="jxr_javadoccomment">	 * This method converts the key and value using the configured converters (if any) and validates</em>
-<a class="jxr_linenumber" name="L482" href="#L482">482</a> <em class="jxr_javadoccomment">	 * the types (if key/value types were specified when creating the map). After conversion and validation,</em>
-<a class="jxr_linenumber" name="L483" href="#L483">483</a> <em class="jxr_javadoccomment">	 * the entry is added using the standard {@link #put(Object, Object)} method, which applies the filter.</em>
-<a class="jxr_linenumber" name="L484" href="#L484">484</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L485" href="#L485">485</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Type Conversion:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L486" href="#L486">486</a> <em class="jxr_javadoccomment">	 * &lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L487" href="#L487">487</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;If a key function is configured, the key is converted by applying the function</em>
-<a class="jxr_linenumber" name="L488" href="#L488">488</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;If a value function is configured, the value is converted by applying the function</em>
-<a class="jxr_linenumber" name="L489" href="#L489">489</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;If no function is configured, the object is used as-is (but may be validated if types were specified)</em>
-<a class="jxr_linenumber" name="L490" href="#L490">490</a> <em class="jxr_javadoccomment">	 * &lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L491" href="#L491">491</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L492" href="#L492">492</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Type Validation:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L493" href="#L493">493</a> <em class="jxr_javadoccomment">	 * &lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L494" href="#L494">494</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;If key type was specified (via {@link #create(Class, Class)}), the converted key must be an instance of that type</em>
-<a class="jxr_linenumber" name="L495" href="#L495">495</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;If value type was specified (via {@link #create(Class, Class)}), the converted value must be an instance of that type</em>
-<a class="jxr_linenumber" name="L496" href="#L496">496</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;If {@link #create()} was used (no types specified), &lt;c&gt;Object.class&lt;/c&gt; is used, which accepts any type</em>
-<a class="jxr_linenumber" name="L497" href="#L497">497</a> <em class="jxr_javadoccomment">	 * &lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L498" href="#L498">498</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L499" href="#L499">499</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Return Value:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L500" href="#L500">500</a> <em class="jxr_javadoccomment">	 * &lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L501" href="#L501">501</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;If the entry is added successfully, returns the previous value associated with the key (or &lt;jk&gt;null&lt;/jk&gt; if there was no mapping)</em>
-<a class="jxr_linenumber" name="L502" href="#L502">502</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;If the entry is filtered out, returns &lt;jk&gt;null&lt;/jk&gt; (even if there was a previous value)</em>
-<a class="jxr_linenumber" name="L503" href="#L503">503</a> <em class="jxr_javadoccomment">	 * &lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L504" href="#L504">504</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L505" href="#L505">505</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L506" href="#L506">506</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L507" href="#L507">507</a> <em class="jxr_javadoccomment">	 * 	FilteredMap&amp;lt;String, Integer&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = FilteredMap</em>
-<a class="jxr_linenumber" name="L508" href="#L508">508</a> <em class="jxr_javadoccomment">	 * 		.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, Integer.&lt;jk&gt;class&lt;/jk&gt;)</em>
-<a class="jxr_linenumber" name="L509" href="#L509">509</a> <em class="jxr_javadoccomment">	 * 		.filter((k, v) -&amp;gt; v != &lt;jk&gt;null&lt;/jk&gt; &amp;amp;&amp;amp; v &amp;gt; 0)</em>
-<a class="jxr_linenumber" name="L510" href="#L510">510</a> <em class="jxr_javadoccomment">	 * 		.valueFunction(o -&amp;gt; Integer.parseInt(o.toString()))</em>
-<a class="jxr_linenumber" name="L511" href="#L511">511</a> <em class="jxr_javadoccomment">	 * 		.build();</em>
-<a class="jxr_linenumber" name="L512" href="#L512">512</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L513" href="#L513">513</a> <em class="jxr_javadoccomment">	 * 	&lt;jv&gt;map&lt;/jv&gt;.add(&lt;js&gt;"key"&lt;/js&gt;, &lt;js&gt;"123"&lt;/js&gt;);  &lt;jc&gt;// Value converted from String to Integer&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L514" href="#L514">514</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L515" href="#L515">515</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L516" href="#L516">516</a> <em class="jxr_javadoccomment">	 * @param key The key to add. Will be converted if a key function is configured.</em>
-<a class="jxr_linenumber" name="L517" href="#L517">517</a> <em class="jxr_javadoccomment">	 * @param value The value to add. Will be converted if a value function is configured.</em>
-<a class="jxr_linenumber" name="L518" href="#L518">518</a> <em class="jxr_javadoccomment">	 * @return The previous value associated with the key if the entry was added, or &lt;jk&gt;null&lt;/jk&gt; if there was no mapping or the entry was filtered out.</em>
-<a class="jxr_linenumber" name="L519" href="#L519">519</a> <em class="jxr_javadoccomment">	 * @throws RuntimeException If conversion fails or type validation fails.</em>
-<a class="jxr_linenumber" name="L520" href="#L520">520</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L521" href="#L521">521</a> 	<strong class="jxr_keyword">public</strong> V add(Object key, Object value) {
-<a class="jxr_linenumber" name="L522" href="#L522">522</a> 		K convertedKey = convertKey(key);
-<a class="jxr_linenumber" name="L523" href="#L523">523</a> 		V convertedValue = convertValue(value);
-<a class="jxr_linenumber" name="L524" href="#L524">524</a> 		<strong class="jxr_keyword">if</strong> (filter.test(convertedKey, convertedValue))
-<a class="jxr_linenumber" name="L525" href="#L525">525</a> 			<strong class="jxr_keyword">return</strong> put(convertedKey, convertedValue);
-<a class="jxr_linenumber" name="L526" href="#L526">526</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;  <em class="jxr_comment">// Filtered out, return null</em>
-<a class="jxr_linenumber" name="L527" href="#L527">527</a> 	}
-<a class="jxr_linenumber" name="L528" href="#L528">528</a> 
-<a class="jxr_linenumber" name="L529" href="#L529">529</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L530" href="#L530">530</a> <em class="jxr_javadoccomment">	 * Adds all entries from the specified map with automatic type conversion.</em>
-<a class="jxr_linenumber" name="L531" href="#L531">531</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L532" href="#L532">532</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L533" href="#L533">533</a> <em class="jxr_javadoccomment">	 * This method iterates over all entries in the source map and adds each one using {@link #add(Object, Object)},</em>
-<a class="jxr_linenumber" name="L534" href="#L534">534</a> <em class="jxr_javadoccomment">	 * which applies conversion and validation before adding.</em>
-<a class="jxr_linenumber" name="L535" href="#L535">535</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L536" href="#L536">536</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L537" href="#L537">537</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L538" href="#L538">538</a> <em class="jxr_javadoccomment">	 * 	FilteredMap&amp;lt;String, Integer&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = FilteredMap</em>
-<a class="jxr_linenumber" name="L539" href="#L539">539</a> <em class="jxr_javadoccomment">	 * 		.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, Integer.&lt;jk&gt;class&lt;/jk&gt;)</em>
-<a class="jxr_linenumber" name="L540" href="#L540">540</a> <em class="jxr_javadoccomment">	 * 		.filter((k, v) -&amp;gt; v != &lt;jk&gt;null&lt;/jk&gt; &amp;amp;&amp;amp; v &amp;gt; 0)</em>
-<a class="jxr_linenumber" name="L541" href="#L541">541</a> <em class="jxr_javadoccomment">	 * 		.valueFunction(o -&amp;gt; Integer.parseInt(o.toString()))</em>
-<a class="jxr_linenumber" name="L542" href="#L542">542</a> <em class="jxr_javadoccomment">	 * 		.build();</em>
-<a class="jxr_linenumber" name="L543" href="#L543">543</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L544" href="#L544">544</a> <em class="jxr_javadoccomment">	 * 	Map&amp;lt;String, String&amp;gt; &lt;jv&gt;source&lt;/jv&gt; = Map.of(&lt;js&gt;"a"&lt;/js&gt;, &lt;js&gt;"5"&lt;/js&gt;, &lt;js&gt;"b"&lt;/js&gt;, &lt;js&gt;"-1"&lt;/js&gt;);</em>
-<a class="jxr_linenumber" name="L545" href="#L545">545</a> <em class="jxr_javadoccomment">	 * 	&lt;jv&gt;map&lt;/jv&gt;.addAll(&lt;jv&gt;source&lt;/jv&gt;);  &lt;jc&gt;// Values converted, negative value filtered out&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L546" href="#L546">546</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L547" href="#L547">547</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L548" href="#L548">548</a> <em class="jxr_javadoccomment">	 * @param source The map containing entries to add. Can be &lt;jk&gt;null&lt;/jk&gt; (no-op).</em>
+<a class="jxr_linenumber" name="L407" href="#L407">407</a> <em class="jxr_javadoccomment">	 * This method can be used to check if an entry would be accepted by the filter without actually</em>
+<a class="jxr_linenumber" name="L408" href="#L408">408</a> <em class="jxr_javadoccomment">	 * adding it to the map. This is useful for validation, debugging, or pre-checking entries before</em>
+<a class="jxr_linenumber" name="L409" href="#L409">409</a> <em class="jxr_javadoccomment">	 * attempting to add them.</em>
+<a class="jxr_linenumber" name="L410" href="#L410">410</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L411" href="#L411">411</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L412" href="#L412">412</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L413" href="#L413">413</a> <em class="jxr_javadoccomment">	 * 	FilteredMap&amp;lt;String, Integer&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = FilteredMap</em>
+<a class="jxr_linenumber" name="L414" href="#L414">414</a> <em class="jxr_javadoccomment">	 * 		.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, Integer.&lt;jk&gt;class&lt;/jk&gt;)</em>
+<a class="jxr_linenumber" name="L415" href="#L415">415</a> <em class="jxr_javadoccomment">	 * 		.filter((k, v) -&amp;gt; v != &lt;jk&gt;null&lt;/jk&gt; &amp;amp;&amp;amp; v &amp;gt; 0)</em>
+<a class="jxr_linenumber" name="L416" href="#L416">416</a> <em class="jxr_javadoccomment">	 * 		.build();</em>
+<a class="jxr_linenumber" name="L417" href="#L417">417</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L418" href="#L418">418</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;if&lt;/jk&gt; (&lt;jv&gt;map&lt;/jv&gt;.wouldAccept(&lt;js&gt;"key"&lt;/js&gt;, 5)) {</em>
+<a class="jxr_linenumber" name="L419" href="#L419">419</a> <em class="jxr_javadoccomment">	 * 		&lt;jv&gt;map&lt;/jv&gt;.put(&lt;js&gt;"key"&lt;/js&gt;, 5);  &lt;jc&gt;// Will be added&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L420" href="#L420">420</a> <em class="jxr_javadoccomment">	 * 	}</em>
+<a class="jxr_linenumber" name="L421" href="#L421">421</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L422" href="#L422">422</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L423" href="#L423">423</a> <em class="jxr_javadoccomment">	 * @param key The key to test.</em>
+<a class="jxr_linenumber" name="L424" href="#L424">424</a> <em class="jxr_javadoccomment">	 * @param value The value to test.</em>
+<a class="jxr_linenumber" name="L425" href="#L425">425</a> <em class="jxr_javadoccomment">	 * @return &lt;jk&gt;true&lt;/jk&gt; if the entry would be added to the map, &lt;jk&gt;false&lt;/jk&gt; if it would be filtered out.</em>
+<a class="jxr_linenumber" name="L426" href="#L426">426</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L427" href="#L427">427</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> wouldAccept(K key, V value) {
+<a class="jxr_linenumber" name="L428" href="#L428">428</a> 		<strong class="jxr_keyword">return</strong> filter.test(key, value);
+<a class="jxr_linenumber" name="L429" href="#L429">429</a> 	}
+<a class="jxr_linenumber" name="L430" href="#L430">430</a> 
+<a class="jxr_linenumber" name="L431" href="#L431">431</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L432" href="#L432">432</a> <em class="jxr_javadoccomment">	 * Returns the filter predicate used by this map.</em>
+<a class="jxr_linenumber" name="L433" href="#L433">433</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L434" href="#L434">434</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L435" href="#L435">435</a> <em class="jxr_javadoccomment">	 * This method provides access to the filter for debugging, inspection, or advanced use cases.</em>
+<a class="jxr_linenumber" name="L436" href="#L436">436</a> <em class="jxr_javadoccomment">	 * The returned predicate is the combined filter used internally by this map. If multiple filters</em>
+<a class="jxr_linenumber" name="L437" href="#L437">437</a> <em class="jxr_javadoccomment">	 * were set via the builder, they are combined using AND logic.</em>
+<a class="jxr_linenumber" name="L438" href="#L438">438</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L439" href="#L439">439</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L440" href="#L440">440</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L441" href="#L441">441</a> <em class="jxr_javadoccomment">	 * 	FilteredMap&amp;lt;String, Integer&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = FilteredMap</em>
+<a class="jxr_linenumber" name="L442" href="#L442">442</a> <em class="jxr_javadoccomment">	 * 		.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, Integer.&lt;jk&gt;class&lt;/jk&gt;)</em>
+<a class="jxr_linenumber" name="L443" href="#L443">443</a> <em class="jxr_javadoccomment">	 * 		.filter((k, v) -&amp;gt; v != &lt;jk&gt;null&lt;/jk&gt; &amp;amp;&amp;amp; v &amp;gt; 0)</em>
+<a class="jxr_linenumber" name="L444" href="#L444">444</a> <em class="jxr_javadoccomment">	 * 		.build();</em>
+<a class="jxr_linenumber" name="L445" href="#L445">445</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L446" href="#L446">446</a> <em class="jxr_javadoccomment">	 * 	BiPredicate&amp;lt;String, Integer&amp;gt; &lt;jv&gt;filter&lt;/jv&gt; = &lt;jv&gt;map&lt;/jv&gt;.getFilter();</em>
+<a class="jxr_linenumber" name="L447" href="#L447">447</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Use filter for other purposes&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L448" href="#L448">448</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L449" href="#L449">449</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L450" href="#L450">450</a> <em class="jxr_javadoccomment">	 * @return The filter predicate. Never &lt;jk&gt;null&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L451" href="#L451">451</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L452" href="#L452">452</a> 	<strong class="jxr_keyword">public</strong> BiPredicate&lt;K,V&gt; getFilter() {
+<a class="jxr_linenumber" name="L453" href="#L453">453</a> 		<strong class="jxr_keyword">return</strong> filter;
+<a class="jxr_linenumber" name="L454" href="#L454">454</a> 	}
+<a class="jxr_linenumber" name="L455" href="#L455">455</a> 
+<a class="jxr_linenumber" name="L456" href="#L456">456</a> 	@Override
+<a class="jxr_linenumber" name="L457" href="#L457">457</a> 	<strong class="jxr_keyword">public</strong> Set&lt;Entry&lt;K,V&gt;&gt; entrySet() {
+<a class="jxr_linenumber" name="L458" href="#L458">458</a> 		<strong class="jxr_keyword">return</strong> map.entrySet();
+<a class="jxr_linenumber" name="L459" href="#L459">459</a> 	}
+<a class="jxr_linenumber" name="L460" href="#L460">460</a> 
+<a class="jxr_linenumber" name="L461" href="#L461">461</a> 	@Override
+<a class="jxr_linenumber" name="L462" href="#L462">462</a> 	<strong class="jxr_keyword">public</strong> V get(Object key) {
+<a class="jxr_linenumber" name="L463" href="#L463">463</a> 		<strong class="jxr_keyword">return</strong> map.get(key);
+<a class="jxr_linenumber" name="L464" href="#L464">464</a> 	}
+<a class="jxr_linenumber" name="L465" href="#L465">465</a> 
+<a class="jxr_linenumber" name="L466" href="#L466">466</a> 	@Override
+<a class="jxr_linenumber" name="L467" href="#L467">467</a> 	<strong class="jxr_keyword">public</strong> V remove(Object key) {
+<a class="jxr_linenumber" name="L468" href="#L468">468</a> 		<strong class="jxr_keyword">return</strong> map.remove(key);
+<a class="jxr_linenumber" name="L469" href="#L469">469</a> 	}
+<a class="jxr_linenumber" name="L470" href="#L470">470</a> 
+<a class="jxr_linenumber" name="L471" href="#L471">471</a> 	@Override
+<a class="jxr_linenumber" name="L472" href="#L472">472</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> containsKey(Object key) {
+<a class="jxr_linenumber" name="L473" href="#L473">473</a> 		<strong class="jxr_keyword">return</strong> map.containsKey(key);
+<a class="jxr_linenumber" name="L474" href="#L474">474</a> 	}
+<a class="jxr_linenumber" name="L475" href="#L475">475</a> 
+<a class="jxr_linenumber" name="L476" href="#L476">476</a> 	@Override
+<a class="jxr_linenumber" name="L477" href="#L477">477</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> containsValue(Object value) {
+<a class="jxr_linenumber" name="L478" href="#L478">478</a> 		<strong class="jxr_keyword">return</strong> map.containsValue(value);
+<a class="jxr_linenumber" name="L479" href="#L479">479</a> 	}
+<a class="jxr_linenumber" name="L480" href="#L480">480</a> 
+<a class="jxr_linenumber" name="L481" href="#L481">481</a> 	@Override
+<a class="jxr_linenumber" name="L482" href="#L482">482</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> size() {
+<a class="jxr_linenumber" name="L483" href="#L483">483</a> 		<strong class="jxr_keyword">return</strong> map.size();
+<a class="jxr_linenumber" name="L484" href="#L484">484</a> 	}
+<a class="jxr_linenumber" name="L485" href="#L485">485</a> 
+<a class="jxr_linenumber" name="L486" href="#L486">486</a> 	@Override
+<a class="jxr_linenumber" name="L487" href="#L487">487</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> isEmpty() {
+<a class="jxr_linenumber" name="L488" href="#L488">488</a> 		<strong class="jxr_keyword">return</strong> map.isEmpty();
+<a class="jxr_linenumber" name="L489" href="#L489">489</a> 	}
+<a class="jxr_linenumber" name="L490" href="#L490">490</a> 
+<a class="jxr_linenumber" name="L491" href="#L491">491</a> 	@Override
+<a class="jxr_linenumber" name="L492" href="#L492">492</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> clear() {
+<a class="jxr_linenumber" name="L493" href="#L493">493</a> 		map.clear();
+<a class="jxr_linenumber" name="L494" href="#L494">494</a> 	}
+<a class="jxr_linenumber" name="L495" href="#L495">495</a> 
+<a class="jxr_linenumber" name="L496" href="#L496">496</a> 	@Override
+<a class="jxr_linenumber" name="L497" href="#L497">497</a> 	<strong class="jxr_keyword">public</strong> Set&lt;K&gt; keySet() {
+<a class="jxr_linenumber" name="L498" href="#L498">498</a> 		<strong class="jxr_keyword">return</strong> map.keySet();
+<a class="jxr_linenumber" name="L499" href="#L499">499</a> 	}
+<a class="jxr_linenumber" name="L500" href="#L500">500</a> 
+<a class="jxr_linenumber" name="L501" href="#L501">501</a> 	@Override
+<a class="jxr_linenumber" name="L502" href="#L502">502</a> 	<strong class="jxr_keyword">public</strong> Collection&lt;V&gt; values() {
+<a class="jxr_linenumber" name="L503" href="#L503">503</a> 		<strong class="jxr_keyword">return</strong> map.values();
+<a class="jxr_linenumber" name="L504" href="#L504">504</a> 	}
+<a class="jxr_linenumber" name="L505" href="#L505">505</a> 
+<a class="jxr_linenumber" name="L506" href="#L506">506</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L507" href="#L507">507</a> <em class="jxr_javadoccomment">	 * Adds an entry to this map with automatic type conversion.</em>
+<a class="jxr_linenumber" name="L508" href="#L508">508</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L509" href="#L509">509</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L510" href="#L510">510</a> <em class="jxr_javadoccomment">	 * This method converts the key and value using the configured key/value functions (if any) and validates</em>
+<a class="jxr_linenumber" name="L511" href="#L511">511</a> <em class="jxr_javadoccomment">	 * the types (if key/value types were specified when creating the map). After conversion and validation,</em>
+<a class="jxr_linenumber" name="L512" href="#L512">512</a> <em class="jxr_javadoccomment">	 * the entry is added using the standard {@link #put(Object, Object)} method, which applies the filter.</em>
+<a class="jxr_linenumber" name="L513" href="#L513">513</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L514" href="#L514">514</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Type Conversion:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L515" href="#L515">515</a> <em class="jxr_javadoccomment">	 * &lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L516" href="#L516">516</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;If a key function is configured, the key is converted by applying the function</em>
+<a class="jxr_linenumber" name="L517" href="#L517">517</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;If a value function is configured, the value is converted by applying the function</em>
+<a class="jxr_linenumber" name="L518" href="#L518">518</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;If no function is configured, the object is used as-is (but may be validated if types were specified)</em>
+<a class="jxr_linenumber" name="L519" href="#L519">519</a> <em class="jxr_javadoccomment">	 * &lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L520" href="#L520">520</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L521" href="#L521">521</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Type Validation:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L522" href="#L522">522</a> <em class="jxr_javadoccomment">	 * &lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L523" href="#L523">523</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;If key type was specified (via {@link #create(Class, Class)}), the converted key must be an instance of that type</em>
+<a class="jxr_linenumber" name="L524" href="#L524">524</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;If value type was specified (via {@link #create(Class, Class)}), the converted value must be an instance of that type</em>
+<a class="jxr_linenumber" name="L525" href="#L525">525</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;If {@link #create()} was used (no types specified), &lt;c&gt;Object.class&lt;/c&gt; is used, which accepts any type</em>
+<a class="jxr_linenumber" name="L526" href="#L526">526</a> <em class="jxr_javadoccomment">	 * &lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L527" href="#L527">527</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L528" href="#L528">528</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Return Value:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L529" href="#L529">529</a> <em class="jxr_javadoccomment">	 * &lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L530" href="#L530">530</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;If the entry is added successfully, returns the previous value associated with the key (or &lt;jk&gt;null&lt;/jk&gt; if there was no mapping)</em>
+<a class="jxr_linenumber" name="L531" href="#L531">531</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;If the entry is filtered out, returns &lt;jk&gt;null&lt;/jk&gt; (even if there was a previous value)</em>
+<a class="jxr_linenumber" name="L532" href="#L532">532</a> <em class="jxr_javadoccomment">	 * &lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L533" href="#L533">533</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L534" href="#L534">534</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L535" href="#L535">535</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L536" href="#L536">536</a> <em class="jxr_javadoccomment">	 * 	FilteredMap&amp;lt;String, Integer&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = FilteredMap</em>
+<a class="jxr_linenumber" name="L537" href="#L537">537</a> <em class="jxr_javadoccomment">	 * 		.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, Integer.&lt;jk&gt;class&lt;/jk&gt;)</em>
+<a class="jxr_linenumber" name="L538" href="#L538">538</a> <em class="jxr_javadoccomment">	 * 		.filter((k, v) -&amp;gt; v != &lt;jk&gt;null&lt;/jk&gt; &amp;amp;&amp;amp; v &amp;gt; 0)</em>
+<a class="jxr_linenumber" name="L539" href="#L539">539</a> <em class="jxr_javadoccomment">	 * 		.valueFunction(o -&amp;gt; Integer.parseInt(o.toString()))</em>
+<a class="jxr_linenumber" name="L540" href="#L540">540</a> <em class="jxr_javadoccomment">	 * 		.build();</em>
+<a class="jxr_linenumber" name="L541" href="#L541">541</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L542" href="#L542">542</a> <em class="jxr_javadoccomment">	 * 	&lt;jv&gt;map&lt;/jv&gt;.add(&lt;js&gt;"key"&lt;/js&gt;, &lt;js&gt;"123"&lt;/js&gt;);  &lt;jc&gt;// Value converted from String to Integer&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L543" href="#L543">543</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L544" href="#L544">544</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L545" href="#L545">545</a> <em class="jxr_javadoccomment">	 * @param key The key to add. Will be converted if a key function is configured.</em>
+<a class="jxr_linenumber" name="L546" href="#L546">546</a> <em class="jxr_javadoccomment">	 * @param value The value to add. Will be converted if a value function is configured.</em>
+<a class="jxr_linenumber" name="L547" href="#L547">547</a> <em class="jxr_javadoccomment">	 * @return The previous value associated with the key if the entry was added, or &lt;jk&gt;null&lt;/jk&gt; if there was no mapping or the entry was filtered out.</em>
+<a class="jxr_linenumber" name="L548" href="#L548">548</a> <em class="jxr_javadoccomment">	 * @throws RuntimeException If conversion fails or type validation fails.</em>
 <a class="jxr_linenumber" name="L549" href="#L549">549</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L550" href="#L550">550</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> addAll(Map&lt;?,?&gt; source) {
-<a class="jxr_linenumber" name="L551" href="#L551">551</a> 		<strong class="jxr_keyword">if</strong> (source != <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L552" href="#L552">552</a> 			<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> entry : source.entrySet()) {
-<a class="jxr_linenumber" name="L553" href="#L553">553</a> 				add(entry.getKey(), entry.getValue());
-<a class="jxr_linenumber" name="L554" href="#L554">554</a> 			}
-<a class="jxr_linenumber" name="L555" href="#L555">555</a> 		}
+<a class="jxr_linenumber" name="L550" href="#L550">550</a> 	<strong class="jxr_keyword">public</strong> V add(Object key, Object value) {
+<a class="jxr_linenumber" name="L551" href="#L551">551</a> 		K convertedKey = convertKey(key);
+<a class="jxr_linenumber" name="L552" href="#L552">552</a> 		V convertedValue = convertValue(value);
+<a class="jxr_linenumber" name="L553" href="#L553">553</a> 		<strong class="jxr_keyword">if</strong> (filter.test(convertedKey, convertedValue))
+<a class="jxr_linenumber" name="L554" href="#L554">554</a> 			<strong class="jxr_keyword">return</strong> put(convertedKey, convertedValue);
+<a class="jxr_linenumber" name="L555" href="#L555">555</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;  <em class="jxr_comment">// Filtered out, return null</em>
 <a class="jxr_linenumber" name="L556" href="#L556">556</a> 	}
 <a class="jxr_linenumber" name="L557" href="#L557">557</a> 
-<a class="jxr_linenumber" name="L558" href="#L558">558</a> 	<strong class="jxr_keyword">private</strong> K convertKey(Object key) {
-<a class="jxr_linenumber" name="L559" href="#L559">559</a> 		<strong class="jxr_keyword">if</strong> (keyFunction != <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L560" href="#L560">560</a> 			key = keyFunction.apply(key);
-<a class="jxr_linenumber" name="L561" href="#L561">561</a> 		}
-<a class="jxr_linenumber" name="L562" href="#L562">562</a> 		<strong class="jxr_keyword">if</strong> (key == <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L563" href="#L563">563</a> 			<em class="jxr_comment">// Allow null for non-primitive types</em>
-<a class="jxr_linenumber" name="L564" href="#L564">564</a> 			<strong class="jxr_keyword">if</strong> (keyType.isPrimitive())
-<a class="jxr_linenumber" name="L565" href="#L565">565</a> 				<strong class="jxr_keyword">throw</strong> rex(<span class="jxr_string">"Cannot set null key for primitive type {0}"</span>, keyType.getName());
-<a class="jxr_linenumber" name="L566" href="#L566">566</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L567" href="#L567">567</a> 		}
-<a class="jxr_linenumber" name="L568" href="#L568">568</a> 		<strong class="jxr_keyword">if</strong> (keyType.isInstance(key))
-<a class="jxr_linenumber" name="L569" href="#L569">569</a> 			<strong class="jxr_keyword">return</strong> keyType.<strong class="jxr_keyword">cast</strong>(key);
-<a class="jxr_linenumber" name="L570" href="#L570">570</a> 		<strong class="jxr_keyword">throw</strong> rex(<span class="jxr_string">"Object of type {0} could not be converted to key type {1}"</span>, cn(key), cn(keyType));
-<a class="jxr_linenumber" name="L571" href="#L571">571</a> 	}
-<a class="jxr_linenumber" name="L572" href="#L572">572</a> 
-<a class="jxr_linenumber" name="L573" href="#L573">573</a> 	<strong class="jxr_keyword">private</strong> V convertValue(Object value) {
-<a class="jxr_linenumber" name="L574" href="#L574">574</a> 		<strong class="jxr_keyword">if</strong> (valueFunction != <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L575" href="#L575">575</a> 			value = valueFunction.apply(value);
-<a class="jxr_linenumber" name="L576" href="#L576">576</a> 		}
-<a class="jxr_linenumber" name="L577" href="#L577">577</a> 		<strong class="jxr_keyword">if</strong> (value == <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L578" href="#L578">578</a> 			<em class="jxr_comment">// Allow null for non-primitive types</em>
-<a class="jxr_linenumber" name="L579" href="#L579">579</a> 			<strong class="jxr_keyword">if</strong> (valueType.isPrimitive())
-<a class="jxr_linenumber" name="L580" href="#L580">580</a> 				<strong class="jxr_keyword">throw</strong> rex(<span class="jxr_string">"Cannot set null value for primitive type {0}"</span>, valueType.getName());
-<a class="jxr_linenumber" name="L581" href="#L581">581</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L582" href="#L582">582</a> 		}
-<a class="jxr_linenumber" name="L583" href="#L583">583</a> 		<strong class="jxr_keyword">if</strong> (valueType.isInstance(value))
-<a class="jxr_linenumber" name="L584" href="#L584">584</a> 			<strong class="jxr_keyword">return</strong> valueType.<strong class="jxr_keyword">cast</strong>(value);
-<a class="jxr_linenumber" name="L585" href="#L585">585</a> 		<strong class="jxr_keyword">throw</strong> rex(<span class="jxr_string">"Object of type {0} could not be converted to value type {1}"</span>, cn(value), cn(valueType));
-<a class="jxr_linenumber" name="L586" href="#L586">586</a> 	}
-<a class="jxr_linenumber" name="L587" href="#L587">587</a> 
-<a class="jxr_linenumber" name="L588" href="#L588">588</a> 	@Override
-<a class="jxr_linenumber" name="L589" href="#L589">589</a> 	<strong class="jxr_keyword">public</strong> String toString() {
-<a class="jxr_linenumber" name="L590" href="#L590">590</a> 		<strong class="jxr_keyword">return</strong> map.toString();
-<a class="jxr_linenumber" name="L591" href="#L591">591</a> 	}
-<a class="jxr_linenumber" name="L592" href="#L592">592</a> 
-<a class="jxr_linenumber" name="L593" href="#L593">593</a> 	@Override
-<a class="jxr_linenumber" name="L594" href="#L594">594</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> equals(Object o) {
-<a class="jxr_linenumber" name="L595" href="#L595">595</a> 		<strong class="jxr_keyword">return</strong> map.equals(o);
-<a class="jxr_linenumber" name="L596" href="#L596">596</a> 	}
-<a class="jxr_linenumber" name="L597" href="#L597">597</a> 
-<a class="jxr_linenumber" name="L598" href="#L598">598</a> 	@Override
-<a class="jxr_linenumber" name="L599" href="#L599">599</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> hashCode() {
-<a class="jxr_linenumber" name="L600" href="#L600">600</a> 		<strong class="jxr_keyword">return</strong> map.hashCode();
-<a class="jxr_linenumber" name="L601" href="#L601">601</a> 	}
-<a class="jxr_linenumber" name="L602" href="#L602">602</a> }
-<a class="jxr_linenumber" name="L603" href="#L603">603</a> 
+<a class="jxr_linenumber" name="L558" href="#L558">558</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L559" href="#L559">559</a> <em class="jxr_javadoccomment">	 * Adds all entries from the specified map with automatic type conversion.</em>
+<a class="jxr_linenumber" name="L560" href="#L560">560</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L561" href="#L561">561</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L562" href="#L562">562</a> <em class="jxr_javadoccomment">	 * This method iterates over all entries in the source map and adds each one using {@link #add(Object, Object)},</em>
+<a class="jxr_linenumber" name="L563" href="#L563">563</a> <em class="jxr_javadoccomment">	 * which applies conversion and validation before adding.</em>
+<a class="jxr_linenumber" name="L564" href="#L564">564</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L565" href="#L565">565</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L566" href="#L566">566</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L567" href="#L567">567</a> <em class="jxr_javadoccomment">	 * 	FilteredMap&amp;lt;String, Integer&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = FilteredMap</em>
+<a class="jxr_linenumber" name="L568" href="#L568">568</a> <em class="jxr_javadoccomment">	 * 		.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, Integer.&lt;jk&gt;class&lt;/jk&gt;)</em>
+<a class="jxr_linenumber" name="L569" href="#L569">569</a> <em class="jxr_javadoccomment">	 * 		.filter((k, v) -&amp;gt; v != &lt;jk&gt;null&lt;/jk&gt; &amp;amp;&amp;amp; v &amp;gt; 0)</em>
+<a class="jxr_linenumber" name="L570" href="#L570">570</a> <em class="jxr_javadoccomment">	 * 		.valueFunction(o -&amp;gt; Integer.parseInt(o.toString()))</em>
+<a class="jxr_linenumber" name="L571" href="#L571">571</a> <em class="jxr_javadoccomment">	 * 		.build();</em>
+<a class="jxr_linenumber" name="L572" href="#L572">572</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L573" href="#L573">573</a> <em class="jxr_javadoccomment">	 * 	Map&amp;lt;String, String&amp;gt; &lt;jv&gt;source&lt;/jv&gt; = Map.of(&lt;js&gt;"a"&lt;/js&gt;, &lt;js&gt;"5"&lt;/js&gt;, &lt;js&gt;"b"&lt;/js&gt;, &lt;js&gt;"-1"&lt;/js&gt;);</em>
+<a class="jxr_linenumber" name="L574" href="#L574">574</a> <em class="jxr_javadoccomment">	 * 	&lt;jv&gt;map&lt;/jv&gt;.addAll(&lt;jv&gt;source&lt;/jv&gt;);  &lt;jc&gt;// Values converted, negative value filtered out&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L575" href="#L575">575</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L576" href="#L576">576</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L577" href="#L577">577</a> <em class="jxr_javadoccomment">	 * @param source The map containing entries to add. Can be &lt;jk&gt;null&lt;/jk&gt; (no-op).</em>
+<a class="jxr_linenumber" name="L578" href="#L578">578</a> <em class="jxr_javadoccomment">	 * @return This object for method chaining.</em>
+<a class="jxr_linenumber" name="L579" href="#L579">579</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L580" href="#L580">580</a> 	<strong class="jxr_keyword">public</strong> FilteredMap&lt;K,V&gt; addAll(Map&lt;?,?&gt; source) {
+<a class="jxr_linenumber" name="L581" href="#L581">581</a> 		<strong class="jxr_keyword">if</strong> (source != <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="L582" href="#L582">582</a> 			<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> entry : source.entrySet()) {
+<a class="jxr_linenumber" name="L583" href="#L583">583</a> 				add(entry.getKey(), entry.getValue());
+<a class="jxr_linenumber" name="L584" href="#L584">584</a> 			}
+<a class="jxr_linenumber" name="L585" href="#L585">585</a> 		}
+<a class="jxr_linenumber" name="L586" href="#L586">586</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
+<a class="jxr_linenumber" name="L587" href="#L587">587</a> 	}
+<a class="jxr_linenumber" name="L588" href="#L588">588</a> 
+<a class="jxr_linenumber" name="L589" href="#L589">589</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L590" href="#L590">590</a> <em class="jxr_javadoccomment">	 * Adds arbitrary values to this map.</em>
+<a class="jxr_linenumber" name="L591" href="#L591">591</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L592" href="#L592">592</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L593" href="#L593">593</a> <em class="jxr_javadoccomment">	 * Objects can be any of the following:</em>
+<a class="jxr_linenumber" name="L594" href="#L594">594</a> <em class="jxr_javadoccomment">	 * &lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L595" href="#L595">595</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;Maps of key/value types convertible to the key/value types of this map.</em>
+<a class="jxr_linenumber" name="L596" href="#L596">596</a> <em class="jxr_javadoccomment">	 * &lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L597" href="#L597">597</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L598" href="#L598">598</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L599" href="#L599">599</a> <em class="jxr_javadoccomment">	 * Each entry from the maps will be added using {@link #add(Object, Object)}, which applies</em>
+<a class="jxr_linenumber" name="L600" href="#L600">600</a> <em class="jxr_javadoccomment">	 * conversion and filtering.</em>
+<a class="jxr_linenumber" name="L601" href="#L601">601</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L602" href="#L602">602</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L603" href="#L603">603</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L604" href="#L604">604</a> <em class="jxr_javadoccomment">	 * 	FilteredMap&amp;lt;String, Integer&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = FilteredMap</em>
+<a class="jxr_linenumber" name="L605" href="#L605">605</a> <em class="jxr_javadoccomment">	 * 		.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, Integer.&lt;jk&gt;class&lt;/jk&gt;)</em>
+<a class="jxr_linenumber" name="L606" href="#L606">606</a> <em class="jxr_javadoccomment">	 * 		.filter((k, v) -&amp;gt; v != &lt;jk&gt;null&lt;/jk&gt; &amp;amp;&amp;amp; v &amp;gt; 0)</em>
+<a class="jxr_linenumber" name="L607" href="#L607">607</a> <em class="jxr_javadoccomment">	 * 		.build();</em>
+<a class="jxr_linenumber" name="L608" href="#L608">608</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L609" href="#L609">609</a> <em class="jxr_javadoccomment">	 * 	Map&amp;lt;String, Integer&amp;gt; &lt;jv&gt;map1&lt;/jv&gt; = Map.of(&lt;js&gt;"a"&lt;/js&gt;, 5, &lt;js&gt;"b"&lt;/js&gt;, -1);</em>
+<a class="jxr_linenumber" name="L610" href="#L610">610</a> <em class="jxr_javadoccomment">	 * 	Map&amp;lt;String, Integer&amp;gt; &lt;jv&gt;map2&lt;/jv&gt; = Map.of(&lt;js&gt;"c"&lt;/js&gt;, 10);</em>
+<a class="jxr_linenumber" name="L611" href="#L611">611</a> <em class="jxr_javadoccomment">	 * 	&lt;jv&gt;map&lt;/jv&gt;.addAny(&lt;jv&gt;map1&lt;/jv&gt;, &lt;jv&gt;map2&lt;/jv&gt;);  &lt;jc&gt;// Adds a=5, c=10 (b=-1 filtered out)&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L612" href="#L612">612</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L613" href="#L613">613</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L614" href="#L614">614</a> <em class="jxr_javadoccomment">	 * @param values The values to add. Can be &lt;jk&gt;null&lt;/jk&gt; or contain &lt;jk&gt;null&lt;/jk&gt; values (ignored).</em>
+<a class="jxr_linenumber" name="L615" href="#L615">615</a> <em class="jxr_javadoccomment">	 * @return This object for method chaining.</em>
+<a class="jxr_linenumber" name="L616" href="#L616">616</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L617" href="#L617">617</a> 	<strong class="jxr_keyword">public</strong> FilteredMap&lt;K,V&gt; addAny(Object...values) {
+<a class="jxr_linenumber" name="L618" href="#L618">618</a> 		<strong class="jxr_keyword">if</strong> (values != <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="L619" href="#L619">619</a> 			<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> o : values) {
+<a class="jxr_linenumber" name="L620" href="#L620">620</a> 				<strong class="jxr_keyword">if</strong> (o != <strong class="jxr_keyword">null</strong> &amp;&amp; o instanceof Map&lt;?,?&gt; m) {
+<a class="jxr_linenumber" name="L621" href="#L621">621</a> 					addAll(m);
+<a class="jxr_linenumber" name="L622" href="#L622">622</a> 				}
+<a class="jxr_linenumber" name="L623" href="#L623">623</a> 			}
+<a class="jxr_linenumber" name="L624" href="#L624">624</a> 		}
+<a class="jxr_linenumber" name="L625" href="#L625">625</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
+<a class="jxr_linenumber" name="L626" href="#L626">626</a> 	}
+<a class="jxr_linenumber" name="L627" href="#L627">627</a> 
+<a class="jxr_linenumber" name="L628" href="#L628">628</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L629" href="#L629">629</a> <em class="jxr_javadoccomment">	 * Adds a list of key/value pairs to this map.</em>
+<a class="jxr_linenumber" name="L630" href="#L630">630</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L631" href="#L631">631</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L632" href="#L632">632</a> <em class="jxr_javadoccomment">	 * The pairs are processed in order, with each pair consisting of two consecutive elements</em>
+<a class="jxr_linenumber" name="L633" href="#L633">633</a> <em class="jxr_javadoccomment">	 * in the array. Each pair is added using {@link #add(Object, Object)}, which applies</em>
+<a class="jxr_linenumber" name="L634" href="#L634">634</a> <em class="jxr_javadoccomment">	 * conversion and filtering.</em>
+<a class="jxr_linenumber" name="L635" href="#L635">635</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L636" href="#L636">636</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L637" href="#L637">637</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L638" href="#L638">638</a> <em class="jxr_javadoccomment">	 * 	FilteredMap&amp;lt;String, Integer&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = FilteredMap</em>
+<a class="jxr_linenumber" name="L639" href="#L639">639</a> <em class="jxr_javadoccomment">	 * 		.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, Integer.&lt;jk&gt;class&lt;/jk&gt;)</em>
+<a class="jxr_linenumber" name="L640" href="#L640">640</a> <em class="jxr_javadoccomment">	 * 		.filter((k, v) -&amp;gt; v != &lt;jk&gt;null&lt;/jk&gt; &amp;amp;&amp;amp; v &amp;gt; 0)</em>
+<a class="jxr_linenumber" name="L641" href="#L641">641</a> <em class="jxr_javadoccomment">	 * 		.build();</em>
+<a class="jxr_linenumber" name="L642" href="#L642">642</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L643" href="#L643">643</a> <em class="jxr_javadoccomment">	 * 	&lt;jv&gt;map&lt;/jv&gt;.addPairs(&lt;js&gt;"a"&lt;/js&gt;, 5, &lt;js&gt;"b"&lt;/js&gt;, -1, &lt;js&gt;"c"&lt;/js&gt;, 10);</em>
+<a class="jxr_linenumber" name="L644" href="#L644">644</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Adds a=5, c=10 (b=-1 filtered out)&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L645" href="#L645">645</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L646" href="#L646">646</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L647" href="#L647">647</a> <em class="jxr_javadoccomment">	 * @param pairs The pairs to add. Must have an even number of elements.</em>
+<a class="jxr_linenumber" name="L648" href="#L648">648</a> <em class="jxr_javadoccomment">	 * @return This object for method chaining.</em>
+<a class="jxr_linenumber" name="L649" href="#L649">649</a> <em class="jxr_javadoccomment">	 * @throws IllegalArgumentException If an odd number of parameters is provided.</em>
+<a class="jxr_linenumber" name="L650" href="#L650">650</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L651" href="#L651">651</a> 	<strong class="jxr_keyword">public</strong> FilteredMap&lt;K,V&gt; addPairs(Object...pairs) {
+<a class="jxr_linenumber" name="L652" href="#L652">652</a> 		assertArgNotNull(<span class="jxr_string">"pairs"</span>, pairs);
+<a class="jxr_linenumber" name="L653" href="#L653">653</a> 		<strong class="jxr_keyword">if</strong> (pairs.length % 2 != 0)
+<a class="jxr_linenumber" name="L654" href="#L654">654</a> 			<strong class="jxr_keyword">throw</strong> illegalArg(<span class="jxr_string">"Odd number of parameters passed into addPairs()"</span>);
+<a class="jxr_linenumber" name="L655" href="#L655">655</a> 		<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> i = 0; i &lt; pairs.length; i += 2)
+<a class="jxr_linenumber" name="L656" href="#L656">656</a> 			add(pairs[i], pairs[i + 1]);
+<a class="jxr_linenumber" name="L657" href="#L657">657</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
+<a class="jxr_linenumber" name="L658" href="#L658">658</a> 	}
+<a class="jxr_linenumber" name="L659" href="#L659">659</a> 
+<a class="jxr_linenumber" name="L660" href="#L660">660</a> 	<strong class="jxr_keyword">private</strong> K convertKey(Object key) {
+<a class="jxr_linenumber" name="L661" href="#L661">661</a> 		<strong class="jxr_keyword">if</strong> (keyFunction != <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="L662" href="#L662">662</a> 			key = keyFunction.apply(key);
+<a class="jxr_linenumber" name="L663" href="#L663">663</a> 		}
+<a class="jxr_linenumber" name="L664" href="#L664">664</a> 		<strong class="jxr_keyword">if</strong> (key == <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="L665" href="#L665">665</a> 			<em class="jxr_comment">// Allow null for non-primitive types</em>
+<a class="jxr_linenumber" name="L666" href="#L666">666</a> 			<strong class="jxr_keyword">if</strong> (keyType.isPrimitive())
+<a class="jxr_linenumber" name="L667" href="#L667">667</a> 				<strong class="jxr_keyword">throw</strong> rex(<span class="jxr_string">"Cannot set null key for primitive type {0}"</span>, keyType.getName());
+<a class="jxr_linenumber" name="L668" href="#L668">668</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L669" href="#L669">669</a> 		}
+<a class="jxr_linenumber" name="L670" href="#L670">670</a> 		<strong class="jxr_keyword">if</strong> (keyType.isInstance(key))
+<a class="jxr_linenumber" name="L671" href="#L671">671</a> 			<strong class="jxr_keyword">return</strong> keyType.<strong class="jxr_keyword">cast</strong>(key);
+<a class="jxr_linenumber" name="L672" href="#L672">672</a> 		<strong class="jxr_keyword">throw</strong> rex(<span class="jxr_string">"Object of type {0} could not be converted to key type {1}"</span>, cn(key), cn(keyType));
+<a class="jxr_linenumber" name="L673" href="#L673">673</a> 	}
+<a class="jxr_linenumber" name="L674" href="#L674">674</a> 
+<a class="jxr_linenumber" name="L675" href="#L675">675</a> 	<strong class="jxr_keyword">private</strong> V convertValue(Object value) {
+<a class="jxr_linenumber" name="L676" href="#L676">676</a> 		<strong class="jxr_keyword">if</strong> (valueFunction != <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="L677" href="#L677">677</a> 			value = valueFunction.apply(value);
+<a class="jxr_linenumber" name="L678" href="#L678">678</a> 		}
+<a class="jxr_linenumber" name="L679" href="#L679">679</a> 		<strong class="jxr_keyword">if</strong> (value == <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="L680" href="#L680">680</a> 			<em class="jxr_comment">// Allow null for non-primitive types</em>
+<a class="jxr_linenumber" name="L681" href="#L681">681</a> 			<strong class="jxr_keyword">if</strong> (valueType.isPrimitive())
+<a class="jxr_linenumber" name="L682" href="#L682">682</a> 				<strong class="jxr_keyword">throw</strong> rex(<span class="jxr_string">"Cannot set null value for primitive type {0}"</span>, valueType.getName());
+<a class="jxr_linenumber" name="L683" href="#L683">683</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L684" href="#L684">684</a> 		}
+<a class="jxr_linenumber" name="L685" href="#L685">685</a> 		<strong class="jxr_keyword">if</strong> (valueType.isInstance(value))
+<a class="jxr_linenumber" name="L686" href="#L686">686</a> 			<strong class="jxr_keyword">return</strong> valueType.<strong class="jxr_keyword">cast</strong>(value);
+<a class="jxr_linenumber" name="L687" href="#L687">687</a> 		<strong class="jxr_keyword">throw</strong> rex(<span class="jxr_string">"Object of type {0} could not be converted to value type {1}"</span>, cn(value), cn(valueType));
+<a class="jxr_linenumber" name="L688" href="#L688">688</a> 	}
+<a class="jxr_linenumber" name="L689" href="#L689">689</a> 
+<a class="jxr_linenumber" name="L690" href="#L690">690</a> 	@Override
+<a class="jxr_linenumber" name="L691" href="#L691">691</a> 	<strong class="jxr_keyword">public</strong> String toString() {
+<a class="jxr_linenumber" name="L692" href="#L692">692</a> 		<strong class="jxr_keyword">return</strong> map.toString();
+<a class="jxr_linenumber" name="L693" href="#L693">693</a> 	}
+<a class="jxr_linenumber" name="L694" href="#L694">694</a> 
+<a class="jxr_linenumber" name="L695" href="#L695">695</a> 	@Override
+<a class="jxr_linenumber" name="L696" href="#L696">696</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> equals(Object o) {
+<a class="jxr_linenumber" name="L697" href="#L697">697</a> 		<strong class="jxr_keyword">return</strong> map.equals(o);
+<a class="jxr_linenumber" name="L698" href="#L698">698</a> 	}
+<a class="jxr_linenumber" name="L699" href="#L699">699</a> 
+<a class="jxr_linenumber" name="L700" href="#L700">700</a> 	@Override
+<a class="jxr_linenumber" name="L701" href="#L701">701</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> hashCode() {
+<a class="jxr_linenumber" name="L702" href="#L702">702</a> 		<strong class="jxr_keyword">return</strong> map.hashCode();
+<a class="jxr_linenumber" name="L703" href="#L703">703</a> 	}
+<a class="jxr_linenumber" name="L704" href="#L704">704</a> }
+<a class="jxr_linenumber" name="L705" href="#L705">705</a> 
 </pre>
 <hr/>
 <div id="footer">© 2016–2025 <a href="https://www.apache.org/">The Apache Software Foundation</a></div>
diff --git a/site/xref/org/apache/juneau/commons/collections/MapBuilder.html b/site/xref/org/apache/juneau/commons/collections/MapBuilder.html
index c87b3c6f30..1e4703135d 100644
--- a/site/xref/org/apache/juneau/commons/collections/MapBuilder.html
+++ b/site/xref/org/apache/juneau/commons/collections/MapBuilder.html
@@ -25,452 +25,604 @@
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.commons.collections;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.AssertionUtils.*;
-<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.ThrowableUtils.*;
-<a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.Utils.*;
-<a class="jxr_linenumber" name="L23" href="#L23">23</a>  
-<a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> java.lang.reflect.*;
-<a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> java.util.*;
+<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.ThrowableUtils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.Utils.*;
+<a class="jxr_linenumber" name="L22" href="#L22">22</a>  
+<a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> java.lang.reflect.*;
+<a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> java.util.*;
+<a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> java.util.function.*;
 <a class="jxr_linenumber" name="L26" href="#L26">26</a>  
-<a class="jxr_linenumber" name="L27" href="#L27">27</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.commons.utils.*;
-<a class="jxr_linenumber" name="L28" href="#L28">28</a>  
-<a class="jxr_linenumber" name="L29" href="#L29">29</a>  <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L30" href="#L30">30</a>  <em class="jxr_javadoccomment"> * A fluent builder for constructing {@link Map} instances with various configuration options.</em>
-<a class="jxr_linenumber" name="L31" href="#L31">31</a>  <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L32" href="#L32">32</a>  <em class="jxr_javadoccomment"> * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L33" href="#L33">33</a>  <em class="jxr_javadoccomment"> * This builder provides a flexible and type-safe way to construct maps with support for adding entries,</em>
-<a class="jxr_linenumber" name="L34" href="#L34">34</a>  <em class="jxr_javadoccomment"> * other maps, sorting by keys, and applying modifiers like unmodifiable or sparse modes. It's particularly</em>
-<a class="jxr_linenumber" name="L35" href="#L35">35</a>  <em class="jxr_javadoccomment"> * useful when constructing maps dynamically from multiple sources or with conditional entries.</em>
-<a class="jxr_linenumber" name="L36" href="#L36">36</a>  <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L37" href="#L37">37</a>  <em class="jxr_javadoccomment"> * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L38" href="#L38">38</a>  <em class="jxr_javadoccomment"> * Instances of this builder can be created using {@link #create(Class, Class)} or the convenience method</em>
-<a class="jxr_linenumber" name="L39" href="#L39">39</a>  <em class="jxr_javadoccomment"> * {@link org.apache.juneau.commons.utils.CollectionUtils#mapb(Class, Class, org.apache.juneau.commons.utils.Converter...)}.</em>
-<a class="jxr_linenumber" name="L40" href="#L40">40</a>  <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L41" href="#L41">41</a>  <em class="jxr_javadoccomment"> * &lt;h5 class='section'&gt;Features:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L42" href="#L42">42</a>  <em class="jxr_javadoccomment"> * &lt;ul class='spaced-list'&gt;</em>
-<a class="jxr_linenumber" name="L43" href="#L43">43</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;Fluent API - all methods return &lt;c&gt;this&lt;/c&gt; for method chaining</em>
-<a class="jxr_linenumber" name="L44" href="#L44">44</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;Multiple add methods - single entries, pairs, other maps</em>
-<a class="jxr_linenumber" name="L45" href="#L45">45</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;Arbitrary input support - automatic type conversion with {@link #addAny(Object...)}</em>
-<a class="jxr_linenumber" name="L46" href="#L46">46</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;Pair adding - {@link #addPairs(Object...)} for varargs key-value pairs</em>
-<a class="jxr_linenumber" name="L47" href="#L47">47</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;Filtering support - exclude unwanted values via {@link #filtered()} or {@link #filtered(java.util.function.Predicate)}</em>
-<a class="jxr_linenumber" name="L48" href="#L48">48</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;Sorting support - natural key order or custom {@link Comparator}</em>
-<a class="jxr_linenumber" name="L49" href="#L49">49</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;Sparse mode - return &lt;jk&gt;null&lt;/jk&gt; for empty maps</em>
-<a class="jxr_linenumber" name="L50" href="#L50">50</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;Unmodifiable mode - create immutable maps</em>
-<a class="jxr_linenumber" name="L51" href="#L51">51</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;Custom converters - type conversion via {@link Converter}</em>
-<a class="jxr_linenumber" name="L52" href="#L52">52</a>  <em class="jxr_javadoccomment"> * &lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L53" href="#L53">53</a>  <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L54" href="#L54">54</a>  <em class="jxr_javadoccomment"> * &lt;h5 class='section'&gt;Examples:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L55" href="#L55">55</a>  <em class="jxr_javadoccomment"> * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L56" href="#L56">56</a>  <em class="jxr_javadoccomment"> * 	&lt;jk&gt;import static&lt;/jk&gt; org.apache.juneau.commons.utils.CollectionUtils.*;</em>
-<a class="jxr_linenumber" name="L57" href="#L57">57</a>  <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L58" href="#L58">58</a>  <em class="jxr_javadoccomment"> * 	&lt;jc&gt;// Basic usage&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L59" href="#L59">59</a>  <em class="jxr_javadoccomment"> * 	Map&amp;lt;String,Integer&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = &lt;jsm&gt;mapb&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, Integer.&lt;jk&gt;class&lt;/jk&gt;)</em>
-<a class="jxr_linenumber" name="L60" href="#L60">60</a>  <em class="jxr_javadoccomment"> * 		.add(&lt;js&gt;"one"&lt;/js&gt;, 1)</em>
-<a class="jxr_linenumber" name="L61" href="#L61">61</a>  <em class="jxr_javadoccomment"> * 		.add(&lt;js&gt;"two"&lt;/js&gt;, 2)</em>
-<a class="jxr_linenumber" name="L62" href="#L62">62</a>  <em class="jxr_javadoccomment"> * 		.add(&lt;js&gt;"three"&lt;/js&gt;, 3)</em>
-<a class="jxr_linenumber" name="L63" href="#L63">63</a>  <em class="jxr_javadoccomment"> * 		.build();</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"> * 	&lt;jc&gt;// Using pairs&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L66" href="#L66">66</a>  <em class="jxr_javadoccomment"> * 	Map&amp;lt;String,String&amp;gt; &lt;jv&gt;props&lt;/jv&gt; = &lt;jsm&gt;mapb&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, String.&lt;jk&gt;class&lt;/jk&gt;)</em>
-<a class="jxr_linenumber" name="L67" href="#L67">67</a>  <em class="jxr_javadoccomment"> * 		.addPairs(&lt;js&gt;"host"&lt;/js&gt;, &lt;js&gt;"localhost"&lt;/js&gt;, &lt;js&gt;"port"&lt;/js&gt;, &lt;js&gt;"8080"&lt;/js&gt;)</em>
-<a class="jxr_linenumber" name="L68" href="#L68">68</a>  <em class="jxr_javadoccomment"> * 		.build();</em>
-<a class="jxr_linenumber" name="L69" href="#L69">69</a>  <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L70" href="#L70">70</a>  <em class="jxr_javadoccomment"> * 	&lt;jc&gt;// With sorting by key&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L71" href="#L71">71</a>  <em class="jxr_javadoccomment"> * 	Map&amp;lt;String,Integer&amp;gt; &lt;jv&gt;sorted&lt;/jv&gt; = &lt;jsm&gt;mapb&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, Integer.&lt;jk&gt;class&lt;/jk&gt;)</em>
-<a class="jxr_linenumber" name="L72" href="#L72">72</a>  <em class="jxr_javadoccomment"> * 		.add(&lt;js&gt;"zebra"&lt;/js&gt;, 3)</em>
-<a class="jxr_linenumber" name="L73" href="#L73">73</a>  <em class="jxr_javadoccomment"> * 		.add(&lt;js&gt;"apple"&lt;/js&gt;, 1)</em>
-<a class="jxr_linenumber" name="L74" href="#L74">74</a>  <em class="jxr_javadoccomment"> * 		.add(&lt;js&gt;"banana"&lt;/js&gt;, 2)</em>
-<a class="jxr_linenumber" name="L75" href="#L75">75</a>  <em class="jxr_javadoccomment"> * 		.sorted()</em>
-<a class="jxr_linenumber" name="L76" href="#L76">76</a>  <em class="jxr_javadoccomment"> * 		.build();  &lt;jc&gt;// Returns TreeMap with natural key order&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L77" href="#L77">77</a>  <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L78" href="#L78">78</a>  <em class="jxr_javadoccomment"> * 	&lt;jc&gt;// Immutable map&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L79" href="#L79">79</a>  <em class="jxr_javadoccomment"> * 	Map&amp;lt;String,String&amp;gt; &lt;jv&gt;config&lt;/jv&gt; = &lt;jsm&gt;mapb&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, String.&lt;jk&gt;class&lt;/jk&gt;)</em>
-<a class="jxr_linenumber" name="L80" href="#L80">80</a>  <em class="jxr_javadoccomment"> * 		.add(&lt;js&gt;"env"&lt;/js&gt;, &lt;js&gt;"prod"&lt;/js&gt;)</em>
-<a class="jxr_linenumber" name="L81" href="#L81">81</a>  <em class="jxr_javadoccomment"> * 		.add(&lt;js&gt;"region"&lt;/js&gt;, &lt;js&gt;"us-west"&lt;/js&gt;)</em>
-<a class="jxr_linenumber" name="L82" href="#L82">82</a>  <em class="jxr_javadoccomment"> * 		.unmodifiable()</em>
-<a class="jxr_linenumber" name="L83" href="#L83">83</a>  <em class="jxr_javadoccomment"> * 		.build();</em>
-<a class="jxr_linenumber" name="L84" href="#L84">84</a>  <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L85" href="#L85">85</a>  <em class="jxr_javadoccomment"> * 	&lt;jc&gt;// From multiple sources&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L86" href="#L86">86</a>  <em class="jxr_javadoccomment"> * 	Map&amp;lt;String,Integer&amp;gt; &lt;jv&gt;existing&lt;/jv&gt; = Map.of(&lt;js&gt;"a"&lt;/js&gt;, 1, &lt;js&gt;"b"&lt;/js&gt;, 2);</em>
-<a class="jxr_linenumber" name="L87" href="#L87">87</a>  <em class="jxr_javadoccomment"> * 	Map&amp;lt;String,Integer&amp;gt; &lt;jv&gt;combined&lt;/jv&gt; = &lt;jsm&gt;mapb&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, Integer.&lt;jk&gt;class&lt;/jk&gt;)</em>
-<a class="jxr_linenumber" name="L88" href="#L88">88</a>  <em class="jxr_javadoccomment"> * 		.addAll(&lt;jv&gt;existing&lt;/jv&gt;)</em>
-<a class="jxr_linenumber" name="L89" href="#L89">89</a>  <em class="jxr_javadoccomment"> * 		.add(&lt;js&gt;"c"&lt;/js&gt;, 3)</em>
-<a class="jxr_linenumber" name="L90" href="#L90">90</a>  <em class="jxr_javadoccomment"> * 		.build();</em>
-<a class="jxr_linenumber" name="L91" href="#L91">91</a>  <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L92" href="#L92">92</a>  <em class="jxr_javadoccomment"> * 	&lt;jc&gt;// Sparse mode - returns null when empty&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L93" href="#L93">93</a>  <em class="jxr_javadoccomment"> * 	Map&amp;lt;String,String&amp;gt; &lt;jv&gt;maybeNull&lt;/jv&gt; = &lt;jsm&gt;mapb&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, String.&lt;jk&gt;class&lt;/jk&gt;)</em>
-<a class="jxr_linenumber" name="L94" href="#L94">94</a>  <em class="jxr_javadoccomment"> * 		.sparse()</em>
-<a class="jxr_linenumber" name="L95" href="#L95">95</a>  <em class="jxr_javadoccomment"> * 		.build();  &lt;jc&gt;// Returns null, not empty map&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L96" href="#L96">96</a>  <em class="jxr_javadoccomment"> * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L97" href="#L97">97</a>  <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L98" href="#L98">98</a>  <em class="jxr_javadoccomment"> * &lt;h5 class='section'&gt;Thread Safety:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L99" href="#L99">99</a>  <em class="jxr_javadoccomment"> * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L100" href="#L100">100</a> <em class="jxr_javadoccomment"> * This class is &lt;b&gt;not thread-safe&lt;/b&gt;. Each builder instance should be used by a single thread or</em>
-<a class="jxr_linenumber" name="L101" href="#L101">101</a> <em class="jxr_javadoccomment"> * properly synchronized.</em>
-<a class="jxr_linenumber" name="L102" href="#L102">102</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L103" href="#L103">103</a> <em class="jxr_javadoccomment"> * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;&lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L104" href="#L104">104</a> <em class="jxr_javadoccomment"> * 	&lt;li class='link'&gt;&lt;a class="doclink" href="<a href="https://juneau.apache.org/docs/topics/JuneauCommonsCollections" target="alexandria_uri">https://juneau.apache.org/docs/topics/JuneauCommonsCollections</a>"&gt;juneau-commons-collections&lt;/a&gt;</em>
-<a class="jxr_linenumber" name="L105" href="#L105">105</a> <em class="jxr_javadoccomment"> * 	&lt;li class='jc'&gt;{@link ListBuilder}</em>
-<a class="jxr_linenumber" name="L106" href="#L106">106</a> <em class="jxr_javadoccomment"> * 	&lt;li class='jc'&gt;{@link SetBuilder}</em>
-<a class="jxr_linenumber" name="L107" href="#L107">107</a> <em class="jxr_javadoccomment"> * &lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L108" href="#L108">108</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L109" href="#L109">109</a> <em class="jxr_javadoccomment"> * @param &lt;K&gt; The key type.</em>
-<a class="jxr_linenumber" name="L110" href="#L110">110</a> <em class="jxr_javadoccomment"> * @param &lt;V&gt; The value type.</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> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> MapBuilder&lt;K,V&gt; {
-<a class="jxr_linenumber" name="L113" href="#L113">113</a> 
-<a class="jxr_linenumber" name="L114" href="#L114">114</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L115" href="#L115">115</a> <em class="jxr_javadoccomment">	 * Static creator.</em>
-<a class="jxr_linenumber" name="L116" href="#L116">116</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L117" href="#L117">117</a> <em class="jxr_javadoccomment">	 * @param &lt;K&gt; Key type.</em>
-<a class="jxr_linenumber" name="L118" href="#L118">118</a> <em class="jxr_javadoccomment">	 * @param &lt;V&gt; Value type.</em>
-<a class="jxr_linenumber" name="L119" href="#L119">119</a> <em class="jxr_javadoccomment">	 * @param keyType The key type. Must not be &lt;jk&gt;null&lt;/jk&gt;.</em>
-<a class="jxr_linenumber" name="L120" href="#L120">120</a> <em class="jxr_javadoccomment">	 * @param valueType The value type. Must not be &lt;jk&gt;null&lt;/jk&gt;.</em>
-<a class="jxr_linenumber" name="L121" href="#L121">121</a> <em class="jxr_javadoccomment">	 * @return A new builder.</em>
-<a class="jxr_linenumber" name="L122" href="#L122">122</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L123" href="#L123">123</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;K,V&gt; MapBuilder&lt;K,V&gt; create(Class&lt;K&gt; keyType, Class&lt;V&gt; valueType) {
-<a class="jxr_linenumber" name="L124" href="#L124">124</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> MapBuilder&lt;&gt;(assertArgNotNull(<span class="jxr_string">"keyType"</span>, keyType), assertArgNotNull(<span class="jxr_string">"valueType"</span>, valueType));
-<a class="jxr_linenumber" name="L125" href="#L125">125</a> 	}
-<a class="jxr_linenumber" name="L126" href="#L126">126</a> 
-<a class="jxr_linenumber" name="L127" href="#L127">127</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L128" href="#L128">128</a> <em class="jxr_javadoccomment">	 * Static creator without explicit type parameters.</em>
-<a class="jxr_linenumber" name="L129" href="#L129">129</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L130" href="#L130">130</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L131" href="#L131">131</a> <em class="jxr_javadoccomment">	 * This is a convenience method that creates a builder without requiring explicit type parameters.</em>
-<a class="jxr_linenumber" name="L132" href="#L132">132</a> <em class="jxr_javadoccomment">	 * The types will be inferred from usage context. Internally uses &lt;c&gt;Object.class&lt;/c&gt; for both</em>
-<a class="jxr_linenumber" name="L133" href="#L133">133</a> <em class="jxr_javadoccomment">	 * key and value types, which allows any types to be added.</em>
-<a class="jxr_linenumber" name="L134" href="#L134">134</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L135" href="#L135">135</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L136" href="#L136">136</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L137" href="#L137">137</a> <em class="jxr_javadoccomment">	 * 	Map&amp;lt;String, Integer&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = MapBuilder.&lt;jsm&gt;create&lt;/jsm&gt;()</em>
-<a class="jxr_linenumber" name="L138" href="#L138">138</a> <em class="jxr_javadoccomment">	 * 		.add(&lt;js&gt;"one"&lt;/js&gt;, 1)</em>
-<a class="jxr_linenumber" name="L139" href="#L139">139</a> <em class="jxr_javadoccomment">	 * 		.add(&lt;js&gt;"two"&lt;/js&gt;, 2)</em>
-<a class="jxr_linenumber" name="L140" href="#L140">140</a> <em class="jxr_javadoccomment">	 * 		.build();</em>
-<a class="jxr_linenumber" name="L141" href="#L141">141</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L142" href="#L142">142</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L143" href="#L143">143</a> <em class="jxr_javadoccomment">	 * @param &lt;K&gt; Key type.</em>
-<a class="jxr_linenumber" name="L144" href="#L144">144</a> <em class="jxr_javadoccomment">	 * @param &lt;V&gt; Value type.</em>
-<a class="jxr_linenumber" name="L145" href="#L145">145</a> <em class="jxr_javadoccomment">	 * @return A new builder.</em>
-<a class="jxr_linenumber" name="L146" href="#L146">146</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L147" href="#L147">147</a> 	@SuppressWarnings({ <span class="jxr_string">"unchecked"</span>, <span class="jxr_string">"rawtypes"</span> })
-<a class="jxr_linenumber" name="L148" href="#L148">148</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;K,V&gt; MapBuilder&lt;K,V&gt; create() {
-<a class="jxr_linenumber" name="L149" href="#L149">149</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a name="MapBuilder" href="../../../../../org/apache/juneau/commons/collections/MapBuilder.html#MapBuilder">MapBuilder</a>(Object.<strong class="jxr_keyword">class</strong>, Object.<strong class="jxr_keyword">class</strong>);
-<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> 	<strong class="jxr_keyword">private</strong> Map&lt;K,V&gt; map;
-<a class="jxr_linenumber" name="L153" href="#L153">153</a> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> unmodifiable = false, sparse = false;
-<a class="jxr_linenumber" name="L154" href="#L154">154</a> 	<strong class="jxr_keyword">private</strong> Comparator&lt;K&gt; comparator;
-<a class="jxr_linenumber" name="L155" href="#L155">155</a> 
-<a class="jxr_linenumber" name="L156" href="#L156">156</a> 	<strong class="jxr_keyword">private</strong> java.util.function.Predicate&lt;Object&gt; filter;
-<a class="jxr_linenumber" name="L157" href="#L157">157</a> 	<strong class="jxr_keyword">private</strong> Class&lt;K&gt; keyType;
-<a class="jxr_linenumber" name="L158" href="#L158">158</a> 	<strong class="jxr_keyword">private</strong> Class&lt;V&gt; valueType;
-<a class="jxr_linenumber" name="L159" href="#L159">159</a> 
-<a class="jxr_linenumber" name="L160" href="#L160">160</a> 	<strong class="jxr_keyword">private</strong> List&lt;Converter&gt; converters;
+<a class="jxr_linenumber" name="L27" href="#L27">27</a>  <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L28" href="#L28">28</a>  <em class="jxr_javadoccomment"> * A fluent builder for constructing {@link Map} instances with various configuration options.</em>
+<a class="jxr_linenumber" name="L29" href="#L29">29</a>  <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L30" href="#L30">30</a>  <em class="jxr_javadoccomment"> * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L31" href="#L31">31</a>  <em class="jxr_javadoccomment"> * This builder provides a flexible and type-safe way to construct maps with support for adding entries,</em>
+<a class="jxr_linenumber" name="L32" href="#L32">32</a>  <em class="jxr_javadoccomment"> * other maps, sorting by keys, and applying modifiers like unmodifiable or sparse modes. It's particularly</em>
+<a class="jxr_linenumber" name="L33" href="#L33">33</a>  <em class="jxr_javadoccomment"> * useful when constructing maps dynamically from multiple sources or with conditional entries.</em>
+<a class="jxr_linenumber" name="L34" href="#L34">34</a>  <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L35" href="#L35">35</a>  <em class="jxr_javadoccomment"> * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L36" href="#L36">36</a>  <em class="jxr_javadoccomment"> * Instances of this builder can be created using {@link #create(Class, Class)} or the convenience method</em>
+<a class="jxr_linenumber" name="L37" href="#L37">37</a>  <em class="jxr_javadoccomment"> * {@link org.apache.juneau.commons.utils.CollectionUtils#mapb(Class, Class)}.</em>
+<a class="jxr_linenumber" name="L38" href="#L38">38</a>  <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L39" href="#L39">39</a>  <em class="jxr_javadoccomment"> * &lt;h5 class='section'&gt;Features:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L40" href="#L40">40</a>  <em class="jxr_javadoccomment"> * &lt;ul class='spaced-list'&gt;</em>
+<a class="jxr_linenumber" name="L41" href="#L41">41</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;Fluent API - all methods return &lt;c&gt;this&lt;/c&gt; for method chaining</em>
+<a class="jxr_linenumber" name="L42" href="#L42">42</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;Multiple add methods - single entries, pairs, other maps</em>
+<a class="jxr_linenumber" name="L43" href="#L43">43</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;Arbitrary input support - automatic type conversion with {@link #addAny(Object...)}</em>
+<a class="jxr_linenumber" name="L44" href="#L44">44</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;Pair adding - {@link #addPairs(Object...)} for varargs key-value pairs</em>
+<a class="jxr_linenumber" name="L45" href="#L45">45</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;Filtering support - exclude unwanted entries via {@link #filtered()} or {@link #filtered(BiPredicate)}</em>
+<a class="jxr_linenumber" name="L46" href="#L46">46</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;Sorting support - natural key order or custom {@link Comparator}</em>
+<a class="jxr_linenumber" name="L47" href="#L47">47</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;Sparse mode - return &lt;jk&gt;null&lt;/jk&gt; for empty maps</em>
+<a class="jxr_linenumber" name="L48" href="#L48">48</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;Unmodifiable mode - create immutable maps</em>
+<a class="jxr_linenumber" name="L49" href="#L49">49</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;Custom conversion functions - type conversion via {@link #keyFunction(Function)} and {@link #valueFunction(Function)}</em>
+<a class="jxr_linenumber" name="L50" href="#L50">50</a>  <em class="jxr_javadoccomment"> * &lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L51" href="#L51">51</a>  <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L52" href="#L52">52</a>  <em class="jxr_javadoccomment"> * &lt;h5 class='section'&gt;Examples:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L53" href="#L53">53</a>  <em class="jxr_javadoccomment"> * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L54" href="#L54">54</a>  <em class="jxr_javadoccomment"> * 	&lt;jk&gt;import static&lt;/jk&gt; org.apache.juneau.commons.utils.CollectionUtils.*;</em>
+<a class="jxr_linenumber" name="L55" href="#L55">55</a>  <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L56" href="#L56">56</a>  <em class="jxr_javadoccomment"> * 	&lt;jc&gt;// Basic usage - returns Map&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L57" href="#L57">57</a>  <em class="jxr_javadoccomment"> * 	Map&amp;lt;String,Integer&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = &lt;jsm&gt;mapb&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, Integer.&lt;jk&gt;class&lt;/jk&gt;)</em>
+<a class="jxr_linenumber" name="L58" href="#L58">58</a>  <em class="jxr_javadoccomment"> * 		.add(&lt;js&gt;"one"&lt;/js&gt;, 1)</em>
+<a class="jxr_linenumber" name="L59" href="#L59">59</a>  <em class="jxr_javadoccomment"> * 		.add(&lt;js&gt;"two"&lt;/js&gt;, 2)</em>
+<a class="jxr_linenumber" name="L60" href="#L60">60</a>  <em class="jxr_javadoccomment"> * 		.add(&lt;js&gt;"three"&lt;/js&gt;, 3)</em>
+<a class="jxr_linenumber" name="L61" href="#L61">61</a>  <em class="jxr_javadoccomment"> * 		.build();</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"> * 	&lt;jc&gt;// Using pairs - returns Map&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L64" href="#L64">64</a>  <em class="jxr_javadoccomment"> * 	Map&amp;lt;String,String&amp;gt; &lt;jv&gt;props&lt;/jv&gt; = &lt;jsm&gt;mapb&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, String.&lt;jk&gt;class&lt;/jk&gt;)</em>
+<a class="jxr_linenumber" name="L65" href="#L65">65</a>  <em class="jxr_javadoccomment"> * 		.addPairs(&lt;js&gt;"host"&lt;/js&gt;, &lt;js&gt;"localhost"&lt;/js&gt;, &lt;js&gt;"port"&lt;/js&gt;, &lt;js&gt;"8080"&lt;/js&gt;)</em>
+<a class="jxr_linenumber" name="L66" href="#L66">66</a>  <em class="jxr_javadoccomment"> * 		.build();</em>
+<a class="jxr_linenumber" name="L67" href="#L67">67</a>  <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L68" href="#L68">68</a>  <em class="jxr_javadoccomment"> * 	&lt;jc&gt;// With sorting by key - returns Map&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L69" href="#L69">69</a>  <em class="jxr_javadoccomment"> * 	Map&amp;lt;String,Integer&amp;gt; &lt;jv&gt;sorted&lt;/jv&gt; = &lt;jsm&gt;mapb&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, Integer.&lt;jk&gt;class&lt;/jk&gt;)</em>
+<a class="jxr_linenumber" name="L70" href="#L70">70</a>  <em class="jxr_javadoccomment"> * 		.add(&lt;js&gt;"zebra"&lt;/js&gt;, 3)</em>
+<a class="jxr_linenumber" name="L71" href="#L71">71</a>  <em class="jxr_javadoccomment"> * 		.add(&lt;js&gt;"apple"&lt;/js&gt;, 1)</em>
+<a class="jxr_linenumber" name="L72" href="#L72">72</a>  <em class="jxr_javadoccomment"> * 		.add(&lt;js&gt;"banana"&lt;/js&gt;, 2)</em>
+<a class="jxr_linenumber" name="L73" href="#L73">73</a>  <em class="jxr_javadoccomment"> * 		.sorted()</em>
+<a class="jxr_linenumber" name="L74" href="#L74">74</a>  <em class="jxr_javadoccomment"> * 		.build();  &lt;jc&gt;// Returns TreeMap with natural key order&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L75" href="#L75">75</a>  <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L76" href="#L76">76</a>  <em class="jxr_javadoccomment"> * 	&lt;jc&gt;// Immutable map - returns Map&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L77" href="#L77">77</a>  <em class="jxr_javadoccomment"> * 	Map&amp;lt;String,String&amp;gt; &lt;jv&gt;config&lt;/jv&gt; = &lt;jsm&gt;mapb&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, String.&lt;jk&gt;class&lt;/jk&gt;)</em>
+<a class="jxr_linenumber" name="L78" href="#L78">78</a>  <em class="jxr_javadoccomment"> * 		.add(&lt;js&gt;"env"&lt;/js&gt;, &lt;js&gt;"prod"&lt;/js&gt;)</em>
+<a class="jxr_linenumber" name="L79" href="#L79">79</a>  <em class="jxr_javadoccomment"> * 		.add(&lt;js&gt;"region"&lt;/js&gt;, &lt;js&gt;"us-west"&lt;/js&gt;)</em>
+<a class="jxr_linenumber" name="L80" href="#L80">80</a>  <em class="jxr_javadoccomment"> * 		.unmodifiable()</em>
+<a class="jxr_linenumber" name="L81" href="#L81">81</a>  <em class="jxr_javadoccomment"> * 		.build();</em>
+<a class="jxr_linenumber" name="L82" href="#L82">82</a>  <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L83" href="#L83">83</a>  <em class="jxr_javadoccomment"> * 	&lt;jc&gt;// From multiple sources - returns Map&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L84" href="#L84">84</a>  <em class="jxr_javadoccomment"> * 	Map&amp;lt;String,Integer&amp;gt; &lt;jv&gt;existing&lt;/jv&gt; = Map.of(&lt;js&gt;"a"&lt;/js&gt;, 1, &lt;js&gt;"b"&lt;/js&gt;, 2);</em>
+<a class="jxr_linenumber" name="L85" href="#L85">85</a>  <em class="jxr_javadoccomment"> * 	Map&amp;lt;String,Integer&amp;gt; &lt;jv&gt;combined&lt;/jv&gt; = &lt;jsm&gt;mapb&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, Integer.&lt;jk&gt;class&lt;/jk&gt;)</em>
+<a class="jxr_linenumber" name="L86" href="#L86">86</a>  <em class="jxr_javadoccomment"> * 		.addAll(&lt;jv&gt;existing&lt;/jv&gt;)</em>
+<a class="jxr_linenumber" name="L87" href="#L87">87</a>  <em class="jxr_javadoccomment"> * 		.add(&lt;js&gt;"c"&lt;/js&gt;, 3)</em>
+<a class="jxr_linenumber" name="L88" href="#L88">88</a>  <em class="jxr_javadoccomment"> * 		.build();</em>
+<a class="jxr_linenumber" name="L89" href="#L89">89</a>  <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L90" href="#L90">90</a>  <em class="jxr_javadoccomment"> * 	&lt;jc&gt;// Sparse mode - returns null when empty&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L91" href="#L91">91</a>  <em class="jxr_javadoccomment"> * 	Map&amp;lt;String,String&amp;gt; &lt;jv&gt;maybeNull&lt;/jv&gt; = &lt;jsm&gt;mapb&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, String.&lt;jk&gt;class&lt;/jk&gt;)</em>
+<a class="jxr_linenumber" name="L92" href="#L92">92</a>  <em class="jxr_javadoccomment"> * 		.sparse()</em>
+<a class="jxr_linenumber" name="L93" href="#L93">93</a>  <em class="jxr_javadoccomment"> * 		.build();  &lt;jc&gt;// Returns null, not empty map&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L94" href="#L94">94</a>  <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L95" href="#L95">95</a>  <em class="jxr_javadoccomment"> * 	&lt;jc&gt;// FluentMap wrapper - use buildFluent()&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L96" href="#L96">96</a>  <em class="jxr_javadoccomment"> * 	FluentMap&amp;lt;String,Integer&amp;gt; &lt;jv&gt;fluent&lt;/jv&gt; = &lt;jsm&gt;mapb&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, Integer.&lt;jk&gt;class&lt;/jk&gt;)</em>
+<a class="jxr_linenumber" name="L97" href="#L97">97</a>  <em class="jxr_javadoccomment"> * 		.add(&lt;js&gt;"one"&lt;/js&gt;, 1)</em>
+<a class="jxr_linenumber" name="L98" href="#L98">98</a>  <em class="jxr_javadoccomment"> * 		.buildFluent();</em>
+<a class="jxr_linenumber" name="L99" href="#L99">99</a>  <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L100" href="#L100">100</a> <em class="jxr_javadoccomment"> * 	&lt;jc&gt;// FilteredMap - use buildFiltered()&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L101" href="#L101">101</a> <em class="jxr_javadoccomment"> * 	FilteredMap&amp;lt;String,Integer&amp;gt; &lt;jv&gt;filtered&lt;/jv&gt; = &lt;jsm&gt;mapb&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, Integer.&lt;jk&gt;class&lt;/jk&gt;)</em>
+<a class="jxr_linenumber" name="L102" href="#L102">102</a> <em class="jxr_javadoccomment"> * 		.filtered((k, v) -&amp;gt; v &amp;gt; 0)</em>
+<a class="jxr_linenumber" name="L103" href="#L103">103</a> <em class="jxr_javadoccomment"> * 		.add(&lt;js&gt;"a"&lt;/js&gt;, 5)</em>
+<a class="jxr_linenumber" name="L104" href="#L104">104</a> <em class="jxr_javadoccomment"> * 		.add(&lt;js&gt;"b"&lt;/js&gt;, -1)  &lt;jc&gt;// Filtered out&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L105" href="#L105">105</a> <em class="jxr_javadoccomment"> * 		.buildFiltered();</em>
+<a class="jxr_linenumber" name="L106" href="#L106">106</a> <em class="jxr_javadoccomment"> * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L107" href="#L107">107</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L108" href="#L108">108</a> <em class="jxr_javadoccomment"> * &lt;h5 class='section'&gt;Thread Safety:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L109" href="#L109">109</a> <em class="jxr_javadoccomment"> * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L110" href="#L110">110</a> <em class="jxr_javadoccomment"> * This class is &lt;b&gt;not thread-safe&lt;/b&gt;. Each builder instance should be used by a single thread or</em>
+<a class="jxr_linenumber" name="L111" href="#L111">111</a> <em class="jxr_javadoccomment"> * properly synchronized.</em>
+<a class="jxr_linenumber" name="L112" href="#L112">112</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L113" href="#L113">113</a> <em class="jxr_javadoccomment"> * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;&lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L114" href="#L114">114</a> <em class="jxr_javadoccomment"> * 	&lt;li class='link'&gt;&lt;a class="doclink" href="<a href="https://juneau.apache.org/docs/topics/JuneauCommonsCollections" target="alexandria_uri">https://juneau.apache.org/docs/topics/JuneauCommonsCollections</a>"&gt;juneau-commons-collections&lt;/a&gt;</em>
+<a class="jxr_linenumber" name="L115" href="#L115">115</a> <em class="jxr_javadoccomment"> * 	&lt;li class='jc'&gt;{@link ListBuilder}</em>
+<a class="jxr_linenumber" name="L116" href="#L116">116</a> <em class="jxr_javadoccomment"> * 	&lt;li class='jc'&gt;{@link SetBuilder}</em>
+<a class="jxr_linenumber" name="L117" href="#L117">117</a> <em class="jxr_javadoccomment"> * &lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L118" href="#L118">118</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L119" href="#L119">119</a> <em class="jxr_javadoccomment"> * @param &lt;K&gt; The key type.</em>
+<a class="jxr_linenumber" name="L120" href="#L120">120</a> <em class="jxr_javadoccomment"> * @param &lt;V&gt; The value type.</em>
+<a class="jxr_linenumber" name="L121" href="#L121">121</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L122" href="#L122">122</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> MapBuilder&lt;K,V&gt; {
+<a class="jxr_linenumber" name="L123" href="#L123">123</a> 
+<a class="jxr_linenumber" name="L124" href="#L124">124</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L125" href="#L125">125</a> <em class="jxr_javadoccomment">	 * Static creator.</em>
+<a class="jxr_linenumber" name="L126" href="#L126">126</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L127" href="#L127">127</a> <em class="jxr_javadoccomment">	 * @param &lt;K&gt; Key type.</em>
+<a class="jxr_linenumber" name="L128" href="#L128">128</a> <em class="jxr_javadoccomment">	 * @param &lt;V&gt; Value type.</em>
+<a class="jxr_linenumber" name="L129" href="#L129">129</a> <em class="jxr_javadoccomment">	 * @param keyType The key type. Must not be &lt;jk&gt;null&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L130" href="#L130">130</a> <em class="jxr_javadoccomment">	 * @param valueType The value type. Must not be &lt;jk&gt;null&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L131" href="#L131">131</a> <em class="jxr_javadoccomment">	 * @return A new builder.</em>
+<a class="jxr_linenumber" name="L132" href="#L132">132</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L133" href="#L133">133</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;K,V&gt; MapBuilder&lt;K,V&gt; create(Class&lt;K&gt; keyType, Class&lt;V&gt; valueType) {
+<a class="jxr_linenumber" name="L134" href="#L134">134</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> MapBuilder&lt;&gt;(assertArgNotNull(<span class="jxr_string">"keyType"</span>, keyType), assertArgNotNull(<span class="jxr_string">"valueType"</span>, valueType));
+<a class="jxr_linenumber" name="L135" href="#L135">135</a> 	}
+<a class="jxr_linenumber" name="L136" href="#L136">136</a> 
+<a class="jxr_linenumber" name="L137" href="#L137">137</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L138" href="#L138">138</a> <em class="jxr_javadoccomment">	 * Static creator without explicit type parameters.</em>
+<a class="jxr_linenumber" name="L139" href="#L139">139</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L140" href="#L140">140</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L141" href="#L141">141</a> <em class="jxr_javadoccomment">	 * This is a convenience method that creates a builder without requiring explicit type parameters.</em>
+<a class="jxr_linenumber" name="L142" href="#L142">142</a> <em class="jxr_javadoccomment">	 * The types will be inferred from usage context. Internally uses &lt;c&gt;Object.class&lt;/c&gt; for both</em>
+<a class="jxr_linenumber" name="L143" href="#L143">143</a> <em class="jxr_javadoccomment">	 * key and value types, which allows any types to be added.</em>
+<a class="jxr_linenumber" name="L144" href="#L144">144</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L145" href="#L145">145</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L146" href="#L146">146</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L147" href="#L147">147</a> <em class="jxr_javadoccomment">	 * 	Map&amp;lt;String, Integer&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = MapBuilder.&lt;jsm&gt;create&lt;/jsm&gt;()</em>
+<a class="jxr_linenumber" name="L148" href="#L148">148</a> <em class="jxr_javadoccomment">	 * 		.add(&lt;js&gt;"one"&lt;/js&gt;, 1)</em>
+<a class="jxr_linenumber" name="L149" href="#L149">149</a> <em class="jxr_javadoccomment">	 * 		.add(&lt;js&gt;"two"&lt;/js&gt;, 2)</em>
+<a class="jxr_linenumber" name="L150" href="#L150">150</a> <em class="jxr_javadoccomment">	 * 		.build();</em>
+<a class="jxr_linenumber" name="L151" href="#L151">151</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L152" href="#L152">152</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L153" href="#L153">153</a> <em class="jxr_javadoccomment">	 * @param &lt;K&gt; Key type.</em>
+<a class="jxr_linenumber" name="L154" href="#L154">154</a> <em class="jxr_javadoccomment">	 * @param &lt;V&gt; Value type.</em>
+<a class="jxr_linenumber" name="L155" href="#L155">155</a> <em class="jxr_javadoccomment">	 * @return A new builder.</em>
+<a class="jxr_linenumber" name="L156" href="#L156">156</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L157" href="#L157">157</a> 	@SuppressWarnings({ <span class="jxr_string">"unchecked"</span>, <span class="jxr_string">"rawtypes"</span> })
+<a class="jxr_linenumber" name="L158" href="#L158">158</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;K,V&gt; MapBuilder&lt;K,V&gt; create() {
+<a class="jxr_linenumber" name="L159" href="#L159">159</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a name="MapBuilder" href="../../../../../org/apache/juneau/commons/collections/MapBuilder.html#MapBuilder">MapBuilder</a>(Object.<strong class="jxr_keyword">class</strong>, Object.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L160" href="#L160">160</a> 	}
 <a class="jxr_linenumber" name="L161" href="#L161">161</a> 
-<a class="jxr_linenumber" name="L162" href="#L162">162</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L163" href="#L163">163</a> <em class="jxr_javadoccomment">	 * Constructor.</em>
-<a class="jxr_linenumber" name="L164" href="#L164">164</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L165" href="#L165">165</a> <em class="jxr_javadoccomment">	 * @param keyType The key type. Must not be &lt;jk&gt;null&lt;/jk&gt;.</em>
-<a class="jxr_linenumber" name="L166" href="#L166">166</a> <em class="jxr_javadoccomment">	 * @param valueType The value type. Must not be &lt;jk&gt;null&lt;/jk&gt;.</em>
-<a class="jxr_linenumber" name="L167" href="#L167">167</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L168" href="#L168">168</a> 	<strong class="jxr_keyword">public</strong> <a name="MapBuilder" href="../../../../../org/apache/juneau/commons/collections/MapBuilder.html#MapBuilder">MapBuilder</a>(Class&lt;K&gt; keyType, Class&lt;V&gt; valueType) {
-<a class="jxr_linenumber" name="L169" href="#L169">169</a> 		<strong class="jxr_keyword">this</strong>.keyType = assertArgNotNull(<span class="jxr_string">"keyType"</span>, keyType);
-<a class="jxr_linenumber" name="L170" href="#L170">170</a> 		<strong class="jxr_keyword">this</strong>.valueType = assertArgNotNull(<span class="jxr_string">"valueType"</span>, valueType);
-<a class="jxr_linenumber" name="L171" href="#L171">171</a> 	}
+<a class="jxr_linenumber" name="L162" href="#L162">162</a> 	<strong class="jxr_keyword">private</strong> Map&lt;K,V&gt; map;
+<a class="jxr_linenumber" name="L163" href="#L163">163</a> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> unmodifiable = false, sparse = false;
+<a class="jxr_linenumber" name="L164" href="#L164">164</a> 	<strong class="jxr_keyword">private</strong> Comparator&lt;K&gt; comparator;
+<a class="jxr_linenumber" name="L165" href="#L165">165</a> 
+<a class="jxr_linenumber" name="L166" href="#L166">166</a> 	<strong class="jxr_keyword">private</strong> BiPredicate&lt;K,V&gt; filter;
+<a class="jxr_linenumber" name="L167" href="#L167">167</a> 	<strong class="jxr_keyword">private</strong> Class&lt;K&gt; keyType;
+<a class="jxr_linenumber" name="L168" href="#L168">168</a> 	<strong class="jxr_keyword">private</strong> Class&lt;V&gt; valueType;
+<a class="jxr_linenumber" name="L169" href="#L169">169</a> 
+<a class="jxr_linenumber" name="L170" href="#L170">170</a> 	<strong class="jxr_keyword">private</strong> Function&lt;Object,K&gt; keyFunction;
+<a class="jxr_linenumber" name="L171" href="#L171">171</a> 	<strong class="jxr_keyword">private</strong> Function&lt;Object,V&gt; valueFunction;
 <a class="jxr_linenumber" name="L172" href="#L172">172</a> 
 <a class="jxr_linenumber" name="L173" href="#L173">173</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L174" href="#L174">174</a> <em class="jxr_javadoccomment">	 * Adds a single entry to this map.</em>
+<a class="jxr_linenumber" name="L174" href="#L174">174</a> <em class="jxr_javadoccomment">	 * Constructor.</em>
 <a class="jxr_linenumber" name="L175" href="#L175">175</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L176" href="#L176">176</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L177" href="#L177">177</a> <em class="jxr_javadoccomment">	 * If a filter has been set via {@link #filtered(java.util.function.Predicate)} or {@link #filtered()},</em>
-<a class="jxr_linenumber" name="L178" href="#L178">178</a> <em class="jxr_javadoccomment">	 * the value will only be added if it passes the filter (i.e., the filter returns {@code true}).</em>
-<a class="jxr_linenumber" name="L179" href="#L179">179</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L180" href="#L180">180</a> <em class="jxr_javadoccomment">	 * @param key The map key.</em>
-<a class="jxr_linenumber" name="L181" href="#L181">181</a> <em class="jxr_javadoccomment">	 * @param value The map value.</em>
-<a class="jxr_linenumber" name="L182" href="#L182">182</a> <em class="jxr_javadoccomment">	 * @return This object.</em>
-<a class="jxr_linenumber" name="L183" href="#L183">183</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L184" href="#L184">184</a> 	<strong class="jxr_keyword">public</strong> MapBuilder&lt;K,V&gt; add(K key, V value) {
-<a class="jxr_linenumber" name="L185" href="#L185">185</a> 		<strong class="jxr_keyword">if</strong> (filter != <strong class="jxr_keyword">null</strong> &amp;&amp; ! filter.test(value))
-<a class="jxr_linenumber" name="L186" href="#L186">186</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
-<a class="jxr_linenumber" name="L187" href="#L187">187</a> 		<strong class="jxr_keyword">if</strong> (map == <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L188" href="#L188">188</a> 			map = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;&gt;();
-<a class="jxr_linenumber" name="L189" href="#L189">189</a> 		map.put(key, value);
-<a class="jxr_linenumber" name="L190" href="#L190">190</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
-<a class="jxr_linenumber" name="L191" href="#L191">191</a> 	}
-<a class="jxr_linenumber" name="L192" href="#L192">192</a> 
-<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">	 * Appends the contents of the specified map into this map.</em>
-<a class="jxr_linenumber" name="L195" href="#L195">195</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L196" href="#L196">196</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L197" href="#L197">197</a> <em class="jxr_javadoccomment">	 * This is a no-op if the value is &lt;jk&gt;null&lt;/jk&gt;.</em>
-<a class="jxr_linenumber" name="L198" href="#L198">198</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L199" href="#L199">199</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L200" href="#L200">200</a> <em class="jxr_javadoccomment">	 * If a filter has been set, each value will be filtered before being added.</em>
-<a class="jxr_linenumber" name="L201" href="#L201">201</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L202" href="#L202">202</a> <em class="jxr_javadoccomment">	 * @param value The map to add to this map.</em>
-<a class="jxr_linenumber" name="L203" href="#L203">203</a> <em class="jxr_javadoccomment">	 * @return This object.</em>
-<a class="jxr_linenumber" name="L204" href="#L204">204</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L205" href="#L205">205</a> 	<strong class="jxr_keyword">public</strong> MapBuilder&lt;K,V&gt; addAll(Map&lt;K,V&gt; value) {
-<a class="jxr_linenumber" name="L206" href="#L206">206</a> 		<strong class="jxr_keyword">if</strong> (nn(value)) {
-<a class="jxr_linenumber" name="L207" href="#L207">207</a> 			<strong class="jxr_keyword">for</strong> (Map.Entry&lt;K,V&gt; entry : value.entrySet())
-<a class="jxr_linenumber" name="L208" href="#L208">208</a> 				add(entry.getKey(), entry.getValue());
-<a class="jxr_linenumber" name="L209" href="#L209">209</a> 		}
-<a class="jxr_linenumber" name="L210" href="#L210">210</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
-<a class="jxr_linenumber" name="L211" href="#L211">211</a> 	}
-<a class="jxr_linenumber" name="L212" href="#L212">212</a> 
-<a class="jxr_linenumber" name="L213" href="#L213">213</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L214" href="#L214">214</a> <em class="jxr_javadoccomment">	 * Adds arbitrary values to this list.</em>
-<a class="jxr_linenumber" name="L215" href="#L215">215</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L216" href="#L216">216</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L217" href="#L217">217</a> <em class="jxr_javadoccomment">	 * Objects can be any of the following:</em>
-<a class="jxr_linenumber" name="L218" href="#L218">218</a> <em class="jxr_javadoccomment">	 * &lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L219" href="#L219">219</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;Maps of key/value types convertible to the key/value types of this map.</em>
-<a class="jxr_linenumber" name="L220" href="#L220">220</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;JSON object strings parsed and convertible to the key/value types of this map.</em>
-<a class="jxr_linenumber" name="L221" href="#L221">221</a> <em class="jxr_javadoccomment">	 * &lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L222" href="#L222">222</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L223" href="#L223">223</a> <em class="jxr_javadoccomment">	 * @param values The values to add.</em>
-<a class="jxr_linenumber" name="L224" href="#L224">224</a> <em class="jxr_javadoccomment">	 * @return This object.</em>
-<a class="jxr_linenumber" name="L225" href="#L225">225</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L226" href="#L226">226</a> 	@SuppressWarnings(<span class="jxr_string">"unchecked"</span>)
-<a class="jxr_linenumber" name="L227" href="#L227">227</a> 	<strong class="jxr_keyword">public</strong> MapBuilder&lt;K,V&gt; addAny(Object...values) {
-<a class="jxr_linenumber" name="L228" href="#L228">228</a> 		<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> o : values) {
-<a class="jxr_linenumber" name="L229" href="#L229">229</a> 			<strong class="jxr_keyword">if</strong> (nn(o)) {
-<a class="jxr_linenumber" name="L230" href="#L230">230</a> 				<strong class="jxr_keyword">if</strong> (o instanceof Map o2) {
-<a class="jxr_linenumber" name="L231" href="#L231">231</a> 					o2.forEach((k, v) -&gt; add(toType(keyType, k), toType(valueType, v)));
-<a class="jxr_linenumber" name="L232" href="#L232">232</a> 				} <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="L233" href="#L233">233</a> 					<strong class="jxr_keyword">var</strong> m = converters.stream().map(x -&gt; x.convertTo(Map.<strong class="jxr_keyword">class</strong>, o)).filter(Utils::nn).findFirst().orElse(<strong class="jxr_keyword">null</strong>);
-<a class="jxr_linenumber" name="L234" href="#L234">234</a> 					<strong class="jxr_keyword">if</strong> (nn(m))
-<a class="jxr_linenumber" name="L235" href="#L235">235</a> 						addAny(m);
-<a class="jxr_linenumber" name="L236" href="#L236">236</a> 					<strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L237" href="#L237">237</a> 						<strong class="jxr_keyword">throw</strong> rex(<span class="jxr_string">"Object of type {0} could not be converted to type {1}"</span>, cn(o), <span class="jxr_string">"Map"</span>);
-<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> 		}
-<a class="jxr_linenumber" name="L241" href="#L241">241</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
-<a class="jxr_linenumber" name="L242" href="#L242">242</a> 	}
-<a class="jxr_linenumber" name="L243" href="#L243">243</a> 
-<a class="jxr_linenumber" name="L244" href="#L244">244</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L245" href="#L245">245</a> <em class="jxr_javadoccomment">	 * Adds a list of key/value pairs to this map.</em>
-<a class="jxr_linenumber" name="L246" href="#L246">246</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L247" href="#L247">247</a> <em class="jxr_javadoccomment">	 * @param pairs The pairs to add.</em>
-<a class="jxr_linenumber" name="L248" href="#L248">248</a> <em class="jxr_javadoccomment">	 * @return This object.</em>
-<a class="jxr_linenumber" name="L249" href="#L249">249</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L250" href="#L250">250</a> 	@SuppressWarnings(<span class="jxr_string">"unchecked"</span>)
-<a class="jxr_linenumber" name="L251" href="#L251">251</a> 	<strong class="jxr_keyword">public</strong> MapBuilder&lt;K,V&gt; addPairs(Object...pairs) {
-<a class="jxr_linenumber" name="L252" href="#L252">252</a> 		assertArgNotNull(<span class="jxr_string">"pairs"</span>, pairs);
-<a class="jxr_linenumber" name="L253" href="#L253">253</a> 		<strong class="jxr_keyword">if</strong> (pairs.length % 2 != 0)
-<a class="jxr_linenumber" name="L254" href="#L254">254</a> 			<strong class="jxr_keyword">throw</strong> illegalArg(<span class="jxr_string">"Odd number of parameters passed into AMap.ofPairs()"</span>);
-<a class="jxr_linenumber" name="L255" href="#L255">255</a> 		<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> i = 0; i &lt; pairs.length; i += 2)
-<a class="jxr_linenumber" name="L256" href="#L256">256</a> 			add((K)pairs[i], (V)pairs[i + 1]);
-<a class="jxr_linenumber" name="L257" href="#L257">257</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
-<a class="jxr_linenumber" name="L258" href="#L258">258</a> 	}
-<a class="jxr_linenumber" name="L259" href="#L259">259</a> 
-<a class="jxr_linenumber" name="L260" href="#L260">260</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L261" href="#L261">261</a> <em class="jxr_javadoccomment">	 * Builds the map.</em>
-<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">	 * @return A map conforming to the settings on this builder.</em>
-<a class="jxr_linenumber" name="L264" href="#L264">264</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L265" href="#L265">265</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L266" href="#L266">266</a> <em class="jxr_javadoccomment">	 * Builds the map.</em>
-<a class="jxr_linenumber" name="L267" href="#L267">267</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L268" href="#L268">268</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L269" href="#L269">269</a> <em class="jxr_javadoccomment">	 * Applies sorting/unmodifiable/sparse options.</em>
-<a class="jxr_linenumber" name="L270" href="#L270">270</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L271" href="#L271">271</a> <em class="jxr_javadoccomment">	 * @return The built map or {@code null} if {@link #sparse()} is set and the map is empty.</em>
-<a class="jxr_linenumber" name="L272" href="#L272">272</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L273" href="#L273">273</a> 	<strong class="jxr_keyword">public</strong> Map&lt;K,V&gt; build() {
-<a class="jxr_linenumber" name="L274" href="#L274">274</a> 		<strong class="jxr_keyword">if</strong> (sparse) {
-<a class="jxr_linenumber" name="L275" href="#L275">275</a> 			<strong class="jxr_keyword">if</strong> (nn(map) &amp;&amp; map.isEmpty())
-<a class="jxr_linenumber" name="L276" href="#L276">276</a> 				map = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L277" href="#L277">277</a> 		} <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="L278" href="#L278">278</a> 			<strong class="jxr_keyword">if</strong> (map == <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L279" href="#L279">279</a> 				map = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;&gt;();
-<a class="jxr_linenumber" name="L280" href="#L280">280</a> 		}
-<a class="jxr_linenumber" name="L281" href="#L281">281</a> 		<strong class="jxr_keyword">if</strong> (nn(map)) {
-<a class="jxr_linenumber" name="L282" href="#L282">282</a> 			<strong class="jxr_keyword">if</strong> (nn(comparator)) {
-<a class="jxr_linenumber" name="L283" href="#L283">283</a> 				<strong class="jxr_keyword">var</strong> m2 = <strong class="jxr_keyword">new</strong> TreeMap&lt;K,V&gt;(comparator);
-<a class="jxr_linenumber" name="L284" href="#L284">284</a> 				m2.putAll(map);
-<a class="jxr_linenumber" name="L285" href="#L285">285</a> 				map = m2;
-<a class="jxr_linenumber" name="L286" href="#L286">286</a> 			}
-<a class="jxr_linenumber" name="L287" href="#L287">287</a> 			<strong class="jxr_keyword">if</strong> (unmodifiable)
-<a class="jxr_linenumber" name="L288" href="#L288">288</a> 				map = Collections.unmodifiableMap(map);
-<a class="jxr_linenumber" name="L289" href="#L289">289</a> 		}
-<a class="jxr_linenumber" name="L290" href="#L290">290</a> 		<strong class="jxr_keyword">return</strong> map;
-<a class="jxr_linenumber" name="L291" href="#L291">291</a> 	}
-<a class="jxr_linenumber" name="L292" href="#L292">292</a> 
-<a class="jxr_linenumber" name="L293" href="#L293">293</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L294" href="#L294">294</a> <em class="jxr_javadoccomment">	 * Registers value converters that can adapt incoming values in {@link #addAny(Object...)}.</em>
-<a class="jxr_linenumber" name="L295" href="#L295">295</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L296" href="#L296">296</a> <em class="jxr_javadoccomment">	 * @param values Converters to register. Ignored if {@code null}.</em>
-<a class="jxr_linenumber" name="L297" href="#L297">297</a> <em class="jxr_javadoccomment">	 * @return This object.</em>
-<a class="jxr_linenumber" name="L298" href="#L298">298</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L299" href="#L299">299</a> 	<strong class="jxr_keyword">public</strong> MapBuilder&lt;K,V&gt; converters(Converter...values) {
-<a class="jxr_linenumber" name="L300" href="#L300">300</a> 		<strong class="jxr_keyword">if</strong> (values.length == 0)
-<a class="jxr_linenumber" name="L301" href="#L301">301</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
-<a class="jxr_linenumber" name="L302" href="#L302">302</a> 		<strong class="jxr_keyword">if</strong> (converters == <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L303" href="#L303">303</a> 			converters = list();
-<a class="jxr_linenumber" name="L304" href="#L304">304</a> 		converters.addAll(l(values));
-<a class="jxr_linenumber" name="L305" href="#L305">305</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
-<a class="jxr_linenumber" name="L306" href="#L306">306</a> 	}
+<a class="jxr_linenumber" name="L176" href="#L176">176</a> <em class="jxr_javadoccomment">	 * @param keyType The key type. Must not be &lt;jk&gt;null&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L177" href="#L177">177</a> <em class="jxr_javadoccomment">	 * @param valueType The value type. Must not be &lt;jk&gt;null&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L178" href="#L178">178</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L179" href="#L179">179</a> 	<strong class="jxr_keyword">public</strong> <a name="MapBuilder" href="../../../../../org/apache/juneau/commons/collections/MapBuilder.html#MapBuilder">MapBuilder</a>(Class&lt;K&gt; keyType, Class&lt;V&gt; valueType) {
+<a class="jxr_linenumber" name="L180" href="#L180">180</a> 		<strong class="jxr_keyword">this</strong>.keyType = assertArgNotNull(<span class="jxr_string">"keyType"</span>, keyType);
+<a class="jxr_linenumber" name="L181" href="#L181">181</a> 		<strong class="jxr_keyword">this</strong>.valueType = assertArgNotNull(<span class="jxr_string">"valueType"</span>, valueType);
+<a class="jxr_linenumber" name="L182" href="#L182">182</a> 	}
+<a class="jxr_linenumber" name="L183" href="#L183">183</a> 
+<a class="jxr_linenumber" name="L184" href="#L184">184</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L185" href="#L185">185</a> <em class="jxr_javadoccomment">	 * Adds a single entry to this map.</em>
+<a class="jxr_linenumber" name="L186" href="#L186">186</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L187" href="#L187">187</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L188" href="#L188">188</a> <em class="jxr_javadoccomment">	 * Note: Filtering is applied at build time, not when adding entries.</em>
+<a class="jxr_linenumber" name="L189" href="#L189">189</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L190" href="#L190">190</a> <em class="jxr_javadoccomment">	 * @param key The map key.</em>
+<a class="jxr_linenumber" name="L191" href="#L191">191</a> <em class="jxr_javadoccomment">	 * @param value The map value.</em>
+<a class="jxr_linenumber" name="L192" href="#L192">192</a> <em class="jxr_javadoccomment">	 * @return This object.</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> 	<strong class="jxr_keyword">public</strong> MapBuilder&lt;K,V&gt; add(K key, V value) {
+<a class="jxr_linenumber" name="L195" href="#L195">195</a> 		<strong class="jxr_keyword">if</strong> (map == <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L196" href="#L196">196</a> 			map = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;&gt;();
+<a class="jxr_linenumber" name="L197" href="#L197">197</a> 		map.put(key, value);
+<a class="jxr_linenumber" name="L198" href="#L198">198</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
+<a class="jxr_linenumber" name="L199" href="#L199">199</a> 	}
+<a class="jxr_linenumber" name="L200" href="#L200">200</a> 
+<a class="jxr_linenumber" name="L201" href="#L201">201</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L202" href="#L202">202</a> <em class="jxr_javadoccomment">	 * Appends the contents of the specified map into this map.</em>
+<a class="jxr_linenumber" name="L203" href="#L203">203</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L204" href="#L204">204</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L205" href="#L205">205</a> <em class="jxr_javadoccomment">	 * This is a no-op if the value is &lt;jk&gt;null&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L206" href="#L206">206</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L207" href="#L207">207</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L208" href="#L208">208</a> <em class="jxr_javadoccomment">	 * Note: Filtering is applied at build time, not when adding entries.</em>
+<a class="jxr_linenumber" name="L209" href="#L209">209</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L210" href="#L210">210</a> <em class="jxr_javadoccomment">	 * @param value The map to add to this map.</em>
+<a class="jxr_linenumber" name="L211" href="#L211">211</a> <em class="jxr_javadoccomment">	 * @return This object.</em>
+<a class="jxr_linenumber" name="L212" href="#L212">212</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L213" href="#L213">213</a> 	<strong class="jxr_keyword">public</strong> MapBuilder&lt;K,V&gt; addAll(Map&lt;K,V&gt; value) {
+<a class="jxr_linenumber" name="L214" href="#L214">214</a> 		<strong class="jxr_keyword">if</strong> (nn(value)) {
+<a class="jxr_linenumber" name="L215" href="#L215">215</a> 			<strong class="jxr_keyword">if</strong> (map == <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L216" href="#L216">216</a> 				map = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;&gt;();
+<a class="jxr_linenumber" name="L217" href="#L217">217</a> 			map.putAll(value);
+<a class="jxr_linenumber" name="L218" href="#L218">218</a> 		}
+<a class="jxr_linenumber" name="L219" href="#L219">219</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
+<a class="jxr_linenumber" name="L220" href="#L220">220</a> 	}
+<a class="jxr_linenumber" name="L221" href="#L221">221</a> 
+<a class="jxr_linenumber" name="L222" href="#L222">222</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L223" href="#L223">223</a> <em class="jxr_javadoccomment">	 * Adds arbitrary values to this map.</em>
+<a class="jxr_linenumber" name="L224" href="#L224">224</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L225" href="#L225">225</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L226" href="#L226">226</a> <em class="jxr_javadoccomment">	 * Objects can be any of the following:</em>
+<a class="jxr_linenumber" name="L227" href="#L227">227</a> <em class="jxr_javadoccomment">	 * &lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L228" href="#L228">228</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;Maps of key/value types convertible to the key/value types of this map.</em>
+<a class="jxr_linenumber" name="L229" href="#L229">229</a> <em class="jxr_javadoccomment">	 * &lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L230" href="#L230">230</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L231" href="#L231">231</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L232" href="#L232">232</a> <em class="jxr_javadoccomment">	 * Each entry from the maps will be added using {@link #add(Object, Object)}, which applies</em>
+<a class="jxr_linenumber" name="L233" href="#L233">233</a> <em class="jxr_javadoccomment">	 * key/value function conversion if configured. Non-Map objects will cause a {@link RuntimeException} to be thrown.</em>
+<a class="jxr_linenumber" name="L234" href="#L234">234</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L235" href="#L235">235</a> <em class="jxr_javadoccomment">	 * @param values The values to add. Can contain &lt;jk&gt;null&lt;/jk&gt; values (ignored).</em>
+<a class="jxr_linenumber" name="L236" href="#L236">236</a> <em class="jxr_javadoccomment">	 * @return This object.</em>
+<a class="jxr_linenumber" name="L237" href="#L237">237</a> <em class="jxr_javadoccomment">	 * @throws RuntimeException If a non-Map object is provided.</em>
+<a class="jxr_linenumber" name="L238" href="#L238">238</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L239" href="#L239">239</a> 	@SuppressWarnings(<span class="jxr_string">"unchecked"</span>)
+<a class="jxr_linenumber" name="L240" href="#L240">240</a> 	<strong class="jxr_keyword">public</strong> MapBuilder&lt;K,V&gt; addAny(Object...values) {
+<a class="jxr_linenumber" name="L241" href="#L241">241</a> 		<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> o : values) {
+<a class="jxr_linenumber" name="L242" href="#L242">242</a> 			<strong class="jxr_keyword">if</strong> (nn(o)) {
+<a class="jxr_linenumber" name="L243" href="#L243">243</a> 				<strong class="jxr_keyword">if</strong> (o instanceof Map o2) {
+<a class="jxr_linenumber" name="L244" href="#L244">244</a> 					o2.forEach((k, v) -&gt; {
+<a class="jxr_linenumber" name="L245" href="#L245">245</a> 						K key = convertKey(k);
+<a class="jxr_linenumber" name="L246" href="#L246">246</a> 						V value = convertValue(v);
+<a class="jxr_linenumber" name="L247" href="#L247">247</a> 						add(key, value);
+<a class="jxr_linenumber" name="L248" href="#L248">248</a> 					});
+<a class="jxr_linenumber" name="L249" href="#L249">249</a> 				} <strong class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="L250" href="#L250">250</a> 					<strong class="jxr_keyword">throw</strong> rex(<span class="jxr_string">"Object of type {0} could not be converted to type {1}"</span>, cn(o), <span class="jxr_string">"Map"</span>);
+<a class="jxr_linenumber" name="L251" href="#L251">251</a> 				}
+<a class="jxr_linenumber" name="L252" href="#L252">252</a> 			}
+<a class="jxr_linenumber" name="L253" href="#L253">253</a> 		}
+<a class="jxr_linenumber" name="L254" href="#L254">254</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
+<a class="jxr_linenumber" name="L255" href="#L255">255</a> 	}
+<a class="jxr_linenumber" name="L256" href="#L256">256</a> 
+<a class="jxr_linenumber" name="L257" href="#L257">257</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L258" href="#L258">258</a> <em class="jxr_javadoccomment">	 * Adds a list of key/value pairs to this map.</em>
+<a class="jxr_linenumber" name="L259" href="#L259">259</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L260" href="#L260">260</a> <em class="jxr_javadoccomment">	 * @param pairs The pairs to add.</em>
+<a class="jxr_linenumber" name="L261" href="#L261">261</a> <em class="jxr_javadoccomment">	 * @return This object.</em>
+<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> 	@SuppressWarnings(<span class="jxr_string">"unchecked"</span>)
+<a class="jxr_linenumber" name="L264" href="#L264">264</a> 	<strong class="jxr_keyword">public</strong> MapBuilder&lt;K,V&gt; addPairs(Object...pairs) {
+<a class="jxr_linenumber" name="L265" href="#L265">265</a> 		assertArgNotNull(<span class="jxr_string">"pairs"</span>, pairs);
+<a class="jxr_linenumber" name="L266" href="#L266">266</a> 		<strong class="jxr_keyword">if</strong> (pairs.length % 2 != 0)
+<a class="jxr_linenumber" name="L267" href="#L267">267</a> 			<strong class="jxr_keyword">throw</strong> illegalArg(<span class="jxr_string">"Odd number of parameters passed into MapBuilder.addPairs(...)"</span>);
+<a class="jxr_linenumber" name="L268" href="#L268">268</a> 		<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> i = 0; i &lt; pairs.length; i += 2)
+<a class="jxr_linenumber" name="L269" href="#L269">269</a> 			add((K)pairs[i], (V)pairs[i + 1]);
+<a class="jxr_linenumber" name="L270" href="#L270">270</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
+<a class="jxr_linenumber" name="L271" href="#L271">271</a> 	}
+<a class="jxr_linenumber" name="L272" href="#L272">272</a> 
+<a class="jxr_linenumber" name="L273" href="#L273">273</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L274" href="#L274">274</a> <em class="jxr_javadoccomment">	 * Builds the map.</em>
+<a class="jxr_linenumber" name="L275" href="#L275">275</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L276" href="#L276">276</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L277" href="#L277">277</a> <em class="jxr_javadoccomment">	 * Applies filtering, sorting, unmodifiable, and sparse options.</em>
+<a class="jxr_linenumber" name="L278" href="#L278">278</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L279" href="#L279">279</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L280" href="#L280">280</a> <em class="jxr_javadoccomment">	 * If filtering is applied, the result is wrapped in a {@link FilteredMap}. If sorting is applied,</em>
+<a class="jxr_linenumber" name="L281" href="#L281">281</a> <em class="jxr_javadoccomment">	 * a {@link TreeMap} is used as the underlying map; otherwise a {@link LinkedHashMap} is used.</em>
+<a class="jxr_linenumber" name="L282" href="#L282">282</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L283" href="#L283">283</a> <em class="jxr_javadoccomment">	 * @return The built map, or {@code null} if {@link #sparse()} is set and the map is empty.</em>
+<a class="jxr_linenumber" name="L284" href="#L284">284</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L285" href="#L285">285</a> 	<strong class="jxr_keyword">public</strong> Map&lt;K,V&gt; build() {
+<a class="jxr_linenumber" name="L286" href="#L286">286</a> 		<strong class="jxr_keyword">if</strong> (sparse) {
+<a class="jxr_linenumber" name="L287" href="#L287">287</a> 			<strong class="jxr_keyword">if</strong> (nn(map) &amp;&amp; map.isEmpty())
+<a class="jxr_linenumber" name="L288" href="#L288">288</a> 				<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L289" href="#L289">289</a> 		} <strong class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="L290" href="#L290">290</a> 			<strong class="jxr_keyword">if</strong> (map == <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L291" href="#L291">291</a> 				map = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;&gt;();
+<a class="jxr_linenumber" name="L292" href="#L292">292</a> 		}
+<a class="jxr_linenumber" name="L293" href="#L293">293</a> 
+<a class="jxr_linenumber" name="L294" href="#L294">294</a> 		Map&lt;K,V&gt; result = map;
+<a class="jxr_linenumber" name="L295" href="#L295">295</a> 
+<a class="jxr_linenumber" name="L296" href="#L296">296</a> 		<strong class="jxr_keyword">if</strong> (nn(result)) {
+<a class="jxr_linenumber" name="L297" href="#L297">297</a> 			<em class="jxr_comment">// Apply filtering if specified</em>
+<a class="jxr_linenumber" name="L298" href="#L298">298</a> 			<strong class="jxr_keyword">if</strong> (nn(filter)) {
+<a class="jxr_linenumber" name="L299" href="#L299">299</a> 				Map&lt;K,V&gt; innerMap = nn(comparator)
+<a class="jxr_linenumber" name="L300" href="#L300">300</a> 					? <strong class="jxr_keyword">new</strong> TreeMap&lt;&gt;(comparator)
+<a class="jxr_linenumber" name="L301" href="#L301">301</a> 					: <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;&gt;();
+<a class="jxr_linenumber" name="L302" href="#L302">302</a> 
+<a class="jxr_linenumber" name="L303" href="#L303">303</a> 				<strong class="jxr_keyword">var</strong> filteredMap = FilteredMap.&lt;K,V&gt;create(keyType, valueType)
+<a class="jxr_linenumber" name="L304" href="#L304">304</a> 					.filter(filter)
+<a class="jxr_linenumber" name="L305" href="#L305">305</a> 					.<strong class="jxr_keyword">inner</strong>(innerMap)
+<a class="jxr_linenumber" name="L306" href="#L306">306</a> 					.build();
 <a class="jxr_linenumber" name="L307" href="#L307">307</a> 
-<a class="jxr_linenumber" name="L308" href="#L308">308</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L309" href="#L309">309</a> <em class="jxr_javadoccomment">	 * Forces the existing set to be copied instead of appended to.</em>
-<a class="jxr_linenumber" name="L310" href="#L310">310</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L311" href="#L311">311</a> <em class="jxr_javadoccomment">	 * @return This object.</em>
-<a class="jxr_linenumber" name="L312" href="#L312">312</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L313" href="#L313">313</a> 	<strong class="jxr_keyword">public</strong> MapBuilder&lt;K,V&gt; copy() {
-<a class="jxr_linenumber" name="L314" href="#L314">314</a> 		<strong class="jxr_keyword">if</strong> (nn(map))
-<a class="jxr_linenumber" name="L315" href="#L315">315</a> 			map = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;&gt;(map);
-<a class="jxr_linenumber" name="L316" href="#L316">316</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
-<a class="jxr_linenumber" name="L317" href="#L317">317</a> 	}
-<a class="jxr_linenumber" name="L318" href="#L318">318</a> 
-<a class="jxr_linenumber" name="L319" href="#L319">319</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L320" href="#L320">320</a> <em class="jxr_javadoccomment">	 * Applies a default filter that excludes common "empty" or "unset" values from being added to the map.</em>
-<a class="jxr_linenumber" name="L321" href="#L321">321</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L322" href="#L322">322</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L323" href="#L323">323</a> <em class="jxr_javadoccomment">	 * The following values are filtered out:</em>
-<a class="jxr_linenumber" name="L324" href="#L324">324</a> <em class="jxr_javadoccomment">	 * &lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L325" href="#L325">325</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;{@code null}</em>
-<a class="jxr_linenumber" name="L326" href="#L326">326</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;{@link Boolean#FALSE}</em>
-<a class="jxr_linenumber" name="L327" href="#L327">327</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;Numbers with {@code intValue() == -1}</em>
-<a class="jxr_linenumber" name="L328" href="#L328">328</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;Empty arrays</em>
-<a class="jxr_linenumber" name="L329" href="#L329">329</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;Empty {@link Map Maps}</em>
-<a class="jxr_linenumber" name="L330" href="#L330">330</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;Empty {@link Collection Collections}</em>
-<a class="jxr_linenumber" name="L331" href="#L331">331</a> <em class="jxr_javadoccomment">	 * &lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L332" href="#L332">332</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L333" href="#L333">333</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L334" href="#L334">334</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L335" href="#L335">335</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;import static&lt;/jk&gt; org.apache.juneau.commons.utils.CollectionUtils.*;</em>
-<a class="jxr_linenumber" name="L336" href="#L336">336</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L337" href="#L337">337</a> <em class="jxr_javadoccomment">	 * 	Map&amp;lt;String,Object&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = &lt;jsm&gt;mapb&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, Object.&lt;jk&gt;class&lt;/jk&gt;)</em>
-<a class="jxr_linenumber" name="L338" href="#L338">338</a> <em class="jxr_javadoccomment">	 * 		.filtered()</em>
-<a class="jxr_linenumber" name="L339" href="#L339">339</a> <em class="jxr_javadoccomment">	 * 		.add(&lt;js&gt;"name"&lt;/js&gt;, &lt;js&gt;"John"&lt;/js&gt;)</em>
-<a class="jxr_linenumber" name="L340" href="#L340">340</a> <em class="jxr_javadoccomment">	 * 		.add(&lt;js&gt;"age"&lt;/js&gt;, -1)              &lt;jc&gt;// Not added&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L341" href="#L341">341</a> <em class="jxr_javadoccomment">	 * 		.add(&lt;js&gt;"enabled"&lt;/js&gt;, &lt;jk&gt;false&lt;/jk&gt;)   &lt;jc&gt;// Not added&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L342" href="#L342">342</a> <em class="jxr_javadoccomment">	 * 		.add(&lt;js&gt;"tags"&lt;/js&gt;, &lt;jk&gt;new&lt;/jk&gt; String[0]) &lt;jc&gt;// Not added&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L343" href="#L343">343</a> <em class="jxr_javadoccomment">	 * 		.build();</em>
-<a class="jxr_linenumber" name="L344" href="#L344">344</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L345" href="#L345">345</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L346" href="#L346">346</a> <em class="jxr_javadoccomment">	 * @return This object.</em>
-<a class="jxr_linenumber" name="L347" href="#L347">347</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L348" href="#L348">348</a> 	<strong class="jxr_keyword">public</strong> MapBuilder&lt;K,V&gt; filtered() {
-<a class="jxr_linenumber" name="L349" href="#L349">349</a> 		<em class="jxr_comment">// @formatter:off</em>
-<a class="jxr_linenumber" name="L350" href="#L350">350</a> 		<strong class="jxr_keyword">return</strong> filtered(x -&gt; ! (
-<a class="jxr_linenumber" name="L351" href="#L351">351</a> 			x == <strong class="jxr_keyword">null</strong>
-<a class="jxr_linenumber" name="L352" href="#L352">352</a> 			|| (x instanceof Boolean x2 &amp;&amp; x2.equals(false))
-<a class="jxr_linenumber" name="L353" href="#L353">353</a> 			|| (x instanceof Number x3 &amp;&amp; x3.intValue() == -1)
-<a class="jxr_linenumber" name="L354" href="#L354">354</a> 			|| (isArray(x) &amp;&amp; Array.getLength(x) == 0)
-<a class="jxr_linenumber" name="L355" href="#L355">355</a> 			|| (x instanceof Map x2 &amp;&amp; x2.isEmpty())
-<a class="jxr_linenumber" name="L356" href="#L356">356</a> 			|| (x instanceof Collection x3 &amp;&amp; x3.isEmpty())
-<a class="jxr_linenumber" name="L357" href="#L357">357</a> 			));
-<a class="jxr_linenumber" name="L358" href="#L358">358</a> 		<em class="jxr_comment">// @formatter:on</em>
-<a class="jxr_linenumber" name="L359" href="#L359">359</a> 	}
-<a class="jxr_linenumber" name="L360" href="#L360">360</a> 
-<a class="jxr_linenumber" name="L361" href="#L361">361</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L362" href="#L362">362</a> <em class="jxr_javadoccomment">	 * Applies a filter predicate to values added via {@link #add(Object, Object)}.</em>
-<a class="jxr_linenumber" name="L363" href="#L363">363</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L364" href="#L364">364</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L365" href="#L365">365</a> <em class="jxr_javadoccomment">	 * Values where the predicate returns {@code true} will be kept; values where it returns {@code false} will not be added.</em>
-<a class="jxr_linenumber" name="L366" href="#L366">366</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L367" href="#L367">367</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L368" href="#L368">368</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L369" href="#L369">369</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;import static&lt;/jk&gt; org.apache.juneau.commons.utils.CollectionUtils.*;</em>
+<a class="jxr_linenumber" name="L308" href="#L308">308</a> 				<em class="jxr_comment">// Add all entries to the filtered map</em>
+<a class="jxr_linenumber" name="L309" href="#L309">309</a> 				result.forEach(filteredMap::put);
+<a class="jxr_linenumber" name="L310" href="#L310">310</a> 				result = filteredMap;
+<a class="jxr_linenumber" name="L311" href="#L311">311</a> 			} <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (nn(comparator)) {
+<a class="jxr_linenumber" name="L312" href="#L312">312</a> 				<em class="jxr_comment">// Apply sorting if no filter</em>
+<a class="jxr_linenumber" name="L313" href="#L313">313</a> 				<strong class="jxr_keyword">var</strong> m2 = <strong class="jxr_keyword">new</strong> TreeMap&lt;K,V&gt;(comparator);
+<a class="jxr_linenumber" name="L314" href="#L314">314</a> 				m2.putAll(result);
+<a class="jxr_linenumber" name="L315" href="#L315">315</a> 				result = m2;
+<a class="jxr_linenumber" name="L316" href="#L316">316</a> 			}
+<a class="jxr_linenumber" name="L317" href="#L317">317</a> 
+<a class="jxr_linenumber" name="L318" href="#L318">318</a> 			<em class="jxr_comment">// Apply unmodifiable if specified</em>
+<a class="jxr_linenumber" name="L319" href="#L319">319</a> 			<strong class="jxr_keyword">if</strong> (unmodifiable)
+<a class="jxr_linenumber" name="L320" href="#L320">320</a> 				result = Collections.unmodifiableMap(result);
+<a class="jxr_linenumber" name="L321" href="#L321">321</a> 		}
+<a class="jxr_linenumber" name="L322" href="#L322">322</a> 
+<a class="jxr_linenumber" name="L323" href="#L323">323</a> 		<strong class="jxr_keyword">return</strong> result;
+<a class="jxr_linenumber" name="L324" href="#L324">324</a> 	}
+<a class="jxr_linenumber" name="L325" href="#L325">325</a> 
+<a class="jxr_linenumber" name="L326" href="#L326">326</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L327" href="#L327">327</a> <em class="jxr_javadoccomment">	 * Builds the map and wraps it in a {@link FluentMap}.</em>
+<a class="jxr_linenumber" name="L328" href="#L328">328</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L329" href="#L329">329</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L330" href="#L330">330</a> <em class="jxr_javadoccomment">	 * This is a convenience method that calls {@link #build()} and wraps the result in a {@link FluentMap}.</em>
+<a class="jxr_linenumber" name="L331" href="#L331">331</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L332" href="#L332">332</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L333" href="#L333">333</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L334" href="#L334">334</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;import static&lt;/jk&gt; org.apache.juneau.commons.utils.CollectionUtils.*;</em>
+<a class="jxr_linenumber" name="L335" href="#L335">335</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L336" href="#L336">336</a> <em class="jxr_javadoccomment">	 * 	FluentMap&amp;lt;String,Integer&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = &lt;jsm&gt;mapb&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, Integer.&lt;jk&gt;class&lt;/jk&gt;)</em>
+<a class="jxr_linenumber" name="L337" href="#L337">337</a> <em class="jxr_javadoccomment">	 * 		.add(&lt;js&gt;"one"&lt;/js&gt;, 1)</em>
+<a class="jxr_linenumber" name="L338" href="#L338">338</a> <em class="jxr_javadoccomment">	 * 		.add(&lt;js&gt;"two"&lt;/js&gt;, 2)</em>
+<a class="jxr_linenumber" name="L339" href="#L339">339</a> <em class="jxr_javadoccomment">	 * 		.buildFluent();</em>
+<a class="jxr_linenumber" name="L340" href="#L340">340</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L341" href="#L341">341</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L342" href="#L342">342</a> <em class="jxr_javadoccomment">	 * @return The built map wrapped in a {@link FluentMap}, or {@code null} if {@link #sparse()} is set and the map is empty.</em>
+<a class="jxr_linenumber" name="L343" href="#L343">343</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L344" href="#L344">344</a> 	<strong class="jxr_keyword">public</strong> FluentMap&lt;K,V&gt; buildFluent() {
+<a class="jxr_linenumber" name="L345" href="#L345">345</a> 		Map&lt;K,V&gt; result = build();
+<a class="jxr_linenumber" name="L346" href="#L346">346</a> 		<strong class="jxr_keyword">return</strong> result == <strong class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">null</strong> : <strong class="jxr_keyword">new</strong> FluentMap&lt;&gt;(result);
+<a class="jxr_linenumber" name="L347" href="#L347">347</a> 	}
+<a class="jxr_linenumber" name="L348" href="#L348">348</a> 
+<a class="jxr_linenumber" name="L349" href="#L349">349</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L350" href="#L350">350</a> <em class="jxr_javadoccomment">	 * Builds the map as a {@link FilteredMap}.</em>
+<a class="jxr_linenumber" name="L351" href="#L351">351</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L352" href="#L352">352</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L353" href="#L353">353</a> <em class="jxr_javadoccomment">	 * If sorting is applied, a {@link TreeMap} is used as the underlying map; otherwise a {@link LinkedHashMap} is used.</em>
+<a class="jxr_linenumber" name="L354" href="#L354">354</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L355" href="#L355">355</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L356" href="#L356">356</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L357" href="#L357">357</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;import static&lt;/jk&gt; org.apache.juneau.commons.utils.CollectionUtils.*;</em>
+<a class="jxr_linenumber" name="L358" href="#L358">358</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L359" href="#L359">359</a> <em class="jxr_javadoccomment">	 * 	FilteredMap&amp;lt;String,Integer&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = &lt;jsm&gt;mapb&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, Integer.&lt;jk&gt;class&lt;/jk&gt;)</em>
+<a class="jxr_linenumber" name="L360" href="#L360">360</a> <em class="jxr_javadoccomment">	 * 		.filtered((k, v) -&amp;gt; v != &lt;jk&gt;null&lt;/jk&gt; &amp;amp;&amp;amp; v &amp;gt; 0)</em>
+<a class="jxr_linenumber" name="L361" href="#L361">361</a> <em class="jxr_javadoccomment">	 * 		.add(&lt;js&gt;"a"&lt;/js&gt;, 5)</em>
+<a class="jxr_linenumber" name="L362" href="#L362">362</a> <em class="jxr_javadoccomment">	 * 		.add(&lt;js&gt;"b"&lt;/js&gt;, -1)  &lt;jc&gt;// Will be filtered out&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L363" href="#L363">363</a> <em class="jxr_javadoccomment">	 * 		.buildFiltered();</em>
+<a class="jxr_linenumber" name="L364" href="#L364">364</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L365" href="#L365">365</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L366" href="#L366">366</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L367" href="#L367">367</a> <em class="jxr_javadoccomment">	 * Note: If {@link #unmodifiable()} is set, the returned map will be wrapped in an unmodifiable view,</em>
+<a class="jxr_linenumber" name="L368" href="#L368">368</a> <em class="jxr_javadoccomment">	 * which may cause issues if the FilteredMap tries to modify it internally. It's recommended to avoid</em>
+<a class="jxr_linenumber" name="L369" href="#L369">369</a> <em class="jxr_javadoccomment">	 * using {@link #unmodifiable()} when calling this method.</em>
 <a class="jxr_linenumber" name="L370" href="#L370">370</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L371" href="#L371">371</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Keep only non-null, non-empty string values&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L372" href="#L372">372</a> <em class="jxr_javadoccomment">	 * 	Map&amp;lt;String,String&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = &lt;jsm&gt;mapb&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, String.&lt;jk&gt;class&lt;/jk&gt;)</em>
-<a class="jxr_linenumber" name="L373" href="#L373">373</a> <em class="jxr_javadoccomment">	 * 		.filtered(&lt;jv&gt;x&lt;/jv&gt; -&amp;gt; &lt;jv&gt;x&lt;/jv&gt; != &lt;jk&gt;null&lt;/jk&gt; &amp;amp;&amp;amp; !&lt;jv&gt;x&lt;/jv&gt;.equals(&lt;js&gt;""&lt;/js&gt;))</em>
-<a class="jxr_linenumber" name="L374" href="#L374">374</a> <em class="jxr_javadoccomment">	 * 		.add(&lt;js&gt;"a"&lt;/js&gt;, &lt;js&gt;"foo"&lt;/js&gt;)</em>
-<a class="jxr_linenumber" name="L375" href="#L375">375</a> <em class="jxr_javadoccomment">	 * 		.add(&lt;js&gt;"b"&lt;/js&gt;, &lt;jk&gt;null&lt;/jk&gt;)     &lt;jc&gt;// Not added&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L376" href="#L376">376</a> <em class="jxr_javadoccomment">	 * 		.add(&lt;js&gt;"c"&lt;/js&gt;, &lt;js&gt;""&lt;/js&gt;)       &lt;jc&gt;// Not added&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L377" href="#L377">377</a> <em class="jxr_javadoccomment">	 * 		.build();</em>
-<a class="jxr_linenumber" name="L378" href="#L378">378</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L379" href="#L379">379</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L380" href="#L380">380</a> <em class="jxr_javadoccomment">	 * @param filter The filter predicate. Must not be &lt;jk&gt;null&lt;/jk&gt;.</em>
-<a class="jxr_linenumber" name="L381" href="#L381">381</a> <em class="jxr_javadoccomment">	 * @return This object.</em>
-<a class="jxr_linenumber" name="L382" href="#L382">382</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L383" href="#L383">383</a> 	<strong class="jxr_keyword">public</strong> MapBuilder&lt;K,V&gt; filtered(java.util.function.Predicate&lt;Object&gt; filter) {
-<a class="jxr_linenumber" name="L384" href="#L384">384</a> 		<strong class="jxr_keyword">this</strong>.filter = assertArgNotNull(<span class="jxr_string">"filter"</span>, filter);
-<a class="jxr_linenumber" name="L385" href="#L385">385</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
-<a class="jxr_linenumber" name="L386" href="#L386">386</a> 	}
-<a class="jxr_linenumber" name="L387" href="#L387">387</a> 
-<a class="jxr_linenumber" name="L388" href="#L388">388</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L389" href="#L389">389</a> <em class="jxr_javadoccomment">	 * Converts the set into a {@link SortedMap}.</em>
-<a class="jxr_linenumber" name="L390" href="#L390">390</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L371" href="#L371">371</a> <em class="jxr_javadoccomment">	 * @return The built map as a {@link FilteredMap}, or {@code null} if {@link #sparse()} is set and the map is empty.</em>
+<a class="jxr_linenumber" name="L372" href="#L372">372</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L373" href="#L373">373</a> 	<strong class="jxr_keyword">public</strong> FilteredMap&lt;K,V&gt; buildFiltered() {
+<a class="jxr_linenumber" name="L374" href="#L374">374</a> 		<strong class="jxr_keyword">var</strong> m = build();
+<a class="jxr_linenumber" name="L375" href="#L375">375</a> 		<strong class="jxr_keyword">if</strong> (m == <strong class="jxr_keyword">null</strong>)  <em class="jxr_comment">// sparse mode and empty</em>
+<a class="jxr_linenumber" name="L376" href="#L376">376</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L377" href="#L377">377</a> 		<strong class="jxr_keyword">if</strong> (m instanceof FilteredMap&lt;K,V&gt; m2)
+<a class="jxr_linenumber" name="L378" href="#L378">378</a> 			<strong class="jxr_keyword">return</strong> m2;
+<a class="jxr_linenumber" name="L379" href="#L379">379</a> 		<em class="jxr_comment">// Note that if unmodifiable is true, 'm' will be unmodifiable and will cause an error if you try</em>
+<a class="jxr_linenumber" name="L380" href="#L380">380</a> 		<em class="jxr_comment">// to insert a value from within FilteredMap.</em>
+<a class="jxr_linenumber" name="L381" href="#L381">381</a> 		<strong class="jxr_keyword">return</strong> FilteredMap.create(keyType, valueType).<strong class="jxr_keyword">inner</strong>(m).build();
+<a class="jxr_linenumber" name="L382" href="#L382">382</a> 	}
+<a class="jxr_linenumber" name="L383" href="#L383">383</a> 
+<a class="jxr_linenumber" name="L384" href="#L384">384</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L385" href="#L385">385</a> <em class="jxr_javadoccomment">	 * Sets the key conversion function for converting keys in {@link #addAny(Object...)}.</em>
+<a class="jxr_linenumber" name="L386" href="#L386">386</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L387" href="#L387">387</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L388" href="#L388">388</a> <em class="jxr_javadoccomment">	 * The function is applied to each key when adding entries from maps in {@link #addAny(Object...)}.</em>
+<a class="jxr_linenumber" name="L389" href="#L389">389</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L390" href="#L390">390</a> <em class="jxr_javadoccomment">	 * @param keyFunction The function to convert keys. Must not be &lt;jk&gt;null&lt;/jk&gt;.</em>
 <a class="jxr_linenumber" name="L391" href="#L391">391</a> <em class="jxr_javadoccomment">	 * @return This object.</em>
 <a class="jxr_linenumber" name="L392" href="#L392">392</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L393" href="#L393">393</a> 	@SuppressWarnings(<span class="jxr_string">"unchecked"</span>)
-<a class="jxr_linenumber" name="L394" href="#L394">394</a> 	<strong class="jxr_keyword">public</strong> MapBuilder&lt;K,V&gt; sorted() {
-<a class="jxr_linenumber" name="L395" href="#L395">395</a> 		<strong class="jxr_keyword">return</strong> sorted((Comparator&lt;K&gt;)Comparator.naturalOrder());
+<a class="jxr_linenumber" name="L393" href="#L393">393</a> 	<strong class="jxr_keyword">public</strong> MapBuilder&lt;K,V&gt; keyFunction(Function&lt;Object,K&gt; keyFunction) {
+<a class="jxr_linenumber" name="L394" href="#L394">394</a> 		<strong class="jxr_keyword">this</strong>.keyFunction = assertArgNotNull(<span class="jxr_string">"keyFunction"</span>, keyFunction);
+<a class="jxr_linenumber" name="L395" href="#L395">395</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
 <a class="jxr_linenumber" name="L396" href="#L396">396</a> 	}
 <a class="jxr_linenumber" name="L397" href="#L397">397</a> 
 <a class="jxr_linenumber" name="L398" href="#L398">398</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L399" href="#L399">399</a> <em class="jxr_javadoccomment">	 * Converts the set into a {@link SortedMap} using the specified comparator.</em>
+<a class="jxr_linenumber" name="L399" href="#L399">399</a> <em class="jxr_javadoccomment">	 * Sets the value conversion function for converting values in {@link #addAny(Object...)}.</em>
 <a class="jxr_linenumber" name="L400" href="#L400">400</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L401" href="#L401">401</a> <em class="jxr_javadoccomment">	 * @param comparator The comparator to use for sorting. Must not be &lt;jk&gt;null&lt;/jk&gt;.</em>
-<a class="jxr_linenumber" name="L402" href="#L402">402</a> <em class="jxr_javadoccomment">	 * @return This object.</em>
-<a class="jxr_linenumber" name="L403" href="#L403">403</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L404" href="#L404">404</a> 	<strong class="jxr_keyword">public</strong> MapBuilder&lt;K,V&gt; sorted(Comparator&lt;K&gt; comparator) {
-<a class="jxr_linenumber" name="L405" href="#L405">405</a> 		<strong class="jxr_keyword">this</strong>.comparator = assertArgNotNull(<span class="jxr_string">"comparator"</span>, comparator);
-<a class="jxr_linenumber" name="L406" href="#L406">406</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
-<a class="jxr_linenumber" name="L407" href="#L407">407</a> 	}
-<a class="jxr_linenumber" name="L408" href="#L408">408</a> 
-<a class="jxr_linenumber" name="L409" href="#L409">409</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L410" href="#L410">410</a> <em class="jxr_javadoccomment">	 * When specified, the {@link #build()} method will return &lt;jk&gt;null&lt;/jk&gt; if the map is empty.</em>
-<a class="jxr_linenumber" name="L411" href="#L411">411</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L412" href="#L412">412</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L413" href="#L413">413</a> <em class="jxr_javadoccomment">	 * Otherwise {@link #build()} will never return &lt;jk&gt;null&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L401" href="#L401">401</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L402" href="#L402">402</a> <em class="jxr_javadoccomment">	 * The function is applied to each value when adding entries from maps in {@link #addAny(Object...)}.</em>
+<a class="jxr_linenumber" name="L403" href="#L403">403</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L404" href="#L404">404</a> <em class="jxr_javadoccomment">	 * @param valueFunction The function to convert values. Must not be &lt;jk&gt;null&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L405" href="#L405">405</a> <em class="jxr_javadoccomment">	 * @return This object.</em>
+<a class="jxr_linenumber" name="L406" href="#L406">406</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L407" href="#L407">407</a> 	<strong class="jxr_keyword">public</strong> MapBuilder&lt;K,V&gt; valueFunction(Function&lt;Object,V&gt; valueFunction) {
+<a class="jxr_linenumber" name="L408" href="#L408">408</a> 		<strong class="jxr_keyword">this</strong>.valueFunction = assertArgNotNull(<span class="jxr_string">"valueFunction"</span>, valueFunction);
+<a class="jxr_linenumber" name="L409" href="#L409">409</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
+<a class="jxr_linenumber" name="L410" href="#L410">410</a> 	}
+<a class="jxr_linenumber" name="L411" href="#L411">411</a> 
+<a class="jxr_linenumber" name="L412" href="#L412">412</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L413" href="#L413">413</a> <em class="jxr_javadoccomment">	 * Sets both key and value conversion functions.</em>
 <a class="jxr_linenumber" name="L414" href="#L414">414</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L415" href="#L415">415</a> <em class="jxr_javadoccomment">	 * @return This object.</em>
-<a class="jxr_linenumber" name="L416" href="#L416">416</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L417" href="#L417">417</a> 	<strong class="jxr_keyword">public</strong> MapBuilder&lt;K,V&gt; sparse() {
-<a class="jxr_linenumber" name="L418" href="#L418">418</a> 		sparse = <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="L419" href="#L419">419</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
-<a class="jxr_linenumber" name="L420" href="#L420">420</a> 	}
-<a class="jxr_linenumber" name="L421" href="#L421">421</a> 
-<a class="jxr_linenumber" name="L422" href="#L422">422</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L423" href="#L423">423</a> <em class="jxr_javadoccomment">	 * Specifies the map to append to.</em>
-<a class="jxr_linenumber" name="L424" href="#L424">424</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L425" href="#L425">425</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L426" href="#L426">426</a> <em class="jxr_javadoccomment">	 * If not specified, uses a new {@link LinkedHashMap}.</em>
-<a class="jxr_linenumber" name="L427" href="#L427">427</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L428" href="#L428">428</a> <em class="jxr_javadoccomment">	 * @param map The map to append to.</em>
-<a class="jxr_linenumber" name="L429" href="#L429">429</a> <em class="jxr_javadoccomment">	 * @return This object.</em>
-<a class="jxr_linenumber" name="L430" href="#L430">430</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L431" href="#L431">431</a> 	<strong class="jxr_keyword">public</strong> MapBuilder&lt;K,V&gt; to(Map&lt;K,V&gt; map) {
-<a class="jxr_linenumber" name="L432" href="#L432">432</a> 		<strong class="jxr_keyword">this</strong>.map = map;
-<a class="jxr_linenumber" name="L433" href="#L433">433</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
-<a class="jxr_linenumber" name="L434" href="#L434">434</a> 	}
-<a class="jxr_linenumber" name="L435" href="#L435">435</a> 
-<a class="jxr_linenumber" name="L436" href="#L436">436</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L437" href="#L437">437</a> <em class="jxr_javadoccomment">	 * When specified, {@link #build()} will return an unmodifiable map.</em>
-<a class="jxr_linenumber" name="L438" href="#L438">438</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L439" href="#L439">439</a> <em class="jxr_javadoccomment">	 * @return This object.</em>
-<a class="jxr_linenumber" name="L440" href="#L440">440</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L441" href="#L441">441</a> 	<strong class="jxr_keyword">public</strong> MapBuilder&lt;K,V&gt; unmodifiable() {
-<a class="jxr_linenumber" name="L442" href="#L442">442</a> 		unmodifiable = <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="L443" href="#L443">443</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
-<a class="jxr_linenumber" name="L444" href="#L444">444</a> 	}
-<a class="jxr_linenumber" name="L445" href="#L445">445</a> 
-<a class="jxr_linenumber" name="L446" href="#L446">446</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L447" href="#L447">447</a> <em class="jxr_javadoccomment">	 * Converts an object to the specified type.</em>
-<a class="jxr_linenumber" name="L448" href="#L448">448</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L449" href="#L449">449</a> <em class="jxr_javadoccomment">	 * @param &lt;T&gt; The type to convert to.</em>
-<a class="jxr_linenumber" name="L450" href="#L450">450</a> <em class="jxr_javadoccomment">	 * @param c The type to convert to.</em>
-<a class="jxr_linenumber" name="L451" href="#L451">451</a> <em class="jxr_javadoccomment">	 * @param o The object to convert.</em>
-<a class="jxr_linenumber" name="L452" href="#L452">452</a> <em class="jxr_javadoccomment">	 * @return The converted object.</em>
-<a class="jxr_linenumber" name="L453" href="#L453">453</a> <em class="jxr_javadoccomment">	 * @throws RuntimeException If the object cannot be converted to the specified type.</em>
-<a class="jxr_linenumber" name="L454" href="#L454">454</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L455" href="#L455">455</a> 	<strong class="jxr_keyword">private</strong> &lt;T&gt; T toType(Class&lt;T&gt; c, Object o) {
-<a class="jxr_linenumber" name="L456" href="#L456">456</a> 		<strong class="jxr_keyword">if</strong> (c.isInstance(o))
-<a class="jxr_linenumber" name="L457" href="#L457">457</a> 			<strong class="jxr_keyword">return</strong> c.<strong class="jxr_keyword">cast</strong>(o);
-<a class="jxr_linenumber" name="L458" href="#L458">458</a> 		<strong class="jxr_keyword">if</strong> (nn(converters)) {
-<a class="jxr_linenumber" name="L459" href="#L459">459</a> 			<strong class="jxr_keyword">var</strong> e = converters.stream().map(x -&gt; x.convertTo(c, o)).filter(Utils::nn).findFirst().orElse(<strong class="jxr_keyword">null</strong>);
-<a class="jxr_linenumber" name="L460" href="#L460">460</a> 			<strong class="jxr_keyword">if</strong> (nn(e))
-<a class="jxr_linenumber" name="L461" href="#L461">461</a> 				<strong class="jxr_keyword">return</strong> e;
-<a class="jxr_linenumber" name="L462" href="#L462">462</a> 		}
-<a class="jxr_linenumber" name="L463" href="#L463">463</a> 		<strong class="jxr_keyword">throw</strong> rex(<span class="jxr_string">"Object of type {0} could not be converted to type {1}"</span>, cn(o), cn(c));
-<a class="jxr_linenumber" name="L464" href="#L464">464</a> 	}
-<a class="jxr_linenumber" name="L465" href="#L465">465</a> }
+<a class="jxr_linenumber" name="L415" href="#L415">415</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L416" href="#L416">416</a> <em class="jxr_javadoccomment">	 * Convenience method for setting both functions at once.</em>
+<a class="jxr_linenumber" name="L417" href="#L417">417</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L418" href="#L418">418</a> <em class="jxr_javadoccomment">	 * @param keyFunction The function to convert keys. Must not be &lt;jk&gt;null&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L419" href="#L419">419</a> <em class="jxr_javadoccomment">	 * @param valueFunction The function to convert values. Must not be &lt;jk&gt;null&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L420" href="#L420">420</a> <em class="jxr_javadoccomment">	 * @return This object.</em>
+<a class="jxr_linenumber" name="L421" href="#L421">421</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L422" href="#L422">422</a> 	<strong class="jxr_keyword">public</strong> MapBuilder&lt;K,V&gt; functions(Function&lt;Object,K&gt; keyFunction, Function&lt;Object,V&gt; valueFunction) {
+<a class="jxr_linenumber" name="L423" href="#L423">423</a> 		<strong class="jxr_keyword">this</strong>.keyFunction = assertArgNotNull(<span class="jxr_string">"keyFunction"</span>, keyFunction);
+<a class="jxr_linenumber" name="L424" href="#L424">424</a> 		<strong class="jxr_keyword">this</strong>.valueFunction = assertArgNotNull(<span class="jxr_string">"valueFunction"</span>, valueFunction);
+<a class="jxr_linenumber" name="L425" href="#L425">425</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
+<a class="jxr_linenumber" name="L426" href="#L426">426</a> 	}
+<a class="jxr_linenumber" name="L427" href="#L427">427</a> 
+<a class="jxr_linenumber" name="L428" href="#L428">428</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L429" href="#L429">429</a> <em class="jxr_javadoccomment">	 * Forces the existing set to be copied instead of appended to.</em>
+<a class="jxr_linenumber" name="L430" href="#L430">430</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L431" href="#L431">431</a> <em class="jxr_javadoccomment">	 * @return This object.</em>
+<a class="jxr_linenumber" name="L432" href="#L432">432</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L433" href="#L433">433</a> 	<strong class="jxr_keyword">public</strong> MapBuilder&lt;K,V&gt; copy() {
+<a class="jxr_linenumber" name="L434" href="#L434">434</a> 		<strong class="jxr_keyword">if</strong> (nn(map))
+<a class="jxr_linenumber" name="L435" href="#L435">435</a> 			map = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;&gt;(map);
+<a class="jxr_linenumber" name="L436" href="#L436">436</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
+<a class="jxr_linenumber" name="L437" href="#L437">437</a> 	}
+<a class="jxr_linenumber" name="L438" href="#L438">438</a> 
+<a class="jxr_linenumber" name="L439" href="#L439">439</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L440" href="#L440">440</a> <em class="jxr_javadoccomment">	 * Applies a default filter that excludes common "empty" or "unset" values from being added to the map.</em>
+<a class="jxr_linenumber" name="L441" href="#L441">441</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L442" href="#L442">442</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L443" href="#L443">443</a> <em class="jxr_javadoccomment">	 * The following values are filtered out:</em>
+<a class="jxr_linenumber" name="L444" href="#L444">444</a> <em class="jxr_javadoccomment">	 * &lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L445" href="#L445">445</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;{@code null}</em>
+<a class="jxr_linenumber" name="L446" href="#L446">446</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;{@link Boolean#FALSE}</em>
+<a class="jxr_linenumber" name="L447" href="#L447">447</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;Numbers with {@code intValue() == -1}</em>
+<a class="jxr_linenumber" name="L448" href="#L448">448</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;Empty arrays</em>
+<a class="jxr_linenumber" name="L449" href="#L449">449</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;Empty {@link Map Maps}</em>
+<a class="jxr_linenumber" name="L450" href="#L450">450</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;Empty {@link Collection Collections}</em>
+<a class="jxr_linenumber" name="L451" href="#L451">451</a> <em class="jxr_javadoccomment">	 * &lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L452" href="#L452">452</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L453" href="#L453">453</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L454" href="#L454">454</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L455" href="#L455">455</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;import static&lt;/jk&gt; org.apache.juneau.commons.utils.CollectionUtils.*;</em>
+<a class="jxr_linenumber" name="L456" href="#L456">456</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L457" href="#L457">457</a> <em class="jxr_javadoccomment">	 * 	FluentMap&amp;lt;String,Object&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = &lt;jsm&gt;mapb&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, Object.&lt;jk&gt;class&lt;/jk&gt;)</em>
+<a class="jxr_linenumber" name="L458" href="#L458">458</a> <em class="jxr_javadoccomment">	 * 		.filtered()</em>
+<a class="jxr_linenumber" name="L459" href="#L459">459</a> <em class="jxr_javadoccomment">	 * 		.add(&lt;js&gt;"name"&lt;/js&gt;, &lt;js&gt;"John"&lt;/js&gt;)</em>
+<a class="jxr_linenumber" name="L460" href="#L460">460</a> <em class="jxr_javadoccomment">	 * 		.add(&lt;js&gt;"age"&lt;/js&gt;, -1)              &lt;jc&gt;// Filtered out at build time&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L461" href="#L461">461</a> <em class="jxr_javadoccomment">	 * 		.add(&lt;js&gt;"enabled"&lt;/js&gt;, &lt;jk&gt;false&lt;/jk&gt;)   &lt;jc&gt;// Filtered out at build time&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L462" href="#L462">462</a> <em class="jxr_javadoccomment">	 * 		.add(&lt;js&gt;"tags"&lt;/js&gt;, &lt;jk&gt;new&lt;/jk&gt; String[0]) &lt;jc&gt;// Filtered out at build time&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L463" href="#L463">463</a> <em class="jxr_javadoccomment">	 * 		.build();</em>
+<a class="jxr_linenumber" name="L464" href="#L464">464</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L465" href="#L465">465</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L466" href="#L466">466</a> <em class="jxr_javadoccomment">	 * @return This object.</em>
+<a class="jxr_linenumber" name="L467" href="#L467">467</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L468" href="#L468">468</a> 	<strong class="jxr_keyword">public</strong> MapBuilder&lt;K,V&gt; filtered() {
+<a class="jxr_linenumber" name="L469" href="#L469">469</a> 		<em class="jxr_comment">// @formatter:off</em>
+<a class="jxr_linenumber" name="L470" href="#L470">470</a> 		<strong class="jxr_keyword">return</strong> filtered((k, v) -&gt; ! (
+<a class="jxr_linenumber" name="L471" href="#L471">471</a> 			v == <strong class="jxr_keyword">null</strong>
+<a class="jxr_linenumber" name="L472" href="#L472">472</a> 			|| (v instanceof Boolean v2 &amp;&amp; v2.equals(false))
+<a class="jxr_linenumber" name="L473" href="#L473">473</a> 			|| (v instanceof Number v3 &amp;&amp; v3.intValue() == -1)
+<a class="jxr_linenumber" name="L474" href="#L474">474</a> 			|| (isArray(v) &amp;&amp; Array.getLength(v) == 0)
+<a class="jxr_linenumber" name="L475" href="#L475">475</a> 			|| (v instanceof Map v2 &amp;&amp; v2.isEmpty())
+<a class="jxr_linenumber" name="L476" href="#L476">476</a> 			|| (v instanceof Collection v3 &amp;&amp; v3.isEmpty())
+<a class="jxr_linenumber" name="L477" href="#L477">477</a> 			));
+<a class="jxr_linenumber" name="L478" href="#L478">478</a> 		<em class="jxr_comment">// @formatter:on</em>
+<a class="jxr_linenumber" name="L479" href="#L479">479</a> 	}
+<a class="jxr_linenumber" name="L480" href="#L480">480</a> 
+<a class="jxr_linenumber" name="L481" href="#L481">481</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L482" href="#L482">482</a> <em class="jxr_javadoccomment">	 * Applies a filter predicate to entries when building the map.</em>
+<a class="jxr_linenumber" name="L483" href="#L483">483</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L484" href="#L484">484</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L485" href="#L485">485</a> <em class="jxr_javadoccomment">	 * The filter receives both the key and value of each entry. Entries where the predicate returns</em>
+<a class="jxr_linenumber" name="L486" href="#L486">486</a> <em class="jxr_javadoccomment">	 * {@code true} will be kept; entries where it returns {@code false} will be filtered out.</em>
+<a class="jxr_linenumber" name="L487" href="#L487">487</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L488" href="#L488">488</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L489" href="#L489">489</a> <em class="jxr_javadoccomment">	 * This method can be called multiple times. When called multiple times, all filters are combined</em>
+<a class="jxr_linenumber" name="L490" href="#L490">490</a> <em class="jxr_javadoccomment">	 * using AND logic - an entry must pass all filters to be kept in the map.</em>
+<a class="jxr_linenumber" name="L491" href="#L491">491</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L492" href="#L492">492</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L493" href="#L493">493</a> <em class="jxr_javadoccomment">	 * Note: Filtering is applied at build time, not when adding entries.</em>
+<a class="jxr_linenumber" name="L494" href="#L494">494</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L495" href="#L495">495</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L496" href="#L496">496</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L497" href="#L497">497</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;import static&lt;/jk&gt; org.apache.juneau.commons.utils.CollectionUtils.*;</em>
+<a class="jxr_linenumber" name="L498" href="#L498">498</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L499" href="#L499">499</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Keep only non-null, non-empty string values&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L500" href="#L500">500</a> <em class="jxr_javadoccomment">	 * 	Map&amp;lt;String,String&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = &lt;jsm&gt;mapb&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, String.&lt;jk&gt;class&lt;/jk&gt;)</em>
+<a class="jxr_linenumber" name="L501" href="#L501">501</a> <em class="jxr_javadoccomment">	 * 		.filtered((k, v) -&amp;gt; v != &lt;jk&gt;null&lt;/jk&gt; &amp;amp;&amp;amp; !v.equals(&lt;js&gt;""&lt;/js&gt;))</em>
+<a class="jxr_linenumber" name="L502" href="#L502">502</a> <em class="jxr_javadoccomment">	 * 		.add(&lt;js&gt;"a"&lt;/js&gt;, &lt;js&gt;"foo"&lt;/js&gt;)</em>
+<a class="jxr_linenumber" name="L503" href="#L503">503</a> <em class="jxr_javadoccomment">	 * 		.add(&lt;js&gt;"b"&lt;/js&gt;, &lt;jk&gt;null&lt;/jk&gt;)     &lt;jc&gt;// Filtered out at build time&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L504" href="#L504">504</a> <em class="jxr_javadoccomment">	 * 		.add(&lt;js&gt;"c"&lt;/js&gt;, &lt;js&gt;""&lt;/js&gt;)       &lt;jc&gt;// Filtered out at build time&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L505" href="#L505">505</a> <em class="jxr_javadoccomment">	 * 		.build();</em>
+<a class="jxr_linenumber" name="L506" href="#L506">506</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L507" href="#L507">507</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Multiple filters combined with AND&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L508" href="#L508">508</a> <em class="jxr_javadoccomment">	 * 	Map&amp;lt;String,Integer&amp;gt; &lt;jv&gt;map2&lt;/jv&gt; = &lt;jsm&gt;mapb&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;, Integer.&lt;jk&gt;class&lt;/jk&gt;)</em>
+<a class="jxr_linenumber" name="L509" href="#L509">509</a> <em class="jxr_javadoccomment">	 * 		.filtered((k, v) -&amp;gt; v != &lt;jk&gt;null&lt;/jk&gt;)           &lt;jc&gt;// First filter&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L510" href="#L510">510</a> <em class="jxr_javadoccomment">	 * 		.filtered((k, v) -&amp;gt; v &amp;gt; 0)                    &lt;jc&gt;// Second filter (ANDed with first)&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L511" href="#L511">511</a> <em class="jxr_javadoccomment">	 * 		.filtered((k, v) -&amp;gt; ! k.startsWith(&lt;js&gt;"_"&lt;/js&gt;)) &lt;jc&gt;// Third filter (ANDed with previous)&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L512" href="#L512">512</a> <em class="jxr_javadoccomment">	 * 		.add(&lt;js&gt;"a"&lt;/js&gt;, 5)</em>
+<a class="jxr_linenumber" name="L513" href="#L513">513</a> <em class="jxr_javadoccomment">	 * 		.add(&lt;js&gt;"_b"&lt;/js&gt;, 10)  &lt;jc&gt;// Filtered out (starts with "_")&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L514" href="#L514">514</a> <em class="jxr_javadoccomment">	 * 		.add(&lt;js&gt;"c"&lt;/js&gt;, -1)   &lt;jc&gt;// Filtered out (not &amp;gt; 0)&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L515" href="#L515">515</a> <em class="jxr_javadoccomment">	 * 		.build();</em>
+<a class="jxr_linenumber" name="L516" href="#L516">516</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L517" href="#L517">517</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L518" href="#L518">518</a> <em class="jxr_javadoccomment">	 * @param filter The filter predicate. Must not be &lt;jk&gt;null&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L519" href="#L519">519</a> <em class="jxr_javadoccomment">	 * @return This object.</em>
+<a class="jxr_linenumber" name="L520" href="#L520">520</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L521" href="#L521">521</a> 	<strong class="jxr_keyword">public</strong> MapBuilder&lt;K,V&gt; filtered(BiPredicate&lt;K,V&gt; filter) {
+<a class="jxr_linenumber" name="L522" href="#L522">522</a> 		BiPredicate&lt;K,V&gt; newFilter = assertArgNotNull(<span class="jxr_string">"filter"</span>, filter);
+<a class="jxr_linenumber" name="L523" href="#L523">523</a> 		<strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">this</strong>.filter == <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L524" href="#L524">524</a> 			<strong class="jxr_keyword">this</strong>.filter = newFilter;
+<a class="jxr_linenumber" name="L525" href="#L525">525</a> 		<strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L526" href="#L526">526</a> 			<strong class="jxr_keyword">this</strong>.filter = <strong class="jxr_keyword">this</strong>.filter.and(newFilter);
+<a class="jxr_linenumber" name="L527" href="#L527">527</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
+<a class="jxr_linenumber" name="L528" href="#L528">528</a> 	}
+<a class="jxr_linenumber" name="L529" href="#L529">529</a> 
+<a class="jxr_linenumber" name="L530" href="#L530">530</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L531" href="#L531">531</a> <em class="jxr_javadoccomment">	 * Converts the set into a {@link SortedMap}.</em>
+<a class="jxr_linenumber" name="L532" href="#L532">532</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L533" href="#L533">533</a> <em class="jxr_javadoccomment">	 * @return This object.</em>
+<a class="jxr_linenumber" name="L534" href="#L534">534</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L535" href="#L535">535</a> 	@SuppressWarnings(<span class="jxr_string">"unchecked"</span>)
+<a class="jxr_linenumber" name="L536" href="#L536">536</a> 	<strong class="jxr_keyword">public</strong> MapBuilder&lt;K,V&gt; sorted() {
+<a class="jxr_linenumber" name="L537" href="#L537">537</a> 		<strong class="jxr_keyword">return</strong> sorted((Comparator&lt;K&gt;)Comparator.naturalOrder());
+<a class="jxr_linenumber" name="L538" href="#L538">538</a> 	}
+<a class="jxr_linenumber" name="L539" href="#L539">539</a> 
+<a class="jxr_linenumber" name="L540" href="#L540">540</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L541" href="#L541">541</a> <em class="jxr_javadoccomment">	 * Converts the set into a {@link SortedMap} using the specified comparator.</em>
+<a class="jxr_linenumber" name="L542" href="#L542">542</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L543" href="#L543">543</a> <em class="jxr_javadoccomment">	 * @param comparator The comparator to use for sorting. Must not be &lt;jk&gt;null&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L544" href="#L544">544</a> <em class="jxr_javadoccomment">	 * @return This object.</em>
+<a class="jxr_linenumber" name="L545" href="#L545">545</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L546" href="#L546">546</a> 	<strong class="jxr_keyword">public</strong> MapBuilder&lt;K,V&gt; sorted(Comparator&lt;K&gt; comparator) {
+<a class="jxr_linenumber" name="L547" href="#L547">547</a> 		<strong class="jxr_keyword">this</strong>.comparator = assertArgNotNull(<span class="jxr_string">"comparator"</span>, comparator);
+<a class="jxr_linenumber" name="L548" href="#L548">548</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
+<a class="jxr_linenumber" name="L549" href="#L549">549</a> 	}
+<a class="jxr_linenumber" name="L550" href="#L550">550</a> 
+<a class="jxr_linenumber" name="L551" href="#L551">551</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L552" href="#L552">552</a> <em class="jxr_javadoccomment">	 * When specified, the {@link #build()} method will return &lt;jk&gt;null&lt;/jk&gt; if the map is empty.</em>
+<a class="jxr_linenumber" name="L553" href="#L553">553</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L554" href="#L554">554</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L555" href="#L555">555</a> <em class="jxr_javadoccomment">	 * Otherwise {@link #build()} will never return &lt;jk&gt;null&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L556" href="#L556">556</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L557" href="#L557">557</a> <em class="jxr_javadoccomment">	 * @return This object.</em>
+<a class="jxr_linenumber" name="L558" href="#L558">558</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L559" href="#L559">559</a> 	<strong class="jxr_keyword">public</strong> MapBuilder&lt;K,V&gt; sparse() {
+<a class="jxr_linenumber" name="L560" href="#L560">560</a> 		sparse = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="L561" href="#L561">561</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
+<a class="jxr_linenumber" name="L562" href="#L562">562</a> 	}
+<a class="jxr_linenumber" name="L563" href="#L563">563</a> 
+<a class="jxr_linenumber" name="L564" href="#L564">564</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L565" href="#L565">565</a> <em class="jxr_javadoccomment">	 * Specifies the map to append to.</em>
+<a class="jxr_linenumber" name="L566" href="#L566">566</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L567" href="#L567">567</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L568" href="#L568">568</a> <em class="jxr_javadoccomment">	 * If not specified, uses a new {@link LinkedHashMap}.</em>
+<a class="jxr_linenumber" name="L569" href="#L569">569</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L570" href="#L570">570</a> <em class="jxr_javadoccomment">	 * @param map The map to append to.</em>
+<a class="jxr_linenumber" name="L571" href="#L571">571</a> <em class="jxr_javadoccomment">	 * @return This object.</em>
+<a class="jxr_linenumber" name="L572" href="#L572">572</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L573" href="#L573">573</a> 	<strong class="jxr_keyword">public</strong> MapBuilder&lt;K,V&gt; to(Map&lt;K,V&gt; map) {
+<a class="jxr_linenumber" name="L574" href="#L574">574</a> 		<strong class="jxr_keyword">this</strong>.map = map;
+<a class="jxr_linenumber" name="L575" href="#L575">575</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
+<a class="jxr_linenumber" name="L576" href="#L576">576</a> 	}
+<a class="jxr_linenumber" name="L577" href="#L577">577</a> 
+<a class="jxr_linenumber" name="L578" href="#L578">578</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L579" href="#L579">579</a> <em class="jxr_javadoccomment">	 * When specified, {@link #build()} will return an unmodifiable map.</em>
+<a class="jxr_linenumber" name="L580" href="#L580">580</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L581" href="#L581">581</a> <em class="jxr_javadoccomment">	 * @return This object.</em>
+<a class="jxr_linenumber" name="L582" href="#L582">582</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L583" href="#L583">583</a> 	<strong class="jxr_keyword">public</strong> MapBuilder&lt;K,V&gt; unmodifiable() {
+<a class="jxr_linenumber" name="L584" href="#L584">584</a> 		unmodifiable = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="L585" href="#L585">585</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
+<a class="jxr_linenumber" name="L586" href="#L586">586</a> 	}
+<a class="jxr_linenumber" name="L587" href="#L587">587</a> 
+<a class="jxr_linenumber" name="L588" href="#L588">588</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L589" href="#L589">589</a> <em class="jxr_javadoccomment">	 * Converts a key object to the key type.</em>
+<a class="jxr_linenumber" name="L590" href="#L590">590</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L591" href="#L591">591</a> <em class="jxr_javadoccomment">	 * @param o The object to convert.</em>
+<a class="jxr_linenumber" name="L592" href="#L592">592</a> <em class="jxr_javadoccomment">	 * @return The converted key.</em>
+<a class="jxr_linenumber" name="L593" href="#L593">593</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L594" href="#L594">594</a> 	@SuppressWarnings(<span class="jxr_string">"unchecked"</span>)
+<a class="jxr_linenumber" name="L595" href="#L595">595</a> 	<strong class="jxr_keyword">private</strong> K convertKey(Object o) {
+<a class="jxr_linenumber" name="L596" href="#L596">596</a> 		<strong class="jxr_keyword">if</strong> (keyType.isInstance(o))
+<a class="jxr_linenumber" name="L597" href="#L597">597</a> 			<strong class="jxr_keyword">return</strong> (K)o;
+<a class="jxr_linenumber" name="L598" href="#L598">598</a> 		<strong class="jxr_keyword">if</strong> (nn(keyFunction))
+<a class="jxr_linenumber" name="L599" href="#L599">599</a> 			<strong class="jxr_keyword">return</strong> keyFunction.apply(o);
+<a class="jxr_linenumber" name="L600" href="#L600">600</a> 		<strong class="jxr_keyword">throw</strong> rex(<span class="jxr_string">"Object of type {0} could not be converted to key type {1}"</span>, cn(o), cn(keyType));
+<a class="jxr_linenumber" name="L601" href="#L601">601</a> 	}
+<a class="jxr_linenumber" name="L602" href="#L602">602</a> 
+<a class="jxr_linenumber" name="L603" href="#L603">603</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L604" href="#L604">604</a> <em class="jxr_javadoccomment">	 * Converts a value object to the value type.</em>
+<a class="jxr_linenumber" name="L605" href="#L605">605</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L606" href="#L606">606</a> <em class="jxr_javadoccomment">	 * @param o The object to convert.</em>
+<a class="jxr_linenumber" name="L607" href="#L607">607</a> <em class="jxr_javadoccomment">	 * @return The converted value.</em>
+<a class="jxr_linenumber" name="L608" href="#L608">608</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L609" href="#L609">609</a> 	@SuppressWarnings(<span class="jxr_string">"unchecked"</span>)
+<a class="jxr_linenumber" name="L610" href="#L610">610</a> 	<strong class="jxr_keyword">private</strong> V convertValue(Object o) {
+<a class="jxr_linenumber" name="L611" href="#L611">611</a> 		<strong class="jxr_keyword">if</strong> (valueType.isInstance(o))
+<a class="jxr_linenumber" name="L612" href="#L612">612</a> 			<strong class="jxr_keyword">return</strong> (V)o;
+<a class="jxr_linenumber" name="L613" href="#L613">613</a> 		<strong class="jxr_keyword">if</strong> (nn(valueFunction))
+<a class="jxr_linenumber" name="L614" href="#L614">614</a> 			<strong class="jxr_keyword">return</strong> valueFunction.apply(o);
+<a class="jxr_linenumber" name="L615" href="#L615">615</a> 		<strong class="jxr_keyword">throw</strong> rex(<span class="jxr_string">"Object of type {0} could not be converted to value type {1}"</span>, cn(o), cn(valueType));
+<a class="jxr_linenumber" name="L616" href="#L616">616</a> 	}
+<a class="jxr_linenumber" name="L617" href="#L617">617</a> }
 </pre>
 <hr/>
 <div id="footer">© 2016–2025 <a href="https://www.apache.org/">The Apache Software Foundation</a></div>
diff --git a/site/xref/org/apache/juneau/commons/utils/CollectionUtils.html b/site/xref/org/apache/juneau/commons/utils/CollectionUtils.html
index 87aa32290a..a7344d2225 100644
--- a/site/xref/org/apache/juneau/commons/utils/CollectionUtils.html
+++ b/site/xref/org/apache/juneau/commons/utils/CollectionUtils.html
@@ -1575,8 +1575,8 @@
 <a class="jxr_linenumber" name="L1567" href="#L1567">1567</a> <em class="jxr_javadoccomment">	 * @param converters Optional converters to use for converting values.</em>
 <a class="jxr_linenumber" name="L1568" href="#L1568">1568</a> <em class="jxr_javadoccomment">	 * @return A new map builder.</em>
 <a class="jxr_linenumber" name="L1569" href="#L1569">1569</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1570" href="#L1570">1570</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;K,V&gt; MapBuilder&lt;K,V&gt; mapb(Class&lt;K&gt; keyType, Class&lt;V&gt; valueType, Converter...converters) {
-<a class="jxr_linenumber" name="L1571" href="#L1571">1571</a> 		<strong class="jxr_keyword">return</strong> MapBuilder.create(keyType, valueType).converters(converters);
+<a class="jxr_linenumber" name="L1570" href="#L1570">1570</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;K,V&gt; MapBuilder&lt;K,V&gt; mapb(Class&lt;K&gt; keyType, Class&lt;V&gt; valueType) {
+<a class="jxr_linenumber" name="L1571" href="#L1571">1571</a> 		<strong class="jxr_keyword">return</strong> MapBuilder.create(keyType, valueType);
 <a class="jxr_linenumber" name="L1572" href="#L1572">1572</a> 	}
 <a class="jxr_linenumber" name="L1573" href="#L1573">1573</a> 
 <a class="jxr_linenumber" name="L1574" href="#L1574">1574</a> 	<em class="jxr_javadoccomment">/**</em>
diff --git a/site/xref/org/apache/juneau/internal/ConverterUtils.html b/site/xref/org/apache/juneau/internal/ConverterUtils.html
index 7d835101ff..33f05d8364 100644
--- a/site/xref/org/apache/juneau/internal/ConverterUtils.html
+++ b/site/xref/org/apache/juneau/internal/ConverterUtils.html
@@ -263,33 +263,36 @@
 <a class="jxr_linenumber" name="L255" href="#L255">255</a> <em class="jxr_javadoccomment">	 * @return A new {@link MapBuilder} containing the converted entries.</em>
 <a class="jxr_linenumber" name="L256" href="#L256">256</a> <em class="jxr_javadoccomment">	 */</em>
 <a class="jxr_linenumber" name="L257" href="#L257">257</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;K,V&gt; MapBuilder&lt;K,V&gt; toMapBuilder(Object value, Class&lt;K&gt; keyType, Class&lt;V&gt; valueType) {
-<a class="jxr_linenumber" name="L258" href="#L258">258</a> 		<strong class="jxr_keyword">return</strong> mapb(keyType, valueType, GenericConverter.INSTANCE).addAny(value);
-<a class="jxr_linenumber" name="L259" href="#L259">259</a> 	}
-<a class="jxr_linenumber" name="L260" href="#L260">260</a> 
-<a class="jxr_linenumber" name="L261" href="#L261">261</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L262" href="#L262">262</a> <em class="jxr_javadoccomment">	 * Converts the specified object to a {@link SetBuilder} with elements of the specified type.</em>
-<a class="jxr_linenumber" name="L263" href="#L263">263</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L264" href="#L264">264</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L265" href="#L265">265</a> <em class="jxr_javadoccomment">	 * The input value can be any of the following:</em>
-<a class="jxr_linenumber" name="L266" href="#L266">266</a> <em class="jxr_javadoccomment">	 * &lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L267" href="#L267">267</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;An array of objects convertible to the element type</em>
-<a class="jxr_linenumber" name="L268" href="#L268">268</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;A {@link Collection} of objects convertible to the element type</em>
-<a class="jxr_linenumber" name="L269" href="#L269">269</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;A single object convertible to the element type (creates a set with one element)</em>
-<a class="jxr_linenumber" name="L270" href="#L270">270</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;A JSON array string that can be parsed into objects of the element type</em>
-<a class="jxr_linenumber" name="L271" href="#L271">271</a> <em class="jxr_javadoccomment">	 * &lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L272" href="#L272">272</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L273" href="#L273">273</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L274" href="#L274">274</a> <em class="jxr_javadoccomment">	 * Duplicate elements (after conversion) will be automatically removed as per {@link java.util.Set Set} semantics.</em>
+<a class="jxr_linenumber" name="L258" href="#L258">258</a> 		<strong class="jxr_keyword">return</strong> mapb(keyType, valueType)
+<a class="jxr_linenumber" name="L259" href="#L259">259</a> 			.keyFunction(o -&gt; GenericConverter.INSTANCE.convertTo(keyType, o))
+<a class="jxr_linenumber" name="L260" href="#L260">260</a> 			.valueFunction(o -&gt; GenericConverter.INSTANCE.convertTo(valueType, o))
+<a class="jxr_linenumber" name="L261" href="#L261">261</a> 			.addAny(value);
+<a class="jxr_linenumber" name="L262" href="#L262">262</a> 	}
+<a class="jxr_linenumber" name="L263" href="#L263">263</a> 
+<a class="jxr_linenumber" name="L264" href="#L264">264</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L265" href="#L265">265</a> <em class="jxr_javadoccomment">	 * Converts the specified object to a {@link SetBuilder} with elements of the specified type.</em>
+<a class="jxr_linenumber" name="L266" href="#L266">266</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L267" href="#L267">267</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L268" href="#L268">268</a> <em class="jxr_javadoccomment">	 * The input value can be any of the following:</em>
+<a class="jxr_linenumber" name="L269" href="#L269">269</a> <em class="jxr_javadoccomment">	 * &lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L270" href="#L270">270</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;An array of objects convertible to the element type</em>
+<a class="jxr_linenumber" name="L271" href="#L271">271</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;A {@link Collection} of objects convertible to the element type</em>
+<a class="jxr_linenumber" name="L272" href="#L272">272</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;A single object convertible to the element type (creates a set with one element)</em>
+<a class="jxr_linenumber" name="L273" href="#L273">273</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;A JSON array string that can be parsed into objects of the element type</em>
+<a class="jxr_linenumber" name="L274" href="#L274">274</a> <em class="jxr_javadoccomment">	 * &lt;/ul&gt;</em>
 <a class="jxr_linenumber" name="L275" href="#L275">275</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L276" href="#L276">276</a> <em class="jxr_javadoccomment">	 * @param &lt;T&gt; The element type.</em>
-<a class="jxr_linenumber" name="L277" href="#L277">277</a> <em class="jxr_javadoccomment">	 * @param value The value to convert. Can be &lt;jk&gt;null&lt;/jk&gt;.</em>
-<a class="jxr_linenumber" name="L278" href="#L278">278</a> <em class="jxr_javadoccomment">	 * @param type The element type class.</em>
-<a class="jxr_linenumber" name="L279" href="#L279">279</a> <em class="jxr_javadoccomment">	 * @return A new {@link SetBuilder} containing the converted elements.</em>
-<a class="jxr_linenumber" name="L280" href="#L280">280</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L281" href="#L281">281</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;T&gt; SetBuilder&lt;T&gt; toSetBuilder(Object value, Class&lt;T&gt; type) {
-<a class="jxr_linenumber" name="L282" href="#L282">282</a> 		<strong class="jxr_keyword">return</strong> setb(type, GenericConverter.INSTANCE).addAny(value);
-<a class="jxr_linenumber" name="L283" href="#L283">283</a> 	}
-<a class="jxr_linenumber" name="L284" href="#L284">284</a> }
+<a class="jxr_linenumber" name="L276" href="#L276">276</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L277" href="#L277">277</a> <em class="jxr_javadoccomment">	 * Duplicate elements (after conversion) will be automatically removed as per {@link java.util.Set Set} semantics.</em>
+<a class="jxr_linenumber" name="L278" href="#L278">278</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L279" href="#L279">279</a> <em class="jxr_javadoccomment">	 * @param &lt;T&gt; The element type.</em>
+<a class="jxr_linenumber" name="L280" href="#L280">280</a> <em class="jxr_javadoccomment">	 * @param value The value to convert. Can be &lt;jk&gt;null&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L281" href="#L281">281</a> <em class="jxr_javadoccomment">	 * @param type The element type class.</em>
+<a class="jxr_linenumber" name="L282" href="#L282">282</a> <em class="jxr_javadoccomment">	 * @return A new {@link SetBuilder} containing the converted elements.</em>
+<a class="jxr_linenumber" name="L283" href="#L283">283</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L284" href="#L284">284</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;T&gt; SetBuilder&lt;T&gt; toSetBuilder(Object value, Class&lt;T&gt; type) {
+<a class="jxr_linenumber" name="L285" href="#L285">285</a> 		<strong class="jxr_keyword">return</strong> setb(type, GenericConverter.INSTANCE).addAny(value);
+<a class="jxr_linenumber" name="L286" href="#L286">286</a> 	}
+<a class="jxr_linenumber" name="L287" href="#L287">287</a> }
 </pre>
 <hr/>
 <div id="footer">© 2016–2025 <a href="https://www.apache.org/">The Apache Software Foundation</a></div>