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:21 UTC
[02/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/src-html/org/apache/juneau/utils/PojoQuery.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/utils/PojoQuery.html b/content/site/apidocs/src-html/org/apache/juneau/utils/PojoQuery.html
index fe50e73..6b46ec8 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/utils/PojoQuery.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/utils/PojoQuery.html
@@ -31,7 +31,7 @@
<span class="sourceLineNo">023</span>import org.apache.juneau.internal.*;<a name="line.23"></a>
<span class="sourceLineNo">024</span><a name="line.24"></a>
<span class="sourceLineNo">025</span>/**<a name="line.25"></a>
-<span class="sourceLineNo">026</span> * Designed to provide query/view/sort/paging filtering on tabular in-memory POJO models.<a name="line.26"></a>
+<span class="sourceLineNo">026</span> * Designed to provide search/view/sort/paging filtering on tabular in-memory POJO models.<a name="line.26"></a>
<span class="sourceLineNo">027</span> * <p><a name="line.27"></a>
<span class="sourceLineNo">028</span> * It can also perform just view filtering on beans/maps.<a name="line.28"></a>
<span class="sourceLineNo">029</span> * <p><a name="line.29"></a>
@@ -46,1216 +46,1109 @@
<span class="sourceLineNo">038</span> * Tabular POJO models can be thought of as tables of data. For example, a list of the following beans...<a name="line.38"></a>
<span class="sourceLineNo">039</span> * <p class='bcode'><a name="line.39"></a>
<span class="sourceLineNo">040</span> * <jk>public</jk> MyBean {<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * <jk>public int</jk> fi;<a name="line.41"></a>
-<span class="sourceLineNo">042</span> * <jk>public</jk> String fs;<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * <jk>public</jk> Date fd;<a name="line.43"></a>
+<span class="sourceLineNo">041</span> * <jk>public int</jk> myInt;<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * <jk>public</jk> String myString;<a name="line.42"></a>
+<span class="sourceLineNo">043</span> * <jk>public</jk> Date myDate;<a name="line.43"></a>
<span class="sourceLineNo">044</span> * }<a name="line.44"></a>
<span class="sourceLineNo">045</span> * <p><a name="line.45"></a>
<span class="sourceLineNo">046</span> * ... can be thought of a table containing the following columns...<a name="line.46"></a>
<span class="sourceLineNo">047</span> * <p><a name="line.47"></a>
<span class="sourceLineNo">048</span> * <table class='styled code'><a name="line.48"></a>
-<span class="sourceLineNo">049</span> * <tr><th>fi</th><th>fs</th><th>fd</th></tr><a name="line.49"></a>
+<span class="sourceLineNo">049</span> * <tr><th>myInt</th><th>myString</th><th>myDate</th></tr><a name="line.49"></a>
<span class="sourceLineNo">050</span> * <tr><td>123</td><td>'foobar'</td><td>yyyy/MM/dd HH:mm:ss</td></tr><a name="line.50"></a>
<span class="sourceLineNo">051</span> * <tr><td colspan=3>...</td></tr><a name="line.51"></a>
<span class="sourceLineNo">052</span> * </table><a name="line.52"></a>
<span class="sourceLineNo">053</span> * <p><a name="line.53"></a>
<span class="sourceLineNo">054</span> * From this table, you can perform the following functions:<a name="line.54"></a>
<span class="sourceLineNo">055</span> * <ul class='spaced-list'><a name="line.55"></a>
-<span class="sourceLineNo">056</span> * <li>Query - Return only rows where a search pattern matches.<a name="line.56"></a>
+<span class="sourceLineNo">056</span> * <li>Search - Return only rows where a search pattern matches.<a name="line.56"></a>
<span class="sourceLineNo">057</span> * <li>View - Return only the specified subset of columns in the specified order.<a name="line.57"></a>
<span class="sourceLineNo">058</span> * <li>Sort - Sort the table by one or more columns.<a name="line.58"></a>
-<span class="sourceLineNo">059</span> * <li>Page - Only return a subset of rows.<a name="line.59"></a>
+<span class="sourceLineNo">059</span> * <li>Position/limit - Only return a subset of rows.<a name="line.59"></a>
<span class="sourceLineNo">060</span> * </ul><a name="line.60"></a>
<span class="sourceLineNo">061</span> *<a name="line.61"></a>
-<span class="sourceLineNo">062</span> * <h5 class='topic'>Query</h5><a name="line.62"></a>
+<span class="sourceLineNo">062</span> * <h5 class='topic'>Search</h5><a name="line.62"></a>
<span class="sourceLineNo">063</span> * <p><a name="line.63"></a>
-<span class="sourceLineNo">064</span> * The query capabilites allow you to filter based on query patterns against<a name="line.64"></a>
+<span class="sourceLineNo">064</span> * The search capabilities allow you to filter based on query patterns against<a name="line.64"></a>
<span class="sourceLineNo">065</span> * strings, dates, and numbers. Queries take the form of a Map with column names<a name="line.65"></a>
<span class="sourceLineNo">066</span> * as keys, and search patterns as values. <br><a name="line.66"></a>
-<span class="sourceLineNo">067</span> * Search patterns can be either {@code Strings} or {@code Maps}.<br><a name="line.67"></a>
-<span class="sourceLineNo">068</span> * Multiple search patterns are ANDed (i.e. all patterns must match for the row to be returned).<a name="line.68"></a>
-<span class="sourceLineNo">069</span> *<a name="line.69"></a>
-<span class="sourceLineNo">070</span> * <h5 class='section'>Example:</h5><a name="line.70"></a>
-<span class="sourceLineNo">071</span> * <ul class='spaced-list'><a name="line.71"></a>
-<span class="sourceLineNo">072</span> * <li><tt>{fi:'123'}</tt> - Return only rows where the <tt>fi</tt> column is 123.<a name="line.72"></a>
-<span class="sourceLineNo">073</span> * <li><tt>{fs:'foobar'}</tt> - Return only rows where the <tt>fs</tt> column is 'foobar'.<a name="line.73"></a>
-<span class="sourceLineNo">074</span> * <li><tt>{fd:'2001'}</tt> - Return only rows where the <tt>fd</tt> column have dates in the year 2001.<a name="line.74"></a>
-<span class="sourceLineNo">075</span> * <li><tt>{fs:'foobar'}</tt> - Return only rows where the <tt>fs</tt> column is 'foobar'.<a name="line.75"></a>
-<span class="sourceLineNo">076</span> * and the <tt>fs</tt> column starts with <tt>"foo"</tt>.<a name="line.76"></a>
-<span class="sourceLineNo">077</span> * </ul><a name="line.77"></a>
-<span class="sourceLineNo">078</span> * <p><a name="line.78"></a>
-<span class="sourceLineNo">079</span> * Search patterns can also be applied to lower level fields. For example, the search term<a name="line.79"></a>
-<span class="sourceLineNo">080</span> * <tt>{f1:{f2:{f3{'foobar'}}}</tt> means only return top level rows where the <tt>f1.getF2().getF3()</tt><a name="line.80"></a>
-<span class="sourceLineNo">081</span> * property is <tt>'foobar'</tt>.<a name="line.81"></a>
-<span class="sourceLineNo">082</span> *<a name="line.82"></a>
-<span class="sourceLineNo">083</span> * <h5 class='topic'>String Patterns</h5><a name="line.83"></a>
-<span class="sourceLineNo">084</span> * <p><a name="line.84"></a>
-<span class="sourceLineNo">085</span> * Any objects can be queried against using string patterns. If the objects being<a name="line.85"></a>
-<span class="sourceLineNo">086</span> * searched are not strings, then the patterns are matched against whatever is<a name="line.86"></a>
-<span class="sourceLineNo">087</span> * return by the {@code Object#toString()} method.<a name="line.87"></a>
-<span class="sourceLineNo">088</span> *<a name="line.88"></a>
-<span class="sourceLineNo">089</span> * <h6 class='topic'>Example string query patterns:</h6><a name="line.89"></a>
-<span class="sourceLineNo">090</span> * <ul><a name="line.90"></a>
-<span class="sourceLineNo">091</span> * <li><tt>foo</tt> - The string 'foo'<a name="line.91"></a>
-<span class="sourceLineNo">092</span> * <li><tt>foo bar</tt> - The string 'foo' or the string 'bar'<a name="line.92"></a>
-<span class="sourceLineNo">093</span> * <li><tt>'foo bar'</tt> - The phrase 'foo bar'<a name="line.93"></a>
-<span class="sourceLineNo">094</span> * <li><tt>"foo bar"</tt> - The phrase 'foo bar'<a name="line.94"></a>
-<span class="sourceLineNo">095</span> * <li><tt>foo*</tt> - <tt>*</tt> matches zero-or-more characters.<a name="line.95"></a>
-<span class="sourceLineNo">096</span> * <li><tt>foo?</tt> - <tt>?</tt> matches exactly one character<a name="line.96"></a>
+<span class="sourceLineNo">067</span> * Multiple search patterns are ANDed (i.e. all patterns must match for the row to be returned).<a name="line.67"></a>
+<span class="sourceLineNo">068</span> *<a name="line.68"></a>
+<span class="sourceLineNo">069</span> * <h5 class='section'>Example:</h5><a name="line.69"></a>
+<span class="sourceLineNo">070</span> * <ul class='spaced-list'><a name="line.70"></a>
+<span class="sourceLineNo">071</span> * <li><tt>{myInt:'123'}</tt> - Return only rows where the <tt>myInt</tt> column is 123.<a name="line.71"></a>
+<span class="sourceLineNo">072</span> * <li><tt>{myString:'foobar'}</tt> - Return only rows where the <tt>myString</tt> column is 'foobar'.<a name="line.72"></a>
+<span class="sourceLineNo">073</span> * <li><tt>{myDate:'2001'}</tt> - Return only rows where the <tt>myDate</tt> column have dates in the year 2001.<a name="line.73"></a>
+<span class="sourceLineNo">074</span> * </ul><a name="line.74"></a>
+<span class="sourceLineNo">075</span> *<a name="line.75"></a>
+<span class="sourceLineNo">076</span> * <h5 class='topic'>String Patterns</h5><a name="line.76"></a>
+<span class="sourceLineNo">077</span> * <p><a name="line.77"></a>
+<span class="sourceLineNo">078</span> * Any objects can be queried against using string patterns. If the objects being<a name="line.78"></a>
+<span class="sourceLineNo">079</span> * searched are not strings, then the patterns are matched against whatever is<a name="line.79"></a>
+<span class="sourceLineNo">080</span> * return by the {@code Object#toString()} method.<a name="line.80"></a>
+<span class="sourceLineNo">081</span> *<a name="line.81"></a>
+<span class="sourceLineNo">082</span> * <h6 class='topic'>Example string query patterns:</h6><a name="line.82"></a>
+<span class="sourceLineNo">083</span> * <ul><a name="line.83"></a>
+<span class="sourceLineNo">084</span> * <li><tt>foo</tt> - The string 'foo'<a name="line.84"></a>
+<span class="sourceLineNo">085</span> * <li><tt>foo bar</tt> - The string 'foo' or the string 'bar'<a name="line.85"></a>
+<span class="sourceLineNo">086</span> * <li><tt>'foo bar'</tt> - The phrase 'foo bar'<a name="line.86"></a>
+<span class="sourceLineNo">087</span> * <li><tt>"foo bar"</tt> - The phrase 'foo bar'<a name="line.87"></a>
+<span class="sourceLineNo">088</span> * <li><tt>foo*</tt> - <tt>*</tt> matches zero-or-more characters.<a name="line.88"></a>
+<span class="sourceLineNo">089</span> * <li><tt>foo?</tt> - <tt>?</tt> matches exactly one character<a name="line.89"></a>
+<span class="sourceLineNo">090</span> * </ul><a name="line.90"></a>
+<span class="sourceLineNo">091</span> *<a name="line.91"></a>
+<span class="sourceLineNo">092</span> * <h5 class='section'>Notes:</h5><a name="line.92"></a>
+<span class="sourceLineNo">093</span> * <ul class='spaced-list'><a name="line.93"></a>
+<span class="sourceLineNo">094</span> * <li>Whitespace is ignored around search patterns.<a name="line.94"></a>
+<span class="sourceLineNo">095</span> * <li>Prepend <tt>+</tt> to tokens that must match. (e.g. <tt>+foo* +*bar</tt>)<a name="line.95"></a>
+<span class="sourceLineNo">096</span> * <li>Prepend <tt>-</tt> to tokens that must not match. (e.g. <tt>+foo* -*bar</tt>)<a name="line.96"></a>
<span class="sourceLineNo">097</span> * </ul><a name="line.97"></a>
<span class="sourceLineNo">098</span> *<a name="line.98"></a>
-<span class="sourceLineNo">099</span> * <h5 class='section'>Notes:</h5><a name="line.99"></a>
-<span class="sourceLineNo">100</span> * <ul class='spaced-list'><a name="line.100"></a>
-<span class="sourceLineNo">101</span> * <li>Whitespace is ignored around search patterns.<a name="line.101"></a>
-<span class="sourceLineNo">102</span> * <li>Prepend <tt>+</tt> to tokens that must match. (e.g. <tt>+foo* +*bar</tt>)<a name="line.102"></a>
-<span class="sourceLineNo">103</span> * <li>Prepend <tt>-</tt> to tokens that must not match. (e.g. <tt>+foo* -*bar</tt>)<a name="line.103"></a>
-<span class="sourceLineNo">104</span> * </ul><a name="line.104"></a>
-<span class="sourceLineNo">105</span> *<a name="line.105"></a>
-<span class="sourceLineNo">106</span> * <h5 class='topic'>Numeric Patterns</h5><a name="line.106"></a>
-<span class="sourceLineNo">107</span> * <p><a name="line.107"></a>
-<span class="sourceLineNo">108</span> * Any object of type {@link Number} (or numeric primitives) can be searched using numeric patterns.<a name="line.108"></a>
-<span class="sourceLineNo">109</span> *<a name="line.109"></a>
-<span class="sourceLineNo">110</span> * <h6 class='topic'>Example numeric query patterns:</h6><a name="line.110"></a>
-<span class="sourceLineNo">111</span> * <ul><a name="line.111"></a>
-<span class="sourceLineNo">112</span> * <li><tt>123</tt> - The single number 123<a name="line.112"></a>
-<span class="sourceLineNo">113</span> * <li><tt>1 2 3</tt> - 1, 2, or 3<a name="line.113"></a>
-<span class="sourceLineNo">114</span> * <li><tt>1-100</tt> - Between 1 and 100<a name="line.114"></a>
-<span class="sourceLineNo">115</span> * <li><tt>1 - 100</tt> - Between 1 and 100<a name="line.115"></a>
-<span class="sourceLineNo">116</span> * <li><tt>1 - 100 200-300</tt> - Between 1 and 100 or between 200 and 300<a name="line.116"></a>
-<span class="sourceLineNo">117</span> * <li><tt>&gt; 100</tt> - Greater than 100<a name="line.117"></a>
-<span class="sourceLineNo">118</span> * <li><tt>&gt;= 100</tt> - Greater than or equal to 100<a name="line.118"></a>
-<span class="sourceLineNo">119</span> * <li><tt>!123</tt> - Not 123<a name="line.119"></a>
-<span class="sourceLineNo">120</span> * </ul><a name="line.120"></a>
-<span class="sourceLineNo">121</span> *<a name="line.121"></a>
-<span class="sourceLineNo">122</span> * <h5 class='section'>Notes:</h5><a name="line.122"></a>
-<span class="sourceLineNo">123</span> * <ul class='spaced-list'><a name="line.123"></a>
-<span class="sourceLineNo">124</span> * <li>Whitespace is ignored in search patterns.<a name="line.124"></a>
-<span class="sourceLineNo">125</span> * <li>Negative numbers are supported.<a name="line.125"></a>
-<span class="sourceLineNo">126</span> * </ul><a name="line.126"></a>
-<span class="sourceLineNo">127</span> *<a name="line.127"></a>
-<span class="sourceLineNo">128</span> * <h5 class='topic'>Date Patterns</h5><a name="line.128"></a>
-<span class="sourceLineNo">129</span> * <p><a name="line.129"></a>
-<span class="sourceLineNo">130</span> * Any object of type {@link Date} or {@link Calendar} can be searched using date patterns.<a name="line.130"></a>
-<span class="sourceLineNo">131</span> * <p><a name="line.131"></a>
-<span class="sourceLineNo">132</span> * The default valid input timestamp formats (which can be overridden via the {@link #setValidTimestampFormats(String...)} method are...<a name="line.132"></a>
-<span class="sourceLineNo">133</span> *<a name="line.133"></a>
-<span class="sourceLineNo">134</span> * <ul><a name="line.134"></a>
-<span class="sourceLineNo">135</span> * <li><tt>yyyy.MM.dd.HH.mm.ss</tt><a name="line.135"></a>
-<span class="sourceLineNo">136</span> * <li><tt>yyyy.MM.dd.HH.mm</tt><a name="line.136"></a>
-<span class="sourceLineNo">137</span> * <li><tt>yyyy.MM.dd.HH</tt><a name="line.137"></a>
-<span class="sourceLineNo">138</span> * <li><tt>yyyy.MM.dd</tt><a name="line.138"></a>
-<span class="sourceLineNo">139</span> * <li><tt>yyyy.MM</tt><a name="line.139"></a>
-<span class="sourceLineNo">140</span> * <li><tt>yyyy</tt><a name="line.140"></a>
-<span class="sourceLineNo">141</span> * </ul><a name="line.141"></a>
-<span class="sourceLineNo">142</span> *<a name="line.142"></a>
-<span class="sourceLineNo">143</span> * <h6 class='topic'>Example date query patterns:</h6><a name="line.143"></a>
-<span class="sourceLineNo">144</span> * <ul><a name="line.144"></a>
-<span class="sourceLineNo">145</span> * <li><tt>2001</tt> - A specific year.<a name="line.145"></a>
-<span class="sourceLineNo">146</span> * <li><tt>2001.01.01.10.50</tt> - A specific time.<a name="line.146"></a>
-<span class="sourceLineNo">147</span> * <li><tt>&gt;2001</tt> - After a specific year.<a name="line.147"></a>
-<span class="sourceLineNo">148</span> * <li><tt>&gt;=2001</tt> - During or after a specific year.<a name="line.148"></a>
-<span class="sourceLineNo">149</span> * <li><tt>2001 - 2003.06.30</tt> - A date range.<a name="line.149"></a>
-<span class="sourceLineNo">150</span> * <li><tt>2001 2003 2005</tt> - Multiple date patterns are ORed.<a name="line.150"></a>
-<span class="sourceLineNo">151</span> * </ul><a name="line.151"></a>
-<span class="sourceLineNo">152</span> *<a name="line.152"></a>
-<span class="sourceLineNo">153</span> * <h5 class='section'>Notes:</h5><a name="line.153"></a>
-<span class="sourceLineNo">154</span> * <ul><a name="line.154"></a>
-<span class="sourceLineNo">155</span> * <li>Whitespace is ignored in search patterns.<a name="line.155"></a>
-<span class="sourceLineNo">156</span> * </ul><a name="line.156"></a>
-<span class="sourceLineNo">157</span> *<a name="line.157"></a>
-<span class="sourceLineNo">158</span> * <h5 class='topic'>View</h5><a name="line.158"></a>
-<span class="sourceLineNo">159</span> * <p><a name="line.159"></a>
-<span class="sourceLineNo">160</span> * The view capability allows you to return only the specified subset of columns in the<a name="line.160"></a>
-<span class="sourceLineNo">161</span> * specified order.<br><a name="line.161"></a>
-<span class="sourceLineNo">162</span> * The view parameter is a list of either <tt>Strings</tt> or <tt>Maps</tt>.<a name="line.162"></a>
-<span class="sourceLineNo">163</span> *<a name="line.163"></a>
-<span class="sourceLineNo">164</span> * <h6 class='topic'>Example view parameters:</h6><a name="line.164"></a>
-<span class="sourceLineNo">165</span> * <ul><a name="line.165"></a>
-<span class="sourceLineNo">166</span> * <li><tt>['f1']</tt> - Return only column 'f1'.<a name="line.166"></a>
-<span class="sourceLineNo">167</span> * <li><tt>['f2','f1']</tt> - Return only columns 'f2' and 'f1'.<a name="line.167"></a>
-<span class="sourceLineNo">168</span> * <li><tt>['f1',{f2:'f3'}]</tt> - Return only columns 'f1' and 'f2', but for 'f2' objects,<a name="line.168"></a>
-<span class="sourceLineNo">169</span> * only show the 'f3' property.<a name="line.169"></a>
-<span class="sourceLineNo">170</span> * </ul><a name="line.170"></a>
-<span class="sourceLineNo">171</span> *<a name="line.171"></a>
-<span class="sourceLineNo">172</span> * <h5 class='topic'>Sort</h5><a name="line.172"></a>
-<span class="sourceLineNo">173</span> * <p><a name="line.173"></a>
-<span class="sourceLineNo">174</span> * The sort capability allows you to sort values by the specified rows.<br><a name="line.174"></a>
-<span class="sourceLineNo">175</span> * The sort parameter is a list of either <tt>Strings</tt> or <tt>Maps</tt>.<br><a name="line.175"></a>
-<span class="sourceLineNo">176</span> * <tt>Strings</tt> represent column names to sort ascending. If you want<a name="line.176"></a>
-<span class="sourceLineNo">177</span> * to sort descending, you need to specify a <tt>Map</tt> of the form <tt>{colname:'d'}</tt><a name="line.177"></a>
-<span class="sourceLineNo">178</span> *<a name="line.178"></a>
-<span class="sourceLineNo">179</span> * <h6 class='topic'>Example sort parameters:</h6><a name="line.179"></a>
-<span class="sourceLineNo">180</span> * <ul><a name="line.180"></a>
-<span class="sourceLineNo">181</span> * <li><tt>['f1']</tt> - Sort rows by column 'f1' ascending.<a name="line.181"></a>
-<span class="sourceLineNo">182</span> * <li><tt>[{f1:'a'}]</tt> - Sort rows by column 'f1' ascending.<a name="line.182"></a>
-<span class="sourceLineNo">183</span> * <li><tt>[{f1:'d'}]</tt> - Sort rows by column 'f1' descending.<a name="line.183"></a>
-<span class="sourceLineNo">184</span> * <li><tt>[{f1:'a'},{f2:'d'}]</tt> - Sort rows by column 'f1' ascending, then 'f2' descending.<a name="line.184"></a>
-<span class="sourceLineNo">185</span> * </ul><a name="line.185"></a>
-<span class="sourceLineNo">186</span> *<a name="line.186"></a>
-<span class="sourceLineNo">187</span> * <h5 class='topic'>Paging</h5><a name="line.187"></a>
-<span class="sourceLineNo">188</span> * <p><a name="line.188"></a>
-<span class="sourceLineNo">189</span> * Use the <tt>pos</tt> and <tt>limit</tt> parameters to specify a subset of rows to<a name="line.189"></a>
-<span class="sourceLineNo">190</span> * return.<a name="line.190"></a>
-<span class="sourceLineNo">191</span> *<a name="line.191"></a>
-<span class="sourceLineNo">192</span> * <h5 class='topic'>Other Notes</h5><a name="line.192"></a>
-<span class="sourceLineNo">193</span> * <ul class='spaced-list'><a name="line.193"></a>
-<span class="sourceLineNo">194</span> * <li>Calling <tt>filterMap()</tt> or <tt>filterCollection()</tt> always returns a new data<a name="line.194"></a>
-<span class="sourceLineNo">195</span> * structure, so the methods can be called multiple times against the same input.<a name="line.195"></a>
-<span class="sourceLineNo">196</span> * </ul><a name="line.196"></a>
-<span class="sourceLineNo">197</span> */<a name="line.197"></a>
-<span class="sourceLineNo">198</span>@SuppressWarnings({"unchecked","rawtypes"})<a name="line.198"></a>
-<span class="sourceLineNo">199</span>public final class PojoQuery {<a name="line.199"></a>
+<span class="sourceLineNo">099</span> * <h5 class='topic'>Numeric Patterns</h5><a name="line.99"></a>
+<span class="sourceLineNo">100</span> * <p><a name="line.100"></a>
+<span class="sourceLineNo">101</span> * Any object of type {@link Number} (or numeric primitives) can be searched using numeric patterns.<a name="line.101"></a>
+<span class="sourceLineNo">102</span> *<a name="line.102"></a>
+<span class="sourceLineNo">103</span> * <h6 class='topic'>Example numeric query patterns:</h6><a name="line.103"></a>
+<span class="sourceLineNo">104</span> * <ul><a name="line.104"></a>
+<span class="sourceLineNo">105</span> * <li><tt>123</tt> - The single number 123<a name="line.105"></a>
+<span class="sourceLineNo">106</span> * <li><tt>1 2 3</tt> - 1, 2, or 3<a name="line.106"></a>
+<span class="sourceLineNo">107</span> * <li><tt>1-100</tt> - Between 1 and 100<a name="line.107"></a>
+<span class="sourceLineNo">108</span> * <li><tt>1 - 100</tt> - Between 1 and 100<a name="line.108"></a>
+<span class="sourceLineNo">109</span> * <li><tt>1 - 100 200-300</tt> - Between 1 and 100 or between 200 and 300<a name="line.109"></a>
+<span class="sourceLineNo">110</span> * <li><tt>&gt; 100</tt> - Greater than 100<a name="line.110"></a>
+<span class="sourceLineNo">111</span> * <li><tt>&gt;= 100</tt> - Greater than or equal to 100<a name="line.111"></a>
+<span class="sourceLineNo">112</span> * <li><tt>!123</tt> - Not 123<a name="line.112"></a>
+<span class="sourceLineNo">113</span> * </ul><a name="line.113"></a>
+<span class="sourceLineNo">114</span> *<a name="line.114"></a>
+<span class="sourceLineNo">115</span> * <h5 class='section'>Notes:</h5><a name="line.115"></a>
+<span class="sourceLineNo">116</span> * <ul class='spaced-list'><a name="line.116"></a>
+<span class="sourceLineNo">117</span> * <li>Whitespace is ignored in search patterns.<a name="line.117"></a>
+<span class="sourceLineNo">118</span> * <li>Negative numbers are supported.<a name="line.118"></a>
+<span class="sourceLineNo">119</span> * </ul><a name="line.119"></a>
+<span class="sourceLineNo">120</span> *<a name="line.120"></a>
+<span class="sourceLineNo">121</span> * <h5 class='topic'>Date Patterns</h5><a name="line.121"></a>
+<span class="sourceLineNo">122</span> * <p><a name="line.122"></a>
+<span class="sourceLineNo">123</span> * Any object of type {@link Date} or {@link Calendar} can be searched using date patterns.<a name="line.123"></a>
+<span class="sourceLineNo">124</span> * <p><a name="line.124"></a>
+<span class="sourceLineNo">125</span> * The default valid input timestamp formats (which can be overridden via the {@link #setValidTimestampFormats(String...)} method are...<a name="line.125"></a>
+<span class="sourceLineNo">126</span> *<a name="line.126"></a>
+<span class="sourceLineNo">127</span> * <ul><a name="line.127"></a>
+<span class="sourceLineNo">128</span> * <li><tt>yyyy.MM.dd.HH.mm.ss</tt><a name="line.128"></a>
+<span class="sourceLineNo">129</span> * <li><tt>yyyy.MM.dd.HH.mm</tt><a name="line.129"></a>
+<span class="sourceLineNo">130</span> * <li><tt>yyyy.MM.dd.HH</tt><a name="line.130"></a>
+<span class="sourceLineNo">131</span> * <li><tt>yyyy.MM.dd</tt><a name="line.131"></a>
+<span class="sourceLineNo">132</span> * <li><tt>yyyy.MM</tt><a name="line.132"></a>
+<span class="sourceLineNo">133</span> * <li><tt>yyyy</tt><a name="line.133"></a>
+<span class="sourceLineNo">134</span> * </ul><a name="line.134"></a>
+<span class="sourceLineNo">135</span> *<a name="line.135"></a>
+<span class="sourceLineNo">136</span> * <h6 class='topic'>Example date query patterns:</h6><a name="line.136"></a>
+<span class="sourceLineNo">137</span> * <ul><a name="line.137"></a>
+<span class="sourceLineNo">138</span> * <li><tt>2001</tt> - A specific year.<a name="line.138"></a>
+<span class="sourceLineNo">139</span> * <li><tt>2001.01.01.10.50</tt> - A specific time.<a name="line.139"></a>
+<span class="sourceLineNo">140</span> * <li><tt>&gt;2001</tt> - After a specific year.<a name="line.140"></a>
+<span class="sourceLineNo">141</span> * <li><tt>&gt;=2001</tt> - During or after a specific year.<a name="line.141"></a>
+<span class="sourceLineNo">142</span> * <li><tt>2001 - 2003.06.30</tt> - A date range.<a name="line.142"></a>
+<span class="sourceLineNo">143</span> * <li><tt>2001 2003 2005</tt> - Multiple date patterns are ORed.<a name="line.143"></a>
+<span class="sourceLineNo">144</span> * </ul><a name="line.144"></a>
+<span class="sourceLineNo">145</span> *<a name="line.145"></a>
+<span class="sourceLineNo">146</span> * <h5 class='section'>Notes:</h5><a name="line.146"></a>
+<span class="sourceLineNo">147</span> * <ul><a name="line.147"></a>
+<span class="sourceLineNo">148</span> * <li>Whitespace is ignored in search patterns.<a name="line.148"></a>
+<span class="sourceLineNo">149</span> * </ul><a name="line.149"></a>
+<span class="sourceLineNo">150</span> *<a name="line.150"></a>
+<span class="sourceLineNo">151</span> * <h5 class='topic'>View</h5><a name="line.151"></a>
+<span class="sourceLineNo">152</span> * <p><a name="line.152"></a>
+<span class="sourceLineNo">153</span> * The view capability allows you to return only the specified subset of columns in the<a name="line.153"></a>
+<span class="sourceLineNo">154</span> * specified order.<br><a name="line.154"></a>
+<span class="sourceLineNo">155</span> * The view parameter is a list of either <tt>Strings</tt> or <tt>Maps</tt>.<a name="line.155"></a>
+<span class="sourceLineNo">156</span> *<a name="line.156"></a>
+<span class="sourceLineNo">157</span> * <h6 class='topic'>Example view parameters:</h6><a name="line.157"></a>
+<span class="sourceLineNo">158</span> * <ul><a name="line.158"></a>
+<span class="sourceLineNo">159</span> * <li><tt>column1</tt> - Return only column 'column1'.<a name="line.159"></a>
+<span class="sourceLineNo">160</span> * <li><tt>column2, column1</tt> - Return only columns 'column2' and 'column1' in that order.<a name="line.160"></a>
+<span class="sourceLineNo">161</span> * </ul><a name="line.161"></a>
+<span class="sourceLineNo">162</span> *<a name="line.162"></a>
+<span class="sourceLineNo">163</span> * <h5 class='topic'>Sort</h5><a name="line.163"></a>
+<span class="sourceLineNo">164</span> * <p><a name="line.164"></a>
+<span class="sourceLineNo">165</span> * The sort capability allows you to sort values by the specified rows.<br><a name="line.165"></a>
+<span class="sourceLineNo">166</span> * The sort parameter is a list of strings with an optional <js>'+'</js> or <js>'-'</js> suffix representing<a name="line.166"></a>
+<span class="sourceLineNo">167</span> * ascending and descending order accordingly.<a name="line.167"></a>
+<span class="sourceLineNo">168</span> *<a name="line.168"></a>
+<span class="sourceLineNo">169</span> * <h6 class='topic'>Example sort parameters:</h6><a name="line.169"></a>
+<span class="sourceLineNo">170</span> * <ul><a name="line.170"></a>
+<span class="sourceLineNo">171</span> * <li><tt>column1</tt> - Sort rows by column 'column1' ascending.<a name="line.171"></a>
+<span class="sourceLineNo">172</span> * <li><tt>column1+</tt> - Sort rows by column 'column1' ascending.<a name="line.172"></a>
+<span class="sourceLineNo">173</span> * <li><tt>column1-</tt> - Sort rows by column 'column1' descending.<a name="line.173"></a>
+<span class="sourceLineNo">174</span> * <li><tt>column1, column2-</tt> - Sort rows by column 'column1' ascending, then 'column2' descending.<a name="line.174"></a>
+<span class="sourceLineNo">175</span> * </ul><a name="line.175"></a>
+<span class="sourceLineNo">176</span> *<a name="line.176"></a>
+<span class="sourceLineNo">177</span> * <h5 class='topic'>Paging</h5><a name="line.177"></a>
+<span class="sourceLineNo">178</span> * <p><a name="line.178"></a>
+<span class="sourceLineNo">179</span> * Use the <tt>position</tt> and <tt>limit</tt> parameters to specify a subset of rows to<a name="line.179"></a>
+<span class="sourceLineNo">180</span> * return.<a name="line.180"></a>
+<span class="sourceLineNo">181</span> */<a name="line.181"></a>
+<span class="sourceLineNo">182</span>@SuppressWarnings({"unchecked","rawtypes"})<a name="line.182"></a>
+<span class="sourceLineNo">183</span>public final class PojoQuery {<a name="line.183"></a>
+<span class="sourceLineNo">184</span><a name="line.184"></a>
+<span class="sourceLineNo">185</span> private Object input;<a name="line.185"></a>
+<span class="sourceLineNo">186</span> private ClassMeta type;<a name="line.186"></a>
+<span class="sourceLineNo">187</span> private BeanSession session;<a name="line.187"></a>
+<span class="sourceLineNo">188</span><a name="line.188"></a>
+<span class="sourceLineNo">189</span> /**<a name="line.189"></a>
+<span class="sourceLineNo">190</span> * Constructor.<a name="line.190"></a>
+<span class="sourceLineNo">191</span> *<a name="line.191"></a>
+<span class="sourceLineNo">192</span> * @param input The POJO we're going to be filtering.<a name="line.192"></a>
+<span class="sourceLineNo">193</span> * @param session The bean session to use to create bean maps for beans.<a name="line.193"></a>
+<span class="sourceLineNo">194</span> */<a name="line.194"></a>
+<span class="sourceLineNo">195</span> public PojoQuery(Object input, BeanSession session) {<a name="line.195"></a>
+<span class="sourceLineNo">196</span> this.input = input;<a name="line.196"></a>
+<span class="sourceLineNo">197</span> this.type = session.getClassMetaForObject(input);<a name="line.197"></a>
+<span class="sourceLineNo">198</span> this.session = session;<a name="line.198"></a>
+<span class="sourceLineNo">199</span> }<a name="line.199"></a>
<span class="sourceLineNo">200</span><a name="line.200"></a>
-<span class="sourceLineNo">201</span> private Object input;<a name="line.201"></a>
-<span class="sourceLineNo">202</span> private ClassMeta type;<a name="line.202"></a>
-<span class="sourceLineNo">203</span> private BeanSession session;<a name="line.203"></a>
-<span class="sourceLineNo">204</span><a name="line.204"></a>
-<span class="sourceLineNo">205</span> /**<a name="line.205"></a>
-<span class="sourceLineNo">206</span> * Constructor.<a name="line.206"></a>
-<span class="sourceLineNo">207</span> *<a name="line.207"></a>
-<span class="sourceLineNo">208</span> * @param input The POJO we're going to be filtering.<a name="line.208"></a>
-<span class="sourceLineNo">209</span> * @param session The bean session to use to create bean maps for beans.<a name="line.209"></a>
-<span class="sourceLineNo">210</span> */<a name="line.210"></a>
-<span class="sourceLineNo">211</span> public PojoQuery(Object input, BeanSession session) {<a name="line.211"></a>
-<span class="sourceLineNo">212</span> this.input = input;<a name="line.212"></a>
-<span class="sourceLineNo">213</span> this.type = session.getClassMetaForObject(input);<a name="line.213"></a>
-<span class="sourceLineNo">214</span> this.session = session;<a name="line.214"></a>
-<span class="sourceLineNo">215</span> }<a name="line.215"></a>
-<span class="sourceLineNo">216</span><a name="line.216"></a>
-<span class="sourceLineNo">217</span> /**<a name="line.217"></a>
-<span class="sourceLineNo">218</span> * Filters the input object as a map.<a name="line.218"></a>
-<span class="sourceLineNo">219</span> *<a name="line.219"></a>
-<span class="sourceLineNo">220</span> * @param view The list and order of properties to return from the map. Values must be of type {@code String} or {@code Map}.<a name="line.220"></a>
-<span class="sourceLineNo">221</span> * @return The filtered map<a name="line.221"></a>
-<span class="sourceLineNo">222</span> */<a name="line.222"></a>
-<span class="sourceLineNo">223</span> public Map filterMap(List view) {<a name="line.223"></a>
-<span class="sourceLineNo">224</span><a name="line.224"></a>
-<span class="sourceLineNo">225</span> if (input == null)<a name="line.225"></a>
-<span class="sourceLineNo">226</span> return null;<a name="line.226"></a>
+<span class="sourceLineNo">201</span> /**<a name="line.201"></a>
+<span class="sourceLineNo">202</span> * Filters the input object as a collection of maps.<a name="line.202"></a>
+<span class="sourceLineNo">203</span> *<a name="line.203"></a>
+<span class="sourceLineNo">204</span> * @param args The search arguments.<a name="line.204"></a>
+<span class="sourceLineNo">205</span> * @return The filtered collection.<a name="line.205"></a>
+<span class="sourceLineNo">206</span> * <br>Returns the unaltered input if the input is not a collection or array of objects.<a name="line.206"></a>
+<span class="sourceLineNo">207</span> */<a name="line.207"></a>
+<span class="sourceLineNo">208</span> public List filter(SearchArgs args) {<a name="line.208"></a>
+<span class="sourceLineNo">209</span><a name="line.209"></a>
+<span class="sourceLineNo">210</span> if (input == null)<a name="line.210"></a>
+<span class="sourceLineNo">211</span> return null;<a name="line.211"></a>
+<span class="sourceLineNo">212</span><a name="line.212"></a>
+<span class="sourceLineNo">213</span> if (! type.isCollectionOrArray())<a name="line.213"></a>
+<span class="sourceLineNo">214</span> throw new RuntimeException("Cannot call filterCollection() on class type " + type);<a name="line.214"></a>
+<span class="sourceLineNo">215</span><a name="line.215"></a>
+<span class="sourceLineNo">216</span> // Create a new ObjectList<a name="line.216"></a>
+<span class="sourceLineNo">217</span> ObjectList l = (ObjectList)replaceWithMutables(input);<a name="line.217"></a>
+<span class="sourceLineNo">218</span><a name="line.218"></a>
+<span class="sourceLineNo">219</span> // Do the search<a name="line.219"></a>
+<span class="sourceLineNo">220</span> CollectionFilter filter = new CollectionFilter(args.getSearch(), args.isIgnoreCase());<a name="line.220"></a>
+<span class="sourceLineNo">221</span> filter.doQuery(l);<a name="line.221"></a>
+<span class="sourceLineNo">222</span><a name="line.222"></a>
+<span class="sourceLineNo">223</span> // If sort or view isn't empty, then we need to make sure that all entries in the<a name="line.223"></a>
+<span class="sourceLineNo">224</span> // list are maps.<a name="line.224"></a>
+<span class="sourceLineNo">225</span> Map<String,Boolean> sort = args.getSort();<a name="line.225"></a>
+<span class="sourceLineNo">226</span> List<String> view = args.getView();<a name="line.226"></a>
<span class="sourceLineNo">227</span><a name="line.227"></a>
-<span class="sourceLineNo">228</span> if (! type.isMapOrBean())<a name="line.228"></a>
-<span class="sourceLineNo">229</span> throw new RuntimeException("Cannot call filterMap() on class type " + type);<a name="line.229"></a>
-<span class="sourceLineNo">230</span><a name="line.230"></a>
-<span class="sourceLineNo">231</span> Map m = (Map)replaceWithMutables(input);<a name="line.231"></a>
-<span class="sourceLineNo">232</span> doView(m, view);<a name="line.232"></a>
-<span class="sourceLineNo">233</span><a name="line.233"></a>
-<span class="sourceLineNo">234</span> return m;<a name="line.234"></a>
-<span class="sourceLineNo">235</span> }<a name="line.235"></a>
-<span class="sourceLineNo">236</span><a name="line.236"></a>
-<span class="sourceLineNo">237</span> /**<a name="line.237"></a>
-<span class="sourceLineNo">238</span> * Filters the input object as a collection of maps.<a name="line.238"></a>
-<span class="sourceLineNo">239</span> *<a name="line.239"></a>
-<span class="sourceLineNo">240</span> * @param query The query attributes. Keys must be column names and values must be of type {@code String} or {@code Map}.<a name="line.240"></a>
-<span class="sourceLineNo">241</span> * @param view The view attributes. Values must be of type {@code String} or {@code Map}.<a name="line.241"></a>
-<span class="sourceLineNo">242</span> * @param sort The sort attributes. Values must be of type {@code String} or {@code Map}.<a name="line.242"></a>
-<span class="sourceLineNo">243</span> * @param pos The index into the list to start returning results from. Default is {@code 0}.<a name="line.243"></a>
-<span class="sourceLineNo">244</span> * @param limit The number of rows to return. Default is all rows.<a name="line.244"></a>
-<span class="sourceLineNo">245</span> * @param ignoreCase If <jk>true</jk>, then querying is case insensitive. Default is <jk>false</jk>.<a name="line.245"></a>
-<span class="sourceLineNo">246</span> * @return The filtered collection.<a name="line.246"></a>
-<span class="sourceLineNo">247</span> */<a name="line.247"></a>
-<span class="sourceLineNo">248</span> public List filterCollection(Map query, List view, List sort, int pos, int limit, boolean ignoreCase) {<a name="line.248"></a>
-<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span> if (input == null)<a name="line.250"></a>
-<span class="sourceLineNo">251</span> return null;<a name="line.251"></a>
-<span class="sourceLineNo">252</span><a name="line.252"></a>
-<span class="sourceLineNo">253</span> if (! type.isCollectionOrArray())<a name="line.253"></a>
-<span class="sourceLineNo">254</span> throw new RuntimeException("Cannot call filterCollection() on class type " + type);<a name="line.254"></a>
-<span class="sourceLineNo">255</span><a name="line.255"></a>
-<span class="sourceLineNo">256</span> if (view == null)<a name="line.256"></a>
-<span class="sourceLineNo">257</span> view = Collections.EMPTY_LIST;<a name="line.257"></a>
-<span class="sourceLineNo">258</span><a name="line.258"></a>
-<span class="sourceLineNo">259</span> if (sort == null)<a name="line.259"></a>
-<span class="sourceLineNo">260</span> sort = Collections.EMPTY_LIST;<a name="line.260"></a>
-<span class="sourceLineNo">261</span><a name="line.261"></a>
-<span class="sourceLineNo">262</span> // Create a new ObjectList<a name="line.262"></a>
-<span class="sourceLineNo">263</span> ObjectList l = (ObjectList)replaceWithMutables(input);<a name="line.263"></a>
-<span class="sourceLineNo">264</span><a name="line.264"></a>
-<span class="sourceLineNo">265</span> // Do the search<a name="line.265"></a>
-<span class="sourceLineNo">266</span> CollectionFilter filter = new CollectionFilter(query, ignoreCase);<a name="line.266"></a>
-<span class="sourceLineNo">267</span> filter.doQuery(l);<a name="line.267"></a>
-<span class="sourceLineNo">268</span><a name="line.268"></a>
-<span class="sourceLineNo">269</span> // If sort or view isn't empty, then we need to make sure that all entries in the<a name="line.269"></a>
-<span class="sourceLineNo">270</span> // list are maps.<a name="line.270"></a>
-<span class="sourceLineNo">271</span> if ((! sort.isEmpty()) || (! view.isEmpty())) {<a name="line.271"></a>
-<span class="sourceLineNo">272</span><a name="line.272"></a>
-<span class="sourceLineNo">273</span> if (! sort.isEmpty())<a name="line.273"></a>
-<span class="sourceLineNo">274</span> doSort(l, sort);<a name="line.274"></a>
-<span class="sourceLineNo">275</span><a name="line.275"></a>
-<span class="sourceLineNo">276</span> if (! view.isEmpty())<a name="line.276"></a>
-<span class="sourceLineNo">277</span> doView(l, view);<a name="line.277"></a>
-<span class="sourceLineNo">278</span> }<a name="line.278"></a>
-<span class="sourceLineNo">279</span><a name="line.279"></a>
-<span class="sourceLineNo">280</span> // Do the paging.<a name="line.280"></a>
-<span class="sourceLineNo">281</span> if (pos != 0 || limit != 0) {<a name="line.281"></a>
-<span class="sourceLineNo">282</span> int end = (limit == 0 || limit+pos >= l.size()) ? l.size() : limit + pos;<a name="line.282"></a>
-<span class="sourceLineNo">283</span> ObjectList l2 = new DelegateList(((DelegateList)l).getClassMeta());<a name="line.283"></a>
-<span class="sourceLineNo">284</span> l2.addAll(l.subList(pos, end));<a name="line.284"></a>
-<span class="sourceLineNo">285</span> l = l2;<a name="line.285"></a>
-<span class="sourceLineNo">286</span> }<a name="line.286"></a>
+<span class="sourceLineNo">228</span> if ((! sort.isEmpty()) || (! view.isEmpty())) {<a name="line.228"></a>
+<span class="sourceLineNo">229</span> if (! sort.isEmpty())<a name="line.229"></a>
+<span class="sourceLineNo">230</span> doSort(l, sort);<a name="line.230"></a>
+<span class="sourceLineNo">231</span> if (! view.isEmpty())<a name="line.231"></a>
+<span class="sourceLineNo">232</span> doView(l, view);<a name="line.232"></a>
+<span class="sourceLineNo">233</span> }<a name="line.233"></a>
+<span class="sourceLineNo">234</span><a name="line.234"></a>
+<span class="sourceLineNo">235</span> // Do the paging.<a name="line.235"></a>
+<span class="sourceLineNo">236</span> int pos = args.getPosition();<a name="line.236"></a>
+<span class="sourceLineNo">237</span> int limit = args.getLimit();<a name="line.237"></a>
+<span class="sourceLineNo">238</span> if (pos != 0 || limit != 0) {<a name="line.238"></a>
+<span class="sourceLineNo">239</span> int end = (limit == 0 || limit+pos >= l.size()) ? l.size() : limit + pos;<a name="line.239"></a>
+<span class="sourceLineNo">240</span> ObjectList l2 = new DelegateList(((DelegateList)l).getClassMeta());<a name="line.240"></a>
+<span class="sourceLineNo">241</span> l2.addAll(l.subList(pos, end));<a name="line.241"></a>
+<span class="sourceLineNo">242</span> l = l2;<a name="line.242"></a>
+<span class="sourceLineNo">243</span> }<a name="line.243"></a>
+<span class="sourceLineNo">244</span><a name="line.244"></a>
+<span class="sourceLineNo">245</span> return l;<a name="line.245"></a>
+<span class="sourceLineNo">246</span> }<a name="line.246"></a>
+<span class="sourceLineNo">247</span><a name="line.247"></a>
+<span class="sourceLineNo">248</span> /*<a name="line.248"></a>
+<span class="sourceLineNo">249</span> * If there are any non-Maps in the specified list, replaces them with BeanMaps.<a name="line.249"></a>
+<span class="sourceLineNo">250</span> */<a name="line.250"></a>
+<span class="sourceLineNo">251</span> private Object replaceWithMutables(Object o) {<a name="line.251"></a>
+<span class="sourceLineNo">252</span> if (o == null)<a name="line.252"></a>
+<span class="sourceLineNo">253</span> return null;<a name="line.253"></a>
+<span class="sourceLineNo">254</span> ClassMeta cm = session.getClassMetaForObject(o);<a name="line.254"></a>
+<span class="sourceLineNo">255</span> if (cm.isCollection()) {<a name="line.255"></a>
+<span class="sourceLineNo">256</span> ObjectList l = new DelegateList(session.getClassMetaForObject(o));<a name="line.256"></a>
+<span class="sourceLineNo">257</span> for (Object o2 : (Collection)o)<a name="line.257"></a>
+<span class="sourceLineNo">258</span> l.add(replaceWithMutables(o2));<a name="line.258"></a>
+<span class="sourceLineNo">259</span> return l;<a name="line.259"></a>
+<span class="sourceLineNo">260</span> }<a name="line.260"></a>
+<span class="sourceLineNo">261</span> if (cm.isMap() && o instanceof BeanMap) {<a name="line.261"></a>
+<span class="sourceLineNo">262</span> BeanMap bm = (BeanMap)o;<a name="line.262"></a>
+<span class="sourceLineNo">263</span> DelegateBeanMap dbm = new DelegateBeanMap(bm.getBean(), session);<a name="line.263"></a>
+<span class="sourceLineNo">264</span> for (Object key : bm.keySet())<a name="line.264"></a>
+<span class="sourceLineNo">265</span> dbm.addKey(key.toString());<a name="line.265"></a>
+<span class="sourceLineNo">266</span> return dbm;<a name="line.266"></a>
+<span class="sourceLineNo">267</span> }<a name="line.267"></a>
+<span class="sourceLineNo">268</span> if (cm.isBean()) {<a name="line.268"></a>
+<span class="sourceLineNo">269</span> BeanMap bm = session.toBeanMap(o);<a name="line.269"></a>
+<span class="sourceLineNo">270</span> DelegateBeanMap dbm = new DelegateBeanMap(bm.getBean(), session);<a name="line.270"></a>
+<span class="sourceLineNo">271</span> for (Object key : bm.keySet())<a name="line.271"></a>
+<span class="sourceLineNo">272</span> dbm.addKey(key.toString());<a name="line.272"></a>
+<span class="sourceLineNo">273</span> return dbm;<a name="line.273"></a>
+<span class="sourceLineNo">274</span> }<a name="line.274"></a>
+<span class="sourceLineNo">275</span> if (cm.isMap()) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span> Map m = (Map)o;<a name="line.276"></a>
+<span class="sourceLineNo">277</span> DelegateMap dm = new DelegateMap(session.getClassMetaForObject(m));<a name="line.277"></a>
+<span class="sourceLineNo">278</span> for (Map.Entry e : (Set<Map.Entry>)m.entrySet())<a name="line.278"></a>
+<span class="sourceLineNo">279</span> dm.put(e.getKey().toString(), e.getValue());<a name="line.279"></a>
+<span class="sourceLineNo">280</span> return dm;<a name="line.280"></a>
+<span class="sourceLineNo">281</span> }<a name="line.281"></a>
+<span class="sourceLineNo">282</span> if (cm.isArray()) {<a name="line.282"></a>
+<span class="sourceLineNo">283</span> return replaceWithMutables(Arrays.asList((Object[])o));<a name="line.283"></a>
+<span class="sourceLineNo">284</span> }<a name="line.284"></a>
+<span class="sourceLineNo">285</span> return o;<a name="line.285"></a>
+<span class="sourceLineNo">286</span> }<a name="line.286"></a>
<span class="sourceLineNo">287</span><a name="line.287"></a>
-<span class="sourceLineNo">288</span> return l;<a name="line.288"></a>
-<span class="sourceLineNo">289</span> }<a name="line.289"></a>
-<span class="sourceLineNo">290</span><a name="line.290"></a>
-<span class="sourceLineNo">291</span> /*<a name="line.291"></a>
-<span class="sourceLineNo">292</span> * If there are any non-Maps in the specified list, replaces them with BeanMaps.<a name="line.292"></a>
-<span class="sourceLineNo">293</span> */<a name="line.293"></a>
-<span class="sourceLineNo">294</span> private Object replaceWithMutables(Object o) {<a name="line.294"></a>
-<span class="sourceLineNo">295</span> if (o == null)<a name="line.295"></a>
-<span class="sourceLineNo">296</span> return null;<a name="line.296"></a>
-<span class="sourceLineNo">297</span> ClassMeta cm = session.getClassMetaForObject(o);<a name="line.297"></a>
-<span class="sourceLineNo">298</span> if (cm.isCollection()) {<a name="line.298"></a>
-<span class="sourceLineNo">299</span> ObjectList l = new DelegateList(session.getClassMetaForObject(o));<a name="line.299"></a>
-<span class="sourceLineNo">300</span> for (Object o2 : (Collection)o)<a name="line.300"></a>
-<span class="sourceLineNo">301</span> l.add(replaceWithMutables(o2));<a name="line.301"></a>
-<span class="sourceLineNo">302</span> return l;<a name="line.302"></a>
-<span class="sourceLineNo">303</span> }<a name="line.303"></a>
-<span class="sourceLineNo">304</span> if (cm.isMap() && o instanceof BeanMap) {<a name="line.304"></a>
-<span class="sourceLineNo">305</span> BeanMap bm = (BeanMap)o;<a name="line.305"></a>
-<span class="sourceLineNo">306</span> DelegateBeanMap dbm = new DelegateBeanMap(bm.getBean(), session);<a name="line.306"></a>
-<span class="sourceLineNo">307</span> for (BeanMapEntry e : (Set<BeanMapEntry>)bm.entrySet()) {<a name="line.307"></a>
-<span class="sourceLineNo">308</span> ClassMeta ct1 = e.getMeta().getClassMeta();<a name="line.308"></a>
-<span class="sourceLineNo">309</span> if (ct1.isCollectionOrArray() || ct1.isMapOrBean() || ct1.isObject())<a name="line.309"></a>
-<span class="sourceLineNo">310</span> dbm.put(e.getKey(), replaceWithMutables(e.getValue()));<a name="line.310"></a>
-<span class="sourceLineNo">311</span> else<a name="line.311"></a>
-<span class="sourceLineNo">312</span> dbm.addKey(e.getKey());<a name="line.312"></a>
-<span class="sourceLineNo">313</span> }<a name="line.313"></a>
-<span class="sourceLineNo">314</span> return dbm;<a name="line.314"></a>
-<span class="sourceLineNo">315</span> }<a name="line.315"></a>
-<span class="sourceLineNo">316</span> if (cm.isBean()) {<a name="line.316"></a>
-<span class="sourceLineNo">317</span> BeanMap bm = session.toBeanMap(o);<a name="line.317"></a>
-<span class="sourceLineNo">318</span> DelegateBeanMap dbm = new DelegateBeanMap(bm.getBean(), session);<a name="line.318"></a>
-<span class="sourceLineNo">319</span> for (BeanMapEntry e : (Set<BeanMapEntry>)bm.entrySet()) {<a name="line.319"></a>
-<span class="sourceLineNo">320</span> ClassMeta ct1 = e.getMeta().getClassMeta();<a name="line.320"></a>
-<span class="sourceLineNo">321</span> if (ct1.isCollectionOrArray() || ct1.isMapOrBean() || ct1.isObject()) {<a name="line.321"></a>
-<span class="sourceLineNo">322</span> Object val = null;<a name="line.322"></a>
-<span class="sourceLineNo">323</span> try {<a name="line.323"></a>
-<span class="sourceLineNo">324</span> val = e.getValue();<a name="line.324"></a>
-<span class="sourceLineNo">325</span> } catch (BeanRuntimeException ex) {<a name="line.325"></a>
-<span class="sourceLineNo">326</span> // Ignore.<a name="line.326"></a>
-<span class="sourceLineNo">327</span> }<a name="line.327"></a>
-<span class="sourceLineNo">328</span> dbm.put(e.getKey(), replaceWithMutables(val));<a name="line.328"></a>
-<span class="sourceLineNo">329</span> }<a name="line.329"></a>
-<span class="sourceLineNo">330</span> else<a name="line.330"></a>
-<span class="sourceLineNo">331</span> dbm.addKey(e.getKey());<a name="line.331"></a>
-<span class="sourceLineNo">332</span> }<a name="line.332"></a>
-<span class="sourceLineNo">333</span> return dbm;<a name="line.333"></a>
-<span class="sourceLineNo">334</span> }<a name="line.334"></a>
-<span class="sourceLineNo">335</span> if (cm.isMap()) {<a name="line.335"></a>
-<span class="sourceLineNo">336</span> Map m = (Map)o;<a name="line.336"></a>
-<span class="sourceLineNo">337</span> DelegateMap dm = new DelegateMap(session.getClassMetaForObject(m));<a name="line.337"></a>
-<span class="sourceLineNo">338</span> for (Map.Entry e : (Set<Map.Entry>)m.entrySet())<a name="line.338"></a>
-<span class="sourceLineNo">339</span> dm.put(e.getKey().toString(), replaceWithMutables(e.getValue()));<a name="line.339"></a>
-<span class="sourceLineNo">340</span> return dm;<a name="line.340"></a>
-<span class="sourceLineNo">341</span> }<a name="line.341"></a>
-<span class="sourceLineNo">342</span> if (cm.isArray()) {<a name="line.342"></a>
-<span class="sourceLineNo">343</span> return replaceWithMutables(Arrays.asList((Object[])o));<a name="line.343"></a>
-<span class="sourceLineNo">344</span> }<a name="line.344"></a>
-<span class="sourceLineNo">345</span> return o;<a name="line.345"></a>
-<span class="sourceLineNo">346</span> }<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> * Sorts the specified list by the sort list.<a name="line.349"></a>
-<span class="sourceLineNo">350</span> */<a name="line.350"></a>
-<span class="sourceLineNo">351</span> private static void doSort(List list, List sortList) {<a name="line.351"></a>
-<span class="sourceLineNo">352</span><a name="line.352"></a>
-<span class="sourceLineNo">353</span> Map sort = new LinkedHashMap();<a name="line.353"></a>
-<span class="sourceLineNo">354</span> for (Object s : sortList) {<a name="line.354"></a>
-<span class="sourceLineNo">355</span> if (s instanceof String)<a name="line.355"></a>
-<span class="sourceLineNo">356</span> sort.put(s, "a");<a name="line.356"></a>
-<span class="sourceLineNo">357</span> else if (s instanceof Map) {<a name="line.357"></a>
-<span class="sourceLineNo">358</span> Map sm = (Map)s;<a name="line.358"></a>
-<span class="sourceLineNo">359</span> for (Map.Entry e : (Set<Map.Entry>)sm.entrySet())<a name="line.359"></a>
-<span class="sourceLineNo">360</span> sort.put(e.getKey(), e.getValue().toString().toLowerCase(Locale.ENGLISH));<a name="line.360"></a>
-<span class="sourceLineNo">361</span> }<a name="line.361"></a>
-<span class="sourceLineNo">362</span> }<a name="line.362"></a>
-<span class="sourceLineNo">363</span><a name="line.363"></a>
-<span class="sourceLineNo">364</span> // Do the sort.<a name="line.364"></a>
-<span class="sourceLineNo">365</span> List<String> columns = new ArrayList<String>(sort.keySet());<a name="line.365"></a>
-<span class="sourceLineNo">366</span> Collections.reverse(columns);<a name="line.366"></a>
-<span class="sourceLineNo">367</span> for (final String c : columns) {<a name="line.367"></a>
-<span class="sourceLineNo">368</span> final boolean isDesc = startsWith(sort.get(c).toString(), 'd');<a name="line.368"></a>
-<span class="sourceLineNo">369</span> Comparator comp = new Comparator<Map>() {<a name="line.369"></a>
-<span class="sourceLineNo">370</span> @Override /* Comparator */<a name="line.370"></a>
-<span class="sourceLineNo">371</span> public int compare(Map m1, Map m2) {<a name="line.371"></a>
-<span class="sourceLineNo">372</span> Comparable v1 = (Comparable)m1.get(c), v2 = (Comparable)m2.get(c);<a name="line.372"></a>
-<span class="sourceLineNo">373</span> if (v1 == null && v2 == null)<a name="line.373"></a>
-<span class="sourceLineNo">374</span> return 0;<a name="line.374"></a>
-<span class="sourceLineNo">375</span> if (v1 == null)<a name="line.375"></a>
-<span class="sourceLineNo">376</span> return (isDesc ? -1 : 1);<a name="line.376"></a>
-<span class="sourceLineNo">377</span> if (v2 == null)<a name="line.377"></a>
-<span class="sourceLineNo">378</span> return (isDesc ? 1 : -1);<a name="line.378"></a>
-<span class="sourceLineNo">379</span> return (isDesc ? v2.compareTo(v1) : v1.compareTo(v2));<a name="line.379"></a>
-<span class="sourceLineNo">380</span> }<a name="line.380"></a>
-<span class="sourceLineNo">381</span> };<a name="line.381"></a>
-<span class="sourceLineNo">382</span> Collections.sort(list, comp);<a name="line.382"></a>
+<span class="sourceLineNo">288</span> /*<a name="line.288"></a>
+<span class="sourceLineNo">289</span> * Sorts the specified list by the sort list.<a name="line.289"></a>
+<span class="sourceLineNo">290</span> */<a name="line.290"></a>
+<span class="sourceLineNo">291</span> private static void doSort(List list, Map<String,Boolean> sortList) {<a name="line.291"></a>
+<span class="sourceLineNo">292</span><a name="line.292"></a>
+<span class="sourceLineNo">293</span> // We reverse the list and sort last to first.<a name="line.293"></a>
+<span class="sourceLineNo">294</span> List<String> columns = new ArrayList<String>(sortList.keySet());<a name="line.294"></a>
+<span class="sourceLineNo">295</span> Collections.reverse(columns);<a name="line.295"></a>
+<span class="sourceLineNo">296</span><a name="line.296"></a>
+<span class="sourceLineNo">297</span> for (final String c : columns) {<a name="line.297"></a>
+<span class="sourceLineNo">298</span> final boolean isDesc = sortList.get(c);<a name="line.298"></a>
+<span class="sourceLineNo">299</span><a name="line.299"></a>
+<span class="sourceLineNo">300</span> Comparator comp = new Comparator<Map>() {<a name="line.300"></a>
+<span class="sourceLineNo">301</span> @Override /* Comparator */<a name="line.301"></a>
+<span class="sourceLineNo">302</span> public int compare(Map m1, Map m2) {<a name="line.302"></a>
+<span class="sourceLineNo">303</span> Comparable v1 = (Comparable)m1.get(c), v2 = (Comparable)m2.get(c);<a name="line.303"></a>
+<span class="sourceLineNo">304</span> if (v1 == null && v2 == null)<a name="line.304"></a>
+<span class="sourceLineNo">305</span> return 0;<a name="line.305"></a>
+<span class="sourceLineNo">306</span> if (v1 == null)<a name="line.306"></a>
+<span class="sourceLineNo">307</span> return (isDesc ? -1 : 1);<a name="line.307"></a>
+<span class="sourceLineNo">308</span> if (v2 == null)<a name="line.308"></a>
+<span class="sourceLineNo">309</span> return (isDesc ? 1 : -1);<a name="line.309"></a>
+<span class="sourceLineNo">310</span> return (isDesc ? v2.compareTo(v1) : v1.compareTo(v2));<a name="line.310"></a>
+<span class="sourceLineNo">311</span> }<a name="line.311"></a>
+<span class="sourceLineNo">312</span> };<a name="line.312"></a>
+<span class="sourceLineNo">313</span> Collections.sort(list, comp);<a name="line.313"></a>
+<span class="sourceLineNo">314</span> }<a name="line.314"></a>
+<span class="sourceLineNo">315</span> }<a name="line.315"></a>
+<span class="sourceLineNo">316</span><a name="line.316"></a>
+<span class="sourceLineNo">317</span> /*<a name="line.317"></a>
+<span class="sourceLineNo">318</span> * Filters all but the specified view columns on all entries in the specified list.<a name="line.318"></a>
+<span class="sourceLineNo">319</span> */<a name="line.319"></a>
+<span class="sourceLineNo">320</span> private static void doView(List list, List<String> view) {<a name="line.320"></a>
+<span class="sourceLineNo">321</span> for (ListIterator i = list.listIterator(); i.hasNext();) {<a name="line.321"></a>
+<span class="sourceLineNo">322</span> Object o = i.next();<a name="line.322"></a>
+<span class="sourceLineNo">323</span> Map m = (Map)o;<a name="line.323"></a>
+<span class="sourceLineNo">324</span> doView(m, view);<a name="line.324"></a>
+<span class="sourceLineNo">325</span> }<a name="line.325"></a>
+<span class="sourceLineNo">326</span> }<a name="line.326"></a>
+<span class="sourceLineNo">327</span><a name="line.327"></a>
+<span class="sourceLineNo">328</span> /*<a name="line.328"></a>
+<span class="sourceLineNo">329</span> * Creates a new Map with only the entries specified in the view list.<a name="line.329"></a>
+<span class="sourceLineNo">330</span> */<a name="line.330"></a>
+<span class="sourceLineNo">331</span> private static Map doView(Map m, List<String> view) {<a name="line.331"></a>
+<span class="sourceLineNo">332</span> if (m instanceof DelegateMap)<a name="line.332"></a>
+<span class="sourceLineNo">333</span> ((DelegateMap)m).filterKeys(view);<a name="line.333"></a>
+<span class="sourceLineNo">334</span> else<a name="line.334"></a>
+<span class="sourceLineNo">335</span> ((DelegateBeanMap)m).filterKeys(view);<a name="line.335"></a>
+<span class="sourceLineNo">336</span> return m;<a name="line.336"></a>
+<span class="sourceLineNo">337</span> }<a name="line.337"></a>
+<span class="sourceLineNo">338</span><a name="line.338"></a>
+<span class="sourceLineNo">339</span><a name="line.339"></a>
+<span class="sourceLineNo">340</span> //====================================================================================================<a name="line.340"></a>
+<span class="sourceLineNo">341</span> // CollectionFilter<a name="line.341"></a>
+<span class="sourceLineNo">342</span> //====================================================================================================<a name="line.342"></a>
+<span class="sourceLineNo">343</span> private class CollectionFilter {<a name="line.343"></a>
+<span class="sourceLineNo">344</span> IMatcher entryMatcher;<a name="line.344"></a>
+<span class="sourceLineNo">345</span><a name="line.345"></a>
+<span class="sourceLineNo">346</span> public CollectionFilter(Map query, boolean ignoreCase) {<a name="line.346"></a>
+<span class="sourceLineNo">347</span> if (query != null && ! query.isEmpty())<a name="line.347"></a>
+<span class="sourceLineNo">348</span> entryMatcher = new MapMatcher(query, ignoreCase);<a name="line.348"></a>
+<span class="sourceLineNo">349</span> }<a name="line.349"></a>
+<span class="sourceLineNo">350</span><a name="line.350"></a>
+<span class="sourceLineNo">351</span> public void doQuery(List in) {<a name="line.351"></a>
+<span class="sourceLineNo">352</span> if (in == null || entryMatcher == null)<a name="line.352"></a>
+<span class="sourceLineNo">353</span> return;<a name="line.353"></a>
+<span class="sourceLineNo">354</span> for (Iterator i = in.iterator(); i.hasNext();) {<a name="line.354"></a>
+<span class="sourceLineNo">355</span> Object o = i.next();<a name="line.355"></a>
+<span class="sourceLineNo">356</span> if (! entryMatcher.matches(o))<a name="line.356"></a>
+<span class="sourceLineNo">357</span> i.remove();<a name="line.357"></a>
+<span class="sourceLineNo">358</span> }<a name="line.358"></a>
+<span class="sourceLineNo">359</span> }<a name="line.359"></a>
+<span class="sourceLineNo">360</span> }<a name="line.360"></a>
+<span class="sourceLineNo">361</span><a name="line.361"></a>
+<span class="sourceLineNo">362</span> //====================================================================================================<a name="line.362"></a>
+<span class="sourceLineNo">363</span> // IMatcher<a name="line.363"></a>
+<span class="sourceLineNo">364</span> //====================================================================================================<a name="line.364"></a>
+<span class="sourceLineNo">365</span> private interface IMatcher<E> {<a name="line.365"></a>
+<span class="sourceLineNo">366</span> public boolean matches(E o);<a name="line.366"></a>
+<span class="sourceLineNo">367</span> }<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> // MapMatcher<a name="line.370"></a>
+<span class="sourceLineNo">371</span> //====================================================================================================<a name="line.371"></a>
+<span class="sourceLineNo">372</span> /*<a name="line.372"></a>
+<span class="sourceLineNo">373</span> * Matches on a Map only if all specified entry matchers match.<a name="line.373"></a>
+<span class="sourceLineNo">374</span> */<a name="line.374"></a>
+<span class="sourceLineNo">375</span> private class MapMatcher implements IMatcher<Map> {<a name="line.375"></a>
+<span class="sourceLineNo">376</span><a name="line.376"></a>
+<span class="sourceLineNo">377</span> Map<String,IMatcher> entryMatchers = new HashMap<String,IMatcher>();<a name="line.377"></a>
+<span class="sourceLineNo">378</span><a name="line.378"></a>
+<span class="sourceLineNo">379</span> public MapMatcher(Map query, boolean ignoreCase) {<a name="line.379"></a>
+<span class="sourceLineNo">380</span> for (Map.Entry e : (Set<Map.Entry>)query.entrySet())<a name="line.380"></a>
+<span class="sourceLineNo">381</span> if (e.getKey() != null && e.getValue() != null)<a name="line.381"></a>
+<span class="sourceLineNo">382</span> entryMatchers.put(e.getKey().toString(), new ObjectMatcher(e.getValue().toString(), ignoreCase));<a name="line.382"></a>
<span class="sourceLineNo">383</span> }<a name="line.383"></a>
-<span class="sourceLineNo">384</span> }<a name="line.384"></a>
-<span class="sourceLineNo">385</span><a name="line.385"></a>
-<span class="sourceLineNo">386</span> /*<a name="line.386"></a>
-<span class="sourceLineNo">387</span> * Filters all but the specified view columns on all entries in the specified list.<a name="line.387"></a>
-<span class="sourceLineNo">388</span> */<a name="line.388"></a>
-<span class="sourceLineNo">389</span> private void doView(List list, List view) {<a name="line.389"></a>
-<span class="sourceLineNo">390</span><a name="line.390"></a>
-<span class="sourceLineNo">391</span> for (ListIterator i = list.listIterator(); i.hasNext();) {<a name="line.391"></a>
-<span class="sourceLineNo">392</span> Object o = i.next();<a name="line.392"></a>
-<span class="sourceLineNo">393</span> Map m = (Map)o;<a name="line.393"></a>
-<span class="sourceLineNo">394</span> doView(m, view);<a name="line.394"></a>
-<span class="sourceLineNo">395</span> }<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> * Creates a new Map with only the entries specified in the view list.<a name="line.399"></a>
-<span class="sourceLineNo">400</span> */<a name="line.400"></a>
-<span class="sourceLineNo">401</span> private void doView(Map m, List view) {<a name="line.401"></a>
-<span class="sourceLineNo">402</span> List<String> filterKeys = new LinkedList<String>();<a name="line.402"></a>
-<span class="sourceLineNo">403</span> for (Object v : view) {<a name="line.403"></a>
-<span class="sourceLineNo">404</span> if (v instanceof String) {<a name="line.404"></a>
-<span class="sourceLineNo">405</span> filterKeys.add(v.toString());<a name="line.405"></a>
-<span class="sourceLineNo">406</span> } else if (v instanceof ObjectMap) {<a name="line.406"></a>
-<span class="sourceLineNo">407</span> ObjectMap vm = (ObjectMap)v;<a name="line.407"></a>
-<span class="sourceLineNo">408</span> for (Map.Entry<String,Object> e : vm.entrySet()) {<a name="line.408"></a>
-<span class="sourceLineNo">409</span> String vmKey = e.getKey();<a name="line.409"></a>
-<span class="sourceLineNo">410</span> Object vmVal = e.getValue();<a name="line.410"></a>
-<span class="sourceLineNo">411</span> Object mv = m.get(vmKey);<a name="line.411"></a>
-<span class="sourceLineNo">412</span> filterKeys.add(vmKey);<a name="line.412"></a>
-<span class="sourceLineNo">413</span> if (vmVal instanceof List) {<a name="line.413"></a>
-<span class="sourceLineNo">414</span> List l = (List)vmVal;<a name="line.414"></a>
-<span class="sourceLineNo">415</span> if (mv instanceof List)<a name="line.415"></a>
-<span class="sourceLineNo">416</span> doView((List)mv, l);<a name="line.416"></a>
-<span class="sourceLineNo">417</span> else if (mv instanceof Map)<a name="line.417"></a>
-<span class="sourceLineNo">418</span> doView((Map)mv, l);<a name="line.418"></a>
-<span class="sourceLineNo">419</span> }<a name="line.419"></a>
-<span class="sourceLineNo">420</span> }<a name="line.420"></a>
-<span class="sourceLineNo">421</span> }<a name="line.421"></a>
+<span class="sourceLineNo">384</span><a name="line.384"></a>
+<span class="sourceLineNo">385</span> @Override /* IMatcher */<a name="line.385"></a>
+<span class="sourceLineNo">386</span> public boolean matches(Map m) {<a name="line.386"></a>
+<span class="sourceLineNo">387</span> if (m == null)<a name="line.387"></a>
+<span class="sourceLineNo">388</span> return false;<a name="line.388"></a>
+<span class="sourceLineNo">389</span> for (Map.Entry<String,IMatcher> e : entryMatchers.entrySet()) {<a name="line.389"></a>
+<span class="sourceLineNo">390</span> String key = e.getKey();<a name="line.390"></a>
+<span class="sourceLineNo">391</span> Object val = null;<a name="line.391"></a>
+<span class="sourceLineNo">392</span> if (m instanceof BeanMap) {<a name="line.392"></a>
+<span class="sourceLineNo">393</span> val = ((BeanMap)m).getRaw(key);<a name="line.393"></a>
+<span class="sourceLineNo">394</span> } else {<a name="line.394"></a>
+<span class="sourceLineNo">395</span> val = m.get(key);<a name="line.395"></a>
+<span class="sourceLineNo">396</span> }<a name="line.396"></a>
+<span class="sourceLineNo">397</span> if (! e.getValue().matches(val))<a name="line.397"></a>
+<span class="sourceLineNo">398</span> return false;<a name="line.398"></a>
+<span class="sourceLineNo">399</span> }<a name="line.399"></a>
+<span class="sourceLineNo">400</span> return true;<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> //====================================================================================================<a name="line.404"></a>
+<span class="sourceLineNo">405</span> // ObjectMatcher<a name="line.405"></a>
+<span class="sourceLineNo">406</span> //====================================================================================================<a name="line.406"></a>
+<span class="sourceLineNo">407</span> /*<a name="line.407"></a>
+<span class="sourceLineNo">408</span> * Matcher that uses the correct matcher based on object type.<a name="line.408"></a>
+<span class="sourceLineNo">409</span> * Used for objects when we can't determine the object type beforehand.<a name="line.409"></a>
+<span class="sourceLineNo">410</span> */<a name="line.410"></a>
+<span class="sourceLineNo">411</span> private class ObjectMatcher implements IMatcher<Object> {<a name="line.411"></a>
+<span class="sourceLineNo">412</span><a name="line.412"></a>
+<span class="sourceLineNo">413</span> String searchPattern;<a name="line.413"></a>
+<span class="sourceLineNo">414</span> boolean ignoreCase;<a name="line.414"></a>
+<span class="sourceLineNo">415</span> DateMatcher dateMatcher;<a name="line.415"></a>
+<span class="sourceLineNo">416</span> NumberMatcher numberMatcher;<a name="line.416"></a>
+<span class="sourceLineNo">417</span> StringMatcher stringMatcher;<a name="line.417"></a>
+<span class="sourceLineNo">418</span><a name="line.418"></a>
+<span class="sourceLineNo">419</span> ObjectMatcher(String searchPattern, boolean ignoreCase) {<a name="line.419"></a>
+<span class="sourceLineNo">420</span> this.searchPattern = searchPattern;<a name="line.420"></a>
+<span class="sourceLineNo">421</span> this.ignoreCase = ignoreCase;<a name="line.421"></a>
<span class="sourceLineNo">422</span> }<a name="line.422"></a>
-<span class="sourceLineNo">423</span> if (m instanceof DelegateMap)<a name="line.423"></a>
-<span class="sourceLineNo">424</span> ((DelegateMap)m).filterKeys(filterKeys);<a name="line.424"></a>
-<span class="sourceLineNo">425</span> else<a name="line.425"></a>
-<span class="sourceLineNo">426</span> ((DelegateBeanMap)m).filterKeys(filterKeys);<a name="line.426"></a>
-<span class="sourceLineNo">427</span> }<a name="line.427"></a>
-<span class="sourceLineNo">428</span><a name="line.428"></a>
-<span class="sourceLineNo">429</span><a name="line.429"></a>
-<span class="sourceLineNo">430</span> /*<a name="line.430"></a>
-<span class="sourceLineNo">431</span> * Returns the appropriate IMatcher for the specified class type.<a name="line.431"></a>
-<span class="sourceLineNo">432</span> */<a name="line.432"></a>
-<span class="sourceLineNo">433</span> private IMatcher getObjectMatcherForType(String queryString, boolean ignoreCase, ClassMeta cm) {<a name="line.433"></a>
-<span class="sourceLineNo">434</span> if (cm.isDate())<a name="line.434"></a>
-<span class="sourceLineNo">435</span> return new DateMatcher(queryString);<a name="line.435"></a>
-<span class="sourceLineNo">436</span> if (cm.isNumber())<a name="line.436"></a>
-<span class="sourceLineNo">437</span> return new NumberMatcher(queryString);<a name="line.437"></a>
-<span class="sourceLineNo">438</span> if (cm.isObject())<a name="line.438"></a>
-<span class="sourceLineNo">439</span> return new ObjectMatcher(queryString, ignoreCase);<a name="line.439"></a>
-<span class="sourceLineNo">440</span> return new StringMatcher(queryString, ignoreCase);<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> //====================================================================================================<a name="line.443"></a>
-<span class="sourceLineNo">444</span> // CollectionFilter<a name="line.444"></a>
-<span class="sourceLineNo">445</span> //====================================================================================================<a name="line.445"></a>
-<span class="sourceLineNo">446</span> private class CollectionFilter {<a name="line.446"></a>
-<span class="sourceLineNo">447</span> IMatcher entryMatcher;<a name="line.447"></a>
-<span class="sourceLineNo">448</span><a name="line.448"></a>
-<span class="sourceLineNo">449</span> public CollectionFilter(Map query, boolean ignoreCase) {<a name="line.449"></a>
-<span class="sourceLineNo">450</span> if (query != null && ! query.isEmpty())<a name="line.450"></a>
-<span class="sourceLineNo">451</span> entryMatcher = new MapMatcher(query, ignoreCase);<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> public void doQuery(List in) {<a name="line.454"></a>
-<span class="sourceLineNo">455</span> if (in == null || entryMatcher == null)<a name="line.455"></a>
-<span class="sourceLineNo">456</span> return;<a name="line.456"></a>
-<span class="sourceLineNo">457</span> for (Iterator i = in.iterator(); i.hasNext();) {<a name="line.457"></a>
-<span class="sourceLineNo">458</span> Object o = i.next();<a name="line.458"></a>
-<span class="sourceLineNo">459</span> if (! entryMatcher.matches(o))<a name="line.459"></a>
-<span class="sourceLineNo">460</span> i.remove();<a name="line.460"></a>
-<span class="sourceLineNo">461</span> }<a name="line.461"></a>
-<span class="sourceLineNo">462</span> }<a name="line.462"></a>
-<span class="sourceLineNo">463</span> }<a name="line.463"></a>
-<span class="sourceLineNo">464</span><a name="line.464"></a>
-<span class="sourceLineNo">465</span> //====================================================================================================<a name="line.465"></a>
-<span class="sourceLineNo">466</span> // IMatcher<a name="line.466"></a>
-<span class="sourceLineNo">467</span> //====================================================================================================<a name="line.467"></a>
-<span class="sourceLineNo">468</span> private interface IMatcher<E> {<a name="line.468"></a>
-<span class="sourceLineNo">469</span> public boolean matches(E o);<a name="line.469"></a>
-<span class="sourceLineNo">470</span> }<a name="line.470"></a>
-<span class="sourceLineNo">471</span><a name="line.471"></a>
-<span class="sourceLineNo">472</span> //====================================================================================================<a name="line.472"></a>
-<span class="sourceLineNo">473</span> // MapMatcher<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> * Matches on a Map only if all specified entry matchers match.<a name="line.476"></a>
-<span class="sourceLineNo">477</span> */<a name="line.477"></a>
-<span class="sourceLineNo">478</span> private class MapMatcher implements IMatcher<Map> {<a name="line.478"></a>
-<span class="sourceLineNo">479</span><a name="line.479"></a>
-<span class="sourceLineNo">480</span> Map<String,IMatcher> entryMatchers = new HashMap<String,IMatcher>();<a name="line.480"></a>
-<span class="sourceLineNo">481</span><a name="line.481"></a>
-<span class="sourceLineNo">482</span> public MapMatcher(Map query, boolean ignoreCase) {<a name="line.482"></a>
-<span class="sourceLineNo">483</span> for (Map.Entry e : (Set<Map.Entry>)query.entrySet()) {<a name="line.483"></a>
-<span class="sourceLineNo">484</span> String key = e.getKey().toString();<a name="line.484"></a>
-<span class="sourceLineNo">485</span> Object value = e.getValue();<a name="line.485"></a>
-<span class="sourceLineNo">486</span> IMatcher matcher = null;<a name="line.486"></a>
-<span class="sourceLineNo">487</span> if (value instanceof String)<a name="line.487"></a>
-<span class="sourceLineNo">488</span> matcher = getObjectMatcherForType((String)value, ignoreCase, session.object());<a name="line.488"></a>
-<span class="sourceLineNo">489</span> else if (value instanceof ObjectMap)<a name="line.489"></a>
-<span class="sourceLineNo">490</span> matcher = new MapMatcher((ObjectMap)value, ignoreCase);<a name="line.490"></a>
-<span class="sourceLineNo">491</span> else<a name="line.491"></a>
-<span class="sourceLineNo">492</span> throw new RuntimeException("Invalid value type: " + value);<a name="line.492"></a>
-<span class="sourceLineNo">493</span> entryMatchers.put(key, matcher);<a name="line.493"></a>
-<span class="sourceLineNo">494</span> }<a name="line.494"></a>
-<span class="sourceLineNo">495</span> }<a name="line.495"></a>
-<span class="sourceLineNo">496</span><a name="line.496"></a>
-<span class="sourceLineNo">497</span> @Override /* IMatcher */<a name="line.497"></a>
-<span class="sourceLineNo">498</span> public boolean matches(Map m) {<a name="line.498"></a>
-<span class="sourceLineNo">499</span> if (m == null)<a name="line.499"></a>
-<span class="sourceLineNo">500</span> return false;<a name="line.500"></a>
-<span class="sourceLineNo">501</span> for (Map.Entry<String,IMatcher> e : entryMatchers.entrySet()) {<a name="line.501"></a>
-<span class="sourceLineNo">502</span> String key = e.getKey();<a name="line.502"></a>
-<span class="sourceLineNo">503</span> Object val = m.get(key);<a name="line.503"></a>
-<span class="sourceLineNo">504</span> if (! e.getValue().matches(val))<a name="line.504"></a>
-<span class="sourceLineNo">505</span> return false;<a name="line.505"></a>
-<span class="sourceLineNo">506</span> }<a name="line.506"></a>
-<span class="sourceLineNo">507</span> return true;<a name="line.507"></a>
-<span class="sourceLineNo">508</span> }<a name="line.508"></a>
-<span class="sourceLineNo">509</span> }<a name="line.509"></a>
-<span class="sourceLineNo">510</span><a name="line.510"></a>
-<span class="sourceLineNo">511</span> //====================================================================================================<a name="line.511"></a>
-<span class="sourceLineNo">512</span> // ObjectMatcher<a name="line.512"></a>
-<span class="sourceLineNo">513</span> //====================================================================================================<a name="line.513"></a>
-<span class="sourceLineNo">514</span> /*<a name="line.514"></a>
-<span class="sourceLineNo">515</span> * Matcher that uses the correct matcher based on object type.<a name="line.515"></a>
-<span class="sourceLineNo">516</span> * Used for objects when we can't determine the object type beforehand.<a name="line.516"></a>
-<span class="sourceLineNo">517</span> */<a name="line.517"></a>
-<span class="sourceLineNo">518</span> private class ObjectMatcher implements IMatcher<Object> {<a name="line.518"></a>
-<span class="sourceLineNo">519</span><a name="line.519"></a>
-<span class="sourceLineNo">520</span> String searchPattern;<a name="line.520"></a>
-<span class="sourceLineNo">521</span> boolean ignoreCase;<a name="line.521"></a>
-<span class="sourceLineNo">522</span> DateMatcher dateMatcher;<a name="line.522"></a>
-<span class="sourceLineNo">523</span> NumberMatcher numberMatcher;<a name="line.523"></a>
-<span class="sourceLineNo">524</span> StringMatcher stringMatcher;<a name="line.524"></a>
-<span class="sourceLineNo">525</span><a name="line.525"></a>
-<span class="sourceLineNo">526</span> ObjectMatcher(String searchPattern, boolean ignoreCase) {<a name="line.526"></a>
-<span class="sourceLineNo">527</span> this.searchPattern = searchPattern;<a name="line.527"></a>
-<span class="sourceLineNo">528</span> this.ignoreCase = ignoreCase;<a name="line.528"></a>
-<span class="sourceLineNo">529</span> }<a name="line.529"></a>
+<span class="sourceLineNo">423</span><a name="line.423"></a>
+<span class="sourceLineNo">424</span> @Override /* IMatcher */<a name="line.424"></a>
+<span class="sourceLineNo">425</span> public boolean matches(Object o) {<a name="line.425"></a>
+<span class="sourceLineNo">426</span> if (o instanceof Number)<a name="line.426"></a>
+<span class="sourceLineNo">427</span> return getNumberMatcher().matches(o);<a name="line.427"></a>
+<span class="sourceLineNo">428</span> if (o instanceof Date || o instanceof Calendar)<a name="line.428"></a>
+<span class="sourceLineNo">429</span> return getDateMatcher().matches(o);<a name="line.429"></a>
+<span class="sourceLineNo">430</span> return getStringMatcher().matches(o);<a name="line.430"></a>
+<span class="sourceLineNo">431</span> }<a name="line.431"></a>
+<span class="sourceLineNo">432</span><a name="line.432"></a>
+<span class="sourceLineNo">433</span> private IMatcher getNumberMatcher() {<a name="line.433"></a>
+<span class="sourceLineNo">434</span> if (numberMatcher == null)<a name="line.434"></a>
+<span class="sourceLineNo">435</span> numberMatcher = new NumberMatcher(searchPattern);<a name="line.435"></a>
+<span class="sourceLineNo">436</span> return numberMatcher;<a name="line.436"></a>
+<span class="sourceLineNo">437</span> }<a name="line.437"></a>
+<span class="sourceLineNo">438</span><a name="line.438"></a>
+<span class="sourceLineNo">439</span> private IMatcher getStringMatcher() {<a name="line.439"></a>
+<span class="sourceLineNo">440</span> if (stringMatcher == null)<a name="line.440"></a>
+<span class="sourceLineNo">441</span> stringMatcher = new StringMatcher(searchPattern, ignor
<TRUNCATED>