You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2017/06/18 19:40:32 UTC

[13/21] incubator-juneau-website git commit: Update javadocs with QueryWidget info.

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/2871fb5d/content/site/apidocs/org/apache/juneau/utils/package-frame.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/utils/package-frame.html b/content/site/apidocs/org/apache/juneau/utils/package-frame.html
index b340415..62a375b 100644
--- a/content/site/apidocs/org/apache/juneau/utils/package-frame.html
+++ b/content/site/apidocs/org/apache/juneau/utils/package-frame.html
@@ -32,6 +32,8 @@
 <li><a href="PojoRest.html" title="class in org.apache.juneau.utils" target="classFrame">PojoRest</a></li>
 <li><a href="ProcBuilder.html" title="class in org.apache.juneau.utils" target="classFrame">ProcBuilder</a></li>
 <li><a href="ProcBuilder.Matcher.html" title="class in org.apache.juneau.utils" target="classFrame">ProcBuilder.Matcher</a></li>
+<li><a href="SearchArgs.html" title="class in org.apache.juneau.utils" target="classFrame">SearchArgs</a></li>
+<li><a href="SearchArgs.Builder.html" title="class in org.apache.juneau.utils" target="classFrame">SearchArgs.Builder</a></li>
 <li><a href="StringMessage.html" title="class in org.apache.juneau.utils" target="classFrame">StringMessage</a></li>
 <li><a href="StringObject.html" title="class in org.apache.juneau.utils" target="classFrame">StringObject</a></li>
 <li><a href="ZipFileList.html" title="class in org.apache.juneau.utils" target="classFrame">ZipFileList</a></li>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/2871fb5d/content/site/apidocs/org/apache/juneau/utils/package-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/utils/package-summary.html b/content/site/apidocs/org/apache/juneau/utils/package-summary.html
index 5887d8d..cfa6aee 100644
--- a/content/site/apidocs/org/apache/juneau/utils/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/utils/package-summary.html
@@ -171,7 +171,7 @@
 <tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/utils/PojoQuery.html" title="class in org.apache.juneau.utils">PojoQuery</a></td>
 <td class="colLast">
-<div class="block">Designed to provide query/view/sort/paging filtering on tabular in-memory POJO models.</div>
+<div class="block">Designed to provide search/view/sort/paging filtering on tabular in-memory POJO models.</div>
 </td>
 </tr>
 <tr class="rowColor">
@@ -194,6 +194,18 @@
 </td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><a href="../../../../org/apache/juneau/utils/SearchArgs.html" title="class in org.apache.juneau.utils">SearchArgs</a></td>
+<td class="colLast">
+<div class="block">Encapsulates arguments for basic search/view/sort/position/limit functionality.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../org/apache/juneau/utils/SearchArgs.Builder.html" title="class in org.apache.juneau.utils">SearchArgs.Builder</a></td>
+<td class="colLast">
+<div class="block">Builder for <a href="../../../../org/apache/juneau/utils/SearchArgs.html" title="class in org.apache.juneau.utils"><code>SearchArgs</code></a> class.</div>
+</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/utils/StringMessage.html" title="class in org.apache.juneau.utils">StringMessage</a></td>
 <td class="colLast">
 <div class="block">An encapsulated MessageFormat-style string and arguments.</div>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/2871fb5d/content/site/apidocs/org/apache/juneau/utils/package-tree.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/utils/package-tree.html b/content/site/apidocs/org/apache/juneau/utils/package-tree.html
index 0802681..66c8856 100644
--- a/content/site/apidocs/org/apache/juneau/utils/package-tree.html
+++ b/content/site/apidocs/org/apache/juneau/utils/package-tree.html
@@ -143,6 +143,8 @@
 <li type="circle">org.apache.juneau.utils.<a href="../../../../org/apache/juneau/utils/MessageBundle.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">MessageBundle</span></a></li>
 </ul>
 </li>
