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/11/25 19:23:30 UTC
(juneau) branch asf-staging updated: Deploy documentation staging from 5a1c49db9b8effb8cb79470216ca396a3b6b9216 5a1c49db9b8effb8cb79470216ca396a3b6b9216
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 8106605dfe Deploy documentation staging from 5a1c49db9b8effb8cb79470216ca396a3b6b9216 5a1c49db9b8effb8cb79470216ca396a3b6b9216
8106605dfe is described below
commit 8106605dfe31ace42c666953b7c5e96125583d1c
Author: github-actions[bot] <gi...@users.noreply.github.com>
AuthorDate: Tue Nov 25 19:23:23 2025 +0000
Deploy documentation staging from 5a1c49db9b8effb8cb79470216ca396a3b6b9216 5a1c49db9b8effb8cb79470216ca396a3b6b9216
---
.../org/apache/juneau/BeanConfig_Test.html | 40 +++++++++++-----------
site/xref-test/org/apache/juneau/ComboInput.html | 2 +-
.../org/apache/juneau/ComboRoundTrip_Tester.html | 8 ++---
.../org/apache/juneau/ComboSerialize_Tester.html | 2 +-
.../org/apache/juneau/MaxIndent_Test.html | 2 +-
site/xref-test/org/apache/juneau/TestUtils.html | 10 +++---
.../a/rttests/RoundTripLargeObjects_Test.html | 6 ++--
.../juneau/common/utils/StringUtils_Test.html | 4 +--
.../org/apache/juneau/html/BasicHtml_Test.html | 14 ++++----
.../juneau/http/MediaRanges_FindMatch_Test.html | 2 +-
.../juneau/http/header/ContentType_Match_Test.html | 2 +-
.../juneau/json/JsonParserEdgeCases_Test.html | 12 +++----
.../apache/juneau/rest/annotation/Path_Test.html | 2 +-
.../juneau/serializer/UriResolution_Test.html | 4 +--
.../juneau/transforms/OneWayStringSwap_Tester.html | 4 +--
.../transforms/RoundTripObjectSwap_Tester.html | 8 ++---
.../juneau/transforms/StringSwap_Tester.html | 8 ++---
.../utils/UriContextResolutionCombo_Test.html | 2 +-
.../juneau/utils/UriContextUriCombo_Test.html | 14 ++++----
.../org/apache/juneau/xml/BasicXml_Test.html | 12 +++----
.../apache/juneau/xml/XmlIgnoreComments_Test.html | 8 ++---
.../org/apache/juneau/BasicAssertionError.html | 2 +-
site/xref/org/apache/juneau/BasicException.html | 2 +-
.../org/apache/juneau/BasicRuntimeException.html | 6 ++--
site/xref/org/apache/juneau/ContextSession.html | 2 +-
.../org/apache/juneau/assertions/Assertion.html | 4 +--
.../juneau/assertions/AssertionPredicate.html | 8 ++---
.../juneau/assertions/FluentObjectAssertion.html | 2 +-
site/xref/org/apache/juneau/assertions/Verify.html | 6 ++--
site/xref/org/apache/juneau/bean/LinkString.html | 2 +-
.../common/reflect/BeanRuntimeException.html | 2 +-
.../juneau/common/reflect/ExecutableException.html | 4 +--
.../juneau/common/reflect/ExecutableInfo.html | 6 ++--
.../org/apache/juneau/common/utils/Console.html | 4 +--
.../apache/juneau/common/utils/StringUtils.html | 2 +-
.../apache/juneau/common/utils/ThrowableUtils.html | 20 +++++------
.../xref/org/apache/juneau/common/utils/Utils.html | 8 ++---
site/xref/org/apache/juneau/cp/Messages.html | 2 +-
.../juneau/http/response/BasicHttpException.html | 6 ++--
.../org/apache/juneau/junit/bct/AssertionArgs.html | 4 +--
.../xref/org/apache/juneau/junit/bct/BctUtils.html | 2 +-
.../junit/bct/PropertyNotFoundException.html | 4 +--
.../org/apache/juneau/parser/ParseException.html | 2 +-
.../org/apache/juneau/parser/ParserListener.html | 4 +--
site/xref/org/apache/juneau/rest/RestContext.html | 8 ++---
.../org/apache/juneau/rest/arg/ArgException.html | 2 +-
.../juneau/rest/client/RestCallException.html | 2 +-
.../juneau/rest/mock/MockServletRequest.html | 2 +-
.../org/apache/juneau/rest/servlet/RestObject.html | 4 +--
.../apache/juneau/rest/servlet/RestServlet.html | 4 +--
.../juneau/rest/swagger/SwaggerException.html | 2 +-
.../juneau/serializer/SerializeException.html | 2 +-
.../juneau/serializer/SerializerListener.html | 2 +-
.../juneau/serializer/SerializerSession.html | 2 +-
54 files changed, 150 insertions(+), 150 deletions(-)
diff --git a/site/xref-test/org/apache/juneau/BeanConfig_Test.html b/site/xref-test/org/apache/juneau/BeanConfig_Test.html
index 21a67b323b..16324fcc2f 100644
--- a/site/xref-test/org/apache/juneau/BeanConfig_Test.html
+++ b/site/xref-test/org/apache/juneau/BeanConfig_Test.html
@@ -81,17 +81,17 @@
<a class="jxr_linenumber" name="L73" href="#L73">73</a>
<a class="jxr_linenumber" name="L74" href="#L74">74</a> <strong class="jxr_keyword">var</strong> pm1 = bc.toBeanMap(p1);
<a class="jxr_linenumber" name="L75" href="#L75">75</a>
-<a class="jxr_linenumber" name="L76" href="#L76">76</a> assertEquals(pm1.size(), m1.size(), fs(<span class="jxr_string">"Bean Map size failed for: {0} / {1} / {2}"</span>, p1, pm1.size(), m1.size()));
-<a class="jxr_linenumber" name="L77" href="#L77">77</a> assertEquals(pm1.keySet(), m1.keySet(), fs(<span class="jxr_string">"Bean Map key set equality failed for: {0} / {1} / {2}"</span>, p1, pm1.keySet() , m1.keySet()));
-<a class="jxr_linenumber" name="L78" href="#L78">78</a> assertEquals(m1.keySet(), pm1.keySet(), fs(<span class="jxr_string">"Bean Map key set reverse equality failed for: {0} / {1} / {2}"</span>, p1, pm1.keySet(), m1.keySet()));
-<a class="jxr_linenumber" name="L79" href="#L79">79</a> assertEquals(pm1, m1, fs(<span class="jxr_string">"Bean Map equality failed for: {0} / {1} / {2}"</span>, p1, pm1, m1)); <em class="jxr_comment">// NOSONAR</em>
+<a class="jxr_linenumber" name="L76" href="#L76">76</a> assertEquals(pm1.size(), m1.size(), mfs(<span class="jxr_string">"Bean Map size failed for: {0} / {1} / {2}"</span>, p1, pm1.size(), m1.size()));
+<a class="jxr_linenumber" name="L77" href="#L77">77</a> assertEquals(pm1.keySet(), m1.keySet(), mfs(<span class="jxr_string">"Bean Map key set equality failed for: {0} / {1} / {2}"</span>, p1, pm1.keySet() , m1.keySet()));
+<a class="jxr_linenumber" name="L78" href="#L78">78</a> assertEquals(m1.keySet(), pm1.keySet(), mfs(<span class="jxr_string">"Bean Map key set reverse equality failed for: {0} / {1} / {2}"</span>, p1, pm1.keySet(), m1.keySet()));
+<a class="jxr_linenumber" name="L79" href="#L79">79</a> assertEquals(pm1, m1, mfs(<span class="jxr_string">"Bean Map equality failed for: {0} / {1} / {2}"</span>, p1, pm1, m1)); <em class="jxr_comment">// NOSONAR</em>
<a class="jxr_linenumber" name="L80" href="#L80">80</a> assertThrows(BeanRuntimeException.<strong class="jxr_keyword">class</strong>, ()->bc.newBeanMap(Address.<strong class="jxr_keyword">class</strong>)); <em class="jxr_comment">// Address returned as a new bean type, but shouldn't be since it doesn't have a default constructor.</em>
<a class="jxr_linenumber" name="L81" href="#L81">81</a> assertNull(bc.newBeanMap(java.lang.Integer.<strong class="jxr_keyword">class</strong>), <span class="jxr_string">"java.lang.Integer incorrectly designated as bean type."</span>);
<a class="jxr_linenumber" name="L82" href="#L82">82</a> assertNull(bc.newBeanMap(java.lang.Class.<strong class="jxr_keyword">class</strong>), <span class="jxr_string">"java.lang.Class incorrectly designated as bean type."</span>);
<a class="jxr_linenumber" name="L83" href="#L83">83</a>
<a class="jxr_linenumber" name="L84" href="#L84">84</a> <strong class="jxr_keyword">var</strong> bm1 = bc.toBeanMap(<strong class="jxr_keyword">new</strong> Address(<span class="jxr_string">"street"</span>, <span class="jxr_string">"city"</span>, <span class="jxr_string">"state"</span>, <span class="jxr_string">"zip"</span>));
<a class="jxr_linenumber" name="L85" href="#L85">85</a>
-<a class="jxr_linenumber" name="L86" href="#L86">86</a> assertEquals(bm1.size(), m2.size(), fs(<span class="jxr_string">"Bean Adapter map's key set has wrong size: {0} / {1} / {2}"</span>, a, bm1.size(), m2.size()));
+<a class="jxr_linenumber" name="L86" href="#L86">86</a> assertEquals(bm1.size(), m2.size(), mfs(<span class="jxr_string">"Bean Adapter map's key set has wrong size: {0} / {1} / {2}"</span>, a, bm1.size(), m2.size()));
<a class="jxr_linenumber" name="L87" href="#L87">87</a>
<a class="jxr_linenumber" name="L88" href="#L88">88</a> <strong class="jxr_keyword">var</strong> iter = bm1.keySet().iterator();
<a class="jxr_linenumber" name="L89" href="#L89">89</a> <strong class="jxr_keyword">var</strong> temp = <strong class="jxr_keyword">new</strong> HashSet<>();
@@ -101,16 +101,16 @@
<a class="jxr_linenumber" name="L93" href="#L93">93</a> count++;
<a class="jxr_linenumber" name="L94" href="#L94">94</a> }
<a class="jxr_linenumber" name="L95" href="#L95">95</a>
-<a class="jxr_linenumber" name="L96" href="#L96">96</a> assertEquals(count, m2.size(), fs(<span class="jxr_string">"Iteration count over bean adpater key set failed: {0} / {1} / {2}"</span>, a, count, m2.size()));
-<a class="jxr_linenumber" name="L97" href="#L97">97</a> assertEquals(m2.keySet(), temp, fs(<span class="jxr_string">"Iteration over bean adpater key set failed: {0} / {1} / {2}"</span>, a, bm1.keySet(), m2.keySet()));
-<a class="jxr_linenumber" name="L98" href="#L98">98</a> assertNotNull(bc.toBeanMap(p2), fs(<span class="jxr_string">"Failed to identify class as bean type: {0}"</span>, p2.getClass()));
+<a class="jxr_linenumber" name="L96" href="#L96">96</a> assertEquals(count, m2.size(), mfs(<span class="jxr_string">"Iteration count over bean adpater key set failed: {0} / {1} / {2}"</span>, a, count, m2.size()));
+<a class="jxr_linenumber" name="L97" href="#L97">97</a> assertEquals(m2.keySet(), temp, mfs(<span class="jxr_string">"Iteration over bean adpater key set failed: {0} / {1} / {2}"</span>, a, bm1.keySet(), m2.keySet()));
+<a class="jxr_linenumber" name="L98" href="#L98">98</a> assertNotNull(bc.toBeanMap(p2), mfs(<span class="jxr_string">"Failed to identify class as bean type: {0}"</span>, p2.getClass()));
<a class="jxr_linenumber" name="L99" href="#L99">99</a>
<a class="jxr_linenumber" name="L100" href="#L100">100</a> <strong class="jxr_keyword">var</strong> m5 = bc.toBeanMap(p2);
<a class="jxr_linenumber" name="L101" href="#L101">101</a> @SuppressWarnings(<span class="jxr_string">"cast"</span>)
<a class="jxr_linenumber" name="L102" href="#L102">102</a> <strong class="jxr_keyword">var</strong> es1 = (Set)m5.entrySet();
<a class="jxr_linenumber" name="L103" href="#L103">103</a>
-<a class="jxr_linenumber" name="L104" href="#L104">104</a> assertEquals(es1, m3.entrySet(), fs(<span class="jxr_string">"Entry set equality failed: {0} / {1} / {2}"</span>, p2, es1, m3.entrySet()));
-<a class="jxr_linenumber" name="L105" href="#L105">105</a> assertEquals(m3.entrySet(), es1, fs(<span class="jxr_string">"Entry set reverse equality failed: {0} / {1} / {2}"</span>, p2, es1, m3.entrySet()));
+<a class="jxr_linenumber" name="L104" href="#L104">104</a> assertEquals(es1, m3.entrySet(), mfs(<span class="jxr_string">"Entry set equality failed: {0} / {1} / {2}"</span>, p2, es1, m3.entrySet()));
+<a class="jxr_linenumber" name="L105" href="#L105">105</a> assertEquals(m3.entrySet(), es1, mfs(<span class="jxr_string">"Entry set reverse equality failed: {0} / {1} / {2}"</span>, p2, es1, m3.entrySet()));
<a class="jxr_linenumber" name="L106" href="#L106">106</a>
<a class="jxr_linenumber" name="L107" href="#L107">107</a> iter = es1.iterator();
<a class="jxr_linenumber" name="L108" href="#L108">108</a> temp = <strong class="jxr_keyword">new</strong> HashSet<>();
@@ -120,8 +120,8 @@
<a class="jxr_linenumber" name="L112" href="#L112">112</a> count++;
<a class="jxr_linenumber" name="L113" href="#L113">113</a> }
<a class="jxr_linenumber" name="L114" href="#L114">114</a>
-<a class="jxr_linenumber" name="L115" href="#L115">115</a> assertEquals(count, m3.size(), fs(<span class="jxr_string">"Iteration count over bean adpater entry set failed: {0} / {1} / {2}"</span>, a, count, m3.size()));
-<a class="jxr_linenumber" name="L116" href="#L116">116</a> assertEquals(m3.entrySet(), temp, fs(<span class="jxr_string">"Iteration over bean adpater entry set failed: {0} / {1} / {2}"</span>, a, es1, m3.entrySet()));
+<a class="jxr_linenumber" name="L115" href="#L115">115</a> assertEquals(count, m3.size(), mfs(<span class="jxr_string">"Iteration count over bean adpater entry set failed: {0} / {1} / {2}"</span>, a, count, m3.size()));
+<a class="jxr_linenumber" name="L116" href="#L116">116</a> assertEquals(m3.entrySet(), temp, mfs(<span class="jxr_string">"Iteration over bean adpater entry set failed: {0} / {1} / {2}"</span>, a, es1, m3.entrySet()));
<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> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> Person {
@@ -141,7 +141,7 @@
<a class="jxr_linenumber" name="L133" href="#L133">133</a>
<a class="jxr_linenumber" name="L134" href="#L134">134</a> @Override <em class="jxr_comment">/* Overridden from Object */</em>
<a class="jxr_linenumber" name="L135" href="#L135">135</a> <strong class="jxr_keyword">public</strong> String toString() {
-<a class="jxr_linenumber" name="L136" href="#L136">136</a> <strong class="jxr_keyword">return</strong> f(<span class="jxr_string">"Person(name: {0}, age: {1})"</span>, name, age);
+<a class="jxr_linenumber" name="L136" href="#L136">136</a> <strong class="jxr_keyword">return</strong> mf(<span class="jxr_string">"Person(name: {0}, age: {1})"</span>, name, age);
<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>
@@ -178,7 +178,7 @@
<a class="jxr_linenumber" name="L170" href="#L170">170</a>
<a class="jxr_linenumber" name="L171" href="#L171">171</a> @Override <em class="jxr_comment">/* Overridden from Object */</em>
<a class="jxr_linenumber" name="L172" href="#L172">172</a> <strong class="jxr_keyword">public</strong> String toString() {
-<a class="jxr_linenumber" name="L173" href="#L173">173</a> <strong class="jxr_keyword">return</strong> f(<span class="jxr_string">"Address(street: {0}, city: {1}, state: {2}, zip: {3})"</span>, street, city, state, zip);
+<a class="jxr_linenumber" name="L173" href="#L173">173</a> <strong class="jxr_keyword">return</strong> mf(<span class="jxr_string">"Address(street: {0}, city: {1}, state: {2}, zip: {3})"</span>, street, city, state, zip);
<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>
@@ -336,7 +336,7 @@
<a class="jxr_linenumber" name="L328" href="#L328">328</a>
<a class="jxr_linenumber" name="L329" href="#L329">329</a> @Override <em class="jxr_comment">/* Overridden from Object */</em>
<a class="jxr_linenumber" name="L330" href="#L330">330</a> <strong class="jxr_keyword">public</strong> String toString() {
-<a class="jxr_linenumber" name="L331" href="#L331">331</a> <strong class="jxr_keyword">return</strong> f(<span class="jxr_string">"toString():name={0},age={1}"</span>, name, age);
+<a class="jxr_linenumber" name="L331" href="#L331">331</a> <strong class="jxr_keyword">return</strong> mf(<span class="jxr_string">"toString():name={0},age={1}"</span>, name, age);
<a class="jxr_linenumber" name="L332" href="#L332">332</a> }
<a class="jxr_linenumber" name="L333" href="#L333">333</a> }
<a class="jxr_linenumber" name="L334" href="#L334">334</a>
@@ -366,7 +366,7 @@
<a class="jxr_linenumber" name="L358" href="#L358">358</a>
<a class="jxr_linenumber" name="L359" href="#L359">359</a> @Override <em class="jxr_comment">/* Overridden from Object */</em>
<a class="jxr_linenumber" name="L360" href="#L360">360</a> <strong class="jxr_keyword">public</strong> String toString() {
-<a class="jxr_linenumber" name="L361" href="#L361">361</a> <strong class="jxr_keyword">return</strong> f(<span class="jxr_string">"toString():name={0},age={1}"</span>, name, age);
+<a class="jxr_linenumber" name="L361" href="#L361">361</a> <strong class="jxr_keyword">return</strong> mf(<span class="jxr_string">"toString():name={0},age={1}"</span>, name, age);
<a class="jxr_linenumber" name="L362" href="#L362">362</a> }
<a class="jxr_linenumber" name="L363" href="#L363">363</a> }
<a class="jxr_linenumber" name="L364" href="#L364">364</a>
@@ -407,10 +407,10 @@
<a class="jxr_linenumber" name="L399" href="#L399">399</a> <strong class="jxr_keyword">var</strong> f1 = (A) Proxy.newProxyInstance(<strong class="jxr_keyword">this</strong>.getClass().getClassLoader(), a(A.<strong class="jxr_keyword">class</strong>), <strong class="jxr_keyword">new</strong> AHandler());
<a class="jxr_linenumber" name="L400" href="#L400">400</a>
<a class="jxr_linenumber" name="L401" href="#L401">401</a> <strong class="jxr_keyword">var</strong> bm1 = session.toBeanMap(f1);
-<a class="jxr_linenumber" name="L402" href="#L402">402</a> assertNotNull(bm1, fs(<span class="jxr_string">"Failed to obtain bean adapter for proxy: {0}"</span>, f1));
+<a class="jxr_linenumber" name="L402" href="#L402">402</a> assertNotNull(bm1, mfs(<span class="jxr_string">"Failed to obtain bean adapter for proxy: {0}"</span>, f1));
<a class="jxr_linenumber" name="L403" href="#L403">403</a>
<a class="jxr_linenumber" name="L404" href="#L404">404</a> <strong class="jxr_keyword">var</strong> bm2 = session.newBeanMap(A.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L405" href="#L405">405</a> assertNotNull(bm2, fs(<span class="jxr_string">"Failed to create dynamic proxy bean for interface: {0}"</span>, A.<strong class="jxr_keyword">class</strong>.getName()));
+<a class="jxr_linenumber" name="L405" href="#L405">405</a> assertNotNull(bm2, mfs(<span class="jxr_string">"Failed to create dynamic proxy bean for interface: {0}"</span>, A.<strong class="jxr_keyword">class</strong>.getName()));
<a class="jxr_linenumber" name="L406" href="#L406">406</a>
<a class="jxr_linenumber" name="L407" href="#L407">407</a> bm2.put(<span class="jxr_string">"a"</span>, <span class="jxr_string">"Hello"</span>);
<a class="jxr_linenumber" name="L408" href="#L408">408</a> bm2.put(<span class="jxr_string">"b"</span>, Integer.valueOf(50));
@@ -418,8 +418,8 @@
<a class="jxr_linenumber" name="L410" href="#L410">410</a> f1.setB(50);
<a class="jxr_linenumber" name="L411" href="#L411">411</a>
<a class="jxr_linenumber" name="L412" href="#L412">412</a> assertBean(bm2, <span class="jxr_string">"a,b"</span>, <span class="jxr_string">"Hello,50"</span>);
-<a class="jxr_linenumber" name="L413" href="#L413">413</a> assertEquals(bm1, bm2, fs(<span class="jxr_string">"Failed equality test of dynamic proxies beans: {0} / {1}"</span>, bm1, bm2));
-<a class="jxr_linenumber" name="L414" href="#L414">414</a> assertEquals(bm2, bm1, fs(<span class="jxr_string">"Failed reverse equality test of dynamic proxies beans: {0} / {1}"</span>, bm1, bm2));
+<a class="jxr_linenumber" name="L413" href="#L413">413</a> assertEquals(bm1, bm2, mfs(<span class="jxr_string">"Failed equality test of dynamic proxies beans: {0} / {1}"</span>, bm1, bm2));
+<a class="jxr_linenumber" name="L414" href="#L414">414</a> assertEquals(bm2, bm1, mfs(<span class="jxr_string">"Failed reverse equality test of dynamic proxies beans: {0} / {1}"</span>, bm1, bm2));
<a class="jxr_linenumber" name="L415" href="#L415">415</a> }
<a class="jxr_linenumber" name="L416" href="#L416">416</a>
<a class="jxr_linenumber" name="L417" href="#L417">417</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">interface</strong> A {
diff --git a/site/xref-test/org/apache/juneau/ComboInput.html b/site/xref-test/org/apache/juneau/ComboInput.html
index fdd3e05cbf..3e59ac3883 100644
--- a/site/xref-test/org/apache/juneau/ComboInput.html
+++ b/site/xref-test/org/apache/juneau/ComboInput.html
@@ -83,7 +83,7 @@
<a class="jxr_linenumber" name="L75" href="#L75">75</a> }
<a class="jxr_linenumber" name="L76" href="#L76">76</a>
<a class="jxr_linenumber" name="L77" href="#L77">77</a> <strong class="jxr_keyword">public</strong> ComboInput<T> verify(Predicate<T> verify, String msg, Object...args) {
-<a class="jxr_linenumber" name="L78" href="#L78">78</a> <strong class="jxr_keyword">this</strong>.verify.add(x -> verify.test(x) ? <strong class="jxr_keyword">null</strong> : format(msg, args));
+<a class="jxr_linenumber" name="L78" href="#L78">78</a> <strong class="jxr_keyword">this</strong>.verify.add(x -> verify.test(x) ? <strong class="jxr_keyword">null</strong> : mformat(msg, args));
<a class="jxr_linenumber" name="L79" href="#L79">79</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
<a class="jxr_linenumber" name="L80" href="#L80">80</a> }
<a class="jxr_linenumber" name="L81" href="#L81">81</a>
diff --git a/site/xref-test/org/apache/juneau/ComboRoundTrip_Tester.html b/site/xref-test/org/apache/juneau/ComboRoundTrip_Tester.html
index 589ea5f12b..a504ccd36c 100644
--- a/site/xref-test/org/apache/juneau/ComboRoundTrip_Tester.html
+++ b/site/xref-test/org/apache/juneau/ComboRoundTrip_Tester.html
@@ -94,7 +94,7 @@
<a class="jxr_linenumber" name="L86" href="#L86">86</a>
<a class="jxr_linenumber" name="L87" href="#L87">87</a> <strong class="jxr_keyword">public</strong> Builder<T> verify(Function<T,String> v) { verify.add(v); <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>; }
<a class="jxr_linenumber" name="L88" href="#L88">88</a>
-<a class="jxr_linenumber" name="L89" href="#L89">89</a> <strong class="jxr_keyword">public</strong> Builder<T> verify(Predicate<T> p, String msg, Object...args) { verify.add(x -> p.test(x) ? <strong class="jxr_keyword">null</strong> : f(msg, args)); <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>; }
+<a class="jxr_linenumber" name="L89" href="#L89">89</a> <strong class="jxr_keyword">public</strong> Builder<T> verify(Predicate<T> p, String msg, Object...args) { verify.add(x -> p.test(x) ? <strong class="jxr_keyword">null</strong> : mf(msg, args)); <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>; }
<a class="jxr_linenumber" name="L90" href="#L90">90</a>
<a class="jxr_linenumber" name="L91" href="#L91">91</a> <strong class="jxr_keyword">public</strong> Builder<T> swaps(Class<?>...c) { swaps.addAll(l(c)); <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>; }
<a class="jxr_linenumber" name="L92" href="#L92">92</a>
@@ -240,7 +240,7 @@
<a class="jxr_linenumber" name="L232" href="#L232">232</a> System.out.println(r);
<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> assertEquals(exp, r, fs(<span class="jxr_string">"{0}/{1} serialize-normal failed."</span>, label, testName));
+<a class="jxr_linenumber" name="L235" href="#L235">235</a> assertEquals(exp, r, mfs(<span class="jxr_string">"{0}/{1} serialize-normal failed."</span>, label, testName));
<a class="jxr_linenumber" name="L236" href="#L236">236</a> } <strong class="jxr_keyword">catch</strong> (AssertionError e) {
<a class="jxr_linenumber" name="L237" href="#L237">237</a> <strong class="jxr_keyword">if</strong> (exceptionMsg == <strong class="jxr_keyword">null</strong>)
<a class="jxr_linenumber" name="L238" href="#L238">238</a> <strong class="jxr_keyword">throw</strong> e;
@@ -264,7 +264,7 @@
<a class="jxr_linenumber" name="L256" href="#L256">256</a> o = postConvert.apply((T)o);
<a class="jxr_linenumber" name="L257" href="#L257">257</a> r = s.serializeToString(o);
<a class="jxr_linenumber" name="L258" href="#L258">258</a>
-<a class="jxr_linenumber" name="L259" href="#L259">259</a> assertEquals(exp, r, fs(<span class="jxr_string">"{0}/{1} parse-normal failed"</span>, label, testName));
+<a class="jxr_linenumber" name="L259" href="#L259">259</a> assertEquals(exp, r, mfs(<span class="jxr_string">"{0}/{1} parse-normal failed"</span>, label, testName));
<a class="jxr_linenumber" name="L260" href="#L260">260</a> } <strong class="jxr_keyword">catch</strong> (AssertionError e) {
<a class="jxr_linenumber" name="L261" href="#L261">261</a> <strong class="jxr_keyword">if</strong> (exceptionMsg == <strong class="jxr_keyword">null</strong>)
<a class="jxr_linenumber" name="L262" href="#L262">262</a> <strong class="jxr_keyword">throw</strong> e;
@@ -306,7 +306,7 @@
<a class="jxr_linenumber" name="L298" href="#L298">298</a> <strong class="jxr_keyword">var</strong> r = s.serializeToString(in.get());
<a class="jxr_linenumber" name="L299" href="#L299">299</a> <strong class="jxr_keyword">var</strong> o = p.parse(r, type);
<a class="jxr_linenumber" name="L300" href="#L300">300</a> r = js.serialize(o);
-<a class="jxr_linenumber" name="L301" href="#L301">301</a> assertEquals(exp, r, fs(<span class="jxr_string">"{0}/{1} parse-normal failed on JSON equivalency"</span>, label, testName));
+<a class="jxr_linenumber" name="L301" href="#L301">301</a> assertEquals(exp, r, mfs(<span class="jxr_string">"{0}/{1} parse-normal failed on JSON equivalency"</span>, label, testName));
<a class="jxr_linenumber" name="L302" href="#L302">302</a> } <strong class="jxr_keyword">catch</strong> (AssertionError e) {
<a class="jxr_linenumber" name="L303" href="#L303">303</a> <strong class="jxr_keyword">if</strong> (exceptionMsg == <strong class="jxr_keyword">null</strong>)
<a class="jxr_linenumber" name="L304" href="#L304">304</a> <strong class="jxr_keyword">throw</strong> e;
diff --git a/site/xref-test/org/apache/juneau/ComboSerialize_Tester.html b/site/xref-test/org/apache/juneau/ComboSerialize_Tester.html
index 3da19c6e71..e2d7777341 100644
--- a/site/xref-test/org/apache/juneau/ComboSerialize_Tester.html
+++ b/site/xref-test/org/apache/juneau/ComboSerialize_Tester.html
@@ -181,7 +181,7 @@
<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>
-<a class="jxr_linenumber" name="L176" href="#L176">176</a> assertEquals(exp, r, fs(<span class="jxr_string">"{0}/{1} serialize-normal failed."</span>, label, testName));
+<a class="jxr_linenumber" name="L176" href="#L176">176</a> assertEquals(exp, r, mfs(<span class="jxr_string">"{0}/{1} serialize-normal failed."</span>, label, testName));
<a class="jxr_linenumber" name="L177" href="#L177">177</a> } <strong class="jxr_keyword">catch</strong> (AssertionError e) {
<a class="jxr_linenumber" name="L178" href="#L178">178</a> <strong class="jxr_keyword">if</strong> (exceptionMsg == <strong class="jxr_keyword">null</strong>)
<a class="jxr_linenumber" name="L179" href="#L179">179</a> <strong class="jxr_keyword">throw</strong> e;
diff --git a/site/xref-test/org/apache/juneau/MaxIndent_Test.html b/site/xref-test/org/apache/juneau/MaxIndent_Test.html
index 8b53c6e584..19270b8013 100644
--- a/site/xref-test/org/apache/juneau/MaxIndent_Test.html
+++ b/site/xref-test/org/apache/juneau/MaxIndent_Test.html
@@ -232,7 +232,7 @@
<a class="jxr_linenumber" name="L224" href="#L224">224</a> <strong class="jxr_keyword">return</strong>;
<a class="jxr_linenumber" name="L225" href="#L225">225</a> }
<a class="jxr_linenumber" name="L226" href="#L226">226</a>
-<a class="jxr_linenumber" name="L227" href="#L227">227</a> assertEquals(expected, r, fs(<span class="jxr_string">"{0}/{1} parse-normal failed"</span>, input.label, testName));
+<a class="jxr_linenumber" name="L227" href="#L227">227</a> assertEquals(expected, r, mfs(<span class="jxr_string">"{0}/{1} parse-normal failed"</span>, input.label, testName));
<a class="jxr_linenumber" name="L228" href="#L228">228</a>
<a class="jxr_linenumber" name="L229" href="#L229">229</a> } <strong class="jxr_keyword">catch</strong> (AssertionError e) {
<a class="jxr_linenumber" name="L230" href="#L230">230</a> <strong class="jxr_keyword">throw</strong> e;
diff --git a/site/xref-test/org/apache/juneau/TestUtils.html b/site/xref-test/org/apache/juneau/TestUtils.html
index 205634bdf1..c297f293d0 100644
--- a/site/xref-test/org/apache/juneau/TestUtils.html
+++ b/site/xref-test/org/apache/juneau/TestUtils.html
@@ -156,7 +156,7 @@
<a class="jxr_linenumber" name="L148" href="#L148">148</a>
<a class="jxr_linenumber" name="L149" href="#L149">149</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> assertEqualsAll(Object...values) {
<a class="jxr_linenumber" name="L150" href="#L150">150</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> i = 1; i < values.length; i++) {
-<a class="jxr_linenumber" name="L151" href="#L151">151</a> assertEquals(values[0], values[i], fs(<span class="jxr_string">"Elements at index {0} and {1} did not match. {0}={2}, {1}={3}"</span>, 0, i, r(values[0]), r(values[i])));
+<a class="jxr_linenumber" name="L151" href="#L151">151</a> assertEquals(values[0], values[i], mfs(<span class="jxr_string">"Elements at index {0} and {1} did not match. {0}={2}, {1}={3}"</span>, 0, i, r(values[0]), r(values[i])));
<a class="jxr_linenumber" name="L152" href="#L152">152</a> }
<a class="jxr_linenumber" name="L153" href="#L153">153</a> }
<a class="jxr_linenumber" name="L154" href="#L154">154</a>
@@ -179,7 +179,7 @@
<a class="jxr_linenumber" name="L171" href="#L171">171</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> assertNotEqualsAny(Object actual, Object...values) {
<a class="jxr_linenumber" name="L172" href="#L172">172</a> assertNotNull(actual, <span class="jxr_string">"Value was null."</span>);
<a class="jxr_linenumber" name="L173" href="#L173">173</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> i = 0; i < values.length; i++) {
-<a class="jxr_linenumber" name="L174" href="#L174">174</a> assertNotEquals(values[i], actual, fs(<span class="jxr_string">"Element at index {0} unexpectedly matched. expected={1}, actual={2}"</span>, i, values[i], s(actual)));
+<a class="jxr_linenumber" name="L174" href="#L174">174</a> assertNotEquals(values[i], actual, mfs(<span class="jxr_string">"Element at index {0} unexpectedly matched. expected={1}, actual={2}"</span>, i, values[i], s(actual)));
<a class="jxr_linenumber" name="L175" href="#L175">175</a> }
<a class="jxr_linenumber" name="L176" href="#L176">176</a> }
<a class="jxr_linenumber" name="L177" href="#L177">177</a>
@@ -192,21 +192,21 @@
<a class="jxr_linenumber" name="L184" href="#L184">184</a>
<a class="jxr_linenumber" name="L185" href="#L185">185</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <T <strong class="jxr_keyword">extends</strong> Throwable> T assertThrowable(Class<? <strong class="jxr_keyword">extends</strong> Throwable> expectedType, String expectedSubstring, T t) {
<a class="jxr_linenumber" name="L186" href="#L186">186</a> <strong class="jxr_keyword">var</strong> messages = getMessages(t);
-<a class="jxr_linenumber" name="L187" href="#L187">187</a> assertTrue(messages.contains(expectedSubstring), fs(<span class="jxr_string">"Expected message to contain: {0}.\nActual:\n{1}"</span>, expectedSubstring, messages));
+<a class="jxr_linenumber" name="L187" href="#L187">187</a> assertTrue(messages.contains(expectedSubstring), mfs(<span class="jxr_string">"Expected message to contain: {0}.\nActual:\n{1}"</span>, expectedSubstring, messages));
<a class="jxr_linenumber" name="L188" href="#L188">188</a> <strong class="jxr_keyword">return</strong> t;
<a class="jxr_linenumber" name="L189" href="#L189">189</a> }
<a class="jxr_linenumber" name="L190" href="#L190">190</a>
<a class="jxr_linenumber" name="L191" href="#L191">191</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <T <strong class="jxr_keyword">extends</strong> Throwable> T assertThrowsWithMessage(Class<T> expectedType, List<String> expectedSubstrings, org.junit.jupiter.api.function.Executable executable) {
<a class="jxr_linenumber" name="L192" href="#L192">192</a> <strong class="jxr_keyword">var</strong> exception = Assertions.assertThrows(expectedType, executable);
<a class="jxr_linenumber" name="L193" href="#L193">193</a> <strong class="jxr_keyword">var</strong> messages = getMessages(exception);
-<a class="jxr_linenumber" name="L194" href="#L194">194</a> expectedSubstrings.stream().forEach(x -> assertTrue(messages.contains(x), fs(<span class="jxr_string">"Expected message to contain: {0}.\nActual:\n{1}"</span>, x, messages)));
+<a class="jxr_linenumber" name="L194" href="#L194">194</a> expectedSubstrings.stream().forEach(x -> assertTrue(messages.contains(x), mfs(<span class="jxr_string">"Expected message to contain: {0}.\nActual:\n{1}"</span>, x, messages)));
<a class="jxr_linenumber" name="L195" href="#L195">195</a> <strong class="jxr_keyword">return</strong> exception;
<a class="jxr_linenumber" name="L196" href="#L196">196</a> }
<a class="jxr_linenumber" name="L197" href="#L197">197</a>
<a class="jxr_linenumber" name="L198" href="#L198">198</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <T <strong class="jxr_keyword">extends</strong> Throwable> T assertThrowsWithMessage(Class<T> expectedType, String expectedSubstring, org.junit.jupiter.api.function.Executable executable) {
<a class="jxr_linenumber" name="L199" href="#L199">199</a> <strong class="jxr_keyword">var</strong> exception = Assertions.assertThrows(expectedType, executable);
<a class="jxr_linenumber" name="L200" href="#L200">200</a> <strong class="jxr_keyword">var</strong> messages = getMessages(exception);
-<a class="jxr_linenumber" name="L201" href="#L201">201</a> assertTrue(messages.contains(expectedSubstring), fs(<span class="jxr_string">"Expected message to contain: {0}.\nActual:\n{1}"</span>, expectedSubstring, messages));
+<a class="jxr_linenumber" name="L201" href="#L201">201</a> assertTrue(messages.contains(expectedSubstring), mfs(<span class="jxr_string">"Expected message to contain: {0}.\nActual:\n{1}"</span>, expectedSubstring, messages));
<a class="jxr_linenumber" name="L202" href="#L202">202</a> <strong class="jxr_keyword">return</strong> exception;
<a class="jxr_linenumber" name="L203" href="#L203">203</a> }
<a class="jxr_linenumber" name="L204" href="#L204">204</a>
diff --git a/site/xref-test/org/apache/juneau/a/rttests/RoundTripLargeObjects_Test.html b/site/xref-test/org/apache/juneau/a/rttests/RoundTripLargeObjects_Test.html
index 7bf3d46a35..7f5b010f4e 100644
--- a/site/xref-test/org/apache/juneau/a/rttests/RoundTripLargeObjects_Test.html
+++ b/site/xref-test/org/apache/juneau/a/rttests/RoundTripLargeObjects_Test.html
@@ -119,17 +119,17 @@
<a class="jxr_linenumber" name="L111" href="#L111">111</a>
<a class="jxr_linenumber" name="L112" href="#L112">112</a> <em class="jxr_comment">// Initialization run.</em>
<a class="jxr_linenumber" name="L113" href="#L113">113</a> r = s.serialize(a);
-<a class="jxr_linenumber" name="L114" href="#L114">114</a> System.err.println(format(<span class="jxr_string">"Serialized size: {0,number} "</span>, (r instanceof String ? r.toString().length() : ((byte[])r).length))); <em class="jxr_comment">// NOT DEBUG</em>
+<a class="jxr_linenumber" name="L114" href="#L114">114</a> System.err.println(mformat(<span class="jxr_string">"Serialized size: {0,number} "</span>, (r instanceof String ? r.toString().length() : ((byte[])r).length))); <em class="jxr_comment">// NOT DEBUG</em>
<a class="jxr_linenumber" name="L115" href="#L115">115</a> p.parse(r, A.<strong class="jxr_keyword">class</strong>);
<a class="jxr_linenumber" name="L116" href="#L116">116</a>
<a class="jxr_linenumber" name="L117" href="#L117">117</a> startTime = System.currentTimeMillis();
<a class="jxr_linenumber" name="L118" href="#L118">118</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> i = 0; i < numRuns; i++)
<a class="jxr_linenumber" name="L119" href="#L119">119</a> r = s.serialize(a);
-<a class="jxr_linenumber" name="L120" href="#L120">120</a> System.err.println(format(<span class="jxr_string">"Average serialize time: {0,number}ms"</span>, (System.currentTimeMillis()-startTime)/numRuns)); <em class="jxr_comment">// NOT DEBUG</em>
+<a class="jxr_linenumber" name="L120" href="#L120">120</a> System.err.println(mformat(<span class="jxr_string">"Average serialize time: {0,number}ms"</span>, (System.currentTimeMillis()-startTime)/numRuns)); <em class="jxr_comment">// NOT DEBUG</em>
<a class="jxr_linenumber" name="L121" href="#L121">121</a> startTime = System.currentTimeMillis();
<a class="jxr_linenumber" name="L122" href="#L122">122</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> i = 0; i < numRuns; i++)
<a class="jxr_linenumber" name="L123" href="#L123">123</a> p.parse(r, A.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L124" href="#L124">124</a> System.err.println(format(<span class="jxr_string">"Average parsed time: {0,number}ms"</span>, (System.currentTimeMillis()-startTime)/numRuns)); <em class="jxr_comment">// NOT DEBUG</em>
+<a class="jxr_linenumber" name="L124" href="#L124">124</a> System.err.println(mformat(<span class="jxr_string">"Average parsed time: {0,number}ms"</span>, (System.currentTimeMillis()-startTime)/numRuns)); <em class="jxr_comment">// NOT DEBUG</em>
<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">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> A {
diff --git a/site/xref-test/org/apache/juneau/common/utils/StringUtils_Test.html b/site/xref-test/org/apache/juneau/common/utils/StringUtils_Test.html
index a4fadc504c..b505218a4e 100644
--- a/site/xref-test/org/apache/juneau/common/utils/StringUtils_Test.html
+++ b/site/xref-test/org/apache/juneau/common/utils/StringUtils_Test.html
@@ -3104,14 +3104,14 @@
<a class="jxr_linenumber" name="L3096" href="#L3096">3096</a> assertNull(toStringArray(<strong class="jxr_keyword">null</strong>));
<a class="jxr_linenumber" name="L3097" href="#L3097">3097</a> assertList(toStringArray(Collections.emptyList()));
<a class="jxr_linenumber" name="L3098" href="#L3098">3098</a> assertList(toStringArray(l(<span class="jxr_string">"a"</span>, <span class="jxr_string">"b"</span>, <span class="jxr_string">"c"</span>)), <span class="jxr_string">"a"</span>, <span class="jxr_string">"b"</span>, <span class="jxr_string">"c"</span>);
-<a class="jxr_linenumber" name="L3099" href="#L3099">3099</a>
+<a class="jxr_linenumber" name="L3099" href="#L3099">3099</a>
<a class="jxr_linenumber" name="L3100" href="#L3100">3100</a> <em class="jxr_comment">// Set.of() doesn't preserve order, so use LinkedHashSet for order-sensitive test</em>
<a class="jxr_linenumber" name="L3101" href="#L3101">3101</a> <strong class="jxr_keyword">var</strong> set = <strong class="jxr_keyword">new</strong> LinkedHashSet<String>();
<a class="jxr_linenumber" name="L3102" href="#L3102">3102</a> set.add(<span class="jxr_string">"x"</span>);
<a class="jxr_linenumber" name="L3103" href="#L3103">3103</a> set.add(<span class="jxr_string">"y"</span>);
<a class="jxr_linenumber" name="L3104" href="#L3104">3104</a> set.add(<span class="jxr_string">"z"</span>);
<a class="jxr_linenumber" name="L3105" href="#L3105">3105</a> assertList(toStringArray(set), <span class="jxr_string">"x"</span>, <span class="jxr_string">"y"</span>, <span class="jxr_string">"z"</span>);
-<a class="jxr_linenumber" name="L3106" href="#L3106">3106</a>
+<a class="jxr_linenumber" name="L3106" href="#L3106">3106</a>
<a class="jxr_linenumber" name="L3107" href="#L3107">3107</a> assertList(toStringArray(<strong class="jxr_keyword">new</strong> LinkedHashSet<>(l(<span class="jxr_string">"foo"</span>, <span class="jxr_string">"bar"</span>, <span class="jxr_string">"baz"</span>))), <span class="jxr_string">"foo"</span>, <span class="jxr_string">"bar"</span>, <span class="jxr_string">"baz"</span>);
<a class="jxr_linenumber" name="L3108" href="#L3108">3108</a> <strong class="jxr_keyword">var</strong> list = <strong class="jxr_keyword">new</strong> ArrayList<String>();
<a class="jxr_linenumber" name="L3109" href="#L3109">3109</a> list.add(<span class="jxr_string">"one"</span>);
diff --git a/site/xref-test/org/apache/juneau/html/BasicHtml_Test.html b/site/xref-test/org/apache/juneau/html/BasicHtml_Test.html
index 454f644518..13787b1253 100644
--- a/site/xref-test/org/apache/juneau/html/BasicHtml_Test.html
+++ b/site/xref-test/org/apache/juneau/html/BasicHtml_Test.html
@@ -2559,7 +2559,7 @@
<a class="jxr_linenumber" name="L2551" href="#L2551">2551</a> <strong class="jxr_keyword">void</strong> a1_serializeNormal(Input input) {
<a class="jxr_linenumber" name="L2552" href="#L2552">2552</a> <strong class="jxr_keyword">try</strong> {
<a class="jxr_linenumber" name="L2553" href="#L2553">2553</a> <strong class="jxr_keyword">var</strong> r = s1.serialize(input.in);
-<a class="jxr_linenumber" name="L2554" href="#L2554">2554</a> assertEquals(input.e1, r, fs(<span class="jxr_string">"{0} serialize-normal failed"</span>, input.label));
+<a class="jxr_linenumber" name="L2554" href="#L2554">2554</a> assertEquals(input.e1, r, mfs(<span class="jxr_string">"{0} serialize-normal failed"</span>, input.label));
<a class="jxr_linenumber" name="L2555" href="#L2555">2555</a> } <strong class="jxr_keyword">catch</strong> (AssertionError e) {
<a class="jxr_linenumber" name="L2556" href="#L2556">2556</a> <strong class="jxr_keyword">throw</strong> e;
<a class="jxr_linenumber" name="L2557" href="#L2557">2557</a> } <strong class="jxr_keyword">catch</strong> (Throwable e) {
@@ -2574,7 +2574,7 @@
<a class="jxr_linenumber" name="L2566" href="#L2566">2566</a> <strong class="jxr_keyword">var</strong> r = s1.serialize(input.in);
<a class="jxr_linenumber" name="L2567" href="#L2567">2567</a> <strong class="jxr_keyword">var</strong> o = parser.parse(r, input.type);
<a class="jxr_linenumber" name="L2568" href="#L2568">2568</a> r = s1.serialize(o);
-<a class="jxr_linenumber" name="L2569" href="#L2569">2569</a> assertEquals(input.e1, r, fs(<span class="jxr_string">"{0} parse-normal failed"</span>, input.label));
+<a class="jxr_linenumber" name="L2569" href="#L2569">2569</a> assertEquals(input.e1, r, mfs(<span class="jxr_string">"{0} parse-normal failed"</span>, input.label));
<a class="jxr_linenumber" name="L2570" href="#L2570">2570</a> } <strong class="jxr_keyword">catch</strong> (AssertionError e) {
<a class="jxr_linenumber" name="L2571" href="#L2571">2571</a> <strong class="jxr_keyword">throw</strong> e;
<a class="jxr_linenumber" name="L2572" href="#L2572">2572</a> } <strong class="jxr_keyword">catch</strong> (Throwable e) {
@@ -2601,7 +2601,7 @@
<a class="jxr_linenumber" name="L2593" href="#L2593">2593</a> <strong class="jxr_keyword">void</strong> b1_serializeReadable(Input input) {
<a class="jxr_linenumber" name="L2594" href="#L2594">2594</a> <strong class="jxr_keyword">try</strong> {
<a class="jxr_linenumber" name="L2595" href="#L2595">2595</a> <strong class="jxr_keyword">var</strong> r = s2.serialize(input.in);
-<a class="jxr_linenumber" name="L2596" href="#L2596">2596</a> assertEquals(input.e2, r, fs(<span class="jxr_string">"{0} serialize-readable failed"</span>, input.label));
+<a class="jxr_linenumber" name="L2596" href="#L2596">2596</a> assertEquals(input.e2, r, mfs(<span class="jxr_string">"{0} serialize-readable failed"</span>, input.label));
<a class="jxr_linenumber" name="L2597" href="#L2597">2597</a> } <strong class="jxr_keyword">catch</strong> (AssertionError e) {
<a class="jxr_linenumber" name="L2598" href="#L2598">2598</a> <strong class="jxr_keyword">throw</strong> e;
<a class="jxr_linenumber" name="L2599" href="#L2599">2599</a> } <strong class="jxr_keyword">catch</strong> (Throwable e) {
@@ -2616,7 +2616,7 @@
<a class="jxr_linenumber" name="L2608" href="#L2608">2608</a> <strong class="jxr_keyword">var</strong> r = s2.serialize(input.in);
<a class="jxr_linenumber" name="L2609" href="#L2609">2609</a> <strong class="jxr_keyword">var</strong> o = parser.parse(r, input.type);
<a class="jxr_linenumber" name="L2610" href="#L2610">2610</a> r = s2.serialize(o);
-<a class="jxr_linenumber" name="L2611" href="#L2611">2611</a> assertEquals(input.e2, r, fs(<span class="jxr_string">"{0} parse-readable failed"</span>, input.label));
+<a class="jxr_linenumber" name="L2611" href="#L2611">2611</a> assertEquals(input.e2, r, mfs(<span class="jxr_string">"{0} parse-readable failed"</span>, input.label));
<a class="jxr_linenumber" name="L2612" href="#L2612">2612</a> } <strong class="jxr_keyword">catch</strong> (AssertionError e) {
<a class="jxr_linenumber" name="L2613" href="#L2613">2613</a> <strong class="jxr_keyword">throw</strong> e;
<a class="jxr_linenumber" name="L2614" href="#L2614">2614</a> } <strong class="jxr_keyword">catch</strong> (Throwable e) {
@@ -2643,7 +2643,7 @@
<a class="jxr_linenumber" name="L2635" href="#L2635">2635</a> <strong class="jxr_keyword">void</strong> c1_serializeAbridged(Input input) {
<a class="jxr_linenumber" name="L2636" href="#L2636">2636</a> <strong class="jxr_keyword">try</strong> {
<a class="jxr_linenumber" name="L2637" href="#L2637">2637</a> <strong class="jxr_keyword">var</strong> r = s3.serialize(input.in);
-<a class="jxr_linenumber" name="L2638" href="#L2638">2638</a> assertEquals(input.e3, r, fs(<span class="jxr_string">"{0} serialize-addRootType failed"</span>, input.label));
+<a class="jxr_linenumber" name="L2638" href="#L2638">2638</a> assertEquals(input.e3, r, mfs(<span class="jxr_string">"{0} serialize-addRootType failed"</span>, input.label));
<a class="jxr_linenumber" name="L2639" href="#L2639">2639</a> } <strong class="jxr_keyword">catch</strong> (AssertionError e) {
<a class="jxr_linenumber" name="L2640" href="#L2640">2640</a> <strong class="jxr_keyword">throw</strong> e;
<a class="jxr_linenumber" name="L2641" href="#L2641">2641</a> } <strong class="jxr_keyword">catch</strong> (Throwable e) {
@@ -2658,7 +2658,7 @@
<a class="jxr_linenumber" name="L2650" href="#L2650">2650</a> <strong class="jxr_keyword">var</strong> r = s3.serialize(input.in);
<a class="jxr_linenumber" name="L2651" href="#L2651">2651</a> <strong class="jxr_keyword">var</strong> o = parser.parse(r, input.type);
<a class="jxr_linenumber" name="L2652" href="#L2652">2652</a> r = s3.serialize(o);
-<a class="jxr_linenumber" name="L2653" href="#L2653">2653</a> assertEquals(input.e3, r, fs(<span class="jxr_string">"{0} parse-addRootType failed"</span>, input.label));
+<a class="jxr_linenumber" name="L2653" href="#L2653">2653</a> assertEquals(input.e3, r, mfs(<span class="jxr_string">"{0} parse-addRootType failed"</span>, input.label));
<a class="jxr_linenumber" name="L2654" href="#L2654">2654</a> } <strong class="jxr_keyword">catch</strong> (AssertionError e) {
<a class="jxr_linenumber" name="L2655" href="#L2655">2655</a> <strong class="jxr_keyword">throw</strong> e;
<a class="jxr_linenumber" name="L2656" href="#L2656">2656</a> } <strong class="jxr_keyword">catch</strong> (Throwable e) {
@@ -3119,7 +3119,7 @@
<a class="jxr_linenumber" name="L3111" href="#L3111">3111</a>
<a class="jxr_linenumber" name="L3112" href="#L3112">3112</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> assertInstancesOf(Class<?> c, Object...values) {
<a class="jxr_linenumber" name="L3113" href="#L3113">3113</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> i = 0; i < values.length; i++) {
-<a class="jxr_linenumber" name="L3114" href="#L3114">3114</a> assertInstanceOf(c, values[i], fs(<span class="jxr_string">"Object {0} not expected type. Expected={1}, Actual={2}"</span>, i, c, cns(values[i])));
+<a class="jxr_linenumber" name="L3114" href="#L3114">3114</a> assertInstanceOf(c, values[i], mfs(<span class="jxr_string">"Object {0} not expected type. Expected={1}, Actual={2}"</span>, i, c, cns(values[i])));
<a class="jxr_linenumber" name="L3115" href="#L3115">3115</a> }
<a class="jxr_linenumber" name="L3116" href="#L3116">3116</a> }
<a class="jxr_linenumber" name="L3117" href="#L3117">3117</a> }
diff --git a/site/xref-test/org/apache/juneau/http/MediaRanges_FindMatch_Test.html b/site/xref-test/org/apache/juneau/http/MediaRanges_FindMatch_Test.html
index a8a913bfbc..94229b45f8 100644
--- a/site/xref-test/org/apache/juneau/http/MediaRanges_FindMatch_Test.html
+++ b/site/xref-test/org/apache/juneau/http/MediaRanges_FindMatch_Test.html
@@ -186,7 +186,7 @@
<a class="jxr_linenumber" name="L178" href="#L178">178</a> <strong class="jxr_keyword">var</strong> a = accept(input.accept);
<a class="jxr_linenumber" name="L179" href="#L179">179</a> <strong class="jxr_keyword">var</strong> mt = JsonParser.DEFAULT.parse(input.mediaTypes, MediaType[].<strong class="jxr_keyword">class</strong>);
<a class="jxr_linenumber" name="L180" href="#L180">180</a> <strong class="jxr_keyword">var</strong> r = a.match(l(mt));
-<a class="jxr_linenumber" name="L181" href="#L181">181</a> assertEquals(input.expected, r, fs(<span class="jxr_string">"{0} failed"</span>, input.label));
+<a class="jxr_linenumber" name="L181" href="#L181">181</a> assertEquals(input.expected, r, mfs(<span class="jxr_string">"{0} failed"</span>, input.label));
<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> @ParameterizedTest
diff --git a/site/xref-test/org/apache/juneau/http/header/ContentType_Match_Test.html b/site/xref-test/org/apache/juneau/http/header/ContentType_Match_Test.html
index a33e2bd6cd..fbd1591d0d 100644
--- a/site/xref-test/org/apache/juneau/http/header/ContentType_Match_Test.html
+++ b/site/xref-test/org/apache/juneau/http/header/ContentType_Match_Test.html
@@ -102,7 +102,7 @@
<a class="jxr_linenumber" name="L94" href="#L94">94</a> <strong class="jxr_keyword">void</strong> a01_basic(Input input) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="L95" href="#L95">95</a> <strong class="jxr_keyword">var</strong> ct = contentType(input.contentType);
<a class="jxr_linenumber" name="L96" href="#L96">96</a> <strong class="jxr_keyword">var</strong> mt = JsonParser.DEFAULT.parse(input.mediaTypes, MediaType[].<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L97" href="#L97">97</a> assertEquals(input.expected, ct.match(l(mt)), fs(<span class="jxr_string">"{0} failed"</span>, input.label));
+<a class="jxr_linenumber" name="L97" href="#L97">97</a> assertEquals(input.expected, ct.match(l(mt)), mfs(<span class="jxr_string">"{0} failed"</span>, input.label));
<a class="jxr_linenumber" name="L98" href="#L98">98</a> }
<a class="jxr_linenumber" name="L99" href="#L99">99</a> }
</pre>
diff --git a/site/xref-test/org/apache/juneau/json/JsonParserEdgeCases_Test.html b/site/xref-test/org/apache/juneau/json/JsonParserEdgeCases_Test.html
index c577bc621e..4d0daddb74 100644
--- a/site/xref-test/org/apache/juneau/json/JsonParserEdgeCases_Test.html
+++ b/site/xref-test/org/apache/juneau/json/JsonParserEdgeCases_Test.html
@@ -407,10 +407,10 @@
<a class="jxr_linenumber" name="L399" href="#L399">399</a> fail(<span class="jxr_string">"ParseException expected. Test="</span>+input.name+<span class="jxr_string">", Input="</span> + input.jsonReadable);
<a class="jxr_linenumber" name="L400" href="#L400">400</a> } <strong class="jxr_keyword">catch</strong> (ParseException e) {
<a class="jxr_linenumber" name="L401" href="#L401">401</a> <strong class="jxr_keyword">if</strong> (input.errorText != <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L402" href="#L402">402</a> assertTrue(e.getRootCause().getMessage().contains(input.errorText), fs(<span class="jxr_string">"Got ParseException but didn't contain expected text ''{0}''. Test={1}, Input={2}, Message={3}"</span>, input.errorText, input.name, input.jsonReadable, e.getRootCause().getMessage()));
+<a class="jxr_linenumber" name="L402" href="#L402">402</a> assertTrue(e.getRootCause().getMessage().contains(input.errorText), mfs(<span class="jxr_string">"Got ParseException but didn't contain expected text ''{0}''. Test={1}, Input={2}, Message={3}"</span>, input.errorText, input.name, input.jsonReadable, e.getRootCause().getMessage()));
<a class="jxr_linenumber" name="L403" href="#L403">403</a> } <strong class="jxr_keyword">catch</strong> (IOException e) {
<a class="jxr_linenumber" name="L404" href="#L404">404</a> <strong class="jxr_keyword">if</strong> (input.errorText != <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L405" href="#L405">405</a> assertTrue(e.getMessage().contains(input.errorText), fs(<span class="jxr_string">"Got ParseException but didn't contain expected text ''{0}''. Test={1}, Input={2}, Message={3}"</span>, input.errorText, input.name, input.jsonReadable, e.getMessage()));
+<a class="jxr_linenumber" name="L405" href="#L405">405</a> assertTrue(e.getMessage().contains(input.errorText), mfs(<span class="jxr_string">"Got ParseException but didn't contain expected text ''{0}''. Test={1}, Input={2}, Message={3}"</span>, input.errorText, input.name, input.jsonReadable, e.getMessage()));
<a class="jxr_linenumber" name="L406" href="#L406">406</a> } <strong class="jxr_keyword">catch</strong> (AssertionError e) {
<a class="jxr_linenumber" name="L407" href="#L407">407</a> <strong class="jxr_keyword">throw</strong> e;
<a class="jxr_linenumber" name="L408" href="#L408">408</a> } <strong class="jxr_keyword">catch</strong> (Throwable t) {
@@ -423,10 +423,10 @@
<a class="jxr_linenumber" name="L415" href="#L415">415</a> p.parse(input.json, Object.<strong class="jxr_keyword">class</strong>);
<a class="jxr_linenumber" name="L416" href="#L416">416</a> } <strong class="jxr_keyword">catch</strong> (ParseException e) {
<a class="jxr_linenumber" name="L417" href="#L417">417</a> <strong class="jxr_keyword">if</strong> (input.errorText != <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L418" href="#L418">418</a> assertTrue(e.getRootCause().getMessage().contains(input.errorText), fs(<span class="jxr_string">"Got ParseException but didn't contain expected text ''{0}''. Test={1}, Input={2}, Message={3}"</span>, input.errorText, input.name, input.jsonReadable, e.getRootCause().getMessage()));
+<a class="jxr_linenumber" name="L418" href="#L418">418</a> assertTrue(e.getRootCause().getMessage().contains(input.errorText), mfs(<span class="jxr_string">"Got ParseException but didn't contain expected text ''{0}''. Test={1}, Input={2}, Message={3}"</span>, input.errorText, input.name, input.jsonReadable, e.getRootCause().getMessage()));
<a class="jxr_linenumber" name="L419" href="#L419">419</a> } <strong class="jxr_keyword">catch</strong> (IOException e) {
<a class="jxr_linenumber" name="L420" href="#L420">420</a> <strong class="jxr_keyword">if</strong> (input.errorText != <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L421" href="#L421">421</a> assertTrue(e.getMessage().contains(input.errorText), fs(<span class="jxr_string">"Got ParseException but didn't contain expected text ''{0}''. Test={1}, Input={2}, Message={3}"</span>, input.errorText, input.name, input.jsonReadable, e.getMessage()));
+<a class="jxr_linenumber" name="L421" href="#L421">421</a> assertTrue(e.getMessage().contains(input.errorText), mfs(<span class="jxr_string">"Got ParseException but didn't contain expected text ''{0}''. Test={1}, Input={2}, Message={3}"</span>, input.errorText, input.name, input.jsonReadable, e.getMessage()));
<a class="jxr_linenumber" name="L422" href="#L422">422</a> } <strong class="jxr_keyword">catch</strong> (Throwable t) {
<a class="jxr_linenumber" name="L423" href="#L423">423</a> fail(<span class="jxr_string">"Expected ParseException. Test="</span>+input.name+<span class="jxr_string">", Input="</span> + input.jsonReadable + <span class="jxr_string">", Exception="</span> + t.getClass().getName() + <span class="jxr_string">","</span> +t.getLocalizedMessage());
<a class="jxr_linenumber" name="L424" href="#L424">424</a> }
@@ -452,7 +452,7 @@
<a class="jxr_linenumber" name="L444" href="#L444">444</a> p.parse(input.json, Object.<strong class="jxr_keyword">class</strong>);
<a class="jxr_linenumber" name="L445" href="#L445">445</a> } <strong class="jxr_keyword">catch</strong> (ParseException e) {
<a class="jxr_linenumber" name="L446" href="#L446">446</a> <strong class="jxr_keyword">if</strong> (input.errorText != <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L447" href="#L447">447</a> assertTrue(e.getRootCause().getMessage().contains(input.errorText), fs(<span class="jxr_string">"Got ParseException but didn't contain expected text ''{0}''. Test={1}, Input={2}, Message={3}"</span>, input.errorText, input.name, input.jsonReadable, e.getRootCause().getMessage()));
+<a class="jxr_linenumber" name="L447" href="#L447">447</a> assertTrue(e.getRootCause().getMessage().contains(input.errorText), mfs(<span class="jxr_string">"Got ParseException but didn't contain expected text ''{0}''. Test={1}, Input={2}, Message={3}"</span>, input.errorText, input.name, input.jsonReadable, e.getRootCause().getMessage()));
<a class="jxr_linenumber" name="L448" href="#L448">448</a> } <strong class="jxr_keyword">catch</strong> (AssertionError e) {
<a class="jxr_linenumber" name="L449" href="#L449">449</a> <strong class="jxr_keyword">throw</strong> e;
<a class="jxr_linenumber" name="L450" href="#L450">450</a> } <strong class="jxr_keyword">catch</strong> (Throwable t) {
@@ -465,7 +465,7 @@
<a class="jxr_linenumber" name="L457" href="#L457">457</a> p.parse(input.json, Object.<strong class="jxr_keyword">class</strong>);
<a class="jxr_linenumber" name="L458" href="#L458">458</a> } <strong class="jxr_keyword">catch</strong> (ParseException e) {
<a class="jxr_linenumber" name="L459" href="#L459">459</a> <strong class="jxr_keyword">if</strong> (input.errorText != <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L460" href="#L460">460</a> assertTrue(e.getRootCause().getMessage().contains(input.errorText), fs(<span class="jxr_string">"Got ParseException but didn't contain expected text ''{0}''. Test={1}, Input={2}, Message={3}"</span>, input.errorText, input.name, input.jsonReadable, e.getRootCause().getMessage()));
+<a class="jxr_linenumber" name="L460" href="#L460">460</a> assertTrue(e.getRootCause().getMessage().contains(input.errorText), mfs(<span class="jxr_string">"Got ParseException but didn't contain expected text ''{0}''. Test={1}, Input={2}, Message={3}"</span>, input.errorText, input.name, input.jsonReadable, e.getRootCause().getMessage()));
<a class="jxr_linenumber" name="L461" href="#L461">461</a> } <strong class="jxr_keyword">catch</strong> (Throwable t) {
<a class="jxr_linenumber" name="L462" href="#L462">462</a> fail(<span class="jxr_string">"Expected ParseException. Test="</span>+input.name+<span class="jxr_string">", Input="</span> + input.jsonReadable + <span class="jxr_string">", Exception="</span> + t.getClass().getName() + <span class="jxr_string">","</span> +t.getLocalizedMessage());
<a class="jxr_linenumber" name="L463" href="#L463">463</a> }
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 648b67a782..3b51100769 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
@@ -414,7 +414,7 @@
<a class="jxr_linenumber" name="L406" href="#L406">406</a> <strong class="jxr_keyword">return</strong> format(<span class="jxr_string">"f: {0}"</span>, path.toString());
<a class="jxr_linenumber" name="L407" href="#L407">407</a> }
<a class="jxr_linenumber" name="L408" href="#L408">408</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> String format(String msg, Object...args) {
-<a class="jxr_linenumber" name="L409" href="#L409">409</a> <strong class="jxr_keyword">return</strong> StringUtils.format(msg, args);
+<a class="jxr_linenumber" name="L409" href="#L409">409</a> <strong class="jxr_keyword">return</strong> StringUtils.mformat(msg, args);
<a class="jxr_linenumber" name="L410" href="#L410">410</a> }
<a class="jxr_linenumber" name="L411" href="#L411">411</a> }
<a class="jxr_linenumber" name="L412" href="#L412">412</a>
diff --git a/site/xref-test/org/apache/juneau/serializer/UriResolution_Test.html b/site/xref-test/org/apache/juneau/serializer/UriResolution_Test.html
index f737849100..b315d80e81 100644
--- a/site/xref-test/org/apache/juneau/serializer/UriResolution_Test.html
+++ b/site/xref-test/org/apache/juneau/serializer/UriResolution_Test.html
@@ -66,7 +66,7 @@
<a class="jxr_linenumber" name="L58" href="#L58">58</a> System.out.println(r);
<a class="jxr_linenumber" name="L59" href="#L59">59</a> }
<a class="jxr_linenumber" name="L60" href="#L60">60</a>
-<a class="jxr_linenumber" name="L61" href="#L61">61</a> assertEquals(expected, r, fs(<span class="jxr_string">"{0}/{1} serialize-normal failed"</span>, label, s.getClass().getSimpleName()));
+<a class="jxr_linenumber" name="L61" href="#L61">61</a> assertEquals(expected, r, mfs(<span class="jxr_string">"{0}/{1} serialize-normal failed"</span>, label, s.getClass().getSimpleName()));
<a class="jxr_linenumber" name="L62" href="#L62">62</a>
<a class="jxr_linenumber" name="L63" href="#L63">63</a> } <strong class="jxr_keyword">catch</strong> (AssertionError e) {
<a class="jxr_linenumber" name="L64" href="#L64">64</a> <strong class="jxr_keyword">throw</strong> e;
@@ -83,7 +83,7 @@
<a class="jxr_linenumber" name="L75" href="#L75">75</a> <strong class="jxr_keyword">var</strong> m = p.parse(r, TreeMap.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>);
<a class="jxr_linenumber" name="L76" href="#L76">76</a>
<a class="jxr_linenumber" name="L77" href="#L77">77</a> <strong class="jxr_keyword">var</strong> r2 = Json5Serializer.DEFAULT.toString(m);
-<a class="jxr_linenumber" name="L78" href="#L78">78</a> assertEquals(r2, results.json, fs(<span class="jxr_string">"{0}/{1} parse failed"</span>, label, s.getClass().getSimpleName()));
+<a class="jxr_linenumber" name="L78" href="#L78">78</a> assertEquals(r2, results.json, mfs(<span class="jxr_string">"{0}/{1} parse failed"</span>, label, s.getClass().getSimpleName()));
<a class="jxr_linenumber" name="L79" href="#L79">79</a>
<a class="jxr_linenumber" name="L80" href="#L80">80</a> } <strong class="jxr_keyword">catch</strong> (AssertionError e) {
<a class="jxr_linenumber" name="L81" href="#L81">81</a> <strong class="jxr_keyword">throw</strong> e;
diff --git a/site/xref-test/org/apache/juneau/transforms/OneWayStringSwap_Tester.html b/site/xref-test/org/apache/juneau/transforms/OneWayStringSwap_Tester.html
index b188e02730..ba80567e96 100644
--- a/site/xref-test/org/apache/juneau/transforms/OneWayStringSwap_Tester.html
+++ b/site/xref-test/org/apache/juneau/transforms/OneWayStringSwap_Tester.html
@@ -102,11 +102,11 @@
<a class="jxr_linenumber" name="L94" href="#L94">94</a> } <strong class="jxr_keyword">catch</strong> (AssertionError e) {
<a class="jxr_linenumber" name="L95" href="#L95">95</a> <strong class="jxr_keyword">if</strong> (exceptionMsg == <strong class="jxr_keyword">null</strong>)
<a class="jxr_linenumber" name="L96" href="#L96">96</a> <strong class="jxr_keyword">throw</strong> e;
-<a class="jxr_linenumber" name="L97" href="#L97">97</a> assertTrue(e.getMessage().contains(exceptionMsg), fs(<span class="jxr_string">"Expected exception message to contain: {0}, but was {1}."</span>, exceptionMsg, e.getMessage()));
+<a class="jxr_linenumber" name="L97" href="#L97">97</a> assertTrue(e.getMessage().contains(exceptionMsg), mfs(<span class="jxr_string">"Expected exception message to contain: {0}, but was {1}."</span>, exceptionMsg, e.getMessage()));
<a class="jxr_linenumber" name="L98" href="#L98">98</a> } <strong class="jxr_keyword">catch</strong> (Exception e) {
<a class="jxr_linenumber" name="L99" href="#L99">99</a> <strong class="jxr_keyword">if</strong> (exceptionMsg == <strong class="jxr_keyword">null</strong>)
<a class="jxr_linenumber" name="L100" href="#L100">100</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> AssertionError(<span class="jxr_string">"Test ["</span> + label + <span class="jxr_string">" swap] failed with exception: "</span> + e.getLocalizedMessage(), e);
-<a class="jxr_linenumber" name="L101" href="#L101">101</a> assertTrue(e.getMessage().contains(exceptionMsg), fs(<span class="jxr_string">"Expected exception message to contain: {0}, but was {1}."</span>, exceptionMsg, e.getMessage()));
+<a class="jxr_linenumber" name="L101" href="#L101">101</a> assertTrue(e.getMessage().contains(exceptionMsg), mfs(<span class="jxr_string">"Expected exception message to contain: {0}, but was {1}."</span>, exceptionMsg, e.getMessage()));
<a class="jxr_linenumber" name="L102" href="#L102">102</a> }
<a class="jxr_linenumber" name="L103" href="#L103">103</a> }
<a class="jxr_linenumber" name="L104" href="#L104">104</a>
diff --git a/site/xref-test/org/apache/juneau/transforms/RoundTripObjectSwap_Tester.html b/site/xref-test/org/apache/juneau/transforms/RoundTripObjectSwap_Tester.html
index 62ad52b7b5..4937b9b919 100644
--- a/site/xref-test/org/apache/juneau/transforms/RoundTripObjectSwap_Tester.html
+++ b/site/xref-test/org/apache/juneau/transforms/RoundTripObjectSwap_Tester.html
@@ -96,11 +96,11 @@
<a class="jxr_linenumber" name="L88" href="#L88">88</a> } <strong class="jxr_keyword">catch</strong> (AssertionError e) {
<a class="jxr_linenumber" name="L89" href="#L89">89</a> <strong class="jxr_keyword">if</strong> (exceptionMsg == <strong class="jxr_keyword">null</strong>)
<a class="jxr_linenumber" name="L90" href="#L90">90</a> <strong class="jxr_keyword">throw</strong> e;
-<a class="jxr_linenumber" name="L91" href="#L91">91</a> assertTrue(e.getMessage().contains(exceptionMsg), fs(<span class="jxr_string">"Expected exception message to contain: {0}, but was {1}."</span>, exceptionMsg, e.getMessage()));
+<a class="jxr_linenumber" name="L91" href="#L91">91</a> assertTrue(e.getMessage().contains(exceptionMsg), mfs(<span class="jxr_string">"Expected exception message to contain: {0}, but was {1}."</span>, exceptionMsg, e.getMessage()));
<a class="jxr_linenumber" name="L92" href="#L92">92</a> } <strong class="jxr_keyword">catch</strong> (Exception e) {
<a class="jxr_linenumber" name="L93" href="#L93">93</a> <strong class="jxr_keyword">if</strong> (exceptionMsg == <strong class="jxr_keyword">null</strong>)
<a class="jxr_linenumber" name="L94" href="#L94">94</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> AssertionError(<span class="jxr_string">"Test ["</span> + label + <span class="jxr_string">" swap] failed with exception: "</span> + e.getLocalizedMessage(), e);
-<a class="jxr_linenumber" name="L95" href="#L95">95</a> assertTrue(e.getMessage().contains(exceptionMsg), fs(<span class="jxr_string">"Expected exception message to contain: {0}, but was {1}."</span>, exceptionMsg, e.getMessage()));
+<a class="jxr_linenumber" name="L95" href="#L95">95</a> assertTrue(e.getMessage().contains(exceptionMsg), mfs(<span class="jxr_string">"Expected exception message to contain: {0}, but was {1}."</span>, exceptionMsg, e.getMessage()));
<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>
@@ -117,11 +117,11 @@
<a class="jxr_linenumber" name="L109" href="#L109">109</a> } <strong class="jxr_keyword">catch</strong> (AssertionError e) {
<a class="jxr_linenumber" name="L110" href="#L110">110</a> <strong class="jxr_keyword">if</strong> (exceptionMsg == <strong class="jxr_keyword">null</strong>)
<a class="jxr_linenumber" name="L111" href="#L111">111</a> <strong class="jxr_keyword">throw</strong> e;
-<a class="jxr_linenumber" name="L112" href="#L112">112</a> assertTrue(e.getMessage().contains(exceptionMsg), fs(<span class="jxr_string">"Expected exception message to contain: {0}, but was {1}."</span>, exceptionMsg, e.getMessage()));
+<a class="jxr_linenumber" name="L112" href="#L112">112</a> assertTrue(e.getMessage().contains(exceptionMsg), mfs(<span class="jxr_string">"Expected exception message to contain: {0}, but was {1}."</span>, exceptionMsg, e.getMessage()));
<a class="jxr_linenumber" name="L113" href="#L113">113</a> } <strong class="jxr_keyword">catch</strong> (Exception e) {
<a class="jxr_linenumber" name="L114" href="#L114">114</a> <strong class="jxr_keyword">if</strong> (exceptionMsg == <strong class="jxr_keyword">null</strong>)
<a class="jxr_linenumber" name="L115" href="#L115">115</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> AssertionError(<span class="jxr_string">"Test ["</span> + label + <span class="jxr_string">" unswap] failed with exception: "</span> + e.getLocalizedMessage(), e);
-<a class="jxr_linenumber" name="L116" href="#L116">116</a> assertTrue(e.getMessage().contains(exceptionMsg), fs(<span class="jxr_string">"Expected exception message to contain: {0}, but was {1}."</span>, exceptionMsg, e.getMessage()));
+<a class="jxr_linenumber" name="L116" href="#L116">116</a> assertTrue(e.getMessage().contains(exceptionMsg), mfs(<span class="jxr_string">"Expected exception message to contain: {0}, but was {1}."</span>, exceptionMsg, e.getMessage()));
<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>
diff --git a/site/xref-test/org/apache/juneau/transforms/StringSwap_Tester.html b/site/xref-test/org/apache/juneau/transforms/StringSwap_Tester.html
index 33b67741ea..fd82cf0270 100644
--- a/site/xref-test/org/apache/juneau/transforms/StringSwap_Tester.html
+++ b/site/xref-test/org/apache/juneau/transforms/StringSwap_Tester.html
@@ -99,11 +99,11 @@
<a class="jxr_linenumber" name="L91" href="#L91">91</a> } <strong class="jxr_keyword">catch</strong> (AssertionError e) {
<a class="jxr_linenumber" name="L92" href="#L92">92</a> <strong class="jxr_keyword">if</strong> (exceptionMsg == <strong class="jxr_keyword">null</strong>)
<a class="jxr_linenumber" name="L93" href="#L93">93</a> <strong class="jxr_keyword">throw</strong> e;
-<a class="jxr_linenumber" name="L94" href="#L94">94</a> assertTrue(e.getMessage().contains(exceptionMsg), fs(<span class="jxr_string">"Expected exception message to contain: {0}, but was {1}."</span>, exceptionMsg, e.getMessage()));
+<a class="jxr_linenumber" name="L94" href="#L94">94</a> assertTrue(e.getMessage().contains(exceptionMsg), mfs(<span class="jxr_string">"Expected exception message to contain: {0}, but was {1}."</span>, exceptionMsg, e.getMessage()));
<a class="jxr_linenumber" name="L95" href="#L95">95</a> } <strong class="jxr_keyword">catch</strong> (Exception e) {
<a class="jxr_linenumber" name="L96" href="#L96">96</a> <strong class="jxr_keyword">if</strong> (exceptionMsg == <strong class="jxr_keyword">null</strong>)
<a class="jxr_linenumber" name="L97" href="#L97">97</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> AssertionError(<span class="jxr_string">"Test ["</span> + label + <span class="jxr_string">" swap] failed with exception: "</span> + e.getLocalizedMessage(), e);
-<a class="jxr_linenumber" name="L98" href="#L98">98</a> assertTrue(e.getMessage().contains(exceptionMsg), fs(<span class="jxr_string">"Expected exception message to contain: {0}, but was {1}."</span>, exceptionMsg, e.getMessage()));
+<a class="jxr_linenumber" name="L98" href="#L98">98</a> assertTrue(e.getMessage().contains(exceptionMsg), mfs(<span class="jxr_string">"Expected exception message to contain: {0}, but was {1}."</span>, exceptionMsg, e.getMessage()));
<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>
@@ -121,11 +121,11 @@
<a class="jxr_linenumber" name="L113" href="#L113">113</a> } <strong class="jxr_keyword">catch</strong> (AssertionError e) {
<a class="jxr_linenumber" name="L114" href="#L114">114</a> <strong class="jxr_keyword">if</strong> (exceptionMsg == <strong class="jxr_keyword">null</strong>)
<a class="jxr_linenumber" name="L115" href="#L115">115</a> <strong class="jxr_keyword">throw</strong> e;
-<a class="jxr_linenumber" name="L116" href="#L116">116</a> assertTrue(e.getMessage().contains(exceptionMsg), fs(<span class="jxr_string">"Expected exception message to contain: {0}, but was {1}."</span>, exceptionMsg, e.getMessage()));
+<a class="jxr_linenumber" name="L116" href="#L116">116</a> assertTrue(e.getMessage().contains(exceptionMsg), mfs(<span class="jxr_string">"Expected exception message to contain: {0}, but was {1}."</span>, exceptionMsg, e.getMessage()));
<a class="jxr_linenumber" name="L117" href="#L117">117</a> } <strong class="jxr_keyword">catch</strong> (Exception e) {
<a class="jxr_linenumber" name="L118" href="#L118">118</a> <strong class="jxr_keyword">if</strong> (exceptionMsg == <strong class="jxr_keyword">null</strong>)
<a class="jxr_linenumber" name="L119" href="#L119">119</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> AssertionError(<span class="jxr_string">"Test ["</span> + label + <span class="jxr_string">" unswap] failed with exception: "</span> + e.getLocalizedMessage(), e);
-<a class="jxr_linenumber" name="L120" href="#L120">120</a> assertTrue(e.getMessage().contains(exceptionMsg), fs(<span class="jxr_string">"Expected exception message to contain: {0}, but was {1}."</span>, exceptionMsg, e.getMessage()));
+<a class="jxr_linenumber" name="L120" href="#L120">120</a> assertTrue(e.getMessage().contains(exceptionMsg), mfs(<span class="jxr_string">"Expected exception message to contain: {0}, but was {1}."</span>, exceptionMsg, e.getMessage()));
<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>
diff --git a/site/xref-test/org/apache/juneau/utils/UriContextResolutionCombo_Test.html b/site/xref-test/org/apache/juneau/utils/UriContextResolutionCombo_Test.html
index 25d64526c6..51a467b1d3 100644
--- a/site/xref-test/org/apache/juneau/utils/UriContextResolutionCombo_Test.html
+++ b/site/xref-test/org/apache/juneau/utils/UriContextResolutionCombo_Test.html
@@ -1104,7 +1104,7 @@
<a class="jxr_linenumber" name="L1096" href="#L1096">1096</a> @MethodSource(<span class="jxr_string">"testers"</span>)
<a class="jxr_linenumber" name="L1097" href="#L1097">1097</a> <strong class="jxr_keyword">void</strong> a01_testAbsoluteResource(Tester t) {
<a class="jxr_linenumber" name="L1098" href="#L1098">1098</a> <strong class="jxr_keyword">var</strong> x = UriResolver.of(ABSOLUTE, RESOURCE, UriContext.of(t.input.authority, t.input.context, t.input.resource, t.input.path)).resolve(t.input.uri);
-<a class="jxr_linenumber" name="L1099" href="#L1099">1099</a> assertEquals(t.results.aResource, x, fs(<span class="jxr_string">"{0}: testAbsolute() failed"</span>, t.label));
+<a class="jxr_linenumber" name="L1099" href="#L1099">1099</a> assertEquals(t.results.aResource, x, mfs(<span class="jxr_string">"{0}: testAbsolute() failed"</span>, t.label));
<a class="jxr_linenumber" name="L1100" href="#L1100">1100</a> }
<a class="jxr_linenumber" name="L1101" href="#L1101">1101</a>
<a class="jxr_linenumber" name="L1102" href="#L1102">1102</a> @ParameterizedTest
diff --git a/site/xref-test/org/apache/juneau/utils/UriContextUriCombo_Test.html b/site/xref-test/org/apache/juneau/utils/UriContextUriCombo_Test.html
index 6422c06975..190002bd77 100644
--- a/site/xref-test/org/apache/juneau/utils/UriContextUriCombo_Test.html
+++ b/site/xref-test/org/apache/juneau/utils/UriContextUriCombo_Test.html
@@ -246,43 +246,43 @@
<a class="jxr_linenumber" name="L238" href="#L238">238</a> @ParameterizedTest
<a class="jxr_linenumber" name="L239" href="#L239">239</a> @MethodSource(<span class="jxr_string">"data"</span>)
<a class="jxr_linenumber" name="L240" href="#L240">240</a> <strong class="jxr_keyword">void</strong> a01_testAbsoluteAuthority(Data d) {
-<a class="jxr_linenumber" name="L241" href="#L241">241</a> assertEquals(d.r.eAbsoluteAuthority, d.in.uriContext.getAbsoluteAuthority(), fs(<span class="jxr_string">"{0}: testAbsoluteAuthority() failed"</span>, d.label));
+<a class="jxr_linenumber" name="L241" href="#L241">241</a> assertEquals(d.r.eAbsoluteAuthority, d.in.uriContext.getAbsoluteAuthority(), mfs(<span class="jxr_string">"{0}: testAbsoluteAuthority() failed"</span>, d.label));
<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> @ParameterizedTest
<a class="jxr_linenumber" name="L245" href="#L245">245</a> @MethodSource(<span class="jxr_string">"data"</span>)
<a class="jxr_linenumber" name="L246" href="#L246">246</a> <strong class="jxr_keyword">void</strong> a02_testAbsoluteContext(Data d) {
-<a class="jxr_linenumber" name="L247" href="#L247">247</a> assertEquals(d.r.eAbsoluteContext, d.in.uriContext.getAbsoluteContextRoot(), fs(<span class="jxr_string">"{0}: testAbsoluteContext() failed"</span>, d.label));
+<a class="jxr_linenumber" name="L247" href="#L247">247</a> assertEquals(d.r.eAbsoluteContext, d.in.uriContext.getAbsoluteContextRoot(), mfs(<span class="jxr_string">"{0}: testAbsoluteContext() failed"</span>, d.label));
<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> @ParameterizedTest
<a class="jxr_linenumber" name="L251" href="#L251">251</a> @MethodSource(<span class="jxr_string">"data"</span>)
<a class="jxr_linenumber" name="L252" href="#L252">252</a> <strong class="jxr_keyword">void</strong> a03_testAbsoluteResource(Data d) {
-<a class="jxr_linenumber" name="L253" href="#L253">253</a> assertEquals(d.r.eAbsoluteResource, d.in.uriContext.getAbsoluteServletPath(), fs(<span class="jxr_string">"{0}: testAbsoluteResource() failed"</span>, d.label));
+<a class="jxr_linenumber" name="L253" href="#L253">253</a> assertEquals(d.r.eAbsoluteResource, d.in.uriContext.getAbsoluteServletPath(), mfs(<span class="jxr_string">"{0}: testAbsoluteResource() failed"</span>, d.label));
<a class="jxr_linenumber" name="L254" href="#L254">254</a> }
<a class="jxr_linenumber" name="L255" href="#L255">255</a>
<a class="jxr_linenumber" name="L256" href="#L256">256</a> @ParameterizedTest
<a class="jxr_linenumber" name="L257" href="#L257">257</a> @MethodSource(<span class="jxr_string">"data"</span>)
<a class="jxr_linenumber" name="L258" href="#L258">258</a> <strong class="jxr_keyword">void</strong> a04_testAbsolutePath(Data d) {
-<a class="jxr_linenumber" name="L259" href="#L259">259</a> assertEquals(d.r.eAbsolutePath, d.in.uriContext.getAbsolutePathInfo(), fs(<span class="jxr_string">"{0}: testAbsolutePath() failed"</span>, d.label));
+<a class="jxr_linenumber" name="L259" href="#L259">259</a> assertEquals(d.r.eAbsolutePath, d.in.uriContext.getAbsolutePathInfo(), mfs(<span class="jxr_string">"{0}: testAbsolutePath() failed"</span>, d.label));
<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> @ParameterizedTest
<a class="jxr_linenumber" name="L263" href="#L263">263</a> @MethodSource(<span class="jxr_string">"data"</span>)
<a class="jxr_linenumber" name="L264" href="#L264">264</a> <strong class="jxr_keyword">void</strong> a05_testRootRelativeContext(Data d) {
-<a class="jxr_linenumber" name="L265" href="#L265">265</a> assertEquals(d.r.eRootRelativeContext, d.in.uriContext.getRootRelativeContextRoot(), fs(<span class="jxr_string">"{0}: testRootRelativeContext() failed"</span>, d.label));
+<a class="jxr_linenumber" name="L265" href="#L265">265</a> assertEquals(d.r.eRootRelativeContext, d.in.uriContext.getRootRelativeContextRoot(), mfs(<span class="jxr_string">"{0}: testRootRelativeContext() failed"</span>, d.label));
<a class="jxr_linenumber" name="L266" href="#L266">266</a> }
<a class="jxr_linenumber" name="L267" href="#L267">267</a>
<a class="jxr_linenumber" name="L268" href="#L268">268</a> @ParameterizedTest
<a class="jxr_linenumber" name="L269" href="#L269">269</a> @MethodSource(<span class="jxr_string">"data"</span>)
<a class="jxr_linenumber" name="L270" href="#L270">270</a> <strong class="jxr_keyword">void</strong> a06_testRootRelativeResource(Data d) {
-<a class="jxr_linenumber" name="L271" href="#L271">271</a> assertEquals(d.r.eRootRelativeResource, d.in.uriContext.getRootRelativeServletPath(), fs(<span class="jxr_string">"{0}: testRootRelativeResource() failed"</span>, d.label));
+<a class="jxr_linenumber" name="L271" href="#L271">271</a> assertEquals(d.r.eRootRelativeResource, d.in.uriContext.getRootRelativeServletPath(), mfs(<span class="jxr_string">"{0}: testRootRelativeResource() failed"</span>, d.label));
<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> @ParameterizedTest
<a class="jxr_linenumber" name="L275" href="#L275">275</a> @MethodSource(<span class="jxr_string">"data"</span>)
<a class="jxr_linenumber" name="L276" href="#L276">276</a> <strong class="jxr_keyword">void</strong> a07_testRootRelativePath(Data d) {
-<a class="jxr_linenumber" name="L277" href="#L277">277</a> assertEquals(d.r.eRootRelativePath, d.in.uriContext.getRootRelativePathInfo(), fs(<span class="jxr_string">"{0}: testRootRelativePath() failed"</span>, d.label));
+<a class="jxr_linenumber" name="L277" href="#L277">277</a> assertEquals(d.r.eRootRelativePath, d.in.uriContext.getRootRelativePathInfo(), mfs(<span class="jxr_string">"{0}: testRootRelativePath() failed"</span>, d.label));
<a class="jxr_linenumber" name="L278" href="#L278">278</a> }
<a class="jxr_linenumber" name="L279" href="#L279">279</a> }
</pre>
diff --git a/site/xref-test/org/apache/juneau/xml/BasicXml_Test.html b/site/xref-test/org/apache/juneau/xml/BasicXml_Test.html
index b2c97420df..d29a52e871 100644
--- a/site/xref-test/org/apache/juneau/xml/BasicXml_Test.html
+++ b/site/xref-test/org/apache/juneau/xml/BasicXml_Test.html
@@ -1191,7 +1191,7 @@
<a class="jxr_linenumber" name="L1183" href="#L1183">1183</a> <strong class="jxr_keyword">void</strong> a01_serializeNormal(Input input) {
<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> <strong class="jxr_keyword">var</strong> r = s1.serialize(input.in);
-<a class="jxr_linenumber" name="L1186" href="#L1186">1186</a> assertEquals(input.e1, r, fs(<span class="jxr_string">"{0} serialize-normal failed"</span>, input.label));
+<a class="jxr_linenumber" name="L1186" href="#L1186">1186</a> assertEquals(input.e1, r, mfs(<span class="jxr_string">"{0} serialize-normal failed"</span>, input.label));
<a class="jxr_linenumber" name="L1187" href="#L1187">1187</a> } <strong class="jxr_keyword">catch</strong> (AssertionError e) {
<a class="jxr_linenumber" name="L1188" href="#L1188">1188</a> <strong class="jxr_keyword">throw</strong> e;
<a class="jxr_linenumber" name="L1189" href="#L1189">1189</a> } <strong class="jxr_keyword">catch</strong> (Throwable e) {
@@ -1207,7 +1207,7 @@
<a class="jxr_linenumber" name="L1199" href="#L1199">1199</a> <strong class="jxr_keyword">var</strong> c = input.in == <strong class="jxr_keyword">null</strong> ? Object.<strong class="jxr_keyword">class</strong> : input.in.getClass();
<a class="jxr_linenumber" name="L1200" href="#L1200">1200</a> <strong class="jxr_keyword">var</strong> o = parser.parse(r, c);
<a class="jxr_linenumber" name="L1201" href="#L1201">1201</a> r = s1.serialize(o);
-<a class="jxr_linenumber" name="L1202" href="#L1202">1202</a> assertEquals(input.e1, r, fs(<span class="jxr_string">"{0} parse-normal failed"</span>, input.label));
+<a class="jxr_linenumber" name="L1202" href="#L1202">1202</a> assertEquals(input.e1, r, mfs(<span class="jxr_string">"{0} parse-normal failed"</span>, input.label));
<a class="jxr_linenumber" name="L1203" href="#L1203">1203</a> } <strong class="jxr_keyword">catch</strong> (AssertionError e) {
<a class="jxr_linenumber" name="L1204" href="#L1204">1204</a> <strong class="jxr_keyword">throw</strong> e;
<a class="jxr_linenumber" name="L1205" href="#L1205">1205</a> } <strong class="jxr_keyword">catch</strong> (Throwable e) {
@@ -1220,7 +1220,7 @@
<a class="jxr_linenumber" name="L1212" href="#L1212">1212</a> <strong class="jxr_keyword">void</strong> a03_serializeReadable(Input input) {
<a class="jxr_linenumber" name="L1213" href="#L1213">1213</a> <strong class="jxr_keyword">try</strong> {
<a class="jxr_linenumber" name="L1214" href="#L1214">1214</a> <strong class="jxr_keyword">var</strong> r = s2.serialize(input.in);
-<a class="jxr_linenumber" name="L1215" href="#L1215">1215</a> assertEquals(input.e2, r, fs(<span class="jxr_string">"{0} serialize-readable failed"</span>, input.label));
+<a class="jxr_linenumber" name="L1215" href="#L1215">1215</a> assertEquals(input.e2, r, mfs(<span class="jxr_string">"{0} serialize-readable failed"</span>, input.label));
<a class="jxr_linenumber" name="L1216" href="#L1216">1216</a> } <strong class="jxr_keyword">catch</strong> (AssertionError e) {
<a class="jxr_linenumber" name="L1217" href="#L1217">1217</a> <strong class="jxr_keyword">throw</strong> e;
<a class="jxr_linenumber" name="L1218" href="#L1218">1218</a> } <strong class="jxr_keyword">catch</strong> (Throwable e) {
@@ -1236,7 +1236,7 @@
<a class="jxr_linenumber" name="L1228" href="#L1228">1228</a> <strong class="jxr_keyword">var</strong> c = input.in == <strong class="jxr_keyword">null</strong> ? Object.<strong class="jxr_keyword">class</strong> : input.in.getClass();
<a class="jxr_linenumber" name="L1229" href="#L1229">1229</a> <strong class="jxr_keyword">var</strong> o = parser.parse(r, c);
<a class="jxr_linenumber" name="L1230" href="#L1230">1230</a> r = s2.serialize(o);
-<a class="jxr_linenumber" name="L1231" href="#L1231">1231</a> assertEquals(input.e2, r, fs(<span class="jxr_string">"{0} parse-readable failed"</span>, input.label));
+<a class="jxr_linenumber" name="L1231" href="#L1231">1231</a> assertEquals(input.e2, r, mfs(<span class="jxr_string">"{0} parse-readable failed"</span>, input.label));
<a class="jxr_linenumber" name="L1232" href="#L1232">1232</a> } <strong class="jxr_keyword">catch</strong> (AssertionError e) {
<a class="jxr_linenumber" name="L1233" href="#L1233">1233</a> <strong class="jxr_keyword">throw</strong> e;
<a class="jxr_linenumber" name="L1234" href="#L1234">1234</a> } <strong class="jxr_keyword">catch</strong> (Throwable e) {
@@ -1249,7 +1249,7 @@
<a class="jxr_linenumber" name="L1241" href="#L1241">1241</a> <strong class="jxr_keyword">void</strong> a05_serializeNsEnabled(Input input) {
<a class="jxr_linenumber" name="L1242" href="#L1242">1242</a> <strong class="jxr_keyword">try</strong> {
<a class="jxr_linenumber" name="L1243" href="#L1243">1243</a> <strong class="jxr_keyword">var</strong> r = s3.serialize(input.in);
-<a class="jxr_linenumber" name="L1244" href="#L1244">1244</a> assertEquals(input.e3, r, fs(<span class="jxr_string">"{0} serialize-ns-enabled failed"</span>, input.label));
+<a class="jxr_linenumber" name="L1244" href="#L1244">1244</a> assertEquals(input.e3, r, mfs(<span class="jxr_string">"{0} serialize-ns-enabled failed"</span>, input.label));
<a class="jxr_linenumber" name="L1245" href="#L1245">1245</a> } <strong class="jxr_keyword">catch</strong> (AssertionError e) {
<a class="jxr_linenumber" name="L1246" href="#L1246">1246</a> <strong class="jxr_keyword">throw</strong> e;
<a class="jxr_linenumber" name="L1247" href="#L1247">1247</a> } <strong class="jxr_keyword">catch</strong> (Throwable e) {
@@ -1265,7 +1265,7 @@
<a class="jxr_linenumber" name="L1257" href="#L1257">1257</a> <strong class="jxr_keyword">var</strong> c = input.in == <strong class="jxr_keyword">null</strong> ? Object.<strong class="jxr_keyword">class</strong> : input.in.getClass();
<a class="jxr_linenumber" name="L1258" href="#L1258">1258</a> <strong class="jxr_keyword">var</strong> o = parser.parse(r, c);
<a class="jxr_linenumber" name="L1259" href="#L1259">1259</a> r = s3.serialize(o);
-<a class="jxr_linenumber" name="L1260" href="#L1260">1260</a> assertEquals(input.e3, r, fs(<span class="jxr_string">"{0} parse-ns-enabled failed"</span>, input.label));
+<a class="jxr_linenumber" name="L1260" href="#L1260">1260</a> assertEquals(input.e3, r, mfs(<span class="jxr_string">"{0} parse-ns-enabled failed"</span>, input.label));
<a class="jxr_linenumber" name="L1261" href="#L1261">1261</a> } <strong class="jxr_keyword">catch</strong> (AssertionError e) {
<a class="jxr_linenumber" name="L1262" href="#L1262">1262</a> <strong class="jxr_keyword">throw</strong> e;
<a class="jxr_linenumber" name="L1263" href="#L1263">1263</a> } <strong class="jxr_keyword">catch</strong> (Throwable e) {
diff --git a/site/xref-test/org/apache/juneau/xml/XmlIgnoreComments_Test.html b/site/xref-test/org/apache/juneau/xml/XmlIgnoreComments_Test.html
index 52df06f83d..02f2d6452b 100644
--- a/site/xref-test/org/apache/juneau/xml/XmlIgnoreComments_Test.html
+++ b/site/xref-test/org/apache/juneau/xml/XmlIgnoreComments_Test.html
@@ -710,14 +710,14 @@
<a class="jxr_linenumber" name="L702" href="#L702">702</a> @MethodSource(<span class="jxr_string">"input"</span>)
<a class="jxr_linenumber" name="L703" href="#L703">703</a> <strong class="jxr_keyword">void</strong> a01_noComment(Input input) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="L704" href="#L704">704</a> <strong class="jxr_keyword">var</strong> actual = XmlParser.DEFAULT.parse(input.input.replace(<span class="jxr_string">"|"</span>, <span class="jxr_string">""</span>), input.type);
-<a class="jxr_linenumber" name="L705" href="#L705">705</a> assertEquals(json(actual), json(input.expected), fs(<span class="jxr_string">"Test ''{0}'' failed with comparison error"</span>, input.label));
+<a class="jxr_linenumber" name="L705" href="#L705">705</a> assertEquals(json(actual), json(input.expected), mfs(<span class="jxr_string">"Test ''{0}'' failed with comparison error"</span>, input.label));
<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> @ParameterizedTest
<a class="jxr_linenumber" name="L709" href="#L709">709</a> @MethodSource(<span class="jxr_string">"input"</span>)
<a class="jxr_linenumber" name="L710" href="#L710">710</a> <strong class="jxr_keyword">void</strong> a02_normalComment(Input input) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="L711" href="#L711">711</a> <strong class="jxr_keyword">var</strong> actual = XmlParser.DEFAULT.parse(input.input.replace(<span class="jxr_string">"|"</span>, <span class="jxr_string">"<!--x-->"</span>), input.type);
-<a class="jxr_linenumber" name="L712" href="#L712">712</a> assertEquals(json(actual), json(input.expected), fs(<span class="jxr_string">"Test ''{0}'' failed with comparison error"</span>, input.label));
+<a class="jxr_linenumber" name="L712" href="#L712">712</a> assertEquals(json(actual), json(input.expected), mfs(<span class="jxr_string">"Test ''{0}'' failed with comparison error"</span>, input.label));
<a class="jxr_linenumber" name="L713" href="#L713">713</a> }
<a class="jxr_linenumber" name="L714" href="#L714">714</a>
<a class="jxr_linenumber" name="L715" href="#L715">715</a> @ParameterizedTest
@@ -725,7 +725,7 @@
<a class="jxr_linenumber" name="L717" href="#L717">717</a> <strong class="jxr_keyword">void</strong> a03_commentWithWhitespace(Input input) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="L718" href="#L718">718</a> <strong class="jxr_keyword">var</strong> actual = XmlParser.DEFAULT.parse(input.input.replace(<span class="jxr_string">"|"</span>, <span class="jxr_string">" \n <!-- \n x \n --> \n "</span>), input.type);
<a class="jxr_linenumber" name="L719" href="#L719">719</a> <strong class="jxr_keyword">if</strong> (! input.skipWsTests)
-<a class="jxr_linenumber" name="L720" href="#L720">720</a> assertEquals(json(actual), json(input.expected), fs(<span class="jxr_string">"Test ''{0}'' failed with comparison error"</span>, input.label));
+<a class="jxr_linenumber" name="L720" href="#L720">720</a> assertEquals(json(actual), json(input.expected), mfs(<span class="jxr_string">"Test ''{0}'' failed with comparison error"</span>, input.label));
<a class="jxr_linenumber" name="L721" href="#L721">721</a> }
<a class="jxr_linenumber" name="L722" href="#L722">722</a>
<a class="jxr_linenumber" name="L723" href="#L723">723</a> @ParameterizedTest
@@ -733,7 +733,7 @@
<a class="jxr_linenumber" name="L725" href="#L725">725</a> <strong class="jxr_keyword">void</strong> a04_doubleCommentsWithWhitespace(Input input) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="L726" href="#L726">726</a> <strong class="jxr_keyword">var</strong> actual = XmlParser.DEFAULT.parse(input.input.replace(<span class="jxr_string">"|"</span>, <span class="jxr_string">" \n <!-- \n x \n --> \n \n <!-- \n x \n --> \n "</span>), input.type);
<a class="jxr_linenumber" name="L727" href="#L727">727</a> <strong class="jxr_keyword">if</strong> (! input.skipWsTests)
-<a class="jxr_linenumber" name="L728" href="#L728">728</a> assertEquals(json(actual), json(input.expected), fs(<span class="jxr_string">"Test ''{0}'' failed with comparison error"</span>, input.label));
+<a class="jxr_linenumber" name="L728" href="#L728">728</a> assertEquals(json(actual), json(input.expected), mfs(<span class="jxr_string">"Test ''{0}'' failed with comparison error"</span>, input.label));
<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> <em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
diff --git a/site/xref/org/apache/juneau/BasicAssertionError.html b/site/xref/org/apache/juneau/BasicAssertionError.html
index 572bb595ce..e83f68e6d0 100644
--- a/site/xref/org/apache/juneau/BasicAssertionError.html
+++ b/site/xref/org/apache/juneau/BasicAssertionError.html
@@ -62,7 +62,7 @@
<a class="jxr_linenumber" name="L54" href="#L54">54</a> <em class="jxr_javadoccomment"> * @param args Optional {@link MessageFormat}-style arguments.</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> <a name="BasicAssertionError" href="../../../org/apache/juneau/BasicAssertionError.html#BasicAssertionError">BasicAssertionError</a>(String message, Object...args) {
-<a class="jxr_linenumber" name="L57" href="#L57">57</a> <strong class="jxr_keyword">super</strong>(format(message, args));
+<a class="jxr_linenumber" name="L57" href="#L57">57</a> <strong class="jxr_keyword">super</strong>(mformat(message, args));
<a class="jxr_linenumber" name="L58" href="#L58">58</a> }
<a class="jxr_linenumber" name="L59" href="#L59">59</a>
<a class="jxr_linenumber" name="L60" href="#L60">60</a> <em class="jxr_javadoccomment">/**</em>
diff --git a/site/xref/org/apache/juneau/BasicException.html b/site/xref/org/apache/juneau/BasicException.html
index 1a4538244a..61a31fe72d 100644
--- a/site/xref/org/apache/juneau/BasicException.html
+++ b/site/xref/org/apache/juneau/BasicException.html
@@ -46,7 +46,7 @@
<a class="jxr_linenumber" name="L38" href="#L38">38</a> <em class="jxr_javadoccomment"> * @param args Optional {@link MessageFormat}-style arguments.</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> <strong class="jxr_keyword">public</strong> <a name="BasicException" href="../../../org/apache/juneau/BasicException.html#BasicException">BasicException</a>(String message, Object...args) {
-<a class="jxr_linenumber" name="L41" href="#L41">41</a> <strong class="jxr_keyword">super</strong>(format(message, args));
+<a class="jxr_linenumber" name="L41" href="#L41">41</a> <strong class="jxr_keyword">super</strong>(mformat(message, args));
<a class="jxr_linenumber" name="L42" href="#L42">42</a> }
<a class="jxr_linenumber" name="L43" href="#L43">43</a>
<a class="jxr_linenumber" name="L44" href="#L44">44</a> <em class="jxr_javadoccomment">/**</em>
diff --git a/site/xref/org/apache/juneau/BasicRuntimeException.html b/site/xref/org/apache/juneau/BasicRuntimeException.html
index 4aafebeea0..e08a0f2f83 100644
--- a/site/xref/org/apache/juneau/BasicRuntimeException.html
+++ b/site/xref/org/apache/juneau/BasicRuntimeException.html
@@ -48,7 +48,7 @@
<a class="jxr_linenumber" name="L40" href="#L40">40</a> <em class="jxr_javadoccomment"> * @param args Optional {@link MessageFormat}-style arguments.</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="BasicRuntimeException" href="../../../org/apache/juneau/BasicRuntimeException.html#BasicRuntimeException">BasicRuntimeException</a>(String message, Object...args) {
-<a class="jxr_linenumber" name="L43" href="#L43">43</a> <strong class="jxr_keyword">super</strong>(format(message, args));
+<a class="jxr_linenumber" name="L43" href="#L43">43</a> <strong class="jxr_keyword">super</strong>(mformat(message, args));
<a class="jxr_linenumber" name="L44" href="#L44">44</a> }
<a class="jxr_linenumber" name="L45" href="#L45">45</a>
<a class="jxr_linenumber" name="L46" href="#L46">46</a> <em class="jxr_javadoccomment">/**</em>
@@ -68,7 +68,7 @@
<a class="jxr_linenumber" name="L60" href="#L60">60</a> <em class="jxr_javadoccomment"> * @param args Optional {@link MessageFormat}-style arguments.</em>
<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> <strong class="jxr_keyword">public</strong> <a name="BasicRuntimeException" href="../../../org/apache/juneau/BasicRuntimeException.html#BasicRuntimeException">BasicRuntimeException</a>(Throwable cause, String message, Object...args) {
-<a class="jxr_linenumber" name="L63" href="#L63">63</a> <strong class="jxr_keyword">super</strong>(format(message, args), cause);
+<a class="jxr_linenumber" name="L63" href="#L63">63</a> <strong class="jxr_keyword">super</strong>(mformat(message, args), cause);
<a class="jxr_linenumber" name="L64" href="#L64">64</a> }
<a class="jxr_linenumber" name="L65" href="#L65">65</a>
<a class="jxr_linenumber" name="L66" href="#L66">66</a> @Override <em class="jxr_comment">/* Overridden from Throwable */</em>
@@ -120,7 +120,7 @@
<a class="jxr_linenumber" name="L112" href="#L112">112</a> <em class="jxr_javadoccomment"> */</em>
<a class="jxr_linenumber" name="L113" href="#L113">113</a> <strong class="jxr_keyword">public</strong> <a name="BasicRuntimeException" href="../../../org/apache/juneau/BasicRuntimeException.html#BasicRuntimeException">BasicRuntimeException</a> setMessage(String message, Object...args) {
<a class="jxr_linenumber" name="L114" href="#L114">114</a> assertModifiable();
-<a class="jxr_linenumber" name="L115" href="#L115">115</a> <strong class="jxr_keyword">this</strong>.message = format(message, args);
+<a class="jxr_linenumber" name="L115" href="#L115">115</a> <strong class="jxr_keyword">this</strong>.message = mformat(message, args);
<a class="jxr_linenumber" name="L116" href="#L116">116</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
<a class="jxr_linenumber" name="L117" href="#L117">117</a> }
<a class="jxr_linenumber" name="L118" href="#L118">118</a>
diff --git a/site/xref/org/apache/juneau/ContextSession.html b/site/xref/org/apache/juneau/ContextSession.html
index c39c915eab..ae130366d8 100644
--- a/site/xref/org/apache/juneau/ContextSession.html
+++ b/site/xref/org/apache/juneau/ContextSession.html
@@ -197,7 +197,7 @@
<a class="jxr_linenumber" name="L189" href="#L189">189</a> <strong class="jxr_keyword">return</strong>;
<a class="jxr_linenumber" name="L190" href="#L190">190</a> <strong class="jxr_keyword">if</strong> (warnings == <strong class="jxr_keyword">null</strong>)
<a class="jxr_linenumber" name="L191" href="#L191">191</a> warnings = <strong class="jxr_keyword">new</strong> LinkedList<>();
-<a class="jxr_linenumber" name="L192" href="#L192">192</a> warnings.add((warnings.size() + 1) + <span class="jxr_string">": "</span> + format(msg, args));
+<a class="jxr_linenumber" name="L192" href="#L192">192</a> warnings.add((warnings.size() + 1) + <span class="jxr_string">": "</span> + mformat(msg, args));
<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> <em class="jxr_javadoccomment">/**</em>
diff --git a/site/xref/org/apache/juneau/assertions/Assertion.html b/site/xref/org/apache/juneau/assertions/Assertion.html
index 9d893e6623..07471ba431 100644
--- a/site/xref/org/apache/juneau/assertions/Assertion.html
+++ b/site/xref/org/apache/juneau/assertions/Assertion.html
@@ -221,9 +221,9 @@
<a class="jxr_linenumber" name="L213" href="#L213">213</a> <em class="jxr_javadoccomment"> * @return A new {@link BasicAssertionError}.</em>
<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> <strong class="jxr_keyword">protected</strong> <a name="BasicAssertionError" href="../../../../org/apache/juneau/BasicAssertionError.html#BasicAssertionError">BasicAssertionError</a> error(Throwable cause, String msg, Object...args) {
-<a class="jxr_linenumber" name="L216" href="#L216">216</a> msg = format(msg, args);
+<a class="jxr_linenumber" name="L216" href="#L216">216</a> msg = mformat(msg, args);
<a class="jxr_linenumber" name="L217" href="#L217">217</a> <strong class="jxr_keyword">if</strong> (nn(<strong class="jxr_keyword">this</strong>.msg))
-<a class="jxr_linenumber" name="L218" href="#L218">218</a> msg = format(<strong class="jxr_keyword">this</strong>.msg, <strong class="jxr_keyword">this</strong>.msgArgs).replace(<span class="jxr_string">"<<<MSG>>>"</span>, msg);
+<a class="jxr_linenumber" name="L218" href="#L218">218</a> msg = mformat(<strong class="jxr_keyword">this</strong>.msg, <strong class="jxr_keyword">this</strong>.msgArgs).replace(<span class="jxr_string">"<<<MSG>>>"</span>, msg);
<a class="jxr_linenumber" name="L219" href="#L219">219</a> <strong class="jxr_keyword">if</strong> (nn(out))
<a class="jxr_linenumber" name="L220" href="#L220">220</a> out.println(msg);
<a class="jxr_linenumber" name="L221" href="#L221">221</a> <strong class="jxr_keyword">if</strong> (nn(throwable)) {
diff --git a/site/xref/org/apache/juneau/assertions/AssertionPredicate.html b/site/xref/org/apache/juneau/assertions/AssertionPredicate.html
index e8f6cd25f1..4156e1f072 100644
--- a/site/xref/org/apache/juneau/assertions/AssertionPredicate.html
+++ b/site/xref/org/apache/juneau/assertions/AssertionPredicate.html
@@ -104,7 +104,7 @@
<a class="jxr_linenumber" name="L96" href="#L96">96</a> <strong class="jxr_keyword">if</strong> (nn(p)) {
<a class="jxr_linenumber" name="L97" href="#L97">97</a> <strong class="jxr_keyword">var</strong> b = p.test(t);
<a class="jxr_linenumber" name="L98" href="#L98">98</a> <strong class="jxr_keyword">if</strong> (! b) {
-<a class="jxr_linenumber" name="L99" href="#L99">99</a> <strong class="jxr_keyword">var</strong> m = format(MSG_predicateTestFailed, i + 1);
+<a class="jxr_linenumber" name="L99" href="#L99">99</a> <strong class="jxr_keyword">var</strong> m = mformat(MSG_predicateTestFailed, i + 1);
<a class="jxr_linenumber" name="L100" href="#L100">100</a> <strong class="jxr_keyword">if</strong> (p instanceof <a name="AssertionPredicate" href="../../../../org/apache/juneau/assertions/AssertionPredicate.html#AssertionPredicate">AssertionPredicate</a> p2) <em class="jxr_comment">// NOSONAR - Intentional.</em>
<a class="jxr_linenumber" name="L101" href="#L101">101</a> m += <span class="jxr_string">"\n\t"</span> + p2.getFailureMessage();
<a class="jxr_linenumber" name="L102" href="#L102">102</a> failedMessage.set(m);
@@ -147,7 +147,7 @@
<a class="jxr_linenumber" name="L139" href="#L139">139</a> <strong class="jxr_keyword">if</strong> (nn(p)) {
<a class="jxr_linenumber" name="L140" href="#L140">140</a> <strong class="jxr_keyword">var</strong> b = p.test(t);
<a class="jxr_linenumber" name="L141" href="#L141">141</a> <strong class="jxr_keyword">if</strong> (b) {
-<a class="jxr_linenumber" name="L142" href="#L142">142</a> failedMessage.set(format(MSG_predicateTestsUnexpectedlyPassed));
+<a class="jxr_linenumber" name="L142" href="#L142">142</a> failedMessage.set(mformat(MSG_predicateTestsUnexpectedlyPassed));
<a class="jxr_linenumber" name="L143" href="#L143">143</a> <strong class="jxr_keyword">return</strong> false;
<a class="jxr_linenumber" name="L144" href="#L144">144</a> }
<a class="jxr_linenumber" name="L145" href="#L145">145</a> }
@@ -187,7 +187,7 @@
<a class="jxr_linenumber" name="L179" href="#L179">179</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> p : <strong class="jxr_keyword">inner</strong>)
<a class="jxr_linenumber" name="L180" href="#L180">180</a> <strong class="jxr_keyword">if</strong> (nn(p) && p.test(t))
<a class="jxr_linenumber" name="L181" href="#L181">181</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="L182" href="#L182">182</a> <strong class="jxr_keyword">var</strong> m = format(MSG_noPredicateTestsPassed);
+<a class="jxr_linenumber" name="L182" href="#L182">182</a> <strong class="jxr_keyword">var</strong> m = mformat(MSG_noPredicateTestsPassed);
<a class="jxr_linenumber" name="L183" href="#L183">183</a> failedMessage.set(m);
<a class="jxr_linenumber" name="L184" href="#L184">184</a> <strong class="jxr_keyword">return</strong> false;
<a class="jxr_linenumber" name="L185" href="#L185">185</a> }
@@ -258,7 +258,7 @@
<a class="jxr_linenumber" name="L250" href="#L250">250</a> <strong class="jxr_keyword">else</strong>
<a class="jxr_linenumber" name="L251" href="#L251">251</a> oargs[i] = a;
<a class="jxr_linenumber" name="L252" href="#L252">252</a> }
-<a class="jxr_linenumber" name="L253" href="#L253">253</a> m = format(m, oargs);
+<a class="jxr_linenumber" name="L253" href="#L253">253</a> m = mformat(m, oargs);
<a class="jxr_linenumber" name="L254" href="#L254">254</a> <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">inner</strong> instanceof <a name="AssertionPredicate" href="../../../../org/apache/juneau/assertions/AssertionPredicate.html#AssertionPredicate">AssertionPredicate</a> <strong class="jxr_keyword">inner</strong>2) <em class="jxr_comment">// NOSONAR - Intentional.</em>
<a class="jxr_linenumber" name="L255" href="#L255">255</a> m += <span class="jxr_string">"\n\t"</span> + <strong class="jxr_keyword">inner</strong>2.getFailureMessage();
<a class="jxr_linenumber" name="L256" href="#L256">256</a> failedMessage.set(m);
diff --git a/site/xref/org/apache/juneau/assertions/FluentObjectAssertion.html b/site/xref/org/apache/juneau/assertions/FluentObjectAssertion.html
index c1d55d3962..07193c68a6 100644
--- a/site/xref/org/apache/juneau/assertions/FluentObjectAssertion.html
+++ b/site/xref/org/apache/juneau/assertions/FluentObjectAssertion.html
@@ -589,7 +589,7 @@
<a class="jxr_linenumber" name="L581" href="#L581">581</a> <strong class="jxr_keyword">protected</strong> String getFailureMessage(Predicate<?> p, Object value) {
<a class="jxr_linenumber" name="L582" href="#L582">582</a> <strong class="jxr_keyword">if</strong> (p instanceof <a name="AssertionPredicate" href="../../../../org/apache/juneau/assertions/AssertionPredicate.html#AssertionPredicate">AssertionPredicate</a> p2)
<a class="jxr_linenumber" name="L583" href="#L583">583</a> <strong class="jxr_keyword">return</strong> p2.getFailureMessage();
-<a class="jxr_linenumber" name="L584" href="#L584">584</a> <strong class="jxr_keyword">return</strong> format(MSG_unexpectedValue2, value);
+<a class="jxr_linenumber" name="L584" href="#L584">584</a> <strong class="jxr_keyword">return</strong> mformat(MSG_unexpectedValue2, value);
<a class="jxr_linenumber" name="L585" href="#L585">585</a> }
<a class="jxr_linenumber" name="L586" href="#L586">586</a>
<a class="jxr_linenumber" name="L587" href="#L587">587</a> <em class="jxr_javadoccomment">/**</em>
diff --git a/site/xref/org/apache/juneau/assertions/Verify.html b/site/xref/org/apache/juneau/assertions/Verify.html
index 69b8a0f1d2..07cb2b5314 100644
--- a/site/xref/org/apache/juneau/assertions/Verify.html
+++ b/site/xref/org/apache/juneau/assertions/Verify.html
@@ -91,7 +91,7 @@
<a class="jxr_linenumber" name="L83" href="#L83">83</a> <strong class="jxr_keyword">if</strong> (expected == o)
<a class="jxr_linenumber" name="L84" href="#L84">84</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
<a class="jxr_linenumber" name="L85" href="#L85">85</a> <strong class="jxr_keyword">if</strong> (expected == <strong class="jxr_keyword">null</strong> || o == <strong class="jxr_keyword">null</strong> || ! expected.equals(o))
-<a class="jxr_linenumber" name="L86" href="#L86">86</a> <strong class="jxr_keyword">return</strong> nn(msg) ? msg.get() : format(MSG_unexpectedValue, expected, o);
+<a class="jxr_linenumber" name="L86" href="#L86">86</a> <strong class="jxr_keyword">return</strong> nn(msg) ? msg.get() : mformat(MSG_unexpectedValue, expected, o);
<a class="jxr_linenumber" name="L87" href="#L87">87</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
<a class="jxr_linenumber" name="L88" href="#L88">88</a> }
<a class="jxr_linenumber" name="L89" href="#L89">89</a>
@@ -120,7 +120,7 @@
<a class="jxr_linenumber" name="L112" href="#L112">112</a> <strong class="jxr_keyword">if</strong> ((type == <strong class="jxr_keyword">null</strong> && o == <strong class="jxr_keyword">null</strong>) || (nn(type) && type.isInstance(o)))
<a class="jxr_linenumber" name="L113" href="#L113">113</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
<a class="jxr_linenumber" name="L114" href="#L114">114</a> <strong class="jxr_keyword">var</strong> c = o == <strong class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">null</strong> : o.getClass();
-<a class="jxr_linenumber" name="L115" href="#L115">115</a> <strong class="jxr_keyword">return</strong> nn(msg) ? msg.get() : format(MSG_unexpectedType, type, c);
+<a class="jxr_linenumber" name="L115" href="#L115">115</a> <strong class="jxr_keyword">return</strong> nn(msg) ? msg.get() : mformat(MSG_unexpectedType, type, c);
<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> <em class="jxr_javadoccomment">/**</em>
@@ -131,7 +131,7 @@
<a class="jxr_linenumber" name="L123" href="#L123">123</a> <em class="jxr_javadoccomment"> * @return This object.</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> <strong class="jxr_keyword">public</strong> <a name="Verify" href="../../../../org/apache/juneau/assertions/Verify.html#Verify">Verify</a> msg(String msg, Object args) {
-<a class="jxr_linenumber" name="L126" href="#L126">126</a> <strong class="jxr_keyword">this</strong>.msg = () -> format(msg, args);
+<a class="jxr_linenumber" name="L126" href="#L126">126</a> <strong class="jxr_keyword">this</strong>.msg = () -> mformat(msg, args);
<a class="jxr_linenumber" name="L127" href="#L127">127</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
<a class="jxr_linenumber" name="L128" href="#L128">128</a> }
<a class="jxr_linenumber" name="L129" href="#L129">129</a> }
diff --git a/site/xref/org/apache/juneau/bean/LinkString.html b/site/xref/org/apache/juneau/bean/LinkString.html
index bf27f96146..9937cf633c 100644
--- a/site/xref/org/apache/juneau/bean/LinkString.html
+++ b/site/xref/org/apache/juneau/bean/LinkString.html
@@ -160,7 +160,7 @@
<a class="jxr_linenumber" name="L152" href="#L152">152</a> } <strong class="jxr_keyword">catch</strong> (<a name="SchemaValidationException" href="../../../../org/apache/juneau/httppart/SchemaValidationException.html#SchemaValidationException">SchemaValidationException</a> | <a name="SerializeException" href="../../../../org/apache/juneau/serializer/SerializeException.html#SerializeException">SerializeException</a> e) {
<a class="jxr_linenumber" name="L153" href="#L153">153</a> <strong class="jxr_keyword">throw</strong> toRex(e);
<a class="jxr_linenumber" name="L154" href="#L154">154</a> }
-<a class="jxr_linenumber" name="L155" href="#L155">155</a> <strong class="jxr_keyword">this</strong>.uri = java.net.URI.create(format(value, args));
+<a class="jxr_linenumber" name="L155" href="#L155">155</a> <strong class="jxr_keyword">this</strong>.uri = java.net.URI.create(mformat(value, args));
<a class="jxr_linenumber" name="L156" href="#L156">156</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
<a class="jxr_linenumber" name="L157" href="#L157">157</a> }
<a class="jxr_linenumber" name="L158" href="#L158">158</a>
diff --git a/site/xref/org/apache/juneau/common/reflect/BeanRuntimeException.html b/site/xref/org/apache/juneau/common/reflect/BeanRuntimeException.html
index 9028d79a47..069951b702 100644
--- a/site/xref/org/apache/juneau/common/reflect/BeanRuntimeException.html
+++ b/site/xref/org/apache/juneau/common/reflect/BeanRuntimeException.html
@@ -66,7 +66,7 @@
<a class="jxr_linenumber" name="L58" href="#L58">58</a>
<a class="jxr_linenumber" name="L59" href="#L59">59</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> String getMessage(Throwable cause, Class<?> c, String msg, Object...args) {
<a class="jxr_linenumber" name="L60" href="#L60">60</a> <strong class="jxr_keyword">if</strong> (nn(msg))
-<a class="jxr_linenumber" name="L61" href="#L61">61</a> <strong class="jxr_keyword">return</strong> (c == <strong class="jxr_keyword">null</strong> ? <span class="jxr_string">""</span> : cn(c) + <span class="jxr_string">": "</span>) + f(msg, args);
+<a class="jxr_linenumber" name="L61" href="#L61">61</a> <strong class="jxr_keyword">return</strong> (c == <strong class="jxr_keyword">null</strong> ? <span class="jxr_string">""</span> : cn(c) + <span class="jxr_string">": "</span>) + mf(msg, args);
<a class="jxr_linenumber" name="L62" href="#L62">62</a> <strong class="jxr_keyword">if</strong> (nn(cause))
<a class="jxr_linenumber" name="L63" href="#L63">63</a> <strong class="jxr_keyword">return</strong> (c == <strong class="jxr_keyword">null</strong> ? <span class="jxr_string">""</span> : cn(c) + <span class="jxr_string">": "</span>) + cause.getMessage();
<a class="jxr_linenumber" name="L64" href="#L64">64</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
diff --git a/site/xref/org/apache/juneau/common/reflect/ExecutableException.html b/site/xref/org/apache/juneau/common/reflect/ExecutableException.html
index dc9421293a..6eb9950f3d 100644
--- a/site/xref/org/apache/juneau/common/reflect/ExecutableException.html
+++ b/site/xref/org/apache/juneau/common/reflect/ExecutableException.html
@@ -46,7 +46,7 @@
<a class="jxr_linenumber" name="L38" href="#L38">38</a> <em class="jxr_javadoccomment"> * @param args Optional {@link MessageFormat}-style arguments.</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> <strong class="jxr_keyword">public</strong> <a name="ExecutableException" href="../../../../../org/apache/juneau/common/reflect/ExecutableException.html#ExecutableException">ExecutableException</a>(String message, Object...args) {
-<a class="jxr_linenumber" name="L41" href="#L41">41</a> <strong class="jxr_keyword">super</strong>(f(message, args));
+<a class="jxr_linenumber" name="L41" href="#L41">41</a> <strong class="jxr_keyword">super</strong>(mf(message, args));
<a class="jxr_linenumber" name="L42" href="#L42">42</a> }
<a class="jxr_linenumber" name="L43" href="#L43">43</a>
<a class="jxr_linenumber" name="L44" href="#L44">44</a> <em class="jxr_javadoccomment">/**</em>
@@ -66,7 +66,7 @@
<a class="jxr_linenumber" name="L58" href="#L58">58</a> <em class="jxr_javadoccomment"> * @param args Optional {@link MessageFormat}-style arguments.</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> <a name="ExecutableException" href="../../../../../org/apache/juneau/common/reflect/ExecutableException.html#ExecutableException">ExecutableException</a>(Throwable causedBy, String message, Object...args) {
-<a class="jxr_linenumber" name="L61" href="#L61">61</a> <strong class="jxr_keyword">super</strong>(f(message, args), causedBy);
+<a class="jxr_linenumber" name="L61" href="#L61">61</a> <strong class="jxr_keyword">super</strong>(mf(message, args), causedBy);
<a class="jxr_linenumber" name="L62" href="#L62">62</a> }
<a class="jxr_linenumber" name="L63" href="#L63">63</a>
<a class="jxr_linenumber" name="L64" href="#L64">64</a> <em class="jxr_javadoccomment">/**</em>
diff --git a/site/xref/org/apache/juneau/common/reflect/ExecutableInfo.html b/site/xref/org/apache/juneau/common/reflect/ExecutableInfo.html
index f44c7def5f..fcb3cb74f8 100644
--- a/site/xref/org/apache/juneau/common/reflect/ExecutableInfo.html
+++ b/site/xref/org/apache/juneau/common/reflect/ExecutableInfo.html
@@ -120,7 +120,7 @@
<a class="jxr_linenumber" name="L112" href="#L112">112</a> <strong class="jxr_keyword">this</strong>.parameters = memoize(<strong class="jxr_keyword">this</strong>::findParameters);
<a class="jxr_linenumber" name="L113" href="#L113">113</a> <strong class="jxr_keyword">this</strong>.exceptions = memoize(() -> stream(<strong class="jxr_keyword">inner</strong>.getExceptionTypes()).map(ClassInfo::of).toList());
<a class="jxr_linenumber" name="L114" href="#L114">114</a> <strong class="jxr_keyword">this</strong>.declaredAnnotations = memoize(() -> stream(<strong class="jxr_keyword">inner</strong>.getDeclaredAnnotations()).flatMap(a -> AnnotationUtils.streamRepeated(a)).map(a -> ai((<a name="Annotatable" href="../../../../../org/apache/juneau/common/reflect/Annotatable.html#Annotatable">Annotatable</a>)<strong class="jxr_keyword">this</strong>, a)).toList());
-<a class="jxr_linenumber" name="L115" href="#L115">115</a> <strong class="jxr_keyword">this</strong>.shortName = memoize(() -> f(<span class="jxr_string">"{0}({1})"</span>, getSimpleName(), getParameters().stream().map(p -> p.getParameterType().getNameSimple()).collect(joining(<span class="jxr_string">","</span>))));
+<a class="jxr_linenumber" name="L115" href="#L115">115</a> <strong class="jxr_keyword">this</strong>.shortName = memoize(() -> mf(<span class="jxr_string">"{0}({1})"</span>, getSimpleName(), getParameters().stream().map(p -> p.getParameterType().getNameSimple()).collect(joining(<span class="jxr_string">","</span>))));
<a class="jxr_linenumber" name="L116" href="#L116">116</a> <strong class="jxr_keyword">this</strong>.fullName = memoize(<strong class="jxr_keyword">this</strong>::findFullName);
<a class="jxr_linenumber" name="L117" href="#L117">117</a> }
<a class="jxr_linenumber" name="L118" href="#L118">118</a>
@@ -761,9 +761,9 @@
<a class="jxr_linenumber" name="L753" href="#L753">753</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> checkIndex(<strong class="jxr_keyword">int</strong> index) {
<a class="jxr_linenumber" name="L754" href="#L754">754</a> <strong class="jxr_keyword">int</strong> pc = getParameterCount();
<a class="jxr_linenumber" name="L755" href="#L755">755</a> <strong class="jxr_keyword">if</strong> (pc == 0)
-<a class="jxr_linenumber" name="L756" href="#L756">756</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> IndexOutOfBoundsException(format(<span class="jxr_string">"Invalid index ''{0}''. No parameters."</span>, index));
+<a class="jxr_linenumber" name="L756" href="#L756">756</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> IndexOutOfBoundsException(mformat(<span class="jxr_string">"Invalid index ''{0}''. No parameters."</span>, index));
<a class="jxr_linenumber" name="L757" href="#L757">757</a> <strong class="jxr_keyword">if</strong> (index < 0 || index >= pc)
-<a class="jxr_linenumber" name="L758" href="#L758">758</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> IndexOutOfBoundsException(format(<span class="jxr_string">"Invalid index ''{0}''. Parameter count: {1}"</span>, index, pc));
+<a class="jxr_linenumber" name="L758" href="#L758">758</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> IndexOutOfBoundsException(mformat(<span class="jxr_string">"Invalid index ''{0}''. Parameter count: {1}"</span>, index, pc));
<a class="jxr_linenumber" name="L759" href="#L759">759</a> }
<a class="jxr_linenumber" name="L760" href="#L760">760</a>
<a class="jxr_linenumber" name="L761" href="#L761">761</a> <strong class="jxr_keyword">private</strong> List<ParameterInfo> findParameters() {
diff --git a/site/xref/org/apache/juneau/common/utils/Console.html b/site/xref/org/apache/juneau/common/utils/Console.html
index 7c4164b6ee..ce69d65f4a 100644
--- a/site/xref/org/apache/juneau/common/utils/Console.html
+++ b/site/xref/org/apache/juneau/common/utils/Console.html
@@ -54,7 +54,7 @@
<a class="jxr_linenumber" name="L46" href="#L46">46</a> <em class="jxr_javadoccomment"> * @param args The arguments sent to the formatter.</em>
<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> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">void</strong> err(String msg, Object...args) {
-<a class="jxr_linenumber" name="L49" href="#L49">49</a> System.err.println(f(msg, args)); <em class="jxr_comment">// NOT DEBUG</em>
+<a class="jxr_linenumber" name="L49" href="#L49">49</a> System.err.println(mf(msg, args)); <em class="jxr_comment">// NOT DEBUG</em>
<a class="jxr_linenumber" name="L50" href="#L50">50</a> }
<a class="jxr_linenumber" name="L51" href="#L51">51</a>
<a class="jxr_linenumber" name="L52" href="#L52">52</a> <em class="jxr_javadoccomment">/**</em>
@@ -75,7 +75,7 @@
<a class="jxr_linenumber" name="L67" href="#L67">67</a> <em class="jxr_javadoccomment"> * @param args The arguments sent to the formatter.</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">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">void</strong> out(String msg, Object...args) {
-<a class="jxr_linenumber" name="L70" href="#L70">70</a> System.out.println(f(msg, args));
+<a class="jxr_linenumber" name="L70" href="#L70">70</a> System.out.println(mf(msg, args));
<a class="jxr_linenumber" name="L71" href="#L71">71</a> }
<a class="jxr_linenumber" name="L72" href="#L72">72</a> }
</pre>
diff --git a/site/xref/org/apache/juneau/common/utils/StringUtils.html b/site/xref/org/apache/juneau/common/utils/StringUtils.html
index 7ee5de27dd..8b313f5ba5 100644
--- a/site/xref/org/apache/juneau/common/utils/StringUtils.html
+++ b/site/xref/org/apache/juneau/common/utils/StringUtils.html
@@ -746,7 +746,7 @@
<a class="jxr_linenumber" name="L738" href="#L738">738</a> <em class="jxr_javadoccomment"> * @param args The arguments.</em>
<a class="jxr_linenumber" name="L739" href="#L739">739</a> <em class="jxr_javadoccomment"> * @return The formatted string.</em>
<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> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> String format(String pattern, Object...args) {
+<a class="jxr_linenumber" name="L741" href="#L741">741</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> String mformat(String pattern, Object...args) {
<a class="jxr_linenumber" name="L742" href="#L742">742</a> <strong class="jxr_keyword">if</strong> (args == <strong class="jxr_keyword">null</strong> || args.length == 0)
<a class="jxr_linenumber" name="L743" href="#L743">743</a> <strong class="jxr_keyword">return</strong> pattern;
<a class="jxr_linenumber" name="L744" href="#L744">744</a>
diff --git a/site/xref/org/apache/juneau/common/utils/ThrowableUtils.html b/site/xref/org/apache/juneau/common/utils/ThrowableUtils.html
index 57837c4875..07a63b90d9 100644
--- a/site/xref/org/apache/juneau/common/utils/ThrowableUtils.html
+++ b/site/xref/org/apache/juneau/common/utils/ThrowableUtils.html
@@ -146,7 +146,7 @@
<a class="jxr_linenumber" name="L138" href="#L138">138</a> <em class="jxr_javadoccomment"> * @return A new IllegalArgumentException with the formatted message.</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> <strong class="jxr_keyword">static</strong> IllegalArgumentException illegalArg(String msg, Object...args) {
-<a class="jxr_linenumber" name="L141" href="#L141">141</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> IllegalArgumentException(args.length == 0 ? msg : f(msg, args));
+<a class="jxr_linenumber" name="L141" href="#L141">141</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> IllegalArgumentException(args.length == 0 ? msg : mf(msg, args));
<a class="jxr_linenumber" name="L142" href="#L142">142</a> }
<a class="jxr_linenumber" name="L143" href="#L143">143</a>
<a class="jxr_linenumber" name="L144" href="#L144">144</a> <em class="jxr_javadoccomment">/**</em>
@@ -168,7 +168,7 @@
<a class="jxr_linenumber" name="L160" href="#L160">160</a> <em class="jxr_javadoccomment"> * @return A new IllegalArgumentException with the formatted message and cause.</em>
<a class="jxr_linenumber" name="L161" href="#L161">161</a> <em class="jxr_javadoccomment"> */</em>
<a class="jxr_linenumber" name="L162" href="#L162">162</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> IllegalArgumentException illegalArg(Throwable cause, String msg, Object...args) {
-<a class="jxr_linenumber" name="L163" href="#L163">163</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> IllegalArgumentException(args.length == 0 ? msg : f(msg, args), cause);
+<a class="jxr_linenumber" name="L163" href="#L163">163</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> IllegalArgumentException(args.length == 0 ? msg : mf(msg, args), cause);
<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> <em class="jxr_javadoccomment">/**</em>
@@ -179,7 +179,7 @@
<a class="jxr_linenumber" name="L171" href="#L171">171</a> <em class="jxr_javadoccomment"> * @return A new IOException with the formatted message.</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> <strong class="jxr_keyword">static</strong> java.io.IOException ioex(String msg, Object...args) {
-<a class="jxr_linenumber" name="L174" href="#L174">174</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> java.io.IOException(args.length == 0 ? msg : f(msg, args));
+<a class="jxr_linenumber" name="L174" href="#L174">174</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> java.io.IOException(args.length == 0 ? msg : mf(msg, args));
<a class="jxr_linenumber" name="L175" href="#L175">175</a> }
<a class="jxr_linenumber" name="L176" href="#L176">176</a>
<a class="jxr_linenumber" name="L177" href="#L177">177</a> <em class="jxr_javadoccomment">/**</em>
@@ -201,7 +201,7 @@
<a class="jxr_linenumber" name="L193" href="#L193">193</a> <em class="jxr_javadoccomment"> * @return A new IOException with the formatted message and cause.</em>
<a class="jxr_linenumber" name="L194" href="#L194">194</a> <em class="jxr_javadoccomment"> */</em>
<a class="jxr_linenumber" name="L195" href="#L195">195</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> java.io.IOException ioex(Throwable cause, String msg, Object...args) {
-<a class="jxr_linenumber" name="L196" href="#L196">196</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> java.io.IOException(args.length == 0 ? msg : f(msg, args), cause);
+<a class="jxr_linenumber" name="L196" href="#L196">196</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> java.io.IOException(args.length == 0 ? msg : mf(msg, args), cause);
<a class="jxr_linenumber" name="L197" href="#L197">197</a> }
<a class="jxr_linenumber" name="L198" href="#L198">198</a>
<a class="jxr_linenumber" name="L199" href="#L199">199</a> <em class="jxr_javadoccomment">/**</em>
@@ -222,7 +222,7 @@
<a class="jxr_linenumber" name="L214" href="#L214">214</a> <em class="jxr_javadoccomment"> * @return A new RuntimeException with the formatted message.</em>
<a class="jxr_linenumber" name="L215" href="#L215">215</a> <em class="jxr_javadoccomment"> */</em>
<a class="jxr_linenumber" name="L216" href="#L216">216</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> RuntimeException rex(String msg, Object...args) {
-<a class="jxr_linenumber" name="L217" href="#L217">217</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> RuntimeException(args.length == 0 ? msg : f(msg, args));
+<a class="jxr_linenumber" name="L217" href="#L217">217</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> RuntimeException(args.length == 0 ? msg : mf(msg, args));
<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> <em class="jxr_javadoccomment">/**</em>
@@ -244,7 +244,7 @@
<a class="jxr_linenumber" name="L236" href="#L236">236</a> <em class="jxr_javadoccomment"> * @return A new RuntimeException with the formatted message and cause.</em>
<a class="jxr_linenumber" name="L237" href="#L237">237</a> <em class="jxr_javadoccomment"> */</em>
<a class="jxr_linenumber" name="L238" href="#L238">238</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> RuntimeException rex(Throwable cause, String msg, Object...args) {
-<a class="jxr_linenumber" name="L239" href="#L239">239</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> RuntimeException(args.length == 0 ? msg : f(msg, args), cause);
+<a class="jxr_linenumber" name="L239" href="#L239">239</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> RuntimeException(args.length == 0 ? msg : mf(msg, args), cause);
<a class="jxr_linenumber" name="L240" href="#L240">240</a> }
<a class="jxr_linenumber" name="L241" href="#L241">241</a>
<a class="jxr_linenumber" name="L242" href="#L242">242</a> <em class="jxr_javadoccomment">/**</em>
@@ -255,7 +255,7 @@
<a class="jxr_linenumber" name="L247" href="#L247">247</a> <em class="jxr_javadoccomment"> * @return A new RuntimeException with the formatted message.</em>
<a class="jxr_linenumber" name="L248" href="#L248">248</a> <em class="jxr_javadoccomment"> */</em>
<a class="jxr_linenumber" name="L249" href="#L249">249</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <a name="BeanRuntimeException" href="../../../../../org/apache/juneau/common/reflect/BeanRuntimeException.html#BeanRuntimeException">BeanRuntimeException</a> bex(String msg, Object...args) {
-<a class="jxr_linenumber" name="L250" href="#L250">250</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a name="BeanRuntimeException" href="../../../../../org/apache/juneau/common/reflect/BeanRuntimeException.html#BeanRuntimeException">BeanRuntimeException</a>(args.length == 0 ? msg : f(msg, args));
+<a class="jxr_linenumber" name="L250" href="#L250">250</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a name="BeanRuntimeException" href="../../../../../org/apache/juneau/common/reflect/BeanRuntimeException.html#BeanRuntimeException">BeanRuntimeException</a>(args.length == 0 ? msg : mf(msg, args));
<a class="jxr_linenumber" name="L251" href="#L251">251</a> }
<a class="jxr_linenumber" name="L252" href="#L252">252</a>
<a class="jxr_linenumber" name="L253" href="#L253">253</a> <em class="jxr_javadoccomment">/**</em>
@@ -302,7 +302,7 @@
<a class="jxr_linenumber" name="L294" href="#L294">294</a> <em class="jxr_javadoccomment"> * @return A new RuntimeException with the formatted message and cause.</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> <strong class="jxr_keyword">static</strong> <a name="BeanRuntimeException" href="../../../../../org/apache/juneau/common/reflect/BeanRuntimeException.html#BeanRuntimeException">BeanRuntimeException</a> bex(Throwable cause, String msg, Object...args) {
-<a class="jxr_linenumber" name="L297" href="#L297">297</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a name="BeanRuntimeException" href="../../../../../org/apache/juneau/common/reflect/BeanRuntimeException.html#BeanRuntimeException">BeanRuntimeException</a>(args.length == 0 ? msg : f(msg, args), cause);
+<a class="jxr_linenumber" name="L297" href="#L297">297</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a name="BeanRuntimeException" href="../../../../../org/apache/juneau/common/reflect/BeanRuntimeException.html#BeanRuntimeException">BeanRuntimeException</a>(args.length == 0 ? msg : mf(msg, args), cause);
<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> <em class="jxr_javadoccomment">/**</em>
@@ -332,7 +332,7 @@
<a class="jxr_linenumber" name="L324" href="#L324">324</a> <em class="jxr_javadoccomment"> * @return A new UnsupportedOperationException with the formatted message.</em>
<a class="jxr_linenumber" name="L325" href="#L325">325</a> <em class="jxr_javadoccomment"> */</em>
<a class="jxr_linenumber" name="L326" href="#L326">326</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> UnsupportedOperationException unsupportedOp(String msg, Object...args) {
-<a class="jxr_linenumber" name="L327" href="#L327">327</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> UnsupportedOperationException(args.length == 0 ? msg : f(msg, args));
+<a class="jxr_linenumber" name="L327" href="#L327">327</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> UnsupportedOperationException(args.length == 0 ? msg : mf(msg, args));
<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_javadoccomment">/**</em>
@@ -354,7 +354,7 @@
<a class="jxr_linenumber" name="L346" href="#L346">346</a> <em class="jxr_javadoccomment"> * @return A new UnsupportedOperationException with the formatted message and cause.</em>
<a class="jxr_linenumber" name="L347" href="#L347">347</a> <em class="jxr_javadoccomment"> */</em>
<a class="jxr_linenumber" name="L348" href="#L348">348</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> UnsupportedOperationException unsupportedOp(Throwable cause, String msg, Object...args) {
-<a class="jxr_linenumber" name="L349" href="#L349">349</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> UnsupportedOperationException(args.length == 0 ? msg : f(msg, args), cause);
+<a class="jxr_linenumber" name="L349" href="#L349">349</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> UnsupportedOperationException(args.length == 0 ? msg : mf(msg, args), cause);
<a class="jxr_linenumber" name="L350" href="#L350">350</a> }
<a class="jxr_linenumber" name="L351" href="#L351">351</a>
<a class="jxr_linenumber" name="L352" href="#L352">352</a> <em class="jxr_javadoccomment">/**</em>
diff --git a/site/xref/org/apache/juneau/common/utils/Utils.html b/site/xref/org/apache/juneau/common/utils/Utils.html
index 1f7e88b139..bc317da165 100644
--- a/site/xref/org/apache/juneau/common/utils/Utils.html
+++ b/site/xref/org/apache/juneau/common/utils/Utils.html
@@ -303,7 +303,7 @@
<a class="jxr_linenumber" name="L295" href="#L295">295</a> <em class="jxr_javadoccomment"> * @param args The arguments to substitute into the pattern.</em>
<a class="jxr_linenumber" name="L296" href="#L296">296</a> <em class="jxr_javadoccomment"> * @return The formatted string.</em>
<a class="jxr_linenumber" name="L297" href="#L297">297</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L298" href="#L298">298</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> String f(String pattern, Object...args) {
+<a class="jxr_linenumber" name="L298" href="#L298">298</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> String mf(String pattern, Object...args) {
<a class="jxr_linenumber" name="L299" href="#L299">299</a> <strong class="jxr_keyword">if</strong> (args.length == 0)
<a class="jxr_linenumber" name="L300" href="#L300">300</a> <strong class="jxr_keyword">return</strong> pattern;
<a class="jxr_linenumber" name="L301" href="#L301">301</a> <strong class="jxr_keyword">return</strong> MessageFormat.format(pattern, args);
@@ -408,10 +408,10 @@
<a class="jxr_linenumber" name="L400" href="#L400">400</a> <em class="jxr_javadoccomment"> * @param pattern The message pattern using <js>{0}</js>, <js>{1}</js>, etc. placeholders.</em>
<a class="jxr_linenumber" name="L401" href="#L401">401</a> <em class="jxr_javadoccomment"> * @param args The arguments to substitute into the pattern placeholders.</em>
<a class="jxr_linenumber" name="L402" href="#L402">402</a> <em class="jxr_javadoccomment"> * @return A {@link Supplier} that will format the string when {@code get()} is called.</em>
-<a class="jxr_linenumber" name="L403" href="#L403">403</a> <em class="jxr_javadoccomment"> * @see StringUtils#format(String, Object...)</em>
+<a class="jxr_linenumber" name="L403" href="#L403">403</a> <em class="jxr_javadoccomment"> * @see StringUtils#mformat(String, Object...)</em>
<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> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> Supplier<String> fs(String pattern, Object...args) {
-<a class="jxr_linenumber" name="L406" href="#L406">406</a> <strong class="jxr_keyword">return</strong> () -> format(pattern, args);
+<a class="jxr_linenumber" name="L405" href="#L405">405</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> Supplier<String> mfs(String pattern, Object...args) {
+<a class="jxr_linenumber" name="L406" href="#L406">406</a> <strong class="jxr_keyword">return</strong> () -> mformat(pattern, args);
<a class="jxr_linenumber" name="L407" href="#L407">407</a> }
<a class="jxr_linenumber" name="L408" href="#L408">408</a>
<a class="jxr_linenumber" name="L409" href="#L409">409</a> <em class="jxr_javadoccomment">/**</em>
diff --git a/site/xref/org/apache/juneau/cp/Messages.html b/site/xref/org/apache/juneau/cp/Messages.html
index 10b96c7d78..b2c732d479 100644
--- a/site/xref/org/apache/juneau/cp/Messages.html
+++ b/site/xref/org/apache/juneau/cp/Messages.html
@@ -449,7 +449,7 @@
<a class="jxr_linenumber" name="L441" href="#L441">441</a> <strong class="jxr_keyword">var</strong> s = getString(key);
<a class="jxr_linenumber" name="L442" href="#L442">442</a> <strong class="jxr_keyword">if</strong> (s.startsWith(<span class="jxr_string">"{!"</span>))
<a class="jxr_linenumber" name="L443" href="#L443">443</a> <strong class="jxr_keyword">return</strong> s;
-<a class="jxr_linenumber" name="L444" href="#L444">444</a> <strong class="jxr_keyword">return</strong> format(s, args);
+<a class="jxr_linenumber" name="L444" href="#L444">444</a> <strong class="jxr_keyword">return</strong> mformat(s, args);
<a class="jxr_linenumber" name="L445" href="#L445">445</a> }
<a class="jxr_linenumber" name="L446" href="#L446">446</a>
<a class="jxr_linenumber" name="L447" href="#L447">447</a> @Override <em class="jxr_comment">/* Overridden from ResourceBundle */</em>
diff --git a/site/xref/org/apache/juneau/http/response/BasicHttpException.html b/site/xref/org/apache/juneau/http/response/BasicHttpException.html
index c3ddb8ee90..665792801f 100644
--- a/site/xref/org/apache/juneau/http/response/BasicHttpException.html
+++ b/site/xref/org/apache/juneau/http/response/BasicHttpException.html
@@ -140,7 +140,7 @@
<a class="jxr_linenumber" name="L132" href="#L132">132</a> <strong class="jxr_keyword">public</strong> <a name="BasicHttpException" href="../../../../../org/apache/juneau/http/response/BasicHttpException.html#BasicHttpException">BasicHttpException</a>(<strong class="jxr_keyword">int</strong> statusCode, Throwable cause, String msg, Object...args) {
<a class="jxr_linenumber" name="L133" href="#L133">133</a> <strong class="jxr_keyword">super</strong>(cause, msg, args);
<a class="jxr_linenumber" name="L134" href="#L134">134</a> setStatusCode(statusCode);
-<a class="jxr_linenumber" name="L135" href="#L135">135</a> setContent(f(msg, args));
+<a class="jxr_linenumber" name="L135" href="#L135">135</a> setContent(mf(msg, args));
<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>
@@ -210,9 +210,9 @@
<a class="jxr_linenumber" name="L202" href="#L202">202</a> msg = msg.replace('<', ' ').replace('>', ' ').replace('&', ' ');
<a class="jxr_linenumber" name="L203" href="#L203">203</a> <strong class="jxr_keyword">var</strong> cls = cns(e);
<a class="jxr_linenumber" name="L204" href="#L204">204</a> <strong class="jxr_keyword">if</strong> (msg == <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L205" href="#L205">205</a> sb.append(f(<span class="jxr_string">"\nCaused by ({0})"</span>, cls));
+<a class="jxr_linenumber" name="L205" href="#L205">205</a> sb.append(mf(<span class="jxr_string">"\nCaused by ({0})"</span>, cls));
<a class="jxr_linenumber" name="L206" href="#L206">206</a> <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L207" href="#L207">207</a> sb.append(f(<span class="jxr_string">"\nCaused by ({0}): {1}"</span>, cls, msg));
+<a class="jxr_linenumber" name="L207" href="#L207">207</a> sb.append(mf(<span class="jxr_string">"\nCaused by ({0}): {1}"</span>, cls, msg));
<a class="jxr_linenumber" name="L208" href="#L208">208</a> e = e.getCause();
<a class="jxr_linenumber" name="L209" href="#L209">209</a> }
<a class="jxr_linenumber" name="L210" href="#L210">210</a> <strong class="jxr_keyword">return</strong> sb.toString();
diff --git a/site/xref/org/apache/juneau/junit/bct/AssertionArgs.html b/site/xref/org/apache/juneau/junit/bct/AssertionArgs.html
index 51f25d2ac3..e3b7db1d95 100644
--- a/site/xref/org/apache/juneau/junit/bct/AssertionArgs.html
+++ b/site/xref/org/apache/juneau/junit/bct/AssertionArgs.html
@@ -202,7 +202,7 @@
<a class="jxr_linenumber" name="L194" href="#L194">194</a> <em class="jxr_javadoccomment"> * @return This instance for method chaining.</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> <strong class="jxr_keyword">public</strong> <a name="AssertionArgs" href="../../../../../org/apache/juneau/junit/bct/AssertionArgs.html#AssertionArgs">AssertionArgs</a> setMessage(String message, Object...args) {
-<a class="jxr_linenumber" name="L197" href="#L197">197</a> messageSupplier = fs(message, args);
+<a class="jxr_linenumber" name="L197" href="#L197">197</a> messageSupplier = mfs(message, args);
<a class="jxr_linenumber" name="L198" href="#L198">198</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
<a class="jxr_linenumber" name="L199" href="#L199">199</a> }
<a class="jxr_linenumber" name="L200" href="#L200">200</a>
@@ -268,7 +268,7 @@
<a class="jxr_linenumber" name="L260" href="#L260">260</a> <em class="jxr_javadoccomment"> * @return A supplier that produces the composed error message.</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> <strong class="jxr_keyword">protected</strong> Supplier<String> getMessage(String msg, Object...args) {
-<a class="jxr_linenumber" name="L263" href="#L263">263</a> <strong class="jxr_keyword">return</strong> messageSupplier == <strong class="jxr_keyword">null</strong> ? fs(msg, args) : fs(<span class="jxr_string">"{0}, Caused by: {1}"</span>, messageSupplier.get(), f(msg, args));
+<a class="jxr_linenumber" name="L263" href="#L263">263</a> <strong class="jxr_keyword">return</strong> messageSupplier == <strong class="jxr_keyword">null</strong> ? mfs(msg, args) : mfs(<span class="jxr_string">"{0}, Caused by: {1}"</span>, messageSupplier.get(), mf(msg, args));
<a class="jxr_linenumber" name="L264" href="#L264">264</a> }
<a class="jxr_linenumber" name="L265" href="#L265">265</a> }
</pre>
diff --git a/site/xref/org/apache/juneau/junit/bct/BctUtils.html b/site/xref/org/apache/juneau/junit/bct/BctUtils.html
index 41e215f579..786ec56389 100644
--- a/site/xref/org/apache/juneau/junit/bct/BctUtils.html
+++ b/site/xref/org/apache/juneau/junit/bct/BctUtils.html
@@ -68,7 +68,7 @@
<a class="jxr_linenumber" name="L60" href="#L60">60</a> <em class="jxr_javadoccomment"> * @return A new {@link AssertionFailedError} with formatted message and values.</em>
<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> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> AssertionFailedError assertEqualsFailed(Object expected, Object actual, Supplier<String> messageSupplier) {
-<a class="jxr_linenumber" name="L63" href="#L63">63</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> AssertionFailedError(opt(messageSupplier).map(x -> x.get()).orElse(<span class="jxr_string">"Equals assertion failed."</span>) + f(<span class="jxr_string">" ==> expected: <{0}> but was: <{1}>"</span>, expected, actual), expected, actual);
+<a class="jxr_linenumber" name="L63" href="#L63">63</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> AssertionFailedError(opt(messageSupplier).map(x -> x.get()).orElse(<span class="jxr_string">"Equals assertion failed."</span>) + mf(<span class="jxr_string">" ==> expected: <{0}> but was: <{1}>"</span>, expected, actual), expected, actual);
<a class="jxr_linenumber" name="L64" href="#L64">64</a> }
<a class="jxr_linenumber" name="L65" href="#L65">65</a>
<a class="jxr_linenumber" name="L66" href="#L66">66</a> <em class="jxr_javadoccomment">/**</em>
diff --git a/site/xref/org/apache/juneau/junit/bct/PropertyNotFoundException.html b/site/xref/org/apache/juneau/junit/bct/PropertyNotFoundException.html
index 84a6bd14e6..10191c228f 100644
--- a/site/xref/org/apache/juneau/junit/bct/PropertyNotFoundException.html
+++ b/site/xref/org/apache/juneau/junit/bct/PropertyNotFoundException.html
@@ -70,7 +70,7 @@
<a class="jxr_linenumber" name="L62" href="#L62">62</a> <em class="jxr_javadoccomment"> * @param objectType The type of object on which the property was sought</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> <strong class="jxr_keyword">public</strong> <a name="PropertyNotFoundException" href="../../../../../org/apache/juneau/junit/bct/PropertyNotFoundException.html#PropertyNotFoundException">PropertyNotFoundException</a>(String propertyName, Class<?> objectType) {
-<a class="jxr_linenumber" name="L65" href="#L65">65</a> <strong class="jxr_keyword">super</strong>(f(<span class="jxr_string">"Property ''{0}'' not found on object of type {1}"</span>, propertyName, cns(objectType)));
+<a class="jxr_linenumber" name="L65" href="#L65">65</a> <strong class="jxr_keyword">super</strong>(mf(<span class="jxr_string">"Property ''{0}'' not found on object of type {1}"</span>, propertyName, cns(objectType)));
<a class="jxr_linenumber" name="L66" href="#L66">66</a> }
<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>
@@ -81,7 +81,7 @@
<a class="jxr_linenumber" name="L73" href="#L73">73</a> <em class="jxr_javadoccomment"> * @param cause The underlying cause of the exception</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> <strong class="jxr_keyword">public</strong> <a name="PropertyNotFoundException" href="../../../../../org/apache/juneau/junit/bct/PropertyNotFoundException.html#PropertyNotFoundException">PropertyNotFoundException</a>(String propertyName, Class<?> objectType, Throwable cause) {
-<a class="jxr_linenumber" name="L76" href="#L76">76</a> <strong class="jxr_keyword">super</strong>(f(<span class="jxr_string">"Property ''{0}'' not found on object of type {1}"</span>, propertyName, cns(objectType)), cause);
+<a class="jxr_linenumber" name="L76" href="#L76">76</a> <strong class="jxr_keyword">super</strong>(mf(<span class="jxr_string">"Property ''{0}'' not found on object of type {1}"</span>, propertyName, cns(objectType)), cause);
<a class="jxr_linenumber" name="L77" href="#L77">77</a> }
<a class="jxr_linenumber" name="L78" href="#L78">78</a>
<a class="jxr_linenumber" name="L79" href="#L79">79</a> <em class="jxr_javadoccomment">/**</em>
diff --git a/site/xref/org/apache/juneau/parser/ParseException.html b/site/xref/org/apache/juneau/parser/ParseException.html
index a3602534c2..803d021e71 100644
--- a/site/xref/org/apache/juneau/parser/ParseException.html
+++ b/site/xref/org/apache/juneau/parser/ParseException.html
@@ -68,7 +68,7 @@
<a class="jxr_linenumber" name="L60" href="#L60">60</a>
<a class="jxr_linenumber" name="L61" href="#L61">61</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> String getMessage(<a name="ParserSession" href="../../../../org/apache/juneau/parser/ParserSession.html#ParserSession">ParserSession</a> session, String msg, Object...args) {
<a class="jxr_linenumber" name="L62" href="#L62">62</a> <strong class="jxr_keyword">if</strong> (args.length != 0)
-<a class="jxr_linenumber" name="L63" href="#L63">63</a> msg = format(msg, args);
+<a class="jxr_linenumber" name="L63" href="#L63">63</a> msg = mformat(msg, args);
<a class="jxr_linenumber" name="L64" href="#L64">64</a>
<a class="jxr_linenumber" name="L65" href="#L65">65</a> <strong class="jxr_keyword">if</strong> (nn(session)) {
<a class="jxr_linenumber" name="L66" href="#L66">66</a> Position p = session.getPosition();
diff --git a/site/xref/org/apache/juneau/parser/ParserListener.html b/site/xref/org/apache/juneau/parser/ParserListener.html
index c7b3733ef7..063862aa2e 100644
--- a/site/xref/org/apache/juneau/parser/ParserListener.html
+++ b/site/xref/org/apache/juneau/parser/ParserListener.html
@@ -52,7 +52,7 @@
<a class="jxr_linenumber" name="L44" href="#L44">44</a> <em class="jxr_javadoccomment"> * @param p The bean property we had an issue on.</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> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> onBeanSetterException(<a name="ParserSession" href="../../../../org/apache/juneau/parser/ParserSession.html#ParserSession">ParserSession</a> session, Throwable t, BeanPropertyMeta p) {
-<a class="jxr_linenumber" name="L47" href="#L47">47</a> onError(session, t, format(<span class="jxr_string">"Could not call setValue() on property ''{0}'' of class ''{1}'', exception = {2}"</span>, p.getName(), p.getBeanMeta().getClassMeta(), lm(t)));
+<a class="jxr_linenumber" name="L47" href="#L47">47</a> onError(session, t, mformat(<span class="jxr_string">"Could not call setValue() on property ''{0}'' of class ''{1}'', exception = {2}"</span>, p.getName(), p.getBeanMeta().getClassMeta(), lm(t)));
<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> <em class="jxr_javadoccomment">/**</em>
@@ -80,7 +80,7 @@
<a class="jxr_linenumber" name="L72" href="#L72">72</a> <em class="jxr_javadoccomment"> * @param bean The bean.</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> <T> <strong class="jxr_keyword">void</strong> onUnknownBeanProperty(<a name="ParserSession" href="../../../../org/apache/juneau/parser/ParserSession.html#ParserSession">ParserSession</a> session, String propertyName, Class<T> beanClass, T bean) {
-<a class="jxr_linenumber" name="L75" href="#L75">75</a> onError(session, <strong class="jxr_keyword">null</strong>, format(<span class="jxr_string">"Unknown property ''{0}'' encountered while trying to parse into class ''{1}'' at location {2}"</span>, propertyName, beanClass, session.getPosition()));
+<a class="jxr_linenumber" name="L75" href="#L75">75</a> onError(session, <strong class="jxr_keyword">null</strong>, mformat(<span class="jxr_string">"Unknown property ''{0}'' encountered while trying to parse into class ''{1}'' at location {2}"</span>, propertyName, beanClass, session.getPosition()));
<a class="jxr_linenumber" name="L76" href="#L76">76</a> }
<a class="jxr_linenumber" name="L77" href="#L77">77</a> }
</pre>
diff --git a/site/xref/org/apache/juneau/rest/RestContext.html b/site/xref/org/apache/juneau/rest/RestContext.html
index 43b63f6f78..62f035316b 100644
--- a/site/xref/org/apache/juneau/rest/RestContext.html
+++ b/site/xref/org/apache/juneau/rest/RestContext.html
@@ -4908,11 +4908,11 @@
<a class="jxr_linenumber" name="L4900" href="#L4900">4900</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Map<Class<?>,RestContext> getGlobalRegistry() { <strong class="jxr_keyword">return</strong> u(REGISTRY); }
<a class="jxr_linenumber" name="L4901" href="#L4901">4901</a>
<a class="jxr_linenumber" name="L4902" href="#L4902">4902</a> <strong class="jxr_keyword">static</strong> ServletException servletException(String msg, Object...args) {
-<a class="jxr_linenumber" name="L4903" href="#L4903">4903</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> ServletException(f(msg, args));
+<a class="jxr_linenumber" name="L4903" href="#L4903">4903</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> ServletException(mf(msg, args));
<a class="jxr_linenumber" name="L4904" href="#L4904">4904</a> }
<a class="jxr_linenumber" name="L4905" href="#L4905">4905</a>
<a class="jxr_linenumber" name="L4906" href="#L4906">4906</a> <strong class="jxr_keyword">static</strong> ServletException servletException(Throwable t, String msg, Object...args) {
-<a class="jxr_linenumber" name="L4907" href="#L4907">4907</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> ServletException(f(msg, args), t);
+<a class="jxr_linenumber" name="L4907" href="#L4907">4907</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> ServletException(mf(msg, args), t);
<a class="jxr_linenumber" name="L4908" href="#L4908">4908</a> }
<a class="jxr_linenumber" name="L4909" href="#L4909">4909</a>
<a class="jxr_linenumber" name="L4910" href="#L4910">4910</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Supplier<?> resource;
@@ -5108,7 +5108,7 @@
<a class="jxr_linenumber" name="L5100" href="#L5100">5100</a> <strong class="jxr_keyword">try</strong> {
<a class="jxr_linenumber" name="L5101" href="#L5101">5101</a> x.invoke(beanStore, getResource());
<a class="jxr_linenumber" name="L5102" href="#L5102">5102</a> } <strong class="jxr_keyword">catch</strong> (Exception e) {
-<a class="jxr_linenumber" name="L5103" href="#L5103">5103</a> getLogger().log(Level.WARNING, unwrap(e), () -> f(<span class="jxr_string">"Error occurred invoking servlet-destroy method ''{0}''."</span>, x.getFullName()));
+<a class="jxr_linenumber" name="L5103" href="#L5103">5103</a> getLogger().log(Level.WARNING, unwrap(e), () -> mf(<span class="jxr_string">"Error occurred invoking servlet-destroy method ''{0}''."</span>, x.getFullName()));
<a class="jxr_linenumber" name="L5104" href="#L5104">5104</a> }
<a class="jxr_linenumber" name="L5105" href="#L5105">5105</a> }
<a class="jxr_linenumber" name="L5106" href="#L5106">5106</a>
@@ -5901,7 +5901,7 @@
<a class="jxr_linenumber" name="L5893" href="#L5893">5893</a> <strong class="jxr_keyword">try</strong> {
<a class="jxr_linenumber" name="L5894" href="#L5894">5894</a> x.invoke(session.getBeanStore(), session.getResource());
<a class="jxr_linenumber" name="L5895" href="#L5895">5895</a> } <strong class="jxr_keyword">catch</strong> (Exception e) {
-<a class="jxr_linenumber" name="L5896" href="#L5896">5896</a> getLogger().log(Level.WARNING, unwrap(e), () -> f(<span class="jxr_string">"Error occurred invoking finish-call method ''{0}''."</span>, x.getFullName()));
+<a class="jxr_linenumber" name="L5896" href="#L5896">5896</a> getLogger().log(Level.WARNING, unwrap(e), () -> mf(<span class="jxr_string">"Error occurred invoking finish-call method ''{0}''."</span>, x.getFullName()));
<a class="jxr_linenumber" name="L5897" href="#L5897">5897</a> }
<a class="jxr_linenumber" name="L5898" href="#L5898">5898</a> }
<a class="jxr_linenumber" name="L5899" href="#L5899">5899</a> }
diff --git a/site/xref/org/apache/juneau/rest/arg/ArgException.html b/site/xref/org/apache/juneau/rest/arg/ArgException.html
index 94d9af4339..fbcb63500b 100644
--- a/site/xref/org/apache/juneau/rest/arg/ArgException.html
+++ b/site/xref/org/apache/juneau/rest/arg/ArgException.html
@@ -54,7 +54,7 @@
<a class="jxr_linenumber" name="L46" href="#L46">46</a> <em class="jxr_javadoccomment"> * @param args The message args.</em>
<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> <strong class="jxr_keyword">public</strong> <a name="ArgException" href="../../../../../org/apache/juneau/rest/arg/ArgException.html#ArgException">ArgException</a>(<a name="ParameterInfo" href="../../../../../org/apache/juneau/common/reflect/ParameterInfo.html#ParameterInfo">ParameterInfo</a> pi, String msg, Object...args) {
-<a class="jxr_linenumber" name="L49" href="#L49">49</a> <strong class="jxr_keyword">super</strong>(format(msg, args) + <span class="jxr_string">" on parameter "</span> + pi.getIndex() + <span class="jxr_string">" of method "</span> + pi.getMethod().getFullName() + <span class="jxr_string">"."</span>);
+<a class="jxr_linenumber" name="L49" href="#L49">49</a> <strong class="jxr_keyword">super</strong>(mformat(msg, args) + <span class="jxr_string">" on parameter "</span> + pi.getIndex() + <span class="jxr_string">" of method "</span> + pi.getMethod().getFullName() + <span class="jxr_string">"."</span>);
<a class="jxr_linenumber" name="L50" href="#L50">50</a> }
<a class="jxr_linenumber" name="L51" href="#L51">51</a>
<a class="jxr_linenumber" name="L52" href="#L52">52</a> <em class="jxr_javadoccomment">/**</em>
diff --git a/site/xref/org/apache/juneau/rest/client/RestCallException.html b/site/xref/org/apache/juneau/rest/client/RestCallException.html
index a229102500..2e7f4c829e 100644
--- a/site/xref/org/apache/juneau/rest/client/RestCallException.html
+++ b/site/xref/org/apache/juneau/rest/client/RestCallException.html
@@ -69,7 +69,7 @@
<a class="jxr_linenumber" name="L61" href="#L61">61</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> String format(String msg, Object...args) {
<a class="jxr_linenumber" name="L62" href="#L62">62</a> <strong class="jxr_keyword">if</strong> (args.length == 0)
<a class="jxr_linenumber" name="L63" href="#L63">63</a> <strong class="jxr_keyword">return</strong> clean(msg);
-<a class="jxr_linenumber" name="L64" href="#L64">64</a> <strong class="jxr_keyword">return</strong> clean(f(msg, args));
+<a class="jxr_linenumber" name="L64" href="#L64">64</a> <strong class="jxr_keyword">return</strong> clean(mf(msg, args));
<a class="jxr_linenumber" name="L65" href="#L65">65</a> }
<a class="jxr_linenumber" name="L66" href="#L66">66</a>
<a class="jxr_linenumber" name="L67" href="#L67">67</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> statusCode;
diff --git a/site/xref/org/apache/juneau/rest/mock/MockServletRequest.html b/site/xref/org/apache/juneau/rest/mock/MockServletRequest.html
index 6e2458c1d3..ca7db160da 100644
--- a/site/xref/org/apache/juneau/rest/mock/MockServletRequest.html
+++ b/site/xref/org/apache/juneau/rest/mock/MockServletRequest.html
@@ -84,7 +84,7 @@
<a class="jxr_linenumber" name="L76" href="#L76">76</a> <em class="jxr_javadoccomment"> * @return A new request.</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> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <a name="MockServletRequest" href="../../../../../org/apache/juneau/rest/mock/MockServletRequest.html#MockServletRequest">MockServletRequest</a> create(String method, String uri, Object...pathArgs) {
-<a class="jxr_linenumber" name="L79" href="#L79">79</a> <strong class="jxr_keyword">return</strong> create().method(method).uri(format(uri, pathArgs));
+<a class="jxr_linenumber" name="L79" href="#L79">79</a> <strong class="jxr_keyword">return</strong> create().method(method).uri(mformat(uri, pathArgs));
<a class="jxr_linenumber" name="L80" href="#L80">80</a> }
<a class="jxr_linenumber" name="L81" href="#L81">81</a>
<a class="jxr_linenumber" name="L82" href="#L82">82</a> <strong class="jxr_keyword">private</strong> String method = <span class="jxr_string">"GET"</span>;
diff --git a/site/xref/org/apache/juneau/rest/servlet/RestObject.html b/site/xref/org/apache/juneau/rest/servlet/RestObject.html
index f62c711d3b..95fdbe512b 100644
--- a/site/xref/org/apache/juneau/rest/servlet/RestObject.html
+++ b/site/xref/org/apache/juneau/rest/servlet/RestObject.html
@@ -78,7 +78,7 @@
<a class="jxr_linenumber" name="L70" href="#L70">70</a> <em class="jxr_javadoccomment"> * @param args Optional {@link MessageFormat}-style arguments.</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> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> log(Level level, String msg, Object...args) {
-<a class="jxr_linenumber" name="L73" href="#L73">73</a> doLog(level, <strong class="jxr_keyword">null</strong>, () -> format(msg, args));
+<a class="jxr_linenumber" name="L73" href="#L73">73</a> doLog(level, <strong class="jxr_keyword">null</strong>, () -> mformat(msg, args));
<a class="jxr_linenumber" name="L74" href="#L74">74</a> }
<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>
@@ -93,7 +93,7 @@
<a class="jxr_linenumber" name="L85" href="#L85">85</a> <em class="jxr_javadoccomment"> * @param args Optional {@link MessageFormat}-style arguments.</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">void</strong> log(Level level, Throwable cause, String msg, Object...args) {
-<a class="jxr_linenumber" name="L88" href="#L88">88</a> doLog(level, cause, () -> format(msg, args));
+<a class="jxr_linenumber" name="L88" href="#L88">88</a> doLog(level, cause, () -> mformat(msg, args));
<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> <em class="jxr_javadoccomment">/**</em>
diff --git a/site/xref/org/apache/juneau/rest/servlet/RestServlet.html b/site/xref/org/apache/juneau/rest/servlet/RestServlet.html
index c8d8015254..90a73f31e5 100644
--- a/site/xref/org/apache/juneau/rest/servlet/RestServlet.html
+++ b/site/xref/org/apache/juneau/rest/servlet/RestServlet.html
@@ -177,7 +177,7 @@
<a class="jxr_linenumber" name="L169" href="#L169">169</a> <em class="jxr_javadoccomment"> * @param args Optional {@link MessageFormat}-style arguments.</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> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> log(Level level, String msg, Object...args) {
-<a class="jxr_linenumber" name="L172" href="#L172">172</a> doLog(level, <strong class="jxr_keyword">null</strong>, () -> StringUtils.format(msg, args));
+<a class="jxr_linenumber" name="L172" href="#L172">172</a> doLog(level, <strong class="jxr_keyword">null</strong>, () -> StringUtils.mformat(msg, args));
<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>
@@ -192,7 +192,7 @@
<a class="jxr_linenumber" name="L184" href="#L184">184</a> <em class="jxr_javadoccomment"> * @param args Optional {@link MessageFormat}-style arguments.</em>
<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> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> log(Level level, Throwable cause, String msg, Object...args) {
-<a class="jxr_linenumber" name="L187" href="#L187">187</a> doLog(level, cause, () -> StringUtils.format(msg, args));
+<a class="jxr_linenumber" name="L187" href="#L187">187</a> doLog(level, cause, () -> StringUtils.mformat(msg, args));
<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>
diff --git a/site/xref/org/apache/juneau/rest/swagger/SwaggerException.html b/site/xref/org/apache/juneau/rest/swagger/SwaggerException.html
index 4f6e5a03bd..9d0caa2d0d 100644
--- a/site/xref/org/apache/juneau/rest/swagger/SwaggerException.html
+++ b/site/xref/org/apache/juneau/rest/swagger/SwaggerException.html
@@ -32,7 +32,7 @@
<a class="jxr_linenumber" name="L24" href="#L24">24</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong> serialVersionUID = 1L;
<a class="jxr_linenumber" name="L25" href="#L25">25</a>
<a class="jxr_linenumber" name="L26" href="#L26">26</a> SwaggerException(Exception e, String location, Object...locationArgs) {
-<a class="jxr_linenumber" name="L27" href="#L27">27</a> <strong class="jxr_keyword">super</strong>(e, <span class="jxr_string">"Swagger exception: at "</span> + format(location, locationArgs));
+<a class="jxr_linenumber" name="L27" href="#L27">27</a> <strong class="jxr_keyword">super</strong>(e, <span class="jxr_string">"Swagger exception: at "</span> + mformat(location, locationArgs));
<a class="jxr_linenumber" name="L28" href="#L28">28</a> }
<a class="jxr_linenumber" name="L29" href="#L29">29</a> }
</pre>
diff --git a/site/xref/org/apache/juneau/serializer/SerializeException.html b/site/xref/org/apache/juneau/serializer/SerializeException.html
index a4077c7df8..a462ed0a46 100644
--- a/site/xref/org/apache/juneau/serializer/SerializeException.html
+++ b/site/xref/org/apache/juneau/serializer/SerializeException.html
@@ -68,7 +68,7 @@
<a class="jxr_linenumber" name="L60" href="#L60">60</a> }
<a class="jxr_linenumber" name="L61" href="#L61">61</a>
<a class="jxr_linenumber" name="L62" href="#L62">62</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> String getMessage(<a name="SerializerSession" href="../../../../org/apache/juneau/serializer/SerializerSession.html#SerializerSession">SerializerSession</a> session, String msg, Object...args) {
-<a class="jxr_linenumber" name="L63" href="#L63">63</a> msg = format(msg, args);
+<a class="jxr_linenumber" name="L63" href="#L63">63</a> msg = mformat(msg, args);
<a class="jxr_linenumber" name="L64" href="#L64">64</a> <strong class="jxr_keyword">if</strong> (nn(session)) {
<a class="jxr_linenumber" name="L65" href="#L65">65</a> Map<String,Object> m = session.getLastLocation();
<a class="jxr_linenumber" name="L66" href="#L66">66</a> <strong class="jxr_keyword">if</strong> (nn(m) && ! m.isEmpty())
diff --git a/site/xref/org/apache/juneau/serializer/SerializerListener.html b/site/xref/org/apache/juneau/serializer/SerializerListener.html
index ecaa604dc8..8f18655b69 100644
--- a/site/xref/org/apache/juneau/serializer/SerializerListener.html
+++ b/site/xref/org/apache/juneau/serializer/SerializerListener.html
@@ -52,7 +52,7 @@
<a class="jxr_linenumber" name="L44" href="#L44">44</a> <em class="jxr_javadoccomment"> * @param p The bean property we had an issue on.</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> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> onBeanGetterException(<a name="SerializerSession" href="../../../../org/apache/juneau/serializer/SerializerSession.html#SerializerSession">SerializerSession</a> session, Throwable t, BeanPropertyMeta p) {
-<a class="jxr_linenumber" name="L47" href="#L47">47</a> onError(session, t, format(<span class="jxr_string">"Could not call getValue() on property ''{0}'' of class ''{1}'', exception = {2}"</span>, p.getName(), p.getBeanMeta().getClassMeta(), lm(t)));
+<a class="jxr_linenumber" name="L47" href="#L47">47</a> onError(session, t, mformat(<span class="jxr_string">"Could not call getValue() on property ''{0}'' of class ''{1}'', exception = {2}"</span>, p.getName(), p.getBeanMeta().getClassMeta(), lm(t)));
<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> <em class="jxr_javadoccomment">/**</em>
diff --git a/site/xref/org/apache/juneau/serializer/SerializerSession.html b/site/xref/org/apache/juneau/serializer/SerializerSession.html
index 80b6a35eac..2e649040a6 100644
--- a/site/xref/org/apache/juneau/serializer/SerializerSession.html
+++ b/site/xref/org/apache/juneau/serializer/SerializerSession.html
@@ -988,7 +988,7 @@
<a class="jxr_linenumber" name="L980" href="#L980">980</a> @Override
<a class="jxr_linenumber" name="L981" href="#L981">981</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> onError(Throwable t, String msg, Object...args) {
<a class="jxr_linenumber" name="L982" href="#L982">982</a> <strong class="jxr_keyword">if</strong> (nn(listener))
-<a class="jxr_linenumber" name="L983" href="#L983">983</a> listener.onError(<strong class="jxr_keyword">this</strong>, t, format(msg, args));
+<a class="jxr_linenumber" name="L983" href="#L983">983</a> listener.onError(<strong class="jxr_keyword">this</strong>, t, mformat(msg, args));
<a class="jxr_linenumber" name="L984" href="#L984">984</a> <strong class="jxr_keyword">super</strong>.onError(t, msg, args);
<a class="jxr_linenumber" name="L985" href="#L985">985</a> }
<a class="jxr_linenumber" name="L986" href="#L986">986</a>