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/15 15:09:52 UTC

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

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 d24a15c760 Deploy documentation staging from e0bb0767af2e7c4aadb55bb75dd1a3d6bb411758 e0bb0767af2e7c4aadb55bb75dd1a3d6bb411758
d24a15c760 is described below

commit d24a15c7602662c8880671a5370c5e114a21b4ed
Author: github-actions[bot] <gi...@users.noreply.github.com>
AuthorDate: Mon Dec 15 15:09:46 2025 +0000

    Deploy documentation staging from e0bb0767af2e7c4aadb55bb75dd1a3d6bb411758 e0bb0767af2e7c4aadb55bb75dd1a3d6bb411758
---
 site/xref-test/allclasses-frame.html               |   14 +-
 .../commons/annotation/AnnotationObject_Test.html  |    6 +-
 .../annotation/AppliedAnnotationObject_Test.html   |    2 +-
 .../AppliedOnClassAnnotationObject_Test.html       |    6 +-
 .../commons/reflect/AnnotationInfo_Test.html       |   10 +-
 .../juneau/commons/reflect/ReflectionMap_Test.html |    2 +-
 .../org/apache/juneau/cp/BeanStore_Test.html       |   12 +-
 .../org/apache/juneau/cp/Messages_Test.html        |    2 +-
 .../remote/Remote_FormDataAnnotation_Test.html     |   28 +-
 .../http/remote/Remote_HeaderAnnotation_Test.html  |   24 +-
 .../http/remote/Remote_QueryAnnotation_Test.html   |   26 +-
 .../apache/juneau/rest/annotation/Path_Test.html   |   62 +-
 .../juneau/rest/util/UrlPathMatcher_Test.html      |   86 +-
 ...t.html => SerializerConfigAnnotation_Test.html} |   30 +-
 .../apache/juneau/serializer/package-frame.html    |   10 +-
 .../apache/juneau/serializer/package-summary.html  |   10 +-
 .../{BeanDiffTest.html => BeanDiff_Test.html}      |   28 +-
 .../org/apache/juneau/utils/package-frame.html     |    4 +-
 .../org/apache/juneau/utils/package-summary.html   |    4 +-
 site/xref/org/apache/juneau/BeanMeta.html          | 1230 ++++++++--------
 site/xref/org/apache/juneau/BeanPropertyMeta.html  |  389 ++---
 site/xref/org/apache/juneau/BeanPropertyValue.html |  165 +--
 site/xref/org/apache/juneau/BeanRegistry.html      |  338 ++---
 site/xref/org/apache/juneau/Context.html           |    2 +-
 site/xref/org/apache/juneau/ContextSession.html    |    2 +-
 site/xref/org/apache/juneau/UriContext.html        |  772 +++++-----
 .../commons/annotation/AnnotationObject.html       |   16 +-
 .../juneau/commons/collections/FluentMap.html      |  487 ++++---
 .../juneau/commons/reflect/AnnotationInfo.html     | 1442 +++++++++----------
 .../juneau/commons/reflect/ReflectionMap.html      | 1391 +++++++++---------
 .../juneau/commons/utils/CollectionUtils.html      | 1499 ++++++++++----------
 .../org/apache/juneau/commons/utils/Utils.html     |  567 ++++----
 .../xref/org/apache/juneau/cp/BasicFileFinder.html |  337 ++---
 site/xref/org/apache/juneau/cp/BeanStore.html      | 1298 +++++++++--------
 site/xref/org/apache/juneau/cp/Messages.html       |  922 ++++++------
 .../org/apache/juneau/httppart/HttpPartSchema.html |  994 +++++++------
 .../apache/juneau/rest/debug/DebugEnablement.html  |  586 ++++----
 .../juneau/rest/httppart/RequestAttributes.html    |  552 +++----
 .../juneau/rest/httppart/RequestFormParams.html    | 1059 +++++++-------
 .../juneau/rest/httppart/RequestHeaders.html       |  947 +++++++------
 .../juneau/rest/httppart/RequestPathParams.html    | 1077 +++++++-------
 .../juneau/rest/httppart/RequestQueryParams.html   | 1069 +++++++-------
 .../org/apache/juneau/rest/logger/CallLogger.html  |  269 ++--
 .../apache/juneau/rest/logger/CallLoggerRule.html  |  770 +++++-----
 .../apache/juneau/rest/mock/MockPathResolver.html  |  241 ++--
 .../juneau/rest/staticfile/BasicStaticFiles.html   |  268 ++--
 .../apache/juneau/rest/stats/MethodExecStats.html  |  473 +++---
 .../org/apache/juneau/rest/stats/ThrownStats.html  |   29 +-
 site/xref/org/apache/juneau/rest/util/UrlPath.html |  172 +--
 .../org/apache/juneau/rest/util/UrlPathMatch.html  |  260 ++--
 .../org/apache/juneau/svl/VarResolverSession.html  |   41 +-
 site/xref/org/apache/juneau/utils/BeanDiff.html    |  431 +++---
 site/xref/org/apache/juneau/utils/HashKey.html     |  101 +-
 .../xref/org/apache/juneau/utils/ManifestFile.html |    2 +-
 54 files changed, 10439 insertions(+), 10125 deletions(-)

diff --git a/site/xref-test/allclasses-frame.html b/site/xref-test/allclasses-frame.html
index 4231566964..b2458a5c05 100644
--- a/site/xref-test/allclasses-frame.html
+++ b/site/xref-test/allclasses-frame.html
@@ -300,8 +300,8 @@
                 <li><a href="org/apache/juneau/transforms/BeanDictionary_ComboRoundTripTest.html#BeanDictionary_ComboRoundTripTest.B" target="classFrame">BeanDictionary_ComboRoundTripTest.B</a></li>
                 <li><a href="org/apache/juneau/transforms/BeanDictionary_ComboRoundTripTest.html#BeanDictionary_ComboRoundTripTest.IA" target="classFrame">BeanDictionary_ComboRoundTripTest.IA</a></li>
                 <li><a href="org/apache/juneau/transforms/BeanDictionary_ComboRoundTripTest.html#BeanDictionary_ComboRoundTripTest.IB" target="classFrame">BeanDictionary_ComboRoundTripTest.IB</a></li>
-                <li><a href="org/apache/juneau/utils/BeanDiffTest.html#BeanDiffTest" target="classFrame">BeanDiffTest</a></li>
-                <li><a href="org/apache/juneau/utils/BeanDiffTest.html#BeanDiffTest.A" target="classFrame">BeanDiffTest.A</a></li>
+                <li><a href="org/apache/juneau/utils/BeanDiff_Test.html#BeanDiff_Test" target="classFrame">BeanDiff_Test</a></li>
+                <li><a href="org/apache/juneau/utils/BeanDiff_Test.html#BeanDiff_Test.A" target="classFrame">BeanDiff_Test.A</a></li>
                 <li><a href="org/apache/juneau/BeanFilter_Test.html#BeanFilter_Test" target="classFrame">BeanFilter_Test</a></li>
                 <li><a href="org/apache/juneau/transforms/BeanFilter_Test.html#BeanFilter_Test" target="classFrame">BeanFilter_Test</a></li>
                 <li><a href="org/apache/juneau/BeanFilter_Test.html#BeanFilter_Test.A" target="classFrame">BeanFilter_Test.A</a></li>
@@ -2656,11 +2656,11 @@
                 <li><a href="org/apache/juneau/http/SerializedHttpEntity_Test.html#SerializedHttpEntity_Test.A" target="classFrame">SerializedHttpEntity_Test.A</a></li>
                 <li><a href="org/apache/juneau/http/SerializedPart_Test.html#SerializedPart_Test" target="classFrame">SerializedPart_Test</a></li>
                 <li><a href="org/apache/juneau/http/SerializedPart_Test.html#SerializedPart_Test.BadPartSerializerSession" target="classFrame">SerializedPart_Test.BadPartSerializerSession</a></li>
-                <li><a href="org/apache/juneau/serializer/SerializerConfigAnnotationTest.html#SerializerConfigAnnotationTest" target="classFrame">SerializerConfigAnnotationTest</a></li>
-                <li><a href="org/apache/juneau/serializer/SerializerConfigAnnotationTest.html#SerializerConfigAnnotationTest.A" target="classFrame">SerializerConfigAnnotationTest.A</a></li>
-                <li><a href="org/apache/juneau/serializer/SerializerConfigAnnotationTest.html#SerializerConfigAnnotationTest.AA" target="classFrame">SerializerConfigAnnotationTest.AA</a></li>
-                <li><a href="org/apache/juneau/serializer/SerializerConfigAnnotationTest.html#SerializerConfigAnnotationTest.B" target="classFrame">SerializerConfigAnnotationTest.B</a></li>
-                <li><a href="org/apache/juneau/serializer/SerializerConfigAnnotationTest.html#SerializerConfigAnnotationTest.C" target="classFrame">SerializerConfigAnnotationTest.C</a></li>
+                <li><a href="org/apache/juneau/serializer/SerializerConfigAnnotation_Test.html#SerializerConfigAnnotation_Test" target="classFrame">SerializerConfigAnnotation_Test</a></li>
+                <li><a href="org/apache/juneau/serializer/SerializerConfigAnnotation_Test.html#SerializerConfigAnnotation_Test.A" target="classFrame">SerializerConfigAnnotation_Test.A</a></li>
+                <li><a href="org/apache/juneau/serializer/SerializerConfigAnnotation_Test.html#SerializerConfigAnnotation_Test.AA" target="classFrame">SerializerConfigAnnotation_Test.AA</a></li>
+                <li><a href="org/apache/juneau/serializer/SerializerConfigAnnotation_Test.html#SerializerConfigAnnotation_Test.B" target="classFrame">SerializerConfigAnnotation_Test.B</a></li>
+                <li><a href="org/apache/juneau/serializer/SerializerConfigAnnotation_Test.html#SerializerConfigAnnotation_Test.C" target="classFrame">SerializerConfigAnnotation_Test.C</a></li>
                 <li><a href="org/apache/juneau/serializer/SerializerSet_Test.html#SerializerSet_Test" target="classFrame">SerializerSet_Test</a></li>
                 <li><a href="org/apache/juneau/serializer/SerializerSet_Test.html#SerializerSet_Test.SA1" target="classFrame">SerializerSet_Test.SA1</a></li>
                 <li><a href="org/apache/juneau/serializer/SerializerSet_Test.html#SerializerSet_Test.SA2" target="classFrame">SerializerSet_Test.SA2</a></li>
diff --git a/site/xref-test/org/apache/juneau/commons/annotation/AnnotationObject_Test.html b/site/xref-test/org/apache/juneau/commons/annotation/AnnotationObject_Test.html
index 0a01121b06..6ca8091653 100644
--- a/site/xref-test/org/apache/juneau/commons/annotation/AnnotationObject_Test.html
+++ b/site/xref-test/org/apache/juneau/commons/annotation/AnnotationObject_Test.html
@@ -208,20 +208,20 @@
 <a class="jxr_linenumber" name="L200" href="#L200">200</a> 	@Test
 <a class="jxr_linenumber" name="L201" href="#L201">201</a> 	<strong class="jxr_keyword">void</strong> c01_toMap_defaultValues() {
 <a class="jxr_linenumber" name="L202" href="#L202">202</a> 		<strong class="jxr_keyword">var</strong> a = T.create().build();
-<a class="jxr_linenumber" name="L203" href="#L203">203</a> 		assertBean(((T)a).toMap(), <span class="jxr_string">"value,number,flag,array"</span>, <span class="jxr_string">",0,false,[]"</span>);
+<a class="jxr_linenumber" name="L203" href="#L203">203</a> 		assertBean(((T)a).propertyMap(), <span class="jxr_string">"value,number,flag,array"</span>, <span class="jxr_string">",0,false,[]"</span>);
 <a class="jxr_linenumber" name="L204" href="#L204">204</a> 	}
 <a class="jxr_linenumber" name="L205" href="#L205">205</a> 
 <a class="jxr_linenumber" name="L206" href="#L206">206</a> 	@Test
 <a class="jxr_linenumber" name="L207" href="#L207">207</a> 	<strong class="jxr_keyword">void</strong> c02_toMap_customValues() {
 <a class="jxr_linenumber" name="L208" href="#L208">208</a> 		<strong class="jxr_keyword">var</strong> a = T.create().value(<span class="jxr_string">"a"</span>).number(1).flag(<strong class="jxr_keyword">true</strong>).array(<span class="jxr_string">"b1"</span>, <span class="jxr_string">"b2"</span>).build();
 <a class="jxr_linenumber" name="L209" href="#L209">209</a> 
-<a class="jxr_linenumber" name="L210" href="#L210">210</a> 		assertBean(((T)a).toMap(), <span class="jxr_string">"value,number,flag,array"</span>, <span class="jxr_string">"a,1,true,[b1,b2]"</span>);
+<a class="jxr_linenumber" name="L210" href="#L210">210</a> 		assertBean(((T)a).propertyMap(), <span class="jxr_string">"value,number,flag,array"</span>, <span class="jxr_string">"a,1,true,[b1,b2]"</span>);
 <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> 	@Test
 <a class="jxr_linenumber" name="L214" href="#L214">214</a> 	<strong class="jxr_keyword">void</strong> c03_toMap_keySorted() {
 <a class="jxr_linenumber" name="L215" href="#L215">215</a> 		<strong class="jxr_keyword">var</strong> a = T.create().build();
-<a class="jxr_linenumber" name="L216" href="#L216">216</a> 		<strong class="jxr_keyword">var</strong> map = ((T)a).toMap();
+<a class="jxr_linenumber" name="L216" href="#L216">216</a> 		<strong class="jxr_keyword">var</strong> map = ((T)a).propertyMap();
 <a class="jxr_linenumber" name="L217" href="#L217">217</a> 
 <a class="jxr_linenumber" name="L218" href="#L218">218</a> 		<em class="jxr_comment">// Map should be ordered by key name</em>
 <a class="jxr_linenumber" name="L219" href="#L219">219</a> 		assertList(map.keySet(), <span class="jxr_string">"array"</span>, <span class="jxr_string">"flag"</span>, <span class="jxr_string">"number"</span>, <span class="jxr_string">"value"</span>);
diff --git a/site/xref-test/org/apache/juneau/commons/annotation/AppliedAnnotationObject_Test.html b/site/xref-test/org/apache/juneau/commons/annotation/AppliedAnnotationObject_Test.html
index 2d5e4f3add..62922dcca2 100644
--- a/site/xref-test/org/apache/juneau/commons/annotation/AppliedAnnotationObject_Test.html
+++ b/site/xref-test/org/apache/juneau/commons/annotation/AppliedAnnotationObject_Test.html
@@ -959,7 +959,7 @@
 <a class="jxr_linenumber" name="L951" href="#L951">951</a> 		<strong class="jxr_keyword">void</strong> k01_withTargets() {
 <a class="jxr_linenumber" name="L952" href="#L952">952</a> 			<strong class="jxr_keyword">var</strong> a = TAO.create().on(<span class="jxr_string">"target1"</span>, <span class="jxr_string">"target2"</span>).value(<span class="jxr_string">"test"</span>).build();
 <a class="jxr_linenumber" name="L953" href="#L953">953</a> 
-<a class="jxr_linenumber" name="L954" href="#L954">954</a> 			<strong class="jxr_keyword">var</strong> map = ((TAO)a).toMap();
+<a class="jxr_linenumber" name="L954" href="#L954">954</a> 			<strong class="jxr_keyword">var</strong> map = ((TAO)a).propertyMap();
 <a class="jxr_linenumber" name="L955" href="#L955">955</a> 			assertBean(map, <span class="jxr_string">"on,value"</span>, <span class="jxr_string">"[target1,target2],test"</span>);
 <a class="jxr_linenumber" name="L956" href="#L956">956</a> 		}
 <a class="jxr_linenumber" name="L957" href="#L957">957</a> 	}
diff --git a/site/xref-test/org/apache/juneau/commons/annotation/AppliedOnClassAnnotationObject_Test.html b/site/xref-test/org/apache/juneau/commons/annotation/AppliedOnClassAnnotationObject_Test.html
index 181d29e933..cfc49c4377 100644
--- a/site/xref-test/org/apache/juneau/commons/annotation/AppliedOnClassAnnotationObject_Test.html
+++ b/site/xref-test/org/apache/juneau/commons/annotation/AppliedOnClassAnnotationObject_Test.html
@@ -297,7 +297,7 @@
 <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> e01_toMap_withOnClass() {
 <a class="jxr_linenumber" name="L291" href="#L291">291</a> 		<strong class="jxr_keyword">var</strong> a = T.create().onClass(TC1.<strong class="jxr_keyword">class</strong>, TC2.<strong class="jxr_keyword">class</strong>).value(<span class="jxr_string">"test"</span>).build();
-<a class="jxr_linenumber" name="L292" href="#L292">292</a> 		<strong class="jxr_keyword">var</strong> map = ((T)a).toMap();
+<a class="jxr_linenumber" name="L292" href="#L292">292</a> 		<strong class="jxr_keyword">var</strong> map = ((T)a).propertyMap();
 <a class="jxr_linenumber" name="L293" href="#L293">293</a> 
 <a class="jxr_linenumber" name="L294" href="#L294">294</a> 		assertBean(map, <span class="jxr_string">"value,on,onClass"</span>, <span class="jxr_string">"test,[],[TC1,TC2]"</span>);
 <a class="jxr_linenumber" name="L295" href="#L295">295</a> 	}
@@ -305,7 +305,7 @@
 <a class="jxr_linenumber" name="L297" href="#L297">297</a> 	@Test
 <a class="jxr_linenumber" name="L298" href="#L298">298</a> 	<strong class="jxr_keyword">void</strong> e02_toMap_withBoth() {
 <a class="jxr_linenumber" name="L299" href="#L299">299</a> 		<strong class="jxr_keyword">var</strong> a = T.create().on(<span class="jxr_string">"com.example.Class1"</span>).onClass(TC1.<strong class="jxr_keyword">class</strong>).value(<span class="jxr_string">"test"</span>).build();
-<a class="jxr_linenumber" name="L300" href="#L300">300</a> 		<strong class="jxr_keyword">var</strong> map = ((T)a).toMap();
+<a class="jxr_linenumber" name="L300" href="#L300">300</a> 		<strong class="jxr_keyword">var</strong> map = ((T)a).propertyMap();
 <a class="jxr_linenumber" name="L301" href="#L301">301</a> 
 <a class="jxr_linenumber" name="L302" href="#L302">302</a> 		assertBean(map, <span class="jxr_string">"value,on,onClass"</span>, <span class="jxr_string">"test,[com.example.Class1],[TC1]"</span>);
 <a class="jxr_linenumber" name="L303" href="#L303">303</a> 	}
@@ -313,7 +313,7 @@
 <a class="jxr_linenumber" name="L305" href="#L305">305</a> 	@Test
 <a class="jxr_linenumber" name="L306" href="#L306">306</a> 	<strong class="jxr_keyword">void</strong> e03_toMap_empty() {
 <a class="jxr_linenumber" name="L307" href="#L307">307</a> 		<strong class="jxr_keyword">var</strong> a = T.create().build();
-<a class="jxr_linenumber" name="L308" href="#L308">308</a> 		<strong class="jxr_keyword">var</strong> map = ((T)a).toMap();
+<a class="jxr_linenumber" name="L308" href="#L308">308</a> 		<strong class="jxr_keyword">var</strong> map = ((T)a).propertyMap();
 <a class="jxr_linenumber" name="L309" href="#L309">309</a> 
 <a class="jxr_linenumber" name="L310" href="#L310">310</a> 		assertBean(map, <span class="jxr_string">"value,on,onClass"</span>, <span class="jxr_string">",[],[]"</span>);
 <a class="jxr_linenumber" name="L311" href="#L311">311</a> 	}
diff --git a/site/xref-test/org/apache/juneau/commons/reflect/AnnotationInfo_Test.html b/site/xref-test/org/apache/juneau/commons/reflect/AnnotationInfo_Test.html
index 2f2c57cf38..5f65833a2a 100644
--- a/site/xref-test/org/apache/juneau/commons/reflect/AnnotationInfo_Test.html
+++ b/site/xref-test/org/apache/juneau/commons/reflect/AnnotationInfo_Test.html
@@ -642,15 +642,15 @@
 <a class="jxr_linenumber" name="L634" href="#L634">634</a> 	}
 <a class="jxr_linenumber" name="L635" href="#L635">635</a> 
 <a class="jxr_linenumber" name="L636" href="#L636">636</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L637" href="#L637">637</a> 	<em class="jxr_comment">// toMap()</em>
+<a class="jxr_linenumber" name="L637" href="#L637">637</a> 	<em class="jxr_comment">// properties()</em>
 <a class="jxr_linenumber" name="L638" href="#L638">638</a> 	<em class="jxr_comment">//====================================================================================================</em>
 <a class="jxr_linenumber" name="L639" href="#L639">639</a> 	@Test
-<a class="jxr_linenumber" name="L640" href="#L640">640</a> 	<strong class="jxr_keyword">void</strong> a029_toMap() {
+<a class="jxr_linenumber" name="L640" href="#L640">640</a> 	<strong class="jxr_keyword">void</strong> a029_properties() {
 <a class="jxr_linenumber" name="L641" href="#L641">641</a> 		<strong class="jxr_keyword">var</strong> ci = ClassInfo.of(TestClass.<strong class="jxr_keyword">class</strong>);
 <a class="jxr_linenumber" name="L642" href="#L642">642</a> 		<strong class="jxr_keyword">var</strong> ai = ci.getAnnotations(TestAnnotation.<strong class="jxr_keyword">class</strong>).findFirst().orElse(<strong class="jxr_keyword">null</strong>);
 <a class="jxr_linenumber" name="L643" href="#L643">643</a> 		assertNotNull(ai);
 <a class="jxr_linenumber" name="L644" href="#L644">644</a> 
-<a class="jxr_linenumber" name="L645" href="#L645">645</a> 		<strong class="jxr_keyword">var</strong> map = ai.toMap();
+<a class="jxr_linenumber" name="L645" href="#L645">645</a> 		<strong class="jxr_keyword">var</strong> map = ai.properties();
 <a class="jxr_linenumber" name="L646" href="#L646">646</a> 		assertNotNull(map);
 <a class="jxr_linenumber" name="L647" href="#L647">647</a> 		assertTrue(map.containsKey(<span class="jxr_string">"CLASS_TYPE"</span>));
 <a class="jxr_linenumber" name="L648" href="#L648">648</a> 		assertTrue(map.containsKey(<span class="jxr_string">"@TestAnnotation"</span>));
@@ -664,7 +664,7 @@
 <a class="jxr_linenumber" name="L656" href="#L656">656</a> 		<strong class="jxr_keyword">var</strong> ai2 = ci2.getAnnotations(ToMapTestAnnotation.<strong class="jxr_keyword">class</strong>).findFirst().orElse(<strong class="jxr_keyword">null</strong>);
 <a class="jxr_linenumber" name="L657" href="#L657">657</a> 		assertNotNull(ai2);
 <a class="jxr_linenumber" name="L658" href="#L658">658</a> 
-<a class="jxr_linenumber" name="L659" href="#L659">659</a> 		<strong class="jxr_keyword">var</strong> map2 = ai2.toMap();
+<a class="jxr_linenumber" name="L659" href="#L659">659</a> 		<strong class="jxr_keyword">var</strong> map2 = ai2.properties();
 <a class="jxr_linenumber" name="L660" href="#L660">660</a> 		assertNotNull(map2);
 <a class="jxr_linenumber" name="L661" href="#L661">661</a> 		<strong class="jxr_keyword">var</strong> annotationMap2 = (java.util.Map&lt;String,Object&gt;)map2.get(<span class="jxr_string">"@ToMapTestAnnotation"</span>);
 <a class="jxr_linenumber" name="L662" href="#L662">662</a> 		assertNotNull(annotationMap2);
@@ -714,7 +714,7 @@
 <a class="jxr_linenumber" name="L706" href="#L706">706</a> 		<strong class="jxr_keyword">var</strong> ci3 = ClassInfo.of(ToMapTestClass.<strong class="jxr_keyword">class</strong>);
 <a class="jxr_linenumber" name="L707" href="#L707">707</a> 		<strong class="jxr_keyword">var</strong> ai3 = AnnotationInfo.of(ci3, proxyAnnotation);
 <a class="jxr_linenumber" name="L708" href="#L708">708</a> 		
-<a class="jxr_linenumber" name="L709" href="#L709">709</a> 		<strong class="jxr_keyword">var</strong> map3 = ai3.toMap();
+<a class="jxr_linenumber" name="L709" href="#L709">709</a> 		<strong class="jxr_keyword">var</strong> map3 = ai3.properties();
 <a class="jxr_linenumber" name="L710" href="#L710">710</a> 		assertNotNull(map3);
 <a class="jxr_linenumber" name="L711" href="#L711">711</a> 		<strong class="jxr_keyword">var</strong> annotationMap3 = (java.util.Map&lt;String,Object&gt;)map3.get(<span class="jxr_string">"@ToMapTestAnnotation"</span>);
 <a class="jxr_linenumber" name="L712" href="#L712">712</a> 		assertNotNull(annotationMap3);
diff --git a/site/xref-test/org/apache/juneau/commons/reflect/ReflectionMap_Test.html b/site/xref-test/org/apache/juneau/commons/reflect/ReflectionMap_Test.html
index 1dd037f0e3..42431177f4 100644
--- a/site/xref-test/org/apache/juneau/commons/reflect/ReflectionMap_Test.html
+++ b/site/xref-test/org/apache/juneau/commons/reflect/ReflectionMap_Test.html
@@ -637,7 +637,7 @@
 <a class="jxr_linenumber" name="L629" href="#L629">629</a> 				.append(<span class="jxr_string">"F1.myField"</span>, 4)            <em class="jxr_comment">// field</em>
 <a class="jxr_linenumber" name="L630" href="#L630">630</a> 				.append(<span class="jxr_string">"F1()"</span>, 5)                  <em class="jxr_comment">// constructor</em>
 <a class="jxr_linenumber" name="L631" href="#L631">631</a> 				.build();
-<a class="jxr_linenumber" name="L632" href="#L632">632</a> 			assertString(<span class="jxr_string">"{classEntries=[{simpleName=F1, fullName=F1, value=1}], methodEntries=[{simpleClassName=F1, fullClassName=F1, methodName=toString, value=2}, {simpleClassName=F1, fullClassName=F1, methodName=toString, args=[String], value=3}, {simpleClassName=F1, fullClassName=F1, methodName=myField, value=4}], fieldEntries=[{simpleClassName=F1, fullClassName=F1, fieldName=toString, value=2}, {simpleClassN [...]
+<a class="jxr_linenumber" name="L632" href="#L632">632</a> 			assertString(<span class="jxr_string">"{classEntries=[{fullName=F1,simpleName=F1,value=1}],constructorEntries=[{fullClassName=F1,simpleClassName=F1,value=5}],fieldEntries=[{fieldName=toString,fullClassName=F1,simpleClassName=F1,value=2},{fieldName=myField,fullClassName=F1,simpleClassName=F1,value=4}],methodEntries=[{fullClassName=F1,methodName=toString,simpleClassName=F1,value=2},{args=[String],fullClassName=F1,methodName=toSt [...]
 <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> }
diff --git a/site/xref-test/org/apache/juneau/cp/BeanStore_Test.html b/site/xref-test/org/apache/juneau/cp/BeanStore_Test.html
index 646e6977b9..4f310046bc 100644
--- a/site/xref-test/org/apache/juneau/cp/BeanStore_Test.html
+++ b/site/xref-test/org/apache/juneau/cp/BeanStore_Test.html
@@ -76,8 +76,8 @@
 <a class="jxr_linenumber" name="L68" href="#L68">68</a>  	@Test <strong class="jxr_keyword">void</strong> a01_builderCopyConstructor() {
 <a class="jxr_linenumber" name="L69" href="#L69">69</a>  		<strong class="jxr_keyword">var</strong> b1p = BeanStore.create().readOnly().threadSafe().build();
 <a class="jxr_linenumber" name="L70" href="#L70">70</a>  		<strong class="jxr_keyword">var</strong> b1c = BeanStore.create().parent(b1p).build();
-<a class="jxr_linenumber" name="L71" href="#L71">71</a>  		assertContains(<span class="jxr_string">"readOnly:true"</span>, b1c.toString());
-<a class="jxr_linenumber" name="L72" href="#L72">72</a>  		assertContains(<span class="jxr_string">"threadSafe:true"</span>, b1c.toString());
+<a class="jxr_linenumber" name="L71" href="#L71">71</a>  		assertContains(<span class="jxr_string">"readOnly=true"</span>, b1c.toString());
+<a class="jxr_linenumber" name="L72" href="#L72">72</a>  		assertContains(<span class="jxr_string">"threadSafe=true"</span>, b1c.toString());
 <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 <strong class="jxr_keyword">void</strong> a02_readOnly() {
@@ -171,10 +171,10 @@
 <a class="jxr_linenumber" name="L163" href="#L163">163</a> 			assertList(b.stream(A2.<strong class="jxr_keyword">class</strong>).map(BeanStoreEntry::get), a2a);
 <a class="jxr_linenumber" name="L164" href="#L164">164</a> 		}
 <a class="jxr_linenumber" name="L165" href="#L165">165</a> 
-<a class="jxr_linenumber" name="L166" href="#L166">166</a> 		assertMatchesGlob(<span class="jxr_string">"{*,entries:[{type:'A1',bean:'"</span>+identity(a1b)+<span class="jxr_string">"'},{type:'A1',bean:'"</span>+Utils.identity(a1a)+<span class="jxr_string">"'}]}"</span>, b1p);
-<a class="jxr_linenumber" name="L167" href="#L167">167</a> 		assertMatchesGlob(<span class="jxr_string">"{*,entries:[{type:'A2',bean:'"</span>+identity(a2a)+<span class="jxr_string">"'}],parent:{*,entries:[{type:'A1',bean:'"</span>+Utils.identity(a1b)+<span class="jxr_string">"'},{type:'A1',bean:'"</span>+Utils.identity(a1a)+<span class="jxr_string">"'}]}}"</span>, b1c);
-<a class="jxr_linenumber" name="L168" href="#L168">168</a> 		assertMatchesGlob(<span class="jxr_string">"{*,entries:[{type:'A1',bean:'"</span>+identity(a1b)+<span class="jxr_string">"'},{type:'A1',bean:'"</span>+Utils.identity(a1a)+<span class="jxr_string">"'}],threadSafe:true}"</span>, b2p);
-<a class="jxr_linenumber" name="L169" href="#L169">169</a> 		assertMatchesGlob(<span class="jxr_string">"{*,entries:[{type:'A2',bean:'"</span>+identity(a2a)+<span class="jxr_string">"'}],parent:{*,entries:[{type:'A1',bean:'"</span>+Utils.identity(a1b)+<span class="jxr_string">"'},{type:'A1',bean:'"</span>+Utils.identity(a1a)+<span class="jxr_string">"'}],threadSafe:true},threadSafe:true}"</span>, b2c);
+<a class="jxr_linenumber" name="L166" href="#L166">166</a> 		assertMatchesGlob(<span class="jxr_string">"{entries=[{type=A1,bean="</span>+identity(a1b)+<span class="jxr_string">"},{type=A1,bean="</span>+Utils.identity(a1a)+<span class="jxr_string">"}],identity=*}"</span>, b1p);
+<a class="jxr_linenumber" name="L167" href="#L167">167</a> 		assertMatchesGlob(<span class="jxr_string">"{entries=[{type=A2,bean="</span>+identity(a2a)+<span class="jxr_string">"}],identity=*,parent={entries=[{type=A1,bean="</span>+Utils.identity(a1b)+<span class="jxr_string">"},{type=A1,bean="</span>+Utils.identity(a1a)+<span class="jxr_string">"}],identity=*}}"</span>, b1c);
+<a class="jxr_linenumber" name="L168" href="#L168">168</a> 		assertMatchesGlob(<span class="jxr_string">"{entries=[{type=A1,bean="</span>+identity(a1b)+<span class="jxr_string">"},{type=A1,bean="</span>+Utils.identity(a1a)+<span class="jxr_string">"}],identity=*,threadSafe=true}"</span>, b2p);
+<a class="jxr_linenumber" name="L169" href="#L169">169</a> 		assertMatchesGlob(<span class="jxr_string">"{entries=[{type=A2,bean="</span>+identity(a2a)+<span class="jxr_string">"}],identity=*,parent={entries=[{type=A1,bean="</span>+Utils.identity(a1b)+<span class="jxr_string">"},{type=A1,bean="</span>+Utils.identity(a1a)+<span class="jxr_string">"}],identity=*,threadSafe=true},threadSafe=true}"</span>, b2c);
 <a class="jxr_linenumber" name="L170" href="#L170">170</a> 
 <a class="jxr_linenumber" name="L171" href="#L171">171</a> 		b1p.removeBean(A1.<strong class="jxr_keyword">class</strong>);
 <a class="jxr_linenumber" name="L172" href="#L172">172</a> 		b1c.clear().addBean(A1.<strong class="jxr_keyword">class</strong>, a1a);
diff --git a/site/xref-test/org/apache/juneau/cp/Messages_Test.html b/site/xref-test/org/apache/juneau/cp/Messages_Test.html
index a53d328778..94d2d28dba 100644
--- a/site/xref-test/org/apache/juneau/cp/Messages_Test.html
+++ b/site/xref-test/org/apache/juneau/cp/Messages_Test.html
@@ -159,7 +159,7 @@
 <a class="jxr_linenumber" name="L151" href="#L151">151</a> 
 <a class="jxr_linenumber" name="L152" href="#L152">152</a> 	@Test <strong class="jxr_keyword">void</strong> a13_toString() {
 <a class="jxr_linenumber" name="L153" href="#L153">153</a> 		<strong class="jxr_keyword">var</strong> x = Messages.of(Test2.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L154" href="#L154">154</a> 		assertString(<span class="jxr_string">"{file:'Test2.properties',yyy:'bar'}"</span>, x);
+<a class="jxr_linenumber" name="L154" href="#L154">154</a> 		assertString(<span class="jxr_string">"{file=Test2.properties,yyy=bar}"</span>, x);
 <a class="jxr_linenumber" name="L155" href="#L155">155</a> 	}
 <a class="jxr_linenumber" name="L156" href="#L156">156</a> }
 </pre>
diff --git a/site/xref-test/org/apache/juneau/http/remote/Remote_FormDataAnnotation_Test.html b/site/xref-test/org/apache/juneau/http/remote/Remote_FormDataAnnotation_Test.html
index 8a5277a13f..6965f5e245 100644
--- a/site/xref-test/org/apache/juneau/http/remote/Remote_FormDataAnnotation_Test.html
+++ b/site/xref-test/org/apache/juneau/http/remote/Remote_FormDataAnnotation_Test.html
@@ -745,9 +745,9 @@
 <a class="jxr_linenumber" name="L737" href="#L737">737</a> 	@Test <strong class="jxr_keyword">void</strong> k01_requestBean_simpleVals() {
 <a class="jxr_linenumber" name="L738" href="#L738">738</a> 		<strong class="jxr_keyword">var</strong> x1 = remote(K.<strong class="jxr_keyword">class</strong>,K1.<strong class="jxr_keyword">class</strong>);
 <a class="jxr_linenumber" name="L739" href="#L739">739</a> 		<strong class="jxr_keyword">var</strong> x2 = client(K.<strong class="jxr_keyword">class</strong>).partSerializer(UonSerializer.<strong class="jxr_keyword">class</strong>).build().getRemote(K1.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L740" href="#L740">740</a> 		assertEquals(<span class="jxr_string">"{a:'a1',b:'b1',c:'c1',e:'',g:'true',h:'123',i1:'foo'}"</span>,x1.postX1(<strong class="jxr_keyword">new</strong> K1a()));
-<a class="jxr_linenumber" name="L741" href="#L741">741</a> 		assertEquals(<span class="jxr_string">"{a:'a1',b:'b1',c:'c1',e:'',g:'&#92;&#92;'true&#92;&#92;'',h:'&#92;&#92;'123&#92;&#92;'',i1:'foo'}"</span>,x2.postX1(<strong class="jxr_keyword">new</strong> K1a()));
-<a class="jxr_linenumber" name="L742" href="#L742">742</a> 		assertEquals(<span class="jxr_string">"{a:'xa1x',b:'xb1x',c:'xc1x',e:'xx',g:'xtruex',h:'x123x',i1:'xfoox'}"</span>,x2.postX2(<strong class="jxr_keyword">new</strong> K1a()));
+<a class="jxr_linenumber" name="L740" href="#L740">740</a> 		assertEquals(<span class="jxr_string">"{a=a1,b=b1,c=c1,e=,g=true,h=123,i1=foo}"</span>,x1.postX1(<strong class="jxr_keyword">new</strong> K1a()));
+<a class="jxr_linenumber" name="L741" href="#L741">741</a> 		assertEquals(<span class="jxr_string">"{a=a1,b=b1,c=c1,e=,g='true',h='123',i1=foo}"</span>,x2.postX1(<strong class="jxr_keyword">new</strong> K1a()));
+<a class="jxr_linenumber" name="L742" href="#L742">742</a> 		assertEquals(<span class="jxr_string">"{a=xa1x,b=xb1x,c=xc1x,e=xx,g=xtruex,h=x123x,i1=xfoox}"</span>,x2.postX2(<strong class="jxr_keyword">new</strong> K1a()));
 <a class="jxr_linenumber" name="L743" href="#L743">743</a> 	}
 <a class="jxr_linenumber" name="L744" href="#L744">744</a> 
 <a class="jxr_linenumber" name="L745" href="#L745">745</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
@@ -770,9 +770,9 @@
 <a class="jxr_linenumber" name="L762" href="#L762">762</a> 	@Test <strong class="jxr_keyword">void</strong> k02_requestBean_maps() {
 <a class="jxr_linenumber" name="L763" href="#L763">763</a> 		<strong class="jxr_keyword">var</strong> x1 = remote(K.<strong class="jxr_keyword">class</strong>,K2.<strong class="jxr_keyword">class</strong>);
 <a class="jxr_linenumber" name="L764" href="#L764">764</a> 		<strong class="jxr_keyword">var</strong> x2 = client(K.<strong class="jxr_keyword">class</strong>).partSerializer(UonSerializer.<strong class="jxr_keyword">class</strong>).build().getRemote(K2.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L765" href="#L765">765</a> 		assertEquals(<span class="jxr_string">"{a:'a1=v1,a2=123,a3=null,a4=',b1:'true',b2:'123',b3:'null',c1:'v1',c2:'123',c4:''}"</span>,x1.postX1(<strong class="jxr_keyword">new</strong> K2a()));
-<a class="jxr_linenumber" name="L766" href="#L766">766</a> 		assertEquals(<span class="jxr_string">"{a:'(a1=v1,a2=123,a3=null,a4=&#92;&#92;'&#92;&#92;')',b1:'&#92;&#92;'true&#92;&#92;'',b2:'&#92;&#92;'123&#92;&#92;'',b3:'&#92;&#92;'null&#92;&#92;'',c1:'v1',c2:'123',c4:''}"</span>,x2.postX1(<strong class="jxr_keyword">new</strong> K2a()));
-<a class="jxr_linenumber" name="L767" href="#L767">767</a> 		assertEquals(<span class="jxr_string">"{a:'x{a1=v1, a2=123, a3=null, a4=}x',b1:'xtruex',b2:'x123x',b3:'xnullx',c1:'xv1x',c2:'x123x',c4:'xx'}"</span>,x2.postX2(<strong class="jxr_keyword">new</strong> K2a()));
+<a class="jxr_linenumber" name="L765" href="#L765">765</a> 		assertEquals(<span class="jxr_string">"{a=a1=v1,a2=123,a3=null,a4=,b1=true,b2=123,b3=null,c1=v1,c2=123,c4=}"</span>,x1.postX1(<strong class="jxr_keyword">new</strong> K2a()));
+<a class="jxr_linenumber" name="L766" href="#L766">766</a> 		assertEquals(<span class="jxr_string">"{a=(a1=v1,a2=123,a3=null,a4=''),b1='true',b2='123',b3='null',c1=v1,c2=123,c4=}"</span>,x2.postX1(<strong class="jxr_keyword">new</strong> K2a()));
+<a class="jxr_linenumber" name="L767" href="#L767">767</a> 		assertEquals(<span class="jxr_string">"{a=x{a1=v1, a2=123, a3=null, a4=}x,b1=xtruex,b2=x123x,b3=xnullx,c1=xv1x,c2=x123x,c4=xx}"</span>,x2.postX2(<strong class="jxr_keyword">new</strong> K2a()));
 <a class="jxr_linenumber" name="L768" href="#L768">768</a> 	}
 <a class="jxr_linenumber" name="L769" href="#L769">769</a> 
 <a class="jxr_linenumber" name="L770" href="#L770">770</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
@@ -796,9 +796,9 @@
 <a class="jxr_linenumber" name="L788" href="#L788">788</a> 	@Test <strong class="jxr_keyword">void</strong> k03_requestBean_nameValuePairs() {
 <a class="jxr_linenumber" name="L789" href="#L789">789</a> 		<strong class="jxr_keyword">var</strong> x1 = remote(K.<strong class="jxr_keyword">class</strong>,K3.<strong class="jxr_keyword">class</strong>);
 <a class="jxr_linenumber" name="L790" href="#L790">790</a> 		<strong class="jxr_keyword">var</strong> x2 = client(K.<strong class="jxr_keyword">class</strong>).partSerializer(UonSerializer.<strong class="jxr_keyword">class</strong>).build().getRemote(K3.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L791" href="#L791">791</a> 		assertEquals(<span class="jxr_string">"{a1:'v1',a2:'123',a4:'',b1:'true',b2:'123',b3:'null',c1:'v1',c2:'123',c4:'',e1:'v1',e2:'123',e4:''}"</span>,x1.postX1(<strong class="jxr_keyword">new</strong> K3a()));
-<a class="jxr_linenumber" name="L792" href="#L792">792</a> 		assertEquals(<span class="jxr_string">"{a1:'v1',a2:'123',a4:'',b1:'true',b2:'123',b3:'null',c1:'v1',c2:'123',c4:'',e1:'v1',e2:'123',e4:''}"</span>,x2.postX1(<strong class="jxr_keyword">new</strong> K3a()));
-<a class="jxr_linenumber" name="L793" href="#L793">793</a> 		assertEquals(<span class="jxr_string">"{a1:'v1',a2:'123',a4:'',b1:'true',b2:'123',b3:'null',c1:'v1',c2:'123',c4:'',e1:'v1',e2:'123',e4:''}"</span>,x2.postX2(<strong class="jxr_keyword">new</strong> K3a()));
+<a class="jxr_linenumber" name="L791" href="#L791">791</a> 		assertEquals(<span class="jxr_string">"{a1=v1,a2=123,a4=,b1=true,b2=123,b3=null,c1=v1,c2=123,c4=,e1=v1,e2=123,e4=}"</span>,x1.postX1(<strong class="jxr_keyword">new</strong> K3a()));
+<a class="jxr_linenumber" name="L792" href="#L792">792</a> 		assertEquals(<span class="jxr_string">"{a1=v1,a2=123,a4=,b1=true,b2=123,b3=null,c1=v1,c2=123,c4=,e1=v1,e2=123,e4=}"</span>,x2.postX1(<strong class="jxr_keyword">new</strong> K3a()));
+<a class="jxr_linenumber" name="L793" href="#L793">793</a> 		assertEquals(<span class="jxr_string">"{a1=v1,a2=123,a4=,b1=true,b2=123,b3=null,c1=v1,c2=123,c4=,e1=v1,e2=123,e4=}"</span>,x2.postX2(<strong class="jxr_keyword">new</strong> K3a()));
 <a class="jxr_linenumber" name="L794" href="#L794">794</a> 	}
 <a class="jxr_linenumber" name="L795" href="#L795">795</a> 
 <a class="jxr_linenumber" name="L796" href="#L796">796</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
@@ -816,7 +816,7 @@
 <a class="jxr_linenumber" name="L808" href="#L808">808</a> 
 <a class="jxr_linenumber" name="L809" href="#L809">809</a> 	@Test <strong class="jxr_keyword">void</strong> k04_requestBean_charSequence() {
 <a class="jxr_linenumber" name="L810" href="#L810">810</a> 		<strong class="jxr_keyword">var</strong> x = remote(K.<strong class="jxr_keyword">class</strong>,K4.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L811" href="#L811">811</a> 		assertEquals(<span class="jxr_string">"{foo:'bar',baz:'qux'}"</span>,x.post(<strong class="jxr_keyword">new</strong> C04_Bean()));
+<a class="jxr_linenumber" name="L811" href="#L811">811</a> 		assertEquals(<span class="jxr_string">"{baz=qux,foo=bar}"</span>,x.post(<strong class="jxr_keyword">new</strong> C04_Bean()));
 <a class="jxr_linenumber" name="L812" href="#L812">812</a> 	}
 <a class="jxr_linenumber" name="L813" href="#L813">813</a> 
 <a class="jxr_linenumber" name="L814" href="#L814">814</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
@@ -834,7 +834,7 @@
 <a class="jxr_linenumber" name="L826" href="#L826">826</a> 
 <a class="jxr_linenumber" name="L827" href="#L827">827</a> 	@Test <strong class="jxr_keyword">void</strong> k05_requestBean_reader() {
 <a class="jxr_linenumber" name="L828" href="#L828">828</a> 		<strong class="jxr_keyword">var</strong> x = remote(K.<strong class="jxr_keyword">class</strong>,K5.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L829" href="#L829">829</a> 		assertEquals(<span class="jxr_string">"{foo:'bar',baz:'qux'}"</span>,x.post(<strong class="jxr_keyword">new</strong> K5a()));
+<a class="jxr_linenumber" name="L829" href="#L829">829</a> 		assertEquals(<span class="jxr_string">"{baz=qux,foo=bar}"</span>,x.post(<strong class="jxr_keyword">new</strong> K5a()));
 <a class="jxr_linenumber" name="L830" href="#L830">830</a> 	}
 <a class="jxr_linenumber" name="L831" href="#L831">831</a> 
 <a class="jxr_linenumber" name="L832" href="#L832">832</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
@@ -862,9 +862,9 @@
 <a class="jxr_linenumber" name="L854" href="#L854">854</a> 	@Test <strong class="jxr_keyword">void</strong> k06_requestBean_collections() {
 <a class="jxr_linenumber" name="L855" href="#L855">855</a> 		<strong class="jxr_keyword">var</strong> x1 = remote(K.<strong class="jxr_keyword">class</strong>,K6.<strong class="jxr_keyword">class</strong>);
 <a class="jxr_linenumber" name="L856" href="#L856">856</a> 		<strong class="jxr_keyword">var</strong> x2 = client(K.<strong class="jxr_keyword">class</strong>).partSerializer(UonSerializer.<strong class="jxr_keyword">class</strong>).build().getRemote(K6.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L857" href="#L857">857</a> 		assertEquals(<span class="jxr_string">"{a:'foo,,true,123,null,true,123,null',b:'foo,,true,123,null,true,123,null',c:'xfoo||true|123|null|true|123|nullx',d:'',f:'foo,,true,123,null,true,123,null',g:'xfoo||true|123|null|true|123|nullx',h:''}"</span>, x1.postX1(<strong class="jxr_keyword">new</strong> K6a()));
-<a class="jxr_linenumber" name="L858" href="#L858">858</a> 		assertEquals(<span class="jxr_string">"{a:'@(foo,&#92;&#92;'&#92;&#92;',&#92;&#92;'true&#92;&#92;',&#92;&#92;'123&#92;&#92;',&#92;&#92;'null&#92;&#92;',true,123,null)',b:'@(foo,&#92;&#92;'&#92;&#92;',&#92;&#92;'true&#92;&#92;',&#92;&#92;'123&#92;&#92;',&#92;&#92;'null&#92;&#92;',true,123,null)',c:'xfoo||true|123|null|true|123|nullx',d:'@()',f:'@(foo,&#92;&#92;'&#92;&#92;',&#92;&#92;'true&#92;&#92;',&#92;&#92;'123&#92;&#92;',&#9 [...]
-<a class="jxr_linenumber" name="L859" href="#L859">859</a> 		assertEquals(<span class="jxr_string">"{a:'xfoo||true|123|null|true|123|nullx',b:'xfoo||true|123|null|true|123|nullx',c:'xfoo||true|123|null|true|123|nullx',d:'xx',f:'xfoo||true|123|null|true|123|nullx',g:'xfoo||true|123|null|true|123|nullx',h:'xx'}"</span>, x2.postX2(<strong class="jxr_keyword">new</strong> K6a()));
+<a class="jxr_linenumber" name="L857" href="#L857">857</a> 		assertEquals(<span class="jxr_string">"{a=foo,,true,123,null,true,123,null,b=foo,,true,123,null,true,123,null,c=xfoo||true|123|null|true|123|nullx,d=,f=foo,,true,123,null,true,123,null,g=xfoo||true|123|null|true|123|nullx,h=}"</span>, x1.postX1(<strong class="jxr_keyword">new</strong> K6a()));
+<a class="jxr_linenumber" name="L858" href="#L858">858</a> 		assertEquals(<span class="jxr_string">"{a=@(foo,'','true','123','null',true,123,null),b=@(foo,'','true','123','null',true,123,null),c=xfoo||true|123|null|true|123|nullx,d=@(),f=@(foo,'','true','123','null',true,123,null),g=xfoo||true|123|null|true|123|nullx,h=@()}"</span>, x2.postX1(<strong class="jxr_keyword">new</strong> K6a()));
+<a class="jxr_linenumber" name="L859" href="#L859">859</a> 		assertEquals(<span class="jxr_string">"{a=xfoo||true|123|null|true|123|nullx,b=xfoo||true|123|null|true|123|nullx,c=xfoo||true|123|null|true|123|nullx,d=xx,f=xfoo||true|123|null|true|123|nullx,g=xfoo||true|123|null|true|123|nullx,h=xx}"</span>, x2.postX2(<strong class="jxr_keyword">new</strong> K6a()));
 <a class="jxr_linenumber" name="L860" href="#L860">860</a> 	}
 <a class="jxr_linenumber" name="L861" href="#L861">861</a> 
 <a class="jxr_linenumber" name="L862" href="#L862">862</a> 	<em class="jxr_comment">//------------------------------------------------------------------------------------------------------------------</em>
diff --git a/site/xref-test/org/apache/juneau/http/remote/Remote_HeaderAnnotation_Test.html b/site/xref-test/org/apache/juneau/http/remote/Remote_HeaderAnnotation_Test.html
index 5e66c446d1..270ac6f5c5 100644
--- a/site/xref-test/org/apache/juneau/http/remote/Remote_HeaderAnnotation_Test.html
+++ b/site/xref-test/org/apache/juneau/http/remote/Remote_HeaderAnnotation_Test.html
@@ -708,9 +708,9 @@
 <a class="jxr_linenumber" name="L700" href="#L700">700</a> 	@Test <strong class="jxr_keyword">void</strong> k01_requestBean_simpleVals() {
 <a class="jxr_linenumber" name="L701" href="#L701">701</a> 		<strong class="jxr_keyword">var</strong> x1 = remote(K.<strong class="jxr_keyword">class</strong>,K1.<strong class="jxr_keyword">class</strong>);
 <a class="jxr_linenumber" name="L702" href="#L702">702</a> 		<strong class="jxr_keyword">var</strong> x2 = client(K.<strong class="jxr_keyword">class</strong>).partSerializer(UonSerializer.<strong class="jxr_keyword">class</strong>).build().getRemote(K1.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L703" href="#L703">703</a> 		assertEquals(<span class="jxr_string">"{a:'a1',b:'b1',c:'c1',e:'',g:'true',h:'123',i1:'foo'}"</span>,x1.getX1(<strong class="jxr_keyword">new</strong> K1a()));
-<a class="jxr_linenumber" name="L704" href="#L704">704</a> 		assertEquals(<span class="jxr_string">"{a:'a1',b:'b1',c:'c1',e:'',g:'&#92;&#92;'true&#92;&#92;'',h:'&#92;&#92;'123&#92;&#92;'',i1:'foo'}"</span>,x2.getX1(<strong class="jxr_keyword">new</strong> K1a()));
-<a class="jxr_linenumber" name="L705" href="#L705">705</a> 		assertEquals(<span class="jxr_string">"{a:'xa1x',b:'xb1x',c:'xc1x',e:'xx',g:'xtruex',h:'x123x',i1:'xfoox'}"</span>,x2.getX2(<strong class="jxr_keyword">new</strong> K1a()));
+<a class="jxr_linenumber" name="L703" href="#L703">703</a> 		assertEquals(<span class="jxr_string">"{a=a1,b=b1,c=c1,e=,g=true,h=123,i1=foo}"</span>,x1.getX1(<strong class="jxr_keyword">new</strong> K1a()));
+<a class="jxr_linenumber" name="L704" href="#L704">704</a> 		assertEquals(<span class="jxr_string">"{a=a1,b=b1,c=c1,e=,g='true',h='123',i1=foo}"</span>,x2.getX1(<strong class="jxr_keyword">new</strong> K1a()));
+<a class="jxr_linenumber" name="L705" href="#L705">705</a> 		assertEquals(<span class="jxr_string">"{a=xa1x,b=xb1x,c=xc1x,e=xx,g=xtruex,h=x123x,i1=xfoox}"</span>,x2.getX2(<strong class="jxr_keyword">new</strong> K1a()));
 <a class="jxr_linenumber" name="L706" href="#L706">706</a> 	}
 <a class="jxr_linenumber" name="L707" href="#L707">707</a> 
 <a class="jxr_linenumber" name="L708" href="#L708">708</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
@@ -733,9 +733,9 @@
 <a class="jxr_linenumber" name="L725" href="#L725">725</a> 	@Test <strong class="jxr_keyword">void</strong> k02_requestBean_maps() {
 <a class="jxr_linenumber" name="L726" href="#L726">726</a> 		<strong class="jxr_keyword">var</strong> x1 = remote(K.<strong class="jxr_keyword">class</strong>,K2.<strong class="jxr_keyword">class</strong>);
 <a class="jxr_linenumber" name="L727" href="#L727">727</a> 		<strong class="jxr_keyword">var</strong> x2 = client(K.<strong class="jxr_keyword">class</strong>).partSerializer(UonSerializer.<strong class="jxr_keyword">class</strong>).build().getRemote(K2.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L728" href="#L728">728</a> 		assertEquals(<span class="jxr_string">"{a:'a1=v1,a2=123,a3=null,a4=',b1:'true',b2:'123',b3:'null',c1:'v1',c2:'123',c4:''}"</span>,x1.getX1(<strong class="jxr_keyword">new</strong> K2a()));
-<a class="jxr_linenumber" name="L729" href="#L729">729</a> 		assertEquals(<span class="jxr_string">"{a:'(a1=v1,a2=123,a3=null,a4=&#92;&#92;'&#92;&#92;')',b1:'&#92;&#92;'true&#92;&#92;'',b2:'&#92;&#92;'123&#92;&#92;'',b3:'&#92;&#92;'null&#92;&#92;'',c1:'v1',c2:'123',c4:''}"</span>,x2.getX1(<strong class="jxr_keyword">new</strong> K2a()));
-<a class="jxr_linenumber" name="L730" href="#L730">730</a> 		assertEquals(<span class="jxr_string">"{a:'x{a1=v1, a2=123, a3=null, a4=}x',b1:'xtruex',b2:'x123x',b3:'xnullx',c1:'xv1x',c2:'x123x',c4:'xx'}"</span>,x2.getX2(<strong class="jxr_keyword">new</strong> K2a()));
+<a class="jxr_linenumber" name="L728" href="#L728">728</a> 		assertEquals(<span class="jxr_string">"{a=a1=v1,a2=123,a3=null,a4=,b1=true,b2=123,b3=null,c1=v1,c2=123,c4=}"</span>,x1.getX1(<strong class="jxr_keyword">new</strong> K2a()));
+<a class="jxr_linenumber" name="L729" href="#L729">729</a> 		assertEquals(<span class="jxr_string">"{a=(a1=v1,a2=123,a3=null,a4=''),b1='true',b2='123',b3='null',c1=v1,c2=123,c4=}"</span>,x2.getX1(<strong class="jxr_keyword">new</strong> K2a()));
+<a class="jxr_linenumber" name="L730" href="#L730">730</a> 		assertEquals(<span class="jxr_string">"{a=x{a1=v1, a2=123, a3=null, a4=}x,b1=xtruex,b2=x123x,b3=xnullx,c1=xv1x,c2=x123x,c4=xx}"</span>,x2.getX2(<strong class="jxr_keyword">new</strong> K2a()));
 <a class="jxr_linenumber" name="L731" href="#L731">731</a> 	}
 <a class="jxr_linenumber" name="L732" href="#L732">732</a> 
 <a class="jxr_linenumber" name="L733" href="#L733">733</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
@@ -760,9 +760,9 @@
 <a class="jxr_linenumber" name="L752" href="#L752">752</a> 	@Test <strong class="jxr_keyword">void</strong> k03_requestBean_headers() {
 <a class="jxr_linenumber" name="L753" href="#L753">753</a> 		<strong class="jxr_keyword">var</strong> x1 = remote(K.<strong class="jxr_keyword">class</strong>,K3.<strong class="jxr_keyword">class</strong>);
 <a class="jxr_linenumber" name="L754" href="#L754">754</a> 		<strong class="jxr_keyword">var</strong> x2 = client(K.<strong class="jxr_keyword">class</strong>).partSerializer(UonSerializer.<strong class="jxr_keyword">class</strong>).build().getRemote(K3.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L755" href="#L755">755</a> 		assertEquals(<span class="jxr_string">"{a1:'v1',a2:'123',a4:'',b1:'true',b2:'123',b3:'null',c1:'v1',c2:'123',c4:'',e1:'v1',e2:'123',e4:'',f1:'v1',f2:'123',f4:''}"</span>,x1.getX1(<strong class="jxr_keyword">new</strong> K3a()));
-<a class="jxr_linenumber" name="L756" href="#L756">756</a> 		assertEquals(<span class="jxr_string">"{a1:'v1',a2:'123',a4:'',b1:'true',b2:'123',b3:'null',c1:'v1',c2:'123',c4:'',e1:'v1',e2:'123',e4:'',f1:'v1',f2:'123',f4:''}"</span>,x2.getX1(<strong class="jxr_keyword">new</strong> K3a()));
-<a class="jxr_linenumber" name="L757" href="#L757">757</a> 		assertEquals(<span class="jxr_string">"{a1:'v1',a2:'123',a4:'',b1:'true',b2:'123',b3:'null',c1:'v1',c2:'123',c4:'',e1:'v1',e2:'123',e4:'',f1:'v1',f2:'123',f4:''}"</span>,x2.getX2(<strong class="jxr_keyword">new</strong> K3a()));
+<a class="jxr_linenumber" name="L755" href="#L755">755</a> 		assertEquals(<span class="jxr_string">"{a1=v1,a2=123,a4=,b1=true,b2=123,b3=null,c1=v1,c2=123,c4=,e1=v1,e2=123,e4=,f1=v1,f2=123,f4=}"</span>,x1.getX1(<strong class="jxr_keyword">new</strong> K3a()));
+<a class="jxr_linenumber" name="L756" href="#L756">756</a> 		assertEquals(<span class="jxr_string">"{a1=v1,a2=123,a4=,b1=true,b2=123,b3=null,c1=v1,c2=123,c4=,e1=v1,e2=123,e4=,f1=v1,f2=123,f4=}"</span>,x2.getX1(<strong class="jxr_keyword">new</strong> K3a()));
+<a class="jxr_linenumber" name="L757" href="#L757">757</a> 		assertEquals(<span class="jxr_string">"{a1=v1,a2=123,a4=,b1=true,b2=123,b3=null,c1=v1,c2=123,c4=,e1=v1,e2=123,e4=,f1=v1,f2=123,f4=}"</span>,x2.getX2(<strong class="jxr_keyword">new</strong> K3a()));
 <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>
@@ -790,9 +790,9 @@
 <a class="jxr_linenumber" name="L782" href="#L782">782</a> 	@Test <strong class="jxr_keyword">void</strong> k04_requestBean_collections() {
 <a class="jxr_linenumber" name="L783" href="#L783">783</a> 		<strong class="jxr_keyword">var</strong> x1 = remote(K.<strong class="jxr_keyword">class</strong>,K4.<strong class="jxr_keyword">class</strong>);
 <a class="jxr_linenumber" name="L784" href="#L784">784</a> 		<strong class="jxr_keyword">var</strong> x2 = client(K.<strong class="jxr_keyword">class</strong>).partSerializer(UonSerializer.<strong class="jxr_keyword">class</strong>).build().getRemote(K4.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L785" href="#L785">785</a> 		assertEquals(<span class="jxr_string">"{a:'foo,,true,123,null,true,123,null',b:'foo,,true,123,null,true,123,null',c:'xfoo||true|123|null|true|123|nullx',d:'',f:'foo,,true,123,null,true,123,null',g:'xfoo||true|123|null|true|123|nullx',h:''}"</span>, x1.getX1(<strong class="jxr_keyword">new</strong> K4a()));
-<a class="jxr_linenumber" name="L786" href="#L786">786</a> 		assertEquals(<span class="jxr_string">"{a:'@(foo,&#92;&#92;'&#92;&#92;',&#92;&#92;'true&#92;&#92;',&#92;&#92;'123&#92;&#92;',&#92;&#92;'null&#92;&#92;',true,123,null)',b:'@(foo,&#92;&#92;'&#92;&#92;',&#92;&#92;'true&#92;&#92;',&#92;&#92;'123&#92;&#92;',&#92;&#92;'null&#92;&#92;',true,123,null)',c:'xfoo||true|123|null|true|123|nullx',d:'@()',f:'@(foo,&#92;&#92;'&#92;&#92;',&#92;&#92;'true&#92;&#92;',&#92;&#92;'123&#92;&#92;',&#9 [...]
-<a class="jxr_linenumber" name="L787" href="#L787">787</a> 		assertEquals(<span class="jxr_string">"{a:'xfoo||true|123|null|true|123|nullx',b:'xfoo||true|123|null|true|123|nullx',c:'xfoo||true|123|null|true|123|nullx',d:'xx',f:'xfoo||true|123|null|true|123|nullx',g:'xfoo||true|123|null|true|123|nullx',h:'xx'}"</span>, x2.getX2(<strong class="jxr_keyword">new</strong> K4a()));
+<a class="jxr_linenumber" name="L785" href="#L785">785</a> 		assertEquals(<span class="jxr_string">"{a=foo,,true,123,null,true,123,null,b=foo,,true,123,null,true,123,null,c=xfoo||true|123|null|true|123|nullx,d=,f=foo,,true,123,null,true,123,null,g=xfoo||true|123|null|true|123|nullx,h=}"</span>, x1.getX1(<strong class="jxr_keyword">new</strong> K4a()));
+<a class="jxr_linenumber" name="L786" href="#L786">786</a> 		assertEquals(<span class="jxr_string">"{a=@(foo,'','true','123','null',true,123,null),b=@(foo,'','true','123','null',true,123,null),c=xfoo||true|123|null|true|123|nullx,d=@(),f=@(foo,'','true','123','null',true,123,null),g=xfoo||true|123|null|true|123|nullx,h=@()}"</span>, x2.getX1(<strong class="jxr_keyword">new</strong> K4a()));
+<a class="jxr_linenumber" name="L787" href="#L787">787</a> 		assertEquals(<span class="jxr_string">"{a=xfoo||true|123|null|true|123|nullx,b=xfoo||true|123|null|true|123|nullx,c=xfoo||true|123|null|true|123|nullx,d=xx,f=xfoo||true|123|null|true|123|nullx,g=xfoo||true|123|null|true|123|nullx,h=xx}"</span>, x2.getX2(<strong class="jxr_keyword">new</strong> K4a()));
 <a class="jxr_linenumber" name="L788" href="#L788">788</a> 	}
 <a class="jxr_linenumber" name="L789" href="#L789">789</a> 
 <a class="jxr_linenumber" name="L790" href="#L790">790</a> 	<em class="jxr_comment">//------------------------------------------------------------------------------------------------------------------</em>
diff --git a/site/xref-test/org/apache/juneau/http/remote/Remote_QueryAnnotation_Test.html b/site/xref-test/org/apache/juneau/http/remote/Remote_QueryAnnotation_Test.html
index c0fc9ec08e..d20d7f5b6a 100644
--- a/site/xref-test/org/apache/juneau/http/remote/Remote_QueryAnnotation_Test.html
+++ b/site/xref-test/org/apache/juneau/http/remote/Remote_QueryAnnotation_Test.html
@@ -739,9 +739,9 @@
 <a class="jxr_linenumber" name="L731" href="#L731">731</a> 	@Test <strong class="jxr_keyword">void</strong> k01_requestBean_simpleVals() {
 <a class="jxr_linenumber" name="L732" href="#L732">732</a> 		<strong class="jxr_keyword">var</strong> x1 = remote(K.<strong class="jxr_keyword">class</strong>,K1.<strong class="jxr_keyword">class</strong>);
 <a class="jxr_linenumber" name="L733" href="#L733">733</a> 		<strong class="jxr_keyword">var</strong> x2 = client(K.<strong class="jxr_keyword">class</strong>).partSerializer(UonSerializer.<strong class="jxr_keyword">class</strong>).build().getRemote(K1.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L734" href="#L734">734</a> 		assertEquals(<span class="jxr_string">"{a:'a1',b:'b1',c:'c1',e:'',g:'true',h:'123',i1:'foo'}"</span>,x1.getX1(<strong class="jxr_keyword">new</strong> K1b()));
-<a class="jxr_linenumber" name="L735" href="#L735">735</a> 		assertEquals(<span class="jxr_string">"{a:'a1',b:'b1',c:'c1',e:'',g:'&#92;&#92;'true&#92;&#92;'',h:'&#92;&#92;'123&#92;&#92;'',i1:'foo'}"</span>,x2.getX1(<strong class="jxr_keyword">new</strong> K1b()));
-<a class="jxr_linenumber" name="L736" href="#L736">736</a> 		assertEquals(<span class="jxr_string">"{a:'xa1x',b:'xb1x',c:'xc1x',e:'xx',g:'xtruex',h:'x123x',i1:'xfoox'}"</span>,x2.getX2(<strong class="jxr_keyword">new</strong> K1b()));
+<a class="jxr_linenumber" name="L734" href="#L734">734</a> 		assertEquals(<span class="jxr_string">"{a=a1,b=b1,c=c1,e=,g=true,h=123,i1=foo}"</span>,x1.getX1(<strong class="jxr_keyword">new</strong> K1b()));
+<a class="jxr_linenumber" name="L735" href="#L735">735</a> 		assertEquals(<span class="jxr_string">"{a=a1,b=b1,c=c1,e=,g='true',h='123',i1=foo}"</span>,x2.getX1(<strong class="jxr_keyword">new</strong> K1b()));
+<a class="jxr_linenumber" name="L736" href="#L736">736</a> 		assertEquals(<span class="jxr_string">"{a=xa1x,b=xb1x,c=xc1x,e=xx,g=xtruex,h=x123x,i1=xfoox}"</span>,x2.getX2(<strong class="jxr_keyword">new</strong> K1b()));
 <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>
@@ -765,9 +765,9 @@
 <a class="jxr_linenumber" name="L757" href="#L757">757</a> 	@Test <strong class="jxr_keyword">void</strong> k02_requestBean_maps() {
 <a class="jxr_linenumber" name="L758" href="#L758">758</a> 		<strong class="jxr_keyword">var</strong> x1 = remote(K.<strong class="jxr_keyword">class</strong>,K2.<strong class="jxr_keyword">class</strong>);
 <a class="jxr_linenumber" name="L759" href="#L759">759</a> 		<strong class="jxr_keyword">var</strong> x2 = client(K.<strong class="jxr_keyword">class</strong>).partSerializer(UonSerializer.<strong class="jxr_keyword">class</strong>).build().getRemote(K2.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L760" href="#L760">760</a> 		assertEquals(<span class="jxr_string">"{a:'a1=v1,a2=123,a3=null,a4=',b1:'true',b2:'123',b3:'null',c1:'v1',c2:'123',c4:''}"</span>,x1.getX1(<strong class="jxr_keyword">new</strong> K2a()));
-<a class="jxr_linenumber" name="L761" href="#L761">761</a> 		assertEquals(<span class="jxr_string">"{a:'(a1=v1,a2=123,a3=null,a4=&#92;&#92;'&#92;&#92;')',b1:'&#92;&#92;'true&#92;&#92;'',b2:'&#92;&#92;'123&#92;&#92;'',b3:'&#92;&#92;'null&#92;&#92;'',c1:'v1',c2:'123',c4:''}"</span>,x2.getX1(<strong class="jxr_keyword">new</strong> K2a()));
-<a class="jxr_linenumber" name="L762" href="#L762">762</a> 		assertEquals(<span class="jxr_string">"{a:'x{a1=v1, a2=123, a3=null, a4=}x',b1:'xtruex',b2:'x123x',b3:'xnullx',c1:'xv1x',c2:'x123x',c4:'xx'}"</span>,x2.getX2(<strong class="jxr_keyword">new</strong> K2a()));
+<a class="jxr_linenumber" name="L760" href="#L760">760</a> 		assertEquals(<span class="jxr_string">"{a=a1=v1,a2=123,a3=null,a4=,b1=true,b2=123,b3=null,c1=v1,c2=123,c4=}"</span>,x1.getX1(<strong class="jxr_keyword">new</strong> K2a()));
+<a class="jxr_linenumber" name="L761" href="#L761">761</a> 		assertEquals(<span class="jxr_string">"{a=(a1=v1,a2=123,a3=null,a4=''),b1='true',b2='123',b3='null',c1=v1,c2=123,c4=}"</span>,x2.getX1(<strong class="jxr_keyword">new</strong> K2a()));
+<a class="jxr_linenumber" name="L762" href="#L762">762</a> 		assertEquals(<span class="jxr_string">"{a=x{a1=v1, a2=123, a3=null, a4=}x,b1=xtruex,b2=x123x,b3=xnullx,c1=xv1x,c2=x123x,c4=xx}"</span>,x2.getX2(<strong class="jxr_keyword">new</strong> K2a()));
 <a class="jxr_linenumber" name="L763" href="#L763">763</a> 	}
 <a class="jxr_linenumber" name="L764" href="#L764">764</a> 
 <a class="jxr_linenumber" name="L765" href="#L765">765</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
@@ -792,8 +792,8 @@
 <a class="jxr_linenumber" name="L784" href="#L784">784</a> 	@Test <strong class="jxr_keyword">void</strong> k03_requestBean_nameValuePairs() {
 <a class="jxr_linenumber" name="L785" href="#L785">785</a> 		<strong class="jxr_keyword">var</strong> x1 = remote(K.<strong class="jxr_keyword">class</strong>,K3.<strong class="jxr_keyword">class</strong>);
 <a class="jxr_linenumber" name="L786" href="#L786">786</a> 		<strong class="jxr_keyword">var</strong> x2 = client(K.<strong class="jxr_keyword">class</strong>).partSerializer(UonSerializer.<strong class="jxr_keyword">class</strong>).build().getRemote(K3.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L787" href="#L787">787</a> 		assertEquals(<span class="jxr_string">"{a1:'v1',a2:'123',a4:'',b1:'true',b2:'123',b3:'null',c1:'v1',c2:'123',c4:'',e1:'v1',e2:'123',e4:''}"</span>,x1.getX1(<strong class="jxr_keyword">new</strong> K3a()));
-<a class="jxr_linenumber" name="L788" href="#L788">788</a> 		assertEquals(<span class="jxr_string">"{a1:'v1',a2:'123',a4:'',b1:'true',b2:'123',b3:'null',c1:'v1',c2:'123',c4:'',e1:'v1',e2:'123',e4:''}"</span>,x2.getX1(<strong class="jxr_keyword">new</strong> K3a()));
+<a class="jxr_linenumber" name="L787" href="#L787">787</a> 		assertEquals(<span class="jxr_string">"{a1=v1,a2=123,a4=,b1=true,b2=123,b3=null,c1=v1,c2=123,c4=,e1=v1,e2=123,e4=}"</span>,x1.getX1(<strong class="jxr_keyword">new</strong> K3a()));
+<a class="jxr_linenumber" name="L788" href="#L788">788</a> 		assertEquals(<span class="jxr_string">"{a1=v1,a2=123,a4=,b1=true,b2=123,b3=null,c1=v1,c2=123,c4=,e1=v1,e2=123,e4=}"</span>,x2.getX1(<strong class="jxr_keyword">new</strong> K3a()));
 <a class="jxr_linenumber" name="L789" href="#L789">789</a> 	}
 <a class="jxr_linenumber" name="L790" href="#L790">790</a> 
 <a class="jxr_linenumber" name="L791" href="#L791">791</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
@@ -811,7 +811,7 @@
 <a class="jxr_linenumber" name="L803" href="#L803">803</a> 
 <a class="jxr_linenumber" name="L804" href="#L804">804</a> 	@Test <strong class="jxr_keyword">void</strong> k04_requestBean_charSequence() {
 <a class="jxr_linenumber" name="L805" href="#L805">805</a> 		<strong class="jxr_keyword">var</strong> x = remote(K.<strong class="jxr_keyword">class</strong>,K4.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L806" href="#L806">806</a> 		assertEquals(<span class="jxr_string">"{foo:'bar',baz:'qux'}"</span>,x.get(<strong class="jxr_keyword">new</strong> K4a()));
+<a class="jxr_linenumber" name="L806" href="#L806">806</a> 		assertEquals(<span class="jxr_string">"{baz=qux,foo=bar}"</span>,x.get(<strong class="jxr_keyword">new</strong> K4a()));
 <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> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
@@ -829,7 +829,7 @@
 <a class="jxr_linenumber" name="L821" href="#L821">821</a> 
 <a class="jxr_linenumber" name="L822" href="#L822">822</a> 	@Test <strong class="jxr_keyword">void</strong> k05_requestBean_reader() {
 <a class="jxr_linenumber" name="L823" href="#L823">823</a> 		<strong class="jxr_keyword">var</strong> x = remote(K.<strong class="jxr_keyword">class</strong>,K5.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L824" href="#L824">824</a> 		assertEquals(<span class="jxr_string">"{foo:'bar',baz:'qux'}"</span>,x.get(<strong class="jxr_keyword">new</strong> K5a()));
+<a class="jxr_linenumber" name="L824" href="#L824">824</a> 		assertEquals(<span class="jxr_string">"{baz=qux,foo=bar}"</span>,x.get(<strong class="jxr_keyword">new</strong> K5a()));
 <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> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
@@ -857,9 +857,9 @@
 <a class="jxr_linenumber" name="L849" href="#L849">849</a> 	@Test <strong class="jxr_keyword">void</strong> k06_requestBean_collections() {
 <a class="jxr_linenumber" name="L850" href="#L850">850</a> 		<strong class="jxr_keyword">var</strong> x1 = remote(K.<strong class="jxr_keyword">class</strong>,K6.<strong class="jxr_keyword">class</strong>);
 <a class="jxr_linenumber" name="L851" href="#L851">851</a> 		<strong class="jxr_keyword">var</strong> x2 = client(K.<strong class="jxr_keyword">class</strong>).partSerializer(UonSerializer.<strong class="jxr_keyword">class</strong>).build().getRemote(K6.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L852" href="#L852">852</a> 		assertEquals(<span class="jxr_string">"{a:'foo,,true,123,null,true,123,null',b:'foo,,true,123,null,true,123,null',c:'xfoo||true|123|null|true|123|nullx',d:'',f:'foo,,true,123,null,true,123,null',g:'xfoo||true|123|null|true|123|nullx',h:''}"</span>, x1.getX1(<strong class="jxr_keyword">new</strong> K6a()));
-<a class="jxr_linenumber" name="L853" href="#L853">853</a> 		assertEquals(<span class="jxr_string">"{a:'@(foo,&#92;&#92;'&#92;&#92;',&#92;&#92;'true&#92;&#92;',&#92;&#92;'123&#92;&#92;',&#92;&#92;'null&#92;&#92;',true,123,null)',b:'@(foo,&#92;&#92;'&#92;&#92;',&#92;&#92;'true&#92;&#92;',&#92;&#92;'123&#92;&#92;',&#92;&#92;'null&#92;&#92;',true,123,null)',c:'xfoo||true|123|null|true|123|nullx',d:'@()',f:'@(foo,&#92;&#92;'&#92;&#92;',&#92;&#92;'true&#92;&#92;',&#92;&#92;'123&#92;&#92;',&#9 [...]
-<a class="jxr_linenumber" name="L854" href="#L854">854</a> 		assertEquals(<span class="jxr_string">"{a:'xfoo||true|123|null|true|123|nullx',b:'xfoo||true|123|null|true|123|nullx',c:'xfoo||true|123|null|true|123|nullx',d:'xx',f:'xfoo||true|123|null|true|123|nullx',g:'xfoo||true|123|null|true|123|nullx',h:'xx'}"</span>, x2.getX2(<strong class="jxr_keyword">new</strong> K6a()));
+<a class="jxr_linenumber" name="L852" href="#L852">852</a> 		assertEquals(<span class="jxr_string">"{a=foo,,true,123,null,true,123,null,b=foo,,true,123,null,true,123,null,c=xfoo||true|123|null|true|123|nullx,d=,f=foo,,true,123,null,true,123,null,g=xfoo||true|123|null|true|123|nullx,h=}"</span>, x1.getX1(<strong class="jxr_keyword">new</strong> K6a()));
+<a class="jxr_linenumber" name="L853" href="#L853">853</a> 		assertEquals(<span class="jxr_string">"{a=@(foo,'','true','123','null',true,123,null),b=@(foo,'','true','123','null',true,123,null),c=xfoo||true|123|null|true|123|nullx,d=@(),f=@(foo,'','true','123','null',true,123,null),g=xfoo||true|123|null|true|123|nullx,h=@()}"</span>, x2.getX1(<strong class="jxr_keyword">new</strong> K6a()));
+<a class="jxr_linenumber" name="L854" href="#L854">854</a> 		assertEquals(<span class="jxr_string">"{a=xfoo||true|123|null|true|123|nullx,b=xfoo||true|123|null|true|123|nullx,c=xfoo||true|123|null|true|123|nullx,d=xx,f=xfoo||true|123|null|true|123|nullx,g=xfoo||true|123|null|true|123|nullx,h=xx}"</span>, x2.getX2(<strong class="jxr_keyword">new</strong> K6a()));
 <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>
diff --git a/site/xref-test/org/apache/juneau/rest/annotation/Path_Test.html b/site/xref-test/org/apache/juneau/rest/annotation/Path_Test.html
index 5f39104a79..02b222590e 100644
--- a/site/xref-test/org/apache/juneau/rest/annotation/Path_Test.html
+++ b/site/xref-test/org/apache/juneau/rest/annotation/Path_Test.html
@@ -419,7 +419,7 @@
 <a class="jxr_linenumber" name="L411" href="#L411">411</a> 		<strong class="jxr_keyword">var</strong> f = MockRestClient.createLax(F.<strong class="jxr_keyword">class</strong>).servletPath(<span class="jxr_string">"/f"</span>).defaultRequestConfig(RequestConfig.custom().setNormalizeUri(false).build()).build();
 <a class="jxr_linenumber" name="L412" href="#L412">412</a> 		f.get(<span class="jxr_string">"http://localhost/f/x1/x2"</span>)
 <a class="jxr_linenumber" name="L413" href="#L413">413</a> 			.run()
-<a class="jxr_linenumber" name="L414" href="#L414">414</a> 			.assertContent(<span class="jxr_string">"a: {a:'x1',b:'x2'}"</span>);
+<a class="jxr_linenumber" name="L414" href="#L414">414</a> 			.assertContent(<span class="jxr_string">"a: {a=x1,b=x2}"</span>);
 <a class="jxr_linenumber" name="L415" href="#L415">415</a> 		f.get(<span class="jxr_string">"http://localhost/f/x1"</span>)
 <a class="jxr_linenumber" name="L416" href="#L416">416</a> 			.run()
 <a class="jxr_linenumber" name="L417" href="#L417">417</a> 			.assertStatus(404);
@@ -437,7 +437,7 @@
 <a class="jxr_linenumber" name="L429" href="#L429">429</a> 			.assertStatus(404);
 <a class="jxr_linenumber" name="L430" href="#L430">430</a> 		f.get(<span class="jxr_string">"http://localhost/f/x1/x2/foo"</span>)
 <a class="jxr_linenumber" name="L431" href="#L431">431</a> 			.run()
-<a class="jxr_linenumber" name="L432" href="#L432">432</a> 			.assertContent(<span class="jxr_string">"b: {a:'x1',b:'x2','/**':'foo','/*':'foo'}"</span>);
+<a class="jxr_linenumber" name="L432" href="#L432">432</a> 			.assertContent(<span class="jxr_string">"b: {/*=foo,/**=foo,a=x1,b=x2}"</span>);
 <a class="jxr_linenumber" name="L433" href="#L433">433</a> 		f.get(<span class="jxr_string">"http://localhost/f///foo"</span>)
 <a class="jxr_linenumber" name="L434" href="#L434">434</a> 			.run()
 <a class="jxr_linenumber" name="L435" href="#L435">435</a> 			.assertStatus(404);
@@ -449,7 +449,7 @@
 <a class="jxr_linenumber" name="L441" href="#L441">441</a> 			.assertStatus(404);
 <a class="jxr_linenumber" name="L442" href="#L442">442</a> 		f.get(<span class="jxr_string">"http://localhost/f/x1/x2/fc"</span>)
 <a class="jxr_linenumber" name="L443" href="#L443">443</a> 			.run()
-<a class="jxr_linenumber" name="L444" href="#L444">444</a> 			.assertContent(<span class="jxr_string">"c: {a:'x1',b:'x2'}"</span>);
+<a class="jxr_linenumber" name="L444" href="#L444">444</a> 			.assertContent(<span class="jxr_string">"c: {a=x1,b=x2}"</span>);
 <a class="jxr_linenumber" name="L445" href="#L445">445</a> 		f.get(<span class="jxr_string">"http://localhost/f///a"</span>)
 <a class="jxr_linenumber" name="L446" href="#L446">446</a> 			.run()
 <a class="jxr_linenumber" name="L447" href="#L447">447</a> 			.assertStatus(404);
@@ -461,7 +461,7 @@
 <a class="jxr_linenumber" name="L453" href="#L453">453</a> 			.assertStatus(404);
 <a class="jxr_linenumber" name="L454" href="#L454">454</a> 		f.get(<span class="jxr_string">"http://localhost/f/x1/x2/fd/x3/x4"</span>)
 <a class="jxr_linenumber" name="L455" href="#L455">455</a> 			.run()
-<a class="jxr_linenumber" name="L456" href="#L456">456</a> 			.assertContent(<span class="jxr_string">"d: {a:'x1',b:'x2',c:'x3',d:'x4'}"</span>);
+<a class="jxr_linenumber" name="L456" href="#L456">456</a> 			.assertContent(<span class="jxr_string">"d: {a=x1,b=x2,c=x3,d=x4}"</span>);
 <a class="jxr_linenumber" name="L457" href="#L457">457</a> 		f.get(<span class="jxr_string">"http://localhost/f//x2/b/x3/x4"</span>)
 <a class="jxr_linenumber" name="L458" href="#L458">458</a> 			.run()
 <a class="jxr_linenumber" name="L459" href="#L459">459</a> 			.assertStatus(404);
@@ -479,16 +479,16 @@
 <a class="jxr_linenumber" name="L471" href="#L471">471</a> 			.assertStatus(404);
 <a class="jxr_linenumber" name="L472" href="#L472">472</a> 		f.get(<span class="jxr_string">"http://localhost/f/x1/x2/fe/x3/x4"</span>)
 <a class="jxr_linenumber" name="L473" href="#L473">473</a> 			.run()
-<a class="jxr_linenumber" name="L474" href="#L474">474</a> 			.assertContent(<span class="jxr_string">"e: {a:'x1, x3',b:'x2, x4'}"</span>);
+<a class="jxr_linenumber" name="L474" href="#L474">474</a> 			.assertContent(<span class="jxr_string">"e: {a=x1, x3,b=x2, x4}"</span>);
 <a class="jxr_linenumber" name="L475" href="#L475">475</a> 		f.get(<span class="jxr_string">"http://localhost/f/x1/x2/ff/x3/x4"</span>)
 <a class="jxr_linenumber" name="L476" href="#L476">476</a> 			.run()
-<a class="jxr_linenumber" name="L477" href="#L477">477</a> 			.assertContent(<span class="jxr_string">"f: {a:'x1',b:'x2',c:'x3',d:'x4'}"</span>);
+<a class="jxr_linenumber" name="L477" href="#L477">477</a> 			.assertContent(<span class="jxr_string">"f: {a=x1,b=x2,c=x3,d=x4}"</span>);
 <a class="jxr_linenumber" name="L478" href="#L478">478</a> 		f.get(<span class="jxr_string">"http://localhost/f/x1/x2/ff/x3/x4/"</span>)
 <a class="jxr_linenumber" name="L479" href="#L479">479</a> 			.run()
-<a class="jxr_linenumber" name="L480" href="#L480">480</a> 			.assertContent(<span class="jxr_string">"f: {a:'x1',b:'x2',c:'x3',d:'x4','/**':'','/*':''}"</span>);
+<a class="jxr_linenumber" name="L480" href="#L480">480</a> 			.assertContent(<span class="jxr_string">"f: {/*=,/**=,a=x1,b=x2,c=x3,d=x4}"</span>);
 <a class="jxr_linenumber" name="L481" href="#L481">481</a> 		f.get(<span class="jxr_string">"http://localhost/f/x1/x2/ff/x3/x4/foo/bar"</span>)
 <a class="jxr_linenumber" name="L482" href="#L482">482</a> 			.run()
-<a class="jxr_linenumber" name="L483" href="#L483">483</a> 			.assertContent(<span class="jxr_string">"f: {a:'x1',b:'x2',c:'x3',d:'x4','/**':'foo/bar','/*':'foo/bar'}"</span>);
+<a class="jxr_linenumber" name="L483" href="#L483">483</a> 			.assertContent(<span class="jxr_string">"f: {/*=foo/bar,/**=foo/bar,a=x1,b=x2,c=x3,d=x4}"</span>);
 <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> 	<em class="jxr_comment">//------------------------------------------------------------------------------------------------------------------</em>
@@ -502,7 +502,7 @@
 <a class="jxr_linenumber" name="L494" href="#L494">494</a> 		<strong class="jxr_keyword">var</strong> g = MockRestClient.createLax(G.<strong class="jxr_keyword">class</strong>).defaultRequestConfig(RequestConfig.custom().setNormalizeUri(false).build()).build();
 <a class="jxr_linenumber" name="L495" href="#L495">495</a> 		g.get(<span class="jxr_string">"http://localhost/f/x1/x2"</span>)
 <a class="jxr_linenumber" name="L496" href="#L496">496</a> 			.run()
-<a class="jxr_linenumber" name="L497" href="#L497">497</a> 			.assertContent(<span class="jxr_string">"a: {a:'x1',b:'x2'}"</span>);
+<a class="jxr_linenumber" name="L497" href="#L497">497</a> 			.assertContent(<span class="jxr_string">"a: {a=x1,b=x2}"</span>);
 <a class="jxr_linenumber" name="L498" href="#L498">498</a> 		g.get(<span class="jxr_string">"http://localhost/f/x1"</span>)
 <a class="jxr_linenumber" name="L499" href="#L499">499</a> 			.run()
 <a class="jxr_linenumber" name="L500" href="#L500">500</a> 			.assertStatus(404);
@@ -520,7 +520,7 @@
 <a class="jxr_linenumber" name="L512" href="#L512">512</a> 			.assertStatus(404);
 <a class="jxr_linenumber" name="L513" href="#L513">513</a> 		g.get(<span class="jxr_string">"http://localhost/f/x1/x2/fc"</span>)
 <a class="jxr_linenumber" name="L514" href="#L514">514</a> 			.run()
-<a class="jxr_linenumber" name="L515" href="#L515">515</a> 			.assertContent(<span class="jxr_string">"c: {a:'x1',b:'x2'}"</span>);
+<a class="jxr_linenumber" name="L515" href="#L515">515</a> 			.assertContent(<span class="jxr_string">"c: {a=x1,b=x2}"</span>);
 <a class="jxr_linenumber" name="L516" href="#L516">516</a> 		g.get(<span class="jxr_string">"http://localhost/f///a"</span>)
 <a class="jxr_linenumber" name="L517" href="#L517">517</a> 			.run()
 <a class="jxr_linenumber" name="L518" href="#L518">518</a> 			.assertStatus(404);
@@ -532,7 +532,7 @@
 <a class="jxr_linenumber" name="L524" href="#L524">524</a> 			.assertStatus(404);
 <a class="jxr_linenumber" name="L525" href="#L525">525</a> 		g.get(<span class="jxr_string">"http://localhost/f/x1/x2/fd/x3/x4"</span>)
 <a class="jxr_linenumber" name="L526" href="#L526">526</a> 			.run()
-<a class="jxr_linenumber" name="L527" href="#L527">527</a> 			.assertContent(<span class="jxr_string">"d: {a:'x1',b:'x2',c:'x3',d:'x4'}"</span>);
+<a class="jxr_linenumber" name="L527" href="#L527">527</a> 			.assertContent(<span class="jxr_string">"d: {a=x1,b=x2,c=x3,d=x4}"</span>);
 <a class="jxr_linenumber" name="L528" href="#L528">528</a> 		g.get(<span class="jxr_string">"http://localhost/f//x2/b/x3/x4"</span>)
 <a class="jxr_linenumber" name="L529" href="#L529">529</a> 			.run()
 <a class="jxr_linenumber" name="L530" href="#L530">530</a> 			.assertStatus(404);
@@ -550,16 +550,16 @@
 <a class="jxr_linenumber" name="L542" href="#L542">542</a> 			.assertStatus(404);
 <a class="jxr_linenumber" name="L543" href="#L543">543</a> 		g.get(<span class="jxr_string">"http://localhost/f/x1/x2/fe/x3/x4"</span>)
 <a class="jxr_linenumber" name="L544" href="#L544">544</a> 			.run()
-<a class="jxr_linenumber" name="L545" href="#L545">545</a> 			.assertContent(<span class="jxr_string">"e: {a:'x1, x3',b:'x2, x4'}"</span>);
+<a class="jxr_linenumber" name="L545" href="#L545">545</a> 			.assertContent(<span class="jxr_string">"e: {a=x1, x3,b=x2, x4}"</span>);
 <a class="jxr_linenumber" name="L546" href="#L546">546</a> 		g.get(<span class="jxr_string">"http://localhost/f/x1/x2/ff/x3/x4"</span>)
 <a class="jxr_linenumber" name="L547" href="#L547">547</a> 			.run()
-<a class="jxr_linenumber" name="L548" href="#L548">548</a> 			.assertContent(<span class="jxr_string">"f: {a:'x1',b:'x2',c:'x3',d:'x4'}"</span>);
+<a class="jxr_linenumber" name="L548" href="#L548">548</a> 			.assertContent(<span class="jxr_string">"f: {a=x1,b=x2,c=x3,d=x4}"</span>);
 <a class="jxr_linenumber" name="L549" href="#L549">549</a> 		g.get(<span class="jxr_string">"http://localhost/f/x1/x2/ff/x3/x4/"</span>)
 <a class="jxr_linenumber" name="L550" href="#L550">550</a> 			.run()
-<a class="jxr_linenumber" name="L551" href="#L551">551</a> 			.assertContent(<span class="jxr_string">"f: {a:'x1',b:'x2',c:'x3',d:'x4','/**':'','/*':''}"</span>);
+<a class="jxr_linenumber" name="L551" href="#L551">551</a> 			.assertContent(<span class="jxr_string">"f: {/*=,/**=,a=x1,b=x2,c=x3,d=x4}"</span>);
 <a class="jxr_linenumber" name="L552" href="#L552">552</a> 		g.get(<span class="jxr_string">"http://localhost/f/x1/x2/ff/x3/x4/foo/bar"</span>)
 <a class="jxr_linenumber" name="L553" href="#L553">553</a> 			.run()
-<a class="jxr_linenumber" name="L554" href="#L554">554</a> 			.assertContent(<span class="jxr_string">"f: {a:'x1',b:'x2',c:'x3',d:'x4','/**':'foo/bar','/*':'foo/bar'}"</span>);
+<a class="jxr_linenumber" name="L554" href="#L554">554</a> 			.assertContent(<span class="jxr_string">"f: {/*=foo/bar,/**=foo/bar,a=x1,b=x2,c=x3,d=x4}"</span>);
 <a class="jxr_linenumber" name="L555" href="#L555">555</a> 	}
 <a class="jxr_linenumber" name="L556" href="#L556">556</a> 
 <a class="jxr_linenumber" name="L557" href="#L557">557</a> 	<em class="jxr_comment">//------------------------------------------------------------------------------------------------------------------</em>
@@ -573,7 +573,7 @@
 <a class="jxr_linenumber" name="L565" href="#L565">565</a> 		<strong class="jxr_keyword">var</strong> h = MockRestClient.createLax(H.<strong class="jxr_keyword">class</strong>).servletPath(<span class="jxr_string">"/h"</span>).defaultRequestConfig(RequestConfig.custom().setNormalizeUri(false).build()).build();
 <a class="jxr_linenumber" name="L566" href="#L566">566</a> 		h.get(<span class="jxr_string">"http://localhost/h/ha1/hb1/f/x1/x2"</span>)
 <a class="jxr_linenumber" name="L567" href="#L567">567</a> 			.run()
-<a class="jxr_linenumber" name="L568" href="#L568">568</a> 			.assertContent(<span class="jxr_string">"a: {a:'x1',b:'x2',ha:'ha1',hb:'hb1'}"</span>);
+<a class="jxr_linenumber" name="L568" href="#L568">568</a> 			.assertContent(<span class="jxr_string">"a: {a=x1,b=x2,ha=ha1,hb=hb1}"</span>);
 <a class="jxr_linenumber" name="L569" href="#L569">569</a> 		<em class="jxr_comment">// These are 405 instead of 404 because when children don't match, we try to find a matching Java method.</em>
 <a class="jxr_linenumber" name="L570" href="#L570">570</a> 		h.get(<span class="jxr_string">"http://localhost/h/ha1/hb1/f/x1"</span>)
 <a class="jxr_linenumber" name="L571" href="#L571">571</a> 			.run()
@@ -607,7 +607,7 @@
 <a class="jxr_linenumber" name="L599" href="#L599">599</a> 			.assertStatus(404);
 <a class="jxr_linenumber" name="L600" href="#L600">600</a> 		h.get(<span class="jxr_string">"http://localhost/h/ha1/hb1/f/x1/x2/foo"</span>)
 <a class="jxr_linenumber" name="L601" href="#L601">601</a> 			.run()
-<a class="jxr_linenumber" name="L602" href="#L602">602</a> 			.assertContent(<span class="jxr_string">"b: {a:'x1',b:'x2',ha:'ha1',hb:'hb1','/**':'foo','/*':'foo'}"</span>);
+<a class="jxr_linenumber" name="L602" href="#L602">602</a> 			.assertContent(<span class="jxr_string">"b: {/*=foo,/**=foo,a=x1,b=x2,ha=ha1,hb=hb1}"</span>);
 <a class="jxr_linenumber" name="L603" href="#L603">603</a> 		h.get(<span class="jxr_string">"http://localhost/h//hb1/f/x1/x2/foo"</span>)
 <a class="jxr_linenumber" name="L604" href="#L604">604</a> 			.run()
 <a class="jxr_linenumber" name="L605" href="#L605">605</a> 			.assertStatus(404);
@@ -625,7 +625,7 @@
 <a class="jxr_linenumber" name="L617" href="#L617">617</a> 			.assertStatus(404);
 <a class="jxr_linenumber" name="L618" href="#L618">618</a> 		h.get(<span class="jxr_string">"http://localhost/h/ha1/hb1/f/x1/x2/fc"</span>)
 <a class="jxr_linenumber" name="L619" href="#L619">619</a> 			.run()
-<a class="jxr_linenumber" name="L620" href="#L620">620</a> 			.assertContent(<span class="jxr_string">"c: {a:'x1',b:'x2',ha:'ha1',hb:'hb1'}"</span>);
+<a class="jxr_linenumber" name="L620" href="#L620">620</a> 			.assertContent(<span class="jxr_string">"c: {a=x1,b=x2,ha=ha1,hb=hb1}"</span>);
 <a class="jxr_linenumber" name="L621" href="#L621">621</a> 		h.get(<span class="jxr_string">"http://localhost/h//hb1/f/x1/x2/a"</span>)
 <a class="jxr_linenumber" name="L622" href="#L622">622</a> 			.run()
 <a class="jxr_linenumber" name="L623" href="#L623">623</a> 			.assertStatus(404);
@@ -643,19 +643,19 @@
 <a class="jxr_linenumber" name="L635" href="#L635">635</a> 			.assertStatus(404);
 <a class="jxr_linenumber" name="L636" href="#L636">636</a> 		h.get(<span class="jxr_string">"http://localhost/h/ha1/hb1/f/x1/x2/fd/x3/x4"</span>)
 <a class="jxr_linenumber" name="L637" href="#L637">637</a> 			.run()
-<a class="jxr_linenumber" name="L638" href="#L638">638</a> 			.assertContent(<span class="jxr_string">"d: {a:'x1',b:'x2',ha:'ha1',hb:'hb1',c:'x3',d:'x4'}"</span>);
+<a class="jxr_linenumber" name="L638" href="#L638">638</a> 			.assertContent(<span class="jxr_string">"d: {a=x1,b=x2,c=x3,d=x4,ha=ha1,hb=hb1}"</span>);
 <a class="jxr_linenumber" name="L639" href="#L639">639</a> 		h.get(<span class="jxr_string">"http://localhost/h/ha1/hb1/f/x1/x2/fe/x3/x4"</span>)
 <a class="jxr_linenumber" name="L640" href="#L640">640</a> 			.run()
-<a class="jxr_linenumber" name="L641" href="#L641">641</a> 			.assertContent(<span class="jxr_string">"e: {a:'x1, x3',b:'x2, x4',ha:'ha1',hb:'hb1'}"</span>);
+<a class="jxr_linenumber" name="L641" href="#L641">641</a> 			.assertContent(<span class="jxr_string">"e: {a=x1, x3,b=x2, x4,ha=ha1,hb=hb1}"</span>);
 <a class="jxr_linenumber" name="L642" href="#L642">642</a> 		h.get(<span class="jxr_string">"http://localhost/h/ha1/hb1/f/x1/x2/ff/x3/x4"</span>)
 <a class="jxr_linenumber" name="L643" href="#L643">643</a> 			.run()
-<a class="jxr_linenumber" name="L644" href="#L644">644</a> 			.assertContent(<span class="jxr_string">"f: {a:'x1',b:'x2',ha:'ha1',hb:'hb1',c:'x3',d:'x4'}"</span>);
+<a class="jxr_linenumber" name="L644" href="#L644">644</a> 			.assertContent(<span class="jxr_string">"f: {a=x1,b=x2,c=x3,d=x4,ha=ha1,hb=hb1}"</span>);
 <a class="jxr_linenumber" name="L645" href="#L645">645</a> 		h.get(<span class="jxr_string">"http://localhost/h/ha1/hb1/f/x1/x2/ff/x3/x4/"</span>)
 <a class="jxr_linenumber" name="L646" href="#L646">646</a> 			.run()
-<a class="jxr_linenumber" name="L647" href="#L647">647</a> 			.assertContent(<span class="jxr_string">"f: {a:'x1',b:'x2',ha:'ha1',hb:'hb1',c:'x3',d:'x4','/**':'','/*':''}"</span>);
+<a class="jxr_linenumber" name="L647" href="#L647">647</a> 			.assertContent(<span class="jxr_string">"f: {/*=,/**=,a=x1,b=x2,c=x3,d=x4,ha=ha1,hb=hb1}"</span>);
 <a class="jxr_linenumber" name="L648" href="#L648">648</a> 		h.get(<span class="jxr_string">"http://localhost/h/ha1/hb1/f/x1/x2/ff/x3/x4/foo/bar"</span>)
 <a class="jxr_linenumber" name="L649" href="#L649">649</a> 			.run()
-<a class="jxr_linenumber" name="L650" href="#L650">650</a> 			.assertContent(<span class="jxr_string">"f: {a:'x1',b:'x2',ha:'ha1',hb:'hb1',c:'x3',d:'x4','/**':'foo/bar','/*':'foo/bar'}"</span>);
+<a class="jxr_linenumber" name="L650" href="#L650">650</a> 			.assertContent(<span class="jxr_string">"f: {/*=foo/bar,/**=foo/bar,a=x1,b=x2,c=x3,d=x4,ha=ha1,hb=hb1}"</span>);
 <a class="jxr_linenumber" name="L651" href="#L651">651</a> 	}
 <a class="jxr_linenumber" name="L652" href="#L652">652</a> 
 <a class="jxr_linenumber" name="L653" href="#L653">653</a> 	<em class="jxr_comment">//------------------------------------------------------------------------------------------------------------------</em>
@@ -669,7 +669,7 @@
 <a class="jxr_linenumber" name="L661" href="#L661">661</a> 		<strong class="jxr_keyword">var</strong> i = MockRestClient.createLax(I.<strong class="jxr_keyword">class</strong>).servletPath(<span class="jxr_string">"/i"</span>).build();
 <a class="jxr_linenumber" name="L662" href="#L662">662</a> 		i.get(<span class="jxr_string">"http://localhost/i/ia1/ib1/h/ha1/hb1/f/x1/x2"</span>)
 <a class="jxr_linenumber" name="L663" href="#L663">663</a> 			.run()
-<a class="jxr_linenumber" name="L664" href="#L664">664</a> 			.assertContent(<span class="jxr_string">"a: {a:'x1',b:'x2',ha:'ha1',hb:'hb1',ia:'ia1',ib:'ib1'}"</span>);
+<a class="jxr_linenumber" name="L664" href="#L664">664</a> 			.assertContent(<span class="jxr_string">"a: {a=x1,b=x2,ha=ha1,hb=hb1,ia=ia1,ib=ib1}"</span>);
 <a class="jxr_linenumber" name="L665" href="#L665">665</a> 		i.get(<span class="jxr_string">"http://localhost/i/ia1/ib1/h/ha1/hb1/f/x1"</span>)
 <a class="jxr_linenumber" name="L666" href="#L666">666</a> 			.run()
 <a class="jxr_linenumber" name="L667" href="#L667">667</a> 			.assertStatus(404);
@@ -717,25 +717,25 @@
 <a class="jxr_linenumber" name="L709" href="#L709">709</a> 			.assertStatus(404);
 <a class="jxr_linenumber" name="L710" href="#L710">710</a> 		i.get(<span class="jxr_string">"http://localhost/i/ia1/ib1/h/ha1/hb1/f/x1/x2/foo"</span>)
 <a class="jxr_linenumber" name="L711" href="#L711">711</a> 			.run()
-<a class="jxr_linenumber" name="L712" href="#L712">712</a> 			.assertContent(<span class="jxr_string">"b: {a:'x1',b:'x2',ha:'ha1',hb:'hb1',ia:'ia1',ib:'ib1','/**':'foo','/*':'foo'}"</span>);
+<a class="jxr_linenumber" name="L712" href="#L712">712</a> 			.assertContent(<span class="jxr_string">"b: {/*=foo,/**=foo,a=x1,b=x2,ha=ha1,hb=hb1,ia=ia1,ib=ib1}"</span>);
 <a class="jxr_linenumber" name="L713" href="#L713">713</a> 		i.get(<span class="jxr_string">"http://localhost/i/ia1/ib1/h/ha1/hb1/f/x1/x2/fc"</span>)
 <a class="jxr_linenumber" name="L714" href="#L714">714</a> 			.run()
-<a class="jxr_linenumber" name="L715" href="#L715">715</a> 			.assertContent(<span class="jxr_string">"c: {a:'x1',b:'x2',ha:'ha1',hb:'hb1',ia:'ia1',ib:'ib1'}"</span>);
+<a class="jxr_linenumber" name="L715" href="#L715">715</a> 			.assertContent(<span class="jxr_string">"c: {a=x1,b=x2,ha=ha1,hb=hb1,ia=ia1,ib=ib1}"</span>);
 <a class="jxr_linenumber" name="L716" href="#L716">716</a> 		i.get(<span class="jxr_string">"http://localhost/i/ia1/ib1/h/ha1/hb1/f/x1/x2/fd/x3/x4"</span>)
 <a class="jxr_linenumber" name="L717" href="#L717">717</a> 			.run()
-<a class="jxr_linenumber" name="L718" href="#L718">718</a> 			.assertContent(<span class="jxr_string">"d: {a:'x1',b:'x2',ha:'ha1',hb:'hb1',ia:'ia1',ib:'ib1',c:'x3',d:'x4'}"</span>);
+<a class="jxr_linenumber" name="L718" href="#L718">718</a> 			.assertContent(<span class="jxr_string">"d: {a=x1,b=x2,c=x3,d=x4,ha=ha1,hb=hb1,ia=ia1,ib=ib1}"</span>);
 <a class="jxr_linenumber" name="L719" href="#L719">719</a> 		i.get(<span class="jxr_string">"http://localhost/i/ia1/ib1/h/ha1/hb1/f/x1/x2/fe/x3/x4"</span>)
 <a class="jxr_linenumber" name="L720" href="#L720">720</a> 			.run()
-<a class="jxr_linenumber" name="L721" href="#L721">721</a> 			.assertContent(<span class="jxr_string">"e: {a:'x1, x3',b:'x2, x4',ha:'ha1',hb:'hb1',ia:'ia1',ib:'ib1'}"</span>);
+<a class="jxr_linenumber" name="L721" href="#L721">721</a> 			.assertContent(<span class="jxr_string">"e: {a=x1, x3,b=x2, x4,ha=ha1,hb=hb1,ia=ia1,ib=ib1}"</span>);
 <a class="jxr_linenumber" name="L722" href="#L722">722</a> 		i.get(<span class="jxr_string">"http://localhost/i/ia1/ib1/h/ha1/hb1/f/x1/x2/ff/x3/x4"</span>)
 <a class="jxr_linenumber" name="L723" href="#L723">723</a> 			.run()
-<a class="jxr_linenumber" name="L724" href="#L724">724</a> 			.assertContent(<span class="jxr_string">"f: {a:'x1',b:'x2',ha:'ha1',hb:'hb1',ia:'ia1',ib:'ib1',c:'x3',d:'x4'}"</span>);
+<a class="jxr_linenumber" name="L724" href="#L724">724</a> 			.assertContent(<span class="jxr_string">"f: {a=x1,b=x2,c=x3,d=x4,ha=ha1,hb=hb1,ia=ia1,ib=ib1}"</span>);
 <a class="jxr_linenumber" name="L725" href="#L725">725</a> 		i.get(<span class="jxr_string">"http://localhost/i/ia1/ib1/h/ha1/hb1/f/x1/x2/ff/x3/x4/"</span>)
 <a class="jxr_linenumber" name="L726" href="#L726">726</a> 			.run()
-<a class="jxr_linenumber" name="L727" href="#L727">727</a> 			.assertContent(<span class="jxr_string">"f: {a:'x1',b:'x2',ha:'ha1',hb:'hb1',ia:'ia1',ib:'ib1',c:'x3',d:'x4','/**':'','/*':''}"</span>);
+<a class="jxr_linenumber" name="L727" href="#L727">727</a> 			.assertContent(<span class="jxr_string">"f: {/*=,/**=,a=x1,b=x2,c=x3,d=x4,ha=ha1,hb=hb1,ia=ia1,ib=ib1}"</span>);
 <a class="jxr_linenumber" name="L728" href="#L728">728</a> 		i.get(<span class="jxr_string">"http://localhost/i/ia1/ib1/h/ha1/hb1/f/x1/x2/ff/x3/x4/foo/bar"</span>)
 <a class="jxr_linenumber" name="L729" href="#L729">729</a> 			.run()
-<a class="jxr_linenumber" name="L730" href="#L730">730</a> 			.assertContent(<span class="jxr_string">"f: {a:'x1',b:'x2',ha:'ha1',hb:'hb1',ia:'ia1',ib:'ib1',c:'x3',d:'x4','/**':'foo/bar','/*':'foo/bar'}"</span>);
+<a class="jxr_linenumber" name="L730" href="#L730">730</a> 			.assertContent(<span class="jxr_string">"f: {/*=foo/bar,/**=foo/bar,a=x1,b=x2,c=x3,d=x4,ha=ha1,hb=hb1,ia=ia1,ib=ib1}"</span>);
 <a class="jxr_linenumber" name="L731" href="#L731">731</a> 	}
 <a class="jxr_linenumber" name="L732" href="#L732">732</a> 
 <a class="jxr_linenumber" name="L733" href="#L733">733</a> 	<em class="jxr_comment">//------------------------------------------------------------------------------------------------------------------</em>
diff --git a/site/xref-test/org/apache/juneau/rest/util/UrlPathMatcher_Test.html b/site/xref-test/org/apache/juneau/rest/util/UrlPathMatcher_Test.html
index aca39deffb..bb6e8d13ed 100644
--- a/site/xref-test/org/apache/juneau/rest/util/UrlPathMatcher_Test.html
+++ b/site/xref-test/org/apache/juneau/rest/util/UrlPathMatcher_Test.html
@@ -112,7 +112,7 @@
 <a class="jxr_linenumber" name="L104" href="#L104">104</a> 	@Test <strong class="jxr_keyword">void</strong> b01_simple_match() {
 <a class="jxr_linenumber" name="L105" href="#L105">105</a> 		<strong class="jxr_keyword">var</strong> p = of(<span class="jxr_string">"/foo"</span>);
 <a class="jxr_linenumber" name="L106" href="#L106">106</a> 		check(p, <span class="jxr_string">"/foo"</span>, <span class="jxr_string">"{}"</span>);
-<a class="jxr_linenumber" name="L107" href="#L107">107</a> 		check(p, <span class="jxr_string">"/foo/"</span>, <span class="jxr_string">"{r:''}"</span>);
+<a class="jxr_linenumber" name="L107" href="#L107">107</a> 		check(p, <span class="jxr_string">"/foo/"</span>, <span class="jxr_string">"{r=}"</span>);
 <a class="jxr_linenumber" name="L108" href="#L108">108</a> 	}
 <a class="jxr_linenumber" name="L109" href="#L109">109</a> 
 <a class="jxr_linenumber" name="L110" href="#L110">110</a> 	@Test <strong class="jxr_keyword">void</strong> b02_simple_noMatch() {
@@ -123,7 +123,7 @@
 <a class="jxr_linenumber" name="L115" href="#L115">115</a> 	@Test <strong class="jxr_keyword">void</strong> b03_simple_match_2parts() {
 <a class="jxr_linenumber" name="L116" href="#L116">116</a> 		<strong class="jxr_keyword">var</strong> p = of(<span class="jxr_string">"/foo/bar"</span>);
 <a class="jxr_linenumber" name="L117" href="#L117">117</a> 		check(p, <span class="jxr_string">"/foo/bar"</span>, <span class="jxr_string">"{}"</span>);
-<a class="jxr_linenumber" name="L118" href="#L118">118</a> 		check(p, <span class="jxr_string">"/foo/bar/"</span>, <span class="jxr_string">"{r:''}"</span>);
+<a class="jxr_linenumber" name="L118" href="#L118">118</a> 		check(p, <span class="jxr_string">"/foo/bar/"</span>, <span class="jxr_string">"{r=}"</span>);
 <a class="jxr_linenumber" name="L119" href="#L119">119</a> 	}
 <a class="jxr_linenumber" name="L120" href="#L120">120</a> 
 <a class="jxr_linenumber" name="L121" href="#L121">121</a> 	@Test <strong class="jxr_keyword">void</strong> b04_simple_noMatch_2parts() {
@@ -133,7 +133,7 @@
 <a class="jxr_linenumber" name="L125" href="#L125">125</a> 
 <a class="jxr_linenumber" name="L126" href="#L126">126</a> 	@Test <strong class="jxr_keyword">void</strong> b05_simple_match_0parts() {
 <a class="jxr_linenumber" name="L127" href="#L127">127</a> 		<strong class="jxr_keyword">var</strong> p = of(<span class="jxr_string">"/"</span>);
-<a class="jxr_linenumber" name="L128" href="#L128">128</a> 		check(p, <span class="jxr_string">"/"</span>, <span class="jxr_string">"{r:''}"</span>);
+<a class="jxr_linenumber" name="L128" href="#L128">128</a> 		check(p, <span class="jxr_string">"/"</span>, <span class="jxr_string">"{r=}"</span>);
 <a class="jxr_linenumber" name="L129" href="#L129">129</a> 	}
 <a class="jxr_linenumber" name="L130" href="#L130">130</a> 
 <a class="jxr_linenumber" name="L131" href="#L131">131</a> 	@Test <strong class="jxr_keyword">void</strong> b06_simple_noMatch_0parts() {
@@ -143,7 +143,7 @@
 <a class="jxr_linenumber" name="L135" href="#L135">135</a> 
 <a class="jxr_linenumber" name="L136" href="#L136">136</a> 	@Test <strong class="jxr_keyword">void</strong> b07_simple_match_blank() {
 <a class="jxr_linenumber" name="L137" href="#L137">137</a> 		<strong class="jxr_keyword">var</strong> p = of(<span class="jxr_string">""</span>);
-<a class="jxr_linenumber" name="L138" href="#L138">138</a> 		check(p, <span class="jxr_string">"/"</span>, <span class="jxr_string">"{r:''}"</span>);
+<a class="jxr_linenumber" name="L138" href="#L138">138</a> 		check(p, <span class="jxr_string">"/"</span>, <span class="jxr_string">"{r=}"</span>);
 <a class="jxr_linenumber" name="L139" href="#L139">139</a> 	}
 <a class="jxr_linenumber" name="L140" href="#L140">140</a> 
 <a class="jxr_linenumber" name="L141" href="#L141">141</a> 	@Test <strong class="jxr_keyword">void</strong> b08_simple_noMatch_blank() {
@@ -158,10 +158,10 @@
 <a class="jxr_linenumber" name="L150" href="#L150">150</a> 	@Test <strong class="jxr_keyword">void</strong> c01_simple_withRemainder_match() {
 <a class="jxr_linenumber" name="L151" href="#L151">151</a> 		<strong class="jxr_keyword">var</strong> p = of(<span class="jxr_string">"/foo/*"</span>);
 <a class="jxr_linenumber" name="L152" href="#L152">152</a> 		check(p, <span class="jxr_string">"/foo"</span>, <span class="jxr_string">"{}"</span>);
-<a class="jxr_linenumber" name="L153" href="#L153">153</a> 		check(p, <span class="jxr_string">"/foo/"</span>, <span class="jxr_string">"{r:''}"</span>);
-<a class="jxr_linenumber" name="L154" href="#L154">154</a> 		check(p, <span class="jxr_string">"/foo/bar"</span>, <span class="jxr_string">"{r:'bar'}"</span>);
-<a class="jxr_linenumber" name="L155" href="#L155">155</a> 		check(p, <span class="jxr_string">"/foo/bar/"</span>, <span class="jxr_string">"{r:'bar/'}"</span>);
-<a class="jxr_linenumber" name="L156" href="#L156">156</a> 		check(p, <span class="jxr_string">"/foo/bar/baz"</span>, <span class="jxr_string">"{r:'bar/baz'}"</span>);
+<a class="jxr_linenumber" name="L153" href="#L153">153</a> 		check(p, <span class="jxr_string">"/foo/"</span>, <span class="jxr_string">"{r=}"</span>);
+<a class="jxr_linenumber" name="L154" href="#L154">154</a> 		check(p, <span class="jxr_string">"/foo/bar"</span>, <span class="jxr_string">"{r=bar}"</span>);
+<a class="jxr_linenumber" name="L155" href="#L155">155</a> 		check(p, <span class="jxr_string">"/foo/bar/"</span>, <span class="jxr_string">"{r=bar/}"</span>);
+<a class="jxr_linenumber" name="L156" href="#L156">156</a> 		check(p, <span class="jxr_string">"/foo/bar/baz"</span>, <span class="jxr_string">"{r=bar/baz}"</span>);
 <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 <strong class="jxr_keyword">void</strong> c02_simple_withRemainder_noMatch() {
@@ -172,8 +172,8 @@
 <a class="jxr_linenumber" name="L164" href="#L164">164</a> 	@Test <strong class="jxr_keyword">void</strong> c03_simple_withRemainder_match_2parts() {
 <a class="jxr_linenumber" name="L165" href="#L165">165</a> 		<strong class="jxr_keyword">var</strong> p = of(<span class="jxr_string">"/foo/bar/*"</span>);
 <a class="jxr_linenumber" name="L166" href="#L166">166</a> 		check(p, <span class="jxr_string">"/foo/bar"</span>, <span class="jxr_string">"{}"</span>);
-<a class="jxr_linenumber" name="L167" href="#L167">167</a> 		check(p, <span class="jxr_string">"/foo/bar/baz"</span>, <span class="jxr_string">"{r:'baz'}"</span>);
-<a class="jxr_linenumber" name="L168" href="#L168">168</a> 		check(p, <span class="jxr_string">"/foo/bar/baz/"</span>, <span class="jxr_string">"{r:'baz/'}"</span>);
+<a class="jxr_linenumber" name="L167" href="#L167">167</a> 		check(p, <span class="jxr_string">"/foo/bar/baz"</span>, <span class="jxr_string">"{r=baz}"</span>);
+<a class="jxr_linenumber" name="L168" href="#L168">168</a> 		check(p, <span class="jxr_string">"/foo/bar/baz/"</span>, <span class="jxr_string">"{r=baz/}"</span>);
 <a class="jxr_linenumber" name="L169" href="#L169">169</a> 	}
 <a class="jxr_linenumber" name="L170" href="#L170">170</a> 
 <a class="jxr_linenumber" name="L171" href="#L171">171</a> 	@Test <strong class="jxr_keyword">void</strong> c04_simple_withRemainder_noMatch_2parts() {
@@ -183,16 +183,16 @@
 <a class="jxr_linenumber" name="L175" href="#L175">175</a> 
 <a class="jxr_linenumber" name="L176" href="#L176">176</a> 	@Test <strong class="jxr_keyword">void</strong> c05_simple_withRemainder_match_0parts() {
 <a class="jxr_linenumber" name="L177" href="#L177">177</a> 		<strong class="jxr_keyword">var</strong> p = of(<span class="jxr_string">"/*"</span>);
-<a class="jxr_linenumber" name="L178" href="#L178">178</a> 		check(p, <span class="jxr_string">"/"</span>, <span class="jxr_string">"{r:''}"</span>);
-<a class="jxr_linenumber" name="L179" href="#L179">179</a> 		check(p, <span class="jxr_string">"/foo"</span>, <span class="jxr_string">"{r:'foo'}"</span>);
-<a class="jxr_linenumber" name="L180" href="#L180">180</a> 		check(p, <span class="jxr_string">"/foo/bar"</span>, <span class="jxr_string">"{r:'foo/bar'}"</span>);
+<a class="jxr_linenumber" name="L178" href="#L178">178</a> 		check(p, <span class="jxr_string">"/"</span>, <span class="jxr_string">"{r=}"</span>);
+<a class="jxr_linenumber" name="L179" href="#L179">179</a> 		check(p, <span class="jxr_string">"/foo"</span>, <span class="jxr_string">"{r=foo}"</span>);
+<a class="jxr_linenumber" name="L180" href="#L180">180</a> 		check(p, <span class="jxr_string">"/foo/bar"</span>, <span class="jxr_string">"{r=foo/bar}"</span>);
 <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 <strong class="jxr_keyword">void</strong> c06_simple_withRemainder_match_blank() {
 <a class="jxr_linenumber" name="L184" href="#L184">184</a> 		<strong class="jxr_keyword">var</strong> p = of(<span class="jxr_string">"*"</span>);
-<a class="jxr_linenumber" name="L185" href="#L185">185</a> 		check(p, <span class="jxr_string">"/"</span>, <span class="jxr_string">"{r:''}"</span>);
-<a class="jxr_linenumber" name="L186" href="#L186">186</a> 		check(p, <span class="jxr_string">"/foo"</span>, <span class="jxr_string">"{r:'foo'}"</span>);
-<a class="jxr_linenumber" name="L187" href="#L187">187</a> 		check(p, <span class="jxr_string">"/foo/bar"</span>, <span class="jxr_string">"{r:'foo/bar'}"</span>);
+<a class="jxr_linenumber" name="L185" href="#L185">185</a> 		check(p, <span class="jxr_string">"/"</span>, <span class="jxr_string">"{r=}"</span>);
+<a class="jxr_linenumber" name="L186" href="#L186">186</a> 		check(p, <span class="jxr_string">"/foo"</span>, <span class="jxr_string">"{r=foo}"</span>);
+<a class="jxr_linenumber" name="L187" href="#L187">187</a> 		check(p, <span class="jxr_string">"/foo/bar"</span>, <span class="jxr_string">"{r=foo/bar}"</span>);
 <a class="jxr_linenumber" name="L188" href="#L188">188</a> 	}
 <a class="jxr_linenumber" name="L189" href="#L189">189</a> 
 <a class="jxr_linenumber" name="L190" href="#L190">190</a> 	<em class="jxr_comment">//------------------------------------------------------------------------------------------------------------------</em>
@@ -201,8 +201,8 @@
 <a class="jxr_linenumber" name="L193" href="#L193">193</a> 
 <a class="jxr_linenumber" name="L194" href="#L194">194</a> 	@Test <strong class="jxr_keyword">void</strong> d01_1part1vars_match() {
 <a class="jxr_linenumber" name="L195" href="#L195">195</a> 		<strong class="jxr_keyword">var</strong> p = of(<span class="jxr_string">"/{foo}"</span>);
-<a class="jxr_linenumber" name="L196" href="#L196">196</a> 		check(p, <span class="jxr_string">"/bar"</span>, <span class="jxr_string">"{v:{foo:'bar'}}"</span>);
-<a class="jxr_linenumber" name="L197" href="#L197">197</a> 		check(p, <span class="jxr_string">"/bar/"</span>, <span class="jxr_string">"{v:{foo:'bar'},r:''}"</span>);
+<a class="jxr_linenumber" name="L196" href="#L196">196</a> 		check(p, <span class="jxr_string">"/bar"</span>, <span class="jxr_string">"{v={foo=bar}}"</span>);
+<a class="jxr_linenumber" name="L197" href="#L197">197</a> 		check(p, <span class="jxr_string">"/bar/"</span>, <span class="jxr_string">"{r=,v={foo=bar}}"</span>);
 <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> 	@Test <strong class="jxr_keyword">void</strong> d02_1part1<strong class="jxr_keyword">var</strong>_noMatch() {
@@ -212,8 +212,8 @@
 <a class="jxr_linenumber" name="L204" href="#L204">204</a> 
 <a class="jxr_linenumber" name="L205" href="#L205">205</a> 	@Test <strong class="jxr_keyword">void</strong> d03_2parts1<strong class="jxr_keyword">var</strong>_match() {
 <a class="jxr_linenumber" name="L206" href="#L206">206</a> 		<strong class="jxr_keyword">var</strong> p = of(<span class="jxr_string">"/foo/{bar}"</span>);
-<a class="jxr_linenumber" name="L207" href="#L207">207</a> 		check(p, <span class="jxr_string">"/foo/baz"</span>, <span class="jxr_string">"{v:{bar:'baz'}}"</span>);
-<a class="jxr_linenumber" name="L208" href="#L208">208</a> 		check(p, <span class="jxr_string">"/foo/baz/"</span>, <span class="jxr_string">"{v:{bar:'baz'},r:''}"</span>);
+<a class="jxr_linenumber" name="L207" href="#L207">207</a> 		check(p, <span class="jxr_string">"/foo/baz"</span>, <span class="jxr_string">"{v={bar=baz}}"</span>);
+<a class="jxr_linenumber" name="L208" href="#L208">208</a> 		check(p, <span class="jxr_string">"/foo/baz/"</span>, <span class="jxr_string">"{r=,v={bar=baz}}"</span>);
 <a class="jxr_linenumber" name="L209" href="#L209">209</a> 	}
 <a class="jxr_linenumber" name="L210" href="#L210">210</a> 
 <a class="jxr_linenumber" name="L211" href="#L211">211</a> 	@Test <strong class="jxr_keyword">void</strong> d04_2parts1<strong class="jxr_keyword">var</strong>_noMatch() {
@@ -223,8 +223,8 @@
 <a class="jxr_linenumber" name="L215" href="#L215">215</a> 
 <a class="jxr_linenumber" name="L216" href="#L216">216</a> 	@Test <strong class="jxr_keyword">void</strong> d05_3vars_match() {
 <a class="jxr_linenumber" name="L217" href="#L217">217</a> 		<strong class="jxr_keyword">var</strong> p = of(<span class="jxr_string">"/{a}/{b}/{c}"</span>);
-<a class="jxr_linenumber" name="L218" href="#L218">218</a> 		check(p, <span class="jxr_string">"/A/B/C"</span>, <span class="jxr_string">"{v:{a:'A',b:'B',c:'C'}}"</span>);
-<a class="jxr_linenumber" name="L219" href="#L219">219</a> 		check(p, <span class="jxr_string">"/A/B/C/"</span>, <span class="jxr_string">"{v:{a:'A',b:'B',c:'C'},r:''}"</span>);
+<a class="jxr_linenumber" name="L218" href="#L218">218</a> 		check(p, <span class="jxr_string">"/A/B/C"</span>, <span class="jxr_string">"{v={a=A,b=B,c=C}}"</span>);
+<a class="jxr_linenumber" name="L219" href="#L219">219</a> 		check(p, <span class="jxr_string">"/A/B/C/"</span>, <span class="jxr_string">"{r=,v={a=A,b=B,c=C}}"</span>);
 <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> 	@Test <strong class="jxr_keyword">void</strong> d06_3vars_noMatch() {
@@ -234,8 +234,8 @@
 <a class="jxr_linenumber" name="L226" href="#L226">226</a> 
 <a class="jxr_linenumber" name="L227" href="#L227">227</a> 	@Test <strong class="jxr_keyword">void</strong> d07_7parts3vars_match() {
 <a class="jxr_linenumber" name="L228" href="#L228">228</a> 		<strong class="jxr_keyword">var</strong> p = of(<span class="jxr_string">"/a/{a}/b/{b}/c/{c}/d"</span>);
-<a class="jxr_linenumber" name="L229" href="#L229">229</a> 		check(p, <span class="jxr_string">"/a/A/b/B/c/C/d"</span>, <span class="jxr_string">"{v:{a:'A',b:'B',c:'C'}}"</span>);
-<a class="jxr_linenumber" name="L230" href="#L230">230</a> 		check(p, <span class="jxr_string">"/a/A/b/B/c/C/d/"</span>, <span class="jxr_string">"{v:{a:'A',b:'B',c:'C'},r:''}"</span>);
+<a class="jxr_linenumber" name="L229" href="#L229">229</a> 		check(p, <span class="jxr_string">"/a/A/b/B/c/C/d"</span>, <span class="jxr_string">"{v={a=A,b=B,c=C}}"</span>);
+<a class="jxr_linenumber" name="L230" href="#L230">230</a> 		check(p, <span class="jxr_string">"/a/A/b/B/c/C/d/"</span>, <span class="jxr_string">"{r=,v={a=A,b=B,c=C}}"</span>);
 <a class="jxr_linenumber" name="L231" href="#L231">231</a> 	}
 <a class="jxr_linenumber" name="L232" href="#L232">232</a> 
 <a class="jxr_linenumber" name="L233" href="#L233">233</a> 	@Test <strong class="jxr_keyword">void</strong> d08_6parts3vars_noMatch() {
@@ -249,10 +249,10 @@
 <a class="jxr_linenumber" name="L241" href="#L241">241</a> 
 <a class="jxr_linenumber" name="L242" href="#L242">242</a> 	@Test <strong class="jxr_keyword">void</strong> e01_1part1vars_withRemainder_match() {
 <a class="jxr_linenumber" name="L243" href="#L243">243</a> 		<strong class="jxr_keyword">var</strong> p = of(<span class="jxr_string">"/{foo}/*"</span>);
-<a class="jxr_linenumber" name="L244" href="#L244">244</a> 		check(p, <span class="jxr_string">"/bar"</span>, <span class="jxr_string">"{v:{foo:'bar'}}"</span>);
-<a class="jxr_linenumber" name="L245" href="#L245">245</a> 		check(p, <span class="jxr_string">"/bar/"</span>, <span class="jxr_string">"{v:{foo:'bar'},r:''}"</span>);
-<a class="jxr_linenumber" name="L246" href="#L246">246</a> 		check(p, <span class="jxr_string">"/bar/baz"</span>, <span class="jxr_string">"{v:{foo:'bar'},r:'baz'}"</span>);
-<a class="jxr_linenumber" name="L247" href="#L247">247</a> 		check(p, <span class="jxr_string">"/bar/baz/qux"</span>, <span class="jxr_string">"{v:{foo:'bar'},r:'baz/qux'}"</span>);
+<a class="jxr_linenumber" name="L244" href="#L244">244</a> 		check(p, <span class="jxr_string">"/bar"</span>, <span class="jxr_string">"{v={foo=bar}}"</span>);
+<a class="jxr_linenumber" name="L245" href="#L245">245</a> 		check(p, <span class="jxr_string">"/bar/"</span>, <span class="jxr_string">"{r=,v={foo=bar}}"</span>);
+<a class="jxr_linenumber" name="L246" href="#L246">246</a> 		check(p, <span class="jxr_string">"/bar/baz"</span>, <span class="jxr_string">"{r=baz,v={foo=bar}}"</span>);
+<a class="jxr_linenumber" name="L247" href="#L247">247</a> 		check(p, <span class="jxr_string">"/bar/baz/qux"</span>, <span class="jxr_string">"{r=baz/qux,v={foo=bar}}"</span>);
 <a class="jxr_linenumber" name="L248" href="#L248">248</a> 	}
 <a class="jxr_linenumber" name="L249" href="#L249">249</a> 
 <a class="jxr_linenumber" name="L250" href="#L250">250</a> 	@Test <strong class="jxr_keyword">void</strong> e02_1part1<strong class="jxr_keyword">var</strong>_withRemainder_noMatch() {
@@ -262,9 +262,9 @@
 <a class="jxr_linenumber" name="L254" href="#L254">254</a> 
 <a class="jxr_linenumber" name="L255" href="#L255">255</a> 	@Test <strong class="jxr_keyword">void</strong> e03_2parts1<strong class="jxr_keyword">var</strong>_withRemainder_match() {
 <a class="jxr_linenumber" name="L256" href="#L256">256</a> 		<strong class="jxr_keyword">var</strong> p = of(<span class="jxr_string">"/foo/{bar}/*"</span>);
-<a class="jxr_linenumber" name="L257" href="#L257">257</a> 		check(p, <span class="jxr_string">"/foo/baz"</span>, <span class="jxr_string">"{v:{bar:'baz'}}"</span>);
-<a class="jxr_linenumber" name="L258" href="#L258">258</a> 		check(p, <span class="jxr_string">"/foo/baz/"</span>, <span class="jxr_string">"{v:{bar:'baz'},r:''}"</span>);
-<a class="jxr_linenumber" name="L259" href="#L259">259</a> 		check(p, <span class="jxr_string">"/foo/baz/qux/"</span>, <span class="jxr_string">"{v:{bar:'baz'},r:'qux/'}"</span>);
+<a class="jxr_linenumber" name="L257" href="#L257">257</a> 		check(p, <span class="jxr_string">"/foo/baz"</span>, <span class="jxr_string">"{v={bar=baz}}"</span>);
+<a class="jxr_linenumber" name="L258" href="#L258">258</a> 		check(p, <span class="jxr_string">"/foo/baz/"</span>, <span class="jxr_string">"{r=,v={bar=baz}}"</span>);
+<a class="jxr_linenumber" name="L259" href="#L259">259</a> 		check(p, <span class="jxr_string">"/foo/baz/qux/"</span>, <span class="jxr_string">"{r=qux/,v={bar=baz}}"</span>);
 <a class="jxr_linenumber" name="L260" href="#L260">260</a> 	}
 <a class="jxr_linenumber" name="L261" href="#L261">261</a> 
 <a class="jxr_linenumber" name="L262" href="#L262">262</a> 	@Test <strong class="jxr_keyword">void</strong> e04_2parts1<strong class="jxr_keyword">var</strong>_withRemainder_noMatch() {
@@ -279,9 +279,9 @@
 <a class="jxr_linenumber" name="L271" href="#L271">271</a> 	@Test <strong class="jxr_keyword">void</strong> f01_innerMeta_withRemainder_match() {
 <a class="jxr_linenumber" name="L272" href="#L272">272</a> 		<strong class="jxr_keyword">var</strong> p = of(<span class="jxr_string">"/*/*"</span>);
 <a class="jxr_linenumber" name="L273" href="#L273">273</a> 		check(p, <span class="jxr_string">"/bar"</span>, <span class="jxr_string">"{}"</span>);
-<a class="jxr_linenumber" name="L274" href="#L274">274</a> 		check(p, <span class="jxr_string">"/bar/"</span>, <span class="jxr_string">"{r:''}"</span>);
-<a class="jxr_linenumber" name="L275" href="#L275">275</a> 		check(p, <span class="jxr_string">"/bar/baz"</span>, <span class="jxr_string">"{r:'baz'}"</span>);
-<a class="jxr_linenumber" name="L276" href="#L276">276</a> 		check(p, <span class="jxr_string">"/bar/baz/qux"</span>, <span class="jxr_string">"{r:'baz/qux'}"</span>);
+<a class="jxr_linenumber" name="L274" href="#L274">274</a> 		check(p, <span class="jxr_string">"/bar/"</span>, <span class="jxr_string">"{r=}"</span>);
+<a class="jxr_linenumber" name="L275" href="#L275">275</a> 		check(p, <span class="jxr_string">"/bar/baz"</span>, <span class="jxr_string">"{r=baz}"</span>);
+<a class="jxr_linenumber" name="L276" href="#L276">276</a> 		check(p, <span class="jxr_string">"/bar/baz/qux"</span>, <span class="jxr_string">"{r=baz/qux}"</span>);
 <a class="jxr_linenumber" name="L277" href="#L277">277</a> 	}
 <a class="jxr_linenumber" name="L278" href="#L278">278</a> 
 <a class="jxr_linenumber" name="L279" href="#L279">279</a> 	@Test <strong class="jxr_keyword">void</strong> f02_innerMeta_withRemainder_noMatch() {
@@ -292,8 +292,8 @@
 <a class="jxr_linenumber" name="L284" href="#L284">284</a> 	@Test <strong class="jxr_keyword">void</strong> f03_innerMeta_withRemainder_match() {
 <a class="jxr_linenumber" name="L285" href="#L285">285</a> 		<strong class="jxr_keyword">var</strong> p = of(<span class="jxr_string">"/foo/*/bar/*"</span>);
 <a class="jxr_linenumber" name="L286" href="#L286">286</a> 		check(p, <span class="jxr_string">"/foo/baz/bar"</span>, <span class="jxr_string">"{}"</span>);
-<a class="jxr_linenumber" name="L287" href="#L287">287</a> 		check(p, <span class="jxr_string">"/foo/baz/bar/"</span>, <span class="jxr_string">"{r:''}"</span>);
-<a class="jxr_linenumber" name="L288" href="#L288">288</a> 		check(p, <span class="jxr_string">"/foo/baz/bar/qux/"</span>, <span class="jxr_string">"{r:'qux/'}"</span>);
+<a class="jxr_linenumber" name="L287" href="#L287">287</a> 		check(p, <span class="jxr_string">"/foo/baz/bar/"</span>, <span class="jxr_string">"{r=}"</span>);
+<a class="jxr_linenumber" name="L288" href="#L288">288</a> 		check(p, <span class="jxr_string">"/foo/baz/bar/qux/"</span>, <span class="jxr_string">"{r=qux/}"</span>);
 <a class="jxr_linenumber" name="L289" href="#L289">289</a> 	}
 <a class="jxr_linenumber" name="L290" href="#L290">290</a> 
 <a class="jxr_linenumber" name="L291" href="#L291">291</a> 	@Test <strong class="jxr_keyword">void</strong> f04_innerMeta_withRemainder_noMatch() {
@@ -307,10 +307,10 @@
 <a class="jxr_linenumber" name="L299" href="#L299">299</a> 
 <a class="jxr_linenumber" name="L300" href="#L300">300</a> 	@Test <strong class="jxr_keyword">void</strong> g01_encodedVars() {
 <a class="jxr_linenumber" name="L301" href="#L301">301</a> 		<strong class="jxr_keyword">var</strong> p = of(<span class="jxr_string">"/foo/{bar}/*"</span>);
-<a class="jxr_linenumber" name="L302" href="#L302">302</a> 		check(p, <span class="jxr_string">"/foo/baz%2Fqux"</span>, <span class="jxr_string">"{v:{bar:'baz/qux'}}"</span>);
-<a class="jxr_linenumber" name="L303" href="#L303">303</a> 		check(p, <span class="jxr_string">"/foo/baz+qux"</span>, <span class="jxr_string">"{v:{bar:'baz qux'}}"</span>);
-<a class="jxr_linenumber" name="L304" href="#L304">304</a> 		check(p, <span class="jxr_string">"/foo/baz%2Fqux/quux%2Fquuux"</span>, <span class="jxr_string">"{v:{bar:'baz/qux'},r:'quux%2Fquuux'}"</span>);
-<a class="jxr_linenumber" name="L305" href="#L305">305</a> 		check(p, <span class="jxr_string">"/foo/baz+qux/quux+quuux"</span>, <span class="jxr_string">"{v:{bar:'baz qux'},r:'quux+quuux'}"</span>);
+<a class="jxr_linenumber" name="L302" href="#L302">302</a> 		check(p, <span class="jxr_string">"/foo/baz%2Fqux"</span>, <span class="jxr_string">"{v={bar=baz/qux}}"</span>);
+<a class="jxr_linenumber" name="L303" href="#L303">303</a> 		check(p, <span class="jxr_string">"/foo/baz+qux"</span>, <span class="jxr_string">"{v={bar=baz qux}}"</span>);
+<a class="jxr_linenumber" name="L304" href="#L304">304</a> 		check(p, <span class="jxr_string">"/foo/baz%2Fqux/quux%2Fquuux"</span>, <span class="jxr_string">"{r=quux%2Fquuux,v={bar=baz/qux}}"</span>);
+<a class="jxr_linenumber" name="L305" href="#L305">305</a> 		check(p, <span class="jxr_string">"/foo/baz+qux/quux+quuux"</span>, <span class="jxr_string">"{r=quux+quuux,v={bar=baz qux}}"</span>);
 <a class="jxr_linenumber" name="L306" href="#L306">306</a> 	}
 <a class="jxr_linenumber" name="L307" href="#L307">307</a> 
 <a class="jxr_linenumber" name="L308" href="#L308">308</a> 	<em class="jxr_comment">//------------------------------------------------------------------------------------------------------------------</em>
@@ -320,19 +320,19 @@
 <a class="jxr_linenumber" name="L312" href="#L312">312</a> 	@Test <strong class="jxr_keyword">void</strong> h01_notVars() {
 <a class="jxr_linenumber" name="L313" href="#L313">313</a> 		<strong class="jxr_keyword">var</strong> p = of(<span class="jxr_string">"/foo/{bar/*"</span>);
 <a class="jxr_linenumber" name="L314" href="#L314">314</a> 		check(p, <span class="jxr_string">"/foo/{bar"</span>, <span class="jxr_string">"{}"</span>);
-<a class="jxr_linenumber" name="L315" href="#L315">315</a> 		check(p, <span class="jxr_string">"/foo/{bar/{baz"</span>, <span class="jxr_string">"{r:'{baz'}"</span>);
+<a class="jxr_linenumber" name="L315" href="#L315">315</a> 		check(p, <span class="jxr_string">"/foo/{bar/{baz"</span>, <span class="jxr_string">"{r={baz}"</span>);
 <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> 	@Test <strong class="jxr_keyword">void</strong> h02_notVars() {
 <a class="jxr_linenumber" name="L319" href="#L319">319</a> 		<strong class="jxr_keyword">var</strong> p = of(<span class="jxr_string">"/foo/bar}/*"</span>);
 <a class="jxr_linenumber" name="L320" href="#L320">320</a> 		check(p, <span class="jxr_string">"/foo/bar}"</span>, <span class="jxr_string">"{}"</span>);
-<a class="jxr_linenumber" name="L321" href="#L321">321</a> 		check(p, <span class="jxr_string">"/foo/bar}/baz}"</span>, <span class="jxr_string">"{r:'baz}'}"</span>);
+<a class="jxr_linenumber" name="L321" href="#L321">321</a> 		check(p, <span class="jxr_string">"/foo/bar}/baz}"</span>, <span class="jxr_string">"{r=baz}}"</span>);
 <a class="jxr_linenumber" name="L322" href="#L322">322</a> 	}
 <a class="jxr_linenumber" name="L323" href="#L323">323</a> 
 <a class="jxr_linenumber" name="L324" href="#L324">324</a> 	@Test <strong class="jxr_keyword">void</strong> h03_notVars() {
 <a class="jxr_linenumber" name="L325" href="#L325">325</a> 		<strong class="jxr_keyword">var</strong> p = of(<span class="jxr_string">"/foo/x{bar}x/*"</span>);
 <a class="jxr_linenumber" name="L326" href="#L326">326</a> 		check(p, <span class="jxr_string">"/foo/x{bar}x"</span>, <span class="jxr_string">"{}"</span>);
-<a class="jxr_linenumber" name="L327" href="#L327">327</a> 		check(p, <span class="jxr_string">"/foo/x{bar}x/x{baz}x"</span>, <span class="jxr_string">"{r:'x{baz}x'}"</span>);
+<a class="jxr_linenumber" name="L327" href="#L327">327</a> 		check(p, <span class="jxr_string">"/foo/x{bar}x/x{baz}x"</span>, <span class="jxr_string">"{r=x{baz}x}"</span>);
 <a class="jxr_linenumber" name="L328" href="#L328">328</a> 	}
 <a class="jxr_linenumber" name="L329" href="#L329">329</a> 
 <a class="jxr_linenumber" name="L330" href="#L330">330</a> 	<em class="jxr_comment">//------------------------------------------------------------------------------------------------------------------</em>
diff --git a/site/xref-test/org/apache/juneau/serializer/SerializerConfigAnnotationTest.html b/site/xref-test/org/apache/juneau/serializer/SerializerConfigAnnotation_Test.html
similarity index 90%
rename from site/xref-test/org/apache/juneau/serializer/SerializerConfigAnnotationTest.html
rename to site/xref-test/org/apache/juneau/serializer/SerializerConfigAnnotation_Test.html
index 74b74274ff..fb9903269b 100644
--- a/site/xref-test/org/apache/juneau/serializer/SerializerConfigAnnotationTest.html
+++ b/site/xref-test/org/apache/juneau/serializer/SerializerConfigAnnotation_Test.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="" lang="">
 <head><meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-<title>SerializerConfigAnnotationTest xref</title>
+<title>SerializerConfigAnnotation_Test xref</title>
 <link type="text/css" rel="stylesheet" href="../../../../stylesheet.css" />
 </head>
 <body>
-<div id="overview"><a href="../../../../../testapidocs/org/apache/juneau/serializer/SerializerConfigAnnotationTest.html">View Javadoc</a></div><pre>
+<div id="overview"><a href="../../../../../testapidocs/org/apache/juneau/serializer/SerializerConfigAnnotation_Test.html">View Javadoc</a></div><pre>
 <a class="jxr_linenumber" name="L1" href="#L1">1</a>   <em class="jxr_comment">/*</em>
 <a class="jxr_linenumber" name="L2" href="#L2">2</a>   <em class="jxr_comment"> * Licensed to the Apache Software Foundation (ASF) under one or more</em>
 <a class="jxr_linenumber" name="L3" href="#L3">3</a>   <em class="jxr_comment"> * contributor license agreements.  See the NOTICE file distributed with</em>
@@ -40,7 +40,7 @@
 <a class="jxr_linenumber" name="L32" href="#L32">32</a>  <em class="jxr_javadoccomment">/**</em>
 <a class="jxr_linenumber" name="L33" href="#L33">33</a>  <em class="jxr_javadoccomment"> * Tests the @SerializerConfig annotation.</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>  <strong class="jxr_keyword">class</strong> <a name="SerializerConfigAnnotationTest" href="../../../../org/apache/juneau/serializer/SerializerConfigAnnotationTest.html#SerializerConfigAnnotationTest">SerializerConfigAnnotationTest</a> <strong class="jxr_keyword">extends</strong> <a name="TestBase" href="../../../../org/apache/juneau/TestBase.html#TestBase">TestBase</a> {
+<a class="jxr_linenumber" name="L35" href="#L35">35</a>  <strong class="jxr_keyword">class</strong> <a name="SerializerConfigAnnotation_Test" href="../../../../org/apache/juneau/serializer/SerializerConfigAnnotation_Test.html#SerializerConfigAnnotation_Test">SerializerConfigAnnotation_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="L36" href="#L36">36</a>  
 <a class="jxr_linenumber" name="L37" href="#L37">37</a>  	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> check(String expected, Object o) {
 <a class="jxr_linenumber" name="L38" href="#L38">38</a>  		assertEquals(expected, TO_STRING.apply(o));
@@ -87,7 +87,7 @@
 <a class="jxr_linenumber" name="L79" href="#L79">79</a>  	<strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> A {}
 <a class="jxr_linenumber" name="L80" href="#L80">80</a>  	<strong class="jxr_keyword">static</strong> ClassInfo a = ClassInfo.of(A.<strong class="jxr_keyword">class</strong>);
 <a class="jxr_linenumber" name="L81" href="#L81">81</a>  
-<a class="jxr_linenumber" name="L82" href="#L82">82</a>  	@Test <strong class="jxr_keyword">void</strong> basicWriterSerializer() {
+<a class="jxr_linenumber" name="L82" href="#L82">82</a>  	@Test <strong class="jxr_keyword">void</strong> a01_basicWriterSerializer() {
 <a class="jxr_linenumber" name="L83" href="#L83">83</a>  		<strong class="jxr_keyword">var</strong> al = AnnotationWorkList.of(sr, rstream(a.getAnnotations()));
 <a class="jxr_linenumber" name="L84" href="#L84">84</a>  		<strong class="jxr_keyword">var</strong> x = JsonSerializer.create().apply(al).build().getSession();
 <a class="jxr_linenumber" name="L85" href="#L85">85</a>  		check(<span class="jxr_string">"true"</span>, ((SerializerSession)x).isAddBeanTypes());
@@ -105,13 +105,13 @@
 <a class="jxr_linenumber" name="L97" href="#L97">97</a>  		check(<span class="jxr_string">"true"</span>, x.isTrimEmptyMaps());
 <a class="jxr_linenumber" name="L98" href="#L98">98</a>  		check(<span class="jxr_string">"false"</span>, x.isKeepNullProperties());
 <a class="jxr_linenumber" name="L99" href="#L99">99</a>  		check(<span class="jxr_string">"true"</span>, x.isTrimStrings());
-<a class="jxr_linenumber" name="L100" href="#L100">100</a> 		check(<span class="jxr_string">"{absoluteAuthority:'/',absoluteContextRoot:'/',absolutePathInfo:'/',absolutePathInfoParent:'/',absoluteServletPath:'/',absoluteServletPathParent:'/',rootRelativeContextRoot:'/',rootRelativePathInfo:'/',rootRelativePathInfoParent:'/',rootRelativeServletPath:'/',rootRelativeServletPathParent:'/'}"</span>, x.getUriContext());
+<a class="jxr_linenumber" name="L100" href="#L100">100</a> 		check(<span class="jxr_string">"{aContextRoot=/,aPathInfo=/,aServletPath=/,rContextRoot=/,rPath=/,rResource=/}"</span>, x.getUriContext());
 <a class="jxr_linenumber" name="L101" href="#L101">101</a> 		check(<span class="jxr_string">"RESOURCE"</span>, x.getUriRelativity());
 <a class="jxr_linenumber" name="L102" href="#L102">102</a> 		check(<span class="jxr_string">"ABSOLUTE"</span>, x.getUriResolution());
 <a class="jxr_linenumber" name="L103" href="#L103">103</a> 		check(<span class="jxr_string">"true"</span>, x.isUseWhitespace());
 <a class="jxr_linenumber" name="L104" href="#L104">104</a> 	}
 <a class="jxr_linenumber" name="L105" href="#L105">105</a> 
-<a class="jxr_linenumber" name="L106" href="#L106">106</a> 	@Test <strong class="jxr_keyword">void</strong> basicOutputStreamSerializer() {
+<a class="jxr_linenumber" name="L106" href="#L106">106</a> 	@Test <strong class="jxr_keyword">void</strong> a02_basicOutputStreamSerializer() {
 <a class="jxr_linenumber" name="L107" href="#L107">107</a> 		<strong class="jxr_keyword">var</strong> al = AnnotationWorkList.of(sr, rstream(a.getAnnotations()));
 <a class="jxr_linenumber" name="L108" href="#L108">108</a> 		<strong class="jxr_keyword">var</strong> x = MsgPackSerializer.create().apply(al).build().getSession();
 <a class="jxr_linenumber" name="L109" href="#L109">109</a> 		check(<span class="jxr_string">"true"</span>, ((SerializerSession)x).isAddBeanTypes());
@@ -128,7 +128,7 @@
 <a class="jxr_linenumber" name="L120" href="#L120">120</a> 		check(<span class="jxr_string">"true"</span>, x.isTrimEmptyMaps());
 <a class="jxr_linenumber" name="L121" href="#L121">121</a> 		check(<span class="jxr_string">"false"</span>, x.isKeepNullProperties());
 <a class="jxr_linenumber" name="L122" href="#L122">122</a> 		check(<span class="jxr_string">"true"</span>, x.isTrimStrings());
-<a class="jxr_linenumber" name="L123" href="#L123">123</a> 		check(<span class="jxr_string">"{absoluteAuthority:'/',absoluteContextRoot:'/',absolutePathInfo:'/',absolutePathInfoParent:'/',absoluteServletPath:'/',absoluteServletPathParent:'/',rootRelativeContextRoot:'/',rootRelativePathInfo:'/',rootRelativePathInfoParent:'/',rootRelativeServletPath:'/',rootRelativeServletPathParent:'/'}"</span>, x.getUriContext());
+<a class="jxr_linenumber" name="L123" href="#L123">123</a> 		check(<span class="jxr_string">"{aContextRoot=/,aPathInfo=/,aServletPath=/,rContextRoot=/,rPath=/,rResource=/}"</span>, x.getUriContext());
 <a class="jxr_linenumber" name="L124" href="#L124">124</a> 		check(<span class="jxr_string">"RESOURCE"</span>, x.getUriRelativity());
 <a class="jxr_linenumber" name="L125" href="#L125">125</a> 		check(<span class="jxr_string">"ABSOLUTE"</span>, x.getUriResolution());
 <a class="jxr_linenumber" name="L126" href="#L126">126</a> 	}
@@ -141,7 +141,7 @@
 <a class="jxr_linenumber" name="L133" href="#L133">133</a> 	<strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> B {}
 <a class="jxr_linenumber" name="L134" href="#L134">134</a> 	<strong class="jxr_keyword">static</strong> ClassInfo b = ClassInfo.of(B.<strong class="jxr_keyword">class</strong>);
 <a class="jxr_linenumber" name="L135" href="#L135">135</a> 
-<a class="jxr_linenumber" name="L136" href="#L136">136</a> 	@Test <strong class="jxr_keyword">void</strong> noValuesWriterSerializer() {
+<a class="jxr_linenumber" name="L136" href="#L136">136</a> 	@Test <strong class="jxr_keyword">void</strong> b01_noValuesWriterSerializer() {
 <a class="jxr_linenumber" name="L137" href="#L137">137</a> 		<strong class="jxr_keyword">var</strong> al = AnnotationWorkList.of(sr, rstream(b.getAnnotations()));
 <a class="jxr_linenumber" name="L138" href="#L138">138</a> 		<strong class="jxr_keyword">var</strong> x = JsonSerializer.create().apply(al).build().getSession();
 <a class="jxr_linenumber" name="L139" href="#L139">139</a> 		check(<span class="jxr_string">"false"</span>, ((SerializerSession)x).isAddBeanTypes());
@@ -155,13 +155,13 @@
 <a class="jxr_linenumber" name="L147" href="#L147">147</a> 		check(<span class="jxr_string">"false"</span>, x.isTrimEmptyMaps());
 <a class="jxr_linenumber" name="L148" href="#L148">148</a> 		check(<span class="jxr_string">"false"</span>, x.isKeepNullProperties());
 <a class="jxr_linenumber" name="L149" href="#L149">149</a> 		check(<span class="jxr_string">"false"</span>, x.isTrimStrings());
-<a class="jxr_linenumber" name="L150" href="#L150">150</a> 		check(<span class="jxr_string">"{absoluteAuthority:'/',absoluteContextRoot:'/',absolutePathInfo:'/',absolutePathInfoParent:'/',absoluteServletPath:'/',absoluteServletPathParent:'/',rootRelativeContextRoot:'/',rootRelativePathInfo:'/',rootRelativePathInfoParent:'/',rootRelativeServletPath:'/',rootRelativeServletPathParent:'/'}"</span>, x.getUriContext());
+<a class="jxr_linenumber" name="L150" href="#L150">150</a> 		check(<span class="jxr_string">"{aContextRoot=/,aPathInfo=/,aServletPath=/,rContextRoot=/,rPath=/,rResource=/}"</span>, x.getUriContext());
 <a class="jxr_linenumber" name="L151" href="#L151">151</a> 		check(<span class="jxr_string">"RESOURCE"</span>, x.getUriRelativity());
 <a class="jxr_linenumber" name="L152" href="#L152">152</a> 		check(<span class="jxr_string">"NONE"</span>, x.getUriResolution());
 <a class="jxr_linenumber" name="L153" href="#L153">153</a> 		check(<span class="jxr_string">"false"</span>, x.isUseWhitespace());
 <a class="jxr_linenumber" name="L154" href="#L154">154</a> 	}
 <a class="jxr_linenumber" name="L155" href="#L155">155</a> 
-<a class="jxr_linenumber" name="L156" href="#L156">156</a> 	@Test <strong class="jxr_keyword">void</strong> noValuesOutputStreamSerializer() {
+<a class="jxr_linenumber" name="L156" href="#L156">156</a> 	@Test <strong class="jxr_keyword">void</strong> b02_noValuesOutputStreamSerializer() {
 <a class="jxr_linenumber" name="L157" href="#L157">157</a> 		<strong class="jxr_keyword">var</strong> al = AnnotationWorkList.of(sr, rstream(b.getAnnotations()));
 <a class="jxr_linenumber" name="L158" href="#L158">158</a> 		<strong class="jxr_keyword">var</strong> x = MsgPackSerializer.create().apply(al).build().getSession();
 <a class="jxr_linenumber" name="L159" href="#L159">159</a> 		check(<span class="jxr_string">"false"</span>, ((SerializerSession)x).isAddBeanTypes());
@@ -174,7 +174,7 @@
 <a class="jxr_linenumber" name="L166" href="#L166">166</a> 		check(<span class="jxr_string">"false"</span>, x.isTrimEmptyMaps());
 <a class="jxr_linenumber" name="L167" href="#L167">167</a> 		check(<span class="jxr_string">"false"</span>, x.isKeepNullProperties());
 <a class="jxr_linenumber" name="L168" href="#L168">168</a> 		check(<span class="jxr_string">"false"</span>, x.isTrimStrings());
-<a class="jxr_linenumber" name="L169" href="#L169">169</a> 		check(<span class="jxr_string">"{absoluteAuthority:'/',absoluteContextRoot:'/',absolutePathInfo:'/',absolutePathInfoParent:'/',absoluteServletPath:'/',absoluteServletPathParent:'/',rootRelativeContextRoot:'/',rootRelativePathInfo:'/',rootRelativePathInfoParent:'/',rootRelativeServletPath:'/',rootRelativeServletPathParent:'/'}"</span>, x.getUriContext());
+<a class="jxr_linenumber" name="L169" href="#L169">169</a> 		check(<span class="jxr_string">"{aContextRoot=/,aPathInfo=/,aServletPath=/,rContextRoot=/,rPath=/,rResource=/}"</span>, x.getUriContext());
 <a class="jxr_linenumber" name="L170" href="#L170">170</a> 		check(<span class="jxr_string">"RESOURCE"</span>, x.getUriRelativity());
 <a class="jxr_linenumber" name="L171" href="#L171">171</a> 		check(<span class="jxr_string">"NONE"</span>, x.getUriResolution());
 <a class="jxr_linenumber" name="L172" href="#L172">172</a> 	}
@@ -186,7 +186,7 @@
 <a class="jxr_linenumber" name="L178" href="#L178">178</a> 	<strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> C {}
 <a class="jxr_linenumber" name="L179" href="#L179">179</a> 	<strong class="jxr_keyword">static</strong> ClassInfo c = ClassInfo.of(C.<strong class="jxr_keyword">class</strong>);
 <a class="jxr_linenumber" name="L180" href="#L180">180</a> 
-<a class="jxr_linenumber" name="L181" href="#L181">181</a> 	@Test <strong class="jxr_keyword">void</strong> noAnnotationWriterSerializer() {
+<a class="jxr_linenumber" name="L181" href="#L181">181</a> 	@Test <strong class="jxr_keyword">void</strong> c01_noAnnotationWriterSerializer() {
 <a class="jxr_linenumber" name="L182" href="#L182">182</a> 		<strong class="jxr_keyword">var</strong> al = AnnotationWorkList.of(sr, rstream(c.getAnnotations()));
 <a class="jxr_linenumber" name="L183" href="#L183">183</a> 		<strong class="jxr_keyword">var</strong> x = JsonSerializer.create().apply(al).build().getSession();
 <a class="jxr_linenumber" name="L184" href="#L184">184</a> 		check(<span class="jxr_string">"false"</span>, ((SerializerSession)x).isAddBeanTypes());
@@ -200,13 +200,13 @@
 <a class="jxr_linenumber" name="L192" href="#L192">192</a> 		check(<span class="jxr_string">"false"</span>, x.isTrimEmptyMaps());
 <a class="jxr_linenumber" name="L193" href="#L193">193</a> 		check(<span class="jxr_string">"false"</span>, x.isKeepNullProperties());
 <a class="jxr_linenumber" name="L194" href="#L194">194</a> 		check(<span class="jxr_string">"false"</span>, x.isTrimStrings());
-<a class="jxr_linenumber" name="L195" href="#L195">195</a> 		check(<span class="jxr_string">"{absoluteAuthority:'/',absoluteContextRoot:'/',absolutePathInfo:'/',absolutePathInfoParent:'/',absoluteServletPath:'/',absoluteServletPathParent:'/',rootRelativeContextRoot:'/',rootRelativePathInfo:'/',rootRelativePathInfoParent:'/',rootRelativeServletPath:'/',rootRelativeServletPathParent:'/'}"</span>, x.getUriContext());
+<a class="jxr_linenumber" name="L195" href="#L195">195</a> 		check(<span class="jxr_string">"{aContextRoot=/,aPathInfo=/,aServletPath=/,rContextRoot=/,rPath=/,rResource=/}"</span>, x.getUriContext());
 <a class="jxr_linenumber" name="L196" href="#L196">196</a> 		check(<span class="jxr_string">"RESOURCE"</span>, x.getUriRelativity());
 <a class="jxr_linenumber" name="L197" href="#L197">197</a> 		check(<span class="jxr_string">"NONE"</span>, x.getUriResolution());
 <a class="jxr_linenumber" name="L198" href="#L198">198</a> 		check(<span class="jxr_string">"false"</span>, x.isUseWhitespace());
 <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> 	@Test <strong class="jxr_keyword">void</strong> noAnnotationOutputStreamSerializer() {
+<a class="jxr_linenumber" name="L201" href="#L201">201</a> 	@Test <strong class="jxr_keyword">void</strong> c02_noAnnotationOutputStreamSerializer() {
 <a class="jxr_linenumber" name="L202" href="#L202">202</a> 		<strong class="jxr_keyword">var</strong> al = AnnotationWorkList.of(sr, rstream(c.getAnnotations()));
 <a class="jxr_linenumber" name="L203" href="#L203">203</a> 		<strong class="jxr_keyword">var</strong> x = MsgPackSerializer.create().apply(al).build().getSession();
 <a class="jxr_linenumber" name="L204" href="#L204">204</a> 		check(<span class="jxr_string">"false"</span>, ((SerializerSession)x).isAddBeanTypes());
@@ -219,7 +219,7 @@
 <a class="jxr_linenumber" name="L211" href="#L211">211</a> 		check(<span class="jxr_string">"false"</span>, x.isTrimEmptyMaps());
 <a class="jxr_linenumber" name="L212" href="#L212">212</a> 		check(<span class="jxr_string">"false"</span>, x.isKeepNullProperties());
 <a class="jxr_linenumber" name="L213" href="#L213">213</a> 		check(<span class="jxr_string">"false"</span>, x.isTrimStrings());
-<a class="jxr_linenumber" name="L214" href="#L214">214</a> 		check(<span class="jxr_string">"{absoluteAuthority:'/',absoluteContextRoot:'/',absolutePathInfo:'/',absolutePathInfoParent:'/',absoluteServletPath:'/',absoluteServletPathParent:'/',rootRelativeContextRoot:'/',rootRelativePathInfo:'/',rootRelativePathInfoParent:'/',rootRelativeServletPath:'/',rootRelativeServletPathParent:'/'}"</span>, x.getUriContext());
+<a class="jxr_linenumber" name="L214" href="#L214">214</a> 		check(<span class="jxr_string">"{aContextRoot=/,aPathInfo=/,aServletPath=/,rContextRoot=/,rPath=/,rResource=/}"</span>, x.getUriContext());
 <a class="jxr_linenumber" name="L215" href="#L215">215</a> 		check(<span class="jxr_string">"RESOURCE"</span>, x.getUriRelativity());
 <a class="jxr_linenumber" name="L216" href="#L216">216</a> 		check(<span class="jxr_string">"NONE"</span>, x.getUriResolution());
 <a class="jxr_linenumber" name="L217" href="#L217">217</a> 	}
diff --git a/site/xref-test/org/apache/juneau/serializer/package-frame.html b/site/xref-test/org/apache/juneau/serializer/package-frame.html
index 352a0533dc..b4e1be58d6 100644
--- a/site/xref-test/org/apache/juneau/serializer/package-frame.html
+++ b/site/xref-test/org/apache/juneau/serializer/package-frame.html
@@ -40,19 +40,19 @@
                     <a href="ReaderObject_ComboSerializeTest.html#ReaderObject_ComboSerializeTest.BeanWithReaderNullField" target="classFrame">ReaderObject_ComboSerializeTest.BeanWithReaderNullField</a>
                 </li>
                 <li>
-                    <a href="SerializerConfigAnnotationTest.html#SerializerConfigAnnotationTest" target="classFrame">SerializerConfigAnnotationTest</a>
+                    <a href="SerializerConfigAnnotation_Test.html#SerializerConfigAnnotation_Test" target="classFrame">SerializerConfigAnnotation_Test</a>
                 </li>
                 <li>
-                    <a href="SerializerConfigAnnotationTest.html#SerializerConfigAnnotationTest.A" target="classFrame">SerializerConfigAnnotationTest.A</a>
+                    <a href="SerializerConfigAnnotation_Test.html#SerializerConfigAnnotation_Test.A" target="classFrame">SerializerConfigAnnotation_Test.A</a>
                 </li>
                 <li>
-                    <a href="SerializerConfigAnnotationTest.html#SerializerConfigAnnotationTest.AA" target="classFrame">SerializerConfigAnnotationTest.AA</a>
+                    <a href="SerializerConfigAnnotation_Test.html#SerializerConfigAnnotation_Test.AA" target="classFrame">SerializerConfigAnnotation_Test.AA</a>
                 </li>
                 <li>
-                    <a href="SerializerConfigAnnotationTest.html#SerializerConfigAnnotationTest.B" target="classFrame">SerializerConfigAnnotationTest.B</a>
+                    <a href="SerializerConfigAnnotation_Test.html#SerializerConfigAnnotation_Test.B" target="classFrame">SerializerConfigAnnotation_Test.B</a>
                 </li>
                 <li>
-                    <a href="SerializerConfigAnnotationTest.html#SerializerConfigAnnotationTest.C" target="classFrame">SerializerConfigAnnotationTest.C</a>
+                    <a href="SerializerConfigAnnotation_Test.html#SerializerConfigAnnotation_Test.C" target="classFrame">SerializerConfigAnnotation_Test.C</a>
                 </li>
                 <li>
                     <a href="SerializerSet_Test.html#SerializerSet_Test" target="classFrame">SerializerSet_Test</a>
diff --git a/site/xref-test/org/apache/juneau/serializer/package-summary.html b/site/xref-test/org/apache/juneau/serializer/package-summary.html
index 1503532d6a..47eac3e0d2 100644
--- a/site/xref-test/org/apache/juneau/serializer/package-summary.html
+++ b/site/xref-test/org/apache/juneau/serializer/package-summary.html
@@ -103,27 +103,27 @@
                             </tr>
                             <tr class="rowColor">
                                 <td class="colFirst colLast">
-                                    <a href="SerializerConfigAnnotationTest.html#SerializerConfigAnnotationTest" target="classFrame" title="class in org.apache.juneau.serializer">SerializerConfigAnnotationTest</a>
+                                    <a href="SerializerConfigAnnotation_Test.html#SerializerConfigAnnotation_Test" target="classFrame" title="class in org.apache.juneau.serializer">SerializerConfigAnnotation_Test</a>
                                 </td>
                             </tr>
                             <tr class="altColor">
                                 <td class="colFirst colLast">
-                                    <a href="SerializerConfigAnnotationTest.html#SerializerConfigAnnotationTest.A" target="classFrame" title="class in org.apache.juneau.serializer">SerializerConfigAnnotationTest.A</a>
+                                    <a href="SerializerConfigAnnotation_Test.html#SerializerConfigAnnotation_Test.A" target="classFrame" title="class in org.apache.juneau.serializer">SerializerConfigAnnotation_Test.A</a>
                                 </td>
                             </tr>
                             <tr class="rowColor">
                                 <td class="colFirst colLast">
-                                    <a href="SerializerConfigAnnotationTest.html#SerializerConfigAnnotationTest.AA" target="classFrame" title="class in org.apache.juneau.serializer">SerializerConfigAnnotationTest.AA</a>
+                                    <a href="SerializerConfigAnnotation_Test.html#SerializerConfigAnnotation_Test.AA" target="classFrame" title="class in org.apache.juneau.serializer">SerializerConfigAnnotation_Test.AA</a>
                                 </td>
                             </tr>
                             <tr class="altColor">
                                 <td class="colFirst colLast">
-                                    <a href="SerializerConfigAnnotationTest.html#SerializerConfigAnnotationTest.B" target="classFrame" title="class in org.apache.juneau.serializer">SerializerConfigAnnotationTest.B</a>
+                                    <a href="SerializerConfigAnnotation_Test.html#SerializerConfigAnnotation_Test.B" target="classFrame" title="class in org.apache.juneau.serializer">SerializerConfigAnnotation_Test.B</a>
                                 </td>
                             </tr>
                             <tr class="rowColor">
                                 <td class="colFirst colLast">
-                                    <a href="SerializerConfigAnnotationTest.html#SerializerConfigAnnotationTest.C" target="classFrame" title="class in org.apache.juneau.serializer">SerializerConfigAnnotationTest.C</a>
+                                    <a href="SerializerConfigAnnotation_Test.html#SerializerConfigAnnotation_Test.C" target="classFrame" title="class in org.apache.juneau.serializer">SerializerConfigAnnotation_Test.C</a>
                                 </td>
                             </tr>
                             <tr class="altColor">
diff --git a/site/xref-test/org/apache/juneau/utils/BeanDiffTest.html b/site/xref-test/org/apache/juneau/utils/BeanDiff_Test.html
similarity index 91%
rename from site/xref-test/org/apache/juneau/utils/BeanDiffTest.html
rename to site/xref-test/org/apache/juneau/utils/BeanDiff_Test.html
index 3f323f85dc..f5d45e4e14 100644
--- a/site/xref-test/org/apache/juneau/utils/BeanDiffTest.html
+++ b/site/xref-test/org/apache/juneau/utils/BeanDiff_Test.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="" lang="">
 <head><meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-<title>BeanDiffTest xref</title>
+<title>BeanDiff_Test xref</title>
 <link type="text/css" rel="stylesheet" href="../../../../stylesheet.css" />
 </head>
 <body>
-<div id="overview"><a href="../../../../../testapidocs/org/apache/juneau/utils/BeanDiffTest.html">View Javadoc</a></div><pre>
+<div id="overview"><a href="../../../../../testapidocs/org/apache/juneau/utils/BeanDiff_Test.html">View Javadoc</a></div><pre>
 <a class="jxr_linenumber" name="L1" href="#L1">1</a>   <em class="jxr_comment">/*</em>
 <a class="jxr_linenumber" name="L2" href="#L2">2</a>   <em class="jxr_comment"> * Licensed to the Apache Software Foundation (ASF) under one or more</em>
 <a class="jxr_linenumber" name="L3" href="#L3">3</a>   <em class="jxr_comment"> * contributor license agreements.  See the NOTICE file distributed with</em>
@@ -30,7 +30,7 @@
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> org.junit.jupiter.api.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
-<a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">class</strong> <a name="BeanDiffTest" href="../../../../org/apache/juneau/utils/BeanDiffTest.html#BeanDiffTest">BeanDiffTest</a> <strong class="jxr_keyword">extends</strong> <a name="TestBase" href="../../../../org/apache/juneau/TestBase.html#TestBase">TestBase</a> {
+<a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">class</strong> <a name="BeanDiff_Test" href="../../../../org/apache/juneau/utils/BeanDiff_Test.html#BeanDiff_Test">BeanDiff_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="L26" href="#L26">26</a>  
 <a class="jxr_linenumber" name="L27" href="#L27">27</a>  	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> A {
 <a class="jxr_linenumber" name="L28" href="#L28">28</a>  		<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> f1;
@@ -47,67 +47,67 @@
 <a class="jxr_linenumber" name="L39" href="#L39">39</a>  	@Test <strong class="jxr_keyword">void</strong> a01_same() {
 <a class="jxr_linenumber" name="L40" href="#L40">40</a>  		<strong class="jxr_keyword">var</strong> bd = BeanDiff.create(A.create(1, <span class="jxr_string">"a"</span>), A.create(1, <span class="jxr_string">"a"</span>)).build();
 <a class="jxr_linenumber" name="L41" href="#L41">41</a>  		assertFalse(bd.hasDiffs());
-<a class="jxr_linenumber" name="L42" href="#L42">42</a>  		assertEquals(<span class="jxr_string">"{v1:{},v2:{}}"</span>, bd.toString());
+<a class="jxr_linenumber" name="L42" href="#L42">42</a>  		assertEquals(<span class="jxr_string">"{v1={},v2={}}"</span>, bd.toString());
 <a class="jxr_linenumber" name="L43" href="#L43">43</a>  	}
 <a class="jxr_linenumber" name="L44" href="#L44">44</a>  
 <a class="jxr_linenumber" name="L45" href="#L45">45</a>  	@Test <strong class="jxr_keyword">void</strong> a02_different() {
 <a class="jxr_linenumber" name="L46" href="#L46">46</a>  		<strong class="jxr_keyword">var</strong> bd = BeanDiff.create(A.create(1, <span class="jxr_string">"a"</span>), A.create(2, <span class="jxr_string">"b"</span>)).build();
 <a class="jxr_linenumber" name="L47" href="#L47">47</a>  		assertTrue(bd.hasDiffs());
-<a class="jxr_linenumber" name="L48" href="#L48">48</a>  		assertEquals(<span class="jxr_string">"{v1:{f1:1,f2:'a'},v2:{f1:2,f2:'b'}}"</span>, bd.toString());
+<a class="jxr_linenumber" name="L48" href="#L48">48</a>  		assertEquals(<span class="jxr_string">"{v1={f1=1,f2=a},v2={f1=2,f2=b}}"</span>, bd.toString());
 <a class="jxr_linenumber" name="L49" href="#L49">49</a>  	}
 <a class="jxr_linenumber" name="L50" href="#L50">50</a>  
 <a class="jxr_linenumber" name="L51" href="#L51">51</a>  	@Test <strong class="jxr_keyword">void</strong> a03_firstNull() {
 <a class="jxr_linenumber" name="L52" href="#L52">52</a>  		<strong class="jxr_keyword">var</strong> bd = BeanDiff.create(<strong class="jxr_keyword">null</strong>, A.create(2, <span class="jxr_string">"b"</span>)).build();
 <a class="jxr_linenumber" name="L53" href="#L53">53</a>  		assertTrue(bd.hasDiffs());
-<a class="jxr_linenumber" name="L54" href="#L54">54</a>  		assertEquals(<span class="jxr_string">"{v1:{},v2:{f1:2,f2:'b'}}"</span>, bd.toString());
+<a class="jxr_linenumber" name="L54" href="#L54">54</a>  		assertEquals(<span class="jxr_string">"{v1={},v2={f1=2,f2=b}}"</span>, bd.toString());
 <a class="jxr_linenumber" name="L55" href="#L55">55</a>  	}
 <a class="jxr_linenumber" name="L56" href="#L56">56</a>  
 <a class="jxr_linenumber" name="L57" href="#L57">57</a>  	@Test <strong class="jxr_keyword">void</strong> a04_secondNull() {
 <a class="jxr_linenumber" name="L58" href="#L58">58</a>  		<strong class="jxr_keyword">var</strong> bd = BeanDiff.create(A.create(1, <span class="jxr_string">"a"</span>), <strong class="jxr_keyword">null</strong>).build();
 <a class="jxr_linenumber" name="L59" href="#L59">59</a>  		assertTrue(bd.hasDiffs());
-<a class="jxr_linenumber" name="L60" href="#L60">60</a>  		assertEquals(<span class="jxr_string">"{v1:{f1:1,f2:'a'},v2:{}}"</span>, bd.toString());
+<a class="jxr_linenumber" name="L60" href="#L60">60</a>  		assertEquals(<span class="jxr_string">"{v1={f1=1,f2=a},v2={}}"</span>, bd.toString());
 <a class="jxr_linenumber" name="L61" href="#L61">61</a>  	}
 <a class="jxr_linenumber" name="L62" href="#L62">62</a>  
 <a class="jxr_linenumber" name="L63" href="#L63">63</a>  	@Test <strong class="jxr_keyword">void</strong> a05_bothNull() {
 <a class="jxr_linenumber" name="L64" href="#L64">64</a>  		<strong class="jxr_keyword">var</strong> bd = BeanDiff.create(<strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>).build();
 <a class="jxr_linenumber" name="L65" href="#L65">65</a>  		assertFalse(bd.hasDiffs());
-<a class="jxr_linenumber" name="L66" href="#L66">66</a>  		assertEquals(<span class="jxr_string">"{v1:{},v2:{}}"</span>, bd.toString());
+<a class="jxr_linenumber" name="L66" href="#L66">66</a>  		assertEquals(<span class="jxr_string">"{v1={},v2={}}"</span>, bd.toString());
 <a class="jxr_linenumber" name="L67" href="#L67">67</a>  	}
 <a class="jxr_linenumber" name="L68" href="#L68">68</a>  
 <a class="jxr_linenumber" name="L69" href="#L69">69</a>  	@Test <strong class="jxr_keyword">void</strong> a06_nullFields() {
 <a class="jxr_linenumber" name="L70" href="#L70">70</a>  		<strong class="jxr_keyword">var</strong> bd = BeanDiff.create(A.create(1, <strong class="jxr_keyword">null</strong>), A.create(2, <span class="jxr_string">"b"</span>)).build();
 <a class="jxr_linenumber" name="L71" href="#L71">71</a>  		assertTrue(bd.hasDiffs());
-<a class="jxr_linenumber" name="L72" href="#L72">72</a>  		assertEquals(<span class="jxr_string">"{v1:{f1:1},v2:{f1:2,f2:'b'}}"</span>, bd.toString());
+<a class="jxr_linenumber" name="L72" href="#L72">72</a>  		assertEquals(<span class="jxr_string">"{v1={f1=1},v2={f1=2,f2=b}}"</span>, bd.toString());
 <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 <strong class="jxr_keyword">void</strong> a07_includes() {
 <a class="jxr_linenumber" name="L76" href="#L76">76</a>  		<strong class="jxr_keyword">var</strong> bd = BeanDiff.create(A.create(1, <strong class="jxr_keyword">null</strong>), A.create(2, <span class="jxr_string">"b"</span>)).include(<span class="jxr_string">"f1"</span>).build();
 <a class="jxr_linenumber" name="L77" href="#L77">77</a>  		assertTrue(bd.hasDiffs());
-<a class="jxr_linenumber" name="L78" href="#L78">78</a>  		assertEquals(<span class="jxr_string">"{v1:{f1:1},v2:{f1:2}}"</span>, bd.toString());
+<a class="jxr_linenumber" name="L78" href="#L78">78</a>  		assertEquals(<span class="jxr_string">"{v1={f1=1},v2={f1=2}}"</span>, bd.toString());
 <a class="jxr_linenumber" name="L79" href="#L79">79</a>  	}
 <a class="jxr_linenumber" name="L80" href="#L80">80</a>  
 <a class="jxr_linenumber" name="L81" href="#L81">81</a>  	@Test <strong class="jxr_keyword">void</strong> a08_includesSet() {
 <a class="jxr_linenumber" name="L82" href="#L82">82</a>  		<strong class="jxr_keyword">var</strong> bd = BeanDiff.create(A.create(1, <strong class="jxr_keyword">null</strong>), A.create(2, <span class="jxr_string">"b"</span>)).include(set(<span class="jxr_string">"f1"</span>)).build();
 <a class="jxr_linenumber" name="L83" href="#L83">83</a>  		assertTrue(bd.hasDiffs());
-<a class="jxr_linenumber" name="L84" href="#L84">84</a>  		assertEquals(<span class="jxr_string">"{v1:{f1:1},v2:{f1:2}}"</span>, bd.toString());
+<a class="jxr_linenumber" name="L84" href="#L84">84</a>  		assertEquals(<span class="jxr_string">"{v1={f1=1},v2={f1=2}}"</span>, bd.toString());
 <a class="jxr_linenumber" name="L85" href="#L85">85</a>  	}
 <a class="jxr_linenumber" name="L86" href="#L86">86</a>  
 <a class="jxr_linenumber" name="L87" href="#L87">87</a>  	@Test <strong class="jxr_keyword">void</strong> a09_excludes() {
 <a class="jxr_linenumber" name="L88" href="#L88">88</a>  		<strong class="jxr_keyword">var</strong> bd = BeanDiff.create(A.create(1, <strong class="jxr_keyword">null</strong>), A.create(2, <span class="jxr_string">"b"</span>)).exclude(<span class="jxr_string">"f2"</span>).build();
 <a class="jxr_linenumber" name="L89" href="#L89">89</a>  		assertTrue(bd.hasDiffs());
-<a class="jxr_linenumber" name="L90" href="#L90">90</a>  		assertEquals(<span class="jxr_string">"{v1:{f1:1},v2:{f1:2}}"</span>, bd.toString());
+<a class="jxr_linenumber" name="L90" href="#L90">90</a>  		assertEquals(<span class="jxr_string">"{v1={f1=1},v2={f1=2}}"</span>, bd.toString());
 <a class="jxr_linenumber" name="L91" href="#L91">91</a>  	}
 <a class="jxr_linenumber" name="L92" href="#L92">92</a>  
 <a class="jxr_linenumber" name="L93" href="#L93">93</a>  	@Test <strong class="jxr_keyword">void</strong> a10_excludesSet() {
 <a class="jxr_linenumber" name="L94" href="#L94">94</a>  		<strong class="jxr_keyword">var</strong> bd = BeanDiff.create(A.create(1, <strong class="jxr_keyword">null</strong>), A.create(2, <span class="jxr_string">"b"</span>)).exclude(set(<span class="jxr_string">"f2"</span>)).build();
 <a class="jxr_linenumber" name="L95" href="#L95">95</a>  		assertTrue(bd.hasDiffs());
-<a class="jxr_linenumber" name="L96" href="#L96">96</a>  		assertEquals(<span class="jxr_string">"{v1:{f1:1},v2:{f1:2}}"</span>, bd.toString());
+<a class="jxr_linenumber" name="L96" href="#L96">96</a>  		assertEquals(<span class="jxr_string">"{v1={f1=1},v2={f1=2}}"</span>, bd.toString());
 <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 <strong class="jxr_keyword">void</strong> a11_differentBeanContext() {
 <a class="jxr_linenumber" name="L100" href="#L100">100</a> 		<strong class="jxr_keyword">var</strong> bd = BeanDiff.create(A.create(1, <strong class="jxr_keyword">null</strong>), A.create(2, <span class="jxr_string">"b"</span>)).beanContext(BeanContext.DEFAULT_SORTED).build();
 <a class="jxr_linenumber" name="L101" href="#L101">101</a> 		assertTrue(bd.hasDiffs());
-<a class="jxr_linenumber" name="L102" href="#L102">102</a> 		assertEquals(<span class="jxr_string">"{v1:{f1:1},v2:{f1:2,f2:'b'}}"</span>, bd.toString());
+<a class="jxr_linenumber" name="L102" href="#L102">102</a> 		assertEquals(<span class="jxr_string">"{v1={f1=1},v2={f1=2,f2=b}}"</span>, bd.toString());
 <a class="jxr_linenumber" name="L103" href="#L103">103</a> 	}
 <a class="jxr_linenumber" name="L104" href="#L104">104</a> }
 </pre>
diff --git a/site/xref-test/org/apache/juneau/utils/package-frame.html b/site/xref-test/org/apache/juneau/utils/package-frame.html
index 44283904ec..5309673b52 100644
--- a/site/xref-test/org/apache/juneau/utils/package-frame.html
+++ b/site/xref-test/org/apache/juneau/utils/package-frame.html
@@ -13,10 +13,10 @@
             <h2 title="Classes">Classes</h2>
             <ul title="Classes">
                 <li>
-                    <a href="BeanDiffTest.html#BeanDiffTest" target="classFrame">BeanDiffTest</a>
+                    <a href="BeanDiff_Test.html#BeanDiff_Test" target="classFrame">BeanDiff_Test</a>
                 </li>
                 <li>
-                    <a href="BeanDiffTest.html#BeanDiffTest.A" target="classFrame">BeanDiffTest.A</a>
+                    <a href="BeanDiff_Test.html#BeanDiff_Test.A" target="classFrame">BeanDiff_Test.A</a>
                 </li>
                 <li>
                     <a href="FilteredMapTest.html#FilteredMapTest" target="classFrame">FilteredMapTest</a>
diff --git a/site/xref-test/org/apache/juneau/utils/package-summary.html b/site/xref-test/org/apache/juneau/utils/package-summary.html
index 0d0f3c5c9e..f1c1282be8 100644
--- a/site/xref-test/org/apache/juneau/utils/package-summary.html
+++ b/site/xref-test/org/apache/juneau/utils/package-summary.html
@@ -58,12 +58,12 @@
                         <tbody>
                             <tr class="altColor">
                                 <td class="colFirst colLast">
-                                    <a href="BeanDiffTest.html#BeanDiffTest" target="classFrame" title="class in org.apache.juneau.utils">BeanDiffTest</a>
+                                    <a href="BeanDiff_Test.html#BeanDiff_Test" target="classFrame" title="class in org.apache.juneau.utils">BeanDiff_Test</a>
                                 </td>
                             </tr>
                             <tr class="rowColor">
                                 <td class="colFirst colLast">
-                                    <a href="BeanDiffTest.html#BeanDiffTest.A" target="classFrame" title="class in org.apache.juneau.utils">BeanDiffTest.A</a>
+                                    <a href="BeanDiff_Test.html#BeanDiff_Test.A" target="classFrame" title="class in org.apache.juneau.utils">BeanDiff_Test.A</a>
                                 </td>
                             </tr>
                             <tr class="altColor">
diff --git a/site/xref/org/apache/juneau/BeanMeta.html b/site/xref/org/apache/juneau/BeanMeta.html
index 167f3e43f8..0ec88f3a27 100644
--- a/site/xref/org/apache/juneau/BeanMeta.html
+++ b/site/xref/org/apache/juneau/BeanMeta.html
@@ -756,628 +756,632 @@
 <a class="jxr_linenumber" name="L748" href="#L748">748</a> 		<strong class="jxr_keyword">return</strong> beanFilter == <strong class="jxr_keyword">null</strong> ? value : beanFilter.writeProperty(bean, name, value);
 <a class="jxr_linenumber" name="L749" href="#L749">749</a> 	}
 <a class="jxr_linenumber" name="L750" href="#L750">750</a> 
-<a class="jxr_linenumber" name="L751" href="#L751">751</a> 	@Override <em class="jxr_comment">/* Overridden from Object */</em>
-<a class="jxr_linenumber" name="L752" href="#L752">752</a> 	<strong class="jxr_keyword">public</strong> String toString() {
-<a class="jxr_linenumber" name="L753" href="#L753">753</a> 		<strong class="jxr_keyword">var</strong> sb = <strong class="jxr_keyword">new</strong> StringBuilder(classMeta.getName());
-<a class="jxr_linenumber" name="L754" href="#L754">754</a> 		sb.append(<span class="jxr_string">" {\n"</span>);
-<a class="jxr_linenumber" name="L755" href="#L755">755</a> 		properties.values().forEach(x -&gt; sb.append('\t').append(x.toString()).append(<span class="jxr_string">",\n"</span>));
-<a class="jxr_linenumber" name="L756" href="#L756">756</a> 		sb.append('}');
-<a class="jxr_linenumber" name="L757" href="#L757">757</a> 		<strong class="jxr_keyword">return</strong> sb.toString();
-<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_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L761" href="#L761">761</a> <em class="jxr_javadoccomment">	 * Returns the bean context that created this metadata object.</em>
-<a class="jxr_linenumber" name="L762" href="#L762">762</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L763" href="#L763">763</a> <em class="jxr_javadoccomment">	 * @return The bean context.</em>
-<a class="jxr_linenumber" name="L764" href="#L764">764</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L765" href="#L765">765</a> 	<strong class="jxr_keyword">protected</strong> BeanContext getBeanContext() { <strong class="jxr_keyword">return</strong> beanContext; }
-<a class="jxr_linenumber" name="L766" href="#L766">766</a> 
-<a class="jxr_linenumber" name="L767" href="#L767">767</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L768" href="#L768">768</a> <em class="jxr_javadoccomment">	 * Returns the constructor for this bean, if one was found.</em>
-<a class="jxr_linenumber" name="L769" href="#L769">769</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L770" href="#L770">770</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L771" href="#L771">771</a> <em class="jxr_javadoccomment">	 * The constructor is determined by {@link #findBeanConstructor()} and may be:</em>
-<a class="jxr_linenumber" name="L772" href="#L772">772</a> <em class="jxr_javadoccomment">	 * &lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L773" href="#L773">773</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;A constructor annotated with {@link Beanc @Beanc}</em>
-<a class="jxr_linenumber" name="L774" href="#L774">774</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;An implementation class constructor (if provided)</em>
-<a class="jxr_linenumber" name="L775" href="#L775">775</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;A no-argument constructor</em>
-<a class="jxr_linenumber" name="L776" href="#L776">776</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;&lt;jk&gt;null&lt;/jk&gt; if no suitable constructor was found</em>
-<a class="jxr_linenumber" name="L777" href="#L777">777</a> <em class="jxr_javadoccomment">	 * &lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L778" href="#L778">778</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L779" href="#L779">779</a> <em class="jxr_javadoccomment">	 * @return The constructor for this bean, or &lt;jk&gt;null&lt;/jk&gt; if no constructor is available.</em>
-<a class="jxr_linenumber" name="L780" href="#L780">780</a> <em class="jxr_javadoccomment">	 * @see #getConstructorArgs()</em>
-<a class="jxr_linenumber" name="L781" href="#L781">781</a> <em class="jxr_javadoccomment">	 * @see #hasConstructor()</em>
-<a class="jxr_linenumber" name="L782" href="#L782">782</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L783" href="#L783">783</a> 	<strong class="jxr_keyword">protected</strong> <a name="ConstructorInfo" href="../../../org/apache/juneau/commons/reflect/ConstructorInfo.html#ConstructorInfo">ConstructorInfo</a> getConstructor() {
-<a class="jxr_linenumber" name="L784" href="#L784">784</a> 		<strong class="jxr_keyword">return</strong> beanConstructor.constructor().orElse(<strong class="jxr_keyword">null</strong>);
-<a class="jxr_linenumber" name="L785" href="#L785">785</a> 	}
-<a class="jxr_linenumber" name="L786" href="#L786">786</a> 
-<a class="jxr_linenumber" name="L787" href="#L787">787</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L788" href="#L788">788</a> <em class="jxr_javadoccomment">	 * Returns the list of property names that correspond to the constructor parameters.</em>
-<a class="jxr_linenumber" name="L789" href="#L789">789</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L790" href="#L790">790</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L791" href="#L791">791</a> <em class="jxr_javadoccomment">	 * The property names are in the same order as the constructor parameters. These names are used to map</em>
-<a class="jxr_linenumber" name="L792" href="#L792">792</a> <em class="jxr_javadoccomment">	 * parsed property values to constructor arguments when creating bean instances.</em>
+<a class="jxr_linenumber" name="L751" href="#L751">751</a> 	<strong class="jxr_keyword">protected</strong> FluentMap&lt;String,Object&gt; properties() {
+<a class="jxr_linenumber" name="L752" href="#L752">752</a> 		<em class="jxr_comment">// @formatter:off</em>
+<a class="jxr_linenumber" name="L753" href="#L753">753</a> 		<strong class="jxr_keyword">return</strong> filteredBeanPropertyMap()
+<a class="jxr_linenumber" name="L754" href="#L754">754</a> 			.a(<span class="jxr_string">"class"</span>, classMeta.getName())
+<a class="jxr_linenumber" name="L755" href="#L755">755</a> 			.a(<span class="jxr_string">"properties"</span>, properties);
+<a class="jxr_linenumber" name="L756" href="#L756">756</a> 		<em class="jxr_comment">// @formatter:on</em>
+<a class="jxr_linenumber" name="L757" href="#L757">757</a> 	}
+<a class="jxr_linenumber" name="L758" href="#L758">758</a> 
+<a class="jxr_linenumber" name="L759" href="#L759">759</a> 	@Override <em class="jxr_comment">/* Overridden from Object */</em>
+<a class="jxr_linenumber" name="L760" href="#L760">760</a> 	<strong class="jxr_keyword">public</strong> String toString() {
+<a class="jxr_linenumber" name="L761" href="#L761">761</a> 		<strong class="jxr_keyword">return</strong> r(properties());
+<a class="jxr_linenumber" name="L762" href="#L762">762</a> 	}
+<a class="jxr_linenumber" name="L763" href="#L763">763</a> 
+<a class="jxr_linenumber" name="L764" href="#L764">764</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L765" href="#L765">765</a> <em class="jxr_javadoccomment">	 * Returns the bean context that created this metadata object.</em>
+<a class="jxr_linenumber" name="L766" href="#L766">766</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L767" href="#L767">767</a> <em class="jxr_javadoccomment">	 * @return The bean context.</em>
+<a class="jxr_linenumber" name="L768" href="#L768">768</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L769" href="#L769">769</a> 	<strong class="jxr_keyword">protected</strong> BeanContext getBeanContext() { <strong class="jxr_keyword">return</strong> beanContext; }
+<a class="jxr_linenumber" name="L770" href="#L770">770</a> 
+<a class="jxr_linenumber" name="L771" href="#L771">771</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L772" href="#L772">772</a> <em class="jxr_javadoccomment">	 * Returns the constructor for this bean, if one was found.</em>
+<a class="jxr_linenumber" name="L773" href="#L773">773</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L774" href="#L774">774</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L775" href="#L775">775</a> <em class="jxr_javadoccomment">	 * The constructor is determined by {@link #findBeanConstructor()} and may be:</em>
+<a class="jxr_linenumber" name="L776" href="#L776">776</a> <em class="jxr_javadoccomment">	 * &lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L777" href="#L777">777</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;A constructor annotated with {@link Beanc @Beanc}</em>
+<a class="jxr_linenumber" name="L778" href="#L778">778</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;An implementation class constructor (if provided)</em>
+<a class="jxr_linenumber" name="L779" href="#L779">779</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;A no-argument constructor</em>
+<a class="jxr_linenumber" name="L780" href="#L780">780</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;&lt;jk&gt;null&lt;/jk&gt; if no suitable constructor was found</em>
+<a class="jxr_linenumber" name="L781" href="#L781">781</a> <em class="jxr_javadoccomment">	 * &lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L782" href="#L782">782</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L783" href="#L783">783</a> <em class="jxr_javadoccomment">	 * @return The constructor for this bean, or &lt;jk&gt;null&lt;/jk&gt; if no constructor is available.</em>
+<a class="jxr_linenumber" name="L784" href="#L784">784</a> <em class="jxr_javadoccomment">	 * @see #getConstructorArgs()</em>
+<a class="jxr_linenumber" name="L785" href="#L785">785</a> <em class="jxr_javadoccomment">	 * @see #hasConstructor()</em>
+<a class="jxr_linenumber" name="L786" href="#L786">786</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L787" href="#L787">787</a> 	<strong class="jxr_keyword">protected</strong> <a name="ConstructorInfo" href="../../../org/apache/juneau/commons/reflect/ConstructorInfo.html#ConstructorInfo">ConstructorInfo</a> getConstructor() {
+<a class="jxr_linenumber" name="L788" href="#L788">788</a> 		<strong class="jxr_keyword">return</strong> beanConstructor.constructor().orElse(<strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="L789" href="#L789">789</a> 	}
+<a class="jxr_linenumber" name="L790" href="#L790">790</a> 
+<a class="jxr_linenumber" name="L791" href="#L791">791</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L792" href="#L792">792</a> <em class="jxr_javadoccomment">	 * Returns the list of property names that correspond to the constructor parameters.</em>
 <a class="jxr_linenumber" name="L793" href="#L793">793</a> <em class="jxr_javadoccomment">	 *</em>
 <a class="jxr_linenumber" name="L794" href="#L794">794</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L795" href="#L795">795</a> <em class="jxr_javadoccomment">	 * The property names are determined from:</em>
-<a class="jxr_linenumber" name="L796" href="#L796">796</a> <em class="jxr_javadoccomment">	 * &lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L797" href="#L797">797</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;The {@link Beanc#properties() properties()} value in the {@link Beanc @Beanc} annotation (if present)</em>
-<a class="jxr_linenumber" name="L798" href="#L798">798</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;Otherwise, the parameter names from the constructor (if available in bytecode)</em>
-<a class="jxr_linenumber" name="L799" href="#L799">799</a> <em class="jxr_javadoccomment">	 * &lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L800" href="#L800">800</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L801" href="#L801">801</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L802" href="#L802">802</a> <em class="jxr_javadoccomment">	 * If the bean has no constructor or uses a no-argument constructor, this list will be empty.</em>
-<a class="jxr_linenumber" name="L803" href="#L803">803</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L804" href="#L804">804</a> <em class="jxr_javadoccomment">	 * @return A list of property names corresponding to constructor parameters, in parameter order.</em>
-<a class="jxr_linenumber" name="L805" href="#L805">805</a> <em class="jxr_javadoccomment">	 * @see #getConstructor()</em>
-<a class="jxr_linenumber" name="L806" href="#L806">806</a> <em class="jxr_javadoccomment">	 * @see #hasConstructor()</em>
-<a class="jxr_linenumber" name="L807" href="#L807">807</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L808" href="#L808">808</a> 	<strong class="jxr_keyword">protected</strong> List&lt;String&gt; getConstructorArgs() {
-<a class="jxr_linenumber" name="L809" href="#L809">809</a> 		<strong class="jxr_keyword">return</strong> beanConstructor.args();
-<a class="jxr_linenumber" name="L810" href="#L810">810</a> 	}
-<a class="jxr_linenumber" name="L811" href="#L811">811</a> 
-<a class="jxr_linenumber" name="L812" href="#L812">812</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L813" href="#L813">813</a> <em class="jxr_javadoccomment">	 * Returns the "extras" property for dynamic bean properties.</em>
-<a class="jxr_linenumber" name="L814" href="#L814">814</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L815" href="#L815">815</a> <em class="jxr_javadoccomment">	 * @return The dynamic property, or &lt;jk&gt;null&lt;/jk&gt; if not present.</em>
-<a class="jxr_linenumber" name="L816" href="#L816">816</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L817" href="#L817">817</a> 	<strong class="jxr_keyword">protected</strong> BeanPropertyMeta getDynaProperty() { <strong class="jxr_keyword">return</strong> dynaProperty; }
-<a class="jxr_linenumber" name="L818" href="#L818">818</a> 
-<a class="jxr_linenumber" name="L819" href="#L819">819</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L820" href="#L820">820</a> <em class="jxr_javadoccomment">	 * Returns the map of getter methods to property names.</em>
-<a class="jxr_linenumber" name="L821" href="#L821">821</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L822" href="#L822">822</a> <em class="jxr_javadoccomment">	 * @return The getter properties map.</em>
-<a class="jxr_linenumber" name="L823" href="#L823">823</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L824" href="#L824">824</a> 	<strong class="jxr_keyword">protected</strong> Map&lt;Method,String&gt; getGetterProps() { <strong class="jxr_keyword">return</strong> getterProps; }
-<a class="jxr_linenumber" name="L825" href="#L825">825</a> 
-<a class="jxr_linenumber" name="L826" href="#L826">826</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L827" href="#L827">827</a> <em class="jxr_javadoccomment">	 * Returns the map of hidden properties on this bean.</em>
-<a class="jxr_linenumber" name="L828" href="#L828">828</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L829" href="#L829">829</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L830" href="#L830">830</a> <em class="jxr_javadoccomment">	 * Hidden properties are properties that exist on the bean but are not included in the normal property list.</em>
-<a class="jxr_linenumber" name="L831" href="#L831">831</a> <em class="jxr_javadoccomment">	 * These properties are typically excluded from serialization but may still be accessible programmatically.</em>
+<a class="jxr_linenumber" name="L795" href="#L795">795</a> <em class="jxr_javadoccomment">	 * The property names are in the same order as the constructor parameters. These names are used to map</em>
+<a class="jxr_linenumber" name="L796" href="#L796">796</a> <em class="jxr_javadoccomment">	 * parsed property values to constructor arguments when creating bean instances.</em>
+<a class="jxr_linenumber" name="L797" href="#L797">797</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L798" href="#L798">798</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L799" href="#L799">799</a> <em class="jxr_javadoccomment">	 * The property names are determined from:</em>
+<a class="jxr_linenumber" name="L800" href="#L800">800</a> <em class="jxr_javadoccomment">	 * &lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L801" href="#L801">801</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;The {@link Beanc#properties() properties()} value in the {@link Beanc @Beanc} annotation (if present)</em>
+<a class="jxr_linenumber" name="L802" href="#L802">802</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;Otherwise, the parameter names from the constructor (if available in bytecode)</em>
+<a class="jxr_linenumber" name="L803" href="#L803">803</a> <em class="jxr_javadoccomment">	 * &lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L804" href="#L804">804</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L805" href="#L805">805</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L806" href="#L806">806</a> <em class="jxr_javadoccomment">	 * If the bean has no constructor or uses a no-argument constructor, this list will be empty.</em>
+<a class="jxr_linenumber" name="L807" href="#L807">807</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L808" href="#L808">808</a> <em class="jxr_javadoccomment">	 * @return A list of property names corresponding to constructor parameters, in parameter order.</em>
+<a class="jxr_linenumber" name="L809" href="#L809">809</a> <em class="jxr_javadoccomment">	 * @see #getConstructor()</em>
+<a class="jxr_linenumber" name="L810" href="#L810">810</a> <em class="jxr_javadoccomment">	 * @see #hasConstructor()</em>
+<a class="jxr_linenumber" name="L811" href="#L811">811</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L812" href="#L812">812</a> 	<strong class="jxr_keyword">protected</strong> List&lt;String&gt; getConstructorArgs() {
+<a class="jxr_linenumber" name="L813" href="#L813">813</a> 		<strong class="jxr_keyword">return</strong> beanConstructor.args();
+<a class="jxr_linenumber" name="L814" href="#L814">814</a> 	}
+<a class="jxr_linenumber" name="L815" href="#L815">815</a> 
+<a class="jxr_linenumber" name="L816" href="#L816">816</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L817" href="#L817">817</a> <em class="jxr_javadoccomment">	 * Returns the "extras" property for dynamic bean properties.</em>
+<a class="jxr_linenumber" name="L818" href="#L818">818</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L819" href="#L819">819</a> <em class="jxr_javadoccomment">	 * @return The dynamic property, or &lt;jk&gt;null&lt;/jk&gt; if not present.</em>
+<a class="jxr_linenumber" name="L820" href="#L820">820</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L821" href="#L821">821</a> 	<strong class="jxr_keyword">protected</strong> BeanPropertyMeta getDynaProperty() { <strong class="jxr_keyword">return</strong> dynaProperty; }
+<a class="jxr_linenumber" name="L822" href="#L822">822</a> 
+<a class="jxr_linenumber" name="L823" href="#L823">823</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L824" href="#L824">824</a> <em class="jxr_javadoccomment">	 * Returns the map of getter methods to property names.</em>
+<a class="jxr_linenumber" name="L825" href="#L825">825</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L826" href="#L826">826</a> <em class="jxr_javadoccomment">	 * @return The getter properties map.</em>
+<a class="jxr_linenumber" name="L827" href="#L827">827</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L828" href="#L828">828</a> 	<strong class="jxr_keyword">protected</strong> Map&lt;Method,String&gt; getGetterProps() { <strong class="jxr_keyword">return</strong> getterProps; }
+<a class="jxr_linenumber" name="L829" href="#L829">829</a> 
+<a class="jxr_linenumber" name="L830" href="#L830">830</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L831" href="#L831">831</a> <em class="jxr_javadoccomment">	 * Returns the map of hidden properties on this bean.</em>
 <a class="jxr_linenumber" name="L832" href="#L832">832</a> <em class="jxr_javadoccomment">	 *</em>
 <a class="jxr_linenumber" name="L833" href="#L833">833</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L834" href="#L834">834</a> <em class="jxr_javadoccomment">	 * Hidden properties can be defined through:</em>
-<a class="jxr_linenumber" name="L835" href="#L835">835</a> <em class="jxr_javadoccomment">	 * &lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L836" href="#L836">836</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;{@link BeanFilter#getExcludeProperties() Bean filter exclude properties}</em>
-<a class="jxr_linenumber" name="L837" href="#L837">837</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;Properties that fail validation during bean metadata creation</em>
-<a class="jxr_linenumber" name="L838" href="#L838">838</a> <em class="jxr_javadoccomment">	 * &lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L839" href="#L839">839</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L840" href="#L840">840</a> <em class="jxr_javadoccomment">	 * @return A map of hidden property names to their metadata. The map is unmodifiable.</em>
-<a class="jxr_linenumber" name="L841" href="#L841">841</a> <em class="jxr_javadoccomment">	 * @see #getProperties()</em>
-<a class="jxr_linenumber" name="L842" href="#L842">842</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L843" href="#L843">843</a> 	<strong class="jxr_keyword">protected</strong> Map&lt;String,BeanPropertyMeta&gt; getHiddenProperties() {
-<a class="jxr_linenumber" name="L844" href="#L844">844</a> 		<strong class="jxr_keyword">return</strong> hiddenProperties;
-<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> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L848" href="#L848">848</a> <em class="jxr_javadoccomment">	 * Returns the map of setter methods to property names.</em>
-<a class="jxr_linenumber" name="L849" href="#L849">849</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L850" href="#L850">850</a> <em class="jxr_javadoccomment">	 * @return The setter properties map.</em>
-<a class="jxr_linenumber" name="L851" href="#L851">851</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L852" href="#L852">852</a> 	<strong class="jxr_keyword">protected</strong> Map&lt;Method,String&gt; getSetterProps() { <strong class="jxr_keyword">return</strong> setterProps; }
-<a class="jxr_linenumber" name="L853" href="#L853">853</a> 
-<a class="jxr_linenumber" name="L854" href="#L854">854</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L855" href="#L855">855</a> <em class="jxr_javadoccomment">	 * Returns whether this bean has a constructor available for instantiation.</em>
-<a class="jxr_linenumber" name="L856" href="#L856">856</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L857" href="#L857">857</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L858" href="#L858">858</a> <em class="jxr_javadoccomment">	 * A bean has a constructor if {@link #findBeanConstructor()} was able to find a suitable constructor,</em>
-<a class="jxr_linenumber" name="L859" href="#L859">859</a> <em class="jxr_javadoccomment">	 * which may be:</em>
-<a class="jxr_linenumber" name="L860" href="#L860">860</a> <em class="jxr_javadoccomment">	 * &lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L861" href="#L861">861</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;A constructor annotated with {@link Beanc @Beanc}</em>
-<a class="jxr_linenumber" name="L862" href="#L862">862</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;An implementation class constructor (if provided)</em>
-<a class="jxr_linenumber" name="L863" href="#L863">863</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;A no-argument constructor</em>
-<a class="jxr_linenumber" name="L864" href="#L864">864</a> <em class="jxr_javadoccomment">	 * &lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L865" href="#L865">865</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L866" href="#L866">866</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L867" href="#L867">867</a> <em class="jxr_javadoccomment">	 * If this method returns &lt;jk&gt;false&lt;/jk&gt;, the bean cannot be instantiated using {@link #newBean(Object)},</em>
-<a class="jxr_linenumber" name="L868" href="#L868">868</a> <em class="jxr_javadoccomment">	 * and may need to be created through other means (e.g., interface proxies).</em>
+<a class="jxr_linenumber" name="L834" href="#L834">834</a> <em class="jxr_javadoccomment">	 * Hidden properties are properties that exist on the bean but are not included in the normal property list.</em>
+<a class="jxr_linenumber" name="L835" href="#L835">835</a> <em class="jxr_javadoccomment">	 * These properties are typically excluded from serialization but may still be accessible programmatically.</em>
+<a class="jxr_linenumber" name="L836" href="#L836">836</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L837" href="#L837">837</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L838" href="#L838">838</a> <em class="jxr_javadoccomment">	 * Hidden properties can be defined through:</em>
+<a class="jxr_linenumber" name="L839" href="#L839">839</a> <em class="jxr_javadoccomment">	 * &lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L840" href="#L840">840</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;{@link BeanFilter#getExcludeProperties() Bean filter exclude properties}</em>
+<a class="jxr_linenumber" name="L841" href="#L841">841</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;Properties that fail validation during bean metadata creation</em>
+<a class="jxr_linenumber" name="L842" href="#L842">842</a> <em class="jxr_javadoccomment">	 * &lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L843" href="#L843">843</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L844" href="#L844">844</a> <em class="jxr_javadoccomment">	 * @return A map of hidden property names to their metadata. The map is unmodifiable.</em>
+<a class="jxr_linenumber" name="L845" href="#L845">845</a> <em class="jxr_javadoccomment">	 * @see #getProperties()</em>
+<a class="jxr_linenumber" name="L846" href="#L846">846</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L847" href="#L847">847</a> 	<strong class="jxr_keyword">protected</strong> Map&lt;String,BeanPropertyMeta&gt; getHiddenProperties() {
+<a class="jxr_linenumber" name="L848" href="#L848">848</a> 		<strong class="jxr_keyword">return</strong> hiddenProperties;
+<a class="jxr_linenumber" name="L849" href="#L849">849</a> 	}
+<a class="jxr_linenumber" name="L850" href="#L850">850</a> 
+<a class="jxr_linenumber" name="L851" href="#L851">851</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L852" href="#L852">852</a> <em class="jxr_javadoccomment">	 * Returns the map of setter methods to property names.</em>
+<a class="jxr_linenumber" name="L853" href="#L853">853</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L854" href="#L854">854</a> <em class="jxr_javadoccomment">	 * @return The setter properties map.</em>
+<a class="jxr_linenumber" name="L855" href="#L855">855</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L856" href="#L856">856</a> 	<strong class="jxr_keyword">protected</strong> Map&lt;Method,String&gt; getSetterProps() { <strong class="jxr_keyword">return</strong> setterProps; }
+<a class="jxr_linenumber" name="L857" href="#L857">857</a> 
+<a class="jxr_linenumber" name="L858" href="#L858">858</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L859" href="#L859">859</a> <em class="jxr_javadoccomment">	 * Returns whether this bean has a constructor available for instantiation.</em>
+<a class="jxr_linenumber" name="L860" href="#L860">860</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L861" href="#L861">861</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L862" href="#L862">862</a> <em class="jxr_javadoccomment">	 * A bean has a constructor if {@link #findBeanConstructor()} was able to find a suitable constructor,</em>
+<a class="jxr_linenumber" name="L863" href="#L863">863</a> <em class="jxr_javadoccomment">	 * which may be:</em>
+<a class="jxr_linenumber" name="L864" href="#L864">864</a> <em class="jxr_javadoccomment">	 * &lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L865" href="#L865">865</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;A constructor annotated with {@link Beanc @Beanc}</em>
+<a class="jxr_linenumber" name="L866" href="#L866">866</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;An implementation class constructor (if provided)</em>
+<a class="jxr_linenumber" name="L867" href="#L867">867</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;A no-argument constructor</em>
+<a class="jxr_linenumber" name="L868" href="#L868">868</a> <em class="jxr_javadoccomment">	 * &lt;/ul&gt;</em>
 <a class="jxr_linenumber" name="L869" href="#L869">869</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L870" href="#L870">870</a> <em class="jxr_javadoccomment">	 * @return &lt;jk&gt;true&lt;/jk&gt; if a constructor is available, &lt;jk&gt;false&lt;/jk&gt; otherwise.</em>
-<a class="jxr_linenumber" name="L871" href="#L871">871</a> <em class="jxr_javadoccomment">	 * @see #getConstructor()</em>
-<a class="jxr_linenumber" name="L872" href="#L872">872</a> <em class="jxr_javadoccomment">	 * @see #newBean(Object)</em>
-<a class="jxr_linenumber" name="L873" href="#L873">873</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L874" href="#L874">874</a> 	<strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">boolean</strong> hasConstructor() {
-<a class="jxr_linenumber" name="L875" href="#L875">875</a> 		<strong class="jxr_keyword">return</strong> beanConstructor.constructor().isPresent();
-<a class="jxr_linenumber" name="L876" href="#L876">876</a> 	}
-<a class="jxr_linenumber" name="L877" href="#L877">877</a> 
-<a class="jxr_linenumber" name="L878" href="#L878">878</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L879" href="#L879">879</a> <em class="jxr_javadoccomment">	 * Returns whether properties should be sorted for this bean.</em>
-<a class="jxr_linenumber" name="L880" href="#L880">880</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L881" href="#L881">881</a> <em class="jxr_javadoccomment">	 * @return &lt;jk&gt;true&lt;/jk&gt; if properties should be sorted.</em>
-<a class="jxr_linenumber" name="L882" href="#L882">882</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L883" href="#L883">883</a> 	<strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">boolean</strong> isSortProperties() { <strong class="jxr_keyword">return</strong> sortProperties; }
-<a class="jxr_linenumber" name="L884" href="#L884">884</a> 
-<a class="jxr_linenumber" name="L885" href="#L885">885</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L886" href="#L886">886</a> <em class="jxr_javadoccomment">	 * Creates a new instance of this bean.</em>
-<a class="jxr_linenumber" name="L887" href="#L887">887</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L888" href="#L888">888</a> <em class="jxr_javadoccomment">	 * @param outer The outer object if bean class is a non-static inner member class.</em>
-<a class="jxr_linenumber" name="L889" href="#L889">889</a> <em class="jxr_javadoccomment">	 * @return A new instance of this bean if possible, or &lt;jk&gt;null&lt;/jk&gt; if not.</em>
-<a class="jxr_linenumber" name="L890" href="#L890">890</a> <em class="jxr_javadoccomment">	 * @throws ExecutableException Exception occurred on invoked constructor/method/field.</em>
-<a class="jxr_linenumber" name="L891" href="#L891">891</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L892" href="#L892">892</a> 	@SuppressWarnings(<span class="jxr_string">"unchecked"</span>)
-<a class="jxr_linenumber" name="L893" href="#L893">893</a> 	<strong class="jxr_keyword">protected</strong> T newBean(Object <strong class="jxr_keyword">outer</strong>) <strong class="jxr_keyword">throws</strong> <a name="ExecutableException" href="../../../org/apache/juneau/commons/reflect/ExecutableException.html#ExecutableException">ExecutableException</a> {
-<a class="jxr_linenumber" name="L894" href="#L894">894</a> 		<strong class="jxr_keyword">if</strong> (classMeta.isMemberClass() &amp;&amp; classMeta.isNotStatic()) {
-<a class="jxr_linenumber" name="L895" href="#L895">895</a> 			<strong class="jxr_keyword">if</strong> (hasConstructor())
-<a class="jxr_linenumber" name="L896" href="#L896">896</a> 				<strong class="jxr_keyword">return</strong> getConstructor().&lt;T&gt;newInstance(<strong class="jxr_keyword">outer</strong>);
-<a class="jxr_linenumber" name="L897" href="#L897">897</a> 		} <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="L898" href="#L898">898</a> 			<strong class="jxr_keyword">if</strong> (hasConstructor())
-<a class="jxr_linenumber" name="L899" href="#L899">899</a> 				<strong class="jxr_keyword">return</strong> getConstructor().&lt;T&gt;newInstance();
-<a class="jxr_linenumber" name="L900" href="#L900">900</a> 			<strong class="jxr_keyword">var</strong> h = classMeta.getProxyInvocationHandler();
-<a class="jxr_linenumber" name="L901" href="#L901">901</a> 			<strong class="jxr_keyword">if</strong> (nn(h)) {
-<a class="jxr_linenumber" name="L902" href="#L902">902</a> 				<strong class="jxr_keyword">var</strong> cl = classMeta.getClassLoader();
-<a class="jxr_linenumber" name="L903" href="#L903">903</a> 				<strong class="jxr_keyword">return</strong> (T)Proxy.newProxyInstance(cl, a(classMeta.<strong class="jxr_keyword">inner</strong>(), java.io.Serializable.<strong class="jxr_keyword">class</strong>), h);
-<a class="jxr_linenumber" name="L904" href="#L904">904</a> 			}
-<a class="jxr_linenumber" name="L905" href="#L905">905</a> 		}
-<a class="jxr_linenumber" name="L906" href="#L906">906</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L907" href="#L907">907</a> 	}
-<a class="jxr_linenumber" name="L908" href="#L908">908</a> 
-<a class="jxr_linenumber" name="L909" href="#L909">909</a> 	<em class="jxr_comment">/*</em>
-<a class="jxr_linenumber" name="L910" href="#L910">910</a> <em class="jxr_comment">	 * Finds the appropriate constructor for this bean and determines the property names for constructor arguments.</em>
-<a class="jxr_linenumber" name="L911" href="#L911">911</a> <em class="jxr_comment">	 *</em>
-<a class="jxr_linenumber" name="L912" href="#L912">912</a> <em class="jxr_comment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L913" href="#L913">913</a> <em class="jxr_comment">	 * This method searches for a constructor in the following order of precedence:</em>
-<a class="jxr_linenumber" name="L914" href="#L914">914</a> <em class="jxr_comment">	 * &lt;ol&gt;</em>
-<a class="jxr_linenumber" name="L915" href="#L915">915</a> <em class="jxr_comment">	 * 	&lt;li&gt;&lt;b&gt;{@link Beanc @Beanc} annotated constructor:&lt;/b&gt; If a constructor is annotated with {@link Beanc @Beanc},</em>
-<a class="jxr_linenumber" name="L916" href="#L916">916</a> <em class="jxr_comment">	 * 		it is used. The property names are determined from:</em>
-<a class="jxr_linenumber" name="L917" href="#L917">917</a> <em class="jxr_comment">	 * 		&lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L918" href="#L918">918</a> <em class="jxr_comment">	 * 			&lt;li&gt;The {@link Beanc#properties() properties()} value in the annotation, if specified</em>
-<a class="jxr_linenumber" name="L919" href="#L919">919</a> <em class="jxr_comment">	 * 			&lt;li&gt;Otherwise, the parameter names from the constructor (if available in bytecode)</em>
-<a class="jxr_linenumber" name="L920" href="#L920">920</a> <em class="jxr_comment">	 * 		&lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L921" href="#L921">921</a> <em class="jxr_comment">	 * 		If multiple constructors are annotated with {@link Beanc @Beanc}, an exception is thrown.</em>
-<a class="jxr_linenumber" name="L922" href="#L922">922</a> <em class="jxr_comment">	 * 	&lt;li&gt;&lt;b&gt;Implementation class constructor:&lt;/b&gt; If an {@link #implClassConstructor} was provided during bean</em>
-<a class="jxr_linenumber" name="L923" href="#L923">923</a> <em class="jxr_comment">	 * 		metadata creation, it is used with an empty property list.</em>
-<a class="jxr_linenumber" name="L924" href="#L924">924</a> <em class="jxr_comment">	 * 	&lt;li&gt;&lt;b&gt;No-arg constructor:&lt;/b&gt; Searches for a no-argument constructor. The visibility required depends on</em>
-<a class="jxr_linenumber" name="L925" href="#L925">925</a> <em class="jxr_comment">	 * 		whether the class has a {@link Bean @Bean} annotation:</em>
-<a class="jxr_linenumber" name="L926" href="#L926">926</a> <em class="jxr_comment">	 * 		&lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L927" href="#L927">927</a> <em class="jxr_comment">	 * 			&lt;li&gt;If {@link Bean @Bean} is present, private constructors are allowed</em>
-<a class="jxr_linenumber" name="L928" href="#L928">928</a> <em class="jxr_comment">	 * 			&lt;li&gt;Otherwise, the visibility is determined by {@link BeanContext#getBeanConstructorVisibility()}</em>
-<a class="jxr_linenumber" name="L929" href="#L929">929</a> <em class="jxr_comment">	 * 		&lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L930" href="#L930">930</a> <em class="jxr_comment">	 * 	&lt;li&gt;&lt;b&gt;No constructor:&lt;/b&gt; Returns an empty {@link Optional} if no suitable constructor is found.</em>
-<a class="jxr_linenumber" name="L931" href="#L931">931</a> <em class="jxr_comment">	 * &lt;/ol&gt;</em>
-<a class="jxr_linenumber" name="L932" href="#L932">932</a> <em class="jxr_comment">	 *</em>
-<a class="jxr_linenumber" name="L933" href="#L933">933</a> <em class="jxr_comment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L934" href="#L934">934</a> <em class="jxr_comment">	 * The returned {@link BeanConstructor} contains:</em>
-<a class="jxr_linenumber" name="L935" href="#L935">935</a> <em class="jxr_comment">	 * &lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L936" href="#L936">936</a> <em class="jxr_comment">	 * 	&lt;li&gt;The constructor (if found), wrapped in an {@link Optional}</em>
-<a class="jxr_linenumber" name="L937" href="#L937">937</a> <em class="jxr_comment">	 * 	&lt;li&gt;A list of property names that correspond to the constructor parameters, in order</em>
-<a class="jxr_linenumber" name="L938" href="#L938">938</a> <em class="jxr_comment">	 * &lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L939" href="#L939">939</a> <em class="jxr_comment">	 *</em>
-<a class="jxr_linenumber" name="L940" href="#L940">940</a> <em class="jxr_comment">	 * @return A {@link BeanConstructor} containing the found constructor and its associated property names.</em>
-<a class="jxr_linenumber" name="L941" href="#L941">941</a> <em class="jxr_comment">	 * @throws BeanRuntimeException If multiple constructors are annotated with {@link Beanc @Beanc}, or if</em>
-<a class="jxr_linenumber" name="L942" href="#L942">942</a> <em class="jxr_comment">	 * 	the number of properties specified in {@link Beanc @Beanc} doesn't match the number of constructor parameters,</em>
-<a class="jxr_linenumber" name="L943" href="#L943">943</a> <em class="jxr_comment">	 * 	or if parameter names cannot be determined from the bytecode.</em>
-<a class="jxr_linenumber" name="L944" href="#L944">944</a> <em class="jxr_comment">	 */</em>
-<a class="jxr_linenumber" name="L945" href="#L945">945</a> 	<strong class="jxr_keyword">private</strong> BeanConstructor findBeanConstructor() {
-<a class="jxr_linenumber" name="L946" href="#L946">946</a> 		<strong class="jxr_keyword">var</strong> ap = beanContext.getAnnotationProvider();
-<a class="jxr_linenumber" name="L947" href="#L947">947</a> 		<strong class="jxr_keyword">var</strong> vis = beanContext.getBeanConstructorVisibility();
-<a class="jxr_linenumber" name="L948" href="#L948">948</a> 		<strong class="jxr_keyword">var</strong> ci = classMeta;
-<a class="jxr_linenumber" name="L949" href="#L949">949</a> 
-<a class="jxr_linenumber" name="L950" href="#L950">950</a> 		<strong class="jxr_keyword">var</strong> l = ci.getPublicConstructors().stream().filter(x -&gt; ap.has(Beanc.<strong class="jxr_keyword">class</strong>, x)).toList();
-<a class="jxr_linenumber" name="L951" href="#L951">951</a> 		<strong class="jxr_keyword">if</strong> (l.isEmpty())
-<a class="jxr_linenumber" name="L952" href="#L952">952</a> 			l = ci.getDeclaredConstructors().stream().filter(x -&gt; ap.has(Beanc.<strong class="jxr_keyword">class</strong>, x)).toList();
-<a class="jxr_linenumber" name="L953" href="#L953">953</a> 		<strong class="jxr_keyword">if</strong> (l.size() &gt; 1)
-<a class="jxr_linenumber" name="L954" href="#L954">954</a> 			<strong class="jxr_keyword">throw</strong> bex(ci, <span class="jxr_string">"Multiple instances of '@Beanc' found."</span>);
-<a class="jxr_linenumber" name="L955" href="#L955">955</a> 		<strong class="jxr_keyword">if</strong> (l.size() == 1) {
-<a class="jxr_linenumber" name="L956" href="#L956">956</a> 			<strong class="jxr_keyword">var</strong> con = l.get(0).accessible();
-<a class="jxr_linenumber" name="L957" href="#L957">957</a> 			<strong class="jxr_keyword">var</strong> args = ap.find(Beanc.<strong class="jxr_keyword">class</strong>, con).stream().map(x -&gt; x.<strong class="jxr_keyword">inner</strong>().properties()).filter(StringUtils::isNotBlank).map(x -&gt; split(x)).findFirst().orElse(liste());
-<a class="jxr_linenumber" name="L958" href="#L958">958</a> 			<strong class="jxr_keyword">if</strong> (! con.hasNumParameters(args.size())) {
-<a class="jxr_linenumber" name="L959" href="#L959">959</a> 				<strong class="jxr_keyword">if</strong> (isNotEmpty(args))
-<a class="jxr_linenumber" name="L960" href="#L960">960</a> 					<strong class="jxr_keyword">throw</strong> bex(ci, <span class="jxr_string">"Number of properties defined in '@Beanc' annotation does not match number of parameters in constructor."</span>);
-<a class="jxr_linenumber" name="L961" href="#L961">961</a> 				args = con.getParameters().stream().map(x -&gt; x.getName()).toList();
-<a class="jxr_linenumber" name="L962" href="#L962">962</a> 				<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i &lt; args.size(); i++) {
-<a class="jxr_linenumber" name="L963" href="#L963">963</a> 					<strong class="jxr_keyword">if</strong> (isBlank(args.get(i)))
-<a class="jxr_linenumber" name="L964" href="#L964">964</a> 						<strong class="jxr_keyword">throw</strong> bex(ci, <span class="jxr_string">"Could not find name for parameter #{0} of constructor ''{1}''"</span>, i, con.getFullName());
-<a class="jxr_linenumber" name="L965" href="#L965">965</a> 				}
-<a class="jxr_linenumber" name="L966" href="#L966">966</a> 			}
-<a class="jxr_linenumber" name="L967" href="#L967">967</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> BeanConstructor(opt(con), args);
-<a class="jxr_linenumber" name="L968" href="#L968">968</a> 		}
-<a class="jxr_linenumber" name="L969" href="#L969">969</a> 
-<a class="jxr_linenumber" name="L970" href="#L970">970</a> 		<strong class="jxr_keyword">if</strong> (implClassConstructor != <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L971" href="#L971">971</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> BeanConstructor(opt(implClassConstructor.accessible()), liste());
-<a class="jxr_linenumber" name="L972" href="#L972">972</a> 
-<a class="jxr_linenumber" name="L973" href="#L973">973</a> 		<strong class="jxr_keyword">var</strong> ba = ap.find(Bean.<strong class="jxr_keyword">class</strong>, classMeta);
-<a class="jxr_linenumber" name="L974" href="#L974">974</a> 		<strong class="jxr_keyword">var</strong> con = ci.getNoArgConstructor(! ba.isEmpty() ? Visibility.PRIVATE : vis).orElse(<strong class="jxr_keyword">null</strong>);
-<a class="jxr_linenumber" name="L975" href="#L975">975</a> 		<strong class="jxr_keyword">if</strong> (con != <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L976" href="#L976">976</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> BeanConstructor(opt(con.accessible()), liste());
-<a class="jxr_linenumber" name="L977" href="#L977">977</a> 
-<a class="jxr_linenumber" name="L978" href="#L978">978</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> BeanConstructor(opte(), liste());
-<a class="jxr_linenumber" name="L979" href="#L979">979</a> 	}
-<a class="jxr_linenumber" name="L980" href="#L980">980</a> 
-<a class="jxr_linenumber" name="L981" href="#L981">981</a> 	<em class="jxr_comment">/*</em>
-<a class="jxr_linenumber" name="L982" href="#L982">982</a> <em class="jxr_comment">	 * Finds all bean fields in the class hierarchy.</em>
-<a class="jxr_linenumber" name="L983" href="#L983">983</a> <em class="jxr_comment">	 *</em>
-<a class="jxr_linenumber" name="L984" href="#L984">984</a> <em class="jxr_comment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L985" href="#L985">985</a> <em class="jxr_comment">	 * Traverses the complete class hierarchy (as defined by {@link #classHierarchy}) and collects all fields that</em>
-<a class="jxr_linenumber" name="L986" href="#L986">986</a> <em class="jxr_comment">	 * meet the bean field criteria:</em>
-<a class="jxr_linenumber" name="L987" href="#L987">987</a> <em class="jxr_comment">	 * &lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L988" href="#L988">988</a> <em class="jxr_comment">	 * 	&lt;li&gt;Not static</em>
-<a class="jxr_linenumber" name="L989" href="#L989">989</a> <em class="jxr_comment">	 * 	&lt;li&gt;Not transient (unless transient fields are not ignored)</em>
-<a class="jxr_linenumber" name="L990" href="#L990">990</a> <em class="jxr_comment">	 * 	&lt;li&gt;Not annotated with {@link Transient @Transient} (unless transient fields are not ignored)</em>
-<a class="jxr_linenumber" name="L991" href="#L991">991</a> <em class="jxr_comment">	 * 	&lt;li&gt;Not annotated with {@link BeanIgnore @BeanIgnore}</em>
-<a class="jxr_linenumber" name="L992" href="#L992">992</a> <em class="jxr_comment">	 * 	&lt;li&gt;Visible according to the specified visibility level, or annotated with {@link Beanp @Beanp}</em>
-<a class="jxr_linenumber" name="L993" href="#L993">993</a> <em class="jxr_comment">	 * &lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L994" href="#L994">994</a> <em class="jxr_comment">	 *</em>
-<a class="jxr_linenumber" name="L995" href="#L995">995</a> <em class="jxr_comment">	 * @return A collection of all bean fields found in the class hierarchy.</em>
-<a class="jxr_linenumber" name="L996" href="#L996">996</a> <em class="jxr_comment">	 */</em>
-<a class="jxr_linenumber" name="L997" href="#L997">997</a> 	<strong class="jxr_keyword">private</strong> Collection&lt;FieldInfo&gt; findBeanFields() {
-<a class="jxr_linenumber" name="L998" href="#L998">998</a> 		<strong class="jxr_keyword">var</strong> v = beanContext.getBeanFieldVisibility();
-<a class="jxr_linenumber" name="L999" href="#L999">999</a> 		<strong class="jxr_keyword">var</strong> noIgnoreTransients = ! beanContext.isIgnoreTransientFields();
-<a class="jxr_linenumber" name="L1000" href="#L1000">1000</a> 		<strong class="jxr_keyword">var</strong> ap = beanContext.getAnnotationProvider();
-<a class="jxr_linenumber" name="L1001" href="#L1001">1001</a> 		<em class="jxr_comment">// @formatter:off</em>
-<a class="jxr_linenumber" name="L1002" href="#L1002">1002</a> 		<strong class="jxr_keyword">return</strong> classHierarchy.get().stream()
-<a class="jxr_linenumber" name="L1003" href="#L1003">1003</a> 			.flatMap(c2 -&gt; c2.getDeclaredFields().stream())
-<a class="jxr_linenumber" name="L1004" href="#L1004">1004</a> 			.filter(x -&gt; x.isNotStatic()
-<a class="jxr_linenumber" name="L1005" href="#L1005">1005</a> 				&amp;&amp; (x.isNotTransient() || noIgnoreTransients)
-<a class="jxr_linenumber" name="L1006" href="#L1006">1006</a> 				&amp;&amp; (! x.hasAnnotation(Transient.<strong class="jxr_keyword">class</strong>) || noIgnoreTransients)
-<a class="jxr_linenumber" name="L1007" href="#L1007">1007</a> 				&amp;&amp; ! ap.has(BeanIgnore.<strong class="jxr_keyword">class</strong>, x)
-<a class="jxr_linenumber" name="L1008" href="#L1008">1008</a> 				&amp;&amp; (v.isVisible(x.<strong class="jxr_keyword">inner</strong>()) || ap.has(Beanp.<strong class="jxr_keyword">class</strong>, x)))
-<a class="jxr_linenumber" name="L1009" href="#L1009">1009</a> 			.toList();
-<a class="jxr_linenumber" name="L1010" href="#L1010">1010</a> 		<em class="jxr_comment">// @formatter:on</em>
-<a class="jxr_linenumber" name="L1011" href="#L1011">1011</a> 	}
-<a class="jxr_linenumber" name="L1012" href="#L1012">1012</a> 
-<a class="jxr_linenumber" name="L1013" href="#L1013">1013</a> 	<em class="jxr_comment">/*</em>
-<a class="jxr_linenumber" name="L1014" href="#L1014">1014</a> <em class="jxr_comment">	 * Finds all bean methods (getters, setters, and extraKeys) in the class hierarchy.</em>
-<a class="jxr_linenumber" name="L1015" href="#L1015">1015</a> <em class="jxr_comment">	 *</em>
-<a class="jxr_linenumber" name="L1016" href="#L1016">1016</a> <em class="jxr_comment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L1017" href="#L1017">1017</a> <em class="jxr_comment">	 * Traverses the complete class hierarchy (as defined by {@link #classHierarchy}) and identifies methods that</em>
-<a class="jxr_linenumber" name="L1018" href="#L1018">1018</a> <em class="jxr_comment">	 * represent bean properties. Methods are identified as:</em>
-<a class="jxr_linenumber" name="L1019" href="#L1019">1019</a> <em class="jxr_comment">	 * &lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L1020" href="#L1020">1020</a> <em class="jxr_comment">	 * 	&lt;li&gt;&lt;b&gt;Getters:&lt;/b&gt; Methods with no parameters that return a value, matching patterns like:</em>
-<a class="jxr_linenumber" name="L1021" href="#L1021">1021</a> <em class="jxr_comment">	 * 		&lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L1022" href="#L1022">1022</a> <em class="jxr_comment">	 * 			&lt;li&gt;&lt;c&gt;getX()&lt;/c&gt; - standard getter pattern</em>
-<a class="jxr_linenumber" name="L1023" href="#L1023">1023</a> <em class="jxr_comment">	 * 			&lt;li&gt;&lt;c&gt;isX()&lt;/c&gt; - boolean getter pattern (returns boolean or Boolean)</em>
-<a class="jxr_linenumber" name="L1024" href="#L1024">1024</a> <em class="jxr_comment">	 * 			&lt;li&gt;Methods annotated with {@link Beanp @Beanp} or {@link Name @Name}</em>
-<a class="jxr_linenumber" name="L1025" href="#L1025">1025</a> <em class="jxr_comment">	 * 			&lt;li&gt;Methods with {@link Beanp @Beanp} annotation with value &lt;js&gt;"*"&lt;/js&gt; that return a Map</em>
-<a class="jxr_linenumber" name="L1026" href="#L1026">1026</a> <em class="jxr_comment">	 * 		&lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L1027" href="#L1027">1027</a> <em class="jxr_comment">	 * 	&lt;li&gt;&lt;b&gt;Setters:&lt;/b&gt; Methods with one parameter that match patterns like:</em>
-<a class="jxr_linenumber" name="L1028" href="#L1028">1028</a> <em class="jxr_comment">	 * 		&lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L1029" href="#L1029">1029</a> <em class="jxr_comment">	 * 			&lt;li&gt;&lt;c&gt;setX(value)&lt;/c&gt; - standard setter pattern</em>
-<a class="jxr_linenumber" name="L1030" href="#L1030">1030</a> <em class="jxr_comment">	 * 			&lt;li&gt;&lt;c&gt;withX(value)&lt;/c&gt; - fluent setter pattern (returns the bean type)</em>
-<a class="jxr_linenumber" name="L1031" href="#L1031">1031</a> <em class="jxr_comment">	 * 			&lt;li&gt;Methods annotated with {@link Beanp @Beanp} or {@link Name @Name}</em>
-<a class="jxr_linenumber" name="L1032" href="#L1032">1032</a> <em class="jxr_comment">	 * 			&lt;li&gt;Methods with {@link Beanp @Beanp} annotation with value &lt;js&gt;"*"&lt;/js&gt; that accept a Map</em>
-<a class="jxr_linenumber" name="L1033" href="#L1033">1033</a> <em class="jxr_comment">	 * 			&lt;li&gt;Fluent setters (if enabled) - methods that return the bean type and accept one parameter</em>
-<a class="jxr_linenumber" name="L1034" href="#L1034">1034</a> <em class="jxr_comment">	 * 		&lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L1035" href="#L1035">1035</a> <em class="jxr_comment">	 * 	&lt;li&gt;&lt;b&gt;ExtraKeys:&lt;/b&gt; Methods with {@link Beanp @Beanp} annotation with value &lt;js&gt;"*"&lt;/js&gt; that return a Collection</em>
-<a class="jxr_linenumber" name="L1036" href="#L1036">1036</a> <em class="jxr_comment">	 * &lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L1037" href="#L1037">1037</a> <em class="jxr_comment">	 *</em>
-<a class="jxr_linenumber" name="L1038" href="#L1038">1038</a> <em class="jxr_comment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L1039" href="#L1039">1039</a> <em class="jxr_comment">	 * Methods are filtered based on:</em>
-<a class="jxr_linenumber" name="L1040" href="#L1040">1040</a> <em class="jxr_comment">	 * &lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L1041" href="#L1041">1041</a> <em class="jxr_comment">	 * 	&lt;li&gt;Not static, not bridge methods</em>
-<a class="jxr_linenumber" name="L1042" href="#L1042">1042</a> <em class="jxr_comment">	 * 	&lt;li&gt;Parameter count ≤ 2</em>
-<a class="jxr_linenumber" name="L1043" href="#L1043">1043</a> <em class="jxr_comment">	 * 	&lt;li&gt;Not annotated with {@link BeanIgnore @BeanIgnore}</em>
-<a class="jxr_linenumber" name="L1044" href="#L1044">1044</a> <em class="jxr_comment">	 * 	&lt;li&gt;Not annotated with {@link Transient @Transient}</em>
-<a class="jxr_linenumber" name="L1045" href="#L1045">1045</a> <em class="jxr_comment">	 * 	&lt;li&gt;Visible according to the specified visibility level, or annotated with {@link Beanp @Beanp} or {@link Name @Name}</em>
-<a class="jxr_linenumber" name="L1046" href="#L1046">1046</a> <em class="jxr_comment">	 * &lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L1047" href="#L1047">1047</a> <em class="jxr_comment">	 *</em>
-<a class="jxr_linenumber" name="L1048" href="#L1048">1048</a> <em class="jxr_comment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L1049" href="#L1049">1049</a> <em class="jxr_comment">	 * Property names are determined from:</em>
-<a class="jxr_linenumber" name="L1050" href="#L1050">1050</a> <em class="jxr_comment">	 * &lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L1051" href="#L1051">1051</a> <em class="jxr_comment">	 * 	&lt;li&gt;{@link Beanp @Beanp} or {@link Name @Name} annotations (if present)</em>
-<a class="jxr_linenumber" name="L1052" href="#L1052">1052</a> <em class="jxr_comment">	 * 	&lt;li&gt;Otherwise, derived from the method name using the provided {@link PropertyNamer}</em>
-<a class="jxr_linenumber" name="L1053" href="#L1053">1053</a> <em class="jxr_comment">	 * &lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L1054" href="#L1054">1054</a> <em class="jxr_comment">	 *</em>
-<a class="jxr_linenumber" name="L1055" href="#L1055">1055</a> <em class="jxr_comment">	 * @return A list of {@link BeanMethod} objects representing all found bean methods.</em>
-<a class="jxr_linenumber" name="L1056" href="#L1056">1056</a> <em class="jxr_comment">	 */</em>
-<a class="jxr_linenumber" name="L1057" href="#L1057">1057</a> 	<strong class="jxr_keyword">private</strong> List&lt;BeanMethod&gt; findBeanMethods() {
-<a class="jxr_linenumber" name="L1058" href="#L1058">1058</a> 		<strong class="jxr_keyword">var</strong> l = <strong class="jxr_keyword">new</strong> LinkedList&lt;BeanMethod&gt;();
-<a class="jxr_linenumber" name="L1059" href="#L1059">1059</a> 		<strong class="jxr_keyword">var</strong> ap = beanContext.getAnnotationProvider();
-<a class="jxr_linenumber" name="L1060" href="#L1060">1060</a> 		<strong class="jxr_keyword">var</strong> ci = classMeta;
-<a class="jxr_linenumber" name="L1061" href="#L1061">1061</a> 		<strong class="jxr_keyword">var</strong> v = beanContext.getBeanMethodVisibility();
-<a class="jxr_linenumber" name="L1062" href="#L1062">1062</a> 		<strong class="jxr_keyword">var</strong> pn = opt(beanFilter).map(x -&gt; x.getPropertyNamer()).orElse(beanContext.getPropertyNamer());
-<a class="jxr_linenumber" name="L1063" href="#L1063">1063</a> 
-<a class="jxr_linenumber" name="L1064" href="#L1064">1064</a> 		classHierarchy.get().stream().forEach(c2 -&gt; {
-<a class="jxr_linenumber" name="L1065" href="#L1065">1065</a> 			<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> m : c2.getDeclaredMethods()) {
-<a class="jxr_linenumber" name="L1066" href="#L1066">1066</a> 
-<a class="jxr_linenumber" name="L1067" href="#L1067">1067</a> 				<strong class="jxr_keyword">if</strong> (m.isStatic() || m.isBridge() || m.getParameterCount() &gt; 2)
-<a class="jxr_linenumber" name="L1068" href="#L1068">1068</a> 					<strong class="jxr_keyword">continue</strong>;
-<a class="jxr_linenumber" name="L1069" href="#L1069">1069</a> 
-<a class="jxr_linenumber" name="L1070" href="#L1070">1070</a> 				<strong class="jxr_keyword">var</strong> mm = m.getMatchingMethods();
-<a class="jxr_linenumber" name="L1071" href="#L1071">1071</a> 
-<a class="jxr_linenumber" name="L1072" href="#L1072">1072</a> 				<strong class="jxr_keyword">if</strong> (mm.stream().anyMatch(m2 -&gt; ap.has(BeanIgnore.<strong class="jxr_keyword">class</strong>, m2, SELF)))
-<a class="jxr_linenumber" name="L1073" href="#L1073">1073</a> 					<strong class="jxr_keyword">continue</strong>;
-<a class="jxr_linenumber" name="L1074" href="#L1074">1074</a> 
-<a class="jxr_linenumber" name="L1075" href="#L1075">1075</a> 				<strong class="jxr_keyword">if</strong> (mm.stream().anyMatch(m2 -&gt; ap.find(Transient.<strong class="jxr_keyword">class</strong>, m2, SELF).stream().map(x -&gt; x.<strong class="jxr_keyword">inner</strong>().value()).findFirst().orElse(false)))
-<a class="jxr_linenumber" name="L1076" href="#L1076">1076</a> 					<strong class="jxr_keyword">continue</strong>;
-<a class="jxr_linenumber" name="L1077" href="#L1077">1077</a> 
-<a class="jxr_linenumber" name="L1078" href="#L1078">1078</a> 				<strong class="jxr_keyword">var</strong> beanps = ap.find(Beanp.<strong class="jxr_keyword">class</strong>, m).stream().map(AnnotationInfo::<strong class="jxr_keyword">inner</strong>).toList();
-<a class="jxr_linenumber" name="L1079" href="#L1079">1079</a> 				<strong class="jxr_keyword">var</strong> names = ap.find(Name.<strong class="jxr_keyword">class</strong>, m).stream().map(AnnotationInfo::<strong class="jxr_keyword">inner</strong>).toList();
-<a class="jxr_linenumber" name="L1080" href="#L1080">1080</a> 
-<a class="jxr_linenumber" name="L1081" href="#L1081">1081</a> 				<strong class="jxr_keyword">if</strong> (! (m.isVisible(v) || isNotEmpty(beanps) || isNotEmpty(names)))
-<a class="jxr_linenumber" name="L1082" href="#L1082">1082</a> 					<strong class="jxr_keyword">continue</strong>;
-<a class="jxr_linenumber" name="L1083" href="#L1083">1083</a> 
-<a class="jxr_linenumber" name="L1084" href="#L1084">1084</a> 				<strong class="jxr_keyword">var</strong> n = m.getSimpleName();
-<a class="jxr_linenumber" name="L1085" href="#L1085">1085</a> 
-<a class="jxr_linenumber" name="L1086" href="#L1086">1086</a> 				<strong class="jxr_keyword">var</strong> params = m.getParameters();
-<a class="jxr_linenumber" name="L1087" href="#L1087">1087</a> 				<strong class="jxr_keyword">var</strong> rt = m.getReturnType();
-<a class="jxr_linenumber" name="L1088" href="#L1088">1088</a> 				<strong class="jxr_keyword">var</strong> methodType = UNKNOWN;
-<a class="jxr_linenumber" name="L1089" href="#L1089">1089</a> 				<strong class="jxr_keyword">var</strong> bpName = bpName(beanps, names);
-<a class="jxr_linenumber" name="L1090" href="#L1090">1090</a> 
-<a class="jxr_linenumber" name="L1091" href="#L1091">1091</a> 				<strong class="jxr_keyword">if</strong> (params.isEmpty()) {
-<a class="jxr_linenumber" name="L1092" href="#L1092">1092</a> 					<strong class="jxr_keyword">if</strong> (<span class="jxr_string">"*"</span>.equals(bpName)) {
-<a class="jxr_linenumber" name="L1093" href="#L1093">1093</a> 						<strong class="jxr_keyword">if</strong> (rt.isChildOf(Collection.<strong class="jxr_keyword">class</strong>)) {
-<a class="jxr_linenumber" name="L1094" href="#L1094">1094</a> 							methodType = EXTRAKEYS;
-<a class="jxr_linenumber" name="L1095" href="#L1095">1095</a> 						} <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (rt.isChildOf(Map.<strong class="jxr_keyword">class</strong>)) {
-<a class="jxr_linenumber" name="L1096" href="#L1096">1096</a> 							methodType = GETTER;
-<a class="jxr_linenumber" name="L1097" href="#L1097">1097</a> 						}
-<a class="jxr_linenumber" name="L1098" href="#L1098">1098</a> 						n = bpName;
-<a class="jxr_linenumber" name="L1099" href="#L1099">1099</a> 					} <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (n.startsWith(<span class="jxr_string">"get"</span>) &amp;&amp; (! rt.is(Void.TYPE))) {
-<a class="jxr_linenumber" name="L1100" href="#L1100">1100</a> 						methodType = GETTER;
-<a class="jxr_linenumber" name="L1101" href="#L1101">1101</a> 						n = n.substring(3);
-<a class="jxr_linenumber" name="L1102" href="#L1102">1102</a> 					} <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (n.startsWith(<span class="jxr_string">"is"</span>) &amp;&amp; (rt.is(Boolean.TYPE) || rt.is(Boolean.<strong class="jxr_keyword">class</strong>))) {
-<a class="jxr_linenumber" name="L1103" href="#L1103">1103</a> 						methodType = GETTER;
-<a class="jxr_linenumber" name="L1104" href="#L1104">1104</a> 						n = n.substring(2);
-<a class="jxr_linenumber" name="L1105" href="#L1105">1105</a> 					} <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (nn(bpName)) {
-<a class="jxr_linenumber" name="L1106" href="#L1106">1106</a> 						methodType = GETTER;
-<a class="jxr_linenumber" name="L1107" href="#L1107">1107</a> 						<strong class="jxr_keyword">if</strong> (bpName.isEmpty()) {
-<a class="jxr_linenumber" name="L1108" href="#L1108">1108</a> 							<strong class="jxr_keyword">if</strong> (n.startsWith(<span class="jxr_string">"get"</span>))
-<a class="jxr_linenumber" name="L1109" href="#L1109">1109</a> 								n = n.substring(3);
-<a class="jxr_linenumber" name="L1110" href="#L1110">1110</a> 							<strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (n.startsWith(<span class="jxr_string">"is"</span>))
-<a class="jxr_linenumber" name="L1111" href="#L1111">1111</a> 								n = n.substring(2);
-<a class="jxr_linenumber" name="L1112" href="#L1112">1112</a> 							bpName = n;
-<a class="jxr_linenumber" name="L1113" href="#L1113">1113</a> 						} <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="L1114" href="#L1114">1114</a> 							n = bpName;
-<a class="jxr_linenumber" name="L1115" href="#L1115">1115</a> 						}
-<a class="jxr_linenumber" name="L1116" href="#L1116">1116</a> 					}
-<a class="jxr_linenumber" name="L1117" href="#L1117">1117</a> 				} <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (params.size() == 1) {
-<a class="jxr_linenumber" name="L1118" href="#L1118">1118</a> 					<strong class="jxr_keyword">if</strong> (<span class="jxr_string">"*"</span>.equals(bpName)) {
-<a class="jxr_linenumber" name="L1119" href="#L1119">1119</a> 						<strong class="jxr_keyword">if</strong> (params.get(0).getParameterType().isChildOf(Map.<strong class="jxr_keyword">class</strong>)) {
-<a class="jxr_linenumber" name="L1120" href="#L1120">1120</a> 							methodType = SETTER;
-<a class="jxr_linenumber" name="L1121" href="#L1121">1121</a> 							n = bpName;
-<a class="jxr_linenumber" name="L1122" href="#L1122">1122</a> 						} <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (params.get(0).getParameterType().is(String.<strong class="jxr_keyword">class</strong>)) {
-<a class="jxr_linenumber" name="L1123" href="#L1123">1123</a> 							methodType = GETTER;
-<a class="jxr_linenumber" name="L1124" href="#L1124">1124</a> 							n = bpName;
-<a class="jxr_linenumber" name="L1125" href="#L1125">1125</a> 						}
-<a class="jxr_linenumber" name="L1126" href="#L1126">1126</a> 					} <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (n.startsWith(<span class="jxr_string">"set"</span>) &amp;&amp; (rt.isParentOf(ci) || rt.is(Void.TYPE))) {
-<a class="jxr_linenumber" name="L1127" href="#L1127">1127</a> 						methodType = SETTER;
-<a class="jxr_linenumber" name="L1128" href="#L1128">1128</a> 						n = n.substring(3);
-<a class="jxr_linenumber" name="L1129" href="#L1129">1129</a> 					} <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (n.startsWith(<span class="jxr_string">"with"</span>) &amp;&amp; (rt.isParentOf(ci))) {
-<a class="jxr_linenumber" name="L1130" href="#L1130">1130</a> 						methodType = SETTER;
-<a class="jxr_linenumber" name="L1131" href="#L1131">1131</a> 						n = n.substring(4);
-<a class="jxr_linenumber" name="L1132" href="#L1132">1132</a> 					} <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (nn(bpName)) {
-<a class="jxr_linenumber" name="L1133" href="#L1133">1133</a> 						methodType = SETTER;
-<a class="jxr_linenumber" name="L1134" href="#L1134">1134</a> 						<strong class="jxr_keyword">if</strong> (bpName.isEmpty()) {
-<a class="jxr_linenumber" name="L1135" href="#L1135">1135</a> 							<strong class="jxr_keyword">if</strong> (n.startsWith(<span class="jxr_string">"set"</span>))
-<a class="jxr_linenumber" name="L1136" href="#L1136">1136</a> 								n = n.substring(3);
-<a class="jxr_linenumber" name="L1137" href="#L1137">1137</a> 							bpName = n;
-<a class="jxr_linenumber" name="L1138" href="#L1138">1138</a> 						} <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="L1139" href="#L1139">1139</a> 							n = bpName;
-<a class="jxr_linenumber" name="L1140" href="#L1140">1140</a> 						}
-<a class="jxr_linenumber" name="L1141" href="#L1141">1141</a> 					} <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (fluentSetters &amp;&amp; rt.isParentOf(ci)) {
-<a class="jxr_linenumber" name="L1142" href="#L1142">1142</a> 						methodType = SETTER;
-<a class="jxr_linenumber" name="L1143" href="#L1143">1143</a> 					}
-<a class="jxr_linenumber" name="L1144" href="#L1144">1144</a> 				} <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (params.size() == 2) {
-<a class="jxr_linenumber" name="L1145" href="#L1145">1145</a> 					<strong class="jxr_keyword">if</strong> (<span class="jxr_string">"*"</span>.equals(bpName) &amp;&amp; params.get(0).getParameterType().is(String.<strong class="jxr_keyword">class</strong>)) {
-<a class="jxr_linenumber" name="L1146" href="#L1146">1146</a> 						<strong class="jxr_keyword">if</strong> (n.startsWith(<span class="jxr_string">"set"</span>) &amp;&amp; (rt.isParentOf(ci) || rt.is(Void.TYPE))) {
-<a class="jxr_linenumber" name="L1147" href="#L1147">1147</a> 							methodType = SETTER;
-<a class="jxr_linenumber" name="L1148" href="#L1148">1148</a> 						} <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="L1149" href="#L1149">1149</a> 							methodType = GETTER;
-<a class="jxr_linenumber" name="L1150" href="#L1150">1150</a> 						}
-<a class="jxr_linenumber" name="L1151" href="#L1151">1151</a> 						n = bpName;
-<a class="jxr_linenumber" name="L1152" href="#L1152">1152</a> 					}
-<a class="jxr_linenumber" name="L1153" href="#L1153">1153</a> 				}
-<a class="jxr_linenumber" name="L1154" href="#L1154">1154</a> 				n = pn.getPropertyName(n);
-<a class="jxr_linenumber" name="L1155" href="#L1155">1155</a> 
-<a class="jxr_linenumber" name="L1156" href="#L1156">1156</a> 				<strong class="jxr_keyword">if</strong> (<span class="jxr_string">"*"</span>.equals(bpName) &amp;&amp; methodType == UNKNOWN)
-<a class="jxr_linenumber" name="L1157" href="#L1157">1157</a> 					<strong class="jxr_keyword">throw</strong> bex(ci, <span class="jxr_string">"Found @Beanp(\&quot;*\&quot;) but could not determine method type on method ''{0}''."</span>, m.getSimpleName());
-<a class="jxr_linenumber" name="L1158" href="#L1158">1158</a> 
-<a class="jxr_linenumber" name="L1159" href="#L1159">1159</a> 				<strong class="jxr_keyword">if</strong> (methodType != UNKNOWN) {
-<a class="jxr_linenumber" name="L1160" href="#L1160">1160</a> 					<strong class="jxr_keyword">if</strong> (nn(bpName) &amp;&amp; ! bpName.isEmpty())
-<a class="jxr_linenumber" name="L1161" href="#L1161">1161</a> 						n = bpName;
-<a class="jxr_linenumber" name="L1162" href="#L1162">1162</a> 					<strong class="jxr_keyword">if</strong> (nn(n))
-<a class="jxr_linenumber" name="L1163" href="#L1163">1163</a> 						l.add(<strong class="jxr_keyword">new</strong> BeanMethod(n, methodType, m.<strong class="jxr_keyword">inner</strong>()));
-<a class="jxr_linenumber" name="L1164" href="#L1164">1164</a> 				}
-<a class="jxr_linenumber" name="L1165" href="#L1165">1165</a> 			}
-<a class="jxr_linenumber" name="L1166" href="#L1166">1166</a> 		});
-<a class="jxr_linenumber" name="L1167" href="#L1167">1167</a> 		<strong class="jxr_keyword">return</strong> l;
-<a class="jxr_linenumber" name="L1168" href="#L1168">1168</a> 	}
-<a class="jxr_linenumber" name="L1169" href="#L1169">1169</a> 
-<a class="jxr_linenumber" name="L1170" href="#L1170">1170</a> 	<em class="jxr_comment">/*</em>
-<a class="jxr_linenumber" name="L1171" href="#L1171">1171</a> <em class="jxr_comment">	 * Creates a bean registry for this bean class.</em>
-<a class="jxr_linenumber" name="L1172" href="#L1172">1172</a> <em class="jxr_comment">	 *</em>
-<a class="jxr_linenumber" name="L1173" href="#L1173">1173</a> <em class="jxr_comment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L1174" href="#L1174">1174</a> <em class="jxr_comment">	 * The bean registry is used to resolve dictionary names (type names) to actual class types. This is essential</em>
-<a class="jxr_linenumber" name="L1175" href="#L1175">1175</a> <em class="jxr_comment">	 * for polymorphic bean serialization and parsing, where a dictionary name in the serialized form needs to be</em>
-<a class="jxr_linenumber" name="L1176" href="#L1176">1176</a> <em class="jxr_comment">	 * mapped back to the correct subclass.</em>
-<a class="jxr_linenumber" name="L1177" href="#L1177">1177</a> <em class="jxr_comment">	 *</em>
-<a class="jxr_linenumber" name="L1178" href="#L1178">1178</a> <em class="jxr_comment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L1179" href="#L1179">1179</a> <em class="jxr_comment">	 * The registry is built from:</em>
-<a class="jxr_linenumber" name="L1180" href="#L1180">1180</a> <em class="jxr_comment">	 * &lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L1181" href="#L1181">1181</a> <em class="jxr_comment">	 * 	&lt;li&gt;&lt;b&gt;Bean filter dictionary:&lt;/b&gt; Classes specified in the {@link BeanFilter#getBeanDictionary() bean filter's dictionary}</em>
-<a class="jxr_linenumber" name="L1182" href="#L1182">1182</a> <em class="jxr_comment">	 * 		(if a bean filter is present)</em>
-<a class="jxr_linenumber" name="L1183" href="#L1183">1183</a> <em class="jxr_comment">	 * 	&lt;li&gt;&lt;b&gt;{@link Bean @Bean} annotation:&lt;/b&gt; If the class has a {@link Bean @Bean} annotation with a non-empty</em>
-<a class="jxr_linenumber" name="L1184" href="#L1184">1184</a> <em class="jxr_comment">	 * 		{@link Bean#typeName() typeName()}, the class itself is added to the dictionary</em>
-<a class="jxr_linenumber" name="L1185" href="#L1185">1185</a> <em class="jxr_comment">	 * &lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L1186" href="#L1186">1186</a> <em class="jxr_comment">	 *</em>
-<a class="jxr_linenumber" name="L1187" href="#L1187">1187</a> <em class="jxr_comment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L1188" href="#L1188">1188</a> <em class="jxr_comment">	 * The registry is used by parsers to determine which class to instantiate when deserializing polymorphic beans.</em>
-<a class="jxr_linenumber" name="L1189" href="#L1189">1189</a> <em class="jxr_comment">	 *</em>
-<a class="jxr_linenumber" name="L1190" href="#L1190">1190</a> <em class="jxr_comment">	 * @return A new {@link BeanRegistry} containing the dictionary classes for this bean, or an empty registry if</em>
-<a class="jxr_linenumber" name="L1191" href="#L1191">1191</a> <em class="jxr_comment">	 * 	no dictionary classes are found.</em>
-<a class="jxr_linenumber" name="L1192" href="#L1192">1192</a> <em class="jxr_comment">	 */</em>
-<a class="jxr_linenumber" name="L1193" href="#L1193">1193</a> 	<strong class="jxr_keyword">private</strong> <a name="BeanRegistry" href="../../../org/apache/juneau/BeanRegistry.html#BeanRegistry">BeanRegistry</a> findBeanRegistry() {
-<a class="jxr_linenumber" name="L1194" href="#L1194">1194</a> 		<em class="jxr_comment">// Bean dictionary on bean filter.</em>
-<a class="jxr_linenumber" name="L1195" href="#L1195">1195</a> 		<strong class="jxr_keyword">var</strong> beanDictionaryClasses = opt(beanFilter).map(x -&gt; (List&lt;ClassInfo&gt;)copyOf(x.getBeanDictionary())).orElse(list());
-<a class="jxr_linenumber" name="L1196" href="#L1196">1196</a> 
-<a class="jxr_linenumber" name="L1197" href="#L1197">1197</a> 		<em class="jxr_comment">// Bean dictionary from @Bean(typeName) annotation.</em>
-<a class="jxr_linenumber" name="L1198" href="#L1198">1198</a> 		<strong class="jxr_keyword">var</strong> ba = beanContext.getAnnotationProvider().find(Bean.<strong class="jxr_keyword">class</strong>, classMeta);
-<a class="jxr_linenumber" name="L1199" href="#L1199">1199</a> 		ba.stream().map(x -&gt; x.<strong class="jxr_keyword">inner</strong>().typeName()).filter(Utils::isNotEmpty).findFirst().ifPresent(x -&gt; beanDictionaryClasses.add(classMeta));
+<a class="jxr_linenumber" name="L870" href="#L870">870</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L871" href="#L871">871</a> <em class="jxr_javadoccomment">	 * If this method returns &lt;jk&gt;false&lt;/jk&gt;, the bean cannot be instantiated using {@link #newBean(Object)},</em>
+<a class="jxr_linenumber" name="L872" href="#L872">872</a> <em class="jxr_javadoccomment">	 * and may need to be created through other means (e.g., interface proxies).</em>
+<a class="jxr_linenumber" name="L873" href="#L873">873</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L874" href="#L874">874</a> <em class="jxr_javadoccomment">	 * @return &lt;jk&gt;true&lt;/jk&gt; if a constructor is available, &lt;jk&gt;false&lt;/jk&gt; otherwise.</em>
+<a class="jxr_linenumber" name="L875" href="#L875">875</a> <em class="jxr_javadoccomment">	 * @see #getConstructor()</em>
+<a class="jxr_linenumber" name="L876" href="#L876">876</a> <em class="jxr_javadoccomment">	 * @see #newBean(Object)</em>
+<a class="jxr_linenumber" name="L877" href="#L877">877</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L878" href="#L878">878</a> 	<strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">boolean</strong> hasConstructor() {
+<a class="jxr_linenumber" name="L879" href="#L879">879</a> 		<strong class="jxr_keyword">return</strong> beanConstructor.constructor().isPresent();
+<a class="jxr_linenumber" name="L880" href="#L880">880</a> 	}
+<a class="jxr_linenumber" name="L881" href="#L881">881</a> 
+<a class="jxr_linenumber" name="L882" href="#L882">882</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L883" href="#L883">883</a> <em class="jxr_javadoccomment">	 * Returns whether properties should be sorted for this bean.</em>
+<a class="jxr_linenumber" name="L884" href="#L884">884</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L885" href="#L885">885</a> <em class="jxr_javadoccomment">	 * @return &lt;jk&gt;true&lt;/jk&gt; if properties should be sorted.</em>
+<a class="jxr_linenumber" name="L886" href="#L886">886</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L887" href="#L887">887</a> 	<strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">boolean</strong> isSortProperties() { <strong class="jxr_keyword">return</strong> sortProperties; }
+<a class="jxr_linenumber" name="L888" href="#L888">888</a> 
+<a class="jxr_linenumber" name="L889" href="#L889">889</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L890" href="#L890">890</a> <em class="jxr_javadoccomment">	 * Creates a new instance of this bean.</em>
+<a class="jxr_linenumber" name="L891" href="#L891">891</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L892" href="#L892">892</a> <em class="jxr_javadoccomment">	 * @param outer The outer object if bean class is a non-static inner member class.</em>
+<a class="jxr_linenumber" name="L893" href="#L893">893</a> <em class="jxr_javadoccomment">	 * @return A new instance of this bean if possible, or &lt;jk&gt;null&lt;/jk&gt; if not.</em>
+<a class="jxr_linenumber" name="L894" href="#L894">894</a> <em class="jxr_javadoccomment">	 * @throws ExecutableException Exception occurred on invoked constructor/method/field.</em>
+<a class="jxr_linenumber" name="L895" href="#L895">895</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L896" href="#L896">896</a> 	@SuppressWarnings(<span class="jxr_string">"unchecked"</span>)
+<a class="jxr_linenumber" name="L897" href="#L897">897</a> 	<strong class="jxr_keyword">protected</strong> T newBean(Object <strong class="jxr_keyword">outer</strong>) <strong class="jxr_keyword">throws</strong> <a name="ExecutableException" href="../../../org/apache/juneau/commons/reflect/ExecutableException.html#ExecutableException">ExecutableException</a> {
+<a class="jxr_linenumber" name="L898" href="#L898">898</a> 		<strong class="jxr_keyword">if</strong> (classMeta.isMemberClass() &amp;&amp; classMeta.isNotStatic()) {
+<a class="jxr_linenumber" name="L899" href="#L899">899</a> 			<strong class="jxr_keyword">if</strong> (hasConstructor())
+<a class="jxr_linenumber" name="L900" href="#L900">900</a> 				<strong class="jxr_keyword">return</strong> getConstructor().&lt;T&gt;newInstance(<strong class="jxr_keyword">outer</strong>);
+<a class="jxr_linenumber" name="L901" href="#L901">901</a> 		} <strong class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="L902" href="#L902">902</a> 			<strong class="jxr_keyword">if</strong> (hasConstructor())
+<a class="jxr_linenumber" name="L903" href="#L903">903</a> 				<strong class="jxr_keyword">return</strong> getConstructor().&lt;T&gt;newInstance();
+<a class="jxr_linenumber" name="L904" href="#L904">904</a> 			<strong class="jxr_keyword">var</strong> h = classMeta.getProxyInvocationHandler();
+<a class="jxr_linenumber" name="L905" href="#L905">905</a> 			<strong class="jxr_keyword">if</strong> (nn(h)) {
+<a class="jxr_linenumber" name="L906" href="#L906">906</a> 				<strong class="jxr_keyword">var</strong> cl = classMeta.getClassLoader();
+<a class="jxr_linenumber" name="L907" href="#L907">907</a> 				<strong class="jxr_keyword">return</strong> (T)Proxy.newProxyInstance(cl, a(classMeta.<strong class="jxr_keyword">inner</strong>(), java.io.Serializable.<strong class="jxr_keyword">class</strong>), h);
+<a class="jxr_linenumber" name="L908" href="#L908">908</a> 			}
+<a class="jxr_linenumber" name="L909" href="#L909">909</a> 		}
+<a class="jxr_linenumber" name="L910" href="#L910">910</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<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> 	<em class="jxr_comment">/*</em>
+<a class="jxr_linenumber" name="L914" href="#L914">914</a> <em class="jxr_comment">	 * Finds the appropriate constructor for this bean and determines the property names for constructor arguments.</em>
+<a class="jxr_linenumber" name="L915" href="#L915">915</a> <em class="jxr_comment">	 *</em>
+<a class="jxr_linenumber" name="L916" href="#L916">916</a> <em class="jxr_comment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L917" href="#L917">917</a> <em class="jxr_comment">	 * This method searches for a constructor in the following order of precedence:</em>
+<a class="jxr_linenumber" name="L918" href="#L918">918</a> <em class="jxr_comment">	 * &lt;ol&gt;</em>
+<a class="jxr_linenumber" name="L919" href="#L919">919</a> <em class="jxr_comment">	 * 	&lt;li&gt;&lt;b&gt;{@link Beanc @Beanc} annotated constructor:&lt;/b&gt; If a constructor is annotated with {@link Beanc @Beanc},</em>
+<a class="jxr_linenumber" name="L920" href="#L920">920</a> <em class="jxr_comment">	 * 		it is used. The property names are determined from:</em>
+<a class="jxr_linenumber" name="L921" href="#L921">921</a> <em class="jxr_comment">	 * 		&lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L922" href="#L922">922</a> <em class="jxr_comment">	 * 			&lt;li&gt;The {@link Beanc#properties() properties()} value in the annotation, if specified</em>
+<a class="jxr_linenumber" name="L923" href="#L923">923</a> <em class="jxr_comment">	 * 			&lt;li&gt;Otherwise, the parameter names from the constructor (if available in bytecode)</em>
+<a class="jxr_linenumber" name="L924" href="#L924">924</a> <em class="jxr_comment">	 * 		&lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L925" href="#L925">925</a> <em class="jxr_comment">	 * 		If multiple constructors are annotated with {@link Beanc @Beanc}, an exception is thrown.</em>
+<a class="jxr_linenumber" name="L926" href="#L926">926</a> <em class="jxr_comment">	 * 	&lt;li&gt;&lt;b&gt;Implementation class constructor:&lt;/b&gt; If an {@link #implClassConstructor} was provided during bean</em>
+<a class="jxr_linenumber" name="L927" href="#L927">927</a> <em class="jxr_comment">	 * 		metadata creation, it is used with an empty property list.</em>
+<a class="jxr_linenumber" name="L928" href="#L928">928</a> <em class="jxr_comment">	 * 	&lt;li&gt;&lt;b&gt;No-arg constructor:&lt;/b&gt; Searches for a no-argument constructor. The visibility required depends on</em>
+<a class="jxr_linenumber" name="L929" href="#L929">929</a> <em class="jxr_comment">	 * 		whether the class has a {@link Bean @Bean} annotation:</em>
+<a class="jxr_linenumber" name="L930" href="#L930">930</a> <em class="jxr_comment">	 * 		&lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L931" href="#L931">931</a> <em class="jxr_comment">	 * 			&lt;li&gt;If {@link Bean @Bean} is present, private constructors are allowed</em>
+<a class="jxr_linenumber" name="L932" href="#L932">932</a> <em class="jxr_comment">	 * 			&lt;li&gt;Otherwise, the visibility is determined by {@link BeanContext#getBeanConstructorVisibility()}</em>
+<a class="jxr_linenumber" name="L933" href="#L933">933</a> <em class="jxr_comment">	 * 		&lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L934" href="#L934">934</a> <em class="jxr_comment">	 * 	&lt;li&gt;&lt;b&gt;No constructor:&lt;/b&gt; Returns an empty {@link Optional} if no suitable constructor is found.</em>
+<a class="jxr_linenumber" name="L935" href="#L935">935</a> <em class="jxr_comment">	 * &lt;/ol&gt;</em>
+<a class="jxr_linenumber" name="L936" href="#L936">936</a> <em class="jxr_comment">	 *</em>
+<a class="jxr_linenumber" name="L937" href="#L937">937</a> <em class="jxr_comment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L938" href="#L938">938</a> <em class="jxr_comment">	 * The returned {@link BeanConstructor} contains:</em>
+<a class="jxr_linenumber" name="L939" href="#L939">939</a> <em class="jxr_comment">	 * &lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L940" href="#L940">940</a> <em class="jxr_comment">	 * 	&lt;li&gt;The constructor (if found), wrapped in an {@link Optional}</em>
+<a class="jxr_linenumber" name="L941" href="#L941">941</a> <em class="jxr_comment">	 * 	&lt;li&gt;A list of property names that correspond to the constructor parameters, in order</em>
+<a class="jxr_linenumber" name="L942" href="#L942">942</a> <em class="jxr_comment">	 * &lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L943" href="#L943">943</a> <em class="jxr_comment">	 *</em>
+<a class="jxr_linenumber" name="L944" href="#L944">944</a> <em class="jxr_comment">	 * @return A {@link BeanConstructor} containing the found constructor and its associated property names.</em>
+<a class="jxr_linenumber" name="L945" href="#L945">945</a> <em class="jxr_comment">	 * @throws BeanRuntimeException If multiple constructors are annotated with {@link Beanc @Beanc}, or if</em>
+<a class="jxr_linenumber" name="L946" href="#L946">946</a> <em class="jxr_comment">	 * 	the number of properties specified in {@link Beanc @Beanc} doesn't match the number of constructor parameters,</em>
+<a class="jxr_linenumber" name="L947" href="#L947">947</a> <em class="jxr_comment">	 * 	or if parameter names cannot be determined from the bytecode.</em>
+<a class="jxr_linenumber" name="L948" href="#L948">948</a> <em class="jxr_comment">	 */</em>
+<a class="jxr_linenumber" name="L949" href="#L949">949</a> 	<strong class="jxr_keyword">private</strong> BeanConstructor findBeanConstructor() {
+<a class="jxr_linenumber" name="L950" href="#L950">950</a> 		<strong class="jxr_keyword">var</strong> ap = beanContext.getAnnotationProvider();
+<a class="jxr_linenumber" name="L951" href="#L951">951</a> 		<strong class="jxr_keyword">var</strong> vis = beanContext.getBeanConstructorVisibility();
+<a class="jxr_linenumber" name="L952" href="#L952">952</a> 		<strong class="jxr_keyword">var</strong> ci = classMeta;
+<a class="jxr_linenumber" name="L953" href="#L953">953</a> 
+<a class="jxr_linenumber" name="L954" href="#L954">954</a> 		<strong class="jxr_keyword">var</strong> l = ci.getPublicConstructors().stream().filter(x -&gt; ap.has(Beanc.<strong class="jxr_keyword">class</strong>, x)).toList();
+<a class="jxr_linenumber" name="L955" href="#L955">955</a> 		<strong class="jxr_keyword">if</strong> (l.isEmpty())
+<a class="jxr_linenumber" name="L956" href="#L956">956</a> 			l = ci.getDeclaredConstructors().stream().filter(x -&gt; ap.has(Beanc.<strong class="jxr_keyword">class</strong>, x)).toList();
+<a class="jxr_linenumber" name="L957" href="#L957">957</a> 		<strong class="jxr_keyword">if</strong> (l.size() &gt; 1)
+<a class="jxr_linenumber" name="L958" href="#L958">958</a> 			<strong class="jxr_keyword">throw</strong> bex(ci, <span class="jxr_string">"Multiple instances of '@Beanc' found."</span>);
+<a class="jxr_linenumber" name="L959" href="#L959">959</a> 		<strong class="jxr_keyword">if</strong> (l.size() == 1) {
+<a class="jxr_linenumber" name="L960" href="#L960">960</a> 			<strong class="jxr_keyword">var</strong> con = l.get(0).accessible();
+<a class="jxr_linenumber" name="L961" href="#L961">961</a> 			<strong class="jxr_keyword">var</strong> args = ap.find(Beanc.<strong class="jxr_keyword">class</strong>, con).stream().map(x -&gt; x.<strong class="jxr_keyword">inner</strong>().properties()).filter(StringUtils::isNotBlank).map(x -&gt; split(x)).findFirst().orElse(liste());
+<a class="jxr_linenumber" name="L962" href="#L962">962</a> 			<strong class="jxr_keyword">if</strong> (! con.hasNumParameters(args.size())) {
+<a class="jxr_linenumber" name="L963" href="#L963">963</a> 				<strong class="jxr_keyword">if</strong> (isNotEmpty(args))
+<a class="jxr_linenumber" name="L964" href="#L964">964</a> 					<strong class="jxr_keyword">throw</strong> bex(ci, <span class="jxr_string">"Number of properties defined in '@Beanc' annotation does not match number of parameters in constructor."</span>);
+<a class="jxr_linenumber" name="L965" href="#L965">965</a> 				args = con.getParameters().stream().map(x -&gt; x.getName()).toList();
+<a class="jxr_linenumber" name="L966" href="#L966">966</a> 				<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i &lt; args.size(); i++) {
+<a class="jxr_linenumber" name="L967" href="#L967">967</a> 					<strong class="jxr_keyword">if</strong> (isBlank(args.get(i)))
+<a class="jxr_linenumber" name="L968" href="#L968">968</a> 						<strong class="jxr_keyword">throw</strong> bex(ci, <span class="jxr_string">"Could not find name for parameter #{0} of constructor ''{1}''"</span>, i, con.getFullName());
+<a class="jxr_linenumber" name="L969" href="#L969">969</a> 				}
+<a class="jxr_linenumber" name="L970" href="#L970">970</a> 			}
+<a class="jxr_linenumber" name="L971" href="#L971">971</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> BeanConstructor(opt(con), args);
+<a class="jxr_linenumber" name="L972" href="#L972">972</a> 		}
+<a class="jxr_linenumber" name="L973" href="#L973">973</a> 
+<a class="jxr_linenumber" name="L974" href="#L974">974</a> 		<strong class="jxr_keyword">if</strong> (implClassConstructor != <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L975" href="#L975">975</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> BeanConstructor(opt(implClassConstructor.accessible()), liste());
+<a class="jxr_linenumber" name="L976" href="#L976">976</a> 
+<a class="jxr_linenumber" name="L977" href="#L977">977</a> 		<strong class="jxr_keyword">var</strong> ba = ap.find(Bean.<strong class="jxr_keyword">class</strong>, classMeta);
+<a class="jxr_linenumber" name="L978" href="#L978">978</a> 		<strong class="jxr_keyword">var</strong> con = ci.getNoArgConstructor(! ba.isEmpty() ? Visibility.PRIVATE : vis).orElse(<strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="L979" href="#L979">979</a> 		<strong class="jxr_keyword">if</strong> (con != <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L980" href="#L980">980</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> BeanConstructor(opt(con.accessible()), liste());
+<a class="jxr_linenumber" name="L981" href="#L981">981</a> 
+<a class="jxr_linenumber" name="L982" href="#L982">982</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> BeanConstructor(opte(), liste());
+<a class="jxr_linenumber" name="L983" href="#L983">983</a> 	}
+<a class="jxr_linenumber" name="L984" href="#L984">984</a> 
+<a class="jxr_linenumber" name="L985" href="#L985">985</a> 	<em class="jxr_comment">/*</em>
+<a class="jxr_linenumber" name="L986" href="#L986">986</a> <em class="jxr_comment">	 * Finds all bean fields in the class hierarchy.</em>
+<a class="jxr_linenumber" name="L987" href="#L987">987</a> <em class="jxr_comment">	 *</em>
+<a class="jxr_linenumber" name="L988" href="#L988">988</a> <em class="jxr_comment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L989" href="#L989">989</a> <em class="jxr_comment">	 * Traverses the complete class hierarchy (as defined by {@link #classHierarchy}) and collects all fields that</em>
+<a class="jxr_linenumber" name="L990" href="#L990">990</a> <em class="jxr_comment">	 * meet the bean field criteria:</em>
+<a class="jxr_linenumber" name="L991" href="#L991">991</a> <em class="jxr_comment">	 * &lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L992" href="#L992">992</a> <em class="jxr_comment">	 * 	&lt;li&gt;Not static</em>
+<a class="jxr_linenumber" name="L993" href="#L993">993</a> <em class="jxr_comment">	 * 	&lt;li&gt;Not transient (unless transient fields are not ignored)</em>
+<a class="jxr_linenumber" name="L994" href="#L994">994</a> <em class="jxr_comment">	 * 	&lt;li&gt;Not annotated with {@link Transient @Transient} (unless transient fields are not ignored)</em>
+<a class="jxr_linenumber" name="L995" href="#L995">995</a> <em class="jxr_comment">	 * 	&lt;li&gt;Not annotated with {@link BeanIgnore @BeanIgnore}</em>
+<a class="jxr_linenumber" name="L996" href="#L996">996</a> <em class="jxr_comment">	 * 	&lt;li&gt;Visible according to the specified visibility level, or annotated with {@link Beanp @Beanp}</em>
+<a class="jxr_linenumber" name="L997" href="#L997">997</a> <em class="jxr_comment">	 * &lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L998" href="#L998">998</a> <em class="jxr_comment">	 *</em>
+<a class="jxr_linenumber" name="L999" href="#L999">999</a> <em class="jxr_comment">	 * @return A collection of all bean fields found in the class hierarchy.</em>
+<a class="jxr_linenumber" name="L1000" href="#L1000">1000</a> <em class="jxr_comment">	 */</em>
+<a class="jxr_linenumber" name="L1001" href="#L1001">1001</a> 	<strong class="jxr_keyword">private</strong> Collection&lt;FieldInfo&gt; findBeanFields() {
+<a class="jxr_linenumber" name="L1002" href="#L1002">1002</a> 		<strong class="jxr_keyword">var</strong> v = beanContext.getBeanFieldVisibility();
+<a class="jxr_linenumber" name="L1003" href="#L1003">1003</a> 		<strong class="jxr_keyword">var</strong> noIgnoreTransients = ! beanContext.isIgnoreTransientFields();
+<a class="jxr_linenumber" name="L1004" href="#L1004">1004</a> 		<strong class="jxr_keyword">var</strong> ap = beanContext.getAnnotationProvider();
+<a class="jxr_linenumber" name="L1005" href="#L1005">1005</a> 		<em class="jxr_comment">// @formatter:off</em>
+<a class="jxr_linenumber" name="L1006" href="#L1006">1006</a> 		<strong class="jxr_keyword">return</strong> classHierarchy.get().stream()
+<a class="jxr_linenumber" name="L1007" href="#L1007">1007</a> 			.flatMap(c2 -&gt; c2.getDeclaredFields().stream())
+<a class="jxr_linenumber" name="L1008" href="#L1008">1008</a> 			.filter(x -&gt; x.isNotStatic()
+<a class="jxr_linenumber" name="L1009" href="#L1009">1009</a> 				&amp;&amp; (x.isNotTransient() || noIgnoreTransients)
+<a class="jxr_linenumber" name="L1010" href="#L1010">1010</a> 				&amp;&amp; (! x.hasAnnotation(Transient.<strong class="jxr_keyword">class</strong>) || noIgnoreTransients)
+<a class="jxr_linenumber" name="L1011" href="#L1011">1011</a> 				&amp;&amp; ! ap.has(BeanIgnore.<strong class="jxr_keyword">class</strong>, x)
+<a class="jxr_linenumber" name="L1012" href="#L1012">1012</a> 				&amp;&amp; (v.isVisible(x.<strong class="jxr_keyword">inner</strong>()) || ap.has(Beanp.<strong class="jxr_keyword">class</strong>, x)))
+<a class="jxr_linenumber" name="L1013" href="#L1013">1013</a> 			.toList();
+<a class="jxr_linenumber" name="L1014" href="#L1014">1014</a> 		<em class="jxr_comment">// @formatter:on</em>
+<a class="jxr_linenumber" name="L1015" href="#L1015">1015</a> 	}
+<a class="jxr_linenumber" name="L1016" href="#L1016">1016</a> 
+<a class="jxr_linenumber" name="L1017" href="#L1017">1017</a> 	<em class="jxr_comment">/*</em>
+<a class="jxr_linenumber" name="L1018" href="#L1018">1018</a> <em class="jxr_comment">	 * Finds all bean methods (getters, setters, and extraKeys) in the class hierarchy.</em>
+<a class="jxr_linenumber" name="L1019" href="#L1019">1019</a> <em class="jxr_comment">	 *</em>
+<a class="jxr_linenumber" name="L1020" href="#L1020">1020</a> <em class="jxr_comment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L1021" href="#L1021">1021</a> <em class="jxr_comment">	 * Traverses the complete class hierarchy (as defined by {@link #classHierarchy}) and identifies methods that</em>
+<a class="jxr_linenumber" name="L1022" href="#L1022">1022</a> <em class="jxr_comment">	 * represent bean properties. Methods are identified as:</em>
+<a class="jxr_linenumber" name="L1023" href="#L1023">1023</a> <em class="jxr_comment">	 * &lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L1024" href="#L1024">1024</a> <em class="jxr_comment">	 * 	&lt;li&gt;&lt;b&gt;Getters:&lt;/b&gt; Methods with no parameters that return a value, matching patterns like:</em>
+<a class="jxr_linenumber" name="L1025" href="#L1025">1025</a> <em class="jxr_comment">	 * 		&lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L1026" href="#L1026">1026</a> <em class="jxr_comment">	 * 			&lt;li&gt;&lt;c&gt;getX()&lt;/c&gt; - standard getter pattern</em>
+<a class="jxr_linenumber" name="L1027" href="#L1027">1027</a> <em class="jxr_comment">	 * 			&lt;li&gt;&lt;c&gt;isX()&lt;/c&gt; - boolean getter pattern (returns boolean or Boolean)</em>
+<a class="jxr_linenumber" name="L1028" href="#L1028">1028</a> <em class="jxr_comment">	 * 			&lt;li&gt;Methods annotated with {@link Beanp @Beanp} or {@link Name @Name}</em>
+<a class="jxr_linenumber" name="L1029" href="#L1029">1029</a> <em class="jxr_comment">	 * 			&lt;li&gt;Methods with {@link Beanp @Beanp} annotation with value &lt;js&gt;"*"&lt;/js&gt; that return a Map</em>
+<a class="jxr_linenumber" name="L1030" href="#L1030">1030</a> <em class="jxr_comment">	 * 		&lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L1031" href="#L1031">1031</a> <em class="jxr_comment">	 * 	&lt;li&gt;&lt;b&gt;Setters:&lt;/b&gt; Methods with one parameter that match patterns like:</em>
+<a class="jxr_linenumber" name="L1032" href="#L1032">1032</a> <em class="jxr_comment">	 * 		&lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L1033" href="#L1033">1033</a> <em class="jxr_comment">	 * 			&lt;li&gt;&lt;c&gt;setX(value)&lt;/c&gt; - standard setter pattern</em>
+<a class="jxr_linenumber" name="L1034" href="#L1034">1034</a> <em class="jxr_comment">	 * 			&lt;li&gt;&lt;c&gt;withX(value)&lt;/c&gt; - fluent setter pattern (returns the bean type)</em>
+<a class="jxr_linenumber" name="L1035" href="#L1035">1035</a> <em class="jxr_comment">	 * 			&lt;li&gt;Methods annotated with {@link Beanp @Beanp} or {@link Name @Name}</em>
+<a class="jxr_linenumber" name="L1036" href="#L1036">1036</a> <em class="jxr_comment">	 * 			&lt;li&gt;Methods with {@link Beanp @Beanp} annotation with value &lt;js&gt;"*"&lt;/js&gt; that accept a Map</em>
+<a class="jxr_linenumber" name="L1037" href="#L1037">1037</a> <em class="jxr_comment">	 * 			&lt;li&gt;Fluent setters (if enabled) - methods that return the bean type and accept one parameter</em>
+<a class="jxr_linenumber" name="L1038" href="#L1038">1038</a> <em class="jxr_comment">	 * 		&lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L1039" href="#L1039">1039</a> <em class="jxr_comment">	 * 	&lt;li&gt;&lt;b&gt;ExtraKeys:&lt;/b&gt; Methods with {@link Beanp @Beanp} annotation with value &lt;js&gt;"*"&lt;/js&gt; that return a Collection</em>
+<a class="jxr_linenumber" name="L1040" href="#L1040">1040</a> <em class="jxr_comment">	 * &lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L1041" href="#L1041">1041</a> <em class="jxr_comment">	 *</em>
+<a class="jxr_linenumber" name="L1042" href="#L1042">1042</a> <em class="jxr_comment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L1043" href="#L1043">1043</a> <em class="jxr_comment">	 * Methods are filtered based on:</em>
+<a class="jxr_linenumber" name="L1044" href="#L1044">1044</a> <em class="jxr_comment">	 * &lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L1045" href="#L1045">1045</a> <em class="jxr_comment">	 * 	&lt;li&gt;Not static, not bridge methods</em>
+<a class="jxr_linenumber" name="L1046" href="#L1046">1046</a> <em class="jxr_comment">	 * 	&lt;li&gt;Parameter count ≤ 2</em>
+<a class="jxr_linenumber" name="L1047" href="#L1047">1047</a> <em class="jxr_comment">	 * 	&lt;li&gt;Not annotated with {@link BeanIgnore @BeanIgnore}</em>
+<a class="jxr_linenumber" name="L1048" href="#L1048">1048</a> <em class="jxr_comment">	 * 	&lt;li&gt;Not annotated with {@link Transient @Transient}</em>
+<a class="jxr_linenumber" name="L1049" href="#L1049">1049</a> <em class="jxr_comment">	 * 	&lt;li&gt;Visible according to the specified visibility level, or annotated with {@link Beanp @Beanp} or {@link Name @Name}</em>
+<a class="jxr_linenumber" name="L1050" href="#L1050">1050</a> <em class="jxr_comment">	 * &lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L1051" href="#L1051">1051</a> <em class="jxr_comment">	 *</em>
+<a class="jxr_linenumber" name="L1052" href="#L1052">1052</a> <em class="jxr_comment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L1053" href="#L1053">1053</a> <em class="jxr_comment">	 * Property names are determined from:</em>
+<a class="jxr_linenumber" name="L1054" href="#L1054">1054</a> <em class="jxr_comment">	 * &lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L1055" href="#L1055">1055</a> <em class="jxr_comment">	 * 	&lt;li&gt;{@link Beanp @Beanp} or {@link Name @Name} annotations (if present)</em>
+<a class="jxr_linenumber" name="L1056" href="#L1056">1056</a> <em class="jxr_comment">	 * 	&lt;li&gt;Otherwise, derived from the method name using the provided {@link PropertyNamer}</em>
+<a class="jxr_linenumber" name="L1057" href="#L1057">1057</a> <em class="jxr_comment">	 * &lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L1058" href="#L1058">1058</a> <em class="jxr_comment">	 *</em>
+<a class="jxr_linenumber" name="L1059" href="#L1059">1059</a> <em class="jxr_comment">	 * @return A list of {@link BeanMethod} objects representing all found bean methods.</em>
+<a class="jxr_linenumber" name="L1060" href="#L1060">1060</a> <em class="jxr_comment">	 */</em>
+<a class="jxr_linenumber" name="L1061" href="#L1061">1061</a> 	<strong class="jxr_keyword">private</strong> List&lt;BeanMethod&gt; findBeanMethods() {
+<a class="jxr_linenumber" name="L1062" href="#L1062">1062</a> 		<strong class="jxr_keyword">var</strong> l = <strong class="jxr_keyword">new</strong> LinkedList&lt;BeanMethod&gt;();
+<a class="jxr_linenumber" name="L1063" href="#L1063">1063</a> 		<strong class="jxr_keyword">var</strong> ap = beanContext.getAnnotationProvider();
+<a class="jxr_linenumber" name="L1064" href="#L1064">1064</a> 		<strong class="jxr_keyword">var</strong> ci = classMeta;
+<a class="jxr_linenumber" name="L1065" href="#L1065">1065</a> 		<strong class="jxr_keyword">var</strong> v = beanContext.getBeanMethodVisibility();
+<a class="jxr_linenumber" name="L1066" href="#L1066">1066</a> 		<strong class="jxr_keyword">var</strong> pn = opt(beanFilter).map(x -&gt; x.getPropertyNamer()).orElse(beanContext.getPropertyNamer());
+<a class="jxr_linenumber" name="L1067" href="#L1067">1067</a> 
+<a class="jxr_linenumber" name="L1068" href="#L1068">1068</a> 		classHierarchy.get().stream().forEach(c2 -&gt; {
+<a class="jxr_linenumber" name="L1069" href="#L1069">1069</a> 			<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> m : c2.getDeclaredMethods()) {
+<a class="jxr_linenumber" name="L1070" href="#L1070">1070</a> 
+<a class="jxr_linenumber" name="L1071" href="#L1071">1071</a> 				<strong class="jxr_keyword">if</strong> (m.isStatic() || m.isBridge() || m.getParameterCount() &gt; 2)
+<a class="jxr_linenumber" name="L1072" href="#L1072">1072</a> 					<strong class="jxr_keyword">continue</strong>;
+<a class="jxr_linenumber" name="L1073" href="#L1073">1073</a> 
+<a class="jxr_linenumber" name="L1074" href="#L1074">1074</a> 				<strong class="jxr_keyword">var</strong> mm = m.getMatchingMethods();
+<a class="jxr_linenumber" name="L1075" href="#L1075">1075</a> 
+<a class="jxr_linenumber" name="L1076" href="#L1076">1076</a> 				<strong class="jxr_keyword">if</strong> (mm.stream().anyMatch(m2 -&gt; ap.has(BeanIgnore.<strong class="jxr_keyword">class</strong>, m2, SELF)))
+<a class="jxr_linenumber" name="L1077" href="#L1077">1077</a> 					<strong class="jxr_keyword">continue</strong>;
+<a class="jxr_linenumber" name="L1078" href="#L1078">1078</a> 
+<a class="jxr_linenumber" name="L1079" href="#L1079">1079</a> 				<strong class="jxr_keyword">if</strong> (mm.stream().anyMatch(m2 -&gt; ap.find(Transient.<strong class="jxr_keyword">class</strong>, m2, SELF).stream().map(x -&gt; x.<strong class="jxr_keyword">inner</strong>().value()).findFirst().orElse(false)))
+<a class="jxr_linenumber" name="L1080" href="#L1080">1080</a> 					<strong class="jxr_keyword">continue</strong>;
+<a class="jxr_linenumber" name="L1081" href="#L1081">1081</a> 
+<a class="jxr_linenumber" name="L1082" href="#L1082">1082</a> 				<strong class="jxr_keyword">var</strong> beanps = ap.find(Beanp.<strong class="jxr_keyword">class</strong>, m).stream().map(AnnotationInfo::<strong class="jxr_keyword">inner</strong>).toList();
+<a class="jxr_linenumber" name="L1083" href="#L1083">1083</a> 				<strong class="jxr_keyword">var</strong> names = ap.find(Name.<strong class="jxr_keyword">class</strong>, m).stream().map(AnnotationInfo::<strong class="jxr_keyword">inner</strong>).toList();
+<a class="jxr_linenumber" name="L1084" href="#L1084">1084</a> 
+<a class="jxr_linenumber" name="L1085" href="#L1085">1085</a> 				<strong class="jxr_keyword">if</strong> (! (m.isVisible(v) || isNotEmpty(beanps) || isNotEmpty(names)))
+<a class="jxr_linenumber" name="L1086" href="#L1086">1086</a> 					<strong class="jxr_keyword">continue</strong>;
+<a class="jxr_linenumber" name="L1087" href="#L1087">1087</a> 
+<a class="jxr_linenumber" name="L1088" href="#L1088">1088</a> 				<strong class="jxr_keyword">var</strong> n = m.getSimpleName();
+<a class="jxr_linenumber" name="L1089" href="#L1089">1089</a> 
+<a class="jxr_linenumber" name="L1090" href="#L1090">1090</a> 				<strong class="jxr_keyword">var</strong> params = m.getParameters();
+<a class="jxr_linenumber" name="L1091" href="#L1091">1091</a> 				<strong class="jxr_keyword">var</strong> rt = m.getReturnType();
+<a class="jxr_linenumber" name="L1092" href="#L1092">1092</a> 				<strong class="jxr_keyword">var</strong> methodType = UNKNOWN;
+<a class="jxr_linenumber" name="L1093" href="#L1093">1093</a> 				<strong class="jxr_keyword">var</strong> bpName = bpName(beanps, names);
+<a class="jxr_linenumber" name="L1094" href="#L1094">1094</a> 
+<a class="jxr_linenumber" name="L1095" href="#L1095">1095</a> 				<strong class="jxr_keyword">if</strong> (params.isEmpty()) {
+<a class="jxr_linenumber" name="L1096" href="#L1096">1096</a> 					<strong class="jxr_keyword">if</strong> (<span class="jxr_string">"*"</span>.equals(bpName)) {
+<a class="jxr_linenumber" name="L1097" href="#L1097">1097</a> 						<strong class="jxr_keyword">if</strong> (rt.isChildOf(Collection.<strong class="jxr_keyword">class</strong>)) {
+<a class="jxr_linenumber" name="L1098" href="#L1098">1098</a> 							methodType = EXTRAKEYS;
+<a class="jxr_linenumber" name="L1099" href="#L1099">1099</a> 						} <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (rt.isChildOf(Map.<strong class="jxr_keyword">class</strong>)) {
+<a class="jxr_linenumber" name="L1100" href="#L1100">1100</a> 							methodType = GETTER;
+<a class="jxr_linenumber" name="L1101" href="#L1101">1101</a> 						}
+<a class="jxr_linenumber" name="L1102" href="#L1102">1102</a> 						n = bpName;
+<a class="jxr_linenumber" name="L1103" href="#L1103">1103</a> 					} <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (n.startsWith(<span class="jxr_string">"get"</span>) &amp;&amp; (! rt.is(Void.TYPE))) {
+<a class="jxr_linenumber" name="L1104" href="#L1104">1104</a> 						methodType = GETTER;
+<a class="jxr_linenumber" name="L1105" href="#L1105">1105</a> 						n = n.substring(3);
+<a class="jxr_linenumber" name="L1106" href="#L1106">1106</a> 					} <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (n.startsWith(<span class="jxr_string">"is"</span>) &amp;&amp; (rt.is(Boolean.TYPE) || rt.is(Boolean.<strong class="jxr_keyword">class</strong>))) {
+<a class="jxr_linenumber" name="L1107" href="#L1107">1107</a> 						methodType = GETTER;
+<a class="jxr_linenumber" name="L1108" href="#L1108">1108</a> 						n = n.substring(2);
+<a class="jxr_linenumber" name="L1109" href="#L1109">1109</a> 					} <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (nn(bpName)) {
+<a class="jxr_linenumber" name="L1110" href="#L1110">1110</a> 						methodType = GETTER;
+<a class="jxr_linenumber" name="L1111" href="#L1111">1111</a> 						<strong class="jxr_keyword">if</strong> (bpName.isEmpty()) {
+<a class="jxr_linenumber" name="L1112" href="#L1112">1112</a> 							<strong class="jxr_keyword">if</strong> (n.startsWith(<span class="jxr_string">"get"</span>))
+<a class="jxr_linenumber" name="L1113" href="#L1113">1113</a> 								n = n.substring(3);
+<a class="jxr_linenumber" name="L1114" href="#L1114">1114</a> 							<strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (n.startsWith(<span class="jxr_string">"is"</span>))
+<a class="jxr_linenumber" name="L1115" href="#L1115">1115</a> 								n = n.substring(2);
+<a class="jxr_linenumber" name="L1116" href="#L1116">1116</a> 							bpName = n;
+<a class="jxr_linenumber" name="L1117" href="#L1117">1117</a> 						} <strong class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="L1118" href="#L1118">1118</a> 							n = bpName;
+<a class="jxr_linenumber" name="L1119" href="#L1119">1119</a> 						}
+<a class="jxr_linenumber" name="L1120" href="#L1120">1120</a> 					}
+<a class="jxr_linenumber" name="L1121" href="#L1121">1121</a> 				} <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (params.size() == 1) {
+<a class="jxr_linenumber" name="L1122" href="#L1122">1122</a> 					<strong class="jxr_keyword">if</strong> (<span class="jxr_string">"*"</span>.equals(bpName)) {
+<a class="jxr_linenumber" name="L1123" href="#L1123">1123</a> 						<strong class="jxr_keyword">if</strong> (params.get(0).getParameterType().isChildOf(Map.<strong class="jxr_keyword">class</strong>)) {
+<a class="jxr_linenumber" name="L1124" href="#L1124">1124</a> 							methodType = SETTER;
+<a class="jxr_linenumber" name="L1125" href="#L1125">1125</a> 							n = bpName;
+<a class="jxr_linenumber" name="L1126" href="#L1126">1126</a> 						} <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (params.get(0).getParameterType().is(String.<strong class="jxr_keyword">class</strong>)) {
+<a class="jxr_linenumber" name="L1127" href="#L1127">1127</a> 							methodType = GETTER;
+<a class="jxr_linenumber" name="L1128" href="#L1128">1128</a> 							n = bpName;
+<a class="jxr_linenumber" name="L1129" href="#L1129">1129</a> 						}
+<a class="jxr_linenumber" name="L1130" href="#L1130">1130</a> 					} <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (n.startsWith(<span class="jxr_string">"set"</span>) &amp;&amp; (rt.isParentOf(ci) || rt.is(Void.TYPE))) {
+<a class="jxr_linenumber" name="L1131" href="#L1131">1131</a> 						methodType = SETTER;
+<a class="jxr_linenumber" name="L1132" href="#L1132">1132</a> 						n = n.substring(3);
+<a class="jxr_linenumber" name="L1133" href="#L1133">1133</a> 					} <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (n.startsWith(<span class="jxr_string">"with"</span>) &amp;&amp; (rt.isParentOf(ci))) {
+<a class="jxr_linenumber" name="L1134" href="#L1134">1134</a> 						methodType = SETTER;
+<a class="jxr_linenumber" name="L1135" href="#L1135">1135</a> 						n = n.substring(4);
+<a class="jxr_linenumber" name="L1136" href="#L1136">1136</a> 					} <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (nn(bpName)) {
+<a class="jxr_linenumber" name="L1137" href="#L1137">1137</a> 						methodType = SETTER;
+<a class="jxr_linenumber" name="L1138" href="#L1138">1138</a> 						<strong class="jxr_keyword">if</strong> (bpName.isEmpty()) {
+<a class="jxr_linenumber" name="L1139" href="#L1139">1139</a> 							<strong class="jxr_keyword">if</strong> (n.startsWith(<span class="jxr_string">"set"</span>))
+<a class="jxr_linenumber" name="L1140" href="#L1140">1140</a> 								n = n.substring(3);
+<a class="jxr_linenumber" name="L1141" href="#L1141">1141</a> 							bpName = n;
+<a class="jxr_linenumber" name="L1142" href="#L1142">1142</a> 						} <strong class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="L1143" href="#L1143">1143</a> 							n = bpName;
+<a class="jxr_linenumber" name="L1144" href="#L1144">1144</a> 						}
+<a class="jxr_linenumber" name="L1145" href="#L1145">1145</a> 					} <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (fluentSetters &amp;&amp; rt.isParentOf(ci)) {
+<a class="jxr_linenumber" name="L1146" href="#L1146">1146</a> 						methodType = SETTER;
+<a class="jxr_linenumber" name="L1147" href="#L1147">1147</a> 					}
+<a class="jxr_linenumber" name="L1148" href="#L1148">1148</a> 				} <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (params.size() == 2) {
+<a class="jxr_linenumber" name="L1149" href="#L1149">1149</a> 					<strong class="jxr_keyword">if</strong> (<span class="jxr_string">"*"</span>.equals(bpName) &amp;&amp; params.get(0).getParameterType().is(String.<strong class="jxr_keyword">class</strong>)) {
+<a class="jxr_linenumber" name="L1150" href="#L1150">1150</a> 						<strong class="jxr_keyword">if</strong> (n.startsWith(<span class="jxr_string">"set"</span>) &amp;&amp; (rt.isParentOf(ci) || rt.is(Void.TYPE))) {
+<a class="jxr_linenumber" name="L1151" href="#L1151">1151</a> 							methodType = SETTER;
+<a class="jxr_linenumber" name="L1152" href="#L1152">1152</a> 						} <strong class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="L1153" href="#L1153">1153</a> 							methodType = GETTER;
+<a class="jxr_linenumber" name="L1154" href="#L1154">1154</a> 						}
+<a class="jxr_linenumber" name="L1155" href="#L1155">1155</a> 						n = bpName;
+<a class="jxr_linenumber" name="L1156" href="#L1156">1156</a> 					}
+<a class="jxr_linenumber" name="L1157" href="#L1157">1157</a> 				}
+<a class="jxr_linenumber" name="L1158" href="#L1158">1158</a> 				n = pn.getPropertyName(n);
+<a class="jxr_linenumber" name="L1159" href="#L1159">1159</a> 
+<a class="jxr_linenumber" name="L1160" href="#L1160">1160</a> 				<strong class="jxr_keyword">if</strong> (<span class="jxr_string">"*"</span>.equals(bpName) &amp;&amp; methodType == UNKNOWN)
+<a class="jxr_linenumber" name="L1161" href="#L1161">1161</a> 					<strong class="jxr_keyword">throw</strong> bex(ci, <span class="jxr_string">"Found @Beanp(\&quot;*\&quot;) but could not determine method type on method ''{0}''."</span>, m.getSimpleName());
+<a class="jxr_linenumber" name="L1162" href="#L1162">1162</a> 
+<a class="jxr_linenumber" name="L1163" href="#L1163">1163</a> 				<strong class="jxr_keyword">if</strong> (methodType != UNKNOWN) {
+<a class="jxr_linenumber" name="L1164" href="#L1164">1164</a> 					<strong class="jxr_keyword">if</strong> (nn(bpName) &amp;&amp; ! bpName.isEmpty())
+<a class="jxr_linenumber" name="L1165" href="#L1165">1165</a> 						n = bpName;
+<a class="jxr_linenumber" name="L1166" href="#L1166">1166</a> 					<strong class="jxr_keyword">if</strong> (nn(n))
+<a class="jxr_linenumber" name="L1167" href="#L1167">1167</a> 						l.add(<strong class="jxr_keyword">new</strong> BeanMethod(n, methodType, m.<strong class="jxr_keyword">inner</strong>()));
+<a class="jxr_linenumber" name="L1168" href="#L1168">1168</a> 				}
+<a class="jxr_linenumber" name="L1169" href="#L1169">1169</a> 			}
+<a class="jxr_linenumber" name="L1170" href="#L1170">1170</a> 		});
+<a class="jxr_linenumber" name="L1171" href="#L1171">1171</a> 		<strong class="jxr_keyword">return</strong> l;
+<a class="jxr_linenumber" name="L1172" href="#L1172">1172</a> 	}
+<a class="jxr_linenumber" name="L1173" href="#L1173">1173</a> 
+<a class="jxr_linenumber" name="L1174" href="#L1174">1174</a> 	<em class="jxr_comment">/*</em>
+<a class="jxr_linenumber" name="L1175" href="#L1175">1175</a> <em class="jxr_comment">	 * Creates a bean registry for this bean class.</em>
+<a class="jxr_linenumber" name="L1176" href="#L1176">1176</a> <em class="jxr_comment">	 *</em>
+<a class="jxr_linenumber" name="L1177" href="#L1177">1177</a> <em class="jxr_comment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L1178" href="#L1178">1178</a> <em class="jxr_comment">	 * The bean registry is used to resolve dictionary names (type names) to actual class types. This is essential</em>
+<a class="jxr_linenumber" name="L1179" href="#L1179">1179</a> <em class="jxr_comment">	 * for polymorphic bean serialization and parsing, where a dictionary name in the serialized form needs to be</em>
+<a class="jxr_linenumber" name="L1180" href="#L1180">1180</a> <em class="jxr_comment">	 * mapped back to the correct subclass.</em>
+<a class="jxr_linenumber" name="L1181" href="#L1181">1181</a> <em class="jxr_comment">	 *</em>
+<a class="jxr_linenumber" name="L1182" href="#L1182">1182</a> <em class="jxr_comment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L1183" href="#L1183">1183</a> <em class="jxr_comment">	 * The registry is built from:</em>
+<a class="jxr_linenumber" name="L1184" href="#L1184">1184</a> <em class="jxr_comment">	 * &lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L1185" href="#L1185">1185</a> <em class="jxr_comment">	 * 	&lt;li&gt;&lt;b&gt;Bean filter dictionary:&lt;/b&gt; Classes specified in the {@link BeanFilter#getBeanDictionary() bean filter's dictionary}</em>
+<a class="jxr_linenumber" name="L1186" href="#L1186">1186</a> <em class="jxr_comment">	 * 		(if a bean filter is present)</em>
+<a class="jxr_linenumber" name="L1187" href="#L1187">1187</a> <em class="jxr_comment">	 * 	&lt;li&gt;&lt;b&gt;{@link Bean @Bean} annotation:&lt;/b&gt; If the class has a {@link Bean @Bean} annotation with a non-empty</em>
+<a class="jxr_linenumber" name="L1188" href="#L1188">1188</a> <em class="jxr_comment">	 * 		{@link Bean#typeName() typeName()}, the class itself is added to the dictionary</em>
+<a class="jxr_linenumber" name="L1189" href="#L1189">1189</a> <em class="jxr_comment">	 * &lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L1190" href="#L1190">1190</a> <em class="jxr_comment">	 *</em>
+<a class="jxr_linenumber" name="L1191" href="#L1191">1191</a> <em class="jxr_comment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L1192" href="#L1192">1192</a> <em class="jxr_comment">	 * The registry is used by parsers to determine which class to instantiate when deserializing polymorphic beans.</em>
+<a class="jxr_linenumber" name="L1193" href="#L1193">1193</a> <em class="jxr_comment">	 *</em>
+<a class="jxr_linenumber" name="L1194" href="#L1194">1194</a> <em class="jxr_comment">	 * @return A new {@link BeanRegistry} containing the dictionary classes for this bean, or an empty registry if</em>
+<a class="jxr_linenumber" name="L1195" href="#L1195">1195</a> <em class="jxr_comment">	 * 	no dictionary classes are found.</em>
+<a class="jxr_linenumber" name="L1196" href="#L1196">1196</a> <em class="jxr_comment">	 */</em>
+<a class="jxr_linenumber" name="L1197" href="#L1197">1197</a> 	<strong class="jxr_keyword">private</strong> <a name="BeanRegistry" href="../../../org/apache/juneau/BeanRegistry.html#BeanRegistry">BeanRegistry</a> findBeanRegistry() {
+<a class="jxr_linenumber" name="L1198" href="#L1198">1198</a> 		<em class="jxr_comment">// Bean dictionary on bean filter.</em>
+<a class="jxr_linenumber" name="L1199" href="#L1199">1199</a> 		<strong class="jxr_keyword">var</strong> beanDictionaryClasses = opt(beanFilter).map(x -&gt; (List&lt;ClassInfo&gt;)copyOf(x.getBeanDictionary())).orElse(list());
 <a class="jxr_linenumber" name="L1200" href="#L1200">1200</a> 
-<a class="jxr_linenumber" name="L1201" href="#L1201">1201</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a name="BeanRegistry" href="../../../org/apache/juneau/BeanRegistry.html#BeanRegistry">BeanRegistry</a>(beanContext, <strong class="jxr_keyword">null</strong>, beanDictionaryClasses.stream().map(ClassInfo::<strong class="jxr_keyword">inner</strong>).toArray(Class&lt;?&gt;[]::<strong class="jxr_keyword">new</strong>));
-<a class="jxr_linenumber" name="L1202" href="#L1202">1202</a> 	}
-<a class="jxr_linenumber" name="L1203" href="#L1203">1203</a> 
-<a class="jxr_linenumber" name="L1204" href="#L1204">1204</a> 	<em class="jxr_comment">/*</em>
-<a class="jxr_linenumber" name="L1205" href="#L1205">1205</a> <em class="jxr_comment">	 * Builds a list of all classes in the class hierarchy for this bean.</em>
-<a class="jxr_linenumber" name="L1206" href="#L1206">1206</a> <em class="jxr_comment">	 *</em>
-<a class="jxr_linenumber" name="L1207" href="#L1207">1207</a> <em class="jxr_comment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L1208" href="#L1208">1208</a> <em class="jxr_comment">	 * Traverses the complete inheritance hierarchy (classes and interfaces) starting from the bean class (or the</em>
-<a class="jxr_linenumber" name="L1209" href="#L1209">1209</a> <em class="jxr_comment">	 * interface class specified in the bean filter) and collects all classes up to (but not including) the stop class.</em>
+<a class="jxr_linenumber" name="L1201" href="#L1201">1201</a> 		<em class="jxr_comment">// Bean dictionary from @Bean(typeName) annotation.</em>
+<a class="jxr_linenumber" name="L1202" href="#L1202">1202</a> 		<strong class="jxr_keyword">var</strong> ba = beanContext.getAnnotationProvider().find(Bean.<strong class="jxr_keyword">class</strong>, classMeta);
+<a class="jxr_linenumber" name="L1203" href="#L1203">1203</a> 		ba.stream().map(x -&gt; x.<strong class="jxr_keyword">inner</strong>().typeName()).filter(Utils::isNotEmpty).findFirst().ifPresent(x -&gt; beanDictionaryClasses.add(classMeta));
+<a class="jxr_linenumber" name="L1204" href="#L1204">1204</a> 
+<a class="jxr_linenumber" name="L1205" href="#L1205">1205</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a name="BeanRegistry" href="../../../org/apache/juneau/BeanRegistry.html#BeanRegistry">BeanRegistry</a>(beanContext, <strong class="jxr_keyword">null</strong>, beanDictionaryClasses.stream().map(ClassInfo::<strong class="jxr_keyword">inner</strong>).toArray(Class&lt;?&gt;[]::<strong class="jxr_keyword">new</strong>));
+<a class="jxr_linenumber" name="L1206" href="#L1206">1206</a> 	}
+<a class="jxr_linenumber" name="L1207" href="#L1207">1207</a> 
+<a class="jxr_linenumber" name="L1208" href="#L1208">1208</a> 	<em class="jxr_comment">/*</em>
+<a class="jxr_linenumber" name="L1209" href="#L1209">1209</a> <em class="jxr_comment">	 * Builds a list of all classes in the class hierarchy for this bean.</em>
 <a class="jxr_linenumber" name="L1210" href="#L1210">1210</a> <em class="jxr_comment">	 *</em>
 <a class="jxr_linenumber" name="L1211" href="#L1211">1211</a> <em class="jxr_comment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L1212" href="#L1212">1212</a> <em class="jxr_comment">	 * The traversal order follows a depth-first approach:</em>
-<a class="jxr_linenumber" name="L1213" href="#L1213">1213</a> <em class="jxr_comment">	 * &lt;ol&gt;</em>
-<a class="jxr_linenumber" name="L1214" href="#L1214">1214</a> <em class="jxr_comment">	 * 	&lt;li&gt;First, recursively traverses the superclass hierarchy</em>
-<a class="jxr_linenumber" name="L1215" href="#L1215">1215</a> <em class="jxr_comment">	 * 	&lt;li&gt;Then, recursively traverses all implemented interfaces</em>
-<a class="jxr_linenumber" name="L1216" href="#L1216">1216</a> <em class="jxr_comment">	 * 	&lt;li&gt;Finally, adds the current class itself</em>
-<a class="jxr_linenumber" name="L1217" href="#L1217">1217</a> <em class="jxr_comment">	 * &lt;/ol&gt;</em>
-<a class="jxr_linenumber" name="L1218" href="#L1218">1218</a> <em class="jxr_comment">	 *</em>
-<a class="jxr_linenumber" name="L1219" href="#L1219">1219</a> <em class="jxr_comment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L1220" href="#L1220">1220</a> <em class="jxr_comment">	 * If a {@link BeanFilter#getInterfaceClass() bean filter interface class} is specified, the traversal starts</em>
-<a class="jxr_linenumber" name="L1221" href="#L1221">1221</a> <em class="jxr_comment">	 * from that interface class instead of the bean class itself. This allows beans to use properties defined on</em>
-<a class="jxr_linenumber" name="L1222" href="#L1222">1222</a> <em class="jxr_comment">	 * a parent interface rather than the concrete implementation class.</em>
-<a class="jxr_linenumber" name="L1223" href="#L1223">1223</a> <em class="jxr_comment">	 *</em>
-<a class="jxr_linenumber" name="L1224" href="#L1224">1224</a> <em class="jxr_comment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L1225" href="#L1225">1225</a> <em class="jxr_comment">	 * The resulting list is used to find bean properties, methods, and fields across the entire class hierarchy.</em>
-<a class="jxr_linenumber" name="L1226" href="#L1226">1226</a> <em class="jxr_comment">	 *</em>
-<a class="jxr_linenumber" name="L1227" href="#L1227">1227</a> <em class="jxr_comment">	 * @return An unmodifiable list of {@link ClassInfo} objects representing all classes in the hierarchy, in</em>
-<a class="jxr_linenumber" name="L1228" href="#L1228">1228</a> <em class="jxr_comment">	 * 	traversal order (superclasses first, then interfaces, then the class itself).</em>
-<a class="jxr_linenumber" name="L1229" href="#L1229">1229</a> <em class="jxr_comment">	 */</em>
-<a class="jxr_linenumber" name="L1230" href="#L1230">1230</a> 	<strong class="jxr_keyword">private</strong> List&lt;ClassInfo&gt; findClassHierarchy() {
-<a class="jxr_linenumber" name="L1231" href="#L1231">1231</a> 		<strong class="jxr_keyword">var</strong> result = <strong class="jxr_keyword">new</strong> LinkedList&lt;ClassInfo&gt;();
-<a class="jxr_linenumber" name="L1232" href="#L1232">1232</a> 		<em class="jxr_comment">// If @Bean.interfaceClass is specified on the parent class, then we want</em>
-<a class="jxr_linenumber" name="L1233" href="#L1233">1233</a> 		<em class="jxr_comment">// to use the properties defined on that class, not the subclass.</em>
-<a class="jxr_linenumber" name="L1234" href="#L1234">1234</a> 		<strong class="jxr_keyword">var</strong> c2 = (nn(beanFilter) &amp;&amp; nn(beanFilter.getInterfaceClass()) ? beanFilter.getInterfaceClass() : classMeta);
-<a class="jxr_linenumber" name="L1235" href="#L1235">1235</a> 		findClassHierarchy(c2, stopClass, result::add);
-<a class="jxr_linenumber" name="L1236" href="#L1236">1236</a> 		<strong class="jxr_keyword">return</strong> u(result);
-<a class="jxr_linenumber" name="L1237" href="#L1237">1237</a> 	}
-<a class="jxr_linenumber" name="L1238" href="#L1238">1238</a> 
-<a class="jxr_linenumber" name="L1239" href="#L1239">1239</a> 	<em class="jxr_comment">/*</em>
-<a class="jxr_linenumber" name="L1240" href="#L1240">1240</a> <em class="jxr_comment">	 * Recursively traverses the class hierarchy and invokes the consumer for each class found.</em>
-<a class="jxr_linenumber" name="L1241" href="#L1241">1241</a> <em class="jxr_comment">	 *</em>
-<a class="jxr_linenumber" name="L1242" href="#L1242">1242</a> <em class="jxr_comment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L1243" href="#L1243">1243</a> <em class="jxr_comment">	 * This is a helper method that performs a depth-first traversal of the class hierarchy:</em>
-<a class="jxr_linenumber" name="L1244" href="#L1244">1244</a> <em class="jxr_comment">	 * &lt;ol&gt;</em>
-<a class="jxr_linenumber" name="L1245" href="#L1245">1245</a> <em class="jxr_comment">	 * 	&lt;li&gt;Recursively processes the superclass (if present and not the stop class)</em>
-<a class="jxr_linenumber" name="L1246" href="#L1246">1246</a> <em class="jxr_comment">	 * 	&lt;li&gt;Recursively processes all implemented interfaces</em>
-<a class="jxr_linenumber" name="L1247" href="#L1247">1247</a> <em class="jxr_comment">	 * 	&lt;li&gt;Invokes the consumer with the current class</em>
-<a class="jxr_linenumber" name="L1248" href="#L1248">1248</a> <em class="jxr_comment">	 * &lt;/ol&gt;</em>
-<a class="jxr_linenumber" name="L1249" href="#L1249">1249</a> <em class="jxr_comment">	 *</em>
-<a class="jxr_linenumber" name="L1250" href="#L1250">1250</a> <em class="jxr_comment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L1251" href="#L1251">1251</a> <em class="jxr_comment">	 * The traversal stops when it reaches the stop class (which is not included in the traversal).</em>
-<a class="jxr_linenumber" name="L1252" href="#L1252">1252</a> <em class="jxr_comment">	 *</em>
-<a class="jxr_linenumber" name="L1253" href="#L1253">1253</a> <em class="jxr_comment">	 * @param c The class to start traversal from.</em>
-<a class="jxr_linenumber" name="L1254" href="#L1254">1254</a> <em class="jxr_comment">	 * @param stopClass The class to stop traversal at (exclusive). Traversal will not proceed beyond this class.</em>
-<a class="jxr_linenumber" name="L1255" href="#L1255">1255</a> <em class="jxr_comment">	 * @param consumer The consumer to invoke for each class in the hierarchy.</em>
-<a class="jxr_linenumber" name="L1256" href="#L1256">1256</a> <em class="jxr_comment">	 */</em>
-<a class="jxr_linenumber" name="L1257" href="#L1257">1257</a> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> findClassHierarchy(ClassInfo c, ClassInfo stopClass, Consumer&lt;ClassInfo&gt; consumer) {
-<a class="jxr_linenumber" name="L1258" href="#L1258">1258</a> 		<strong class="jxr_keyword">var</strong> sc = c.getSuperclass();
-<a class="jxr_linenumber" name="L1259" href="#L1259">1259</a> 		<strong class="jxr_keyword">if</strong> (nn(sc) &amp;&amp; ! sc.is(stopClass.<strong class="jxr_keyword">inner</strong>()))
-<a class="jxr_linenumber" name="L1260" href="#L1260">1260</a> 			findClassHierarchy(sc, stopClass, consumer);
-<a class="jxr_linenumber" name="L1261" href="#L1261">1261</a> 		c.getInterfaces().forEach(x -&gt; findClassHierarchy(x, stopClass, consumer));
-<a class="jxr_linenumber" name="L1262" href="#L1262">1262</a> 		consumer.accept(c);
-<a class="jxr_linenumber" name="L1263" href="#L1263">1263</a> 	}
-<a class="jxr_linenumber" name="L1264" href="#L1264">1264</a> 
-<a class="jxr_linenumber" name="L1265" href="#L1265">1265</a> 	<em class="jxr_comment">/*</em>
-<a class="jxr_linenumber" name="L1266" href="#L1266">1266</a> <em class="jxr_comment">	 * Finds the dictionary name (type name) for this bean class.</em>
-<a class="jxr_linenumber" name="L1267" href="#L1267">1267</a> <em class="jxr_comment">	 *</em>
-<a class="jxr_linenumber" name="L1268" href="#L1268">1268</a> <em class="jxr_comment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L1269" href="#L1269">1269</a> <em class="jxr_comment">	 * The dictionary name is used in serialized forms to identify the specific type of a bean instance, enabling</em>
-<a class="jxr_linenumber" name="L1270" href="#L1270">1270</a> <em class="jxr_comment">	 * polymorphic serialization and deserialization. This is especially important when serializing/parsing beans</em>
-<a class="jxr_linenumber" name="L1271" href="#L1271">1271</a> <em class="jxr_comment">	 * that are part of an inheritance hierarchy.</em>
-<a class="jxr_linenumber" name="L1272" href="#L1272">1272</a> <em class="jxr_comment">	 *</em>
-<a class="jxr_linenumber" name="L1273" href="#L1273">1273</a> <em class="jxr_comment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L1274" href="#L1274">1274</a> <em class="jxr_comment">	 * The dictionary name is determined by searching in the following order of precedence:</em>
-<a class="jxr_linenumber" name="L1275" href="#L1275">1275</a> <em class="jxr_comment">	 * &lt;ol&gt;</em>
-<a class="jxr_linenumber" name="L1276" href="#L1276">1276</a> <em class="jxr_comment">	 * 	&lt;li&gt;&lt;b&gt;Bean filter type name:&lt;/b&gt; If a bean filter is present and has a type name specified via</em>
-<a class="jxr_linenumber" name="L1277" href="#L1277">1277</a> <em class="jxr_comment">	 * 		{@link BeanFilter#getTypeName()}, that value is used.</em>
-<a class="jxr_linenumber" name="L1278" href="#L1278">1278</a> <em class="jxr_comment">	 * 	&lt;li&gt;&lt;b&gt;Bean registry lookup:&lt;/b&gt; If a bean registry exists for this bean, it is queried for the type name</em>
-<a class="jxr_linenumber" name="L1279" href="#L1279">1279</a> <em class="jxr_comment">	 * 		of this class.</em>
-<a class="jxr_linenumber" name="L1280" href="#L1280">1280</a> <em class="jxr_comment">	 * 	&lt;li&gt;&lt;b&gt;Parent class registry lookup:&lt;/b&gt; Searches through parent classes and interfaces (starting from the</em>
-<a class="jxr_linenumber" name="L1281" href="#L1281">1281</a> <em class="jxr_comment">	 * 		second one, skipping the class itself) and checks if any of their bean registries contain a type name</em>
-<a class="jxr_linenumber" name="L1282" href="#L1282">1282</a> <em class="jxr_comment">	 * 		for this class.</em>
-<a class="jxr_linenumber" name="L1283" href="#L1283">1283</a> <em class="jxr_comment">	 * 	&lt;li&gt;&lt;b&gt;{@link Bean @Bean} annotation:&lt;/b&gt; If the class has a {@link Bean @Bean} annotation with a non-empty</em>
-<a class="jxr_linenumber" name="L1284" href="#L1284">1284</a> <em class="jxr_comment">	 * 		{@link Bean#typeName() typeName()}, that value is used.</em>
-<a class="jxr_linenumber" name="L1285" href="#L1285">1285</a> <em class="jxr_comment">	 * 	&lt;li&gt;&lt;b&gt;No dictionary name:&lt;/b&gt; Returns &lt;jk&gt;null&lt;/jk&gt; if no dictionary name is found.</em>
-<a class="jxr_linenumber" name="L1286" href="#L1286">1286</a> <em class="jxr_comment">	 * &lt;/ol&gt;</em>
-<a class="jxr_linenumber" name="L1287" href="#L1287">1287</a> <em class="jxr_comment">	 *</em>
-<a class="jxr_linenumber" name="L1288" href="#L1288">1288</a> <em class="jxr_comment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L1289" href="#L1289">1289</a> <em class="jxr_comment">	 * If a dictionary name is found, it will be used in serialized output (typically as a special property like</em>
-<a class="jxr_linenumber" name="L1290" href="#L1290">1290</a> <em class="jxr_comment">	 * &lt;js&gt;"_type"&lt;/js&gt;) so that parsers can determine the correct class to instantiate when deserializing.</em>
+<a class="jxr_linenumber" name="L1212" href="#L1212">1212</a> <em class="jxr_comment">	 * Traverses the complete inheritance hierarchy (classes and interfaces) starting from the bean class (or the</em>
+<a class="jxr_linenumber" name="L1213" href="#L1213">1213</a> <em class="jxr_comment">	 * interface class specified in the bean filter) and collects all classes up to (but not including) the stop class.</em>
+<a class="jxr_linenumber" name="L1214" href="#L1214">1214</a> <em class="jxr_comment">	 *</em>
+<a class="jxr_linenumber" name="L1215" href="#L1215">1215</a> <em class="jxr_comment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L1216" href="#L1216">1216</a> <em class="jxr_comment">	 * The traversal order follows a depth-first approach:</em>
+<a class="jxr_linenumber" name="L1217" href="#L1217">1217</a> <em class="jxr_comment">	 * &lt;ol&gt;</em>
+<a class="jxr_linenumber" name="L1218" href="#L1218">1218</a> <em class="jxr_comment">	 * 	&lt;li&gt;First, recursively traverses the superclass hierarchy</em>
+<a class="jxr_linenumber" name="L1219" href="#L1219">1219</a> <em class="jxr_comment">	 * 	&lt;li&gt;Then, recursively traverses all implemented interfaces</em>
+<a class="jxr_linenumber" name="L1220" href="#L1220">1220</a> <em class="jxr_comment">	 * 	&lt;li&gt;Finally, adds the current class itself</em>
+<a class="jxr_linenumber" name="L1221" href="#L1221">1221</a> <em class="jxr_comment">	 * &lt;/ol&gt;</em>
+<a class="jxr_linenumber" name="L1222" href="#L1222">1222</a> <em class="jxr_comment">	 *</em>
+<a class="jxr_linenumber" name="L1223" href="#L1223">1223</a> <em class="jxr_comment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L1224" href="#L1224">1224</a> <em class="jxr_comment">	 * If a {@link BeanFilter#getInterfaceClass() bean filter interface class} is specified, the traversal starts</em>
+<a class="jxr_linenumber" name="L1225" href="#L1225">1225</a> <em class="jxr_comment">	 * from that interface class instead of the bean class itself. This allows beans to use properties defined on</em>
+<a class="jxr_linenumber" name="L1226" href="#L1226">1226</a> <em class="jxr_comment">	 * a parent interface rather than the concrete implementation class.</em>
+<a class="jxr_linenumber" name="L1227" href="#L1227">1227</a> <em class="jxr_comment">	 *</em>
+<a class="jxr_linenumber" name="L1228" href="#L1228">1228</a> <em class="jxr_comment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L1229" href="#L1229">1229</a> <em class="jxr_comment">	 * The resulting list is used to find bean properties, methods, and fields across the entire class hierarchy.</em>
+<a class="jxr_linenumber" name="L1230" href="#L1230">1230</a> <em class="jxr_comment">	 *</em>
+<a class="jxr_linenumber" name="L1231" href="#L1231">1231</a> <em class="jxr_comment">	 * @return An unmodifiable list of {@link ClassInfo} objects representing all classes in the hierarchy, in</em>
+<a class="jxr_linenumber" name="L1232" href="#L1232">1232</a> <em class="jxr_comment">	 * 	traversal order (superclasses first, then interfaces, then the class itself).</em>
+<a class="jxr_linenumber" name="L1233" href="#L1233">1233</a> <em class="jxr_comment">	 */</em>
+<a class="jxr_linenumber" name="L1234" href="#L1234">1234</a> 	<strong class="jxr_keyword">private</strong> List&lt;ClassInfo&gt; findClassHierarchy() {
+<a class="jxr_linenumber" name="L1235" href="#L1235">1235</a> 		<strong class="jxr_keyword">var</strong> result = <strong class="jxr_keyword">new</strong> LinkedList&lt;ClassInfo&gt;();
+<a class="jxr_linenumber" name="L1236" href="#L1236">1236</a> 		<em class="jxr_comment">// If @Bean.interfaceClass is specified on the parent class, then we want</em>
+<a class="jxr_linenumber" name="L1237" href="#L1237">1237</a> 		<em class="jxr_comment">// to use the properties defined on that class, not the subclass.</em>
+<a class="jxr_linenumber" name="L1238" href="#L1238">1238</a> 		<strong class="jxr_keyword">var</strong> c2 = (nn(beanFilter) &amp;&amp; nn(beanFilter.getInterfaceClass()) ? beanFilter.getInterfaceClass() : classMeta);
+<a class="jxr_linenumber" name="L1239" href="#L1239">1239</a> 		findClassHierarchy(c2, stopClass, result::add);
+<a class="jxr_linenumber" name="L1240" href="#L1240">1240</a> 		<strong class="jxr_keyword">return</strong> u(result);
+<a class="jxr_linenumber" name="L1241" href="#L1241">1241</a> 	}
+<a class="jxr_linenumber" name="L1242" href="#L1242">1242</a> 
+<a class="jxr_linenumber" name="L1243" href="#L1243">1243</a> 	<em class="jxr_comment">/*</em>
+<a class="jxr_linenumber" name="L1244" href="#L1244">1244</a> <em class="jxr_comment">	 * Recursively traverses the class hierarchy and invokes the consumer for each class found.</em>
+<a class="jxr_linenumber" name="L1245" href="#L1245">1245</a> <em class="jxr_comment">	 *</em>
+<a class="jxr_linenumber" name="L1246" href="#L1246">1246</a> <em class="jxr_comment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L1247" href="#L1247">1247</a> <em class="jxr_comment">	 * This is a helper method that performs a depth-first traversal of the class hierarchy:</em>
+<a class="jxr_linenumber" name="L1248" href="#L1248">1248</a> <em class="jxr_comment">	 * &lt;ol&gt;</em>
+<a class="jxr_linenumber" name="L1249" href="#L1249">1249</a> <em class="jxr_comment">	 * 	&lt;li&gt;Recursively processes the superclass (if present and not the stop class)</em>
+<a class="jxr_linenumber" name="L1250" href="#L1250">1250</a> <em class="jxr_comment">	 * 	&lt;li&gt;Recursively processes all implemented interfaces</em>
+<a class="jxr_linenumber" name="L1251" href="#L1251">1251</a> <em class="jxr_comment">	 * 	&lt;li&gt;Invokes the consumer with the current class</em>
+<a class="jxr_linenumber" name="L1252" href="#L1252">1252</a> <em class="jxr_comment">	 * &lt;/ol&gt;</em>
+<a class="jxr_linenumber" name="L1253" href="#L1253">1253</a> <em class="jxr_comment">	 *</em>
+<a class="jxr_linenumber" name="L1254" href="#L1254">1254</a> <em class="jxr_comment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L1255" href="#L1255">1255</a> <em class="jxr_comment">	 * The traversal stops when it reaches the stop class (which is not included in the traversal).</em>
+<a class="jxr_linenumber" name="L1256" href="#L1256">1256</a> <em class="jxr_comment">	 *</em>
+<a class="jxr_linenumber" name="L1257" href="#L1257">1257</a> <em class="jxr_comment">	 * @param c The class to start traversal from.</em>
+<a class="jxr_linenumber" name="L1258" href="#L1258">1258</a> <em class="jxr_comment">	 * @param stopClass The class to stop traversal at (exclusive). Traversal will not proceed beyond this class.</em>
+<a class="jxr_linenumber" name="L1259" href="#L1259">1259</a> <em class="jxr_comment">	 * @param consumer The consumer to invoke for each class in the hierarchy.</em>
+<a class="jxr_linenumber" name="L1260" href="#L1260">1260</a> <em class="jxr_comment">	 */</em>
+<a class="jxr_linenumber" name="L1261" href="#L1261">1261</a> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> findClassHierarchy(ClassInfo c, ClassInfo stopClass, Consumer&lt;ClassInfo&gt; consumer) {
+<a class="jxr_linenumber" name="L1262" href="#L1262">1262</a> 		<strong class="jxr_keyword">var</strong> sc = c.getSuperclass();
+<a class="jxr_linenumber" name="L1263" href="#L1263">1263</a> 		<strong class="jxr_keyword">if</strong> (nn(sc) &amp;&amp; ! sc.is(stopClass.<strong class="jxr_keyword">inner</strong>()))
+<a class="jxr_linenumber" name="L1264" href="#L1264">1264</a> 			findClassHierarchy(sc, stopClass, consumer);
+<a class="jxr_linenumber" name="L1265" href="#L1265">1265</a> 		c.getInterfaces().forEach(x -&gt; findClassHierarchy(x, stopClass, consumer));
+<a class="jxr_linenumber" name="L1266" href="#L1266">1266</a> 		consumer.accept(c);
+<a class="jxr_linenumber" name="L1267" href="#L1267">1267</a> 	}
+<a class="jxr_linenumber" name="L1268" href="#L1268">1268</a> 
+<a class="jxr_linenumber" name="L1269" href="#L1269">1269</a> 	<em class="jxr_comment">/*</em>
+<a class="jxr_linenumber" name="L1270" href="#L1270">1270</a> <em class="jxr_comment">	 * Finds the dictionary name (type name) for this bean class.</em>
+<a class="jxr_linenumber" name="L1271" href="#L1271">1271</a> <em class="jxr_comment">	 *</em>
+<a class="jxr_linenumber" name="L1272" href="#L1272">1272</a> <em class="jxr_comment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L1273" href="#L1273">1273</a> <em class="jxr_comment">	 * The dictionary name is used in serialized forms to identify the specific type of a bean instance, enabling</em>
+<a class="jxr_linenumber" name="L1274" href="#L1274">1274</a> <em class="jxr_comment">	 * polymorphic serialization and deserialization. This is especially important when serializing/parsing beans</em>
+<a class="jxr_linenumber" name="L1275" href="#L1275">1275</a> <em class="jxr_comment">	 * that are part of an inheritance hierarchy.</em>
+<a class="jxr_linenumber" name="L1276" href="#L1276">1276</a> <em class="jxr_comment">	 *</em>
+<a class="jxr_linenumber" name="L1277" href="#L1277">1277</a> <em class="jxr_comment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L1278" href="#L1278">1278</a> <em class="jxr_comment">	 * The dictionary name is determined by searching in the following order of precedence:</em>
+<a class="jxr_linenumber" name="L1279" href="#L1279">1279</a> <em class="jxr_comment">	 * &lt;ol&gt;</em>
+<a class="jxr_linenumber" name="L1280" href="#L1280">1280</a> <em class="jxr_comment">	 * 	&lt;li&gt;&lt;b&gt;Bean filter type name:&lt;/b&gt; If a bean filter is present and has a type name specified via</em>
+<a class="jxr_linenumber" name="L1281" href="#L1281">1281</a> <em class="jxr_comment">	 * 		{@link BeanFilter#getTypeName()}, that value is used.</em>
+<a class="jxr_linenumber" name="L1282" href="#L1282">1282</a> <em class="jxr_comment">	 * 	&lt;li&gt;&lt;b&gt;Bean registry lookup:&lt;/b&gt; If a bean registry exists for this bean, it is queried for the type name</em>
+<a class="jxr_linenumber" name="L1283" href="#L1283">1283</a> <em class="jxr_comment">	 * 		of this class.</em>
+<a class="jxr_linenumber" name="L1284" href="#L1284">1284</a> <em class="jxr_comment">	 * 	&lt;li&gt;&lt;b&gt;Parent class registry lookup:&lt;/b&gt; Searches through parent classes and interfaces (starting from the</em>
+<a class="jxr_linenumber" name="L1285" href="#L1285">1285</a> <em class="jxr_comment">	 * 		second one, skipping the class itself) and checks if any of their bean registries contain a type name</em>
+<a class="jxr_linenumber" name="L1286" href="#L1286">1286</a> <em class="jxr_comment">	 * 		for this class.</em>
+<a class="jxr_linenumber" name="L1287" href="#L1287">1287</a> <em class="jxr_comment">	 * 	&lt;li&gt;&lt;b&gt;{@link Bean @Bean} annotation:&lt;/b&gt; If the class has a {@link Bean @Bean} annotation with a non-empty</em>
+<a class="jxr_linenumber" name="L1288" href="#L1288">1288</a> <em class="jxr_comment">	 * 		{@link Bean#typeName() typeName()}, that value is used.</em>
+<a class="jxr_linenumber" name="L1289" href="#L1289">1289</a> <em class="jxr_comment">	 * 	&lt;li&gt;&lt;b&gt;No dictionary name:&lt;/b&gt; Returns &lt;jk&gt;null&lt;/jk&gt; if no dictionary name is found.</em>
+<a class="jxr_linenumber" name="L1290" href="#L1290">1290</a> <em class="jxr_comment">	 * &lt;/ol&gt;</em>
 <a class="jxr_linenumber" name="L1291" href="#L1291">1291</a> <em class="jxr_comment">	 *</em>
-<a class="jxr_linenumber" name="L1292" href="#L1292">1292</a> <em class="jxr_comment">	 * @return The dictionary name for this bean, or &lt;jk&gt;null&lt;/jk&gt; if no dictionary name is defined.</em>
-<a class="jxr_linenumber" name="L1293" href="#L1293">1293</a> <em class="jxr_comment">	 */</em>
-<a class="jxr_linenumber" name="L1294" href="#L1294">1294</a> 	<strong class="jxr_keyword">private</strong> String findDictionaryName() {
-<a class="jxr_linenumber" name="L1295" href="#L1295">1295</a> 		<strong class="jxr_keyword">if</strong> (nn(beanFilter) &amp;&amp; nn(beanFilter.getTypeName()))
-<a class="jxr_linenumber" name="L1296" href="#L1296">1296</a> 			<strong class="jxr_keyword">return</strong> beanFilter.getTypeName();
-<a class="jxr_linenumber" name="L1297" href="#L1297">1297</a> 
-<a class="jxr_linenumber" name="L1298" href="#L1298">1298</a> 		<strong class="jxr_keyword">var</strong> br = getBeanRegistry();
-<a class="jxr_linenumber" name="L1299" href="#L1299">1299</a> 		<strong class="jxr_keyword">if</strong> (nn(br)) {
-<a class="jxr_linenumber" name="L1300" href="#L1300">1300</a> 			String s = br.getTypeName(<strong class="jxr_keyword">this</strong>.classMeta);
-<a class="jxr_linenumber" name="L1301" href="#L1301">1301</a> 			<strong class="jxr_keyword">if</strong> (nn(s))
-<a class="jxr_linenumber" name="L1302" href="#L1302">1302</a> 				<strong class="jxr_keyword">return</strong> s;
-<a class="jxr_linenumber" name="L1303" href="#L1303">1303</a> 		}
-<a class="jxr_linenumber" name="L1304" href="#L1304">1304</a> 
-<a class="jxr_linenumber" name="L1305" href="#L1305">1305</a> 		<strong class="jxr_keyword">var</strong> n = classMeta
-<a class="jxr_linenumber" name="L1306" href="#L1306">1306</a> 			.getParentsAndInterfaces()
-<a class="jxr_linenumber" name="L1307" href="#L1307">1307</a> 			.stream()
-<a class="jxr_linenumber" name="L1308" href="#L1308">1308</a> 			.skip(1)
-<a class="jxr_linenumber" name="L1309" href="#L1309">1309</a> 			.map(x -&gt; beanContext.getClassMeta(x))
-<a class="jxr_linenumber" name="L1310" href="#L1310">1310</a> 			.map(x -&gt; x.getBeanRegistry())
-<a class="jxr_linenumber" name="L1311" href="#L1311">1311</a> 			.filter(Objects::nonNull)
-<a class="jxr_linenumber" name="L1312" href="#L1312">1312</a> 			.map(x -&gt; x.getTypeName(<strong class="jxr_keyword">this</strong>.classMeta))
-<a class="jxr_linenumber" name="L1313" href="#L1313">1313</a> 			.filter(Objects::nonNull)
-<a class="jxr_linenumber" name="L1314" href="#L1314">1314</a> 			.findFirst()
-<a class="jxr_linenumber" name="L1315" href="#L1315">1315</a> 			.orElse(<strong class="jxr_keyword">null</strong>);
-<a class="jxr_linenumber" name="L1316" href="#L1316">1316</a> 
-<a class="jxr_linenumber" name="L1317" href="#L1317">1317</a> 		<strong class="jxr_keyword">if</strong> (n != <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L1318" href="#L1318">1318</a> 			<strong class="jxr_keyword">return</strong> n;
-<a class="jxr_linenumber" name="L1319" href="#L1319">1319</a> 
-<a class="jxr_linenumber" name="L1320" href="#L1320">1320</a> 		<strong class="jxr_keyword">return</strong> classMeta.getBeanContext().getAnnotationProvider().find(Bean.<strong class="jxr_keyword">class</strong>, classMeta)
-<a class="jxr_linenumber" name="L1321" href="#L1321">1321</a> 			.stream()
-<a class="jxr_linenumber" name="L1322" href="#L1322">1322</a> 			.map(AnnotationInfo::<strong class="jxr_keyword">inner</strong>)
-<a class="jxr_linenumber" name="L1323" href="#L1323">1323</a> 			.filter(x -&gt; ! x.typeName().isEmpty())
-<a class="jxr_linenumber" name="L1324" href="#L1324">1324</a> 			.map(x -&gt; x.typeName())
-<a class="jxr_linenumber" name="L1325" href="#L1325">1325</a> 			.findFirst()
-<a class="jxr_linenumber" name="L1326" href="#L1326">1326</a> 			.orElse(<strong class="jxr_keyword">null</strong>);
-<a class="jxr_linenumber" name="L1327" href="#L1327">1327</a> 	}
-<a class="jxr_linenumber" name="L1328" href="#L1328">1328</a> 
-<a class="jxr_linenumber" name="L1329" href="#L1329">1329</a> 	<em class="jxr_comment">/*</em>
-<a class="jxr_linenumber" name="L1330" href="#L1330">1330</a> <em class="jxr_comment">	 * Finds a bean field by name in the class hierarchy.</em>
-<a class="jxr_linenumber" name="L1331" href="#L1331">1331</a> <em class="jxr_comment">	 *</em>
-<a class="jxr_linenumber" name="L1332" href="#L1332">1332</a> <em class="jxr_comment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L1333" href="#L1333">1333</a> <em class="jxr_comment">	 * Searches through the complete class hierarchy (as defined by {@link #classHierarchy}) to find a field</em>
-<a class="jxr_linenumber" name="L1334" href="#L1334">1334</a> <em class="jxr_comment">	 * with the specified name. The search is performed in the order classes appear in the hierarchy, and the</em>
-<a class="jxr_linenumber" name="L1335" href="#L1335">1335</a> <em class="jxr_comment">	 * first matching field is returned.</em>
-<a class="jxr_linenumber" name="L1336" href="#L1336">1336</a> <em class="jxr_comment">	 *</em>
-<a class="jxr_linenumber" name="L1337" href="#L1337">1337</a> <em class="jxr_comment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L1338" href="#L1338">1338</a> <em class="jxr_comment">	 * A field is considered a match if it:</em>
-<a class="jxr_linenumber" name="L1339" href="#L1339">1339</a> <em class="jxr_comment">	 * &lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L1340" href="#L1340">1340</a> <em class="jxr_comment">	 * 	&lt;li&gt;Has the exact name specified</em>
-<a class="jxr_linenumber" name="L1341" href="#L1341">1341</a> <em class="jxr_comment">	 * 	&lt;li&gt;Is not static</em>
-<a class="jxr_linenumber" name="L1342" href="#L1342">1342</a> <em class="jxr_comment">	 * 	&lt;li&gt;Is not transient (unless transient fields are not ignored)</em>
-<a class="jxr_linenumber" name="L1343" href="#L1343">1343</a> <em class="jxr_comment">	 * 	&lt;li&gt;Is not annotated with {@link Transient @Transient} (unless transient fields are not ignored)</em>
-<a class="jxr_linenumber" name="L1344" href="#L1344">1344</a> <em class="jxr_comment">	 * 	&lt;li&gt;Is not annotated with {@link BeanIgnore @BeanIgnore}</em>
-<a class="jxr_linenumber" name="L1345" href="#L1345">1345</a> <em class="jxr_comment">	 * &lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L1346" href="#L1346">1346</a> <em class="jxr_comment">	 *</em>
-<a class="jxr_linenumber" name="L1347" href="#L1347">1347</a> <em class="jxr_comment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L1348" href="#L1348">1348</a> <em class="jxr_comment">	 * This method is used to find fields for bean properties when a field reference is needed but wasn't</em>
-<a class="jxr_linenumber" name="L1349" href="#L1349">1349</a> <em class="jxr_comment">	 * discovered during the initial property discovery phase (e.g., for properties defined only through</em>
-<a class="jxr_linenumber" name="L1350" href="#L1350">1350</a> <em class="jxr_comment">	 * getters/setters).</em>
-<a class="jxr_linenumber" name="L1351" href="#L1351">1351</a> <em class="jxr_comment">	 *</em>
-<a class="jxr_linenumber" name="L1352" href="#L1352">1352</a> <em class="jxr_comment">	 * @param name The name of the field to find.</em>
-<a class="jxr_linenumber" name="L1353" href="#L1353">1353</a> <em class="jxr_comment">	 * @return The {@link FieldInfo} for the field if found, or &lt;jk&gt;null&lt;/jk&gt; if no matching field exists</em>
-<a class="jxr_linenumber" name="L1354" href="#L1354">1354</a> <em class="jxr_comment">	 * 	in the class hierarchy.</em>
-<a class="jxr_linenumber" name="L1355" href="#L1355">1355</a> <em class="jxr_comment">	 */</em>
-<a class="jxr_linenumber" name="L1356" href="#L1356">1356</a> 	<strong class="jxr_keyword">private</strong> Optional&lt;FieldInfo&gt; findInnerBeanField(String name) {
-<a class="jxr_linenumber" name="L1357" href="#L1357">1357</a> 		<strong class="jxr_keyword">var</strong> noIgnoreTransients = ! beanContext.isIgnoreTransientFields();
-<a class="jxr_linenumber" name="L1358" href="#L1358">1358</a> 		<strong class="jxr_keyword">var</strong> ap = beanContext.getAnnotationProvider();
-<a class="jxr_linenumber" name="L1359" href="#L1359">1359</a> 
-<a class="jxr_linenumber" name="L1360" href="#L1360">1360</a> 		<em class="jxr_comment">// @formatter:off</em>
-<a class="jxr_linenumber" name="L1361" href="#L1361">1361</a> 		<strong class="jxr_keyword">return</strong> classHierarchy.get().stream()
-<a class="jxr_linenumber" name="L1362" href="#L1362">1362</a> 			.flatMap(c2 -&gt; c2.getDeclaredField(
-<a class="jxr_linenumber" name="L1363" href="#L1363">1363</a> 				x -&gt; x.isNotStatic()
-<a class="jxr_linenumber" name="L1364" href="#L1364">1364</a> 					&amp;&amp; (x.isNotTransient() || noIgnoreTransients)
-<a class="jxr_linenumber" name="L1365" href="#L1365">1365</a> 					&amp;&amp; (! x.hasAnnotation(Transient.<strong class="jxr_keyword">class</strong>) || noIgnoreTransients)
-<a class="jxr_linenumber" name="L1366" href="#L1366">1366</a> 					&amp;&amp; ! ap.has(BeanIgnore.<strong class="jxr_keyword">class</strong>, x)
-<a class="jxr_linenumber" name="L1367" href="#L1367">1367</a> 					&amp;&amp; x.hasName(name)
-<a class="jxr_linenumber" name="L1368" href="#L1368">1368</a> 			).stream())
-<a class="jxr_linenumber" name="L1369" href="#L1369">1369</a> 			.findFirst();
-<a class="jxr_linenumber" name="L1370" href="#L1370">1370</a> 		<em class="jxr_comment">// @formatter:on</em>
-<a class="jxr_linenumber" name="L1371" href="#L1371">1371</a> 	}
-<a class="jxr_linenumber" name="L1372" href="#L1372">1372</a> }
+<a class="jxr_linenumber" name="L1292" href="#L1292">1292</a> <em class="jxr_comment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L1293" href="#L1293">1293</a> <em class="jxr_comment">	 * If a dictionary name is found, it will be used in serialized output (typically as a special property like</em>
+<a class="jxr_linenumber" name="L1294" href="#L1294">1294</a> <em class="jxr_comment">	 * &lt;js&gt;"_type"&lt;/js&gt;) so that parsers can determine the correct class to instantiate when deserializing.</em>
+<a class="jxr_linenumber" name="L1295" href="#L1295">1295</a> <em class="jxr_comment">	 *</em>
+<a class="jxr_linenumber" name="L1296" href="#L1296">1296</a> <em class="jxr_comment">	 * @return The dictionary name for this bean, or &lt;jk&gt;null&lt;/jk&gt; if no dictionary name is defined.</em>
+<a class="jxr_linenumber" name="L1297" href="#L1297">1297</a> <em class="jxr_comment">	 */</em>
+<a class="jxr_linenumber" name="L1298" href="#L1298">1298</a> 	<strong class="jxr_keyword">private</strong> String findDictionaryName() {
+<a class="jxr_linenumber" name="L1299" href="#L1299">1299</a> 		<strong class="jxr_keyword">if</strong> (nn(beanFilter) &amp;&amp; nn(beanFilter.getTypeName()))
+<a class="jxr_linenumber" name="L1300" href="#L1300">1300</a> 			<strong class="jxr_keyword">return</strong> beanFilter.getTypeName();
+<a class="jxr_linenumber" name="L1301" href="#L1301">1301</a> 
+<a class="jxr_linenumber" name="L1302" href="#L1302">1302</a> 		<strong class="jxr_keyword">var</strong> br = getBeanRegistry();
+<a class="jxr_linenumber" name="L1303" href="#L1303">1303</a> 		<strong class="jxr_keyword">if</strong> (nn(br)) {
+<a class="jxr_linenumber" name="L1304" href="#L1304">1304</a> 			String s = br.getTypeName(<strong class="jxr_keyword">this</strong>.classMeta);
+<a class="jxr_linenumber" name="L1305" href="#L1305">1305</a> 			<strong class="jxr_keyword">if</strong> (nn(s))
+<a class="jxr_linenumber" name="L1306" href="#L1306">1306</a> 				<strong class="jxr_keyword">return</strong> s;
+<a class="jxr_linenumber" name="L1307" href="#L1307">1307</a> 		}
+<a class="jxr_linenumber" name="L1308" href="#L1308">1308</a> 
+<a class="jxr_linenumber" name="L1309" href="#L1309">1309</a> 		<strong class="jxr_keyword">var</strong> n = classMeta
+<a class="jxr_linenumber" name="L1310" href="#L1310">1310</a> 			.getParentsAndInterfaces()
+<a class="jxr_linenumber" name="L1311" href="#L1311">1311</a> 			.stream()
+<a class="jxr_linenumber" name="L1312" href="#L1312">1312</a> 			.skip(1)
+<a class="jxr_linenumber" name="L1313" href="#L1313">1313</a> 			.map(x -&gt; beanContext.getClassMeta(x))
+<a class="jxr_linenumber" name="L1314" href="#L1314">1314</a> 			.map(x -&gt; x.getBeanRegistry())
+<a class="jxr_linenumber" name="L1315" href="#L1315">1315</a> 			.filter(Objects::nonNull)
+<a class="jxr_linenumber" name="L1316" href="#L1316">1316</a> 			.map(x -&gt; x.getTypeName(<strong class="jxr_keyword">this</strong>.classMeta))
+<a class="jxr_linenumber" name="L1317" href="#L1317">1317</a> 			.filter(Objects::nonNull)
+<a class="jxr_linenumber" name="L1318" href="#L1318">1318</a> 			.findFirst()
+<a class="jxr_linenumber" name="L1319" href="#L1319">1319</a> 			.orElse(<strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="L1320" href="#L1320">1320</a> 
+<a class="jxr_linenumber" name="L1321" href="#L1321">1321</a> 		<strong class="jxr_keyword">if</strong> (n != <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L1322" href="#L1322">1322</a> 			<strong class="jxr_keyword">return</strong> n;
+<a class="jxr_linenumber" name="L1323" href="#L1323">1323</a> 
+<a class="jxr_linenumber" name="L1324" href="#L1324">1324</a> 		<strong class="jxr_keyword">return</strong> classMeta.getBeanContext().getAnnotationProvider().find(Bean.<strong class="jxr_keyword">class</strong>, classMeta)
+<a class="jxr_linenumber" name="L1325" href="#L1325">1325</a> 			.stream()
+<a class="jxr_linenumber" name="L1326" href="#L1326">1326</a> 			.map(AnnotationInfo::<strong class="jxr_keyword">inner</strong>)
+<a class="jxr_linenumber" name="L1327" href="#L1327">1327</a> 			.filter(x -&gt; ! x.typeName().isEmpty())
+<a class="jxr_linenumber" name="L1328" href="#L1328">1328</a> 			.map(x -&gt; x.typeName())
+<a class="jxr_linenumber" name="L1329" href="#L1329">1329</a> 			.findFirst()
+<a class="jxr_linenumber" name="L1330" href="#L1330">1330</a> 			.orElse(<strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="L1331" href="#L1331">1331</a> 	}
+<a class="jxr_linenumber" name="L1332" href="#L1332">1332</a> 
+<a class="jxr_linenumber" name="L1333" href="#L1333">1333</a> 	<em class="jxr_comment">/*</em>
+<a class="jxr_linenumber" name="L1334" href="#L1334">1334</a> <em class="jxr_comment">	 * Finds a bean field by name in the class hierarchy.</em>
+<a class="jxr_linenumber" name="L1335" href="#L1335">1335</a> <em class="jxr_comment">	 *</em>
+<a class="jxr_linenumber" name="L1336" href="#L1336">1336</a> <em class="jxr_comment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L1337" href="#L1337">1337</a> <em class="jxr_comment">	 * Searches through the complete class hierarchy (as defined by {@link #classHierarchy}) to find a field</em>
+<a class="jxr_linenumber" name="L1338" href="#L1338">1338</a> <em class="jxr_comment">	 * with the specified name. The search is performed in the order classes appear in the hierarchy, and the</em>
+<a class="jxr_linenumber" name="L1339" href="#L1339">1339</a> <em class="jxr_comment">	 * first matching field is returned.</em>
+<a class="jxr_linenumber" name="L1340" href="#L1340">1340</a> <em class="jxr_comment">	 *</em>
+<a class="jxr_linenumber" name="L1341" href="#L1341">1341</a> <em class="jxr_comment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L1342" href="#L1342">1342</a> <em class="jxr_comment">	 * A field is considered a match if it:</em>
+<a class="jxr_linenumber" name="L1343" href="#L1343">1343</a> <em class="jxr_comment">	 * &lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L1344" href="#L1344">1344</a> <em class="jxr_comment">	 * 	&lt;li&gt;Has the exact name specified</em>
+<a class="jxr_linenumber" name="L1345" href="#L1345">1345</a> <em class="jxr_comment">	 * 	&lt;li&gt;Is not static</em>
+<a class="jxr_linenumber" name="L1346" href="#L1346">1346</a> <em class="jxr_comment">	 * 	&lt;li&gt;Is not transient (unless transient fields are not ignored)</em>
+<a class="jxr_linenumber" name="L1347" href="#L1347">1347</a> <em class="jxr_comment">	 * 	&lt;li&gt;Is not annotated with {@link Transient @Transient} (unless transient fields are not ignored)</em>
+<a class="jxr_linenumber" name="L1348" href="#L1348">1348</a> <em class="jxr_comment">	 * 	&lt;li&gt;Is not annotated with {@link BeanIgnore @BeanIgnore}</em>
+<a class="jxr_linenumber" name="L1349" href="#L1349">1349</a> <em class="jxr_comment">	 * &lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L1350" href="#L1350">1350</a> <em class="jxr_comment">	 *</em>
+<a class="jxr_linenumber" name="L1351" href="#L1351">1351</a> <em class="jxr_comment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L1352" href="#L1352">1352</a> <em class="jxr_comment">	 * This method is used to find fields for bean properties when a field reference is needed but wasn't</em>
+<a class="jxr_linenumber" name="L1353" href="#L1353">1353</a> <em class="jxr_comment">	 * discovered during the initial property discovery phase (e.g., for properties defined only through</em>
+<a class="jxr_linenumber" name="L1354" href="#L1354">1354</a> <em class="jxr_comment">	 * getters/setters).</em>
+<a class="jxr_linenumber" name="L1355" href="#L1355">1355</a> <em class="jxr_comment">	 *</em>
+<a class="jxr_linenumber" name="L1356" href="#L1356">1356</a> <em class="jxr_comment">	 * @param name The name of the field to find.</em>
+<a class="jxr_linenumber" name="L1357" href="#L1357">1357</a> <em class="jxr_comment">	 * @return The {@link FieldInfo} for the field if found, or &lt;jk&gt;null&lt;/jk&gt; if no matching field exists</em>
+<a class="jxr_linenumber" name="L1358" href="#L1358">1358</a> <em class="jxr_comment">	 * 	in the class hierarchy.</em>
+<a class="jxr_linenumber" name="L1359" href="#L1359">1359</a> <em class="jxr_comment">	 */</em>
+<a class="jxr_linenumber" name="L1360" href="#L1360">1360</a> 	<strong class="jxr_keyword">private</strong> Optional&lt;FieldInfo&gt; findInnerBeanField(String name) {
+<a class="jxr_linenumber" name="L1361" href="#L1361">1361</a> 		<strong class="jxr_keyword">var</strong> noIgnoreTransients = ! beanContext.isIgnoreTransientFields();
+<a class="jxr_linenumber" name="L1362" href="#L1362">1362</a> 		<strong class="jxr_keyword">var</strong> ap = beanContext.getAnnotationProvider();
+<a class="jxr_linenumber" name="L1363" href="#L1363">1363</a> 
+<a class="jxr_linenumber" name="L1364" href="#L1364">1364</a> 		<em class="jxr_comment">// @formatter:off</em>
+<a class="jxr_linenumber" name="L1365" href="#L1365">1365</a> 		<strong class="jxr_keyword">return</strong> classHierarchy.get().stream()
+<a class="jxr_linenumber" name="L1366" href="#L1366">1366</a> 			.flatMap(c2 -&gt; c2.getDeclaredField(
+<a class="jxr_linenumber" name="L1367" href="#L1367">1367</a> 				x -&gt; x.isNotStatic()
+<a class="jxr_linenumber" name="L1368" href="#L1368">1368</a> 					&amp;&amp; (x.isNotTransient() || noIgnoreTransients)
+<a class="jxr_linenumber" name="L1369" href="#L1369">1369</a> 					&amp;&amp; (! x.hasAnnotation(Transient.<strong class="jxr_keyword">class</strong>) || noIgnoreTransients)
+<a class="jxr_linenumber" name="L1370" href="#L1370">1370</a> 					&amp;&amp; ! ap.has(BeanIgnore.<strong class="jxr_keyword">class</strong>, x)
+<a class="jxr_linenumber" name="L1371" href="#L1371">1371</a> 					&amp;&amp; x.hasName(name)
+<a class="jxr_linenumber" name="L1372" href="#L1372">1372</a> 			).stream())
+<a class="jxr_linenumber" name="L1373" href="#L1373">1373</a> 			.findFirst();
+<a class="jxr_linenumber" name="L1374" href="#L1374">1374</a> 		<em class="jxr_comment">// @formatter:on</em>
+<a class="jxr_linenumber" name="L1375" href="#L1375">1375</a> 	}
+<a class="jxr_linenumber" name="L1376" href="#L1376">1376</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/BeanPropertyMeta.html b/site/xref/org/apache/juneau/BeanPropertyMeta.html
index 0c2ef94f93..de6f9878c6 100644
--- a/site/xref/org/apache/juneau/BeanPropertyMeta.html
+++ b/site/xref/org/apache/juneau/BeanPropertyMeta.html
@@ -1151,197 +1151,208 @@
 <a class="jxr_linenumber" name="L1143" href="#L1143">1143</a> 		}
 <a class="jxr_linenumber" name="L1144" href="#L1144">1144</a> 	}
 <a class="jxr_linenumber" name="L1145" href="#L1145">1145</a> 
-<a class="jxr_linenumber" name="L1146" href="#L1146">1146</a> 	@Override <em class="jxr_comment">/* Overridden from Object */</em>
-<a class="jxr_linenumber" name="L1147" href="#L1147">1147</a> 	<strong class="jxr_keyword">public</strong> String toString() {
-<a class="jxr_linenumber" name="L1148" href="#L1148">1148</a> 		<strong class="jxr_keyword">return</strong> name + <span class="jxr_string">": "</span> + cn(<strong class="jxr_keyword">this</strong>.rawTypeMeta) + <span class="jxr_string">", field=["</span> + field + <span class="jxr_string">"], getter=["</span> + getter + <span class="jxr_string">"], setter=["</span> + setter + <span class="jxr_string">"]"</span>;
-<a class="jxr_linenumber" name="L1149" href="#L1149">1149</a> 	}
-<a class="jxr_linenumber" name="L1150" href="#L1150">1150</a> 
-<a class="jxr_linenumber" name="L1151" href="#L1151">1151</a> 	<strong class="jxr_keyword">private</strong> Object applyChildPropertiesFilter(BeanSession session, <a name="ClassMeta" href="../../../org/apache/juneau/ClassMeta.html#ClassMeta">ClassMeta</a> cm, Object o) {
-<a class="jxr_linenumber" name="L1152" href="#L1152">1152</a> 		<strong class="jxr_keyword">if</strong> (o == <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L1153" href="#L1153">1153</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L1154" href="#L1154">1154</a> 		<strong class="jxr_keyword">if</strong> (cm.isBean())
-<a class="jxr_linenumber" name="L1155" href="#L1155">1155</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a name="BeanMap" href="../../../org/apache/juneau/BeanMap.html#BeanMap">BeanMap</a>(session, o, <strong class="jxr_keyword">new</strong> <a name="BeanMetaFiltered" href="../../../org/apache/juneau/BeanMetaFiltered.html#BeanMetaFiltered">BeanMetaFiltered</a>(cm.getBeanMeta(), properties));
-<a class="jxr_linenumber" name="L1156" href="#L1156">1156</a> 		<strong class="jxr_keyword">if</strong> (cm.isMap()) {
-<a class="jxr_linenumber" name="L1157" href="#L1157">1157</a> 			<strong class="jxr_keyword">var</strong> propsArray = properties == <strong class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">null</strong> : properties.toArray(<strong class="jxr_keyword">new</strong> String[0]);
-<a class="jxr_linenumber" name="L1158" href="#L1158">1158</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a name="FilteredKeyMap" href="../../../org/apache/juneau/internal/FilteredKeyMap.html#FilteredKeyMap">FilteredKeyMap</a>(cm, (Map)o, propsArray);
-<a class="jxr_linenumber" name="L1159" href="#L1159">1159</a> 		}
-<a class="jxr_linenumber" name="L1160" href="#L1160">1160</a> 		<strong class="jxr_keyword">if</strong> (cm.isObject()) {
-<a class="jxr_linenumber" name="L1161" href="#L1161">1161</a> 			<strong class="jxr_keyword">if</strong> (o instanceof Map o2) {
-<a class="jxr_linenumber" name="L1162" href="#L1162">1162</a> 				<strong class="jxr_keyword">var</strong> propsArray = properties == <strong class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">null</strong> : properties.toArray(<strong class="jxr_keyword">new</strong> String[0]);
-<a class="jxr_linenumber" name="L1163" href="#L1163">1163</a> 				<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a name="FilteredKeyMap" href="../../../org/apache/juneau/internal/FilteredKeyMap.html#FilteredKeyMap">FilteredKeyMap</a>(cm, o2, propsArray);
-<a class="jxr_linenumber" name="L1164" href="#L1164">1164</a> 			}
-<a class="jxr_linenumber" name="L1165" href="#L1165">1165</a> 			<strong class="jxr_keyword">var</strong> bm = bc.getBeanMeta(o.getClass());
-<a class="jxr_linenumber" name="L1166" href="#L1166">1166</a> 			<strong class="jxr_keyword">if</strong> (nn(bm))
-<a class="jxr_linenumber" name="L1167" href="#L1167">1167</a> 				<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a name="BeanMap" href="../../../org/apache/juneau/BeanMap.html#BeanMap">BeanMap</a>(session, o, <strong class="jxr_keyword">new</strong> <a name="BeanMetaFiltered" href="../../../org/apache/juneau/BeanMetaFiltered.html#BeanMetaFiltered">BeanMetaFiltered</a>(cm.getBeanMeta(), properties));
-<a class="jxr_linenumber" name="L1168" href="#L1168">1168</a> 		}
-<a class="jxr_linenumber" name="L1169" href="#L1169">1169</a> 		<strong class="jxr_keyword">return</strong> o;
-<a class="jxr_linenumber" name="L1170" href="#L1170">1170</a> 	}
-<a class="jxr_linenumber" name="L1171" href="#L1171">1171</a> 
-<a class="jxr_linenumber" name="L1172" href="#L1172">1172</a> 	<strong class="jxr_keyword">private</strong> Object getInner(BeanMap&lt;?&gt; m, String pName) {
-<a class="jxr_linenumber" name="L1173" href="#L1173">1173</a> 		<strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="L1174" href="#L1174">1174</a> 
-<a class="jxr_linenumber" name="L1175" href="#L1175">1175</a> 			<strong class="jxr_keyword">if</strong> (writeOnly)
-<a class="jxr_linenumber" name="L1176" href="#L1176">1176</a> 				<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L1177" href="#L1177">1177</a> 
-<a class="jxr_linenumber" name="L1178" href="#L1178">1178</a> 			<strong class="jxr_keyword">if</strong> (nn(overrideValue))
-<a class="jxr_linenumber" name="L1179" href="#L1179">1179</a> 				<strong class="jxr_keyword">return</strong> overrideValue;
-<a class="jxr_linenumber" name="L1180" href="#L1180">1180</a> 
-<a class="jxr_linenumber" name="L1181" href="#L1181">1181</a> 			<em class="jxr_comment">// Read-only beans have their properties stored in a cache until getBean() is called.</em>
-<a class="jxr_linenumber" name="L1182" href="#L1182">1182</a> 			<strong class="jxr_keyword">var</strong> bean = m.bean;
-<a class="jxr_linenumber" name="L1183" href="#L1183">1183</a> 			<strong class="jxr_keyword">if</strong> (bean == <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L1184" href="#L1184">1184</a> 				<strong class="jxr_keyword">return</strong> m.propertyCache.get(name);
+<a class="jxr_linenumber" name="L1146" href="#L1146">1146</a> 	<strong class="jxr_keyword">protected</strong> FluentMap&lt;String,Object&gt; properties() {
+<a class="jxr_linenumber" name="L1147" href="#L1147">1147</a> 		<em class="jxr_comment">// @formatter:off</em>
+<a class="jxr_linenumber" name="L1148" href="#L1148">1148</a> 		<strong class="jxr_keyword">return</strong> filteredBeanPropertyMap()
+<a class="jxr_linenumber" name="L1149" href="#L1149">1149</a> 			.a(<span class="jxr_string">"name"</span>, name)
+<a class="jxr_linenumber" name="L1150" href="#L1150">1150</a> 			.a(<span class="jxr_string">"type"</span>, cn(rawTypeMeta))
+<a class="jxr_linenumber" name="L1151" href="#L1151">1151</a> 			.a(<span class="jxr_string">"field"</span>, field)
+<a class="jxr_linenumber" name="L1152" href="#L1152">1152</a> 			.a(<span class="jxr_string">"getter"</span>, getter)
+<a class="jxr_linenumber" name="L1153" href="#L1153">1153</a> 			.a(<span class="jxr_string">"setter"</span>, setter);
+<a class="jxr_linenumber" name="L1154" href="#L1154">1154</a> 		<em class="jxr_comment">// @formatter:on</em>
+<a class="jxr_linenumber" name="L1155" href="#L1155">1155</a> 	}
+<a class="jxr_linenumber" name="L1156" href="#L1156">1156</a> 
+<a class="jxr_linenumber" name="L1157" href="#L1157">1157</a> 	@Override <em class="jxr_comment">/* Overridden from Object */</em>
+<a class="jxr_linenumber" name="L1158" href="#L1158">1158</a> 	<strong class="jxr_keyword">public</strong> String toString() {
+<a class="jxr_linenumber" name="L1159" href="#L1159">1159</a> 		<strong class="jxr_keyword">return</strong> r(properties());
+<a class="jxr_linenumber" name="L1160" href="#L1160">1160</a> 	}
+<a class="jxr_linenumber" name="L1161" href="#L1161">1161</a> 
+<a class="jxr_linenumber" name="L1162" href="#L1162">1162</a> 	<strong class="jxr_keyword">private</strong> Object applyChildPropertiesFilter(BeanSession session, <a name="ClassMeta" href="../../../org/apache/juneau/ClassMeta.html#ClassMeta">ClassMeta</a> cm, Object o) {
+<a class="jxr_linenumber" name="L1163" href="#L1163">1163</a> 		<strong class="jxr_keyword">if</strong> (o == <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L1164" href="#L1164">1164</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L1165" href="#L1165">1165</a> 		<strong class="jxr_keyword">if</strong> (cm.isBean())
+<a class="jxr_linenumber" name="L1166" href="#L1166">1166</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a name="BeanMap" href="../../../org/apache/juneau/BeanMap.html#BeanMap">BeanMap</a>(session, o, <strong class="jxr_keyword">new</strong> <a name="BeanMetaFiltered" href="../../../org/apache/juneau/BeanMetaFiltered.html#BeanMetaFiltered">BeanMetaFiltered</a>(cm.getBeanMeta(), properties));
+<a class="jxr_linenumber" name="L1167" href="#L1167">1167</a> 		<strong class="jxr_keyword">if</strong> (cm.isMap()) {
+<a class="jxr_linenumber" name="L1168" href="#L1168">1168</a> 			<strong class="jxr_keyword">var</strong> propsArray = properties == <strong class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">null</strong> : properties.toArray(<strong class="jxr_keyword">new</strong> String[0]);
+<a class="jxr_linenumber" name="L1169" href="#L1169">1169</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a name="FilteredKeyMap" href="../../../org/apache/juneau/internal/FilteredKeyMap.html#FilteredKeyMap">FilteredKeyMap</a>(cm, (Map)o, propsArray);
+<a class="jxr_linenumber" name="L1170" href="#L1170">1170</a> 		}
+<a class="jxr_linenumber" name="L1171" href="#L1171">1171</a> 		<strong class="jxr_keyword">if</strong> (cm.isObject()) {
+<a class="jxr_linenumber" name="L1172" href="#L1172">1172</a> 			<strong class="jxr_keyword">if</strong> (o instanceof Map o2) {
+<a class="jxr_linenumber" name="L1173" href="#L1173">1173</a> 				<strong class="jxr_keyword">var</strong> propsArray = properties == <strong class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">null</strong> : properties.toArray(<strong class="jxr_keyword">new</strong> String[0]);
+<a class="jxr_linenumber" name="L1174" href="#L1174">1174</a> 				<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a name="FilteredKeyMap" href="../../../org/apache/juneau/internal/FilteredKeyMap.html#FilteredKeyMap">FilteredKeyMap</a>(cm, o2, propsArray);
+<a class="jxr_linenumber" name="L1175" href="#L1175">1175</a> 			}
+<a class="jxr_linenumber" name="L1176" href="#L1176">1176</a> 			<strong class="jxr_keyword">var</strong> bm = bc.getBeanMeta(o.getClass());
+<a class="jxr_linenumber" name="L1177" href="#L1177">1177</a> 			<strong class="jxr_keyword">if</strong> (nn(bm))
+<a class="jxr_linenumber" name="L1178" href="#L1178">1178</a> 				<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a name="BeanMap" href="../../../org/apache/juneau/BeanMap.html#BeanMap">BeanMap</a>(session, o, <strong class="jxr_keyword">new</strong> <a name="BeanMetaFiltered" href="../../../org/apache/juneau/BeanMetaFiltered.html#BeanMetaFiltered">BeanMetaFiltered</a>(cm.getBeanMeta(), properties));
+<a class="jxr_linenumber" name="L1179" href="#L1179">1179</a> 		}
+<a class="jxr_linenumber" name="L1180" href="#L1180">1180</a> 		<strong class="jxr_keyword">return</strong> o;
+<a class="jxr_linenumber" name="L1181" href="#L1181">1181</a> 	}
+<a class="jxr_linenumber" name="L1182" href="#L1182">1182</a> 
+<a class="jxr_linenumber" name="L1183" href="#L1183">1183</a> 	<strong class="jxr_keyword">private</strong> Object getInner(BeanMap&lt;?&gt; m, String pName) {
+<a class="jxr_linenumber" name="L1184" href="#L1184">1184</a> 		<strong class="jxr_keyword">try</strong> {
 <a class="jxr_linenumber" name="L1185" href="#L1185">1185</a> 
-<a class="jxr_linenumber" name="L1186" href="#L1186">1186</a> 			<strong class="jxr_keyword">var</strong> session = m.getBeanSession();
-<a class="jxr_linenumber" name="L1187" href="#L1187">1187</a> 			<strong class="jxr_keyword">var</strong> o = getRaw(m, pName);
+<a class="jxr_linenumber" name="L1186" href="#L1186">1186</a> 			<strong class="jxr_keyword">if</strong> (writeOnly)
+<a class="jxr_linenumber" name="L1187" href="#L1187">1187</a> 				<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
 <a class="jxr_linenumber" name="L1188" href="#L1188">1188</a> 
-<a class="jxr_linenumber" name="L1189" href="#L1189">1189</a> 			<strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="L1190" href="#L1190">1190</a> 				o = swap(session, o);
-<a class="jxr_linenumber" name="L1191" href="#L1191">1191</a> 				<strong class="jxr_keyword">if</strong> (o == <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L1192" href="#L1192">1192</a> 					<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L1193" href="#L1193">1193</a> 				<strong class="jxr_keyword">if</strong> (nn(properties)) {
-<a class="jxr_linenumber" name="L1194" href="#L1194">1194</a> 					<strong class="jxr_keyword">if</strong> (rawTypeMeta.isArray()) {
-<a class="jxr_linenumber" name="L1195" href="#L1195">1195</a> 						<strong class="jxr_keyword">var</strong> a = (Object[])o;
-<a class="jxr_linenumber" name="L1196" href="#L1196">1196</a> 						<strong class="jxr_keyword">var</strong> l1 = <strong class="jxr_keyword">new</strong> <a name="DelegateList" href="../../../org/apache/juneau/internal/DelegateList.html#DelegateList">DelegateList</a>(rawTypeMeta);
-<a class="jxr_linenumber" name="L1197" href="#L1197">1197</a> 						<strong class="jxr_keyword">var</strong> childType1 = rawTypeMeta.getElementType();
-<a class="jxr_linenumber" name="L1198" href="#L1198">1198</a> 						<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> c1 : a)
-<a class="jxr_linenumber" name="L1199" href="#L1199">1199</a> 							l1.add(applyChildPropertiesFilter(session, childType1, c1));
-<a class="jxr_linenumber" name="L1200" href="#L1200">1200</a> 						<strong class="jxr_keyword">return</strong> l1;
-<a class="jxr_linenumber" name="L1201" href="#L1201">1201</a> 					} <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (rawTypeMeta.isCollection()) {
-<a class="jxr_linenumber" name="L1202" href="#L1202">1202</a> 						<strong class="jxr_keyword">var</strong> c = (Collection)o;
-<a class="jxr_linenumber" name="L1203" href="#L1203">1203</a> 						<strong class="jxr_keyword">var</strong> l = listOfSize(c.size());
-<a class="jxr_linenumber" name="L1204" href="#L1204">1204</a> 						<strong class="jxr_keyword">var</strong> childType = rawTypeMeta.getElementType();
-<a class="jxr_linenumber" name="L1205" href="#L1205">1205</a> 						c.forEach(x -&gt; l.add(applyChildPropertiesFilter(session, childType, x)));
-<a class="jxr_linenumber" name="L1206" href="#L1206">1206</a> 						<strong class="jxr_keyword">return</strong> l;
-<a class="jxr_linenumber" name="L1207" href="#L1207">1207</a> 					} <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="L1208" href="#L1208">1208</a> 						<strong class="jxr_keyword">return</strong> applyChildPropertiesFilter(session, rawTypeMeta, o);
-<a class="jxr_linenumber" name="L1209" href="#L1209">1209</a> 					}
-<a class="jxr_linenumber" name="L1210" href="#L1210">1210</a> 				}
-<a class="jxr_linenumber" name="L1211" href="#L1211">1211</a> 				<strong class="jxr_keyword">return</strong> o;
-<a class="jxr_linenumber" name="L1212" href="#L1212">1212</a> 			} <strong class="jxr_keyword">catch</strong> (<a name="SerializeException" href="../../../org/apache/juneau/serializer/SerializeException.html#SerializeException">SerializeException</a> e) {
-<a class="jxr_linenumber" name="L1213" href="#L1213">1213</a> 				<strong class="jxr_keyword">throw</strong> bex(e);
-<a class="jxr_linenumber" name="L1214" href="#L1214">1214</a> 			}
-<a class="jxr_linenumber" name="L1215" href="#L1215">1215</a> 
-<a class="jxr_linenumber" name="L1216" href="#L1216">1216</a> 		} <strong class="jxr_keyword">catch</strong> (Throwable e) {
-<a class="jxr_linenumber" name="L1217" href="#L1217">1217</a> 			<strong class="jxr_keyword">if</strong> (bc.isIgnoreInvocationExceptionsOnGetters()) {
-<a class="jxr_linenumber" name="L1218" href="#L1218">1218</a> 				<strong class="jxr_keyword">if</strong> (rawTypeMeta.isPrimitive())
-<a class="jxr_linenumber" name="L1219" href="#L1219">1219</a> 					<strong class="jxr_keyword">return</strong> rawTypeMeta.getPrimitiveDefault();
-<a class="jxr_linenumber" name="L1220" href="#L1220">1220</a> 				<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L1221" href="#L1221">1221</a> 			}
-<a class="jxr_linenumber" name="L1222" href="#L1222">1222</a> 			<strong class="jxr_keyword">throw</strong> bex(e, beanMeta.getClassMeta(), <span class="jxr_string">"Exception occurred while getting property ''{0}''"</span>, name);
-<a class="jxr_linenumber" name="L1223" href="#L1223">1223</a> 		}
-<a class="jxr_linenumber" name="L1224" href="#L1224">1224</a> 	}
-<a class="jxr_linenumber" name="L1225" href="#L1225">1225</a> 
-<a class="jxr_linenumber" name="L1226" href="#L1226">1226</a> 	<strong class="jxr_keyword">private</strong> Object invokeGetter(Object bean, String pName) <strong class="jxr_keyword">throws</strong> IllegalArgumentException {
-<a class="jxr_linenumber" name="L1227" href="#L1227">1227</a> 		<strong class="jxr_keyword">if</strong> (isDyna) {
-<a class="jxr_linenumber" name="L1228" href="#L1228">1228</a> 			<strong class="jxr_keyword">var</strong> m = (Map)<strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L1229" href="#L1229">1229</a> 			<strong class="jxr_keyword">if</strong> (nn(getter)) {
-<a class="jxr_linenumber" name="L1230" href="#L1230">1230</a> 				<strong class="jxr_keyword">if</strong> (! isDynaGetterMap)
-<a class="jxr_linenumber" name="L1231" href="#L1231">1231</a> 					<strong class="jxr_keyword">return</strong> getter.invoke(bean, pName);
-<a class="jxr_linenumber" name="L1232" href="#L1232">1232</a> 				m = (Map)getter.invoke(bean);
-<a class="jxr_linenumber" name="L1233" href="#L1233">1233</a> 			} <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (nn(field))
-<a class="jxr_linenumber" name="L1234" href="#L1234">1234</a> 				m = (Map)field.get(bean);
-<a class="jxr_linenumber" name="L1235" href="#L1235">1235</a> 			<strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L1236" href="#L1236">1236</a> 				<strong class="jxr_keyword">throw</strong> bex(beanMeta.getClassMeta(), <span class="jxr_string">"Getter or public field not defined on property ''{0}''"</span>, name);
-<a class="jxr_linenumber" name="L1237" href="#L1237">1237</a> 			<strong class="jxr_keyword">return</strong> (m == <strong class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">null</strong> : m.get(pName));
-<a class="jxr_linenumber" name="L1238" href="#L1238">1238</a> 		}
-<a class="jxr_linenumber" name="L1239" href="#L1239">1239</a> 		<strong class="jxr_keyword">if</strong> (nn(getter))
-<a class="jxr_linenumber" name="L1240" href="#L1240">1240</a> 			<strong class="jxr_keyword">return</strong> getter.invoke(bean);
-<a class="jxr_linenumber" name="L1241" href="#L1241">1241</a> 		<strong class="jxr_keyword">if</strong> (nn(field))
-<a class="jxr_linenumber" name="L1242" href="#L1242">1242</a> 			<strong class="jxr_keyword">return</strong> field.get(bean);
-<a class="jxr_linenumber" name="L1243" href="#L1243">1243</a> 		<strong class="jxr_keyword">throw</strong> bex(beanMeta.getClassMeta(), <span class="jxr_string">"Getter or public field not defined on property ''{0}''"</span>, name);
-<a class="jxr_linenumber" name="L1244" href="#L1244">1244</a> 	}
-<a class="jxr_linenumber" name="L1245" href="#L1245">1245</a> 
-<a class="jxr_linenumber" name="L1246" href="#L1246">1246</a> 	<strong class="jxr_keyword">private</strong> Object invokeSetter(Object bean, String pName, Object val) <strong class="jxr_keyword">throws</strong> IllegalArgumentException {
-<a class="jxr_linenumber" name="L1247" href="#L1247">1247</a> 		<strong class="jxr_keyword">if</strong> (isDyna) {
-<a class="jxr_linenumber" name="L1248" href="#L1248">1248</a> 			<strong class="jxr_keyword">if</strong> (nn(setter))
-<a class="jxr_linenumber" name="L1249" href="#L1249">1249</a> 				<strong class="jxr_keyword">return</strong> setter.invoke(bean, pName, val);
-<a class="jxr_linenumber" name="L1250" href="#L1250">1250</a> 			<strong class="jxr_keyword">var</strong> m = (Map)<strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L1251" href="#L1251">1251</a> 			<strong class="jxr_keyword">if</strong> (nn(field))
-<a class="jxr_linenumber" name="L1252" href="#L1252">1252</a> 				m = (Map&lt;String,Object&gt;)field.get(bean);
-<a class="jxr_linenumber" name="L1253" href="#L1253">1253</a> 			<strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (nn(getter))
-<a class="jxr_linenumber" name="L1254" href="#L1254">1254</a> 				m = (Map&lt;String,Object&gt;)getter.invoke(bean);
-<a class="jxr_linenumber" name="L1255" href="#L1255">1255</a> 			<strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L1256" href="#L1256">1256</a> 				<strong class="jxr_keyword">throw</strong> bex(beanMeta.getClassMeta(), <span class="jxr_string">"Cannot set property ''{0}'' of type ''{1}'' to object of type ''{2}'' because no setter is defined on this property, and the existing property value is null"</span>,
-<a class="jxr_linenumber" name="L1257" href="#L1257">1257</a> 					name, getClassMeta().getName(), cn(val));
-<a class="jxr_linenumber" name="L1258" href="#L1258">1258</a> 			<strong class="jxr_keyword">return</strong> (m == <strong class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">null</strong> : m.put(pName, val));
-<a class="jxr_linenumber" name="L1259" href="#L1259">1259</a> 		}
-<a class="jxr_linenumber" name="L1260" href="#L1260">1260</a> 		<strong class="jxr_keyword">if</strong> (nn(setter))
-<a class="jxr_linenumber" name="L1261" href="#L1261">1261</a> 			<strong class="jxr_keyword">return</strong> setter.invoke(bean, val);
-<a class="jxr_linenumber" name="L1262" href="#L1262">1262</a> 		<strong class="jxr_keyword">if</strong> (nn(field)) {
-<a class="jxr_linenumber" name="L1263" href="#L1263">1263</a> 			field.set(bean, val);
-<a class="jxr_linenumber" name="L1264" href="#L1264">1264</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L1265" href="#L1265">1265</a> 		}
-<a class="jxr_linenumber" name="L1266" href="#L1266">1266</a> 		<strong class="jxr_keyword">throw</strong> bex(beanMeta.getClassMeta(), <span class="jxr_string">"Cannot set property ''{0}'' of type ''{1}'' to object of type ''{2}'' because no setter is defined on this property, and the existing property value is null"</span>, name,
-<a class="jxr_linenumber" name="L1267" href="#L1267">1267</a> 			getClassMeta().getName(), cn(val));
-<a class="jxr_linenumber" name="L1268" href="#L1268">1268</a> 	}
-<a class="jxr_linenumber" name="L1269" href="#L1269">1269</a> 
-<a class="jxr_linenumber" name="L1270" href="#L1270">1270</a> 	<strong class="jxr_keyword">private</strong> Object swap(BeanSession session, Object o) <strong class="jxr_keyword">throws</strong> <a name="SerializeException" href="../../../org/apache/juneau/serializer/SerializeException.html#SerializeException">SerializeException</a> {
-<a class="jxr_linenumber" name="L1271" href="#L1271">1271</a> 		<strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="L1272" href="#L1272">1272</a> 			<em class="jxr_comment">// First use swap defined via @Beanp.</em>
-<a class="jxr_linenumber" name="L1273" href="#L1273">1273</a> 			<strong class="jxr_keyword">if</strong> (nn(swap))
-<a class="jxr_linenumber" name="L1274" href="#L1274">1274</a> 				<strong class="jxr_keyword">return</strong> swap.swap(session, o);
-<a class="jxr_linenumber" name="L1275" href="#L1275">1275</a> 			<strong class="jxr_keyword">if</strong> (o == <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L1276" href="#L1276">1276</a> 				<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L1277" href="#L1277">1277</a> 			<em class="jxr_comment">// Otherwise, look it up via bean context.</em>
-<a class="jxr_linenumber" name="L1278" href="#L1278">1278</a> 			<strong class="jxr_keyword">if</strong> (rawTypeMeta.hasChildSwaps()) {
-<a class="jxr_linenumber" name="L1279" href="#L1279">1279</a> 				ObjectSwap f = rawTypeMeta.getChildObjectSwapForSwap(o.getClass());
-<a class="jxr_linenumber" name="L1280" href="#L1280">1280</a> 				<strong class="jxr_keyword">if</strong> (nn(f))
-<a class="jxr_linenumber" name="L1281" href="#L1281">1281</a> 					<strong class="jxr_keyword">return</strong> f.swap(session, o);
-<a class="jxr_linenumber" name="L1282" href="#L1282">1282</a> 			}
-<a class="jxr_linenumber" name="L1283" href="#L1283">1283</a> 			<strong class="jxr_keyword">return</strong> o;
-<a class="jxr_linenumber" name="L1284" href="#L1284">1284</a> 		} <strong class="jxr_keyword">catch</strong> (<a name="SerializeException" href="../../../org/apache/juneau/serializer/SerializeException.html#SerializeException">SerializeException</a> e) {
-<a class="jxr_linenumber" name="L1285" href="#L1285">1285</a> 			<strong class="jxr_keyword">throw</strong> e;
-<a class="jxr_linenumber" name="L1286" href="#L1286">1286</a> 		} <strong class="jxr_keyword">catch</strong> (Exception e) {
-<a class="jxr_linenumber" name="L1287" href="#L1287">1287</a> 			<strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a name="SerializeException" href="../../../org/apache/juneau/serializer/SerializeException.html#SerializeException">SerializeException</a>(e);
-<a class="jxr_linenumber" name="L1288" href="#L1288">1288</a> 		}
-<a class="jxr_linenumber" name="L1289" href="#L1289">1289</a> 	}
-<a class="jxr_linenumber" name="L1290" href="#L1290">1290</a> 
-<a class="jxr_linenumber" name="L1291" href="#L1291">1291</a> 	<strong class="jxr_keyword">private</strong> Object unswap(BeanSession session, Object o) <strong class="jxr_keyword">throws</strong> <a name="ParseException" href="../../../org/apache/juneau/parser/ParseException.html#ParseException">ParseException</a> {
-<a class="jxr_linenumber" name="L1292" href="#L1292">1292</a> 		<strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="L1293" href="#L1293">1293</a> 			<strong class="jxr_keyword">if</strong> (nn(swap))
-<a class="jxr_linenumber" name="L1294" href="#L1294">1294</a> 				<strong class="jxr_keyword">return</strong> swap.unswap(session, o, rawTypeMeta);
-<a class="jxr_linenumber" name="L1295" href="#L1295">1295</a> 			<strong class="jxr_keyword">if</strong> (o == <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L1296" href="#L1296">1296</a> 				<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L1297" href="#L1297">1297</a> 			<strong class="jxr_keyword">if</strong> (rawTypeMeta.hasChildSwaps()) {
-<a class="jxr_linenumber" name="L1298" href="#L1298">1298</a> 				ObjectSwap f = rawTypeMeta.getChildObjectSwapForUnswap(o.getClass());
-<a class="jxr_linenumber" name="L1299" href="#L1299">1299</a> 				<strong class="jxr_keyword">if</strong> (nn(f))
-<a class="jxr_linenumber" name="L1300" href="#L1300">1300</a> 					<strong class="jxr_keyword">return</strong> f.unswap(session, o, rawTypeMeta);
-<a class="jxr_linenumber" name="L1301" href="#L1301">1301</a> 			}
-<a class="jxr_linenumber" name="L1302" href="#L1302">1302</a> 			<strong class="jxr_keyword">return</strong> o;
-<a class="jxr_linenumber" name="L1303" href="#L1303">1303</a> 		} <strong class="jxr_keyword">catch</strong> (<a name="ParseException" href="../../../org/apache/juneau/parser/ParseException.html#ParseException">ParseException</a> e) {
-<a class="jxr_linenumber" name="L1304" href="#L1304">1304</a> 			<strong class="jxr_keyword">throw</strong> e;
-<a class="jxr_linenumber" name="L1305" href="#L1305">1305</a> 		} <strong class="jxr_keyword">catch</strong> (Exception e) {
-<a class="jxr_linenumber" name="L1306" href="#L1306">1306</a> 			<strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a name="ParseException" href="../../../org/apache/juneau/parser/ParseException.html#ParseException">ParseException</a>(e);
-<a class="jxr_linenumber" name="L1307" href="#L1307">1307</a> 		}
-<a class="jxr_linenumber" name="L1308" href="#L1308">1308</a> 	}
-<a class="jxr_linenumber" name="L1309" href="#L1309">1309</a> 
-<a class="jxr_linenumber" name="L1310" href="#L1310">1310</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1311" href="#L1311">1311</a> <em class="jxr_javadoccomment">	 * Returns &lt;jk&gt;true&lt;/jk&gt; if this property is write-only.</em>
-<a class="jxr_linenumber" name="L1312" href="#L1312">1312</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1313" href="#L1313">1313</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L1314" href="#L1314">1314</a> <em class="jxr_javadoccomment">	 * This implies the property MIGHT be readable, but that serializers should not serialize it.</em>
-<a class="jxr_linenumber" name="L1315" href="#L1315">1315</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1316" href="#L1316">1316</a> <em class="jxr_javadoccomment">	 * @return &lt;jk&gt;true&lt;/jk&gt; if this property is write-only.</em>
-<a class="jxr_linenumber" name="L1317" href="#L1317">1317</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1318" href="#L1318">1318</a> 	<strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">boolean</strong> isWriteOnly() { <strong class="jxr_keyword">return</strong> writeOnly; }
-<a class="jxr_linenumber" name="L1319" href="#L1319">1319</a> 
-<a class="jxr_linenumber" name="L1320" href="#L1320">1320</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1321" href="#L1321">1321</a> <em class="jxr_javadoccomment">	 * Sets an array field on this bean.</em>
-<a class="jxr_linenumber" name="L1322" href="#L1322">1322</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1323" href="#L1323">1323</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L1324" href="#L1324">1324</a> <em class="jxr_javadoccomment">	 * Works on both &lt;c&gt;Object&lt;/c&gt; and primitive arrays.</em>
-<a class="jxr_linenumber" name="L1325" href="#L1325">1325</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1326" href="#L1326">1326</a> <em class="jxr_javadoccomment">	 * @param bean The bean of the field.</em>
-<a class="jxr_linenumber" name="L1327" href="#L1327">1327</a> <em class="jxr_javadoccomment">	 * @param l The collection to use to set the array field.</em>
-<a class="jxr_linenumber" name="L1328" href="#L1328">1328</a> <em class="jxr_javadoccomment">	 * @throws IllegalArgumentException Thrown by method invocation.</em>
-<a class="jxr_linenumber" name="L1329" href="#L1329">1329</a> <em class="jxr_javadoccomment">	 * @throws IllegalAccessException Thrown by method invocation.</em>
-<a class="jxr_linenumber" name="L1330" href="#L1330">1330</a> <em class="jxr_javadoccomment">	 * @throws InvocationTargetException Thrown by method invocation.</em>
-<a class="jxr_linenumber" name="L1331" href="#L1331">1331</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1332" href="#L1332">1332</a> 	<strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> setArray(Object bean, List l) <strong class="jxr_keyword">throws</strong> IllegalArgumentException, IllegalAccessException, InvocationTargetException {
-<a class="jxr_linenumber" name="L1333" href="#L1333">1333</a> 		<strong class="jxr_keyword">var</strong> array = toArray(l, <strong class="jxr_keyword">this</strong>.rawTypeMeta.getElementType().<strong class="jxr_keyword">inner</strong>());
-<a class="jxr_linenumber" name="L1334" href="#L1334">1334</a> 		invokeSetter(bean, name, array);
-<a class="jxr_linenumber" name="L1335" href="#L1335">1335</a> 	}
-<a class="jxr_linenumber" name="L1336" href="#L1336">1336</a> }
+<a class="jxr_linenumber" name="L1189" href="#L1189">1189</a> 			<strong class="jxr_keyword">if</strong> (nn(overrideValue))
+<a class="jxr_linenumber" name="L1190" href="#L1190">1190</a> 				<strong class="jxr_keyword">return</strong> overrideValue;
+<a class="jxr_linenumber" name="L1191" href="#L1191">1191</a> 
+<a class="jxr_linenumber" name="L1192" href="#L1192">1192</a> 			<em class="jxr_comment">// Read-only beans have their properties stored in a cache until getBean() is called.</em>
+<a class="jxr_linenumber" name="L1193" href="#L1193">1193</a> 			<strong class="jxr_keyword">var</strong> bean = m.bean;
+<a class="jxr_linenumber" name="L1194" href="#L1194">1194</a> 			<strong class="jxr_keyword">if</strong> (bean == <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L1195" href="#L1195">1195</a> 				<strong class="jxr_keyword">return</strong> m.propertyCache.get(name);
+<a class="jxr_linenumber" name="L1196" href="#L1196">1196</a> 
+<a class="jxr_linenumber" name="L1197" href="#L1197">1197</a> 			<strong class="jxr_keyword">var</strong> session = m.getBeanSession();
+<a class="jxr_linenumber" name="L1198" href="#L1198">1198</a> 			<strong class="jxr_keyword">var</strong> o = getRaw(m, pName);
+<a class="jxr_linenumber" name="L1199" href="#L1199">1199</a> 
+<a class="jxr_linenumber" name="L1200" href="#L1200">1200</a> 			<strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="L1201" href="#L1201">1201</a> 				o = swap(session, o);
+<a class="jxr_linenumber" name="L1202" href="#L1202">1202</a> 				<strong class="jxr_keyword">if</strong> (o == <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L1203" href="#L1203">1203</a> 					<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L1204" href="#L1204">1204</a> 				<strong class="jxr_keyword">if</strong> (nn(properties)) {
+<a class="jxr_linenumber" name="L1205" href="#L1205">1205</a> 					<strong class="jxr_keyword">if</strong> (rawTypeMeta.isArray()) {
+<a class="jxr_linenumber" name="L1206" href="#L1206">1206</a> 						<strong class="jxr_keyword">var</strong> a = (Object[])o;
+<a class="jxr_linenumber" name="L1207" href="#L1207">1207</a> 						<strong class="jxr_keyword">var</strong> l1 = <strong class="jxr_keyword">new</strong> <a name="DelegateList" href="../../../org/apache/juneau/internal/DelegateList.html#DelegateList">DelegateList</a>(rawTypeMeta);
+<a class="jxr_linenumber" name="L1208" href="#L1208">1208</a> 						<strong class="jxr_keyword">var</strong> childType1 = rawTypeMeta.getElementType();
+<a class="jxr_linenumber" name="L1209" href="#L1209">1209</a> 						<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> c1 : a)
+<a class="jxr_linenumber" name="L1210" href="#L1210">1210</a> 							l1.add(applyChildPropertiesFilter(session, childType1, c1));
+<a class="jxr_linenumber" name="L1211" href="#L1211">1211</a> 						<strong class="jxr_keyword">return</strong> l1;
+<a class="jxr_linenumber" name="L1212" href="#L1212">1212</a> 					} <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (rawTypeMeta.isCollection()) {
+<a class="jxr_linenumber" name="L1213" href="#L1213">1213</a> 						<strong class="jxr_keyword">var</strong> c = (Collection)o;
+<a class="jxr_linenumber" name="L1214" href="#L1214">1214</a> 						<strong class="jxr_keyword">var</strong> l = listOfSize(c.size());
+<a class="jxr_linenumber" name="L1215" href="#L1215">1215</a> 						<strong class="jxr_keyword">var</strong> childType = rawTypeMeta.getElementType();
+<a class="jxr_linenumber" name="L1216" href="#L1216">1216</a> 						c.forEach(x -&gt; l.add(applyChildPropertiesFilter(session, childType, x)));
+<a class="jxr_linenumber" name="L1217" href="#L1217">1217</a> 						<strong class="jxr_keyword">return</strong> l;
+<a class="jxr_linenumber" name="L1218" href="#L1218">1218</a> 					} <strong class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="L1219" href="#L1219">1219</a> 						<strong class="jxr_keyword">return</strong> applyChildPropertiesFilter(session, rawTypeMeta, o);
+<a class="jxr_linenumber" name="L1220" href="#L1220">1220</a> 					}
+<a class="jxr_linenumber" name="L1221" href="#L1221">1221</a> 				}
+<a class="jxr_linenumber" name="L1222" href="#L1222">1222</a> 				<strong class="jxr_keyword">return</strong> o;
+<a class="jxr_linenumber" name="L1223" href="#L1223">1223</a> 			} <strong class="jxr_keyword">catch</strong> (<a name="SerializeException" href="../../../org/apache/juneau/serializer/SerializeException.html#SerializeException">SerializeException</a> e) {
+<a class="jxr_linenumber" name="L1224" href="#L1224">1224</a> 				<strong class="jxr_keyword">throw</strong> bex(e);
+<a class="jxr_linenumber" name="L1225" href="#L1225">1225</a> 			}
+<a class="jxr_linenumber" name="L1226" href="#L1226">1226</a> 
+<a class="jxr_linenumber" name="L1227" href="#L1227">1227</a> 		} <strong class="jxr_keyword">catch</strong> (Throwable e) {
+<a class="jxr_linenumber" name="L1228" href="#L1228">1228</a> 			<strong class="jxr_keyword">if</strong> (bc.isIgnoreInvocationExceptionsOnGetters()) {
+<a class="jxr_linenumber" name="L1229" href="#L1229">1229</a> 				<strong class="jxr_keyword">if</strong> (rawTypeMeta.isPrimitive())
+<a class="jxr_linenumber" name="L1230" href="#L1230">1230</a> 					<strong class="jxr_keyword">return</strong> rawTypeMeta.getPrimitiveDefault();
+<a class="jxr_linenumber" name="L1231" href="#L1231">1231</a> 				<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L1232" href="#L1232">1232</a> 			}
+<a class="jxr_linenumber" name="L1233" href="#L1233">1233</a> 			<strong class="jxr_keyword">throw</strong> bex(e, beanMeta.getClassMeta(), <span class="jxr_string">"Exception occurred while getting property ''{0}''"</span>, name);
+<a class="jxr_linenumber" name="L1234" href="#L1234">1234</a> 		}
+<a class="jxr_linenumber" name="L1235" href="#L1235">1235</a> 	}
+<a class="jxr_linenumber" name="L1236" href="#L1236">1236</a> 
+<a class="jxr_linenumber" name="L1237" href="#L1237">1237</a> 	<strong class="jxr_keyword">private</strong> Object invokeGetter(Object bean, String pName) <strong class="jxr_keyword">throws</strong> IllegalArgumentException {
+<a class="jxr_linenumber" name="L1238" href="#L1238">1238</a> 		<strong class="jxr_keyword">if</strong> (isDyna) {
+<a class="jxr_linenumber" name="L1239" href="#L1239">1239</a> 			<strong class="jxr_keyword">var</strong> m = (Map)<strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L1240" href="#L1240">1240</a> 			<strong class="jxr_keyword">if</strong> (nn(getter)) {
+<a class="jxr_linenumber" name="L1241" href="#L1241">1241</a> 				<strong class="jxr_keyword">if</strong> (! isDynaGetterMap)
+<a class="jxr_linenumber" name="L1242" href="#L1242">1242</a> 					<strong class="jxr_keyword">return</strong> getter.invoke(bean, pName);
+<a class="jxr_linenumber" name="L1243" href="#L1243">1243</a> 				m = (Map)getter.invoke(bean);
+<a class="jxr_linenumber" name="L1244" href="#L1244">1244</a> 			} <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (nn(field))
+<a class="jxr_linenumber" name="L1245" href="#L1245">1245</a> 				m = (Map)field.get(bean);
+<a class="jxr_linenumber" name="L1246" href="#L1246">1246</a> 			<strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L1247" href="#L1247">1247</a> 				<strong class="jxr_keyword">throw</strong> bex(beanMeta.getClassMeta(), <span class="jxr_string">"Getter or public field not defined on property ''{0}''"</span>, name);
+<a class="jxr_linenumber" name="L1248" href="#L1248">1248</a> 			<strong class="jxr_keyword">return</strong> (m == <strong class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">null</strong> : m.get(pName));
+<a class="jxr_linenumber" name="L1249" href="#L1249">1249</a> 		}
+<a class="jxr_linenumber" name="L1250" href="#L1250">1250</a> 		<strong class="jxr_keyword">if</strong> (nn(getter))
+<a class="jxr_linenumber" name="L1251" href="#L1251">1251</a> 			<strong class="jxr_keyword">return</strong> getter.invoke(bean);
+<a class="jxr_linenumber" name="L1252" href="#L1252">1252</a> 		<strong class="jxr_keyword">if</strong> (nn(field))
+<a class="jxr_linenumber" name="L1253" href="#L1253">1253</a> 			<strong class="jxr_keyword">return</strong> field.get(bean);
+<a class="jxr_linenumber" name="L1254" href="#L1254">1254</a> 		<strong class="jxr_keyword">throw</strong> bex(beanMeta.getClassMeta(), <span class="jxr_string">"Getter or public field not defined on property ''{0}''"</span>, name);
+<a class="jxr_linenumber" name="L1255" href="#L1255">1255</a> 	}
+<a class="jxr_linenumber" name="L1256" href="#L1256">1256</a> 
+<a class="jxr_linenumber" name="L1257" href="#L1257">1257</a> 	<strong class="jxr_keyword">private</strong> Object invokeSetter(Object bean, String pName, Object val) <strong class="jxr_keyword">throws</strong> IllegalArgumentException {
+<a class="jxr_linenumber" name="L1258" href="#L1258">1258</a> 		<strong class="jxr_keyword">if</strong> (isDyna) {
+<a class="jxr_linenumber" name="L1259" href="#L1259">1259</a> 			<strong class="jxr_keyword">if</strong> (nn(setter))
+<a class="jxr_linenumber" name="L1260" href="#L1260">1260</a> 				<strong class="jxr_keyword">return</strong> setter.invoke(bean, pName, val);
+<a class="jxr_linenumber" name="L1261" href="#L1261">1261</a> 			<strong class="jxr_keyword">var</strong> m = (Map)<strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L1262" href="#L1262">1262</a> 			<strong class="jxr_keyword">if</strong> (nn(field))
+<a class="jxr_linenumber" name="L1263" href="#L1263">1263</a> 				m = (Map&lt;String,Object&gt;)field.get(bean);
+<a class="jxr_linenumber" name="L1264" href="#L1264">1264</a> 			<strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (nn(getter))
+<a class="jxr_linenumber" name="L1265" href="#L1265">1265</a> 				m = (Map&lt;String,Object&gt;)getter.invoke(bean);
+<a class="jxr_linenumber" name="L1266" href="#L1266">1266</a> 			<strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L1267" href="#L1267">1267</a> 				<strong class="jxr_keyword">throw</strong> bex(beanMeta.getClassMeta(), <span class="jxr_string">"Cannot set property ''{0}'' of type ''{1}'' to object of type ''{2}'' because no setter is defined on this property, and the existing property value is null"</span>,
+<a class="jxr_linenumber" name="L1268" href="#L1268">1268</a> 					name, getClassMeta().getName(), cn(val));
+<a class="jxr_linenumber" name="L1269" href="#L1269">1269</a> 			<strong class="jxr_keyword">return</strong> (m == <strong class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">null</strong> : m.put(pName, val));
+<a class="jxr_linenumber" name="L1270" href="#L1270">1270</a> 		}
+<a class="jxr_linenumber" name="L1271" href="#L1271">1271</a> 		<strong class="jxr_keyword">if</strong> (nn(setter))
+<a class="jxr_linenumber" name="L1272" href="#L1272">1272</a> 			<strong class="jxr_keyword">return</strong> setter.invoke(bean, val);
+<a class="jxr_linenumber" name="L1273" href="#L1273">1273</a> 		<strong class="jxr_keyword">if</strong> (nn(field)) {
+<a class="jxr_linenumber" name="L1274" href="#L1274">1274</a> 			field.set(bean, val);
+<a class="jxr_linenumber" name="L1275" href="#L1275">1275</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L1276" href="#L1276">1276</a> 		}
+<a class="jxr_linenumber" name="L1277" href="#L1277">1277</a> 		<strong class="jxr_keyword">throw</strong> bex(beanMeta.getClassMeta(), <span class="jxr_string">"Cannot set property ''{0}'' of type ''{1}'' to object of type ''{2}'' because no setter is defined on this property, and the existing property value is null"</span>, name,
+<a class="jxr_linenumber" name="L1278" href="#L1278">1278</a> 			getClassMeta().getName(), cn(val));
+<a class="jxr_linenumber" name="L1279" href="#L1279">1279</a> 	}
+<a class="jxr_linenumber" name="L1280" href="#L1280">1280</a> 
+<a class="jxr_linenumber" name="L1281" href="#L1281">1281</a> 	<strong class="jxr_keyword">private</strong> Object swap(BeanSession session, Object o) <strong class="jxr_keyword">throws</strong> <a name="SerializeException" href="../../../org/apache/juneau/serializer/SerializeException.html#SerializeException">SerializeException</a> {
+<a class="jxr_linenumber" name="L1282" href="#L1282">1282</a> 		<strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="L1283" href="#L1283">1283</a> 			<em class="jxr_comment">// First use swap defined via @Beanp.</em>
+<a class="jxr_linenumber" name="L1284" href="#L1284">1284</a> 			<strong class="jxr_keyword">if</strong> (nn(swap))
+<a class="jxr_linenumber" name="L1285" href="#L1285">1285</a> 				<strong class="jxr_keyword">return</strong> swap.swap(session, o);
+<a class="jxr_linenumber" name="L1286" href="#L1286">1286</a> 			<strong class="jxr_keyword">if</strong> (o == <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L1287" href="#L1287">1287</a> 				<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L1288" href="#L1288">1288</a> 			<em class="jxr_comment">// Otherwise, look it up via bean context.</em>
+<a class="jxr_linenumber" name="L1289" href="#L1289">1289</a> 			<strong class="jxr_keyword">if</strong> (rawTypeMeta.hasChildSwaps()) {
+<a class="jxr_linenumber" name="L1290" href="#L1290">1290</a> 				ObjectSwap f = rawTypeMeta.getChildObjectSwapForSwap(o.getClass());
+<a class="jxr_linenumber" name="L1291" href="#L1291">1291</a> 				<strong class="jxr_keyword">if</strong> (nn(f))
+<a class="jxr_linenumber" name="L1292" href="#L1292">1292</a> 					<strong class="jxr_keyword">return</strong> f.swap(session, o);
+<a class="jxr_linenumber" name="L1293" href="#L1293">1293</a> 			}
+<a class="jxr_linenumber" name="L1294" href="#L1294">1294</a> 			<strong class="jxr_keyword">return</strong> o;
+<a class="jxr_linenumber" name="L1295" href="#L1295">1295</a> 		} <strong class="jxr_keyword">catch</strong> (<a name="SerializeException" href="../../../org/apache/juneau/serializer/SerializeException.html#SerializeException">SerializeException</a> e) {
+<a class="jxr_linenumber" name="L1296" href="#L1296">1296</a> 			<strong class="jxr_keyword">throw</strong> e;
+<a class="jxr_linenumber" name="L1297" href="#L1297">1297</a> 		} <strong class="jxr_keyword">catch</strong> (Exception e) {
+<a class="jxr_linenumber" name="L1298" href="#L1298">1298</a> 			<strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a name="SerializeException" href="../../../org/apache/juneau/serializer/SerializeException.html#SerializeException">SerializeException</a>(e);
+<a class="jxr_linenumber" name="L1299" href="#L1299">1299</a> 		}
+<a class="jxr_linenumber" name="L1300" href="#L1300">1300</a> 	}
+<a class="jxr_linenumber" name="L1301" href="#L1301">1301</a> 
+<a class="jxr_linenumber" name="L1302" href="#L1302">1302</a> 	<strong class="jxr_keyword">private</strong> Object unswap(BeanSession session, Object o) <strong class="jxr_keyword">throws</strong> <a name="ParseException" href="../../../org/apache/juneau/parser/ParseException.html#ParseException">ParseException</a> {
+<a class="jxr_linenumber" name="L1303" href="#L1303">1303</a> 		<strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="L1304" href="#L1304">1304</a> 			<strong class="jxr_keyword">if</strong> (nn(swap))
+<a class="jxr_linenumber" name="L1305" href="#L1305">1305</a> 				<strong class="jxr_keyword">return</strong> swap.unswap(session, o, rawTypeMeta);
+<a class="jxr_linenumber" name="L1306" href="#L1306">1306</a> 			<strong class="jxr_keyword">if</strong> (o == <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L1307" href="#L1307">1307</a> 				<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L1308" href="#L1308">1308</a> 			<strong class="jxr_keyword">if</strong> (rawTypeMeta.hasChildSwaps()) {
+<a class="jxr_linenumber" name="L1309" href="#L1309">1309</a> 				ObjectSwap f = rawTypeMeta.getChildObjectSwapForUnswap(o.getClass());
+<a class="jxr_linenumber" name="L1310" href="#L1310">1310</a> 				<strong class="jxr_keyword">if</strong> (nn(f))
+<a class="jxr_linenumber" name="L1311" href="#L1311">1311</a> 					<strong class="jxr_keyword">return</strong> f.unswap(session, o, rawTypeMeta);
+<a class="jxr_linenumber" name="L1312" href="#L1312">1312</a> 			}
+<a class="jxr_linenumber" name="L1313" href="#L1313">1313</a> 			<strong class="jxr_keyword">return</strong> o;
+<a class="jxr_linenumber" name="L1314" href="#L1314">1314</a> 		} <strong class="jxr_keyword">catch</strong> (<a name="ParseException" href="../../../org/apache/juneau/parser/ParseException.html#ParseException">ParseException</a> e) {
+<a class="jxr_linenumber" name="L1315" href="#L1315">1315</a> 			<strong class="jxr_keyword">throw</strong> e;
+<a class="jxr_linenumber" name="L1316" href="#L1316">1316</a> 		} <strong class="jxr_keyword">catch</strong> (Exception e) {
+<a class="jxr_linenumber" name="L1317" href="#L1317">1317</a> 			<strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a name="ParseException" href="../../../org/apache/juneau/parser/ParseException.html#ParseException">ParseException</a>(e);
+<a class="jxr_linenumber" name="L1318" href="#L1318">1318</a> 		}
+<a class="jxr_linenumber" name="L1319" href="#L1319">1319</a> 	}
+<a class="jxr_linenumber" name="L1320" href="#L1320">1320</a> 
+<a class="jxr_linenumber" name="L1321" href="#L1321">1321</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1322" href="#L1322">1322</a> <em class="jxr_javadoccomment">	 * Returns &lt;jk&gt;true&lt;/jk&gt; if this property is write-only.</em>
+<a class="jxr_linenumber" name="L1323" href="#L1323">1323</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1324" href="#L1324">1324</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L1325" href="#L1325">1325</a> <em class="jxr_javadoccomment">	 * This implies the property MIGHT be readable, but that serializers should not serialize it.</em>
+<a class="jxr_linenumber" name="L1326" href="#L1326">1326</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1327" href="#L1327">1327</a> <em class="jxr_javadoccomment">	 * @return &lt;jk&gt;true&lt;/jk&gt; if this property is write-only.</em>
+<a class="jxr_linenumber" name="L1328" href="#L1328">1328</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L1329" href="#L1329">1329</a> 	<strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">boolean</strong> isWriteOnly() { <strong class="jxr_keyword">return</strong> writeOnly; }
+<a class="jxr_linenumber" name="L1330" href="#L1330">1330</a> 
+<a class="jxr_linenumber" name="L1331" href="#L1331">1331</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1332" href="#L1332">1332</a> <em class="jxr_javadoccomment">	 * Sets an array field on this bean.</em>
+<a class="jxr_linenumber" name="L1333" href="#L1333">1333</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1334" href="#L1334">1334</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L1335" href="#L1335">1335</a> <em class="jxr_javadoccomment">	 * Works on both &lt;c&gt;Object&lt;/c&gt; and primitive arrays.</em>
+<a class="jxr_linenumber" name="L1336" href="#L1336">1336</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1337" href="#L1337">1337</a> <em class="jxr_javadoccomment">	 * @param bean The bean of the field.</em>
+<a class="jxr_linenumber" name="L1338" href="#L1338">1338</a> <em class="jxr_javadoccomment">	 * @param l The collection to use to set the array field.</em>
+<a class="jxr_linenumber" name="L1339" href="#L1339">1339</a> <em class="jxr_javadoccomment">	 * @throws IllegalArgumentException Thrown by method invocation.</em>
+<a class="jxr_linenumber" name="L1340" href="#L1340">1340</a> <em class="jxr_javadoccomment">	 * @throws IllegalAccessException Thrown by method invocation.</em>
+<a class="jxr_linenumber" name="L1341" href="#L1341">1341</a> <em class="jxr_javadoccomment">	 * @throws InvocationTargetException Thrown by method invocation.</em>
+<a class="jxr_linenumber" name="L1342" href="#L1342">1342</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L1343" href="#L1343">1343</a> 	<strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> setArray(Object bean, List l) <strong class="jxr_keyword">throws</strong> IllegalArgumentException, IllegalAccessException, InvocationTargetException {
+<a class="jxr_linenumber" name="L1344" href="#L1344">1344</a> 		<strong class="jxr_keyword">var</strong> array = toArray(l, <strong class="jxr_keyword">this</strong>.rawTypeMeta.getElementType().<strong class="jxr_keyword">inner</strong>());
+<a class="jxr_linenumber" name="L1345" href="#L1345">1345</a> 		invokeSetter(bean, name, array);
+<a class="jxr_linenumber" name="L1346" href="#L1346">1346</a> 	}
+<a class="jxr_linenumber" name="L1347" href="#L1347">1347</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/BeanPropertyValue.html b/site/xref/org/apache/juneau/BeanPropertyValue.html
index 7831fbaf43..d9a8d3193f 100644
--- a/site/xref/org/apache/juneau/BeanPropertyValue.html
+++ b/site/xref/org/apache/juneau/BeanPropertyValue.html
@@ -24,88 +24,91 @@
 <a class="jxr_linenumber" name="L16" href="#L16">16</a>  <em class="jxr_comment"> */</em>
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau;
 <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.Utils.*;
-<a class="jxr_linenumber" name="L20" href="#L20">20</a>  
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.collections.*;
-<a class="jxr_linenumber" name="L22" href="#L22">22</a>  
-<a class="jxr_linenumber" name="L23" href="#L23">23</a>  <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L24" href="#L24">24</a>  <em class="jxr_javadoccomment"> * Represents a simple bean property value and the meta-data associated with it.</em>
-<a class="jxr_linenumber" name="L25" href="#L25">25</a>  <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L26" href="#L26">26</a>  <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L27" href="#L27">27</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a name="BeanPropertyValue" href="../../../org/apache/juneau/BeanPropertyValue.html#BeanPropertyValue">BeanPropertyValue</a> <strong class="jxr_keyword">implements</strong> Comparable&lt;BeanPropertyValue&gt; {
-<a class="jxr_linenumber" name="L28" href="#L28">28</a>  
-<a class="jxr_linenumber" name="L29" href="#L29">29</a>  	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> BeanPropertyMeta pMeta;
-<a class="jxr_linenumber" name="L30" href="#L30">30</a>  	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String name;
-<a class="jxr_linenumber" name="L31" href="#L31">31</a>  	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Object value;
-<a class="jxr_linenumber" name="L32" href="#L32">32</a>  	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Throwable thrown;
-<a class="jxr_linenumber" name="L33" href="#L33">33</a>  
-<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">	 * Constructor.</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">	 * @param pMeta The bean property metadata.</em>
-<a class="jxr_linenumber" name="L38" href="#L38">38</a>  <em class="jxr_javadoccomment">	 * @param name The bean property name.</em>
-<a class="jxr_linenumber" name="L39" href="#L39">39</a>  <em class="jxr_javadoccomment">	 * @param value The bean property value.</em>
-<a class="jxr_linenumber" name="L40" href="#L40">40</a>  <em class="jxr_javadoccomment">	 * @param thrown The exception thrown by calling the property getter.</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>  	<strong class="jxr_keyword">public</strong> <a name="BeanPropertyValue" href="../../../org/apache/juneau/BeanPropertyValue.html#BeanPropertyValue">BeanPropertyValue</a>(BeanPropertyMeta pMeta, String name, Object value, Throwable thrown) {
-<a class="jxr_linenumber" name="L43" href="#L43">43</a>  		<strong class="jxr_keyword">this</strong>.pMeta = pMeta;
-<a class="jxr_linenumber" name="L44" href="#L44">44</a>  		<strong class="jxr_keyword">this</strong>.name = name;
-<a class="jxr_linenumber" name="L45" href="#L45">45</a>  		<strong class="jxr_keyword">this</strong>.value = value;
-<a class="jxr_linenumber" name="L46" href="#L46">46</a>  		<strong class="jxr_keyword">this</strong>.thrown = thrown;
-<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>  	@Override <em class="jxr_comment">/* Overridden from Comparable */</em>
-<a class="jxr_linenumber" name="L50" href="#L50">50</a>  	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> compareTo(<a name="BeanPropertyValue" href="../../../org/apache/juneau/BeanPropertyValue.html#BeanPropertyValue">BeanPropertyValue</a> o) {
-<a class="jxr_linenumber" name="L51" href="#L51">51</a>  		<strong class="jxr_keyword">return</strong> name.compareTo(o.name);
-<a class="jxr_linenumber" name="L52" href="#L52">52</a>  	}
-<a class="jxr_linenumber" name="L53" href="#L53">53</a>  
-<a class="jxr_linenumber" name="L54" href="#L54">54</a>  	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L55" href="#L55">55</a>  <em class="jxr_javadoccomment">	 * Returns the bean property metadata.</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">	 * @return The bean property metadata.</em>
-<a class="jxr_linenumber" name="L58" href="#L58">58</a>  <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L59" href="#L59">59</a>  	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> ClassMeta&lt;?&gt; getClassMeta() { <strong class="jxr_keyword">return</strong> pMeta.getClassMeta(); }
-<a class="jxr_linenumber" name="L60" href="#L60">60</a>  
-<a class="jxr_linenumber" name="L61" href="#L61">61</a>  	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L62" href="#L62">62</a>  <em class="jxr_javadoccomment">	 * Returns the bean property metadata.</em>
-<a class="jxr_linenumber" name="L63" href="#L63">63</a>  <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L64" href="#L64">64</a>  <em class="jxr_javadoccomment">	 * @return The bean property metadata.</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>  	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> BeanPropertyMeta getMeta() { <strong class="jxr_keyword">return</strong> pMeta; }
-<a class="jxr_linenumber" name="L67" href="#L67">67</a>  
-<a class="jxr_linenumber" name="L68" href="#L68">68</a>  	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L69" href="#L69">69</a>  <em class="jxr_javadoccomment">	 * Returns the bean property name.</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">	 * @return The bean property name.</em>
-<a class="jxr_linenumber" name="L72" href="#L72">72</a>  <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L73" href="#L73">73</a>  	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> String getName() { <strong class="jxr_keyword">return</strong> name; }
-<a class="jxr_linenumber" name="L74" href="#L74">74</a>  
-<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">	 * Returns the exception thrown by calling the property getter.</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">	 * @return The exception thrown by calling the property getter.</em>
-<a class="jxr_linenumber" name="L79" href="#L79">79</a>  <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L80" href="#L80">80</a>  	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> Throwable getThrown() { <strong class="jxr_keyword">return</strong> thrown; }
-<a class="jxr_linenumber" name="L81" href="#L81">81</a>  
-<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">	 * Returns the bean property value.</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">	 * @return The bean property value.</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>  	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> Object getValue() { <strong class="jxr_keyword">return</strong> value; }
-<a class="jxr_linenumber" name="L88" href="#L88">88</a>  
-<a class="jxr_linenumber" name="L89" href="#L89">89</a>  	@Override <em class="jxr_comment">/* Overridden from Object */</em>
-<a class="jxr_linenumber" name="L90" href="#L90">90</a>  	<strong class="jxr_keyword">public</strong> String toString() {
+<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.CollectionUtils.*;
+<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.Utils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  
+<a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.commons.collections.*;
+<a class="jxr_linenumber" name="L23" href="#L23">23</a>  
+<a class="jxr_linenumber" name="L24" href="#L24">24</a>  <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L25" href="#L25">25</a>  <em class="jxr_javadoccomment"> * Represents a simple bean property value and the meta-data associated with it.</em>
+<a class="jxr_linenumber" name="L26" href="#L26">26</a>  <em class="jxr_javadoccomment"> *</em>
+<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>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a name="BeanPropertyValue" href="../../../org/apache/juneau/BeanPropertyValue.html#BeanPropertyValue">BeanPropertyValue</a> <strong class="jxr_keyword">implements</strong> Comparable&lt;BeanPropertyValue&gt; {
+<a class="jxr_linenumber" name="L29" href="#L29">29</a>  
+<a class="jxr_linenumber" name="L30" href="#L30">30</a>  	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> BeanPropertyMeta pMeta;
+<a class="jxr_linenumber" name="L31" href="#L31">31</a>  	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String name;
+<a class="jxr_linenumber" name="L32" href="#L32">32</a>  	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Object value;
+<a class="jxr_linenumber" name="L33" href="#L33">33</a>  	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Throwable thrown;
+<a class="jxr_linenumber" name="L34" href="#L34">34</a>  
+<a class="jxr_linenumber" name="L35" href="#L35">35</a>  	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L36" href="#L36">36</a>  <em class="jxr_javadoccomment">	 * Constructor.</em>
+<a class="jxr_linenumber" name="L37" href="#L37">37</a>  <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L38" href="#L38">38</a>  <em class="jxr_javadoccomment">	 * @param pMeta The bean property metadata.</em>
+<a class="jxr_linenumber" name="L39" href="#L39">39</a>  <em class="jxr_javadoccomment">	 * @param name The bean property name.</em>
+<a class="jxr_linenumber" name="L40" href="#L40">40</a>  <em class="jxr_javadoccomment">	 * @param value The bean property value.</em>
+<a class="jxr_linenumber" name="L41" href="#L41">41</a>  <em class="jxr_javadoccomment">	 * @param thrown The exception thrown by calling the property getter.</em>
+<a class="jxr_linenumber" name="L42" href="#L42">42</a>  <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L43" href="#L43">43</a>  	<strong class="jxr_keyword">public</strong> <a name="BeanPropertyValue" href="../../../org/apache/juneau/BeanPropertyValue.html#BeanPropertyValue">BeanPropertyValue</a>(BeanPropertyMeta pMeta, String name, Object value, Throwable thrown) {
+<a class="jxr_linenumber" name="L44" href="#L44">44</a>  		<strong class="jxr_keyword">this</strong>.pMeta = pMeta;
+<a class="jxr_linenumber" name="L45" href="#L45">45</a>  		<strong class="jxr_keyword">this</strong>.name = name;
+<a class="jxr_linenumber" name="L46" href="#L46">46</a>  		<strong class="jxr_keyword">this</strong>.value = value;
+<a class="jxr_linenumber" name="L47" href="#L47">47</a>  		<strong class="jxr_keyword">this</strong>.thrown = thrown;
+<a class="jxr_linenumber" name="L48" href="#L48">48</a>  	}
+<a class="jxr_linenumber" name="L49" href="#L49">49</a>  
+<a class="jxr_linenumber" name="L50" href="#L50">50</a>  	@Override <em class="jxr_comment">/* Overridden from Comparable */</em>
+<a class="jxr_linenumber" name="L51" href="#L51">51</a>  	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> compareTo(<a name="BeanPropertyValue" href="../../../org/apache/juneau/BeanPropertyValue.html#BeanPropertyValue">BeanPropertyValue</a> o) {
+<a class="jxr_linenumber" name="L52" href="#L52">52</a>  		<strong class="jxr_keyword">return</strong> name.compareTo(o.name);
+<a class="jxr_linenumber" name="L53" href="#L53">53</a>  	}
+<a class="jxr_linenumber" name="L54" href="#L54">54</a>  
+<a class="jxr_linenumber" name="L55" href="#L55">55</a>  	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L56" href="#L56">56</a>  <em class="jxr_javadoccomment">	 * Returns the bean property metadata.</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">	 * @return The bean property metadata.</em>
+<a class="jxr_linenumber" name="L59" href="#L59">59</a>  <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L60" href="#L60">60</a>  	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> ClassMeta&lt;?&gt; getClassMeta() { <strong class="jxr_keyword">return</strong> pMeta.getClassMeta(); }
+<a class="jxr_linenumber" name="L61" href="#L61">61</a>  
+<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">	 * Returns the bean property metadata.</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">	 * @return The bean property metadata.</em>
+<a class="jxr_linenumber" name="L66" href="#L66">66</a>  <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L67" href="#L67">67</a>  	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> BeanPropertyMeta getMeta() { <strong class="jxr_keyword">return</strong> pMeta; }
+<a class="jxr_linenumber" name="L68" href="#L68">68</a>  
+<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">	 * Returns the bean property name.</em>
+<a class="jxr_linenumber" name="L71" href="#L71">71</a>  <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L72" href="#L72">72</a>  <em class="jxr_javadoccomment">	 * @return The bean property name.</em>
+<a class="jxr_linenumber" name="L73" href="#L73">73</a>  <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L74" href="#L74">74</a>  	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> String getName() { <strong class="jxr_keyword">return</strong> name; }
+<a class="jxr_linenumber" name="L75" href="#L75">75</a>  
+<a class="jxr_linenumber" name="L76" href="#L76">76</a>  	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L77" href="#L77">77</a>  <em class="jxr_javadoccomment">	 * Returns the exception thrown by calling the property getter.</em>
+<a class="jxr_linenumber" name="L78" href="#L78">78</a>  <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L79" href="#L79">79</a>  <em class="jxr_javadoccomment">	 * @return The exception thrown by calling the property getter.</em>
+<a class="jxr_linenumber" name="L80" href="#L80">80</a>  <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L81" href="#L81">81</a>  	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> Throwable getThrown() { <strong class="jxr_keyword">return</strong> thrown; }
+<a class="jxr_linenumber" name="L82" href="#L82">82</a>  
+<a class="jxr_linenumber" name="L83" href="#L83">83</a>  	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L84" href="#L84">84</a>  <em class="jxr_javadoccomment">	 * Returns the bean property value.</em>
+<a class="jxr_linenumber" name="L85" href="#L85">85</a>  <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L86" href="#L86">86</a>  <em class="jxr_javadoccomment">	 * @return The bean property value.</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>  	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> Object getValue() { <strong class="jxr_keyword">return</strong> value; }
+<a class="jxr_linenumber" name="L89" href="#L89">89</a>  
+<a class="jxr_linenumber" name="L90" href="#L90">90</a>  	<strong class="jxr_keyword">protected</strong> FluentMap&lt;String,Object&gt; properties() {
 <a class="jxr_linenumber" name="L91" href="#L91">91</a>  		<em class="jxr_comment">// @formatter:off</em>
-<a class="jxr_linenumber" name="L92" href="#L92">92</a>  		<strong class="jxr_keyword">return</strong> <a name="JsonMap" href="../../../org/apache/juneau/collections/JsonMap.html#JsonMap">JsonMap</a>
-<a class="jxr_linenumber" name="L93" href="#L93">93</a>  			.create()
-<a class="jxr_linenumber" name="L94" href="#L94">94</a>  			.append(<span class="jxr_string">"name"</span>, name)
-<a class="jxr_linenumber" name="L95" href="#L95">95</a>  			.append(<span class="jxr_string">"value"</span>, value)
-<a class="jxr_linenumber" name="L96" href="#L96">96</a>  			.append(<span class="jxr_string">"type"</span>, cns(pMeta.getClassMeta()))
-<a class="jxr_linenumber" name="L97" href="#L97">97</a>  			.toString();
-<a class="jxr_linenumber" name="L98" href="#L98">98</a>  		<em class="jxr_comment">// @formatter:on</em>
-<a class="jxr_linenumber" name="L99" href="#L99">99</a>  	}
-<a class="jxr_linenumber" name="L100" href="#L100">100</a> }
+<a class="jxr_linenumber" name="L92" href="#L92">92</a>  		<strong class="jxr_keyword">return</strong> filteredBeanPropertyMap()
+<a class="jxr_linenumber" name="L93" href="#L93">93</a>  			.a(<span class="jxr_string">"name"</span>, name)
+<a class="jxr_linenumber" name="L94" href="#L94">94</a>  			.a(<span class="jxr_string">"value"</span>, value)
+<a class="jxr_linenumber" name="L95" href="#L95">95</a>  			.a(<span class="jxr_string">"type"</span>, cns(pMeta.getClassMeta()));
+<a class="jxr_linenumber" name="L96" href="#L96">96</a>  		<em class="jxr_comment">// @formatter:on</em>
+<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>  	@Override <em class="jxr_comment">/* Overridden from Object */</em>
+<a class="jxr_linenumber" name="L100" href="#L100">100</a> 	<strong class="jxr_keyword">public</strong> String toString() {
+<a class="jxr_linenumber" name="L101" href="#L101">101</a> 		<strong class="jxr_keyword">return</strong> r(properties());
+<a class="jxr_linenumber" name="L102" href="#L102">102</a> 	}
+<a class="jxr_linenumber" name="L103" href="#L103">103</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/BeanRegistry.html b/site/xref/org/apache/juneau/BeanRegistry.html
index 3f4ea9d28e..280d07ba1f 100644
--- a/site/xref/org/apache/juneau/BeanRegistry.html
+++ b/site/xref/org/apache/juneau/BeanRegistry.html
@@ -25,173 +25,177 @@
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau;
 <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.reflect.ReflectionUtils.*;
-<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.concurrent.*;
-<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.annotation.*;
-<a class="jxr_linenumber" name="L28" href="#L28">28</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.commons.reflect.*;
-<a class="jxr_linenumber" name="L29" href="#L29">29</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.commons.utils.*;
-<a class="jxr_linenumber" name="L30" href="#L30">30</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.cp.*;
-<a class="jxr_linenumber" name="L31" href="#L31">31</a>  
-<a class="jxr_linenumber" name="L32" href="#L32">32</a>  <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L33" href="#L33">33</a>  <em class="jxr_javadoccomment"> * A lookup table for resolving bean types by name.</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"> * In a nutshell, provides a simple mapping of bean class objects to identifying names.</em>
-<a class="jxr_linenumber" name="L37" href="#L37">37</a>  <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L38" href="#L38">38</a>  <em class="jxr_javadoccomment"> * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L39" href="#L39">39</a>  <em class="jxr_javadoccomment"> * Class names are defined through the {@link Bean#typeName() @Bean(typeName)} annotation.</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;p&gt;</em>
-<a class="jxr_linenumber" name="L42" href="#L42">42</a>  <em class="jxr_javadoccomment"> * The dictionary is used by the framework in the following ways:</em>
-<a class="jxr_linenumber" name="L43" href="#L43">43</a>  <em class="jxr_javadoccomment"> * &lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L44" href="#L44">44</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;If a class type cannot be inferred through reflection during parsing, then a helper &lt;js&gt;"_type"&lt;/js&gt; is added</em>
-<a class="jxr_linenumber" name="L45" href="#L45">45</a>  <em class="jxr_javadoccomment"> * 		to the serialized output using the name defined for that class in this dictionary.  This helps determine the</em>
-<a class="jxr_linenumber" name="L46" href="#L46">46</a>  <em class="jxr_javadoccomment"> * 		real class at parse time.</em>
-<a class="jxr_linenumber" name="L47" href="#L47">47</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;The dictionary name is used as element names when serialized to XML.</em>
-<a class="jxr_linenumber" name="L48" href="#L48">48</a>  <em class="jxr_javadoccomment"> * &lt;/ul&gt;</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"> */</em>
-<a class="jxr_linenumber" name="L51" href="#L51">51</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a name="BeanRegistry" href="../../../org/apache/juneau/BeanRegistry.html#BeanRegistry">BeanRegistry</a> {
-<a class="jxr_linenumber" name="L52" href="#L52">52</a>  
-<a class="jxr_linenumber" name="L53" href="#L53">53</a>  	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Map&lt;String,ClassMeta&lt;?&gt;&gt; map;
-<a class="jxr_linenumber" name="L54" href="#L54">54</a>  	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Map&lt;Class&lt;?&gt;,String&gt; reverseMap;
-<a class="jxr_linenumber" name="L55" href="#L55">55</a>  	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> BeanContext bc;
-<a class="jxr_linenumber" name="L56" href="#L56">56</a>  	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> AnnotationProvider ap;
-<a class="jxr_linenumber" name="L57" href="#L57">57</a>  	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> isEmpty;
-<a class="jxr_linenumber" name="L58" href="#L58">58</a>  
-<a class="jxr_linenumber" name="L59" href="#L59">59</a>  	<em class="jxr_comment">// TODO - Convert classes to use ClassInfo.</em>
-<a class="jxr_linenumber" name="L60" href="#L60">60</a>  	BeanRegistry(BeanContext bc, <a name="BeanRegistry" href="../../../org/apache/juneau/BeanRegistry.html#BeanRegistry">BeanRegistry</a> parent, Class&lt;?&gt;...classes) {
-<a class="jxr_linenumber" name="L61" href="#L61">61</a>  		<strong class="jxr_keyword">this</strong>.bc = bc;
-<a class="jxr_linenumber" name="L62" href="#L62">62</a>  		<strong class="jxr_keyword">this</strong>.ap = bc.getAnnotationProvider();
-<a class="jxr_linenumber" name="L63" href="#L63">63</a>  		<strong class="jxr_keyword">this</strong>.map = <strong class="jxr_keyword">new</strong> ConcurrentHashMap&lt;&gt;();
-<a class="jxr_linenumber" name="L64" href="#L64">64</a>  		<strong class="jxr_keyword">this</strong>.reverseMap = <strong class="jxr_keyword">new</strong> ConcurrentHashMap&lt;&gt;();
-<a class="jxr_linenumber" name="L65" href="#L65">65</a>  		bc.getBeanDictionary().forEach(<strong class="jxr_keyword">this</strong>::addClass);
-<a class="jxr_linenumber" name="L66" href="#L66">66</a>  		<strong class="jxr_keyword">if</strong> (nn(parent))
-<a class="jxr_linenumber" name="L67" href="#L67">67</a>  			parent.map.forEach(<strong class="jxr_keyword">this</strong>::addToMap);
-<a class="jxr_linenumber" name="L68" href="#L68">68</a>  		<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> c : classes)
-<a class="jxr_linenumber" name="L69" href="#L69">69</a>  			addClass(c);
-<a class="jxr_linenumber" name="L70" href="#L70">70</a>  		isEmpty = map.isEmpty();
-<a class="jxr_linenumber" name="L71" href="#L71">71</a>  	}
-<a class="jxr_linenumber" name="L72" href="#L72">72</a>  
-<a class="jxr_linenumber" name="L73" href="#L73">73</a>  	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L74" href="#L74">74</a>  <em class="jxr_javadoccomment">	 * Gets the class metadata for the specified bean type name.</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">	 * @param typeName</em>
-<a class="jxr_linenumber" name="L77" href="#L77">77</a>  <em class="jxr_javadoccomment">	 * 	The bean type name as defined by {@link Bean#typeName() @Bean(typeName)}.</em>
-<a class="jxr_linenumber" name="L78" href="#L78">78</a>  <em class="jxr_javadoccomment">	 * 	Can include multi-dimensional array type names (e.g. &lt;js&gt;"X^^"&lt;/js&gt;).</em>
-<a class="jxr_linenumber" name="L79" href="#L79">79</a>  <em class="jxr_javadoccomment">	 * @return The class metadata for the bean.</em>
-<a class="jxr_linenumber" name="L80" href="#L80">80</a>  <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L81" href="#L81">81</a>  	<strong class="jxr_keyword">public</strong> ClassMeta&lt;?&gt; getClassMeta(String typeName) {
-<a class="jxr_linenumber" name="L82" href="#L82">82</a>  		<strong class="jxr_keyword">if</strong> (isEmpty || typeName == <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L83" href="#L83">83</a>  			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L84" href="#L84">84</a>  		<strong class="jxr_keyword">var</strong> cm = map.get(typeName);
-<a class="jxr_linenumber" name="L85" href="#L85">85</a>  		<strong class="jxr_keyword">if</strong> (nn(cm))
-<a class="jxr_linenumber" name="L86" href="#L86">86</a>  			<strong class="jxr_keyword">return</strong> cm;
-<a class="jxr_linenumber" name="L87" href="#L87">87</a>  		<strong class="jxr_keyword">if</strong> (typeName.charAt(typeName.length() - 1) == '^') {
-<a class="jxr_linenumber" name="L88" href="#L88">88</a>  			cm = getClassMeta(typeName.substring(0, typeName.length() - 1));
-<a class="jxr_linenumber" name="L89" href="#L89">89</a>  			<strong class="jxr_keyword">if</strong> (nn(cm)) {
-<a class="jxr_linenumber" name="L90" href="#L90">90</a>  				cm = bc.getClassMeta(Array.newInstance(cm.<strong class="jxr_keyword">inner</strong>(), 1).getClass());
-<a class="jxr_linenumber" name="L91" href="#L91">91</a>  				map.put(typeName, cm);
-<a class="jxr_linenumber" name="L92" href="#L92">92</a>  			}
-<a class="jxr_linenumber" name="L93" href="#L93">93</a>  			<strong class="jxr_keyword">return</strong> cm;
-<a class="jxr_linenumber" name="L94" href="#L94">94</a>  		}
-<a class="jxr_linenumber" name="L95" href="#L95">95</a>  		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<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>  	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L99" href="#L99">99</a>  <em class="jxr_javadoccomment">	 * Given the specified class, return the dictionary name for it.</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">	 * @param c The class to lookup in this registry.</em>
-<a class="jxr_linenumber" name="L102" href="#L102">102</a> <em class="jxr_javadoccomment">	 * @return The dictionary name for the specified class in this registry, or &lt;jk&gt;null&lt;/jk&gt; if not found.</em>
-<a class="jxr_linenumber" name="L103" href="#L103">103</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L104" href="#L104">104</a> 	<strong class="jxr_keyword">public</strong> String getTypeName(ClassMeta&lt;?&gt; c) {
-<a class="jxr_linenumber" name="L105" href="#L105">105</a> 		<strong class="jxr_keyword">return</strong> isEmpty ? <strong class="jxr_keyword">null</strong> : reverseMap.get(c.<strong class="jxr_keyword">inner</strong>());
-<a class="jxr_linenumber" name="L106" href="#L106">106</a> 	}
-<a class="jxr_linenumber" name="L107" href="#L107">107</a> 
-<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">	 * Returns &lt;jk&gt;true&lt;/jk&gt; if this dictionary has an entry for the specified type name.</em>
-<a class="jxr_linenumber" name="L110" href="#L110">110</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L111" href="#L111">111</a> <em class="jxr_javadoccomment">	 * @param typeName The bean type name.</em>
-<a class="jxr_linenumber" name="L112" href="#L112">112</a> <em class="jxr_javadoccomment">	 * @return &lt;jk&gt;true&lt;/jk&gt; if this dictionary has an entry for the specified type name.</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> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> hasName(String typeName) {
-<a class="jxr_linenumber" name="L115" href="#L115">115</a> 		<strong class="jxr_keyword">return</strong> nn(getClassMeta(typeName));
-<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> 	@Override
-<a class="jxr_linenumber" name="L119" href="#L119">119</a> 	<strong class="jxr_keyword">public</strong> String toString() {
-<a class="jxr_linenumber" name="L120" href="#L120">120</a> 		<strong class="jxr_keyword">var</strong> sb = <strong class="jxr_keyword">new</strong> StringBuilder();
-<a class="jxr_linenumber" name="L121" href="#L121">121</a> 		sb.append('{');
-<a class="jxr_linenumber" name="L122" href="#L122">122</a> 		map.forEach((k, v) -&gt; sb.append(k).append(<span class="jxr_string">":"</span>).append(v.toString(<strong class="jxr_keyword">true</strong>)).append(<span class="jxr_string">", "</span>));
-<a class="jxr_linenumber" name="L123" href="#L123">123</a> 		sb.append('}');
-<a class="jxr_linenumber" name="L124" href="#L124">124</a> 		<strong class="jxr_keyword">return</strong> sb.toString();
-<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> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> addClass(Class&lt;?&gt; c) {
-<a class="jxr_linenumber" name="L128" href="#L128">128</a> 		<strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="L129" href="#L129">129</a> 			<strong class="jxr_keyword">if</strong> (nn(c)) {
-<a class="jxr_linenumber" name="L130" href="#L130">130</a> 				<strong class="jxr_keyword">var</strong> ci = info(c);
-<a class="jxr_linenumber" name="L131" href="#L131">131</a> 				<strong class="jxr_keyword">if</strong> (ci.isChildOf(Collection.<strong class="jxr_keyword">class</strong>)) {
-<a class="jxr_linenumber" name="L132" href="#L132">132</a> 					Collection&lt;?&gt; cc = BeanCreator.of(Collection.<strong class="jxr_keyword">class</strong>).type(ci).run();
-<a class="jxr_linenumber" name="L133" href="#L133">133</a> 					cc.forEach(x -&gt; {
-<a class="jxr_linenumber" name="L134" href="#L134">134</a> 						<strong class="jxr_keyword">if</strong> (x instanceof Class x2)
-<a class="jxr_linenumber" name="L135" href="#L135">135</a> 							addClass(x2);
-<a class="jxr_linenumber" name="L136" href="#L136">136</a> 						<strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L137" href="#L137">137</a> 							<strong class="jxr_keyword">throw</strong> bex(<span class="jxr_string">"Collection class ''{0}'' passed to BeanRegistry does not contain Class objects."</span>, cn(c));
-<a class="jxr_linenumber" name="L138" href="#L138">138</a> 					});
-<a class="jxr_linenumber" name="L139" href="#L139">139</a> 				} <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (ci.isChildOf(Map.<strong class="jxr_keyword">class</strong>)) {
-<a class="jxr_linenumber" name="L140" href="#L140">140</a> 					Map&lt;?,?&gt; m = BeanCreator.of(Map.<strong class="jxr_keyword">class</strong>).type(ci).run();
-<a class="jxr_linenumber" name="L141" href="#L141">141</a> 					m.forEach((k, v) -&gt; {
-<a class="jxr_linenumber" name="L142" href="#L142">142</a> 						<strong class="jxr_keyword">var</strong> typeName = s(k);
-<a class="jxr_linenumber" name="L143" href="#L143">143</a> 						<strong class="jxr_keyword">var</strong> val = (ClassMeta&lt;?&gt;)<strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L144" href="#L144">144</a> 						<strong class="jxr_keyword">if</strong> (v instanceof Type v2)
-<a class="jxr_linenumber" name="L145" href="#L145">145</a> 							val = bc.getClassMeta(v2);
-<a class="jxr_linenumber" name="L146" href="#L146">146</a> 						<strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (isArray(v))
-<a class="jxr_linenumber" name="L147" href="#L147">147</a> 							val = getTypedClassMeta(v);
-<a class="jxr_linenumber" name="L148" href="#L148">148</a> 						<strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L149" href="#L149">149</a> 							<strong class="jxr_keyword">throw</strong> bex(<span class="jxr_string">"Class ''{0}'' was passed to BeanRegistry but value of type ''{1}'' found in map is not a Type object."</span>, cn(c), cn(v));
-<a class="jxr_linenumber" name="L150" href="#L150">150</a> 						addToMap(typeName, val);
-<a class="jxr_linenumber" name="L151" href="#L151">151</a> 					});
-<a class="jxr_linenumber" name="L152" href="#L152">152</a> 				} <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="L153" href="#L153">153</a> 					<em class="jxr_comment">// @formatter:off</em>
-<a class="jxr_linenumber" name="L154" href="#L154">154</a> 					<strong class="jxr_keyword">var</strong> typeName = ap.find(Bean.<strong class="jxr_keyword">class</strong>, ci)
-<a class="jxr_linenumber" name="L155" href="#L155">155</a> 						.stream()
-<a class="jxr_linenumber" name="L156" href="#L156">156</a> 						.map(x -&gt; x.<strong class="jxr_keyword">inner</strong>().typeName())
-<a class="jxr_linenumber" name="L157" href="#L157">157</a> 						.filter(Utils::isNotEmpty)
-<a class="jxr_linenumber" name="L158" href="#L158">158</a> 						.findFirst()
-<a class="jxr_linenumber" name="L159" href="#L159">159</a> 						.orElseThrow(() -&gt; bex(<span class="jxr_string">"Class ''{0}'' was passed to BeanRegistry but it doesn't have a @Bean(typeName) annotation defined."</span>, cn(c)));
-<a class="jxr_linenumber" name="L160" href="#L160">160</a> 					<em class="jxr_comment">// @formatter:on</em>
-<a class="jxr_linenumber" name="L161" href="#L161">161</a> 					addToMap(typeName, bc.getClassMeta(c));
-<a class="jxr_linenumber" name="L162" href="#L162">162</a> 				}
-<a class="jxr_linenumber" name="L163" href="#L163">163</a> 			}
-<a class="jxr_linenumber" name="L164" href="#L164">164</a> 		} <strong class="jxr_keyword">catch</strong> (<a name="BeanRuntimeException" href="../../../org/apache/juneau/commons/reflect/BeanRuntimeException.html#BeanRuntimeException">BeanRuntimeException</a> e) {
-<a class="jxr_linenumber" name="L165" href="#L165">165</a> 			<strong class="jxr_keyword">throw</strong> e;
-<a class="jxr_linenumber" name="L166" href="#L166">166</a> 		} <strong class="jxr_keyword">catch</strong> (Exception e) {
-<a class="jxr_linenumber" name="L167" href="#L167">167</a> 			<strong class="jxr_keyword">throw</strong> bex(e);
-<a class="jxr_linenumber" name="L168" href="#L168">168</a> 		}
-<a class="jxr_linenumber" name="L169" href="#L169">169</a> 	}
-<a class="jxr_linenumber" name="L170" href="#L170">170</a> 
-<a class="jxr_linenumber" name="L171" href="#L171">171</a> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> addToMap(String typeName, ClassMeta&lt;?&gt; cm) {
-<a class="jxr_linenumber" name="L172" href="#L172">172</a> 		map.put(typeName, cm);
-<a class="jxr_linenumber" name="L173" href="#L173">173</a> 		reverseMap.put(cm.<strong class="jxr_keyword">inner</strong>(), typeName);
-<a class="jxr_linenumber" name="L174" href="#L174">174</a> 	}
-<a class="jxr_linenumber" name="L175" href="#L175">175</a> 
-<a class="jxr_linenumber" name="L176" href="#L176">176</a> 	<strong class="jxr_keyword">private</strong> ClassMeta&lt;?&gt; getTypedClassMeta(Object array) {
-<a class="jxr_linenumber" name="L177" href="#L177">177</a> 		<strong class="jxr_keyword">var</strong> len = Array.getLength(array);
-<a class="jxr_linenumber" name="L178" href="#L178">178</a> 		<strong class="jxr_keyword">if</strong> (len == 0)
-<a class="jxr_linenumber" name="L179" href="#L179">179</a> 			<strong class="jxr_keyword">throw</strong> bex(<span class="jxr_string">"Map entry had an empty array value."</span>);
-<a class="jxr_linenumber" name="L180" href="#L180">180</a> 		<strong class="jxr_keyword">var</strong> type = (Type)Array.get(array, 0);
-<a class="jxr_linenumber" name="L181" href="#L181">181</a> 		<strong class="jxr_keyword">var</strong> args = <strong class="jxr_keyword">new</strong> Type[len - 1];
-<a class="jxr_linenumber" name="L182" href="#L182">182</a> 		<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> i = 1; i &lt; len; i++)
-<a class="jxr_linenumber" name="L183" href="#L183">183</a> 			args[i - 1] = (Type)Array.get(array, i);
-<a class="jxr_linenumber" name="L184" href="#L184">184</a> 		<strong class="jxr_keyword">return</strong> bc.getClassMeta(type, args);
-<a class="jxr_linenumber" name="L185" href="#L185">185</a> 	}
-<a class="jxr_linenumber" name="L186" href="#L186">186</a> }
+<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="L26" href="#L26">26</a>  <strong class="jxr_keyword">import</strong> java.util.concurrent.*;
+<a class="jxr_linenumber" name="L27" href="#L27">27</a>  
+<a class="jxr_linenumber" name="L28" href="#L28">28</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.annotation.*;
+<a class="jxr_linenumber" name="L29" href="#L29">29</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.commons.collections.*;
+<a class="jxr_linenumber" name="L30" href="#L30">30</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.commons.reflect.*;
+<a class="jxr_linenumber" name="L31" href="#L31">31</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.commons.utils.*;
+<a class="jxr_linenumber" name="L32" href="#L32">32</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.cp.*;
+<a class="jxr_linenumber" name="L33" href="#L33">33</a>  
+<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"> * A lookup table for resolving bean types by name.</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"> * In a nutshell, provides a simple mapping of bean class objects to identifying names.</em>
+<a class="jxr_linenumber" name="L39" href="#L39">39</a>  <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L40" href="#L40">40</a>  <em class="jxr_javadoccomment"> * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L41" href="#L41">41</a>  <em class="jxr_javadoccomment"> * Class names are defined through the {@link Bean#typeName() @Bean(typeName)} annotation.</em>
+<a class="jxr_linenumber" name="L42" href="#L42">42</a>  <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L43" href="#L43">43</a>  <em class="jxr_javadoccomment"> * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L44" href="#L44">44</a>  <em class="jxr_javadoccomment"> * The dictionary is used by the framework in the following ways:</em>
+<a class="jxr_linenumber" name="L45" href="#L45">45</a>  <em class="jxr_javadoccomment"> * &lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L46" href="#L46">46</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;If a class type cannot be inferred through reflection during parsing, then a helper &lt;js&gt;"_type"&lt;/js&gt; is added</em>
+<a class="jxr_linenumber" name="L47" href="#L47">47</a>  <em class="jxr_javadoccomment"> * 		to the serialized output using the name defined for that class in this dictionary.  This helps determine the</em>
+<a class="jxr_linenumber" name="L48" href="#L48">48</a>  <em class="jxr_javadoccomment"> * 		real class at parse time.</em>
+<a class="jxr_linenumber" name="L49" href="#L49">49</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;The dictionary name is used as element names when serialized to XML.</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"> */</em>
+<a class="jxr_linenumber" name="L53" href="#L53">53</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a name="BeanRegistry" href="../../../org/apache/juneau/BeanRegistry.html#BeanRegistry">BeanRegistry</a> {
+<a class="jxr_linenumber" name="L54" href="#L54">54</a>  
+<a class="jxr_linenumber" name="L55" href="#L55">55</a>  	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Map&lt;String,ClassMeta&lt;?&gt;&gt; map;
+<a class="jxr_linenumber" name="L56" href="#L56">56</a>  	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Map&lt;Class&lt;?&gt;,String&gt; reverseMap;
+<a class="jxr_linenumber" name="L57" href="#L57">57</a>  	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> BeanContext bc;
+<a class="jxr_linenumber" name="L58" href="#L58">58</a>  	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> AnnotationProvider ap;
+<a class="jxr_linenumber" name="L59" href="#L59">59</a>  	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> isEmpty;
+<a class="jxr_linenumber" name="L60" href="#L60">60</a>  
+<a class="jxr_linenumber" name="L61" href="#L61">61</a>  	<em class="jxr_comment">// TODO - Convert classes to use ClassInfo.</em>
+<a class="jxr_linenumber" name="L62" href="#L62">62</a>  	BeanRegistry(BeanContext bc, <a name="BeanRegistry" href="../../../org/apache/juneau/BeanRegistry.html#BeanRegistry">BeanRegistry</a> parent, Class&lt;?&gt;...classes) {
+<a class="jxr_linenumber" name="L63" href="#L63">63</a>  		<strong class="jxr_keyword">this</strong>.bc = bc;
+<a class="jxr_linenumber" name="L64" href="#L64">64</a>  		<strong class="jxr_keyword">this</strong>.ap = bc.getAnnotationProvider();
+<a class="jxr_linenumber" name="L65" href="#L65">65</a>  		<strong class="jxr_keyword">this</strong>.map = <strong class="jxr_keyword">new</strong> ConcurrentHashMap&lt;&gt;();
+<a class="jxr_linenumber" name="L66" href="#L66">66</a>  		<strong class="jxr_keyword">this</strong>.reverseMap = <strong class="jxr_keyword">new</strong> ConcurrentHashMap&lt;&gt;();
+<a class="jxr_linenumber" name="L67" href="#L67">67</a>  		bc.getBeanDictionary().forEach(<strong class="jxr_keyword">this</strong>::addClass);
+<a class="jxr_linenumber" name="L68" href="#L68">68</a>  		<strong class="jxr_keyword">if</strong> (nn(parent))
+<a class="jxr_linenumber" name="L69" href="#L69">69</a>  			parent.map.forEach(<strong class="jxr_keyword">this</strong>::addToMap);
+<a class="jxr_linenumber" name="L70" href="#L70">70</a>  		<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> c : classes)
+<a class="jxr_linenumber" name="L71" href="#L71">71</a>  			addClass(c);
+<a class="jxr_linenumber" name="L72" href="#L72">72</a>  		isEmpty = map.isEmpty();
+<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>  	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L76" href="#L76">76</a>  <em class="jxr_javadoccomment">	 * Gets the class metadata for the specified bean type name.</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">	 * @param typeName</em>
+<a class="jxr_linenumber" name="L79" href="#L79">79</a>  <em class="jxr_javadoccomment">	 * 	The bean type name as defined by {@link Bean#typeName() @Bean(typeName)}.</em>
+<a class="jxr_linenumber" name="L80" href="#L80">80</a>  <em class="jxr_javadoccomment">	 * 	Can include multi-dimensional array type names (e.g. &lt;js&gt;"X^^"&lt;/js&gt;).</em>
+<a class="jxr_linenumber" name="L81" href="#L81">81</a>  <em class="jxr_javadoccomment">	 * @return The class metadata for the bean.</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>  	<strong class="jxr_keyword">public</strong> ClassMeta&lt;?&gt; getClassMeta(String typeName) {
+<a class="jxr_linenumber" name="L84" href="#L84">84</a>  		<strong class="jxr_keyword">if</strong> (isEmpty || typeName == <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L85" href="#L85">85</a>  			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L86" href="#L86">86</a>  		<strong class="jxr_keyword">var</strong> cm = map.get(typeName);
+<a class="jxr_linenumber" name="L87" href="#L87">87</a>  		<strong class="jxr_keyword">if</strong> (nn(cm))
+<a class="jxr_linenumber" name="L88" href="#L88">88</a>  			<strong class="jxr_keyword">return</strong> cm;
+<a class="jxr_linenumber" name="L89" href="#L89">89</a>  		<strong class="jxr_keyword">if</strong> (typeName.charAt(typeName.length() - 1) == '^') {
+<a class="jxr_linenumber" name="L90" href="#L90">90</a>  			cm = getClassMeta(typeName.substring(0, typeName.length() - 1));
+<a class="jxr_linenumber" name="L91" href="#L91">91</a>  			<strong class="jxr_keyword">if</strong> (nn(cm)) {
+<a class="jxr_linenumber" name="L92" href="#L92">92</a>  				cm = bc.getClassMeta(Array.newInstance(cm.<strong class="jxr_keyword">inner</strong>(), 1).getClass());
+<a class="jxr_linenumber" name="L93" href="#L93">93</a>  				map.put(typeName, cm);
+<a class="jxr_linenumber" name="L94" href="#L94">94</a>  			}
+<a class="jxr_linenumber" name="L95" href="#L95">95</a>  			<strong class="jxr_keyword">return</strong> cm;
+<a class="jxr_linenumber" name="L96" href="#L96">96</a>  		}
+<a class="jxr_linenumber" name="L97" href="#L97">97</a>  		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L98" href="#L98">98</a>  	}
+<a class="jxr_linenumber" name="L99" href="#L99">99</a>  
+<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">	 * Given the specified class, return the dictionary name for it.</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">	 * @param c The class to lookup in this registry.</em>
+<a class="jxr_linenumber" name="L104" href="#L104">104</a> <em class="jxr_javadoccomment">	 * @return The dictionary name for the specified class in this registry, or &lt;jk&gt;null&lt;/jk&gt; if not found.</em>
+<a class="jxr_linenumber" name="L105" href="#L105">105</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L106" href="#L106">106</a> 	<strong class="jxr_keyword">public</strong> String getTypeName(ClassMeta&lt;?&gt; c) {
+<a class="jxr_linenumber" name="L107" href="#L107">107</a> 		<strong class="jxr_keyword">return</strong> isEmpty ? <strong class="jxr_keyword">null</strong> : reverseMap.get(c.<strong class="jxr_keyword">inner</strong>());
+<a class="jxr_linenumber" name="L108" href="#L108">108</a> 	}
+<a class="jxr_linenumber" name="L109" href="#L109">109</a> 
+<a class="jxr_linenumber" name="L110" href="#L110">110</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L111" href="#L111">111</a> <em class="jxr_javadoccomment">	 * Returns &lt;jk&gt;true&lt;/jk&gt; if this dictionary has an entry for the specified type name.</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">	 * @param typeName The bean type name.</em>
+<a class="jxr_linenumber" name="L114" href="#L114">114</a> <em class="jxr_javadoccomment">	 * @return &lt;jk&gt;true&lt;/jk&gt; if this dictionary has an entry for the specified type name.</em>
+<a class="jxr_linenumber" name="L115" href="#L115">115</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L116" href="#L116">116</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> hasName(String typeName) {
+<a class="jxr_linenumber" name="L117" href="#L117">117</a> 		<strong class="jxr_keyword">return</strong> nn(getClassMeta(typeName));
+<a class="jxr_linenumber" name="L118" href="#L118">118</a> 	}
+<a class="jxr_linenumber" name="L119" href="#L119">119</a> 
+<a class="jxr_linenumber" name="L120" href="#L120">120</a> 	<strong class="jxr_keyword">protected</strong> FluentMap&lt;String,Object&gt; properties() {
+<a class="jxr_linenumber" name="L121" href="#L121">121</a> 		<strong class="jxr_keyword">var</strong> m = filteredBeanPropertyMap();
+<a class="jxr_linenumber" name="L122" href="#L122">122</a> 		map.forEach((k, v) -&gt; m.a(k, v.toString(<strong class="jxr_keyword">true</strong>)));
+<a class="jxr_linenumber" name="L123" href="#L123">123</a> 		<strong class="jxr_keyword">return</strong> m;
+<a class="jxr_linenumber" name="L124" href="#L124">124</a> 	}
+<a class="jxr_linenumber" name="L125" href="#L125">125</a> 
+<a class="jxr_linenumber" name="L126" href="#L126">126</a> 	@Override
+<a class="jxr_linenumber" name="L127" href="#L127">127</a> 	<strong class="jxr_keyword">public</strong> String toString() {
+<a class="jxr_linenumber" name="L128" href="#L128">128</a> 		<strong class="jxr_keyword">return</strong> r(properties());
+<a class="jxr_linenumber" name="L129" href="#L129">129</a> 	}
+<a class="jxr_linenumber" name="L130" href="#L130">130</a> 
+<a class="jxr_linenumber" name="L131" href="#L131">131</a> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> addClass(Class&lt;?&gt; c) {
+<a class="jxr_linenumber" name="L132" href="#L132">132</a> 		<strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="L133" href="#L133">133</a> 			<strong class="jxr_keyword">if</strong> (nn(c)) {
+<a class="jxr_linenumber" name="L134" href="#L134">134</a> 				<strong class="jxr_keyword">var</strong> ci = info(c);
+<a class="jxr_linenumber" name="L135" href="#L135">135</a> 				<strong class="jxr_keyword">if</strong> (ci.isChildOf(Collection.<strong class="jxr_keyword">class</strong>)) {
+<a class="jxr_linenumber" name="L136" href="#L136">136</a> 					Collection&lt;?&gt; cc = BeanCreator.of(Collection.<strong class="jxr_keyword">class</strong>).type(ci).run();
+<a class="jxr_linenumber" name="L137" href="#L137">137</a> 					cc.forEach(x -&gt; {
+<a class="jxr_linenumber" name="L138" href="#L138">138</a> 						<strong class="jxr_keyword">if</strong> (x instanceof Class x2)
+<a class="jxr_linenumber" name="L139" href="#L139">139</a> 							addClass(x2);
+<a class="jxr_linenumber" name="L140" href="#L140">140</a> 						<strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L141" href="#L141">141</a> 							<strong class="jxr_keyword">throw</strong> bex(<span class="jxr_string">"Collection class ''{0}'' passed to BeanRegistry does not contain Class objects."</span>, cn(c));
+<a class="jxr_linenumber" name="L142" href="#L142">142</a> 					});
+<a class="jxr_linenumber" name="L143" href="#L143">143</a> 				} <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (ci.isChildOf(Map.<strong class="jxr_keyword">class</strong>)) {
+<a class="jxr_linenumber" name="L144" href="#L144">144</a> 					Map&lt;?,?&gt; m = BeanCreator.of(Map.<strong class="jxr_keyword">class</strong>).type(ci).run();
+<a class="jxr_linenumber" name="L145" href="#L145">145</a> 					m.forEach((k, v) -&gt; {
+<a class="jxr_linenumber" name="L146" href="#L146">146</a> 						<strong class="jxr_keyword">var</strong> typeName = s(k);
+<a class="jxr_linenumber" name="L147" href="#L147">147</a> 						<strong class="jxr_keyword">var</strong> val = (ClassMeta&lt;?&gt;)<strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L148" href="#L148">148</a> 						<strong class="jxr_keyword">if</strong> (v instanceof Type v2)
+<a class="jxr_linenumber" name="L149" href="#L149">149</a> 							val = bc.getClassMeta(v2);
+<a class="jxr_linenumber" name="L150" href="#L150">150</a> 						<strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (isArray(v))
+<a class="jxr_linenumber" name="L151" href="#L151">151</a> 							val = getTypedClassMeta(v);
+<a class="jxr_linenumber" name="L152" href="#L152">152</a> 						<strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L153" href="#L153">153</a> 							<strong class="jxr_keyword">throw</strong> bex(<span class="jxr_string">"Class ''{0}'' was passed to BeanRegistry but value of type ''{1}'' found in map is not a Type object."</span>, cn(c), cn(v));
+<a class="jxr_linenumber" name="L154" href="#L154">154</a> 						addToMap(typeName, val);
+<a class="jxr_linenumber" name="L155" href="#L155">155</a> 					});
+<a class="jxr_linenumber" name="L156" href="#L156">156</a> 				} <strong class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="L157" href="#L157">157</a> 					<em class="jxr_comment">// @formatter:off</em>
+<a class="jxr_linenumber" name="L158" href="#L158">158</a> 					<strong class="jxr_keyword">var</strong> typeName = ap.find(Bean.<strong class="jxr_keyword">class</strong>, ci)
+<a class="jxr_linenumber" name="L159" href="#L159">159</a> 						.stream()
+<a class="jxr_linenumber" name="L160" href="#L160">160</a> 						.map(x -&gt; x.<strong class="jxr_keyword">inner</strong>().typeName())
+<a class="jxr_linenumber" name="L161" href="#L161">161</a> 						.filter(Utils::isNotEmpty)
+<a class="jxr_linenumber" name="L162" href="#L162">162</a> 						.findFirst()
+<a class="jxr_linenumber" name="L163" href="#L163">163</a> 						.orElseThrow(() -&gt; bex(<span class="jxr_string">"Class ''{0}'' was passed to BeanRegistry but it doesn't have a @Bean(typeName) annotation defined."</span>, cn(c)));
+<a class="jxr_linenumber" name="L164" href="#L164">164</a> 					<em class="jxr_comment">// @formatter:on</em>
+<a class="jxr_linenumber" name="L165" href="#L165">165</a> 					addToMap(typeName, bc.getClassMeta(c));
+<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> 		} <strong class="jxr_keyword">catch</strong> (<a name="BeanRuntimeException" href="../../../org/apache/juneau/commons/reflect/BeanRuntimeException.html#BeanRuntimeException">BeanRuntimeException</a> e) {
+<a class="jxr_linenumber" name="L169" href="#L169">169</a> 			<strong class="jxr_keyword">throw</strong> e;
+<a class="jxr_linenumber" name="L170" href="#L170">170</a> 		} <strong class="jxr_keyword">catch</strong> (Exception e) {
+<a class="jxr_linenumber" name="L171" href="#L171">171</a> 			<strong class="jxr_keyword">throw</strong> bex(e);
+<a class="jxr_linenumber" name="L172" href="#L172">172</a> 		}
+<a class="jxr_linenumber" name="L173" href="#L173">173</a> 	}
+<a class="jxr_linenumber" name="L174" href="#L174">174</a> 
+<a class="jxr_linenumber" name="L175" href="#L175">175</a> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> addToMap(String typeName, ClassMeta&lt;?&gt; cm) {
+<a class="jxr_linenumber" name="L176" href="#L176">176</a> 		map.put(typeName, cm);
+<a class="jxr_linenumber" name="L177" href="#L177">177</a> 		reverseMap.put(cm.<strong class="jxr_keyword">inner</strong>(), typeName);
+<a class="jxr_linenumber" name="L178" href="#L178">178</a> 	}
+<a class="jxr_linenumber" name="L179" href="#L179">179</a> 
+<a class="jxr_linenumber" name="L180" href="#L180">180</a> 	<strong class="jxr_keyword">private</strong> ClassMeta&lt;?&gt; getTypedClassMeta(Object array) {
+<a class="jxr_linenumber" name="L181" href="#L181">181</a> 		<strong class="jxr_keyword">var</strong> len = Array.getLength(array);
+<a class="jxr_linenumber" name="L182" href="#L182">182</a> 		<strong class="jxr_keyword">if</strong> (len == 0)
+<a class="jxr_linenumber" name="L183" href="#L183">183</a> 			<strong class="jxr_keyword">throw</strong> bex(<span class="jxr_string">"Map entry had an empty array value."</span>);
+<a class="jxr_linenumber" name="L184" href="#L184">184</a> 		<strong class="jxr_keyword">var</strong> type = (Type)Array.get(array, 0);
+<a class="jxr_linenumber" name="L185" href="#L185">185</a> 		<strong class="jxr_keyword">var</strong> args = <strong class="jxr_keyword">new</strong> Type[len - 1];
+<a class="jxr_linenumber" name="L186" href="#L186">186</a> 		<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> i = 1; i &lt; len; i++)
+<a class="jxr_linenumber" name="L187" href="#L187">187</a> 			args[i - 1] = (Type)Array.get(array, i);
+<a class="jxr_linenumber" name="L188" href="#L188">188</a> 		<strong class="jxr_keyword">return</strong> bc.getClassMeta(type, args);
+<a class="jxr_linenumber" name="L189" href="#L189">189</a> 	}
+<a class="jxr_linenumber" name="L190" href="#L190">190</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/Context.html b/site/xref/org/apache/juneau/Context.html
index 1f55166200..5c6b2d3e2e 100644
--- a/site/xref/org/apache/juneau/Context.html
+++ b/site/xref/org/apache/juneau/Context.html
@@ -916,7 +916,7 @@
 <a class="jxr_linenumber" name="L908" href="#L908">908</a> <em class="jxr_javadoccomment">	 * @return The properties on this bean as a map for debugging.</em>
 <a class="jxr_linenumber" name="L909" href="#L909">909</a> <em class="jxr_javadoccomment">	 */</em>
 <a class="jxr_linenumber" name="L910" href="#L910">910</a> 	<strong class="jxr_keyword">protected</strong> FluentMap&lt;String,Object&gt; properties() {
-<a class="jxr_linenumber" name="L911" href="#L911">911</a> 		<strong class="jxr_keyword">return</strong> mapb().filtered().sorted().buildFluent()
+<a class="jxr_linenumber" name="L911" href="#L911">911</a> 		<strong class="jxr_keyword">return</strong> filteredBeanPropertyMap()
 <a class="jxr_linenumber" name="L912" href="#L912">912</a> 			.a(<span class="jxr_string">"annotations"</span>, annotations)
 <a class="jxr_linenumber" name="L913" href="#L913">913</a> 			.a(<span class="jxr_string">"debug"</span>, debug);
 <a class="jxr_linenumber" name="L914" href="#L914">914</a> 	}
diff --git a/site/xref/org/apache/juneau/ContextSession.html b/site/xref/org/apache/juneau/ContextSession.html
index 6d1b808810..39ddb9bdd9 100644
--- a/site/xref/org/apache/juneau/ContextSession.html
+++ b/site/xref/org/apache/juneau/ContextSession.html
@@ -248,7 +248,7 @@
 <a class="jxr_linenumber" name="L240" href="#L240">240</a> <em class="jxr_javadoccomment">	 * @return The properties on this bean as a map for debugging.</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> 	<strong class="jxr_keyword">protected</strong> FluentMap&lt;String,Object&gt; properties() {
-<a class="jxr_linenumber" name="L243" href="#L243">243</a> 		<strong class="jxr_keyword">return</strong> mapb().sorted().filtered().buildFluent()
+<a class="jxr_linenumber" name="L243" href="#L243">243</a> 		<strong class="jxr_keyword">return</strong> filteredBeanPropertyMap()
 <a class="jxr_linenumber" name="L244" href="#L244">244</a> 			.a(<span class="jxr_string">"debug"</span>, debug);
 <a class="jxr_linenumber" name="L245" href="#L245">245</a> 	}
 <a class="jxr_linenumber" name="L246" href="#L246">246</a> }
diff --git a/site/xref/org/apache/juneau/UriContext.html b/site/xref/org/apache/juneau/UriContext.html
index bb8e792293..e78be2c410 100644
--- a/site/xref/org/apache/juneau/UriContext.html
+++ b/site/xref/org/apache/juneau/UriContext.html
@@ -24,394 +24,420 @@
 <a class="jxr_linenumber" name="L16" href="#L16">16</a>  <em class="jxr_comment"> */</em>
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau;
 <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.StringUtils.*;
-<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> org.apache.juneau.annotation.*;
-<a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.collections.*;
-<a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.json.*;
-<a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.parser.*;
-<a class="jxr_linenumber" name="L27" href="#L27">27</a>  
-<a class="jxr_linenumber" name="L28" href="#L28">28</a>  <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L29" href="#L29">29</a>  <em class="jxr_javadoccomment"> * Represents a URL broken into authority/context-root/servlet-path/path-info parts.</em>
-<a class="jxr_linenumber" name="L30" href="#L30">30</a>  <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L31" href="#L31">31</a>  <em class="jxr_javadoccomment"> * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L32" href="#L32">32</a>  <em class="jxr_javadoccomment"> * A typical request against a URL takes the following form:</em>
-<a class="jxr_linenumber" name="L33" href="#L33">33</a>  <em class="jxr_javadoccomment"> * &lt;p class='bcode'&gt;</em>
-<a class="jxr_linenumber" name="L34" href="#L34">34</a>  <em class="jxr_javadoccomment"> * 	<a href="http://host:port/context-root/servlet-path/path-info" target="alexandria_uri">http://host:port/context-root/servlet-path/path-info</a></em>
-<a class="jxr_linenumber" name="L35" href="#L35">35</a>  <em class="jxr_javadoccomment"> * 	|   authority   |  context   |  resource  |  path  |</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"> *</em>
-<a class="jxr_linenumber" name="L39" href="#L39">39</a>  <em class="jxr_javadoccomment"> * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L40" href="#L40">40</a>  <em class="jxr_javadoccomment"> * This class allows you to convert URL strings to absolute (e.g. &lt;js&gt;"<a href="http://host:port/foo/bar" target="alexandria_uri">http://host:port/foo/bar</a>"&lt;/js&gt;) or root-relative</em>
-<a class="jxr_linenumber" name="L41" href="#L41">41</a>  <em class="jxr_javadoccomment"> * (e.g. &lt;js&gt;"/foo/bar"&lt;/js&gt;) URLs.</em>
-<a class="jxr_linenumber" name="L42" href="#L42">42</a>  <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L43" href="#L43">43</a>  <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L44" href="#L44">44</a>  @Bean
-<a class="jxr_linenumber" name="L45" href="#L45">45</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a name="UriContext" href="../../../org/apache/juneau/UriContext.html#UriContext">UriContext</a> {
-<a class="jxr_linenumber" name="L46" href="#L46">46</a>  
-<a class="jxr_linenumber" name="L47" href="#L47">47</a>  	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L48" href="#L48">48</a>  <em class="jxr_javadoccomment">	 * Default URI context.</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;p&gt;</em>
-<a class="jxr_linenumber" name="L51" href="#L51">51</a>  <em class="jxr_javadoccomment">	 * No information about authority, servlet-root, context-root, or path-info is known.</em>
-<a class="jxr_linenumber" name="L52" href="#L52">52</a>  <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L53" href="#L53">53</a>  	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <a name="UriContext" href="../../../org/apache/juneau/UriContext.html#UriContext">UriContext</a> DEFAULT = <strong class="jxr_keyword">new</strong> <a name="UriContext" href="../../../org/apache/juneau/UriContext.html#UriContext">UriContext</a>();
-<a class="jxr_linenumber" name="L54" href="#L54">54</a>  
-<a class="jxr_linenumber" name="L55" href="#L55">55</a>  	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L56" href="#L56">56</a>  <em class="jxr_javadoccomment">	 * Static creator.</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">	 * @param s</em>
-<a class="jxr_linenumber" name="L59" href="#L59">59</a>  <em class="jxr_javadoccomment">	 * 	The input string.</em>
-<a class="jxr_linenumber" name="L60" href="#L60">60</a>  <em class="jxr_javadoccomment">	 * 	&lt;br&gt;Example: &lt;js&gt;{authority:'<a href="http://localhost:10000',contextRoot:'/myContext',servletPath:'/myServlet',pathInfo:'/foo'" target="alexandria_uri">http://localhost:10000',contextRoot:'/myContext',servletPath:'/myServlet',pathInfo:'/foo'</a>}&lt;/js&gt;</em>
-<a class="jxr_linenumber" name="L61" href="#L61">61</a>  <em class="jxr_javadoccomment">	 * @return A new {@link UriContext} object.</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>  	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <a name="UriContext" href="../../../org/apache/juneau/UriContext.html#UriContext">UriContext</a> of(String s) {
-<a class="jxr_linenumber" name="L64" href="#L64">64</a>  		<strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="L65" href="#L65">65</a>  			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a name="UriContext" href="../../../org/apache/juneau/UriContext.html#UriContext">UriContext</a>(s);
-<a class="jxr_linenumber" name="L66" href="#L66">66</a>  		} <strong class="jxr_keyword">catch</strong> (<a name="ParseException" href="../../../org/apache/juneau/parser/ParseException.html#ParseException">ParseException</a> e) {
-<a class="jxr_linenumber" name="L67" href="#L67">67</a>  			<strong class="jxr_keyword">throw</strong> toRex(e);
-<a class="jxr_linenumber" name="L68" href="#L68">68</a>  		}
-<a class="jxr_linenumber" name="L69" href="#L69">69</a>  	}
-<a class="jxr_linenumber" name="L70" href="#L70">70</a>  
-<a class="jxr_linenumber" name="L71" href="#L71">71</a>  	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L72" href="#L72">72</a>  <em class="jxr_javadoccomment">	 * Static creator.</em>
-<a class="jxr_linenumber" name="L73" href="#L73">73</a>  <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L74" href="#L74">74</a>  <em class="jxr_javadoccomment">	 * @param authority</em>
-<a class="jxr_linenumber" name="L75" href="#L75">75</a>  <em class="jxr_javadoccomment">	 * 	The authority portion of URL (e.g. &lt;js&gt;"<a href="http://hostname:port" target="alexandria_uri">http://hostname:port</a>"&lt;/js&gt;)</em>
-<a class="jxr_linenumber" name="L76" href="#L76">76</a>  <em class="jxr_javadoccomment">	 * @param contextRoot</em>
-<a class="jxr_linenumber" name="L77" href="#L77">77</a>  <em class="jxr_javadoccomment">	 * 	The context root of the application (e.g. &lt;js&gt;"/context-root"&lt;/js&gt;, or &lt;js&gt;"context-root"&lt;/js&gt;)</em>
-<a class="jxr_linenumber" name="L78" href="#L78">78</a>  <em class="jxr_javadoccomment">	 * @param servletPath</em>
-<a class="jxr_linenumber" name="L79" href="#L79">79</a>  <em class="jxr_javadoccomment">	 * 	The servlet path (e.g. &lt;js&gt;"/servlet-path"&lt;/js&gt;, or &lt;js&gt;"servlet-path"&lt;/js&gt;)</em>
-<a class="jxr_linenumber" name="L80" href="#L80">80</a>  <em class="jxr_javadoccomment">	 * @param pathInfo</em>
-<a class="jxr_linenumber" name="L81" href="#L81">81</a>  <em class="jxr_javadoccomment">	 * 	The path info (e.g. &lt;js&gt;"/path-info"&lt;/js&gt;, or &lt;js&gt;"path-info"&lt;/js&gt;)</em>
-<a class="jxr_linenumber" name="L82" href="#L82">82</a>  <em class="jxr_javadoccomment">	 * @return A new {@link UriContext} object.</em>
-<a class="jxr_linenumber" name="L83" href="#L83">83</a>  <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L84" href="#L84">84</a>  	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <a name="UriContext" href="../../../org/apache/juneau/UriContext.html#UriContext">UriContext</a> of(String authority, String contextRoot, String servletPath, String pathInfo) {
-<a class="jxr_linenumber" name="L85" href="#L85">85</a>  		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a name="UriContext" href="../../../org/apache/juneau/UriContext.html#UriContext">UriContext</a>(authority, contextRoot, servletPath, pathInfo);
-<a class="jxr_linenumber" name="L86" href="#L86">86</a>  	}
-<a class="jxr_linenumber" name="L87" href="#L87">87</a>  
-<a class="jxr_linenumber" name="L88" href="#L88">88</a>  	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> String getParent(String uri) {
-<a class="jxr_linenumber" name="L89" href="#L89">89</a>  		<strong class="jxr_keyword">var</strong> i = uri.lastIndexOf('/');
-<a class="jxr_linenumber" name="L90" href="#L90">90</a>  		<strong class="jxr_keyword">if</strong> (i &lt;= 1)
-<a class="jxr_linenumber" name="L91" href="#L91">91</a>  			<strong class="jxr_keyword">return</strong> <span class="jxr_string">"/"</span>;
-<a class="jxr_linenumber" name="L92" href="#L92">92</a>  		<strong class="jxr_keyword">return</strong> uri.substring(0, i);
-<a class="jxr_linenumber" name="L93" href="#L93">93</a>  	}
-<a class="jxr_linenumber" name="L94" href="#L94">94</a>  
-<a class="jxr_linenumber" name="L95" href="#L95">95</a>  	@SuppressWarnings(<span class="jxr_string">"javadoc"</span>)
-<a class="jxr_linenumber" name="L96" href="#L96">96</a>  	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> String authority, contextRoot, servletPath, pathInfo, parentPath;
+<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.CollectionUtils.*;
+<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.StringUtils.*;
+<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.util.function.Supplier;
+<a class="jxr_linenumber" name="L25" href="#L25">25</a>  
+<a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.annotation.*;
+<a class="jxr_linenumber" name="L27" href="#L27">27</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.collections.*;
+<a class="jxr_linenumber" name="L28" href="#L28">28</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.commons.collections.*;
+<a class="jxr_linenumber" name="L29" href="#L29">29</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.parser.*;
+<a class="jxr_linenumber" name="L30" href="#L30">30</a>  
+<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"> * Represents a URL broken into authority/context-root/servlet-path/path-info parts.</em>
+<a class="jxr_linenumber" name="L33" href="#L33">33</a>  <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L34" href="#L34">34</a>  <em class="jxr_javadoccomment"> * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L35" href="#L35">35</a>  <em class="jxr_javadoccomment"> * A typical request against a URL takes the following form:</em>
+<a class="jxr_linenumber" name="L36" href="#L36">36</a>  <em class="jxr_javadoccomment"> * &lt;p class='bcode'&gt;</em>
+<a class="jxr_linenumber" name="L37" href="#L37">37</a>  <em class="jxr_javadoccomment"> * 	<a href="http://host:port/context-root/servlet-path/path-info" target="alexandria_uri">http://host:port/context-root/servlet-path/path-info</a></em>
+<a class="jxr_linenumber" name="L38" href="#L38">38</a>  <em class="jxr_javadoccomment"> * 	|   authority   |  context   |  resource  |  path  |</em>
+<a class="jxr_linenumber" name="L39" href="#L39">39</a>  <em class="jxr_javadoccomment"> * 	+--------------------------------------------------+</em>
+<a class="jxr_linenumber" name="L40" href="#L40">40</a>  <em class="jxr_javadoccomment"> * &lt;/p&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;p&gt;</em>
+<a class="jxr_linenumber" name="L43" href="#L43">43</a>  <em class="jxr_javadoccomment"> * This class allows you to convert URL strings to absolute (e.g. &lt;js&gt;"<a href="http://host:port/foo/bar" target="alexandria_uri">http://host:port/foo/bar</a>"&lt;/js&gt;) or root-relative</em>
+<a class="jxr_linenumber" name="L44" href="#L44">44</a>  <em class="jxr_javadoccomment"> * (e.g. &lt;js&gt;"/foo/bar"&lt;/js&gt;) URLs.</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"> */</em>
+<a class="jxr_linenumber" name="L47" href="#L47">47</a>  @Bean
+<a class="jxr_linenumber" name="L48" href="#L48">48</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a name="UriContext" href="../../../org/apache/juneau/UriContext.html#UriContext">UriContext</a> {
+<a class="jxr_linenumber" name="L49" href="#L49">49</a>  
+<a class="jxr_linenumber" name="L50" href="#L50">50</a>  	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L51" href="#L51">51</a>  <em class="jxr_javadoccomment">	 * Default URI context.</em>
+<a class="jxr_linenumber" name="L52" href="#L52">52</a>  <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L53" href="#L53">53</a>  <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L54" href="#L54">54</a>  <em class="jxr_javadoccomment">	 * No information about authority, servlet-root, context-root, or path-info is known.</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>  	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <a name="UriContext" href="../../../org/apache/juneau/UriContext.html#UriContext">UriContext</a> DEFAULT = <strong class="jxr_keyword">new</strong> <a name="UriContext" href="../../../org/apache/juneau/UriContext.html#UriContext">UriContext</a>();
+<a class="jxr_linenumber" name="L57" href="#L57">57</a>  
+<a class="jxr_linenumber" name="L58" href="#L58">58</a>  	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L59" href="#L59">59</a>  <em class="jxr_javadoccomment">	 * Static creator.</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">	 * @param s</em>
+<a class="jxr_linenumber" name="L62" href="#L62">62</a>  <em class="jxr_javadoccomment">	 * 	The input string.</em>
+<a class="jxr_linenumber" name="L63" href="#L63">63</a>  <em class="jxr_javadoccomment">	 * 	&lt;br&gt;Example: &lt;js&gt;{authority:'<a href="http://localhost:10000',contextRoot:'/myContext',servletPath:'/myServlet',pathInfo:'/foo'" target="alexandria_uri">http://localhost:10000',contextRoot:'/myContext',servletPath:'/myServlet',pathInfo:'/foo'</a>}&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L64" href="#L64">64</a>  <em class="jxr_javadoccomment">	 * @return A new {@link UriContext} object.</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>  	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <a name="UriContext" href="../../../org/apache/juneau/UriContext.html#UriContext">UriContext</a> of(String s) {
+<a class="jxr_linenumber" name="L67" href="#L67">67</a>  		<strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="L68" href="#L68">68</a>  			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a name="UriContext" href="../../../org/apache/juneau/UriContext.html#UriContext">UriContext</a>(s);
+<a class="jxr_linenumber" name="L69" href="#L69">69</a>  		} <strong class="jxr_keyword">catch</strong> (<a name="ParseException" href="../../../org/apache/juneau/parser/ParseException.html#ParseException">ParseException</a> e) {
+<a class="jxr_linenumber" name="L70" href="#L70">70</a>  			<strong class="jxr_keyword">throw</strong> toRex(e);
+<a class="jxr_linenumber" name="L71" href="#L71">71</a>  		}
+<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>  	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L75" href="#L75">75</a>  <em class="jxr_javadoccomment">	 * Static creator.</em>
+<a class="jxr_linenumber" name="L76" href="#L76">76</a>  <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L77" href="#L77">77</a>  <em class="jxr_javadoccomment">	 * @param authority</em>
+<a class="jxr_linenumber" name="L78" href="#L78">78</a>  <em class="jxr_javadoccomment">	 * 	The authority portion of URL (e.g. &lt;js&gt;"<a href="http://hostname:port" target="alexandria_uri">http://hostname:port</a>"&lt;/js&gt;)</em>
+<a class="jxr_linenumber" name="L79" href="#L79">79</a>  <em class="jxr_javadoccomment">	 * @param contextRoot</em>
+<a class="jxr_linenumber" name="L80" href="#L80">80</a>  <em class="jxr_javadoccomment">	 * 	The context root of the application (e.g. &lt;js&gt;"/context-root"&lt;/js&gt;, or &lt;js&gt;"context-root"&lt;/js&gt;)</em>
+<a class="jxr_linenumber" name="L81" href="#L81">81</a>  <em class="jxr_javadoccomment">	 * @param servletPath</em>
+<a class="jxr_linenumber" name="L82" href="#L82">82</a>  <em class="jxr_javadoccomment">	 * 	The servlet path (e.g. &lt;js&gt;"/servlet-path"&lt;/js&gt;, or &lt;js&gt;"servlet-path"&lt;/js&gt;)</em>
+<a class="jxr_linenumber" name="L83" href="#L83">83</a>  <em class="jxr_javadoccomment">	 * @param pathInfo</em>
+<a class="jxr_linenumber" name="L84" href="#L84">84</a>  <em class="jxr_javadoccomment">	 * 	The path info (e.g. &lt;js&gt;"/path-info"&lt;/js&gt;, or &lt;js&gt;"path-info"&lt;/js&gt;)</em>
+<a class="jxr_linenumber" name="L85" href="#L85">85</a>  <em class="jxr_javadoccomment">	 * @return A new {@link UriContext} object.</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>  	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <a name="UriContext" href="../../../org/apache/juneau/UriContext.html#UriContext">UriContext</a> of(String authority, String contextRoot, String servletPath, String pathInfo) {
+<a class="jxr_linenumber" name="L88" href="#L88">88</a>  		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a name="UriContext" href="../../../org/apache/juneau/UriContext.html#UriContext">UriContext</a>(authority, contextRoot, servletPath, pathInfo);
+<a class="jxr_linenumber" name="L89" href="#L89">89</a>  	}
+<a class="jxr_linenumber" name="L90" href="#L90">90</a>  
+<a class="jxr_linenumber" name="L91" href="#L91">91</a>  	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> String getParent(String uri) {
+<a class="jxr_linenumber" name="L92" href="#L92">92</a>  		<strong class="jxr_keyword">var</strong> i = uri.lastIndexOf('/');
+<a class="jxr_linenumber" name="L93" href="#L93">93</a>  		<strong class="jxr_keyword">if</strong> (i &lt;= 1)
+<a class="jxr_linenumber" name="L94" href="#L94">94</a>  			<strong class="jxr_keyword">return</strong> <span class="jxr_string">"/"</span>;
+<a class="jxr_linenumber" name="L95" href="#L95">95</a>  		<strong class="jxr_keyword">return</strong> uri.substring(0, i);
+<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>  	<em class="jxr_comment">// Lazy-initialized fields.</em>
-<a class="jxr_linenumber" name="L99" href="#L99">99</a>  	<strong class="jxr_keyword">private</strong> String aContextRoot, rContextRoot, aServletPath, rResource, aPathInfo, rPath;
+<a class="jxr_linenumber" name="L98" href="#L98">98</a>  	@SuppressWarnings(<span class="jxr_string">"javadoc"</span>)
+<a class="jxr_linenumber" name="L99" href="#L99">99</a>  	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> String authority, contextRoot, servletPath, pathInfo, parentPath;
 <a class="jxr_linenumber" name="L100" href="#L100">100</a> 
-<a class="jxr_linenumber" name="L101" href="#L101">101</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L102" href="#L102">102</a> <em class="jxr_javadoccomment">	 * Default constructor.</em>
-<a class="jxr_linenumber" name="L103" href="#L103">103</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L104" href="#L104">104</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L105" href="#L105">105</a> <em class="jxr_javadoccomment">	 * All &lt;jk&gt;null&lt;/jk&gt; values.</em>
-<a class="jxr_linenumber" name="L106" href="#L106">106</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L107" href="#L107">107</a> 	<strong class="jxr_keyword">public</strong> <a name="UriContext" href="../../../org/apache/juneau/UriContext.html#UriContext">UriContext</a>() {
-<a class="jxr_linenumber" name="L108" href="#L108">108</a> 		<strong class="jxr_keyword">this</strong>(<strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>);
-<a class="jxr_linenumber" name="L109" href="#L109">109</a> 	}
-<a class="jxr_linenumber" name="L110" href="#L110">110</a> 
-<a class="jxr_linenumber" name="L111" href="#L111">111</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L112" href="#L112">112</a> <em class="jxr_javadoccomment">	 * String constructor.</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">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L115" href="#L115">115</a> <em class="jxr_javadoccomment">	 * Input string is a JSON object with the following format:</em>
-<a class="jxr_linenumber" name="L116" href="#L116">116</a> <em class="jxr_javadoccomment">	 * &lt;js&gt;{authority:'xxx',contextRoot:'xxx',servletPath:'xxx',pathInfo:'xxx'}&lt;/js&gt;</em>
-<a class="jxr_linenumber" name="L117" href="#L117">117</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L118" href="#L118">118</a> <em class="jxr_javadoccomment">	 * @param s</em>
-<a class="jxr_linenumber" name="L119" href="#L119">119</a> <em class="jxr_javadoccomment">	 * 	The input string.</em>
-<a class="jxr_linenumber" name="L120" href="#L120">120</a> <em class="jxr_javadoccomment">	 * 	&lt;br&gt;Example: &lt;js&gt;{authority:'<a href="http://localhost:10000',contextRoot:'/myContext',servletPath:'/myServlet',pathInfo:'/foo'" target="alexandria_uri">http://localhost:10000',contextRoot:'/myContext',servletPath:'/myServlet',pathInfo:'/foo'</a>}&lt;/js&gt;</em>
-<a class="jxr_linenumber" name="L121" href="#L121">121</a> <em class="jxr_javadoccomment">	 * @throws ParseException</em>
-<a class="jxr_linenumber" name="L122" href="#L122">122</a> <em class="jxr_javadoccomment">	 * 	If input string is not a valid JSON object.</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> 	<strong class="jxr_keyword">public</strong> <a name="UriContext" href="../../../org/apache/juneau/UriContext.html#UriContext">UriContext</a>(String s) <strong class="jxr_keyword">throws</strong> <a name="ParseException" href="../../../org/apache/juneau/parser/ParseException.html#ParseException">ParseException</a> {
-<a class="jxr_linenumber" name="L125" href="#L125">125</a> 		<strong class="jxr_keyword">var</strong> m = JsonMap.ofJson(s);
-<a class="jxr_linenumber" name="L126" href="#L126">126</a> 		<strong class="jxr_keyword">this</strong>.authority = nullIfEmpty(trimSlashes(m.getString(<span class="jxr_string">"authority"</span>)));
-<a class="jxr_linenumber" name="L127" href="#L127">127</a> 		<strong class="jxr_keyword">this</strong>.contextRoot = nullIfEmpty(trimSlashes(m.getString(<span class="jxr_string">"contextRoot"</span>)));
-<a class="jxr_linenumber" name="L128" href="#L128">128</a> 		<strong class="jxr_keyword">this</strong>.servletPath = nullIfEmpty(trimSlashes(m.getString(<span class="jxr_string">"servletPath"</span>)));
-<a class="jxr_linenumber" name="L129" href="#L129">129</a> 		<strong class="jxr_keyword">this</strong>.pathInfo = nullIfEmpty(trimSlashes(m.getString(<span class="jxr_string">"pathInfo"</span>)));
-<a class="jxr_linenumber" name="L130" href="#L130">130</a> 		<strong class="jxr_keyword">this</strong>.parentPath = <strong class="jxr_keyword">this</strong>.pathInfo == <strong class="jxr_keyword">null</strong> || <strong class="jxr_keyword">this</strong>.pathInfo.indexOf('/') == -1 ? <strong class="jxr_keyword">null</strong> : <strong class="jxr_keyword">this</strong>.pathInfo.substring(0, <strong class="jxr_keyword">this</strong>.pathInfo.lastIndexOf('/'));
-<a class="jxr_linenumber" name="L131" href="#L131">131</a> 	}
-<a class="jxr_linenumber" name="L132" href="#L132">132</a> 
-<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">	 * Constructor.</em>
-<a class="jxr_linenumber" name="L135" href="#L135">135</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L136" href="#L136">136</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L137" href="#L137">137</a> <em class="jxr_javadoccomment">	 * Leading and trailing slashes are trimmed of all parameters.</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">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L140" href="#L140">140</a> <em class="jxr_javadoccomment">	 * Any parameter can be &lt;jk&gt;null&lt;/jk&gt;.  Blanks and nulls are equivalent.</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> <em class="jxr_javadoccomment">	 * @param authority</em>
-<a class="jxr_linenumber" name="L143" href="#L143">143</a> <em class="jxr_javadoccomment">	 * 	The authority portion of URL (e.g. &lt;js&gt;"<a href="http://hostname:port" target="alexandria_uri">http://hostname:port</a>"&lt;/js&gt;)</em>
-<a class="jxr_linenumber" name="L144" href="#L144">144</a> <em class="jxr_javadoccomment">	 * @param contextRoot</em>
-<a class="jxr_linenumber" name="L145" href="#L145">145</a> <em class="jxr_javadoccomment">	 * 	The context root of the application (e.g. &lt;js&gt;"/context-root"&lt;/js&gt;, or &lt;js&gt;"context-root"&lt;/js&gt;)</em>
-<a class="jxr_linenumber" name="L146" href="#L146">146</a> <em class="jxr_javadoccomment">	 * @param servletPath</em>
-<a class="jxr_linenumber" name="L147" href="#L147">147</a> <em class="jxr_javadoccomment">	 * 	The servlet path (e.g. &lt;js&gt;"/servlet-path"&lt;/js&gt;, or &lt;js&gt;"servlet-path"&lt;/js&gt;)</em>
-<a class="jxr_linenumber" name="L148" href="#L148">148</a> <em class="jxr_javadoccomment">	 * @param pathInfo</em>
-<a class="jxr_linenumber" name="L149" href="#L149">149</a> <em class="jxr_javadoccomment">	 * 	The path info (e.g. &lt;js&gt;"/path-info"&lt;/js&gt;, or &lt;js&gt;"path-info"&lt;/js&gt;)</em>
-<a class="jxr_linenumber" name="L150" href="#L150">150</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L151" href="#L151">151</a> 	@Beanc
-<a class="jxr_linenumber" name="L152" href="#L152">152</a> 	<strong class="jxr_keyword">public</strong> <a name="UriContext" href="../../../org/apache/juneau/UriContext.html#UriContext">UriContext</a>(@Name(<span class="jxr_string">"authority"</span>) String authority, @Name(<span class="jxr_string">"contextRoot"</span>) String contextRoot, @Name(<span class="jxr_string">"servletPath"</span>) String servletPath, @Name(<span class="jxr_string">"pathInfo"</span>) String pathInfo) {
-<a class="jxr_linenumber" name="L153" href="#L153">153</a> 		<strong class="jxr_keyword">this</strong>.authority = nullIfEmpty(trimSlashes(authority));
-<a class="jxr_linenumber" name="L154" href="#L154">154</a> 		<strong class="jxr_keyword">this</strong>.contextRoot = nullIfEmpty(trimSlashes(contextRoot));
-<a class="jxr_linenumber" name="L155" href="#L155">155</a> 		<strong class="jxr_keyword">this</strong>.servletPath = nullIfEmpty(trimSlashes(servletPath));
-<a class="jxr_linenumber" name="L156" href="#L156">156</a> 		<strong class="jxr_keyword">this</strong>.pathInfo = nullIfEmpty(trimSlashes(pathInfo));
-<a class="jxr_linenumber" name="L157" href="#L157">157</a> 		<strong class="jxr_keyword">this</strong>.parentPath = <strong class="jxr_keyword">this</strong>.pathInfo == <strong class="jxr_keyword">null</strong> || <strong class="jxr_keyword">this</strong>.pathInfo.indexOf('/') == -1 ? <strong class="jxr_keyword">null</strong> : <strong class="jxr_keyword">this</strong>.pathInfo.substring(0, <strong class="jxr_keyword">this</strong>.pathInfo.lastIndexOf('/'));
-<a class="jxr_linenumber" name="L158" href="#L158">158</a> 	}
-<a class="jxr_linenumber" name="L159" href="#L159">159</a> 
-<a class="jxr_linenumber" name="L160" href="#L160">160</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L161" href="#L161">161</a> <em class="jxr_javadoccomment">	 * Returns the absolute URI of just the authority portion of this URI context.</em>
-<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">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L164" href="#L164">164</a> <em class="jxr_javadoccomment">	 * Example:  &lt;js&gt;"<a href="http://hostname:port" target="alexandria_uri">http://hostname:port</a>"&lt;/js&gt;</em>
-<a class="jxr_linenumber" name="L165" href="#L165">165</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L166" href="#L166">166</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L167" href="#L167">167</a> <em class="jxr_javadoccomment">	 * If the authority is null/empty, returns &lt;js&gt;"/"&lt;/js&gt;.</em>
-<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">	 * @return</em>
-<a class="jxr_linenumber" name="L170" href="#L170">170</a> <em class="jxr_javadoccomment">	 * 	The absolute URI of just the authority portion of this URI context.</em>
-<a class="jxr_linenumber" name="L171" href="#L171">171</a> <em class="jxr_javadoccomment">	 * 	Never &lt;jk&gt;null&lt;/jk&gt;.</em>
-<a class="jxr_linenumber" name="L172" href="#L172">172</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L173" href="#L173">173</a> 	<strong class="jxr_keyword">public</strong> String getAbsoluteAuthority() { <strong class="jxr_keyword">return</strong> authority == <strong class="jxr_keyword">null</strong> ? <span class="jxr_string">"/"</span> : authority; }
+<a class="jxr_linenumber" name="L101" href="#L101">101</a> 	<em class="jxr_comment">// Memoized suppliers.</em>
+<a class="jxr_linenumber" name="L102" href="#L102">102</a> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Supplier&lt;String&gt; aContextRoot, rContextRoot, aServletPath, rResource, aPathInfo, rPath;
+<a class="jxr_linenumber" name="L103" href="#L103">103</a> 
+<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">	 * Default constructor.</em>
+<a class="jxr_linenumber" name="L106" href="#L106">106</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L107" href="#L107">107</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L108" href="#L108">108</a> <em class="jxr_javadoccomment">	 * All &lt;jk&gt;null&lt;/jk&gt; values.</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> 	<strong class="jxr_keyword">public</strong> <a name="UriContext" href="../../../org/apache/juneau/UriContext.html#UriContext">UriContext</a>() {
+<a class="jxr_linenumber" name="L111" href="#L111">111</a> 		<strong class="jxr_keyword">this</strong>(<strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="L112" href="#L112">112</a> 	}
+<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">	 * String constructor.</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">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L118" href="#L118">118</a> <em class="jxr_javadoccomment">	 * Input string is a JSON object with the following format:</em>
+<a class="jxr_linenumber" name="L119" href="#L119">119</a> <em class="jxr_javadoccomment">	 * &lt;js&gt;{authority:'xxx',contextRoot:'xxx',servletPath:'xxx',pathInfo:'xxx'}&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L120" href="#L120">120</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L121" href="#L121">121</a> <em class="jxr_javadoccomment">	 * @param s</em>
+<a class="jxr_linenumber" name="L122" href="#L122">122</a> <em class="jxr_javadoccomment">	 * 	The input string.</em>
+<a class="jxr_linenumber" name="L123" href="#L123">123</a> <em class="jxr_javadoccomment">	 * 	&lt;br&gt;Example: &lt;js&gt;{authority:'<a href="http://localhost:10000',contextRoot:'/myContext',servletPath:'/myServlet',pathInfo:'/foo'" target="alexandria_uri">http://localhost:10000',contextRoot:'/myContext',servletPath:'/myServlet',pathInfo:'/foo'</a>}&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L124" href="#L124">124</a> <em class="jxr_javadoccomment">	 * @throws ParseException</em>
+<a class="jxr_linenumber" name="L125" href="#L125">125</a> <em class="jxr_javadoccomment">	 * 	If input string is not a valid JSON object.</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> 	<strong class="jxr_keyword">public</strong> <a name="UriContext" href="../../../org/apache/juneau/UriContext.html#UriContext">UriContext</a>(String s) <strong class="jxr_keyword">throws</strong> <a name="ParseException" href="../../../org/apache/juneau/parser/ParseException.html#ParseException">ParseException</a> {
+<a class="jxr_linenumber" name="L128" href="#L128">128</a> 		<strong class="jxr_keyword">var</strong> m = JsonMap.ofJson(s);
+<a class="jxr_linenumber" name="L129" href="#L129">129</a> 		<strong class="jxr_keyword">this</strong>.authority = nullIfEmpty(trimSlashes(m.getString(<span class="jxr_string">"authority"</span>)));
+<a class="jxr_linenumber" name="L130" href="#L130">130</a> 		<strong class="jxr_keyword">this</strong>.contextRoot = nullIfEmpty(trimSlashes(m.getString(<span class="jxr_string">"contextRoot"</span>)));
+<a class="jxr_linenumber" name="L131" href="#L131">131</a> 		<strong class="jxr_keyword">this</strong>.servletPath = nullIfEmpty(trimSlashes(m.getString(<span class="jxr_string">"servletPath"</span>)));
+<a class="jxr_linenumber" name="L132" href="#L132">132</a> 		<strong class="jxr_keyword">this</strong>.pathInfo = nullIfEmpty(trimSlashes(m.getString(<span class="jxr_string">"pathInfo"</span>)));
+<a class="jxr_linenumber" name="L133" href="#L133">133</a> 		<strong class="jxr_keyword">this</strong>.parentPath = <strong class="jxr_keyword">this</strong>.pathInfo == <strong class="jxr_keyword">null</strong> || <strong class="jxr_keyword">this</strong>.pathInfo.indexOf('/') == -1 ? <strong class="jxr_keyword">null</strong> : <strong class="jxr_keyword">this</strong>.pathInfo.substring(0, <strong class="jxr_keyword">this</strong>.pathInfo.lastIndexOf('/'));
+<a class="jxr_linenumber" name="L134" href="#L134">134</a> 		<strong class="jxr_keyword">this</strong>.rContextRoot = memoize(() -&gt; findRContextRoot());
+<a class="jxr_linenumber" name="L135" href="#L135">135</a> 		<strong class="jxr_keyword">this</strong>.rResource = memoize(() -&gt; findRResource());
+<a class="jxr_linenumber" name="L136" href="#L136">136</a> 		<strong class="jxr_keyword">this</strong>.rPath = memoize(() -&gt; findRPath());
+<a class="jxr_linenumber" name="L137" href="#L137">137</a> 		<strong class="jxr_keyword">this</strong>.aContextRoot = memoize(() -&gt; findAContextRoot());
+<a class="jxr_linenumber" name="L138" href="#L138">138</a> 		<strong class="jxr_keyword">this</strong>.aServletPath = memoize(() -&gt; findAServletPath());
+<a class="jxr_linenumber" name="L139" href="#L139">139</a> 		<strong class="jxr_keyword">this</strong>.aPathInfo = memoize(() -&gt; findAPathInfo());
+<a class="jxr_linenumber" name="L140" href="#L140">140</a> 	}
+<a class="jxr_linenumber" name="L141" href="#L141">141</a> 
+<a class="jxr_linenumber" name="L142" href="#L142">142</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L143" href="#L143">143</a> <em class="jxr_javadoccomment">	 * Constructor.</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;p&gt;</em>
+<a class="jxr_linenumber" name="L146" href="#L146">146</a> <em class="jxr_javadoccomment">	 * Leading and trailing slashes are trimmed of all parameters.</em>
+<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">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L149" href="#L149">149</a> <em class="jxr_javadoccomment">	 * Any parameter can be &lt;jk&gt;null&lt;/jk&gt;.  Blanks and nulls are equivalent.</em>
+<a class="jxr_linenumber" name="L150" href="#L150">150</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L151" href="#L151">151</a> <em class="jxr_javadoccomment">	 * @param authority</em>
+<a class="jxr_linenumber" name="L152" href="#L152">152</a> <em class="jxr_javadoccomment">	 * 	The authority portion of URL (e.g. &lt;js&gt;"<a href="http://hostname:port" target="alexandria_uri">http://hostname:port</a>"&lt;/js&gt;)</em>
+<a class="jxr_linenumber" name="L153" href="#L153">153</a> <em class="jxr_javadoccomment">	 * @param contextRoot</em>
+<a class="jxr_linenumber" name="L154" href="#L154">154</a> <em class="jxr_javadoccomment">	 * 	The context root of the application (e.g. &lt;js&gt;"/context-root"&lt;/js&gt;, or &lt;js&gt;"context-root"&lt;/js&gt;)</em>
+<a class="jxr_linenumber" name="L155" href="#L155">155</a> <em class="jxr_javadoccomment">	 * @param servletPath</em>
+<a class="jxr_linenumber" name="L156" href="#L156">156</a> <em class="jxr_javadoccomment">	 * 	The servlet path (e.g. &lt;js&gt;"/servlet-path"&lt;/js&gt;, or &lt;js&gt;"servlet-path"&lt;/js&gt;)</em>
+<a class="jxr_linenumber" name="L157" href="#L157">157</a> <em class="jxr_javadoccomment">	 * @param pathInfo</em>
+<a class="jxr_linenumber" name="L158" href="#L158">158</a> <em class="jxr_javadoccomment">	 * 	The path info (e.g. &lt;js&gt;"/path-info"&lt;/js&gt;, or &lt;js&gt;"path-info"&lt;/js&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> 	@Beanc
+<a class="jxr_linenumber" name="L161" href="#L161">161</a> 	<strong class="jxr_keyword">public</strong> <a name="UriContext" href="../../../org/apache/juneau/UriContext.html#UriContext">UriContext</a>(@Name(<span class="jxr_string">"authority"</span>) String authority, @Name(<span class="jxr_string">"contextRoot"</span>) String contextRoot, @Name(<span class="jxr_string">"servletPath"</span>) String servletPath, @Name(<span class="jxr_string">"pathInfo"</span>) String pathInfo) {
+<a class="jxr_linenumber" name="L162" href="#L162">162</a> 		<strong class="jxr_keyword">this</strong>.authority = nullIfEmpty(trimSlashes(authority));
+<a class="jxr_linenumber" name="L163" href="#L163">163</a> 		<strong class="jxr_keyword">this</strong>.contextRoot = nullIfEmpty(trimSlashes(contextRoot));
+<a class="jxr_linenumber" name="L164" href="#L164">164</a> 		<strong class="jxr_keyword">this</strong>.servletPath = nullIfEmpty(trimSlashes(servletPath));
+<a class="jxr_linenumber" name="L165" href="#L165">165</a> 		<strong class="jxr_keyword">this</strong>.pathInfo = nullIfEmpty(trimSlashes(pathInfo));
+<a class="jxr_linenumber" name="L166" href="#L166">166</a> 		<strong class="jxr_keyword">this</strong>.parentPath = <strong class="jxr_keyword">this</strong>.pathInfo == <strong class="jxr_keyword">null</strong> || <strong class="jxr_keyword">this</strong>.pathInfo.indexOf('/') == -1 ? <strong class="jxr_keyword">null</strong> : <strong class="jxr_keyword">this</strong>.pathInfo.substring(0, <strong class="jxr_keyword">this</strong>.pathInfo.lastIndexOf('/'));
+<a class="jxr_linenumber" name="L167" href="#L167">167</a> 		<strong class="jxr_keyword">this</strong>.rContextRoot = memoize(() -&gt; findRContextRoot());
+<a class="jxr_linenumber" name="L168" href="#L168">168</a> 		<strong class="jxr_keyword">this</strong>.rResource = memoize(() -&gt; findRResource());
+<a class="jxr_linenumber" name="L169" href="#L169">169</a> 		<strong class="jxr_keyword">this</strong>.rPath = memoize(() -&gt; findRPath());
+<a class="jxr_linenumber" name="L170" href="#L170">170</a> 		<strong class="jxr_keyword">this</strong>.aContextRoot = memoize(() -&gt; findAContextRoot());
+<a class="jxr_linenumber" name="L171" href="#L171">171</a> 		<strong class="jxr_keyword">this</strong>.aServletPath = memoize(() -&gt; findAServletPath());
+<a class="jxr_linenumber" name="L172" href="#L172">172</a> 		<strong class="jxr_keyword">this</strong>.aPathInfo = memoize(() -&gt; findAPathInfo());
+<a class="jxr_linenumber" name="L173" href="#L173">173</a> 	}
 <a class="jxr_linenumber" name="L174" href="#L174">174</a> 
-<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">	 * Returns the absolute URI of the context-root portion of this URI context.</em>
-<a class="jxr_linenumber" name="L177" href="#L177">177</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L178" href="#L178">178</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L179" href="#L179">179</a> <em class="jxr_javadoccomment">	 * Example:  &lt;js&gt;"<a href="http://hostname:port/context-root" target="alexandria_uri">http://hostname:port/context-root</a>"&lt;/js&gt;</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">	 * @return</em>
-<a class="jxr_linenumber" name="L182" href="#L182">182</a> <em class="jxr_javadoccomment">	 * 	The absolute URI of the context-root portion of this URI context.</em>
-<a class="jxr_linenumber" name="L183" href="#L183">183</a> <em class="jxr_javadoccomment">	 * 	Never &lt;jk&gt;null&lt;/jk&gt;.</em>
-<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> 	<strong class="jxr_keyword">public</strong> String getAbsoluteContextRoot() {
-<a class="jxr_linenumber" name="L186" href="#L186">186</a> 		<strong class="jxr_keyword">if</strong> (aContextRoot == <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L187" href="#L187">187</a> 			<strong class="jxr_keyword">if</strong> (authority == <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L188" href="#L188">188</a> 				aContextRoot = getRootRelativeContextRoot();
-<a class="jxr_linenumber" name="L189" href="#L189">189</a> 			<strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L190" href="#L190">190</a> 				<em class="jxr_comment">// @formatter:off</em>
-<a class="jxr_linenumber" name="L191" href="#L191">191</a> 				aContextRoot = (
-<a class="jxr_linenumber" name="L192" href="#L192">192</a> 					contextRoot == <strong class="jxr_keyword">null</strong>
-<a class="jxr_linenumber" name="L193" href="#L193">193</a> 					? authority
-<a class="jxr_linenumber" name="L194" href="#L194">194</a> 					: (authority + '/' + contextRoot)
-<a class="jxr_linenumber" name="L195" href="#L195">195</a> 				);
-<a class="jxr_linenumber" name="L196" href="#L196">196</a> 			<em class="jxr_comment">// @formatter:on</em>
-<a class="jxr_linenumber" name="L197" href="#L197">197</a> 		}
-<a class="jxr_linenumber" name="L198" href="#L198">198</a> 		<strong class="jxr_keyword">return</strong> aContextRoot;
-<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">	 * Returns the absolute URI of the path portion of this URI context.</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">	 * Example:  &lt;js&gt;"<a href="http://hostname:port/context-root/servlet-path/path-info" target="alexandria_uri">http://hostname:port/context-root/servlet-path/path-info</a>"&lt;/js&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">	 * @return</em>
-<a class="jxr_linenumber" name="L208" href="#L208">208</a> <em class="jxr_javadoccomment">	 * 	The absolute URI of the path portion of this URI context.</em>
-<a class="jxr_linenumber" name="L209" href="#L209">209</a> <em class="jxr_javadoccomment">	 * 	Never &lt;jk&gt;null&lt;/jk&gt;.</em>
-<a class="jxr_linenumber" name="L210" href="#L210">210</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L211" href="#L211">211</a> 	<strong class="jxr_keyword">public</strong> String getAbsolutePathInfo() {
-<a class="jxr_linenumber" name="L212" href="#L212">212</a> 		<em class="jxr_comment">// @formatter:off</em>
-<a class="jxr_linenumber" name="L213" href="#L213">213</a> 		<strong class="jxr_keyword">if</strong> (aPathInfo == <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L214" href="#L214">214</a> 			<strong class="jxr_keyword">if</strong> (authority == <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L215" href="#L215">215</a> 				aPathInfo = getRootRelativePathInfo();
-<a class="jxr_linenumber" name="L216" href="#L216">216</a> 			<strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="L217" href="#L217">217</a> 				<strong class="jxr_keyword">if</strong> (contextRoot == <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L218" href="#L218">218</a> 					<strong class="jxr_keyword">if</strong> (servletPath == <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L219" href="#L219">219</a> 						aPathInfo = (
-<a class="jxr_linenumber" name="L220" href="#L220">220</a> 							pathInfo == <strong class="jxr_keyword">null</strong>
-<a class="jxr_linenumber" name="L221" href="#L221">221</a> 							? authority : (authority + '/' + pathInfo)
-<a class="jxr_linenumber" name="L222" href="#L222">222</a> 						);
-<a class="jxr_linenumber" name="L223" href="#L223">223</a> 					<strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L224" href="#L224">224</a> 						aPathInfo = (
-<a class="jxr_linenumber" name="L225" href="#L225">225</a> 							pathInfo == <strong class="jxr_keyword">null</strong>
-<a class="jxr_linenumber" name="L226" href="#L226">226</a> 							? (authority + '/' + servletPath)
-<a class="jxr_linenumber" name="L227" href="#L227">227</a> 							: (authority + '/' + servletPath + '/' + pathInfo)
-<a class="jxr_linenumber" name="L228" href="#L228">228</a> 						);
-<a class="jxr_linenumber" name="L229" href="#L229">229</a> 				} <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="L230" href="#L230">230</a> 					<strong class="jxr_keyword">if</strong> (servletPath == <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L231" href="#L231">231</a> 						aPathInfo = (
-<a class="jxr_linenumber" name="L232" href="#L232">232</a> 							pathInfo == <strong class="jxr_keyword">null</strong>
-<a class="jxr_linenumber" name="L233" href="#L233">233</a> 							? authority + '/' + contextRoot
-<a class="jxr_linenumber" name="L234" href="#L234">234</a> 							: (authority + '/' + contextRoot + '/' + pathInfo)
-<a class="jxr_linenumber" name="L235" href="#L235">235</a> 						);
-<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> 						aPathInfo = (
-<a class="jxr_linenumber" name="L238" href="#L238">238</a> 							pathInfo == <strong class="jxr_keyword">null</strong>
-<a class="jxr_linenumber" name="L239" href="#L239">239</a> 							? (authority + '/' + contextRoot + '/' + servletPath)
-<a class="jxr_linenumber" name="L240" href="#L240">240</a> 							: (authority + '/' + contextRoot + '/' + servletPath + '/' + pathInfo)
-<a class="jxr_linenumber" name="L241" href="#L241">241</a> 						);
-<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> 		}
-<a class="jxr_linenumber" name="L245" href="#L245">245</a> 		<strong class="jxr_keyword">return</strong> aPathInfo;
-<a class="jxr_linenumber" name="L246" href="#L246">246</a> 		<em class="jxr_comment">// @formatter:on</em>
-<a class="jxr_linenumber" name="L247" href="#L247">247</a> 	}
-<a class="jxr_linenumber" name="L248" href="#L248">248</a> 
-<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> <em class="jxr_javadoccomment">	 * Returns the parent of the URL returned by {@link #getAbsolutePathInfo()}.</em>
-<a class="jxr_linenumber" name="L251" href="#L251">251</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L252" href="#L252">252</a> <em class="jxr_javadoccomment">	 * @return The parent of the URL returned by {@link #getAbsolutePathInfo()}.</em>
-<a class="jxr_linenumber" name="L253" href="#L253">253</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L254" href="#L254">254</a> 	<strong class="jxr_keyword">public</strong> String getAbsolutePathInfoParent() { <strong class="jxr_keyword">return</strong> getParent(getAbsolutePathInfo()); }
-<a class="jxr_linenumber" name="L255" href="#L255">255</a> 
-<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> <em class="jxr_javadoccomment">	 * Returns the absolute URI of the resource portion of this URI context.</em>
-<a class="jxr_linenumber" name="L258" href="#L258">258</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L259" href="#L259">259</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L260" href="#L260">260</a> <em class="jxr_javadoccomment">	 * Example:  &lt;js&gt;"<a href="http://hostname:port/context-root/servlet-path" target="alexandria_uri">http://hostname:port/context-root/servlet-path</a>"&lt;/js&gt;</em>
-<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">	 * @return</em>
-<a class="jxr_linenumber" name="L263" href="#L263">263</a> <em class="jxr_javadoccomment">	 * 	The absolute URI of the resource portion of this URI context.</em>
-<a class="jxr_linenumber" name="L264" href="#L264">264</a> <em class="jxr_javadoccomment">	 * 	Never &lt;jk&gt;null&lt;/jk&gt;.</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> 	<strong class="jxr_keyword">public</strong> String getAbsoluteServletPath() {
-<a class="jxr_linenumber" name="L267" href="#L267">267</a> 		<em class="jxr_comment">// @formatter:off</em>
-<a class="jxr_linenumber" name="L268" href="#L268">268</a> 		<strong class="jxr_keyword">if</strong> (aServletPath == <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L269" href="#L269">269</a> 			<strong class="jxr_keyword">if</strong> (authority == <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L270" href="#L270">270</a> 				aServletPath = getRootRelativeServletPath();
-<a class="jxr_linenumber" name="L271" href="#L271">271</a> 			<strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="L272" href="#L272">272</a> 				<strong class="jxr_keyword">if</strong> (contextRoot == <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L273" href="#L273">273</a> 					aServletPath = (
-<a class="jxr_linenumber" name="L274" href="#L274">274</a> 						servletPath == <strong class="jxr_keyword">null</strong>
-<a class="jxr_linenumber" name="L275" href="#L275">275</a> 						? authority
-<a class="jxr_linenumber" name="L276" href="#L276">276</a> 						: authority + '/' + servletPath
-<a class="jxr_linenumber" name="L277" href="#L277">277</a> 					);
-<a class="jxr_linenumber" name="L278" href="#L278">278</a> 				<strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L279" href="#L279">279</a> 					aServletPath = (
-<a class="jxr_linenumber" name="L280" href="#L280">280</a> 						servletPath == <strong class="jxr_keyword">null</strong>
-<a class="jxr_linenumber" name="L281" href="#L281">281</a> 						? (authority + '/' + contextRoot)
-<a class="jxr_linenumber" name="L282" href="#L282">282</a> 						: (authority + '/' + contextRoot + '/' + servletPath)
-<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> 		}
-<a class="jxr_linenumber" name="L286" href="#L286">286</a> 		<strong class="jxr_keyword">return</strong> aServletPath;
-<a class="jxr_linenumber" name="L287" href="#L287">287</a> 		<em class="jxr_comment">// @formatter:on</em>
-<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> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L291" href="#L291">291</a> <em class="jxr_javadoccomment">	 * Returns the parent of the URL returned by {@link #getAbsoluteServletPath()}.</em>
+<a class="jxr_linenumber" name="L175" href="#L175">175</a> 	<strong class="jxr_keyword">private</strong> String findRContextRoot() {
+<a class="jxr_linenumber" name="L176" href="#L176">176</a> 		<strong class="jxr_keyword">return</strong> contextRoot == <strong class="jxr_keyword">null</strong> ? <span class="jxr_string">"/"</span> : ('/' + contextRoot);
+<a class="jxr_linenumber" name="L177" href="#L177">177</a> 	}
+<a class="jxr_linenumber" name="L178" href="#L178">178</a> 
+<a class="jxr_linenumber" name="L179" href="#L179">179</a> 	<strong class="jxr_keyword">private</strong> String findRResource() {
+<a class="jxr_linenumber" name="L180" href="#L180">180</a> 		<em class="jxr_comment">// @formatter:off</em>
+<a class="jxr_linenumber" name="L181" href="#L181">181</a> 		<strong class="jxr_keyword">if</strong> (contextRoot == <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L182" href="#L182">182</a> 			<strong class="jxr_keyword">return</strong> (
+<a class="jxr_linenumber" name="L183" href="#L183">183</a> 				servletPath == <strong class="jxr_keyword">null</strong>
+<a class="jxr_linenumber" name="L184" href="#L184">184</a> 				? <span class="jxr_string">"/"</span>
+<a class="jxr_linenumber" name="L185" href="#L185">185</a> 				: ('/' + servletPath)
+<a class="jxr_linenumber" name="L186" href="#L186">186</a> 			);
+<a class="jxr_linenumber" name="L187" href="#L187">187</a> 		<strong class="jxr_keyword">return</strong> (
+<a class="jxr_linenumber" name="L188" href="#L188">188</a> 			servletPath == <strong class="jxr_keyword">null</strong>
+<a class="jxr_linenumber" name="L189" href="#L189">189</a> 			? ('/' + contextRoot)
+<a class="jxr_linenumber" name="L190" href="#L190">190</a> 			: ('/' + contextRoot + '/' + servletPath)
+<a class="jxr_linenumber" name="L191" href="#L191">191</a> 		);
+<a class="jxr_linenumber" name="L192" href="#L192">192</a> 		<em class="jxr_comment">// @formatter:on</em>
+<a class="jxr_linenumber" name="L193" href="#L193">193</a> 	}
+<a class="jxr_linenumber" name="L194" href="#L194">194</a> 
+<a class="jxr_linenumber" name="L195" href="#L195">195</a> 	<strong class="jxr_keyword">private</strong> String findRPath() {
+<a class="jxr_linenumber" name="L196" href="#L196">196</a> 		<em class="jxr_comment">// @formatter:off</em>
+<a class="jxr_linenumber" name="L197" href="#L197">197</a> 		<strong class="jxr_keyword">if</strong> (contextRoot == <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="L198" href="#L198">198</a> 			<strong class="jxr_keyword">if</strong> (servletPath == <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L199" href="#L199">199</a> 				<strong class="jxr_keyword">return</strong> (
+<a class="jxr_linenumber" name="L200" href="#L200">200</a> 					pathInfo == <strong class="jxr_keyword">null</strong>
+<a class="jxr_linenumber" name="L201" href="#L201">201</a> 					? <span class="jxr_string">"/"</span>
+<a class="jxr_linenumber" name="L202" href="#L202">202</a> 					: ('/' + pathInfo)
+<a class="jxr_linenumber" name="L203" href="#L203">203</a> 				);
+<a class="jxr_linenumber" name="L204" href="#L204">204</a> 			<strong class="jxr_keyword">return</strong> (
+<a class="jxr_linenumber" name="L205" href="#L205">205</a> 				pathInfo == <strong class="jxr_keyword">null</strong>
+<a class="jxr_linenumber" name="L206" href="#L206">206</a> 				? ('/' + servletPath)
+<a class="jxr_linenumber" name="L207" href="#L207">207</a> 				: ('/' + servletPath + '/' + pathInfo)
+<a class="jxr_linenumber" name="L208" href="#L208">208</a> 			);
+<a class="jxr_linenumber" name="L209" href="#L209">209</a> 		}
+<a class="jxr_linenumber" name="L210" href="#L210">210</a> 		<strong class="jxr_keyword">if</strong> (servletPath == <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L211" href="#L211">211</a> 			<strong class="jxr_keyword">return</strong> (
+<a class="jxr_linenumber" name="L212" href="#L212">212</a> 				pathInfo == <strong class="jxr_keyword">null</strong>
+<a class="jxr_linenumber" name="L213" href="#L213">213</a> 				? ('/' + contextRoot)
+<a class="jxr_linenumber" name="L214" href="#L214">214</a> 				: ('/' + contextRoot + '/' + pathInfo)
+<a class="jxr_linenumber" name="L215" href="#L215">215</a> 			);
+<a class="jxr_linenumber" name="L216" href="#L216">216</a> 		<strong class="jxr_keyword">return</strong> (
+<a class="jxr_linenumber" name="L217" href="#L217">217</a> 			pathInfo == <strong class="jxr_keyword">null</strong>
+<a class="jxr_linenumber" name="L218" href="#L218">218</a> 			? ('/' + contextRoot + '/' + servletPath)
+<a class="jxr_linenumber" name="L219" href="#L219">219</a> 			: ('/' + contextRoot + '/' + servletPath + '/' + pathInfo)
+<a class="jxr_linenumber" name="L220" href="#L220">220</a> 		);
+<a class="jxr_linenumber" name="L221" href="#L221">221</a> 		<em class="jxr_comment">// @formatter:on</em>
+<a class="jxr_linenumber" name="L222" href="#L222">222</a> 	}
+<a class="jxr_linenumber" name="L223" href="#L223">223</a> 
+<a class="jxr_linenumber" name="L224" href="#L224">224</a> 	<strong class="jxr_keyword">private</strong> String findAContextRoot() {
+<a class="jxr_linenumber" name="L225" href="#L225">225</a> 		<em class="jxr_comment">// @formatter:off</em>
+<a class="jxr_linenumber" name="L226" href="#L226">226</a> 		<strong class="jxr_keyword">if</strong> (authority == <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L227" href="#L227">227</a> 			<strong class="jxr_keyword">return</strong> rContextRoot.get();
+<a class="jxr_linenumber" name="L228" href="#L228">228</a> 		<strong class="jxr_keyword">return</strong> (
+<a class="jxr_linenumber" name="L229" href="#L229">229</a> 			contextRoot == <strong class="jxr_keyword">null</strong>
+<a class="jxr_linenumber" name="L230" href="#L230">230</a> 			? authority
+<a class="jxr_linenumber" name="L231" href="#L231">231</a> 			: (authority + '/' + contextRoot)
+<a class="jxr_linenumber" name="L232" href="#L232">232</a> 		);
+<a class="jxr_linenumber" name="L233" href="#L233">233</a> 		<em class="jxr_comment">// @formatter:on</em>
+<a class="jxr_linenumber" name="L234" href="#L234">234</a> 	}
+<a class="jxr_linenumber" name="L235" href="#L235">235</a> 
+<a class="jxr_linenumber" name="L236" href="#L236">236</a> 	<strong class="jxr_keyword">private</strong> String findAServletPath() {
+<a class="jxr_linenumber" name="L237" href="#L237">237</a> 		<em class="jxr_comment">// @formatter:off</em>
+<a class="jxr_linenumber" name="L238" href="#L238">238</a> 		<strong class="jxr_keyword">if</strong> (authority == <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L239" href="#L239">239</a> 			<strong class="jxr_keyword">return</strong> rResource.get();
+<a class="jxr_linenumber" name="L240" href="#L240">240</a> 		<strong class="jxr_keyword">if</strong> (contextRoot == <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L241" href="#L241">241</a> 			<strong class="jxr_keyword">return</strong> (
+<a class="jxr_linenumber" name="L242" href="#L242">242</a> 				servletPath == <strong class="jxr_keyword">null</strong>
+<a class="jxr_linenumber" name="L243" href="#L243">243</a> 				? authority
+<a class="jxr_linenumber" name="L244" href="#L244">244</a> 				: authority + '/' + servletPath
+<a class="jxr_linenumber" name="L245" href="#L245">245</a> 			);
+<a class="jxr_linenumber" name="L246" href="#L246">246</a> 		<strong class="jxr_keyword">return</strong> (
+<a class="jxr_linenumber" name="L247" href="#L247">247</a> 			servletPath == <strong class="jxr_keyword">null</strong>
+<a class="jxr_linenumber" name="L248" href="#L248">248</a> 			? (authority + '/' + contextRoot)
+<a class="jxr_linenumber" name="L249" href="#L249">249</a> 			: (authority + '/' + contextRoot + '/' + servletPath)
+<a class="jxr_linenumber" name="L250" href="#L250">250</a> 		);
+<a class="jxr_linenumber" name="L251" href="#L251">251</a> 		<em class="jxr_comment">// @formatter:on</em>
+<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">private</strong> String findAPathInfo() {
+<a class="jxr_linenumber" name="L255" href="#L255">255</a> 		<em class="jxr_comment">// @formatter:off</em>
+<a class="jxr_linenumber" name="L256" href="#L256">256</a> 		<strong class="jxr_keyword">if</strong> (authority == <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L257" href="#L257">257</a> 			<strong class="jxr_keyword">return</strong> rPath.get();
+<a class="jxr_linenumber" name="L258" href="#L258">258</a> 		<strong class="jxr_keyword">if</strong> (contextRoot == <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="L259" href="#L259">259</a> 			<strong class="jxr_keyword">if</strong> (servletPath == <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L260" href="#L260">260</a> 				<strong class="jxr_keyword">return</strong> (
+<a class="jxr_linenumber" name="L261" href="#L261">261</a> 					pathInfo == <strong class="jxr_keyword">null</strong>
+<a class="jxr_linenumber" name="L262" href="#L262">262</a> 					? authority : (authority + '/' + pathInfo)
+<a class="jxr_linenumber" name="L263" href="#L263">263</a> 				);
+<a class="jxr_linenumber" name="L264" href="#L264">264</a> 			<strong class="jxr_keyword">return</strong> (
+<a class="jxr_linenumber" name="L265" href="#L265">265</a> 				pathInfo == <strong class="jxr_keyword">null</strong>
+<a class="jxr_linenumber" name="L266" href="#L266">266</a> 				? (authority + '/' + servletPath)
+<a class="jxr_linenumber" name="L267" href="#L267">267</a> 				: (authority + '/' + servletPath + '/' + pathInfo)
+<a class="jxr_linenumber" name="L268" href="#L268">268</a> 			);
+<a class="jxr_linenumber" name="L269" href="#L269">269</a> 		}
+<a class="jxr_linenumber" name="L270" href="#L270">270</a> 		<strong class="jxr_keyword">if</strong> (servletPath == <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L271" href="#L271">271</a> 			<strong class="jxr_keyword">return</strong> (
+<a class="jxr_linenumber" name="L272" href="#L272">272</a> 				pathInfo == <strong class="jxr_keyword">null</strong>
+<a class="jxr_linenumber" name="L273" href="#L273">273</a> 				? authority + '/' + contextRoot
+<a class="jxr_linenumber" name="L274" href="#L274">274</a> 				: (authority + '/' + contextRoot + '/' + pathInfo)
+<a class="jxr_linenumber" name="L275" href="#L275">275</a> 			);
+<a class="jxr_linenumber" name="L276" href="#L276">276</a> 		<strong class="jxr_keyword">return</strong> (
+<a class="jxr_linenumber" name="L277" href="#L277">277</a> 			pathInfo == <strong class="jxr_keyword">null</strong>
+<a class="jxr_linenumber" name="L278" href="#L278">278</a> 			? (authority + '/' + contextRoot + '/' + servletPath)
+<a class="jxr_linenumber" name="L279" href="#L279">279</a> 			: (authority + '/' + contextRoot + '/' + servletPath + '/' + pathInfo)
+<a class="jxr_linenumber" name="L280" href="#L280">280</a> 		);
+<a class="jxr_linenumber" name="L281" href="#L281">281</a> 		<em class="jxr_comment">// @formatter:on</em>
+<a class="jxr_linenumber" name="L282" href="#L282">282</a> 	}
+<a class="jxr_linenumber" name="L283" href="#L283">283</a> 
+<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> <em class="jxr_javadoccomment">	 * Returns the absolute URI of just the authority portion of this URI context.</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">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L288" href="#L288">288</a> <em class="jxr_javadoccomment">	 * Example:  &lt;js&gt;"<a href="http://hostname:port" target="alexandria_uri">http://hostname:port</a>"&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L289" href="#L289">289</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L290" href="#L290">290</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L291" href="#L291">291</a> <em class="jxr_javadoccomment">	 * If the authority is null/empty, returns &lt;js&gt;"/"&lt;/js&gt;.</em>
 <a class="jxr_linenumber" name="L292" href="#L292">292</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L293" href="#L293">293</a> <em class="jxr_javadoccomment">	 * @return The parent of the URL returned by {@link #getAbsoluteServletPath()}.</em>
-<a class="jxr_linenumber" name="L294" href="#L294">294</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L295" href="#L295">295</a> 	<strong class="jxr_keyword">public</strong> String getAbsoluteServletPathParent() { <strong class="jxr_keyword">return</strong> getParent(getAbsoluteServletPath()); }
-<a class="jxr_linenumber" name="L296" href="#L296">296</a> 
-<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">	 * Returns the root-relative URI of the context portion of this URI context.</em>
-<a class="jxr_linenumber" name="L299" href="#L299">299</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L300" href="#L300">300</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L301" href="#L301">301</a> <em class="jxr_javadoccomment">	 * Example:  &lt;js&gt;"/context-root"&lt;/js&gt;</em>
-<a class="jxr_linenumber" name="L302" href="#L302">302</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L303" href="#L303">303</a> <em class="jxr_javadoccomment">	 * @return</em>
-<a class="jxr_linenumber" name="L304" href="#L304">304</a> <em class="jxr_javadoccomment">	 * 	The root-relative URI of the context portion of this URI context.</em>
-<a class="jxr_linenumber" name="L305" href="#L305">305</a> <em class="jxr_javadoccomment">	 * 	Never &lt;jk&gt;null&lt;/jk&gt;.</em>
-<a class="jxr_linenumber" name="L306" href="#L306">306</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L307" href="#L307">307</a> 	<strong class="jxr_keyword">public</strong> String getRootRelativeContextRoot() {
-<a class="jxr_linenumber" name="L308" href="#L308">308</a> 		<strong class="jxr_keyword">if</strong> (rContextRoot == <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L309" href="#L309">309</a> 			rContextRoot = contextRoot == <strong class="jxr_keyword">null</strong> ? <span class="jxr_string">"/"</span> : ('/' + contextRoot);
-<a class="jxr_linenumber" name="L310" href="#L310">310</a> 		<strong class="jxr_keyword">return</strong> rContextRoot;
+<a class="jxr_linenumber" name="L293" href="#L293">293</a> <em class="jxr_javadoccomment">	 * @return</em>
+<a class="jxr_linenumber" name="L294" href="#L294">294</a> <em class="jxr_javadoccomment">	 * 	The absolute URI of just the authority portion of this URI context.</em>
+<a class="jxr_linenumber" name="L295" href="#L295">295</a> <em class="jxr_javadoccomment">	 * 	Never &lt;jk&gt;null&lt;/jk&gt;.</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> 	<strong class="jxr_keyword">public</strong> String getAbsoluteAuthority() { <strong class="jxr_keyword">return</strong> authority == <strong class="jxr_keyword">null</strong> ? <span class="jxr_string">"/"</span> : authority; }
+<a class="jxr_linenumber" name="L298" href="#L298">298</a> 
+<a class="jxr_linenumber" name="L299" href="#L299">299</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L300" href="#L300">300</a> <em class="jxr_javadoccomment">	 * Returns the absolute URI of the context-root portion of this URI context.</em>
+<a class="jxr_linenumber" name="L301" href="#L301">301</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L302" href="#L302">302</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L303" href="#L303">303</a> <em class="jxr_javadoccomment">	 * Example:  &lt;js&gt;"<a href="http://hostname:port/context-root" target="alexandria_uri">http://hostname:port/context-root</a>"&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L304" href="#L304">304</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L305" href="#L305">305</a> <em class="jxr_javadoccomment">	 * @return</em>
+<a class="jxr_linenumber" name="L306" href="#L306">306</a> <em class="jxr_javadoccomment">	 * 	The absolute URI of the context-root portion of this URI context.</em>
+<a class="jxr_linenumber" name="L307" href="#L307">307</a> <em class="jxr_javadoccomment">	 * 	Never &lt;jk&gt;null&lt;/jk&gt;.</em>
+<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> 	<strong class="jxr_keyword">public</strong> String getAbsoluteContextRoot() {
+<a class="jxr_linenumber" name="L310" href="#L310">310</a> 		<strong class="jxr_keyword">return</strong> aContextRoot.get();
 <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">	 * Returns the root-relative URI of the path portion of this URI context.</em>
+<a class="jxr_linenumber" name="L314" href="#L314">314</a> <em class="jxr_javadoccomment">	 * Returns the absolute URI of the path portion of this URI context.</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">	 * Example:  &lt;js&gt;"/context-root/servlet-path/path-info"&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L317" href="#L317">317</a> <em class="jxr_javadoccomment">	 * Example:  &lt;js&gt;"<a href="http://hostname:port/context-root/servlet-path/path-info" target="alexandria_uri">http://hostname:port/context-root/servlet-path/path-info</a>"&lt;/js&gt;</em>
 <a class="jxr_linenumber" name="L318" href="#L318">318</a> <em class="jxr_javadoccomment">	 *</em>
 <a class="jxr_linenumber" name="L319" href="#L319">319</a> <em class="jxr_javadoccomment">	 * @return</em>
-<a class="jxr_linenumber" name="L320" href="#L320">320</a> <em class="jxr_javadoccomment">	 * 	The root-relative URI of the path portion of this URI context.</em>
+<a class="jxr_linenumber" name="L320" href="#L320">320</a> <em class="jxr_javadoccomment">	 * 	The absolute URI of the path portion of this URI context.</em>
 <a class="jxr_linenumber" name="L321" href="#L321">321</a> <em class="jxr_javadoccomment">	 * 	Never &lt;jk&gt;null&lt;/jk&gt;.</em>
 <a class="jxr_linenumber" name="L322" href="#L322">322</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L323" href="#L323">323</a> 	<strong class="jxr_keyword">public</strong> String getRootRelativePathInfo() {
-<a class="jxr_linenumber" name="L324" href="#L324">324</a> 		<em class="jxr_comment">// @formatter:off</em>
-<a class="jxr_linenumber" name="L325" href="#L325">325</a> 		<strong class="jxr_keyword">if</strong> (rPath == <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L326" href="#L326">326</a> 			<strong class="jxr_keyword">if</strong> (contextRoot == <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L327" href="#L327">327</a> 				<strong class="jxr_keyword">if</strong> (servletPath == <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L328" href="#L328">328</a> 					rPath = (
-<a class="jxr_linenumber" name="L329" href="#L329">329</a> 						pathInfo == <strong class="jxr_keyword">null</strong>
-<a class="jxr_linenumber" name="L330" href="#L330">330</a> 						? <span class="jxr_string">"/"</span>
-<a class="jxr_linenumber" name="L331" href="#L331">331</a> 						: ('/' + pathInfo)
-<a class="jxr_linenumber" name="L332" href="#L332">332</a> 					);
-<a class="jxr_linenumber" name="L333" href="#L333">333</a> 				<strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L334" href="#L334">334</a> 					rPath = (
-<a class="jxr_linenumber" name="L335" href="#L335">335</a> 						pathInfo == <strong class="jxr_keyword">null</strong>
-<a class="jxr_linenumber" name="L336" href="#L336">336</a> 						? ('/' + servletPath)
-<a class="jxr_linenumber" name="L337" href="#L337">337</a> 						: ('/' + servletPath + '/' + pathInfo)
-<a class="jxr_linenumber" name="L338" href="#L338">338</a> 					);
-<a class="jxr_linenumber" name="L339" href="#L339">339</a> 			} <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="L340" href="#L340">340</a> 				<strong class="jxr_keyword">if</strong> (servletPath == <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L341" href="#L341">341</a> 					rPath = (
-<a class="jxr_linenumber" name="L342" href="#L342">342</a> 						pathInfo == <strong class="jxr_keyword">null</strong>
-<a class="jxr_linenumber" name="L343" href="#L343">343</a> 						? ('/' + contextRoot)
-<a class="jxr_linenumber" name="L344" href="#L344">344</a> 						: ('/' + contextRoot + '/' + pathInfo)
-<a class="jxr_linenumber" name="L345" href="#L345">345</a> 					);
-<a class="jxr_linenumber" name="L346" href="#L346">346</a> 				<strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L347" href="#L347">347</a> 					rPath = (
-<a class="jxr_linenumber" name="L348" href="#L348">348</a> 						pathInfo == <strong class="jxr_keyword">null</strong>
-<a class="jxr_linenumber" name="L349" href="#L349">349</a> 						? ('/' + contextRoot + '/' + servletPath)
-<a class="jxr_linenumber" name="L350" href="#L350">350</a> 						: ('/' + contextRoot + '/' + servletPath + '/' + pathInfo)
-<a class="jxr_linenumber" name="L351" href="#L351">351</a> 					);
-<a class="jxr_linenumber" name="L352" href="#L352">352</a> 			}
-<a class="jxr_linenumber" name="L353" href="#L353">353</a> 		}
-<a class="jxr_linenumber" name="L354" href="#L354">354</a> 		<strong class="jxr_keyword">return</strong> rPath;
-<a class="jxr_linenumber" name="L355" href="#L355">355</a> 		<em class="jxr_comment">// @formatter:on</em>
-<a class="jxr_linenumber" name="L356" href="#L356">356</a> 	}
-<a class="jxr_linenumber" name="L357" href="#L357">357</a> 
-<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">	 * Returns the parent of the URL returned by {@link #getRootRelativePathInfo()}.</em>
+<a class="jxr_linenumber" name="L323" href="#L323">323</a> 	<strong class="jxr_keyword">public</strong> String getAbsolutePathInfo() {
+<a class="jxr_linenumber" name="L324" href="#L324">324</a> 		<strong class="jxr_keyword">return</strong> aPathInfo.get();
+<a class="jxr_linenumber" name="L325" href="#L325">325</a> 	}
+<a class="jxr_linenumber" name="L326" href="#L326">326</a> 
+<a class="jxr_linenumber" name="L327" href="#L327">327</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L328" href="#L328">328</a> <em class="jxr_javadoccomment">	 * Returns the parent of the URL returned by {@link #getAbsolutePathInfo()}.</em>
+<a class="jxr_linenumber" name="L329" href="#L329">329</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L330" href="#L330">330</a> <em class="jxr_javadoccomment">	 * @return The parent of the URL returned by {@link #getAbsolutePathInfo()}.</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> 	<strong class="jxr_keyword">public</strong> String getAbsolutePathInfoParent() { <strong class="jxr_keyword">return</strong> getParent(getAbsolutePathInfo()); }
+<a class="jxr_linenumber" name="L333" href="#L333">333</a> 
+<a class="jxr_linenumber" name="L334" href="#L334">334</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L335" href="#L335">335</a> <em class="jxr_javadoccomment">	 * Returns the absolute URI of the resource portion of this URI context.</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">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L338" href="#L338">338</a> <em class="jxr_javadoccomment">	 * Example:  &lt;js&gt;"<a href="http://hostname:port/context-root/servlet-path" target="alexandria_uri">http://hostname:port/context-root/servlet-path</a>"&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L339" href="#L339">339</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L340" href="#L340">340</a> <em class="jxr_javadoccomment">	 * @return</em>
+<a class="jxr_linenumber" name="L341" href="#L341">341</a> <em class="jxr_javadoccomment">	 * 	The absolute URI of the resource portion of this URI context.</em>
+<a class="jxr_linenumber" name="L342" href="#L342">342</a> <em class="jxr_javadoccomment">	 * 	Never &lt;jk&gt;null&lt;/jk&gt;.</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> String getAbsoluteServletPath() {
+<a class="jxr_linenumber" name="L345" href="#L345">345</a> 		<strong class="jxr_keyword">return</strong> aServletPath.get();
+<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_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L349" href="#L349">349</a> <em class="jxr_javadoccomment">	 * Returns the parent of the URL returned by {@link #getAbsoluteServletPath()}.</em>
+<a class="jxr_linenumber" name="L350" href="#L350">350</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L351" href="#L351">351</a> <em class="jxr_javadoccomment">	 * @return The parent of the URL returned by {@link #getAbsoluteServletPath()}.</em>
+<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> 	<strong class="jxr_keyword">public</strong> String getAbsoluteServletPathParent() { <strong class="jxr_keyword">return</strong> getParent(getAbsoluteServletPath()); }
+<a class="jxr_linenumber" name="L354" href="#L354">354</a> 
+<a class="jxr_linenumber" name="L355" href="#L355">355</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L356" href="#L356">356</a> <em class="jxr_javadoccomment">	 * Returns the root-relative URI of the context portion of this URI context.</em>
+<a class="jxr_linenumber" name="L357" href="#L357">357</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L358" href="#L358">358</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L359" href="#L359">359</a> <em class="jxr_javadoccomment">	 * Example:  &lt;js&gt;"/context-root"&lt;/js&gt;</em>
 <a class="jxr_linenumber" name="L360" href="#L360">360</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L361" href="#L361">361</a> <em class="jxr_javadoccomment">	 * @return The parent of the URL returned by {@link #getRootRelativePathInfo()}.</em>
-<a class="jxr_linenumber" name="L362" href="#L362">362</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L363" href="#L363">363</a> 	<strong class="jxr_keyword">public</strong> String getRootRelativePathInfoParent() { <strong class="jxr_keyword">return</strong> getParent(getRootRelativePathInfo()); }
-<a class="jxr_linenumber" name="L364" href="#L364">364</a> 
-<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">	 * Returns the root-relative URI of the resource portion of this URI context.</em>
-<a class="jxr_linenumber" name="L367" href="#L367">367</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L368" href="#L368">368</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L369" href="#L369">369</a> <em class="jxr_javadoccomment">	 * Example:  &lt;js&gt;"/context-root/servlet-path"&lt;/js&gt;</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">	 * @return</em>
-<a class="jxr_linenumber" name="L372" href="#L372">372</a> <em class="jxr_javadoccomment">	 * 	The root-relative URI of the resource portion of this URI context.</em>
-<a class="jxr_linenumber" name="L373" href="#L373">373</a> <em class="jxr_javadoccomment">	 * 	Never &lt;jk&gt;null&lt;/jk&gt;.</em>
-<a class="jxr_linenumber" name="L374" href="#L374">374</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L375" href="#L375">375</a> 	<strong class="jxr_keyword">public</strong> String getRootRelativeServletPath() {
-<a class="jxr_linenumber" name="L376" href="#L376">376</a> 		<em class="jxr_comment">// @formatter:off</em>
-<a class="jxr_linenumber" name="L377" href="#L377">377</a> 		<strong class="jxr_keyword">if</strong> (rResource == <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L378" href="#L378">378</a> 			<strong class="jxr_keyword">if</strong> (contextRoot == <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L379" href="#L379">379</a> 				rResource = (
-<a class="jxr_linenumber" name="L380" href="#L380">380</a> 					servletPath == <strong class="jxr_keyword">null</strong>
-<a class="jxr_linenumber" name="L381" href="#L381">381</a> 					? <span class="jxr_string">"/"</span>
-<a class="jxr_linenumber" name="L382" href="#L382">382</a> 					: ('/' + servletPath)
-<a class="jxr_linenumber" name="L383" href="#L383">383</a> 				);
-<a class="jxr_linenumber" name="L384" href="#L384">384</a> 			<strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L385" href="#L385">385</a> 				rResource = (
-<a class="jxr_linenumber" name="L386" href="#L386">386</a> 					servletPath == <strong class="jxr_keyword">null</strong>
-<a class="jxr_linenumber" name="L387" href="#L387">387</a> 					? ('/' + contextRoot)
-<a class="jxr_linenumber" name="L388" href="#L388">388</a> 					: ('/' + contextRoot + '/' + servletPath)
-<a class="jxr_linenumber" name="L389" href="#L389">389</a> 				);
-<a class="jxr_linenumber" name="L390" href="#L390">390</a> 		}
-<a class="jxr_linenumber" name="L391" href="#L391">391</a> 		<strong class="jxr_keyword">return</strong> rResource;
-<a class="jxr_linenumber" name="L392" href="#L392">392</a> 		<em class="jxr_comment">// @formatter:on</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> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L396" href="#L396">396</a> <em class="jxr_javadoccomment">	 * Returns the parent of the URL returned by {@link #getRootRelativeServletPath()}.</em>
-<a class="jxr_linenumber" name="L397" href="#L397">397</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L398" href="#L398">398</a> <em class="jxr_javadoccomment">	 * @return The parent of the URL returned by {@link #getRootRelativeServletPath()}.</em>
+<a class="jxr_linenumber" name="L361" href="#L361">361</a> <em class="jxr_javadoccomment">	 * @return</em>
+<a class="jxr_linenumber" name="L362" href="#L362">362</a> <em class="jxr_javadoccomment">	 * 	The root-relative URI of the context portion of this URI context.</em>
+<a class="jxr_linenumber" name="L363" href="#L363">363</a> <em class="jxr_javadoccomment">	 * 	Never &lt;jk&gt;null&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L364" href="#L364">364</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L365" href="#L365">365</a> 	<strong class="jxr_keyword">public</strong> String getRootRelativeContextRoot() {
+<a class="jxr_linenumber" name="L366" href="#L366">366</a> 		<strong class="jxr_keyword">return</strong> rContextRoot.get();
+<a class="jxr_linenumber" name="L367" href="#L367">367</a> 	}
+<a class="jxr_linenumber" name="L368" href="#L368">368</a> 
+<a class="jxr_linenumber" name="L369" href="#L369">369</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L370" href="#L370">370</a> <em class="jxr_javadoccomment">	 * Returns the root-relative URI of the path portion of this URI context.</em>
+<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">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L373" href="#L373">373</a> <em class="jxr_javadoccomment">	 * Example:  &lt;js&gt;"/context-root/servlet-path/path-info"&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L374" href="#L374">374</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L375" href="#L375">375</a> <em class="jxr_javadoccomment">	 * @return</em>
+<a class="jxr_linenumber" name="L376" href="#L376">376</a> <em class="jxr_javadoccomment">	 * 	The root-relative URI of the path portion of this URI context.</em>
+<a class="jxr_linenumber" name="L377" href="#L377">377</a> <em class="jxr_javadoccomment">	 * 	Never &lt;jk&gt;null&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L378" href="#L378">378</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L379" href="#L379">379</a> 	<strong class="jxr_keyword">public</strong> String getRootRelativePathInfo() {
+<a class="jxr_linenumber" name="L380" href="#L380">380</a> 		<strong class="jxr_keyword">return</strong> rPath.get();
+<a class="jxr_linenumber" name="L381" href="#L381">381</a> 	}
+<a class="jxr_linenumber" name="L382" href="#L382">382</a> 
+<a class="jxr_linenumber" name="L383" href="#L383">383</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L384" href="#L384">384</a> <em class="jxr_javadoccomment">	 * Returns the parent of the URL returned by {@link #getRootRelativePathInfo()}.</em>
+<a class="jxr_linenumber" name="L385" href="#L385">385</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L386" href="#L386">386</a> <em class="jxr_javadoccomment">	 * @return The parent of the URL returned by {@link #getRootRelativePathInfo()}.</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> 	<strong class="jxr_keyword">public</strong> String getRootRelativePathInfoParent() { <strong class="jxr_keyword">return</strong> getParent(getRootRelativePathInfo()); }
+<a class="jxr_linenumber" name="L389" href="#L389">389</a> 
+<a class="jxr_linenumber" name="L390" href="#L390">390</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L391" href="#L391">391</a> <em class="jxr_javadoccomment">	 * Returns the root-relative URI of the resource portion of this URI context.</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">	 * Example:  &lt;js&gt;"/context-root/servlet-path"&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L395" href="#L395">395</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L396" href="#L396">396</a> <em class="jxr_javadoccomment">	 * @return</em>
+<a class="jxr_linenumber" name="L397" href="#L397">397</a> <em class="jxr_javadoccomment">	 * 	The root-relative URI of the resource portion of this URI context.</em>
+<a class="jxr_linenumber" name="L398" href="#L398">398</a> <em class="jxr_javadoccomment">	 * 	Never &lt;jk&gt;null&lt;/jk&gt;.</em>
 <a class="jxr_linenumber" name="L399" href="#L399">399</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L400" href="#L400">400</a> 	<strong class="jxr_keyword">public</strong> String getRootRelativeServletPathParent() { <strong class="jxr_keyword">return</strong> getParent(getRootRelativeServletPath()); }
-<a class="jxr_linenumber" name="L401" href="#L401">401</a> 
-<a class="jxr_linenumber" name="L402" href="#L402">402</a> 	@Override <em class="jxr_comment">/* Overridden from Object */</em>
-<a class="jxr_linenumber" name="L403" href="#L403">403</a> 	<strong class="jxr_keyword">public</strong> String toString() {
-<a class="jxr_linenumber" name="L404" href="#L404">404</a> 		<strong class="jxr_keyword">return</strong> Json5Serializer.DEFAULT.toString(<strong class="jxr_keyword">this</strong>);
-<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="L400" href="#L400">400</a> 	<strong class="jxr_keyword">public</strong> String getRootRelativeServletPath() {
+<a class="jxr_linenumber" name="L401" href="#L401">401</a> 		<strong class="jxr_keyword">return</strong> rResource.get();
+<a class="jxr_linenumber" name="L402" href="#L402">402</a> 	}
+<a class="jxr_linenumber" name="L403" href="#L403">403</a> 
+<a class="jxr_linenumber" name="L404" href="#L404">404</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L405" href="#L405">405</a> <em class="jxr_javadoccomment">	 * Returns the parent of the URL returned by {@link #getRootRelativeServletPath()}.</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> <em class="jxr_javadoccomment">	 * @return The parent of the URL returned by {@link #getRootRelativeServletPath()}.</em>
+<a class="jxr_linenumber" name="L408" href="#L408">408</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L409" href="#L409">409</a> 	<strong class="jxr_keyword">public</strong> String getRootRelativeServletPathParent() { <strong class="jxr_keyword">return</strong> getParent(getRootRelativeServletPath()); }
+<a class="jxr_linenumber" name="L410" href="#L410">410</a> 
+<a class="jxr_linenumber" name="L411" href="#L411">411</a> 	<strong class="jxr_keyword">protected</strong> FluentMap&lt;String,Object&gt; properties() {
+<a class="jxr_linenumber" name="L412" href="#L412">412</a> 		<em class="jxr_comment">// @formatter:off</em>
+<a class="jxr_linenumber" name="L413" href="#L413">413</a> 		<strong class="jxr_keyword">return</strong> filteredBeanPropertyMap()
+<a class="jxr_linenumber" name="L414" href="#L414">414</a> 			.a(<span class="jxr_string">"authority"</span>, authority)
+<a class="jxr_linenumber" name="L415" href="#L415">415</a> 			.a(<span class="jxr_string">"contextRoot"</span>, contextRoot)
+<a class="jxr_linenumber" name="L416" href="#L416">416</a> 			.a(<span class="jxr_string">"servletPath"</span>, servletPath)
+<a class="jxr_linenumber" name="L417" href="#L417">417</a> 			.a(<span class="jxr_string">"pathInfo"</span>, pathInfo)
+<a class="jxr_linenumber" name="L418" href="#L418">418</a> 			.a(<span class="jxr_string">"parentPath"</span>, parentPath)
+<a class="jxr_linenumber" name="L419" href="#L419">419</a> 			.a(<span class="jxr_string">"aContextRoot"</span>, aContextRoot.get())
+<a class="jxr_linenumber" name="L420" href="#L420">420</a> 			.a(<span class="jxr_string">"rContextRoot"</span>, rContextRoot.get())
+<a class="jxr_linenumber" name="L421" href="#L421">421</a> 			.a(<span class="jxr_string">"aServletPath"</span>, aServletPath.get())
+<a class="jxr_linenumber" name="L422" href="#L422">422</a> 			.a(<span class="jxr_string">"rResource"</span>, rResource.get())
+<a class="jxr_linenumber" name="L423" href="#L423">423</a> 			.a(<span class="jxr_string">"aPathInfo"</span>, aPathInfo.get())
+<a class="jxr_linenumber" name="L424" href="#L424">424</a> 			.a(<span class="jxr_string">"rPath"</span>, rPath.get());
+<a class="jxr_linenumber" name="L425" href="#L425">425</a> 		<em class="jxr_comment">// @formatter:on</em>
+<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> 	@Override <em class="jxr_comment">/* Overridden from Object */</em>
+<a class="jxr_linenumber" name="L429" href="#L429">429</a> 	<strong class="jxr_keyword">public</strong> String toString() {
+<a class="jxr_linenumber" name="L430" href="#L430">430</a> 		<strong class="jxr_keyword">return</strong> r(properties());
+<a class="jxr_linenumber" name="L431" href="#L431">431</a> 	}
+<a class="jxr_linenumber" name="L432" href="#L432">432</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/annotation/AnnotationObject.html b/site/xref/org/apache/juneau/commons/annotation/AnnotationObject.html
index 416ef1025e..9c7c6aa59d 100644
--- a/site/xref/org/apache/juneau/commons/annotation/AnnotationObject.html
+++ b/site/xref/org/apache/juneau/commons/annotation/AnnotationObject.html
@@ -24,8 +24,8 @@
 <a class="jxr_linenumber" name="L16" href="#L16">16</a>  <em class="jxr_comment"> */</em>
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.commons.annotation;
 <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> java.util.Arrays.*;
-<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.AssertionUtils.*;
+<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.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.annotation.*;
@@ -216,22 +216,22 @@
 <a class="jxr_linenumber" name="L208" href="#L208">208</a> <em class="jxr_javadoccomment">	 *</em>
 <a class="jxr_linenumber" name="L209" href="#L209">209</a> <em class="jxr_javadoccomment">	 * @return This annotation as a map of key/value pairs.</em>
 <a class="jxr_linenumber" name="L210" href="#L210">210</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L211" href="#L211">211</a> 	<strong class="jxr_keyword">public</strong> Map&lt;String,Object&gt; toMap() {
-<a class="jxr_linenumber" name="L212" href="#L212">212</a> 		<strong class="jxr_keyword">var</strong> m = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String,Object&gt;();
-<a class="jxr_linenumber" name="L213" href="#L213">213</a> 		<em class="jxr_comment">// @formatter:off</em>
+<a class="jxr_linenumber" name="L211" href="#L211">211</a> 	<strong class="jxr_keyword">protected</strong> Map&lt;String,Object&gt; propertyMap() {
+<a class="jxr_linenumber" name="L212" href="#L212">212</a> 		<em class="jxr_comment">// @formatter:off</em>
+<a class="jxr_linenumber" name="L213" href="#L213">213</a> 		<strong class="jxr_keyword">var</strong> m = mapb_so().sorted().build();
 <a class="jxr_linenumber" name="L214" href="#L214">214</a> 		stream(annotationType().getDeclaredMethods())
 <a class="jxr_linenumber" name="L215" href="#L215">215</a> 			<em class="jxr_comment">// Note: isAnnotation() check is defensive code. For properly-formed AnnotationObject instances,</em>
 <a class="jxr_linenumber" name="L216" href="#L216">216</a> 			<em class="jxr_comment">// annotationType() always returns an annotation interface, so this condition is always true.</em>
 <a class="jxr_linenumber" name="L217" href="#L217">217</a> 			.filter(x-&gt;x.getParameterCount() == 0 &amp;&amp; x.getDeclaringClass().isAnnotation())
 <a class="jxr_linenumber" name="L218" href="#L218">218</a> 			.sorted(Comparator.comparing(Method::getName))
 <a class="jxr_linenumber" name="L219" href="#L219">219</a> 			.forEach(x -&gt; m.put(x.getName(), safeSupplier(()-&gt;x.invoke(<strong class="jxr_keyword">this</strong>))));
-<a class="jxr_linenumber" name="L220" href="#L220">220</a> 		<em class="jxr_comment">// @formatter:on</em>
-<a class="jxr_linenumber" name="L221" href="#L221">221</a> 		<strong class="jxr_keyword">return</strong> m;
+<a class="jxr_linenumber" name="L220" href="#L220">220</a> 		<strong class="jxr_keyword">return</strong> m;
+<a class="jxr_linenumber" name="L221" href="#L221">221</a> 		<em class="jxr_comment">// @formatter:on</em>
 <a class="jxr_linenumber" name="L222" href="#L222">222</a> 	}
 <a class="jxr_linenumber" name="L223" href="#L223">223</a> 
 <a class="jxr_linenumber" name="L224" href="#L224">224</a> 	@Override <em class="jxr_comment">/* Overridden from Object */</em>
 <a class="jxr_linenumber" name="L225" href="#L225">225</a> 	<strong class="jxr_keyword">public</strong> String toString() {
-<a class="jxr_linenumber" name="L226" href="#L226">226</a> 		<strong class="jxr_keyword">return</strong> toMap().toString();
+<a class="jxr_linenumber" name="L226" href="#L226">226</a> 		<strong class="jxr_keyword">return</strong> r(propertyMap());
 <a class="jxr_linenumber" name="L227" href="#L227">227</a> 	}
 <a class="jxr_linenumber" name="L228" href="#L228">228</a> }
 </pre>
diff --git a/site/xref/org/apache/juneau/commons/collections/FluentMap.html b/site/xref/org/apache/juneau/commons/collections/FluentMap.html
index 2def27cb37..9b13b398d2 100644
--- a/site/xref/org/apache/juneau/commons/collections/FluentMap.html
+++ b/site/xref/org/apache/juneau/commons/collections/FluentMap.html
@@ -27,235 +27,264 @@
 <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>  
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> java.util.*;
-<a class="jxr_linenumber" name="L22" href="#L22">22</a>  
-<a class="jxr_linenumber" name="L23" href="#L23">23</a>  <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L24" href="#L24">24</a>  <em class="jxr_javadoccomment"> * A fluent wrapper around an arbitrary map that provides convenient methods for adding entries.</em>
-<a class="jxr_linenumber" name="L25" href="#L25">25</a>  <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L26" href="#L26">26</a>  <em class="jxr_javadoccomment"> * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L27" href="#L27">27</a>  <em class="jxr_javadoccomment"> * This class wraps an underlying map and provides a fluent API for adding entries. All methods return</em>
-<a class="jxr_linenumber" name="L28" href="#L28">28</a>  <em class="jxr_javadoccomment"> * &lt;c&gt;this&lt;/c&gt; to allow method chaining. The underlying map can be any {@link Map} implementation.</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;h5 class='section'&gt;Features:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L31" href="#L31">31</a>  <em class="jxr_javadoccomment"> * &lt;ul class='spaced-list'&gt;</em>
-<a class="jxr_linenumber" name="L32" href="#L32">32</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;&lt;b&gt;Fluent API:&lt;/b&gt; All methods return &lt;c&gt;this&lt;/c&gt; for method chaining</em>
-<a class="jxr_linenumber" name="L33" href="#L33">33</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;&lt;b&gt;Arbitrary Map Support:&lt;/b&gt; Works with any map implementation</em>
-<a class="jxr_linenumber" name="L34" href="#L34">34</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;&lt;b&gt;Conditional Adding:&lt;/b&gt; Add entries conditionally based on boolean expressions</em>
-<a class="jxr_linenumber" name="L35" href="#L35">35</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="L36" href="#L36">36</a>  <em class="jxr_javadoccomment"> * &lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L37" href="#L37">37</a>  <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L38" href="#L38">38</a>  <em class="jxr_javadoccomment"> * &lt;h5 class='section'&gt;Usage:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L39" href="#L39">39</a>  <em class="jxr_javadoccomment"> * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L40" href="#L40">40</a>  <em class="jxr_javadoccomment"> * 	&lt;jc&gt;// Create a FluentMap wrapping a LinkedHashMap&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L41" href="#L41">41</a>  <em class="jxr_javadoccomment"> * 	FluentMap&amp;lt;String, String&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = &lt;jk&gt;new&lt;/jk&gt; FluentMap&amp;lt;&amp;gt;(&lt;jk&gt;new&lt;/jk&gt; LinkedHashMap&amp;lt;&amp;gt;());</em>
-<a class="jxr_linenumber" name="L42" href="#L42">42</a>  <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L43" href="#L43">43</a>  <em class="jxr_javadoccomment"> * 	&lt;jv&gt;map&lt;/jv&gt;</em>
-<a class="jxr_linenumber" name="L44" href="#L44">44</a>  <em class="jxr_javadoccomment"> * 		.a(&lt;js&gt;"key1"&lt;/js&gt;, &lt;js&gt;"value1"&lt;/js&gt;)</em>
-<a class="jxr_linenumber" name="L45" href="#L45">45</a>  <em class="jxr_javadoccomment"> * 		.a(&lt;js&gt;"key2"&lt;/js&gt;, &lt;js&gt;"value2"&lt;/js&gt;)</em>
-<a class="jxr_linenumber" name="L46" href="#L46">46</a>  <em class="jxr_javadoccomment"> * 		.ai(&lt;jk&gt;true&lt;/jk&gt;, &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="L47" href="#L47">47</a>  <em class="jxr_javadoccomment"> * 		.ai(&lt;jk&gt;false&lt;/jk&gt;, &lt;js&gt;"key4"&lt;/js&gt;, &lt;js&gt;"value4"&lt;/js&gt;); &lt;jc&gt;// Not added&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L48" href="#L48">48</a>  <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L49" href="#L49">49</a>  <em class="jxr_javadoccomment"> * 	&lt;jc&gt;// Add all entries from another map&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L50" href="#L50">50</a>  <em class="jxr_javadoccomment"> * 	Map&amp;lt;String, String&amp;gt; &lt;jv&gt;other&lt;/jv&gt; = Map.of(&lt;js&gt;"key5"&lt;/js&gt;, &lt;js&gt;"value5"&lt;/js&gt;, &lt;js&gt;"key6"&lt;/js&gt;, &lt;js&gt;"value6"&lt;/js&gt;);</em>
-<a class="jxr_linenumber" name="L51" href="#L51">51</a>  <em class="jxr_javadoccomment"> * 	&lt;jv&gt;map&lt;/jv&gt;.aa(&lt;jv&gt;other&lt;/jv&gt;);</em>
-<a class="jxr_linenumber" name="L52" href="#L52">52</a>  <em class="jxr_javadoccomment"> * &lt;/p&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;Example - Conditional Building:&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;boolean&lt;/jk&gt; &lt;jv&gt;includeDebug&lt;/jv&gt; = &lt;jk&gt;true&lt;/jk&gt;;</em>
-<a class="jxr_linenumber" name="L57" href="#L57">57</a>  <em class="jxr_javadoccomment"> * 	&lt;jk&gt;boolean&lt;/jk&gt; &lt;jv&gt;includeTest&lt;/jv&gt; = &lt;jk&gt;false&lt;/jk&gt;;</em>
-<a class="jxr_linenumber" name="L58" href="#L58">58</a>  <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L59" href="#L59">59</a>  <em class="jxr_javadoccomment"> * 	FluentMap&amp;lt;String, String&amp;gt; &lt;jv&gt;config&lt;/jv&gt; = &lt;jk&gt;new&lt;/jk&gt; FluentMap&amp;lt;&amp;gt;(&lt;jk&gt;new&lt;/jk&gt; LinkedHashMap&amp;lt;&amp;gt;())</em>
-<a class="jxr_linenumber" name="L60" href="#L60">60</a>  <em class="jxr_javadoccomment"> * 		.a(&lt;js&gt;"host"&lt;/js&gt;, &lt;js&gt;"localhost"&lt;/js&gt;)</em>
-<a class="jxr_linenumber" name="L61" href="#L61">61</a>  <em class="jxr_javadoccomment"> * 		.a(&lt;js&gt;"port"&lt;/js&gt;, &lt;js&gt;"8080"&lt;/js&gt;)</em>
-<a class="jxr_linenumber" name="L62" href="#L62">62</a>  <em class="jxr_javadoccomment"> * 		.ai(&lt;jv&gt;includeDebug&lt;/jv&gt;, &lt;js&gt;"debug"&lt;/js&gt;, &lt;js&gt;"true"&lt;/js&gt;)   &lt;jc&gt;// Added&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L63" href="#L63">63</a>  <em class="jxr_javadoccomment"> * 		.ai(&lt;jv&gt;includeTest&lt;/jv&gt;, &lt;js&gt;"test"&lt;/js&gt;, &lt;js&gt;"true"&lt;/js&gt;);    &lt;jc&gt;// Not added&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L64" href="#L64">64</a>  <em class="jxr_javadoccomment"> * &lt;/p&gt;</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;h5 class='section'&gt;Behavior Notes:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L67" href="#L67">67</a>  <em class="jxr_javadoccomment"> * &lt;ul class='spaced-list'&gt;</em>
-<a class="jxr_linenumber" name="L68" href="#L68">68</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;All map operations are delegated to the underlying map</em>
-<a class="jxr_linenumber" name="L69" href="#L69">69</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;The fluent methods ({@link #a(Object, Object)}, {@link #aa(Map)}, {@link #ai(boolean, Object, Object)}) return &lt;c&gt;this&lt;/c&gt; for chaining</em>
-<a class="jxr_linenumber" name="L70" href="#L70">70</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;If a &lt;jk&gt;null&lt;/jk&gt; map is passed to {@link #a(Map)}, it is treated as a no-op</em>
-<a class="jxr_linenumber" name="L71" href="#L71">71</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;The underlying map is stored by reference (not copied), so modifications affect the original map</em>
-<a class="jxr_linenumber" name="L72" href="#L72">72</a>  <em class="jxr_javadoccomment"> * &lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L73" href="#L73">73</a>  <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L74" href="#L74">74</a>  <em class="jxr_javadoccomment"> * &lt;h5 class='section'&gt;Thread Safety:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L75" href="#L75">75</a>  <em class="jxr_javadoccomment"> * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L76" href="#L76">76</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="L77" href="#L77">77</a>  <em class="jxr_javadoccomment"> * use a thread-safe map type (e.g., {@link java.util.concurrent.ConcurrentHashMap}).</em>
-<a class="jxr_linenumber" name="L78" href="#L78">78</a>  <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L79" href="#L79">79</a>  <em class="jxr_javadoccomment"> * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L80" href="#L80">80</a>  <em class="jxr_javadoccomment"> * &lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L81" href="#L81">81</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="L82" href="#L82">82</a>  <em class="jxr_javadoccomment"> * &lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L83" href="#L83">83</a>  <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L84" href="#L84">84</a>  <em class="jxr_javadoccomment"> * @param &lt;K&gt; The key type.</em>
-<a class="jxr_linenumber" name="L85" href="#L85">85</a>  <em class="jxr_javadoccomment"> * @param &lt;V&gt; The value type.</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>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> FluentMap&lt;K,V&gt; <strong class="jxr_keyword">extends</strong> AbstractMap&lt;K,V&gt; {
-<a class="jxr_linenumber" name="L88" href="#L88">88</a>  
-<a class="jxr_linenumber" name="L89" href="#L89">89</a>  	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Map&lt;K,V&gt; map;
-<a class="jxr_linenumber" name="L90" href="#L90">90</a>  
-<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">	 * Constructor.</em>
-<a class="jxr_linenumber" name="L93" href="#L93">93</a>  <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L94" href="#L94">94</a>  <em class="jxr_javadoccomment">	 * @param inner The underlying map to wrap. Must not be &lt;jk&gt;null&lt;/jk&gt;.</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> <a name="FluentMap" href="../../../../../org/apache/juneau/commons/collections/FluentMap.html#FluentMap">FluentMap</a>(Map&lt;K,V&gt; <strong class="jxr_keyword">inner</strong>) {
-<a class="jxr_linenumber" name="L97" href="#L97">97</a>  		<strong class="jxr_keyword">this</strong>.map = assertArgNotNull(<span class="jxr_string">"inner"</span>, <strong class="jxr_keyword">inner</strong>);
-<a class="jxr_linenumber" name="L98" href="#L98">98</a>  	}
-<a class="jxr_linenumber" name="L99" href="#L99">99</a>  
-<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">	 * Adds a single key-value pair to this map.</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;p&gt;</em>
-<a class="jxr_linenumber" name="L104" href="#L104">104</a> <em class="jxr_javadoccomment">	 * This is a convenience method that calls {@link #put(Object, Object)} and returns &lt;c&gt;this&lt;/c&gt;</em>
-<a class="jxr_linenumber" name="L105" href="#L105">105</a> <em class="jxr_javadoccomment">	 * for method chaining.</em>
-<a class="jxr_linenumber" name="L106" href="#L106">106</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L107" href="#L107">107</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L108" href="#L108">108</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L109" href="#L109">109</a> <em class="jxr_javadoccomment">	 * 	FluentMap&amp;lt;String, String&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = &lt;jk&gt;new&lt;/jk&gt; FluentMap&amp;lt;&amp;gt;(&lt;jk&gt;new&lt;/jk&gt; LinkedHashMap&amp;lt;&amp;gt;());</em>
-<a class="jxr_linenumber" name="L110" href="#L110">110</a> <em class="jxr_javadoccomment">	 * 	&lt;jv&gt;map&lt;/jv&gt;.a(&lt;js&gt;"key1"&lt;/js&gt;, &lt;js&gt;"value1"&lt;/js&gt;).a(&lt;js&gt;"key2"&lt;/js&gt;, &lt;js&gt;"value2"&lt;/js&gt;);</em>
-<a class="jxr_linenumber" name="L111" href="#L111">111</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</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">	 * @param key The key to add.</em>
-<a class="jxr_linenumber" name="L114" href="#L114">114</a> <em class="jxr_javadoccomment">	 * @param value The value to add.</em>
-<a class="jxr_linenumber" name="L115" href="#L115">115</a> <em class="jxr_javadoccomment">	 * @return This object for method chaining.</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> FluentMap&lt;K,V&gt; a(K key, V value) {
-<a class="jxr_linenumber" name="L118" href="#L118">118</a> 		map.put(key, value);
-<a class="jxr_linenumber" name="L119" href="#L119">119</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
-<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> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L123" href="#L123">123</a> <em class="jxr_javadoccomment">	 * Adds all entries from the specified map to this map.</em>
-<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">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L126" href="#L126">126</a> <em class="jxr_javadoccomment">	 * This is a convenience method that calls {@link #putAll(Map)} and returns &lt;c&gt;this&lt;/c&gt;</em>
-<a class="jxr_linenumber" name="L127" href="#L127">127</a> <em class="jxr_javadoccomment">	 * for method chaining. If the specified map is &lt;jk&gt;null&lt;/jk&gt;, this is a no-op.</em>
-<a class="jxr_linenumber" name="L128" href="#L128">128</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L129" href="#L129">129</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L130" href="#L130">130</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L131" href="#L131">131</a> <em class="jxr_javadoccomment">	 * 	FluentMap&amp;lt;String, String&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = &lt;jk&gt;new&lt;/jk&gt; FluentMap&amp;lt;&amp;gt;(&lt;jk&gt;new&lt;/jk&gt; LinkedHashMap&amp;lt;&amp;gt;());</em>
-<a class="jxr_linenumber" name="L132" href="#L132">132</a> <em class="jxr_javadoccomment">	 * 	Map&amp;lt;String, String&amp;gt; &lt;jv&gt;other&lt;/jv&gt; = Map.of(&lt;js&gt;"key1"&lt;/js&gt;, &lt;js&gt;"value1"&lt;/js&gt;, &lt;js&gt;"key2"&lt;/js&gt;, &lt;js&gt;"value2"&lt;/js&gt;);</em>
-<a class="jxr_linenumber" name="L133" href="#L133">133</a> <em class="jxr_javadoccomment">	 * 	&lt;jv&gt;map&lt;/jv&gt;.aa(&lt;jv&gt;other&lt;/jv&gt;).a(&lt;js&gt;"key3"&lt;/js&gt;, &lt;js&gt;"value3"&lt;/js&gt;);</em>
-<a class="jxr_linenumber" name="L134" href="#L134">134</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L135" href="#L135">135</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L136" href="#L136">136</a> <em class="jxr_javadoccomment">	 * @param m The map whose entries are to be added. Can be &lt;jk&gt;null&lt;/jk&gt; (no-op).</em>
-<a class="jxr_linenumber" name="L137" href="#L137">137</a> <em class="jxr_javadoccomment">	 * @return This object for method chaining.</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> 	<strong class="jxr_keyword">public</strong> FluentMap&lt;K,V&gt; aa(Map&lt;? <strong class="jxr_keyword">extends</strong> K, ? <strong class="jxr_keyword">extends</strong> V&gt; m) {
-<a class="jxr_linenumber" name="L140" href="#L140">140</a> 		<strong class="jxr_keyword">if</strong> (m != <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L141" href="#L141">141</a> 			map.putAll(m);
-<a class="jxr_linenumber" name="L142" href="#L142">142</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
-<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> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L146" href="#L146">146</a> <em class="jxr_javadoccomment">	 * Adds a key-value pair to this map if the specified boolean condition is &lt;jk&gt;true&lt;/jk&gt;.</em>
-<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">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L149" href="#L149">149</a> <em class="jxr_javadoccomment">	 * This method is useful for conditionally adding entries based on runtime conditions.</em>
-<a class="jxr_linenumber" name="L150" href="#L150">150</a> <em class="jxr_javadoccomment">	 * If the condition is &lt;jk&gt;false&lt;/jk&gt;, the entry is not added and this method returns &lt;c&gt;this&lt;/c&gt;</em>
-<a class="jxr_linenumber" name="L151" href="#L151">151</a> <em class="jxr_javadoccomment">	 * without modifying the map.</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">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L154" href="#L154">154</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L155" href="#L155">155</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;boolean&lt;/jk&gt; &lt;jv&gt;includeDebug&lt;/jv&gt; = &lt;jk&gt;true&lt;/jk&gt;;</em>
-<a class="jxr_linenumber" name="L156" href="#L156">156</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;boolean&lt;/jk&gt; &lt;jv&gt;includeTest&lt;/jv&gt; = &lt;jk&gt;false&lt;/jk&gt;;</em>
-<a class="jxr_linenumber" name="L157" href="#L157">157</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L158" href="#L158">158</a> <em class="jxr_javadoccomment">	 * 	FluentMap&amp;lt;String, String&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = &lt;jk&gt;new&lt;/jk&gt; FluentMap&amp;lt;&amp;gt;(&lt;jk&gt;new&lt;/jk&gt; LinkedHashMap&amp;lt;&amp;gt;())</em>
-<a class="jxr_linenumber" name="L159" href="#L159">159</a> <em class="jxr_javadoccomment">	 * 		.a(&lt;js&gt;"host"&lt;/js&gt;, &lt;js&gt;"localhost"&lt;/js&gt;)</em>
-<a class="jxr_linenumber" name="L160" href="#L160">160</a> <em class="jxr_javadoccomment">	 * 		.ai(&lt;jv&gt;includeDebug&lt;/jv&gt;, &lt;js&gt;"debug"&lt;/js&gt;, &lt;js&gt;"true"&lt;/js&gt;)   &lt;jc&gt;// Added&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L161" href="#L161">161</a> <em class="jxr_javadoccomment">	 * 		.ai(&lt;jv&gt;includeTest&lt;/jv&gt;, &lt;js&gt;"test"&lt;/js&gt;, &lt;js&gt;"true"&lt;/js&gt;);    &lt;jc&gt;// Not added&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L162" href="#L162">162</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L163" href="#L163">163</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L164" href="#L164">164</a> <em class="jxr_javadoccomment">	 * @param condition The condition to evaluate. If &lt;jk&gt;true&lt;/jk&gt;, the entry is added; if &lt;jk&gt;false&lt;/jk&gt;, it is not.</em>
-<a class="jxr_linenumber" name="L165" href="#L165">165</a> <em class="jxr_javadoccomment">	 * @param key The key to add if the condition is &lt;jk&gt;true&lt;/jk&gt;.</em>
-<a class="jxr_linenumber" name="L166" href="#L166">166</a> <em class="jxr_javadoccomment">	 * @param value The value to add if the condition is &lt;jk&gt;true&lt;/jk&gt;.</em>
-<a class="jxr_linenumber" name="L167" href="#L167">167</a> <em class="jxr_javadoccomment">	 * @return This object for method chaining.</em>
-<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> 	<strong class="jxr_keyword">public</strong> FluentMap&lt;K,V&gt; ai(<strong class="jxr_keyword">boolean</strong> condition, K key, V value) {
-<a class="jxr_linenumber" name="L170" href="#L170">170</a> 		<strong class="jxr_keyword">if</strong> (condition)
-<a class="jxr_linenumber" name="L171" href="#L171">171</a> 			map.put(key, value);
-<a class="jxr_linenumber" name="L172" href="#L172">172</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
-<a class="jxr_linenumber" name="L173" href="#L173">173</a> 	}
-<a class="jxr_linenumber" name="L174" href="#L174">174</a> 
-<a class="jxr_linenumber" name="L175" href="#L175">175</a> 	@Override
-<a class="jxr_linenumber" name="L176" href="#L176">176</a> 	<strong class="jxr_keyword">public</strong> Set&lt;Entry&lt;K,V&gt;&gt; entrySet() {
-<a class="jxr_linenumber" name="L177" href="#L177">177</a> 		<strong class="jxr_keyword">return</strong> map.entrySet();
-<a class="jxr_linenumber" name="L178" href="#L178">178</a> 	}
-<a class="jxr_linenumber" name="L179" href="#L179">179</a> 
-<a class="jxr_linenumber" name="L180" href="#L180">180</a> 	@Override
-<a class="jxr_linenumber" name="L181" href="#L181">181</a> 	<strong class="jxr_keyword">public</strong> V get(Object key) {
-<a class="jxr_linenumber" name="L182" href="#L182">182</a> 		<strong class="jxr_keyword">return</strong> map.get(key);
-<a class="jxr_linenumber" name="L183" href="#L183">183</a> 	}
-<a class="jxr_linenumber" name="L184" href="#L184">184</a> 
-<a class="jxr_linenumber" name="L185" href="#L185">185</a> 	@Override
-<a class="jxr_linenumber" name="L186" href="#L186">186</a> 	<strong class="jxr_keyword">public</strong> V put(K key, V value) {
-<a class="jxr_linenumber" name="L187" href="#L187">187</a> 		<strong class="jxr_keyword">return</strong> map.put(key, value);
-<a class="jxr_linenumber" name="L188" href="#L188">188</a> 	}
-<a class="jxr_linenumber" name="L189" href="#L189">189</a> 
-<a class="jxr_linenumber" name="L190" href="#L190">190</a> 	@Override
-<a class="jxr_linenumber" name="L191" href="#L191">191</a> 	<strong class="jxr_keyword">public</strong> V remove(Object key) {
-<a class="jxr_linenumber" name="L192" href="#L192">192</a> 		<strong class="jxr_keyword">return</strong> map.remove(key);
-<a class="jxr_linenumber" name="L193" href="#L193">193</a> 	}
-<a class="jxr_linenumber" name="L194" href="#L194">194</a> 
-<a class="jxr_linenumber" name="L195" href="#L195">195</a> 	@Override
-<a class="jxr_linenumber" name="L196" href="#L196">196</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="L197" href="#L197">197</a> 		map.putAll(m);
-<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> 	@Override
-<a class="jxr_linenumber" name="L201" href="#L201">201</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> clear() {
-<a class="jxr_linenumber" name="L202" href="#L202">202</a> 		map.clear();
-<a class="jxr_linenumber" name="L203" href="#L203">203</a> 	}
-<a class="jxr_linenumber" name="L204" href="#L204">204</a> 
-<a class="jxr_linenumber" name="L205" href="#L205">205</a> 	@Override
-<a class="jxr_linenumber" name="L206" href="#L206">206</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> containsKey(Object key) {
-<a class="jxr_linenumber" name="L207" href="#L207">207</a> 		<strong class="jxr_keyword">return</strong> map.containsKey(key);
-<a class="jxr_linenumber" name="L208" href="#L208">208</a> 	}
-<a class="jxr_linenumber" name="L209" href="#L209">209</a> 
-<a class="jxr_linenumber" name="L210" href="#L210">210</a> 	@Override
-<a class="jxr_linenumber" name="L211" href="#L211">211</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> containsValue(Object value) {
-<a class="jxr_linenumber" name="L212" href="#L212">212</a> 		<strong class="jxr_keyword">return</strong> map.containsValue(value);
-<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> 	@Override
-<a class="jxr_linenumber" name="L216" href="#L216">216</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> size() {
-<a class="jxr_linenumber" name="L217" href="#L217">217</a> 		<strong class="jxr_keyword">return</strong> map.size();
-<a class="jxr_linenumber" name="L218" href="#L218">218</a> 	}
-<a class="jxr_linenumber" name="L219" href="#L219">219</a> 
-<a class="jxr_linenumber" name="L220" href="#L220">220</a> 	@Override
-<a class="jxr_linenumber" name="L221" href="#L221">221</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> isEmpty() {
-<a class="jxr_linenumber" name="L222" href="#L222">222</a> 		<strong class="jxr_keyword">return</strong> map.isEmpty();
-<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> 	@Override
-<a class="jxr_linenumber" name="L226" href="#L226">226</a> 	<strong class="jxr_keyword">public</strong> Set&lt;K&gt; keySet() {
-<a class="jxr_linenumber" name="L227" href="#L227">227</a> 		<strong class="jxr_keyword">return</strong> map.keySet();
-<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> 	@Override
-<a class="jxr_linenumber" name="L231" href="#L231">231</a> 	<strong class="jxr_keyword">public</strong> Collection&lt;V&gt; values() {
-<a class="jxr_linenumber" name="L232" href="#L232">232</a> 		<strong class="jxr_keyword">return</strong> map.values();
-<a class="jxr_linenumber" name="L233" href="#L233">233</a> 	}
-<a class="jxr_linenumber" name="L234" href="#L234">234</a> 
-<a class="jxr_linenumber" name="L235" href="#L235">235</a> 	@Override
-<a class="jxr_linenumber" name="L236" href="#L236">236</a> 	<strong class="jxr_keyword">public</strong> String toString() {
-<a class="jxr_linenumber" name="L237" href="#L237">237</a> 		<strong class="jxr_keyword">return</strong> map.toString();
-<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> 	@Override
-<a class="jxr_linenumber" name="L241" href="#L241">241</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> equals(Object o) {
-<a class="jxr_linenumber" name="L242" href="#L242">242</a> 		<strong class="jxr_keyword">return</strong> map.equals(o);
-<a class="jxr_linenumber" name="L243" href="#L243">243</a> 	}
-<a class="jxr_linenumber" name="L244" href="#L244">244</a> 
-<a class="jxr_linenumber" name="L245" href="#L245">245</a> 	@Override
-<a class="jxr_linenumber" name="L246" href="#L246">246</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> hashCode() {
-<a class="jxr_linenumber" name="L247" href="#L247">247</a> 		<strong class="jxr_keyword">return</strong> map.hashCode();
-<a class="jxr_linenumber" name="L248" href="#L248">248</a> 	}
-<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="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> java.util.function.Predicate;
+<a class="jxr_linenumber" name="L23" href="#L23">23</a>  
+<a class="jxr_linenumber" name="L24" href="#L24">24</a>  <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L25" href="#L25">25</a>  <em class="jxr_javadoccomment"> * A fluent wrapper around an arbitrary map that provides convenient methods for adding entries.</em>
+<a class="jxr_linenumber" name="L26" href="#L26">26</a>  <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L27" href="#L27">27</a>  <em class="jxr_javadoccomment"> * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L28" href="#L28">28</a>  <em class="jxr_javadoccomment"> * This class wraps an underlying map and provides a fluent API for adding entries. All methods return</em>
+<a class="jxr_linenumber" name="L29" href="#L29">29</a>  <em class="jxr_javadoccomment"> * &lt;c&gt;this&lt;/c&gt; to allow method chaining. The underlying map can be any {@link Map} implementation.</em>
+<a class="jxr_linenumber" name="L30" href="#L30">30</a>  <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L31" href="#L31">31</a>  <em class="jxr_javadoccomment"> * &lt;h5 class='section'&gt;Features:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L32" href="#L32">32</a>  <em class="jxr_javadoccomment"> * &lt;ul class='spaced-list'&gt;</em>
+<a class="jxr_linenumber" name="L33" href="#L33">33</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;&lt;b&gt;Fluent API:&lt;/b&gt; All methods return &lt;c&gt;this&lt;/c&gt; for method chaining</em>
+<a class="jxr_linenumber" name="L34" href="#L34">34</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;&lt;b&gt;Arbitrary Map Support:&lt;/b&gt; Works with any map implementation</em>
+<a class="jxr_linenumber" name="L35" href="#L35">35</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;&lt;b&gt;Conditional Adding:&lt;/b&gt; Add entries conditionally based on boolean expressions</em>
+<a class="jxr_linenumber" name="L36" href="#L36">36</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="L37" href="#L37">37</a>  <em class="jxr_javadoccomment"> * &lt;/ul&gt;</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;Usage:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L40" href="#L40">40</a>  <em class="jxr_javadoccomment"> * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L41" href="#L41">41</a>  <em class="jxr_javadoccomment"> * 	&lt;jc&gt;// Create a FluentMap wrapping a LinkedHashMap&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L42" href="#L42">42</a>  <em class="jxr_javadoccomment"> * 	FluentMap&amp;lt;String, String&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = &lt;jk&gt;new&lt;/jk&gt; FluentMap&amp;lt;&amp;gt;(&lt;jk&gt;new&lt;/jk&gt; LinkedHashMap&amp;lt;&amp;gt;());</em>
+<a class="jxr_linenumber" name="L43" href="#L43">43</a>  <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L44" href="#L44">44</a>  <em class="jxr_javadoccomment"> * 	&lt;jv&gt;map&lt;/jv&gt;</em>
+<a class="jxr_linenumber" name="L45" href="#L45">45</a>  <em class="jxr_javadoccomment"> * 		.a(&lt;js&gt;"key1"&lt;/js&gt;, &lt;js&gt;"value1"&lt;/js&gt;)</em>
+<a class="jxr_linenumber" name="L46" href="#L46">46</a>  <em class="jxr_javadoccomment"> * 		.a(&lt;js&gt;"key2"&lt;/js&gt;, &lt;js&gt;"value2"&lt;/js&gt;)</em>
+<a class="jxr_linenumber" name="L47" href="#L47">47</a>  <em class="jxr_javadoccomment"> * 		.ai(&lt;jk&gt;true&lt;/jk&gt;, &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="L48" href="#L48">48</a>  <em class="jxr_javadoccomment"> * 		.ai(&lt;jk&gt;false&lt;/jk&gt;, &lt;js&gt;"key4"&lt;/js&gt;, &lt;js&gt;"value4"&lt;/js&gt;); &lt;jc&gt;// Not added&lt;/jc&gt;</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;jc&gt;// Add all entries from another map&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L51" href="#L51">51</a>  <em class="jxr_javadoccomment"> * 	Map&amp;lt;String, String&amp;gt; &lt;jv&gt;other&lt;/jv&gt; = Map.of(&lt;js&gt;"key5"&lt;/js&gt;, &lt;js&gt;"value5"&lt;/js&gt;, &lt;js&gt;"key6"&lt;/js&gt;, &lt;js&gt;"value6"&lt;/js&gt;);</em>
+<a class="jxr_linenumber" name="L52" href="#L52">52</a>  <em class="jxr_javadoccomment"> * 	&lt;jv&gt;map&lt;/jv&gt;.aa(&lt;jv&gt;other&lt;/jv&gt;);</em>
+<a class="jxr_linenumber" name="L53" href="#L53">53</a>  <em class="jxr_javadoccomment"> * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L54" href="#L54">54</a>  <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L55" href="#L55">55</a>  <em class="jxr_javadoccomment"> * &lt;h5 class='section'&gt;Example - Conditional Building:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L56" href="#L56">56</a>  <em class="jxr_javadoccomment"> * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L57" href="#L57">57</a>  <em class="jxr_javadoccomment"> * 	&lt;jk&gt;boolean&lt;/jk&gt; &lt;jv&gt;includeDebug&lt;/jv&gt; = &lt;jk&gt;true&lt;/jk&gt;;</em>
+<a class="jxr_linenumber" name="L58" href="#L58">58</a>  <em class="jxr_javadoccomment"> * 	&lt;jk&gt;boolean&lt;/jk&gt; &lt;jv&gt;includeTest&lt;/jv&gt; = &lt;jk&gt;false&lt;/jk&gt;;</em>
+<a class="jxr_linenumber" name="L59" href="#L59">59</a>  <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L60" href="#L60">60</a>  <em class="jxr_javadoccomment"> * 	FluentMap&amp;lt;String, String&amp;gt; &lt;jv&gt;config&lt;/jv&gt; = &lt;jk&gt;new&lt;/jk&gt; FluentMap&amp;lt;&amp;gt;(&lt;jk&gt;new&lt;/jk&gt; LinkedHashMap&amp;lt;&amp;gt;())</em>
+<a class="jxr_linenumber" name="L61" href="#L61">61</a>  <em class="jxr_javadoccomment"> * 		.a(&lt;js&gt;"host"&lt;/js&gt;, &lt;js&gt;"localhost"&lt;/js&gt;)</em>
+<a class="jxr_linenumber" name="L62" href="#L62">62</a>  <em class="jxr_javadoccomment"> * 		.a(&lt;js&gt;"port"&lt;/js&gt;, &lt;js&gt;"8080"&lt;/js&gt;)</em>
+<a class="jxr_linenumber" name="L63" href="#L63">63</a>  <em class="jxr_javadoccomment"> * 		.ai(&lt;jv&gt;includeDebug&lt;/jv&gt;, &lt;js&gt;"debug"&lt;/js&gt;, &lt;js&gt;"true"&lt;/js&gt;)   &lt;jc&gt;// Added&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L64" href="#L64">64</a>  <em class="jxr_javadoccomment"> * 		.ai(&lt;jv&gt;includeTest&lt;/jv&gt;, &lt;js&gt;"test"&lt;/js&gt;, &lt;js&gt;"true"&lt;/js&gt;);    &lt;jc&gt;// Not added&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L65" href="#L65">65</a>  <em class="jxr_javadoccomment"> * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L66" href="#L66">66</a>  <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L67" href="#L67">67</a>  <em class="jxr_javadoccomment"> * &lt;h5 class='section'&gt;Behavior Notes:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L68" href="#L68">68</a>  <em class="jxr_javadoccomment"> * &lt;ul class='spaced-list'&gt;</em>
+<a class="jxr_linenumber" name="L69" href="#L69">69</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;All map operations are delegated to the underlying map</em>
+<a class="jxr_linenumber" name="L70" href="#L70">70</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;The fluent methods ({@link #a(Object, Object)}, {@link #aa(Map)}, {@link #ai(boolean, Object, Object)}) return &lt;c&gt;this&lt;/c&gt; for chaining</em>
+<a class="jxr_linenumber" name="L71" href="#L71">71</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;If a &lt;jk&gt;null&lt;/jk&gt; map is passed to {@link #a(Map)}, it is treated as a no-op</em>
+<a class="jxr_linenumber" name="L72" href="#L72">72</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;The underlying map is stored by reference (not copied), so modifications affect the original map</em>
+<a class="jxr_linenumber" name="L73" href="#L73">73</a>  <em class="jxr_javadoccomment"> * &lt;/ul&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;Thread Safety:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L76" href="#L76">76</a>  <em class="jxr_javadoccomment"> * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L77" href="#L77">77</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="L78" href="#L78">78</a>  <em class="jxr_javadoccomment"> * use a thread-safe map type (e.g., {@link java.util.concurrent.ConcurrentHashMap}).</em>
+<a class="jxr_linenumber" name="L79" href="#L79">79</a>  <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L80" href="#L80">80</a>  <em class="jxr_javadoccomment"> * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;</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"> * 	&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="L83" href="#L83">83</a>  <em class="jxr_javadoccomment"> * &lt;/ul&gt;</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"> * @param &lt;K&gt; The key type.</em>
+<a class="jxr_linenumber" name="L86" href="#L86">86</a>  <em class="jxr_javadoccomment"> * @param &lt;V&gt; The value type.</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>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> FluentMap&lt;K,V&gt; <strong class="jxr_keyword">extends</strong> AbstractMap&lt;K,V&gt; {
+<a class="jxr_linenumber" name="L89" href="#L89">89</a>  
+<a class="jxr_linenumber" name="L90" href="#L90">90</a>  	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Map&lt;K,V&gt; map;
+<a class="jxr_linenumber" name="L91" href="#L91">91</a>  
+<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">	 * Constructor.</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">	 * @param inner The underlying map to wrap. Must not be &lt;jk&gt;null&lt;/jk&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>  	<strong class="jxr_keyword">public</strong> <a name="FluentMap" href="../../../../../org/apache/juneau/commons/collections/FluentMap.html#FluentMap">FluentMap</a>(Map&lt;K,V&gt; <strong class="jxr_keyword">inner</strong>) {
+<a class="jxr_linenumber" name="L98" href="#L98">98</a>  		<strong class="jxr_keyword">this</strong>.map = assertArgNotNull(<span class="jxr_string">"inner"</span>, <strong class="jxr_keyword">inner</strong>);
+<a class="jxr_linenumber" name="L99" href="#L99">99</a>  	}
+<a class="jxr_linenumber" name="L100" href="#L100">100</a> 
+<a class="jxr_linenumber" name="L101" href="#L101">101</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L102" href="#L102">102</a> <em class="jxr_javadoccomment">	 * Adds a single key-value pair to this map.</em>
+<a class="jxr_linenumber" name="L103" href="#L103">103</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L104" href="#L104">104</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L105" href="#L105">105</a> <em class="jxr_javadoccomment">	 * This is a convenience method that calls {@link #put(Object, Object)} and returns &lt;c&gt;this&lt;/c&gt;</em>
+<a class="jxr_linenumber" name="L106" href="#L106">106</a> <em class="jxr_javadoccomment">	 * for method chaining.</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;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L109" href="#L109">109</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L110" href="#L110">110</a> <em class="jxr_javadoccomment">	 * 	FluentMap&amp;lt;String, String&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = &lt;jk&gt;new&lt;/jk&gt; FluentMap&amp;lt;&amp;gt;(&lt;jk&gt;new&lt;/jk&gt; LinkedHashMap&amp;lt;&amp;gt;());</em>
+<a class="jxr_linenumber" name="L111" href="#L111">111</a> <em class="jxr_javadoccomment">	 * 	&lt;jv&gt;map&lt;/jv&gt;.a(&lt;js&gt;"key1"&lt;/js&gt;, &lt;js&gt;"value1"&lt;/js&gt;).a(&lt;js&gt;"key2"&lt;/js&gt;, &lt;js&gt;"value2"&lt;/js&gt;);</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 key The key to add.</em>
+<a class="jxr_linenumber" name="L115" href="#L115">115</a> <em class="jxr_javadoccomment">	 * @param value The value to add.</em>
+<a class="jxr_linenumber" name="L116" href="#L116">116</a> <em class="jxr_javadoccomment">	 * @return This object for method chaining.</em>
+<a class="jxr_linenumber" name="L117" href="#L117">117</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L118" href="#L118">118</a> 	<strong class="jxr_keyword">public</strong> FluentMap&lt;K,V&gt; a(K key, V value) {
+<a class="jxr_linenumber" name="L119" href="#L119">119</a> 		map.put(key, value);
+<a class="jxr_linenumber" name="L120" href="#L120">120</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
+<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> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L124" href="#L124">124</a> <em class="jxr_javadoccomment">	 * Adds all entries from the specified map to this map.</em>
+<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">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L127" href="#L127">127</a> <em class="jxr_javadoccomment">	 * This is a convenience method that calls {@link #putAll(Map)} and returns &lt;c&gt;this&lt;/c&gt;</em>
+<a class="jxr_linenumber" name="L128" href="#L128">128</a> <em class="jxr_javadoccomment">	 * for method chaining. If the specified map is &lt;jk&gt;null&lt;/jk&gt;, this is a no-op.</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;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L131" href="#L131">131</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L132" href="#L132">132</a> <em class="jxr_javadoccomment">	 * 	FluentMap&amp;lt;String, String&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = &lt;jk&gt;new&lt;/jk&gt; FluentMap&amp;lt;&amp;gt;(&lt;jk&gt;new&lt;/jk&gt; LinkedHashMap&amp;lt;&amp;gt;());</em>
+<a class="jxr_linenumber" name="L133" href="#L133">133</a> <em class="jxr_javadoccomment">	 * 	Map&amp;lt;String, String&amp;gt; &lt;jv&gt;other&lt;/jv&gt; = Map.of(&lt;js&gt;"key1"&lt;/js&gt;, &lt;js&gt;"value1"&lt;/js&gt;, &lt;js&gt;"key2"&lt;/js&gt;, &lt;js&gt;"value2"&lt;/js&gt;);</em>
+<a class="jxr_linenumber" name="L134" href="#L134">134</a> <em class="jxr_javadoccomment">	 * 	&lt;jv&gt;map&lt;/jv&gt;.aa(&lt;jv&gt;other&lt;/jv&gt;).a(&lt;js&gt;"key3"&lt;/js&gt;, &lt;js&gt;"value3"&lt;/js&gt;);</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">	 *</em>
+<a class="jxr_linenumber" name="L137" href="#L137">137</a> <em class="jxr_javadoccomment">	 * @param m The map whose entries are to be added. Can be &lt;jk&gt;null&lt;/jk&gt; (no-op).</em>
+<a class="jxr_linenumber" name="L138" href="#L138">138</a> <em class="jxr_javadoccomment">	 * @return This object for method chaining.</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> 	<strong class="jxr_keyword">public</strong> FluentMap&lt;K,V&gt; aa(Map&lt;? <strong class="jxr_keyword">extends</strong> K, ? <strong class="jxr_keyword">extends</strong> V&gt; m) {
+<a class="jxr_linenumber" name="L141" href="#L141">141</a> 		<strong class="jxr_keyword">if</strong> (m != <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L142" href="#L142">142</a> 			map.putAll(m);
+<a class="jxr_linenumber" name="L143" href="#L143">143</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
+<a class="jxr_linenumber" name="L144" href="#L144">144</a> 	}
+<a class="jxr_linenumber" name="L145" href="#L145">145</a> 
+<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> <em class="jxr_javadoccomment">	 * Adds a key-value pair to this map if the specified boolean condition is &lt;jk&gt;true&lt;/jk&gt;.</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;p&gt;</em>
+<a class="jxr_linenumber" name="L150" href="#L150">150</a> <em class="jxr_javadoccomment">	 * This method is useful for conditionally adding entries based on runtime conditions.</em>
+<a class="jxr_linenumber" name="L151" href="#L151">151</a> <em class="jxr_javadoccomment">	 * If the condition is &lt;jk&gt;false&lt;/jk&gt;, the entry is not added and this method returns &lt;c&gt;this&lt;/c&gt;</em>
+<a class="jxr_linenumber" name="L152" href="#L152">152</a> <em class="jxr_javadoccomment">	 * without modifying the map.</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;jk&gt;boolean&lt;/jk&gt; &lt;jv&gt;includeDebug&lt;/jv&gt; = &lt;jk&gt;true&lt;/jk&gt;;</em>
+<a class="jxr_linenumber" name="L157" href="#L157">157</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;boolean&lt;/jk&gt; &lt;jv&gt;includeTest&lt;/jv&gt; = &lt;jk&gt;false&lt;/jk&gt;;</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> <em class="jxr_javadoccomment">	 * 	FluentMap&amp;lt;String, String&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = &lt;jk&gt;new&lt;/jk&gt; FluentMap&amp;lt;&amp;gt;(&lt;jk&gt;new&lt;/jk&gt; LinkedHashMap&amp;lt;&amp;gt;())</em>
+<a class="jxr_linenumber" name="L160" href="#L160">160</a> <em class="jxr_javadoccomment">	 * 		.a(&lt;js&gt;"host"&lt;/js&gt;, &lt;js&gt;"localhost"&lt;/js&gt;)</em>
+<a class="jxr_linenumber" name="L161" href="#L161">161</a> <em class="jxr_javadoccomment">	 * 		.ai(&lt;jv&gt;includeDebug&lt;/jv&gt;, &lt;js&gt;"debug"&lt;/js&gt;, &lt;js&gt;"true"&lt;/js&gt;)   &lt;jc&gt;// Added&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L162" href="#L162">162</a> <em class="jxr_javadoccomment">	 * 		.ai(&lt;jv&gt;includeTest&lt;/jv&gt;, &lt;js&gt;"test"&lt;/js&gt;, &lt;js&gt;"true"&lt;/js&gt;);    &lt;jc&gt;// Not added&lt;/jc&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 condition The condition to evaluate. If &lt;jk&gt;true&lt;/jk&gt;, the entry is added; if &lt;jk&gt;false&lt;/jk&gt;, it is not.</em>
+<a class="jxr_linenumber" name="L166" href="#L166">166</a> <em class="jxr_javadoccomment">	 * @param key The key to add if the condition is &lt;jk&gt;true&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L167" href="#L167">167</a> <em class="jxr_javadoccomment">	 * @param value The value to add if the condition is &lt;jk&gt;true&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L168" href="#L168">168</a> <em class="jxr_javadoccomment">	 * @return This object for method chaining.</em>
+<a class="jxr_linenumber" name="L169" href="#L169">169</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L170" href="#L170">170</a> 	<strong class="jxr_keyword">public</strong> FluentMap&lt;K,V&gt; ai(<strong class="jxr_keyword">boolean</strong> condition, K key, V value) {
+<a class="jxr_linenumber" name="L171" href="#L171">171</a> 		<strong class="jxr_keyword">if</strong> (condition)
+<a class="jxr_linenumber" name="L172" href="#L172">172</a> 			map.put(key, value);
+<a class="jxr_linenumber" name="L173" href="#L173">173</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
+<a class="jxr_linenumber" name="L174" href="#L174">174</a> 	}
+<a class="jxr_linenumber" name="L175" href="#L175">175</a> 
+<a class="jxr_linenumber" name="L176" href="#L176">176</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L177" href="#L177">177</a> <em class="jxr_javadoccomment">	 * Adds a key-value pair to this map if the specified predicate returns &lt;jk&gt;true&lt;/jk&gt; when applied to the value.</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> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L180" href="#L180">180</a> <em class="jxr_javadoccomment">	 * This method is useful for conditionally adding entries based on the value itself.</em>
+<a class="jxr_linenumber" name="L181" href="#L181">181</a> <em class="jxr_javadoccomment">	 * The predicate is applied to the value, and if it returns &lt;jk&gt;true&lt;/jk&gt;, the entry is added.</em>
+<a class="jxr_linenumber" name="L182" href="#L182">182</a> <em class="jxr_javadoccomment">	 * If the predicate returns &lt;jk&gt;false&lt;/jk&gt;, the entry is not added and this method returns &lt;c&gt;this&lt;/c&gt;</em>
+<a class="jxr_linenumber" name="L183" href="#L183">183</a> <em class="jxr_javadoccomment">	 * without modifying the map.</em>
+<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">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L186" href="#L186">186</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L187" href="#L187">187</a> <em class="jxr_javadoccomment">	 * 	FluentMap&amp;lt;String, String&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = &lt;jk&gt;new&lt;/jk&gt; FluentMap&amp;lt;&amp;gt;(&lt;jk&gt;new&lt;/jk&gt; LinkedHashMap&amp;lt;&amp;gt;())</em>
+<a class="jxr_linenumber" name="L188" href="#L188">188</a> <em class="jxr_javadoccomment">	 * 		.a(&lt;js&gt;"host"&lt;/js&gt;, &lt;js&gt;"localhost"&lt;/js&gt;)</em>
+<a class="jxr_linenumber" name="L189" href="#L189">189</a> <em class="jxr_javadoccomment">	 * 		.ai(s -&amp;gt; !s.isEmpty(), &lt;js&gt;"debug"&lt;/js&gt;, &lt;js&gt;"true"&lt;/js&gt;)   &lt;jc&gt;// Added (value is not empty)&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L190" href="#L190">190</a> <em class="jxr_javadoccomment">	 * 		.ai(s -&amp;gt; !s.isEmpty(), &lt;js&gt;"test"&lt;/js&gt;, &lt;js&gt;""&lt;/js&gt;);       &lt;jc&gt;// Not added (value is empty)&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L191" href="#L191">191</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</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> <em class="jxr_javadoccomment">	 * @param predicate The predicate to test on the value. If it returns &lt;jk&gt;true&lt;/jk&gt;, the entry is added; if &lt;jk&gt;false&lt;/jk&gt;, it is not.</em>
+<a class="jxr_linenumber" name="L194" href="#L194">194</a> <em class="jxr_javadoccomment">	 * @param key The key to add if the predicate returns &lt;jk&gt;true&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L195" href="#L195">195</a> <em class="jxr_javadoccomment">	 * @param value The value to add if the predicate returns &lt;jk&gt;true&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L196" href="#L196">196</a> <em class="jxr_javadoccomment">	 * @return This object for method chaining.</em>
+<a class="jxr_linenumber" name="L197" href="#L197">197</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L198" href="#L198">198</a> 	<strong class="jxr_keyword">public</strong> FluentMap&lt;K,V&gt; ai(Predicate&lt;V&gt; predicate, K key, V value) {
+<a class="jxr_linenumber" name="L199" href="#L199">199</a> 		<strong class="jxr_keyword">if</strong> (predicate.test(value))
+<a class="jxr_linenumber" name="L200" href="#L200">200</a> 			map.put(key, value);
+<a class="jxr_linenumber" name="L201" href="#L201">201</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
+<a class="jxr_linenumber" name="L202" href="#L202">202</a> 	}
+<a class="jxr_linenumber" name="L203" href="#L203">203</a> 
+<a class="jxr_linenumber" name="L204" href="#L204">204</a> 	@Override
+<a class="jxr_linenumber" name="L205" href="#L205">205</a> 	<strong class="jxr_keyword">public</strong> Set&lt;Entry&lt;K,V&gt;&gt; entrySet() {
+<a class="jxr_linenumber" name="L206" href="#L206">206</a> 		<strong class="jxr_keyword">return</strong> map.entrySet();
+<a class="jxr_linenumber" name="L207" href="#L207">207</a> 	}
+<a class="jxr_linenumber" name="L208" href="#L208">208</a> 
+<a class="jxr_linenumber" name="L209" href="#L209">209</a> 	@Override
+<a class="jxr_linenumber" name="L210" href="#L210">210</a> 	<strong class="jxr_keyword">public</strong> V get(Object key) {
+<a class="jxr_linenumber" name="L211" href="#L211">211</a> 		<strong class="jxr_keyword">return</strong> map.get(key);
+<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> 	@Override
+<a class="jxr_linenumber" name="L215" href="#L215">215</a> 	<strong class="jxr_keyword">public</strong> V put(K key, V value) {
+<a class="jxr_linenumber" name="L216" href="#L216">216</a> 		<strong class="jxr_keyword">return</strong> map.put(key, value);
+<a class="jxr_linenumber" name="L217" href="#L217">217</a> 	}
+<a class="jxr_linenumber" name="L218" href="#L218">218</a> 
+<a class="jxr_linenumber" name="L219" href="#L219">219</a> 	@Override
+<a class="jxr_linenumber" name="L220" href="#L220">220</a> 	<strong class="jxr_keyword">public</strong> V remove(Object key) {
+<a class="jxr_linenumber" name="L221" href="#L221">221</a> 		<strong class="jxr_keyword">return</strong> map.remove(key);
+<a class="jxr_linenumber" name="L222" href="#L222">222</a> 	}
+<a class="jxr_linenumber" name="L223" href="#L223">223</a> 
+<a class="jxr_linenumber" name="L224" href="#L224">224</a> 	@Override
+<a class="jxr_linenumber" name="L225" href="#L225">225</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="L226" href="#L226">226</a> 		map.putAll(m);
+<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> 	@Override
+<a class="jxr_linenumber" name="L230" href="#L230">230</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> clear() {
+<a class="jxr_linenumber" name="L231" href="#L231">231</a> 		map.clear();
+<a class="jxr_linenumber" name="L232" href="#L232">232</a> 	}
+<a class="jxr_linenumber" name="L233" href="#L233">233</a> 
+<a class="jxr_linenumber" name="L234" href="#L234">234</a> 	@Override
+<a class="jxr_linenumber" name="L235" href="#L235">235</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> containsKey(Object key) {
+<a class="jxr_linenumber" name="L236" href="#L236">236</a> 		<strong class="jxr_keyword">return</strong> map.containsKey(key);
+<a class="jxr_linenumber" name="L237" href="#L237">237</a> 	}
+<a class="jxr_linenumber" name="L238" href="#L238">238</a> 
+<a class="jxr_linenumber" name="L239" href="#L239">239</a> 	@Override
+<a class="jxr_linenumber" name="L240" href="#L240">240</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> containsValue(Object value) {
+<a class="jxr_linenumber" name="L241" href="#L241">241</a> 		<strong class="jxr_keyword">return</strong> map.containsValue(value);
+<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> 	@Override
+<a class="jxr_linenumber" name="L245" href="#L245">245</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> size() {
+<a class="jxr_linenumber" name="L246" href="#L246">246</a> 		<strong class="jxr_keyword">return</strong> map.size();
+<a class="jxr_linenumber" name="L247" href="#L247">247</a> 	}
+<a class="jxr_linenumber" name="L248" href="#L248">248</a> 
+<a class="jxr_linenumber" name="L249" href="#L249">249</a> 	@Override
+<a class="jxr_linenumber" name="L250" href="#L250">250</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> isEmpty() {
+<a class="jxr_linenumber" name="L251" href="#L251">251</a> 		<strong class="jxr_keyword">return</strong> map.isEmpty();
+<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> 	@Override
+<a class="jxr_linenumber" name="L255" href="#L255">255</a> 	<strong class="jxr_keyword">public</strong> Set&lt;K&gt; keySet() {
+<a class="jxr_linenumber" name="L256" href="#L256">256</a> 		<strong class="jxr_keyword">return</strong> map.keySet();
+<a class="jxr_linenumber" name="L257" href="#L257">257</a> 	}
+<a class="jxr_linenumber" name="L258" href="#L258">258</a> 
+<a class="jxr_linenumber" name="L259" href="#L259">259</a> 	@Override
+<a class="jxr_linenumber" name="L260" href="#L260">260</a> 	<strong class="jxr_keyword">public</strong> Collection&lt;V&gt; values() {
+<a class="jxr_linenumber" name="L261" href="#L261">261</a> 		<strong class="jxr_keyword">return</strong> map.values();
+<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> 	@Override
+<a class="jxr_linenumber" name="L265" href="#L265">265</a> 	<strong class="jxr_keyword">public</strong> String toString() {
+<a class="jxr_linenumber" name="L266" href="#L266">266</a> 		<strong class="jxr_keyword">return</strong> map.toString();
+<a class="jxr_linenumber" name="L267" href="#L267">267</a> 	}
+<a class="jxr_linenumber" name="L268" href="#L268">268</a> 
+<a class="jxr_linenumber" name="L269" href="#L269">269</a> 	@Override
+<a class="jxr_linenumber" name="L270" href="#L270">270</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> equals(Object o) {
+<a class="jxr_linenumber" name="L271" href="#L271">271</a> 		<strong class="jxr_keyword">return</strong> map.equals(o);
+<a class="jxr_linenumber" name="L272" href="#L272">272</a> 	}
+<a class="jxr_linenumber" name="L273" href="#L273">273</a> 
+<a class="jxr_linenumber" name="L274" href="#L274">274</a> 	@Override
+<a class="jxr_linenumber" name="L275" href="#L275">275</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> hashCode() {
+<a class="jxr_linenumber" name="L276" href="#L276">276</a> 		<strong class="jxr_keyword">return</strong> map.hashCode();
+<a class="jxr_linenumber" name="L277" href="#L277">277</a> 	}
+<a class="jxr_linenumber" name="L278" href="#L278">278</a> }
+<a class="jxr_linenumber" name="L279" href="#L279">279</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/reflect/AnnotationInfo.html b/site/xref/org/apache/juneau/commons/reflect/AnnotationInfo.html
index a24ab7c625..1d75c2f6fc 100644
--- a/site/xref/org/apache/juneau/commons/reflect/AnnotationInfo.html
+++ b/site/xref/org/apache/juneau/commons/reflect/AnnotationInfo.html
@@ -35,729 +35,731 @@
 <a class="jxr_linenumber" name="L27" href="#L27">27</a>  <strong class="jxr_keyword">import</strong> java.util.function.*;
 <a class="jxr_linenumber" name="L28" href="#L28">28</a>  
 <a class="jxr_linenumber" name="L29" href="#L29">29</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.commons.annotation.*;
-<a class="jxr_linenumber" name="L30" href="#L30">30</a>  
-<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"> * Encapsulates information about an annotation instance and the element it's declared on.</em>
-<a class="jxr_linenumber" name="L33" href="#L33">33</a>  <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L34" href="#L34">34</a>  <em class="jxr_javadoccomment"> * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L35" href="#L35">35</a>  <em class="jxr_javadoccomment"> * This class provides a convenient wrapper around Java annotations that allows you to:</em>
-<a class="jxr_linenumber" name="L36" href="#L36">36</a>  <em class="jxr_javadoccomment"> * &lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L37" href="#L37">37</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;Access annotation values in a type-safe manner</em>
-<a class="jxr_linenumber" name="L38" href="#L38">38</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;Query annotation properties without reflection boilerplate</em>
-<a class="jxr_linenumber" name="L39" href="#L39">39</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;Track where the annotation was found (class, method, field, etc.)</em>
-<a class="jxr_linenumber" name="L40" href="#L40">40</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;Sort annotations by precedence using ranks</em>
-<a class="jxr_linenumber" name="L41" href="#L41">41</a>  <em class="jxr_javadoccomment"> * &lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L42" href="#L42">42</a>  <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L43" href="#L43">43</a>  <em class="jxr_javadoccomment"> * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L44" href="#L44">44</a>  <em class="jxr_javadoccomment"> * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L45" href="#L45">45</a>  <em class="jxr_javadoccomment"> * 	&lt;jc&gt;// Get annotation info from a class&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L46" href="#L46">46</a>  <em class="jxr_javadoccomment"> * 	ClassInfo &lt;jv&gt;ci&lt;/jv&gt; = ClassInfo.&lt;jsm&gt;of&lt;/jsm&gt;(MyClass.&lt;jk&gt;class&lt;/jk&gt;);</em>
-<a class="jxr_linenumber" name="L47" href="#L47">47</a>  <em class="jxr_javadoccomment"> * 	Optional&amp;lt;AnnotationInfo&amp;lt;MyAnnotation&amp;gt;&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; =</em>
-<a class="jxr_linenumber" name="L48" href="#L48">48</a>  <em class="jxr_javadoccomment"> * 		&lt;jv&gt;ci&lt;/jv&gt;.getAnnotations(MyAnnotation.&lt;jk&gt;class&lt;/jk&gt;).findFirst();</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;jc&gt;// Access annotation values&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L51" href="#L51">51</a>  <em class="jxr_javadoccomment"> * 	&lt;jv&gt;ai&lt;/jv&gt;.ifPresent(&lt;jv&gt;x&lt;/jv&gt; -&amp;gt; {</em>
-<a class="jxr_linenumber" name="L52" href="#L52">52</a>  <em class="jxr_javadoccomment"> * 		String &lt;jv&gt;value&lt;/jv&gt; = &lt;jv&gt;x&lt;/jv&gt;.getValue(String.&lt;jk&gt;class&lt;/jk&gt;, &lt;js&gt;"value"&lt;/js&gt;).orElse(&lt;js&gt;"default"&lt;/js&gt;);</em>
-<a class="jxr_linenumber" name="L53" href="#L53">53</a>  <em class="jxr_javadoccomment"> * 		&lt;jk&gt;int&lt;/jk&gt; &lt;jv&gt;priority&lt;/jv&gt; = &lt;jv&gt;x&lt;/jv&gt;.getInt(&lt;js&gt;"priority"&lt;/js&gt;).orElse(0);</em>
-<a class="jxr_linenumber" name="L54" href="#L54">54</a>  <em class="jxr_javadoccomment"> * 	});</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;See Also:&lt;/h5&gt;&lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L58" href="#L58">58</a>  <em class="jxr_javadoccomment"> * 	&lt;li class='jc'&gt;{@link ClassInfo}</em>
-<a class="jxr_linenumber" name="L59" href="#L59">59</a>  <em class="jxr_javadoccomment"> * 	&lt;li class='jc'&gt;{@link MethodInfo}</em>
-<a class="jxr_linenumber" name="L60" href="#L60">60</a>  <em class="jxr_javadoccomment"> * 	&lt;li class='jc'&gt;{@link FieldInfo}</em>
-<a class="jxr_linenumber" name="L61" href="#L61">61</a>  <em class="jxr_javadoccomment"> * 	&lt;li class='jc'&gt;{@link ConstructorInfo}</em>
-<a class="jxr_linenumber" name="L62" href="#L62">62</a>  <em class="jxr_javadoccomment"> * 	&lt;li class='jc'&gt;{@link ParameterInfo}</em>
-<a class="jxr_linenumber" name="L63" href="#L63">63</a>  <em class="jxr_javadoccomment"> * 	&lt;li class='jc'&gt;{@link PackageInfo}</em>
-<a class="jxr_linenumber" name="L64" href="#L64">64</a>  <em class="jxr_javadoccomment"> * &lt;/ul&gt;</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"> * @param &lt;T&gt; The annotation type.</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>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> AnnotationInfo&lt;T <strong class="jxr_keyword">extends</strong> Annotation&gt; {
-<a class="jxr_linenumber" name="L69" href="#L69">69</a>  
-<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">	 * Creates a new annotation info object.</em>
-<a class="jxr_linenumber" name="L72" href="#L72">72</a>  <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L73" href="#L73">73</a>  <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L74" href="#L74">74</a>  <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L75" href="#L75">75</a>  <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Create annotation info for a class annotation&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L76" href="#L76">76</a>  <em class="jxr_javadoccomment">	 * 	ClassInfo &lt;jv&gt;ci&lt;/jv&gt; = ClassInfo.&lt;jsm&gt;of&lt;/jsm&gt;(MyClass.&lt;jk&gt;class&lt;/jk&gt;);</em>
-<a class="jxr_linenumber" name="L77" href="#L77">77</a>  <em class="jxr_javadoccomment">	 * 	MyAnnotation &lt;jv&gt;annotation&lt;/jv&gt; = &lt;jv&gt;ci&lt;/jv&gt;.inner().getAnnotation(MyAnnotation.&lt;jk&gt;class&lt;/jk&gt;);</em>
-<a class="jxr_linenumber" name="L78" href="#L78">78</a>  <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;MyAnnotation&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; = AnnotationInfo.&lt;jsm&gt;of&lt;/jsm&gt;(&lt;jv&gt;ci&lt;/jv&gt;, &lt;jv&gt;annotation&lt;/jv&gt;);</em>
-<a class="jxr_linenumber" name="L79" href="#L79">79</a>  <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L80" href="#L80">80</a>  <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L81" href="#L81">81</a>  <em class="jxr_javadoccomment">	 * @param &lt;A&gt; The annotation type.</em>
-<a class="jxr_linenumber" name="L82" href="#L82">82</a>  <em class="jxr_javadoccomment">	 * @param on The annotatable object where the annotation was found (class, method, field, constructor, parameter, or package).</em>
-<a class="jxr_linenumber" name="L83" href="#L83">83</a>  <em class="jxr_javadoccomment">	 * @param value The annotation instance. Must not be &lt;jk&gt;null&lt;/jk&gt;.</em>
-<a class="jxr_linenumber" name="L84" href="#L84">84</a>  <em class="jxr_javadoccomment">	 * @return A new {@link AnnotationInfo} object wrapping the annotation.</em>
-<a class="jxr_linenumber" name="L85" href="#L85">85</a>  <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L86" href="#L86">86</a>  	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;A <strong class="jxr_keyword">extends</strong> Annotation&gt; AnnotationInfo&lt;A&gt; of(<a name="Annotatable" href="../../../../../org/apache/juneau/commons/reflect/Annotatable.html#Annotatable">Annotatable</a> on, A value) {
-<a class="jxr_linenumber" name="L87" href="#L87">87</a>  		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> AnnotationInfo&lt;&gt;(on, value);
-<a class="jxr_linenumber" name="L88" href="#L88">88</a>  	}
-<a class="jxr_linenumber" name="L89" href="#L89">89</a>  
-<a class="jxr_linenumber" name="L90" href="#L90">90</a>  	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">int</strong> findRank(Object a) {
-<a class="jxr_linenumber" name="L91" href="#L91">91</a>  		<em class="jxr_comment">// @formatter:off</em>
-<a class="jxr_linenumber" name="L92" href="#L92">92</a>  		<strong class="jxr_keyword">return</strong> ClassInfo.of(a).getAllMethods().stream()
-<a class="jxr_linenumber" name="L93" href="#L93">93</a>  			.filter(m -&gt; m.hasName(<span class="jxr_string">"rank"</span>) &amp;&amp; m.hasReturnType(<strong class="jxr_keyword">int</strong>.<strong class="jxr_keyword">class</strong>))
-<a class="jxr_linenumber" name="L94" href="#L94">94</a>  			.findFirst()
-<a class="jxr_linenumber" name="L95" href="#L95">95</a>  			.map(m -&gt; safe(() -&gt; (<strong class="jxr_keyword">int</strong>)m.invoke(a)))
-<a class="jxr_linenumber" name="L96" href="#L96">96</a>  			.orElse(0);
-<a class="jxr_linenumber" name="L97" href="#L97">97</a>  		<em class="jxr_comment">// @formatter:on</em>
-<a class="jxr_linenumber" name="L98" href="#L98">98</a>  	}
-<a class="jxr_linenumber" name="L99" href="#L99">99</a>  
-<a class="jxr_linenumber" name="L100" href="#L100">100</a> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a name="Annotatable" href="../../../../../org/apache/juneau/commons/reflect/Annotatable.html#Annotatable">Annotatable</a> annotatable;
-<a class="jxr_linenumber" name="L101" href="#L101">101</a> 	<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> rank;
-<a class="jxr_linenumber" name="L102" href="#L102">102</a> 
-<a class="jxr_linenumber" name="L103" href="#L103">103</a> 	<strong class="jxr_keyword">private</strong> T a;  <em class="jxr_comment">// Effectively final</em>
-<a class="jxr_linenumber" name="L104" href="#L104">104</a> 
-<a class="jxr_linenumber" name="L105" href="#L105">105</a> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Supplier&lt;List&lt;MethodInfo&gt;&gt; methods = memoize(() -&gt; stream(a.annotationType().getMethods()).map(m -&gt; MethodInfo.of(info(a.annotationType()), m)).toList());
-<a class="jxr_linenumber" name="L106" href="#L106">106</a> 
-<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">	 * Constructor.</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 on The annotatable object where the annotation was found.</em>
-<a class="jxr_linenumber" name="L111" href="#L111">111</a> <em class="jxr_javadoccomment">	 * @param a The annotation instance.</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> 	AnnotationInfo(<a name="Annotatable" href="../../../../../org/apache/juneau/commons/reflect/Annotatable.html#Annotatable">Annotatable</a> on, T a) {
-<a class="jxr_linenumber" name="L114" href="#L114">114</a> 		<strong class="jxr_keyword">this</strong>.annotatable = on;  <em class="jxr_comment">// TODO - Shouldn't allow null.</em>
-<a class="jxr_linenumber" name="L115" href="#L115">115</a> 		<strong class="jxr_keyword">this</strong>.a = assertArgNotNull(<span class="jxr_string">"a"</span>, a);
-<a class="jxr_linenumber" name="L116" href="#L116">116</a> 		<strong class="jxr_keyword">this</strong>.rank = findRank(a);
-<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> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L120" href="#L120">120</a> <em class="jxr_javadoccomment">	 * Returns the annotation type of this annotation.</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> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L123" href="#L123">123</a> <em class="jxr_javadoccomment">	 * Same as calling {@link Annotation#annotationType()}.</em>
-<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">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L126" href="#L126">126</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L127" href="#L127">127</a> <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;Deprecated&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; = ClassInfo.&lt;jsm&gt;of&lt;/jsm&gt;(MyClass.&lt;jk&gt;class&lt;/jk&gt;).getAnnotation(Deprecated.&lt;jk&gt;class&lt;/jk&gt;);</em>
-<a class="jxr_linenumber" name="L128" href="#L128">128</a> <em class="jxr_javadoccomment">	 * 	Class&amp;lt;? &lt;jk&gt;extends&lt;/jk&gt; Annotation&amp;gt; &lt;jv&gt;type&lt;/jv&gt; = &lt;jv&gt;ai&lt;/jv&gt;.annotationType();  &lt;jc&gt;// Returns Deprecated.class&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L129" href="#L129">129</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L130" href="#L130">130</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L131" href="#L131">131</a> <em class="jxr_javadoccomment">	 * @return The annotation type of this annotation.</em>
-<a class="jxr_linenumber" name="L132" href="#L132">132</a> <em class="jxr_javadoccomment">	 * @see Annotation#annotationType()</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> 	<strong class="jxr_keyword">public</strong> Class&lt;? <strong class="jxr_keyword">extends</strong> Annotation&gt; annotationType() {
-<a class="jxr_linenumber" name="L135" href="#L135">135</a> 		<strong class="jxr_keyword">return</strong> a.annotationType();
-<a class="jxr_linenumber" name="L136" href="#L136">136</a> 	}
-<a class="jxr_linenumber" name="L137" href="#L137">137</a> 
-<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">	 * Casts this annotation info to a specific annotation type.</em>
-<a class="jxr_linenumber" name="L140" href="#L140">140</a> <em class="jxr_javadoccomment">	 *</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">	 * This is useful when you have an {@code AnnotationInfo&lt;?&gt;} and need to narrow it to a specific type.</em>
-<a class="jxr_linenumber" name="L143" href="#L143">143</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L144" href="#L144">144</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L145" href="#L145">145</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L146" href="#L146">146</a> <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;?&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; = ...;</em>
-<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">	 * 	&lt;jc&gt;// Safe cast&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L149" href="#L149">149</a> <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;MyAnnotation&amp;gt; &lt;jv&gt;myAi&lt;/jv&gt; = &lt;jv&gt;ai&lt;/jv&gt;.cast(MyAnnotation.&lt;jk&gt;class&lt;/jk&gt;);</em>
-<a class="jxr_linenumber" name="L150" href="#L150">150</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;if&lt;/jk&gt; (&lt;jv&gt;myAi&lt;/jv&gt; != &lt;jk&gt;null&lt;/jk&gt;) {</em>
-<a class="jxr_linenumber" name="L151" href="#L151">151</a> <em class="jxr_javadoccomment">	 * 		&lt;jc&gt;// Use strongly-typed annotation info&lt;/jc&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">	 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L154" href="#L154">154</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L155" href="#L155">155</a> <em class="jxr_javadoccomment">	 * @param &lt;A&gt; The annotation type to cast to.</em>
-<a class="jxr_linenumber" name="L156" href="#L156">156</a> <em class="jxr_javadoccomment">	 * @param type The annotation type to cast to.</em>
-<a class="jxr_linenumber" name="L157" href="#L157">157</a> <em class="jxr_javadoccomment">	 * @return This annotation info cast to the specified type, or &lt;jk&gt;null&lt;/jk&gt; if the annotation is not of the specified type.</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> 	@SuppressWarnings(<span class="jxr_string">"unchecked"</span>)
-<a class="jxr_linenumber" name="L160" href="#L160">160</a> 	<strong class="jxr_keyword">public</strong> &lt;A <strong class="jxr_keyword">extends</strong> Annotation&gt; AnnotationInfo&lt;A&gt; <strong class="jxr_keyword">cast</strong>(Class&lt;A&gt; type) {
-<a class="jxr_linenumber" name="L161" href="#L161">161</a> 		<strong class="jxr_keyword">return</strong> type.isInstance(a) ? (AnnotationInfo&lt;A&gt;)<strong class="jxr_keyword">this</strong> : <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L162" href="#L162">162</a> 	}
-<a class="jxr_linenumber" name="L163" href="#L163">163</a> 
-<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">	 * Returns true if the specified object represents an annotation that is logically equivalent to this one.</em>
-<a class="jxr_linenumber" name="L166" href="#L166">166</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L167" href="#L167">167</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L168" href="#L168">168</a> <em class="jxr_javadoccomment">	 * Same as calling {@link Annotation#equals(Object)} on the wrapped annotation.</em>
-<a class="jxr_linenumber" name="L169" href="#L169">169</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L170" href="#L170">170</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L171" href="#L171">171</a> <em class="jxr_javadoccomment">	 * Two annotations are considered equal if:</em>
-<a class="jxr_linenumber" name="L172" href="#L172">172</a> <em class="jxr_javadoccomment">	 * &lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L173" href="#L173">173</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;They are of the same annotation type</em>
-<a class="jxr_linenumber" name="L174" href="#L174">174</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;All their corresponding member values are equal</em>
-<a class="jxr_linenumber" name="L175" href="#L175">175</a> <em class="jxr_javadoccomment">	 * &lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L176" href="#L176">176</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L177" href="#L177">177</a> <em class="jxr_javadoccomment">	 * @param o The reference object with which to compare.</em>
-<a class="jxr_linenumber" name="L178" href="#L178">178</a> <em class="jxr_javadoccomment">	 * @return &lt;jk&gt;true&lt;/jk&gt; if the specified object is equal to this annotation.</em>
-<a class="jxr_linenumber" name="L179" href="#L179">179</a> <em class="jxr_javadoccomment">	 * @see Annotation#equals(Object)</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> 	@Override <em class="jxr_comment">/* Overridden from Object */</em>
-<a class="jxr_linenumber" name="L182" href="#L182">182</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> equals(Object o) {
-<a class="jxr_linenumber" name="L183" href="#L183">183</a> 		<strong class="jxr_keyword">if</strong> (o instanceof <a name="AnnotationInfo" href="../../../../../org/apache/juneau/commons/reflect/AnnotationInfo.html#AnnotationInfo">AnnotationInfo</a> o2)
-<a class="jxr_linenumber" name="L184" href="#L184">184</a> 			<strong class="jxr_keyword">return</strong> a.equals(o2.a);
-<a class="jxr_linenumber" name="L185" href="#L185">185</a> 		<strong class="jxr_keyword">return</strong> a.equals(o);
-<a class="jxr_linenumber" name="L186" href="#L186">186</a> 	}
-<a class="jxr_linenumber" name="L187" href="#L187">187</a> 
-<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">	 * Returns the value of the specified method on this annotation as a boolean.</em>
-<a class="jxr_linenumber" name="L190" href="#L190">190</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L191" href="#L191">191</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L192" href="#L192">192</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L193" href="#L193">193</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// For annotation: @MyAnnotation(enabled=true)&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L194" href="#L194">194</a> <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;MyAnnotation&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; = ...;</em>
-<a class="jxr_linenumber" name="L195" href="#L195">195</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;boolean&lt;/jk&gt; &lt;jv&gt;enabled&lt;/jv&gt; = &lt;jv&gt;ai&lt;/jv&gt;.getBoolean(&lt;js&gt;"enabled"&lt;/js&gt;).orElse(&lt;jk&gt;false&lt;/jk&gt;);  &lt;jc&gt;// Returns true&lt;/jc&gt;</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">	 *</em>
-<a class="jxr_linenumber" name="L198" href="#L198">198</a> <em class="jxr_javadoccomment">	 * @param methodName The method name.</em>
-<a class="jxr_linenumber" name="L199" href="#L199">199</a> <em class="jxr_javadoccomment">	 * @return An {@link Optional} containing the value as a boolean, or empty if not found or not a {@code boolean} type.</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> 	<strong class="jxr_keyword">public</strong> Optional&lt;Boolean&gt; getBoolean(String methodName) {
-<a class="jxr_linenumber" name="L202" href="#L202">202</a> 		<strong class="jxr_keyword">return</strong> getMethod(methodName).filter(x -&gt; x.hasReturnType(<strong class="jxr_keyword">boolean</strong>.<strong class="jxr_keyword">class</strong>)).map(x -&gt; (Boolean)x.invoke(a));
-<a class="jxr_linenumber" name="L203" href="#L203">203</a> 	}
-<a class="jxr_linenumber" name="L204" href="#L204">204</a> 
-<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">	 * Returns the value of the specified method on this annotation as a class array.</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;p&gt;</em>
-<a class="jxr_linenumber" name="L209" href="#L209">209</a> <em class="jxr_javadoccomment">	 * For type-safe access to an array of classes of a specific supertype, use {@link #getClassArray(String, Class)}.</em>
-<a class="jxr_linenumber" name="L210" href="#L210">210</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L211" href="#L211">211</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L212" href="#L212">212</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L213" href="#L213">213</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// For annotation: @MyAnnotation(types={String.class, Integer.class})&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L214" href="#L214">214</a> <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;MyAnnotation&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; = ...;</em>
-<a class="jxr_linenumber" name="L215" href="#L215">215</a> <em class="jxr_javadoccomment">	 * 	Class&amp;lt;?&amp;gt;[] &lt;jv&gt;types&lt;/jv&gt; = &lt;jv&gt;ai&lt;/jv&gt;.getClassArray(&lt;js&gt;"types"&lt;/js&gt;).orElse(&lt;jk&gt;new&lt;/jk&gt; Class[0]);  &lt;jc&gt;// Returns [String.class, Integer.class]&lt;/jc&gt;</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">	 *</em>
-<a class="jxr_linenumber" name="L218" href="#L218">218</a> <em class="jxr_javadoccomment">	 * @param methodName The method name.</em>
-<a class="jxr_linenumber" name="L219" href="#L219">219</a> <em class="jxr_javadoccomment">	 * @return An {@link Optional} containing the class array value, or empty if not found or not a {@code Class[]} type.</em>
-<a class="jxr_linenumber" name="L220" href="#L220">220</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L221" href="#L221">221</a> 	@SuppressWarnings(<span class="jxr_string">"unchecked"</span>)
-<a class="jxr_linenumber" name="L222" href="#L222">222</a> 	<strong class="jxr_keyword">public</strong> Optional&lt;Class&lt;?&gt;[]&gt; getClassArray(String methodName) {
-<a class="jxr_linenumber" name="L223" href="#L223">223</a> 		<strong class="jxr_keyword">return</strong> (Optional&lt;Class&lt;?&gt;[]&gt;)(Optional&lt;?&gt;)getMethod(methodName).filter(x -&gt; x.hasReturnType(Class[].<strong class="jxr_keyword">class</strong>)).map(x -&gt; x.invoke(a));
-<a class="jxr_linenumber" name="L224" href="#L224">224</a> 	}
-<a class="jxr_linenumber" name="L225" href="#L225">225</a> 
-<a class="jxr_linenumber" name="L226" href="#L226">226</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L227" href="#L227">227</a> <em class="jxr_javadoccomment">	 * Returns the value of the specified method on this annotation as a class array of a specific type.</em>
-<a class="jxr_linenumber" name="L228" href="#L228">228</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L229" href="#L229">229</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L230" href="#L230">230</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L231" href="#L231">231</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Get an array of serializer classes from an annotation&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L232" href="#L232">232</a> <em class="jxr_javadoccomment">	 * 	Optional&amp;lt;Class&amp;lt;? &lt;jk&gt;extends&lt;/jk&gt; Serializer&amp;gt;[]&amp;gt; &lt;jv&gt;serializerClasses&lt;/jv&gt; =</em>
-<a class="jxr_linenumber" name="L233" href="#L233">233</a> <em class="jxr_javadoccomment">	 * 		&lt;jv&gt;annotationInfo&lt;/jv&gt;.getClassArray(&lt;js&gt;"serializers"&lt;/js&gt;, Serializer.&lt;jk&gt;class&lt;/jk&gt;);</em>
-<a class="jxr_linenumber" name="L234" href="#L234">234</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L235" href="#L235">235</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L236" href="#L236">236</a> <em class="jxr_javadoccomment">	 * @param &lt;T&gt; The expected supertype of the classes.</em>
-<a class="jxr_linenumber" name="L237" href="#L237">237</a> <em class="jxr_javadoccomment">	 * @param methodName The method name.</em>
-<a class="jxr_linenumber" name="L238" href="#L238">238</a> <em class="jxr_javadoccomment">	 * @param type The expected supertype of the class values.</em>
-<a class="jxr_linenumber" name="L239" href="#L239">239</a> <em class="jxr_javadoccomment">	 * @return An optional containing the value of the specified method cast to the expected type,</em>
-<a class="jxr_linenumber" name="L240" href="#L240">240</a> <em class="jxr_javadoccomment">	 *         or empty if not found, not a class array, or any element is not assignable to the expected type.</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> 	@SuppressWarnings({ <span class="jxr_string">"unchecked"</span>, <span class="jxr_string">"hiding"</span> })
-<a class="jxr_linenumber" name="L243" href="#L243">243</a> 	<strong class="jxr_keyword">public</strong> &lt;T&gt; Optional&lt;Class&lt;? <strong class="jxr_keyword">extends</strong> T&gt;[]&gt; getClassArray(String methodName, Class&lt;T&gt; type) {
-<a class="jxr_linenumber" name="L244" href="#L244">244</a> 		<em class="jxr_comment">// @formatter:off</em>
-<a class="jxr_linenumber" name="L245" href="#L245">245</a> 		<strong class="jxr_keyword">return</strong> getMethod(methodName)
-<a class="jxr_linenumber" name="L246" href="#L246">246</a> 			.filter(x -&gt; x.hasReturnType(Class[].<strong class="jxr_keyword">class</strong>))
-<a class="jxr_linenumber" name="L247" href="#L247">247</a> 			.map(x -&gt; (Class&lt;?&gt;[])x.invoke(a))
-<a class="jxr_linenumber" name="L248" href="#L248">248</a> 			.filter(arr -&gt; {
-<a class="jxr_linenumber" name="L249" href="#L249">249</a> 				<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> c : arr) {
-<a class="jxr_linenumber" name="L250" href="#L250">250</a> 					<strong class="jxr_keyword">if</strong> (!type.isAssignableFrom(c))
-<a class="jxr_linenumber" name="L251" href="#L251">251</a> 						<strong class="jxr_keyword">return</strong> false;
-<a class="jxr_linenumber" name="L252" href="#L252">252</a> 				}
-<a class="jxr_linenumber" name="L253" href="#L253">253</a> 				<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="L254" href="#L254">254</a> 			})
-<a class="jxr_linenumber" name="L255" href="#L255">255</a> 			.map(x -&gt; (Class&lt;? <strong class="jxr_keyword">extends</strong> T&gt;[])x);
-<a class="jxr_linenumber" name="L256" href="#L256">256</a> 		<em class="jxr_comment">// @formatter:on</em>
-<a class="jxr_linenumber" name="L257" href="#L257">257</a> 	}
-<a class="jxr_linenumber" name="L258" href="#L258">258</a> 
-<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">	 * Returns the value of the specified method on this annotation as a class.</em>
-<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">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L263" href="#L263">263</a> <em class="jxr_javadoccomment">	 * For type-safe access to a class of a specific supertype, use {@link #getClassValue(String, Class)}.</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">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L266" href="#L266">266</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L267" href="#L267">267</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// For annotation: @MyAnnotation(type=String.class)&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L268" href="#L268">268</a> <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;MyAnnotation&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; = ...;</em>
-<a class="jxr_linenumber" name="L269" href="#L269">269</a> <em class="jxr_javadoccomment">	 * 	Class&amp;lt;?&amp;gt; &lt;jv&gt;type&lt;/jv&gt; = &lt;jv&gt;ai&lt;/jv&gt;.getClassValue(&lt;js&gt;"type"&lt;/js&gt;).orElse(&lt;jk&gt;null&lt;/jk&gt;);  &lt;jc&gt;// Returns String.class&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L270" href="#L270">270</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L271" href="#L271">271</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L272" href="#L272">272</a> <em class="jxr_javadoccomment">	 * @param methodName The method name.</em>
-<a class="jxr_linenumber" name="L273" href="#L273">273</a> <em class="jxr_javadoccomment">	 * @return An {@link Optional} containing the class value, or empty if not found or not a {@link Class} type.</em>
-<a class="jxr_linenumber" name="L274" href="#L274">274</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L275" href="#L275">275</a> 	@SuppressWarnings(<span class="jxr_string">"unchecked"</span>)
-<a class="jxr_linenumber" name="L276" href="#L276">276</a> 	<strong class="jxr_keyword">public</strong> Optional&lt;Class&lt;?&gt;&gt; getClassValue(String methodName) {
-<a class="jxr_linenumber" name="L277" href="#L277">277</a> 		<strong class="jxr_keyword">return</strong> (Optional&lt;Class&lt;?&gt;&gt;)(Optional&lt;?&gt;)getMethod(methodName).filter(x -&gt; x.hasReturnType(Class.<strong class="jxr_keyword">class</strong>)).map(x -&gt; x.invoke(a));
-<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">	 * Returns the value of the specified method on this annotation as a class of a specific type.</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;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L284" href="#L284">284</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L285" href="#L285">285</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Get a serializer class from an annotation&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L286" href="#L286">286</a> <em class="jxr_javadoccomment">	 * 	Optional&amp;lt;Class&amp;lt;? &lt;jk&gt;extends&lt;/jk&gt; Serializer&amp;gt;&amp;gt; &lt;jv&gt;serializerClass&lt;/jv&gt; =</em>
-<a class="jxr_linenumber" name="L287" href="#L287">287</a> <em class="jxr_javadoccomment">	 * 		&lt;jv&gt;annotationInfo&lt;/jv&gt;.getClassValue(&lt;js&gt;"serializer"&lt;/js&gt;, Serializer.&lt;jk&gt;class&lt;/jk&gt;);</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">	 *</em>
-<a class="jxr_linenumber" name="L290" href="#L290">290</a> <em class="jxr_javadoccomment">	 * @param &lt;T&gt; The expected supertype of the class.</em>
-<a class="jxr_linenumber" name="L291" href="#L291">291</a> <em class="jxr_javadoccomment">	 * @param methodName The method name.</em>
-<a class="jxr_linenumber" name="L292" href="#L292">292</a> <em class="jxr_javadoccomment">	 * @param type The expected supertype of the class value.</em>
-<a class="jxr_linenumber" name="L293" href="#L293">293</a> <em class="jxr_javadoccomment">	 * @return An optional containing the value of the specified method cast to the expected type,</em>
-<a class="jxr_linenumber" name="L294" href="#L294">294</a> <em class="jxr_javadoccomment">	 *         or empty if not found, not a class, or not assignable to the expected type.</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> 	@SuppressWarnings({ <span class="jxr_string">"unchecked"</span>, <span class="jxr_string">"hiding"</span> })
-<a class="jxr_linenumber" name="L297" href="#L297">297</a> 	<strong class="jxr_keyword">public</strong> &lt;T&gt; Optional&lt;Class&lt;? <strong class="jxr_keyword">extends</strong> T&gt;&gt; getClassValue(String methodName, Class&lt;T&gt; type) {
-<a class="jxr_linenumber" name="L298" href="#L298">298</a> 		<em class="jxr_comment">// @formatter:off</em>
-<a class="jxr_linenumber" name="L299" href="#L299">299</a> 		<strong class="jxr_keyword">return</strong> getMethod(methodName)
-<a class="jxr_linenumber" name="L300" href="#L300">300</a> 			.filter(x -&gt; x.hasReturnType(Class.<strong class="jxr_keyword">class</strong>))
-<a class="jxr_linenumber" name="L301" href="#L301">301</a> 			.map(x -&gt; (Class&lt;?&gt;)x.invoke(a))
-<a class="jxr_linenumber" name="L302" href="#L302">302</a> 			.filter(type::isAssignableFrom)
-<a class="jxr_linenumber" name="L303" href="#L303">303</a> 			.map(x -&gt; (Class&lt;? <strong class="jxr_keyword">extends</strong> T&gt;)x);
-<a class="jxr_linenumber" name="L304" href="#L304">304</a> 		<em class="jxr_comment">// @formatter:on</em>
-<a class="jxr_linenumber" name="L305" href="#L305">305</a> 	}
-<a class="jxr_linenumber" name="L306" href="#L306">306</a> 
-<a class="jxr_linenumber" name="L307" href="#L307">307</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L308" href="#L308">308</a> 	<em class="jxr_comment">// Annotation interface methods</em>
-<a class="jxr_linenumber" name="L309" href="#L309">309</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L310" href="#L310">310</a> 
-<a class="jxr_linenumber" name="L311" href="#L311">311</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L312" href="#L312">312</a> <em class="jxr_javadoccomment">	 * Returns the value of the specified method on this annotation as a double.</em>
-<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">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L315" href="#L315">315</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L316" href="#L316">316</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// For annotation: @MyAnnotation(threshold=0.95)&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L317" href="#L317">317</a> <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;MyAnnotation&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; = ...;</em>
-<a class="jxr_linenumber" name="L318" href="#L318">318</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;double&lt;/jk&gt; &lt;jv&gt;threshold&lt;/jv&gt; = &lt;jv&gt;ai&lt;/jv&gt;.getDouble(&lt;js&gt;"threshold"&lt;/js&gt;).orElse(0.0);  &lt;jc&gt;// Returns 0.95&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L319" href="#L319">319</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L320" href="#L320">320</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L321" href="#L321">321</a> <em class="jxr_javadoccomment">	 * @param methodName The method name.</em>
-<a class="jxr_linenumber" name="L322" href="#L322">322</a> <em class="jxr_javadoccomment">	 * @return An {@link Optional} containing the value as a double, or empty if not found or not a {@code double} type.</em>
-<a class="jxr_linenumber" name="L323" href="#L323">323</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L324" href="#L324">324</a> 	<strong class="jxr_keyword">public</strong> Optional&lt;Double&gt; getDouble(String methodName) {
-<a class="jxr_linenumber" name="L325" href="#L325">325</a> 		<strong class="jxr_keyword">return</strong> getMethod(methodName).filter(x -&gt; x.hasReturnType(<strong class="jxr_keyword">double</strong>.<strong class="jxr_keyword">class</strong>)).map(x -&gt; (Double)x.invoke(a));
-<a class="jxr_linenumber" name="L326" href="#L326">326</a> 	}
-<a class="jxr_linenumber" name="L327" href="#L327">327</a> 
-<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">	 * Returns the value of the specified method on this annotation as a float.</em>
-<a class="jxr_linenumber" name="L330" href="#L330">330</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L331" href="#L331">331</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L332" href="#L332">332</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L333" href="#L333">333</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// For annotation: @MyAnnotation(weight=0.5f)&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L334" href="#L334">334</a> <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;MyAnnotation&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; = ...;</em>
-<a class="jxr_linenumber" name="L335" href="#L335">335</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;float&lt;/jk&gt; &lt;jv&gt;weight&lt;/jv&gt; = &lt;jv&gt;ai&lt;/jv&gt;.getFloat(&lt;js&gt;"weight"&lt;/js&gt;).orElse(0.0f);  &lt;jc&gt;// Returns 0.5f&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L336" href="#L336">336</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</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> <em class="jxr_javadoccomment">	 * @param methodName The method name.</em>
-<a class="jxr_linenumber" name="L339" href="#L339">339</a> <em class="jxr_javadoccomment">	 * @return An {@link Optional} containing the value as a float, or empty if not found or not a {@code float} type.</em>
-<a class="jxr_linenumber" name="L340" href="#L340">340</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L341" href="#L341">341</a> 	<strong class="jxr_keyword">public</strong> Optional&lt;Float&gt; getFloat(String methodName) {
-<a class="jxr_linenumber" name="L342" href="#L342">342</a> 		<strong class="jxr_keyword">return</strong> getMethod(methodName).filter(x -&gt; x.hasReturnType(<strong class="jxr_keyword">float</strong>.<strong class="jxr_keyword">class</strong>)).map(x -&gt; (Float)x.invoke(a));
-<a class="jxr_linenumber" name="L343" href="#L343">343</a> 	}
-<a class="jxr_linenumber" name="L344" href="#L344">344</a> 
-<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">	 * Returns the value of the specified method on this annotation as an integer.</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> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L349" href="#L349">349</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L350" href="#L350">350</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// For annotation: @MyAnnotation(priority=5)&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L351" href="#L351">351</a> <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;MyAnnotation&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; = ...;</em>
-<a class="jxr_linenumber" name="L352" href="#L352">352</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;int&lt;/jk&gt; &lt;jv&gt;priority&lt;/jv&gt; = &lt;jv&gt;ai&lt;/jv&gt;.getInt(&lt;js&gt;"priority"&lt;/js&gt;).orElse(0);  &lt;jc&gt;// Returns 5&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L353" href="#L353">353</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</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 methodName The method name.</em>
-<a class="jxr_linenumber" name="L356" href="#L356">356</a> <em class="jxr_javadoccomment">	 * @return An {@link Optional} containing the value as an integer, or empty if not found or not an {@code int} type.</em>
-<a class="jxr_linenumber" name="L357" href="#L357">357</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L358" href="#L358">358</a> 	<strong class="jxr_keyword">public</strong> Optional&lt;Integer&gt; getInt(String methodName) {
-<a class="jxr_linenumber" name="L359" href="#L359">359</a> 		<strong class="jxr_keyword">return</strong> getMethod(methodName).filter(x -&gt; x.hasReturnType(<strong class="jxr_keyword">int</strong>.<strong class="jxr_keyword">class</strong>)).map(x -&gt; (Integer)x.invoke(a));
-<a class="jxr_linenumber" name="L360" href="#L360">360</a> 	}
-<a class="jxr_linenumber" name="L361" href="#L361">361</a> 
-<a class="jxr_linenumber" name="L362" href="#L362">362</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L363" href="#L363">363</a> <em class="jxr_javadoccomment">	 * Returns the value of the specified method on this annotation as a long.</em>
-<a class="jxr_linenumber" name="L364" href="#L364">364</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L365" href="#L365">365</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L366" href="#L366">366</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L367" href="#L367">367</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// For annotation: @MyAnnotation(timestamp=1234567890L)&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L368" href="#L368">368</a> <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;MyAnnotation&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; = ...;</em>
-<a class="jxr_linenumber" name="L369" href="#L369">369</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;long&lt;/jk&gt; &lt;jv&gt;timestamp&lt;/jv&gt; = &lt;jv&gt;ai&lt;/jv&gt;.getLong(&lt;js&gt;"timestamp"&lt;/js&gt;).orElse(0L);  &lt;jc&gt;// Returns 1234567890L&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L370" href="#L370">370</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
-<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">	 * @param methodName The method name.</em>
-<a class="jxr_linenumber" name="L373" href="#L373">373</a> <em class="jxr_javadoccomment">	 * @return An {@link Optional} containing the value as a long, or empty if not found or not a {@code long} type.</em>
-<a class="jxr_linenumber" name="L374" href="#L374">374</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L375" href="#L375">375</a> 	<strong class="jxr_keyword">public</strong> Optional&lt;Long&gt; getLong(String methodName) {
-<a class="jxr_linenumber" name="L376" href="#L376">376</a> 		<strong class="jxr_keyword">return</strong> getMethod(methodName).filter(x -&gt; x.hasReturnType(<strong class="jxr_keyword">long</strong>.<strong class="jxr_keyword">class</strong>)).map(x -&gt; (Long)x.invoke(a));
-<a class="jxr_linenumber" name="L377" href="#L377">377</a> 	}
-<a class="jxr_linenumber" name="L378" href="#L378">378</a> 
-<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">	 * Returns the method with the specified name on this annotation.</em>
-<a class="jxr_linenumber" name="L381" href="#L381">381</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L382" href="#L382">382</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L383" href="#L383">383</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L384" href="#L384">384</a> <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;MyAnnotation&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; = ...;</em>
-<a class="jxr_linenumber" name="L385" href="#L385">385</a> <em class="jxr_javadoccomment">	 * 	Optional&amp;lt;MethodInfo&amp;gt; &lt;jv&gt;method&lt;/jv&gt; = &lt;jv&gt;ai&lt;/jv&gt;.getMethod(&lt;js&gt;"value"&lt;/js&gt;);</em>
-<a class="jxr_linenumber" name="L386" href="#L386">386</a> <em class="jxr_javadoccomment">	 * 	&lt;jv&gt;method&lt;/jv&gt;.ifPresent(&lt;jv&gt;m&lt;/jv&gt; -&amp;gt; System.&lt;jsf&gt;out&lt;/jsf&gt;.println(&lt;jv&gt;m&lt;/jv&gt;.getReturnType()));</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">	 *</em>
-<a class="jxr_linenumber" name="L389" href="#L389">389</a> <em class="jxr_javadoccomment">	 * @param methodName The method name to look for.</em>
-<a class="jxr_linenumber" name="L390" href="#L390">390</a> <em class="jxr_javadoccomment">	 * @return An {@link Optional} containing the method info, or empty if method not found.</em>
-<a class="jxr_linenumber" name="L391" href="#L391">391</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L392" href="#L392">392</a> 	<strong class="jxr_keyword">public</strong> Optional&lt;MethodInfo&gt; getMethod(String methodName) {
-<a class="jxr_linenumber" name="L393" href="#L393">393</a> 		<strong class="jxr_keyword">return</strong> methods.get().stream().filter(x -&gt; eq(methodName, x.getSimpleName())).findFirst();
-<a class="jxr_linenumber" name="L394" href="#L394">394</a> 	}
-<a class="jxr_linenumber" name="L395" href="#L395">395</a> 
-<a class="jxr_linenumber" name="L396" href="#L396">396</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L397" href="#L397">397</a> 	<em class="jxr_comment">// Private helper methods</em>
-<a class="jxr_linenumber" name="L398" href="#L398">398</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L399" href="#L399">399</a> 
-<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">	 * Returns the simple class name of this annotation.</em>
-<a class="jxr_linenumber" name="L402" href="#L402">402</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L403" href="#L403">403</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L404" href="#L404">404</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L405" href="#L405">405</a> <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;MyAnnotation&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; = ...;</em>
-<a class="jxr_linenumber" name="L406" href="#L406">406</a> <em class="jxr_javadoccomment">	 * 	String &lt;jv&gt;name&lt;/jv&gt; = &lt;jv&gt;ai&lt;/jv&gt;.getName();  &lt;jc&gt;// Returns "MyAnnotation"&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L407" href="#L407">407</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L408" href="#L408">408</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L409" href="#L409">409</a> <em class="jxr_javadoccomment">	 * @return The simple class name of the annotation (e.g., {@code "Override"} for {@code @Override}).</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> 	<strong class="jxr_keyword">public</strong> String getName() { <strong class="jxr_keyword">return</strong> cns(a.annotationType()); }
-<a class="jxr_linenumber" name="L412" href="#L412">412</a> 
-<a class="jxr_linenumber" name="L413" href="#L413">413</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L414" href="#L414">414</a> <em class="jxr_javadoccomment">	 * Returns the rank of this annotation for sorting by precedence.</em>
-<a class="jxr_linenumber" name="L415" href="#L415">415</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L416" href="#L416">416</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L417" href="#L417">417</a> <em class="jxr_javadoccomment">	 * The rank is determined by checking if the annotation has a {@code rank()} method that returns an {@code int}.</em>
-<a class="jxr_linenumber" name="L418" href="#L418">418</a> <em class="jxr_javadoccomment">	 * If found, that value is used; otherwise the rank defaults to {@code 0}.</em>
-<a class="jxr_linenumber" name="L419" href="#L419">419</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L420" href="#L420">420</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L421" href="#L421">421</a> <em class="jxr_javadoccomment">	 * Higher rank values indicate higher precedence when multiple annotations of the same type are present.</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">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L424" href="#L424">424</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L425" href="#L425">425</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Annotation with rank method&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L426" href="#L426">426</a> <em class="jxr_javadoccomment">	 * 	&lt;ja&gt;@interface&lt;/ja&gt; MyAnnotation {</em>
-<a class="jxr_linenumber" name="L427" href="#L427">427</a> <em class="jxr_javadoccomment">	 * 		&lt;jk&gt;int&lt;/jk&gt; rank() &lt;jk&gt;default&lt;/jk&gt; 0;</em>
-<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">	 *</em>
-<a class="jxr_linenumber" name="L430" href="#L430">430</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Get rank from annotation info&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L431" href="#L431">431</a> <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;MyAnnotation&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; = ...;</em>
-<a class="jxr_linenumber" name="L432" href="#L432">432</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;int&lt;/jk&gt; &lt;jv&gt;rank&lt;/jv&gt; = &lt;jv&gt;ai&lt;/jv&gt;.getRank();  &lt;jc&gt;// Returns value from rank() method&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L433" href="#L433">433</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L434" href="#L434">434</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L435" href="#L435">435</a> <em class="jxr_javadoccomment">	 * @return The rank of this annotation, or {@code 0} if no rank method exists.</em>
-<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> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> getRank() { <strong class="jxr_keyword">return</strong> rank; }
-<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">	 * Returns the return type of the specified method on this annotation.</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;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L443" href="#L443">443</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L444" href="#L444">444</a> <em class="jxr_javadoccomment">	 * 	Optional&amp;lt;ClassInfo&amp;gt; &lt;jv&gt;returnType&lt;/jv&gt; = &lt;jv&gt;annotationInfo&lt;/jv&gt;.getReturnType(&lt;js&gt;"value"&lt;/js&gt;);</em>
-<a class="jxr_linenumber" name="L445" href="#L445">445</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
-<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">	 * @param methodName The method name.</em>
-<a class="jxr_linenumber" name="L448" href="#L448">448</a> <em class="jxr_javadoccomment">	 * @return An optional containing the return type of the specified method, or empty if method not found.</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> 	<strong class="jxr_keyword">public</strong> Optional&lt;ClassInfo&gt; getReturnType(String methodName) {
-<a class="jxr_linenumber" name="L451" href="#L451">451</a> 		<strong class="jxr_keyword">return</strong> getMethod(methodName).map(x -&gt; x.getReturnType());
-<a class="jxr_linenumber" name="L452" href="#L452">452</a> 	}
-<a class="jxr_linenumber" name="L453" href="#L453">453</a> 
-<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> <em class="jxr_javadoccomment">	 * Returns the value of the specified method on this annotation as a string.</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">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L458" href="#L458">458</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L459" href="#L459">459</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// For annotation: @MyAnnotation(name="John", age=30)&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L460" href="#L460">460</a> <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;MyAnnotation&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; = ...;</em>
-<a class="jxr_linenumber" name="L461" href="#L461">461</a> <em class="jxr_javadoccomment">	 * 	String &lt;jv&gt;name&lt;/jv&gt; = &lt;jv&gt;ai&lt;/jv&gt;.getString(&lt;js&gt;"name"&lt;/js&gt;).orElse(&lt;js&gt;"unknown"&lt;/js&gt;);  &lt;jc&gt;// Returns "John"&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L462" href="#L462">462</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L463" href="#L463">463</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L464" href="#L464">464</a> <em class="jxr_javadoccomment">	 * @param methodName The method name.</em>
-<a class="jxr_linenumber" name="L465" href="#L465">465</a> <em class="jxr_javadoccomment">	 * @return An {@link Optional} containing the value as a string, or empty if not found or not a string type.</em>
-<a class="jxr_linenumber" name="L466" href="#L466">466</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L467" href="#L467">467</a> 	<strong class="jxr_keyword">public</strong> Optional&lt;String&gt; getString(String methodName) {
-<a class="jxr_linenumber" name="L468" href="#L468">468</a> 		<strong class="jxr_keyword">return</strong> getMethod(methodName).filter(x -&gt; x.hasReturnType(String.<strong class="jxr_keyword">class</strong>)).map(x -&gt; s(x.invoke(a)));
-<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> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L472" href="#L472">472</a> <em class="jxr_javadoccomment">	 * Returns the value of the specified method on this annotation as a string array.</em>
-<a class="jxr_linenumber" name="L473" href="#L473">473</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L474" href="#L474">474</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L475" href="#L475">475</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L476" href="#L476">476</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// For annotation: @MyAnnotation(tags={"foo", "bar"})&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L477" href="#L477">477</a> <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;MyAnnotation&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; = ...;</em>
-<a class="jxr_linenumber" name="L478" href="#L478">478</a> <em class="jxr_javadoccomment">	 * 	String[] &lt;jv&gt;tags&lt;/jv&gt; = &lt;jv&gt;ai&lt;/jv&gt;.getStringArray(&lt;js&gt;"tags"&lt;/js&gt;).orElse(&lt;jk&gt;new&lt;/jk&gt; String[0]);  &lt;jc&gt;// Returns ["foo", "bar"]&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L479" href="#L479">479</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L480" href="#L480">480</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L481" href="#L481">481</a> <em class="jxr_javadoccomment">	 * @param methodName The method name.</em>
-<a class="jxr_linenumber" name="L482" href="#L482">482</a> <em class="jxr_javadoccomment">	 * @return An {@link Optional} containing the string array value, or empty if not found or not a {@code String[]} type.</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> 	<strong class="jxr_keyword">public</strong> Optional&lt;String[]&gt; getStringArray(String methodName) {
-<a class="jxr_linenumber" name="L485" href="#L485">485</a> 		<strong class="jxr_keyword">return</strong> getMethod(methodName).filter(x -&gt; x.hasReturnType(String[].<strong class="jxr_keyword">class</strong>)).map(x -&gt; (String[])x.invoke(a));
-<a class="jxr_linenumber" name="L486" href="#L486">486</a> 	}
-<a class="jxr_linenumber" name="L487" href="#L487">487</a> 
-<a class="jxr_linenumber" name="L488" href="#L488">488</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L489" href="#L489">489</a> <em class="jxr_javadoccomment">	 * Returns the value of the {@code value()} method on this annotation as a string.</em>
-<a class="jxr_linenumber" name="L490" href="#L490">490</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L491" href="#L491">491</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L492" href="#L492">492</a> <em class="jxr_javadoccomment">	 * This is a convenience method equivalent to calling {@link #getString(String) getString("value")}.</em>
-<a class="jxr_linenumber" name="L493" href="#L493">493</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L494" href="#L494">494</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L495" href="#L495">495</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L496" href="#L496">496</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// For annotation: @MyAnnotation("foo")&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L497" href="#L497">497</a> <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;MyAnnotation&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; = ...;</em>
-<a class="jxr_linenumber" name="L498" href="#L498">498</a> <em class="jxr_javadoccomment">	 * 	String &lt;jv&gt;value&lt;/jv&gt; = &lt;jv&gt;ai&lt;/jv&gt;.getValue().orElse(&lt;js&gt;"default"&lt;/js&gt;);  &lt;jc&gt;// Returns "foo"&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L499" href="#L499">499</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L500" href="#L500">500</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L501" href="#L501">501</a> <em class="jxr_javadoccomment">	 * @return An {@link Optional} containing the value of the {@code value()} method, or empty if not found or not a string.</em>
-<a class="jxr_linenumber" name="L502" href="#L502">502</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L503" href="#L503">503</a> 	<strong class="jxr_keyword">public</strong> Optional&lt;String&gt; getValue() { <strong class="jxr_keyword">return</strong> getString(<span class="jxr_string">"value"</span>); }
-<a class="jxr_linenumber" name="L504" href="#L504">504</a> 
-<a class="jxr_linenumber" name="L505" href="#L505">505</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L506" href="#L506">506</a> <em class="jxr_javadoccomment">	 * Returns the value of a specific annotation method.</em>
-<a class="jxr_linenumber" name="L507" href="#L507">507</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L508" href="#L508">508</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L509" href="#L509">509</a> <em class="jxr_javadoccomment">	 * This method provides type-safe access to annotation field values without requiring</em>
-<a class="jxr_linenumber" name="L510" href="#L510">510</a> <em class="jxr_javadoccomment">	 * explicit reflection calls or casting.</em>
-<a class="jxr_linenumber" name="L511" href="#L511">511</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L512" href="#L512">512</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L513" href="#L513">513</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L514" href="#L514">514</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// For annotation: @interface MyAnnotation { String value(); int priority(); }&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L515" href="#L515">515</a> <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;MyAnnotation&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; = ...;</em>
-<a class="jxr_linenumber" name="L516" href="#L516">516</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L517" href="#L517">517</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Get string value&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L518" href="#L518">518</a> <em class="jxr_javadoccomment">	 * 	Optional&amp;lt;String&amp;gt; &lt;jv&gt;value&lt;/jv&gt; = &lt;jv&gt;ai&lt;/jv&gt;.getValue(String.&lt;jk&gt;class&lt;/jk&gt;, &lt;js&gt;"value"&lt;/js&gt;);</em>
-<a class="jxr_linenumber" name="L519" href="#L519">519</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L520" href="#L520">520</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Get int value&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L521" href="#L521">521</a> <em class="jxr_javadoccomment">	 * 	Optional&amp;lt;Integer&amp;gt; &lt;jv&gt;priority&lt;/jv&gt; = &lt;jv&gt;ai&lt;/jv&gt;.getValue(Integer.&lt;jk&gt;class&lt;/jk&gt;, &lt;js&gt;"priority"&lt;/js&gt;);</em>
-<a class="jxr_linenumber" name="L522" href="#L522">522</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L523" href="#L523">523</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L524" href="#L524">524</a> <em class="jxr_javadoccomment">	 * @param &lt;V&gt; The expected type of the annotation field value.</em>
-<a class="jxr_linenumber" name="L525" href="#L525">525</a> <em class="jxr_javadoccomment">	 * @param type The expected class of the annotation field value.</em>
-<a class="jxr_linenumber" name="L526" href="#L526">526</a> <em class="jxr_javadoccomment">	 * @param name The name of the annotation method (field).</em>
-<a class="jxr_linenumber" name="L527" href="#L527">527</a> <em class="jxr_javadoccomment">	 * @return An {@link Optional} containing the value if found and type matches, empty otherwise.</em>
-<a class="jxr_linenumber" name="L528" href="#L528">528</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L529" href="#L529">529</a> 	@SuppressWarnings(<span class="jxr_string">"unchecked"</span>)
-<a class="jxr_linenumber" name="L530" href="#L530">530</a> 	<strong class="jxr_keyword">public</strong> &lt;V&gt; Optional&lt;V&gt; getValue(Class&lt;V&gt; type, String name) {
-<a class="jxr_linenumber" name="L531" href="#L531">531</a> 		<em class="jxr_comment">// @formatter:off</em>
-<a class="jxr_linenumber" name="L532" href="#L532">532</a> 		<strong class="jxr_keyword">return</strong> methods.get().stream()
-<a class="jxr_linenumber" name="L533" href="#L533">533</a> 			.filter(m -&gt; eq(m.getName(), name) &amp;&amp; eq(m.getReturnType().<strong class="jxr_keyword">inner</strong>(), type))
-<a class="jxr_linenumber" name="L534" href="#L534">534</a> 			.map(m -&gt; safe(() -&gt; (V)m.invoke(a)))
-<a class="jxr_linenumber" name="L535" href="#L535">535</a> 			.findFirst();
-<a class="jxr_linenumber" name="L536" href="#L536">536</a> 		<em class="jxr_comment">// @formatter:on</em>
-<a class="jxr_linenumber" name="L537" href="#L537">537</a> 	}
-<a class="jxr_linenumber" name="L538" href="#L538">538</a> 
-<a class="jxr_linenumber" name="L539" href="#L539">539</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L540" href="#L540">540</a> <em class="jxr_javadoccomment">	 * Returns &lt;jk&gt;true&lt;/jk&gt; if this annotation is itself annotated with the specified annotation.</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;p&gt;</em>
-<a class="jxr_linenumber" name="L543" href="#L543">543</a> <em class="jxr_javadoccomment">	 * This checks for meta-annotations on the annotation type.</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">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L546" href="#L546">546</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L547" href="#L547">547</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Check if @MyAnnotation is annotated with @Documented&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L548" href="#L548">548</a> <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;MyAnnotation&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; = ...;</em>
-<a class="jxr_linenumber" name="L549" href="#L549">549</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;boolean&lt;/jk&gt; &lt;jv&gt;isDocumented&lt;/jv&gt; = &lt;jv&gt;ai&lt;/jv&gt;.hasAnnotation(Documented.&lt;jk&gt;class&lt;/jk&gt;);</em>
-<a class="jxr_linenumber" name="L550" href="#L550">550</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
-<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">	 * @param &lt;A&gt; The meta-annotation type.</em>
-<a class="jxr_linenumber" name="L553" href="#L553">553</a> <em class="jxr_javadoccomment">	 * @param type The meta-annotation to test for.</em>
-<a class="jxr_linenumber" name="L554" href="#L554">554</a> <em class="jxr_javadoccomment">	 * @return &lt;jk&gt;true&lt;/jk&gt; if this annotation is annotated with the specified annotation.</em>
-<a class="jxr_linenumber" name="L555" href="#L555">555</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L556" href="#L556">556</a> 	<strong class="jxr_keyword">public</strong> &lt;A <strong class="jxr_keyword">extends</strong> Annotation&gt; <strong class="jxr_keyword">boolean</strong> hasAnnotation(Class&lt;A&gt; type) {
-<a class="jxr_linenumber" name="L557" href="#L557">557</a> 		<strong class="jxr_keyword">return</strong> nn(<strong class="jxr_keyword">this</strong>.a.annotationType().getAnnotation(type));
-<a class="jxr_linenumber" name="L558" href="#L558">558</a> 	}
-<a class="jxr_linenumber" name="L559" href="#L559">559</a> 
-<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">	 * Returns the hash code of this annotation.</em>
-<a class="jxr_linenumber" name="L562" href="#L562">562</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L563" href="#L563">563</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L564" href="#L564">564</a> <em class="jxr_javadoccomment">	 * Same as calling {@link Annotation#hashCode()} on the wrapped annotation.</em>
-<a class="jxr_linenumber" name="L565" href="#L565">565</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L566" href="#L566">566</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L567" href="#L567">567</a> <em class="jxr_javadoccomment">	 * The hash code of an annotation is the sum of the hash codes of its members (including those with default values).</em>
-<a class="jxr_linenumber" name="L568" href="#L568">568</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L569" href="#L569">569</a> <em class="jxr_javadoccomment">	 * @return The hash code of this annotation.</em>
-<a class="jxr_linenumber" name="L570" href="#L570">570</a> <em class="jxr_javadoccomment">	 * @see Annotation#hashCode()</em>
-<a class="jxr_linenumber" name="L571" href="#L571">571</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L572" href="#L572">572</a> 	@Override <em class="jxr_comment">/* Overridden from Object */</em>
-<a class="jxr_linenumber" name="L573" href="#L573">573</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> hashCode() {
-<a class="jxr_linenumber" name="L574" href="#L574">574</a> 		<strong class="jxr_keyword">return</strong> a.hashCode();
-<a class="jxr_linenumber" name="L575" href="#L575">575</a> 	}
-<a class="jxr_linenumber" name="L576" href="#L576">576</a> 
-<a class="jxr_linenumber" name="L577" href="#L577">577</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L578" href="#L578">578</a> <em class="jxr_javadoccomment">	 * Returns &lt;jk&gt;true&lt;/jk&gt; if this annotation has the specified fully-qualified name.</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> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L581" href="#L581">581</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L582" href="#L582">582</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;boolean&lt;/jk&gt; &lt;jv&gt;isName&lt;/jv&gt; = &lt;jv&gt;annotationInfo&lt;/jv&gt;.hasName(&lt;js&gt;"org.apache.juneau.annotation.Name"&lt;/js&gt;);</em>
-<a class="jxr_linenumber" name="L583" href="#L583">583</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L584" href="#L584">584</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L585" href="#L585">585</a> <em class="jxr_javadoccomment">	 * @param value The fully-qualified name to check.</em>
-<a class="jxr_linenumber" name="L586" href="#L586">586</a> <em class="jxr_javadoccomment">	 * @return &lt;jk&gt;true&lt;/jk&gt; if this annotation has the specified fully-qualified name.</em>
-<a class="jxr_linenumber" name="L587" href="#L587">587</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L588" href="#L588">588</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> hasName(String value) {
-<a class="jxr_linenumber" name="L589" href="#L589">589</a> 		<strong class="jxr_keyword">return</strong> eq(value, a.annotationType().getName());
-<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> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L593" href="#L593">593</a> <em class="jxr_javadoccomment">	 * Returns &lt;jk&gt;true&lt;/jk&gt; if this annotation has the specified simple name.</em>
-<a class="jxr_linenumber" name="L594" href="#L594">594</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L595" href="#L595">595</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L596" href="#L596">596</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L597" href="#L597">597</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;boolean&lt;/jk&gt; &lt;jv&gt;isName&lt;/jv&gt; = &lt;jv&gt;annotationInfo&lt;/jv&gt;.hasSimpleName(&lt;js&gt;"Name"&lt;/js&gt;);</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">	 *</em>
-<a class="jxr_linenumber" name="L600" href="#L600">600</a> <em class="jxr_javadoccomment">	 * @param value The simple name to check.</em>
-<a class="jxr_linenumber" name="L601" href="#L601">601</a> <em class="jxr_javadoccomment">	 * @return &lt;jk&gt;true&lt;/jk&gt; if this annotation has the specified simple name.</em>
-<a class="jxr_linenumber" name="L602" href="#L602">602</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L603" href="#L603">603</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> hasSimpleName(String value) {
-<a class="jxr_linenumber" name="L604" href="#L604">604</a> 		<strong class="jxr_keyword">return</strong> eq(value, a.annotationType().getSimpleName());
-<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> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L608" href="#L608">608</a> <em class="jxr_javadoccomment">	 * Returns the wrapped annotation instance.</em>
-<a class="jxr_linenumber" name="L609" href="#L609">609</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L610" href="#L610">610</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L611" href="#L611">611</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L612" href="#L612">612</a> <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;MyAnnotation&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; = ...;</em>
-<a class="jxr_linenumber" name="L613" href="#L613">613</a> <em class="jxr_javadoccomment">	 * 	MyAnnotation &lt;jv&gt;annotation&lt;/jv&gt; = &lt;jv&gt;ai&lt;/jv&gt;.inner();</em>
-<a class="jxr_linenumber" name="L614" href="#L614">614</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L615" href="#L615">615</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Access annotation methods directly&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L616" href="#L616">616</a> <em class="jxr_javadoccomment">	 * 	String &lt;jv&gt;value&lt;/jv&gt; = &lt;jv&gt;annotation&lt;/jv&gt;.value();</em>
-<a class="jxr_linenumber" name="L617" href="#L617">617</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L618" href="#L618">618</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L619" href="#L619">619</a> <em class="jxr_javadoccomment">	 * @return The wrapped annotation instance.</em>
-<a class="jxr_linenumber" name="L620" href="#L620">620</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L621" href="#L621">621</a> 	<strong class="jxr_keyword">public</strong> T <strong class="jxr_keyword">inner</strong>() {
-<a class="jxr_linenumber" name="L622" href="#L622">622</a> 		<strong class="jxr_keyword">return</strong> 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> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L626" href="#L626">626</a> <em class="jxr_javadoccomment">	 * Returns &lt;jk&gt;true&lt;/jk&gt; if this annotation is in the specified {@link AnnotationGroup}.</em>
-<a class="jxr_linenumber" name="L627" href="#L627">627</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L628" href="#L628">628</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L629" href="#L629">629</a> <em class="jxr_javadoccomment">	 * Annotation groups are used to logically group related annotations together.</em>
-<a class="jxr_linenumber" name="L630" href="#L630">630</a> <em class="jxr_javadoccomment">	 * This checks if the annotation is annotated with {@link AnnotationGroup} and if</em>
-<a class="jxr_linenumber" name="L631" href="#L631">631</a> <em class="jxr_javadoccomment">	 * the group value matches the specified type.</em>
-<a class="jxr_linenumber" name="L632" href="#L632">632</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L633" href="#L633">633</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L634" href="#L634">634</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L635" href="#L635">635</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Define an annotation group&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L636" href="#L636">636</a> <em class="jxr_javadoccomment">	 * 	&lt;ja&gt;@interface&lt;/ja&gt; MyGroup {}</em>
-<a class="jxr_linenumber" name="L637" href="#L637">637</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L638" href="#L638">638</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Annotation in the group&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L639" href="#L639">639</a> <em class="jxr_javadoccomment">	 * 	&lt;ja&gt;@AnnotationGroup&lt;/ja&gt;(MyGroup.&lt;jk&gt;class&lt;/jk&gt;)</em>
-<a class="jxr_linenumber" name="L640" href="#L640">640</a> <em class="jxr_javadoccomment">	 * 	&lt;ja&gt;@interface&lt;/ja&gt; MyAnnotation {}</em>
-<a class="jxr_linenumber" name="L641" href="#L641">641</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L642" href="#L642">642</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Check if annotation is in group&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L643" href="#L643">643</a> <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;MyAnnotation&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; = ...;</em>
-<a class="jxr_linenumber" name="L644" href="#L644">644</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;boolean&lt;/jk&gt; &lt;jv&gt;inGroup&lt;/jv&gt; = &lt;jv&gt;ai&lt;/jv&gt;.isInGroup(MyGroup.&lt;jk&gt;class&lt;/jk&gt;);  &lt;jc&gt;// Returns true&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 &lt;A&gt; The group annotation type.</em>
-<a class="jxr_linenumber" name="L648" href="#L648">648</a> <em class="jxr_javadoccomment">	 * @param group The group annotation class to test for.</em>
-<a class="jxr_linenumber" name="L649" href="#L649">649</a> <em class="jxr_javadoccomment">	 * @return &lt;jk&gt;true&lt;/jk&gt; if this annotation is in the specified group.</em>
-<a class="jxr_linenumber" name="L650" href="#L650">650</a> <em class="jxr_javadoccomment">	 * @see AnnotationGroup</em>
-<a class="jxr_linenumber" name="L651" href="#L651">651</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L652" href="#L652">652</a> 	<strong class="jxr_keyword">public</strong> &lt;A <strong class="jxr_keyword">extends</strong> Annotation&gt; <strong class="jxr_keyword">boolean</strong> isInGroup(Class&lt;A&gt; group) {
-<a class="jxr_linenumber" name="L653" href="#L653">653</a> 		<strong class="jxr_keyword">var</strong> x = a.annotationType().getAnnotation(AnnotationGroup.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L654" href="#L654">654</a> 		<strong class="jxr_keyword">return</strong> (nn(x) &amp;&amp; x.value().equals(group));
-<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_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L658" href="#L658">658</a> <em class="jxr_javadoccomment">	 * Returns &lt;jk&gt;true&lt;/jk&gt; if this annotation is of the specified type.</em>
-<a class="jxr_linenumber" name="L659" href="#L659">659</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L660" href="#L660">660</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L661" href="#L661">661</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L662" href="#L662">662</a> <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;?&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; = ...;</em>
-<a class="jxr_linenumber" name="L663" href="#L663">663</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L664" href="#L664">664</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;if&lt;/jk&gt; (&lt;jv&gt;ai&lt;/jv&gt;.isType(MyAnnotation.&lt;jk&gt;class&lt;/jk&gt;)) {</em>
-<a class="jxr_linenumber" name="L665" href="#L665">665</a> <em class="jxr_javadoccomment">	 * 		&lt;jc&gt;// Handle MyAnnotation specifically&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L666" href="#L666">666</a> <em class="jxr_javadoccomment">	 * 	}</em>
-<a class="jxr_linenumber" name="L667" href="#L667">667</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L668" href="#L668">668</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L669" href="#L669">669</a> <em class="jxr_javadoccomment">	 * @param &lt;A&gt; The annotation type to test for.</em>
-<a class="jxr_linenumber" name="L670" href="#L670">670</a> <em class="jxr_javadoccomment">	 * @param type The annotation type to test against.</em>
-<a class="jxr_linenumber" name="L671" href="#L671">671</a> <em class="jxr_javadoccomment">	 * @return &lt;jk&gt;true&lt;/jk&gt; if this annotation's type is exactly the specified type.</em>
-<a class="jxr_linenumber" name="L672" href="#L672">672</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L673" href="#L673">673</a> 	<strong class="jxr_keyword">public</strong> &lt;A <strong class="jxr_keyword">extends</strong> Annotation&gt; <strong class="jxr_keyword">boolean</strong> isType(Class&lt;A&gt; type) {
-<a class="jxr_linenumber" name="L674" href="#L674">674</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>.a.annotationType() == type;
-<a class="jxr_linenumber" name="L675" href="#L675">675</a> 	}
-<a class="jxr_linenumber" name="L676" href="#L676">676</a> 
-<a class="jxr_linenumber" name="L677" href="#L677">677</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L678" href="#L678">678</a> <em class="jxr_javadoccomment">	 * Converts this annotation info to a map representation for debugging purposes.</em>
-<a class="jxr_linenumber" name="L679" href="#L679">679</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L680" href="#L680">680</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L681" href="#L681">681</a> <em class="jxr_javadoccomment">	 * The returned map contains:</em>
-<a class="jxr_linenumber" name="L682" href="#L682">682</a> <em class="jxr_javadoccomment">	 * &lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L683" href="#L683">683</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;The annotatable element's type and label (e.g., {@code "CLASS_TYPE" -&gt; "com.example.MyClass"})</em>
-<a class="jxr_linenumber" name="L684" href="#L684">684</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;A nested map with the annotation's simple name as key and its non-default values</em>
-<a class="jxr_linenumber" name="L685" href="#L685">685</a> <em class="jxr_javadoccomment">	 * &lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L686" href="#L686">686</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L687" href="#L687">687</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L688" href="#L688">688</a> <em class="jxr_javadoccomment">	 * Only annotation values that differ from their default values are included.</em>
-<a class="jxr_linenumber" name="L689" href="#L689">689</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L690" href="#L690">690</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L691" href="#L691">691</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L692" href="#L692">692</a> <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;MyAnnotation&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; = ...;</em>
-<a class="jxr_linenumber" name="L693" href="#L693">693</a> <em class="jxr_javadoccomment">	 * 	LinkedHashMap&amp;lt;String,Object&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = &lt;jv&gt;ai&lt;/jv&gt;.toMap();</em>
-<a class="jxr_linenumber" name="L694" href="#L694">694</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Returns: {"CLASS_TYPE": "MyClass", "@MyAnnotation": {"value": "foo", "priority": 5}}&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L695" href="#L695">695</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L696" href="#L696">696</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L697" href="#L697">697</a> <em class="jxr_javadoccomment">	 * @return A new map showing the attributes of this annotation info.</em>
-<a class="jxr_linenumber" name="L698" href="#L698">698</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L699" href="#L699">699</a> 	<strong class="jxr_keyword">public</strong> LinkedHashMap&lt;String,Object&gt; toMap() {
-<a class="jxr_linenumber" name="L700" href="#L700">700</a> 		<strong class="jxr_keyword">var</strong> jm = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String,Object&gt;();
-<a class="jxr_linenumber" name="L701" href="#L701">701</a> 		jm.put(s(annotatable.getAnnotatableType()), annotatable.getLabel());
-<a class="jxr_linenumber" name="L702" href="#L702">702</a> 		<strong class="jxr_keyword">var</strong> ja = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String,Object&gt;();
-<a class="jxr_linenumber" name="L703" href="#L703">703</a> 		<strong class="jxr_keyword">var</strong> ca = info(a.annotationType());
+<a class="jxr_linenumber" name="L30" href="#L30">30</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.commons.collections.*;
+<a class="jxr_linenumber" name="L31" href="#L31">31</a>  
+<a class="jxr_linenumber" name="L32" href="#L32">32</a>  <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L33" href="#L33">33</a>  <em class="jxr_javadoccomment"> * Encapsulates information about an annotation instance and the element it's declared on.</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"> * This class provides a convenient wrapper around Java annotations that allows you to:</em>
+<a class="jxr_linenumber" name="L37" href="#L37">37</a>  <em class="jxr_javadoccomment"> * &lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L38" href="#L38">38</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;Access annotation values in a type-safe manner</em>
+<a class="jxr_linenumber" name="L39" href="#L39">39</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;Query annotation properties without reflection boilerplate</em>
+<a class="jxr_linenumber" name="L40" href="#L40">40</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;Track where the annotation was found (class, method, field, etc.)</em>
+<a class="jxr_linenumber" name="L41" href="#L41">41</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;Sort annotations by precedence using ranks</em>
+<a class="jxr_linenumber" name="L42" href="#L42">42</a>  <em class="jxr_javadoccomment"> * &lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L43" href="#L43">43</a>  <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L44" href="#L44">44</a>  <em class="jxr_javadoccomment"> * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L45" href="#L45">45</a>  <em class="jxr_javadoccomment"> * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L46" href="#L46">46</a>  <em class="jxr_javadoccomment"> * 	&lt;jc&gt;// Get annotation info from a class&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L47" href="#L47">47</a>  <em class="jxr_javadoccomment"> * 	ClassInfo &lt;jv&gt;ci&lt;/jv&gt; = ClassInfo.&lt;jsm&gt;of&lt;/jsm&gt;(MyClass.&lt;jk&gt;class&lt;/jk&gt;);</em>
+<a class="jxr_linenumber" name="L48" href="#L48">48</a>  <em class="jxr_javadoccomment"> * 	Optional&amp;lt;AnnotationInfo&amp;lt;MyAnnotation&amp;gt;&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; =</em>
+<a class="jxr_linenumber" name="L49" href="#L49">49</a>  <em class="jxr_javadoccomment"> * 		&lt;jv&gt;ci&lt;/jv&gt;.getAnnotations(MyAnnotation.&lt;jk&gt;class&lt;/jk&gt;).findFirst();</em>
+<a class="jxr_linenumber" name="L50" href="#L50">50</a>  <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L51" href="#L51">51</a>  <em class="jxr_javadoccomment"> * 	&lt;jc&gt;// Access annotation values&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L52" href="#L52">52</a>  <em class="jxr_javadoccomment"> * 	&lt;jv&gt;ai&lt;/jv&gt;.ifPresent(&lt;jv&gt;x&lt;/jv&gt; -&amp;gt; {</em>
+<a class="jxr_linenumber" name="L53" href="#L53">53</a>  <em class="jxr_javadoccomment"> * 		String &lt;jv&gt;value&lt;/jv&gt; = &lt;jv&gt;x&lt;/jv&gt;.getValue(String.&lt;jk&gt;class&lt;/jk&gt;, &lt;js&gt;"value"&lt;/js&gt;).orElse(&lt;js&gt;"default"&lt;/js&gt;);</em>
+<a class="jxr_linenumber" name="L54" href="#L54">54</a>  <em class="jxr_javadoccomment"> * 		&lt;jk&gt;int&lt;/jk&gt; &lt;jv&gt;priority&lt;/jv&gt; = &lt;jv&gt;x&lt;/jv&gt;.getInt(&lt;js&gt;"priority"&lt;/js&gt;).orElse(0);</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;/p&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;h5 class='section'&gt;See Also:&lt;/h5&gt;&lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L59" href="#L59">59</a>  <em class="jxr_javadoccomment"> * 	&lt;li class='jc'&gt;{@link ClassInfo}</em>
+<a class="jxr_linenumber" name="L60" href="#L60">60</a>  <em class="jxr_javadoccomment"> * 	&lt;li class='jc'&gt;{@link MethodInfo}</em>
+<a class="jxr_linenumber" name="L61" href="#L61">61</a>  <em class="jxr_javadoccomment"> * 	&lt;li class='jc'&gt;{@link FieldInfo}</em>
+<a class="jxr_linenumber" name="L62" href="#L62">62</a>  <em class="jxr_javadoccomment"> * 	&lt;li class='jc'&gt;{@link ConstructorInfo}</em>
+<a class="jxr_linenumber" name="L63" href="#L63">63</a>  <em class="jxr_javadoccomment"> * 	&lt;li class='jc'&gt;{@link ParameterInfo}</em>
+<a class="jxr_linenumber" name="L64" href="#L64">64</a>  <em class="jxr_javadoccomment"> * 	&lt;li class='jc'&gt;{@link PackageInfo}</em>
+<a class="jxr_linenumber" name="L65" href="#L65">65</a>  <em class="jxr_javadoccomment"> * &lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L66" href="#L66">66</a>  <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L67" href="#L67">67</a>  <em class="jxr_javadoccomment"> * @param &lt;T&gt; The annotation type.</em>
+<a class="jxr_linenumber" name="L68" href="#L68">68</a>  <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L69" href="#L69">69</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> AnnotationInfo&lt;T <strong class="jxr_keyword">extends</strong> Annotation&gt; {
+<a class="jxr_linenumber" name="L70" href="#L70">70</a>  
+<a class="jxr_linenumber" name="L71" href="#L71">71</a>  	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L72" href="#L72">72</a>  <em class="jxr_javadoccomment">	 * Creates a new annotation info object.</em>
+<a class="jxr_linenumber" name="L73" href="#L73">73</a>  <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L74" href="#L74">74</a>  <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L75" href="#L75">75</a>  <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L76" href="#L76">76</a>  <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Create annotation info for a class annotation&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L77" href="#L77">77</a>  <em class="jxr_javadoccomment">	 * 	ClassInfo &lt;jv&gt;ci&lt;/jv&gt; = ClassInfo.&lt;jsm&gt;of&lt;/jsm&gt;(MyClass.&lt;jk&gt;class&lt;/jk&gt;);</em>
+<a class="jxr_linenumber" name="L78" href="#L78">78</a>  <em class="jxr_javadoccomment">	 * 	MyAnnotation &lt;jv&gt;annotation&lt;/jv&gt; = &lt;jv&gt;ci&lt;/jv&gt;.inner().getAnnotation(MyAnnotation.&lt;jk&gt;class&lt;/jk&gt;);</em>
+<a class="jxr_linenumber" name="L79" href="#L79">79</a>  <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;MyAnnotation&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; = AnnotationInfo.&lt;jsm&gt;of&lt;/jsm&gt;(&lt;jv&gt;ci&lt;/jv&gt;, &lt;jv&gt;annotation&lt;/jv&gt;);</em>
+<a class="jxr_linenumber" name="L80" href="#L80">80</a>  <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L81" href="#L81">81</a>  <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L82" href="#L82">82</a>  <em class="jxr_javadoccomment">	 * @param &lt;A&gt; The annotation type.</em>
+<a class="jxr_linenumber" name="L83" href="#L83">83</a>  <em class="jxr_javadoccomment">	 * @param on The annotatable object where the annotation was found (class, method, field, constructor, parameter, or package).</em>
+<a class="jxr_linenumber" name="L84" href="#L84">84</a>  <em class="jxr_javadoccomment">	 * @param value The annotation instance. Must not be &lt;jk&gt;null&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L85" href="#L85">85</a>  <em class="jxr_javadoccomment">	 * @return A new {@link AnnotationInfo} object wrapping the annotation.</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>  	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;A <strong class="jxr_keyword">extends</strong> Annotation&gt; AnnotationInfo&lt;A&gt; of(<a name="Annotatable" href="../../../../../org/apache/juneau/commons/reflect/Annotatable.html#Annotatable">Annotatable</a> on, A value) {
+<a class="jxr_linenumber" name="L88" href="#L88">88</a>  		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> AnnotationInfo&lt;&gt;(on, value);
+<a class="jxr_linenumber" name="L89" href="#L89">89</a>  	}
+<a class="jxr_linenumber" name="L90" href="#L90">90</a>  
+<a class="jxr_linenumber" name="L91" href="#L91">91</a>  	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">int</strong> findRank(Object a) {
+<a class="jxr_linenumber" name="L92" href="#L92">92</a>  		<em class="jxr_comment">// @formatter:off</em>
+<a class="jxr_linenumber" name="L93" href="#L93">93</a>  		<strong class="jxr_keyword">return</strong> ClassInfo.of(a).getAllMethods().stream()
+<a class="jxr_linenumber" name="L94" href="#L94">94</a>  			.filter(m -&gt; m.hasName(<span class="jxr_string">"rank"</span>) &amp;&amp; m.hasReturnType(<strong class="jxr_keyword">int</strong>.<strong class="jxr_keyword">class</strong>))
+<a class="jxr_linenumber" name="L95" href="#L95">95</a>  			.findFirst()
+<a class="jxr_linenumber" name="L96" href="#L96">96</a>  			.map(m -&gt; safe(() -&gt; (<strong class="jxr_keyword">int</strong>)m.invoke(a)))
+<a class="jxr_linenumber" name="L97" href="#L97">97</a>  			.orElse(0);
+<a class="jxr_linenumber" name="L98" href="#L98">98</a>  		<em class="jxr_comment">// @formatter:on</em>
+<a class="jxr_linenumber" name="L99" href="#L99">99</a>  	}
+<a class="jxr_linenumber" name="L100" href="#L100">100</a> 
+<a class="jxr_linenumber" name="L101" href="#L101">101</a> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a name="Annotatable" href="../../../../../org/apache/juneau/commons/reflect/Annotatable.html#Annotatable">Annotatable</a> annotatable;
+<a class="jxr_linenumber" name="L102" href="#L102">102</a> 	<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> rank;
+<a class="jxr_linenumber" name="L103" href="#L103">103</a> 
+<a class="jxr_linenumber" name="L104" href="#L104">104</a> 	<strong class="jxr_keyword">private</strong> T a;  <em class="jxr_comment">// Effectively final</em>
+<a class="jxr_linenumber" name="L105" href="#L105">105</a> 
+<a class="jxr_linenumber" name="L106" href="#L106">106</a> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Supplier&lt;List&lt;MethodInfo&gt;&gt; methods = memoize(() -&gt; stream(a.annotationType().getMethods()).map(m -&gt; MethodInfo.of(info(a.annotationType()), m)).toList());
+<a class="jxr_linenumber" name="L107" href="#L107">107</a> 
+<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">	 * Constructor.</em>
+<a class="jxr_linenumber" name="L110" href="#L110">110</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L111" href="#L111">111</a> <em class="jxr_javadoccomment">	 * @param on The annotatable object where the annotation was found.</em>
+<a class="jxr_linenumber" name="L112" href="#L112">112</a> <em class="jxr_javadoccomment">	 * @param a The annotation instance.</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> 	AnnotationInfo(<a name="Annotatable" href="../../../../../org/apache/juneau/commons/reflect/Annotatable.html#Annotatable">Annotatable</a> on, T a) {
+<a class="jxr_linenumber" name="L115" href="#L115">115</a> 		<strong class="jxr_keyword">this</strong>.annotatable = on;  <em class="jxr_comment">// TODO - Shouldn't allow null.</em>
+<a class="jxr_linenumber" name="L116" href="#L116">116</a> 		<strong class="jxr_keyword">this</strong>.a = assertArgNotNull(<span class="jxr_string">"a"</span>, a);
+<a class="jxr_linenumber" name="L117" href="#L117">117</a> 		<strong class="jxr_keyword">this</strong>.rank = findRank(a);
+<a class="jxr_linenumber" name="L118" href="#L118">118</a> 	}
+<a class="jxr_linenumber" name="L119" href="#L119">119</a> 
+<a class="jxr_linenumber" name="L120" href="#L120">120</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L121" href="#L121">121</a> <em class="jxr_javadoccomment">	 * Returns the annotation type of this annotation.</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> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L124" href="#L124">124</a> <em class="jxr_javadoccomment">	 * Same as calling {@link Annotation#annotationType()}.</em>
+<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">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L127" href="#L127">127</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L128" href="#L128">128</a> <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;Deprecated&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; = ClassInfo.&lt;jsm&gt;of&lt;/jsm&gt;(MyClass.&lt;jk&gt;class&lt;/jk&gt;).getAnnotation(Deprecated.&lt;jk&gt;class&lt;/jk&gt;);</em>
+<a class="jxr_linenumber" name="L129" href="#L129">129</a> <em class="jxr_javadoccomment">	 * 	Class&amp;lt;? &lt;jk&gt;extends&lt;/jk&gt; Annotation&amp;gt; &lt;jv&gt;type&lt;/jv&gt; = &lt;jv&gt;ai&lt;/jv&gt;.annotationType();  &lt;jc&gt;// Returns Deprecated.class&lt;/jc&gt;</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">	 *</em>
+<a class="jxr_linenumber" name="L132" href="#L132">132</a> <em class="jxr_javadoccomment">	 * @return The annotation type of this annotation.</em>
+<a class="jxr_linenumber" name="L133" href="#L133">133</a> <em class="jxr_javadoccomment">	 * @see Annotation#annotationType()</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> 	<strong class="jxr_keyword">public</strong> Class&lt;? <strong class="jxr_keyword">extends</strong> Annotation&gt; annotationType() {
+<a class="jxr_linenumber" name="L136" href="#L136">136</a> 		<strong class="jxr_keyword">return</strong> a.annotationType();
+<a class="jxr_linenumber" name="L137" href="#L137">137</a> 	}
+<a class="jxr_linenumber" name="L138" href="#L138">138</a> 
+<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">	 * Casts this annotation info to a specific annotation type.</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> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L143" href="#L143">143</a> <em class="jxr_javadoccomment">	 * This is useful when you have an {@code AnnotationInfo&lt;?&gt;} and need to narrow it to a specific type.</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">	 * 	AnnotationInfo&amp;lt;?&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; = ...;</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;// Safe cast&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L150" href="#L150">150</a> <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;MyAnnotation&amp;gt; &lt;jv&gt;myAi&lt;/jv&gt; = &lt;jv&gt;ai&lt;/jv&gt;.cast(MyAnnotation.&lt;jk&gt;class&lt;/jk&gt;);</em>
+<a class="jxr_linenumber" name="L151" href="#L151">151</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;if&lt;/jk&gt; (&lt;jv&gt;myAi&lt;/jv&gt; != &lt;jk&gt;null&lt;/jk&gt;) {</em>
+<a class="jxr_linenumber" name="L152" href="#L152">152</a> <em class="jxr_javadoccomment">	 * 		&lt;jc&gt;// Use strongly-typed annotation info&lt;/jc&gt;</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;/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 &lt;A&gt; The annotation type to cast to.</em>
+<a class="jxr_linenumber" name="L157" href="#L157">157</a> <em class="jxr_javadoccomment">	 * @param type The annotation type to cast to.</em>
+<a class="jxr_linenumber" name="L158" href="#L158">158</a> <em class="jxr_javadoccomment">	 * @return This annotation info cast to the specified type, or &lt;jk&gt;null&lt;/jk&gt; if the annotation is not of the specified type.</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> 	@SuppressWarnings(<span class="jxr_string">"unchecked"</span>)
+<a class="jxr_linenumber" name="L161" href="#L161">161</a> 	<strong class="jxr_keyword">public</strong> &lt;A <strong class="jxr_keyword">extends</strong> Annotation&gt; AnnotationInfo&lt;A&gt; <strong class="jxr_keyword">cast</strong>(Class&lt;A&gt; type) {
+<a class="jxr_linenumber" name="L162" href="#L162">162</a> 		<strong class="jxr_keyword">return</strong> type.isInstance(a) ? (AnnotationInfo&lt;A&gt;)<strong class="jxr_keyword">this</strong> : <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L163" href="#L163">163</a> 	}
+<a class="jxr_linenumber" name="L164" href="#L164">164</a> 
+<a class="jxr_linenumber" name="L165" href="#L165">165</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L166" href="#L166">166</a> <em class="jxr_javadoccomment">	 * Returns true if the specified object represents an annotation that is logically equivalent to this one.</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> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L169" href="#L169">169</a> <em class="jxr_javadoccomment">	 * Same as calling {@link Annotation#equals(Object)} on the wrapped annotation.</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">	 * Two annotations are considered equal if:</em>
+<a class="jxr_linenumber" name="L173" href="#L173">173</a> <em class="jxr_javadoccomment">	 * &lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L174" href="#L174">174</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;They are of the same annotation type</em>
+<a class="jxr_linenumber" name="L175" href="#L175">175</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;All their corresponding member values are equal</em>
+<a class="jxr_linenumber" name="L176" href="#L176">176</a> <em class="jxr_javadoccomment">	 * &lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L177" href="#L177">177</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L178" href="#L178">178</a> <em class="jxr_javadoccomment">	 * @param o The reference object with which to compare.</em>
+<a class="jxr_linenumber" name="L179" href="#L179">179</a> <em class="jxr_javadoccomment">	 * @return &lt;jk&gt;true&lt;/jk&gt; if the specified object is equal to this annotation.</em>
+<a class="jxr_linenumber" name="L180" href="#L180">180</a> <em class="jxr_javadoccomment">	 * @see Annotation#equals(Object)</em>
+<a class="jxr_linenumber" name="L181" href="#L181">181</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L182" href="#L182">182</a> 	@Override <em class="jxr_comment">/* Overridden from Object */</em>
+<a class="jxr_linenumber" name="L183" href="#L183">183</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> equals(Object o) {
+<a class="jxr_linenumber" name="L184" href="#L184">184</a> 		<strong class="jxr_keyword">if</strong> (o instanceof <a name="AnnotationInfo" href="../../../../../org/apache/juneau/commons/reflect/AnnotationInfo.html#AnnotationInfo">AnnotationInfo</a> o2)
+<a class="jxr_linenumber" name="L185" href="#L185">185</a> 			<strong class="jxr_keyword">return</strong> a.equals(o2.a);
+<a class="jxr_linenumber" name="L186" href="#L186">186</a> 		<strong class="jxr_keyword">return</strong> a.equals(o);
+<a class="jxr_linenumber" name="L187" href="#L187">187</a> 	}
+<a class="jxr_linenumber" name="L188" href="#L188">188</a> 
+<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">	 * Returns the value of the specified method on this annotation as a boolean.</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">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L193" href="#L193">193</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L194" href="#L194">194</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// For annotation: @MyAnnotation(enabled=true)&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L195" href="#L195">195</a> <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;MyAnnotation&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; = ...;</em>
+<a class="jxr_linenumber" name="L196" href="#L196">196</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;boolean&lt;/jk&gt; &lt;jv&gt;enabled&lt;/jv&gt; = &lt;jv&gt;ai&lt;/jv&gt;.getBoolean(&lt;js&gt;"enabled"&lt;/js&gt;).orElse(&lt;jk&gt;false&lt;/jk&gt;);  &lt;jc&gt;// Returns true&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L197" href="#L197">197</a> <em class="jxr_javadoccomment">	 * &lt;/p&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">	 * @param methodName The method name.</em>
+<a class="jxr_linenumber" name="L200" href="#L200">200</a> <em class="jxr_javadoccomment">	 * @return An {@link Optional} containing the value as a boolean, or empty if not found or not a {@code boolean} type.</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> 	<strong class="jxr_keyword">public</strong> Optional&lt;Boolean&gt; getBoolean(String methodName) {
+<a class="jxr_linenumber" name="L203" href="#L203">203</a> 		<strong class="jxr_keyword">return</strong> getMethod(methodName).filter(x -&gt; x.hasReturnType(<strong class="jxr_keyword">boolean</strong>.<strong class="jxr_keyword">class</strong>)).map(x -&gt; (Boolean)x.invoke(a));
+<a class="jxr_linenumber" name="L204" href="#L204">204</a> 	}
+<a class="jxr_linenumber" name="L205" href="#L205">205</a> 
+<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">	 * Returns the value of the specified method on this annotation as a class array.</em>
+<a class="jxr_linenumber" name="L208" href="#L208">208</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L209" href="#L209">209</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L210" href="#L210">210</a> <em class="jxr_javadoccomment">	 * For type-safe access to an array of classes of a specific supertype, use {@link #getClassArray(String, Class)}.</em>
+<a class="jxr_linenumber" name="L211" href="#L211">211</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L212" href="#L212">212</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L213" href="#L213">213</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L214" href="#L214">214</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// For annotation: @MyAnnotation(types={String.class, Integer.class})&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L215" href="#L215">215</a> <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;MyAnnotation&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; = ...;</em>
+<a class="jxr_linenumber" name="L216" href="#L216">216</a> <em class="jxr_javadoccomment">	 * 	Class&amp;lt;?&amp;gt;[] &lt;jv&gt;types&lt;/jv&gt; = &lt;jv&gt;ai&lt;/jv&gt;.getClassArray(&lt;js&gt;"types"&lt;/js&gt;).orElse(&lt;jk&gt;new&lt;/jk&gt; Class[0]);  &lt;jc&gt;// Returns [String.class, Integer.class]&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 methodName The method name.</em>
+<a class="jxr_linenumber" name="L220" href="#L220">220</a> <em class="jxr_javadoccomment">	 * @return An {@link Optional} containing the class array value, or empty if not found or not a {@code Class[]} type.</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> 	@SuppressWarnings(<span class="jxr_string">"unchecked"</span>)
+<a class="jxr_linenumber" name="L223" href="#L223">223</a> 	<strong class="jxr_keyword">public</strong> Optional&lt;Class&lt;?&gt;[]&gt; getClassArray(String methodName) {
+<a class="jxr_linenumber" name="L224" href="#L224">224</a> 		<strong class="jxr_keyword">return</strong> (Optional&lt;Class&lt;?&gt;[]&gt;)(Optional&lt;?&gt;)getMethod(methodName).filter(x -&gt; x.hasReturnType(Class[].<strong class="jxr_keyword">class</strong>)).map(x -&gt; x.invoke(a));
+<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">	 * Returns the value of the specified method on this annotation as a class array of a specific type.</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;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L231" href="#L231">231</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L232" href="#L232">232</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Get an array of serializer classes from an annotation&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L233" href="#L233">233</a> <em class="jxr_javadoccomment">	 * 	Optional&amp;lt;Class&amp;lt;? &lt;jk&gt;extends&lt;/jk&gt; Serializer&amp;gt;[]&amp;gt; &lt;jv&gt;serializerClasses&lt;/jv&gt; =</em>
+<a class="jxr_linenumber" name="L234" href="#L234">234</a> <em class="jxr_javadoccomment">	 * 		&lt;jv&gt;annotationInfo&lt;/jv&gt;.getClassArray(&lt;js&gt;"serializers"&lt;/js&gt;, Serializer.&lt;jk&gt;class&lt;/jk&gt;);</em>
+<a class="jxr_linenumber" name="L235" href="#L235">235</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L236" href="#L236">236</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L237" href="#L237">237</a> <em class="jxr_javadoccomment">	 * @param &lt;T&gt; The expected supertype of the classes.</em>
+<a class="jxr_linenumber" name="L238" href="#L238">238</a> <em class="jxr_javadoccomment">	 * @param methodName The method name.</em>
+<a class="jxr_linenumber" name="L239" href="#L239">239</a> <em class="jxr_javadoccomment">	 * @param type The expected supertype of the class values.</em>
+<a class="jxr_linenumber" name="L240" href="#L240">240</a> <em class="jxr_javadoccomment">	 * @return An optional containing the value of the specified method cast to the expected type,</em>
+<a class="jxr_linenumber" name="L241" href="#L241">241</a> <em class="jxr_javadoccomment">	 *         or empty if not found, not a class array, or any element is not assignable to the expected type.</em>
+<a class="jxr_linenumber" name="L242" href="#L242">242</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L243" href="#L243">243</a> 	@SuppressWarnings({ <span class="jxr_string">"unchecked"</span>, <span class="jxr_string">"hiding"</span> })
+<a class="jxr_linenumber" name="L244" href="#L244">244</a> 	<strong class="jxr_keyword">public</strong> &lt;T&gt; Optional&lt;Class&lt;? <strong class="jxr_keyword">extends</strong> T&gt;[]&gt; getClassArray(String methodName, Class&lt;T&gt; type) {
+<a class="jxr_linenumber" name="L245" href="#L245">245</a> 		<em class="jxr_comment">// @formatter:off</em>
+<a class="jxr_linenumber" name="L246" href="#L246">246</a> 		<strong class="jxr_keyword">return</strong> getMethod(methodName)
+<a class="jxr_linenumber" name="L247" href="#L247">247</a> 			.filter(x -&gt; x.hasReturnType(Class[].<strong class="jxr_keyword">class</strong>))
+<a class="jxr_linenumber" name="L248" href="#L248">248</a> 			.map(x -&gt; (Class&lt;?&gt;[])x.invoke(a))
+<a class="jxr_linenumber" name="L249" href="#L249">249</a> 			.filter(arr -&gt; {
+<a class="jxr_linenumber" name="L250" href="#L250">250</a> 				<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> c : arr) {
+<a class="jxr_linenumber" name="L251" href="#L251">251</a> 					<strong class="jxr_keyword">if</strong> (!type.isAssignableFrom(c))
+<a class="jxr_linenumber" name="L252" href="#L252">252</a> 						<strong class="jxr_keyword">return</strong> false;
+<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">true</strong>;
+<a class="jxr_linenumber" name="L255" href="#L255">255</a> 			})
+<a class="jxr_linenumber" name="L256" href="#L256">256</a> 			.map(x -&gt; (Class&lt;? <strong class="jxr_keyword">extends</strong> T&gt;[])x);
+<a class="jxr_linenumber" name="L257" href="#L257">257</a> 		<em class="jxr_comment">// @formatter:on</em>
+<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">	 * Returns the value of the specified method on this annotation as a class.</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">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L264" href="#L264">264</a> <em class="jxr_javadoccomment">	 * For type-safe access to a class of a specific supertype, use {@link #getClassValue(String, Class)}.</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">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L267" href="#L267">267</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L268" href="#L268">268</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// For annotation: @MyAnnotation(type=String.class)&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L269" href="#L269">269</a> <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;MyAnnotation&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; = ...;</em>
+<a class="jxr_linenumber" name="L270" href="#L270">270</a> <em class="jxr_javadoccomment">	 * 	Class&amp;lt;?&amp;gt; &lt;jv&gt;type&lt;/jv&gt; = &lt;jv&gt;ai&lt;/jv&gt;.getClassValue(&lt;js&gt;"type"&lt;/js&gt;).orElse(&lt;jk&gt;null&lt;/jk&gt;);  &lt;jc&gt;// Returns String.class&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L271" href="#L271">271</a> <em class="jxr_javadoccomment">	 * &lt;/p&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">	 * @param methodName The method name.</em>
+<a class="jxr_linenumber" name="L274" href="#L274">274</a> <em class="jxr_javadoccomment">	 * @return An {@link Optional} containing the class value, or empty if not found or not a {@link Class} type.</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> 	@SuppressWarnings(<span class="jxr_string">"unchecked"</span>)
+<a class="jxr_linenumber" name="L277" href="#L277">277</a> 	<strong class="jxr_keyword">public</strong> Optional&lt;Class&lt;?&gt;&gt; getClassValue(String methodName) {
+<a class="jxr_linenumber" name="L278" href="#L278">278</a> 		<strong class="jxr_keyword">return</strong> (Optional&lt;Class&lt;?&gt;&gt;)(Optional&lt;?&gt;)getMethod(methodName).filter(x -&gt; x.hasReturnType(Class.<strong class="jxr_keyword">class</strong>)).map(x -&gt; x.invoke(a));
+<a class="jxr_linenumber" name="L279" href="#L279">279</a> 	}
+<a class="jxr_linenumber" name="L280" href="#L280">280</a> 
+<a class="jxr_linenumber" name="L281" href="#L281">281</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L282" href="#L282">282</a> <em class="jxr_javadoccomment">	 * Returns the value of the specified method on this annotation as a class of a specific type.</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> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L285" href="#L285">285</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L286" href="#L286">286</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Get a serializer class from an annotation&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L287" href="#L287">287</a> <em class="jxr_javadoccomment">	 * 	Optional&amp;lt;Class&amp;lt;? &lt;jk&gt;extends&lt;/jk&gt; Serializer&amp;gt;&amp;gt; &lt;jv&gt;serializerClass&lt;/jv&gt; =</em>
+<a class="jxr_linenumber" name="L288" href="#L288">288</a> <em class="jxr_javadoccomment">	 * 		&lt;jv&gt;annotationInfo&lt;/jv&gt;.getClassValue(&lt;js&gt;"serializer"&lt;/js&gt;, Serializer.&lt;jk&gt;class&lt;/jk&gt;);</em>
+<a class="jxr_linenumber" name="L289" href="#L289">289</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L290" href="#L290">290</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L291" href="#L291">291</a> <em class="jxr_javadoccomment">	 * @param &lt;T&gt; The expected supertype of the class.</em>
+<a class="jxr_linenumber" name="L292" href="#L292">292</a> <em class="jxr_javadoccomment">	 * @param methodName The method name.</em>
+<a class="jxr_linenumber" name="L293" href="#L293">293</a> <em class="jxr_javadoccomment">	 * @param type The expected supertype of the class value.</em>
+<a class="jxr_linenumber" name="L294" href="#L294">294</a> <em class="jxr_javadoccomment">	 * @return An optional containing the value of the specified method cast to the expected type,</em>
+<a class="jxr_linenumber" name="L295" href="#L295">295</a> <em class="jxr_javadoccomment">	 *         or empty if not found, not a class, or not assignable to the expected type.</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> 	@SuppressWarnings({ <span class="jxr_string">"unchecked"</span>, <span class="jxr_string">"hiding"</span> })
+<a class="jxr_linenumber" name="L298" href="#L298">298</a> 	<strong class="jxr_keyword">public</strong> &lt;T&gt; Optional&lt;Class&lt;? <strong class="jxr_keyword">extends</strong> T&gt;&gt; getClassValue(String methodName, Class&lt;T&gt; type) {
+<a class="jxr_linenumber" name="L299" href="#L299">299</a> 		<em class="jxr_comment">// @formatter:off</em>
+<a class="jxr_linenumber" name="L300" href="#L300">300</a> 		<strong class="jxr_keyword">return</strong> getMethod(methodName)
+<a class="jxr_linenumber" name="L301" href="#L301">301</a> 			.filter(x -&gt; x.hasReturnType(Class.<strong class="jxr_keyword">class</strong>))
+<a class="jxr_linenumber" name="L302" href="#L302">302</a> 			.map(x -&gt; (Class&lt;?&gt;)x.invoke(a))
+<a class="jxr_linenumber" name="L303" href="#L303">303</a> 			.filter(type::isAssignableFrom)
+<a class="jxr_linenumber" name="L304" href="#L304">304</a> 			.map(x -&gt; (Class&lt;? <strong class="jxr_keyword">extends</strong> T&gt;)x);
+<a class="jxr_linenumber" name="L305" href="#L305">305</a> 		<em class="jxr_comment">// @formatter:on</em>
+<a class="jxr_linenumber" name="L306" href="#L306">306</a> 	}
+<a class="jxr_linenumber" name="L307" href="#L307">307</a> 
+<a class="jxr_linenumber" name="L308" href="#L308">308</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L309" href="#L309">309</a> 	<em class="jxr_comment">// Annotation interface methods</em>
+<a class="jxr_linenumber" name="L310" href="#L310">310</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L311" href="#L311">311</a> 
+<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> <em class="jxr_javadoccomment">	 * Returns the value of the specified method on this annotation as a double.</em>
+<a class="jxr_linenumber" name="L314" href="#L314">314</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L315" href="#L315">315</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L316" href="#L316">316</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L317" href="#L317">317</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// For annotation: @MyAnnotation(threshold=0.95)&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L318" href="#L318">318</a> <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;MyAnnotation&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; = ...;</em>
+<a class="jxr_linenumber" name="L319" href="#L319">319</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;double&lt;/jk&gt; &lt;jv&gt;threshold&lt;/jv&gt; = &lt;jv&gt;ai&lt;/jv&gt;.getDouble(&lt;js&gt;"threshold"&lt;/js&gt;).orElse(0.0);  &lt;jc&gt;// Returns 0.95&lt;/jc&gt;</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">	 *</em>
+<a class="jxr_linenumber" name="L322" href="#L322">322</a> <em class="jxr_javadoccomment">	 * @param methodName The method name.</em>
+<a class="jxr_linenumber" name="L323" href="#L323">323</a> <em class="jxr_javadoccomment">	 * @return An {@link Optional} containing the value as a double, or empty if not found or not a {@code double} type.</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> 	<strong class="jxr_keyword">public</strong> Optional&lt;Double&gt; getDouble(String methodName) {
+<a class="jxr_linenumber" name="L326" href="#L326">326</a> 		<strong class="jxr_keyword">return</strong> getMethod(methodName).filter(x -&gt; x.hasReturnType(<strong class="jxr_keyword">double</strong>.<strong class="jxr_keyword">class</strong>)).map(x -&gt; (Double)x.invoke(a));
+<a class="jxr_linenumber" name="L327" href="#L327">327</a> 	}
+<a class="jxr_linenumber" name="L328" href="#L328">328</a> 
+<a class="jxr_linenumber" name="L329" href="#L329">329</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L330" href="#L330">330</a> <em class="jxr_javadoccomment">	 * Returns the value of the specified method on this annotation as a float.</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;jc&gt;// For annotation: @MyAnnotation(weight=0.5f)&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L335" href="#L335">335</a> <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;MyAnnotation&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; = ...;</em>
+<a class="jxr_linenumber" name="L336" href="#L336">336</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;float&lt;/jk&gt; &lt;jv&gt;weight&lt;/jv&gt; = &lt;jv&gt;ai&lt;/jv&gt;.getFloat(&lt;js&gt;"weight"&lt;/js&gt;).orElse(0.0f);  &lt;jc&gt;// Returns 0.5f&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L337" href="#L337">337</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L338" href="#L338">338</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L339" href="#L339">339</a> <em class="jxr_javadoccomment">	 * @param methodName The method name.</em>
+<a class="jxr_linenumber" name="L340" href="#L340">340</a> <em class="jxr_javadoccomment">	 * @return An {@link Optional} containing the value as a float, or empty if not found or not a {@code float} type.</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> 	<strong class="jxr_keyword">public</strong> Optional&lt;Float&gt; getFloat(String methodName) {
+<a class="jxr_linenumber" name="L343" href="#L343">343</a> 		<strong class="jxr_keyword">return</strong> getMethod(methodName).filter(x -&gt; x.hasReturnType(<strong class="jxr_keyword">float</strong>.<strong class="jxr_keyword">class</strong>)).map(x -&gt; (Float)x.invoke(a));
+<a class="jxr_linenumber" name="L344" href="#L344">344</a> 	}
+<a class="jxr_linenumber" name="L345" href="#L345">345</a> 
+<a class="jxr_linenumber" name="L346" href="#L346">346</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L347" href="#L347">347</a> <em class="jxr_javadoccomment">	 * Returns the value of the specified method on this annotation as an integer.</em>
+<a class="jxr_linenumber" name="L348" href="#L348">348</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L349" href="#L349">349</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L350" href="#L350">350</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L351" href="#L351">351</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// For annotation: @MyAnnotation(priority=5)&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L352" href="#L352">352</a> <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;MyAnnotation&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; = ...;</em>
+<a class="jxr_linenumber" name="L353" href="#L353">353</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;int&lt;/jk&gt; &lt;jv&gt;priority&lt;/jv&gt; = &lt;jv&gt;ai&lt;/jv&gt;.getInt(&lt;js&gt;"priority"&lt;/js&gt;).orElse(0);  &lt;jc&gt;// Returns 5&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L354" href="#L354">354</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L355" href="#L355">355</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L356" href="#L356">356</a> <em class="jxr_javadoccomment">	 * @param methodName The method name.</em>
+<a class="jxr_linenumber" name="L357" href="#L357">357</a> <em class="jxr_javadoccomment">	 * @return An {@link Optional} containing the value as an integer, or empty if not found or not an {@code int} type.</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> 	<strong class="jxr_keyword">public</strong> Optional&lt;Integer&gt; getInt(String methodName) {
+<a class="jxr_linenumber" name="L360" href="#L360">360</a> 		<strong class="jxr_keyword">return</strong> getMethod(methodName).filter(x -&gt; x.hasReturnType(<strong class="jxr_keyword">int</strong>.<strong class="jxr_keyword">class</strong>)).map(x -&gt; (Integer)x.invoke(a));
+<a class="jxr_linenumber" name="L361" href="#L361">361</a> 	}
+<a class="jxr_linenumber" name="L362" href="#L362">362</a> 
+<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">	 * Returns the value of the specified method on this annotation as a long.</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;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L367" href="#L367">367</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L368" href="#L368">368</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// For annotation: @MyAnnotation(timestamp=1234567890L)&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L369" href="#L369">369</a> <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;MyAnnotation&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; = ...;</em>
+<a class="jxr_linenumber" name="L370" href="#L370">370</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;long&lt;/jk&gt; &lt;jv&gt;timestamp&lt;/jv&gt; = &lt;jv&gt;ai&lt;/jv&gt;.getLong(&lt;js&gt;"timestamp"&lt;/js&gt;).orElse(0L);  &lt;jc&gt;// Returns 1234567890L&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L371" href="#L371">371</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</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> <em class="jxr_javadoccomment">	 * @param methodName The method name.</em>
+<a class="jxr_linenumber" name="L374" href="#L374">374</a> <em class="jxr_javadoccomment">	 * @return An {@link Optional} containing the value as a long, or empty if not found or not a {@code long} type.</em>
+<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> 	<strong class="jxr_keyword">public</strong> Optional&lt;Long&gt; getLong(String methodName) {
+<a class="jxr_linenumber" name="L377" href="#L377">377</a> 		<strong class="jxr_keyword">return</strong> getMethod(methodName).filter(x -&gt; x.hasReturnType(<strong class="jxr_keyword">long</strong>.<strong class="jxr_keyword">class</strong>)).map(x -&gt; (Long)x.invoke(a));
+<a class="jxr_linenumber" name="L378" href="#L378">378</a> 	}
+<a class="jxr_linenumber" name="L379" href="#L379">379</a> 
+<a class="jxr_linenumber" name="L380" href="#L380">380</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L381" href="#L381">381</a> <em class="jxr_javadoccomment">	 * Returns the method with the specified name on this annotation.</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">	 * 	AnnotationInfo&amp;lt;MyAnnotation&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; = ...;</em>
+<a class="jxr_linenumber" name="L386" href="#L386">386</a> <em class="jxr_javadoccomment">	 * 	Optional&amp;lt;MethodInfo&amp;gt; &lt;jv&gt;method&lt;/jv&gt; = &lt;jv&gt;ai&lt;/jv&gt;.getMethod(&lt;js&gt;"value"&lt;/js&gt;);</em>
+<a class="jxr_linenumber" name="L387" href="#L387">387</a> <em class="jxr_javadoccomment">	 * 	&lt;jv&gt;method&lt;/jv&gt;.ifPresent(&lt;jv&gt;m&lt;/jv&gt; -&amp;gt; System.&lt;jsf&gt;out&lt;/jsf&gt;.println(&lt;jv&gt;m&lt;/jv&gt;.getReturnType()));</em>
+<a class="jxr_linenumber" name="L388" href="#L388">388</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</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 methodName The method name to look for.</em>
+<a class="jxr_linenumber" name="L391" href="#L391">391</a> <em class="jxr_javadoccomment">	 * @return An {@link Optional} containing the method info, or empty if method not found.</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> 	<strong class="jxr_keyword">public</strong> Optional&lt;MethodInfo&gt; getMethod(String methodName) {
+<a class="jxr_linenumber" name="L394" href="#L394">394</a> 		<strong class="jxr_keyword">return</strong> methods.get().stream().filter(x -&gt; eq(methodName, x.getSimpleName())).findFirst();
+<a class="jxr_linenumber" name="L395" href="#L395">395</a> 	}
+<a class="jxr_linenumber" name="L396" href="#L396">396</a> 
+<a class="jxr_linenumber" name="L397" href="#L397">397</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L398" href="#L398">398</a> 	<em class="jxr_comment">// Private helper methods</em>
+<a class="jxr_linenumber" name="L399" href="#L399">399</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L400" href="#L400">400</a> 
+<a class="jxr_linenumber" name="L401" href="#L401">401</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L402" href="#L402">402</a> <em class="jxr_javadoccomment">	 * Returns the simple class name of this annotation.</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">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L405" href="#L405">405</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L406" href="#L406">406</a> <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;MyAnnotation&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; = ...;</em>
+<a class="jxr_linenumber" name="L407" href="#L407">407</a> <em class="jxr_javadoccomment">	 * 	String &lt;jv&gt;name&lt;/jv&gt; = &lt;jv&gt;ai&lt;/jv&gt;.getName();  &lt;jc&gt;// Returns "MyAnnotation"&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L408" href="#L408">408</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</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">	 * @return The simple class name of the annotation (e.g., {@code "Override"} for {@code @Override}).</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> 	<strong class="jxr_keyword">public</strong> String getName() { <strong class="jxr_keyword">return</strong> cns(a.annotationType()); }
+<a class="jxr_linenumber" name="L413" href="#L413">413</a> 
+<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">	 * Returns the rank of this annotation for sorting by precedence.</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">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L418" href="#L418">418</a> <em class="jxr_javadoccomment">	 * The rank is determined by checking if the annotation has a {@code rank()} method that returns an {@code int}.</em>
+<a class="jxr_linenumber" name="L419" href="#L419">419</a> <em class="jxr_javadoccomment">	 * If found, that value is used; otherwise the rank defaults to {@code 0}.</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">	 * Higher rank values indicate higher precedence when multiple annotations of the same type are present.</em>
+<a class="jxr_linenumber" name="L423" href="#L423">423</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L424" href="#L424">424</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L425" href="#L425">425</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L426" href="#L426">426</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Annotation with rank method&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L427" href="#L427">427</a> <em class="jxr_javadoccomment">	 * 	&lt;ja&gt;@interface&lt;/ja&gt; MyAnnotation {</em>
+<a class="jxr_linenumber" name="L428" href="#L428">428</a> <em class="jxr_javadoccomment">	 * 		&lt;jk&gt;int&lt;/jk&gt; rank() &lt;jk&gt;default&lt;/jk&gt; 0;</em>
+<a class="jxr_linenumber" name="L429" href="#L429">429</a> <em class="jxr_javadoccomment">	 * 	}</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">	 * 	&lt;jc&gt;// Get rank from annotation info&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L432" href="#L432">432</a> <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;MyAnnotation&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; = ...;</em>
+<a class="jxr_linenumber" name="L433" href="#L433">433</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;int&lt;/jk&gt; &lt;jv&gt;rank&lt;/jv&gt; = &lt;jv&gt;ai&lt;/jv&gt;.getRank();  &lt;jc&gt;// Returns value from rank() method&lt;/jc&gt;</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">	 *</em>
+<a class="jxr_linenumber" name="L436" href="#L436">436</a> <em class="jxr_javadoccomment">	 * @return The rank of this annotation, or {@code 0} if no rank method exists.</em>
+<a class="jxr_linenumber" name="L437" href="#L437">437</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L438" href="#L438">438</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> getRank() { <strong class="jxr_keyword">return</strong> rank; }
+<a class="jxr_linenumber" name="L439" href="#L439">439</a> 
+<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> <em class="jxr_javadoccomment">	 * Returns the return type of the specified method on this annotation.</em>
+<a class="jxr_linenumber" name="L442" href="#L442">442</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L443" href="#L443">443</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L444" href="#L444">444</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L445" href="#L445">445</a> <em class="jxr_javadoccomment">	 * 	Optional&amp;lt;ClassInfo&amp;gt; &lt;jv&gt;returnType&lt;/jv&gt; = &lt;jv&gt;annotationInfo&lt;/jv&gt;.getReturnType(&lt;js&gt;"value"&lt;/js&gt;);</em>
+<a class="jxr_linenumber" name="L446" href="#L446">446</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L447" href="#L447">447</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L448" href="#L448">448</a> <em class="jxr_javadoccomment">	 * @param methodName The method name.</em>
+<a class="jxr_linenumber" name="L449" href="#L449">449</a> <em class="jxr_javadoccomment">	 * @return An optional containing the return type of the specified method, or empty if method not found.</em>
+<a class="jxr_linenumber" name="L450" href="#L450">450</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L451" href="#L451">451</a> 	<strong class="jxr_keyword">public</strong> Optional&lt;ClassInfo&gt; getReturnType(String methodName) {
+<a class="jxr_linenumber" name="L452" href="#L452">452</a> 		<strong class="jxr_keyword">return</strong> getMethod(methodName).map(x -&gt; x.getReturnType());
+<a class="jxr_linenumber" name="L453" href="#L453">453</a> 	}
+<a class="jxr_linenumber" name="L454" href="#L454">454</a> 
+<a class="jxr_linenumber" name="L455" href="#L455">455</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L456" href="#L456">456</a> <em class="jxr_javadoccomment">	 * Returns the value of the specified method on this annotation as a string.</em>
+<a class="jxr_linenumber" name="L457" href="#L457">457</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L458" href="#L458">458</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L459" href="#L459">459</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L460" href="#L460">460</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// For annotation: @MyAnnotation(name="John", age=30)&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L461" href="#L461">461</a> <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;MyAnnotation&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; = ...;</em>
+<a class="jxr_linenumber" name="L462" href="#L462">462</a> <em class="jxr_javadoccomment">	 * 	String &lt;jv&gt;name&lt;/jv&gt; = &lt;jv&gt;ai&lt;/jv&gt;.getString(&lt;js&gt;"name"&lt;/js&gt;).orElse(&lt;js&gt;"unknown"&lt;/js&gt;);  &lt;jc&gt;// Returns "John"&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L463" href="#L463">463</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L464" href="#L464">464</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L465" href="#L465">465</a> <em class="jxr_javadoccomment">	 * @param methodName The method name.</em>
+<a class="jxr_linenumber" name="L466" href="#L466">466</a> <em class="jxr_javadoccomment">	 * @return An {@link Optional} containing the value as a string, or empty if not found or not a string type.</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> Optional&lt;String&gt; getString(String methodName) {
+<a class="jxr_linenumber" name="L469" href="#L469">469</a> 		<strong class="jxr_keyword">return</strong> getMethod(methodName).filter(x -&gt; x.hasReturnType(String.<strong class="jxr_keyword">class</strong>)).map(x -&gt; s(x.invoke(a)));
+<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> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L473" href="#L473">473</a> <em class="jxr_javadoccomment">	 * Returns the value of the specified method on this annotation as a string array.</em>
+<a class="jxr_linenumber" name="L474" href="#L474">474</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L475" href="#L475">475</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L476" href="#L476">476</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L477" href="#L477">477</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// For annotation: @MyAnnotation(tags={"foo", "bar"})&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L478" href="#L478">478</a> <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;MyAnnotation&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; = ...;</em>
+<a class="jxr_linenumber" name="L479" href="#L479">479</a> <em class="jxr_javadoccomment">	 * 	String[] &lt;jv&gt;tags&lt;/jv&gt; = &lt;jv&gt;ai&lt;/jv&gt;.getStringArray(&lt;js&gt;"tags"&lt;/js&gt;).orElse(&lt;jk&gt;new&lt;/jk&gt; String[0]);  &lt;jc&gt;// Returns ["foo", "bar"]&lt;/jc&gt;</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">	 *</em>
+<a class="jxr_linenumber" name="L482" href="#L482">482</a> <em class="jxr_javadoccomment">	 * @param methodName The method name.</em>
+<a class="jxr_linenumber" name="L483" href="#L483">483</a> <em class="jxr_javadoccomment">	 * @return An {@link Optional} containing the string array value, or empty if not found or not a {@code String[]} type.</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> 	<strong class="jxr_keyword">public</strong> Optional&lt;String[]&gt; getStringArray(String methodName) {
+<a class="jxr_linenumber" name="L486" href="#L486">486</a> 		<strong class="jxr_keyword">return</strong> getMethod(methodName).filter(x -&gt; x.hasReturnType(String[].<strong class="jxr_keyword">class</strong>)).map(x -&gt; (String[])x.invoke(a));
+<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_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L490" href="#L490">490</a> <em class="jxr_javadoccomment">	 * Returns the value of the {@code value()} method on this annotation as a string.</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">	 * This is a convenience method equivalent to calling {@link #getString(String) getString("value")}.</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;jc&gt;// For annotation: @MyAnnotation("foo")&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L498" href="#L498">498</a> <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;MyAnnotation&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; = ...;</em>
+<a class="jxr_linenumber" name="L499" href="#L499">499</a> <em class="jxr_javadoccomment">	 * 	String &lt;jv&gt;value&lt;/jv&gt; = &lt;jv&gt;ai&lt;/jv&gt;.getValue().orElse(&lt;js&gt;"default"&lt;/js&gt;);  &lt;jc&gt;// Returns "foo"&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L500" href="#L500">500</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L501" href="#L501">501</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L502" href="#L502">502</a> <em class="jxr_javadoccomment">	 * @return An {@link Optional} containing the value of the {@code value()} method, or empty if not found or not a string.</em>
+<a class="jxr_linenumber" name="L503" href="#L503">503</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L504" href="#L504">504</a> 	<strong class="jxr_keyword">public</strong> Optional&lt;String&gt; getValue() { <strong class="jxr_keyword">return</strong> getString(<span class="jxr_string">"value"</span>); }
+<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">	 * Returns the value of a specific annotation method.</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 provides type-safe access to annotation field values without requiring</em>
+<a class="jxr_linenumber" name="L511" href="#L511">511</a> <em class="jxr_javadoccomment">	 * explicit reflection calls or casting.</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;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L514" href="#L514">514</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L515" href="#L515">515</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// For annotation: @interface MyAnnotation { String value(); int priority(); }&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L516" href="#L516">516</a> <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;MyAnnotation&amp;gt; &lt;jv&gt;ai&lt;/jv&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">	 * 	&lt;jc&gt;// Get string value&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L519" href="#L519">519</a> <em class="jxr_javadoccomment">	 * 	Optional&amp;lt;String&amp;gt; &lt;jv&gt;value&lt;/jv&gt; = &lt;jv&gt;ai&lt;/jv&gt;.getValue(String.&lt;jk&gt;class&lt;/jk&gt;, &lt;js&gt;"value"&lt;/js&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;jc&gt;// Get int value&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L522" href="#L522">522</a> <em class="jxr_javadoccomment">	 * 	Optional&amp;lt;Integer&amp;gt; &lt;jv&gt;priority&lt;/jv&gt; = &lt;jv&gt;ai&lt;/jv&gt;.getValue(Integer.&lt;jk&gt;class&lt;/jk&gt;, &lt;js&gt;"priority"&lt;/js&gt;);</em>
+<a class="jxr_linenumber" name="L523" href="#L523">523</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L524" href="#L524">524</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L525" href="#L525">525</a> <em class="jxr_javadoccomment">	 * @param &lt;V&gt; The expected type of the annotation field value.</em>
+<a class="jxr_linenumber" name="L526" href="#L526">526</a> <em class="jxr_javadoccomment">	 * @param type The expected class of the annotation field value.</em>
+<a class="jxr_linenumber" name="L527" href="#L527">527</a> <em class="jxr_javadoccomment">	 * @param name The name of the annotation method (field).</em>
+<a class="jxr_linenumber" name="L528" href="#L528">528</a> <em class="jxr_javadoccomment">	 * @return An {@link Optional} containing the value if found and type matches, empty otherwise.</em>
+<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> 	@SuppressWarnings(<span class="jxr_string">"unchecked"</span>)
+<a class="jxr_linenumber" name="L531" href="#L531">531</a> 	<strong class="jxr_keyword">public</strong> &lt;V&gt; Optional&lt;V&gt; getValue(Class&lt;V&gt; type, String name) {
+<a class="jxr_linenumber" name="L532" href="#L532">532</a> 		<em class="jxr_comment">// @formatter:off</em>
+<a class="jxr_linenumber" name="L533" href="#L533">533</a> 		<strong class="jxr_keyword">return</strong> methods.get().stream()
+<a class="jxr_linenumber" name="L534" href="#L534">534</a> 			.filter(m -&gt; eq(m.getName(), name) &amp;&amp; eq(m.getReturnType().<strong class="jxr_keyword">inner</strong>(), type))
+<a class="jxr_linenumber" name="L535" href="#L535">535</a> 			.map(m -&gt; safe(() -&gt; (V)m.invoke(a)))
+<a class="jxr_linenumber" name="L536" href="#L536">536</a> 			.findFirst();
+<a class="jxr_linenumber" name="L537" href="#L537">537</a> 		<em class="jxr_comment">// @formatter:on</em>
+<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">	 * Returns &lt;jk&gt;true&lt;/jk&gt; if this annotation is itself annotated with the specified annotation.</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">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L544" href="#L544">544</a> <em class="jxr_javadoccomment">	 * This checks for meta-annotations on the annotation type.</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> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L547" href="#L547">547</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L548" href="#L548">548</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Check if @MyAnnotation is annotated with @Documented&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L549" href="#L549">549</a> <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;MyAnnotation&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; = ...;</em>
+<a class="jxr_linenumber" name="L550" href="#L550">550</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;boolean&lt;/jk&gt; &lt;jv&gt;isDocumented&lt;/jv&gt; = &lt;jv&gt;ai&lt;/jv&gt;.hasAnnotation(Documented.&lt;jk&gt;class&lt;/jk&gt;);</em>
+<a class="jxr_linenumber" name="L551" href="#L551">551</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L552" href="#L552">552</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L553" href="#L553">553</a> <em class="jxr_javadoccomment">	 * @param &lt;A&gt; The meta-annotation type.</em>
+<a class="jxr_linenumber" name="L554" href="#L554">554</a> <em class="jxr_javadoccomment">	 * @param type The meta-annotation to test for.</em>
+<a class="jxr_linenumber" name="L555" href="#L555">555</a> <em class="jxr_javadoccomment">	 * @return &lt;jk&gt;true&lt;/jk&gt; if this annotation is annotated with the specified annotation.</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> 	<strong class="jxr_keyword">public</strong> &lt;A <strong class="jxr_keyword">extends</strong> Annotation&gt; <strong class="jxr_keyword">boolean</strong> hasAnnotation(Class&lt;A&gt; type) {
+<a class="jxr_linenumber" name="L558" href="#L558">558</a> 		<strong class="jxr_keyword">return</strong> nn(<strong class="jxr_keyword">this</strong>.a.annotationType().getAnnotation(type));
+<a class="jxr_linenumber" name="L559" href="#L559">559</a> 	}
+<a class="jxr_linenumber" name="L560" href="#L560">560</a> 
+<a class="jxr_linenumber" name="L561" href="#L561">561</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L562" href="#L562">562</a> <em class="jxr_javadoccomment">	 * Returns the hash code of this annotation.</em>
+<a class="jxr_linenumber" name="L563" href="#L563">563</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L564" href="#L564">564</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L565" href="#L565">565</a> <em class="jxr_javadoccomment">	 * Same as calling {@link Annotation#hashCode()} on the wrapped annotation.</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">	 * The hash code of an annotation is the sum of the hash codes of its members (including those with default values).</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">	 * @return The hash code of this annotation.</em>
+<a class="jxr_linenumber" name="L571" href="#L571">571</a> <em class="jxr_javadoccomment">	 * @see Annotation#hashCode()</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> 	@Override <em class="jxr_comment">/* Overridden from Object */</em>
+<a class="jxr_linenumber" name="L574" href="#L574">574</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> hashCode() {
+<a class="jxr_linenumber" name="L575" href="#L575">575</a> 		<strong class="jxr_keyword">return</strong> a.hashCode();
+<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">	 * Returns &lt;jk&gt;true&lt;/jk&gt; if this annotation has the specified fully-qualified name.</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">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L582" href="#L582">582</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L583" href="#L583">583</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;boolean&lt;/jk&gt; &lt;jv&gt;isName&lt;/jv&gt; = &lt;jv&gt;annotationInfo&lt;/jv&gt;.hasName(&lt;js&gt;"org.apache.juneau.annotation.Name"&lt;/js&gt;);</em>
+<a class="jxr_linenumber" name="L584" href="#L584">584</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L585" href="#L585">585</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L586" href="#L586">586</a> <em class="jxr_javadoccomment">	 * @param value The fully-qualified name to check.</em>
+<a class="jxr_linenumber" name="L587" href="#L587">587</a> <em class="jxr_javadoccomment">	 * @return &lt;jk&gt;true&lt;/jk&gt; if this annotation has the specified fully-qualified name.</em>
+<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> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> hasName(String value) {
+<a class="jxr_linenumber" name="L590" href="#L590">590</a> 		<strong class="jxr_keyword">return</strong> eq(value, a.annotationType().getName());
+<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> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L594" href="#L594">594</a> <em class="jxr_javadoccomment">	 * Returns &lt;jk&gt;true&lt;/jk&gt; if this annotation has the specified simple name.</em>
+<a class="jxr_linenumber" name="L595" href="#L595">595</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L596" href="#L596">596</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L597" href="#L597">597</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L598" href="#L598">598</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;boolean&lt;/jk&gt; &lt;jv&gt;isName&lt;/jv&gt; = &lt;jv&gt;annotationInfo&lt;/jv&gt;.hasSimpleName(&lt;js&gt;"Name"&lt;/js&gt;);</em>
+<a class="jxr_linenumber" name="L599" href="#L599">599</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L600" href="#L600">600</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L601" href="#L601">601</a> <em class="jxr_javadoccomment">	 * @param value The simple name to check.</em>
+<a class="jxr_linenumber" name="L602" href="#L602">602</a> <em class="jxr_javadoccomment">	 * @return &lt;jk&gt;true&lt;/jk&gt; if this annotation has the specified simple name.</em>
+<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> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> hasSimpleName(String value) {
+<a class="jxr_linenumber" name="L605" href="#L605">605</a> 		<strong class="jxr_keyword">return</strong> eq(value, a.annotationType().getSimpleName());
+<a class="jxr_linenumber" name="L606" href="#L606">606</a> 	}
+<a class="jxr_linenumber" name="L607" href="#L607">607</a> 
+<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">	 * Returns the wrapped annotation instance.</em>
+<a class="jxr_linenumber" name="L610" href="#L610">610</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L611" href="#L611">611</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L612" href="#L612">612</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L613" href="#L613">613</a> <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;MyAnnotation&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; = ...;</em>
+<a class="jxr_linenumber" name="L614" href="#L614">614</a> <em class="jxr_javadoccomment">	 * 	MyAnnotation &lt;jv&gt;annotation&lt;/jv&gt; = &lt;jv&gt;ai&lt;/jv&gt;.inner();</em>
+<a class="jxr_linenumber" name="L615" href="#L615">615</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L616" href="#L616">616</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Access annotation methods directly&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L617" href="#L617">617</a> <em class="jxr_javadoccomment">	 * 	String &lt;jv&gt;value&lt;/jv&gt; = &lt;jv&gt;annotation&lt;/jv&gt;.value();</em>
+<a class="jxr_linenumber" name="L618" href="#L618">618</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L619" href="#L619">619</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L620" href="#L620">620</a> <em class="jxr_javadoccomment">	 * @return The wrapped annotation instance.</em>
+<a class="jxr_linenumber" name="L621" href="#L621">621</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L622" href="#L622">622</a> 	<strong class="jxr_keyword">public</strong> T <strong class="jxr_keyword">inner</strong>() {
+<a class="jxr_linenumber" name="L623" href="#L623">623</a> 		<strong class="jxr_keyword">return</strong> a;
+<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> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L627" href="#L627">627</a> <em class="jxr_javadoccomment">	 * Returns &lt;jk&gt;true&lt;/jk&gt; if this annotation is in the specified {@link AnnotationGroup}.</em>
+<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">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L630" href="#L630">630</a> <em class="jxr_javadoccomment">	 * Annotation groups are used to logically group related annotations together.</em>
+<a class="jxr_linenumber" name="L631" href="#L631">631</a> <em class="jxr_javadoccomment">	 * This checks if the annotation is annotated with {@link AnnotationGroup} and if</em>
+<a class="jxr_linenumber" name="L632" href="#L632">632</a> <em class="jxr_javadoccomment">	 * the group value matches the specified type.</em>
+<a class="jxr_linenumber" name="L633" href="#L633">633</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L634" href="#L634">634</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L635" href="#L635">635</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L636" href="#L636">636</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Define an annotation group&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L637" href="#L637">637</a> <em class="jxr_javadoccomment">	 * 	&lt;ja&gt;@interface&lt;/ja&gt; MyGroup {}</em>
+<a class="jxr_linenumber" name="L638" href="#L638">638</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L639" href="#L639">639</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Annotation in the group&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L640" href="#L640">640</a> <em class="jxr_javadoccomment">	 * 	&lt;ja&gt;@AnnotationGroup&lt;/ja&gt;(MyGroup.&lt;jk&gt;class&lt;/jk&gt;)</em>
+<a class="jxr_linenumber" name="L641" href="#L641">641</a> <em class="jxr_javadoccomment">	 * 	&lt;ja&gt;@interface&lt;/ja&gt; MyAnnotation {}</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;jc&gt;// Check if annotation is in group&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L644" href="#L644">644</a> <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;MyAnnotation&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; = ...;</em>
+<a class="jxr_linenumber" name="L645" href="#L645">645</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;boolean&lt;/jk&gt; &lt;jv&gt;inGroup&lt;/jv&gt; = &lt;jv&gt;ai&lt;/jv&gt;.isInGroup(MyGroup.&lt;jk&gt;class&lt;/jk&gt;);  &lt;jc&gt;// Returns true&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L646" href="#L646">646</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L647" href="#L647">647</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L648" href="#L648">648</a> <em class="jxr_javadoccomment">	 * @param &lt;A&gt; The group annotation type.</em>
+<a class="jxr_linenumber" name="L649" href="#L649">649</a> <em class="jxr_javadoccomment">	 * @param group The group annotation class to test for.</em>
+<a class="jxr_linenumber" name="L650" href="#L650">650</a> <em class="jxr_javadoccomment">	 * @return &lt;jk&gt;true&lt;/jk&gt; if this annotation is in the specified group.</em>
+<a class="jxr_linenumber" name="L651" href="#L651">651</a> <em class="jxr_javadoccomment">	 * @see AnnotationGroup</em>
+<a class="jxr_linenumber" name="L652" href="#L652">652</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L653" href="#L653">653</a> 	<strong class="jxr_keyword">public</strong> &lt;A <strong class="jxr_keyword">extends</strong> Annotation&gt; <strong class="jxr_keyword">boolean</strong> isInGroup(Class&lt;A&gt; group) {
+<a class="jxr_linenumber" name="L654" href="#L654">654</a> 		<strong class="jxr_keyword">var</strong> x = a.annotationType().getAnnotation(AnnotationGroup.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L655" href="#L655">655</a> 		<strong class="jxr_keyword">return</strong> (nn(x) &amp;&amp; x.value().equals(group));
+<a class="jxr_linenumber" name="L656" href="#L656">656</a> 	}
+<a class="jxr_linenumber" name="L657" href="#L657">657</a> 
+<a class="jxr_linenumber" name="L658" href="#L658">658</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L659" href="#L659">659</a> <em class="jxr_javadoccomment">	 * Returns &lt;jk&gt;true&lt;/jk&gt; if this annotation is of the specified type.</em>
+<a class="jxr_linenumber" name="L660" href="#L660">660</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L661" href="#L661">661</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L662" href="#L662">662</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L663" href="#L663">663</a> <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;?&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; = ...;</em>
+<a class="jxr_linenumber" name="L664" href="#L664">664</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L665" href="#L665">665</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;if&lt;/jk&gt; (&lt;jv&gt;ai&lt;/jv&gt;.isType(MyAnnotation.&lt;jk&gt;class&lt;/jk&gt;)) {</em>
+<a class="jxr_linenumber" name="L666" href="#L666">666</a> <em class="jxr_javadoccomment">	 * 		&lt;jc&gt;// Handle MyAnnotation specifically&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L667" href="#L667">667</a> <em class="jxr_javadoccomment">	 * 	}</em>
+<a class="jxr_linenumber" name="L668" href="#L668">668</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L669" href="#L669">669</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L670" href="#L670">670</a> <em class="jxr_javadoccomment">	 * @param &lt;A&gt; The annotation type to test for.</em>
+<a class="jxr_linenumber" name="L671" href="#L671">671</a> <em class="jxr_javadoccomment">	 * @param type The annotation type to test against.</em>
+<a class="jxr_linenumber" name="L672" href="#L672">672</a> <em class="jxr_javadoccomment">	 * @return &lt;jk&gt;true&lt;/jk&gt; if this annotation's type is exactly the specified type.</em>
+<a class="jxr_linenumber" name="L673" href="#L673">673</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L674" href="#L674">674</a> 	<strong class="jxr_keyword">public</strong> &lt;A <strong class="jxr_keyword">extends</strong> Annotation&gt; <strong class="jxr_keyword">boolean</strong> isType(Class&lt;A&gt; type) {
+<a class="jxr_linenumber" name="L675" href="#L675">675</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>.a.annotationType() == type;
+<a class="jxr_linenumber" name="L676" href="#L676">676</a> 	}
+<a class="jxr_linenumber" name="L677" href="#L677">677</a> 
+<a class="jxr_linenumber" name="L678" href="#L678">678</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L679" href="#L679">679</a> <em class="jxr_javadoccomment">	 * Converts this annotation info to a map representation for debugging purposes.</em>
+<a class="jxr_linenumber" name="L680" href="#L680">680</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L681" href="#L681">681</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L682" href="#L682">682</a> <em class="jxr_javadoccomment">	 * The returned map contains:</em>
+<a class="jxr_linenumber" name="L683" href="#L683">683</a> <em class="jxr_javadoccomment">	 * &lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L684" href="#L684">684</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;The annotatable element's type and label (e.g., {@code "CLASS_TYPE" -&gt; "com.example.MyClass"})</em>
+<a class="jxr_linenumber" name="L685" href="#L685">685</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;A nested map with the annotation's simple name as key and its non-default values</em>
+<a class="jxr_linenumber" name="L686" href="#L686">686</a> <em class="jxr_javadoccomment">	 * &lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L687" href="#L687">687</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L688" href="#L688">688</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L689" href="#L689">689</a> <em class="jxr_javadoccomment">	 * Only annotation values that differ from their default values are included.</em>
+<a class="jxr_linenumber" name="L690" href="#L690">690</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L691" href="#L691">691</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L692" href="#L692">692</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L693" href="#L693">693</a> <em class="jxr_javadoccomment">	 * 	AnnotationInfo&amp;lt;MyAnnotation&amp;gt; &lt;jv&gt;ai&lt;/jv&gt; = ...;</em>
+<a class="jxr_linenumber" name="L694" href="#L694">694</a> <em class="jxr_javadoccomment">	 * 	LinkedHashMap&amp;lt;String,Object&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = &lt;jv&gt;ai&lt;/jv&gt;.toMap();</em>
+<a class="jxr_linenumber" name="L695" href="#L695">695</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Returns: {"CLASS_TYPE": "MyClass", "@MyAnnotation": {"value": "foo", "priority": 5}}&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L696" href="#L696">696</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L697" href="#L697">697</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L698" href="#L698">698</a> <em class="jxr_javadoccomment">	 * @return A new map showing the attributes of this annotation info.</em>
+<a class="jxr_linenumber" name="L699" href="#L699">699</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L700" href="#L700">700</a> 	<strong class="jxr_keyword">protected</strong> FluentMap&lt;String,Object&gt; properties() {
+<a class="jxr_linenumber" name="L701" href="#L701">701</a> 		<em class="jxr_comment">// @formatter:off</em>
+<a class="jxr_linenumber" name="L702" href="#L702">702</a> 		<strong class="jxr_keyword">var</strong> ca = info(a.annotationType());
+<a class="jxr_linenumber" name="L703" href="#L703">703</a> 		<strong class="jxr_keyword">var</strong> ja = mapb().sorted().buildFluent();  <em class="jxr_comment">// NOAI</em>
 <a class="jxr_linenumber" name="L704" href="#L704">704</a> 		ca.getDeclaredMethods().stream().forEach(x -&gt; {
-<a class="jxr_linenumber" name="L705" href="#L705">705</a> 			<strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="L706" href="#L706">706</a> 				<strong class="jxr_keyword">var</strong> v = x.invoke(a);
+<a class="jxr_linenumber" name="L705" href="#L705">705</a> 			safeOptCatch(() -&gt; {
+<a class="jxr_linenumber" name="L706" href="#L706">706</a> 				<strong class="jxr_keyword">var</strong> val = x.invoke(a);
 <a class="jxr_linenumber" name="L707" href="#L707">707</a> 				<strong class="jxr_keyword">var</strong> d = x.<strong class="jxr_keyword">inner</strong>().getDefaultValue();
-<a class="jxr_linenumber" name="L708" href="#L708">708</a> 				<strong class="jxr_keyword">if</strong> (ne(v, d)) {
-<a class="jxr_linenumber" name="L709" href="#L709">709</a> 					<strong class="jxr_keyword">if</strong> (! (isArray(v) &amp;&amp; length(v) == 0 &amp;&amp; length(d) == 0))
-<a class="jxr_linenumber" name="L710" href="#L710">710</a> 						ja.put(x.getName(), v);
-<a class="jxr_linenumber" name="L711" href="#L711">711</a> 				}
-<a class="jxr_linenumber" name="L712" href="#L712">712</a> 			} <strong class="jxr_keyword">catch</strong> (Exception e) {
-<a class="jxr_linenumber" name="L713" href="#L713">713</a> 				ja.put(x.getName(), lm(e));
-<a class="jxr_linenumber" name="L714" href="#L714">714</a> 			}
+<a class="jxr_linenumber" name="L708" href="#L708">708</a> 				<em class="jxr_comment">// Add values only if they're different from the default.</em>
+<a class="jxr_linenumber" name="L709" href="#L709">709</a> 				<strong class="jxr_keyword">if</strong> (ne(val, d)) {
+<a class="jxr_linenumber" name="L710" href="#L710">710</a> 					<strong class="jxr_keyword">if</strong> (! (isArray(val) &amp;&amp; length(val) == 0 &amp;&amp; isArray(d) &amp;&amp; length(d) == 0))
+<a class="jxr_linenumber" name="L711" href="#L711">711</a> 						<strong class="jxr_keyword">return</strong> val;
+<a class="jxr_linenumber" name="L712" href="#L712">712</a> 				}
+<a class="jxr_linenumber" name="L713" href="#L713">713</a> 				<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L714" href="#L714">714</a> 			}, e -&gt; lm(e)).ifPresent(v -&gt; ja.a(x.getName(), v));
 <a class="jxr_linenumber" name="L715" href="#L715">715</a> 		});
-<a class="jxr_linenumber" name="L716" href="#L716">716</a> 		jm.put(<span class="jxr_string">"@"</span> + ca.getNameSimple(), ja);
-<a class="jxr_linenumber" name="L717" href="#L717">717</a> 		<strong class="jxr_keyword">return</strong> jm;
-<a class="jxr_linenumber" name="L718" href="#L718">718</a> 	}
-<a class="jxr_linenumber" name="L719" href="#L719">719</a> 
-<a class="jxr_linenumber" name="L720" href="#L720">720</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L721" href="#L721">721</a> <em class="jxr_javadoccomment">	 * Returns a simple string representation of this annotation showing the annotation type and location.</em>
-<a class="jxr_linenumber" name="L722" href="#L722">722</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L723" href="#L723">723</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L724" href="#L724">724</a> <em class="jxr_javadoccomment">	 * Format: {@code @AnnotationName(on=location)}</em>
-<a class="jxr_linenumber" name="L725" href="#L725">725</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L726" href="#L726">726</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Examples:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L727" href="#L727">727</a> <em class="jxr_javadoccomment">	 * &lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L728" href="#L728">728</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;{@code @Rest(on=MyClass)} - Annotation on a class</em>
-<a class="jxr_linenumber" name="L729" href="#L729">729</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;{@code @RestGet(on=MyClass.myMethod)} - Annotation on a method</em>
-<a class="jxr_linenumber" name="L730" href="#L730">730</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;{@code @Inject(on=MyClass.myField)} - Annotation on a field</em>
-<a class="jxr_linenumber" name="L731" href="#L731">731</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;{@code @PackageAnnotation(on=my.package)} - Annotation on a package</em>
-<a class="jxr_linenumber" name="L732" href="#L732">732</a> <em class="jxr_javadoccomment">	 * &lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L733" href="#L733">733</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L734" href="#L734">734</a> <em class="jxr_javadoccomment">	 * @return A simple string representation of this annotation.</em>
-<a class="jxr_linenumber" name="L735" href="#L735">735</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L736" href="#L736">736</a> 	<strong class="jxr_keyword">public</strong> String toSimpleString() {
-<a class="jxr_linenumber" name="L737" href="#L737">737</a> 		<strong class="jxr_keyword">return</strong> <span class="jxr_string">"@"</span> + cns(a.annotationType()) + <span class="jxr_string">"(on="</span> + annotatable.getLabel() + <span class="jxr_string">")"</span>;
-<a class="jxr_linenumber" name="L738" href="#L738">738</a> 	}
-<a class="jxr_linenumber" name="L739" href="#L739">739</a> 
-<a class="jxr_linenumber" name="L740" href="#L740">740</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L741" href="#L741">741</a> <em class="jxr_javadoccomment">	 * Returns a string representation of this annotation.</em>
-<a class="jxr_linenumber" name="L742" href="#L742">742</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L743" href="#L743">743</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L744" href="#L744">744</a> <em class="jxr_javadoccomment">	 * Returns the map representation created by {@link #toMap()}.</em>
-<a class="jxr_linenumber" name="L745" href="#L745">745</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L746" href="#L746">746</a> <em class="jxr_javadoccomment">	 * @return A string representation of this annotation.</em>
-<a class="jxr_linenumber" name="L747" href="#L747">747</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L748" href="#L748">748</a> 	@Override <em class="jxr_comment">/* Overridden from Object */</em>
-<a class="jxr_linenumber" name="L749" href="#L749">749</a> 	<strong class="jxr_keyword">public</strong> String toString() {
-<a class="jxr_linenumber" name="L750" href="#L750">750</a> 		<strong class="jxr_keyword">return</strong> toMap().toString();
-<a class="jxr_linenumber" name="L751" href="#L751">751</a> 	}
-<a class="jxr_linenumber" name="L752" href="#L752">752</a> }
+<a class="jxr_linenumber" name="L716" href="#L716">716</a> 		<strong class="jxr_keyword">return</strong> filteredBeanPropertyMap()
+<a class="jxr_linenumber" name="L717" href="#L717">717</a> 			.a(s(annotatable.getAnnotatableType()), annotatable.getLabel())
+<a class="jxr_linenumber" name="L718" href="#L718">718</a> 			.a(<span class="jxr_string">"@"</span> + ca.getNameSimple(), ja);
+<a class="jxr_linenumber" name="L719" href="#L719">719</a> 		<em class="jxr_comment">// @formatter:on</em>
+<a class="jxr_linenumber" name="L720" href="#L720">720</a> 	}
+<a class="jxr_linenumber" name="L721" href="#L721">721</a> 
+<a class="jxr_linenumber" name="L722" href="#L722">722</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L723" href="#L723">723</a> <em class="jxr_javadoccomment">	 * Returns a simple string representation of this annotation showing the annotation type and location.</em>
+<a class="jxr_linenumber" name="L724" href="#L724">724</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L725" href="#L725">725</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L726" href="#L726">726</a> <em class="jxr_javadoccomment">	 * Format: {@code @AnnotationName(on=location)}</em>
+<a class="jxr_linenumber" name="L727" href="#L727">727</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L728" href="#L728">728</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Examples:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L729" href="#L729">729</a> <em class="jxr_javadoccomment">	 * &lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L730" href="#L730">730</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;{@code @Rest(on=MyClass)} - Annotation on a class</em>
+<a class="jxr_linenumber" name="L731" href="#L731">731</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;{@code @RestGet(on=MyClass.myMethod)} - Annotation on a method</em>
+<a class="jxr_linenumber" name="L732" href="#L732">732</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;{@code @Inject(on=MyClass.myField)} - Annotation on a field</em>
+<a class="jxr_linenumber" name="L733" href="#L733">733</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;{@code @PackageAnnotation(on=my.package)} - Annotation on a package</em>
+<a class="jxr_linenumber" name="L734" href="#L734">734</a> <em class="jxr_javadoccomment">	 * &lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L735" href="#L735">735</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L736" href="#L736">736</a> <em class="jxr_javadoccomment">	 * @return A simple string representation of this annotation.</em>
+<a class="jxr_linenumber" name="L737" href="#L737">737</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L738" href="#L738">738</a> 	<strong class="jxr_keyword">public</strong> String toSimpleString() {
+<a class="jxr_linenumber" name="L739" href="#L739">739</a> 		<strong class="jxr_keyword">return</strong> <span class="jxr_string">"@"</span> + cns(a.annotationType()) + <span class="jxr_string">"(on="</span> + annotatable.getLabel() + <span class="jxr_string">")"</span>;
+<a class="jxr_linenumber" name="L740" href="#L740">740</a> 	}
+<a class="jxr_linenumber" name="L741" href="#L741">741</a> 
+<a class="jxr_linenumber" name="L742" href="#L742">742</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L743" href="#L743">743</a> <em class="jxr_javadoccomment">	 * Returns a string representation of this annotation.</em>
+<a class="jxr_linenumber" name="L744" href="#L744">744</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L745" href="#L745">745</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L746" href="#L746">746</a> <em class="jxr_javadoccomment">	 * Returns the map representation created by {@link #properties()}.</em>
+<a class="jxr_linenumber" name="L747" href="#L747">747</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L748" href="#L748">748</a> <em class="jxr_javadoccomment">	 * @return A string representation of this annotation.</em>
+<a class="jxr_linenumber" name="L749" href="#L749">749</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L750" href="#L750">750</a> 	@Override <em class="jxr_comment">/* Overridden from Object */</em>
+<a class="jxr_linenumber" name="L751" href="#L751">751</a> 	<strong class="jxr_keyword">public</strong> String toString() {
+<a class="jxr_linenumber" name="L752" href="#L752">752</a> 		<strong class="jxr_keyword">return</strong> r(properties());
+<a class="jxr_linenumber" name="L753" href="#L753">753</a> 	}
+<a class="jxr_linenumber" name="L754" href="#L754">754</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/reflect/ReflectionMap.html b/site/xref/org/apache/juneau/commons/reflect/ReflectionMap.html
index e7733e0de6..9d7da17bd9 100644
--- a/site/xref/org/apache/juneau/commons/reflect/ReflectionMap.html
+++ b/site/xref/org/apache/juneau/commons/reflect/ReflectionMap.html
@@ -35,701 +35,712 @@
 <a class="jxr_linenumber" name="L27" href="#L27">27</a>  <strong class="jxr_keyword">import</strong> java.util.function.*;
 <a class="jxr_linenumber" name="L28" href="#L28">28</a>  <strong class="jxr_keyword">import</strong> java.util.stream.*;
 <a class="jxr_linenumber" name="L29" href="#L29">29</a>  
-<a class="jxr_linenumber" name="L30" href="#L30">30</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.commons.utils.*;
-<a class="jxr_linenumber" name="L31" href="#L31">31</a>  
-<a class="jxr_linenumber" name="L32" href="#L32">32</a>  <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L33" href="#L33">33</a>  <em class="jxr_javadoccomment"> * Maps arbitrary values to classes, methods, fields, and constructors based on name-based patterns.</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"> * This utility allows you to create flexible mappings between reflection elements and custom values.</em>
-<a class="jxr_linenumber" name="L37" href="#L37">37</a>  <em class="jxr_javadoccomment"> * It supports various pattern formats for identifying classes and their members, with intelligent</em>
-<a class="jxr_linenumber" name="L38" href="#L38">38</a>  <em class="jxr_javadoccomment"> * matching that handles inner classes, method signatures, and field names.</em>
-<a class="jxr_linenumber" name="L39" href="#L39">39</a>  <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L40" href="#L40">40</a>  <em class="jxr_javadoccomment"> * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L41" href="#L41">41</a>  <em class="jxr_javadoccomment"> * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L42" href="#L42">42</a>  <em class="jxr_javadoccomment"> * 	&lt;jc&gt;// Create a map that associates visibility levels with specific classes/methods&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L43" href="#L43">43</a>  <em class="jxr_javadoccomment"> * 	ReflectionMap&amp;lt;Visibility&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = ReflectionMap</em>
-<a class="jxr_linenumber" name="L44" href="#L44">44</a>  <em class="jxr_javadoccomment"> * 		.&lt;jsm&gt;create&lt;/jsm&gt;(Visibility.&lt;jk&gt;class&lt;/jk&gt;)</em>
-<a class="jxr_linenumber" name="L45" href="#L45">45</a>  <em class="jxr_javadoccomment"> * 		.append(&lt;js&gt;"com.foo.MyClass"&lt;/js&gt;, Visibility.&lt;jsf&gt;PUBLIC&lt;/jsf&gt;)</em>
-<a class="jxr_linenumber" name="L46" href="#L46">46</a>  <em class="jxr_javadoccomment"> * 		.append(&lt;js&gt;"com.foo.MyClass.secretMethod"&lt;/js&gt;, Visibility.&lt;jsf&gt;PRIVATE&lt;/jsf&gt;)</em>
-<a class="jxr_linenumber" name="L47" href="#L47">47</a>  <em class="jxr_javadoccomment"> * 		.append(&lt;js&gt;"com.foo.MyClass.internalField"&lt;/js&gt;, Visibility.&lt;jsf&gt;PACKAGE&lt;/jsf&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;jc&gt;// Find values for specific reflection elements&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L51" href="#L51">51</a>  <em class="jxr_javadoccomment"> * 	Stream&amp;lt;Visibility&amp;gt; &lt;jv&gt;classVisibility&lt;/jv&gt; = &lt;jv&gt;map&lt;/jv&gt;.find(MyClass.&lt;jk&gt;class&lt;/jk&gt;);</em>
-<a class="jxr_linenumber" name="L52" href="#L52">52</a>  <em class="jxr_javadoccomment"> * 	Stream&amp;lt;Visibility&amp;gt; &lt;jv&gt;methodVisibility&lt;/jv&gt; = &lt;jv&gt;map&lt;/jv&gt;.find(&lt;jv&gt;secretMethod&lt;/jv&gt;);</em>
-<a class="jxr_linenumber" name="L53" href="#L53">53</a>  <em class="jxr_javadoccomment"> * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L54" href="#L54">54</a>  <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L55" href="#L55">55</a>  <em class="jxr_javadoccomment"> * &lt;h5 class='section'&gt;Supported Pattern Formats:&lt;/h5&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;p&gt;</em>
-<a class="jxr_linenumber" name="L58" href="#L58">58</a>  <em class="jxr_javadoccomment"> * The following pattern formats are supported for mapping keys:</em>
-<a class="jxr_linenumber" name="L59" href="#L59">59</a>  <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L60" href="#L60">60</a>  <em class="jxr_javadoccomment"> * &lt;ul class='spaced-list'&gt;</em>
-<a class="jxr_linenumber" name="L61" href="#L61">61</a>  <em class="jxr_javadoccomment"> *  &lt;li&gt;&lt;b&gt;Classes:&lt;/b&gt;</em>
-<a class="jxr_linenumber" name="L62" href="#L62">62</a>  <em class="jxr_javadoccomment"> * 		&lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L63" href="#L63">63</a>  <em class="jxr_javadoccomment"> * 			&lt;li&gt;Fully qualified:</em>
-<a class="jxr_linenumber" name="L64" href="#L64">64</a>  <em class="jxr_javadoccomment"> * 				&lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L65" href="#L65">65</a>  <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"com.foo.MyClass"&lt;/js&gt;</em>
-<a class="jxr_linenumber" name="L66" href="#L66">66</a>  <em class="jxr_javadoccomment"> * 				&lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L67" href="#L67">67</a>  <em class="jxr_javadoccomment"> * 			&lt;li&gt;Fully qualified inner class:</em>
-<a class="jxr_linenumber" name="L68" href="#L68">68</a>  <em class="jxr_javadoccomment"> * 				&lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L69" href="#L69">69</a>  <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"com.foo.MyClass$Inner1$Inner2"&lt;/js&gt;</em>
-<a class="jxr_linenumber" name="L70" href="#L70">70</a>  <em class="jxr_javadoccomment"> * 				&lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L71" href="#L71">71</a>  <em class="jxr_javadoccomment"> * 			&lt;li&gt;Simple class name:</em>
-<a class="jxr_linenumber" name="L72" href="#L72">72</a>  <em class="jxr_javadoccomment"> * 				&lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L73" href="#L73">73</a>  <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"MyClass"&lt;/js&gt;</em>
-<a class="jxr_linenumber" name="L74" href="#L74">74</a>  <em class="jxr_javadoccomment"> * 				&lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L75" href="#L75">75</a>  <em class="jxr_javadoccomment"> * 			&lt;li&gt;Simple inner class:</em>
-<a class="jxr_linenumber" name="L76" href="#L76">76</a>  <em class="jxr_javadoccomment"> * 				&lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L77" href="#L77">77</a>  <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"MyClass$Inner1$Inner2"&lt;/js&gt;</em>
-<a class="jxr_linenumber" name="L78" href="#L78">78</a>  <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"Inner1$Inner2"&lt;/js&gt;</em>
-<a class="jxr_linenumber" name="L79" href="#L79">79</a>  <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"Inner2"&lt;/js&gt;</em>
-<a class="jxr_linenumber" name="L80" href="#L80">80</a>  <em class="jxr_javadoccomment"> * 				&lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L81" href="#L81">81</a>  <em class="jxr_javadoccomment"> * 			&lt;li&gt;All classes wildcard:</em>
-<a class="jxr_linenumber" name="L82" href="#L82">82</a>  <em class="jxr_javadoccomment"> * 				&lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L83" href="#L83">83</a>  <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"*"&lt;/js&gt;</em>
-<a class="jxr_linenumber" name="L84" href="#L84">84</a>  <em class="jxr_javadoccomment"> * 				&lt;/ul&gt;</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"> * 	&lt;li&gt;&lt;b&gt;Methods:&lt;/b&gt;</em>
-<a class="jxr_linenumber" name="L87" href="#L87">87</a>  <em class="jxr_javadoccomment"> * 		&lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L88" href="#L88">88</a>  <em class="jxr_javadoccomment"> * 			&lt;li&gt;Fully qualified with args:</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&gt;&lt;js&gt;"com.foo.MyClass.myMethod(String,int)"&lt;/js&gt;</em>
-<a class="jxr_linenumber" name="L91" href="#L91">91</a>  <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"com.foo.MyClass.myMethod(java.lang.String,int)"&lt;/js&gt;</em>
-<a class="jxr_linenumber" name="L92" href="#L92">92</a>  <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"com.foo.MyClass.myMethod()"&lt;/js&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&gt;Fully qualified without args (matches any args):</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"> * 					&lt;li&gt;&lt;js&gt;"com.foo.MyClass.myMethod"&lt;/js&gt;</em>
-<a class="jxr_linenumber" name="L97" href="#L97">97</a>  <em class="jxr_javadoccomment"> * 				&lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L98" href="#L98">98</a>  <em class="jxr_javadoccomment"> * 			&lt;li&gt;Simple with args:</em>
-<a class="jxr_linenumber" name="L99" href="#L99">99</a>  <em class="jxr_javadoccomment"> * 				&lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L100" href="#L100">100</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"MyClass.myMethod(String,int)"&lt;/js&gt;</em>
-<a class="jxr_linenumber" name="L101" href="#L101">101</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"MyClass.myMethod(java.lang.String,int)"&lt;/js&gt;</em>
-<a class="jxr_linenumber" name="L102" href="#L102">102</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"MyClass.myMethod()"&lt;/js&gt;</em>
-<a class="jxr_linenumber" name="L103" href="#L103">103</a> <em class="jxr_javadoccomment"> * 				&lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L104" href="#L104">104</a> <em class="jxr_javadoccomment"> * 			&lt;li&gt;Simple without args (matches any args):</em>
-<a class="jxr_linenumber" name="L105" href="#L105">105</a> <em class="jxr_javadoccomment"> * 				&lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L106" href="#L106">106</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"MyClass.myMethod"&lt;/js&gt;</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"> * 			&lt;li&gt;Simple inner class:</em>
-<a class="jxr_linenumber" name="L109" href="#L109">109</a> <em class="jxr_javadoccomment"> * 				&lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L110" href="#L110">110</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"MyClass$Inner1$Inner2.myMethod"&lt;/js&gt;</em>
-<a class="jxr_linenumber" name="L111" href="#L111">111</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"Inner1$Inner2.myMethod"&lt;/js&gt;</em>
-<a class="jxr_linenumber" name="L112" href="#L112">112</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"Inner2.myMethod"&lt;/js&gt;</em>
-<a class="jxr_linenumber" name="L113" href="#L113">113</a> <em class="jxr_javadoccomment"> * 				&lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L114" href="#L114">114</a> <em class="jxr_javadoccomment"> * 		&lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L115" href="#L115">115</a> <em class="jxr_javadoccomment"> * 	&lt;li&gt;&lt;b&gt;Fields:&lt;/b&gt;</em>
-<a class="jxr_linenumber" name="L116" href="#L116">116</a> <em class="jxr_javadoccomment"> * 		&lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L117" href="#L117">117</a> <em class="jxr_javadoccomment"> * 			&lt;li&gt;Fully qualified:</em>
-<a class="jxr_linenumber" name="L118" href="#L118">118</a> <em class="jxr_javadoccomment"> * 				&lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L119" href="#L119">119</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"com.foo.MyClass.myField"&lt;/js&gt;</em>
-<a class="jxr_linenumber" name="L120" href="#L120">120</a> <em class="jxr_javadoccomment"> * 				&lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L121" href="#L121">121</a> <em class="jxr_javadoccomment"> * 			&lt;li&gt;Simple:</em>
-<a class="jxr_linenumber" name="L122" href="#L122">122</a> <em class="jxr_javadoccomment"> * 				&lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L123" href="#L123">123</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"MyClass.myField"&lt;/js&gt;</em>
-<a class="jxr_linenumber" name="L124" href="#L124">124</a> <em class="jxr_javadoccomment"> * 				&lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L125" href="#L125">125</a> <em class="jxr_javadoccomment"> * 			&lt;li&gt;Simple inner class:</em>
-<a class="jxr_linenumber" name="L126" href="#L126">126</a> <em class="jxr_javadoccomment"> * 				&lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L127" href="#L127">127</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"MyClass$Inner1$Inner2.myField"&lt;/js&gt;</em>
-<a class="jxr_linenumber" name="L128" href="#L128">128</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"Inner1$Inner2.myField"&lt;/js&gt;</em>
-<a class="jxr_linenumber" name="L129" href="#L129">129</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"Inner2.myField"&lt;/js&gt;</em>
-<a class="jxr_linenumber" name="L130" href="#L130">130</a> <em class="jxr_javadoccomment"> * 				&lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L131" href="#L131">131</a> <em class="jxr_javadoccomment"> * 		&lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L132" href="#L132">132</a> <em class="jxr_javadoccomment"> * 	&lt;li&gt;&lt;b&gt;Constructors:&lt;/b&gt;</em>
-<a class="jxr_linenumber" name="L133" href="#L133">133</a> <em class="jxr_javadoccomment"> * 		&lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L134" href="#L134">134</a> <em class="jxr_javadoccomment"> * 			&lt;li&gt;Fully qualified with args:</em>
-<a class="jxr_linenumber" name="L135" href="#L135">135</a> <em class="jxr_javadoccomment"> * 				&lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L136" href="#L136">136</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"com.foo.MyClass(String,int)"&lt;/js&gt;</em>
-<a class="jxr_linenumber" name="L137" href="#L137">137</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"com.foo.MyClass(java.lang.String,int)"&lt;/js&gt;</em>
-<a class="jxr_linenumber" name="L138" href="#L138">138</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"com.foo.MyClass()"&lt;/js&gt;</em>
-<a class="jxr_linenumber" name="L139" href="#L139">139</a> <em class="jxr_javadoccomment"> * 				&lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L140" href="#L140">140</a> <em class="jxr_javadoccomment"> * 			&lt;li&gt;Simple with args:</em>
-<a class="jxr_linenumber" name="L141" href="#L141">141</a> <em class="jxr_javadoccomment"> * 				&lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L142" href="#L142">142</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"MyClass(String,int)"&lt;/js&gt;</em>
-<a class="jxr_linenumber" name="L143" href="#L143">143</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"MyClass(java.lang.String,int)"&lt;/js&gt;</em>
-<a class="jxr_linenumber" name="L144" href="#L144">144</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"MyClass()"&lt;/js&gt;</em>
-<a class="jxr_linenumber" name="L145" href="#L145">145</a> <em class="jxr_javadoccomment"> * 				&lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L146" href="#L146">146</a> <em class="jxr_javadoccomment"> * 			&lt;li&gt;Simple inner class:</em>
-<a class="jxr_linenumber" name="L147" href="#L147">147</a> <em class="jxr_javadoccomment"> * 				&lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L148" href="#L148">148</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"MyClass$Inner1$Inner2()"&lt;/js&gt;</em>
-<a class="jxr_linenumber" name="L149" href="#L149">149</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"Inner1$Inner2()"&lt;/js&gt;</em>
-<a class="jxr_linenumber" name="L150" href="#L150">150</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"Inner2()"&lt;/js&gt;</em>
-<a class="jxr_linenumber" name="L151" href="#L151">151</a> <em class="jxr_javadoccomment"> * 				&lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L152" href="#L152">152</a> <em class="jxr_javadoccomment"> * 		&lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L153" href="#L153">153</a> <em class="jxr_javadoccomment"> * 	&lt;li&gt;&lt;b&gt;Multiple patterns:&lt;/b&gt;</em>
-<a class="jxr_linenumber" name="L154" href="#L154">154</a> <em class="jxr_javadoccomment"> * 		&lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L155" href="#L155">155</a> <em class="jxr_javadoccomment"> * 			&lt;li&gt;A comma-delimited list of any patterns above:</em>
-<a class="jxr_linenumber" name="L156" href="#L156">156</a> <em class="jxr_javadoccomment"> * 				&lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L157" href="#L157">157</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"com.foo.MyClass, com.bar.OtherClass"&lt;/js&gt;</em>
-<a class="jxr_linenumber" name="L158" href="#L158">158</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"MyClass.method1, MyClass.method2, MyClass.field1"&lt;/js&gt;</em>
-<a class="jxr_linenumber" name="L159" href="#L159">159</a> <em class="jxr_javadoccomment"> * 				&lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L160" href="#L160">160</a> <em class="jxr_javadoccomment"> * 		&lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L161" href="#L161">161</a> <em class="jxr_javadoccomment"> * &lt;/ul&gt;</em>
-<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"> * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L164" href="#L164">164</a> <em class="jxr_javadoccomment"> * &lt;ul class='spaced-list'&gt;</em>
-<a class="jxr_linenumber" name="L165" href="#L165">165</a> <em class="jxr_javadoccomment"> * 	&lt;li&gt;Method and constructor patterns without parentheses match any method signature.</em>
-<a class="jxr_linenumber" name="L166" href="#L166">166</a> <em class="jxr_javadoccomment"> * 	&lt;li&gt;Method and constructor argument types can be specified with simple or fully qualified names.</em>
-<a class="jxr_linenumber" name="L167" href="#L167">167</a> <em class="jxr_javadoccomment"> * 	&lt;li&gt;Array types in signatures use either &lt;js&gt;"Type[]"&lt;/js&gt; or JVM notation like &lt;js&gt;"[LType;"&lt;/js&gt;.</em>
-<a class="jxr_linenumber" name="L168" href="#L168">168</a> <em class="jxr_javadoccomment"> * 	&lt;li&gt;Generic type parameters are stripped from method signatures during matching.</em>
-<a class="jxr_linenumber" name="L169" href="#L169">169</a> <em class="jxr_javadoccomment"> * 	&lt;li&gt;Patterns are case-sensitive.</em>
-<a class="jxr_linenumber" name="L170" href="#L170">170</a> <em class="jxr_javadoccomment"> * &lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L171" href="#L171">171</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L172" href="#L172">172</a> <em class="jxr_javadoccomment"> * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L173" href="#L173">173</a> <em class="jxr_javadoccomment"> * &lt;ul class='seealso'&gt;</em>
-<a class="jxr_linenumber" name="L174" href="#L174">174</a> <em class="jxr_javadoccomment"> * 	&lt;li class='jc'&gt;{@link ClassInfo}</em>
-<a class="jxr_linenumber" name="L175" href="#L175">175</a> <em class="jxr_javadoccomment"> * 	&lt;li class='jc'&gt;{@link MethodInfo}</em>
-<a class="jxr_linenumber" name="L176" href="#L176">176</a> <em class="jxr_javadoccomment"> * 	&lt;li class='jc'&gt;{@link FieldInfo}</em>
-<a class="jxr_linenumber" name="L177" href="#L177">177</a> <em class="jxr_javadoccomment"> * 	&lt;li class='jc'&gt;{@link ConstructorInfo}</em>
-<a class="jxr_linenumber" name="L178" href="#L178">178</a> <em class="jxr_javadoccomment"> * &lt;/ul&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"> * @param &lt;V&gt; The type of values stored in this map.</em>
-<a class="jxr_linenumber" name="L181" href="#L181">181</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L182" href="#L182">182</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> ReflectionMap&lt;V&gt; {
-<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">	 * Builder for creating {@link ReflectionMap} instances.</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;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L188" href="#L188">188</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L189" href="#L189">189</a> <em class="jxr_javadoccomment">	 * 	ReflectionMap&amp;lt;String&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = ReflectionMap</em>
-<a class="jxr_linenumber" name="L190" href="#L190">190</a> <em class="jxr_javadoccomment">	 * 		.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;)</em>
-<a class="jxr_linenumber" name="L191" href="#L191">191</a> <em class="jxr_javadoccomment">	 * 		.append(&lt;js&gt;"MyClass"&lt;/js&gt;, &lt;js&gt;"value1"&lt;/js&gt;)</em>
-<a class="jxr_linenumber" name="L192" href="#L192">192</a> <em class="jxr_javadoccomment">	 * 		.append(&lt;js&gt;"MyClass.myMethod"&lt;/js&gt;, &lt;js&gt;"value2"&lt;/js&gt;)</em>
-<a class="jxr_linenumber" name="L193" href="#L193">193</a> <em class="jxr_javadoccomment">	 * 		.build();</em>
-<a class="jxr_linenumber" name="L194" href="#L194">194</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</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">	 * @param &lt;V&gt; The type of values stored in this map.</em>
-<a class="jxr_linenumber" name="L197" href="#L197">197</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L198" href="#L198">198</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> Builder&lt;V&gt; {
-<a class="jxr_linenumber" name="L199" href="#L199">199</a> 		<strong class="jxr_keyword">final</strong> List&lt;ClassEntry&lt;V&gt;&gt; classEntries;
-<a class="jxr_linenumber" name="L200" href="#L200">200</a> 		<strong class="jxr_keyword">final</strong> List&lt;MethodEntry&lt;V&gt;&gt; methodEntries;
-<a class="jxr_linenumber" name="L201" href="#L201">201</a> 		<strong class="jxr_keyword">final</strong> List&lt;FieldEntry&lt;V&gt;&gt; fieldEntries;
-<a class="jxr_linenumber" name="L202" href="#L202">202</a> 		<strong class="jxr_keyword">final</strong> List&lt;ConstructorEntry&lt;V&gt;&gt; constructorEntries;
-<a class="jxr_linenumber" name="L203" href="#L203">203</a> 
-<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> <em class="jxr_javadoccomment">		 * Constructor.</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> 		<strong class="jxr_keyword">protected</strong> Builder() {
-<a class="jxr_linenumber" name="L208" href="#L208">208</a> 			classEntries = list();
-<a class="jxr_linenumber" name="L209" href="#L209">209</a> 			methodEntries = list();
-<a class="jxr_linenumber" name="L210" href="#L210">210</a> 			fieldEntries = list();
-<a class="jxr_linenumber" name="L211" href="#L211">211</a> 			constructorEntries = list();
-<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> 		<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L215" href="#L215">215</a> <em class="jxr_javadoccomment">		 * Adds one or more mappings to this builder.</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">		 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L218" href="#L218">218</a> <em class="jxr_javadoccomment">		 * This method accepts pattern strings that identify classes, methods, fields, or constructors,</em>
-<a class="jxr_linenumber" name="L219" href="#L219">219</a> <em class="jxr_javadoccomment">		 * and associates them with the specified value. Multiple patterns can be specified in a single</em>
-<a class="jxr_linenumber" name="L220" href="#L220">220</a> <em class="jxr_javadoccomment">		 * key using comma-delimited format.</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> <em class="jxr_javadoccomment">		 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L223" href="#L223">223</a> <em class="jxr_javadoccomment">		 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L224" href="#L224">224</a> <em class="jxr_javadoccomment">		 * 	Builder&amp;lt;String&amp;gt; &lt;jv&gt;builder&lt;/jv&gt; = ReflectionMap.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;);</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> <em class="jxr_javadoccomment">		 * 	&lt;jc&gt;// Map a class&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L227" href="#L227">227</a> <em class="jxr_javadoccomment">		 * 	&lt;jv&gt;builder&lt;/jv&gt;.append(&lt;js&gt;"com.foo.MyClass"&lt;/js&gt;, &lt;js&gt;"classValue"&lt;/js&gt;);</em>
-<a class="jxr_linenumber" name="L228" href="#L228">228</a> <em class="jxr_javadoccomment">		 *</em>
-<a class="jxr_linenumber" name="L229" href="#L229">229</a> <em class="jxr_javadoccomment">		 * 	&lt;jc&gt;// Map a specific method&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L230" href="#L230">230</a> <em class="jxr_javadoccomment">		 * 	&lt;jv&gt;builder&lt;/jv&gt;.append(&lt;js&gt;"MyClass.myMethod(String,int)"&lt;/js&gt;, &lt;js&gt;"methodValue"&lt;/js&gt;);</em>
-<a class="jxr_linenumber" name="L231" href="#L231">231</a> <em class="jxr_javadoccomment">		 *</em>
-<a class="jxr_linenumber" name="L232" href="#L232">232</a> <em class="jxr_javadoccomment">		 * 	&lt;jc&gt;// Map multiple patterns at once&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L233" href="#L233">233</a> <em class="jxr_javadoccomment">		 * 	&lt;jv&gt;builder&lt;/jv&gt;.append(&lt;js&gt;"MyClass.field1, MyClass.field2, MyClass.field3"&lt;/js&gt;, &lt;js&gt;"fieldValue"&lt;/js&gt;);</em>
-<a class="jxr_linenumber" name="L234" href="#L234">234</a> <em class="jxr_javadoccomment">		 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L235" href="#L235">235</a> <em class="jxr_javadoccomment">		 *</em>
-<a class="jxr_linenumber" name="L236" href="#L236">236</a> <em class="jxr_javadoccomment">		 * @param key</em>
-<a class="jxr_linenumber" name="L237" href="#L237">237</a> <em class="jxr_javadoccomment">		 * 	The mapping key pattern(s).</em>
-<a class="jxr_linenumber" name="L238" href="#L238">238</a> <em class="jxr_javadoccomment">		 * 	&lt;br&gt;Can be any of the following:</em>
-<a class="jxr_linenumber" name="L239" href="#L239">239</a> <em class="jxr_javadoccomment">		 * 	&lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L240" href="#L240">240</a> <em class="jxr_javadoccomment">		 * 		&lt;li&gt;Fully qualified class name (e.g., &lt;js&gt;"com.foo.MyClass"&lt;/js&gt;)</em>
-<a class="jxr_linenumber" name="L241" href="#L241">241</a> <em class="jxr_javadoccomment">		 * 		&lt;li&gt;Simple class name (e.g., &lt;js&gt;"MyClass"&lt;/js&gt;)</em>
-<a class="jxr_linenumber" name="L242" href="#L242">242</a> <em class="jxr_javadoccomment">		 * 		&lt;li&gt;All classes wildcard (e.g., &lt;js&gt;"*"&lt;/js&gt;)</em>
-<a class="jxr_linenumber" name="L243" href="#L243">243</a> <em class="jxr_javadoccomment">		 * 		&lt;li&gt;Method with signature (e.g., &lt;js&gt;"com.foo.MyClass.myMethod(String,int)"&lt;/js&gt;)</em>
-<a class="jxr_linenumber" name="L244" href="#L244">244</a> <em class="jxr_javadoccomment">		 * 		&lt;li&gt;Method without signature (e.g., &lt;js&gt;"MyClass.myMethod"&lt;/js&gt;) - matches any signature</em>
-<a class="jxr_linenumber" name="L245" href="#L245">245</a> <em class="jxr_javadoccomment">		 * 		&lt;li&gt;Field (e.g., &lt;js&gt;"MyClass.myField"&lt;/js&gt;)</em>
-<a class="jxr_linenumber" name="L246" href="#L246">246</a> <em class="jxr_javadoccomment">		 * 		&lt;li&gt;Constructor (e.g., &lt;js&gt;"MyClass(String,int)"&lt;/js&gt;)</em>
-<a class="jxr_linenumber" name="L247" href="#L247">247</a> <em class="jxr_javadoccomment">		 * 		&lt;li&gt;Comma-delimited list of any of the above (e.g., &lt;js&gt;"MyClass, MyClass.method1, MyClass.field1"&lt;/js&gt;)</em>
-<a class="jxr_linenumber" name="L248" href="#L248">248</a> <em class="jxr_javadoccomment">		 * 	&lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L249" href="#L249">249</a> <em class="jxr_javadoccomment">		 * @param value</em>
-<a class="jxr_linenumber" name="L250" href="#L250">250</a> <em class="jxr_javadoccomment">		 * 	The value to associate with the matching reflection element(s).</em>
-<a class="jxr_linenumber" name="L251" href="#L251">251</a> <em class="jxr_javadoccomment">		 * 	&lt;br&gt;Can be &lt;jk&gt;null&lt;/jk&gt;.</em>
-<a class="jxr_linenumber" name="L252" href="#L252">252</a> <em class="jxr_javadoccomment">		 * @return This object.</em>
-<a class="jxr_linenumber" name="L253" href="#L253">253</a> <em class="jxr_javadoccomment">		 * @throws RuntimeException If the key pattern is invalid or empty.</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> 		<strong class="jxr_keyword">public</strong> Builder&lt;V&gt; append(String key, V value) {
-<a class="jxr_linenumber" name="L256" href="#L256">256</a> 			<strong class="jxr_keyword">if</strong> (Utils.isEmpty(key))  <em class="jxr_comment">// NOAI</em>
-<a class="jxr_linenumber" name="L257" href="#L257">257</a> 				<strong class="jxr_keyword">throw</strong> rex(<span class="jxr_string">"Invalid reflection signature: [{0}]"</span>, key);
-<a class="jxr_linenumber" name="L258" href="#L258">258</a> 			<strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="L259" href="#L259">259</a> 				splitNames(key, k -&gt; {
-<a class="jxr_linenumber" name="L260" href="#L260">260</a> 					<strong class="jxr_keyword">if</strong> (k.endsWith(<span class="jxr_string">")"</span>)) {
-<a class="jxr_linenumber" name="L261" href="#L261">261</a> 						<strong class="jxr_keyword">int</strong> i = k.substring(0, k.indexOf('(')).lastIndexOf('.');
-<a class="jxr_linenumber" name="L262" href="#L262">262</a> 						<strong class="jxr_keyword">if</strong> (i == -1 || isUpperCase(k.charAt(i + 1))) {
-<a class="jxr_linenumber" name="L263" href="#L263">263</a> 							constructorEntries.add(<strong class="jxr_keyword">new</strong> ConstructorEntry&lt;&gt;(k, value));
-<a class="jxr_linenumber" name="L264" href="#L264">264</a> 						} <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="L265" href="#L265">265</a> 							methodEntries.add(<strong class="jxr_keyword">new</strong> MethodEntry&lt;&gt;(k, value));
-<a class="jxr_linenumber" name="L266" href="#L266">266</a> 						}
-<a class="jxr_linenumber" name="L267" href="#L267">267</a> 					} <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="L268" href="#L268">268</a> 						<strong class="jxr_keyword">var</strong> i = k.lastIndexOf('.');
-<a class="jxr_linenumber" name="L269" href="#L269">269</a> 						<strong class="jxr_keyword">if</strong> (i == -1) {
-<a class="jxr_linenumber" name="L270" href="#L270">270</a> 							classEntries.add(<strong class="jxr_keyword">new</strong> ClassEntry&lt;&gt;(k, value));
-<a class="jxr_linenumber" name="L271" href="#L271">271</a> 						} <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (isUpperCase(k.charAt(i + 1))) {
-<a class="jxr_linenumber" name="L272" href="#L272">272</a> 							classEntries.add(<strong class="jxr_keyword">new</strong> ClassEntry&lt;&gt;(k, value));
-<a class="jxr_linenumber" name="L273" href="#L273">273</a> 							fieldEntries.add(<strong class="jxr_keyword">new</strong> FieldEntry&lt;&gt;(k, value));
-<a class="jxr_linenumber" name="L274" href="#L274">274</a> 						} <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="L275" href="#L275">275</a> 							methodEntries.add(<strong class="jxr_keyword">new</strong> MethodEntry&lt;&gt;(k, value));
-<a class="jxr_linenumber" name="L276" href="#L276">276</a> 							fieldEntries.add(<strong class="jxr_keyword">new</strong> FieldEntry&lt;&gt;(k, value));
-<a class="jxr_linenumber" name="L277" href="#L277">277</a> 						}
-<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> 			} <strong class="jxr_keyword">catch</strong> (@SuppressWarnings(<span class="jxr_string">"unused"</span>) IndexOutOfBoundsException e) {
-<a class="jxr_linenumber" name="L281" href="#L281">281</a> 				<strong class="jxr_keyword">throw</strong> rex(<span class="jxr_string">"Invalid reflection signature: [{0}]"</span>, key);
-<a class="jxr_linenumber" name="L282" href="#L282">282</a> 			}
-<a class="jxr_linenumber" name="L283" href="#L283">283</a> 
-<a class="jxr_linenumber" name="L284" href="#L284">284</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</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> 		<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L288" href="#L288">288</a> <em class="jxr_javadoccomment">		 * Builds a new {@link ReflectionMap} from the current state of this builder.</em>
-<a class="jxr_linenumber" name="L289" href="#L289">289</a> <em class="jxr_javadoccomment">		 *</em>
-<a class="jxr_linenumber" name="L290" href="#L290">290</a> <em class="jxr_javadoccomment">		 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L291" href="#L291">291</a> <em class="jxr_javadoccomment">		 * Multiple calls to this method will create independent copies of the map.</em>
-<a class="jxr_linenumber" name="L292" href="#L292">292</a> <em class="jxr_javadoccomment">		 *</em>
-<a class="jxr_linenumber" name="L293" href="#L293">293</a> <em class="jxr_javadoccomment">		 * @return A new immutable {@link ReflectionMap} instance.</em>
-<a class="jxr_linenumber" name="L294" href="#L294">294</a> <em class="jxr_javadoccomment">		 */</em>
-<a class="jxr_linenumber" name="L295" href="#L295">295</a> 		<strong class="jxr_keyword">public</strong> ReflectionMap&lt;V&gt; build() {
-<a class="jxr_linenumber" name="L296" href="#L296">296</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> ReflectionMap&lt;&gt;(<strong class="jxr_keyword">this</strong>);
-<a class="jxr_linenumber" name="L297" href="#L297">297</a> 		}
-<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> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> ClassEntry&lt;V&gt; {
-<a class="jxr_linenumber" name="L301" href="#L301">301</a> 		<strong class="jxr_keyword">final</strong> String simpleName, fullName;
-<a class="jxr_linenumber" name="L302" href="#L302">302</a> 		<strong class="jxr_keyword">final</strong> V value;
-<a class="jxr_linenumber" name="L303" href="#L303">303</a> 
-<a class="jxr_linenumber" name="L304" href="#L304">304</a> 		ClassEntry(String name, V value) {
-<a class="jxr_linenumber" name="L305" href="#L305">305</a> 			<strong class="jxr_keyword">this</strong>.simpleName = simpleClassName(name);
-<a class="jxr_linenumber" name="L306" href="#L306">306</a> 			<strong class="jxr_keyword">this</strong>.fullName = name;
-<a class="jxr_linenumber" name="L307" href="#L307">307</a> 			<strong class="jxr_keyword">this</strong>.value = value;
-<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> 		<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> matches(Class&lt;?&gt; c) {
-<a class="jxr_linenumber" name="L311" href="#L311">311</a> 			<strong class="jxr_keyword">if</strong> (c == <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L312" href="#L312">312</a> 				<strong class="jxr_keyword">return</strong> false;
-<a class="jxr_linenumber" name="L313" href="#L313">313</a> 			<strong class="jxr_keyword">return</strong> classMatches(simpleName, fullName, c);
-<a class="jxr_linenumber" name="L314" href="#L314">314</a> 		}
-<a class="jxr_linenumber" name="L315" href="#L315">315</a> 
-<a class="jxr_linenumber" name="L316" href="#L316">316</a> 		@Override
-<a class="jxr_linenumber" name="L317" href="#L317">317</a> 		<strong class="jxr_keyword">public</strong> String toString() {
+<a class="jxr_linenumber" name="L30" href="#L30">30</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.commons.collections.*;
+<a class="jxr_linenumber" name="L31" href="#L31">31</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.commons.utils.*;
+<a class="jxr_linenumber" name="L32" href="#L32">32</a>  
+<a class="jxr_linenumber" name="L33" href="#L33">33</a>  <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L34" href="#L34">34</a>  <em class="jxr_javadoccomment"> * Maps arbitrary values to classes, methods, fields, and constructors based on name-based patterns.</em>
+<a class="jxr_linenumber" name="L35" href="#L35">35</a>  <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L36" href="#L36">36</a>  <em class="jxr_javadoccomment"> * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L37" href="#L37">37</a>  <em class="jxr_javadoccomment"> * This utility allows you to create flexible mappings between reflection elements and custom values.</em>
+<a class="jxr_linenumber" name="L38" href="#L38">38</a>  <em class="jxr_javadoccomment"> * It supports various pattern formats for identifying classes and their members, with intelligent</em>
+<a class="jxr_linenumber" name="L39" href="#L39">39</a>  <em class="jxr_javadoccomment"> * matching that handles inner classes, method signatures, and field names.</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;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L42" href="#L42">42</a>  <em class="jxr_javadoccomment"> * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L43" href="#L43">43</a>  <em class="jxr_javadoccomment"> * 	&lt;jc&gt;// Create a map that associates visibility levels with specific classes/methods&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L44" href="#L44">44</a>  <em class="jxr_javadoccomment"> * 	ReflectionMap&amp;lt;Visibility&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = ReflectionMap</em>
+<a class="jxr_linenumber" name="L45" href="#L45">45</a>  <em class="jxr_javadoccomment"> * 		.&lt;jsm&gt;create&lt;/jsm&gt;(Visibility.&lt;jk&gt;class&lt;/jk&gt;)</em>
+<a class="jxr_linenumber" name="L46" href="#L46">46</a>  <em class="jxr_javadoccomment"> * 		.append(&lt;js&gt;"com.foo.MyClass"&lt;/js&gt;, Visibility.&lt;jsf&gt;PUBLIC&lt;/jsf&gt;)</em>
+<a class="jxr_linenumber" name="L47" href="#L47">47</a>  <em class="jxr_javadoccomment"> * 		.append(&lt;js&gt;"com.foo.MyClass.secretMethod"&lt;/js&gt;, Visibility.&lt;jsf&gt;PRIVATE&lt;/jsf&gt;)</em>
+<a class="jxr_linenumber" name="L48" href="#L48">48</a>  <em class="jxr_javadoccomment"> * 		.append(&lt;js&gt;"com.foo.MyClass.internalField"&lt;/js&gt;, Visibility.&lt;jsf&gt;PACKAGE&lt;/jsf&gt;)</em>
+<a class="jxr_linenumber" name="L49" href="#L49">49</a>  <em class="jxr_javadoccomment"> * 		.build();</em>
+<a class="jxr_linenumber" name="L50" href="#L50">50</a>  <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L51" href="#L51">51</a>  <em class="jxr_javadoccomment"> * 	&lt;jc&gt;// Find values for specific reflection elements&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L52" href="#L52">52</a>  <em class="jxr_javadoccomment"> * 	Stream&amp;lt;Visibility&amp;gt; &lt;jv&gt;classVisibility&lt;/jv&gt; = &lt;jv&gt;map&lt;/jv&gt;.find(MyClass.&lt;jk&gt;class&lt;/jk&gt;);</em>
+<a class="jxr_linenumber" name="L53" href="#L53">53</a>  <em class="jxr_javadoccomment"> * 	Stream&amp;lt;Visibility&amp;gt; &lt;jv&gt;methodVisibility&lt;/jv&gt; = &lt;jv&gt;map&lt;/jv&gt;.find(&lt;jv&gt;secretMethod&lt;/jv&gt;);</em>
+<a class="jxr_linenumber" name="L54" href="#L54">54</a>  <em class="jxr_javadoccomment"> * &lt;/p&gt;</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;h5 class='section'&gt;Supported Pattern Formats:&lt;/h5&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;p&gt;</em>
+<a class="jxr_linenumber" name="L59" href="#L59">59</a>  <em class="jxr_javadoccomment"> * The following pattern formats are supported for mapping keys:</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;ul class='spaced-list'&gt;</em>
+<a class="jxr_linenumber" name="L62" href="#L62">62</a>  <em class="jxr_javadoccomment"> *  &lt;li&gt;&lt;b&gt;Classes:&lt;/b&gt;</em>
+<a class="jxr_linenumber" name="L63" href="#L63">63</a>  <em class="jxr_javadoccomment"> * 		&lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L64" href="#L64">64</a>  <em class="jxr_javadoccomment"> * 			&lt;li&gt;Fully qualified:</em>
+<a class="jxr_linenumber" name="L65" href="#L65">65</a>  <em class="jxr_javadoccomment"> * 				&lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L66" href="#L66">66</a>  <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"com.foo.MyClass"&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L67" href="#L67">67</a>  <em class="jxr_javadoccomment"> * 				&lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L68" href="#L68">68</a>  <em class="jxr_javadoccomment"> * 			&lt;li&gt;Fully qualified inner class:</em>
+<a class="jxr_linenumber" name="L69" href="#L69">69</a>  <em class="jxr_javadoccomment"> * 				&lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L70" href="#L70">70</a>  <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"com.foo.MyClass$Inner1$Inner2"&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L71" href="#L71">71</a>  <em class="jxr_javadoccomment"> * 				&lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L72" href="#L72">72</a>  <em class="jxr_javadoccomment"> * 			&lt;li&gt;Simple class name:</em>
+<a class="jxr_linenumber" name="L73" href="#L73">73</a>  <em class="jxr_javadoccomment"> * 				&lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L74" href="#L74">74</a>  <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"MyClass"&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L75" href="#L75">75</a>  <em class="jxr_javadoccomment"> * 				&lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L76" href="#L76">76</a>  <em class="jxr_javadoccomment"> * 			&lt;li&gt;Simple inner class:</em>
+<a class="jxr_linenumber" name="L77" href="#L77">77</a>  <em class="jxr_javadoccomment"> * 				&lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L78" href="#L78">78</a>  <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"MyClass$Inner1$Inner2"&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L79" href="#L79">79</a>  <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"Inner1$Inner2"&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L80" href="#L80">80</a>  <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"Inner2"&lt;/js&gt;</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"> * 			&lt;li&gt;All classes wildcard:</em>
+<a class="jxr_linenumber" name="L83" href="#L83">83</a>  <em class="jxr_javadoccomment"> * 				&lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L84" href="#L84">84</a>  <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"*"&lt;/js&gt;</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"> * 		&lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L87" href="#L87">87</a>  <em class="jxr_javadoccomment"> * 	&lt;li&gt;&lt;b&gt;Methods:&lt;/b&gt;</em>
+<a class="jxr_linenumber" name="L88" href="#L88">88</a>  <em class="jxr_javadoccomment"> * 		&lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L89" href="#L89">89</a>  <em class="jxr_javadoccomment"> * 			&lt;li&gt;Fully qualified with args:</em>
+<a class="jxr_linenumber" name="L90" href="#L90">90</a>  <em class="jxr_javadoccomment"> * 				&lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L91" href="#L91">91</a>  <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"com.foo.MyClass.myMethod(String,int)"&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L92" href="#L92">92</a>  <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"com.foo.MyClass.myMethod(java.lang.String,int)"&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L93" href="#L93">93</a>  <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"com.foo.MyClass.myMethod()"&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L94" href="#L94">94</a>  <em class="jxr_javadoccomment"> * 				&lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L95" href="#L95">95</a>  <em class="jxr_javadoccomment"> * 			&lt;li&gt;Fully qualified without args (matches any args):</em>
+<a class="jxr_linenumber" name="L96" href="#L96">96</a>  <em class="jxr_javadoccomment"> * 				&lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L97" href="#L97">97</a>  <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"com.foo.MyClass.myMethod"&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L98" href="#L98">98</a>  <em class="jxr_javadoccomment"> * 				&lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L99" href="#L99">99</a>  <em class="jxr_javadoccomment"> * 			&lt;li&gt;Simple with args:</em>
+<a class="jxr_linenumber" name="L100" href="#L100">100</a> <em class="jxr_javadoccomment"> * 				&lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L101" href="#L101">101</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"MyClass.myMethod(String,int)"&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L102" href="#L102">102</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"MyClass.myMethod(java.lang.String,int)"&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L103" href="#L103">103</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"MyClass.myMethod()"&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L104" href="#L104">104</a> <em class="jxr_javadoccomment"> * 				&lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L105" href="#L105">105</a> <em class="jxr_javadoccomment"> * 			&lt;li&gt;Simple without args (matches any args):</em>
+<a class="jxr_linenumber" name="L106" href="#L106">106</a> <em class="jxr_javadoccomment"> * 				&lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L107" href="#L107">107</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"MyClass.myMethod"&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L108" href="#L108">108</a> <em class="jxr_javadoccomment"> * 				&lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L109" href="#L109">109</a> <em class="jxr_javadoccomment"> * 			&lt;li&gt;Simple inner class:</em>
+<a class="jxr_linenumber" name="L110" href="#L110">110</a> <em class="jxr_javadoccomment"> * 				&lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L111" href="#L111">111</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"MyClass$Inner1$Inner2.myMethod"&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L112" href="#L112">112</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"Inner1$Inner2.myMethod"&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L113" href="#L113">113</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"Inner2.myMethod"&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L114" href="#L114">114</a> <em class="jxr_javadoccomment"> * 				&lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L115" href="#L115">115</a> <em class="jxr_javadoccomment"> * 		&lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L116" href="#L116">116</a> <em class="jxr_javadoccomment"> * 	&lt;li&gt;&lt;b&gt;Fields:&lt;/b&gt;</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"> * 			&lt;li&gt;Fully qualified:</em>
+<a class="jxr_linenumber" name="L119" href="#L119">119</a> <em class="jxr_javadoccomment"> * 				&lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L120" href="#L120">120</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"com.foo.MyClass.myField"&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L121" href="#L121">121</a> <em class="jxr_javadoccomment"> * 				&lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L122" href="#L122">122</a> <em class="jxr_javadoccomment"> * 			&lt;li&gt;Simple:</em>
+<a class="jxr_linenumber" name="L123" href="#L123">123</a> <em class="jxr_javadoccomment"> * 				&lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L124" href="#L124">124</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"MyClass.myField"&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L125" href="#L125">125</a> <em class="jxr_javadoccomment"> * 				&lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L126" href="#L126">126</a> <em class="jxr_javadoccomment"> * 			&lt;li&gt;Simple inner class:</em>
+<a class="jxr_linenumber" name="L127" href="#L127">127</a> <em class="jxr_javadoccomment"> * 				&lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L128" href="#L128">128</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"MyClass$Inner1$Inner2.myField"&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L129" href="#L129">129</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"Inner1$Inner2.myField"&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L130" href="#L130">130</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"Inner2.myField"&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L131" href="#L131">131</a> <em class="jxr_javadoccomment"> * 				&lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L132" href="#L132">132</a> <em class="jxr_javadoccomment"> * 		&lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L133" href="#L133">133</a> <em class="jxr_javadoccomment"> * 	&lt;li&gt;&lt;b&gt;Constructors:&lt;/b&gt;</em>
+<a class="jxr_linenumber" name="L134" href="#L134">134</a> <em class="jxr_javadoccomment"> * 		&lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L135" href="#L135">135</a> <em class="jxr_javadoccomment"> * 			&lt;li&gt;Fully qualified with args:</em>
+<a class="jxr_linenumber" name="L136" href="#L136">136</a> <em class="jxr_javadoccomment"> * 				&lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L137" href="#L137">137</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"com.foo.MyClass(String,int)"&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L138" href="#L138">138</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"com.foo.MyClass(java.lang.String,int)"&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L139" href="#L139">139</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"com.foo.MyClass()"&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L140" href="#L140">140</a> <em class="jxr_javadoccomment"> * 				&lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L141" href="#L141">141</a> <em class="jxr_javadoccomment"> * 			&lt;li&gt;Simple with args:</em>
+<a class="jxr_linenumber" name="L142" href="#L142">142</a> <em class="jxr_javadoccomment"> * 				&lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L143" href="#L143">143</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"MyClass(String,int)"&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L144" href="#L144">144</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"MyClass(java.lang.String,int)"&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L145" href="#L145">145</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"MyClass()"&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L146" href="#L146">146</a> <em class="jxr_javadoccomment"> * 				&lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L147" href="#L147">147</a> <em class="jxr_javadoccomment"> * 			&lt;li&gt;Simple inner class:</em>
+<a class="jxr_linenumber" name="L148" href="#L148">148</a> <em class="jxr_javadoccomment"> * 				&lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L149" href="#L149">149</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"MyClass$Inner1$Inner2()"&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L150" href="#L150">150</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"Inner1$Inner2()"&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L151" href="#L151">151</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"Inner2()"&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L152" href="#L152">152</a> <em class="jxr_javadoccomment"> * 				&lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L153" href="#L153">153</a> <em class="jxr_javadoccomment"> * 		&lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L154" href="#L154">154</a> <em class="jxr_javadoccomment"> * 	&lt;li&gt;&lt;b&gt;Multiple patterns:&lt;/b&gt;</em>
+<a class="jxr_linenumber" name="L155" href="#L155">155</a> <em class="jxr_javadoccomment"> * 		&lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L156" href="#L156">156</a> <em class="jxr_javadoccomment"> * 			&lt;li&gt;A comma-delimited list of any patterns above:</em>
+<a class="jxr_linenumber" name="L157" href="#L157">157</a> <em class="jxr_javadoccomment"> * 				&lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L158" href="#L158">158</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"com.foo.MyClass, com.bar.OtherClass"&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L159" href="#L159">159</a> <em class="jxr_javadoccomment"> * 					&lt;li&gt;&lt;js&gt;"MyClass.method1, MyClass.method2, MyClass.field1"&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L160" href="#L160">160</a> <em class="jxr_javadoccomment"> * 				&lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L161" href="#L161">161</a> <em class="jxr_javadoccomment"> * 		&lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L162" href="#L162">162</a> <em class="jxr_javadoccomment"> * &lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L163" href="#L163">163</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L164" href="#L164">164</a> <em class="jxr_javadoccomment"> * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L165" href="#L165">165</a> <em class="jxr_javadoccomment"> * &lt;ul class='spaced-list'&gt;</em>
+<a class="jxr_linenumber" name="L166" href="#L166">166</a> <em class="jxr_javadoccomment"> * 	&lt;li&gt;Method and constructor patterns without parentheses match any method signature.</em>
+<a class="jxr_linenumber" name="L167" href="#L167">167</a> <em class="jxr_javadoccomment"> * 	&lt;li&gt;Method and constructor argument types can be specified with simple or fully qualified names.</em>
+<a class="jxr_linenumber" name="L168" href="#L168">168</a> <em class="jxr_javadoccomment"> * 	&lt;li&gt;Array types in signatures use either &lt;js&gt;"Type[]"&lt;/js&gt; or JVM notation like &lt;js&gt;"[LType;"&lt;/js&gt;.</em>
+<a class="jxr_linenumber" name="L169" href="#L169">169</a> <em class="jxr_javadoccomment"> * 	&lt;li&gt;Generic type parameters are stripped from method signatures during matching.</em>
+<a class="jxr_linenumber" name="L170" href="#L170">170</a> <em class="jxr_javadoccomment"> * 	&lt;li&gt;Patterns are case-sensitive.</em>
+<a class="jxr_linenumber" name="L171" href="#L171">171</a> <em class="jxr_javadoccomment"> * &lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L172" href="#L172">172</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L173" href="#L173">173</a> <em class="jxr_javadoccomment"> * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L174" href="#L174">174</a> <em class="jxr_javadoccomment"> * &lt;ul class='seealso'&gt;</em>
+<a class="jxr_linenumber" name="L175" href="#L175">175</a> <em class="jxr_javadoccomment"> * 	&lt;li class='jc'&gt;{@link ClassInfo}</em>
+<a class="jxr_linenumber" name="L176" href="#L176">176</a> <em class="jxr_javadoccomment"> * 	&lt;li class='jc'&gt;{@link MethodInfo}</em>
+<a class="jxr_linenumber" name="L177" href="#L177">177</a> <em class="jxr_javadoccomment"> * 	&lt;li class='jc'&gt;{@link FieldInfo}</em>
+<a class="jxr_linenumber" name="L178" href="#L178">178</a> <em class="jxr_javadoccomment"> * 	&lt;li class='jc'&gt;{@link ConstructorInfo}</em>
+<a class="jxr_linenumber" name="L179" href="#L179">179</a> <em class="jxr_javadoccomment"> * &lt;/ul&gt;</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"> * @param &lt;V&gt; The type of values stored in this map.</em>
+<a class="jxr_linenumber" name="L182" href="#L182">182</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L183" href="#L183">183</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> ReflectionMap&lt;V&gt; {
+<a class="jxr_linenumber" name="L184" href="#L184">184</a> 
+<a class="jxr_linenumber" name="L185" href="#L185">185</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L186" href="#L186">186</a> <em class="jxr_javadoccomment">	 * Builder for creating {@link ReflectionMap} instances.</em>
+<a class="jxr_linenumber" name="L187" href="#L187">187</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L188" href="#L188">188</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L189" href="#L189">189</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L190" href="#L190">190</a> <em class="jxr_javadoccomment">	 * 	ReflectionMap&amp;lt;String&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = ReflectionMap</em>
+<a class="jxr_linenumber" name="L191" href="#L191">191</a> <em class="jxr_javadoccomment">	 * 		.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;)</em>
+<a class="jxr_linenumber" name="L192" href="#L192">192</a> <em class="jxr_javadoccomment">	 * 		.append(&lt;js&gt;"MyClass"&lt;/js&gt;, &lt;js&gt;"value1"&lt;/js&gt;)</em>
+<a class="jxr_linenumber" name="L193" href="#L193">193</a> <em class="jxr_javadoccomment">	 * 		.append(&lt;js&gt;"MyClass.myMethod"&lt;/js&gt;, &lt;js&gt;"value2"&lt;/js&gt;)</em>
+<a class="jxr_linenumber" name="L194" href="#L194">194</a> <em class="jxr_javadoccomment">	 * 		.build();</em>
+<a class="jxr_linenumber" name="L195" href="#L195">195</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L196" href="#L196">196</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L197" href="#L197">197</a> <em class="jxr_javadoccomment">	 * @param &lt;V&gt; The type of values stored in this map.</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> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> Builder&lt;V&gt; {
+<a class="jxr_linenumber" name="L200" href="#L200">200</a> 		<strong class="jxr_keyword">final</strong> List&lt;ClassEntry&lt;V&gt;&gt; classEntries;
+<a class="jxr_linenumber" name="L201" href="#L201">201</a> 		<strong class="jxr_keyword">final</strong> List&lt;MethodEntry&lt;V&gt;&gt; methodEntries;
+<a class="jxr_linenumber" name="L202" href="#L202">202</a> 		<strong class="jxr_keyword">final</strong> List&lt;FieldEntry&lt;V&gt;&gt; fieldEntries;
+<a class="jxr_linenumber" name="L203" href="#L203">203</a> 		<strong class="jxr_keyword">final</strong> List&lt;ConstructorEntry&lt;V&gt;&gt; constructorEntries;
+<a class="jxr_linenumber" name="L204" href="#L204">204</a> 
+<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">		 * Constructor.</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> 		<strong class="jxr_keyword">protected</strong> Builder() {
+<a class="jxr_linenumber" name="L209" href="#L209">209</a> 			classEntries = list();
+<a class="jxr_linenumber" name="L210" href="#L210">210</a> 			methodEntries = list();
+<a class="jxr_linenumber" name="L211" href="#L211">211</a> 			fieldEntries = list();
+<a class="jxr_linenumber" name="L212" href="#L212">212</a> 			constructorEntries = list();
+<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> 		<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L216" href="#L216">216</a> <em class="jxr_javadoccomment">		 * Adds one or more mappings to this builder.</em>
+<a class="jxr_linenumber" name="L217" href="#L217">217</a> <em class="jxr_javadoccomment">		 *</em>
+<a class="jxr_linenumber" name="L218" href="#L218">218</a> <em class="jxr_javadoccomment">		 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L219" href="#L219">219</a> <em class="jxr_javadoccomment">		 * This method accepts pattern strings that identify classes, methods, fields, or constructors,</em>
+<a class="jxr_linenumber" name="L220" href="#L220">220</a> <em class="jxr_javadoccomment">		 * and associates them with the specified value. Multiple patterns can be specified in a single</em>
+<a class="jxr_linenumber" name="L221" href="#L221">221</a> <em class="jxr_javadoccomment">		 * key using comma-delimited format.</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">		 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L224" href="#L224">224</a> <em class="jxr_javadoccomment">		 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L225" href="#L225">225</a> <em class="jxr_javadoccomment">		 * 	Builder&amp;lt;String&amp;gt; &lt;jv&gt;builder&lt;/jv&gt; = ReflectionMap.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;);</em>
+<a class="jxr_linenumber" name="L226" href="#L226">226</a> <em class="jxr_javadoccomment">		 *</em>
+<a class="jxr_linenumber" name="L227" href="#L227">227</a> <em class="jxr_javadoccomment">		 * 	&lt;jc&gt;// Map a class&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L228" href="#L228">228</a> <em class="jxr_javadoccomment">		 * 	&lt;jv&gt;builder&lt;/jv&gt;.append(&lt;js&gt;"com.foo.MyClass"&lt;/js&gt;, &lt;js&gt;"classValue"&lt;/js&gt;);</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;jc&gt;// Map a specific method&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L231" href="#L231">231</a> <em class="jxr_javadoccomment">		 * 	&lt;jv&gt;builder&lt;/jv&gt;.append(&lt;js&gt;"MyClass.myMethod(String,int)"&lt;/js&gt;, &lt;js&gt;"methodValue"&lt;/js&gt;);</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;jc&gt;// Map multiple patterns at once&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L234" href="#L234">234</a> <em class="jxr_javadoccomment">		 * 	&lt;jv&gt;builder&lt;/jv&gt;.append(&lt;js&gt;"MyClass.field1, MyClass.field2, MyClass.field3"&lt;/js&gt;, &lt;js&gt;"fieldValue"&lt;/js&gt;);</em>
+<a class="jxr_linenumber" name="L235" href="#L235">235</a> <em class="jxr_javadoccomment">		 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L236" href="#L236">236</a> <em class="jxr_javadoccomment">		 *</em>
+<a class="jxr_linenumber" name="L237" href="#L237">237</a> <em class="jxr_javadoccomment">		 * @param key</em>
+<a class="jxr_linenumber" name="L238" href="#L238">238</a> <em class="jxr_javadoccomment">		 * 	The mapping key pattern(s).</em>
+<a class="jxr_linenumber" name="L239" href="#L239">239</a> <em class="jxr_javadoccomment">		 * 	&lt;br&gt;Can be any of the following:</em>
+<a class="jxr_linenumber" name="L240" href="#L240">240</a> <em class="jxr_javadoccomment">		 * 	&lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L241" href="#L241">241</a> <em class="jxr_javadoccomment">		 * 		&lt;li&gt;Fully qualified class name (e.g., &lt;js&gt;"com.foo.MyClass"&lt;/js&gt;)</em>
+<a class="jxr_linenumber" name="L242" href="#L242">242</a> <em class="jxr_javadoccomment">		 * 		&lt;li&gt;Simple class name (e.g., &lt;js&gt;"MyClass"&lt;/js&gt;)</em>
+<a class="jxr_linenumber" name="L243" href="#L243">243</a> <em class="jxr_javadoccomment">		 * 		&lt;li&gt;All classes wildcard (e.g., &lt;js&gt;"*"&lt;/js&gt;)</em>
+<a class="jxr_linenumber" name="L244" href="#L244">244</a> <em class="jxr_javadoccomment">		 * 		&lt;li&gt;Method with signature (e.g., &lt;js&gt;"com.foo.MyClass.myMethod(String,int)"&lt;/js&gt;)</em>
+<a class="jxr_linenumber" name="L245" href="#L245">245</a> <em class="jxr_javadoccomment">		 * 		&lt;li&gt;Method without signature (e.g., &lt;js&gt;"MyClass.myMethod"&lt;/js&gt;) - matches any signature</em>
+<a class="jxr_linenumber" name="L246" href="#L246">246</a> <em class="jxr_javadoccomment">		 * 		&lt;li&gt;Field (e.g., &lt;js&gt;"MyClass.myField"&lt;/js&gt;)</em>
+<a class="jxr_linenumber" name="L247" href="#L247">247</a> <em class="jxr_javadoccomment">		 * 		&lt;li&gt;Constructor (e.g., &lt;js&gt;"MyClass(String,int)"&lt;/js&gt;)</em>
+<a class="jxr_linenumber" name="L248" href="#L248">248</a> <em class="jxr_javadoccomment">		 * 		&lt;li&gt;Comma-delimited list of any of the above (e.g., &lt;js&gt;"MyClass, MyClass.method1, MyClass.field1"&lt;/js&gt;)</em>
+<a class="jxr_linenumber" name="L249" href="#L249">249</a> <em class="jxr_javadoccomment">		 * 	&lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L250" href="#L250">250</a> <em class="jxr_javadoccomment">		 * @param value</em>
+<a class="jxr_linenumber" name="L251" href="#L251">251</a> <em class="jxr_javadoccomment">		 * 	The value to associate with the matching reflection element(s).</em>
+<a class="jxr_linenumber" name="L252" href="#L252">252</a> <em class="jxr_javadoccomment">		 * 	&lt;br&gt;Can be &lt;jk&gt;null&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L253" href="#L253">253</a> <em class="jxr_javadoccomment">		 * @return This object.</em>
+<a class="jxr_linenumber" name="L254" href="#L254">254</a> <em class="jxr_javadoccomment">		 * @throws RuntimeException If the key pattern is invalid or empty.</em>
+<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> 		<strong class="jxr_keyword">public</strong> Builder&lt;V&gt; append(String key, V value) {
+<a class="jxr_linenumber" name="L257" href="#L257">257</a> 			<strong class="jxr_keyword">if</strong> (Utils.isEmpty(key))  <em class="jxr_comment">// NOAI</em>
+<a class="jxr_linenumber" name="L258" href="#L258">258</a> 				<strong class="jxr_keyword">throw</strong> rex(<span class="jxr_string">"Invalid reflection signature: [{0}]"</span>, key);
+<a class="jxr_linenumber" name="L259" href="#L259">259</a> 			<strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="L260" href="#L260">260</a> 				splitNames(key, k -&gt; {
+<a class="jxr_linenumber" name="L261" href="#L261">261</a> 					<strong class="jxr_keyword">if</strong> (k.endsWith(<span class="jxr_string">")"</span>)) {
+<a class="jxr_linenumber" name="L262" href="#L262">262</a> 						<strong class="jxr_keyword">int</strong> i = k.substring(0, k.indexOf('(')).lastIndexOf('.');
+<a class="jxr_linenumber" name="L263" href="#L263">263</a> 						<strong class="jxr_keyword">if</strong> (i == -1 || isUpperCase(k.charAt(i + 1))) {
+<a class="jxr_linenumber" name="L264" href="#L264">264</a> 							constructorEntries.add(<strong class="jxr_keyword">new</strong> ConstructorEntry&lt;&gt;(k, value));
+<a class="jxr_linenumber" name="L265" href="#L265">265</a> 						} <strong class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="L266" href="#L266">266</a> 							methodEntries.add(<strong class="jxr_keyword">new</strong> MethodEntry&lt;&gt;(k, value));
+<a class="jxr_linenumber" name="L267" href="#L267">267</a> 						}
+<a class="jxr_linenumber" name="L268" href="#L268">268</a> 					} <strong class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="L269" href="#L269">269</a> 						<strong class="jxr_keyword">var</strong> i = k.lastIndexOf('.');
+<a class="jxr_linenumber" name="L270" href="#L270">270</a> 						<strong class="jxr_keyword">if</strong> (i == -1) {
+<a class="jxr_linenumber" name="L271" href="#L271">271</a> 							classEntries.add(<strong class="jxr_keyword">new</strong> ClassEntry&lt;&gt;(k, value));
+<a class="jxr_linenumber" name="L272" href="#L272">272</a> 						} <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (isUpperCase(k.charAt(i + 1))) {
+<a class="jxr_linenumber" name="L273" href="#L273">273</a> 							classEntries.add(<strong class="jxr_keyword">new</strong> ClassEntry&lt;&gt;(k, value));
+<a class="jxr_linenumber" name="L274" href="#L274">274</a> 							fieldEntries.add(<strong class="jxr_keyword">new</strong> FieldEntry&lt;&gt;(k, value));
+<a class="jxr_linenumber" name="L275" href="#L275">275</a> 						} <strong class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="L276" href="#L276">276</a> 							methodEntries.add(<strong class="jxr_keyword">new</strong> MethodEntry&lt;&gt;(k, value));
+<a class="jxr_linenumber" name="L277" href="#L277">277</a> 							fieldEntries.add(<strong class="jxr_keyword">new</strong> FieldEntry&lt;&gt;(k, value));
+<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> 				});
+<a class="jxr_linenumber" name="L281" href="#L281">281</a> 			} <strong class="jxr_keyword">catch</strong> (@SuppressWarnings(<span class="jxr_string">"unused"</span>) IndexOutOfBoundsException e) {
+<a class="jxr_linenumber" name="L282" href="#L282">282</a> 				<strong class="jxr_keyword">throw</strong> rex(<span class="jxr_string">"Invalid reflection signature: [{0}]"</span>, key);
+<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> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</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> 		<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L289" href="#L289">289</a> <em class="jxr_javadoccomment">		 * Builds a new {@link ReflectionMap} from the current state of this builder.</em>
+<a class="jxr_linenumber" name="L290" href="#L290">290</a> <em class="jxr_javadoccomment">		 *</em>
+<a class="jxr_linenumber" name="L291" href="#L291">291</a> <em class="jxr_javadoccomment">		 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L292" href="#L292">292</a> <em class="jxr_javadoccomment">		 * Multiple calls to this method will create independent copies of the map.</em>
+<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">		 * @return A new immutable {@link ReflectionMap} instance.</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> 		<strong class="jxr_keyword">public</strong> ReflectionMap&lt;V&gt; build() {
+<a class="jxr_linenumber" name="L297" href="#L297">297</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> ReflectionMap&lt;&gt;(<strong class="jxr_keyword">this</strong>);
+<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> 
+<a class="jxr_linenumber" name="L301" href="#L301">301</a> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> ClassEntry&lt;V&gt; {
+<a class="jxr_linenumber" name="L302" href="#L302">302</a> 		<strong class="jxr_keyword">final</strong> String simpleName, fullName;
+<a class="jxr_linenumber" name="L303" href="#L303">303</a> 		<strong class="jxr_keyword">final</strong> V value;
+<a class="jxr_linenumber" name="L304" href="#L304">304</a> 
+<a class="jxr_linenumber" name="L305" href="#L305">305</a> 		ClassEntry(String name, V value) {
+<a class="jxr_linenumber" name="L306" href="#L306">306</a> 			<strong class="jxr_keyword">this</strong>.simpleName = simpleClassName(name);
+<a class="jxr_linenumber" name="L307" href="#L307">307</a> 			<strong class="jxr_keyword">this</strong>.fullName = name;
+<a class="jxr_linenumber" name="L308" href="#L308">308</a> 			<strong class="jxr_keyword">this</strong>.value = value;
+<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> 		<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> matches(Class&lt;?&gt; c) {
+<a class="jxr_linenumber" name="L312" href="#L312">312</a> 			<strong class="jxr_keyword">if</strong> (c == <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L313" href="#L313">313</a> 				<strong class="jxr_keyword">return</strong> false;
+<a class="jxr_linenumber" name="L314" href="#L314">314</a> 			<strong class="jxr_keyword">return</strong> classMatches(simpleName, fullName, c);
+<a class="jxr_linenumber" name="L315" href="#L315">315</a> 		}
+<a class="jxr_linenumber" name="L316" href="#L316">316</a> 
+<a class="jxr_linenumber" name="L317" href="#L317">317</a> 		<strong class="jxr_keyword">protected</strong> FluentMap&lt;String,Object&gt; properties() {
 <a class="jxr_linenumber" name="L318" href="#L318">318</a> 			<em class="jxr_comment">// @formatter:off</em>
-<a class="jxr_linenumber" name="L319" href="#L319">319</a> 			<strong class="jxr_keyword">return</strong> mapb().filtered()
-<a class="jxr_linenumber" name="L320" href="#L320">320</a> 				.add(<span class="jxr_string">"simpleName"</span>, simpleName)
-<a class="jxr_linenumber" name="L321" href="#L321">321</a> 				.add(<span class="jxr_string">"fullName"</span>, fullName)
-<a class="jxr_linenumber" name="L322" href="#L322">322</a> 				.add(<span class="jxr_string">"value"</span>, value)
-<a class="jxr_linenumber" name="L323" href="#L323">323</a> 				.build()
-<a class="jxr_linenumber" name="L324" href="#L324">324</a> 				.toString();
-<a class="jxr_linenumber" name="L325" href="#L325">325</a> 			<em class="jxr_comment">// @formatter:on</em>
-<a class="jxr_linenumber" name="L326" href="#L326">326</a> 		}
-<a class="jxr_linenumber" name="L327" href="#L327">327</a> 	}
-<a class="jxr_linenumber" name="L328" href="#L328">328</a> 
-<a class="jxr_linenumber" name="L329" href="#L329">329</a> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> ConstructorEntry&lt;V&gt; {
-<a class="jxr_linenumber" name="L330" href="#L330">330</a> 		String simpleClassName, fullClassName, args[];
-<a class="jxr_linenumber" name="L331" href="#L331">331</a> 		V value;
-<a class="jxr_linenumber" name="L332" href="#L332">332</a> 
-<a class="jxr_linenumber" name="L333" href="#L333">333</a> 		ConstructorEntry(String name, V value) {
-<a class="jxr_linenumber" name="L334" href="#L334">334</a> 			<strong class="jxr_keyword">var</strong> i = name.indexOf('(');
-<a class="jxr_linenumber" name="L335" href="#L335">335</a> 			<strong class="jxr_keyword">this</strong>.args = splitMethodArgs(name.substring(i + 1, name.length() - 1));
-<a class="jxr_linenumber" name="L336" href="#L336">336</a> 			<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> j = 0; j &lt; args.length; j++) {
-<a class="jxr_linenumber" name="L337" href="#L337">337</a> 				<em class="jxr_comment">// Strip off generic parameters (e.g., "List&lt;String&gt;[]" -&gt; "List[]")</em>
-<a class="jxr_linenumber" name="L338" href="#L338">338</a> 				args[j] = stripGenerics(args[j]);
-<a class="jxr_linenumber" name="L339" href="#L339">339</a> 			}
-<a class="jxr_linenumber" name="L340" href="#L340">340</a> 			name = name.substring(0, i).trim();
-<a class="jxr_linenumber" name="L341" href="#L341">341</a> 			<strong class="jxr_keyword">this</strong>.simpleClassName = simpleClassName(name);
-<a class="jxr_linenumber" name="L342" href="#L342">342</a> 			<strong class="jxr_keyword">this</strong>.fullClassName = name;
-<a class="jxr_linenumber" name="L343" href="#L343">343</a> 			<strong class="jxr_keyword">this</strong>.value = value;
-<a class="jxr_linenumber" name="L344" href="#L344">344</a> 		}
-<a class="jxr_linenumber" name="L345" href="#L345">345</a> 
-<a class="jxr_linenumber" name="L346" href="#L346">346</a> 		<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> matches(Constructor&lt;?&gt; m) {
-<a class="jxr_linenumber" name="L347" href="#L347">347</a> 			<strong class="jxr_keyword">if</strong> (m == <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L348" href="#L348">348</a> 				<strong class="jxr_keyword">return</strong> false;
-<a class="jxr_linenumber" name="L349" href="#L349">349</a> 			<strong class="jxr_keyword">var</strong> c = m.getDeclaringClass();
-<a class="jxr_linenumber" name="L350" href="#L350">350</a> 			<strong class="jxr_keyword">return</strong> classMatches(simpleClassName, fullClassName, c) &amp;&amp; (argsMatch(args, m.getParameterTypes()));
-<a class="jxr_linenumber" name="L351" href="#L351">351</a> 		}
-<a class="jxr_linenumber" name="L352" href="#L352">352</a> 
-<a class="jxr_linenumber" name="L353" href="#L353">353</a> 		@Override
-<a class="jxr_linenumber" name="L354" href="#L354">354</a> 		<strong class="jxr_keyword">public</strong> String toString() {
-<a class="jxr_linenumber" name="L355" href="#L355">355</a> 			<em class="jxr_comment">// @formatter:off</em>
-<a class="jxr_linenumber" name="L356" href="#L356">356</a> 			<strong class="jxr_keyword">return</strong> mapb().filtered()
-<a class="jxr_linenumber" name="L357" href="#L357">357</a> 				.add(<span class="jxr_string">"simpleClassName"</span>, simpleClassName)
-<a class="jxr_linenumber" name="L358" href="#L358">358</a> 				.add(<span class="jxr_string">"fullClassName"</span>, fullClassName)
-<a class="jxr_linenumber" name="L359" href="#L359">359</a> 				.add(<span class="jxr_string">"args"</span>, args)
-<a class="jxr_linenumber" name="L360" href="#L360">360</a> 				.add(<span class="jxr_string">"value"</span>, value)
-<a class="jxr_linenumber" name="L361" href="#L361">361</a> 				.build()
-<a class="jxr_linenumber" name="L362" href="#L362">362</a> 				.toString();
+<a class="jxr_linenumber" name="L319" href="#L319">319</a> 			<strong class="jxr_keyword">return</strong> filteredBeanPropertyMap()
+<a class="jxr_linenumber" name="L320" href="#L320">320</a> 				.a(<span class="jxr_string">"simpleName"</span>, simpleName)
+<a class="jxr_linenumber" name="L321" href="#L321">321</a> 				.a(<span class="jxr_string">"fullName"</span>, fullName)
+<a class="jxr_linenumber" name="L322" href="#L322">322</a> 				.a(<span class="jxr_string">"value"</span>, value);
+<a class="jxr_linenumber" name="L323" href="#L323">323</a> 			<em class="jxr_comment">// @formatter:on</em>
+<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> 		@Override
+<a class="jxr_linenumber" name="L327" href="#L327">327</a> 		<strong class="jxr_keyword">public</strong> String toString() {
+<a class="jxr_linenumber" name="L328" href="#L328">328</a> 			<strong class="jxr_keyword">return</strong> r(properties());
+<a class="jxr_linenumber" name="L329" href="#L329">329</a> 		}
+<a class="jxr_linenumber" name="L330" href="#L330">330</a> 	}
+<a class="jxr_linenumber" name="L331" href="#L331">331</a> 
+<a class="jxr_linenumber" name="L332" href="#L332">332</a> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> ConstructorEntry&lt;V&gt; {
+<a class="jxr_linenumber" name="L333" href="#L333">333</a> 		String simpleClassName, fullClassName, args[];
+<a class="jxr_linenumber" name="L334" href="#L334">334</a> 		V value;
+<a class="jxr_linenumber" name="L335" href="#L335">335</a> 
+<a class="jxr_linenumber" name="L336" href="#L336">336</a> 		ConstructorEntry(String name, V value) {
+<a class="jxr_linenumber" name="L337" href="#L337">337</a> 			<strong class="jxr_keyword">var</strong> i = name.indexOf('(');
+<a class="jxr_linenumber" name="L338" href="#L338">338</a> 			<strong class="jxr_keyword">this</strong>.args = splitMethodArgs(name.substring(i + 1, name.length() - 1));
+<a class="jxr_linenumber" name="L339" href="#L339">339</a> 			<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> j = 0; j &lt; args.length; j++) {
+<a class="jxr_linenumber" name="L340" href="#L340">340</a> 				<em class="jxr_comment">// Strip off generic parameters (e.g., "List&lt;String&gt;[]" -&gt; "List[]")</em>
+<a class="jxr_linenumber" name="L341" href="#L341">341</a> 				args[j] = stripGenerics(args[j]);
+<a class="jxr_linenumber" name="L342" href="#L342">342</a> 			}
+<a class="jxr_linenumber" name="L343" href="#L343">343</a> 			name = name.substring(0, i).trim();
+<a class="jxr_linenumber" name="L344" href="#L344">344</a> 			<strong class="jxr_keyword">this</strong>.simpleClassName = simpleClassName(name);
+<a class="jxr_linenumber" name="L345" href="#L345">345</a> 			<strong class="jxr_keyword">this</strong>.fullClassName = name;
+<a class="jxr_linenumber" name="L346" href="#L346">346</a> 			<strong class="jxr_keyword">this</strong>.value = value;
+<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> 		<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> matches(Constructor&lt;?&gt; m) {
+<a class="jxr_linenumber" name="L350" href="#L350">350</a> 			<strong class="jxr_keyword">if</strong> (m == <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L351" href="#L351">351</a> 				<strong class="jxr_keyword">return</strong> false;
+<a class="jxr_linenumber" name="L352" href="#L352">352</a> 			<strong class="jxr_keyword">var</strong> c = m.getDeclaringClass();
+<a class="jxr_linenumber" name="L353" href="#L353">353</a> 			<strong class="jxr_keyword">return</strong> classMatches(simpleClassName, fullClassName, c) &amp;&amp; (argsMatch(args, m.getParameterTypes()));
+<a class="jxr_linenumber" name="L354" href="#L354">354</a> 		}
+<a class="jxr_linenumber" name="L355" href="#L355">355</a> 
+<a class="jxr_linenumber" name="L356" href="#L356">356</a> 		<strong class="jxr_keyword">protected</strong> FluentMap&lt;String,Object&gt; properties() {
+<a class="jxr_linenumber" name="L357" href="#L357">357</a> 			<em class="jxr_comment">// @formatter:off</em>
+<a class="jxr_linenumber" name="L358" href="#L358">358</a> 			<strong class="jxr_keyword">return</strong> filteredBeanPropertyMap()
+<a class="jxr_linenumber" name="L359" href="#L359">359</a> 				.a(<span class="jxr_string">"simpleClassName"</span>, simpleClassName)
+<a class="jxr_linenumber" name="L360" href="#L360">360</a> 				.a(<span class="jxr_string">"fullClassName"</span>, fullClassName)
+<a class="jxr_linenumber" name="L361" href="#L361">361</a> 				.a(<span class="jxr_string">"args"</span>, args)
+<a class="jxr_linenumber" name="L362" href="#L362">362</a> 				.a(<span class="jxr_string">"value"</span>, value);
 <a class="jxr_linenumber" name="L363" href="#L363">363</a> 			<em class="jxr_comment">// @formatter:on</em>
 <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> 
-<a class="jxr_linenumber" name="L367" href="#L367">367</a> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> FieldEntry&lt;V&gt; {
-<a class="jxr_linenumber" name="L368" href="#L368">368</a> 		String simpleClassName, fullClassName, fieldName;
-<a class="jxr_linenumber" name="L369" href="#L369">369</a> 		V value;
-<a class="jxr_linenumber" name="L370" href="#L370">370</a> 
-<a class="jxr_linenumber" name="L371" href="#L371">371</a> 		FieldEntry(String name, V value) {
-<a class="jxr_linenumber" name="L372" href="#L372">372</a> 			<strong class="jxr_keyword">var</strong> i = name.lastIndexOf('.');
-<a class="jxr_linenumber" name="L373" href="#L373">373</a> 			<strong class="jxr_keyword">var</strong> s1 = name.substring(0, i);
-<a class="jxr_linenumber" name="L374" href="#L374">374</a> 			<strong class="jxr_keyword">var</strong> s2 = name.substring(i + 1);
-<a class="jxr_linenumber" name="L375" href="#L375">375</a> 			<strong class="jxr_keyword">this</strong>.simpleClassName = simpleClassName(s1);
-<a class="jxr_linenumber" name="L376" href="#L376">376</a> 			<strong class="jxr_keyword">this</strong>.fullClassName = s1;
-<a class="jxr_linenumber" name="L377" href="#L377">377</a> 			<strong class="jxr_keyword">this</strong>.fieldName = s2;
-<a class="jxr_linenumber" name="L378" href="#L378">378</a> 			<strong class="jxr_keyword">this</strong>.value = value;
-<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> 		<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> matches(Field f) {
-<a class="jxr_linenumber" name="L382" href="#L382">382</a> 			<strong class="jxr_keyword">if</strong> (f == <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L383" href="#L383">383</a> 				<strong class="jxr_keyword">return</strong> false;
-<a class="jxr_linenumber" name="L384" href="#L384">384</a> 			<strong class="jxr_keyword">var</strong> c = f.getDeclaringClass();
-<a class="jxr_linenumber" name="L385" href="#L385">385</a> 			<strong class="jxr_keyword">return</strong> classMatches(simpleClassName, fullClassName, c) &amp;&amp; (eq(f.getName(), fieldName));
-<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> 		@Override
-<a class="jxr_linenumber" name="L389" href="#L389">389</a> 		<strong class="jxr_keyword">public</strong> String toString() {
-<a class="jxr_linenumber" name="L390" href="#L390">390</a> 			<em class="jxr_comment">// @formatter:off</em>
-<a class="jxr_linenumber" name="L391" href="#L391">391</a> 			<strong class="jxr_keyword">return</strong> mapb().filtered()
-<a class="jxr_linenumber" name="L392" href="#L392">392</a> 				.add(<span class="jxr_string">"simpleClassName"</span>, simpleClassName)
-<a class="jxr_linenumber" name="L393" href="#L393">393</a> 				.add(<span class="jxr_string">"fullClassName"</span>, fullClassName)
-<a class="jxr_linenumber" name="L394" href="#L394">394</a> 				.add(<span class="jxr_string">"fieldName"</span>, fieldName)
-<a class="jxr_linenumber" name="L395" href="#L395">395</a> 				.add(<span class="jxr_string">"value"</span>, value)
-<a class="jxr_linenumber" name="L396" href="#L396">396</a> 				.build()
-<a class="jxr_linenumber" name="L397" href="#L397">397</a> 				.toString();
-<a class="jxr_linenumber" name="L398" href="#L398">398</a> 			<em class="jxr_comment">// @formatter:on</em>
-<a class="jxr_linenumber" name="L399" href="#L399">399</a> 		}
-<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> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> MethodEntry&lt;V&gt; {
-<a class="jxr_linenumber" name="L403" href="#L403">403</a> 		String simpleClassName, fullClassName, methodName, args[];
-<a class="jxr_linenumber" name="L404" href="#L404">404</a> 		V value;
-<a class="jxr_linenumber" name="L405" href="#L405">405</a> 
-<a class="jxr_linenumber" name="L406" href="#L406">406</a> 		MethodEntry(String name, V value) {
-<a class="jxr_linenumber" name="L407" href="#L407">407</a> 			<strong class="jxr_keyword">var</strong> i = name.indexOf('(');
-<a class="jxr_linenumber" name="L408" href="#L408">408</a> 			<strong class="jxr_keyword">this</strong>.args = i == -1 ? <strong class="jxr_keyword">null</strong> : splitMethodArgs(name.substring(i + 1, name.length() - 1));
-<a class="jxr_linenumber" name="L409" href="#L409">409</a> 			<strong class="jxr_keyword">if</strong> (nn(args)) {
-<a class="jxr_linenumber" name="L410" href="#L410">410</a> 				<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> j = 0; j &lt; args.length; j++) {
-<a class="jxr_linenumber" name="L411" href="#L411">411</a> 					<em class="jxr_comment">// Strip off generic parameters (e.g., "List&lt;String&gt;[]" -&gt; "List[]")</em>
-<a class="jxr_linenumber" name="L412" href="#L412">412</a> 					args[j] = stripGenerics(args[j]);
-<a class="jxr_linenumber" name="L413" href="#L413">413</a> 				}
-<a class="jxr_linenumber" name="L414" href="#L414">414</a> 			}
-<a class="jxr_linenumber" name="L415" href="#L415">415</a> 			name = i == -1 ? name : name.substring(0, i);
-<a class="jxr_linenumber" name="L416" href="#L416">416</a> 			i = name.lastIndexOf('.');
-<a class="jxr_linenumber" name="L417" href="#L417">417</a> 			<strong class="jxr_keyword">var</strong> s1 = name.substring(0, i).trim();
-<a class="jxr_linenumber" name="L418" href="#L418">418</a> 			<strong class="jxr_keyword">var</strong> s2 = name.substring(i + 1).trim();
-<a class="jxr_linenumber" name="L419" href="#L419">419</a> 			<strong class="jxr_keyword">this</strong>.simpleClassName = simpleClassName(s1);
-<a class="jxr_linenumber" name="L420" href="#L420">420</a> 			<strong class="jxr_keyword">this</strong>.fullClassName = s1;
-<a class="jxr_linenumber" name="L421" href="#L421">421</a> 			<strong class="jxr_keyword">this</strong>.methodName = s2;
-<a class="jxr_linenumber" name="L422" href="#L422">422</a> 			<strong class="jxr_keyword">this</strong>.value = value;
-<a class="jxr_linenumber" name="L423" href="#L423">423</a> 		}
-<a class="jxr_linenumber" name="L424" href="#L424">424</a> 
-<a class="jxr_linenumber" name="L425" href="#L425">425</a> 		<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> matches(Method m) {
-<a class="jxr_linenumber" name="L426" href="#L426">426</a> 			<strong class="jxr_keyword">if</strong> (m == <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L427" href="#L427">427</a> 				<strong class="jxr_keyword">return</strong> false;
-<a class="jxr_linenumber" name="L428" href="#L428">428</a> 			<strong class="jxr_keyword">var</strong> c = m.getDeclaringClass();
-<a class="jxr_linenumber" name="L429" href="#L429">429</a> 			<em class="jxr_comment">// @formatter:off</em>
-<a class="jxr_linenumber" name="L430" href="#L430">430</a> 			<strong class="jxr_keyword">return</strong>
-<a class="jxr_linenumber" name="L431" href="#L431">431</a> 				classMatches(simpleClassName, fullClassName, c)
-<a class="jxr_linenumber" name="L432" href="#L432">432</a> 				&amp;&amp; (eq(m.getName(), methodName))
-<a class="jxr_linenumber" name="L433" href="#L433">433</a> 				&amp;&amp; (argsMatch(args, m.getParameterTypes()));
-<a class="jxr_linenumber" name="L434" href="#L434">434</a> 			<em class="jxr_comment">// @formatter:on</em>
-<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> String toString() {
-<a class="jxr_linenumber" name="L439" href="#L439">439</a> 			<em class="jxr_comment">// @formatter:off</em>
-<a class="jxr_linenumber" name="L440" href="#L440">440</a> 			<strong class="jxr_keyword">return</strong> mapb().filtered()
-<a class="jxr_linenumber" name="L441" href="#L441">441</a> 				.add(<span class="jxr_string">"simpleClassName"</span>, simpleClassName)
-<a class="jxr_linenumber" name="L442" href="#L442">442</a> 				.add(<span class="jxr_string">"fullClassName"</span>, fullClassName)
-<a class="jxr_linenumber" name="L443" href="#L443">443</a> 				.add(<span class="jxr_string">"methodName"</span>, methodName)
-<a class="jxr_linenumber" name="L444" href="#L444">444</a> 				.add(<span class="jxr_string">"args"</span>, opt(args).map(x -&gt; '[' + toCdl(x) + <span class="jxr_string">"]"</span>).orElse(<strong class="jxr_keyword">null</strong>))
-<a class="jxr_linenumber" name="L445" href="#L445">445</a> 				.add(<span class="jxr_string">"value"</span>, value)
-<a class="jxr_linenumber" name="L446" href="#L446">446</a> 				.build()
-<a class="jxr_linenumber" name="L447" href="#L447">447</a> 				.toString();
-<a class="jxr_linenumber" name="L448" href="#L448">448</a> 			<em class="jxr_comment">// @formatter:on</em>
-<a class="jxr_linenumber" name="L449" href="#L449">449</a> 		}
-<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> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L453" href="#L453">453</a> <em class="jxr_javadoccomment">	 * Creates a new builder for constructing a {@link ReflectionMap}.</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> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L456" href="#L456">456</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L457" href="#L457">457</a> <em class="jxr_javadoccomment">	 * 	ReflectionMap&amp;lt;String&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = ReflectionMap</em>
-<a class="jxr_linenumber" name="L458" href="#L458">458</a> <em class="jxr_javadoccomment">	 * 		.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;)</em>
-<a class="jxr_linenumber" name="L459" href="#L459">459</a> <em class="jxr_javadoccomment">	 * 		.append(&lt;js&gt;"com.foo.MyClass"&lt;/js&gt;, &lt;js&gt;"value1"&lt;/js&gt;)</em>
-<a class="jxr_linenumber" name="L460" href="#L460">460</a> <em class="jxr_javadoccomment">	 * 		.append(&lt;js&gt;"com.foo.MyClass.myMethod"&lt;/js&gt;, &lt;js&gt;"value2"&lt;/js&gt;)</em>
-<a class="jxr_linenumber" name="L461" href="#L461">461</a> <em class="jxr_javadoccomment">	 * 		.build();</em>
-<a class="jxr_linenumber" name="L462" href="#L462">462</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L365" href="#L365">365</a> 
+<a class="jxr_linenumber" name="L366" href="#L366">366</a> 		@Override
+<a class="jxr_linenumber" name="L367" href="#L367">367</a> 		<strong class="jxr_keyword">public</strong> String toString() {
+<a class="jxr_linenumber" name="L368" href="#L368">368</a> 			<strong class="jxr_keyword">return</strong> r(properties());
+<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> 
+<a class="jxr_linenumber" name="L372" href="#L372">372</a> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> FieldEntry&lt;V&gt; {
+<a class="jxr_linenumber" name="L373" href="#L373">373</a> 		String simpleClassName, fullClassName, fieldName;
+<a class="jxr_linenumber" name="L374" href="#L374">374</a> 		V value;
+<a class="jxr_linenumber" name="L375" href="#L375">375</a> 
+<a class="jxr_linenumber" name="L376" href="#L376">376</a> 		FieldEntry(String name, V value) {
+<a class="jxr_linenumber" name="L377" href="#L377">377</a> 			<strong class="jxr_keyword">var</strong> i = name.lastIndexOf('.');
+<a class="jxr_linenumber" name="L378" href="#L378">378</a> 			<strong class="jxr_keyword">var</strong> s1 = name.substring(0, i);
+<a class="jxr_linenumber" name="L379" href="#L379">379</a> 			<strong class="jxr_keyword">var</strong> s2 = name.substring(i + 1);
+<a class="jxr_linenumber" name="L380" href="#L380">380</a> 			<strong class="jxr_keyword">this</strong>.simpleClassName = simpleClassName(s1);
+<a class="jxr_linenumber" name="L381" href="#L381">381</a> 			<strong class="jxr_keyword">this</strong>.fullClassName = s1;
+<a class="jxr_linenumber" name="L382" href="#L382">382</a> 			<strong class="jxr_keyword">this</strong>.fieldName = s2;
+<a class="jxr_linenumber" name="L383" href="#L383">383</a> 			<strong class="jxr_keyword">this</strong>.value = value;
+<a class="jxr_linenumber" name="L384" href="#L384">384</a> 		}
+<a class="jxr_linenumber" name="L385" href="#L385">385</a> 
+<a class="jxr_linenumber" name="L386" href="#L386">386</a> 		<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> matches(Field f) {
+<a class="jxr_linenumber" name="L387" href="#L387">387</a> 			<strong class="jxr_keyword">if</strong> (f == <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L388" href="#L388">388</a> 				<strong class="jxr_keyword">return</strong> false;
+<a class="jxr_linenumber" name="L389" href="#L389">389</a> 			<strong class="jxr_keyword">var</strong> c = f.getDeclaringClass();
+<a class="jxr_linenumber" name="L390" href="#L390">390</a> 			<strong class="jxr_keyword">return</strong> classMatches(simpleClassName, fullClassName, c) &amp;&amp; (eq(f.getName(), fieldName));
+<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> 		<strong class="jxr_keyword">protected</strong> FluentMap&lt;String,Object&gt; properties() {
+<a class="jxr_linenumber" name="L394" href="#L394">394</a> 			<em class="jxr_comment">// @formatter:off</em>
+<a class="jxr_linenumber" name="L395" href="#L395">395</a> 			<strong class="jxr_keyword">return</strong> filteredBeanPropertyMap()
+<a class="jxr_linenumber" name="L396" href="#L396">396</a> 				.a(<span class="jxr_string">"simpleClassName"</span>, simpleClassName)
+<a class="jxr_linenumber" name="L397" href="#L397">397</a> 				.a(<span class="jxr_string">"fullClassName"</span>, fullClassName)
+<a class="jxr_linenumber" name="L398" href="#L398">398</a> 				.a(<span class="jxr_string">"fieldName"</span>, fieldName)
+<a class="jxr_linenumber" name="L399" href="#L399">399</a> 				.a(<span class="jxr_string">"value"</span>, value);
+<a class="jxr_linenumber" name="L400" href="#L400">400</a> 			<em class="jxr_comment">// @formatter:on</em>
+<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> 		@Override
+<a class="jxr_linenumber" name="L404" href="#L404">404</a> 		<strong class="jxr_keyword">public</strong> String toString() {
+<a class="jxr_linenumber" name="L405" href="#L405">405</a> 			<strong class="jxr_keyword">return</strong> r(properties());
+<a class="jxr_linenumber" name="L406" href="#L406">406</a> 		}
+<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> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> MethodEntry&lt;V&gt; {
+<a class="jxr_linenumber" name="L410" href="#L410">410</a> 		String simpleClassName, fullClassName, methodName, args[];
+<a class="jxr_linenumber" name="L411" href="#L411">411</a> 		V value;
+<a class="jxr_linenumber" name="L412" href="#L412">412</a> 
+<a class="jxr_linenumber" name="L413" href="#L413">413</a> 		MethodEntry(String name, V value) {
+<a class="jxr_linenumber" name="L414" href="#L414">414</a> 			<strong class="jxr_keyword">var</strong> i = name.indexOf('(');
+<a class="jxr_linenumber" name="L415" href="#L415">415</a> 			<strong class="jxr_keyword">this</strong>.args = i == -1 ? <strong class="jxr_keyword">null</strong> : splitMethodArgs(name.substring(i + 1, name.length() - 1));
+<a class="jxr_linenumber" name="L416" href="#L416">416</a> 			<strong class="jxr_keyword">if</strong> (nn(args)) {
+<a class="jxr_linenumber" name="L417" href="#L417">417</a> 				<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> j = 0; j &lt; args.length; j++) {
+<a class="jxr_linenumber" name="L418" href="#L418">418</a> 					<em class="jxr_comment">// Strip off generic parameters (e.g., "List&lt;String&gt;[]" -&gt; "List[]")</em>
+<a class="jxr_linenumber" name="L419" href="#L419">419</a> 					args[j] = stripGenerics(args[j]);
+<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> 			name = i == -1 ? name : name.substring(0, i);
+<a class="jxr_linenumber" name="L423" href="#L423">423</a> 			i = name.lastIndexOf('.');
+<a class="jxr_linenumber" name="L424" href="#L424">424</a> 			<strong class="jxr_keyword">var</strong> s1 = name.substring(0, i).trim();
+<a class="jxr_linenumber" name="L425" href="#L425">425</a> 			<strong class="jxr_keyword">var</strong> s2 = name.substring(i + 1).trim();
+<a class="jxr_linenumber" name="L426" href="#L426">426</a> 			<strong class="jxr_keyword">this</strong>.simpleClassName = simpleClassName(s1);
+<a class="jxr_linenumber" name="L427" href="#L427">427</a> 			<strong class="jxr_keyword">this</strong>.fullClassName = s1;
+<a class="jxr_linenumber" name="L428" href="#L428">428</a> 			<strong class="jxr_keyword">this</strong>.methodName = s2;
+<a class="jxr_linenumber" name="L429" href="#L429">429</a> 			<strong class="jxr_keyword">this</strong>.value = value;
+<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> 		<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> matches(Method m) {
+<a class="jxr_linenumber" name="L433" href="#L433">433</a> 			<strong class="jxr_keyword">if</strong> (m == <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L434" href="#L434">434</a> 				<strong class="jxr_keyword">return</strong> false;
+<a class="jxr_linenumber" name="L435" href="#L435">435</a> 			<strong class="jxr_keyword">var</strong> c = m.getDeclaringClass();
+<a class="jxr_linenumber" name="L436" href="#L436">436</a> 			<em class="jxr_comment">// @formatter:off</em>
+<a class="jxr_linenumber" name="L437" href="#L437">437</a> 			<strong class="jxr_keyword">return</strong>
+<a class="jxr_linenumber" name="L438" href="#L438">438</a> 				classMatches(simpleClassName, fullClassName, c)
+<a class="jxr_linenumber" name="L439" href="#L439">439</a> 				&amp;&amp; (eq(m.getName(), methodName))
+<a class="jxr_linenumber" name="L440" href="#L440">440</a> 				&amp;&amp; (argsMatch(args, m.getParameterTypes()));
+<a class="jxr_linenumber" name="L441" href="#L441">441</a> 			<em class="jxr_comment">// @formatter:on</em>
+<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> 		<strong class="jxr_keyword">protected</strong> FluentMap&lt;String,Object&gt; properties() {
+<a class="jxr_linenumber" name="L445" href="#L445">445</a> 			<em class="jxr_comment">// @formatter:off</em>
+<a class="jxr_linenumber" name="L446" href="#L446">446</a> 			<strong class="jxr_keyword">return</strong> filteredBeanPropertyMap()
+<a class="jxr_linenumber" name="L447" href="#L447">447</a> 				.a(<span class="jxr_string">"simpleClassName"</span>, simpleClassName)
+<a class="jxr_linenumber" name="L448" href="#L448">448</a> 				.a(<span class="jxr_string">"fullClassName"</span>, fullClassName)
+<a class="jxr_linenumber" name="L449" href="#L449">449</a> 				.a(<span class="jxr_string">"methodName"</span>, methodName)
+<a class="jxr_linenumber" name="L450" href="#L450">450</a> 				.a(<span class="jxr_string">"args"</span>, opt(args).map(x -&gt; '[' + toCdl(x) + <span class="jxr_string">"]"</span>).orElse(<strong class="jxr_keyword">null</strong>))
+<a class="jxr_linenumber" name="L451" href="#L451">451</a> 				.a(<span class="jxr_string">"value"</span>, value);
+<a class="jxr_linenumber" name="L452" href="#L452">452</a> 			<em class="jxr_comment">// @formatter:on</em>
+<a class="jxr_linenumber" name="L453" href="#L453">453</a> 		}
+<a class="jxr_linenumber" name="L454" href="#L454">454</a> 
+<a class="jxr_linenumber" name="L455" href="#L455">455</a> 		@Override
+<a class="jxr_linenumber" name="L456" href="#L456">456</a> 		<strong class="jxr_keyword">public</strong> String toString() {
+<a class="jxr_linenumber" name="L457" href="#L457">457</a> 			<strong class="jxr_keyword">return</strong> r(properties());
+<a class="jxr_linenumber" name="L458" href="#L458">458</a> 		}
+<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> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L462" href="#L462">462</a> <em class="jxr_javadoccomment">	 * Creates a new builder for constructing a {@link ReflectionMap}.</em>
 <a class="jxr_linenumber" name="L463" href="#L463">463</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L464" href="#L464">464</a> <em class="jxr_javadoccomment">	 * @param &lt;V&gt; The type of values stored in the map.</em>
-<a class="jxr_linenumber" name="L465" href="#L465">465</a> <em class="jxr_javadoccomment">	 * @param c The class type of values (used for type safety, not stored).</em>
-<a class="jxr_linenumber" name="L466" href="#L466">466</a> <em class="jxr_javadoccomment">	 * @return A new builder instance.</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> <strong class="jxr_keyword">static</strong> &lt;V&gt; Builder&lt;V&gt; create(Class&lt;V&gt; c) {
-<a class="jxr_linenumber" name="L469" href="#L469">469</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> Builder&lt;&gt;();
-<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> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">boolean</strong> argMatches(String pattern, Class&lt;?&gt; type) {
-<a class="jxr_linenumber" name="L473" href="#L473">473</a> 		<em class="jxr_comment">// Extract base type and dimensions from pattern</em>
-<a class="jxr_linenumber" name="L474" href="#L474">474</a> 		<strong class="jxr_keyword">var</strong> patternDims = 0;
-<a class="jxr_linenumber" name="L475" href="#L475">475</a> 		<strong class="jxr_keyword">var</strong> patternBase = pattern;
-<a class="jxr_linenumber" name="L476" href="#L476">476</a> 		<strong class="jxr_keyword">while</strong> (patternBase.endsWith(<span class="jxr_string">"[]"</span>)) {
-<a class="jxr_linenumber" name="L477" href="#L477">477</a> 			patternDims++;
-<a class="jxr_linenumber" name="L478" href="#L478">478</a> 			patternBase = patternBase.substring(0, patternBase.length() - 2);
-<a class="jxr_linenumber" name="L479" href="#L479">479</a> 		}
+<a class="jxr_linenumber" name="L464" href="#L464">464</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L465" href="#L465">465</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L466" href="#L466">466</a> <em class="jxr_javadoccomment">	 * 	ReflectionMap&amp;lt;String&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = ReflectionMap</em>
+<a class="jxr_linenumber" name="L467" href="#L467">467</a> <em class="jxr_javadoccomment">	 * 		.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;)</em>
+<a class="jxr_linenumber" name="L468" href="#L468">468</a> <em class="jxr_javadoccomment">	 * 		.append(&lt;js&gt;"com.foo.MyClass"&lt;/js&gt;, &lt;js&gt;"value1"&lt;/js&gt;)</em>
+<a class="jxr_linenumber" name="L469" href="#L469">469</a> <em class="jxr_javadoccomment">	 * 		.append(&lt;js&gt;"com.foo.MyClass.myMethod"&lt;/js&gt;, &lt;js&gt;"value2"&lt;/js&gt;)</em>
+<a class="jxr_linenumber" name="L470" href="#L470">470</a> <em class="jxr_javadoccomment">	 * 		.build();</em>
+<a class="jxr_linenumber" name="L471" href="#L471">471</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L472" href="#L472">472</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L473" href="#L473">473</a> <em class="jxr_javadoccomment">	 * @param &lt;V&gt; The type of values stored in the map.</em>
+<a class="jxr_linenumber" name="L474" href="#L474">474</a> <em class="jxr_javadoccomment">	 * @param c The class type of values (used for type safety, not stored).</em>
+<a class="jxr_linenumber" name="L475" href="#L475">475</a> <em class="jxr_javadoccomment">	 * @return A new builder instance.</em>
+<a class="jxr_linenumber" name="L476" href="#L476">476</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L477" href="#L477">477</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;V&gt; Builder&lt;V&gt; create(Class&lt;V&gt; c) {
+<a class="jxr_linenumber" name="L478" href="#L478">478</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> Builder&lt;&gt;();
+<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">// Extract base type and dimensions from actual type</em>
-<a class="jxr_linenumber" name="L482" href="#L482">482</a> 		<strong class="jxr_keyword">var</strong> typeDims = 0;
-<a class="jxr_linenumber" name="L483" href="#L483">483</a> 		<strong class="jxr_keyword">var</strong> typeBase = type;
-<a class="jxr_linenumber" name="L484" href="#L484">484</a> 		<strong class="jxr_keyword">while</strong> (typeBase.isArray()) {
-<a class="jxr_linenumber" name="L485" href="#L485">485</a> 			typeDims++;
-<a class="jxr_linenumber" name="L486" href="#L486">486</a> 			typeBase = typeBase.getComponentType();
-<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">// Array dimensions must match</em>
-<a class="jxr_linenumber" name="L490" href="#L490">490</a> 		<strong class="jxr_keyword">if</strong> (patternDims != typeDims)
-<a class="jxr_linenumber" name="L491" href="#L491">491</a> 			<strong class="jxr_keyword">return</strong> false;
-<a class="jxr_linenumber" name="L492" href="#L492">492</a> 
-<a class="jxr_linenumber" name="L493" href="#L493">493</a> 		<em class="jxr_comment">// If non-array, use simple comparison</em>
-<a class="jxr_linenumber" name="L494" href="#L494">494</a> 		<strong class="jxr_keyword">if</strong> (patternDims == 0)
-<a class="jxr_linenumber" name="L495" href="#L495">495</a> 			<strong class="jxr_keyword">return</strong> eq(pattern, type.getSimpleName()) || eq(pattern, type.getName());
-<a class="jxr_linenumber" name="L496" href="#L496">496</a> 
-<a class="jxr_linenumber" name="L497" href="#L497">497</a> 		<em class="jxr_comment">// For arrays, compare the component types (simple name or full name)</em>
-<a class="jxr_linenumber" name="L498" href="#L498">498</a> 		<strong class="jxr_keyword">return</strong> eq(patternBase, typeBase.getSimpleName()) || eq(patternBase, typeBase.getName());
-<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> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">boolean</strong> argsMatch(String[] names, Class&lt;?&gt;[] args) {
-<a class="jxr_linenumber" name="L502" href="#L502">502</a> 		<strong class="jxr_keyword">if</strong> (names == <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L503" href="#L503">503</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="L504" href="#L504">504</a> 		<strong class="jxr_keyword">if</strong> (names.length != args.length)
-<a class="jxr_linenumber" name="L505" href="#L505">505</a> 			<strong class="jxr_keyword">return</strong> false;
-<a class="jxr_linenumber" name="L506" href="#L506">506</a> 		<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> i = 0; i &lt; args.length; i++) {
-<a class="jxr_linenumber" name="L507" href="#L507">507</a> 			<strong class="jxr_keyword">if</strong> (! argMatches(names[i], args[i]))
-<a class="jxr_linenumber" name="L508" href="#L508">508</a> 				<strong class="jxr_keyword">return</strong> false;
-<a class="jxr_linenumber" name="L509" href="#L509">509</a> 		}
-<a class="jxr_linenumber" name="L510" href="#L510">510</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="L511" href="#L511">511</a> 	}
-<a class="jxr_linenumber" name="L512" href="#L512">512</a> 
-<a class="jxr_linenumber" name="L513" href="#L513">513</a> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">boolean</strong> classMatches(String simpleName, String fullName, Class&lt;?&gt; c) {
-<a class="jxr_linenumber" name="L514" href="#L514">514</a> 		<em class="jxr_comment">// For class org.apache.juneau.a.rttests.RountTripBeansWithBuilders$Ac$Builder</em>
-<a class="jxr_linenumber" name="L515" href="#L515">515</a> 		<em class="jxr_comment">// c.getSimpleName() == "Builder"</em>
-<a class="jxr_linenumber" name="L516" href="#L516">516</a> 		<em class="jxr_comment">// c.getFullName() == "org.apache.juneau.a.rttests.RountTripBeansWithBuilders$Ac$Builder"</em>
-<a class="jxr_linenumber" name="L517" href="#L517">517</a> 		<em class="jxr_comment">// c.getPackage() == "org.apache.juneau.a.rttests"</em>
-<a class="jxr_linenumber" name="L518" href="#L518">518</a> 		<strong class="jxr_keyword">var</strong> cSimple = cns(c);
-<a class="jxr_linenumber" name="L519" href="#L519">519</a> 		<strong class="jxr_keyword">var</strong> cFull = cn(c);
-<a class="jxr_linenumber" name="L520" href="#L520">520</a> 		<strong class="jxr_keyword">if</strong> (eq(simpleName, cSimple) || eq(fullName, cFull) || <span class="jxr_string">"*"</span>.equals(simpleName))
-<a class="jxr_linenumber" name="L521" href="#L521">521</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="L522" href="#L522">522</a> 		<strong class="jxr_keyword">if</strong> (cFull.indexOf('$') != -1) {
-<a class="jxr_linenumber" name="L523" href="#L523">523</a> 			<strong class="jxr_keyword">var</strong> p = c.getPackage();
-<a class="jxr_linenumber" name="L524" href="#L524">524</a> 			<strong class="jxr_keyword">if</strong> (nn(p))
-<a class="jxr_linenumber" name="L525" href="#L525">525</a> 				cFull = cFull.substring(p.getName().length() + 1);
-<a class="jxr_linenumber" name="L526" href="#L526">526</a> 			<strong class="jxr_keyword">if</strong> (eq(simpleName, cFull))
-<a class="jxr_linenumber" name="L527" href="#L527">527</a> 				<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="L528" href="#L528">528</a> 			<strong class="jxr_keyword">var</strong> i = cFull.indexOf('$');
-<a class="jxr_linenumber" name="L529" href="#L529">529</a> 			<strong class="jxr_keyword">while</strong> (i != -1) {
-<a class="jxr_linenumber" name="L530" href="#L530">530</a> 				cFull = cFull.substring(i + 1);
-<a class="jxr_linenumber" name="L531" href="#L531">531</a> 				<strong class="jxr_keyword">if</strong> (eq(simpleName, cFull))
-<a class="jxr_linenumber" name="L532" href="#L532">532</a> 					<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="L533" href="#L533">533</a> 				i = cFull.indexOf('$');
-<a class="jxr_linenumber" name="L534" href="#L534">534</a> 			}
-<a class="jxr_linenumber" name="L535" href="#L535">535</a> 		}
-<a class="jxr_linenumber" name="L536" href="#L536">536</a> 		<strong class="jxr_keyword">return</strong> false;
-<a class="jxr_linenumber" name="L537" href="#L537">537</a> 	}
-<a class="jxr_linenumber" name="L538" href="#L538">538</a> 
-<a class="jxr_linenumber" name="L539" href="#L539">539</a> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> String simpleClassName(String name) {
-<a class="jxr_linenumber" name="L540" href="#L540">540</a> 		<strong class="jxr_keyword">var</strong> i = name.indexOf('.');
-<a class="jxr_linenumber" name="L541" href="#L541">541</a> 		<strong class="jxr_keyword">if</strong> (i == -1)
-<a class="jxr_linenumber" name="L542" href="#L542">542</a> 			<strong class="jxr_keyword">return</strong> name;
-<a class="jxr_linenumber" name="L543" href="#L543">543</a> 		<em class="jxr_comment">// Return null for fully qualified names to ensure they only match by fullName, not by simpleName.</em>
-<a class="jxr_linenumber" name="L544" href="#L544">544</a> 		<em class="jxr_comment">// This prevents ambiguous matches where a simple name pattern might accidentally match</em>
-<a class="jxr_linenumber" name="L545" href="#L545">545</a> 		<em class="jxr_comment">// a fully qualified pattern's simple part.</em>
-<a class="jxr_linenumber" name="L546" href="#L546">546</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L547" href="#L547">547</a> 	}
-<a class="jxr_linenumber" name="L548" href="#L548">548</a> 
-<a class="jxr_linenumber" name="L549" href="#L549">549</a> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> splitNames(String key, Consumer&lt;String&gt; consumer) {
-<a class="jxr_linenumber" name="L550" href="#L550">550</a> 		<strong class="jxr_keyword">if</strong> (key.indexOf(',') == -1) {
-<a class="jxr_linenumber" name="L551" href="#L551">551</a> 			consumer.accept(key);
-<a class="jxr_linenumber" name="L552" href="#L552">552</a> 		} <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="L553" href="#L553">553</a> 			<strong class="jxr_keyword">var</strong> m = 0;
-<a class="jxr_linenumber" name="L554" href="#L554">554</a> 			<strong class="jxr_keyword">var</strong> escaped = false;
-<a class="jxr_linenumber" name="L555" href="#L555">555</a> 			<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> i = 0; i &lt; key.length(); i++) {
-<a class="jxr_linenumber" name="L556" href="#L556">556</a> 				<strong class="jxr_keyword">var</strong> c = key.charAt(i);
-<a class="jxr_linenumber" name="L557" href="#L557">557</a> 				<strong class="jxr_keyword">if</strong> (c == '(')
-<a class="jxr_linenumber" name="L558" href="#L558">558</a> 					escaped = <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="L559" href="#L559">559</a> 				<strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (c == ')')
-<a class="jxr_linenumber" name="L560" href="#L560">560</a> 					escaped = false;
-<a class="jxr_linenumber" name="L561" href="#L561">561</a> 				<strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (c == ',' &amp;&amp; ! escaped) {
-<a class="jxr_linenumber" name="L562" href="#L562">562</a> 					consumer.accept(key.substring(m, i).trim());
-<a class="jxr_linenumber" name="L563" href="#L563">563</a> 					m = i + 1;
-<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> 			consumer.accept(key.substring(m).trim());
-<a class="jxr_linenumber" name="L567" href="#L567">567</a> 		}
-<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> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> String stripGenerics(String type) {
-<a class="jxr_linenumber" name="L571" href="#L571">571</a> 		<strong class="jxr_keyword">if</strong> (type.indexOf('&lt;') == -1)
-<a class="jxr_linenumber" name="L572" href="#L572">572</a> 			<strong class="jxr_keyword">return</strong> type;
-<a class="jxr_linenumber" name="L573" href="#L573">573</a> 		<strong class="jxr_keyword">var</strong> sb = <strong class="jxr_keyword">new</strong> StringBuilder(type.length());
-<a class="jxr_linenumber" name="L574" href="#L574">574</a> 		<strong class="jxr_keyword">var</strong> depth = 0;
-<a class="jxr_linenumber" name="L575" href="#L575">575</a> 		<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> i = 0; i &lt; type.length(); i++) {
-<a class="jxr_linenumber" name="L576" href="#L576">576</a> 			<strong class="jxr_keyword">var</strong> c = type.charAt(i);
-<a class="jxr_linenumber" name="L577" href="#L577">577</a> 			<strong class="jxr_keyword">if</strong> (c == '&lt;') {
-<a class="jxr_linenumber" name="L578" href="#L578">578</a> 				depth++;
-<a class="jxr_linenumber" name="L579" href="#L579">579</a> 			} <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (c == '&gt;') {
-<a class="jxr_linenumber" name="L580" href="#L580">580</a> 				depth--;
-<a class="jxr_linenumber" name="L581" href="#L581">581</a> 			} <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (depth == 0) {
-<a class="jxr_linenumber" name="L582" href="#L582">582</a> 				sb.append(c);
-<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> 		<strong class="jxr_keyword">return</strong> sb.toString();
-<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> 	<strong class="jxr_keyword">final</strong> List&lt;ClassEntry&lt;V&gt;&gt; classEntries;
-<a class="jxr_linenumber" name="L589" href="#L589">589</a> 	<strong class="jxr_keyword">final</strong> List&lt;MethodEntry&lt;V&gt;&gt; methodEntries;
-<a class="jxr_linenumber" name="L590" href="#L590">590</a> 	<strong class="jxr_keyword">final</strong> List&lt;FieldEntry&lt;V&gt;&gt; fieldEntries;
-<a class="jxr_linenumber" name="L591" href="#L591">591</a> 	<strong class="jxr_keyword">final</strong> List&lt;ConstructorEntry&lt;V&gt;&gt; constructorEntries;
-<a class="jxr_linenumber" name="L592" href="#L592">592</a> 
-<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> <em class="jxr_javadoccomment">	 * Constructor.</em>
-<a class="jxr_linenumber" name="L595" href="#L595">595</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L596" href="#L596">596</a> <em class="jxr_javadoccomment">	 * @param b The builder containing the mappings to initialize this map with.</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> 	<strong class="jxr_keyword">protected</strong> <a name="ReflectionMap" href="../../../../../org/apache/juneau/commons/reflect/ReflectionMap.html#ReflectionMap">ReflectionMap</a>(Builder&lt;V&gt; b) {
-<a class="jxr_linenumber" name="L599" href="#L599">599</a> 		<strong class="jxr_keyword">this</strong>.classEntries = u(copyOf(b.classEntries));
-<a class="jxr_linenumber" name="L600" href="#L600">600</a> 		<strong class="jxr_keyword">this</strong>.methodEntries = u(copyOf(b.methodEntries));
-<a class="jxr_linenumber" name="L601" href="#L601">601</a> 		<strong class="jxr_keyword">this</strong>.fieldEntries = u(copyOf(b.fieldEntries));
-<a class="jxr_linenumber" name="L602" href="#L602">602</a> 		<strong class="jxr_keyword">this</strong>.constructorEntries = u(copyOf(b.constructorEntries));
-<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> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L606" href="#L606">606</a> <em class="jxr_javadoccomment">	 * Finds all values associated with the specified class.</em>
-<a class="jxr_linenumber" name="L607" href="#L607">607</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L608" href="#L608">608</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L609" href="#L609">609</a> <em class="jxr_javadoccomment">	 * This method searches for mappings that match the given class, including patterns for</em>
-<a class="jxr_linenumber" name="L610" href="#L610">610</a> <em class="jxr_javadoccomment">	 * the fully qualified name, simple name, inner class names, and wildcard patterns.</em>
-<a class="jxr_linenumber" name="L611" href="#L611">611</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L612" href="#L612">612</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L613" href="#L613">613</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L614" href="#L614">614</a> <em class="jxr_javadoccomment">	 * 	ReflectionMap&amp;lt;String&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = ReflectionMap</em>
-<a class="jxr_linenumber" name="L615" href="#L615">615</a> <em class="jxr_javadoccomment">	 * 		.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;)</em>
-<a class="jxr_linenumber" name="L616" href="#L616">616</a> <em class="jxr_javadoccomment">	 * 		.append(&lt;js&gt;"com.foo.MyClass"&lt;/js&gt;, &lt;js&gt;"value1"&lt;/js&gt;)</em>
-<a class="jxr_linenumber" name="L617" href="#L617">617</a> <em class="jxr_javadoccomment">	 * 		.append(&lt;js&gt;"MyClass"&lt;/js&gt;, &lt;js&gt;"value2"&lt;/js&gt;)</em>
-<a class="jxr_linenumber" name="L618" href="#L618">618</a> <em class="jxr_javadoccomment">	 * 		.build();</em>
-<a class="jxr_linenumber" name="L619" href="#L619">619</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L620" href="#L620">620</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Find all values for MyClass&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L621" href="#L621">621</a> <em class="jxr_javadoccomment">	 * 	Stream&amp;lt;String&amp;gt; &lt;jv&gt;values&lt;/jv&gt; = &lt;jv&gt;map&lt;/jv&gt;.find(MyClass.&lt;jk&gt;class&lt;/jk&gt;);</em>
-<a class="jxr_linenumber" name="L622" href="#L622">622</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Returns stream containing ["value1", "value2"]&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L623" href="#L623">623</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L624" href="#L624">624</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L625" href="#L625">625</a> <em class="jxr_javadoccomment">	 * @param c The class to find mappings for. Can be &lt;jk&gt;null&lt;/jk&gt;.</em>
-<a class="jxr_linenumber" name="L626" href="#L626">626</a> <em class="jxr_javadoccomment">	 * @return A stream of all values associated with the class. Empty stream if no matches found.</em>
-<a class="jxr_linenumber" name="L627" href="#L627">627</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L628" href="#L628">628</a> 	<strong class="jxr_keyword">public</strong> Stream&lt;V&gt; find(Class&lt;?&gt; c) {
-<a class="jxr_linenumber" name="L629" href="#L629">629</a> 		<strong class="jxr_keyword">return</strong> classEntries.stream().filter(x -&gt; x.matches(c)).map(x -&gt; x.value);
-<a class="jxr_linenumber" name="L630" href="#L630">630</a> 	}
-<a class="jxr_linenumber" name="L631" href="#L631">631</a> 
-<a class="jxr_linenumber" name="L632" href="#L632">632</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L633" href="#L633">633</a> <em class="jxr_javadoccomment">	 * Finds all values associated with the specified constructor.</em>
-<a class="jxr_linenumber" name="L634" href="#L634">634</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L635" href="#L635">635</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L636" href="#L636">636</a> <em class="jxr_javadoccomment">	 * This method searches for mappings that match the given constructor, considering both</em>
-<a class="jxr_linenumber" name="L637" href="#L637">637</a> <em class="jxr_javadoccomment">	 * the declaring class and parameter types.</em>
-<a class="jxr_linenumber" name="L638" href="#L638">638</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L639" href="#L639">639</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L640" href="#L640">640</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L641" href="#L641">641</a> <em class="jxr_javadoccomment">	 * 	ReflectionMap&amp;lt;String&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = ReflectionMap</em>
-<a class="jxr_linenumber" name="L642" href="#L642">642</a> <em class="jxr_javadoccomment">	 * 		.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;)</em>
-<a class="jxr_linenumber" name="L643" href="#L643">643</a> <em class="jxr_javadoccomment">	 * 		.append(&lt;js&gt;"MyClass(String,int)"&lt;/js&gt;, &lt;js&gt;"value1"&lt;/js&gt;)</em>
-<a class="jxr_linenumber" name="L644" href="#L644">644</a> <em class="jxr_javadoccomment">	 * 		.build();</em>
-<a class="jxr_linenumber" name="L645" href="#L645">645</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L646" href="#L646">646</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Find value for specific constructor&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L647" href="#L647">647</a> <em class="jxr_javadoccomment">	 * 	Constructor&amp;lt;?&amp;gt; &lt;jv&gt;ctor&lt;/jv&gt; = MyClass.&lt;jk&gt;class&lt;/jk&gt;.getConstructor(String.&lt;jk&gt;class&lt;/jk&gt;, &lt;jk&gt;int&lt;/jk&gt;.&lt;jk&gt;class&lt;/jk&gt;);</em>
-<a class="jxr_linenumber" name="L648" href="#L648">648</a> <em class="jxr_javadoccomment">	 * 	Stream&amp;lt;String&amp;gt; &lt;jv&gt;values&lt;/jv&gt; = &lt;jv&gt;map&lt;/jv&gt;.find(&lt;jv&gt;ctor&lt;/jv&gt;);</em>
-<a class="jxr_linenumber" name="L649" href="#L649">649</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</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> <em class="jxr_javadoccomment">	 * @param c The constructor to find mappings for. Can be &lt;jk&gt;null&lt;/jk&gt;.</em>
-<a class="jxr_linenumber" name="L652" href="#L652">652</a> <em class="jxr_javadoccomment">	 * @return A stream of all values associated with the constructor. Empty stream if no matches found.</em>
-<a class="jxr_linenumber" name="L653" href="#L653">653</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L654" href="#L654">654</a> 	<strong class="jxr_keyword">public</strong> Stream&lt;V&gt; find(Constructor&lt;?&gt; c) {
-<a class="jxr_linenumber" name="L655" href="#L655">655</a> 		<strong class="jxr_keyword">return</strong> constructorEntries.stream().filter(x -&gt; x.matches(c)).map(x -&gt; x.value);
-<a class="jxr_linenumber" name="L656" href="#L656">656</a> 	}
-<a class="jxr_linenumber" name="L657" href="#L657">657</a> 
-<a class="jxr_linenumber" name="L658" href="#L658">658</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L659" href="#L659">659</a> <em class="jxr_javadoccomment">	 * Finds all values associated with the specified field.</em>
-<a class="jxr_linenumber" name="L660" href="#L660">660</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L661" href="#L661">661</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L662" href="#L662">662</a> <em class="jxr_javadoccomment">	 * This method searches for mappings that match the given field, considering both</em>
-<a class="jxr_linenumber" name="L663" href="#L663">663</a> <em class="jxr_javadoccomment">	 * the declaring class and field name.</em>
-<a class="jxr_linenumber" name="L664" href="#L664">664</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L665" href="#L665">665</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L666" href="#L666">666</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L667" href="#L667">667</a> <em class="jxr_javadoccomment">	 * 	ReflectionMap&amp;lt;String&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = ReflectionMap</em>
-<a class="jxr_linenumber" name="L668" href="#L668">668</a> <em class="jxr_javadoccomment">	 * 		.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;)</em>
-<a class="jxr_linenumber" name="L669" href="#L669">669</a> <em class="jxr_javadoccomment">	 * 		.append(&lt;js&gt;"MyClass.myField"&lt;/js&gt;, &lt;js&gt;"value1"&lt;/js&gt;)</em>
-<a class="jxr_linenumber" name="L670" href="#L670">670</a> <em class="jxr_javadoccomment">	 * 		.build();</em>
-<a class="jxr_linenumber" name="L671" href="#L671">671</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L672" href="#L672">672</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Find value for specific field&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L673" href="#L673">673</a> <em class="jxr_javadoccomment">	 * 	Field &lt;jv&gt;field&lt;/jv&gt; = MyClass.&lt;jk&gt;class&lt;/jk&gt;.getField(&lt;js&gt;"myField"&lt;/js&gt;);</em>
-<a class="jxr_linenumber" name="L674" href="#L674">674</a> <em class="jxr_javadoccomment">	 * 	Stream&amp;lt;String&amp;gt; &lt;jv&gt;values&lt;/jv&gt; = &lt;jv&gt;map&lt;/jv&gt;.find(&lt;jv&gt;field&lt;/jv&gt;);</em>
-<a class="jxr_linenumber" name="L675" href="#L675">675</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L676" href="#L676">676</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L677" href="#L677">677</a> <em class="jxr_javadoccomment">	 * @param f The field to find mappings for. Can be &lt;jk&gt;null&lt;/jk&gt;.</em>
-<a class="jxr_linenumber" name="L678" href="#L678">678</a> <em class="jxr_javadoccomment">	 * @return A stream of all values associated with the field. Empty stream if no matches found.</em>
-<a class="jxr_linenumber" name="L679" href="#L679">679</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L680" href="#L680">680</a> 	<strong class="jxr_keyword">public</strong> Stream&lt;V&gt; find(Field f) {
-<a class="jxr_linenumber" name="L681" href="#L681">681</a> 		<strong class="jxr_keyword">return</strong> fieldEntries.stream().filter(x -&gt; x.matches(f)).map(x -&gt; x.value);
-<a class="jxr_linenumber" name="L682" href="#L682">682</a> 	}
-<a class="jxr_linenumber" name="L683" href="#L683">683</a> 
-<a class="jxr_linenumber" name="L684" href="#L684">684</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L685" href="#L685">685</a> <em class="jxr_javadoccomment">	 * Finds all values associated with the specified method.</em>
-<a class="jxr_linenumber" name="L686" href="#L686">686</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L687" href="#L687">687</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L688" href="#L688">688</a> <em class="jxr_javadoccomment">	 * This method searches for mappings that match the given method, considering the</em>
-<a class="jxr_linenumber" name="L689" href="#L689">689</a> <em class="jxr_javadoccomment">	 * declaring class, method name, and parameter types.</em>
-<a class="jxr_linenumber" name="L690" href="#L690">690</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L691" href="#L691">691</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L692" href="#L692">692</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L693" href="#L693">693</a> <em class="jxr_javadoccomment">	 * 	ReflectionMap&amp;lt;String&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = ReflectionMap</em>
-<a class="jxr_linenumber" name="L694" href="#L694">694</a> <em class="jxr_javadoccomment">	 * 		.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;)</em>
-<a class="jxr_linenumber" name="L695" href="#L695">695</a> <em class="jxr_javadoccomment">	 * 		.append(&lt;js&gt;"MyClass.myMethod"&lt;/js&gt;, &lt;js&gt;"value1"&lt;/js&gt;)</em>
-<a class="jxr_linenumber" name="L696" href="#L696">696</a> <em class="jxr_javadoccomment">	 * 		.append(&lt;js&gt;"MyClass.myMethod(String)"&lt;/js&gt;, &lt;js&gt;"value2"&lt;/js&gt;)</em>
-<a class="jxr_linenumber" name="L697" href="#L697">697</a> <em class="jxr_javadoccomment">	 * 		.build();</em>
-<a class="jxr_linenumber" name="L698" href="#L698">698</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L699" href="#L699">699</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Find values for specific method&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L700" href="#L700">700</a> <em class="jxr_javadoccomment">	 * 	Method &lt;jv&gt;method&lt;/jv&gt; = MyClass.&lt;jk&gt;class&lt;/jk&gt;.getMethod(&lt;js&gt;"myMethod"&lt;/js&gt;, String.&lt;jk&gt;class&lt;/jk&gt;);</em>
-<a class="jxr_linenumber" name="L701" href="#L701">701</a> <em class="jxr_javadoccomment">	 * 	Stream&amp;lt;String&amp;gt; &lt;jv&gt;values&lt;/jv&gt; = &lt;jv&gt;map&lt;/jv&gt;.find(&lt;jv&gt;method&lt;/jv&gt;);</em>
-<a class="jxr_linenumber" name="L702" href="#L702">702</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Returns stream containing ["value1", "value2"] - first matches any signature&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L703" href="#L703">703</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L704" href="#L704">704</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L705" href="#L705">705</a> <em class="jxr_javadoccomment">	 * @param m The method to find mappings for. Can be &lt;jk&gt;null&lt;/jk&gt;.</em>
-<a class="jxr_linenumber" name="L706" href="#L706">706</a> <em class="jxr_javadoccomment">	 * @return A stream of all values associated with the method. Empty stream if no matches found.</em>
-<a class="jxr_linenumber" name="L707" href="#L707">707</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L708" href="#L708">708</a> 	<strong class="jxr_keyword">public</strong> Stream&lt;V&gt; find(Method m) {
-<a class="jxr_linenumber" name="L709" href="#L709">709</a> 		<strong class="jxr_keyword">return</strong> methodEntries.stream().filter(x -&gt; x.matches(m)).map(x -&gt; x.value);
-<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> 	@Override <em class="jxr_comment">/* Overridden from Object */</em>
-<a class="jxr_linenumber" name="L713" href="#L713">713</a> 	<strong class="jxr_keyword">public</strong> String toString() {
-<a class="jxr_linenumber" name="L714" href="#L714">714</a> 		<em class="jxr_comment">// @formatter:off</em>
-<a class="jxr_linenumber" name="L715" href="#L715">715</a> 		<strong class="jxr_keyword">return</strong> mapb().filtered()
-<a class="jxr_linenumber" name="L716" href="#L716">716</a> 			.add(<span class="jxr_string">"classEntries"</span>, classEntries)
-<a class="jxr_linenumber" name="L717" href="#L717">717</a> 			.add(<span class="jxr_string">"methodEntries"</span>, methodEntries)
-<a class="jxr_linenumber" name="L718" href="#L718">718</a> 			.add(<span class="jxr_string">"fieldEntries"</span>, fieldEntries)
-<a class="jxr_linenumber" name="L719" href="#L719">719</a> 			.add(<span class="jxr_string">"constructorEntries"</span>, constructorEntries)
-<a class="jxr_linenumber" name="L720" href="#L720">720</a> 			.build()
-<a class="jxr_linenumber" name="L721" href="#L721">721</a> 			.toString();
-<a class="jxr_linenumber" name="L722" href="#L722">722</a> 		<em class="jxr_comment">// @formatter:on</em>
-<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="L481" href="#L481">481</a> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">boolean</strong> argMatches(String pattern, Class&lt;?&gt; type) {
+<a class="jxr_linenumber" name="L482" href="#L482">482</a> 		<em class="jxr_comment">// Extract base type and dimensions from pattern</em>
+<a class="jxr_linenumber" name="L483" href="#L483">483</a> 		<strong class="jxr_keyword">var</strong> patternDims = 0;
+<a class="jxr_linenumber" name="L484" href="#L484">484</a> 		<strong class="jxr_keyword">var</strong> patternBase = pattern;
+<a class="jxr_linenumber" name="L485" href="#L485">485</a> 		<strong class="jxr_keyword">while</strong> (patternBase.endsWith(<span class="jxr_string">"[]"</span>)) {
+<a class="jxr_linenumber" name="L486" href="#L486">486</a> 			patternDims++;
+<a class="jxr_linenumber" name="L487" href="#L487">487</a> 			patternBase = patternBase.substring(0, patternBase.length() - 2);
+<a class="jxr_linenumber" name="L488" href="#L488">488</a> 		}
+<a class="jxr_linenumber" name="L489" href="#L489">489</a> 
+<a class="jxr_linenumber" name="L490" href="#L490">490</a> 		<em class="jxr_comment">// Extract base type and dimensions from actual type</em>
+<a class="jxr_linenumber" name="L491" href="#L491">491</a> 		<strong class="jxr_keyword">var</strong> typeDims = 0;
+<a class="jxr_linenumber" name="L492" href="#L492">492</a> 		<strong class="jxr_keyword">var</strong> typeBase = type;
+<a class="jxr_linenumber" name="L493" href="#L493">493</a> 		<strong class="jxr_keyword">while</strong> (typeBase.isArray()) {
+<a class="jxr_linenumber" name="L494" href="#L494">494</a> 			typeDims++;
+<a class="jxr_linenumber" name="L495" href="#L495">495</a> 			typeBase = typeBase.getComponentType();
+<a class="jxr_linenumber" name="L496" href="#L496">496</a> 		}
+<a class="jxr_linenumber" name="L497" href="#L497">497</a> 
+<a class="jxr_linenumber" name="L498" href="#L498">498</a> 		<em class="jxr_comment">// Array dimensions must match</em>
+<a class="jxr_linenumber" name="L499" href="#L499">499</a> 		<strong class="jxr_keyword">if</strong> (patternDims != typeDims)
+<a class="jxr_linenumber" name="L500" href="#L500">500</a> 			<strong class="jxr_keyword">return</strong> false;
+<a class="jxr_linenumber" name="L501" href="#L501">501</a> 
+<a class="jxr_linenumber" name="L502" href="#L502">502</a> 		<em class="jxr_comment">// If non-array, use simple comparison</em>
+<a class="jxr_linenumber" name="L503" href="#L503">503</a> 		<strong class="jxr_keyword">if</strong> (patternDims == 0)
+<a class="jxr_linenumber" name="L504" href="#L504">504</a> 			<strong class="jxr_keyword">return</strong> eq(pattern, type.getSimpleName()) || eq(pattern, type.getName());
+<a class="jxr_linenumber" name="L505" href="#L505">505</a> 
+<a class="jxr_linenumber" name="L506" href="#L506">506</a> 		<em class="jxr_comment">// For arrays, compare the component types (simple name or full name)</em>
+<a class="jxr_linenumber" name="L507" href="#L507">507</a> 		<strong class="jxr_keyword">return</strong> eq(patternBase, typeBase.getSimpleName()) || eq(patternBase, typeBase.getName());
+<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> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">boolean</strong> argsMatch(String[] names, Class&lt;?&gt;[] args) {
+<a class="jxr_linenumber" name="L511" href="#L511">511</a> 		<strong class="jxr_keyword">if</strong> (names == <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L512" href="#L512">512</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="L513" href="#L513">513</a> 		<strong class="jxr_keyword">if</strong> (names.length != args.length)
+<a class="jxr_linenumber" name="L514" href="#L514">514</a> 			<strong class="jxr_keyword">return</strong> false;
+<a class="jxr_linenumber" name="L515" href="#L515">515</a> 		<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> i = 0; i &lt; args.length; i++) {
+<a class="jxr_linenumber" name="L516" href="#L516">516</a> 			<strong class="jxr_keyword">if</strong> (! argMatches(names[i], args[i]))
+<a class="jxr_linenumber" name="L517" href="#L517">517</a> 				<strong class="jxr_keyword">return</strong> false;
+<a class="jxr_linenumber" name="L518" href="#L518">518</a> 		}
+<a class="jxr_linenumber" name="L519" href="#L519">519</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
+<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> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">boolean</strong> classMatches(String simpleName, String fullName, Class&lt;?&gt; c) {
+<a class="jxr_linenumber" name="L523" href="#L523">523</a> 		<em class="jxr_comment">// For class org.apache.juneau.a.rttests.RountTripBeansWithBuilders$Ac$Builder</em>
+<a class="jxr_linenumber" name="L524" href="#L524">524</a> 		<em class="jxr_comment">// c.getSimpleName() == "Builder"</em>
+<a class="jxr_linenumber" name="L525" href="#L525">525</a> 		<em class="jxr_comment">// c.getFullName() == "org.apache.juneau.a.rttests.RountTripBeansWithBuilders$Ac$Builder"</em>
+<a class="jxr_linenumber" name="L526" href="#L526">526</a> 		<em class="jxr_comment">// c.getPackage() == "org.apache.juneau.a.rttests"</em>
+<a class="jxr_linenumber" name="L527" href="#L527">527</a> 		<strong class="jxr_keyword">var</strong> cSimple = cns(c);
+<a class="jxr_linenumber" name="L528" href="#L528">528</a> 		<strong class="jxr_keyword">var</strong> cFull = cn(c);
+<a class="jxr_linenumber" name="L529" href="#L529">529</a> 		<strong class="jxr_keyword">if</strong> (eq(simpleName, cSimple) || eq(fullName, cFull) || <span class="jxr_string">"*"</span>.equals(simpleName))
+<a class="jxr_linenumber" name="L530" href="#L530">530</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="L531" href="#L531">531</a> 		<strong class="jxr_keyword">if</strong> (cFull.indexOf('$') != -1) {
+<a class="jxr_linenumber" name="L532" href="#L532">532</a> 			<strong class="jxr_keyword">var</strong> p = c.getPackage();
+<a class="jxr_linenumber" name="L533" href="#L533">533</a> 			<strong class="jxr_keyword">if</strong> (nn(p))
+<a class="jxr_linenumber" name="L534" href="#L534">534</a> 				cFull = cFull.substring(p.getName().length() + 1);
+<a class="jxr_linenumber" name="L535" href="#L535">535</a> 			<strong class="jxr_keyword">if</strong> (eq(simpleName, cFull))
+<a class="jxr_linenumber" name="L536" href="#L536">536</a> 				<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="L537" href="#L537">537</a> 			<strong class="jxr_keyword">var</strong> i = cFull.indexOf('$');
+<a class="jxr_linenumber" name="L538" href="#L538">538</a> 			<strong class="jxr_keyword">while</strong> (i != -1) {
+<a class="jxr_linenumber" name="L539" href="#L539">539</a> 				cFull = cFull.substring(i + 1);
+<a class="jxr_linenumber" name="L540" href="#L540">540</a> 				<strong class="jxr_keyword">if</strong> (eq(simpleName, cFull))
+<a class="jxr_linenumber" name="L541" href="#L541">541</a> 					<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="L542" href="#L542">542</a> 				i = cFull.indexOf('$');
+<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> 		<strong class="jxr_keyword">return</strong> false;
+<a class="jxr_linenumber" name="L546" href="#L546">546</a> 	}
+<a class="jxr_linenumber" name="L547" href="#L547">547</a> 
+<a class="jxr_linenumber" name="L548" href="#L548">548</a> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> String simpleClassName(String name) {
+<a class="jxr_linenumber" name="L549" href="#L549">549</a> 		<strong class="jxr_keyword">var</strong> i = name.indexOf('.');
+<a class="jxr_linenumber" name="L550" href="#L550">550</a> 		<strong class="jxr_keyword">if</strong> (i == -1)
+<a class="jxr_linenumber" name="L551" href="#L551">551</a> 			<strong class="jxr_keyword">return</strong> name;
+<a class="jxr_linenumber" name="L552" href="#L552">552</a> 		<em class="jxr_comment">// Return null for fully qualified names to ensure they only match by fullName, not by simpleName.</em>
+<a class="jxr_linenumber" name="L553" href="#L553">553</a> 		<em class="jxr_comment">// This prevents ambiguous matches where a simple name pattern might accidentally match</em>
+<a class="jxr_linenumber" name="L554" href="#L554">554</a> 		<em class="jxr_comment">// a fully qualified pattern's simple part.</em>
+<a class="jxr_linenumber" name="L555" href="#L555">555</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<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> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> splitNames(String key, Consumer&lt;String&gt; consumer) {
+<a class="jxr_linenumber" name="L559" href="#L559">559</a> 		<strong class="jxr_keyword">if</strong> (key.indexOf(',') == -1) {
+<a class="jxr_linenumber" name="L560" href="#L560">560</a> 			consumer.accept(key);
+<a class="jxr_linenumber" name="L561" href="#L561">561</a> 		} <strong class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="L562" href="#L562">562</a> 			<strong class="jxr_keyword">var</strong> m = 0;
+<a class="jxr_linenumber" name="L563" href="#L563">563</a> 			<strong class="jxr_keyword">var</strong> escaped = false;
+<a class="jxr_linenumber" name="L564" href="#L564">564</a> 			<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> i = 0; i &lt; key.length(); i++) {
+<a class="jxr_linenumber" name="L565" href="#L565">565</a> 				<strong class="jxr_keyword">var</strong> c = key.charAt(i);
+<a class="jxr_linenumber" name="L566" href="#L566">566</a> 				<strong class="jxr_keyword">if</strong> (c == '(')
+<a class="jxr_linenumber" name="L567" href="#L567">567</a> 					escaped = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="L568" href="#L568">568</a> 				<strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (c == ')')
+<a class="jxr_linenumber" name="L569" href="#L569">569</a> 					escaped = false;
+<a class="jxr_linenumber" name="L570" href="#L570">570</a> 				<strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (c == ',' &amp;&amp; ! escaped) {
+<a class="jxr_linenumber" name="L571" href="#L571">571</a> 					consumer.accept(key.substring(m, i).trim());
+<a class="jxr_linenumber" name="L572" href="#L572">572</a> 					m = i + 1;
+<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> 			consumer.accept(key.substring(m).trim());
+<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> 
+<a class="jxr_linenumber" name="L579" href="#L579">579</a> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> String stripGenerics(String type) {
+<a class="jxr_linenumber" name="L580" href="#L580">580</a> 		<strong class="jxr_keyword">if</strong> (type.indexOf('&lt;') == -1)
+<a class="jxr_linenumber" name="L581" href="#L581">581</a> 			<strong class="jxr_keyword">return</strong> type;
+<a class="jxr_linenumber" name="L582" href="#L582">582</a> 		<strong class="jxr_keyword">var</strong> sb = <strong class="jxr_keyword">new</strong> StringBuilder(type.length());
+<a class="jxr_linenumber" name="L583" href="#L583">583</a> 		<strong class="jxr_keyword">var</strong> depth = 0;
+<a class="jxr_linenumber" name="L584" href="#L584">584</a> 		<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> i = 0; i &lt; type.length(); i++) {
+<a class="jxr_linenumber" name="L585" href="#L585">585</a> 			<strong class="jxr_keyword">var</strong> c = type.charAt(i);
+<a class="jxr_linenumber" name="L586" href="#L586">586</a> 			<strong class="jxr_keyword">if</strong> (c == '&lt;') {
+<a class="jxr_linenumber" name="L587" href="#L587">587</a> 				depth++;
+<a class="jxr_linenumber" name="L588" href="#L588">588</a> 			} <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (c == '&gt;') {
+<a class="jxr_linenumber" name="L589" href="#L589">589</a> 				depth--;
+<a class="jxr_linenumber" name="L590" href="#L590">590</a> 			} <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (depth == 0) {
+<a class="jxr_linenumber" name="L591" href="#L591">591</a> 				sb.append(c);
+<a class="jxr_linenumber" name="L592" href="#L592">592</a> 			}
+<a class="jxr_linenumber" name="L593" href="#L593">593</a> 		}
+<a class="jxr_linenumber" name="L594" href="#L594">594</a> 		<strong class="jxr_keyword">return</strong> sb.toString();
+<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="L597" href="#L597">597</a> 	<strong class="jxr_keyword">final</strong> List&lt;ClassEntry&lt;V&gt;&gt; classEntries;
+<a class="jxr_linenumber" name="L598" href="#L598">598</a> 	<strong class="jxr_keyword">final</strong> List&lt;MethodEntry&lt;V&gt;&gt; methodEntries;
+<a class="jxr_linenumber" name="L599" href="#L599">599</a> 	<strong class="jxr_keyword">final</strong> List&lt;FieldEntry&lt;V&gt;&gt; fieldEntries;
+<a class="jxr_linenumber" name="L600" href="#L600">600</a> 	<strong class="jxr_keyword">final</strong> List&lt;ConstructorEntry&lt;V&gt;&gt; constructorEntries;
+<a class="jxr_linenumber" name="L601" href="#L601">601</a> 
+<a class="jxr_linenumber" name="L602" href="#L602">602</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L603" href="#L603">603</a> <em class="jxr_javadoccomment">	 * Constructor.</em>
+<a class="jxr_linenumber" name="L604" href="#L604">604</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L605" href="#L605">605</a> <em class="jxr_javadoccomment">	 * @param b The builder containing the mappings to initialize this map with.</em>
+<a class="jxr_linenumber" name="L606" href="#L606">606</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L607" href="#L607">607</a> 	<strong class="jxr_keyword">protected</strong> <a name="ReflectionMap" href="../../../../../org/apache/juneau/commons/reflect/ReflectionMap.html#ReflectionMap">ReflectionMap</a>(Builder&lt;V&gt; b) {
+<a class="jxr_linenumber" name="L608" href="#L608">608</a> 		<strong class="jxr_keyword">this</strong>.classEntries = u(copyOf(b.classEntries));
+<a class="jxr_linenumber" name="L609" href="#L609">609</a> 		<strong class="jxr_keyword">this</strong>.methodEntries = u(copyOf(b.methodEntries));
+<a class="jxr_linenumber" name="L610" href="#L610">610</a> 		<strong class="jxr_keyword">this</strong>.fieldEntries = u(copyOf(b.fieldEntries));
+<a class="jxr_linenumber" name="L611" href="#L611">611</a> 		<strong class="jxr_keyword">this</strong>.constructorEntries = u(copyOf(b.constructorEntries));
+<a class="jxr_linenumber" name="L612" href="#L612">612</a> 	}
+<a class="jxr_linenumber" name="L613" href="#L613">613</a> 
+<a class="jxr_linenumber" name="L614" href="#L614">614</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L615" href="#L615">615</a> <em class="jxr_javadoccomment">	 * Finds all values associated with the specified class.</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> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L618" href="#L618">618</a> <em class="jxr_javadoccomment">	 * This method searches for mappings that match the given class, including patterns for</em>
+<a class="jxr_linenumber" name="L619" href="#L619">619</a> <em class="jxr_javadoccomment">	 * the fully qualified name, simple name, inner class names, and wildcard patterns.</em>
+<a class="jxr_linenumber" name="L620" href="#L620">620</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L621" href="#L621">621</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L622" href="#L622">622</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L623" href="#L623">623</a> <em class="jxr_javadoccomment">	 * 	ReflectionMap&amp;lt;String&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = ReflectionMap</em>
+<a class="jxr_linenumber" name="L624" href="#L624">624</a> <em class="jxr_javadoccomment">	 * 		.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;)</em>
+<a class="jxr_linenumber" name="L625" href="#L625">625</a> <em class="jxr_javadoccomment">	 * 		.append(&lt;js&gt;"com.foo.MyClass"&lt;/js&gt;, &lt;js&gt;"value1"&lt;/js&gt;)</em>
+<a class="jxr_linenumber" name="L626" href="#L626">626</a> <em class="jxr_javadoccomment">	 * 		.append(&lt;js&gt;"MyClass"&lt;/js&gt;, &lt;js&gt;"value2"&lt;/js&gt;)</em>
+<a class="jxr_linenumber" name="L627" href="#L627">627</a> <em class="jxr_javadoccomment">	 * 		.build();</em>
+<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">	 * 	&lt;jc&gt;// Find all values for MyClass&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L630" href="#L630">630</a> <em class="jxr_javadoccomment">	 * 	Stream&amp;lt;String&amp;gt; &lt;jv&gt;values&lt;/jv&gt; = &lt;jv&gt;map&lt;/jv&gt;.find(MyClass.&lt;jk&gt;class&lt;/jk&gt;);</em>
+<a class="jxr_linenumber" name="L631" href="#L631">631</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Returns stream containing ["value1", "value2"]&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L632" href="#L632">632</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L633" href="#L633">633</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L634" href="#L634">634</a> <em class="jxr_javadoccomment">	 * @param c The class to find mappings for. Can be &lt;jk&gt;null&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L635" href="#L635">635</a> <em class="jxr_javadoccomment">	 * @return A stream of all values associated with the class. Empty stream if no matches found.</em>
+<a class="jxr_linenumber" name="L636" href="#L636">636</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L637" href="#L637">637</a> 	<strong class="jxr_keyword">public</strong> Stream&lt;V&gt; find(Class&lt;?&gt; c) {
+<a class="jxr_linenumber" name="L638" href="#L638">638</a> 		<strong class="jxr_keyword">return</strong> classEntries.stream().filter(x -&gt; x.matches(c)).map(x -&gt; x.value);
+<a class="jxr_linenumber" name="L639" href="#L639">639</a> 	}
+<a class="jxr_linenumber" name="L640" href="#L640">640</a> 
+<a class="jxr_linenumber" name="L641" href="#L641">641</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L642" href="#L642">642</a> <em class="jxr_javadoccomment">	 * Finds all values associated with the specified constructor.</em>
+<a class="jxr_linenumber" name="L643" href="#L643">643</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L644" href="#L644">644</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L645" href="#L645">645</a> <em class="jxr_javadoccomment">	 * This method searches for mappings that match the given constructor, considering both</em>
+<a class="jxr_linenumber" name="L646" href="#L646">646</a> <em class="jxr_javadoccomment">	 * the declaring class and parameter types.</em>
+<a class="jxr_linenumber" name="L647" href="#L647">647</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L648" href="#L648">648</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L649" href="#L649">649</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L650" href="#L650">650</a> <em class="jxr_javadoccomment">	 * 	ReflectionMap&amp;lt;String&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = ReflectionMap</em>
+<a class="jxr_linenumber" name="L651" href="#L651">651</a> <em class="jxr_javadoccomment">	 * 		.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;)</em>
+<a class="jxr_linenumber" name="L652" href="#L652">652</a> <em class="jxr_javadoccomment">	 * 		.append(&lt;js&gt;"MyClass(String,int)"&lt;/js&gt;, &lt;js&gt;"value1"&lt;/js&gt;)</em>
+<a class="jxr_linenumber" name="L653" href="#L653">653</a> <em class="jxr_javadoccomment">	 * 		.build();</em>
+<a class="jxr_linenumber" name="L654" href="#L654">654</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L655" href="#L655">655</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Find value for specific constructor&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L656" href="#L656">656</a> <em class="jxr_javadoccomment">	 * 	Constructor&amp;lt;?&amp;gt; &lt;jv&gt;ctor&lt;/jv&gt; = MyClass.&lt;jk&gt;class&lt;/jk&gt;.getConstructor(String.&lt;jk&gt;class&lt;/jk&gt;, &lt;jk&gt;int&lt;/jk&gt;.&lt;jk&gt;class&lt;/jk&gt;);</em>
+<a class="jxr_linenumber" name="L657" href="#L657">657</a> <em class="jxr_javadoccomment">	 * 	Stream&amp;lt;String&amp;gt; &lt;jv&gt;values&lt;/jv&gt; = &lt;jv&gt;map&lt;/jv&gt;.find(&lt;jv&gt;ctor&lt;/jv&gt;);</em>
+<a class="jxr_linenumber" name="L658" href="#L658">658</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L659" href="#L659">659</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L660" href="#L660">660</a> <em class="jxr_javadoccomment">	 * @param c The constructor to find mappings for. Can be &lt;jk&gt;null&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L661" href="#L661">661</a> <em class="jxr_javadoccomment">	 * @return A stream of all values associated with the constructor. Empty stream if no matches found.</em>
+<a class="jxr_linenumber" name="L662" href="#L662">662</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L663" href="#L663">663</a> 	<strong class="jxr_keyword">public</strong> Stream&lt;V&gt; find(Constructor&lt;?&gt; c) {
+<a class="jxr_linenumber" name="L664" href="#L664">664</a> 		<strong class="jxr_keyword">return</strong> constructorEntries.stream().filter(x -&gt; x.matches(c)).map(x -&gt; x.value);
+<a class="jxr_linenumber" name="L665" href="#L665">665</a> 	}
+<a class="jxr_linenumber" name="L666" href="#L666">666</a> 
+<a class="jxr_linenumber" name="L667" href="#L667">667</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L668" href="#L668">668</a> <em class="jxr_javadoccomment">	 * Finds all values associated with the specified field.</em>
+<a class="jxr_linenumber" name="L669" href="#L669">669</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L670" href="#L670">670</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L671" href="#L671">671</a> <em class="jxr_javadoccomment">	 * This method searches for mappings that match the given field, considering both</em>
+<a class="jxr_linenumber" name="L672" href="#L672">672</a> <em class="jxr_javadoccomment">	 * the declaring class and field name.</em>
+<a class="jxr_linenumber" name="L673" href="#L673">673</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L674" href="#L674">674</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L675" href="#L675">675</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L676" href="#L676">676</a> <em class="jxr_javadoccomment">	 * 	ReflectionMap&amp;lt;String&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = ReflectionMap</em>
+<a class="jxr_linenumber" name="L677" href="#L677">677</a> <em class="jxr_javadoccomment">	 * 		.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;)</em>
+<a class="jxr_linenumber" name="L678" href="#L678">678</a> <em class="jxr_javadoccomment">	 * 		.append(&lt;js&gt;"MyClass.myField"&lt;/js&gt;, &lt;js&gt;"value1"&lt;/js&gt;)</em>
+<a class="jxr_linenumber" name="L679" href="#L679">679</a> <em class="jxr_javadoccomment">	 * 		.build();</em>
+<a class="jxr_linenumber" name="L680" href="#L680">680</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L681" href="#L681">681</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Find value for specific field&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L682" href="#L682">682</a> <em class="jxr_javadoccomment">	 * 	Field &lt;jv&gt;field&lt;/jv&gt; = MyClass.&lt;jk&gt;class&lt;/jk&gt;.getField(&lt;js&gt;"myField"&lt;/js&gt;);</em>
+<a class="jxr_linenumber" name="L683" href="#L683">683</a> <em class="jxr_javadoccomment">	 * 	Stream&amp;lt;String&amp;gt; &lt;jv&gt;values&lt;/jv&gt; = &lt;jv&gt;map&lt;/jv&gt;.find(&lt;jv&gt;field&lt;/jv&gt;);</em>
+<a class="jxr_linenumber" name="L684" href="#L684">684</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L685" href="#L685">685</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L686" href="#L686">686</a> <em class="jxr_javadoccomment">	 * @param f The field to find mappings for. Can be &lt;jk&gt;null&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L687" href="#L687">687</a> <em class="jxr_javadoccomment">	 * @return A stream of all values associated with the field. Empty stream if no matches found.</em>
+<a class="jxr_linenumber" name="L688" href="#L688">688</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L689" href="#L689">689</a> 	<strong class="jxr_keyword">public</strong> Stream&lt;V&gt; find(Field f) {
+<a class="jxr_linenumber" name="L690" href="#L690">690</a> 		<strong class="jxr_keyword">return</strong> fieldEntries.stream().filter(x -&gt; x.matches(f)).map(x -&gt; x.value);
+<a class="jxr_linenumber" name="L691" href="#L691">691</a> 	}
+<a class="jxr_linenumber" name="L692" href="#L692">692</a> 
+<a class="jxr_linenumber" name="L693" href="#L693">693</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L694" href="#L694">694</a> <em class="jxr_javadoccomment">	 * Finds all values associated with the specified method.</em>
+<a class="jxr_linenumber" name="L695" href="#L695">695</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L696" href="#L696">696</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L697" href="#L697">697</a> <em class="jxr_javadoccomment">	 * This method searches for mappings that match the given method, considering the</em>
+<a class="jxr_linenumber" name="L698" href="#L698">698</a> <em class="jxr_javadoccomment">	 * declaring class, method name, and parameter types.</em>
+<a class="jxr_linenumber" name="L699" href="#L699">699</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L700" href="#L700">700</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L701" href="#L701">701</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L702" href="#L702">702</a> <em class="jxr_javadoccomment">	 * 	ReflectionMap&amp;lt;String&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = ReflectionMap</em>
+<a class="jxr_linenumber" name="L703" href="#L703">703</a> <em class="jxr_javadoccomment">	 * 		.&lt;jsm&gt;create&lt;/jsm&gt;(String.&lt;jk&gt;class&lt;/jk&gt;)</em>
+<a class="jxr_linenumber" name="L704" href="#L704">704</a> <em class="jxr_javadoccomment">	 * 		.append(&lt;js&gt;"MyClass.myMethod"&lt;/js&gt;, &lt;js&gt;"value1"&lt;/js&gt;)</em>
+<a class="jxr_linenumber" name="L705" href="#L705">705</a> <em class="jxr_javadoccomment">	 * 		.append(&lt;js&gt;"MyClass.myMethod(String)"&lt;/js&gt;, &lt;js&gt;"value2"&lt;/js&gt;)</em>
+<a class="jxr_linenumber" name="L706" href="#L706">706</a> <em class="jxr_javadoccomment">	 * 		.build();</em>
+<a class="jxr_linenumber" name="L707" href="#L707">707</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L708" href="#L708">708</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Find values for specific method&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L709" href="#L709">709</a> <em class="jxr_javadoccomment">	 * 	Method &lt;jv&gt;method&lt;/jv&gt; = MyClass.&lt;jk&gt;class&lt;/jk&gt;.getMethod(&lt;js&gt;"myMethod"&lt;/js&gt;, String.&lt;jk&gt;class&lt;/jk&gt;);</em>
+<a class="jxr_linenumber" name="L710" href="#L710">710</a> <em class="jxr_javadoccomment">	 * 	Stream&amp;lt;String&amp;gt; &lt;jv&gt;values&lt;/jv&gt; = &lt;jv&gt;map&lt;/jv&gt;.find(&lt;jv&gt;method&lt;/jv&gt;);</em>
+<a class="jxr_linenumber" name="L711" href="#L711">711</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Returns stream containing ["value1", "value2"] - first matches any signature&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L712" href="#L712">712</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L713" href="#L713">713</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L714" href="#L714">714</a> <em class="jxr_javadoccomment">	 * @param m The method to find mappings for. Can be &lt;jk&gt;null&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L715" href="#L715">715</a> <em class="jxr_javadoccomment">	 * @return A stream of all values associated with the method. Empty stream if no matches found.</em>
+<a class="jxr_linenumber" name="L716" href="#L716">716</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L717" href="#L717">717</a> 	<strong class="jxr_keyword">public</strong> Stream&lt;V&gt; find(Method m) {
+<a class="jxr_linenumber" name="L718" href="#L718">718</a> 		<strong class="jxr_keyword">return</strong> methodEntries.stream().filter(x -&gt; x.matches(m)).map(x -&gt; x.value);
+<a class="jxr_linenumber" name="L719" href="#L719">719</a> 	}
+<a class="jxr_linenumber" name="L720" href="#L720">720</a> 
+<a class="jxr_linenumber" name="L721" href="#L721">721</a> 	<strong class="jxr_keyword">protected</strong> FluentMap&lt;String,Object&gt; properties() {
+<a class="jxr_linenumber" name="L722" href="#L722">722</a> 		<em class="jxr_comment">// @formatter:off</em>
+<a class="jxr_linenumber" name="L723" href="#L723">723</a> 		<strong class="jxr_keyword">return</strong> filteredBeanPropertyMap()
+<a class="jxr_linenumber" name="L724" href="#L724">724</a> 			.a(<span class="jxr_string">"classEntries"</span>, classEntries)
+<a class="jxr_linenumber" name="L725" href="#L725">725</a> 			.a(<span class="jxr_string">"methodEntries"</span>, methodEntries)
+<a class="jxr_linenumber" name="L726" href="#L726">726</a> 			.a(<span class="jxr_string">"fieldEntries"</span>, fieldEntries)
+<a class="jxr_linenumber" name="L727" href="#L727">727</a> 			.a(<span class="jxr_string">"constructorEntries"</span>, constructorEntries);
+<a class="jxr_linenumber" name="L728" href="#L728">728</a> 		<em class="jxr_comment">// @formatter:on</em>
+<a class="jxr_linenumber" name="L729" href="#L729">729</a> 	}
+<a class="jxr_linenumber" name="L730" href="#L730">730</a> 
+<a class="jxr_linenumber" name="L731" href="#L731">731</a> 	@Override <em class="jxr_comment">/* Overridden from Object */</em>
+<a class="jxr_linenumber" name="L732" href="#L732">732</a> 	<strong class="jxr_keyword">public</strong> String toString() {
+<a class="jxr_linenumber" name="L733" href="#L733">733</a> 		<strong class="jxr_keyword">return</strong> r(properties());
+<a class="jxr_linenumber" name="L734" href="#L734">734</a> 	}
+<a class="jxr_linenumber" name="L735" href="#L735">735</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 6adadb505c..0650308cca 100644
--- a/site/xref/org/apache/juneau/commons/utils/CollectionUtils.html
+++ b/site/xref/org/apache/juneau/commons/utils/CollectionUtils.html
@@ -1533,10 +1533,10 @@
 <a class="jxr_linenumber" name="L1525" href="#L1525">1525</a> 	}
 <a class="jxr_linenumber" name="L1526" href="#L1526">1526</a> 
 <a class="jxr_linenumber" name="L1527" href="#L1527">1527</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1528" href="#L1528">1528</a> <em class="jxr_javadoccomment">	 * Convenience factory for a {@link Maps} with {@link String} keys and {@link Object} values.</em>
+<a class="jxr_linenumber" name="L1528" href="#L1528">1528</a> <em class="jxr_javadoccomment">	 * Convenience factory for a {@link Maps} builder.</em>
 <a class="jxr_linenumber" name="L1529" href="#L1529">1529</a> <em class="jxr_javadoccomment">	 *</em>
 <a class="jxr_linenumber" name="L1530" href="#L1530">1530</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L1531" href="#L1531">1531</a> <em class="jxr_javadoccomment">	 * This is a shortcut for &lt;c&gt;Maps.create(String.&lt;jk&gt;class&lt;/jk&gt;, Object.&lt;jk&gt;class&lt;/jk&gt;)&lt;/c&gt;.</em>
+<a class="jxr_linenumber" name="L1531" href="#L1531">1531</a> <em class="jxr_javadoccomment">	 * This is a shortcut for &lt;c&gt;Maps.create().ordered()&lt;/c&gt;.</em>
 <a class="jxr_linenumber" name="L1532" href="#L1532">1532</a> <em class="jxr_javadoccomment">	 *</em>
 <a class="jxr_linenumber" name="L1533" href="#L1533">1533</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
 <a class="jxr_linenumber" name="L1534" href="#L1534">1534</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
@@ -1546,743 +1546,792 @@
 <a class="jxr_linenumber" name="L1538" href="#L1538">1538</a> <em class="jxr_javadoccomment">	 * 		.build();</em>
 <a class="jxr_linenumber" name="L1539" href="#L1539">1539</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
 <a class="jxr_linenumber" name="L1540" href="#L1540">1540</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1541" href="#L1541">1541</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L1542" href="#L1542">1542</a> <em class="jxr_javadoccomment">	 * This builder supports optional filtering to automatically exclude unwanted values:</em>
-<a class="jxr_linenumber" name="L1543" href="#L1543">1543</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L1544" href="#L1544">1544</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Build a map excluding null and empty values&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L1545" href="#L1545">1545</a> <em class="jxr_javadoccomment">	 * 	Map&amp;lt;String,Object&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = mapb().filtered()</em>
-<a class="jxr_linenumber" name="L1546" href="#L1546">1546</a> <em class="jxr_javadoccomment">	 * 		.add(&lt;js&gt;"foo"&lt;/js&gt;, &lt;jk&gt;null&lt;/jk&gt;)       &lt;jc&gt;// Excluded&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L1547" href="#L1547">1547</a> <em class="jxr_javadoccomment">	 * 		.add(&lt;js&gt;"bar"&lt;/js&gt;, &lt;js&gt;""&lt;/js&gt;)         &lt;jc&gt;// Excluded&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L1548" href="#L1548">1548</a> <em class="jxr_javadoccomment">	 * 		.add(&lt;js&gt;"baz"&lt;/js&gt;, &lt;js&gt;"value"&lt;/js&gt;)    &lt;jc&gt;// Included&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L1549" href="#L1549">1549</a> <em class="jxr_javadoccomment">	 * 		.build();</em>
-<a class="jxr_linenumber" name="L1550" href="#L1550">1550</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L1551" href="#L1551">1551</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1552" href="#L1552">1552</a> <em class="jxr_javadoccomment">	 * @return A new map builder.</em>
-<a class="jxr_linenumber" name="L1553" href="#L1553">1553</a> <em class="jxr_javadoccomment">	 * @see Maps</em>
-<a class="jxr_linenumber" name="L1554" href="#L1554">1554</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1555" href="#L1555">1555</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> Maps&lt;String,Object&gt; mapb() {
-<a class="jxr_linenumber" name="L1556" href="#L1556">1556</a> 		<strong class="jxr_keyword">return</strong> Maps.create(String.<strong class="jxr_keyword">class</strong>, Object.<strong class="jxr_keyword">class</strong>).ordered();
-<a class="jxr_linenumber" name="L1557" href="#L1557">1557</a> 	}
-<a class="jxr_linenumber" name="L1558" href="#L1558">1558</a> 
-<a class="jxr_linenumber" name="L1559" href="#L1559">1559</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1560" href="#L1560">1560</a> <em class="jxr_javadoccomment">	 * Convenience factory for a {@link Maps}.</em>
-<a class="jxr_linenumber" name="L1561" href="#L1561">1561</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1562" href="#L1562">1562</a> <em class="jxr_javadoccomment">	 * @param &lt;K&gt; The key type.</em>
-<a class="jxr_linenumber" name="L1563" href="#L1563">1563</a> <em class="jxr_javadoccomment">	 * @param &lt;V&gt; The value type.</em>
-<a class="jxr_linenumber" name="L1564" href="#L1564">1564</a> <em class="jxr_javadoccomment">	 * @param keyType The key type.</em>
-<a class="jxr_linenumber" name="L1565" href="#L1565">1565</a> <em class="jxr_javadoccomment">	 * @param valueType The value type.</em>
-<a class="jxr_linenumber" name="L1566" href="#L1566">1566</a> <em class="jxr_javadoccomment">	 * @param converters Optional converters to use for converting values.</em>
-<a class="jxr_linenumber" name="L1567" href="#L1567">1567</a> <em class="jxr_javadoccomment">	 * @return A new map builder.</em>
-<a class="jxr_linenumber" name="L1568" href="#L1568">1568</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1569" href="#L1569">1569</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;K,V&gt; Maps&lt;K,V&gt; mapb(Class&lt;K&gt; keyType, Class&lt;V&gt; valueType) {
-<a class="jxr_linenumber" name="L1570" href="#L1570">1570</a> 		<strong class="jxr_keyword">return</strong> Maps.create(keyType, valueType).ordered();
-<a class="jxr_linenumber" name="L1571" href="#L1571">1571</a> 	}
-<a class="jxr_linenumber" name="L1572" href="#L1572">1572</a> 
-<a class="jxr_linenumber" name="L1573" href="#L1573">1573</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1574" href="#L1574">1574</a> <em class="jxr_javadoccomment">	 * Shortcut for creating an empty map of the specified types.</em>
+<a class="jxr_linenumber" name="L1541" href="#L1541">1541</a> <em class="jxr_javadoccomment">	 * @param &lt;K&gt; The key type.</em>
+<a class="jxr_linenumber" name="L1542" href="#L1542">1542</a> <em class="jxr_javadoccomment">	 * @param &lt;V&gt; The value type.</em>
+<a class="jxr_linenumber" name="L1543" href="#L1543">1543</a> <em class="jxr_javadoccomment">	 * @return A new map builder.</em>
+<a class="jxr_linenumber" name="L1544" href="#L1544">1544</a> <em class="jxr_javadoccomment">	 * @see Maps</em>
+<a class="jxr_linenumber" name="L1545" href="#L1545">1545</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L1546" href="#L1546">1546</a> 	@SuppressWarnings(<span class="jxr_string">"unchecked"</span>)
+<a class="jxr_linenumber" name="L1547" href="#L1547">1547</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;K,V&gt; Maps&lt;K,V&gt; mapb() {
+<a class="jxr_linenumber" name="L1548" href="#L1548">1548</a> 		<strong class="jxr_keyword">return</strong> (Maps&lt;K,V&gt;)Maps.create().ordered();
+<a class="jxr_linenumber" name="L1549" href="#L1549">1549</a> 	}
+<a class="jxr_linenumber" name="L1550" href="#L1550">1550</a> 
+<a class="jxr_linenumber" name="L1551" href="#L1551">1551</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1552" href="#L1552">1552</a> <em class="jxr_javadoccomment">	 * Convenience factory for a {@link Maps} with {@link String} keys and {@link Object} values.</em>
+<a class="jxr_linenumber" name="L1553" href="#L1553">1553</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1554" href="#L1554">1554</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L1555" href="#L1555">1555</a> <em class="jxr_javadoccomment">	 * This is a shortcut for &lt;c&gt;Maps.create(String.&lt;jk&gt;class&lt;/jk&gt;, Object.&lt;jk&gt;class&lt;/jk&gt;)&lt;/c&gt;.</em>
+<a class="jxr_linenumber" name="L1556" href="#L1556">1556</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1557" href="#L1557">1557</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L1558" href="#L1558">1558</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L1559" href="#L1559">1559</a> <em class="jxr_javadoccomment">	 * 	Map&amp;lt;String,Object&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = mapb()</em>
+<a class="jxr_linenumber" name="L1560" href="#L1560">1560</a> <em class="jxr_javadoccomment">	 * 		.add(&lt;js&gt;"foo"&lt;/js&gt;, 1)</em>
+<a class="jxr_linenumber" name="L1561" href="#L1561">1561</a> <em class="jxr_javadoccomment">	 * 		.add(&lt;js&gt;"bar"&lt;/js&gt;, 2)</em>
+<a class="jxr_linenumber" name="L1562" href="#L1562">1562</a> <em class="jxr_javadoccomment">	 * 		.build();</em>
+<a class="jxr_linenumber" name="L1563" href="#L1563">1563</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L1564" href="#L1564">1564</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1565" href="#L1565">1565</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L1566" href="#L1566">1566</a> <em class="jxr_javadoccomment">	 * This builder supports optional filtering to automatically exclude unwanted values:</em>
+<a class="jxr_linenumber" name="L1567" href="#L1567">1567</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L1568" href="#L1568">1568</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Build a map excluding null and empty values&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L1569" href="#L1569">1569</a> <em class="jxr_javadoccomment">	 * 	Map&amp;lt;String,Object&amp;gt; &lt;jv&gt;map&lt;/jv&gt; = mapb().filtered()</em>
+<a class="jxr_linenumber" name="L1570" href="#L1570">1570</a> <em class="jxr_javadoccomment">	 * 		.add(&lt;js&gt;"foo"&lt;/js&gt;, &lt;jk&gt;null&lt;/jk&gt;)       &lt;jc&gt;// Excluded&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L1571" href="#L1571">1571</a> <em class="jxr_javadoccomment">	 * 		.add(&lt;js&gt;"bar"&lt;/js&gt;, &lt;js&gt;""&lt;/js&gt;)         &lt;jc&gt;// Excluded&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L1572" href="#L1572">1572</a> <em class="jxr_javadoccomment">	 * 		.add(&lt;js&gt;"baz"&lt;/js&gt;, &lt;js&gt;"value"&lt;/js&gt;)    &lt;jc&gt;// Included&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L1573" href="#L1573">1573</a> <em class="jxr_javadoccomment">	 * 		.build();</em>
+<a class="jxr_linenumber" name="L1574" href="#L1574">1574</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
 <a class="jxr_linenumber" name="L1575" href="#L1575">1575</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1576" href="#L1576">1576</a> <em class="jxr_javadoccomment">	 * @param &lt;K&gt; The key type.</em>
-<a class="jxr_linenumber" name="L1577" href="#L1577">1577</a> <em class="jxr_javadoccomment">	 * @param &lt;V&gt; The value type.</em>
-<a class="jxr_linenumber" name="L1578" href="#L1578">1578</a> <em class="jxr_javadoccomment">	 * @param keyType The key type class.</em>
-<a class="jxr_linenumber" name="L1579" href="#L1579">1579</a> <em class="jxr_javadoccomment">	 * @param valueType The value type class.</em>
-<a class="jxr_linenumber" name="L1580" href="#L1580">1580</a> <em class="jxr_javadoccomment">	 * @return An empty unmodifiable map.</em>
-<a class="jxr_linenumber" name="L1581" href="#L1581">1581</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1582" href="#L1582">1582</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;K,V&gt; Map&lt;K,V&gt; mape(Class&lt;K&gt; keyType, Class&lt;V&gt; valueType) {
-<a class="jxr_linenumber" name="L1583" href="#L1583">1583</a> 		<strong class="jxr_keyword">return</strong> Collections.emptyMap();
-<a class="jxr_linenumber" name="L1584" href="#L1584">1584</a> 	}
-<a class="jxr_linenumber" name="L1585" href="#L1585">1585</a> 
-<a class="jxr_linenumber" name="L1586" href="#L1586">1586</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1587" href="#L1587">1587</a> <em class="jxr_javadoccomment">	 * Shortcut for creating an empty map with generic types.</em>
+<a class="jxr_linenumber" name="L1576" href="#L1576">1576</a> <em class="jxr_javadoccomment">	 * @return A new map builder.</em>
+<a class="jxr_linenumber" name="L1577" href="#L1577">1577</a> <em class="jxr_javadoccomment">	 * @see Maps</em>
+<a class="jxr_linenumber" name="L1578" href="#L1578">1578</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L1579" href="#L1579">1579</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> Maps&lt;String,Object&gt; mapb_so() {
+<a class="jxr_linenumber" name="L1580" href="#L1580">1580</a> 		<strong class="jxr_keyword">return</strong> Maps.create(String.<strong class="jxr_keyword">class</strong>, Object.<strong class="jxr_keyword">class</strong>).ordered();
+<a class="jxr_linenumber" name="L1581" href="#L1581">1581</a> 	}
+<a class="jxr_linenumber" name="L1582" href="#L1582">1582</a> 
+<a class="jxr_linenumber" name="L1583" href="#L1583">1583</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1584" href="#L1584">1584</a> <em class="jxr_javadoccomment">	 * Convenience factory for a filtered, sorted, fluent map with {@link String} keys and {@link Object} values.</em>
+<a class="jxr_linenumber" name="L1585" href="#L1585">1585</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1586" href="#L1586">1586</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L1587" href="#L1587">1587</a> <em class="jxr_javadoccomment">	 * This is a shortcut for &lt;c&gt;Maps.create(String.&lt;jk&gt;class&lt;/jk&gt;, Object.&lt;jk&gt;class&lt;/jk&gt;).filtered().sorted().buildFluent()&lt;/c&gt;.</em>
 <a class="jxr_linenumber" name="L1588" href="#L1588">1588</a> <em class="jxr_javadoccomment">	 *</em>
 <a class="jxr_linenumber" name="L1589" href="#L1589">1589</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L1590" href="#L1590">1590</a> <em class="jxr_javadoccomment">	 * This is a convenience method that creates an empty unmodifiable map without requiring</em>
-<a class="jxr_linenumber" name="L1591" href="#L1591">1591</a> <em class="jxr_javadoccomment">	 * explicit type parameters. The types will be inferred from usage context.</em>
-<a class="jxr_linenumber" name="L1592" href="#L1592">1592</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1593" href="#L1593">1593</a> <em class="jxr_javadoccomment">	 * @param &lt;K&gt; The key type.</em>
-<a class="jxr_linenumber" name="L1594" href="#L1594">1594</a> <em class="jxr_javadoccomment">	 * @param &lt;V&gt; The value type.</em>
-<a class="jxr_linenumber" name="L1595" href="#L1595">1595</a> <em class="jxr_javadoccomment">	 * @return An empty unmodifiable map.</em>
-<a class="jxr_linenumber" name="L1596" href="#L1596">1596</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1597" href="#L1597">1597</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;K,V&gt; Map&lt;K,V&gt; mape() {
-<a class="jxr_linenumber" name="L1598" href="#L1598">1598</a> 		<strong class="jxr_keyword">return</strong> Collections.emptyMap();
-<a class="jxr_linenumber" name="L1599" href="#L1599">1599</a> 	}
-<a class="jxr_linenumber" name="L1600" href="#L1600">1600</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1601" href="#L1601">1601</a> <em class="jxr_javadoccomment">	 * Returns a null map.</em>
-<a class="jxr_linenumber" name="L1602" href="#L1602">1602</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1603" href="#L1603">1603</a> <em class="jxr_javadoccomment">	 * @param &lt;K&gt; The key type.</em>
-<a class="jxr_linenumber" name="L1604" href="#L1604">1604</a> <em class="jxr_javadoccomment">	 * @param &lt;V&gt; The value type.</em>
-<a class="jxr_linenumber" name="L1605" href="#L1605">1605</a> <em class="jxr_javadoccomment">	 * @param keyType The key type class.</em>
-<a class="jxr_linenumber" name="L1606" href="#L1606">1606</a> <em class="jxr_javadoccomment">	 * @param valueType The value type class.</em>
-<a class="jxr_linenumber" name="L1607" href="#L1607">1607</a> <em class="jxr_javadoccomment">	 * @return &lt;jk&gt;null&lt;/jk&gt;.</em>
-<a class="jxr_linenumber" name="L1608" href="#L1608">1608</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1609" href="#L1609">1609</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;K,V&gt; Map&lt;K,V&gt; mapn(Class&lt;K&gt; keyType, Class&lt;V&gt; valueType) {
-<a class="jxr_linenumber" name="L1610" href="#L1610">1610</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L1611" href="#L1611">1611</a> 	}
-<a class="jxr_linenumber" name="L1612" href="#L1612">1612</a> 
-<a class="jxr_linenumber" name="L1613" href="#L1613">1613</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1614" href="#L1614">1614</a> <em class="jxr_javadoccomment">	 * Convenience method for creating a {@link LinkedHashMap}.</em>
-<a class="jxr_linenumber" name="L1615" href="#L1615">1615</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1616" href="#L1616">1616</a> <em class="jxr_javadoccomment">	 * @param &lt;K&gt; The key type.</em>
-<a class="jxr_linenumber" name="L1617" href="#L1617">1617</a> <em class="jxr_javadoccomment">	 * @param &lt;V&gt; The value type.</em>
-<a class="jxr_linenumber" name="L1618" href="#L1618">1618</a> <em class="jxr_javadoccomment">	 * @param keyType The key type.</em>
-<a class="jxr_linenumber" name="L1619" href="#L1619">1619</a> <em class="jxr_javadoccomment">	 * @param valueType The value type.</em>
-<a class="jxr_linenumber" name="L1620" href="#L1620">1620</a> <em class="jxr_javadoccomment">	 * @return A new modifiable map.</em>
-<a class="jxr_linenumber" name="L1621" href="#L1621">1621</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1622" href="#L1622">1622</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;K,V&gt; LinkedHashMap&lt;K,V&gt; mapOf(Class&lt;K&gt; keyType, Class&lt;V&gt; valueType) {
-<a class="jxr_linenumber" name="L1623" href="#L1623">1623</a> 		<strong class="jxr_keyword">return</strong> map();
-<a class="jxr_linenumber" name="L1624" href="#L1624">1624</a> 	}
-<a class="jxr_linenumber" name="L1625" href="#L1625">1625</a> 
-<a class="jxr_linenumber" name="L1626" href="#L1626">1626</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1627" href="#L1627">1627</a> <em class="jxr_javadoccomment">	 * Returns &lt;jk&gt;null&lt;/jk&gt; for the specified array type.</em>
-<a class="jxr_linenumber" name="L1628" href="#L1628">1628</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1629" href="#L1629">1629</a> <em class="jxr_javadoccomment">	 * @param &lt;T&gt; The component type.</em>
-<a class="jxr_linenumber" name="L1630" href="#L1630">1630</a> <em class="jxr_javadoccomment">	 * @param type The component type class.</em>
-<a class="jxr_linenumber" name="L1631" href="#L1631">1631</a> <em class="jxr_javadoccomment">	 * @return &lt;jk&gt;null&lt;/jk&gt;.</em>
-<a class="jxr_linenumber" name="L1632" href="#L1632">1632</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1633" href="#L1633">1633</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;T&gt; T[] na(Class&lt;T&gt; type) {
-<a class="jxr_linenumber" name="L1634" href="#L1634">1634</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L1635" href="#L1635">1635</a> 	}
-<a class="jxr_linenumber" name="L1636" href="#L1636">1636</a> 
-<a class="jxr_linenumber" name="L1637" href="#L1637">1637</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1638" href="#L1638">1638</a> <em class="jxr_javadoccomment">	 * Adds all the specified values to the specified collection.</em>
-<a class="jxr_linenumber" name="L1639" href="#L1639">1639</a> <em class="jxr_javadoccomment">	 * Creates a new set if the value is &lt;jk&gt;null&lt;/jk&gt;.</em>
-<a class="jxr_linenumber" name="L1640" href="#L1640">1640</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1641" href="#L1641">1641</a> <em class="jxr_javadoccomment">	 * @param &lt;E&gt; The element type.</em>
-<a class="jxr_linenumber" name="L1642" href="#L1642">1642</a> <em class="jxr_javadoccomment">	 * @param value The collection to add to.</em>
-<a class="jxr_linenumber" name="L1643" href="#L1643">1643</a> <em class="jxr_javadoccomment">	 * @param entries The entries to add.</em>
-<a class="jxr_linenumber" name="L1644" href="#L1644">1644</a> <em class="jxr_javadoccomment">	 * @return The set.</em>
+<a class="jxr_linenumber" name="L1590" href="#L1590">1590</a> <em class="jxr_javadoccomment">	 * This is typically used for creating property maps in &lt;c&gt;toString()&lt;/c&gt; methods that need to be sorted and filtered.</em>
+<a class="jxr_linenumber" name="L1591" href="#L1591">1591</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1592" href="#L1592">1592</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L1593" href="#L1593">1593</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L1594" href="#L1594">1594</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// In a properties() method&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L1595" href="#L1595">1595</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;return&lt;/jk&gt; filteredBeanPropertyMap()</em>
+<a class="jxr_linenumber" name="L1596" href="#L1596">1596</a> <em class="jxr_javadoccomment">	 * 		.a(&lt;js&gt;"name"&lt;/js&gt;, &lt;jv&gt;name&lt;/jv&gt;)</em>
+<a class="jxr_linenumber" name="L1597" href="#L1597">1597</a> <em class="jxr_javadoccomment">	 * 		.a(&lt;js&gt;"value"&lt;/js&gt;, &lt;jv&gt;value&lt;/jv&gt;);</em>
+<a class="jxr_linenumber" name="L1598" href="#L1598">1598</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L1599" href="#L1599">1599</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1600" href="#L1600">1600</a> <em class="jxr_javadoccomment">	 * @return A new filtered, sorted, fluent map builder.</em>
+<a class="jxr_linenumber" name="L1601" href="#L1601">1601</a> <em class="jxr_javadoccomment">	 * @see FluentMap</em>
+<a class="jxr_linenumber" name="L1602" href="#L1602">1602</a> <em class="jxr_javadoccomment">	 * @see Maps</em>
+<a class="jxr_linenumber" name="L1603" href="#L1603">1603</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L1604" href="#L1604">1604</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> FluentMap&lt;String,Object&gt; filteredBeanPropertyMap() {
+<a class="jxr_linenumber" name="L1605" href="#L1605">1605</a> 		<strong class="jxr_keyword">return</strong> Maps.create(String.<strong class="jxr_keyword">class</strong>, Object.<strong class="jxr_keyword">class</strong>).filtered().sorted().buildFluent();
+<a class="jxr_linenumber" name="L1606" href="#L1606">1606</a> 	}
+<a class="jxr_linenumber" name="L1607" href="#L1607">1607</a> 
+<a class="jxr_linenumber" name="L1608" href="#L1608">1608</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1609" href="#L1609">1609</a> <em class="jxr_javadoccomment">	 * Convenience factory for a {@link Maps}.</em>
+<a class="jxr_linenumber" name="L1610" href="#L1610">1610</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1611" href="#L1611">1611</a> <em class="jxr_javadoccomment">	 * @param &lt;K&gt; The key type.</em>
+<a class="jxr_linenumber" name="L1612" href="#L1612">1612</a> <em class="jxr_javadoccomment">	 * @param &lt;V&gt; The value type.</em>
+<a class="jxr_linenumber" name="L1613" href="#L1613">1613</a> <em class="jxr_javadoccomment">	 * @param keyType The key type.</em>
+<a class="jxr_linenumber" name="L1614" href="#L1614">1614</a> <em class="jxr_javadoccomment">	 * @param valueType The value type.</em>
+<a class="jxr_linenumber" name="L1615" href="#L1615">1615</a> <em class="jxr_javadoccomment">	 * @param converters Optional converters to use for converting values.</em>
+<a class="jxr_linenumber" name="L1616" href="#L1616">1616</a> <em class="jxr_javadoccomment">	 * @return A new map builder.</em>
+<a class="jxr_linenumber" name="L1617" href="#L1617">1617</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L1618" href="#L1618">1618</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;K,V&gt; Maps&lt;K,V&gt; mapb(Class&lt;K&gt; keyType, Class&lt;V&gt; valueType) {
+<a class="jxr_linenumber" name="L1619" href="#L1619">1619</a> 		<strong class="jxr_keyword">return</strong> Maps.create(keyType, valueType).ordered();
+<a class="jxr_linenumber" name="L1620" href="#L1620">1620</a> 	}
+<a class="jxr_linenumber" name="L1621" href="#L1621">1621</a> 
+<a class="jxr_linenumber" name="L1622" href="#L1622">1622</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1623" href="#L1623">1623</a> <em class="jxr_javadoccomment">	 * Shortcut for creating an empty map of the specified types.</em>
+<a class="jxr_linenumber" name="L1624" href="#L1624">1624</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1625" href="#L1625">1625</a> <em class="jxr_javadoccomment">	 * @param &lt;K&gt; The key type.</em>
+<a class="jxr_linenumber" name="L1626" href="#L1626">1626</a> <em class="jxr_javadoccomment">	 * @param &lt;V&gt; The value type.</em>
+<a class="jxr_linenumber" name="L1627" href="#L1627">1627</a> <em class="jxr_javadoccomment">	 * @param keyType The key type class.</em>
+<a class="jxr_linenumber" name="L1628" href="#L1628">1628</a> <em class="jxr_javadoccomment">	 * @param valueType The value type class.</em>
+<a class="jxr_linenumber" name="L1629" href="#L1629">1629</a> <em class="jxr_javadoccomment">	 * @return An empty unmodifiable map.</em>
+<a class="jxr_linenumber" name="L1630" href="#L1630">1630</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L1631" href="#L1631">1631</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;K,V&gt; Map&lt;K,V&gt; mape(Class&lt;K&gt; keyType, Class&lt;V&gt; valueType) {
+<a class="jxr_linenumber" name="L1632" href="#L1632">1632</a> 		<strong class="jxr_keyword">return</strong> Collections.emptyMap();
+<a class="jxr_linenumber" name="L1633" href="#L1633">1633</a> 	}
+<a class="jxr_linenumber" name="L1634" href="#L1634">1634</a> 
+<a class="jxr_linenumber" name="L1635" href="#L1635">1635</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1636" href="#L1636">1636</a> <em class="jxr_javadoccomment">	 * Shortcut for creating an empty map with generic types.</em>
+<a class="jxr_linenumber" name="L1637" href="#L1637">1637</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1638" href="#L1638">1638</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L1639" href="#L1639">1639</a> <em class="jxr_javadoccomment">	 * This is a convenience method that creates an empty unmodifiable map without requiring</em>
+<a class="jxr_linenumber" name="L1640" href="#L1640">1640</a> <em class="jxr_javadoccomment">	 * explicit type parameters. The types will be inferred from usage context.</em>
+<a class="jxr_linenumber" name="L1641" href="#L1641">1641</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1642" href="#L1642">1642</a> <em class="jxr_javadoccomment">	 * @param &lt;K&gt; The key type.</em>
+<a class="jxr_linenumber" name="L1643" href="#L1643">1643</a> <em class="jxr_javadoccomment">	 * @param &lt;V&gt; The value type.</em>
+<a class="jxr_linenumber" name="L1644" href="#L1644">1644</a> <em class="jxr_javadoccomment">	 * @return An empty unmodifiable map.</em>
 <a class="jxr_linenumber" name="L1645" href="#L1645">1645</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1646" href="#L1646">1646</a> 	@SafeVarargs
-<a class="jxr_linenumber" name="L1647" href="#L1647">1647</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;E&gt; List&lt;E&gt; prependAll(List&lt;E&gt; value, E...entries) {
-<a class="jxr_linenumber" name="L1648" href="#L1648">1648</a> 		<strong class="jxr_keyword">if</strong> (nn(entries)) {
-<a class="jxr_linenumber" name="L1649" href="#L1649">1649</a> 			<strong class="jxr_keyword">if</strong> (value == <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L1650" href="#L1650">1650</a> 				value = list(entries);
-<a class="jxr_linenumber" name="L1651" href="#L1651">1651</a> 			<strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L1652" href="#L1652">1652</a> 				value.addAll(0, l(entries));
-<a class="jxr_linenumber" name="L1653" href="#L1653">1653</a> 		}
-<a class="jxr_linenumber" name="L1654" href="#L1654">1654</a> 		<strong class="jxr_keyword">return</strong> value;
-<a class="jxr_linenumber" name="L1655" href="#L1655">1655</a> 	}
-<a class="jxr_linenumber" name="L1656" href="#L1656">1656</a> 
-<a class="jxr_linenumber" name="L1657" href="#L1657">1657</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1658" href="#L1658">1658</a> <em class="jxr_javadoccomment">	 * Reverses the entries in an array.</em>
-<a class="jxr_linenumber" name="L1659" href="#L1659">1659</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1660" href="#L1660">1660</a> <em class="jxr_javadoccomment">	 * @param &lt;E&gt; The element type.</em>
-<a class="jxr_linenumber" name="L1661" href="#L1661">1661</a> <em class="jxr_javadoccomment">	 * @param array The array to reverse.</em>
-<a class="jxr_linenumber" name="L1662" href="#L1662">1662</a> <em class="jxr_javadoccomment">	 * @return The same array.</em>
-<a class="jxr_linenumber" name="L1663" href="#L1663">1663</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1664" href="#L1664">1664</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1665" href="#L1665">1665</a> <em class="jxr_javadoccomment">	 * Reverses the elements in the specified array in-place.</em>
-<a class="jxr_linenumber" name="L1666" href="#L1666">1666</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1667" href="#L1667">1667</a> <em class="jxr_javadoccomment">	 * @param &lt;E&gt; The element type.</em>
-<a class="jxr_linenumber" name="L1668" href="#L1668">1668</a> <em class="jxr_javadoccomment">	 * @param array The array to reverse.</em>
-<a class="jxr_linenumber" name="L1669" href="#L1669">1669</a> <em class="jxr_javadoccomment">	 * @return The same array, reversed.</em>
+<a class="jxr_linenumber" name="L1646" href="#L1646">1646</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;K,V&gt; Map&lt;K,V&gt; mape() {
+<a class="jxr_linenumber" name="L1647" href="#L1647">1647</a> 		<strong class="jxr_keyword">return</strong> Collections.emptyMap();
+<a class="jxr_linenumber" name="L1648" href="#L1648">1648</a> 	}
+<a class="jxr_linenumber" name="L1649" href="#L1649">1649</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1650" href="#L1650">1650</a> <em class="jxr_javadoccomment">	 * Returns a null map.</em>
+<a class="jxr_linenumber" name="L1651" href="#L1651">1651</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1652" href="#L1652">1652</a> <em class="jxr_javadoccomment">	 * @param &lt;K&gt; The key type.</em>
+<a class="jxr_linenumber" name="L1653" href="#L1653">1653</a> <em class="jxr_javadoccomment">	 * @param &lt;V&gt; The value type.</em>
+<a class="jxr_linenumber" name="L1654" href="#L1654">1654</a> <em class="jxr_javadoccomment">	 * @param keyType The key type class.</em>
+<a class="jxr_linenumber" name="L1655" href="#L1655">1655</a> <em class="jxr_javadoccomment">	 * @param valueType The value type class.</em>
+<a class="jxr_linenumber" name="L1656" href="#L1656">1656</a> <em class="jxr_javadoccomment">	 * @return &lt;jk&gt;null&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L1657" href="#L1657">1657</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L1658" href="#L1658">1658</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;K,V&gt; Map&lt;K,V&gt; mapn(Class&lt;K&gt; keyType, Class&lt;V&gt; valueType) {
+<a class="jxr_linenumber" name="L1659" href="#L1659">1659</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L1660" href="#L1660">1660</a> 	}
+<a class="jxr_linenumber" name="L1661" href="#L1661">1661</a> 
+<a class="jxr_linenumber" name="L1662" href="#L1662">1662</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1663" href="#L1663">1663</a> <em class="jxr_javadoccomment">	 * Convenience method for creating a {@link LinkedHashMap}.</em>
+<a class="jxr_linenumber" name="L1664" href="#L1664">1664</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1665" href="#L1665">1665</a> <em class="jxr_javadoccomment">	 * @param &lt;K&gt; The key type.</em>
+<a class="jxr_linenumber" name="L1666" href="#L1666">1666</a> <em class="jxr_javadoccomment">	 * @param &lt;V&gt; The value type.</em>
+<a class="jxr_linenumber" name="L1667" href="#L1667">1667</a> <em class="jxr_javadoccomment">	 * @param keyType The key type.</em>
+<a class="jxr_linenumber" name="L1668" href="#L1668">1668</a> <em class="jxr_javadoccomment">	 * @param valueType The value type.</em>
+<a class="jxr_linenumber" name="L1669" href="#L1669">1669</a> <em class="jxr_javadoccomment">	 * @return A new modifiable map.</em>
 <a class="jxr_linenumber" name="L1670" href="#L1670">1670</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1671" href="#L1671">1671</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;E&gt; E[] reverse(E[] array) {
-<a class="jxr_linenumber" name="L1672" href="#L1672">1672</a> 		<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> i = 0; i &lt; array.length / 2; i++) {
-<a class="jxr_linenumber" name="L1673" href="#L1673">1673</a> 			E temp = array[i];
-<a class="jxr_linenumber" name="L1674" href="#L1674">1674</a> 			array[i] = array[array.length - i - 1];
-<a class="jxr_linenumber" name="L1675" href="#L1675">1675</a> 			array[array.length - i - 1] = temp;
-<a class="jxr_linenumber" name="L1676" href="#L1676">1676</a> 		}
-<a class="jxr_linenumber" name="L1677" href="#L1677">1677</a> 		<strong class="jxr_keyword">return</strong> array;
-<a class="jxr_linenumber" name="L1678" href="#L1678">1678</a> 	}
-<a class="jxr_linenumber" name="L1679" href="#L1679">1679</a> 
-<a class="jxr_linenumber" name="L1680" href="#L1680">1680</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1681" href="#L1681">1681</a> <em class="jxr_javadoccomment">	 * Returns a reversed view of the specified list.</em>
-<a class="jxr_linenumber" name="L1682" href="#L1682">1682</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1683" href="#L1683">1683</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L1684" href="#L1684">1684</a> <em class="jxr_javadoccomment">	 * The returned list is a live view that reflects changes to the original list.</em>
-<a class="jxr_linenumber" name="L1685" href="#L1685">1685</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1686" href="#L1686">1686</a> <em class="jxr_javadoccomment">	 * @param &lt;E&gt; The element type.</em>
-<a class="jxr_linenumber" name="L1687" href="#L1687">1687</a> <em class="jxr_javadoccomment">	 * @param list The list to reverse.</em>
-<a class="jxr_linenumber" name="L1688" href="#L1688">1688</a> <em class="jxr_javadoccomment">	 * @return A reversed view of the list.</em>
-<a class="jxr_linenumber" name="L1689" href="#L1689">1689</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1690" href="#L1690">1690</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;E&gt; List&lt;E&gt; reverse(List&lt;E&gt; list) {
-<a class="jxr_linenumber" name="L1691" href="#L1691">1691</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> ReversedList&lt;&gt;(list);
-<a class="jxr_linenumber" name="L1692" href="#L1692">1692</a> 	}
-<a class="jxr_linenumber" name="L1693" href="#L1693">1693</a> 
-<a class="jxr_linenumber" name="L1694" href="#L1694">1694</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1695" href="#L1695">1695</a> <em class="jxr_javadoccomment">	 * Returns a reverse stream of the specified list.</em>
-<a class="jxr_linenumber" name="L1696" href="#L1696">1696</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1697" href="#L1697">1697</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L1698" href="#L1698">1698</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L1699" href="#L1699">1699</a> <em class="jxr_javadoccomment">	 * 	List&amp;lt;String&amp;gt; &lt;jv&gt;list&lt;/jv&gt; = &lt;jsm&gt;list&lt;/jsm&gt;(&lt;js&gt;"a"&lt;/js&gt;, &lt;js&gt;"b"&lt;/js&gt;, &lt;js&gt;"c"&lt;/js&gt;);</em>
-<a class="jxr_linenumber" name="L1700" href="#L1700">1700</a> <em class="jxr_javadoccomment">	 * 	Stream&amp;lt;String&amp;gt; &lt;jv&gt;reversed&lt;/jv&gt; = &lt;jsm&gt;rstream&lt;/jsm&gt;(&lt;jv&gt;list&lt;/jv&gt;);</em>
-<a class="jxr_linenumber" name="L1701" href="#L1701">1701</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Produces stream: "c", "b", "a"&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L1702" href="#L1702">1702</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L1703" href="#L1703">1703</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1704" href="#L1704">1704</a> <em class="jxr_javadoccomment">	 * @param &lt;T&gt; The element type.</em>
-<a class="jxr_linenumber" name="L1705" href="#L1705">1705</a> <em class="jxr_javadoccomment">	 * @param value The list to stream in reverse order. Can be &lt;jk&gt;null&lt;/jk&gt;.</em>
-<a class="jxr_linenumber" name="L1706" href="#L1706">1706</a> <em class="jxr_javadoccomment">	 * @return A stream of the list elements in reverse order, or an empty stream if the list is &lt;jk&gt;null&lt;/jk&gt; or empty.</em>
-<a class="jxr_linenumber" name="L1707" href="#L1707">1707</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1708" href="#L1708">1708</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;T&gt; Stream&lt;T&gt; rstream(List&lt;T&gt; value) {
-<a class="jxr_linenumber" name="L1709" href="#L1709">1709</a> 		<strong class="jxr_keyword">if</strong> (value == <strong class="jxr_keyword">null</strong> || value.isEmpty())
-<a class="jxr_linenumber" name="L1710" href="#L1710">1710</a> 			<strong class="jxr_keyword">return</strong> Stream.empty();
-<a class="jxr_linenumber" name="L1711" href="#L1711">1711</a> 		<strong class="jxr_keyword">return</strong> IntStream.range(0, value.size()).mapToObj(i -&gt; value.get(value.size() - 1 - i));
-<a class="jxr_linenumber" name="L1712" href="#L1712">1712</a> 	}
-<a class="jxr_linenumber" name="L1713" href="#L1713">1713</a> 
-<a class="jxr_linenumber" name="L1714" href="#L1714">1714</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1715" href="#L1715">1715</a> <em class="jxr_javadoccomment">	 * Shortcut for creating a modifiable set out of an array of values.</em>
-<a class="jxr_linenumber" name="L1716" href="#L1716">1716</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1717" href="#L1717">1717</a> <em class="jxr_javadoccomment">	 * @param &lt;T&gt; The element type.</em>
-<a class="jxr_linenumber" name="L1718" href="#L1718">1718</a> <em class="jxr_javadoccomment">	 * @param values The values to add to the set.</em>
-<a class="jxr_linenumber" name="L1719" href="#L1719">1719</a> <em class="jxr_javadoccomment">	 * @return A modifiable LinkedHashSet containing the specified values.</em>
-<a class="jxr_linenumber" name="L1720" href="#L1720">1720</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1721" href="#L1721">1721</a> 	@SafeVarargs
-<a class="jxr_linenumber" name="L1722" href="#L1722">1722</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;T&gt; LinkedHashSet&lt;T&gt; set(T...values) {  <em class="jxr_comment">// NOSONAR</em>
-<a class="jxr_linenumber" name="L1723" href="#L1723">1723</a> 		assertArgNotNull(<span class="jxr_string">"values"</span>, values);
-<a class="jxr_linenumber" name="L1724" href="#L1724">1724</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> LinkedHashSet&lt;&gt;(Arrays.asList(values));
-<a class="jxr_linenumber" name="L1725" href="#L1725">1725</a> 	}
-<a class="jxr_linenumber" name="L1726" href="#L1726">1726</a> 
-<a class="jxr_linenumber" name="L1727" href="#L1727">1727</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1728" href="#L1728">1728</a> <em class="jxr_javadoccomment">	 * Returns an empty immutable set.</em>
-<a class="jxr_linenumber" name="L1729" href="#L1729">1729</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1730" href="#L1730">1730</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L1731" href="#L1731">1731</a> <em class="jxr_javadoccomment">	 * This is a convenience method that returns {@link Collections#emptySet()}.</em>
-<a class="jxr_linenumber" name="L1732" href="#L1732">1732</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1733" href="#L1733">1733</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L1734" href="#L1734">1734</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L1735" href="#L1735">1735</a> <em class="jxr_javadoccomment">	 * 	Set&amp;lt;String&amp;gt; &lt;jv&gt;empty&lt;/jv&gt; = CollectionUtils.&lt;jsf&gt;sete&lt;/jsf&gt;();  &lt;jc&gt;// Returns Collections.emptySet()&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L1736" href="#L1736">1736</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L1737" href="#L1737">1737</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1738" href="#L1738">1738</a> <em class="jxr_javadoccomment">	 * @param &lt;T&gt; The element type.</em>
-<a class="jxr_linenumber" name="L1739" href="#L1739">1739</a> <em class="jxr_javadoccomment">	 * @return An empty immutable set.</em>
-<a class="jxr_linenumber" name="L1740" href="#L1740">1740</a> <em class="jxr_javadoccomment">	 * @see Collections#emptySet()</em>
-<a class="jxr_linenumber" name="L1741" href="#L1741">1741</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1742" href="#L1742">1742</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;T&gt; Set&lt;T&gt; sete() {
-<a class="jxr_linenumber" name="L1743" href="#L1743">1743</a> 		<strong class="jxr_keyword">return</strong> Collections.emptySet();
-<a class="jxr_linenumber" name="L1744" href="#L1744">1744</a> 	}
-<a class="jxr_linenumber" name="L1745" href="#L1745">1745</a> 
-<a class="jxr_linenumber" name="L1746" href="#L1746">1746</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1747" href="#L1747">1747</a> <em class="jxr_javadoccomment">	 * Convenience factory for a {@link Sets}.</em>
-<a class="jxr_linenumber" name="L1748" href="#L1748">1748</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1749" href="#L1749">1749</a> <em class="jxr_javadoccomment">	 * @param &lt;E&gt; The element type.</em>
-<a class="jxr_linenumber" name="L1750" href="#L1750">1750</a> <em class="jxr_javadoccomment">	 * @param type The element type.</em>
-<a class="jxr_linenumber" name="L1751" href="#L1751">1751</a> <em class="jxr_javadoccomment">	 * @return A new set builder.</em>
-<a class="jxr_linenumber" name="L1752" href="#L1752">1752</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1753" href="#L1753">1753</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;E&gt; Sets&lt;E&gt; setb(Class&lt;E&gt; type) {
-<a class="jxr_linenumber" name="L1754" href="#L1754">1754</a> 		<strong class="jxr_keyword">return</strong> Sets.create(type).ordered();
-<a class="jxr_linenumber" name="L1755" href="#L1755">1755</a> 	}
-<a class="jxr_linenumber" name="L1756" href="#L1756">1756</a> 
-<a class="jxr_linenumber" name="L1757" href="#L1757">1757</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1758" href="#L1758">1758</a> <em class="jxr_javadoccomment">	 * Convenience method for creating a {@link LinkedHashSet}.</em>
-<a class="jxr_linenumber" name="L1759" href="#L1759">1759</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1760" href="#L1760">1760</a> <em class="jxr_javadoccomment">	 * @param &lt;E&gt; The element type.</em>
-<a class="jxr_linenumber" name="L1761" href="#L1761">1761</a> <em class="jxr_javadoccomment">	 * @param elementType The element type.</em>
-<a class="jxr_linenumber" name="L1762" href="#L1762">1762</a> <em class="jxr_javadoccomment">	 * @param values The values to initialize the set with.</em>
-<a class="jxr_linenumber" name="L1763" href="#L1763">1763</a> <em class="jxr_javadoccomment">	 * @return A new modifiable set.</em>
-<a class="jxr_linenumber" name="L1764" href="#L1764">1764</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1765" href="#L1765">1765</a> 	@SafeVarargs
-<a class="jxr_linenumber" name="L1766" href="#L1766">1766</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;E&gt; LinkedHashSet&lt;E&gt; setOf(Class&lt;E&gt; elementType, E...values) {
-<a class="jxr_linenumber" name="L1767" href="#L1767">1767</a> 		<strong class="jxr_keyword">return</strong> set(values);
-<a class="jxr_linenumber" name="L1768" href="#L1768">1768</a> 	}
-<a class="jxr_linenumber" name="L1769" href="#L1769">1769</a> 
-<a class="jxr_linenumber" name="L1770" href="#L1770">1770</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1771" href="#L1771">1771</a> <em class="jxr_javadoccomment">	 * Shortcut for creating a short array.</em>
-<a class="jxr_linenumber" name="L1772" href="#L1772">1772</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1773" href="#L1773">1773</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;Accepts int values and converts them to shorts, eliminating the need for explicit short casts.&lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L1774" href="#L1774">1774</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1775" href="#L1775">1775</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L1776" href="#L1776">1776</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L1777" href="#L1777">1777</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;short&lt;/jk&gt;[] &lt;jv&gt;myArray&lt;/jv&gt; = &lt;jsm&gt;shorts&lt;/jsm&gt;(1, 2, 3);</em>
-<a class="jxr_linenumber" name="L1778" href="#L1778">1778</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L1779" href="#L1779">1779</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1780" href="#L1780">1780</a> <em class="jxr_javadoccomment">	 * @param value The int values to convert to shorts. Values outside the short range (-32768 to 32767) will be truncated.</em>
-<a class="jxr_linenumber" name="L1781" href="#L1781">1781</a> <em class="jxr_javadoccomment">	 * @return A new short array.</em>
-<a class="jxr_linenumber" name="L1782" href="#L1782">1782</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1783" href="#L1783">1783</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">short</strong>[] shorts(<strong class="jxr_keyword">int</strong>...value) {
-<a class="jxr_linenumber" name="L1784" href="#L1784">1784</a> 		<strong class="jxr_keyword">var</strong> result = <strong class="jxr_keyword">new</strong> <strong class="jxr_keyword">short</strong>[value.length];
-<a class="jxr_linenumber" name="L1785" href="#L1785">1785</a> 		<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> i = 0; i &lt; value.length; i++) {
-<a class="jxr_linenumber" name="L1786" href="#L1786">1786</a> 			result[i] = (<strong class="jxr_keyword">short</strong>)value[i];
-<a class="jxr_linenumber" name="L1787" href="#L1787">1787</a> 		}
-<a class="jxr_linenumber" name="L1788" href="#L1788">1788</a> 		<strong class="jxr_keyword">return</strong> result;
-<a class="jxr_linenumber" name="L1789" href="#L1789">1789</a> 	}
-<a class="jxr_linenumber" name="L1790" href="#L1790">1790</a> 
-<a class="jxr_linenumber" name="L1791" href="#L1791">1791</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1792" href="#L1792">1792</a> <em class="jxr_javadoccomment">	 * Convenience method for creating an {@link ArrayList} and sorting it.</em>
-<a class="jxr_linenumber" name="L1793" href="#L1793">1793</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1794" href="#L1794">1794</a> <em class="jxr_javadoccomment">	 * @param &lt;E&gt; The element type.</em>
-<a class="jxr_linenumber" name="L1795" href="#L1795">1795</a> <em class="jxr_javadoccomment">	 * @param comparator The comparator to use to sort the list.</em>
-<a class="jxr_linenumber" name="L1796" href="#L1796">1796</a> <em class="jxr_javadoccomment">	 * @param value The values to initialize the list with.</em>
-<a class="jxr_linenumber" name="L1797" href="#L1797">1797</a> <em class="jxr_javadoccomment">	 * @return A new modifiable list.</em>
-<a class="jxr_linenumber" name="L1798" href="#L1798">1798</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1799" href="#L1799">1799</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;E&gt; ArrayList&lt;E&gt; sortedList(Comparator&lt;E&gt; comparator, Collection&lt;E&gt; value) {
-<a class="jxr_linenumber" name="L1800" href="#L1800">1800</a> 		ArrayList&lt;E&gt; l = toList(value);
-<a class="jxr_linenumber" name="L1801" href="#L1801">1801</a> 		Collections.sort(l, comparator);
-<a class="jxr_linenumber" name="L1802" href="#L1802">1802</a> 		<strong class="jxr_keyword">return</strong> l;
-<a class="jxr_linenumber" name="L1803" href="#L1803">1803</a> 	}
-<a class="jxr_linenumber" name="L1804" href="#L1804">1804</a> 
-<a class="jxr_linenumber" name="L1805" href="#L1805">1805</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1806" href="#L1806">1806</a> <em class="jxr_javadoccomment">	 * Convenience method for creating an {@link ArrayList} and sorting it.</em>
-<a class="jxr_linenumber" name="L1807" href="#L1807">1807</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1808" href="#L1808">1808</a> <em class="jxr_javadoccomment">	 * @param &lt;E&gt; The element type.</em>
-<a class="jxr_linenumber" name="L1809" href="#L1809">1809</a> <em class="jxr_javadoccomment">	 * @param comparator The comparator to use to sort the list.</em>
-<a class="jxr_linenumber" name="L1810" href="#L1810">1810</a> <em class="jxr_javadoccomment">	 * @param values The values to initialize the list with.</em>
-<a class="jxr_linenumber" name="L1811" href="#L1811">1811</a> <em class="jxr_javadoccomment">	 * @return A new modifiable list.</em>
-<a class="jxr_linenumber" name="L1812" href="#L1812">1812</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1813" href="#L1813">1813</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;E&gt; List&lt;E&gt; sortedList(Comparator&lt;E&gt; comparator, E[] values) {
-<a class="jxr_linenumber" name="L1814" href="#L1814">1814</a> 		List&lt;E&gt; l = list(values);
-<a class="jxr_linenumber" name="L1815" href="#L1815">1815</a> 		Collections.sort(l, comparator);
-<a class="jxr_linenumber" name="L1816" href="#L1816">1816</a> 		<strong class="jxr_keyword">return</strong> l;
+<a class="jxr_linenumber" name="L1671" href="#L1671">1671</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;K,V&gt; LinkedHashMap&lt;K,V&gt; mapOf(Class&lt;K&gt; keyType, Class&lt;V&gt; valueType) {
+<a class="jxr_linenumber" name="L1672" href="#L1672">1672</a> 		<strong class="jxr_keyword">return</strong> map();
+<a class="jxr_linenumber" name="L1673" href="#L1673">1673</a> 	}
+<a class="jxr_linenumber" name="L1674" href="#L1674">1674</a> 
+<a class="jxr_linenumber" name="L1675" href="#L1675">1675</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1676" href="#L1676">1676</a> <em class="jxr_javadoccomment">	 * Returns &lt;jk&gt;null&lt;/jk&gt; for the specified array type.</em>
+<a class="jxr_linenumber" name="L1677" href="#L1677">1677</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1678" href="#L1678">1678</a> <em class="jxr_javadoccomment">	 * @param &lt;T&gt; The component type.</em>
+<a class="jxr_linenumber" name="L1679" href="#L1679">1679</a> <em class="jxr_javadoccomment">	 * @param type The component type class.</em>
+<a class="jxr_linenumber" name="L1680" href="#L1680">1680</a> <em class="jxr_javadoccomment">	 * @return &lt;jk&gt;null&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L1681" href="#L1681">1681</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L1682" href="#L1682">1682</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;T&gt; T[] na(Class&lt;T&gt; type) {
+<a class="jxr_linenumber" name="L1683" href="#L1683">1683</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L1684" href="#L1684">1684</a> 	}
+<a class="jxr_linenumber" name="L1685" href="#L1685">1685</a> 
+<a class="jxr_linenumber" name="L1686" href="#L1686">1686</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1687" href="#L1687">1687</a> <em class="jxr_javadoccomment">	 * Adds all the specified values to the specified collection.</em>
+<a class="jxr_linenumber" name="L1688" href="#L1688">1688</a> <em class="jxr_javadoccomment">	 * Creates a new set if the value is &lt;jk&gt;null&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L1689" href="#L1689">1689</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1690" href="#L1690">1690</a> <em class="jxr_javadoccomment">	 * @param &lt;E&gt; The element type.</em>
+<a class="jxr_linenumber" name="L1691" href="#L1691">1691</a> <em class="jxr_javadoccomment">	 * @param value The collection to add to.</em>
+<a class="jxr_linenumber" name="L1692" href="#L1692">1692</a> <em class="jxr_javadoccomment">	 * @param entries The entries to add.</em>
+<a class="jxr_linenumber" name="L1693" href="#L1693">1693</a> <em class="jxr_javadoccomment">	 * @return The set.</em>
+<a class="jxr_linenumber" name="L1694" href="#L1694">1694</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L1695" href="#L1695">1695</a> 	@SafeVarargs
+<a class="jxr_linenumber" name="L1696" href="#L1696">1696</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;E&gt; List&lt;E&gt; prependAll(List&lt;E&gt; value, E...entries) {
+<a class="jxr_linenumber" name="L1697" href="#L1697">1697</a> 		<strong class="jxr_keyword">if</strong> (nn(entries)) {
+<a class="jxr_linenumber" name="L1698" href="#L1698">1698</a> 			<strong class="jxr_keyword">if</strong> (value == <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L1699" href="#L1699">1699</a> 				value = list(entries);
+<a class="jxr_linenumber" name="L1700" href="#L1700">1700</a> 			<strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L1701" href="#L1701">1701</a> 				value.addAll(0, l(entries));
+<a class="jxr_linenumber" name="L1702" href="#L1702">1702</a> 		}
+<a class="jxr_linenumber" name="L1703" href="#L1703">1703</a> 		<strong class="jxr_keyword">return</strong> value;
+<a class="jxr_linenumber" name="L1704" href="#L1704">1704</a> 	}
+<a class="jxr_linenumber" name="L1705" href="#L1705">1705</a> 
+<a class="jxr_linenumber" name="L1706" href="#L1706">1706</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1707" href="#L1707">1707</a> <em class="jxr_javadoccomment">	 * Reverses the entries in an array.</em>
+<a class="jxr_linenumber" name="L1708" href="#L1708">1708</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1709" href="#L1709">1709</a> <em class="jxr_javadoccomment">	 * @param &lt;E&gt; The element type.</em>
+<a class="jxr_linenumber" name="L1710" href="#L1710">1710</a> <em class="jxr_javadoccomment">	 * @param array The array to reverse.</em>
+<a class="jxr_linenumber" name="L1711" href="#L1711">1711</a> <em class="jxr_javadoccomment">	 * @return The same array.</em>
+<a class="jxr_linenumber" name="L1712" href="#L1712">1712</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L1713" href="#L1713">1713</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1714" href="#L1714">1714</a> <em class="jxr_javadoccomment">	 * Reverses the elements in the specified array in-place.</em>
+<a class="jxr_linenumber" name="L1715" href="#L1715">1715</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1716" href="#L1716">1716</a> <em class="jxr_javadoccomment">	 * @param &lt;E&gt; The element type.</em>
+<a class="jxr_linenumber" name="L1717" href="#L1717">1717</a> <em class="jxr_javadoccomment">	 * @param array The array to reverse.</em>
+<a class="jxr_linenumber" name="L1718" href="#L1718">1718</a> <em class="jxr_javadoccomment">	 * @return The same array, reversed.</em>
+<a class="jxr_linenumber" name="L1719" href="#L1719">1719</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L1720" href="#L1720">1720</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;E&gt; E[] reverse(E[] array) {
+<a class="jxr_linenumber" name="L1721" href="#L1721">1721</a> 		<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> i = 0; i &lt; array.length / 2; i++) {
+<a class="jxr_linenumber" name="L1722" href="#L1722">1722</a> 			E temp = array[i];
+<a class="jxr_linenumber" name="L1723" href="#L1723">1723</a> 			array[i] = array[array.length - i - 1];
+<a class="jxr_linenumber" name="L1724" href="#L1724">1724</a> 			array[array.length - i - 1] = temp;
+<a class="jxr_linenumber" name="L1725" href="#L1725">1725</a> 		}
+<a class="jxr_linenumber" name="L1726" href="#L1726">1726</a> 		<strong class="jxr_keyword">return</strong> array;
+<a class="jxr_linenumber" name="L1727" href="#L1727">1727</a> 	}
+<a class="jxr_linenumber" name="L1728" href="#L1728">1728</a> 
+<a class="jxr_linenumber" name="L1729" href="#L1729">1729</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1730" href="#L1730">1730</a> <em class="jxr_javadoccomment">	 * Returns a reversed view of the specified list.</em>
+<a class="jxr_linenumber" name="L1731" href="#L1731">1731</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1732" href="#L1732">1732</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L1733" href="#L1733">1733</a> <em class="jxr_javadoccomment">	 * The returned list is a live view that reflects changes to the original list.</em>
+<a class="jxr_linenumber" name="L1734" href="#L1734">1734</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1735" href="#L1735">1735</a> <em class="jxr_javadoccomment">	 * @param &lt;E&gt; The element type.</em>
+<a class="jxr_linenumber" name="L1736" href="#L1736">1736</a> <em class="jxr_javadoccomment">	 * @param list The list to reverse.</em>
+<a class="jxr_linenumber" name="L1737" href="#L1737">1737</a> <em class="jxr_javadoccomment">	 * @return A reversed view of the list.</em>
+<a class="jxr_linenumber" name="L1738" href="#L1738">1738</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L1739" href="#L1739">1739</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;E&gt; List&lt;E&gt; reverse(List&lt;E&gt; list) {
+<a class="jxr_linenumber" name="L1740" href="#L1740">1740</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> ReversedList&lt;&gt;(list);
+<a class="jxr_linenumber" name="L1741" href="#L1741">1741</a> 	}
+<a class="jxr_linenumber" name="L1742" href="#L1742">1742</a> 
+<a class="jxr_linenumber" name="L1743" href="#L1743">1743</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1744" href="#L1744">1744</a> <em class="jxr_javadoccomment">	 * Returns a reverse stream of the specified list.</em>
+<a class="jxr_linenumber" name="L1745" href="#L1745">1745</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1746" href="#L1746">1746</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L1747" href="#L1747">1747</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L1748" href="#L1748">1748</a> <em class="jxr_javadoccomment">	 * 	List&amp;lt;String&amp;gt; &lt;jv&gt;list&lt;/jv&gt; = &lt;jsm&gt;list&lt;/jsm&gt;(&lt;js&gt;"a"&lt;/js&gt;, &lt;js&gt;"b"&lt;/js&gt;, &lt;js&gt;"c"&lt;/js&gt;);</em>
+<a class="jxr_linenumber" name="L1749" href="#L1749">1749</a> <em class="jxr_javadoccomment">	 * 	Stream&amp;lt;String&amp;gt; &lt;jv&gt;reversed&lt;/jv&gt; = &lt;jsm&gt;rstream&lt;/jsm&gt;(&lt;jv&gt;list&lt;/jv&gt;);</em>
+<a class="jxr_linenumber" name="L1750" href="#L1750">1750</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Produces stream: "c", "b", "a"&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L1751" href="#L1751">1751</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L1752" href="#L1752">1752</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1753" href="#L1753">1753</a> <em class="jxr_javadoccomment">	 * @param &lt;T&gt; The element type.</em>
+<a class="jxr_linenumber" name="L1754" href="#L1754">1754</a> <em class="jxr_javadoccomment">	 * @param value The list to stream in reverse order. Can be &lt;jk&gt;null&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L1755" href="#L1755">1755</a> <em class="jxr_javadoccomment">	 * @return A stream of the list elements in reverse order, or an empty stream if the list is &lt;jk&gt;null&lt;/jk&gt; or empty.</em>
+<a class="jxr_linenumber" name="L1756" href="#L1756">1756</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L1757" href="#L1757">1757</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;T&gt; Stream&lt;T&gt; rstream(List&lt;T&gt; value) {
+<a class="jxr_linenumber" name="L1758" href="#L1758">1758</a> 		<strong class="jxr_keyword">if</strong> (value == <strong class="jxr_keyword">null</strong> || value.isEmpty())
+<a class="jxr_linenumber" name="L1759" href="#L1759">1759</a> 			<strong class="jxr_keyword">return</strong> Stream.empty();
+<a class="jxr_linenumber" name="L1760" href="#L1760">1760</a> 		<strong class="jxr_keyword">return</strong> IntStream.range(0, value.size()).mapToObj(i -&gt; value.get(value.size() - 1 - i));
+<a class="jxr_linenumber" name="L1761" href="#L1761">1761</a> 	}
+<a class="jxr_linenumber" name="L1762" href="#L1762">1762</a> 
+<a class="jxr_linenumber" name="L1763" href="#L1763">1763</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1764" href="#L1764">1764</a> <em class="jxr_javadoccomment">	 * Shortcut for creating a modifiable set out of an array of values.</em>
+<a class="jxr_linenumber" name="L1765" href="#L1765">1765</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1766" href="#L1766">1766</a> <em class="jxr_javadoccomment">	 * @param &lt;T&gt; The element type.</em>
+<a class="jxr_linenumber" name="L1767" href="#L1767">1767</a> <em class="jxr_javadoccomment">	 * @param values The values to add to the set.</em>
+<a class="jxr_linenumber" name="L1768" href="#L1768">1768</a> <em class="jxr_javadoccomment">	 * @return A modifiable LinkedHashSet containing the specified values.</em>
+<a class="jxr_linenumber" name="L1769" href="#L1769">1769</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L1770" href="#L1770">1770</a> 	@SafeVarargs
+<a class="jxr_linenumber" name="L1771" href="#L1771">1771</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;T&gt; LinkedHashSet&lt;T&gt; set(T...values) {  <em class="jxr_comment">// NOSONAR</em>
+<a class="jxr_linenumber" name="L1772" href="#L1772">1772</a> 		assertArgNotNull(<span class="jxr_string">"values"</span>, values);
+<a class="jxr_linenumber" name="L1773" href="#L1773">1773</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> LinkedHashSet&lt;&gt;(Arrays.asList(values));
+<a class="jxr_linenumber" name="L1774" href="#L1774">1774</a> 	}
+<a class="jxr_linenumber" name="L1775" href="#L1775">1775</a> 
+<a class="jxr_linenumber" name="L1776" href="#L1776">1776</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1777" href="#L1777">1777</a> <em class="jxr_javadoccomment">	 * Returns an empty immutable set.</em>
+<a class="jxr_linenumber" name="L1778" href="#L1778">1778</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1779" href="#L1779">1779</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L1780" href="#L1780">1780</a> <em class="jxr_javadoccomment">	 * This is a convenience method that returns {@link Collections#emptySet()}.</em>
+<a class="jxr_linenumber" name="L1781" href="#L1781">1781</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1782" href="#L1782">1782</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L1783" href="#L1783">1783</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L1784" href="#L1784">1784</a> <em class="jxr_javadoccomment">	 * 	Set&amp;lt;String&amp;gt; &lt;jv&gt;empty&lt;/jv&gt; = CollectionUtils.&lt;jsf&gt;sete&lt;/jsf&gt;();  &lt;jc&gt;// Returns Collections.emptySet()&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L1785" href="#L1785">1785</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L1786" href="#L1786">1786</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1787" href="#L1787">1787</a> <em class="jxr_javadoccomment">	 * @param &lt;T&gt; The element type.</em>
+<a class="jxr_linenumber" name="L1788" href="#L1788">1788</a> <em class="jxr_javadoccomment">	 * @return An empty immutable set.</em>
+<a class="jxr_linenumber" name="L1789" href="#L1789">1789</a> <em class="jxr_javadoccomment">	 * @see Collections#emptySet()</em>
+<a class="jxr_linenumber" name="L1790" href="#L1790">1790</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L1791" href="#L1791">1791</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;T&gt; Set&lt;T&gt; sete() {
+<a class="jxr_linenumber" name="L1792" href="#L1792">1792</a> 		<strong class="jxr_keyword">return</strong> Collections.emptySet();
+<a class="jxr_linenumber" name="L1793" href="#L1793">1793</a> 	}
+<a class="jxr_linenumber" name="L1794" href="#L1794">1794</a> 
+<a class="jxr_linenumber" name="L1795" href="#L1795">1795</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1796" href="#L1796">1796</a> <em class="jxr_javadoccomment">	 * Convenience factory for a {@link Sets}.</em>
+<a class="jxr_linenumber" name="L1797" href="#L1797">1797</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1798" href="#L1798">1798</a> <em class="jxr_javadoccomment">	 * @param &lt;E&gt; The element type.</em>
+<a class="jxr_linenumber" name="L1799" href="#L1799">1799</a> <em class="jxr_javadoccomment">	 * @param type The element type.</em>
+<a class="jxr_linenumber" name="L1800" href="#L1800">1800</a> <em class="jxr_javadoccomment">	 * @return A new set builder.</em>
+<a class="jxr_linenumber" name="L1801" href="#L1801">1801</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L1802" href="#L1802">1802</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;E&gt; Sets&lt;E&gt; setb(Class&lt;E&gt; type) {
+<a class="jxr_linenumber" name="L1803" href="#L1803">1803</a> 		<strong class="jxr_keyword">return</strong> Sets.create(type).ordered();
+<a class="jxr_linenumber" name="L1804" href="#L1804">1804</a> 	}
+<a class="jxr_linenumber" name="L1805" href="#L1805">1805</a> 
+<a class="jxr_linenumber" name="L1806" href="#L1806">1806</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1807" href="#L1807">1807</a> <em class="jxr_javadoccomment">	 * Convenience method for creating a {@link LinkedHashSet}.</em>
+<a class="jxr_linenumber" name="L1808" href="#L1808">1808</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1809" href="#L1809">1809</a> <em class="jxr_javadoccomment">	 * @param &lt;E&gt; The element type.</em>
+<a class="jxr_linenumber" name="L1810" href="#L1810">1810</a> <em class="jxr_javadoccomment">	 * @param elementType The element type.</em>
+<a class="jxr_linenumber" name="L1811" href="#L1811">1811</a> <em class="jxr_javadoccomment">	 * @param values The values to initialize the set with.</em>
+<a class="jxr_linenumber" name="L1812" href="#L1812">1812</a> <em class="jxr_javadoccomment">	 * @return A new modifiable set.</em>
+<a class="jxr_linenumber" name="L1813" href="#L1813">1813</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L1814" href="#L1814">1814</a> 	@SafeVarargs
+<a class="jxr_linenumber" name="L1815" href="#L1815">1815</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;E&gt; LinkedHashSet&lt;E&gt; setOf(Class&lt;E&gt; elementType, E...values) {
+<a class="jxr_linenumber" name="L1816" href="#L1816">1816</a> 		<strong class="jxr_keyword">return</strong> set(values);
 <a class="jxr_linenumber" name="L1817" href="#L1817">1817</a> 	}
 <a class="jxr_linenumber" name="L1818" href="#L1818">1818</a> 
 <a class="jxr_linenumber" name="L1819" href="#L1819">1819</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1820" href="#L1820">1820</a> <em class="jxr_javadoccomment">	 * Convenience method for creating an {@link ArrayList} and sorting it.</em>
+<a class="jxr_linenumber" name="L1820" href="#L1820">1820</a> <em class="jxr_javadoccomment">	 * Shortcut for creating a short array.</em>
 <a class="jxr_linenumber" name="L1821" href="#L1821">1821</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1822" href="#L1822">1822</a> <em class="jxr_javadoccomment">	 * @param &lt;E&gt; The element type.</em>
-<a class="jxr_linenumber" name="L1823" href="#L1823">1823</a> <em class="jxr_javadoccomment">	 * @param values The values to initialize the list with.</em>
-<a class="jxr_linenumber" name="L1824" href="#L1824">1824</a> <em class="jxr_javadoccomment">	 * @return A new modifiable list.</em>
-<a class="jxr_linenumber" name="L1825" href="#L1825">1825</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1826" href="#L1826">1826</a> 	@SuppressWarnings({ <span class="jxr_string">"rawtypes"</span>, <span class="jxr_string">"unchecked"</span> })
-<a class="jxr_linenumber" name="L1827" href="#L1827">1827</a> 	@SafeVarargs
-<a class="jxr_linenumber" name="L1828" href="#L1828">1828</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;E&gt; List&lt;E&gt; sortedList(E...values) {
-<a class="jxr_linenumber" name="L1829" href="#L1829">1829</a> 		List&lt;E&gt; l = list(values);
-<a class="jxr_linenumber" name="L1830" href="#L1830">1830</a> 		Collections.sort((List&lt;Comparable&gt;)l);
-<a class="jxr_linenumber" name="L1831" href="#L1831">1831</a> 		<strong class="jxr_keyword">return</strong> l;
-<a class="jxr_linenumber" name="L1832" href="#L1832">1832</a> 	}
-<a class="jxr_linenumber" name="L1833" href="#L1833">1833</a> 
-<a class="jxr_linenumber" name="L1834" href="#L1834">1834</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1835" href="#L1835">1835</a> <em class="jxr_javadoccomment">	 * Convenience method for creating a {@link TreeMap}.</em>
-<a class="jxr_linenumber" name="L1836" href="#L1836">1836</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1837" href="#L1837">1837</a> <em class="jxr_javadoccomment">	 * @param &lt;K&gt; The key type.</em>
-<a class="jxr_linenumber" name="L1838" href="#L1838">1838</a> <em class="jxr_javadoccomment">	 * @param &lt;V&gt; The value type.</em>
-<a class="jxr_linenumber" name="L1839" href="#L1839">1839</a> <em class="jxr_javadoccomment">	 * @return A new modifiable set.</em>
-<a class="jxr_linenumber" name="L1840" href="#L1840">1840</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1841" href="#L1841">1841</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;K,V&gt; TreeMap&lt;K,V&gt; sortedMap() {
-<a class="jxr_linenumber" name="L1842" href="#L1842">1842</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> TreeMap&lt;&gt;();
-<a class="jxr_linenumber" name="L1843" href="#L1843">1843</a> 	}
-<a class="jxr_linenumber" name="L1844" href="#L1844">1844</a> 
-<a class="jxr_linenumber" name="L1845" href="#L1845">1845</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1846" href="#L1846">1846</a> <em class="jxr_javadoccomment">	 * Convenience method for creating a {@link TreeSet}.</em>
-<a class="jxr_linenumber" name="L1847" href="#L1847">1847</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1848" href="#L1848">1848</a> <em class="jxr_javadoccomment">	 * @param &lt;E&gt; The element type.</em>
-<a class="jxr_linenumber" name="L1849" href="#L1849">1849</a> <em class="jxr_javadoccomment">	 * @param values The values to initialize the set with.</em>
-<a class="jxr_linenumber" name="L1850" href="#L1850">1850</a> <em class="jxr_javadoccomment">	 * @return A new modifiable set.</em>
-<a class="jxr_linenumber" name="L1851" href="#L1851">1851</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1852" href="#L1852">1852</a> 	@SafeVarargs
-<a class="jxr_linenumber" name="L1853" href="#L1853">1853</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;E&gt; TreeSet&lt;E&gt; sortedSet(E...values) {
-<a class="jxr_linenumber" name="L1854" href="#L1854">1854</a> 		assertArgNotNull(<span class="jxr_string">"values"</span>, values);
-<a class="jxr_linenumber" name="L1855" href="#L1855">1855</a> 		<strong class="jxr_keyword">var</strong> l = <strong class="jxr_keyword">new</strong> TreeSet&lt;E&gt;();
-<a class="jxr_linenumber" name="L1856" href="#L1856">1856</a> 		<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> v : values)
-<a class="jxr_linenumber" name="L1857" href="#L1857">1857</a> 			l.add(v);
-<a class="jxr_linenumber" name="L1858" href="#L1858">1858</a> 		<strong class="jxr_keyword">return</strong> l;
-<a class="jxr_linenumber" name="L1859" href="#L1859">1859</a> 	}
-<a class="jxr_linenumber" name="L1860" href="#L1860">1860</a> 
-<a class="jxr_linenumber" name="L1861" href="#L1861">1861</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1862" href="#L1862">1862</a> <em class="jxr_javadoccomment">	 * Returns a stream of the specified array.</em>
-<a class="jxr_linenumber" name="L1863" href="#L1863">1863</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1864" href="#L1864">1864</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L1865" href="#L1865">1865</a> <em class="jxr_javadoccomment">	 * Gracefully handles &lt;jk&gt;null&lt;/jk&gt; arrays by returning an empty stream.</em>
-<a class="jxr_linenumber" name="L1866" href="#L1866">1866</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1867" href="#L1867">1867</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L1868" href="#L1868">1868</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L1869" href="#L1869">1869</a> <em class="jxr_javadoccomment">	 * 	String[] &lt;jv&gt;array&lt;/jv&gt; = {&lt;js&gt;"a"&lt;/js&gt;, &lt;js&gt;"b"&lt;/js&gt;, &lt;js&gt;"c"&lt;/js&gt;};</em>
+<a class="jxr_linenumber" name="L1822" href="#L1822">1822</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;Accepts int values and converts them to shorts, eliminating the need for explicit short casts.&lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L1823" href="#L1823">1823</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1824" href="#L1824">1824</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L1825" href="#L1825">1825</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L1826" href="#L1826">1826</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;short&lt;/jk&gt;[] &lt;jv&gt;myArray&lt;/jv&gt; = &lt;jsm&gt;shorts&lt;/jsm&gt;(1, 2, 3);</em>
+<a class="jxr_linenumber" name="L1827" href="#L1827">1827</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L1828" href="#L1828">1828</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1829" href="#L1829">1829</a> <em class="jxr_javadoccomment">	 * @param value The int values to convert to shorts. Values outside the short range (-32768 to 32767) will be truncated.</em>
+<a class="jxr_linenumber" name="L1830" href="#L1830">1830</a> <em class="jxr_javadoccomment">	 * @return A new short array.</em>
+<a class="jxr_linenumber" name="L1831" href="#L1831">1831</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L1832" href="#L1832">1832</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">short</strong>[] shorts(<strong class="jxr_keyword">int</strong>...value) {
+<a class="jxr_linenumber" name="L1833" href="#L1833">1833</a> 		<strong class="jxr_keyword">var</strong> result = <strong class="jxr_keyword">new</strong> <strong class="jxr_keyword">short</strong>[value.length];
+<a class="jxr_linenumber" name="L1834" href="#L1834">1834</a> 		<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> i = 0; i &lt; value.length; i++) {
+<a class="jxr_linenumber" name="L1835" href="#L1835">1835</a> 			result[i] = (<strong class="jxr_keyword">short</strong>)value[i];
+<a class="jxr_linenumber" name="L1836" href="#L1836">1836</a> 		}
+<a class="jxr_linenumber" name="L1837" href="#L1837">1837</a> 		<strong class="jxr_keyword">return</strong> result;
+<a class="jxr_linenumber" name="L1838" href="#L1838">1838</a> 	}
+<a class="jxr_linenumber" name="L1839" href="#L1839">1839</a> 
+<a class="jxr_linenumber" name="L1840" href="#L1840">1840</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1841" href="#L1841">1841</a> <em class="jxr_javadoccomment">	 * Convenience method for creating an {@link ArrayList} and sorting it.</em>
+<a class="jxr_linenumber" name="L1842" href="#L1842">1842</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1843" href="#L1843">1843</a> <em class="jxr_javadoccomment">	 * @param &lt;E&gt; The element type.</em>
+<a class="jxr_linenumber" name="L1844" href="#L1844">1844</a> <em class="jxr_javadoccomment">	 * @param comparator The comparator to use to sort the list.</em>
+<a class="jxr_linenumber" name="L1845" href="#L1845">1845</a> <em class="jxr_javadoccomment">	 * @param value The values to initialize the list with.</em>
+<a class="jxr_linenumber" name="L1846" href="#L1846">1846</a> <em class="jxr_javadoccomment">	 * @return A new modifiable list.</em>
+<a class="jxr_linenumber" name="L1847" href="#L1847">1847</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L1848" href="#L1848">1848</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;E&gt; ArrayList&lt;E&gt; sortedList(Comparator&lt;E&gt; comparator, Collection&lt;E&gt; value) {
+<a class="jxr_linenumber" name="L1849" href="#L1849">1849</a> 		ArrayList&lt;E&gt; l = toList(value);
+<a class="jxr_linenumber" name="L1850" href="#L1850">1850</a> 		Collections.sort(l, comparator);
+<a class="jxr_linenumber" name="L1851" href="#L1851">1851</a> 		<strong class="jxr_keyword">return</strong> l;
+<a class="jxr_linenumber" name="L1852" href="#L1852">1852</a> 	}
+<a class="jxr_linenumber" name="L1853" href="#L1853">1853</a> 
+<a class="jxr_linenumber" name="L1854" href="#L1854">1854</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1855" href="#L1855">1855</a> <em class="jxr_javadoccomment">	 * Convenience method for creating an {@link ArrayList} and sorting it.</em>
+<a class="jxr_linenumber" name="L1856" href="#L1856">1856</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1857" href="#L1857">1857</a> <em class="jxr_javadoccomment">	 * @param &lt;E&gt; The element type.</em>
+<a class="jxr_linenumber" name="L1858" href="#L1858">1858</a> <em class="jxr_javadoccomment">	 * @param comparator The comparator to use to sort the list.</em>
+<a class="jxr_linenumber" name="L1859" href="#L1859">1859</a> <em class="jxr_javadoccomment">	 * @param values The values to initialize the list with.</em>
+<a class="jxr_linenumber" name="L1860" href="#L1860">1860</a> <em class="jxr_javadoccomment">	 * @return A new modifiable list.</em>
+<a class="jxr_linenumber" name="L1861" href="#L1861">1861</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L1862" href="#L1862">1862</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;E&gt; List&lt;E&gt; sortedList(Comparator&lt;E&gt; comparator, E[] values) {
+<a class="jxr_linenumber" name="L1863" href="#L1863">1863</a> 		List&lt;E&gt; l = list(values);
+<a class="jxr_linenumber" name="L1864" href="#L1864">1864</a> 		Collections.sort(l, comparator);
+<a class="jxr_linenumber" name="L1865" href="#L1865">1865</a> 		<strong class="jxr_keyword">return</strong> l;
+<a class="jxr_linenumber" name="L1866" href="#L1866">1866</a> 	}
+<a class="jxr_linenumber" name="L1867" href="#L1867">1867</a> 
+<a class="jxr_linenumber" name="L1868" href="#L1868">1868</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1869" href="#L1869">1869</a> <em class="jxr_javadoccomment">	 * Convenience method for creating an {@link ArrayList} and sorting it.</em>
 <a class="jxr_linenumber" name="L1870" href="#L1870">1870</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1871" href="#L1871">1871</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Prints "a", "b", "c"&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L1872" href="#L1872">1872</a> <em class="jxr_javadoccomment">	 * 	&lt;jsm&gt;stream&lt;/jsm&gt;(&lt;jv&gt;array&lt;/jv&gt;).forEach(System.&lt;jk&gt;out&lt;/jk&gt;::println);</em>
-<a class="jxr_linenumber" name="L1873" href="#L1873">1873</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1874" href="#L1874">1874</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Handles null gracefully - returns empty stream&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L1875" href="#L1875">1875</a> <em class="jxr_javadoccomment">	 * 	&lt;jsm&gt;stream&lt;/jsm&gt;(&lt;jk&gt;null&lt;/jk&gt;).forEach(System.&lt;jk&gt;out&lt;/jk&gt;::println);  &lt;jc&gt;// Prints nothing&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L1876" href="#L1876">1876</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L1877" href="#L1877">1877</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1878" href="#L1878">1878</a> <em class="jxr_javadoccomment">	 * @param &lt;T&gt; The element type.</em>
-<a class="jxr_linenumber" name="L1879" href="#L1879">1879</a> <em class="jxr_javadoccomment">	 * @param array The array to stream. Can be &lt;jk&gt;null&lt;/jk&gt;.</em>
-<a class="jxr_linenumber" name="L1880" href="#L1880">1880</a> <em class="jxr_javadoccomment">	 * @return A stream of the array elements, or an empty stream if the array is &lt;jk&gt;null&lt;/jk&gt;.</em>
-<a class="jxr_linenumber" name="L1881" href="#L1881">1881</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1882" href="#L1882">1882</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;T&gt; Stream&lt;T&gt; stream(T[] array) {
-<a class="jxr_linenumber" name="L1883" href="#L1883">1883</a> 		<strong class="jxr_keyword">return</strong> array == <strong class="jxr_keyword">null</strong> ? Stream.empty() : Arrays.stream(array);
-<a class="jxr_linenumber" name="L1884" href="#L1884">1884</a> 	}
-<a class="jxr_linenumber" name="L1885" href="#L1885">1885</a> 
-<a class="jxr_linenumber" name="L1886" href="#L1886">1886</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1887" href="#L1887">1887</a> <em class="jxr_javadoccomment">	 * Wraps the specified list in {@link Collections#unmodifiableList(List)}.</em>
-<a class="jxr_linenumber" name="L1888" href="#L1888">1888</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1889" href="#L1889">1889</a> <em class="jxr_javadoccomment">	 * @param &lt;E&gt; The element type.</em>
-<a class="jxr_linenumber" name="L1890" href="#L1890">1890</a> <em class="jxr_javadoccomment">	 * @param value The list to wrap.</em>
-<a class="jxr_linenumber" name="L1891" href="#L1891">1891</a> <em class="jxr_javadoccomment">	 * @return The wrapped list.</em>
-<a class="jxr_linenumber" name="L1892" href="#L1892">1892</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1893" href="#L1893">1893</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;E&gt; List&lt;E&gt; synced(List&lt;E&gt; value) {
-<a class="jxr_linenumber" name="L1894" href="#L1894">1894</a> 		<strong class="jxr_keyword">return</strong> value == <strong class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">null</strong> : Collections.synchronizedList(value);
-<a class="jxr_linenumber" name="L1895" href="#L1895">1895</a> 	}
-<a class="jxr_linenumber" name="L1896" href="#L1896">1896</a> 
-<a class="jxr_linenumber" name="L1897" href="#L1897">1897</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1898" href="#L1898">1898</a> <em class="jxr_javadoccomment">	 * Wraps the specified map in {@link Collections#unmodifiableMap(Map)}.</em>
-<a class="jxr_linenumber" name="L1899" href="#L1899">1899</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1900" href="#L1900">1900</a> <em class="jxr_javadoccomment">	 * @param &lt;K&gt; The key type.</em>
-<a class="jxr_linenumber" name="L1901" href="#L1901">1901</a> <em class="jxr_javadoccomment">	 * @param &lt;V&gt; The value type.</em>
-<a class="jxr_linenumber" name="L1902" href="#L1902">1902</a> <em class="jxr_javadoccomment">	 * @param value The map to wrap.</em>
-<a class="jxr_linenumber" name="L1903" href="#L1903">1903</a> <em class="jxr_javadoccomment">	 * @return The wrapped map.</em>
-<a class="jxr_linenumber" name="L1904" href="#L1904">1904</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1905" href="#L1905">1905</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;K,V&gt; Map&lt;K,V&gt; synced(Map&lt;K,V&gt; value) {
-<a class="jxr_linenumber" name="L1906" href="#L1906">1906</a> 		<strong class="jxr_keyword">return</strong> value == <strong class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">null</strong> : Collections.synchronizedMap(value);
-<a class="jxr_linenumber" name="L1907" href="#L1907">1907</a> 	}
-<a class="jxr_linenumber" name="L1908" href="#L1908">1908</a> 
-<a class="jxr_linenumber" name="L1909" href="#L1909">1909</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1910" href="#L1910">1910</a> <em class="jxr_javadoccomment">	 * Wraps the specified set in {@link Collections#unmodifiableSet(Set)}.</em>
-<a class="jxr_linenumber" name="L1911" href="#L1911">1911</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1912" href="#L1912">1912</a> <em class="jxr_javadoccomment">	 * @param &lt;E&gt; The element type.</em>
-<a class="jxr_linenumber" name="L1913" href="#L1913">1913</a> <em class="jxr_javadoccomment">	 * @param value The set to wrap.</em>
-<a class="jxr_linenumber" name="L1914" href="#L1914">1914</a> <em class="jxr_javadoccomment">	 * @return The wrapped set.</em>
-<a class="jxr_linenumber" name="L1915" href="#L1915">1915</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1916" href="#L1916">1916</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;E&gt; Set&lt;E&gt; synced(Set&lt;E&gt; value) {
-<a class="jxr_linenumber" name="L1917" href="#L1917">1917</a> 		<strong class="jxr_keyword">return</strong> value == <strong class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">null</strong> : Collections.synchronizedSet(value);
-<a class="jxr_linenumber" name="L1918" href="#L1918">1918</a> 	}
-<a class="jxr_linenumber" name="L1919" href="#L1919">1919</a> 
-<a class="jxr_linenumber" name="L1920" href="#L1920">1920</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1921" href="#L1921">1921</a> <em class="jxr_javadoccomment">	 * Converts the specified collection to an array.</em>
+<a class="jxr_linenumber" name="L1871" href="#L1871">1871</a> <em class="jxr_javadoccomment">	 * @param &lt;E&gt; The element type.</em>
+<a class="jxr_linenumber" name="L1872" href="#L1872">1872</a> <em class="jxr_javadoccomment">	 * @param values The values to initialize the list with.</em>
+<a class="jxr_linenumber" name="L1873" href="#L1873">1873</a> <em class="jxr_javadoccomment">	 * @return A new modifiable list.</em>
+<a class="jxr_linenumber" name="L1874" href="#L1874">1874</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L1875" href="#L1875">1875</a> 	@SuppressWarnings({ <span class="jxr_string">"rawtypes"</span>, <span class="jxr_string">"unchecked"</span> })
+<a class="jxr_linenumber" name="L1876" href="#L1876">1876</a> 	@SafeVarargs
+<a class="jxr_linenumber" name="L1877" href="#L1877">1877</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;E&gt; List&lt;E&gt; sortedList(E...values) {
+<a class="jxr_linenumber" name="L1878" href="#L1878">1878</a> 		List&lt;E&gt; l = list(values);
+<a class="jxr_linenumber" name="L1879" href="#L1879">1879</a> 		Collections.sort((List&lt;Comparable&gt;)l);
+<a class="jxr_linenumber" name="L1880" href="#L1880">1880</a> 		<strong class="jxr_keyword">return</strong> l;
+<a class="jxr_linenumber" name="L1881" href="#L1881">1881</a> 	}
+<a class="jxr_linenumber" name="L1882" href="#L1882">1882</a> 
+<a class="jxr_linenumber" name="L1883" href="#L1883">1883</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1884" href="#L1884">1884</a> <em class="jxr_javadoccomment">	 * Convenience method for creating a {@link TreeMap}.</em>
+<a class="jxr_linenumber" name="L1885" href="#L1885">1885</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1886" href="#L1886">1886</a> <em class="jxr_javadoccomment">	 * @param &lt;K&gt; The key type.</em>
+<a class="jxr_linenumber" name="L1887" href="#L1887">1887</a> <em class="jxr_javadoccomment">	 * @param &lt;V&gt; The value type.</em>
+<a class="jxr_linenumber" name="L1888" href="#L1888">1888</a> <em class="jxr_javadoccomment">	 * @return A new modifiable set.</em>
+<a class="jxr_linenumber" name="L1889" href="#L1889">1889</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L1890" href="#L1890">1890</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;K,V&gt; TreeMap&lt;K,V&gt; sortedMap() {
+<a class="jxr_linenumber" name="L1891" href="#L1891">1891</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> TreeMap&lt;&gt;();
+<a class="jxr_linenumber" name="L1892" href="#L1892">1892</a> 	}
+<a class="jxr_linenumber" name="L1893" href="#L1893">1893</a> 
+<a class="jxr_linenumber" name="L1894" href="#L1894">1894</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1895" href="#L1895">1895</a> <em class="jxr_javadoccomment">	 * Convenience method for creating a {@link TreeSet}.</em>
+<a class="jxr_linenumber" name="L1896" href="#L1896">1896</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1897" href="#L1897">1897</a> <em class="jxr_javadoccomment">	 * @param &lt;E&gt; The element type.</em>
+<a class="jxr_linenumber" name="L1898" href="#L1898">1898</a> <em class="jxr_javadoccomment">	 * @param values The values to initialize the set with.</em>
+<a class="jxr_linenumber" name="L1899" href="#L1899">1899</a> <em class="jxr_javadoccomment">	 * @return A new modifiable set.</em>
+<a class="jxr_linenumber" name="L1900" href="#L1900">1900</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L1901" href="#L1901">1901</a> 	@SafeVarargs
+<a class="jxr_linenumber" name="L1902" href="#L1902">1902</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;E&gt; TreeSet&lt;E&gt; sortedSet(E...values) {
+<a class="jxr_linenumber" name="L1903" href="#L1903">1903</a> 		assertArgNotNull(<span class="jxr_string">"values"</span>, values);
+<a class="jxr_linenumber" name="L1904" href="#L1904">1904</a> 		<strong class="jxr_keyword">var</strong> l = <strong class="jxr_keyword">new</strong> TreeSet&lt;E&gt;();
+<a class="jxr_linenumber" name="L1905" href="#L1905">1905</a> 		<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> v : values)
+<a class="jxr_linenumber" name="L1906" href="#L1906">1906</a> 			l.add(v);
+<a class="jxr_linenumber" name="L1907" href="#L1907">1907</a> 		<strong class="jxr_keyword">return</strong> l;
+<a class="jxr_linenumber" name="L1908" href="#L1908">1908</a> 	}
+<a class="jxr_linenumber" name="L1909" href="#L1909">1909</a> 
+<a class="jxr_linenumber" name="L1910" href="#L1910">1910</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1911" href="#L1911">1911</a> <em class="jxr_javadoccomment">	 * Returns a stream of the specified array.</em>
+<a class="jxr_linenumber" name="L1912" href="#L1912">1912</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1913" href="#L1913">1913</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L1914" href="#L1914">1914</a> <em class="jxr_javadoccomment">	 * Gracefully handles &lt;jk&gt;null&lt;/jk&gt; arrays by returning an empty stream.</em>
+<a class="jxr_linenumber" name="L1915" href="#L1915">1915</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1916" href="#L1916">1916</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L1917" href="#L1917">1917</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L1918" href="#L1918">1918</a> <em class="jxr_javadoccomment">	 * 	String[] &lt;jv&gt;array&lt;/jv&gt; = {&lt;js&gt;"a"&lt;/js&gt;, &lt;js&gt;"b"&lt;/js&gt;, &lt;js&gt;"c"&lt;/js&gt;};</em>
+<a class="jxr_linenumber" name="L1919" href="#L1919">1919</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1920" href="#L1920">1920</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Prints "a", "b", "c"&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L1921" href="#L1921">1921</a> <em class="jxr_javadoccomment">	 * 	&lt;jsm&gt;stream&lt;/jsm&gt;(&lt;jv&gt;array&lt;/jv&gt;).forEach(System.&lt;jk&gt;out&lt;/jk&gt;::println);</em>
 <a class="jxr_linenumber" name="L1922" href="#L1922">1922</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1923" href="#L1923">1923</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L1924" href="#L1924">1924</a> <em class="jxr_javadoccomment">	 * Works on both object and primitive arrays.</em>
-<a class="jxr_linenumber" name="L1925" href="#L1925">1925</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1926" href="#L1926">1926</a> <em class="jxr_javadoccomment">	 * @param &lt;E&gt; The element type.</em>
-<a class="jxr_linenumber" name="L1927" href="#L1927">1927</a> <em class="jxr_javadoccomment">	 * @param c The collection to convert to an array.</em>
-<a class="jxr_linenumber" name="L1928" href="#L1928">1928</a> <em class="jxr_javadoccomment">	 * @param elementType The component type of the collection.</em>
-<a class="jxr_linenumber" name="L1929" href="#L1929">1929</a> <em class="jxr_javadoccomment">	 * @return A new array.</em>
+<a class="jxr_linenumber" name="L1923" href="#L1923">1923</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Handles null gracefully - returns empty stream&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L1924" href="#L1924">1924</a> <em class="jxr_javadoccomment">	 * 	&lt;jsm&gt;stream&lt;/jsm&gt;(&lt;jk&gt;null&lt;/jk&gt;).forEach(System.&lt;jk&gt;out&lt;/jk&gt;::println);  &lt;jc&gt;// Prints nothing&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L1925" href="#L1925">1925</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L1926" href="#L1926">1926</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1927" href="#L1927">1927</a> <em class="jxr_javadoccomment">	 * @param &lt;T&gt; The element type.</em>
+<a class="jxr_linenumber" name="L1928" href="#L1928">1928</a> <em class="jxr_javadoccomment">	 * @param array The array to stream. Can be &lt;jk&gt;null&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L1929" href="#L1929">1929</a> <em class="jxr_javadoccomment">	 * @return A stream of the array elements, or an empty stream if the array is &lt;jk&gt;null&lt;/jk&gt;.</em>
 <a class="jxr_linenumber" name="L1930" href="#L1930">1930</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1931" href="#L1931">1931</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;E&gt; Object toArray(Collection&lt;?&gt; c, Class&lt;E&gt; elementType) {
-<a class="jxr_linenumber" name="L1932" href="#L1932">1932</a> 		<strong class="jxr_keyword">var</strong> a = Array.newInstance(elementType, c.size());
-<a class="jxr_linenumber" name="L1933" href="#L1933">1933</a> 		Iterator&lt;?&gt; it = c.iterator();
-<a class="jxr_linenumber" name="L1934" href="#L1934">1934</a> 		<strong class="jxr_keyword">int</strong> i = 0;
-<a class="jxr_linenumber" name="L1935" href="#L1935">1935</a> 		<strong class="jxr_keyword">while</strong> (it.hasNext())
-<a class="jxr_linenumber" name="L1936" href="#L1936">1936</a> 			Array.set(a, i++, it.next());
-<a class="jxr_linenumber" name="L1937" href="#L1937">1937</a> 		<strong class="jxr_keyword">return</strong> a;
-<a class="jxr_linenumber" name="L1938" href="#L1938">1938</a> 	}
-<a class="jxr_linenumber" name="L1939" href="#L1939">1939</a> 
-<a class="jxr_linenumber" name="L1940" href="#L1940">1940</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1941" href="#L1941">1941</a> <em class="jxr_javadoccomment">	 * Creates an {@link ArrayList} copy from a collection.</em>
-<a class="jxr_linenumber" name="L1942" href="#L1942">1942</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1943" href="#L1943">1943</a> <em class="jxr_javadoccomment">	 * @param &lt;E&gt; The element type.</em>
-<a class="jxr_linenumber" name="L1944" href="#L1944">1944</a> <em class="jxr_javadoccomment">	 * @param value The collection to copy from.</em>
-<a class="jxr_linenumber" name="L1945" href="#L1945">1945</a> <em class="jxr_javadoccomment">	 * @return A new modifiable list.</em>
-<a class="jxr_linenumber" name="L1946" href="#L1946">1946</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1947" href="#L1947">1947</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;E&gt; ArrayList&lt;E&gt; toList(Collection&lt;E&gt; value) {
-<a class="jxr_linenumber" name="L1948" href="#L1948">1948</a> 		<strong class="jxr_keyword">return</strong> toList(value, false);
-<a class="jxr_linenumber" name="L1949" href="#L1949">1949</a> 	}
-<a class="jxr_linenumber" name="L1950" href="#L1950">1950</a> 
-<a class="jxr_linenumber" name="L1951" href="#L1951">1951</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1952" href="#L1952">1952</a> <em class="jxr_javadoccomment">	 * Creates an {@link ArrayList} copy from a collection.</em>
-<a class="jxr_linenumber" name="L1953" href="#L1953">1953</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1954" href="#L1954">1954</a> <em class="jxr_javadoccomment">	 * @param &lt;E&gt; The element type.</em>
-<a class="jxr_linenumber" name="L1955" href="#L1955">1955</a> <em class="jxr_javadoccomment">	 * @param value The collection to copy from.</em>
-<a class="jxr_linenumber" name="L1956" href="#L1956">1956</a> <em class="jxr_javadoccomment">	 * @param nullIfEmpty If &lt;jk&gt;true&lt;/jk&gt; will return &lt;jk&gt;null&lt;/jk&gt; if the collection is empty.</em>
-<a class="jxr_linenumber" name="L1957" href="#L1957">1957</a> <em class="jxr_javadoccomment">	 * @return A new modifiable list.</em>
-<a class="jxr_linenumber" name="L1958" href="#L1958">1958</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1959" href="#L1959">1959</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;E&gt; ArrayList&lt;E&gt; toList(Collection&lt;E&gt; value, <strong class="jxr_keyword">boolean</strong> nullIfEmpty) {
-<a class="jxr_linenumber" name="L1960" href="#L1960">1960</a> 		<strong class="jxr_keyword">if</strong> (value == <strong class="jxr_keyword">null</strong> || (nullIfEmpty &amp;&amp; value.isEmpty()))
-<a class="jxr_linenumber" name="L1961" href="#L1961">1961</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L1962" href="#L1962">1962</a> 		<strong class="jxr_keyword">var</strong> l = <strong class="jxr_keyword">new</strong> ArrayList&lt;E&gt;();
-<a class="jxr_linenumber" name="L1963" href="#L1963">1963</a> 		value.forEach(x -&gt; l.add(x));
-<a class="jxr_linenumber" name="L1964" href="#L1964">1964</a> 		<strong class="jxr_keyword">return</strong> l;
-<a class="jxr_linenumber" name="L1965" href="#L1965">1965</a> 	}
-<a class="jxr_linenumber" name="L1966" href="#L1966">1966</a> 
-<a class="jxr_linenumber" name="L1967" href="#L1967">1967</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1968" href="#L1968">1968</a> <em class="jxr_javadoccomment">	 * Converts various collection-like objects to a {@link List}.</em>
-<a class="jxr_linenumber" name="L1969" href="#L1969">1969</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1970" href="#L1970">1970</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;This utility method enables testing of any collection-like object by converting it to a List that can be</em>
-<a class="jxr_linenumber" name="L1971" href="#L1971">1971</a> <em class="jxr_javadoccomment">	 * passed to methods such as TestUtils.assertList().&lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L1972" href="#L1972">1972</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1973" href="#L1973">1973</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Supported Input Types:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L1974" href="#L1974">1974</a> <em class="jxr_javadoccomment">	 * &lt;ul&gt;</em>
-<a class="jxr_linenumber" name="L1975" href="#L1975">1975</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;&lt;b&gt;List:&lt;/b&gt; Returns the input unchanged&lt;/li&gt;</em>
-<a class="jxr_linenumber" name="L1976" href="#L1976">1976</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;&lt;b&gt;Iterable:&lt;/b&gt; Any collection, set, queue, etc. (converted to List preserving order)&lt;/li&gt;</em>
-<a class="jxr_linenumber" name="L1977" href="#L1977">1977</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;&lt;b&gt;Iterator:&lt;/b&gt; Converts iterator contents to List&lt;/li&gt;</em>
-<a class="jxr_linenumber" name="L1978" href="#L1978">1978</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;&lt;b&gt;Enumeration:&lt;/b&gt; Converts enumeration contents to List&lt;/li&gt;</em>
-<a class="jxr_linenumber" name="L1979" href="#L1979">1979</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;&lt;b&gt;Stream:&lt;/b&gt; Converts stream contents to List (stream is consumed)&lt;/li&gt;</em>
-<a class="jxr_linenumber" name="L1980" href="#L1980">1980</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;&lt;b&gt;Map:&lt;/b&gt; Converts map entries to List of Map.Entry objects&lt;/li&gt;</em>
-<a class="jxr_linenumber" name="L1981" href="#L1981">1981</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;&lt;b&gt;Array:&lt;/b&gt; Converts any array type (including primitive arrays) to List&lt;/li&gt;</em>
-<a class="jxr_linenumber" name="L1982" href="#L1982">1982</a> <em class="jxr_javadoccomment">	 * &lt;/ul&gt;</em>
-<a class="jxr_linenumber" name="L1983" href="#L1983">1983</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1984" href="#L1984">1984</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Usage Examples:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L1985" href="#L1985">1985</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L1986" href="#L1986">1986</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Test a Set&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L1987" href="#L1987">1987</a> <em class="jxr_javadoccomment">	 * 	Set&amp;lt;String&amp;gt; &lt;jv&gt;mySet&lt;/jv&gt; = Set.of(&lt;js&gt;"a"&lt;/js&gt;, &lt;js&gt;"b"&lt;/js&gt;, &lt;js&gt;"c"&lt;/js&gt;);</em>
-<a class="jxr_linenumber" name="L1988" href="#L1988">1988</a> <em class="jxr_javadoccomment">	 * 	assertList(toList(&lt;jv&gt;mySet&lt;/jv&gt;), &lt;js&gt;"a"&lt;/js&gt;, &lt;js&gt;"b"&lt;/js&gt;, &lt;js&gt;"c"&lt;/js&gt;);</em>
-<a class="jxr_linenumber" name="L1989" href="#L1989">1989</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1990" href="#L1990">1990</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Test an array&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L1991" href="#L1991">1991</a> <em class="jxr_javadoccomment">	 * 	String[] &lt;jv&gt;myArray&lt;/jv&gt; = {&lt;js&gt;"x"&lt;/js&gt;, &lt;js&gt;"y"&lt;/js&gt;, &lt;js&gt;"z"&lt;/js&gt;};</em>
-<a class="jxr_linenumber" name="L1992" href="#L1992">1992</a> <em class="jxr_javadoccomment">	 * 	assertList(toList(&lt;jv&gt;myArray&lt;/jv&gt;), &lt;js&gt;"x"&lt;/js&gt;, &lt;js&gt;"y"&lt;/js&gt;, &lt;js&gt;"z"&lt;/js&gt;);</em>
-<a class="jxr_linenumber" name="L1993" href="#L1993">1993</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1994" href="#L1994">1994</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Test a primitive array&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L1995" href="#L1995">1995</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;int&lt;/jk&gt;[] &lt;jv&gt;numbers&lt;/jv&gt; = {1, 2, 3};</em>
-<a class="jxr_linenumber" name="L1996" href="#L1996">1996</a> <em class="jxr_javadoccomment">	 * 	assertList(toList(&lt;jv&gt;numbers&lt;/jv&gt;), &lt;js&gt;"1"&lt;/js&gt;, &lt;js&gt;"2"&lt;/js&gt;, &lt;js&gt;"3"&lt;/js&gt;);</em>
-<a class="jxr_linenumber" name="L1997" href="#L1997">1997</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1998" href="#L1998">1998</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Test a Stream&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L1999" href="#L1999">1999</a> <em class="jxr_javadoccomment">	 * 	Stream&amp;lt;String&amp;gt; &lt;jv&gt;myStream&lt;/jv&gt; = Stream.of(&lt;js&gt;"foo"&lt;/js&gt;, &lt;js&gt;"bar"&lt;/js&gt;);</em>
-<a class="jxr_linenumber" name="L2000" href="#L2000">2000</a> <em class="jxr_javadoccomment">	 * 	assertList(toList(&lt;jv&gt;myStream&lt;/jv&gt;), &lt;js&gt;"foo"&lt;/js&gt;, &lt;js&gt;"bar"&lt;/js&gt;);</em>
-<a class="jxr_linenumber" name="L2001" href="#L2001">2001</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L2002" href="#L2002">2002</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Test a Map (converted to entries)&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L2003" href="#L2003">2003</a> <em class="jxr_javadoccomment">	 * 	Map&amp;lt;String,Integer&amp;gt; &lt;jv&gt;myMap&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="L2004" href="#L2004">2004</a> <em class="jxr_javadoccomment">	 * 	assertList(toList(&lt;jv&gt;myMap&lt;/jv&gt;), &lt;js&gt;"a=1"&lt;/js&gt;, &lt;js&gt;"b=2"&lt;/js&gt;);</em>
-<a class="jxr_linenumber" name="L2005" href="#L2005">2005</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L2006" href="#L2006">2006</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Test any Iterable collection&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L2007" href="#L2007">2007</a> <em class="jxr_javadoccomment">	 * 	Queue&amp;lt;String&amp;gt; &lt;jv&gt;myQueue&lt;/jv&gt; = new LinkedList&amp;lt;&amp;gt;(List.of(&lt;js&gt;"first"&lt;/js&gt;, &lt;js&gt;"second"&lt;/js&gt;));</em>
-<a class="jxr_linenumber" name="L2008" href="#L2008">2008</a> <em class="jxr_javadoccomment">	 * 	assertList(toList(&lt;jv&gt;myQueue&lt;/jv&gt;), &lt;js&gt;"first"&lt;/js&gt;, &lt;js&gt;"second"&lt;/js&gt;);</em>
-<a class="jxr_linenumber" name="L2009" href="#L2009">2009</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L2010" href="#L2010">2010</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L2011" href="#L2011">2011</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Integration with Testing:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L2012" href="#L2012">2012</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;This method is specifically designed to work with testing frameworks to provide</em>
-<a class="jxr_linenumber" name="L2013" href="#L2013">2013</a> <em class="jxr_javadoccomment">	 * a unified testing approach for all collection-like types. Instead of having separate assertion methods</em>
-<a class="jxr_linenumber" name="L2014" href="#L2014">2014</a> <em class="jxr_javadoccomment">	 * for arrays, sets, and other collections, you can convert them all to Lists and use standard</em>
-<a class="jxr_linenumber" name="L2015" href="#L2015">2015</a> <em class="jxr_javadoccomment">	 * list assertion methods.&lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L2016" href="#L2016">2016</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L2017" href="#L2017">2017</a> <em class="jxr_javadoccomment">	 * @param o The object to convert to a List. Must not be null and must be a supported collection-like type.</em>
-<a class="jxr_linenumber" name="L2018" href="#L2018">2018</a> <em class="jxr_javadoccomment">	 * @return A {@link List} containing the elements from the input object.</em>
-<a class="jxr_linenumber" name="L2019" href="#L2019">2019</a> <em class="jxr_javadoccomment">	 * @throws IllegalArgumentException if the input object cannot be converted to a List.</em>
-<a class="jxr_linenumber" name="L2020" href="#L2020">2020</a> <em class="jxr_javadoccomment">	 * @see arrayToList</em>
-<a class="jxr_linenumber" name="L2021" href="#L2021">2021</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L2022" href="#L2022">2022</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> List&lt;?&gt; toList(Object o) {  <em class="jxr_comment">// NOSONAR</em>
-<a class="jxr_linenumber" name="L2023" href="#L2023">2023</a> 		assertArgNotNull(<span class="jxr_string">"o"</span>, o);
-<a class="jxr_linenumber" name="L2024" href="#L2024">2024</a> 		<strong class="jxr_keyword">if</strong> (o instanceof List&lt;?&gt; o2)
-<a class="jxr_linenumber" name="L2025" href="#L2025">2025</a> 			<strong class="jxr_keyword">return</strong> o2;
-<a class="jxr_linenumber" name="L2026" href="#L2026">2026</a> 		<strong class="jxr_keyword">if</strong> (o instanceof Iterable&lt;?&gt; o2)
-<a class="jxr_linenumber" name="L2027" href="#L2027">2027</a> 			<strong class="jxr_keyword">return</strong> StreamSupport.stream(o2.spliterator(), false).toList();
-<a class="jxr_linenumber" name="L2028" href="#L2028">2028</a> 		<strong class="jxr_keyword">if</strong> (o instanceof Iterator&lt;?&gt; o2)
-<a class="jxr_linenumber" name="L2029" href="#L2029">2029</a> 			<strong class="jxr_keyword">return</strong> StreamSupport.stream(Spliterators.spliteratorUnknownSize(o2, 0), false).toList();
-<a class="jxr_linenumber" name="L2030" href="#L2030">2030</a> 		<strong class="jxr_keyword">if</strong> (o instanceof Enumeration&lt;?&gt; o2)
-<a class="jxr_linenumber" name="L2031" href="#L2031">2031</a> 			<strong class="jxr_keyword">return</strong> Collections.list(o2);
-<a class="jxr_linenumber" name="L2032" href="#L2032">2032</a> 		<strong class="jxr_keyword">if</strong> (o instanceof Stream&lt;?&gt; o2)
-<a class="jxr_linenumber" name="L2033" href="#L2033">2033</a> 			<strong class="jxr_keyword">return</strong> o2.toList();
-<a class="jxr_linenumber" name="L2034" href="#L2034">2034</a> 		<strong class="jxr_keyword">if</strong> (o instanceof Map&lt;?,?&gt; o2)
-<a class="jxr_linenumber" name="L2035" href="#L2035">2035</a> 			<strong class="jxr_keyword">return</strong> toList(o2.entrySet());
-<a class="jxr_linenumber" name="L2036" href="#L2036">2036</a> 		<strong class="jxr_keyword">if</strong> (o instanceof Optional&lt;?&gt; o2)
-<a class="jxr_linenumber" name="L2037" href="#L2037">2037</a> 			<strong class="jxr_keyword">return</strong> o2.isEmpty() ? Collections.emptyList() : Collections.singletonList(o2.get());
-<a class="jxr_linenumber" name="L2038" href="#L2038">2038</a> 		<strong class="jxr_keyword">if</strong> (isArray(o))
-<a class="jxr_linenumber" name="L2039" href="#L2039">2039</a> 			<strong class="jxr_keyword">return</strong> arrayToList(o);
-<a class="jxr_linenumber" name="L2040" href="#L2040">2040</a> 		<strong class="jxr_keyword">throw</strong> rex(<span class="jxr_string">"Could not convert object of type {0} to a list"</span>, cn(o));
-<a class="jxr_linenumber" name="L2041" href="#L2041">2041</a> 	}
-<a class="jxr_linenumber" name="L2042" href="#L2042">2042</a> 
-<a class="jxr_linenumber" name="L2043" href="#L2043">2043</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L2044" href="#L2044">2044</a> <em class="jxr_javadoccomment">	 * Converts the specified array to an &lt;c&gt;ArrayList&lt;/c&gt;</em>
-<a class="jxr_linenumber" name="L2045" href="#L2045">2045</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L2046" href="#L2046">2046</a> <em class="jxr_javadoccomment">	 * @param &lt;E&gt; The element type.</em>
-<a class="jxr_linenumber" name="L2047" href="#L2047">2047</a> <em class="jxr_javadoccomment">	 * @param array The array to convert.</em>
-<a class="jxr_linenumber" name="L2048" href="#L2048">2048</a> <em class="jxr_javadoccomment">	 * @param elementType</em>
-<a class="jxr_linenumber" name="L2049" href="#L2049">2049</a> <em class="jxr_javadoccomment">	 * 	The type of objects in the array.</em>
-<a class="jxr_linenumber" name="L2050" href="#L2050">2050</a> <em class="jxr_javadoccomment">	 * 	It must match the actual component type in the array.</em>
-<a class="jxr_linenumber" name="L2051" href="#L2051">2051</a> <em class="jxr_javadoccomment">	 * @return A new {@link ArrayList}</em>
-<a class="jxr_linenumber" name="L2052" href="#L2052">2052</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L2053" href="#L2053">2053</a> 	@SuppressWarnings(<span class="jxr_string">"unchecked"</span>)
-<a class="jxr_linenumber" name="L2054" href="#L2054">2054</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;E&gt; List&lt;E&gt; toList(Object array, Class&lt;E&gt; elementType) {
-<a class="jxr_linenumber" name="L2055" href="#L2055">2055</a> 		<strong class="jxr_keyword">var</strong> l = <strong class="jxr_keyword">new</strong> ArrayList&lt;E&gt;(Array.getLength(array));
-<a class="jxr_linenumber" name="L2056" href="#L2056">2056</a> 		<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> i = 0; i &lt; Array.getLength(array); i++)
-<a class="jxr_linenumber" name="L2057" href="#L2057">2057</a> 			l.add((E)Array.get(array, i));
-<a class="jxr_linenumber" name="L2058" href="#L2058">2058</a> 		<strong class="jxr_keyword">return</strong> l;
-<a class="jxr_linenumber" name="L2059" href="#L2059">2059</a> 	}
-<a class="jxr_linenumber" name="L2060" href="#L2060">2060</a> 
-<a class="jxr_linenumber" name="L2061" href="#L2061">2061</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L2062" href="#L2062">2062</a> <em class="jxr_javadoccomment">	 * Recursively converts the specified array into a list of objects.</em>
-<a class="jxr_linenumber" name="L2063" href="#L2063">2063</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L2064" href="#L2064">2064</a> <em class="jxr_javadoccomment">	 * @param array The array to convert.</em>
-<a class="jxr_linenumber" name="L2065" href="#L2065">2065</a> <em class="jxr_javadoccomment">	 * @return A new {@link ArrayList}</em>
-<a class="jxr_linenumber" name="L2066" href="#L2066">2066</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L2067" href="#L2067">2067</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> List&lt;Object&gt; toObjectList(Object array) {
-<a class="jxr_linenumber" name="L2068" href="#L2068">2068</a> 		<strong class="jxr_keyword">var</strong> l = <strong class="jxr_keyword">new</strong> ArrayList&lt;&gt;(Array.getLength(array));
-<a class="jxr_linenumber" name="L2069" href="#L2069">2069</a> 		<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> i = 0; i &lt; Array.getLength(array); i++) {
-<a class="jxr_linenumber" name="L2070" href="#L2070">2070</a> 			<strong class="jxr_keyword">var</strong> o = Array.get(array, i);
-<a class="jxr_linenumber" name="L2071" href="#L2071">2071</a> 			<strong class="jxr_keyword">if</strong> (isArray(o))
-<a class="jxr_linenumber" name="L2072" href="#L2072">2072</a> 				o = toObjectList(o);
-<a class="jxr_linenumber" name="L2073" href="#L2073">2073</a> 			l.add(o);
-<a class="jxr_linenumber" name="L2074" href="#L2074">2074</a> 		}
-<a class="jxr_linenumber" name="L2075" href="#L2075">2075</a> 		<strong class="jxr_keyword">return</strong> l;
-<a class="jxr_linenumber" name="L2076" href="#L2076">2076</a> 	}
-<a class="jxr_linenumber" name="L2077" href="#L2077">2077</a> 
-<a class="jxr_linenumber" name="L2078" href="#L2078">2078</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L2079" href="#L2079">2079</a> <em class="jxr_javadoccomment">	 * Creates a new set from the specified collection.</em>
-<a class="jxr_linenumber" name="L2080" href="#L2080">2080</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L2081" href="#L2081">2081</a> <em class="jxr_javadoccomment">	 * @param &lt;E&gt; The element type.</em>
-<a class="jxr_linenumber" name="L2082" href="#L2082">2082</a> <em class="jxr_javadoccomment">	 * @param val The value to copy from.</em>
-<a class="jxr_linenumber" name="L2083" href="#L2083">2083</a> <em class="jxr_javadoccomment">	 * @return A new {@link LinkedHashSet}, or &lt;jk&gt;null&lt;/jk&gt; if the input was null.</em>
-<a class="jxr_linenumber" name="L2084" href="#L2084">2084</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L2085" href="#L2085">2085</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;E&gt; Set&lt;E&gt; toSet(Collection&lt;E&gt; val) {
-<a class="jxr_linenumber" name="L2086" href="#L2086">2086</a> 		<strong class="jxr_keyword">return</strong> val == <strong class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">null</strong> : <strong class="jxr_keyword">new</strong> LinkedHashSet&lt;&gt;(val);
-<a class="jxr_linenumber" name="L2087" href="#L2087">2087</a> 	}
-<a class="jxr_linenumber" name="L2088" href="#L2088">2088</a> 
-<a class="jxr_linenumber" name="L2089" href="#L2089">2089</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L2090" href="#L2090">2090</a> <em class="jxr_javadoccomment">	 * Converts the specified array to a &lt;c&gt;Set&lt;/c&gt;.</em>
-<a class="jxr_linenumber" name="L2091" href="#L2091">2091</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L2092" href="#L2092">2092</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L2093" href="#L2093">2093</a> <em class="jxr_javadoccomment">	 * The order of the entries in the set are the same as the array.</em>
+<a class="jxr_linenumber" name="L1931" href="#L1931">1931</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;T&gt; Stream&lt;T&gt; stream(T[] array) {
+<a class="jxr_linenumber" name="L1932" href="#L1932">1932</a> 		<strong class="jxr_keyword">return</strong> array == <strong class="jxr_keyword">null</strong> ? Stream.empty() : Arrays.stream(array);
+<a class="jxr_linenumber" name="L1933" href="#L1933">1933</a> 	}
+<a class="jxr_linenumber" name="L1934" href="#L1934">1934</a> 
+<a class="jxr_linenumber" name="L1935" href="#L1935">1935</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1936" href="#L1936">1936</a> <em class="jxr_javadoccomment">	 * Wraps the specified list in {@link Collections#unmodifiableList(List)}.</em>
+<a class="jxr_linenumber" name="L1937" href="#L1937">1937</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1938" href="#L1938">1938</a> <em class="jxr_javadoccomment">	 * @param &lt;E&gt; The element type.</em>
+<a class="jxr_linenumber" name="L1939" href="#L1939">1939</a> <em class="jxr_javadoccomment">	 * @param value The list to wrap.</em>
+<a class="jxr_linenumber" name="L1940" href="#L1940">1940</a> <em class="jxr_javadoccomment">	 * @return The wrapped list.</em>
+<a class="jxr_linenumber" name="L1941" href="#L1941">1941</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L1942" href="#L1942">1942</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;E&gt; List&lt;E&gt; synced(List&lt;E&gt; value) {
+<a class="jxr_linenumber" name="L1943" href="#L1943">1943</a> 		<strong class="jxr_keyword">return</strong> value == <strong class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">null</strong> : Collections.synchronizedList(value);
+<a class="jxr_linenumber" name="L1944" href="#L1944">1944</a> 	}
+<a class="jxr_linenumber" name="L1945" href="#L1945">1945</a> 
+<a class="jxr_linenumber" name="L1946" href="#L1946">1946</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1947" href="#L1947">1947</a> <em class="jxr_javadoccomment">	 * Wraps the specified map in {@link Collections#unmodifiableMap(Map)}.</em>
+<a class="jxr_linenumber" name="L1948" href="#L1948">1948</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1949" href="#L1949">1949</a> <em class="jxr_javadoccomment">	 * @param &lt;K&gt; The key type.</em>
+<a class="jxr_linenumber" name="L1950" href="#L1950">1950</a> <em class="jxr_javadoccomment">	 * @param &lt;V&gt; The value type.</em>
+<a class="jxr_linenumber" name="L1951" href="#L1951">1951</a> <em class="jxr_javadoccomment">	 * @param value The map to wrap.</em>
+<a class="jxr_linenumber" name="L1952" href="#L1952">1952</a> <em class="jxr_javadoccomment">	 * @return The wrapped map.</em>
+<a class="jxr_linenumber" name="L1953" href="#L1953">1953</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L1954" href="#L1954">1954</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;K,V&gt; Map&lt;K,V&gt; synced(Map&lt;K,V&gt; value) {
+<a class="jxr_linenumber" name="L1955" href="#L1955">1955</a> 		<strong class="jxr_keyword">return</strong> value == <strong class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">null</strong> : Collections.synchronizedMap(value);
+<a class="jxr_linenumber" name="L1956" href="#L1956">1956</a> 	}
+<a class="jxr_linenumber" name="L1957" href="#L1957">1957</a> 
+<a class="jxr_linenumber" name="L1958" href="#L1958">1958</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1959" href="#L1959">1959</a> <em class="jxr_javadoccomment">	 * Wraps the specified set in {@link Collections#unmodifiableSet(Set)}.</em>
+<a class="jxr_linenumber" name="L1960" href="#L1960">1960</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1961" href="#L1961">1961</a> <em class="jxr_javadoccomment">	 * @param &lt;E&gt; The element type.</em>
+<a class="jxr_linenumber" name="L1962" href="#L1962">1962</a> <em class="jxr_javadoccomment">	 * @param value The set to wrap.</em>
+<a class="jxr_linenumber" name="L1963" href="#L1963">1963</a> <em class="jxr_javadoccomment">	 * @return The wrapped set.</em>
+<a class="jxr_linenumber" name="L1964" href="#L1964">1964</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L1965" href="#L1965">1965</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;E&gt; Set&lt;E&gt; synced(Set&lt;E&gt; value) {
+<a class="jxr_linenumber" name="L1966" href="#L1966">1966</a> 		<strong class="jxr_keyword">return</strong> value == <strong class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">null</strong> : Collections.synchronizedSet(value);
+<a class="jxr_linenumber" name="L1967" href="#L1967">1967</a> 	}
+<a class="jxr_linenumber" name="L1968" href="#L1968">1968</a> 
+<a class="jxr_linenumber" name="L1969" href="#L1969">1969</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1970" href="#L1970">1970</a> <em class="jxr_javadoccomment">	 * Converts the specified collection to an array.</em>
+<a class="jxr_linenumber" name="L1971" href="#L1971">1971</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1972" href="#L1972">1972</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L1973" href="#L1973">1973</a> <em class="jxr_javadoccomment">	 * Works on both object and primitive arrays.</em>
+<a class="jxr_linenumber" name="L1974" href="#L1974">1974</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1975" href="#L1975">1975</a> <em class="jxr_javadoccomment">	 * @param &lt;E&gt; The element type.</em>
+<a class="jxr_linenumber" name="L1976" href="#L1976">1976</a> <em class="jxr_javadoccomment">	 * @param c The collection to convert to an array.</em>
+<a class="jxr_linenumber" name="L1977" href="#L1977">1977</a> <em class="jxr_javadoccomment">	 * @param elementType The component type of the collection.</em>
+<a class="jxr_linenumber" name="L1978" href="#L1978">1978</a> <em class="jxr_javadoccomment">	 * @return A new array.</em>
+<a class="jxr_linenumber" name="L1979" href="#L1979">1979</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L1980" href="#L1980">1980</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;E&gt; Object toArray(Collection&lt;?&gt; c, Class&lt;E&gt; elementType) {
+<a class="jxr_linenumber" name="L1981" href="#L1981">1981</a> 		<strong class="jxr_keyword">var</strong> a = Array.newInstance(elementType, c.size());
+<a class="jxr_linenumber" name="L1982" href="#L1982">1982</a> 		Iterator&lt;?&gt; it = c.iterator();
+<a class="jxr_linenumber" name="L1983" href="#L1983">1983</a> 		<strong class="jxr_keyword">int</strong> i = 0;
+<a class="jxr_linenumber" name="L1984" href="#L1984">1984</a> 		<strong class="jxr_keyword">while</strong> (it.hasNext())
+<a class="jxr_linenumber" name="L1985" href="#L1985">1985</a> 			Array.set(a, i++, it.next());
+<a class="jxr_linenumber" name="L1986" href="#L1986">1986</a> 		<strong class="jxr_keyword">return</strong> a;
+<a class="jxr_linenumber" name="L1987" href="#L1987">1987</a> 	}
+<a class="jxr_linenumber" name="L1988" href="#L1988">1988</a> 
+<a class="jxr_linenumber" name="L1989" href="#L1989">1989</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1990" href="#L1990">1990</a> <em class="jxr_javadoccomment">	 * Creates an {@link ArrayList} copy from a collection.</em>
+<a class="jxr_linenumber" name="L1991" href="#L1991">1991</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1992" href="#L1992">1992</a> <em class="jxr_javadoccomment">	 * @param &lt;E&gt; The element type.</em>
+<a class="jxr_linenumber" name="L1993" href="#L1993">1993</a> <em class="jxr_javadoccomment">	 * @param value The collection to copy from.</em>
+<a class="jxr_linenumber" name="L1994" href="#L1994">1994</a> <em class="jxr_javadoccomment">	 * @return A new modifiable list.</em>
+<a class="jxr_linenumber" name="L1995" href="#L1995">1995</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L1996" href="#L1996">1996</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;E&gt; ArrayList&lt;E&gt; toList(Collection&lt;E&gt; value) {
+<a class="jxr_linenumber" name="L1997" href="#L1997">1997</a> 		<strong class="jxr_keyword">return</strong> toList(value, false);
+<a class="jxr_linenumber" name="L1998" href="#L1998">1998</a> 	}
+<a class="jxr_linenumber" name="L1999" href="#L1999">1999</a> 
+<a class="jxr_linenumber" name="L2000" href="#L2000">2000</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L2001" href="#L2001">2001</a> <em class="jxr_javadoccomment">	 * Creates an {@link ArrayList} copy from a collection.</em>
+<a class="jxr_linenumber" name="L2002" href="#L2002">2002</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L2003" href="#L2003">2003</a> <em class="jxr_javadoccomment">	 * @param &lt;E&gt; The element type.</em>
+<a class="jxr_linenumber" name="L2004" href="#L2004">2004</a> <em class="jxr_javadoccomment">	 * @param value The collection to copy from.</em>
+<a class="jxr_linenumber" name="L2005" href="#L2005">2005</a> <em class="jxr_javadoccomment">	 * @param nullIfEmpty If &lt;jk&gt;true&lt;/jk&gt; will return &lt;jk&gt;null&lt;/jk&gt; if the collection is empty.</em>
+<a class="jxr_linenumber" name="L2006" href="#L2006">2006</a> <em class="jxr_javadoccomment">	 * @return A new modifiable list.</em>
+<a class="jxr_linenumber" name="L2007" href="#L2007">2007</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L2008" href="#L2008">2008</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;E&gt; ArrayList&lt;E&gt; toList(Collection&lt;E&gt; value, <strong class="jxr_keyword">boolean</strong> nullIfEmpty) {
+<a class="jxr_linenumber" name="L2009" href="#L2009">2009</a> 		<strong class="jxr_keyword">if</strong> (value == <strong class="jxr_keyword">null</strong> || (nullIfEmpty &amp;&amp; value.isEmpty()))
+<a class="jxr_linenumber" name="L2010" href="#L2010">2010</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L2011" href="#L2011">2011</a> 		<strong class="jxr_keyword">var</strong> l = <strong class="jxr_keyword">new</strong> ArrayList&lt;E&gt;();
+<a class="jxr_linenumber" name="L2012" href="#L2012">2012</a> 		value.forEach(x -&gt; l.add(x));
+<a class="jxr_linenumber" name="L2013" href="#L2013">2013</a> 		<strong class="jxr_keyword">return</strong> l;
+<a class="jxr_linenumber" name="L2014" href="#L2014">2014</a> 	}
+<a class="jxr_linenumber" name="L2015" href="#L2015">2015</a> 
+<a class="jxr_linenumber" name="L2016" href="#L2016">2016</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L2017" href="#L2017">2017</a> <em class="jxr_javadoccomment">	 * Converts various collection-like objects to a {@link List}.</em>
+<a class="jxr_linenumber" name="L2018" href="#L2018">2018</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L2019" href="#L2019">2019</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;This utility method enables testing of any collection-like object by converting it to a List that can be</em>
+<a class="jxr_linenumber" name="L2020" href="#L2020">2020</a> <em class="jxr_javadoccomment">	 * passed to methods such as TestUtils.assertList().&lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L2021" href="#L2021">2021</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L2022" href="#L2022">2022</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Supported Input Types:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L2023" href="#L2023">2023</a> <em class="jxr_javadoccomment">	 * &lt;ul&gt;</em>
+<a class="jxr_linenumber" name="L2024" href="#L2024">2024</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;&lt;b&gt;List:&lt;/b&gt; Returns the input unchanged&lt;/li&gt;</em>
+<a class="jxr_linenumber" name="L2025" href="#L2025">2025</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;&lt;b&gt;Iterable:&lt;/b&gt; Any collection, set, queue, etc. (converted to List preserving order)&lt;/li&gt;</em>
+<a class="jxr_linenumber" name="L2026" href="#L2026">2026</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;&lt;b&gt;Iterator:&lt;/b&gt; Converts iterator contents to List&lt;/li&gt;</em>
+<a class="jxr_linenumber" name="L2027" href="#L2027">2027</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;&lt;b&gt;Enumeration:&lt;/b&gt; Converts enumeration contents to List&lt;/li&gt;</em>
+<a class="jxr_linenumber" name="L2028" href="#L2028">2028</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;&lt;b&gt;Stream:&lt;/b&gt; Converts stream contents to List (stream is consumed)&lt;/li&gt;</em>
+<a class="jxr_linenumber" name="L2029" href="#L2029">2029</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;&lt;b&gt;Map:&lt;/b&gt; Converts map entries to List of Map.Entry objects&lt;/li&gt;</em>
+<a class="jxr_linenumber" name="L2030" href="#L2030">2030</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;&lt;b&gt;Array:&lt;/b&gt; Converts any array type (including primitive arrays) to List&lt;/li&gt;</em>
+<a class="jxr_linenumber" name="L2031" href="#L2031">2031</a> <em class="jxr_javadoccomment">	 * &lt;/ul&gt;</em>
+<a class="jxr_linenumber" name="L2032" href="#L2032">2032</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L2033" href="#L2033">2033</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Usage Examples:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L2034" href="#L2034">2034</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L2035" href="#L2035">2035</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Test a Set&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L2036" href="#L2036">2036</a> <em class="jxr_javadoccomment">	 * 	Set&amp;lt;String&amp;gt; &lt;jv&gt;mySet&lt;/jv&gt; = Set.of(&lt;js&gt;"a"&lt;/js&gt;, &lt;js&gt;"b"&lt;/js&gt;, &lt;js&gt;"c"&lt;/js&gt;);</em>
+<a class="jxr_linenumber" name="L2037" href="#L2037">2037</a> <em class="jxr_javadoccomment">	 * 	assertList(toList(&lt;jv&gt;mySet&lt;/jv&gt;), &lt;js&gt;"a"&lt;/js&gt;, &lt;js&gt;"b"&lt;/js&gt;, &lt;js&gt;"c"&lt;/js&gt;);</em>
+<a class="jxr_linenumber" name="L2038" href="#L2038">2038</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L2039" href="#L2039">2039</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Test an array&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L2040" href="#L2040">2040</a> <em class="jxr_javadoccomment">	 * 	String[] &lt;jv&gt;myArray&lt;/jv&gt; = {&lt;js&gt;"x"&lt;/js&gt;, &lt;js&gt;"y"&lt;/js&gt;, &lt;js&gt;"z"&lt;/js&gt;};</em>
+<a class="jxr_linenumber" name="L2041" href="#L2041">2041</a> <em class="jxr_javadoccomment">	 * 	assertList(toList(&lt;jv&gt;myArray&lt;/jv&gt;), &lt;js&gt;"x"&lt;/js&gt;, &lt;js&gt;"y"&lt;/js&gt;, &lt;js&gt;"z"&lt;/js&gt;);</em>
+<a class="jxr_linenumber" name="L2042" href="#L2042">2042</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L2043" href="#L2043">2043</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Test a primitive array&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L2044" href="#L2044">2044</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;int&lt;/jk&gt;[] &lt;jv&gt;numbers&lt;/jv&gt; = {1, 2, 3};</em>
+<a class="jxr_linenumber" name="L2045" href="#L2045">2045</a> <em class="jxr_javadoccomment">	 * 	assertList(toList(&lt;jv&gt;numbers&lt;/jv&gt;), &lt;js&gt;"1"&lt;/js&gt;, &lt;js&gt;"2"&lt;/js&gt;, &lt;js&gt;"3"&lt;/js&gt;);</em>
+<a class="jxr_linenumber" name="L2046" href="#L2046">2046</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L2047" href="#L2047">2047</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Test a Stream&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L2048" href="#L2048">2048</a> <em class="jxr_javadoccomment">	 * 	Stream&amp;lt;String&amp;gt; &lt;jv&gt;myStream&lt;/jv&gt; = Stream.of(&lt;js&gt;"foo"&lt;/js&gt;, &lt;js&gt;"bar"&lt;/js&gt;);</em>
+<a class="jxr_linenumber" name="L2049" href="#L2049">2049</a> <em class="jxr_javadoccomment">	 * 	assertList(toList(&lt;jv&gt;myStream&lt;/jv&gt;), &lt;js&gt;"foo"&lt;/js&gt;, &lt;js&gt;"bar"&lt;/js&gt;);</em>
+<a class="jxr_linenumber" name="L2050" href="#L2050">2050</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L2051" href="#L2051">2051</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Test a Map (converted to entries)&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L2052" href="#L2052">2052</a> <em class="jxr_javadoccomment">	 * 	Map&amp;lt;String,Integer&amp;gt; &lt;jv&gt;myMap&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="L2053" href="#L2053">2053</a> <em class="jxr_javadoccomment">	 * 	assertList(toList(&lt;jv&gt;myMap&lt;/jv&gt;), &lt;js&gt;"a=1"&lt;/js&gt;, &lt;js&gt;"b=2"&lt;/js&gt;);</em>
+<a class="jxr_linenumber" name="L2054" href="#L2054">2054</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L2055" href="#L2055">2055</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Test any Iterable collection&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L2056" href="#L2056">2056</a> <em class="jxr_javadoccomment">	 * 	Queue&amp;lt;String&amp;gt; &lt;jv&gt;myQueue&lt;/jv&gt; = new LinkedList&amp;lt;&amp;gt;(List.of(&lt;js&gt;"first"&lt;/js&gt;, &lt;js&gt;"second"&lt;/js&gt;));</em>
+<a class="jxr_linenumber" name="L2057" href="#L2057">2057</a> <em class="jxr_javadoccomment">	 * 	assertList(toList(&lt;jv&gt;myQueue&lt;/jv&gt;), &lt;js&gt;"first"&lt;/js&gt;, &lt;js&gt;"second"&lt;/js&gt;);</em>
+<a class="jxr_linenumber" name="L2058" href="#L2058">2058</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L2059" href="#L2059">2059</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L2060" href="#L2060">2060</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Integration with Testing:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L2061" href="#L2061">2061</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;This method is specifically designed to work with testing frameworks to provide</em>
+<a class="jxr_linenumber" name="L2062" href="#L2062">2062</a> <em class="jxr_javadoccomment">	 * a unified testing approach for all collection-like types. Instead of having separate assertion methods</em>
+<a class="jxr_linenumber" name="L2063" href="#L2063">2063</a> <em class="jxr_javadoccomment">	 * for arrays, sets, and other collections, you can convert them all to Lists and use standard</em>
+<a class="jxr_linenumber" name="L2064" href="#L2064">2064</a> <em class="jxr_javadoccomment">	 * list assertion methods.&lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L2065" href="#L2065">2065</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L2066" href="#L2066">2066</a> <em class="jxr_javadoccomment">	 * @param o The object to convert to a List. Must not be null and must be a supported collection-like type.</em>
+<a class="jxr_linenumber" name="L2067" href="#L2067">2067</a> <em class="jxr_javadoccomment">	 * @return A {@link List} containing the elements from the input object.</em>
+<a class="jxr_linenumber" name="L2068" href="#L2068">2068</a> <em class="jxr_javadoccomment">	 * @throws IllegalArgumentException if the input object cannot be converted to a List.</em>
+<a class="jxr_linenumber" name="L2069" href="#L2069">2069</a> <em class="jxr_javadoccomment">	 * @see arrayToList</em>
+<a class="jxr_linenumber" name="L2070" href="#L2070">2070</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L2071" href="#L2071">2071</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> List&lt;?&gt; toList(Object o) {  <em class="jxr_comment">// NOSONAR</em>
+<a class="jxr_linenumber" name="L2072" href="#L2072">2072</a> 		assertArgNotNull(<span class="jxr_string">"o"</span>, o);
+<a class="jxr_linenumber" name="L2073" href="#L2073">2073</a> 		<strong class="jxr_keyword">if</strong> (o instanceof List&lt;?&gt; o2)
+<a class="jxr_linenumber" name="L2074" href="#L2074">2074</a> 			<strong class="jxr_keyword">return</strong> o2;
+<a class="jxr_linenumber" name="L2075" href="#L2075">2075</a> 		<strong class="jxr_keyword">if</strong> (o instanceof Iterable&lt;?&gt; o2)
+<a class="jxr_linenumber" name="L2076" href="#L2076">2076</a> 			<strong class="jxr_keyword">return</strong> StreamSupport.stream(o2.spliterator(), false).toList();
+<a class="jxr_linenumber" name="L2077" href="#L2077">2077</a> 		<strong class="jxr_keyword">if</strong> (o instanceof Iterator&lt;?&gt; o2)
+<a class="jxr_linenumber" name="L2078" href="#L2078">2078</a> 			<strong class="jxr_keyword">return</strong> StreamSupport.stream(Spliterators.spliteratorUnknownSize(o2, 0), false).toList();
+<a class="jxr_linenumber" name="L2079" href="#L2079">2079</a> 		<strong class="jxr_keyword">if</strong> (o instanceof Enumeration&lt;?&gt; o2)
+<a class="jxr_linenumber" name="L2080" href="#L2080">2080</a> 			<strong class="jxr_keyword">return</strong> Collections.list(o2);
+<a class="jxr_linenumber" name="L2081" href="#L2081">2081</a> 		<strong class="jxr_keyword">if</strong> (o instanceof Stream&lt;?&gt; o2)
+<a class="jxr_linenumber" name="L2082" href="#L2082">2082</a> 			<strong class="jxr_keyword">return</strong> o2.toList();
+<a class="jxr_linenumber" name="L2083" href="#L2083">2083</a> 		<strong class="jxr_keyword">if</strong> (o instanceof Map&lt;?,?&gt; o2)
+<a class="jxr_linenumber" name="L2084" href="#L2084">2084</a> 			<strong class="jxr_keyword">return</strong> toList(o2.entrySet());
+<a class="jxr_linenumber" name="L2085" href="#L2085">2085</a> 		<strong class="jxr_keyword">if</strong> (o instanceof Optional&lt;?&gt; o2)
+<a class="jxr_linenumber" name="L2086" href="#L2086">2086</a> 			<strong class="jxr_keyword">return</strong> o2.isEmpty() ? Collections.emptyList() : Collections.singletonList(o2.get());
+<a class="jxr_linenumber" name="L2087" href="#L2087">2087</a> 		<strong class="jxr_keyword">if</strong> (isArray(o))
+<a class="jxr_linenumber" name="L2088" href="#L2088">2088</a> 			<strong class="jxr_keyword">return</strong> arrayToList(o);
+<a class="jxr_linenumber" name="L2089" href="#L2089">2089</a> 		<strong class="jxr_keyword">throw</strong> rex(<span class="jxr_string">"Could not convert object of type {0} to a list"</span>, cn(o));
+<a class="jxr_linenumber" name="L2090" href="#L2090">2090</a> 	}
+<a class="jxr_linenumber" name="L2091" href="#L2091">2091</a> 
+<a class="jxr_linenumber" name="L2092" href="#L2092">2092</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L2093" href="#L2093">2093</a> <em class="jxr_javadoccomment">	 * Converts the specified array to an &lt;c&gt;ArrayList&lt;/c&gt;</em>
 <a class="jxr_linenumber" name="L2094" href="#L2094">2094</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L2095" href="#L2095">2095</a> <em class="jxr_javadoccomment">	 * @param &lt;T&gt; The entry type of the array.</em>
-<a class="jxr_linenumber" name="L2096" href="#L2096">2096</a> <em class="jxr_javadoccomment">	 * @param array The array being wrapped in a &lt;c&gt;Set&lt;/c&gt; interface.</em>
-<a class="jxr_linenumber" name="L2097" href="#L2097">2097</a> <em class="jxr_javadoccomment">	 * @return The new set.</em>
-<a class="jxr_linenumber" name="L2098" href="#L2098">2098</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L2099" href="#L2099">2099</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;T&gt; Set&lt;T&gt; toSet(T[] array) {
-<a class="jxr_linenumber" name="L2100" href="#L2100">2100</a> 		assertArgNotNull(<span class="jxr_string">"array"</span>, array);
-<a class="jxr_linenumber" name="L2101" href="#L2101">2101</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> AbstractSet&lt;&gt;() {
-<a class="jxr_linenumber" name="L2102" href="#L2102">2102</a> 
-<a class="jxr_linenumber" name="L2103" href="#L2103">2103</a> 			@Override <em class="jxr_comment">/* Overridden from Set */</em>
-<a class="jxr_linenumber" name="L2104" href="#L2104">2104</a> 			<strong class="jxr_keyword">public</strong> Iterator&lt;T&gt; iterator() {
-<a class="jxr_linenumber" name="L2105" href="#L2105">2105</a> 				<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> Iterator&lt;&gt;() {
-<a class="jxr_linenumber" name="L2106" href="#L2106">2106</a> 					<strong class="jxr_keyword">int</strong> i = 0;
-<a class="jxr_linenumber" name="L2107" href="#L2107">2107</a> 
-<a class="jxr_linenumber" name="L2108" href="#L2108">2108</a> 					@Override <em class="jxr_comment">/* Overridden from Iterator */</em>
-<a class="jxr_linenumber" name="L2109" href="#L2109">2109</a> 					<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> hasNext() {
-<a class="jxr_linenumber" name="L2110" href="#L2110">2110</a> 						<strong class="jxr_keyword">return</strong> i &lt; array.length;
-<a class="jxr_linenumber" name="L2111" href="#L2111">2111</a> 					}
-<a class="jxr_linenumber" name="L2112" href="#L2112">2112</a> 
-<a class="jxr_linenumber" name="L2113" href="#L2113">2113</a> 					@Override <em class="jxr_comment">/* Overridden from Iterator */</em>
-<a class="jxr_linenumber" name="L2114" href="#L2114">2114</a> 					<strong class="jxr_keyword">public</strong> T next() {
-<a class="jxr_linenumber" name="L2115" href="#L2115">2115</a> 						<strong class="jxr_keyword">if</strong> (i &gt;= array.length)
-<a class="jxr_linenumber" name="L2116" href="#L2116">2116</a> 							<strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> NoSuchElementException();
-<a class="jxr_linenumber" name="L2117" href="#L2117">2117</a> 						T t = array[i];
-<a class="jxr_linenumber" name="L2118" href="#L2118">2118</a> 						i++;
-<a class="jxr_linenumber" name="L2119" href="#L2119">2119</a> 						<strong class="jxr_keyword">return</strong> t;
-<a class="jxr_linenumber" name="L2120" href="#L2120">2120</a> 					}
-<a class="jxr_linenumber" name="L2121" href="#L2121">2121</a> 
-<a class="jxr_linenumber" name="L2122" href="#L2122">2122</a> 					@Override <em class="jxr_comment">/* Overridden from Iterator */</em>
-<a class="jxr_linenumber" name="L2123" href="#L2123">2123</a> 					<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> remove() {
-<a class="jxr_linenumber" name="L2124" href="#L2124">2124</a> 						<strong class="jxr_keyword">throw</strong> unsupportedOp();
-<a class="jxr_linenumber" name="L2125" href="#L2125">2125</a> 					}
-<a class="jxr_linenumber" name="L2126" href="#L2126">2126</a> 				};
-<a class="jxr_linenumber" name="L2127" href="#L2127">2127</a> 			}
-<a class="jxr_linenumber" name="L2128" href="#L2128">2128</a> 
-<a class="jxr_linenumber" name="L2129" href="#L2129">2129</a> 			@Override <em class="jxr_comment">/* Overridden from Set */</em>
-<a class="jxr_linenumber" name="L2130" href="#L2130">2130</a> 			<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> size() {
-<a class="jxr_linenumber" name="L2131" href="#L2131">2131</a> 				<strong class="jxr_keyword">return</strong> array.length;
-<a class="jxr_linenumber" name="L2132" href="#L2132">2132</a> 			}
-<a class="jxr_linenumber" name="L2133" href="#L2133">2133</a> 		};
-<a class="jxr_linenumber" name="L2134" href="#L2134">2134</a> 	}
-<a class="jxr_linenumber" name="L2135" href="#L2135">2135</a> 
-<a class="jxr_linenumber" name="L2136" href="#L2136">2136</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L2137" href="#L2137">2137</a> 	<em class="jxr_comment">// Primitive array creation methods</em>
-<a class="jxr_linenumber" name="L2138" href="#L2138">2138</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L2139" href="#L2139">2139</a> 
-<a class="jxr_linenumber" name="L2140" href="#L2140">2140</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L2141" href="#L2141">2141</a> <em class="jxr_javadoccomment">	 * Creates a new {@link TreeSet} from the specified collection.</em>
-<a class="jxr_linenumber" name="L2142" href="#L2142">2142</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L2143" href="#L2143">2143</a> <em class="jxr_javadoccomment">	 * @param &lt;E&gt; The element type.</em>
-<a class="jxr_linenumber" name="L2144" href="#L2144">2144</a> <em class="jxr_javadoccomment">	 * @param value The value to copy from.</em>
-<a class="jxr_linenumber" name="L2145" href="#L2145">2145</a> <em class="jxr_javadoccomment">	 * @return A new {@link TreeSet}, or &lt;jk&gt;null&lt;/jk&gt; if the input was null.</em>
-<a class="jxr_linenumber" name="L2146" href="#L2146">2146</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L2147" href="#L2147">2147</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;E&gt; TreeSet&lt;E&gt; toSortedSet(Collection&lt;E&gt; value) {
-<a class="jxr_linenumber" name="L2148" href="#L2148">2148</a> 		<strong class="jxr_keyword">if</strong> (value == <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L2149" href="#L2149">2149</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L2150" href="#L2150">2150</a> 		<strong class="jxr_keyword">var</strong> l = <strong class="jxr_keyword">new</strong> TreeSet&lt;E&gt;();
-<a class="jxr_linenumber" name="L2151" href="#L2151">2151</a> 		value.forEach(x -&gt; l.add(x));
-<a class="jxr_linenumber" name="L2152" href="#L2152">2152</a> 		<strong class="jxr_keyword">return</strong> l;
-<a class="jxr_linenumber" name="L2153" href="#L2153">2153</a> 	}
-<a class="jxr_linenumber" name="L2154" href="#L2154">2154</a> 
-<a class="jxr_linenumber" name="L2155" href="#L2155">2155</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L2156" href="#L2156">2156</a> <em class="jxr_javadoccomment">	 * Creates a new {@link TreeSet} from the specified collection.</em>
-<a class="jxr_linenumber" name="L2157" href="#L2157">2157</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L2158" href="#L2158">2158</a> <em class="jxr_javadoccomment">	 * @param &lt;E&gt; The element type.</em>
-<a class="jxr_linenumber" name="L2159" href="#L2159">2159</a> <em class="jxr_javadoccomment">	 * @param value The value to copy from.</em>
-<a class="jxr_linenumber" name="L2160" href="#L2160">2160</a> <em class="jxr_javadoccomment">	 * @param nullIfEmpty If &lt;jk&gt;true&lt;/jk&gt; returns &lt;jk&gt;null&lt;/jk&gt; if the collection is empty.</em>
-<a class="jxr_linenumber" name="L2161" href="#L2161">2161</a> <em class="jxr_javadoccomment">	 * @return A new {@link TreeSet}, or &lt;jk&gt;null&lt;/jk&gt; if the input was null.</em>
-<a class="jxr_linenumber" name="L2162" href="#L2162">2162</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L2163" href="#L2163">2163</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;E&gt; TreeSet&lt;E&gt; toSortedSet(Collection&lt;E&gt; value, <strong class="jxr_keyword">boolean</strong> nullIfEmpty) {
-<a class="jxr_linenumber" name="L2164" href="#L2164">2164</a> 		<strong class="jxr_keyword">if</strong> (value == <strong class="jxr_keyword">null</strong> || (nullIfEmpty &amp;&amp; value.isEmpty()))
-<a class="jxr_linenumber" name="L2165" href="#L2165">2165</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L2166" href="#L2166">2166</a> 		<strong class="jxr_keyword">var</strong> l = <strong class="jxr_keyword">new</strong> TreeSet&lt;E&gt;();
-<a class="jxr_linenumber" name="L2167" href="#L2167">2167</a> 		value.forEach(x -&gt; l.add(x));
-<a class="jxr_linenumber" name="L2168" href="#L2168">2168</a> 		<strong class="jxr_keyword">return</strong> l;
-<a class="jxr_linenumber" name="L2169" href="#L2169">2169</a> 	}
+<a class="jxr_linenumber" name="L2095" href="#L2095">2095</a> <em class="jxr_javadoccomment">	 * @param &lt;E&gt; The element type.</em>
+<a class="jxr_linenumber" name="L2096" href="#L2096">2096</a> <em class="jxr_javadoccomment">	 * @param array The array to convert.</em>
+<a class="jxr_linenumber" name="L2097" href="#L2097">2097</a> <em class="jxr_javadoccomment">	 * @param elementType</em>
+<a class="jxr_linenumber" name="L2098" href="#L2098">2098</a> <em class="jxr_javadoccomment">	 * 	The type of objects in the array.</em>
+<a class="jxr_linenumber" name="L2099" href="#L2099">2099</a> <em class="jxr_javadoccomment">	 * 	It must match the actual component type in the array.</em>
+<a class="jxr_linenumber" name="L2100" href="#L2100">2100</a> <em class="jxr_javadoccomment">	 * @return A new {@link ArrayList}</em>
+<a class="jxr_linenumber" name="L2101" href="#L2101">2101</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L2102" href="#L2102">2102</a> 	@SuppressWarnings(<span class="jxr_string">"unchecked"</span>)
+<a class="jxr_linenumber" name="L2103" href="#L2103">2103</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;E&gt; List&lt;E&gt; toList(Object array, Class&lt;E&gt; elementType) {
+<a class="jxr_linenumber" name="L2104" href="#L2104">2104</a> 		<strong class="jxr_keyword">var</strong> l = <strong class="jxr_keyword">new</strong> ArrayList&lt;E&gt;(Array.getLength(array));
+<a class="jxr_linenumber" name="L2105" href="#L2105">2105</a> 		<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> i = 0; i &lt; Array.getLength(array); i++)
+<a class="jxr_linenumber" name="L2106" href="#L2106">2106</a> 			l.add((E)Array.get(array, i));
+<a class="jxr_linenumber" name="L2107" href="#L2107">2107</a> 		<strong class="jxr_keyword">return</strong> l;
+<a class="jxr_linenumber" name="L2108" href="#L2108">2108</a> 	}
+<a class="jxr_linenumber" name="L2109" href="#L2109">2109</a> 
+<a class="jxr_linenumber" name="L2110" href="#L2110">2110</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L2111" href="#L2111">2111</a> <em class="jxr_javadoccomment">	 * Recursively converts the specified array into a list of objects.</em>
+<a class="jxr_linenumber" name="L2112" href="#L2112">2112</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L2113" href="#L2113">2113</a> <em class="jxr_javadoccomment">	 * @param array The array to convert.</em>
+<a class="jxr_linenumber" name="L2114" href="#L2114">2114</a> <em class="jxr_javadoccomment">	 * @return A new {@link ArrayList}</em>
+<a class="jxr_linenumber" name="L2115" href="#L2115">2115</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L2116" href="#L2116">2116</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> List&lt;Object&gt; toObjectList(Object array) {
+<a class="jxr_linenumber" name="L2117" href="#L2117">2117</a> 		<strong class="jxr_keyword">var</strong> l = <strong class="jxr_keyword">new</strong> ArrayList&lt;&gt;(Array.getLength(array));
+<a class="jxr_linenumber" name="L2118" href="#L2118">2118</a> 		<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> i = 0; i &lt; Array.getLength(array); i++) {
+<a class="jxr_linenumber" name="L2119" href="#L2119">2119</a> 			<strong class="jxr_keyword">var</strong> o = Array.get(array, i);
+<a class="jxr_linenumber" name="L2120" href="#L2120">2120</a> 			<strong class="jxr_keyword">if</strong> (isArray(o))
+<a class="jxr_linenumber" name="L2121" href="#L2121">2121</a> 				o = toObjectList(o);
+<a class="jxr_linenumber" name="L2122" href="#L2122">2122</a> 			l.add(o);
+<a class="jxr_linenumber" name="L2123" href="#L2123">2123</a> 		}
+<a class="jxr_linenumber" name="L2124" href="#L2124">2124</a> 		<strong class="jxr_keyword">return</strong> l;
+<a class="jxr_linenumber" name="L2125" href="#L2125">2125</a> 	}
+<a class="jxr_linenumber" name="L2126" href="#L2126">2126</a> 
+<a class="jxr_linenumber" name="L2127" href="#L2127">2127</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L2128" href="#L2128">2128</a> <em class="jxr_javadoccomment">	 * Creates a new set from the specified collection.</em>
+<a class="jxr_linenumber" name="L2129" href="#L2129">2129</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L2130" href="#L2130">2130</a> <em class="jxr_javadoccomment">	 * @param &lt;E&gt; The element type.</em>
+<a class="jxr_linenumber" name="L2131" href="#L2131">2131</a> <em class="jxr_javadoccomment">	 * @param val The value to copy from.</em>
+<a class="jxr_linenumber" name="L2132" href="#L2132">2132</a> <em class="jxr_javadoccomment">	 * @return A new {@link LinkedHashSet}, or &lt;jk&gt;null&lt;/jk&gt; if the input was null.</em>
+<a class="jxr_linenumber" name="L2133" href="#L2133">2133</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L2134" href="#L2134">2134</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;E&gt; Set&lt;E&gt; toSet(Collection&lt;E&gt; val) {
+<a class="jxr_linenumber" name="L2135" href="#L2135">2135</a> 		<strong class="jxr_keyword">return</strong> val == <strong class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">null</strong> : <strong class="jxr_keyword">new</strong> LinkedHashSet&lt;&gt;(val);
+<a class="jxr_linenumber" name="L2136" href="#L2136">2136</a> 	}
+<a class="jxr_linenumber" name="L2137" href="#L2137">2137</a> 
+<a class="jxr_linenumber" name="L2138" href="#L2138">2138</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L2139" href="#L2139">2139</a> <em class="jxr_javadoccomment">	 * Converts the specified array to a &lt;c&gt;Set&lt;/c&gt;.</em>
+<a class="jxr_linenumber" name="L2140" href="#L2140">2140</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L2141" href="#L2141">2141</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L2142" href="#L2142">2142</a> <em class="jxr_javadoccomment">	 * The order of the entries in the set are the same as the array.</em>
+<a class="jxr_linenumber" name="L2143" href="#L2143">2143</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L2144" href="#L2144">2144</a> <em class="jxr_javadoccomment">	 * @param &lt;T&gt; The entry type of the array.</em>
+<a class="jxr_linenumber" name="L2145" href="#L2145">2145</a> <em class="jxr_javadoccomment">	 * @param array The array being wrapped in a &lt;c&gt;Set&lt;/c&gt; interface.</em>
+<a class="jxr_linenumber" name="L2146" href="#L2146">2146</a> <em class="jxr_javadoccomment">	 * @return The new set.</em>
+<a class="jxr_linenumber" name="L2147" href="#L2147">2147</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L2148" href="#L2148">2148</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;T&gt; Set&lt;T&gt; toSet(T[] array) {
+<a class="jxr_linenumber" name="L2149" href="#L2149">2149</a> 		assertArgNotNull(<span class="jxr_string">"array"</span>, array);
+<a class="jxr_linenumber" name="L2150" href="#L2150">2150</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> AbstractSet&lt;&gt;() {
+<a class="jxr_linenumber" name="L2151" href="#L2151">2151</a> 
+<a class="jxr_linenumber" name="L2152" href="#L2152">2152</a> 			@Override <em class="jxr_comment">/* Overridden from Set */</em>
+<a class="jxr_linenumber" name="L2153" href="#L2153">2153</a> 			<strong class="jxr_keyword">public</strong> Iterator&lt;T&gt; iterator() {
+<a class="jxr_linenumber" name="L2154" href="#L2154">2154</a> 				<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> Iterator&lt;&gt;() {
+<a class="jxr_linenumber" name="L2155" href="#L2155">2155</a> 					<strong class="jxr_keyword">int</strong> i = 0;
+<a class="jxr_linenumber" name="L2156" href="#L2156">2156</a> 
+<a class="jxr_linenumber" name="L2157" href="#L2157">2157</a> 					@Override <em class="jxr_comment">/* Overridden from Iterator */</em>
+<a class="jxr_linenumber" name="L2158" href="#L2158">2158</a> 					<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> hasNext() {
+<a class="jxr_linenumber" name="L2159" href="#L2159">2159</a> 						<strong class="jxr_keyword">return</strong> i &lt; array.length;
+<a class="jxr_linenumber" name="L2160" href="#L2160">2160</a> 					}
+<a class="jxr_linenumber" name="L2161" href="#L2161">2161</a> 
+<a class="jxr_linenumber" name="L2162" href="#L2162">2162</a> 					@Override <em class="jxr_comment">/* Overridden from Iterator */</em>
+<a class="jxr_linenumber" name="L2163" href="#L2163">2163</a> 					<strong class="jxr_keyword">public</strong> T next() {
+<a class="jxr_linenumber" name="L2164" href="#L2164">2164</a> 						<strong class="jxr_keyword">if</strong> (i &gt;= array.length)
+<a class="jxr_linenumber" name="L2165" href="#L2165">2165</a> 							<strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> NoSuchElementException();
+<a class="jxr_linenumber" name="L2166" href="#L2166">2166</a> 						T t = array[i];
+<a class="jxr_linenumber" name="L2167" href="#L2167">2167</a> 						i++;
+<a class="jxr_linenumber" name="L2168" href="#L2168">2168</a> 						<strong class="jxr_keyword">return</strong> t;
+<a class="jxr_linenumber" name="L2169" href="#L2169">2169</a> 					}
 <a class="jxr_linenumber" name="L2170" href="#L2170">2170</a> 
-<a class="jxr_linenumber" name="L2171" href="#L2171">2171</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L2172" href="#L2172">2172</a> <em class="jxr_javadoccomment">	 * Creates a new {@link TreeSet} containing a copy of the specified set.</em>
-<a class="jxr_linenumber" name="L2173" href="#L2173">2173</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L2174" href="#L2174">2174</a> <em class="jxr_javadoccomment">	 * @param &lt;T&gt; The element type.</em>
-<a class="jxr_linenumber" name="L2175" href="#L2175">2175</a> <em class="jxr_javadoccomment">	 * @param copyFrom The set to copy from.</em>
-<a class="jxr_linenumber" name="L2176" href="#L2176">2176</a> <em class="jxr_javadoccomment">	 * @return A new {@link TreeSet}, or &lt;jk&gt;null&lt;/jk&gt; if the set was &lt;jk&gt;null&lt;/jk&gt;.</em>
-<a class="jxr_linenumber" name="L2177" href="#L2177">2177</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L2178" href="#L2178">2178</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;T&gt; TreeSet&lt;T&gt; toSortedSet(Set&lt;T&gt; copyFrom) {
-<a class="jxr_linenumber" name="L2179" href="#L2179">2179</a> 		<strong class="jxr_keyword">return</strong> copyFrom == <strong class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">null</strong> : <strong class="jxr_keyword">new</strong> TreeSet&lt;&gt;(copyFrom);
-<a class="jxr_linenumber" name="L2180" href="#L2180">2180</a> 	}
-<a class="jxr_linenumber" name="L2181" href="#L2181">2181</a> 
-<a class="jxr_linenumber" name="L2182" href="#L2182">2182</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L2183" href="#L2183">2183</a> <em class="jxr_javadoccomment">	 * Converts an array to a stream of objects.</em>
-<a class="jxr_linenumber" name="L2184" href="#L2184">2184</a> <em class="jxr_javadoccomment">	 * @param array The array to convert.</em>
-<a class="jxr_linenumber" name="L2185" href="#L2185">2185</a> <em class="jxr_javadoccomment">	 * @return A new stream.</em>
-<a class="jxr_linenumber" name="L2186" href="#L2186">2186</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L2187" href="#L2187">2187</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> Stream&lt;Object&gt; toStream(Object array) {
-<a class="jxr_linenumber" name="L2188" href="#L2188">2188</a> 		assertArg(isArray(array), <span class="jxr_string">"Arg was not an array.  Type: {0}"</span>, cn(array));
-<a class="jxr_linenumber" name="L2189" href="#L2189">2189</a> 		<strong class="jxr_keyword">var</strong> length = Array.getLength(array);
-<a class="jxr_linenumber" name="L2190" href="#L2190">2190</a> 		<strong class="jxr_keyword">return</strong> IntStream.range(0, length).mapToObj(i -&gt; Array.get(array, i));
-<a class="jxr_linenumber" name="L2191" href="#L2191">2191</a> 	}
-<a class="jxr_linenumber" name="L2192" href="#L2192">2192</a> 
-<a class="jxr_linenumber" name="L2193" href="#L2193">2193</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L2194" href="#L2194">2194</a> <em class="jxr_javadoccomment">	 * Converts the specified collection to an array of strings.</em>
-<a class="jxr_linenumber" name="L2195" href="#L2195">2195</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L2196" href="#L2196">2196</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L2197" href="#L2197">2197</a> <em class="jxr_javadoccomment">	 * Entries are converted to strings using {@link #toString()}.</em>
-<a class="jxr_linenumber" name="L2198" href="#L2198">2198</a> <em class="jxr_javadoccomment">	 * &lt;jk&gt;null&lt;/jk&gt; values remain &lt;jk&gt;null&lt;/jk&gt;.</em>
-<a class="jxr_linenumber" name="L2199" href="#L2199">2199</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L2200" href="#L2200">2200</a> <em class="jxr_javadoccomment">	 * @param c The collection to convert.</em>
-<a class="jxr_linenumber" name="L2201" href="#L2201">2201</a> <em class="jxr_javadoccomment">	 * @return The collection as a string array.</em>
-<a class="jxr_linenumber" name="L2202" href="#L2202">2202</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L2203" href="#L2203">2203</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> String[] toStringArray(Collection&lt;?&gt; c) {
-<a class="jxr_linenumber" name="L2204" href="#L2204">2204</a> 		<strong class="jxr_keyword">var</strong> r = <strong class="jxr_keyword">new</strong> String[c.size()];
-<a class="jxr_linenumber" name="L2205" href="#L2205">2205</a> 		<strong class="jxr_keyword">var</strong> i = 0;
-<a class="jxr_linenumber" name="L2206" href="#L2206">2206</a> 		<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> o : c)
-<a class="jxr_linenumber" name="L2207" href="#L2207">2207</a> 			r[i++] = s(o);
-<a class="jxr_linenumber" name="L2208" href="#L2208">2208</a> 		<strong class="jxr_keyword">return</strong> r;
-<a class="jxr_linenumber" name="L2209" href="#L2209">2209</a> 	}
-<a class="jxr_linenumber" name="L2210" href="#L2210">2210</a> 
-<a class="jxr_linenumber" name="L2211" href="#L2211">2211</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L2212" href="#L2212">2212</a> <em class="jxr_javadoccomment">	 * Traverses all elements in the specified object and executes a consumer for it.</em>
-<a class="jxr_linenumber" name="L2213" href="#L2213">2213</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L2214" href="#L2214">2214</a> <em class="jxr_javadoccomment">	 * @param &lt;T&gt; The element type.</em>
-<a class="jxr_linenumber" name="L2215" href="#L2215">2215</a> <em class="jxr_javadoccomment">	 * @param o The object to traverse.</em>
-<a class="jxr_linenumber" name="L2216" href="#L2216">2216</a> <em class="jxr_javadoccomment">	 * @param c The consumer of the objects.</em>
-<a class="jxr_linenumber" name="L2217" href="#L2217">2217</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L2218" href="#L2218">2218</a> 	@SuppressWarnings(<span class="jxr_string">"unchecked"</span>)
-<a class="jxr_linenumber" name="L2219" href="#L2219">2219</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;T&gt; <strong class="jxr_keyword">void</strong> traverse(Object o, Consumer&lt;T&gt; c) {
-<a class="jxr_linenumber" name="L2220" href="#L2220">2220</a> 		<strong class="jxr_keyword">if</strong> (o == <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L2221" href="#L2221">2221</a> 			<strong class="jxr_keyword">return</strong>;
-<a class="jxr_linenumber" name="L2222" href="#L2222">2222</a> 		<strong class="jxr_keyword">if</strong> (o instanceof Iterable&lt;?&gt; o2)
-<a class="jxr_linenumber" name="L2223" href="#L2223">2223</a> 			o2.forEach(x -&gt; traverse(x, c));
-<a class="jxr_linenumber" name="L2224" href="#L2224">2224</a> 		<strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (o instanceof Stream&lt;?&gt; o2)
-<a class="jxr_linenumber" name="L2225" href="#L2225">2225</a> 			o2.forEach(x -&gt; traverse(x, c));
-<a class="jxr_linenumber" name="L2226" href="#L2226">2226</a> 		<strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (isArray(o))
-<a class="jxr_linenumber" name="L2227" href="#L2227">2227</a> 			toStream(o).forEach(x -&gt; traverse(x, c));
-<a class="jxr_linenumber" name="L2228" href="#L2228">2228</a> 		<strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L2229" href="#L2229">2229</a> 			c.accept((T)o);
-<a class="jxr_linenumber" name="L2230" href="#L2230">2230</a> 	}
-<a class="jxr_linenumber" name="L2231" href="#L2231">2231</a> 
-<a class="jxr_linenumber" name="L2232" href="#L2232">2232</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L2233" href="#L2233">2233</a> <em class="jxr_javadoccomment">	 * Creates an unmodifiable view of the specified list.</em>
-<a class="jxr_linenumber" name="L2234" href="#L2234">2234</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L2235" href="#L2235">2235</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;This is a null-safe wrapper around {@link Collections#unmodifiableList(List)}.&lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L2236" href="#L2236">2236</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L2237" href="#L2237">2237</a> <em class="jxr_javadoccomment">	 * @param &lt;T&gt; The element type.</em>
-<a class="jxr_linenumber" name="L2238" href="#L2238">2238</a> <em class="jxr_javadoccomment">	 * @param value The list to make unmodifiable. Can be null.</em>
-<a class="jxr_linenumber" name="L2239" href="#L2239">2239</a> <em class="jxr_javadoccomment">	 * @return An unmodifiable view of the list, or null if the input was null.</em>
-<a class="jxr_linenumber" name="L2240" href="#L2240">2240</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L2241" href="#L2241">2241</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;T&gt; List&lt;T&gt; u(List&lt;? <strong class="jxr_keyword">extends</strong> T&gt; value) {
-<a class="jxr_linenumber" name="L2242" href="#L2242">2242</a> 		<strong class="jxr_keyword">return</strong> value == <strong class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">null</strong> : Collections.unmodifiableList(value);
-<a class="jxr_linenumber" name="L2243" href="#L2243">2243</a> 	}
-<a class="jxr_linenumber" name="L2244" href="#L2244">2244</a> 
-<a class="jxr_linenumber" name="L2245" href="#L2245">2245</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L2246" href="#L2246">2246</a> <em class="jxr_javadoccomment">	 * Creates an unmodifiable view of the specified map.</em>
-<a class="jxr_linenumber" name="L2247" href="#L2247">2247</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L2248" href="#L2248">2248</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;This is a null-safe wrapper around {@link Collections#unmodifiableMap(Map)}.&lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L2249" href="#L2249">2249</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L2250" href="#L2250">2250</a> <em class="jxr_javadoccomment">	 * @param &lt;K&gt; The key type.</em>
-<a class="jxr_linenumber" name="L2251" href="#L2251">2251</a> <em class="jxr_javadoccomment">	 * @param &lt;V&gt; The value type.</em>
-<a class="jxr_linenumber" name="L2252" href="#L2252">2252</a> <em class="jxr_javadoccomment">	 * @param value The map to make unmodifiable. Can be null.</em>
-<a class="jxr_linenumber" name="L2253" href="#L2253">2253</a> <em class="jxr_javadoccomment">	 * @return An unmodifiable view of the map, or null if the input was null.</em>
-<a class="jxr_linenumber" name="L2254" href="#L2254">2254</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L2255" href="#L2255">2255</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;K,V&gt; Map&lt;K,V&gt; u(Map&lt;? <strong class="jxr_keyword">extends</strong> K,? <strong class="jxr_keyword">extends</strong> V&gt; value) {
-<a class="jxr_linenumber" name="L2256" href="#L2256">2256</a> 		<strong class="jxr_keyword">return</strong> value == <strong class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">null</strong> : Collections.unmodifiableMap(value);
-<a class="jxr_linenumber" name="L2257" href="#L2257">2257</a> 	}
-<a class="jxr_linenumber" name="L2258" href="#L2258">2258</a> 
-<a class="jxr_linenumber" name="L2259" href="#L2259">2259</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L2260" href="#L2260">2260</a> 	<em class="jxr_comment">// Stream utilities</em>
-<a class="jxr_linenumber" name="L2261" href="#L2261">2261</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L2262" href="#L2262">2262</a> 
-<a class="jxr_linenumber" name="L2263" href="#L2263">2263</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L2264" href="#L2264">2264</a> <em class="jxr_javadoccomment">	 * Creates an unmodifiable view of the specified set.</em>
-<a class="jxr_linenumber" name="L2265" href="#L2265">2265</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L2266" href="#L2266">2266</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;This is a null-safe wrapper around {@link Collections#unmodifiableSet(Set)}.&lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L2267" href="#L2267">2267</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L2268" href="#L2268">2268</a> <em class="jxr_javadoccomment">	 * @param &lt;T&gt; The element type.</em>
-<a class="jxr_linenumber" name="L2269" href="#L2269">2269</a> <em class="jxr_javadoccomment">	 * @param value The set to make unmodifiable. Can be null.</em>
-<a class="jxr_linenumber" name="L2270" href="#L2270">2270</a> <em class="jxr_javadoccomment">	 * @return An unmodifiable view of the set, or null if the input was null.</em>
-<a class="jxr_linenumber" name="L2271" href="#L2271">2271</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L2272" href="#L2272">2272</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;T&gt; Set&lt;T&gt; u(Set&lt;? <strong class="jxr_keyword">extends</strong> T&gt; value) {
-<a class="jxr_linenumber" name="L2273" href="#L2273">2273</a> 		<strong class="jxr_keyword">return</strong> value == <strong class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">null</strong> : Collections.unmodifiableSet(value);
-<a class="jxr_linenumber" name="L2274" href="#L2274">2274</a> 	}
-<a class="jxr_linenumber" name="L2275" href="#L2275">2275</a> 
-<a class="jxr_linenumber" name="L2276" href="#L2276">2276</a> 	<strong class="jxr_keyword">private</strong> <a name="CollectionUtils" href="../../../../../org/apache/juneau/commons/utils/CollectionUtils.html#CollectionUtils">CollectionUtils</a>() {}
-<a class="jxr_linenumber" name="L2277" href="#L2277">2277</a> }
+<a class="jxr_linenumber" name="L2171" href="#L2171">2171</a> 					@Override <em class="jxr_comment">/* Overridden from Iterator */</em>
+<a class="jxr_linenumber" name="L2172" href="#L2172">2172</a> 					<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> remove() {
+<a class="jxr_linenumber" name="L2173" href="#L2173">2173</a> 						<strong class="jxr_keyword">throw</strong> unsupportedOp();
+<a class="jxr_linenumber" name="L2174" href="#L2174">2174</a> 					}
+<a class="jxr_linenumber" name="L2175" href="#L2175">2175</a> 				};
+<a class="jxr_linenumber" name="L2176" href="#L2176">2176</a> 			}
+<a class="jxr_linenumber" name="L2177" href="#L2177">2177</a> 
+<a class="jxr_linenumber" name="L2178" href="#L2178">2178</a> 			@Override <em class="jxr_comment">/* Overridden from Set */</em>
+<a class="jxr_linenumber" name="L2179" href="#L2179">2179</a> 			<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> size() {
+<a class="jxr_linenumber" name="L2180" href="#L2180">2180</a> 				<strong class="jxr_keyword">return</strong> array.length;
+<a class="jxr_linenumber" name="L2181" href="#L2181">2181</a> 			}
+<a class="jxr_linenumber" name="L2182" href="#L2182">2182</a> 		};
+<a class="jxr_linenumber" name="L2183" href="#L2183">2183</a> 	}
+<a class="jxr_linenumber" name="L2184" href="#L2184">2184</a> 
+<a class="jxr_linenumber" name="L2185" href="#L2185">2185</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L2186" href="#L2186">2186</a> 	<em class="jxr_comment">// Primitive array creation methods</em>
+<a class="jxr_linenumber" name="L2187" href="#L2187">2187</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L2188" href="#L2188">2188</a> 
+<a class="jxr_linenumber" name="L2189" href="#L2189">2189</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L2190" href="#L2190">2190</a> <em class="jxr_javadoccomment">	 * Creates a new {@link TreeSet} from the specified collection.</em>
+<a class="jxr_linenumber" name="L2191" href="#L2191">2191</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L2192" href="#L2192">2192</a> <em class="jxr_javadoccomment">	 * @param &lt;E&gt; The element type.</em>
+<a class="jxr_linenumber" name="L2193" href="#L2193">2193</a> <em class="jxr_javadoccomment">	 * @param value The value to copy from.</em>
+<a class="jxr_linenumber" name="L2194" href="#L2194">2194</a> <em class="jxr_javadoccomment">	 * @return A new {@link TreeSet}, or &lt;jk&gt;null&lt;/jk&gt; if the input was null.</em>
+<a class="jxr_linenumber" name="L2195" href="#L2195">2195</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L2196" href="#L2196">2196</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;E&gt; TreeSet&lt;E&gt; toSortedSet(Collection&lt;E&gt; value) {
+<a class="jxr_linenumber" name="L2197" href="#L2197">2197</a> 		<strong class="jxr_keyword">if</strong> (value == <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L2198" href="#L2198">2198</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L2199" href="#L2199">2199</a> 		<strong class="jxr_keyword">var</strong> l = <strong class="jxr_keyword">new</strong> TreeSet&lt;E&gt;();
+<a class="jxr_linenumber" name="L2200" href="#L2200">2200</a> 		value.forEach(x -&gt; l.add(x));
+<a class="jxr_linenumber" name="L2201" href="#L2201">2201</a> 		<strong class="jxr_keyword">return</strong> l;
+<a class="jxr_linenumber" name="L2202" href="#L2202">2202</a> 	}
+<a class="jxr_linenumber" name="L2203" href="#L2203">2203</a> 
+<a class="jxr_linenumber" name="L2204" href="#L2204">2204</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L2205" href="#L2205">2205</a> <em class="jxr_javadoccomment">	 * Creates a new {@link TreeSet} from the specified collection.</em>
+<a class="jxr_linenumber" name="L2206" href="#L2206">2206</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L2207" href="#L2207">2207</a> <em class="jxr_javadoccomment">	 * @param &lt;E&gt; The element type.</em>
+<a class="jxr_linenumber" name="L2208" href="#L2208">2208</a> <em class="jxr_javadoccomment">	 * @param value The value to copy from.</em>
+<a class="jxr_linenumber" name="L2209" href="#L2209">2209</a> <em class="jxr_javadoccomment">	 * @param nullIfEmpty If &lt;jk&gt;true&lt;/jk&gt; returns &lt;jk&gt;null&lt;/jk&gt; if the collection is empty.</em>
+<a class="jxr_linenumber" name="L2210" href="#L2210">2210</a> <em class="jxr_javadoccomment">	 * @return A new {@link TreeSet}, or &lt;jk&gt;null&lt;/jk&gt; if the input was null.</em>
+<a class="jxr_linenumber" name="L2211" href="#L2211">2211</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L2212" href="#L2212">2212</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;E&gt; TreeSet&lt;E&gt; toSortedSet(Collection&lt;E&gt; value, <strong class="jxr_keyword">boolean</strong> nullIfEmpty) {
+<a class="jxr_linenumber" name="L2213" href="#L2213">2213</a> 		<strong class="jxr_keyword">if</strong> (value == <strong class="jxr_keyword">null</strong> || (nullIfEmpty &amp;&amp; value.isEmpty()))
+<a class="jxr_linenumber" name="L2214" href="#L2214">2214</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L2215" href="#L2215">2215</a> 		<strong class="jxr_keyword">var</strong> l = <strong class="jxr_keyword">new</strong> TreeSet&lt;E&gt;();
+<a class="jxr_linenumber" name="L2216" href="#L2216">2216</a> 		value.forEach(x -&gt; l.add(x));
+<a class="jxr_linenumber" name="L2217" href="#L2217">2217</a> 		<strong class="jxr_keyword">return</strong> l;
+<a class="jxr_linenumber" name="L2218" href="#L2218">2218</a> 	}
+<a class="jxr_linenumber" name="L2219" href="#L2219">2219</a> 
+<a class="jxr_linenumber" name="L2220" href="#L2220">2220</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L2221" href="#L2221">2221</a> <em class="jxr_javadoccomment">	 * Creates a new {@link TreeSet} containing a copy of the specified set.</em>
+<a class="jxr_linenumber" name="L2222" href="#L2222">2222</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L2223" href="#L2223">2223</a> <em class="jxr_javadoccomment">	 * @param &lt;T&gt; The element type.</em>
+<a class="jxr_linenumber" name="L2224" href="#L2224">2224</a> <em class="jxr_javadoccomment">	 * @param copyFrom The set to copy from.</em>
+<a class="jxr_linenumber" name="L2225" href="#L2225">2225</a> <em class="jxr_javadoccomment">	 * @return A new {@link TreeSet}, or &lt;jk&gt;null&lt;/jk&gt; if the set was &lt;jk&gt;null&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L2226" href="#L2226">2226</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L2227" href="#L2227">2227</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;T&gt; TreeSet&lt;T&gt; toSortedSet(Set&lt;T&gt; copyFrom) {
+<a class="jxr_linenumber" name="L2228" href="#L2228">2228</a> 		<strong class="jxr_keyword">return</strong> copyFrom == <strong class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">null</strong> : <strong class="jxr_keyword">new</strong> TreeSet&lt;&gt;(copyFrom);
+<a class="jxr_linenumber" name="L2229" href="#L2229">2229</a> 	}
+<a class="jxr_linenumber" name="L2230" href="#L2230">2230</a> 
+<a class="jxr_linenumber" name="L2231" href="#L2231">2231</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L2232" href="#L2232">2232</a> <em class="jxr_javadoccomment">	 * Converts an array to a stream of objects.</em>
+<a class="jxr_linenumber" name="L2233" href="#L2233">2233</a> <em class="jxr_javadoccomment">	 * @param array The array to convert.</em>
+<a class="jxr_linenumber" name="L2234" href="#L2234">2234</a> <em class="jxr_javadoccomment">	 * @return A new stream.</em>
+<a class="jxr_linenumber" name="L2235" href="#L2235">2235</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L2236" href="#L2236">2236</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> Stream&lt;Object&gt; toStream(Object array) {
+<a class="jxr_linenumber" name="L2237" href="#L2237">2237</a> 		assertArg(isArray(array), <span class="jxr_string">"Arg was not an array.  Type: {0}"</span>, cn(array));
+<a class="jxr_linenumber" name="L2238" href="#L2238">2238</a> 		<strong class="jxr_keyword">var</strong> length = Array.getLength(array);
+<a class="jxr_linenumber" name="L2239" href="#L2239">2239</a> 		<strong class="jxr_keyword">return</strong> IntStream.range(0, length).mapToObj(i -&gt; Array.get(array, i));
+<a class="jxr_linenumber" name="L2240" href="#L2240">2240</a> 	}
+<a class="jxr_linenumber" name="L2241" href="#L2241">2241</a> 
+<a class="jxr_linenumber" name="L2242" href="#L2242">2242</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L2243" href="#L2243">2243</a> <em class="jxr_javadoccomment">	 * Converts the specified collection to an array of strings.</em>
+<a class="jxr_linenumber" name="L2244" href="#L2244">2244</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L2245" href="#L2245">2245</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L2246" href="#L2246">2246</a> <em class="jxr_javadoccomment">	 * Entries are converted to strings using {@link #toString()}.</em>
+<a class="jxr_linenumber" name="L2247" href="#L2247">2247</a> <em class="jxr_javadoccomment">	 * &lt;jk&gt;null&lt;/jk&gt; values remain &lt;jk&gt;null&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L2248" href="#L2248">2248</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L2249" href="#L2249">2249</a> <em class="jxr_javadoccomment">	 * @param c The collection to convert.</em>
+<a class="jxr_linenumber" name="L2250" href="#L2250">2250</a> <em class="jxr_javadoccomment">	 * @return The collection as a string array.</em>
+<a class="jxr_linenumber" name="L2251" href="#L2251">2251</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L2252" href="#L2252">2252</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> String[] toStringArray(Collection&lt;?&gt; c) {
+<a class="jxr_linenumber" name="L2253" href="#L2253">2253</a> 		<strong class="jxr_keyword">var</strong> r = <strong class="jxr_keyword">new</strong> String[c.size()];
+<a class="jxr_linenumber" name="L2254" href="#L2254">2254</a> 		<strong class="jxr_keyword">var</strong> i = 0;
+<a class="jxr_linenumber" name="L2255" href="#L2255">2255</a> 		<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> o : c)
+<a class="jxr_linenumber" name="L2256" href="#L2256">2256</a> 			r[i++] = s(o);
+<a class="jxr_linenumber" name="L2257" href="#L2257">2257</a> 		<strong class="jxr_keyword">return</strong> r;
+<a class="jxr_linenumber" name="L2258" href="#L2258">2258</a> 	}
+<a class="jxr_linenumber" name="L2259" href="#L2259">2259</a> 
+<a class="jxr_linenumber" name="L2260" href="#L2260">2260</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L2261" href="#L2261">2261</a> <em class="jxr_javadoccomment">	 * Traverses all elements in the specified object and executes a consumer for it.</em>
+<a class="jxr_linenumber" name="L2262" href="#L2262">2262</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L2263" href="#L2263">2263</a> <em class="jxr_javadoccomment">	 * @param &lt;T&gt; The element type.</em>
+<a class="jxr_linenumber" name="L2264" href="#L2264">2264</a> <em class="jxr_javadoccomment">	 * @param o The object to traverse.</em>
+<a class="jxr_linenumber" name="L2265" href="#L2265">2265</a> <em class="jxr_javadoccomment">	 * @param c The consumer of the objects.</em>
+<a class="jxr_linenumber" name="L2266" href="#L2266">2266</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L2267" href="#L2267">2267</a> 	@SuppressWarnings(<span class="jxr_string">"unchecked"</span>)
+<a class="jxr_linenumber" name="L2268" href="#L2268">2268</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;T&gt; <strong class="jxr_keyword">void</strong> traverse(Object o, Consumer&lt;T&gt; c) {
+<a class="jxr_linenumber" name="L2269" href="#L2269">2269</a> 		<strong class="jxr_keyword">if</strong> (o == <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L2270" href="#L2270">2270</a> 			<strong class="jxr_keyword">return</strong>;
+<a class="jxr_linenumber" name="L2271" href="#L2271">2271</a> 		<strong class="jxr_keyword">if</strong> (o instanceof Iterable&lt;?&gt; o2)
+<a class="jxr_linenumber" name="L2272" href="#L2272">2272</a> 			o2.forEach(x -&gt; traverse(x, c));
+<a class="jxr_linenumber" name="L2273" href="#L2273">2273</a> 		<strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (o instanceof Stream&lt;?&gt; o2)
+<a class="jxr_linenumber" name="L2274" href="#L2274">2274</a> 			o2.forEach(x -&gt; traverse(x, c));
+<a class="jxr_linenumber" name="L2275" href="#L2275">2275</a> 		<strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (isArray(o))
+<a class="jxr_linenumber" name="L2276" href="#L2276">2276</a> 			toStream(o).forEach(x -&gt; traverse(x, c));
+<a class="jxr_linenumber" name="L2277" href="#L2277">2277</a> 		<strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L2278" href="#L2278">2278</a> 			c.accept((T)o);
+<a class="jxr_linenumber" name="L2279" href="#L2279">2279</a> 	}
+<a class="jxr_linenumber" name="L2280" href="#L2280">2280</a> 
+<a class="jxr_linenumber" name="L2281" href="#L2281">2281</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L2282" href="#L2282">2282</a> <em class="jxr_javadoccomment">	 * Creates an unmodifiable view of the specified list.</em>
+<a class="jxr_linenumber" name="L2283" href="#L2283">2283</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L2284" href="#L2284">2284</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;This is a null-safe wrapper around {@link Collections#unmodifiableList(List)}.&lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L2285" href="#L2285">2285</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L2286" href="#L2286">2286</a> <em class="jxr_javadoccomment">	 * @param &lt;T&gt; The element type.</em>
+<a class="jxr_linenumber" name="L2287" href="#L2287">2287</a> <em class="jxr_javadoccomment">	 * @param value The list to make unmodifiable. Can be null.</em>
+<a class="jxr_linenumber" name="L2288" href="#L2288">2288</a> <em class="jxr_javadoccomment">	 * @return An unmodifiable view of the list, or null if the input was null.</em>
+<a class="jxr_linenumber" name="L2289" href="#L2289">2289</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L2290" href="#L2290">2290</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;T&gt; List&lt;T&gt; u(List&lt;? <strong class="jxr_keyword">extends</strong> T&gt; value) {
+<a class="jxr_linenumber" name="L2291" href="#L2291">2291</a> 		<strong class="jxr_keyword">return</strong> value == <strong class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">null</strong> : Collections.unmodifiableList(value);
+<a class="jxr_linenumber" name="L2292" href="#L2292">2292</a> 	}
+<a class="jxr_linenumber" name="L2293" href="#L2293">2293</a> 
+<a class="jxr_linenumber" name="L2294" href="#L2294">2294</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L2295" href="#L2295">2295</a> <em class="jxr_javadoccomment">	 * Creates an unmodifiable view of the specified map.</em>
+<a class="jxr_linenumber" name="L2296" href="#L2296">2296</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L2297" href="#L2297">2297</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;This is a null-safe wrapper around {@link Collections#unmodifiableMap(Map)}.&lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L2298" href="#L2298">2298</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L2299" href="#L2299">2299</a> <em class="jxr_javadoccomment">	 * @param &lt;K&gt; The key type.</em>
+<a class="jxr_linenumber" name="L2300" href="#L2300">2300</a> <em class="jxr_javadoccomment">	 * @param &lt;V&gt; The value type.</em>
+<a class="jxr_linenumber" name="L2301" href="#L2301">2301</a> <em class="jxr_javadoccomment">	 * @param value The map to make unmodifiable. Can be null.</em>
+<a class="jxr_linenumber" name="L2302" href="#L2302">2302</a> <em class="jxr_javadoccomment">	 * @return An unmodifiable view of the map, or null if the input was null.</em>
+<a class="jxr_linenumber" name="L2303" href="#L2303">2303</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L2304" href="#L2304">2304</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;K,V&gt; Map&lt;K,V&gt; u(Map&lt;? <strong class="jxr_keyword">extends</strong> K,? <strong class="jxr_keyword">extends</strong> V&gt; value) {
+<a class="jxr_linenumber" name="L2305" href="#L2305">2305</a> 		<strong class="jxr_keyword">return</strong> value == <strong class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">null</strong> : Collections.unmodifiableMap(value);
+<a class="jxr_linenumber" name="L2306" href="#L2306">2306</a> 	}
+<a class="jxr_linenumber" name="L2307" href="#L2307">2307</a> 
+<a class="jxr_linenumber" name="L2308" href="#L2308">2308</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L2309" href="#L2309">2309</a> 	<em class="jxr_comment">// Stream utilities</em>
+<a class="jxr_linenumber" name="L2310" href="#L2310">2310</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L2311" href="#L2311">2311</a> 
+<a class="jxr_linenumber" name="L2312" href="#L2312">2312</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L2313" href="#L2313">2313</a> <em class="jxr_javadoccomment">	 * Creates an unmodifiable view of the specified set.</em>
+<a class="jxr_linenumber" name="L2314" href="#L2314">2314</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L2315" href="#L2315">2315</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;This is a null-safe wrapper around {@link Collections#unmodifiableSet(Set)}.&lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L2316" href="#L2316">2316</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L2317" href="#L2317">2317</a> <em class="jxr_javadoccomment">	 * @param &lt;T&gt; The element type.</em>
+<a class="jxr_linenumber" name="L2318" href="#L2318">2318</a> <em class="jxr_javadoccomment">	 * @param value The set to make unmodifiable. Can be null.</em>
+<a class="jxr_linenumber" name="L2319" href="#L2319">2319</a> <em class="jxr_javadoccomment">	 * @return An unmodifiable view of the set, or null if the input was null.</em>
+<a class="jxr_linenumber" name="L2320" href="#L2320">2320</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L2321" href="#L2321">2321</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;T&gt; Set&lt;T&gt; u(Set&lt;? <strong class="jxr_keyword">extends</strong> T&gt; value) {
+<a class="jxr_linenumber" name="L2322" href="#L2322">2322</a> 		<strong class="jxr_keyword">return</strong> value == <strong class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">null</strong> : Collections.unmodifiableSet(value);
+<a class="jxr_linenumber" name="L2323" href="#L2323">2323</a> 	}
+<a class="jxr_linenumber" name="L2324" href="#L2324">2324</a> 
+<a class="jxr_linenumber" name="L2325" href="#L2325">2325</a> 	<strong class="jxr_keyword">private</strong> <a name="CollectionUtils" href="../../../../../org/apache/juneau/commons/utils/CollectionUtils.html#CollectionUtils">CollectionUtils</a>() {}
+<a class="jxr_linenumber" name="L2326" href="#L2326">2326</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/Utils.html b/site/xref/org/apache/juneau/commons/utils/Utils.html
index 91b251ee9a..17451871af 100644
--- a/site/xref/org/apache/juneau/commons/utils/Utils.html
+++ b/site/xref/org/apache/juneau/commons/utils/Utils.html
@@ -1552,270 +1552,335 @@
 <a class="jxr_linenumber" name="L1544" href="#L1544">1544</a> 	}
 <a class="jxr_linenumber" name="L1545" href="#L1545">1545</a> 
 <a class="jxr_linenumber" name="L1546" href="#L1546">1546</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1547" href="#L1547">1547</a> <em class="jxr_javadoccomment">	 * Executes a supplier that may throw an exception and returns an Optional.</em>
+<a class="jxr_linenumber" name="L1547" href="#L1547">1547</a> <em class="jxr_javadoccomment">	 * Executes a supplier that may throw an exception and returns the result or a fallback value.</em>
 <a class="jxr_linenumber" name="L1548" href="#L1548">1548</a> <em class="jxr_javadoccomment">	 *</em>
 <a class="jxr_linenumber" name="L1549" href="#L1549">1549</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L1550" href="#L1550">1550</a> <em class="jxr_javadoccomment">	 * If the supplier executes successfully, returns {@link Optional#of(Object)} with the result.</em>
-<a class="jxr_linenumber" name="L1551" href="#L1551">1551</a> <em class="jxr_javadoccomment">	 * If the supplier throws any exception, returns {@link Optional#empty()}.</em>
+<a class="jxr_linenumber" name="L1550" href="#L1550">1550</a> <em class="jxr_javadoccomment">	 * If the supplier executes successfully, returns the result.</em>
+<a class="jxr_linenumber" name="L1551" href="#L1551">1551</a> <em class="jxr_javadoccomment">	 * If the supplier throws any exception, applies the exception function to get a fallback value.</em>
 <a class="jxr_linenumber" name="L1552" href="#L1552">1552</a> <em class="jxr_javadoccomment">	 *</em>
 <a class="jxr_linenumber" name="L1553" href="#L1553">1553</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
 <a class="jxr_linenumber" name="L1554" href="#L1554">1554</a> <em class="jxr_javadoccomment">	 * This is useful for operations that may fail but you want to handle the failure</em>
-<a class="jxr_linenumber" name="L1555" href="#L1555">1555</a> <em class="jxr_javadoccomment">	 * gracefully by returning an empty Optional instead of throwing an exception.</em>
+<a class="jxr_linenumber" name="L1555" href="#L1555">1555</a> <em class="jxr_javadoccomment">	 * gracefully by returning a fallback value instead of throwing an exception.</em>
 <a class="jxr_linenumber" name="L1556" href="#L1556">1556</a> <em class="jxr_javadoccomment">	 *</em>
 <a class="jxr_linenumber" name="L1557" href="#L1557">1557</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
 <a class="jxr_linenumber" name="L1558" href="#L1558">1558</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L1559" href="#L1559">1559</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Check if AccessibleObject.isAccessible() method exists (Java 9+)&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L1560" href="#L1560">1560</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;boolean&lt;/jk&gt; &lt;jv&gt;isAccessible&lt;/jv&gt; = &lt;jsm&gt;safeOpt&lt;/jsm&gt;(() -&amp;gt;</em>
-<a class="jxr_linenumber" name="L1561" href="#L1561">1561</a> <em class="jxr_javadoccomment">	 * 		(&lt;jk&gt;boolean&lt;/jk&gt;)AccessibleObject.&lt;jk&gt;class&lt;/jk&gt;.getMethod(&lt;js&gt;"isAccessible"&lt;/js&gt;).invoke(&lt;jv&gt;obj&lt;/jv&gt;)</em>
-<a class="jxr_linenumber" name="L1562" href="#L1562">1562</a> <em class="jxr_javadoccomment">	 * 	).orElse(&lt;jk&gt;false&lt;/jk&gt;);</em>
-<a class="jxr_linenumber" name="L1563" href="#L1563">1563</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L1564" href="#L1564">1564</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1565" href="#L1565">1565</a> <em class="jxr_javadoccomment">	 * @param &lt;T&gt; The return type.</em>
-<a class="jxr_linenumber" name="L1566" href="#L1566">1566</a> <em class="jxr_javadoccomment">	 * @param s The supplier that may throw an exception.</em>
-<a class="jxr_linenumber" name="L1567" href="#L1567">1567</a> <em class="jxr_javadoccomment">	 * @return An Optional containing the result if successful, or empty if an exception was thrown.</em>
-<a class="jxr_linenumber" name="L1568" href="#L1568">1568</a> <em class="jxr_javadoccomment">	 * @see #safe(ThrowingSupplier)</em>
-<a class="jxr_linenumber" name="L1569" href="#L1569">1569</a> <em class="jxr_javadoccomment">	 * @see #opt(Object)</em>
-<a class="jxr_linenumber" name="L1570" href="#L1570">1570</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1571" href="#L1571">1571</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;T&gt; Optional&lt;T&gt; safeOpt(ThrowingSupplier&lt;T&gt; s) {
-<a class="jxr_linenumber" name="L1572" href="#L1572">1572</a> 		<strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="L1573" href="#L1573">1573</a> 			<strong class="jxr_keyword">return</strong> Optional.of(s.get());
-<a class="jxr_linenumber" name="L1574" href="#L1574">1574</a> 		} <strong class="jxr_keyword">catch</strong> (@SuppressWarnings(<span class="jxr_string">"unused"</span>) Exception e) {
-<a class="jxr_linenumber" name="L1575" href="#L1575">1575</a> 			<strong class="jxr_keyword">return</strong> Optional.empty();
-<a class="jxr_linenumber" name="L1576" href="#L1576">1576</a> 		}
-<a class="jxr_linenumber" name="L1577" href="#L1577">1577</a> 	}
-<a class="jxr_linenumber" name="L1578" href="#L1578">1578</a> 
-<a class="jxr_linenumber" name="L1579" href="#L1579">1579</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1580" href="#L1580">1580</a> <em class="jxr_javadoccomment">	 * Executes a supplier that may throw an exception and returns the result or &lt;c&gt;null&lt;/c&gt;.</em>
-<a class="jxr_linenumber" name="L1581" href="#L1581">1581</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1582" href="#L1582">1582</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L1583" href="#L1583">1583</a> <em class="jxr_javadoccomment">	 * If the supplier executes successfully, returns the result.</em>
-<a class="jxr_linenumber" name="L1584" href="#L1584">1584</a> <em class="jxr_javadoccomment">	 * If the supplier throws any exception, returns &lt;c&gt;null&lt;/c&gt;.</em>
-<a class="jxr_linenumber" name="L1585" href="#L1585">1585</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1586" href="#L1586">1586</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L1587" href="#L1587">1587</a> <em class="jxr_javadoccomment">	 * This is useful for operations that may fail but you want to handle the failure</em>
-<a class="jxr_linenumber" name="L1588" href="#L1588">1588</a> <em class="jxr_javadoccomment">	 * gracefully by returning &lt;c&gt;null&lt;/c&gt; instead of throwing an exception. This is particularly</em>
-<a class="jxr_linenumber" name="L1589" href="#L1589">1589</a> <em class="jxr_javadoccomment">	 * useful in fluent method chains where you want to filter out failed conversions.</em>
-<a class="jxr_linenumber" name="L1590" href="#L1590">1590</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1591" href="#L1591">1591</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L1592" href="#L1592">1592</a> <em class="jxr_javadoccomment">	 * This method is similar to {@link #safeOpt(ThrowingSupplier)} but returns &lt;c&gt;null&lt;/c&gt; instead</em>
-<a class="jxr_linenumber" name="L1593" href="#L1593">1593</a> <em class="jxr_javadoccomment">	 * of &lt;c&gt;Optional.empty()&lt;/c&gt; when an exception occurs. Use this method when you prefer &lt;c&gt;null&lt;/c&gt;</em>
-<a class="jxr_linenumber" name="L1594" href="#L1594">1594</a> <em class="jxr_javadoccomment">	 * over &lt;c&gt;Optional&lt;/c&gt; for error handling.</em>
-<a class="jxr_linenumber" name="L1595" href="#L1595">1595</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1596" href="#L1596">1596</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L1597" href="#L1597">1597</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L1598" href="#L1598">1598</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Parse an integer, returning null if parsing fails&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L1599" href="#L1599">1599</a> <em class="jxr_javadoccomment">	 * 	Integer &lt;jv&gt;value&lt;/jv&gt; = &lt;jsm&gt;safeOrNull&lt;/jsm&gt;(() -&amp;gt; Integer.valueOf(&lt;js&gt;"123"&lt;/js&gt;));  &lt;jc&gt;// 123&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L1600" href="#L1600">1600</a> <em class="jxr_javadoccomment">	 * 	Integer &lt;jv&gt;invalid&lt;/jv&gt; = &lt;jsm&gt;safeOrNull&lt;/jsm&gt;(() -&amp;gt; Integer.valueOf(&lt;js&gt;"abc"&lt;/js&gt;));  &lt;jc&gt;// null&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L1601" href="#L1601">1601</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1602" href="#L1602">1602</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Use in a fluent chain to filter out failed conversions&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L1603" href="#L1603">1603</a> <em class="jxr_javadoccomment">	 * 	Optional&amp;lt;Integer&amp;gt; &lt;jv&gt;parsed&lt;/jv&gt; = get(&lt;js&gt;"my.property"&lt;/js&gt;)</em>
-<a class="jxr_linenumber" name="L1604" href="#L1604">1604</a> <em class="jxr_javadoccomment">	 * 		.map(&lt;jv&gt;v&lt;/jv&gt; -&amp;gt; &lt;jsm&gt;safeOrNull&lt;/jsm&gt;(() -&amp;gt; Integer.valueOf(&lt;jv&gt;v&lt;/jv&gt;)))</em>
-<a class="jxr_linenumber" name="L1605" href="#L1605">1605</a> <em class="jxr_javadoccomment">	 * 		.filter(Objects::nonNull);</em>
-<a class="jxr_linenumber" name="L1606" href="#L1606">1606</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L1607" href="#L1607">1607</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1608" href="#L1608">1608</a> <em class="jxr_javadoccomment">	 * @param &lt;T&gt; The return type.</em>
-<a class="jxr_linenumber" name="L1609" href="#L1609">1609</a> <em class="jxr_javadoccomment">	 * @param s The supplier that may throw an exception.</em>
-<a class="jxr_linenumber" name="L1610" href="#L1610">1610</a> <em class="jxr_javadoccomment">	 * @return The result of the supplier if successful, or &lt;c&gt;null&lt;/c&gt; if an exception was thrown.</em>
-<a class="jxr_linenumber" name="L1611" href="#L1611">1611</a> <em class="jxr_javadoccomment">	 * @see #safeOpt(ThrowingSupplier)</em>
-<a class="jxr_linenumber" name="L1612" href="#L1612">1612</a> <em class="jxr_javadoccomment">	 * @see #safe(ThrowingSupplier)</em>
-<a class="jxr_linenumber" name="L1613" href="#L1613">1613</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1614" href="#L1614">1614</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;T&gt; T safeOrNull(ThrowingSupplier&lt;T&gt; s) {
-<a class="jxr_linenumber" name="L1615" href="#L1615">1615</a> 		<strong class="jxr_keyword">return</strong> safeOpt(s).orElse(<strong class="jxr_keyword">null</strong>);
-<a class="jxr_linenumber" name="L1616" href="#L1616">1616</a> 	}
-<a class="jxr_linenumber" name="L1617" href="#L1617">1617</a> 
-<a class="jxr_linenumber" name="L1618" href="#L1618">1618</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1619" href="#L1619">1619</a> <em class="jxr_javadoccomment">	 * Allows you to wrap a supplier that throws an exception so that it can be used in a fluent interface.</em>
-<a class="jxr_linenumber" name="L1620" href="#L1620">1620</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1621" href="#L1621">1621</a> <em class="jxr_javadoccomment">	 * @param &lt;T&gt; The supplier type.</em>
-<a class="jxr_linenumber" name="L1622" href="#L1622">1622</a> <em class="jxr_javadoccomment">	 * @param supplier The supplier throwing an exception.</em>
-<a class="jxr_linenumber" name="L1623" href="#L1623">1623</a> <em class="jxr_javadoccomment">	 * @return The supplied result.</em>
-<a class="jxr_linenumber" name="L1624" href="#L1624">1624</a> <em class="jxr_javadoccomment">	 * @throws RuntimeException if supplier threw an exception.</em>
-<a class="jxr_linenumber" name="L1625" href="#L1625">1625</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1626" href="#L1626">1626</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;T&gt; T safeSupplier(ThrowableUtils.SupplierWithThrowable&lt;T&gt; supplier) {
-<a class="jxr_linenumber" name="L1627" href="#L1627">1627</a> 		<strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="L1628" href="#L1628">1628</a> 			<strong class="jxr_keyword">return</strong> supplier.get();
-<a class="jxr_linenumber" name="L1629" href="#L1629">1629</a> 		} <strong class="jxr_keyword">catch</strong> (RuntimeException t) {
-<a class="jxr_linenumber" name="L1630" href="#L1630">1630</a> 			<strong class="jxr_keyword">throw</strong> t;
-<a class="jxr_linenumber" name="L1631" href="#L1631">1631</a> 		} <strong class="jxr_keyword">catch</strong> (Throwable t) {
-<a class="jxr_linenumber" name="L1632" href="#L1632">1632</a> 			<strong class="jxr_keyword">throw</strong> toRex(t);
-<a class="jxr_linenumber" name="L1633" href="#L1633">1633</a> 		}
-<a class="jxr_linenumber" name="L1634" href="#L1634">1634</a> 	}
-<a class="jxr_linenumber" name="L1635" href="#L1635">1635</a> 
-<a class="jxr_linenumber" name="L1636" href="#L1636">1636</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1637" href="#L1637">1637</a> <em class="jxr_javadoccomment">	 * Allows you to wrap a supplier that throws an exception with a custom exception mapper.</em>
-<a class="jxr_linenumber" name="L1638" href="#L1638">1638</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1639" href="#L1639">1639</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L1640" href="#L1640">1640</a> <em class="jxr_javadoccomment">	 * This method allows you to define a function that converts any thrown throwable into a runtime exception.</em>
-<a class="jxr_linenumber" name="L1641" href="#L1641">1641</a> <em class="jxr_javadoccomment">	 * This is useful when you need to wrap exceptions in a specific runtime exception type.</em>
-<a class="jxr_linenumber" name="L1642" href="#L1642">1642</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1643" href="#L1643">1643</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
-<a class="jxr_linenumber" name="L1644" href="#L1644">1644</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
-<a class="jxr_linenumber" name="L1645" href="#L1645">1645</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Wrap a supplier with custom exception handling&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L1646" href="#L1646">1646</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;return&lt;/jk&gt; Utils.&lt;jsm&gt;safeSupplier&lt;/jsm&gt;(() -&amp;gt; {</em>
-<a class="jxr_linenumber" name="L1647" href="#L1647">1647</a> <em class="jxr_javadoccomment">	 * 		&lt;jc&gt;// some code that may throw&lt;/jc&gt;</em>
-<a class="jxr_linenumber" name="L1648" href="#L1648">1648</a> <em class="jxr_javadoccomment">	 * 		&lt;jk&gt;return&lt;/jk&gt; &lt;jv&gt;result&lt;/jv&gt;;</em>
-<a class="jxr_linenumber" name="L1649" href="#L1649">1649</a> <em class="jxr_javadoccomment">	 * 	}, &lt;jv&gt;e&lt;/jv&gt; -&amp;gt; &lt;jk&gt;new&lt;/jk&gt; CustomRuntimeException(&lt;jv&gt;e&lt;/jv&gt;));</em>
-<a class="jxr_linenumber" name="L1650" href="#L1650">1650</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L1651" href="#L1651">1651</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1652" href="#L1652">1652</a> <em class="jxr_javadoccomment">	 * @param &lt;T&gt; The supplier type.</em>
-<a class="jxr_linenumber" name="L1653" href="#L1653">1653</a> <em class="jxr_javadoccomment">	 * @param supplier The supplier throwing an exception.</em>
-<a class="jxr_linenumber" name="L1654" href="#L1654">1654</a> <em class="jxr_javadoccomment">	 * @param exceptionMapper A function that converts the thrown throwable into a runtime exception.</em>
-<a class="jxr_linenumber" name="L1655" href="#L1655">1655</a> <em class="jxr_javadoccomment">	 * @return The supplied result.</em>
-<a class="jxr_linenumber" name="L1656" href="#L1656">1656</a> <em class="jxr_javadoccomment">	 * @throws RuntimeException The exception returned by the exception mapper if the supplier threw a throwable.</em>
-<a class="jxr_linenumber" name="L1657" href="#L1657">1657</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1658" href="#L1658">1658</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;T&gt; T safeSupplier(ThrowableUtils.SupplierWithThrowable&lt;T&gt; supplier, Function&lt;Throwable, RuntimeException&gt; exceptionMapper) {
-<a class="jxr_linenumber" name="L1659" href="#L1659">1659</a> 		<strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="L1660" href="#L1660">1660</a> 			<strong class="jxr_keyword">return</strong> supplier.get();
-<a class="jxr_linenumber" name="L1661" href="#L1661">1661</a> 		} <strong class="jxr_keyword">catch</strong> (RuntimeException t) {
-<a class="jxr_linenumber" name="L1662" href="#L1662">1662</a> 			<strong class="jxr_keyword">throw</strong> t;
-<a class="jxr_linenumber" name="L1663" href="#L1663">1663</a> 		} <strong class="jxr_keyword">catch</strong> (Throwable t) {
-<a class="jxr_linenumber" name="L1664" href="#L1664">1664</a> 			<strong class="jxr_keyword">throw</strong> exceptionMapper.apply(t);
-<a class="jxr_linenumber" name="L1665" href="#L1665">1665</a> 		}
-<a class="jxr_linenumber" name="L1666" href="#L1666">1666</a> 	}
-<a class="jxr_linenumber" name="L1667" href="#L1667">1667</a> 
-<a class="jxr_linenumber" name="L1668" href="#L1668">1668</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1669" href="#L1669">1669</a> <em class="jxr_javadoccomment">	 * Helper method for creating StringBuilder objects.</em>
-<a class="jxr_linenumber" name="L1670" href="#L1670">1670</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1671" href="#L1671">1671</a> <em class="jxr_javadoccomment">	 * @param value The string value to wrap in a StringBuilder.</em>
-<a class="jxr_linenumber" name="L1672" href="#L1672">1672</a> <em class="jxr_javadoccomment">	 * @return A new StringBuilder containing the specified value.</em>
-<a class="jxr_linenumber" name="L1673" href="#L1673">1673</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1674" href="#L1674">1674</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> StringBuilder sb(String value) {
-<a class="jxr_linenumber" name="L1675" href="#L1675">1675</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> StringBuilder(value);
-<a class="jxr_linenumber" name="L1676" href="#L1676">1676</a> 	}
-<a class="jxr_linenumber" name="L1677" href="#L1677">1677</a> 
-<a class="jxr_linenumber" name="L1678" href="#L1678">1678</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1679" href="#L1679">1679</a> <em class="jxr_javadoccomment">	 * Shortcut for calling {@link StringUtils#stringSupplier(Supplier)}.</em>
-<a class="jxr_linenumber" name="L1680" href="#L1680">1680</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1681" href="#L1681">1681</a> <em class="jxr_javadoccomment">	 * @param s The supplier.</em>
-<a class="jxr_linenumber" name="L1682" href="#L1682">1682</a> <em class="jxr_javadoccomment">	 * @return A string supplier that calls {@link #r(Object)} on the supplied value.</em>
-<a class="jxr_linenumber" name="L1683" href="#L1683">1683</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1684" href="#L1684">1684</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> Supplier&lt;String&gt; ss(Supplier&lt;?&gt; s) {
-<a class="jxr_linenumber" name="L1685" href="#L1685">1685</a> 		<strong class="jxr_keyword">return</strong> stringSupplier(s);
-<a class="jxr_linenumber" name="L1686" href="#L1686">1686</a> 	}
-<a class="jxr_linenumber" name="L1687" href="#L1687">1687</a> 
-<a class="jxr_linenumber" name="L1688" href="#L1688">1688</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1689" href="#L1689">1689</a> <em class="jxr_javadoccomment">	 * Convenience method for calling {@link StringUtils#upperCase(String)}.</em>
-<a class="jxr_linenumber" name="L1690" href="#L1690">1690</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1691" href="#L1691">1691</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L1692" href="#L1692">1692</a> <em class="jxr_javadoccomment">	 * Converts the string to uppercase if not null.</em>
-<a class="jxr_linenumber" name="L1693" href="#L1693">1693</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1694" href="#L1694">1694</a> <em class="jxr_javadoccomment">	 * @param value The string to convert.</em>
-<a class="jxr_linenumber" name="L1695" href="#L1695">1695</a> <em class="jxr_javadoccomment">	 * @return The uppercase string, or &lt;jk&gt;null&lt;/jk&gt; if the input was &lt;jk&gt;null&lt;/jk&gt;.</em>
-<a class="jxr_linenumber" name="L1696" href="#L1696">1696</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1697" href="#L1697">1697</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> String uc(String value) {
-<a class="jxr_linenumber" name="L1698" href="#L1698">1698</a> 		<strong class="jxr_keyword">return</strong> StringUtils.upperCase(value);
+<a class="jxr_linenumber" name="L1559" href="#L1559">1559</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Get a value with a fallback if an exception occurs&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L1560" href="#L1560">1560</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;String&lt;/jk&gt; &lt;jv&gt;value&lt;/jv&gt; = &lt;jsm&gt;safeCatch&lt;/jsm&gt;(() -&amp;gt; &lt;jv&gt;riskyOperation&lt;/jv&gt;(), &lt;jv&gt;e&lt;/jv&gt; -&amp;gt; &lt;js&gt;"default"&lt;/js&gt;);</em>
+<a class="jxr_linenumber" name="L1561" href="#L1561">1561</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L1562" href="#L1562">1562</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1563" href="#L1563">1563</a> <em class="jxr_javadoccomment">	 * @param &lt;T&gt; The return type.</em>
+<a class="jxr_linenumber" name="L1564" href="#L1564">1564</a> <em class="jxr_javadoccomment">	 * @param s The supplier that may throw an exception.</em>
+<a class="jxr_linenumber" name="L1565" href="#L1565">1565</a> <em class="jxr_javadoccomment">	 * @param exceptionFunction A function that converts the thrown exception into a fallback value.</em>
+<a class="jxr_linenumber" name="L1566" href="#L1566">1566</a> <em class="jxr_javadoccomment">	 * @return The result of the supplier execution, or the fallback value if an exception was thrown.</em>
+<a class="jxr_linenumber" name="L1567" href="#L1567">1567</a> <em class="jxr_javadoccomment">	 * @see #safe(ThrowingSupplier)</em>
+<a class="jxr_linenumber" name="L1568" href="#L1568">1568</a> <em class="jxr_javadoccomment">	 * @see #safeOptCatch(ThrowingSupplier, Function)</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;T&gt; T safeCatch(ThrowingSupplier&lt;T&gt; s, Function&lt;Throwable,T&gt; exceptionFunction) {
+<a class="jxr_linenumber" name="L1571" href="#L1571">1571</a> 		<strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="L1572" href="#L1572">1572</a> 			<strong class="jxr_keyword">return</strong> s.get();
+<a class="jxr_linenumber" name="L1573" href="#L1573">1573</a> 		} <strong class="jxr_keyword">catch</strong> (Throwable e) {
+<a class="jxr_linenumber" name="L1574" href="#L1574">1574</a> 			<strong class="jxr_keyword">return</strong> exceptionFunction.apply(e);
+<a class="jxr_linenumber" name="L1575" href="#L1575">1575</a> 		}
+<a class="jxr_linenumber" name="L1576" href="#L1576">1576</a> 	}
+<a class="jxr_linenumber" name="L1577" href="#L1577">1577</a> 
+<a class="jxr_linenumber" name="L1578" href="#L1578">1578</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1579" href="#L1579">1579</a> <em class="jxr_javadoccomment">	 * Executes a supplier that may throw an exception and returns an Optional.</em>
+<a class="jxr_linenumber" name="L1580" href="#L1580">1580</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1581" href="#L1581">1581</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L1582" href="#L1582">1582</a> <em class="jxr_javadoccomment">	 * If the supplier executes successfully, returns {@link Optional#of(Object)} with the result.</em>
+<a class="jxr_linenumber" name="L1583" href="#L1583">1583</a> <em class="jxr_javadoccomment">	 * If the supplier throws any exception, returns {@link Optional#empty()}.</em>
+<a class="jxr_linenumber" name="L1584" href="#L1584">1584</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1585" href="#L1585">1585</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L1586" href="#L1586">1586</a> <em class="jxr_javadoccomment">	 * This is useful for operations that may fail but you want to handle the failure</em>
+<a class="jxr_linenumber" name="L1587" href="#L1587">1587</a> <em class="jxr_javadoccomment">	 * gracefully by returning an empty Optional instead of throwing an exception.</em>
+<a class="jxr_linenumber" name="L1588" href="#L1588">1588</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1589" href="#L1589">1589</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L1590" href="#L1590">1590</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L1591" href="#L1591">1591</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Check if AccessibleObject.isAccessible() method exists (Java 9+)&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L1592" href="#L1592">1592</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;boolean&lt;/jk&gt; &lt;jv&gt;isAccessible&lt;/jv&gt; = &lt;jsm&gt;safeOpt&lt;/jsm&gt;(() -&amp;gt;</em>
+<a class="jxr_linenumber" name="L1593" href="#L1593">1593</a> <em class="jxr_javadoccomment">	 * 		(&lt;jk&gt;boolean&lt;/jk&gt;)AccessibleObject.&lt;jk&gt;class&lt;/jk&gt;.getMethod(&lt;js&gt;"isAccessible"&lt;/js&gt;).invoke(&lt;jv&gt;obj&lt;/jv&gt;)</em>
+<a class="jxr_linenumber" name="L1594" href="#L1594">1594</a> <em class="jxr_javadoccomment">	 * 	).orElse(&lt;jk&gt;false&lt;/jk&gt;);</em>
+<a class="jxr_linenumber" name="L1595" href="#L1595">1595</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L1596" href="#L1596">1596</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1597" href="#L1597">1597</a> <em class="jxr_javadoccomment">	 * @param &lt;T&gt; The return type.</em>
+<a class="jxr_linenumber" name="L1598" href="#L1598">1598</a> <em class="jxr_javadoccomment">	 * @param s The supplier that may throw an exception.</em>
+<a class="jxr_linenumber" name="L1599" href="#L1599">1599</a> <em class="jxr_javadoccomment">	 * @return An Optional containing the result if successful, or empty if an exception was thrown.</em>
+<a class="jxr_linenumber" name="L1600" href="#L1600">1600</a> <em class="jxr_javadoccomment">	 * @see #safe(ThrowingSupplier)</em>
+<a class="jxr_linenumber" name="L1601" href="#L1601">1601</a> <em class="jxr_javadoccomment">	 * @see #opt(Object)</em>
+<a class="jxr_linenumber" name="L1602" href="#L1602">1602</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L1603" href="#L1603">1603</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;T&gt; Optional&lt;T&gt; safeOpt(ThrowingSupplier&lt;T&gt; s) {
+<a class="jxr_linenumber" name="L1604" href="#L1604">1604</a> 		<strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="L1605" href="#L1605">1605</a> 			<strong class="jxr_keyword">return</strong> Optional.of(s.get());
+<a class="jxr_linenumber" name="L1606" href="#L1606">1606</a> 		} <strong class="jxr_keyword">catch</strong> (@SuppressWarnings(<span class="jxr_string">"unused"</span>) Exception e) {
+<a class="jxr_linenumber" name="L1607" href="#L1607">1607</a> 			<strong class="jxr_keyword">return</strong> Optional.empty();
+<a class="jxr_linenumber" name="L1608" href="#L1608">1608</a> 		}
+<a class="jxr_linenumber" name="L1609" href="#L1609">1609</a> 	}
+<a class="jxr_linenumber" name="L1610" href="#L1610">1610</a> 
+<a class="jxr_linenumber" name="L1611" href="#L1611">1611</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1612" href="#L1612">1612</a> <em class="jxr_javadoccomment">	 * Executes a supplier that may throw an exception and returns an Optional with the result or a fallback value.</em>
+<a class="jxr_linenumber" name="L1613" href="#L1613">1613</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1614" href="#L1614">1614</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L1615" href="#L1615">1615</a> <em class="jxr_javadoccomment">	 * If the supplier executes successfully, returns {@link Optional#of(Object)} with the result.</em>
+<a class="jxr_linenumber" name="L1616" href="#L1616">1616</a> <em class="jxr_javadoccomment">	 * If the supplier throws any exception, applies the exception function to get a fallback value and returns it wrapped in an Optional.</em>
+<a class="jxr_linenumber" name="L1617" href="#L1617">1617</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1618" href="#L1618">1618</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L1619" href="#L1619">1619</a> <em class="jxr_javadoccomment">	 * This is useful for operations that may fail but you want to handle the failure</em>
+<a class="jxr_linenumber" name="L1620" href="#L1620">1620</a> <em class="jxr_javadoccomment">	 * gracefully by returning a fallback value wrapped in an Optional instead of throwing an exception.</em>
+<a class="jxr_linenumber" name="L1621" href="#L1621">1621</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1622" href="#L1622">1622</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L1623" href="#L1623">1623</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L1624" href="#L1624">1624</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Get a value with a fallback if an exception occurs&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L1625" href="#L1625">1625</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;Optional&lt;/jk&gt;&amp;lt;&lt;jk&gt;String&lt;/jk&gt;&amp;gt; &lt;jv&gt;value&lt;/jv&gt; = &lt;jsm&gt;safeOptCatch&lt;/jsm&gt;(() -&amp;gt; &lt;jv&gt;riskyOperation&lt;/jv&gt;(), &lt;jv&gt;e&lt;/jv&gt; -&amp;gt; &lt;js&gt;"default"&lt;/js&gt;);</em>
+<a class="jxr_linenumber" name="L1626" href="#L1626">1626</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L1627" href="#L1627">1627</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1628" href="#L1628">1628</a> <em class="jxr_javadoccomment">	 * @param &lt;T&gt; The return type.</em>
+<a class="jxr_linenumber" name="L1629" href="#L1629">1629</a> <em class="jxr_javadoccomment">	 * @param s The supplier that may throw an exception.</em>
+<a class="jxr_linenumber" name="L1630" href="#L1630">1630</a> <em class="jxr_javadoccomment">	 * @param exceptionFunction A function that converts the thrown exception into a fallback value.</em>
+<a class="jxr_linenumber" name="L1631" href="#L1631">1631</a> <em class="jxr_javadoccomment">	 * @return An Optional containing the result if successful, or the fallback value wrapped in an Optional if an exception was thrown.</em>
+<a class="jxr_linenumber" name="L1632" href="#L1632">1632</a> <em class="jxr_javadoccomment">	 * @see #safeOpt(ThrowingSupplier)</em>
+<a class="jxr_linenumber" name="L1633" href="#L1633">1633</a> <em class="jxr_javadoccomment">	 * @see #safeCatch(ThrowingSupplier, Function)</em>
+<a class="jxr_linenumber" name="L1634" href="#L1634">1634</a> <em class="jxr_javadoccomment">	 * @see #opt(Object)</em>
+<a class="jxr_linenumber" name="L1635" href="#L1635">1635</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L1636" href="#L1636">1636</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;T&gt; Optional&lt;T&gt; safeOptCatch(ThrowingSupplier&lt;T&gt; s, Function&lt;Throwable,T&gt; exceptionFunction) {
+<a class="jxr_linenumber" name="L1637" href="#L1637">1637</a> 		<strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="L1638" href="#L1638">1638</a> 			<strong class="jxr_keyword">return</strong> opt(s.get());
+<a class="jxr_linenumber" name="L1639" href="#L1639">1639</a> 		} <strong class="jxr_keyword">catch</strong> (Throwable e) {
+<a class="jxr_linenumber" name="L1640" href="#L1640">1640</a> 			<strong class="jxr_keyword">return</strong> opt(exceptionFunction.apply(e));
+<a class="jxr_linenumber" name="L1641" href="#L1641">1641</a> 		}
+<a class="jxr_linenumber" name="L1642" href="#L1642">1642</a> 	}
+<a class="jxr_linenumber" name="L1643" href="#L1643">1643</a> 
+<a class="jxr_linenumber" name="L1644" href="#L1644">1644</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1645" href="#L1645">1645</a> <em class="jxr_javadoccomment">	 * Executes a supplier that may throw an exception and returns the result or &lt;c&gt;null&lt;/c&gt;.</em>
+<a class="jxr_linenumber" name="L1646" href="#L1646">1646</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1647" href="#L1647">1647</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L1648" href="#L1648">1648</a> <em class="jxr_javadoccomment">	 * If the supplier executes successfully, returns the result.</em>
+<a class="jxr_linenumber" name="L1649" href="#L1649">1649</a> <em class="jxr_javadoccomment">	 * If the supplier throws any exception, returns &lt;c&gt;null&lt;/c&gt;.</em>
+<a class="jxr_linenumber" name="L1650" href="#L1650">1650</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1651" href="#L1651">1651</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L1652" href="#L1652">1652</a> <em class="jxr_javadoccomment">	 * This is useful for operations that may fail but you want to handle the failure</em>
+<a class="jxr_linenumber" name="L1653" href="#L1653">1653</a> <em class="jxr_javadoccomment">	 * gracefully by returning &lt;c&gt;null&lt;/c&gt; instead of throwing an exception. This is particularly</em>
+<a class="jxr_linenumber" name="L1654" href="#L1654">1654</a> <em class="jxr_javadoccomment">	 * useful in fluent method chains where you want to filter out failed conversions.</em>
+<a class="jxr_linenumber" name="L1655" href="#L1655">1655</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1656" href="#L1656">1656</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L1657" href="#L1657">1657</a> <em class="jxr_javadoccomment">	 * This method is similar to {@link #safeOpt(ThrowingSupplier)} but returns &lt;c&gt;null&lt;/c&gt; instead</em>
+<a class="jxr_linenumber" name="L1658" href="#L1658">1658</a> <em class="jxr_javadoccomment">	 * of &lt;c&gt;Optional.empty()&lt;/c&gt; when an exception occurs. Use this method when you prefer &lt;c&gt;null&lt;/c&gt;</em>
+<a class="jxr_linenumber" name="L1659" href="#L1659">1659</a> <em class="jxr_javadoccomment">	 * over &lt;c&gt;Optional&lt;/c&gt; for error handling.</em>
+<a class="jxr_linenumber" name="L1660" href="#L1660">1660</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1661" href="#L1661">1661</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L1662" href="#L1662">1662</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L1663" href="#L1663">1663</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Parse an integer, returning null if parsing fails&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L1664" href="#L1664">1664</a> <em class="jxr_javadoccomment">	 * 	Integer &lt;jv&gt;value&lt;/jv&gt; = &lt;jsm&gt;safeOrNull&lt;/jsm&gt;(() -&amp;gt; Integer.valueOf(&lt;js&gt;"123"&lt;/js&gt;));  &lt;jc&gt;// 123&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L1665" href="#L1665">1665</a> <em class="jxr_javadoccomment">	 * 	Integer &lt;jv&gt;invalid&lt;/jv&gt; = &lt;jsm&gt;safeOrNull&lt;/jsm&gt;(() -&amp;gt; Integer.valueOf(&lt;js&gt;"abc"&lt;/js&gt;));  &lt;jc&gt;// null&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L1666" href="#L1666">1666</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1667" href="#L1667">1667</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Use in a fluent chain to filter out failed conversions&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L1668" href="#L1668">1668</a> <em class="jxr_javadoccomment">	 * 	Optional&amp;lt;Integer&amp;gt; &lt;jv&gt;parsed&lt;/jv&gt; = get(&lt;js&gt;"my.property"&lt;/js&gt;)</em>
+<a class="jxr_linenumber" name="L1669" href="#L1669">1669</a> <em class="jxr_javadoccomment">	 * 		.map(&lt;jv&gt;v&lt;/jv&gt; -&amp;gt; &lt;jsm&gt;safeOrNull&lt;/jsm&gt;(() -&amp;gt; Integer.valueOf(&lt;jv&gt;v&lt;/jv&gt;)))</em>
+<a class="jxr_linenumber" name="L1670" href="#L1670">1670</a> <em class="jxr_javadoccomment">	 * 		.filter(Objects::nonNull);</em>
+<a class="jxr_linenumber" name="L1671" href="#L1671">1671</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L1672" href="#L1672">1672</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1673" href="#L1673">1673</a> <em class="jxr_javadoccomment">	 * @param &lt;T&gt; The return type.</em>
+<a class="jxr_linenumber" name="L1674" href="#L1674">1674</a> <em class="jxr_javadoccomment">	 * @param s The supplier that may throw an exception.</em>
+<a class="jxr_linenumber" name="L1675" href="#L1675">1675</a> <em class="jxr_javadoccomment">	 * @return The result of the supplier if successful, or &lt;c&gt;null&lt;/c&gt; if an exception was thrown.</em>
+<a class="jxr_linenumber" name="L1676" href="#L1676">1676</a> <em class="jxr_javadoccomment">	 * @see #safeOpt(ThrowingSupplier)</em>
+<a class="jxr_linenumber" name="L1677" href="#L1677">1677</a> <em class="jxr_javadoccomment">	 * @see #safe(ThrowingSupplier)</em>
+<a class="jxr_linenumber" name="L1678" href="#L1678">1678</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L1679" href="#L1679">1679</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;T&gt; T safeOrNull(ThrowingSupplier&lt;T&gt; s) {
+<a class="jxr_linenumber" name="L1680" href="#L1680">1680</a> 		<strong class="jxr_keyword">return</strong> safeOpt(s).orElse(<strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="L1681" href="#L1681">1681</a> 	}
+<a class="jxr_linenumber" name="L1682" href="#L1682">1682</a> 
+<a class="jxr_linenumber" name="L1683" href="#L1683">1683</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1684" href="#L1684">1684</a> <em class="jxr_javadoccomment">	 * Allows you to wrap a supplier that throws an exception so that it can be used in a fluent interface.</em>
+<a class="jxr_linenumber" name="L1685" href="#L1685">1685</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1686" href="#L1686">1686</a> <em class="jxr_javadoccomment">	 * @param &lt;T&gt; The supplier type.</em>
+<a class="jxr_linenumber" name="L1687" href="#L1687">1687</a> <em class="jxr_javadoccomment">	 * @param supplier The supplier throwing an exception.</em>
+<a class="jxr_linenumber" name="L1688" href="#L1688">1688</a> <em class="jxr_javadoccomment">	 * @return The supplied result.</em>
+<a class="jxr_linenumber" name="L1689" href="#L1689">1689</a> <em class="jxr_javadoccomment">	 * @throws RuntimeException if supplier threw an exception.</em>
+<a class="jxr_linenumber" name="L1690" href="#L1690">1690</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L1691" href="#L1691">1691</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;T&gt; T safeSupplier(ThrowableUtils.SupplierWithThrowable&lt;T&gt; supplier) {
+<a class="jxr_linenumber" name="L1692" href="#L1692">1692</a> 		<strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="L1693" href="#L1693">1693</a> 			<strong class="jxr_keyword">return</strong> supplier.get();
+<a class="jxr_linenumber" name="L1694" href="#L1694">1694</a> 		} <strong class="jxr_keyword">catch</strong> (RuntimeException t) {
+<a class="jxr_linenumber" name="L1695" href="#L1695">1695</a> 			<strong class="jxr_keyword">throw</strong> t;
+<a class="jxr_linenumber" name="L1696" href="#L1696">1696</a> 		} <strong class="jxr_keyword">catch</strong> (Throwable t) {
+<a class="jxr_linenumber" name="L1697" href="#L1697">1697</a> 			<strong class="jxr_keyword">throw</strong> toRex(t);
+<a class="jxr_linenumber" name="L1698" href="#L1698">1698</a> 		}
 <a class="jxr_linenumber" name="L1699" href="#L1699">1699</a> 	}
 <a class="jxr_linenumber" name="L1700" href="#L1700">1700</a> 
 <a class="jxr_linenumber" name="L1701" href="#L1701">1701</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1702" href="#L1702">1702</a> <em class="jxr_javadoccomment">	 * If the specified object is a {@link Supplier} or {@link Value}, returns the inner value, otherwise the same value.</em>
+<a class="jxr_linenumber" name="L1702" href="#L1702">1702</a> <em class="jxr_javadoccomment">	 * Allows you to wrap a supplier that throws an exception with a custom exception mapper.</em>
 <a class="jxr_linenumber" name="L1703" href="#L1703">1703</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1704" href="#L1704">1704</a> <em class="jxr_javadoccomment">	 * @param o The object to unwrap.</em>
-<a class="jxr_linenumber" name="L1705" href="#L1705">1705</a> <em class="jxr_javadoccomment">	 * @return The unwrapped object.</em>
-<a class="jxr_linenumber" name="L1706" href="#L1706">1706</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1707" href="#L1707">1707</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> Object unwrap(Object o) {
-<a class="jxr_linenumber" name="L1708" href="#L1708">1708</a> 		<strong class="jxr_keyword">if</strong> (o instanceof Supplier&lt;?&gt; o2)
-<a class="jxr_linenumber" name="L1709" href="#L1709">1709</a> 			o = unwrap(o2.get());
-<a class="jxr_linenumber" name="L1710" href="#L1710">1710</a> 		<strong class="jxr_keyword">if</strong> (o instanceof Value&lt;?&gt; o2)
-<a class="jxr_linenumber" name="L1711" href="#L1711">1711</a> 			o = unwrap(o2.get());
-<a class="jxr_linenumber" name="L1712" href="#L1712">1712</a> 		<strong class="jxr_keyword">if</strong> (o instanceof Optional&lt;?&gt; o2)
-<a class="jxr_linenumber" name="L1713" href="#L1713">1713</a> 			o = unwrap(o2.orElse(<strong class="jxr_keyword">null</strong>));
-<a class="jxr_linenumber" name="L1714" href="#L1714">1714</a> 		<strong class="jxr_keyword">return</strong> o;
-<a class="jxr_linenumber" name="L1715" href="#L1715">1715</a> 	}
-<a class="jxr_linenumber" name="L1716" href="#L1716">1716</a> 
-<a class="jxr_linenumber" name="L1717" href="#L1717">1717</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1718" href="#L1718">1718</a> <em class="jxr_javadoccomment">	 * Converts a property name to an environment variable name.</em>
-<a class="jxr_linenumber" name="L1719" href="#L1719">1719</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1720" href="#L1720">1720</a> <em class="jxr_javadoccomment">	 * @param name The property name to convert.</em>
-<a class="jxr_linenumber" name="L1721" href="#L1721">1721</a> <em class="jxr_javadoccomment">	 * @return The environment variable name (uppercase with dots replaced by underscores).</em>
+<a class="jxr_linenumber" name="L1704" href="#L1704">1704</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L1705" href="#L1705">1705</a> <em class="jxr_javadoccomment">	 * This method allows you to define a function that converts any thrown throwable into a runtime exception.</em>
+<a class="jxr_linenumber" name="L1706" href="#L1706">1706</a> <em class="jxr_javadoccomment">	 * This is useful when you need to wrap exceptions in a specific runtime exception type.</em>
+<a class="jxr_linenumber" name="L1707" href="#L1707">1707</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1708" href="#L1708">1708</a> <em class="jxr_javadoccomment">	 * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;</em>
+<a class="jxr_linenumber" name="L1709" href="#L1709">1709</a> <em class="jxr_javadoccomment">	 * &lt;p class='bjava'&gt;</em>
+<a class="jxr_linenumber" name="L1710" href="#L1710">1710</a> <em class="jxr_javadoccomment">	 * 	&lt;jc&gt;// Wrap a supplier with custom exception handling&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L1711" href="#L1711">1711</a> <em class="jxr_javadoccomment">	 * 	&lt;jk&gt;return&lt;/jk&gt; Utils.&lt;jsm&gt;safeSupplier&lt;/jsm&gt;(() -&amp;gt; {</em>
+<a class="jxr_linenumber" name="L1712" href="#L1712">1712</a> <em class="jxr_javadoccomment">	 * 		&lt;jc&gt;// some code that may throw&lt;/jc&gt;</em>
+<a class="jxr_linenumber" name="L1713" href="#L1713">1713</a> <em class="jxr_javadoccomment">	 * 		&lt;jk&gt;return&lt;/jk&gt; &lt;jv&gt;result&lt;/jv&gt;;</em>
+<a class="jxr_linenumber" name="L1714" href="#L1714">1714</a> <em class="jxr_javadoccomment">	 * 	}, &lt;jv&gt;e&lt;/jv&gt; -&amp;gt; &lt;jk&gt;new&lt;/jk&gt; CustomRuntimeException(&lt;jv&gt;e&lt;/jv&gt;));</em>
+<a class="jxr_linenumber" name="L1715" href="#L1715">1715</a> <em class="jxr_javadoccomment">	 * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L1716" href="#L1716">1716</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1717" href="#L1717">1717</a> <em class="jxr_javadoccomment">	 * @param &lt;T&gt; The supplier type.</em>
+<a class="jxr_linenumber" name="L1718" href="#L1718">1718</a> <em class="jxr_javadoccomment">	 * @param supplier The supplier throwing an exception.</em>
+<a class="jxr_linenumber" name="L1719" href="#L1719">1719</a> <em class="jxr_javadoccomment">	 * @param exceptionMapper A function that converts the thrown throwable into a runtime exception.</em>
+<a class="jxr_linenumber" name="L1720" href="#L1720">1720</a> <em class="jxr_javadoccomment">	 * @return The supplied result.</em>
+<a class="jxr_linenumber" name="L1721" href="#L1721">1721</a> <em class="jxr_javadoccomment">	 * @throws RuntimeException The exception returned by the exception mapper if the supplier threw a throwable.</em>
 <a class="jxr_linenumber" name="L1722" href="#L1722">1722</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1723" href="#L1723">1723</a> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> String envName(String name) {
-<a class="jxr_linenumber" name="L1724" href="#L1724">1724</a> 		<strong class="jxr_keyword">return</strong> PROPERTY_TO_ENV.computeIfAbsent(name, x -&gt; x.toUpperCase().replace(<span class="jxr_string">"."</span>, <span class="jxr_string">"_"</span>));
-<a class="jxr_linenumber" name="L1725" href="#L1725">1725</a> 	}
-<a class="jxr_linenumber" name="L1726" href="#L1726">1726</a> 
-<a class="jxr_linenumber" name="L1727" href="#L1727">1727</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1728" href="#L1728">1728</a> <em class="jxr_javadoccomment">	 * Converts a string to the specified type using registered conversion functions.</em>
-<a class="jxr_linenumber" name="L1729" href="#L1729">1729</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1730" href="#L1730">1730</a> <em class="jxr_javadoccomment">	 * @param &lt;T&gt; The target type.</em>
-<a class="jxr_linenumber" name="L1731" href="#L1731">1731</a> <em class="jxr_javadoccomment">	 * @param s The string to convert.</em>
-<a class="jxr_linenumber" name="L1732" href="#L1732">1732</a> <em class="jxr_javadoccomment">	 * @param def The default value (used to determine the target type).</em>
-<a class="jxr_linenumber" name="L1733" href="#L1733">1733</a> <em class="jxr_javadoccomment">	 * @return The converted value, or &lt;jk&gt;null&lt;/jk&gt; if the string or default is &lt;jk&gt;null&lt;/jk&gt;.</em>
-<a class="jxr_linenumber" name="L1734" href="#L1734">1734</a> <em class="jxr_javadoccomment">	 * @throws RuntimeException If the type is not supported for conversion.</em>
-<a class="jxr_linenumber" name="L1735" href="#L1735">1735</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1736" href="#L1736">1736</a> 	@SuppressWarnings({ <span class="jxr_string">"unchecked"</span>, <span class="jxr_string">"rawtypes"</span> })
-<a class="jxr_linenumber" name="L1737" href="#L1737">1737</a> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> &lt;T&gt; T toType(String s, T def) {
-<a class="jxr_linenumber" name="L1738" href="#L1738">1738</a> 		<strong class="jxr_keyword">if</strong> (s == <strong class="jxr_keyword">null</strong> || def == <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L1739" href="#L1739">1739</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L1740" href="#L1740">1740</a> 		<strong class="jxr_keyword">var</strong> c = (Class&lt;T&gt;)def.getClass();
-<a class="jxr_linenumber" name="L1741" href="#L1741">1741</a> 		<strong class="jxr_keyword">if</strong> (c == String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L1742" href="#L1742">1742</a> 			<strong class="jxr_keyword">return</strong> (T)s;
-<a class="jxr_linenumber" name="L1743" href="#L1743">1743</a> 		<strong class="jxr_keyword">if</strong> (c.isEnum())
-<a class="jxr_linenumber" name="L1744" href="#L1744">1744</a> 			<strong class="jxr_keyword">return</strong> (T)Enum.valueOf((Class&lt;? <strong class="jxr_keyword">extends</strong> Enum&gt;)c, s);
-<a class="jxr_linenumber" name="L1745" href="#L1745">1745</a> 		<strong class="jxr_keyword">var</strong> f = (Function&lt;String,T&gt;)ENV_FUNCTIONS.get(c);
-<a class="jxr_linenumber" name="L1746" href="#L1746">1746</a> 		<strong class="jxr_keyword">if</strong> (f == <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L1747" href="#L1747">1747</a> 			<strong class="jxr_keyword">throw</strong> rex(<span class="jxr_string">"Invalid env type: {0}"</span>, c);
-<a class="jxr_linenumber" name="L1748" href="#L1748">1748</a> 		<strong class="jxr_keyword">return</strong> f.apply(s);
-<a class="jxr_linenumber" name="L1749" href="#L1749">1749</a> 	}
-<a class="jxr_linenumber" name="L1750" href="#L1750">1750</a> 
-<a class="jxr_linenumber" name="L1751" href="#L1751">1751</a> 	<em class="jxr_javadoccomment">/** Constructor - This class is meant to be subclasses. */</em>
-<a class="jxr_linenumber" name="L1752" href="#L1752">1752</a> 	<strong class="jxr_keyword">protected</strong> <a name="Utils" href="../../../../../org/apache/juneau/commons/utils/Utils.html#Utils">Utils</a>() {}
-<a class="jxr_linenumber" name="L1753" href="#L1753">1753</a> 
-<a class="jxr_linenumber" name="L1754" href="#L1754">1754</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1755" href="#L1755">1755</a> <em class="jxr_javadoccomment">	 * Returns the specified string, or &lt;jk&gt;null&lt;/jk&gt; if that string is &lt;jk&gt;null&lt;/jk&gt; or empty.</em>
-<a class="jxr_linenumber" name="L1756" href="#L1756">1756</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1757" href="#L1757">1757</a> <em class="jxr_javadoccomment">	 * @param value The string value to check.</em>
-<a class="jxr_linenumber" name="L1758" href="#L1758">1758</a> <em class="jxr_javadoccomment">	 * @return The string value, or &lt;jk&gt;null&lt;/jk&gt; if the string is &lt;jk&gt;null&lt;/jk&gt; or empty.</em>
-<a class="jxr_linenumber" name="L1759" href="#L1759">1759</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1760" href="#L1760">1760</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> String nullIfEmpty(String value) {
-<a class="jxr_linenumber" name="L1761" href="#L1761">1761</a> 		<strong class="jxr_keyword">return</strong> StringUtils.isEmpty(value) ? <strong class="jxr_keyword">null</strong> : value;
-<a class="jxr_linenumber" name="L1762" href="#L1762">1762</a> 	}
-<a class="jxr_linenumber" name="L1763" href="#L1763">1763</a> 
-<a class="jxr_linenumber" name="L1764" href="#L1764">1764</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1765" href="#L1765">1765</a> <em class="jxr_javadoccomment">	 * Returns &lt;jk&gt;null&lt;/jk&gt; if the specified map is &lt;jk&gt;null&lt;/jk&gt; or empty, otherwise returns the map.</em>
-<a class="jxr_linenumber" name="L1766" href="#L1766">1766</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1767" href="#L1767">1767</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L1768" href="#L1768">1768</a> <em class="jxr_javadoccomment">	 * This is a convenience method for preserving backward compatibility when maps are initialized immediately</em>
-<a class="jxr_linenumber" name="L1769" href="#L1769">1769</a> <em class="jxr_javadoccomment">	 * but getters should return &lt;jk&gt;null&lt;/jk&gt; if the map is empty.</em>
-<a class="jxr_linenumber" name="L1770" href="#L1770">1770</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1771" href="#L1771">1771</a> <em class="jxr_javadoccomment">	 * @param &lt;K&gt; The key type.</em>
-<a class="jxr_linenumber" name="L1772" href="#L1772">1772</a> <em class="jxr_javadoccomment">	 * @param &lt;V&gt; The value type.</em>
-<a class="jxr_linenumber" name="L1773" href="#L1773">1773</a> <em class="jxr_javadoccomment">	 * @param val The map to check.</em>
-<a class="jxr_linenumber" name="L1774" href="#L1774">1774</a> <em class="jxr_javadoccomment">	 * @return &lt;jk&gt;null&lt;/jk&gt; if the map is &lt;jk&gt;null&lt;/jk&gt; or empty, otherwise the map itself.</em>
-<a class="jxr_linenumber" name="L1775" href="#L1775">1775</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1776" href="#L1776">1776</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;K,V&gt; Map&lt;K,V&gt; nullIfEmpty(Map&lt;K,V&gt; val) {
-<a class="jxr_linenumber" name="L1777" href="#L1777">1777</a> 		<strong class="jxr_keyword">return</strong> isEmpty(val) ? <strong class="jxr_keyword">null</strong> : val;
-<a class="jxr_linenumber" name="L1778" href="#L1778">1778</a> 	}
-<a class="jxr_linenumber" name="L1779" href="#L1779">1779</a> 
-<a class="jxr_linenumber" name="L1780" href="#L1780">1780</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1781" href="#L1781">1781</a> <em class="jxr_javadoccomment">	 * Returns &lt;jk&gt;null&lt;/jk&gt; if the specified list is &lt;jk&gt;null&lt;/jk&gt; or empty, otherwise returns the list.</em>
-<a class="jxr_linenumber" name="L1782" href="#L1782">1782</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1783" href="#L1783">1783</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L1784" href="#L1784">1784</a> <em class="jxr_javadoccomment">	 * This is a convenience method for preserving backward compatibility when lists are initialized immediately</em>
-<a class="jxr_linenumber" name="L1785" href="#L1785">1785</a> <em class="jxr_javadoccomment">	 * but getters should return &lt;jk&gt;null&lt;/jk&gt; if the list is empty.</em>
-<a class="jxr_linenumber" name="L1786" href="#L1786">1786</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1787" href="#L1787">1787</a> <em class="jxr_javadoccomment">	 * @param &lt;E&gt; The element type.</em>
-<a class="jxr_linenumber" name="L1788" href="#L1788">1788</a> <em class="jxr_javadoccomment">	 * @param val The list to check.</em>
-<a class="jxr_linenumber" name="L1789" href="#L1789">1789</a> <em class="jxr_javadoccomment">	 * @return &lt;jk&gt;null&lt;/jk&gt; if the list is &lt;jk&gt;null&lt;/jk&gt; or empty, otherwise the list itself.</em>
-<a class="jxr_linenumber" name="L1790" href="#L1790">1790</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1791" href="#L1791">1791</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;E&gt; List&lt;E&gt; nullIfEmpty(List&lt;E&gt; val) {
-<a class="jxr_linenumber" name="L1792" href="#L1792">1792</a> 		<strong class="jxr_keyword">return</strong> isEmpty(val) ? <strong class="jxr_keyword">null</strong> : val;
-<a class="jxr_linenumber" name="L1793" href="#L1793">1793</a> 	}
-<a class="jxr_linenumber" name="L1794" href="#L1794">1794</a> 
-<a class="jxr_linenumber" name="L1795" href="#L1795">1795</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L1796" href="#L1796">1796</a> <em class="jxr_javadoccomment">	 * Returns &lt;jk&gt;null&lt;/jk&gt; if the specified set is &lt;jk&gt;null&lt;/jk&gt; or empty, otherwise returns the set.</em>
-<a class="jxr_linenumber" name="L1797" href="#L1797">1797</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1798" href="#L1798">1798</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L1799" href="#L1799">1799</a> <em class="jxr_javadoccomment">	 * This is a convenience method for preserving backward compatibility when sets are initialized immediately</em>
-<a class="jxr_linenumber" name="L1800" href="#L1800">1800</a> <em class="jxr_javadoccomment">	 * but getters should return &lt;jk&gt;null&lt;/jk&gt; if the set is empty.</em>
-<a class="jxr_linenumber" name="L1801" href="#L1801">1801</a> <em class="jxr_javadoccomment">	 *</em>
-<a class="jxr_linenumber" name="L1802" href="#L1802">1802</a> <em class="jxr_javadoccomment">	 * @param &lt;E&gt; The element type.</em>
-<a class="jxr_linenumber" name="L1803" href="#L1803">1803</a> <em class="jxr_javadoccomment">	 * @param val The set to check.</em>
-<a class="jxr_linenumber" name="L1804" href="#L1804">1804</a> <em class="jxr_javadoccomment">	 * @return &lt;jk&gt;null&lt;/jk&gt; if the set is &lt;jk&gt;null&lt;/jk&gt; or empty, otherwise the set itself.</em>
-<a class="jxr_linenumber" name="L1805" href="#L1805">1805</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L1806" href="#L1806">1806</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;E&gt; Set&lt;E&gt; nullIfEmpty(Set&lt;E&gt; val) {
-<a class="jxr_linenumber" name="L1807" href="#L1807">1807</a> 		<strong class="jxr_keyword">return</strong> isEmpty(val) ? <strong class="jxr_keyword">null</strong> : val;
-<a class="jxr_linenumber" name="L1808" href="#L1808">1808</a> 	}
-<a class="jxr_linenumber" name="L1809" href="#L1809">1809</a> 
-<a class="jxr_linenumber" name="L1810" href="#L1810">1810</a> }
+<a class="jxr_linenumber" name="L1723" href="#L1723">1723</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;T&gt; T safeSupplier(ThrowableUtils.SupplierWithThrowable&lt;T&gt; supplier, Function&lt;Throwable, RuntimeException&gt; exceptionMapper) {
+<a class="jxr_linenumber" name="L1724" href="#L1724">1724</a> 		<strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="L1725" href="#L1725">1725</a> 			<strong class="jxr_keyword">return</strong> supplier.get();
+<a class="jxr_linenumber" name="L1726" href="#L1726">1726</a> 		} <strong class="jxr_keyword">catch</strong> (RuntimeException t) {
+<a class="jxr_linenumber" name="L1727" href="#L1727">1727</a> 			<strong class="jxr_keyword">throw</strong> t;
+<a class="jxr_linenumber" name="L1728" href="#L1728">1728</a> 		} <strong class="jxr_keyword">catch</strong> (Throwable t) {
+<a class="jxr_linenumber" name="L1729" href="#L1729">1729</a> 			<strong class="jxr_keyword">throw</strong> exceptionMapper.apply(t);
+<a class="jxr_linenumber" name="L1730" href="#L1730">1730</a> 		}
+<a class="jxr_linenumber" name="L1731" href="#L1731">1731</a> 	}
+<a class="jxr_linenumber" name="L1732" href="#L1732">1732</a> 
+<a class="jxr_linenumber" name="L1733" href="#L1733">1733</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1734" href="#L1734">1734</a> <em class="jxr_javadoccomment">	 * Helper method for creating StringBuilder objects.</em>
+<a class="jxr_linenumber" name="L1735" href="#L1735">1735</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1736" href="#L1736">1736</a> <em class="jxr_javadoccomment">	 * @param value The string value to wrap in a StringBuilder.</em>
+<a class="jxr_linenumber" name="L1737" href="#L1737">1737</a> <em class="jxr_javadoccomment">	 * @return A new StringBuilder containing the specified value.</em>
+<a class="jxr_linenumber" name="L1738" href="#L1738">1738</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L1739" href="#L1739">1739</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> StringBuilder sb(String value) {
+<a class="jxr_linenumber" name="L1740" href="#L1740">1740</a> 		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> StringBuilder(value);
+<a class="jxr_linenumber" name="L1741" href="#L1741">1741</a> 	}
+<a class="jxr_linenumber" name="L1742" href="#L1742">1742</a> 
+<a class="jxr_linenumber" name="L1743" href="#L1743">1743</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1744" href="#L1744">1744</a> <em class="jxr_javadoccomment">	 * Shortcut for calling {@link StringUtils#stringSupplier(Supplier)}.</em>
+<a class="jxr_linenumber" name="L1745" href="#L1745">1745</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1746" href="#L1746">1746</a> <em class="jxr_javadoccomment">	 * @param s The supplier.</em>
+<a class="jxr_linenumber" name="L1747" href="#L1747">1747</a> <em class="jxr_javadoccomment">	 * @return A string supplier that calls {@link #r(Object)} on the supplied value.</em>
+<a class="jxr_linenumber" name="L1748" href="#L1748">1748</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L1749" href="#L1749">1749</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> Supplier&lt;String&gt; ss(Supplier&lt;?&gt; s) {
+<a class="jxr_linenumber" name="L1750" href="#L1750">1750</a> 		<strong class="jxr_keyword">return</strong> stringSupplier(s);
+<a class="jxr_linenumber" name="L1751" href="#L1751">1751</a> 	}
+<a class="jxr_linenumber" name="L1752" href="#L1752">1752</a> 
+<a class="jxr_linenumber" name="L1753" href="#L1753">1753</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1754" href="#L1754">1754</a> <em class="jxr_javadoccomment">	 * Convenience method for calling {@link StringUtils#upperCase(String)}.</em>
+<a class="jxr_linenumber" name="L1755" href="#L1755">1755</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1756" href="#L1756">1756</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L1757" href="#L1757">1757</a> <em class="jxr_javadoccomment">	 * Converts the string to uppercase if not null.</em>
+<a class="jxr_linenumber" name="L1758" href="#L1758">1758</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1759" href="#L1759">1759</a> <em class="jxr_javadoccomment">	 * @param value The string to convert.</em>
+<a class="jxr_linenumber" name="L1760" href="#L1760">1760</a> <em class="jxr_javadoccomment">	 * @return The uppercase string, or &lt;jk&gt;null&lt;/jk&gt; if the input was &lt;jk&gt;null&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L1761" href="#L1761">1761</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L1762" href="#L1762">1762</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> String uc(String value) {
+<a class="jxr_linenumber" name="L1763" href="#L1763">1763</a> 		<strong class="jxr_keyword">return</strong> StringUtils.upperCase(value);
+<a class="jxr_linenumber" name="L1764" href="#L1764">1764</a> 	}
+<a class="jxr_linenumber" name="L1765" href="#L1765">1765</a> 
+<a class="jxr_linenumber" name="L1766" href="#L1766">1766</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1767" href="#L1767">1767</a> <em class="jxr_javadoccomment">	 * If the specified object is a {@link Supplier} or {@link Value}, returns the inner value, otherwise the same value.</em>
+<a class="jxr_linenumber" name="L1768" href="#L1768">1768</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1769" href="#L1769">1769</a> <em class="jxr_javadoccomment">	 * @param o The object to unwrap.</em>
+<a class="jxr_linenumber" name="L1770" href="#L1770">1770</a> <em class="jxr_javadoccomment">	 * @return The unwrapped object.</em>
+<a class="jxr_linenumber" name="L1771" href="#L1771">1771</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L1772" href="#L1772">1772</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> Object unwrap(Object o) {
+<a class="jxr_linenumber" name="L1773" href="#L1773">1773</a> 		<strong class="jxr_keyword">if</strong> (o instanceof Supplier&lt;?&gt; o2)
+<a class="jxr_linenumber" name="L1774" href="#L1774">1774</a> 			o = unwrap(o2.get());
+<a class="jxr_linenumber" name="L1775" href="#L1775">1775</a> 		<strong class="jxr_keyword">if</strong> (o instanceof Value&lt;?&gt; o2)
+<a class="jxr_linenumber" name="L1776" href="#L1776">1776</a> 			o = unwrap(o2.get());
+<a class="jxr_linenumber" name="L1777" href="#L1777">1777</a> 		<strong class="jxr_keyword">if</strong> (o instanceof Optional&lt;?&gt; o2)
+<a class="jxr_linenumber" name="L1778" href="#L1778">1778</a> 			o = unwrap(o2.orElse(<strong class="jxr_keyword">null</strong>));
+<a class="jxr_linenumber" name="L1779" href="#L1779">1779</a> 		<strong class="jxr_keyword">return</strong> o;
+<a class="jxr_linenumber" name="L1780" href="#L1780">1780</a> 	}
+<a class="jxr_linenumber" name="L1781" href="#L1781">1781</a> 
+<a class="jxr_linenumber" name="L1782" href="#L1782">1782</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1783" href="#L1783">1783</a> <em class="jxr_javadoccomment">	 * Converts a property name to an environment variable name.</em>
+<a class="jxr_linenumber" name="L1784" href="#L1784">1784</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1785" href="#L1785">1785</a> <em class="jxr_javadoccomment">	 * @param name The property name to convert.</em>
+<a class="jxr_linenumber" name="L1786" href="#L1786">1786</a> <em class="jxr_javadoccomment">	 * @return The environment variable name (uppercase with dots replaced by underscores).</em>
+<a class="jxr_linenumber" name="L1787" href="#L1787">1787</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L1788" href="#L1788">1788</a> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> String envName(String name) {
+<a class="jxr_linenumber" name="L1789" href="#L1789">1789</a> 		<strong class="jxr_keyword">return</strong> PROPERTY_TO_ENV.computeIfAbsent(name, x -&gt; x.toUpperCase().replace(<span class="jxr_string">"."</span>, <span class="jxr_string">"_"</span>));
+<a class="jxr_linenumber" name="L1790" href="#L1790">1790</a> 	}
+<a class="jxr_linenumber" name="L1791" href="#L1791">1791</a> 
+<a class="jxr_linenumber" name="L1792" href="#L1792">1792</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1793" href="#L1793">1793</a> <em class="jxr_javadoccomment">	 * Converts a string to the specified type using registered conversion functions.</em>
+<a class="jxr_linenumber" name="L1794" href="#L1794">1794</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1795" href="#L1795">1795</a> <em class="jxr_javadoccomment">	 * @param &lt;T&gt; The target type.</em>
+<a class="jxr_linenumber" name="L1796" href="#L1796">1796</a> <em class="jxr_javadoccomment">	 * @param s The string to convert.</em>
+<a class="jxr_linenumber" name="L1797" href="#L1797">1797</a> <em class="jxr_javadoccomment">	 * @param def The default value (used to determine the target type).</em>
+<a class="jxr_linenumber" name="L1798" href="#L1798">1798</a> <em class="jxr_javadoccomment">	 * @return The converted value, or &lt;jk&gt;null&lt;/jk&gt; if the string or default is &lt;jk&gt;null&lt;/jk&gt;.</em>
+<a class="jxr_linenumber" name="L1799" href="#L1799">1799</a> <em class="jxr_javadoccomment">	 * @throws RuntimeException If the type is not supported for conversion.</em>
+<a class="jxr_linenumber" name="L1800" href="#L1800">1800</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L1801" href="#L1801">1801</a> 	@SuppressWarnings({ <span class="jxr_string">"unchecked"</span>, <span class="jxr_string">"rawtypes"</span> })
+<a class="jxr_linenumber" name="L1802" href="#L1802">1802</a> 	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> &lt;T&gt; T toType(String s, T def) {
+<a class="jxr_linenumber" name="L1803" href="#L1803">1803</a> 		<strong class="jxr_keyword">if</strong> (s == <strong class="jxr_keyword">null</strong> || def == <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L1804" href="#L1804">1804</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L1805" href="#L1805">1805</a> 		<strong class="jxr_keyword">var</strong> c = (Class&lt;T&gt;)def.getClass();
+<a class="jxr_linenumber" name="L1806" href="#L1806">1806</a> 		<strong class="jxr_keyword">if</strong> (c == String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L1807" href="#L1807">1807</a> 			<strong class="jxr_keyword">return</strong> (T)s;
+<a class="jxr_linenumber" name="L1808" href="#L1808">1808</a> 		<strong class="jxr_keyword">if</strong> (c.isEnum())
+<a class="jxr_linenumber" name="L1809" href="#L1809">1809</a> 			<strong class="jxr_keyword">return</strong> (T)Enum.valueOf((Class&lt;? <strong class="jxr_keyword">extends</strong> Enum&gt;)c, s);
+<a class="jxr_linenumber" name="L1810" href="#L1810">1810</a> 		<strong class="jxr_keyword">var</strong> f = (Function&lt;String,T&gt;)ENV_FUNCTIONS.get(c);
+<a class="jxr_linenumber" name="L1811" href="#L1811">1811</a> 		<strong class="jxr_keyword">if</strong> (f == <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L1812" href="#L1812">1812</a> 			<strong class="jxr_keyword">throw</strong> rex(<span class="jxr_string">"Invalid env type: {0}"</span>, c);
+<a class="jxr_linenumber" name="L1813" href="#L1813">1813</a> 		<strong class="jxr_keyword">return</strong> f.apply(s);
+<a class="jxr_linenumber" name="L1814" href="#L1814">1814</a> 	}
+<a class="jxr_linenumber" name="L1815" href="#L1815">1815</a> 
+<a class="jxr_linenumber" name="L1816" href="#L1816">1816</a> 	<em class="jxr_javadoccomment">/** Constructor - This class is meant to be subclasses. */</em>
+<a class="jxr_linenumber" name="L1817" href="#L1817">1817</a> 	<strong class="jxr_keyword">protected</strong> <a name="Utils" href="../../../../../org/apache/juneau/commons/utils/Utils.html#Utils">Utils</a>() {}
+<a class="jxr_linenumber" name="L1818" href="#L1818">1818</a> 
+<a class="jxr_linenumber" name="L1819" href="#L1819">1819</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1820" href="#L1820">1820</a> <em class="jxr_javadoccomment">	 * Returns the specified string, or &lt;jk&gt;null&lt;/jk&gt; if that string is &lt;jk&gt;null&lt;/jk&gt; or empty.</em>
+<a class="jxr_linenumber" name="L1821" href="#L1821">1821</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1822" href="#L1822">1822</a> <em class="jxr_javadoccomment">	 * @param value The string value to check.</em>
+<a class="jxr_linenumber" name="L1823" href="#L1823">1823</a> <em class="jxr_javadoccomment">	 * @return The string value, or &lt;jk&gt;null&lt;/jk&gt; if the string is &lt;jk&gt;null&lt;/jk&gt; or empty.</em>
+<a class="jxr_linenumber" name="L1824" href="#L1824">1824</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L1825" href="#L1825">1825</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> String nullIfEmpty(String value) {
+<a class="jxr_linenumber" name="L1826" href="#L1826">1826</a> 		<strong class="jxr_keyword">return</strong> StringUtils.isEmpty(value) ? <strong class="jxr_keyword">null</strong> : value;
+<a class="jxr_linenumber" name="L1827" href="#L1827">1827</a> 	}
+<a class="jxr_linenumber" name="L1828" href="#L1828">1828</a> 
+<a class="jxr_linenumber" name="L1829" href="#L1829">1829</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1830" href="#L1830">1830</a> <em class="jxr_javadoccomment">	 * Returns &lt;jk&gt;null&lt;/jk&gt; if the specified map is &lt;jk&gt;null&lt;/jk&gt; or empty, otherwise returns the map.</em>
+<a class="jxr_linenumber" name="L1831" href="#L1831">1831</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1832" href="#L1832">1832</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L1833" href="#L1833">1833</a> <em class="jxr_javadoccomment">	 * This is a convenience method for preserving backward compatibility when maps are initialized immediately</em>
+<a class="jxr_linenumber" name="L1834" href="#L1834">1834</a> <em class="jxr_javadoccomment">	 * but getters should return &lt;jk&gt;null&lt;/jk&gt; if the map is empty.</em>
+<a class="jxr_linenumber" name="L1835" href="#L1835">1835</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1836" href="#L1836">1836</a> <em class="jxr_javadoccomment">	 * @param &lt;K&gt; The key type.</em>
+<a class="jxr_linenumber" name="L1837" href="#L1837">1837</a> <em class="jxr_javadoccomment">	 * @param &lt;V&gt; The value type.</em>
+<a class="jxr_linenumber" name="L1838" href="#L1838">1838</a> <em class="jxr_javadoccomment">	 * @param val The map to check.</em>
+<a class="jxr_linenumber" name="L1839" href="#L1839">1839</a> <em class="jxr_javadoccomment">	 * @return &lt;jk&gt;null&lt;/jk&gt; if the map is &lt;jk&gt;null&lt;/jk&gt; or empty, otherwise the map itself.</em>
+<a class="jxr_linenumber" name="L1840" href="#L1840">1840</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L1841" href="#L1841">1841</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;K,V&gt; Map&lt;K,V&gt; nullIfEmpty(Map&lt;K,V&gt; val) {
+<a class="jxr_linenumber" name="L1842" href="#L1842">1842</a> 		<strong class="jxr_keyword">return</strong> isEmpty(val) ? <strong class="jxr_keyword">null</strong> : val;
+<a class="jxr_linenumber" name="L1843" href="#L1843">1843</a> 	}
+<a class="jxr_linenumber" name="L1844" href="#L1844">1844</a> 
+<a class="jxr_linenumber" name="L1845" href="#L1845">1845</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1846" href="#L1846">1846</a> <em class="jxr_javadoccomment">	 * Returns &lt;jk&gt;null&lt;/jk&gt; if the specified list is &lt;jk&gt;null&lt;/jk&gt; or empty, otherwise returns the list.</em>
+<a class="jxr_linenumber" name="L1847" href="#L1847">1847</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1848" href="#L1848">1848</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L1849" href="#L1849">1849</a> <em class="jxr_javadoccomment">	 * This is a convenience method for preserving backward compatibility when lists are initialized immediately</em>
+<a class="jxr_linenumber" name="L1850" href="#L1850">1850</a> <em class="jxr_javadoccomment">	 * but getters should return &lt;jk&gt;null&lt;/jk&gt; if the list is empty.</em>
+<a class="jxr_linenumber" name="L1851" href="#L1851">1851</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1852" href="#L1852">1852</a> <em class="jxr_javadoccomment">	 * @param &lt;E&gt; The element type.</em>
+<a class="jxr_linenumber" name="L1853" href="#L1853">1853</a> <em class="jxr_javadoccomment">	 * @param val The list to check.</em>
+<a class="jxr_linenumber" name="L1854" href="#L1854">1854</a> <em class="jxr_javadoccomment">	 * @return &lt;jk&gt;null&lt;/jk&gt; if the list is &lt;jk&gt;null&lt;/jk&gt; or empty, otherwise the list itself.</em>
+<a class="jxr_linenumber" name="L1855" href="#L1855">1855</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L1856" href="#L1856">1856</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;E&gt; List&lt;E&gt; nullIfEmpty(List&lt;E&gt; val) {
+<a class="jxr_linenumber" name="L1857" href="#L1857">1857</a> 		<strong class="jxr_keyword">return</strong> isEmpty(val) ? <strong class="jxr_keyword">null</strong> : val;
+<a class="jxr_linenumber" name="L1858" href="#L1858">1858</a> 	}
+<a class="jxr_linenumber" name="L1859" href="#L1859">1859</a> 
+<a class="jxr_linenumber" name="L1860" href="#L1860">1860</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L1861" href="#L1861">1861</a> <em class="jxr_javadoccomment">	 * Returns &lt;jk&gt;null&lt;/jk&gt; if the specified set is &lt;jk&gt;null&lt;/jk&gt; or empty, otherwise returns the set.</em>
+<a class="jxr_linenumber" name="L1862" href="#L1862">1862</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1863" href="#L1863">1863</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L1864" href="#L1864">1864</a> <em class="jxr_javadoccomment">	 * This is a convenience method for preserving backward compatibility when sets are initialized immediately</em>
+<a class="jxr_linenumber" name="L1865" href="#L1865">1865</a> <em class="jxr_javadoccomment">	 * but getters should return &lt;jk&gt;null&lt;/jk&gt; if the set is empty.</em>
+<a class="jxr_linenumber" name="L1866" href="#L1866">1866</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L1867" href="#L1867">1867</a> <em class="jxr_javadoccomment">	 * @param &lt;E&gt; The element type.</em>
+<a class="jxr_linenumber" name="L1868" href="#L1868">1868</a> <em class="jxr_javadoccomment">	 * @param val The set to check.</em>
+<a class="jxr_linenumber" name="L1869" href="#L1869">1869</a> <em class="jxr_javadoccomment">	 * @return &lt;jk&gt;null&lt;/jk&gt; if the set is &lt;jk&gt;null&lt;/jk&gt; or empty, otherwise the set itself.</em>
+<a class="jxr_linenumber" name="L1870" href="#L1870">1870</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L1871" href="#L1871">1871</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> &lt;E&gt; Set&lt;E&gt; nullIfEmpty(Set&lt;E&gt; val) {
+<a class="jxr_linenumber" name="L1872" href="#L1872">1872</a> 		<strong class="jxr_keyword">return</strong> isEmpty(val) ? <strong class="jxr_keyword">null</strong> : val;
+<a class="jxr_linenumber" name="L1873" href="#L1873">1873</a> 	}
+<a class="jxr_linenumber" name="L1874" href="#L1874">1874</a> 
+<a class="jxr_linenumber" name="L1875" href="#L1875">1875</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/cp/BasicFileFinder.html b/site/xref/org/apache/juneau/cp/BasicFileFinder.html
index 25d775a339..a112baa282 100644
--- a/site/xref/org/apache/juneau/cp/BasicFileFinder.html
+++ b/site/xref/org/apache/juneau/cp/BasicFileFinder.html
@@ -24,19 +24,19 @@
 <a class="jxr_linenumber" name="L16" href="#L16">16</a>  <em class="jxr_comment"> */</em>
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.cp;
 <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.collections.JsonMap.*;
-<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.FileUtils.*;
-<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.IoUtils.*;
-<a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.StringUtils.*;
-<a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.Utils.*;
-<a class="jxr_linenumber" name="L25" href="#L25">25</a>  
-<a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">import</strong> java.io.*;
-<a class="jxr_linenumber" name="L27" href="#L27">27</a>  <strong class="jxr_keyword">import</strong> java.util.*;
-<a class="jxr_linenumber" name="L28" href="#L28">28</a>  <strong class="jxr_keyword">import</strong> java.util.ResourceBundle.*;
-<a class="jxr_linenumber" name="L29" href="#L29">29</a>  <strong class="jxr_keyword">import</strong> java.util.concurrent.*;
-<a class="jxr_linenumber" name="L30" href="#L30">30</a>  <strong class="jxr_keyword">import</strong> java.util.regex.*;
-<a class="jxr_linenumber" name="L31" href="#L31">31</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.CollectionUtils.*;
+<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.FileUtils.*;
+<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.IoUtils.*;
+<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.StringUtils.*;
+<a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.Utils.*;
+<a class="jxr_linenumber" name="L24" href="#L24">24</a>  
+<a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> java.io.*;
+<a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">import</strong> java.util.*;
+<a class="jxr_linenumber" name="L27" href="#L27">27</a>  <strong class="jxr_keyword">import</strong> java.util.ResourceBundle.*;
+<a class="jxr_linenumber" name="L28" href="#L28">28</a>  <strong class="jxr_keyword">import</strong> java.util.concurrent.*;
+<a class="jxr_linenumber" name="L29" href="#L29">29</a>  <strong class="jxr_keyword">import</strong> java.util.regex.*;
+<a class="jxr_linenumber" name="L30" href="#L30">30</a>  
+<a class="jxr_linenumber" name="L31" href="#L31">31</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.commons.collections.*;
 <a class="jxr_linenumber" name="L32" href="#L32">32</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.commons.io.*;
 <a class="jxr_linenumber" name="L33" href="#L33">33</a>  
 <a class="jxr_linenumber" name="L34" href="#L34">34</a>  <em class="jxr_javadoccomment">/**</em>
@@ -123,170 +123,173 @@
 <a class="jxr_linenumber" name="L115" href="#L115">115</a> 		<strong class="jxr_keyword">return</strong> hashCode;
 <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> 	@Override <em class="jxr_comment">/* Overridden from Object */</em>
-<a class="jxr_linenumber" name="L119" href="#L119">119</a> 	<strong class="jxr_keyword">public</strong> String toString() {
-<a class="jxr_linenumber" name="L120" href="#L120">120</a> 		<em class="jxr_comment">// @formatter:off</em>
-<a class="jxr_linenumber" name="L121" href="#L121">121</a> 		<strong class="jxr_keyword">return</strong> filteredMap()
-<a class="jxr_linenumber" name="L122" href="#L122">122</a> 			.append(<span class="jxr_string">"class"</span>, cns(getClass()))
-<a class="jxr_linenumber" name="L123" href="#L123">123</a> 			.append(<span class="jxr_string">"roots"</span>, roots)
-<a class="jxr_linenumber" name="L124" href="#L124">124</a> 			.append(<span class="jxr_string">"cachingLimit"</span>, cachingLimit)
-<a class="jxr_linenumber" name="L125" href="#L125">125</a> 			.append(<span class="jxr_string">"include"</span>, includePatterns)
-<a class="jxr_linenumber" name="L126" href="#L126">126</a> 			.append(<span class="jxr_string">"exclude"</span>, excludePatterns)
-<a class="jxr_linenumber" name="L127" href="#L127">127</a> 			.append(<span class="jxr_string">"hashCode"</span>, hashCode)
-<a class="jxr_linenumber" name="L128" href="#L128">128</a> 			.asReadableString();
-<a class="jxr_linenumber" name="L129" href="#L129">129</a> 		<em class="jxr_comment">// @formatter:on</em>
-<a class="jxr_linenumber" name="L130" href="#L130">130</a> 	}
-<a class="jxr_linenumber" name="L131" href="#L131">131</a> 
-<a class="jxr_linenumber" name="L132" href="#L132">132</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L133" href="#L133">133</a> <em class="jxr_javadoccomment">	 * The main implementation method for finding files.</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">	 * Subclasses can override this method to provide their own handling.</em>
+<a class="jxr_linenumber" name="L118" href="#L118">118</a> 	<strong class="jxr_keyword">protected</strong> FluentMap&lt;String,Object&gt; properties() {
+<a class="jxr_linenumber" name="L119" href="#L119">119</a> 		<em class="jxr_comment">// @formatter:off</em>
+<a class="jxr_linenumber" name="L120" href="#L120">120</a> 		<strong class="jxr_keyword">return</strong> filteredBeanPropertyMap()
+<a class="jxr_linenumber" name="L121" href="#L121">121</a> 			.a(<span class="jxr_string">"class"</span>, cns(getClass()))
+<a class="jxr_linenumber" name="L122" href="#L122">122</a> 			.a(<span class="jxr_string">"roots"</span>, roots)
+<a class="jxr_linenumber" name="L123" href="#L123">123</a> 			.a(<span class="jxr_string">"cachingLimit"</span>, cachingLimit)
+<a class="jxr_linenumber" name="L124" href="#L124">124</a> 			.a(<span class="jxr_string">"include"</span>, includePatterns)
+<a class="jxr_linenumber" name="L125" href="#L125">125</a> 			.a(<span class="jxr_string">"exclude"</span>, excludePatterns)
+<a class="jxr_linenumber" name="L126" href="#L126">126</a> 			.a(<span class="jxr_string">"hashCode"</span>, hashCode);
+<a class="jxr_linenumber" name="L127" href="#L127">127</a> 		<em class="jxr_comment">// @formatter:on</em>
+<a class="jxr_linenumber" name="L128" href="#L128">128</a> 	}
+<a class="jxr_linenumber" name="L129" href="#L129">129</a> 
+<a class="jxr_linenumber" name="L130" href="#L130">130</a> 	@Override <em class="jxr_comment">/* Overridden from Object */</em>
+<a class="jxr_linenumber" name="L131" href="#L131">131</a> 	<strong class="jxr_keyword">public</strong> String toString() {
+<a class="jxr_linenumber" name="L132" href="#L132">132</a> 		<strong class="jxr_keyword">return</strong> r(properties());
+<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_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L136" href="#L136">136</a> <em class="jxr_javadoccomment">	 * The main implementation method for finding files.</em>
 <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">	 * @param name The resource name.</em>
-<a class="jxr_linenumber" name="L139" href="#L139">139</a> <em class="jxr_javadoccomment">	 * 	See {@link Class#getResource(String)} for format.</em>
-<a class="jxr_linenumber" name="L140" href="#L140">140</a> <em class="jxr_javadoccomment">	 * @param locale</em>
-<a class="jxr_linenumber" name="L141" href="#L141">141</a> <em class="jxr_javadoccomment">	 * 	The locale of the resource to retrieve.</em>
-<a class="jxr_linenumber" name="L142" href="#L142">142</a> <em class="jxr_javadoccomment">	 * 	&lt;br&gt;If &lt;jk&gt;null&lt;/jk&gt;, won't look for localized file names.</em>
-<a class="jxr_linenumber" name="L143" href="#L143">143</a> <em class="jxr_javadoccomment">	 * @return The resolved resource contents, or &lt;jk&gt;null&lt;/jk&gt; if the resource was not found.</em>
-<a class="jxr_linenumber" name="L144" href="#L144">144</a> <em class="jxr_javadoccomment">	 * @throws IOException Thrown by underlying stream.</em>
-<a class="jxr_linenumber" name="L145" href="#L145">145</a> <em class="jxr_javadoccomment">	 */</em>
-<a class="jxr_linenumber" name="L146" href="#L146">146</a> 	@SuppressWarnings(<span class="jxr_string">"null"</span>)
-<a class="jxr_linenumber" name="L147" href="#L147">147</a> 	<strong class="jxr_keyword">protected</strong> Optional&lt;InputStream&gt; find(String name, Locale locale) <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="L148" href="#L148">148</a> 		name = trimSlashesAndSpaces(name);
-<a class="jxr_linenumber" name="L149" href="#L149">149</a> 
-<a class="jxr_linenumber" name="L150" href="#L150">150</a> 		<strong class="jxr_keyword">if</strong> (isInvalidPath(name))
-<a class="jxr_linenumber" name="L151" href="#L151">151</a> 			<strong class="jxr_keyword">return</strong> opte();
+<a class="jxr_linenumber" name="L138" href="#L138">138</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L139" href="#L139">139</a> <em class="jxr_javadoccomment">	 * Subclasses can override this method to provide their own handling.</em>
+<a class="jxr_linenumber" name="L140" href="#L140">140</a> <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L141" href="#L141">141</a> <em class="jxr_javadoccomment">	 * @param name The resource name.</em>
+<a class="jxr_linenumber" name="L142" href="#L142">142</a> <em class="jxr_javadoccomment">	 * 	See {@link Class#getResource(String)} for format.</em>
+<a class="jxr_linenumber" name="L143" href="#L143">143</a> <em class="jxr_javadoccomment">	 * @param locale</em>
+<a class="jxr_linenumber" name="L144" href="#L144">144</a> <em class="jxr_javadoccomment">	 * 	The locale of the resource to retrieve.</em>
+<a class="jxr_linenumber" name="L145" href="#L145">145</a> <em class="jxr_javadoccomment">	 * 	&lt;br&gt;If &lt;jk&gt;null&lt;/jk&gt;, won't look for localized file names.</em>
+<a class="jxr_linenumber" name="L146" href="#L146">146</a> <em class="jxr_javadoccomment">	 * @return The resolved resource contents, or &lt;jk&gt;null&lt;/jk&gt; if the resource was not found.</em>
+<a class="jxr_linenumber" name="L147" href="#L147">147</a> <em class="jxr_javadoccomment">	 * @throws IOException Thrown by underlying stream.</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> 	@SuppressWarnings(<span class="jxr_string">"null"</span>)
+<a class="jxr_linenumber" name="L150" href="#L150">150</a> 	<strong class="jxr_keyword">protected</strong> Optional&lt;InputStream&gt; find(String name, Locale locale) <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="L151" href="#L151">151</a> 		name = trimSlashesAndSpaces(name);
 <a class="jxr_linenumber" name="L152" href="#L152">152</a> 
-<a class="jxr_linenumber" name="L153" href="#L153">153</a> 		<strong class="jxr_keyword">if</strong> (nn(locale))
-<a class="jxr_linenumber" name="L154" href="#L154">154</a> 			localizedFiles.putIfAbsent(locale, <strong class="jxr_keyword">new</strong> ConcurrentHashMap&lt;&gt;());
+<a class="jxr_linenumber" name="L153" href="#L153">153</a> 		<strong class="jxr_keyword">if</strong> (isInvalidPath(name))
+<a class="jxr_linenumber" name="L154" href="#L154">154</a> 			<strong class="jxr_keyword">return</strong> opte();
 <a class="jxr_linenumber" name="L155" href="#L155">155</a> 
-<a class="jxr_linenumber" name="L156" href="#L156">156</a> 		Map&lt;String,LocalFile&gt; fileCache = locale == <strong class="jxr_keyword">null</strong> ? files : localizedFiles.get(locale);
-<a class="jxr_linenumber" name="L157" href="#L157">157</a> 
-<a class="jxr_linenumber" name="L158" href="#L158">158</a> 		LocalFile lf = fileCache.get(name);
-<a class="jxr_linenumber" name="L159" href="#L159">159</a> 
-<a class="jxr_linenumber" name="L160" href="#L160">160</a> 		<strong class="jxr_keyword">if</strong> (lf == <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L161" href="#L161">161</a> 			List&lt;String&gt; candidateFileNames = getCandidateFileNames(name, locale);
-<a class="jxr_linenumber" name="L162" href="#L162">162</a> 			paths: <strong class="jxr_keyword">for</strong> (<a name="LocalDir" href="../../../../org/apache/juneau/commons/io/LocalDir.html#LocalDir">LocalDir</a> root : roots) {
-<a class="jxr_linenumber" name="L163" href="#L163">163</a> 				<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> cfn : candidateFileNames) {
-<a class="jxr_linenumber" name="L164" href="#L164">164</a> 					lf = root.resolve(cfn);
-<a class="jxr_linenumber" name="L165" href="#L165">165</a> 					<strong class="jxr_keyword">if</strong> (nn(lf))
-<a class="jxr_linenumber" name="L166" href="#L166">166</a> 						<strong class="jxr_keyword">break</strong> paths;
-<a class="jxr_linenumber" name="L167" href="#L167">167</a> 				}
-<a class="jxr_linenumber" name="L168" href="#L168">168</a> 			}
-<a class="jxr_linenumber" name="L169" href="#L169">169</a> 
-<a class="jxr_linenumber" name="L170" href="#L170">170</a> 			<strong class="jxr_keyword">if</strong> (nn(lf) &amp;&amp; isIgnoredFile(lf.getName()))
-<a class="jxr_linenumber" name="L171" href="#L171">171</a> 				lf = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L156" href="#L156">156</a> 		<strong class="jxr_keyword">if</strong> (nn(locale))
+<a class="jxr_linenumber" name="L157" href="#L157">157</a> 			localizedFiles.putIfAbsent(locale, <strong class="jxr_keyword">new</strong> ConcurrentHashMap&lt;&gt;());
+<a class="jxr_linenumber" name="L158" href="#L158">158</a> 
+<a class="jxr_linenumber" name="L159" href="#L159">159</a> 		Map&lt;String,LocalFile&gt; fileCache = locale == <strong class="jxr_keyword">null</strong> ? files : localizedFiles.get(locale);
+<a class="jxr_linenumber" name="L160" href="#L160">160</a> 
+<a class="jxr_linenumber" name="L161" href="#L161">161</a> 		LocalFile lf = fileCache.get(name);
+<a class="jxr_linenumber" name="L162" href="#L162">162</a> 
+<a class="jxr_linenumber" name="L163" href="#L163">163</a> 		<strong class="jxr_keyword">if</strong> (lf == <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="L164" href="#L164">164</a> 			List&lt;String&gt; candidateFileNames = getCandidateFileNames(name, locale);
+<a class="jxr_linenumber" name="L165" href="#L165">165</a> 			paths: <strong class="jxr_keyword">for</strong> (<a name="LocalDir" href="../../../../org/apache/juneau/commons/io/LocalDir.html#LocalDir">LocalDir</a> root : roots) {
+<a class="jxr_linenumber" name="L166" href="#L166">166</a> 				<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> cfn : candidateFileNames) {
+<a class="jxr_linenumber" name="L167" href="#L167">167</a> 					lf = root.resolve(cfn);
+<a class="jxr_linenumber" name="L168" href="#L168">168</a> 					<strong class="jxr_keyword">if</strong> (nn(lf))
+<a class="jxr_linenumber" name="L169" href="#L169">169</a> 						<strong class="jxr_keyword">break</strong> paths;
+<a class="jxr_linenumber" name="L170" href="#L170">170</a> 				}
+<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> 			<strong class="jxr_keyword">if</strong> (nn(lf)) {
-<a class="jxr_linenumber" name="L174" href="#L174">174</a> 				fileCache.put(name, lf);
+<a class="jxr_linenumber" name="L173" href="#L173">173</a> 			<strong class="jxr_keyword">if</strong> (nn(lf) &amp;&amp; isIgnoredFile(lf.getName()))
+<a class="jxr_linenumber" name="L174" href="#L174">174</a> 				lf = <strong class="jxr_keyword">null</strong>;
 <a class="jxr_linenumber" name="L175" href="#L175">175</a> 
-<a class="jxr_linenumber" name="L176" href="#L176">176</a> 				<strong class="jxr_keyword">if</strong> (cachingLimit &gt;= 0) {
-<a class="jxr_linenumber" name="L177" href="#L177">177</a> 					<strong class="jxr_keyword">long</strong> size = lf.size();
-<a class="jxr_linenumber" name="L178" href="#L178">178</a> 					<strong class="jxr_keyword">if</strong> (size &gt; 0 &amp;&amp; size &lt;= cachingLimit)
-<a class="jxr_linenumber" name="L179" href="#L179">179</a> 						lf.cache();
-<a class="jxr_linenumber" name="L180" href="#L180">180</a> 				}
-<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> 
-<a class="jxr_linenumber" name="L184" href="#L184">184</a> 		<strong class="jxr_keyword">return</strong> opt(lf == <strong class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">null</strong> : lf.read());
-<a class="jxr_linenumber" name="L185" href="#L185">185</a> 	}
+<a class="jxr_linenumber" name="L176" href="#L176">176</a> 			<strong class="jxr_keyword">if</strong> (nn(lf)) {
+<a class="jxr_linenumber" name="L177" href="#L177">177</a> 				fileCache.put(name, lf);
+<a class="jxr_linenumber" name="L178" href="#L178">178</a> 
+<a class="jxr_linenumber" name="L179" href="#L179">179</a> 				<strong class="jxr_keyword">if</strong> (cachingLimit &gt;= 0) {
+<a class="jxr_linenumber" name="L180" href="#L180">180</a> 					<strong class="jxr_keyword">long</strong> size = lf.size();
+<a class="jxr_linenumber" name="L181" href="#L181">181</a> 					<strong class="jxr_keyword">if</strong> (size &gt; 0 &amp;&amp; size &lt;= cachingLimit)
+<a class="jxr_linenumber" name="L182" href="#L182">182</a> 						lf.cache();
+<a class="jxr_linenumber" name="L183" href="#L183">183</a> 				}
+<a class="jxr_linenumber" name="L184" href="#L184">184</a> 			}
+<a class="jxr_linenumber" name="L185" href="#L185">185</a> 		}
 <a class="jxr_linenumber" name="L186" href="#L186">186</a> 
-<a class="jxr_linenumber" name="L187" href="#L187">187</a> 	<em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L188" href="#L188">188</a> <em class="jxr_javadoccomment">	 * Returns the candidate file names for the specified file name in the specified locale.</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">	 * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L191" href="#L191">191</a> <em class="jxr_javadoccomment">	 * For example, if looking for the &lt;js&gt;"MyResource.txt"&lt;/js&gt; file in the Japanese locale, the iterator will return</em>
-<a class="jxr_linenumber" name="L192" href="#L192">192</a> <em class="jxr_javadoccomment">	 * names in the following order:</em>
-<a class="jxr_linenumber" name="L193" href="#L193">193</a> <em class="jxr_javadoccomment">	 * &lt;ol&gt;</em>
-<a class="jxr_linenumber" name="L194" href="#L194">194</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;&lt;js&gt;"MyResource_ja_JP.txt"&lt;/js&gt;</em>
-<a class="jxr_linenumber" name="L195" href="#L195">195</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;&lt;js&gt;"MyResource_ja.txt"&lt;/js&gt;</em>
-<a class="jxr_linenumber" name="L196" href="#L196">196</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;&lt;js&gt;"MyResource.txt"&lt;/js&gt;</em>
-<a class="jxr_linenumber" name="L197" href="#L197">197</a> <em class="jxr_javadoccomment">	 * &lt;/ol&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 the locale is &lt;jk&gt;null&lt;/jk&gt;, then it will only return &lt;js&gt;"MyResource.txt"&lt;/js&gt;.</em>
+<a class="jxr_linenumber" name="L187" href="#L187">187</a> 		<strong class="jxr_keyword">return</strong> opt(lf == <strong class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">null</strong> : lf.read());
+<a class="jxr_linenumber" name="L188" href="#L188">188</a> 	}
+<a class="jxr_linenumber" name="L189" href="#L189">189</a> 
+<a class="jxr_linenumber" name="L190" href="#L190">190</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L191" href="#L191">191</a> <em class="jxr_javadoccomment">	 * Returns the candidate file names for the specified file name in the specified locale.</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> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L194" href="#L194">194</a> <em class="jxr_javadoccomment">	 * For example, if looking for the &lt;js&gt;"MyResource.txt"&lt;/js&gt; file in the Japanese locale, the iterator will return</em>
+<a class="jxr_linenumber" name="L195" href="#L195">195</a> <em class="jxr_javadoccomment">	 * names in the following order:</em>
+<a class="jxr_linenumber" name="L196" href="#L196">196</a> <em class="jxr_javadoccomment">	 * &lt;ol&gt;</em>
+<a class="jxr_linenumber" name="L197" href="#L197">197</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;&lt;js&gt;"MyResource_ja_JP.txt"&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L198" href="#L198">198</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;&lt;js&gt;"MyResource_ja.txt"&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L199" href="#L199">199</a> <em class="jxr_javadoccomment">	 * 	&lt;li&gt;&lt;js&gt;"MyResource.txt"&lt;/js&gt;</em>
+<a class="jxr_linenumber" name="L200" href="#L200">200</a> <em class="jxr_javadoccomment">	 * &lt;/ol&gt;</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 fileName The name of the file to get candidate file names on.</em>
-<a class="jxr_linenumber" name="L203" href="#L203">203</a> <em class="jxr_javadoccomment">	 * @param locale</em>
-<a class="jxr_linenumber" name="L204" href="#L204">204</a> <em class="jxr_javadoccomment">	 * 	The locale.</em>
-<a class="jxr_linenumber" name="L205" href="#L205">205</a> <em class="jxr_javadoccomment">	 * 	&lt;br&gt;If &lt;jk&gt;null&lt;/jk&gt;, won't look for localized file names.</em>
-<a class="jxr_linenumber" name="L206" href="#L206">206</a> <em class="jxr_javadoccomment">	 * @return An iterator of file names to look at.</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> 	<strong class="jxr_keyword">protected</strong> List&lt;String&gt; getCandidateFileNames(String fileName, Locale locale) {
-<a class="jxr_linenumber" name="L209" href="#L209">209</a> 
-<a class="jxr_linenumber" name="L210" href="#L210">210</a> 		<strong class="jxr_keyword">if</strong> (locale == <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L211" href="#L211">211</a> 			<strong class="jxr_keyword">return</strong> Collections.singletonList(fileName);
+<a class="jxr_linenumber" name="L202" href="#L202">202</a> <em class="jxr_javadoccomment">	 * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L203" href="#L203">203</a> <em class="jxr_javadoccomment">	 * If the locale is &lt;jk&gt;null&lt;/jk&gt;, then it will only return &lt;js&gt;"MyResource.txt"&lt;/js&gt;.</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> <em class="jxr_javadoccomment">	 * @param fileName The name of the file to get candidate file names on.</em>
+<a class="jxr_linenumber" name="L206" href="#L206">206</a> <em class="jxr_javadoccomment">	 * @param locale</em>
+<a class="jxr_linenumber" name="L207" href="#L207">207</a> <em class="jxr_javadoccomment">	 * 	The locale.</em>
+<a class="jxr_linenumber" name="L208" href="#L208">208</a> <em class="jxr_javadoccomment">	 * 	&lt;br&gt;If &lt;jk&gt;null&lt;/jk&gt;, won't look for localized file names.</em>
+<a class="jxr_linenumber" name="L209" href="#L209">209</a> <em class="jxr_javadoccomment">	 * @return An iterator of file names to look at.</em>
+<a class="jxr_linenumber" name="L210" href="#L210">210</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L211" href="#L211">211</a> 	<strong class="jxr_keyword">protected</strong> List&lt;String&gt; getCandidateFileNames(String fileName, Locale locale) {
 <a class="jxr_linenumber" name="L212" href="#L212">212</a> 
-<a class="jxr_linenumber" name="L213" href="#L213">213</a> 		<strong class="jxr_keyword">var</strong> list = <strong class="jxr_keyword">new</strong> ArrayList&lt;String&gt;();
-<a class="jxr_linenumber" name="L214" href="#L214">214</a> 		<strong class="jxr_keyword">var</strong> baseName = getBaseName(fileName);
-<a class="jxr_linenumber" name="L215" href="#L215">215</a> 		<strong class="jxr_keyword">var</strong> ext = getFileExtension(fileName);
-<a class="jxr_linenumber" name="L216" href="#L216">216</a> 
-<a class="jxr_linenumber" name="L217" href="#L217">217</a> 		getCandidateLocales(locale).forEach(x -&gt; {
-<a class="jxr_linenumber" name="L218" href="#L218">218</a> 			<strong class="jxr_keyword">var</strong> ls = x.toString();
-<a class="jxr_linenumber" name="L219" href="#L219">219</a> 			<strong class="jxr_keyword">if</strong> (ls.isEmpty())
-<a class="jxr_linenumber" name="L220" href="#L220">220</a> 				list.add(fileName);
... 12003 lines suppressed ...