+<li type="circle">org.apache.juneau.utils.<a href="../../../../org/apache/juneau/utils/SearchArgs.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">SearchArgs</span></a></li>
+<li type="circle">org.apache.juneau.utils.<a href="../../../../org/apache/juneau/utils/SearchArgs.Builder.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">SearchArgs.Builder</span></a></li>
 <li type="circle">org.apache.juneau.utils.<a href="../../../../org/apache/juneau/utils/StringMessage.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">StringMessage</span></a> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>, org.apache.juneau.<a href="../../../../org/apache/juneau/Writable.html" title="interface in org.apache.juneau">Writable</a>)</li>
 <li type="circle">org.apache.juneau.utils.<a href="../../../../org/apache/juneau/utils/StringObject.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">StringObject</span></a> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>, org.apache.juneau.<a href="../../../../org/apache/juneau/Writable.html" title="interface in org.apache.juneau">Writable</a>)</li>
 <li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Throwable</span></a> (implements java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/2871fb5d/content/site/apidocs/overview-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/overview-summary.html b/content/site/apidocs/overview-summary.html
index f375fc1..9c3b5fd 100644
--- a/content/site/apidocs/overview-summary.html
+++ b/content/site/apidocs/overview-summary.html
@@ -6869,6 +6869,7 @@
                <li><a href="org/apache/juneau/rest/widget/PoweredByJuneauWidget.html" title="class in org.apache.juneau.rest.widget"><code>PoweredByJuneauWidget</code></a>
                <li><a href="org/apache/juneau/rest/widget/ContentTypeLinksColumnWidget.html" title="class in org.apache.juneau.rest.widget"><code>ContentTypeLinksColumnWidget</code></a>
                <li><a href="org/apache/juneau/rest/widget/ContentTypeLinksRowWidget.html" title="class in org.apache.juneau.rest.widget"><code>ContentTypeLinksRowWidget</code></a>
+               <li><a href="org/apache/juneau/rest/widget/QueryWidget.html" title="class in org.apache.juneau.rest.widget"><code>QueryWidget</code></a>
             </ul>
          <li><code>devops.css</code> cleaned up.
          <li>Removed a bunch of URL-related methods from <a href="org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest"><code>RestRequest</code></a>.  

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/2871fb5d/content/site/apidocs/overview-tree.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/overview-tree.html b/content/site/apidocs/overview-tree.html
index 0a26bb5..2d4e725 100644
--- a/content/site/apidocs/overview-tree.html
+++ b/content/site/apidocs/overview-tree.html
@@ -1085,6 +1085,8 @@
 <li type="circle">org.apache.juneau.dto.jsonschema.<a href="org/apache/juneau/dto/jsonschema/SchemaRef.html" title="class in org.apache.juneau.dto.jsonschema"><span class="typeNameLink">SchemaRef</span></a></li>
 </ul>
 </li>
+<li type="circle">org.apache.juneau.utils.<a href="org/apache/juneau/utils/SearchArgs.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">SearchArgs</span></a></li>
+<li type="circle">org.apache.juneau.utils.<a href="org/apache/juneau/utils/SearchArgs.Builder.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">SearchArgs.Builder</span></a></li>
 <li type="circle">org.apache.juneau.ini.<a href="org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Section</span></a> (implements java.util.<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;K,V&gt;)</li>
 <li type="circle">org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/SerializedNameValuePair.html" title="class in org.apache.juneau.rest.client"><span class="typeNameLink">SerializedNameValuePair</span></a> (implements org.apache.http.NameValuePair)</li>
 <li type="circle">org.apache.juneau.serializer.<a href="org/apache/juneau/serializer/SerializerGroup.html" title="class in org.apache.juneau.serializer"><span class="typeNameLink">SerializerGroup</span></a></li>
@@ -1284,6 +1286,7 @@
 <li type="circle">org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/ContentTypeLinksRowWidget.html" title="class in org.apache.juneau.rest.widget"><span class="typeNameLink">ContentTypeLinksRowWidget</span></a></li>
 <li type="circle">org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/PoweredByApacheWidget.html" title="class in org.apache.juneau.rest.widget"><span class="typeNameLink">PoweredByApacheWidget</span></a></li>
 <li type="circle">org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/PoweredByJuneauWidget.html" title="class in org.apache.juneau.rest.widget"><span class="typeNameLink">PoweredByJuneauWidget</span></a></li>
+<li type="circle">org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/QueryWidget.html" title="class in org.apache.juneau.rest.widget"><span class="typeNameLink">QueryWidget</span></a></li>
 </ul>
 </li>
 <li type="circle">org.apache.juneau.internal.<a href="org/apache/juneau/internal/WrappedMap.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">WrappedMap</span></a>&lt;K,V&gt; (implements java.util.<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;K,V&gt;)</li>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/2871fb5d/content/site/apidocs/src-html/org/apache/juneau/BeanContext.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/BeanContext.html b/content/site/apidocs/src-html/org/apache/juneau/BeanContext.html
index 6ca48ed..8c01ce1 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/BeanContext.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/BeanContext.html
@@ -1672,9 +1672,11 @@
 <span class="sourceLineNo">1664</span>            .append("locale", locale)<a name="line.1664"></a>
 <span class="sourceLineNo">1665</span>            .append("timeZone", timeZone)<a name="line.1665"></a>
 <span class="sourceLineNo">1666</span>            .append("mediaType", mediaType)<a name="line.1666"></a>
-<span class="sourceLineNo">1667</span>         );<a name="line.1667"></a>
-<span class="sourceLineNo">1668</span>   }<a name="line.1668"></a>
-<span class="sourceLineNo">1669</span>}<a name="line.1669"></a>
+<span class="sourceLineNo">1667</span>            .append("includeProperties", includeProperties)<a name="line.1667"></a>
+<span class="sourceLineNo">1668</span>            .append("excludeProperties", excludeProperties)<a name="line.1668"></a>
+<span class="sourceLineNo">1669</span>         );<a name="line.1669"></a>
+<span class="sourceLineNo">1670</span>   }<a name="line.1670"></a>
+<span class="sourceLineNo">1671</span>}<a name="line.1671"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/2871fb5d/content/site/apidocs/src-html/org/apache/juneau/BeanMap.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/BeanMap.html b/content/site/apidocs/src-html/org/apache/juneau/BeanMap.html
index 9b821db..6bc222e 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/BeanMap.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/BeanMap.html
@@ -291,257 +291,272 @@
 <span class="sourceLineNo">283</span>   }<a name="line.283"></a>
 <span class="sourceLineNo">284</span><a name="line.284"></a>
 <span class="sourceLineNo">285</span>   /**<a name="line.285"></a>
-<span class="sourceLineNo">286</span>    * Convenience method for setting multiple property values by passing in JSON (or other) text.<a name="line.286"></a>
-<span class="sourceLineNo">287</span>    * &lt;p&gt;<a name="line.287"></a>
-<span class="sourceLineNo">288</span>    * Typically the input is going to be JSON, although the actual data type<a name="line.288"></a>
-<span class="sourceLineNo">289</span>    *    depends on the default parser specified by the {@link BeanContext#BEAN_defaultParser} property<a name="line.289"></a>
-<span class="sourceLineNo">290</span>    *    value on the config that created the context that created this map.<a name="line.290"></a>
-<span class="sourceLineNo">291</span>    *<a name="line.291"></a>
-<span class="sourceLineNo">292</span>    * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.292"></a>
-<span class="sourceLineNo">293</span>    * &lt;p class='bcode'&gt;<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    *    aPersonBean.load(&lt;js&gt;"{name:'John Smith',age:21}"&lt;/js&gt;)<a name="line.294"></a>
-<span class="sourceLineNo">295</span>    * &lt;/p&gt;<a name="line.295"></a>
-<span class="sourceLineNo">296</span>    *<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    * @param input The text that will get parsed into a map and then added to this map.<a name="line.297"></a>
-<span class="sourceLineNo">298</span>    * @return This object (for method chaining).<a name="line.298"></a>
-<span class="sourceLineNo">299</span>    * @throws ParseException If the input contains a syntax error or is malformed.<a name="line.299"></a>
-<span class="sourceLineNo">300</span>    */<a name="line.300"></a>
-<span class="sourceLineNo">301</span>   public BeanMap&lt;T&gt; load(String input) throws ParseException {<a name="line.301"></a>
-<span class="sourceLineNo">302</span>      putAll(new ObjectMap(input, this.meta.ctx.defaultParser));<a name="line.302"></a>
-<span class="sourceLineNo">303</span>      return this;<a name="line.303"></a>
-<span class="sourceLineNo">304</span>   }<a name="line.304"></a>
-<span class="sourceLineNo">305</span><a name="line.305"></a>
-<span class="sourceLineNo">306</span>   /**<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    * Convenience method for setting multiple property values by passing in a reader.<a name="line.307"></a>
-<span class="sourceLineNo">308</span>    *<a name="line.308"></a>
-<span class="sourceLineNo">309</span>    * @param r The text that will get parsed into a map and then added to this map.<a name="line.309"></a>
-<span class="sourceLineNo">310</span>    * @param p The parser to use to parse the text.<a name="line.310"></a>
-<span class="sourceLineNo">311</span>    * @return This object (for method chaining).<a name="line.311"></a>
-<span class="sourceLineNo">312</span>    * @throws ParseException If the input contains a syntax error or is malformed.<a name="line.312"></a>
-<span class="sourceLineNo">313</span>    * @throws IOException Thrown by &lt;code&gt;Reader&lt;/code&gt;.<a name="line.313"></a>
-<span class="sourceLineNo">314</span>    */<a name="line.314"></a>
-<span class="sourceLineNo">315</span>   public BeanMap&lt;T&gt; load(Reader r, ReaderParser p) throws ParseException, IOException {<a name="line.315"></a>
-<span class="sourceLineNo">316</span>      putAll(new ObjectMap(r, p));<a name="line.316"></a>
-<span class="sourceLineNo">317</span>      return this;<a name="line.317"></a>
-<span class="sourceLineNo">318</span>   }<a name="line.318"></a>
-<span class="sourceLineNo">319</span><a name="line.319"></a>
-<span class="sourceLineNo">320</span>   /**<a name="line.320"></a>
-<span class="sourceLineNo">321</span>    * Convenience method for loading this map with the contents of the specified map.<a name="line.321"></a>
-<span class="sourceLineNo">322</span>    * &lt;p&gt;<a name="line.322"></a>
-<span class="sourceLineNo">323</span>    * Identical to {@link #putAll(Map)} except as a fluent-style method.<a name="line.323"></a>
-<span class="sourceLineNo">324</span>    *<a name="line.324"></a>
-<span class="sourceLineNo">325</span>    * @param entries The map containing the entries to add to this map.<a name="line.325"></a>
+<span class="sourceLineNo">286</span>    * Same as {@link #get(Object)} except bypasses the POJO filter associated with the bean property or<a name="line.286"></a>
+<span class="sourceLineNo">287</span>    *    bean filter associated with the bean class.<a name="line.287"></a>
+<span class="sourceLineNo">288</span>    *<a name="line.288"></a>
+<span class="sourceLineNo">289</span>    * @param property The name of the property to get.<a name="line.289"></a>
+<span class="sourceLineNo">290</span>    * @return The raw property value.<a name="line.290"></a>
+<span class="sourceLineNo">291</span>    */<a name="line.291"></a>
+<span class="sourceLineNo">292</span>   public Object getRaw(Object property) {<a name="line.292"></a>
+<span class="sourceLineNo">293</span>      String pName = StringUtils.toString(property);<a name="line.293"></a>
+<span class="sourceLineNo">294</span>      BeanPropertyMeta p = getPropertyMeta(pName);<a name="line.294"></a>
+<span class="sourceLineNo">295</span>      if (p == null)<a name="line.295"></a>
+<span class="sourceLineNo">296</span>         return null;<a name="line.296"></a>
+<span class="sourceLineNo">297</span>      return p.getRaw(this, pName);<a name="line.297"></a>
+<span class="sourceLineNo">298</span>   }<a name="line.298"></a>
+<span class="sourceLineNo">299</span><a name="line.299"></a>
+<span class="sourceLineNo">300</span>   /**<a name="line.300"></a>
+<span class="sourceLineNo">301</span>    * Convenience method for setting multiple property values by passing in JSON (or other) text.<a name="line.301"></a>
+<span class="sourceLineNo">302</span>    * &lt;p&gt;<a name="line.302"></a>
+<span class="sourceLineNo">303</span>    * Typically the input is going to be JSON, although the actual data type<a name="line.303"></a>
+<span class="sourceLineNo">304</span>    *    depends on the default parser specified by the {@link BeanContext#BEAN_defaultParser} property<a name="line.304"></a>
+<span class="sourceLineNo">305</span>    *    value on the config that created the context that created this map.<a name="line.305"></a>
+<span class="sourceLineNo">306</span>    *<a name="line.306"></a>
+<span class="sourceLineNo">307</span>    * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.307"></a>
+<span class="sourceLineNo">308</span>    * &lt;p class='bcode'&gt;<a name="line.308"></a>
+<span class="sourceLineNo">309</span>    *    aPersonBean.load(&lt;js&gt;"{name:'John Smith',age:21}"&lt;/js&gt;)<a name="line.309"></a>
+<span class="sourceLineNo">310</span>    * &lt;/p&gt;<a name="line.310"></a>
+<span class="sourceLineNo">311</span>    *<a name="line.311"></a>
+<span class="sourceLineNo">312</span>    * @param input The text that will get parsed into a map and then added to this map.<a name="line.312"></a>
+<span class="sourceLineNo">313</span>    * @return This object (for method chaining).<a name="line.313"></a>
+<span class="sourceLineNo">314</span>    * @throws ParseException If the input contains a syntax error or is malformed.<a name="line.314"></a>
+<span class="sourceLineNo">315</span>    */<a name="line.315"></a>
+<span class="sourceLineNo">316</span>   public BeanMap&lt;T&gt; load(String input) throws ParseException {<a name="line.316"></a>
+<span class="sourceLineNo">317</span>      putAll(new ObjectMap(input, this.meta.ctx.defaultParser));<a name="line.317"></a>
+<span class="sourceLineNo">318</span>      return this;<a name="line.318"></a>
+<span class="sourceLineNo">319</span>   }<a name="line.319"></a>
+<span class="sourceLineNo">320</span><a name="line.320"></a>
+<span class="sourceLineNo">321</span>   /**<a name="line.321"></a>
+<span class="sourceLineNo">322</span>    * Convenience method for setting multiple property values by passing in a reader.<a name="line.322"></a>
+<span class="sourceLineNo">323</span>    *<a name="line.323"></a>
+<span class="sourceLineNo">324</span>    * @param r The text that will get parsed into a map and then added to this map.<a name="line.324"></a>
+<span class="sourceLineNo">325</span>    * @param p The parser to use to parse the text.<a name="line.325"></a>
 <span class="sourceLineNo">326</span>    * @return This object (for method chaining).<a name="line.326"></a>
-<span class="sourceLineNo">327</span>    */<a name="line.327"></a>
-<span class="sourceLineNo">328</span>   @SuppressWarnings({"unchecked","rawtypes"})<a name="line.328"></a>
-<span class="sourceLineNo">329</span>   public BeanMap&lt;T&gt; load(Map entries) {<a name="line.329"></a>
-<span class="sourceLineNo">330</span>      putAll(entries);<a name="line.330"></a>
-<span class="sourceLineNo">331</span>      return this;<a name="line.331"></a>
-<span class="sourceLineNo">332</span>   }<a name="line.332"></a>
-<span class="sourceLineNo">333</span><a name="line.333"></a>
-<span class="sourceLineNo">334</span>   /**<a name="line.334"></a>
-<span class="sourceLineNo">335</span>    * Returns the names of all properties associated with the bean.<a name="line.335"></a>
-<span class="sourceLineNo">336</span>    * &lt;p&gt;<a name="line.336"></a>
-<span class="sourceLineNo">337</span>    * The returned set is unmodifiable.<a name="line.337"></a>
-<span class="sourceLineNo">338</span>    */<a name="line.338"></a>
-<span class="sourceLineNo">339</span>   @Override /* Map */<a name="line.339"></a>
-<span class="sourceLineNo">340</span>   public Set&lt;String&gt; keySet() {<a name="line.340"></a>
-<span class="sourceLineNo">341</span>      if (meta.dynaProperty == null)<a name="line.341"></a>
-<span class="sourceLineNo">342</span>         return meta.properties.keySet();<a name="line.342"></a>
-<span class="sourceLineNo">343</span>      Set&lt;String&gt; l = new LinkedHashSet&lt;String&gt;();<a name="line.343"></a>
-<span class="sourceLineNo">344</span>      for (String p : meta.properties.keySet())<a name="line.344"></a>
-<span class="sourceLineNo">345</span>         if (! "*".equals(p))<a name="line.345"></a>
-<span class="sourceLineNo">346</span>            l.add(p);<a name="line.346"></a>
-<span class="sourceLineNo">347</span>      try {<a name="line.347"></a>
-<span class="sourceLineNo">348</span>         l.addAll(meta.dynaProperty.getDynaMap(bean).keySet());<a name="line.348"></a>
-<span class="sourceLineNo">349</span>      } catch (Exception e) {<a name="line.349"></a>
-<span class="sourceLineNo">350</span>         throw new BeanRuntimeException(e);<a name="line.350"></a>
-<span class="sourceLineNo">351</span>      }<a name="line.351"></a>
-<span class="sourceLineNo">352</span>      return l;<a name="line.352"></a>
-<span class="sourceLineNo">353</span>   }<a name="line.353"></a>
-<span class="sourceLineNo">354</span><a name="line.354"></a>
-<span class="sourceLineNo">355</span>   /**<a name="line.355"></a>
-<span class="sourceLineNo">356</span>    * Returns the specified property on this bean map.<a name="line.356"></a>
-<span class="sourceLineNo">357</span>    * &lt;p&gt;<a name="line.357"></a>
-<span class="sourceLineNo">358</span>    * Allows you to get and set an individual property on a bean without having a<a name="line.358"></a>
-<span class="sourceLineNo">359</span>    *    handle to the bean itself by using the {@link BeanMapEntry#getValue()}<a name="line.359"></a>
-<span class="sourceLineNo">360</span>    *    and {@link BeanMapEntry#setValue(Object)} methods.<a name="line.360"></a>
-<span class="sourceLineNo">361</span>    * &lt;p&gt;<a name="line.361"></a>
-<span class="sourceLineNo">362</span>    * This method can also be used to get metadata on a property by<a name="line.362"></a>
-<span class="sourceLineNo">363</span>    *    calling the {@link BeanMapEntry#getMeta()} method.<a name="line.363"></a>
-<span class="sourceLineNo">364</span>    *<a name="line.364"></a>
-<span class="sourceLineNo">365</span>    * @param propertyName The name of the property to look up.<a name="line.365"></a>
-<span class="sourceLineNo">366</span>    * @return The bean property, or null if the bean has no such property.<a name="line.366"></a>
-<span class="sourceLineNo">367</span>    */<a name="line.367"></a>
-<span class="sourceLineNo">368</span>   public BeanMapEntry getProperty(String propertyName) {<a name="line.368"></a>
-<span class="sourceLineNo">369</span>      BeanPropertyMeta p = getPropertyMeta(propertyName);<a name="line.369"></a>
-<span class="sourceLineNo">370</span>      if (p == null)<a name="line.370"></a>
-<span class="sourceLineNo">371</span>         return null;<a name="line.371"></a>
-<span class="sourceLineNo">372</span>      return new BeanMapEntry(this, p, propertyName);<a name="line.372"></a>
-<span class="sourceLineNo">373</span>   }<a name="line.373"></a>
-<span class="sourceLineNo">374</span><a name="line.374"></a>
-<span class="sourceLineNo">375</span>   /**<a name="line.375"></a>
-<span class="sourceLineNo">376</span>    * Returns the metadata on the specified property.<a name="line.376"></a>
-<span class="sourceLineNo">377</span>    *<a name="line.377"></a>
-<span class="sourceLineNo">378</span>    * @param propertyName The name of the bean property.<a name="line.378"></a>
-<span class="sourceLineNo">379</span>    * @return Metadata on the specified property, or &lt;jk&gt;null&lt;/jk&gt; if that property does not exist.<a name="line.379"></a>
-<span class="sourceLineNo">380</span>    */<a name="line.380"></a>
-<span class="sourceLineNo">381</span>   public BeanPropertyMeta getPropertyMeta(String propertyName) {<a name="line.381"></a>
-<span class="sourceLineNo">382</span>      BeanPropertyMeta bpMeta = meta.properties.get(propertyName);<a name="line.382"></a>
-<span class="sourceLineNo">383</span>      if (bpMeta == null)<a name="line.383"></a>
-<span class="sourceLineNo">384</span>         bpMeta = meta.dynaProperty;<a name="line.384"></a>
-<span class="sourceLineNo">385</span>      return bpMeta;<a name="line.385"></a>
-<span class="sourceLineNo">386</span>   }<a name="line.386"></a>
-<span class="sourceLineNo">387</span><a name="line.387"></a>
-<span class="sourceLineNo">388</span>   /**<a name="line.388"></a>
-<span class="sourceLineNo">389</span>    * Returns the {@link ClassMeta} of the wrapped bean.<a name="line.389"></a>
-<span class="sourceLineNo">390</span>    *<a name="line.390"></a>
-<span class="sourceLineNo">391</span>    * @return The class type of the wrapped bean.<a name="line.391"></a>
-<span class="sourceLineNo">392</span>    */<a name="line.392"></a>
-<span class="sourceLineNo">393</span>   @Override /* Delagate */<a name="line.393"></a>
-<span class="sourceLineNo">394</span>   public ClassMeta&lt;T&gt; getClassMeta() {<a name="line.394"></a>
-<span class="sourceLineNo">395</span>      return this.meta.getClassMeta();<a name="line.395"></a>
-<span class="sourceLineNo">396</span>   }<a name="line.396"></a>
-<span class="sourceLineNo">397</span><a name="line.397"></a>
-<span class="sourceLineNo">398</span>   /**<a name="line.398"></a>
-<span class="sourceLineNo">399</span>    * Invokes all the getters on this bean and return the values as a list of {@link BeanPropertyValue} objects.<a name="line.399"></a>
-<span class="sourceLineNo">400</span>    * &lt;p&gt;<a name="line.400"></a>
-<span class="sourceLineNo">401</span>    * This allows a snapshot of all values to be grabbed from a bean in one call.<a name="line.401"></a>
-<span class="sourceLineNo">402</span>    *<a name="line.402"></a>
-<span class="sourceLineNo">403</span>    * @param ignoreNulls<a name="line.403"></a>
-<span class="sourceLineNo">404</span>    * Don't return properties whose values are null.<a name="line.404"></a>
-<span class="sourceLineNo">405</span>    * @param prependVals<a name="line.405"></a>
-<span class="sourceLineNo">406</span>    * Additional bean property values to prepended to this list.<a name="line.406"></a>
-<span class="sourceLineNo">407</span>    * Any &lt;jk&gt;null&lt;/jk&gt; values in this list will be ignored.<a name="line.407"></a>
-<span class="sourceLineNo">408</span>    * @return The list of all bean property values.<a name="line.408"></a>
-<span class="sourceLineNo">409</span>    */<a name="line.409"></a>
-<span class="sourceLineNo">410</span>   public List&lt;BeanPropertyValue&gt; getValues(final boolean ignoreNulls, BeanPropertyValue...prependVals) {<a name="line.410"></a>
-<span class="sourceLineNo">411</span>      Collection&lt;BeanPropertyMeta&gt; properties = getProperties();<a name="line.411"></a>
-<span class="sourceLineNo">412</span>      int capacity = (ignoreNulls &amp;&amp; properties.size() &gt; 10) ? 10 : properties.size() + prependVals.length;<a name="line.412"></a>
-<span class="sourceLineNo">413</span>      List&lt;BeanPropertyValue&gt; l = new ArrayList&lt;BeanPropertyValue&gt;(capacity);<a name="line.413"></a>
-<span class="sourceLineNo">414</span>      for (BeanPropertyValue v : prependVals)<a name="line.414"></a>
-<span class="sourceLineNo">415</span>         if (v != null)<a name="line.415"></a>
-<span class="sourceLineNo">416</span>            l.add(v);<a name="line.416"></a>
-<span class="sourceLineNo">417</span>      for (BeanPropertyMeta bpm : properties) {<a name="line.417"></a>
-<span class="sourceLineNo">418</span>         try {<a name="line.418"></a>
-<span class="sourceLineNo">419</span>            if (bpm.isDyna()) {<a name="line.419"></a>
-<span class="sourceLineNo">420</span>               for (String pName : bpm.getDynaMap(bean).keySet()) {<a name="line.420"></a>
-<span class="sourceLineNo">421</span>                  Object val = bpm.get(this, pName);<a name="line.421"></a>
-<span class="sourceLineNo">422</span>                  if (val != null || ! ignoreNulls)<a name="line.422"></a>
-<span class="sourceLineNo">423</span>                     l.add(new BeanPropertyValue(bpm, pName, val, null));<a name="line.423"></a>
-<span class="sourceLineNo">424</span>               }<a name="line.424"></a>
-<span class="sourceLineNo">425</span>            } else {<a name="line.425"></a>
-<span class="sourceLineNo">426</span>               Object val = bpm.get(this, null);<a name="line.426"></a>
-<span class="sourceLineNo">427</span>               if (val != null || ! ignoreNulls)<a name="line.427"></a>
-<span class="sourceLineNo">428</span>                  l.add(new BeanPropertyValue(bpm, bpm.getName(), val, null));<a name="line.428"></a>
-<span class="sourceLineNo">429</span>            }<a name="line.429"></a>
-<span class="sourceLineNo">430</span>         } catch (Error e) {<a name="line.430"></a>
-<span class="sourceLineNo">431</span>            // Errors should always be uncaught.<a name="line.431"></a>
-<span class="sourceLineNo">432</span>            throw e;<a name="line.432"></a>
-<span class="sourceLineNo">433</span>         } catch (Throwable t) {<a name="line.433"></a>
-<span class="sourceLineNo">434</span>            l.add(new BeanPropertyValue(bpm, bpm.getName(), null, t));<a name="line.434"></a>
-<span class="sourceLineNo">435</span>         }<a name="line.435"></a>
-<span class="sourceLineNo">436</span>      }<a name="line.436"></a>
-<span class="sourceLineNo">437</span>      if (meta.sortProperties &amp;&amp; meta.dynaProperty != null)<a name="line.437"></a>
-<span class="sourceLineNo">438</span>         Collections.sort(l);<a name="line.438"></a>
-<span class="sourceLineNo">439</span>      return l;<a name="line.439"></a>
-<span class="sourceLineNo">440</span>   }<a name="line.440"></a>
-<span class="sourceLineNo">441</span><a name="line.441"></a>
-<span class="sourceLineNo">442</span>   /**<a name="line.442"></a>
-<span class="sourceLineNo">443</span>    * Given a string containing variables of the form &lt;code&gt;"{property}"&lt;/code&gt;, replaces those variables with<a name="line.443"></a>
-<span class="sourceLineNo">444</span>    * property values in this bean.<a name="line.444"></a>
-<span class="sourceLineNo">445</span>    *<a name="line.445"></a>
-<span class="sourceLineNo">446</span>    * @param s The string containing variables.<a name="line.446"></a>
-<span class="sourceLineNo">447</span>    * @return A new string with variables replaced, or the same string if no variables were found.<a name="line.447"></a>
-<span class="sourceLineNo">448</span>    */<a name="line.448"></a>
-<span class="sourceLineNo">449</span>   public String resolveVars(String s) {<a name="line.449"></a>
-<span class="sourceLineNo">450</span>      return StringUtils.replaceVars(s, this);<a name="line.450"></a>
-<span class="sourceLineNo">451</span>   }<a name="line.451"></a>
-<span class="sourceLineNo">452</span><a name="line.452"></a>
-<span class="sourceLineNo">453</span>   /**<a name="line.453"></a>
-<span class="sourceLineNo">454</span>    * Returns a simple collection of properties for this bean map.<a name="line.454"></a>
-<span class="sourceLineNo">455</span>    * @return A simple collection of properties for this bean map.<a name="line.455"></a>
-<span class="sourceLineNo">456</span>    */<a name="line.456"></a>
-<span class="sourceLineNo">457</span>   protected Collection&lt;BeanPropertyMeta&gt; getProperties() {<a name="line.457"></a>
-<span class="sourceLineNo">458</span>      return meta.properties.values();<a name="line.458"></a>
-<span class="sourceLineNo">459</span>   }<a name="line.459"></a>
-<span class="sourceLineNo">460</span><a name="line.460"></a>
-<span class="sourceLineNo">461</span>   /**<a name="line.461"></a>
-<span class="sourceLineNo">462</span>    * Returns all the properties associated with the bean.<a name="line.462"></a>
-<span class="sourceLineNo">463</span>    * @return A new set.<a name="line.463"></a>
-<span class="sourceLineNo">464</span>    */<a name="line.464"></a>
-<span class="sourceLineNo">465</span>   @Override<a name="line.465"></a>
-<span class="sourceLineNo">466</span>   public Set&lt;Entry&lt;String,Object&gt;&gt; entrySet() {<a name="line.466"></a>
+<span class="sourceLineNo">327</span>    * @throws ParseException If the input contains a syntax error or is malformed.<a name="line.327"></a>
+<span class="sourceLineNo">328</span>    * @throws IOException Thrown by &lt;code&gt;Reader&lt;/code&gt;.<a name="line.328"></a>
+<span class="sourceLineNo">329</span>    */<a name="line.329"></a>
+<span class="sourceLineNo">330</span>   public BeanMap&lt;T&gt; load(Reader r, ReaderParser p) throws ParseException, IOException {<a name="line.330"></a>
+<span class="sourceLineNo">331</span>      putAll(new ObjectMap(r, p));<a name="line.331"></a>
+<span class="sourceLineNo">332</span>      return this;<a name="line.332"></a>
+<span class="sourceLineNo">333</span>   }<a name="line.333"></a>
+<span class="sourceLineNo">334</span><a name="line.334"></a>
+<span class="sourceLineNo">335</span>   /**<a name="line.335"></a>
+<span class="sourceLineNo">336</span>    * Convenience method for loading this map with the contents of the specified map.<a name="line.336"></a>
+<span class="sourceLineNo">337</span>    * &lt;p&gt;<a name="line.337"></a>
+<span class="sourceLineNo">338</span>    * Identical to {@link #putAll(Map)} except as a fluent-style method.<a name="line.338"></a>
+<span class="sourceLineNo">339</span>    *<a name="line.339"></a>
+<span class="sourceLineNo">340</span>    * @param entries The map containing the entries to add to this map.<a name="line.340"></a>
+<span class="sourceLineNo">341</span>    * @return This object (for method chaining).<a name="line.341"></a>
+<span class="sourceLineNo">342</span>    */<a name="line.342"></a>
+<span class="sourceLineNo">343</span>   @SuppressWarnings({"unchecked","rawtypes"})<a name="line.343"></a>
+<span class="sourceLineNo">344</span>   public BeanMap&lt;T&gt; load(Map entries) {<a name="line.344"></a>
+<span class="sourceLineNo">345</span>      putAll(entries);<a name="line.345"></a>
+<span class="sourceLineNo">346</span>      return this;<a name="line.346"></a>
+<span class="sourceLineNo">347</span>   }<a name="line.347"></a>
+<span class="sourceLineNo">348</span><a name="line.348"></a>
+<span class="sourceLineNo">349</span>   /**<a name="line.349"></a>
+<span class="sourceLineNo">350</span>    * Returns the names of all properties associated with the bean.<a name="line.350"></a>
+<span class="sourceLineNo">351</span>    * &lt;p&gt;<a name="line.351"></a>
+<span class="sourceLineNo">352</span>    * The returned set is unmodifiable.<a name="line.352"></a>
+<span class="sourceLineNo">353</span>    */<a name="line.353"></a>
+<span class="sourceLineNo">354</span>   @Override /* Map */<a name="line.354"></a>
+<span class="sourceLineNo">355</span>   public Set&lt;String&gt; keySet() {<a name="line.355"></a>
+<span class="sourceLineNo">356</span>      if (meta.dynaProperty == null)<a name="line.356"></a>
+<span class="sourceLineNo">357</span>         return meta.properties.keySet();<a name="line.357"></a>
+<span class="sourceLineNo">358</span>      Set&lt;String&gt; l = new LinkedHashSet&lt;String&gt;();<a name="line.358"></a>
+<span class="sourceLineNo">359</span>      for (String p : meta.properties.keySet())<a name="line.359"></a>
+<span class="sourceLineNo">360</span>         if (! "*".equals(p))<a name="line.360"></a>
+<span class="sourceLineNo">361</span>            l.add(p);<a name="line.361"></a>
+<span class="sourceLineNo">362</span>      try {<a name="line.362"></a>
+<span class="sourceLineNo">363</span>         l.addAll(meta.dynaProperty.getDynaMap(bean).keySet());<a name="line.363"></a>
+<span class="sourceLineNo">364</span>      } catch (Exception e) {<a name="line.364"></a>
+<span class="sourceLineNo">365</span>         throw new BeanRuntimeException(e);<a name="line.365"></a>
+<span class="sourceLineNo">366</span>      }<a name="line.366"></a>
+<span class="sourceLineNo">367</span>      return l;<a name="line.367"></a>
+<span class="sourceLineNo">368</span>   }<a name="line.368"></a>
+<span class="sourceLineNo">369</span><a name="line.369"></a>
+<span class="sourceLineNo">370</span>   /**<a name="line.370"></a>
+<span class="sourceLineNo">371</span>    * Returns the specified property on this bean map.<a name="line.371"></a>
+<span class="sourceLineNo">372</span>    * &lt;p&gt;<a name="line.372"></a>
+<span class="sourceLineNo">373</span>    * Allows you to get and set an individual property on a bean without having a<a name="line.373"></a>
+<span class="sourceLineNo">374</span>    *    handle to the bean itself by using the {@link BeanMapEntry#getValue()}<a name="line.374"></a>
+<span class="sourceLineNo">375</span>    *    and {@link BeanMapEntry#setValue(Object)} methods.<a name="line.375"></a>
+<span class="sourceLineNo">376</span>    * &lt;p&gt;<a name="line.376"></a>
+<span class="sourceLineNo">377</span>    * This method can also be used to get metadata on a property by<a name="line.377"></a>
+<span class="sourceLineNo">378</span>    *    calling the {@link BeanMapEntry#getMeta()} method.<a name="line.378"></a>
+<span class="sourceLineNo">379</span>    *<a name="line.379"></a>
+<span class="sourceLineNo">380</span>    * @param propertyName The name of the property to look up.<a name="line.380"></a>
+<span class="sourceLineNo">381</span>    * @return The bean property, or null if the bean has no such property.<a name="line.381"></a>
+<span class="sourceLineNo">382</span>    */<a name="line.382"></a>
+<span class="sourceLineNo">383</span>   public BeanMapEntry getProperty(String propertyName) {<a name="line.383"></a>
+<span class="sourceLineNo">384</span>      BeanPropertyMeta p = getPropertyMeta(propertyName);<a name="line.384"></a>
+<span class="sourceLineNo">385</span>      if (p == null)<a name="line.385"></a>
+<span class="sourceLineNo">386</span>         return null;<a name="line.386"></a>
+<span class="sourceLineNo">387</span>      return new BeanMapEntry(this, p, propertyName);<a name="line.387"></a>
+<span class="sourceLineNo">388</span>   }<a name="line.388"></a>
+<span class="sourceLineNo">389</span><a name="line.389"></a>
+<span class="sourceLineNo">390</span>   /**<a name="line.390"></a>
+<span class="sourceLineNo">391</span>    * Returns the metadata on the specified property.<a name="line.391"></a>
+<span class="sourceLineNo">392</span>    *<a name="line.392"></a>
+<span class="sourceLineNo">393</span>    * @param propertyName The name of the bean property.<a name="line.393"></a>
+<span class="sourceLineNo">394</span>    * @return Metadata on the specified property, or &lt;jk&gt;null&lt;/jk&gt; if that property does not exist.<a name="line.394"></a>
+<span class="sourceLineNo">395</span>    */<a name="line.395"></a>
+<span class="sourceLineNo">396</span>   public BeanPropertyMeta getPropertyMeta(String propertyName) {<a name="line.396"></a>
+<span class="sourceLineNo">397</span>      BeanPropertyMeta bpMeta = meta.properties.get(propertyName);<a name="line.397"></a>
+<span class="sourceLineNo">398</span>      if (bpMeta == null)<a name="line.398"></a>
+<span class="sourceLineNo">399</span>         bpMeta = meta.dynaProperty;<a name="line.399"></a>
+<span class="sourceLineNo">400</span>      return bpMeta;<a name="line.400"></a>
+<span class="sourceLineNo">401</span>   }<a name="line.401"></a>
+<span class="sourceLineNo">402</span><a name="line.402"></a>
+<span class="sourceLineNo">403</span>   /**<a name="line.403"></a>
+<span class="sourceLineNo">404</span>    * Returns the {@link ClassMeta} of the wrapped bean.<a name="line.404"></a>
+<span class="sourceLineNo">405</span>    *<a name="line.405"></a>
+<span class="sourceLineNo">406</span>    * @return The class type of the wrapped bean.<a name="line.406"></a>
+<span class="sourceLineNo">407</span>    */<a name="line.407"></a>
+<span class="sourceLineNo">408</span>   @Override /* Delagate */<a name="line.408"></a>
+<span class="sourceLineNo">409</span>   public ClassMeta&lt;T&gt; getClassMeta() {<a name="line.409"></a>
+<span class="sourceLineNo">410</span>      return this.meta.getClassMeta();<a name="line.410"></a>
+<span class="sourceLineNo">411</span>   }<a name="line.411"></a>
+<span class="sourceLineNo">412</span><a name="line.412"></a>
+<span class="sourceLineNo">413</span>   /**<a name="line.413"></a>
+<span class="sourceLineNo">414</span>    * Invokes all the getters on this bean and return the values as a list of {@link BeanPropertyValue} objects.<a name="line.414"></a>
+<span class="sourceLineNo">415</span>    * &lt;p&gt;<a name="line.415"></a>
+<span class="sourceLineNo">416</span>    * This allows a snapshot of all values to be grabbed from a bean in one call.<a name="line.416"></a>
+<span class="sourceLineNo">417</span>    *<a name="line.417"></a>
+<span class="sourceLineNo">418</span>    * @param ignoreNulls<a name="line.418"></a>
+<span class="sourceLineNo">419</span>    * Don't return properties whose values are null.<a name="line.419"></a>
+<span class="sourceLineNo">420</span>    * @param prependVals<a name="line.420"></a>
+<span class="sourceLineNo">421</span>    * Additional bean property values to prepended to this list.<a name="line.421"></a>
+<span class="sourceLineNo">422</span>    * Any &lt;jk&gt;null&lt;/jk&gt; values in this list will be ignored.<a name="line.422"></a>
+<span class="sourceLineNo">423</span>    * @return The list of all bean property values.<a name="line.423"></a>
+<span class="sourceLineNo">424</span>    */<a name="line.424"></a>
+<span class="sourceLineNo">425</span>   public List&lt;BeanPropertyValue&gt; getValues(final boolean ignoreNulls, BeanPropertyValue...prependVals) {<a name="line.425"></a>
+<span class="sourceLineNo">426</span>      Collection&lt;BeanPropertyMeta&gt; properties = getProperties();<a name="line.426"></a>
+<span class="sourceLineNo">427</span>      int capacity = (ignoreNulls &amp;&amp; properties.size() &gt; 10) ? 10 : properties.size() + prependVals.length;<a name="line.427"></a>
+<span class="sourceLineNo">428</span>      List&lt;BeanPropertyValue&gt; l = new ArrayList&lt;BeanPropertyValue&gt;(capacity);<a name="line.428"></a>
+<span class="sourceLineNo">429</span>      for (BeanPropertyValue v : prependVals)<a name="line.429"></a>
+<span class="sourceLineNo">430</span>         if (v != null)<a name="line.430"></a>
+<span class="sourceLineNo">431</span>            l.add(v);<a name="line.431"></a>
+<span class="sourceLineNo">432</span>      for (BeanPropertyMeta bpm : properties) {<a name="line.432"></a>
+<span class="sourceLineNo">433</span>         try {<a name="line.433"></a>
+<span class="sourceLineNo">434</span>            if (bpm.isDyna()) {<a name="line.434"></a>
+<span class="sourceLineNo">435</span>               for (String pName : bpm.getDynaMap(bean).keySet()) {<a name="line.435"></a>
+<span class="sourceLineNo">436</span>                  Object val = bpm.get(this, pName);<a name="line.436"></a>
+<span class="sourceLineNo">437</span>                  if (val != null || ! ignoreNulls)<a name="line.437"></a>
+<span class="sourceLineNo">438</span>                     l.add(new BeanPropertyValue(bpm, pName, val, null));<a name="line.438"></a>
+<span class="sourceLineNo">439</span>               }<a name="line.439"></a>
+<span class="sourceLineNo">440</span>            } else {<a name="line.440"></a>
+<span class="sourceLineNo">441</span>               Object val = bpm.get(this, null);<a name="line.441"></a>
+<span class="sourceLineNo">442</span>               if (val != null || ! ignoreNulls)<a name="line.442"></a>
+<span class="sourceLineNo">443</span>                  l.add(new BeanPropertyValue(bpm, bpm.getName(), val, null));<a name="line.443"></a>
+<span class="sourceLineNo">444</span>            }<a name="line.444"></a>
+<span class="sourceLineNo">445</span>         } catch (Error e) {<a name="line.445"></a>
+<span class="sourceLineNo">446</span>            // Errors should always be uncaught.<a name="line.446"></a>
+<span class="sourceLineNo">447</span>            throw e;<a name="line.447"></a>
+<span class="sourceLineNo">448</span>         } catch (Throwable t) {<a name="line.448"></a>
+<span class="sourceLineNo">449</span>            l.add(new BeanPropertyValue(bpm, bpm.getName(), null, t));<a name="line.449"></a>
+<span class="sourceLineNo">450</span>         }<a name="line.450"></a>
+<span class="sourceLineNo">451</span>      }<a name="line.451"></a>
+<span class="sourceLineNo">452</span>      if (meta.sortProperties &amp;&amp; meta.dynaProperty != null)<a name="line.452"></a>
+<span class="sourceLineNo">453</span>         Collections.sort(l);<a name="line.453"></a>
+<span class="sourceLineNo">454</span>      return l;<a name="line.454"></a>
+<span class="sourceLineNo">455</span>   }<a name="line.455"></a>
+<span class="sourceLineNo">456</span><a name="line.456"></a>
+<span class="sourceLineNo">457</span>   /**<a name="line.457"></a>
+<span class="sourceLineNo">458</span>    * Given a string containing variables of the form &lt;code&gt;"{property}"&lt;/code&gt;, replaces those variables with<a name="line.458"></a>
+<span class="sourceLineNo">459</span>    * property values in this bean.<a name="line.459"></a>
+<span class="sourceLineNo">460</span>    *<a name="line.460"></a>
+<span class="sourceLineNo">461</span>    * @param s The string containing variables.<a name="line.461"></a>
+<span class="sourceLineNo">462</span>    * @return A new string with variables replaced, or the same string if no variables were found.<a name="line.462"></a>
+<span class="sourceLineNo">463</span>    */<a name="line.463"></a>
+<span class="sourceLineNo">464</span>   public String resolveVars(String s) {<a name="line.464"></a>
+<span class="sourceLineNo">465</span>      return StringUtils.replaceVars(s, this);<a name="line.465"></a>
+<span class="sourceLineNo">466</span>   }<a name="line.466"></a>
 <span class="sourceLineNo">467</span><a name="line.467"></a>
-<span class="sourceLineNo">468</span>      // If this bean has a dyna-property, then we need to construct the entire set before returning.<a name="line.468"></a>
-<span class="sourceLineNo">469</span>      // Otherwise, we can create an iterator without a new data structure.<a name="line.469"></a>
-<span class="sourceLineNo">470</span>      if (meta.dynaProperty != null) {<a name="line.470"></a>
-<span class="sourceLineNo">471</span>         Set&lt;Entry&lt;String,Object&gt;&gt; s = new LinkedHashSet&lt;Entry&lt;String,Object&gt;&gt;();<a name="line.471"></a>
-<span class="sourceLineNo">472</span>         for (BeanPropertyMeta pMeta : getProperties()) {<a name="line.472"></a>
-<span class="sourceLineNo">473</span>            if (pMeta.isDyna()) {<a name="line.473"></a>
-<span class="sourceLineNo">474</span>               try {<a name="line.474"></a>
-<span class="sourceLineNo">475</span>                  for (Map.Entry&lt;String,Object&gt; e : pMeta.getDynaMap(bean).entrySet())<a name="line.475"></a>
-<span class="sourceLineNo">476</span>                     s.add(new BeanMapEntry(this, pMeta, e.getKey()));<a name="line.476"></a>
-<span class="sourceLineNo">477</span>               } catch (Exception e) {<a name="line.477"></a>
-<span class="sourceLineNo">478</span>                  throw new BeanRuntimeException(e);<a name="line.478"></a>
-<span class="sourceLineNo">479</span>               }<a name="line.479"></a>
-<span class="sourceLineNo">480</span>            } else {<a name="line.480"></a>
-<span class="sourceLineNo">481</span>               s.add(new BeanMapEntry(this, pMeta, pMeta.getName()));<a name="line.481"></a>
-<span class="sourceLineNo">482</span>            }<a name="line.482"></a>
-<span class="sourceLineNo">483</span>         }<a name="line.483"></a>
-<span class="sourceLineNo">484</span>         return s;<a name="line.484"></a>
-<span class="sourceLineNo">485</span>      }<a name="line.485"></a>
-<span class="sourceLineNo">486</span><a name="line.486"></a>
-<span class="sourceLineNo">487</span>      // Construct our own anonymous set to implement this function.<a name="line.487"></a>
-<span class="sourceLineNo">488</span>      Set&lt;Entry&lt;String,Object&gt;&gt; s = new AbstractSet&lt;Entry&lt;String,Object&gt;&gt;() {<a name="line.488"></a>
-<span class="sourceLineNo">489</span><a name="line.489"></a>
-<span class="sourceLineNo">490</span>         // Get the list of properties from the meta object.<a name="line.490"></a>
-<span class="sourceLineNo">491</span>         // Note that the HashMap.values() method caches results, so this collection<a name="line.491"></a>
-<span class="sourceLineNo">492</span>         // will really only be constructed once per bean type since the underlying<a name="line.492"></a>
-<span class="sourceLineNo">493</span>         // map never changes.<a name="line.493"></a>
-<span class="sourceLineNo">494</span>         final Collection&lt;BeanPropertyMeta&gt; pSet = getProperties();<a name="line.494"></a>
-<span class="sourceLineNo">495</span><a name="line.495"></a>
-<span class="sourceLineNo">496</span>         @Override /* Set */<a name="line.496"></a>
-<span class="sourceLineNo">497</span>         public Iterator&lt;java.util.Map.Entry&lt;String, Object&gt;&gt; iterator() {<a name="line.497"></a>
-<span class="sourceLineNo">498</span><a name="line.498"></a>
-<span class="sourceLineNo">499</span>            // Construct our own anonymous iterator that uses iterators against the meta.properties<a name="line.499"></a>
-<span class="sourceLineNo">500</span>            // map to maintain position.  This prevents us from having to construct any of our own<a name="line.500"></a>
-<span class="sourceLineNo">501</span>            // collection objects.<a name="line.501"></a>
-<span class="sourceLineNo">502</span>            return new Iterator&lt;Entry&lt;String,Object&gt;&gt;() {<a name="line.502"></a>
-<span class="sourceLineNo">503</span><a name="line.503"></a>
-<span class="sourceLineNo">504</span>               final Iterator&lt;BeanPropertyMeta&gt; pIterator = pSet.iterator();<a name="line.504"></a>
-<span class="sourceLineNo">505</span><a name="line.505"></a>
-<span class="sourceLineNo">506</span>               @Override /* Iterator */<a name="line.506"></a>
-<span class="sourceLineNo">507</span>               public boolean hasNext() {<a name="line.507"></a>
-<span class="sourceLineNo">508</span>                  return pIterator.hasNext();<a name="line.508"></a>
-<span class="sourceLineNo">509</span>               }<a name="line.509"></a>
+<span class="sourceLineNo">468</span>   /**<a name="line.468"></a>
+<span class="sourceLineNo">469</span>    * Returns a simple collection of properties for this bean map.<a name="line.469"></a>
+<span class="sourceLineNo">470</span>    * @return A simple collection of properties for this bean map.<a name="line.470"></a>
+<span class="sourceLineNo">471</span>    */<a name="line.471"></a>
+<span class="sourceLineNo">472</span>   protected Collection&lt;BeanPropertyMeta&gt; getProperties() {<a name="line.472"></a>
+<span class="sourceLineNo">473</span>      return meta.properties.values();<a name="line.473"></a>
+<span class="sourceLineNo">474</span>   }<a name="line.474"></a>
+<span class="sourceLineNo">475</span><a name="line.475"></a>
+<span class="sourceLineNo">476</span>   /**<a name="line.476"></a>
+<span class="sourceLineNo">477</span>    * Returns all the properties associated with the bean.<a name="line.477"></a>
+<span class="sourceLineNo">478</span>    * @return A new set.<a name="line.478"></a>
+<span class="sourceLineNo">479</span>    */<a name="line.479"></a>
+<span class="sourceLineNo">480</span>   @Override<a name="line.480"></a>
+<span class="sourceLineNo">481</span>   public Set&lt;Entry&lt;String,Object&gt;&gt; entrySet() {<a name="line.481"></a>
+<span class="sourceLineNo">482</span><a name="line.482"></a>
+<span class="sourceLineNo">483</span>      // If this bean has a dyna-property, then we need to construct the entire set before returning.<a name="line.483"></a>
+<span class="sourceLineNo">484</span>      // Otherwise, we can create an iterator without a new data structure.<a name="line.484"></a>
+<span class="sourceLineNo">485</span>      if (meta.dynaProperty != null) {<a name="line.485"></a>
+<span class="sourceLineNo">486</span>         Set&lt;Entry&lt;String,Object&gt;&gt; s = new LinkedHashSet&lt;Entry&lt;String,Object&gt;&gt;();<a name="line.486"></a>
+<span class="sourceLineNo">487</span>         for (BeanPropertyMeta pMeta : getProperties()) {<a name="line.487"></a>
+<span class="sourceLineNo">488</span>            if (pMeta.isDyna()) {<a name="line.488"></a>
+<span class="sourceLineNo">489</span>               try {<a name="line.489"></a>
+<span class="sourceLineNo">490</span>                  for (Map.Entry&lt;String,Object&gt; e : pMeta.getDynaMap(bean).entrySet())<a name="line.490"></a>
+<span class="sourceLineNo">491</span>                     s.add(new BeanMapEntry(this, pMeta, e.getKey()));<a name="line.491"></a>
+<span class="sourceLineNo">492</span>               } catch (Exception e) {<a name="line.492"></a>
+<span class="sourceLineNo">493</span>                  throw new BeanRuntimeException(e);<a name="line.493"></a>
+<span class="sourceLineNo">494</span>               }<a name="line.494"></a>
+<span class="sourceLineNo">495</span>            } else {<a name="line.495"></a>
+<span class="sourceLineNo">496</span>               s.add(new BeanMapEntry(this, pMeta, pMeta.getName()));<a name="line.496"></a>
+<span class="sourceLineNo">497</span>            }<a name="line.497"></a>
+<span class="sourceLineNo">498</span>         }<a name="line.498"></a>
+<span class="sourceLineNo">499</span>         return s;<a name="line.499"></a>
+<span class="sourceLineNo">500</span>      }<a name="line.500"></a>
+<span class="sourceLineNo">501</span><a name="line.501"></a>
+<span class="sourceLineNo">502</span>      // Construct our own anonymous set to implement this function.<a name="line.502"></a>
+<span class="sourceLineNo">503</span>      Set&lt;Entry&lt;String,Object&gt;&gt; s = new AbstractSet&lt;Entry&lt;String,Object&gt;&gt;() {<a name="line.503"></a>
+<span class="sourceLineNo">504</span><a name="line.504"></a>
+<span class="sourceLineNo">505</span>         // Get the list of properties from the meta object.<a name="line.505"></a>
+<span class="sourceLineNo">506</span>         // Note that the HashMap.values() method caches results, so this collection<a name="line.506"></a>
+<span class="sourceLineNo">507</span>         // will really only be constructed once per bean type since the underlying<a name="line.507"></a>
+<span class="sourceLineNo">508</span>         // map never changes.<a name="line.508"></a>
+<span class="sourceLineNo">509</span>         final Collection&lt;BeanPropertyMeta&gt; pSet = getProperties();<a name="line.509"></a>
 <span class="sourceLineNo">510</span><a name="line.510"></a>
-<span class="sourceLineNo">511</span>               @Override /* Iterator */<a name="line.511"></a>
-<span class="sourceLineNo">512</span>               public Map.Entry&lt;String, Object&gt; next() {<a name="line.512"></a>
-<span class="sourceLineNo">513</span>                  return new BeanMapEntry(BeanMap.this, pIterator.next(), null);<a name="line.513"></a>
-<span class="sourceLineNo">514</span>               }<a name="line.514"></a>
-<span class="sourceLineNo">515</span><a name="line.515"></a>
-<span class="sourceLineNo">516</span>               @Override /* Iterator */<a name="line.516"></a>
-<span class="sourceLineNo">517</span>               public void remove() {<a name="line.517"></a>
-<span class="sourceLineNo">518</span>                  throw new UnsupportedOperationException("Cannot remove item from iterator.");<a name="line.518"></a>
-<span class="sourceLineNo">519</span>               }<a name="line.519"></a>
-<span class="sourceLineNo">520</span>            };<a name="line.520"></a>
-<span class="sourceLineNo">521</span>         }<a name="line.521"></a>
-<span class="sourceLineNo">522</span><a name="line.522"></a>
-<span class="sourceLineNo">523</span>         @Override /* Set */<a name="line.523"></a>
-<span class="sourceLineNo">524</span>         public int size() {<a name="line.524"></a>
-<span class="sourceLineNo">525</span>            return pSet.size();<a name="line.525"></a>
-<span class="sourceLineNo">526</span>         }<a name="line.526"></a>
-<span class="sourceLineNo">527</span>      };<a name="line.527"></a>
-<span class="sourceLineNo">528</span><a name="line.528"></a>
-<span class="sourceLineNo">529</span>      return s;<a name="line.529"></a>
-<span class="sourceLineNo">530</span>   }<a name="line.530"></a>
-<span class="sourceLineNo">531</span><a name="line.531"></a>
-<span class="sourceLineNo">532</span>   @SuppressWarnings("unchecked")<a name="line.532"></a>
-<span class="sourceLineNo">533</span>   void setBean(Object bean) {<a name="line.533"></a>
-<span class="sourceLineNo">534</span>      this.bean = (T)bean;<a name="line.534"></a>
-<span class="sourceLineNo">535</span>   }<a name="line.535"></a>
-<span class="sourceLineNo">536</span>}<a name="line.536"></a>
+<span class="sourceLineNo">511</span>         @Override /* Set */<a name="line.511"></a>
+<span class="sourceLineNo">512</span>         public Iterator&lt;java.util.Map.Entry&lt;String, Object&gt;&gt; iterator() {<a name="line.512"></a>
+<span class="sourceLineNo">513</span><a name="line.513"></a>
+<span class="sourceLineNo">514</span>            // Construct our own anonymous iterator that uses iterators against the meta.properties<a name="line.514"></a>
+<span class="sourceLineNo">515</span>            // map to maintain position.  This prevents us from having to construct any of our own<a name="line.515"></a>
+<span class="sourceLineNo">516</span>            // collection objects.<a name="line.516"></a>
+<span class="sourceLineNo">517</span>            return new Iterator&lt;Entry&lt;String,Object&gt;&gt;() {<a name="line.517"></a>
+<span class="sourceLineNo">518</span><a name="line.518"></a>
+<span class="sourceLineNo">519</span>               final Iterator&lt;BeanPropertyMeta&gt; pIterator = pSet.iterator();<a name="line.519"></a>
+<span class="sourceLineNo">520</span><a name="line.520"></a>
+<span class="sourceLineNo">521</span>               @Override /* Iterator */<a name="line.521"></a>
+<span class="sourceLineNo">522</span>               public boolean hasNext() {<a name="line.522"></a>
+<span class="sourceLineNo">523</span>                  return pIterator.hasNext();<a name="line.523"></a>
+<span class="sourceLineNo">524</span>               }<a name="line.524"></a>
+<span class="sourceLineNo">525</span><a name="line.525"></a>
+<span class="sourceLineNo">526</span>               @Override /* Iterator */<a name="line.526"></a>
+<span class="sourceLineNo">527</span>               public Map.Entry&lt;String, Object&gt; next() {<a name="line.527"></a>
+<span class="sourceLineNo">528</span>                  return new BeanMapEntry(BeanMap.this, pIterator.next(), null);<a name="line.528"></a>
+<span class="sourceLineNo">529</span>               }<a name="line.529"></a>
+<span class="sourceLineNo">530</span><a name="line.530"></a>
+<span class="sourceLineNo">531</span>               @Override /* Iterator */<a name="line.531"></a>
+<span class="sourceLineNo">532</span>               public void remove() {<a name="line.532"></a>
+<span class="sourceLineNo">533</span>                  throw new UnsupportedOperationException("Cannot remove item from iterator.");<a name="line.533"></a>
+<span class="sourceLineNo">534</span>               }<a name="line.534"></a>
+<span class="sourceLineNo">535</span>            };<a name="line.535"></a>
+<span class="sourceLineNo">536</span>         }<a name="line.536"></a>
+<span class="sourceLineNo">537</span><a name="line.537"></a>
+<span class="sourceLineNo">538</span>         @Override /* Set */<a name="line.538"></a>
+<span class="sourceLineNo">539</span>         public int size() {<a name="line.539"></a>
+<span class="sourceLineNo">540</span>            return pSet.size();<a name="line.540"></a>
+<span class="sourceLineNo">541</span>         }<a name="line.541"></a>
+<span class="sourceLineNo">542</span>      };<a name="line.542"></a>
+<span class="sourceLineNo">543</span><a name="line.543"></a>
+<span class="sourceLineNo">544</span>      return s;<a name="line.544"></a>
+<span class="sourceLineNo">545</span>   }<a name="line.545"></a>
+<span class="sourceLineNo">546</span><a name="line.546"></a>
+<span class="sourceLineNo">547</span>   @SuppressWarnings("unchecked")<a name="line.547"></a>
+<span class="sourceLineNo">548</span>   void setBean(Object bean) {<a name="line.548"></a>
+<span class="sourceLineNo">549</span>      this.bean = (T)bean;<a name="line.549"></a>
+<span class="sourceLineNo">550</span>   }<a name="line.550"></a>
+<span class="sourceLineNo">551</span>}<a name="line.551"></a>