juneau-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamesbog...@apache.org
Subject [16/51] [partial] incubator-juneau-website git commit: Update javadocs.
Date Sun, 27 Aug 2017 22:19:49 GMT
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/2ead32d5/content/site/apidocs/src-html/org/apache/juneau/uon/UonParserSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/uon/UonParserSession.html b/content/site/apidocs/src-html/org/apache/juneau/uon/UonParserSession.html
index def4de6..eb343d0 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/uon/UonParserSession.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/uon/UonParserSession.html
@@ -76,699 +76,705 @@
 <span class="sourceLineNo">068</span>    * The main difference is that characters are never decoded, and the {@link UonParserContext#UON_decodeChars}<a name="line.68"></a>
 <span class="sourceLineNo">069</span>    * property is always ignored.<a name="line.69"></a>
 <span class="sourceLineNo">070</span>    *<a name="line.70"></a>
-<span class="sourceLineNo">071</span>    * @param ctx The context to copy setting from.<a name="line.71"></a>
-<span class="sourceLineNo">072</span>    */<a name="line.72"></a>
-<span class="sourceLineNo">073</span>   protected UonParserSession(UonParserContext ctx) {<a name="line.73"></a>
-<span class="sourceLineNo">074</span>      super(ctx, null);<a name="line.74"></a>
-<span class="sourceLineNo">075</span>      decodeChars = false;<a name="line.75"></a>
-<span class="sourceLineNo">076</span>   }<a name="line.76"></a>
-<span class="sourceLineNo">077</span><a name="line.77"></a>
-<span class="sourceLineNo">078</span>   @Override /* ParserSession */<a name="line.78"></a>
-<span class="sourceLineNo">079</span>   protected &lt;T&gt; T doParse(ParserPipe pipe, ClassMeta&lt;T&gt; type) throws Exception {<a name="line.79"></a>
-<span class="sourceLineNo">080</span>      UonReader r = getUonReader(pipe, decodeChars);<a name="line.80"></a>
-<span class="sourceLineNo">081</span>      T o = parseAnything(type, r, getOuter(), true, null);<a name="line.81"></a>
-<span class="sourceLineNo">082</span>      validateEnd(r);<a name="line.82"></a>
-<span class="sourceLineNo">083</span>      return o;<a name="line.83"></a>
-<span class="sourceLineNo">084</span>   }<a name="line.84"></a>
-<span class="sourceLineNo">085</span><a name="line.85"></a>
-<span class="sourceLineNo">086</span>   @Override /* ReaderParserSession */<a name="line.86"></a>
-<span class="sourceLineNo">087</span>   protected &lt;K,V&gt; Map&lt;K,V&gt; doParseIntoMap(ParserPipe pipe, Map&lt;K,V&gt; m, Type keyType, Type valueType) throws Exception {<a name="line.87"></a>
-<span class="sourceLineNo">088</span>      UonReader r = getUonReader(pipe, decodeChars);<a name="line.88"></a>
-<span class="sourceLineNo">089</span>      m = parseIntoMap(r, m, (ClassMeta&lt;K&gt;)getClassMeta(keyType), (ClassMeta&lt;V&gt;)getClassMeta(valueType), null);<a name="line.89"></a>
-<span class="sourceLineNo">090</span>      validateEnd(r);<a name="line.90"></a>
-<span class="sourceLineNo">091</span>      return m;<a name="line.91"></a>
-<span class="sourceLineNo">092</span>   }<a name="line.92"></a>
-<span class="sourceLineNo">093</span><a name="line.93"></a>
-<span class="sourceLineNo">094</span>   @Override /* ReaderParserSession */<a name="line.94"></a>
-<span class="sourceLineNo">095</span>   protected &lt;E&gt; Collection&lt;E&gt; doParseIntoCollection(ParserPipe pipe, Collection&lt;E&gt; c, Type elementType) throws Exception {<a name="line.95"></a>
-<span class="sourceLineNo">096</span>      UonReader r = getUonReader(pipe, decodeChars);<a name="line.96"></a>
-<span class="sourceLineNo">097</span>      c = parseIntoCollection(r, c, (ClassMeta&lt;E&gt;)getClassMeta(elementType), false, null);<a name="line.97"></a>
-<span class="sourceLineNo">098</span>      validateEnd(r);<a name="line.98"></a>
-<span class="sourceLineNo">099</span>      return c;<a name="line.99"></a>
-<span class="sourceLineNo">100</span>   }<a name="line.100"></a>
-<span class="sourceLineNo">101</span><a name="line.101"></a>
-<span class="sourceLineNo">102</span>   /**<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    * Workhorse method.<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    *<a name="line.104"></a>
-<span class="sourceLineNo">105</span>    * @param eType The class type being parsed, or &lt;jk&gt;null&lt;/jk&gt; if unknown.<a name="line.105"></a>
-<span class="sourceLineNo">106</span>    * @param r The reader being parsed.<a name="line.106"></a>
-<span class="sourceLineNo">107</span>    * @param outer The outer object (for constructing nested inner classes).<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    * @param isUrlParamValue<a name="line.108"></a>
-<span class="sourceLineNo">109</span>    *    If &lt;jk&gt;true&lt;/jk&gt;, then we're parsing a top-level URL-encoded value which is treated a bit different than the<a name="line.109"></a>
-<span class="sourceLineNo">110</span>    *    default case.<a name="line.110"></a>
-<span class="sourceLineNo">111</span>    * @param pMeta The current bean property being parsed.<a name="line.111"></a>
-<span class="sourceLineNo">112</span>    * @return The parsed object.<a name="line.112"></a>
-<span class="sourceLineNo">113</span>    * @throws Exception<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    */<a name="line.114"></a>
-<span class="sourceLineNo">115</span>   public &lt;T&gt; T parseAnything(ClassMeta&lt;T&gt; eType, UonReader r, Object outer, boolean isUrlParamValue, BeanPropertyMeta pMeta) throws Exception {<a name="line.115"></a>
-<span class="sourceLineNo">116</span><a name="line.116"></a>
-<span class="sourceLineNo">117</span>      if (eType == null)<a name="line.117"></a>
-<span class="sourceLineNo">118</span>         eType = (ClassMeta&lt;T&gt;)object();<a name="line.118"></a>
-<span class="sourceLineNo">119</span>      PojoSwap&lt;T,Object&gt; transform = (PojoSwap&lt;T,Object&gt;)eType.getPojoSwap();<a name="line.119"></a>
-<span class="sourceLineNo">120</span>      ClassMeta&lt;?&gt; sType = eType.getSerializedClassMeta();<a name="line.120"></a>
-<span class="sourceLineNo">121</span><a name="line.121"></a>
-<span class="sourceLineNo">122</span>      Object o = null;<a name="line.122"></a>
-<span class="sourceLineNo">123</span><a name="line.123"></a>
-<span class="sourceLineNo">124</span>      int c = r.peekSkipWs();<a name="line.124"></a>
-<span class="sourceLineNo">125</span><a name="line.125"></a>
-<span class="sourceLineNo">126</span>      if (c == -1 || c == AMP) {<a name="line.126"></a>
-<span class="sourceLineNo">127</span>         // If parameter is blank and it's an array or collection, return an empty list.<a name="line.127"></a>
-<span class="sourceLineNo">128</span>         if (sType.isCollectionOrArray())<a name="line.128"></a>
-<span class="sourceLineNo">129</span>            o = sType.newInstance();<a name="line.129"></a>
-<span class="sourceLineNo">130</span>         else if (sType.isString() || sType.isObject())<a name="line.130"></a>
-<span class="sourceLineNo">131</span>            o = "";<a name="line.131"></a>
-<span class="sourceLineNo">132</span>         else if (sType.isPrimitive())<a name="line.132"></a>
-<span class="sourceLineNo">133</span>            o = sType.getPrimitiveDefault();<a name="line.133"></a>
-<span class="sourceLineNo">134</span>         // Otherwise, leave null.<a name="line.134"></a>
-<span class="sourceLineNo">135</span>      } else if (sType.isVoid()) {<a name="line.135"></a>
-<span class="sourceLineNo">136</span>         String s = parseString(r, isUrlParamValue);<a name="line.136"></a>
-<span class="sourceLineNo">137</span>         if (s != null)<a name="line.137"></a>
-<span class="sourceLineNo">138</span>            throw new ParseException(loc(r), "Expected ''null'' for void value, but was ''{0}''.", s);<a name="line.138"></a>
-<span class="sourceLineNo">139</span>      } else if (sType.isObject()) {<a name="line.139"></a>
-<span class="sourceLineNo">140</span>         if (c == '(') {<a name="line.140"></a>
-<span class="sourceLineNo">141</span>            ObjectMap m = new ObjectMap(this);<a name="line.141"></a>
-<span class="sourceLineNo">142</span>            parseIntoMap(r, m, string(), object(), pMeta);<a name="line.142"></a>
-<span class="sourceLineNo">143</span>            o = cast(m, pMeta, eType);<a name="line.143"></a>
-<span class="sourceLineNo">144</span>         } else if (c == '@') {<a name="line.144"></a>
-<span class="sourceLineNo">145</span>            Collection l = new ObjectList(this);<a name="line.145"></a>
-<span class="sourceLineNo">146</span>            o = parseIntoCollection(r, l, sType, isUrlParamValue, pMeta);<a name="line.146"></a>
-<span class="sourceLineNo">147</span>         } else {<a name="line.147"></a>
-<span class="sourceLineNo">148</span>            String s = parseString(r, isUrlParamValue);<a name="line.148"></a>
-<span class="sourceLineNo">149</span>            if (c != '\'') {<a name="line.149"></a>
-<span class="sourceLineNo">150</span>               if ("true".equals(s) || "false".equals(s))<a name="line.150"></a>
-<span class="sourceLineNo">151</span>                  o = Boolean.valueOf(s);<a name="line.151"></a>
-<span class="sourceLineNo">152</span>               else if (! "null".equals(s)) {<a name="line.152"></a>
-<span class="sourceLineNo">153</span>                  if (isNumeric(s))<a name="line.153"></a>
-<span class="sourceLineNo">154</span>                     o = StringUtils.parseNumber(s, Number.class);<a name="line.154"></a>
-<span class="sourceLineNo">155</span>                  else<a name="line.155"></a>
-<span class="sourceLineNo">156</span>                     o = s;<a name="line.156"></a>
-<span class="sourceLineNo">157</span>               }<a name="line.157"></a>
-<span class="sourceLineNo">158</span>            } else {<a name="line.158"></a>
-<span class="sourceLineNo">159</span>               o = s;<a name="line.159"></a>
-<span class="sourceLineNo">160</span>            }<a name="line.160"></a>
-<span class="sourceLineNo">161</span>         }<a name="line.161"></a>
-<span class="sourceLineNo">162</span>      } else if (sType.isBoolean()) {<a name="line.162"></a>
-<span class="sourceLineNo">163</span>         o = parseBoolean(r);<a name="line.163"></a>
-<span class="sourceLineNo">164</span>      } else if (sType.isCharSequence()) {<a name="line.164"></a>
-<span class="sourceLineNo">165</span>         o = parseString(r, isUrlParamValue);<a name="line.165"></a>
-<span class="sourceLineNo">166</span>      } else if (sType.isChar()) {<a name="line.166"></a>
-<span class="sourceLineNo">167</span>         String s = parseString(r, isUrlParamValue);<a name="line.167"></a>
-<span class="sourceLineNo">168</span>         o = s == null ? null : s.charAt(0);<a name="line.168"></a>
-<span class="sourceLineNo">169</span>      } else if (sType.isNumber()) {<a name="line.169"></a>
-<span class="sourceLineNo">170</span>         o = parseNumber(r, (Class&lt;? extends Number&gt;)sType.getInnerClass());<a name="line.170"></a>
-<span class="sourceLineNo">171</span>      } else if (sType.isMap()) {<a name="line.171"></a>
-<span class="sourceLineNo">172</span>         Map m = (sType.canCreateNewInstance(outer) ? (Map)sType.newInstance(outer) : new ObjectMap(this));<a name="line.172"></a>
-<span class="sourceLineNo">173</span>         o = parseIntoMap(r, m, sType.getKeyType(), sType.getValueType(), pMeta);<a name="line.173"></a>
-<span class="sourceLineNo">174</span>      } else if (sType.isCollection()) {<a name="line.174"></a>
-<span class="sourceLineNo">175</span>         if (c == '(') {<a name="line.175"></a>
-<span class="sourceLineNo">176</span>            ObjectMap m = new ObjectMap(this);<a name="line.176"></a>
-<span class="sourceLineNo">177</span>            parseIntoMap(r, m, string(), object(), pMeta);<a name="line.177"></a>
-<span class="sourceLineNo">178</span>            // Handle case where it's a collection, but serialized as a map with a _type or _value key.<a name="line.178"></a>
-<span class="sourceLineNo">179</span>            if (m.containsKey(getBeanTypePropertyName(sType)))<a name="line.179"></a>
-<span class="sourceLineNo">180</span>               o = cast(m, pMeta, eType);<a name="line.180"></a>
-<span class="sourceLineNo">181</span>            // Handle case where it's a collection, but only a single value was specified.<a name="line.181"></a>
-<span class="sourceLineNo">182</span>            else {<a name="line.182"></a>
-<span class="sourceLineNo">183</span>               Collection l = (<a name="line.183"></a>
-<span class="sourceLineNo">184</span>                  sType.canCreateNewInstance(outer)<a name="line.184"></a>
-<span class="sourceLineNo">185</span>                  ? (Collection)sType.newInstance(outer)<a name="line.185"></a>
-<span class="sourceLineNo">186</span>                  : new ObjectList(this)<a name="line.186"></a>
-<span class="sourceLineNo">187</span>               );<a name="line.187"></a>
-<span class="sourceLineNo">188</span>               l.add(m.cast(sType.getElementType()));<a name="line.188"></a>
-<span class="sourceLineNo">189</span>               o = l;<a name="line.189"></a>
-<span class="sourceLineNo">190</span>            }<a name="line.190"></a>
-<span class="sourceLineNo">191</span>         } else {<a name="line.191"></a>
-<span class="sourceLineNo">192</span>            Collection l = (<a name="line.192"></a>
-<span class="sourceLineNo">193</span>               sType.canCreateNewInstance(outer)<a name="line.193"></a>
-<span class="sourceLineNo">194</span>               ? (Collection)sType.newInstance(outer)<a name="line.194"></a>
-<span class="sourceLineNo">195</span>               : new ObjectList(this)<a name="line.195"></a>
-<span class="sourceLineNo">196</span>            );<a name="line.196"></a>
-<span class="sourceLineNo">197</span>            o = parseIntoCollection(r, l, sType, isUrlParamValue, pMeta);<a name="line.197"></a>
-<span class="sourceLineNo">198</span>         }<a name="line.198"></a>
-<span class="sourceLineNo">199</span>      } else if (sType.canCreateNewBean(outer)) {<a name="line.199"></a>
-<span class="sourceLineNo">200</span>         BeanMap m = newBeanMap(outer, sType.getInnerClass());<a name="line.200"></a>
-<span class="sourceLineNo">201</span>         m = parseIntoBeanMap(r, m);<a name="line.201"></a>
-<span class="sourceLineNo">202</span>         o = m == null ? null : m.getBean();<a name="line.202"></a>
-<span class="sourceLineNo">203</span>      } else if (sType.canCreateNewInstanceFromString(outer)) {<a name="line.203"></a>
-<span class="sourceLineNo">204</span>         String s = parseString(r, isUrlParamValue);<a name="line.204"></a>
-<span class="sourceLineNo">205</span>         if (s != null)<a name="line.205"></a>
-<span class="sourceLineNo">206</span>            o = sType.newInstanceFromString(outer, s);<a name="line.206"></a>
-<span class="sourceLineNo">207</span>      } else if (sType.canCreateNewInstanceFromNumber(outer)) {<a name="line.207"></a>
-<span class="sourceLineNo">208</span>         o = sType.newInstanceFromNumber(this, outer, parseNumber(r, sType.getNewInstanceFromNumberClass()));<a name="line.208"></a>
-<span class="sourceLineNo">209</span>      } else if (sType.isArray() || sType.isArgs()) {<a name="line.209"></a>
-<span class="sourceLineNo">210</span>         if (c == '(') {<a name="line.210"></a>
-<span class="sourceLineNo">211</span>            ObjectMap m = new ObjectMap(this);<a name="line.211"></a>
-<span class="sourceLineNo">212</span>            parseIntoMap(r, m, string(), object(), pMeta);<a name="line.212"></a>
-<span class="sourceLineNo">213</span>            // Handle case where it's an array, but serialized as a map with a _type or _value key.<a name="line.213"></a>
-<span class="sourceLineNo">214</span>            if (m.containsKey(getBeanTypePropertyName(sType)))<a name="line.214"></a>
-<span class="sourceLineNo">215</span>               o = cast(m, pMeta, eType);<a name="line.215"></a>
-<span class="sourceLineNo">216</span>            // Handle case where it's an array, but only a single value was specified.<a name="line.216"></a>
-<span class="sourceLineNo">217</span>            else {<a name="line.217"></a>
-<span class="sourceLineNo">218</span>               ArrayList l = new ArrayList(1);<a name="line.218"></a>
-<span class="sourceLineNo">219</span>               l.add(m.cast(sType.getElementType()));<a name="line.219"></a>
-<span class="sourceLineNo">220</span>               o = toArray(sType, l);<a name="line.220"></a>
-<span class="sourceLineNo">221</span>            }<a name="line.221"></a>
-<span class="sourceLineNo">222</span>         } else {<a name="line.222"></a>
-<span class="sourceLineNo">223</span>            ArrayList l = (ArrayList)parseIntoCollection(r, new ArrayList(), sType, isUrlParamValue, pMeta);<a name="line.223"></a>
-<span class="sourceLineNo">224</span>            o = toArray(sType, l);<a name="line.224"></a>
-<span class="sourceLineNo">225</span>         }<a name="line.225"></a>
-<span class="sourceLineNo">226</span>      } else if (c == '(') {<a name="line.226"></a>
-<span class="sourceLineNo">227</span>         // It could be a non-bean with _type attribute.<a name="line.227"></a>
-<span class="sourceLineNo">228</span>         ObjectMap m = new ObjectMap(this);<a name="line.228"></a>
-<span class="sourceLineNo">229</span>         parseIntoMap(r, m, string(), object(), pMeta);<a name="line.229"></a>
-<span class="sourceLineNo">230</span>         if (m.containsKey(getBeanTypePropertyName(sType)))<a name="line.230"></a>
-<span class="sourceLineNo">231</span>            o = cast(m, pMeta, eType);<a name="line.231"></a>
-<span class="sourceLineNo">232</span>         else<a name="line.232"></a>
-<span class="sourceLineNo">233</span>            throw new ParseException(loc(r), "Class ''{0}'' could not be instantiated.  Reason: ''{1}''",<a name="line.233"></a>
-<span class="sourceLineNo">234</span>               sType.getInnerClass().getName(), sType.getNotABeanReason());<a name="line.234"></a>
-<span class="sourceLineNo">235</span>      } else if (c == 'n') {<a name="line.235"></a>
-<span class="sourceLineNo">236</span>         r.read();<a name="line.236"></a>
-<span class="sourceLineNo">237</span>         parseNull(r);<a name="line.237"></a>
-<span class="sourceLineNo">238</span>      } else {<a name="line.238"></a>
-<span class="sourceLineNo">239</span>         throw new ParseException(loc(r), "Class ''{0}'' could not be instantiated.  Reason: ''{1}''",<a name="line.239"></a>
-<span class="sourceLineNo">240</span>            sType.getInnerClass().getName(), sType.getNotABeanReason());<a name="line.240"></a>
-<span class="sourceLineNo">241</span>      }<a name="line.241"></a>
-<span class="sourceLineNo">242</span><a name="line.242"></a>
-<span class="sourceLineNo">243</span>      if (o == null &amp;&amp; sType.isPrimitive())<a name="line.243"></a>
-<span class="sourceLineNo">244</span>         o = sType.getPrimitiveDefault();<a name="line.244"></a>
-<span class="sourceLineNo">245</span>      if (transform != null &amp;&amp; o != null)<a name="line.245"></a>
-<span class="sourceLineNo">246</span>         o = transform.unswap(this, o, eType);<a name="line.246"></a>
-<span class="sourceLineNo">247</span><a name="line.247"></a>
-<span class="sourceLineNo">248</span>      if (outer != null)<a name="line.248"></a>
-<span class="sourceLineNo">249</span>         setParent(eType, o, outer);<a name="line.249"></a>
-<span class="sourceLineNo">250</span><a name="line.250"></a>
-<span class="sourceLineNo">251</span>      return (T)o;<a name="line.251"></a>
-<span class="sourceLineNo">252</span>   }<a name="line.252"></a>
+<span class="sourceLineNo">071</span>    * @param ctx<a name="line.71"></a>
+<span class="sourceLineNo">072</span>    *    The context creating this session object.<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    *    The context contains all the configuration settings for this object.<a name="line.73"></a>
+<span class="sourceLineNo">074</span>    * @param args<a name="line.74"></a>
+<span class="sourceLineNo">075</span>    *    Runtime session arguments.<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    * @param decodeChars<a name="line.76"></a>
+<span class="sourceLineNo">077</span>    *    Whether to decode characters.<a name="line.77"></a>
+<span class="sourceLineNo">078</span>    */<a name="line.78"></a>
+<span class="sourceLineNo">079</span>   protected UonParserSession(UonParserContext ctx, ParserSessionArgs args, boolean decodeChars) {<a name="line.79"></a>
+<span class="sourceLineNo">080</span>      super(ctx, args);<a name="line.80"></a>
+<span class="sourceLineNo">081</span>      this.decodeChars = decodeChars;<a name="line.81"></a>
+<span class="sourceLineNo">082</span>   }<a name="line.82"></a>
+<span class="sourceLineNo">083</span><a name="line.83"></a>
+<span class="sourceLineNo">084</span>   @Override /* ParserSession */<a name="line.84"></a>
+<span class="sourceLineNo">085</span>   protected &lt;T&gt; T doParse(ParserPipe pipe, ClassMeta&lt;T&gt; type) throws Exception {<a name="line.85"></a>
+<span class="sourceLineNo">086</span>      UonReader r = getUonReader(pipe, decodeChars);<a name="line.86"></a>
+<span class="sourceLineNo">087</span>      T o = parseAnything(type, r, getOuter(), true, null);<a name="line.87"></a>
+<span class="sourceLineNo">088</span>      validateEnd(r);<a name="line.88"></a>
+<span class="sourceLineNo">089</span>      return o;<a name="line.89"></a>
+<span class="sourceLineNo">090</span>   }<a name="line.90"></a>
+<span class="sourceLineNo">091</span><a name="line.91"></a>
+<span class="sourceLineNo">092</span>   @Override /* ReaderParserSession */<a name="line.92"></a>
+<span class="sourceLineNo">093</span>   protected &lt;K,V&gt; Map&lt;K,V&gt; doParseIntoMap(ParserPipe pipe, Map&lt;K,V&gt; m, Type keyType, Type valueType) throws Exception {<a name="line.93"></a>
+<span class="sourceLineNo">094</span>      UonReader r = getUonReader(pipe, decodeChars);<a name="line.94"></a>
+<span class="sourceLineNo">095</span>      m = parseIntoMap(r, m, (ClassMeta&lt;K&gt;)getClassMeta(keyType), (ClassMeta&lt;V&gt;)getClassMeta(valueType), null);<a name="line.95"></a>
+<span class="sourceLineNo">096</span>      validateEnd(r);<a name="line.96"></a>
+<span class="sourceLineNo">097</span>      return m;<a name="line.97"></a>
+<span class="sourceLineNo">098</span>   }<a name="line.98"></a>
+<span class="sourceLineNo">099</span><a name="line.99"></a>
+<span class="sourceLineNo">100</span>   @Override /* ReaderParserSession */<a name="line.100"></a>
+<span class="sourceLineNo">101</span>   protected &lt;E&gt; Collection&lt;E&gt; doParseIntoCollection(ParserPipe pipe, Collection&lt;E&gt; c, Type elementType) throws Exception {<a name="line.101"></a>
+<span class="sourceLineNo">102</span>      UonReader r = getUonReader(pipe, decodeChars);<a name="line.102"></a>
+<span class="sourceLineNo">103</span>      c = parseIntoCollection(r, c, (ClassMeta&lt;E&gt;)getClassMeta(elementType), false, null);<a name="line.103"></a>
+<span class="sourceLineNo">104</span>      validateEnd(r);<a name="line.104"></a>
+<span class="sourceLineNo">105</span>      return c;<a name="line.105"></a>
+<span class="sourceLineNo">106</span>   }<a name="line.106"></a>
+<span class="sourceLineNo">107</span><a name="line.107"></a>
+<span class="sourceLineNo">108</span>   /**<a name="line.108"></a>
+<span class="sourceLineNo">109</span>    * Workhorse method.<a name="line.109"></a>
+<span class="sourceLineNo">110</span>    *<a name="line.110"></a>
+<span class="sourceLineNo">111</span>    * @param eType The class type being parsed, or &lt;jk&gt;null&lt;/jk&gt; if unknown.<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    * @param r The reader being parsed.<a name="line.112"></a>
+<span class="sourceLineNo">113</span>    * @param outer The outer object (for constructing nested inner classes).<a name="line.113"></a>
+<span class="sourceLineNo">114</span>    * @param isUrlParamValue<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    *    If &lt;jk&gt;true&lt;/jk&gt;, then we're parsing a top-level URL-encoded value which is treated a bit different than the<a name="line.115"></a>
+<span class="sourceLineNo">116</span>    *    default case.<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    * @param pMeta The current bean property being parsed.<a name="line.117"></a>
+<span class="sourceLineNo">118</span>    * @return The parsed object.<a name="line.118"></a>
+<span class="sourceLineNo">119</span>    * @throws Exception<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    */<a name="line.120"></a>
+<span class="sourceLineNo">121</span>   public &lt;T&gt; T parseAnything(ClassMeta&lt;T&gt; eType, UonReader r, Object outer, boolean isUrlParamValue, BeanPropertyMeta pMeta) throws Exception {<a name="line.121"></a>
+<span class="sourceLineNo">122</span><a name="line.122"></a>
+<span class="sourceLineNo">123</span>      if (eType == null)<a name="line.123"></a>
+<span class="sourceLineNo">124</span>         eType = (ClassMeta&lt;T&gt;)object();<a name="line.124"></a>
+<span class="sourceLineNo">125</span>      PojoSwap&lt;T,Object&gt; transform = (PojoSwap&lt;T,Object&gt;)eType.getPojoSwap();<a name="line.125"></a>
+<span class="sourceLineNo">126</span>      ClassMeta&lt;?&gt; sType = eType.getSerializedClassMeta();<a name="line.126"></a>
+<span class="sourceLineNo">127</span><a name="line.127"></a>
+<span class="sourceLineNo">128</span>      Object o = null;<a name="line.128"></a>
+<span class="sourceLineNo">129</span><a name="line.129"></a>
+<span class="sourceLineNo">130</span>      int c = r.peekSkipWs();<a name="line.130"></a>
+<span class="sourceLineNo">131</span><a name="line.131"></a>
+<span class="sourceLineNo">132</span>      if (c == -1 || c == AMP) {<a name="line.132"></a>
+<span class="sourceLineNo">133</span>         // If parameter is blank and it's an array or collection, return an empty list.<a name="line.133"></a>
+<span class="sourceLineNo">134</span>         if (sType.isCollectionOrArray())<a name="line.134"></a>
+<span class="sourceLineNo">135</span>            o = sType.newInstance();<a name="line.135"></a>
+<span class="sourceLineNo">136</span>         else if (sType.isString() || sType.isObject())<a name="line.136"></a>
+<span class="sourceLineNo">137</span>            o = "";<a name="line.137"></a>
+<span class="sourceLineNo">138</span>         else if (sType.isPrimitive())<a name="line.138"></a>
+<span class="sourceLineNo">139</span>            o = sType.getPrimitiveDefault();<a name="line.139"></a>
+<span class="sourceLineNo">140</span>         // Otherwise, leave null.<a name="line.140"></a>
+<span class="sourceLineNo">141</span>      } else if (sType.isVoid()) {<a name="line.141"></a>
+<span class="sourceLineNo">142</span>         String s = parseString(r, isUrlParamValue);<a name="line.142"></a>
+<span class="sourceLineNo">143</span>         if (s != null)<a name="line.143"></a>
+<span class="sourceLineNo">144</span>            throw new ParseException(loc(r), "Expected ''null'' for void value, but was ''{0}''.", s);<a name="line.144"></a>
+<span class="sourceLineNo">145</span>      } else if (sType.isObject()) {<a name="line.145"></a>
+<span class="sourceLineNo">146</span>         if (c == '(') {<a name="line.146"></a>
+<span class="sourceLineNo">147</span>            ObjectMap m = new ObjectMap(this);<a name="line.147"></a>
+<span class="sourceLineNo">148</span>            parseIntoMap(r, m, string(), object(), pMeta);<a name="line.148"></a>
+<span class="sourceLineNo">149</span>            o = cast(m, pMeta, eType);<a name="line.149"></a>
+<span class="sourceLineNo">150</span>         } else if (c == '@') {<a name="line.150"></a>
+<span class="sourceLineNo">151</span>            Collection l = new ObjectList(this);<a name="line.151"></a>
+<span class="sourceLineNo">152</span>            o = parseIntoCollection(r, l, sType, isUrlParamValue, pMeta);<a name="line.152"></a>
+<span class="sourceLineNo">153</span>         } else {<a name="line.153"></a>
+<span class="sourceLineNo">154</span>            String s = parseString(r, isUrlParamValue);<a name="line.154"></a>
+<span class="sourceLineNo">155</span>            if (c != '\'') {<a name="line.155"></a>
+<span class="sourceLineNo">156</span>               if ("true".equals(s) || "false".equals(s))<a name="line.156"></a>
+<span class="sourceLineNo">157</span>                  o = Boolean.valueOf(s);<a name="line.157"></a>
+<span class="sourceLineNo">158</span>               else if (! "null".equals(s)) {<a name="line.158"></a>
+<span class="sourceLineNo">159</span>                  if (isNumeric(s))<a name="line.159"></a>
+<span class="sourceLineNo">160</span>                     o = StringUtils.parseNumber(s, Number.class);<a name="line.160"></a>
+<span class="sourceLineNo">161</span>                  else<a name="line.161"></a>
+<span class="sourceLineNo">162</span>                     o = s;<a name="line.162"></a>
+<span class="sourceLineNo">163</span>               }<a name="line.163"></a>
+<span class="sourceLineNo">164</span>            } else {<a name="line.164"></a>
+<span class="sourceLineNo">165</span>               o = s;<a name="line.165"></a>
+<span class="sourceLineNo">166</span>            }<a name="line.166"></a>
+<span class="sourceLineNo">167</span>         }<a name="line.167"></a>
+<span class="sourceLineNo">168</span>      } else if (sType.isBoolean()) {<a name="line.168"></a>
+<span class="sourceLineNo">169</span>         o = parseBoolean(r);<a name="line.169"></a>
+<span class="sourceLineNo">170</span>      } else if (sType.isCharSequence()) {<a name="line.170"></a>
+<span class="sourceLineNo">171</span>         o = parseString(r, isUrlParamValue);<a name="line.171"></a>
+<span class="sourceLineNo">172</span>      } else if (sType.isChar()) {<a name="line.172"></a>
+<span class="sourceLineNo">173</span>         String s = parseString(r, isUrlParamValue);<a name="line.173"></a>
+<span class="sourceLineNo">174</span>         o = s == null ? null : s.charAt(0);<a name="line.174"></a>
+<span class="sourceLineNo">175</span>      } else if (sType.isNumber()) {<a name="line.175"></a>
+<span class="sourceLineNo">176</span>         o = parseNumber(r, (Class&lt;? extends Number&gt;)sType.getInnerClass());<a name="line.176"></a>
+<span class="sourceLineNo">177</span>      } else if (sType.isMap()) {<a name="line.177"></a>
+<span class="sourceLineNo">178</span>         Map m = (sType.canCreateNewInstance(outer) ? (Map)sType.newInstance(outer) : new ObjectMap(this));<a name="line.178"></a>
+<span class="sourceLineNo">179</span>         o = parseIntoMap(r, m, sType.getKeyType(), sType.getValueType(), pMeta);<a name="line.179"></a>
+<span class="sourceLineNo">180</span>      } else if (sType.isCollection()) {<a name="line.180"></a>
+<span class="sourceLineNo">181</span>         if (c == '(') {<a name="line.181"></a>
+<span class="sourceLineNo">182</span>            ObjectMap m = new ObjectMap(this);<a name="line.182"></a>
+<span class="sourceLineNo">183</span>            parseIntoMap(r, m, string(), object(), pMeta);<a name="line.183"></a>
+<span class="sourceLineNo">184</span>            // Handle case where it's a collection, but serialized as a map with a _type or _value key.<a name="line.184"></a>
+<span class="sourceLineNo">185</span>            if (m.containsKey(getBeanTypePropertyName(sType)))<a name="line.185"></a>
+<span class="sourceLineNo">186</span>               o = cast(m, pMeta, eType);<a name="line.186"></a>
+<span class="sourceLineNo">187</span>            // Handle case where it's a collection, but only a single value was specified.<a name="line.187"></a>
+<span class="sourceLineNo">188</span>            else {<a name="line.188"></a>
+<span class="sourceLineNo">189</span>               Collection l = (<a name="line.189"></a>
+<span class="sourceLineNo">190</span>                  sType.canCreateNewInstance(outer)<a name="line.190"></a>
+<span class="sourceLineNo">191</span>                  ? (Collection)sType.newInstance(outer)<a name="line.191"></a>
+<span class="sourceLineNo">192</span>                  : new ObjectList(this)<a name="line.192"></a>
+<span class="sourceLineNo">193</span>               );<a name="line.193"></a>
+<span class="sourceLineNo">194</span>               l.add(m.cast(sType.getElementType()));<a name="line.194"></a>
+<span class="sourceLineNo">195</span>               o = l;<a name="line.195"></a>
+<span class="sourceLineNo">196</span>            }<a name="line.196"></a>
+<span class="sourceLineNo">197</span>         } else {<a name="line.197"></a>
+<span class="sourceLineNo">198</span>            Collection l = (<a name="line.198"></a>
+<span class="sourceLineNo">199</span>               sType.canCreateNewInstance(outer)<a name="line.199"></a>
+<span class="sourceLineNo">200</span>               ? (Collection)sType.newInstance(outer)<a name="line.200"></a>
+<span class="sourceLineNo">201</span>               : new ObjectList(this)<a name="line.201"></a>
+<span class="sourceLineNo">202</span>            );<a name="line.202"></a>
+<span class="sourceLineNo">203</span>            o = parseIntoCollection(r, l, sType, isUrlParamValue, pMeta);<a name="line.203"></a>
+<span class="sourceLineNo">204</span>         }<a name="line.204"></a>
+<span class="sourceLineNo">205</span>      } else if (sType.canCreateNewBean(outer)) {<a name="line.205"></a>
+<span class="sourceLineNo">206</span>         BeanMap m = newBeanMap(outer, sType.getInnerClass());<a name="line.206"></a>
+<span class="sourceLineNo">207</span>         m = parseIntoBeanMap(r, m);<a name="line.207"></a>
+<span class="sourceLineNo">208</span>         o = m == null ? null : m.getBean();<a name="line.208"></a>
+<span class="sourceLineNo">209</span>      } else if (sType.canCreateNewInstanceFromString(outer)) {<a name="line.209"></a>
+<span class="sourceLineNo">210</span>         String s = parseString(r, isUrlParamValue);<a name="line.210"></a>
+<span class="sourceLineNo">211</span>         if (s != null)<a name="line.211"></a>
+<span class="sourceLineNo">212</span>            o = sType.newInstanceFromString(outer, s);<a name="line.212"></a>
+<span class="sourceLineNo">213</span>      } else if (sType.canCreateNewInstanceFromNumber(outer)) {<a name="line.213"></a>
+<span class="sourceLineNo">214</span>         o = sType.newInstanceFromNumber(this, outer, parseNumber(r, sType.getNewInstanceFromNumberClass()));<a name="line.214"></a>
+<span class="sourceLineNo">215</span>      } else if (sType.isArray() || sType.isArgs()) {<a name="line.215"></a>
+<span class="sourceLineNo">216</span>         if (c == '(') {<a name="line.216"></a>
+<span class="sourceLineNo">217</span>            ObjectMap m = new ObjectMap(this);<a name="line.217"></a>
+<span class="sourceLineNo">218</span>            parseIntoMap(r, m, string(), object(), pMeta);<a name="line.218"></a>
+<span class="sourceLineNo">219</span>            // Handle case where it's an array, but serialized as a map with a _type or _value key.<a name="line.219"></a>
+<span class="sourceLineNo">220</span>            if (m.containsKey(getBeanTypePropertyName(sType)))<a name="line.220"></a>
+<span class="sourceLineNo">221</span>               o = cast(m, pMeta, eType);<a name="line.221"></a>
+<span class="sourceLineNo">222</span>            // Handle case where it's an array, but only a single value was specified.<a name="line.222"></a>
+<span class="sourceLineNo">223</span>            else {<a name="line.223"></a>
+<span class="sourceLineNo">224</span>               ArrayList l = new ArrayList(1);<a name="line.224"></a>
+<span class="sourceLineNo">225</span>               l.add(m.cast(sType.getElementType()));<a name="line.225"></a>
+<span class="sourceLineNo">226</span>               o = toArray(sType, l);<a name="line.226"></a>
+<span class="sourceLineNo">227</span>            }<a name="line.227"></a>
+<span class="sourceLineNo">228</span>         } else {<a name="line.228"></a>
+<span class="sourceLineNo">229</span>            ArrayList l = (ArrayList)parseIntoCollection(r, new ArrayList(), sType, isUrlParamValue, pMeta);<a name="line.229"></a>
+<span class="sourceLineNo">230</span>            o = toArray(sType, l);<a name="line.230"></a>
+<span class="sourceLineNo">231</span>         }<a name="line.231"></a>
+<span class="sourceLineNo">232</span>      } else if (c == '(') {<a name="line.232"></a>
+<span class="sourceLineNo">233</span>         // It could be a non-bean with _type attribute.<a name="line.233"></a>
+<span class="sourceLineNo">234</span>         ObjectMap m = new ObjectMap(this);<a name="line.234"></a>
+<span class="sourceLineNo">235</span>         parseIntoMap(r, m, string(), object(), pMeta);<a name="line.235"></a>
+<span class="sourceLineNo">236</span>         if (m.containsKey(getBeanTypePropertyName(sType)))<a name="line.236"></a>
+<span class="sourceLineNo">237</span>            o = cast(m, pMeta, eType);<a name="line.237"></a>
+<span class="sourceLineNo">238</span>         else<a name="line.238"></a>
+<span class="sourceLineNo">239</span>            throw new ParseException(loc(r), "Class ''{0}'' could not be instantiated.  Reason: ''{1}''",<a name="line.239"></a>
+<span class="sourceLineNo">240</span>               sType.getInnerClass().getName(), sType.getNotABeanReason());<a name="line.240"></a>
+<span class="sourceLineNo">241</span>      } else if (c == 'n') {<a name="line.241"></a>
+<span class="sourceLineNo">242</span>         r.read();<a name="line.242"></a>
+<span class="sourceLineNo">243</span>         parseNull(r);<a name="line.243"></a>
+<span class="sourceLineNo">244</span>      } else {<a name="line.244"></a>
+<span class="sourceLineNo">245</span>         throw new ParseException(loc(r), "Class ''{0}'' could not be instantiated.  Reason: ''{1}''",<a name="line.245"></a>
+<span class="sourceLineNo">246</span>            sType.getInnerClass().getName(), sType.getNotABeanReason());<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 (o == null &amp;&amp; sType.isPrimitive())<a name="line.249"></a>
+<span class="sourceLineNo">250</span>         o = sType.getPrimitiveDefault();<a name="line.250"></a>
+<span class="sourceLineNo">251</span>      if (transform != null &amp;&amp; o != null)<a name="line.251"></a>
+<span class="sourceLineNo">252</span>         o = transform.unswap(this, o, eType);<a name="line.252"></a>
 <span class="sourceLineNo">253</span><a name="line.253"></a>
-<span class="sourceLineNo">254</span>   private &lt;K,V&gt; Map&lt;K,V&gt; parseIntoMap(UonReader r, Map&lt;K,V&gt; m, ClassMeta&lt;K&gt; keyType, ClassMeta&lt;V&gt; valueType,<a name="line.254"></a>
-<span class="sourceLineNo">255</span>         BeanPropertyMeta pMeta) throws Exception {<a name="line.255"></a>
+<span class="sourceLineNo">254</span>      if (outer != null)<a name="line.254"></a>
+<span class="sourceLineNo">255</span>         setParent(eType, o, outer);<a name="line.255"></a>
 <span class="sourceLineNo">256</span><a name="line.256"></a>
-<span class="sourceLineNo">257</span>      if (keyType == null)<a name="line.257"></a>
-<span class="sourceLineNo">258</span>         keyType = (ClassMeta&lt;K&gt;)string();<a name="line.258"></a>
+<span class="sourceLineNo">257</span>      return (T)o;<a name="line.257"></a>
+<span class="sourceLineNo">258</span>   }<a name="line.258"></a>
 <span class="sourceLineNo">259</span><a name="line.259"></a>
-<span class="sourceLineNo">260</span>      int c = r.read();<a name="line.260"></a>
-<span class="sourceLineNo">261</span>      if (c == -1 || c == AMP)<a name="line.261"></a>
-<span class="sourceLineNo">262</span>         return null;<a name="line.262"></a>
-<span class="sourceLineNo">263</span>      if (c == 'n')<a name="line.263"></a>
-<span class="sourceLineNo">264</span>         return (Map&lt;K,V&gt;)parseNull(r);<a name="line.264"></a>
-<span class="sourceLineNo">265</span>      if (c != '(')<a name="line.265"></a>
-<span class="sourceLineNo">266</span>         throw new ParseException(loc(r), "Expected '(' at beginning of object.");<a name="line.266"></a>
-<span class="sourceLineNo">267</span><a name="line.267"></a>
-<span class="sourceLineNo">268</span>      final int S1=1; // Looking for attrName start.<a name="line.268"></a>
-<span class="sourceLineNo">269</span>      final int S2=2; // Found attrName end, looking for =.<a name="line.269"></a>
-<span class="sourceLineNo">270</span>      final int S3=3; // Found =, looking for valStart.<a name="line.270"></a>
-<span class="sourceLineNo">271</span>      final int S4=4; // Looking for , or )<a name="line.271"></a>
-<span class="sourceLineNo">272</span>      boolean isInEscape = false;<a name="line.272"></a>
+<span class="sourceLineNo">260</span>   private &lt;K,V&gt; Map&lt;K,V&gt; parseIntoMap(UonReader r, Map&lt;K,V&gt; m, ClassMeta&lt;K&gt; keyType, ClassMeta&lt;V&gt; valueType,<a name="line.260"></a>
+<span class="sourceLineNo">261</span>         BeanPropertyMeta pMeta) throws Exception {<a name="line.261"></a>
+<span class="sourceLineNo">262</span><a name="line.262"></a>
+<span class="sourceLineNo">263</span>      if (keyType == null)<a name="line.263"></a>
+<span class="sourceLineNo">264</span>         keyType = (ClassMeta&lt;K&gt;)string();<a name="line.264"></a>
+<span class="sourceLineNo">265</span><a name="line.265"></a>
+<span class="sourceLineNo">266</span>      int c = r.read();<a name="line.266"></a>
+<span class="sourceLineNo">267</span>      if (c == -1 || c == AMP)<a name="line.267"></a>
+<span class="sourceLineNo">268</span>         return null;<a name="line.268"></a>
+<span class="sourceLineNo">269</span>      if (c == 'n')<a name="line.269"></a>
+<span class="sourceLineNo">270</span>         return (Map&lt;K,V&gt;)parseNull(r);<a name="line.270"></a>
+<span class="sourceLineNo">271</span>      if (c != '(')<a name="line.271"></a>
+<span class="sourceLineNo">272</span>         throw new ParseException(loc(r), "Expected '(' at beginning of object.");<a name="line.272"></a>
 <span class="sourceLineNo">273</span><a name="line.273"></a>
-<span class="sourceLineNo">274</span>      int state = S1;<a name="line.274"></a>
-<span class="sourceLineNo">275</span>      K currAttr = null;<a name="line.275"></a>
-<span class="sourceLineNo">276</span>      while (c != -1 &amp;&amp; c != AMP) {<a name="line.276"></a>
-<span class="sourceLineNo">277</span>         c = r.read();<a name="line.277"></a>
-<span class="sourceLineNo">278</span>         if (! isInEscape) {<a name="line.278"></a>
-<span class="sourceLineNo">279</span>            if (state == S1) {<a name="line.279"></a>
-<span class="sourceLineNo">280</span>               if (c == ')')<a name="line.280"></a>
-<span class="sourceLineNo">281</span>                  return m;<a name="line.281"></a>
-<span class="sourceLineNo">282</span>               if (Character.isWhitespace(c))<a name="line.282"></a>
-<span class="sourceLineNo">283</span>                  skipSpace(r);<a name="line.283"></a>
-<span class="sourceLineNo">284</span>               else {<a name="line.284"></a>
-<span class="sourceLineNo">285</span>                  r.unread();<a name="line.285"></a>
-<span class="sourceLineNo">286</span>                  Object attr = parseAttr(r, decodeChars);<a name="line.286"></a>
-<span class="sourceLineNo">287</span>                  currAttr = attr == null ? null : convertAttrToType(m, trim(attr.toString()), keyType);<a name="line.287"></a>
-<span class="sourceLineNo">288</span>                  state = S2;<a name="line.288"></a>
-<span class="sourceLineNo">289</span>                  c = 0; // Avoid isInEscape if c was '\'<a name="line.289"></a>
-<span class="sourceLineNo">290</span>               }<a name="line.290"></a>
-<span class="sourceLineNo">291</span>            } else if (state == S2) {<a name="line.291"></a>
-<span class="sourceLineNo">292</span>               if (c == EQ || c == '=')<a name="line.292"></a>
-<span class="sourceLineNo">293</span>                  state = S3;<a name="line.293"></a>
-<span class="sourceLineNo">294</span>               else if (c == -1 || c == ',' || c == ')' || c == AMP) {<a name="line.294"></a>
-<span class="sourceLineNo">295</span>                  if (currAttr == null) {<a name="line.295"></a>
-<span class="sourceLineNo">296</span>                     // Value was '%00'<a name="line.296"></a>
-<span class="sourceLineNo">297</span>                     r.unread();<a name="line.297"></a>
-<span class="sourceLineNo">298</span>                     return null;<a name="line.298"></a>
-<span class="sourceLineNo">299</span>                  }<a name="line.299"></a>
-<span class="sourceLineNo">300</span>                  m.put(currAttr, null);<a name="line.300"></a>
-<span class="sourceLineNo">301</span>                  if (c == ')' || c == -1 || c == AMP)<a name="line.301"></a>
-<span class="sourceLineNo">302</span>                     return m;<a name="line.302"></a>
-<span class="sourceLineNo">303</span>                  state = S1;<a name="line.303"></a>
-<span class="sourceLineNo">304</span>               }<a name="line.304"></a>
-<span class="sourceLineNo">305</span>            } else if (state == S3) {<a name="line.305"></a>
-<span class="sourceLineNo">306</span>               if (c == -1 || c == ',' || c == ')' || c == AMP) {<a name="line.306"></a>
-<span class="sourceLineNo">307</span>                  V value = convertAttrToType(m, "", valueType);<a name="line.307"></a>
-<span class="sourceLineNo">308</span>                  m.put(currAttr, value);<a name="line.308"></a>
-<span class="sourceLineNo">309</span>                  if (c == -1 || c == ')' || c == AMP)<a name="line.309"></a>
-<span class="sourceLineNo">310</span>                     return m;<a name="line.310"></a>
-<span class="sourceLineNo">311</span>                  state = S1;<a name="line.311"></a>
-<span class="sourceLineNo">312</span>               } else  {<a name="line.312"></a>
-<span class="sourceLineNo">313</span>                  V value = parseAnything(valueType, r.unread(), m, false, pMeta);<a name="line.313"></a>
-<span class="sourceLineNo">314</span>                  setName(valueType, value, currAttr);<a name="line.314"></a>
-<span class="sourceLineNo">315</span>                  m.put(currAttr, value);<a name="line.315"></a>
-<span class="sourceLineNo">316</span>                  state = S4;<a name="line.316"></a>
-<span class="sourceLineNo">317</span>                  c = 0; // Avoid isInEscape if c was '\'<a name="line.317"></a>
-<span class="sourceLineNo">318</span>               }<a name="line.318"></a>
-<span class="sourceLineNo">319</span>            } else if (state == S4) {<a name="line.319"></a>
-<span class="sourceLineNo">320</span>               if (c == ',')<a name="line.320"></a>
-<span class="sourceLineNo">321</span>                  state = S1;<a name="line.321"></a>
-<span class="sourceLineNo">322</span>               else if (c == ')' || c == -1 || c == AMP) {<a name="line.322"></a>
-<span class="sourceLineNo">323</span>                  return m;<a name="line.323"></a>
+<span class="sourceLineNo">274</span>      final int S1=1; // Looking for attrName start.<a name="line.274"></a>
+<span class="sourceLineNo">275</span>      final int S2=2; // Found attrName end, looking for =.<a name="line.275"></a>
+<span class="sourceLineNo">276</span>      final int S3=3; // Found =, looking for valStart.<a name="line.276"></a>
+<span class="sourceLineNo">277</span>      final int S4=4; // Looking for , or )<a name="line.277"></a>
+<span class="sourceLineNo">278</span>      boolean isInEscape = false;<a name="line.278"></a>
+<span class="sourceLineNo">279</span><a name="line.279"></a>
+<span class="sourceLineNo">280</span>      int state = S1;<a name="line.280"></a>
+<span class="sourceLineNo">281</span>      K currAttr = null;<a name="line.281"></a>
+<span class="sourceLineNo">282</span>      while (c != -1 &amp;&amp; c != AMP) {<a name="line.282"></a>
+<span class="sourceLineNo">283</span>         c = r.read();<a name="line.283"></a>
+<span class="sourceLineNo">284</span>         if (! isInEscape) {<a name="line.284"></a>
+<span class="sourceLineNo">285</span>            if (state == S1) {<a name="line.285"></a>
+<span class="sourceLineNo">286</span>               if (c == ')')<a name="line.286"></a>
+<span class="sourceLineNo">287</span>                  return m;<a name="line.287"></a>
+<span class="sourceLineNo">288</span>               if (Character.isWhitespace(c))<a name="line.288"></a>
+<span class="sourceLineNo">289</span>                  skipSpace(r);<a name="line.289"></a>
+<span class="sourceLineNo">290</span>               else {<a name="line.290"></a>
+<span class="sourceLineNo">291</span>                  r.unread();<a name="line.291"></a>
+<span class="sourceLineNo">292</span>                  Object attr = parseAttr(r, decodeChars);<a name="line.292"></a>
+<span class="sourceLineNo">293</span>                  currAttr = attr == null ? null : convertAttrToType(m, trim(attr.toString()), keyType);<a name="line.293"></a>
+<span class="sourceLineNo">294</span>                  state = S2;<a name="line.294"></a>
+<span class="sourceLineNo">295</span>                  c = 0; // Avoid isInEscape if c was '\'<a name="line.295"></a>
+<span class="sourceLineNo">296</span>               }<a name="line.296"></a>
+<span class="sourceLineNo">297</span>            } else if (state == S2) {<a name="line.297"></a>
+<span class="sourceLineNo">298</span>               if (c == EQ || c == '=')<a name="line.298"></a>
+<span class="sourceLineNo">299</span>                  state = S3;<a name="line.299"></a>
+<span class="sourceLineNo">300</span>               else if (c == -1 || c == ',' || c == ')' || c == AMP) {<a name="line.300"></a>
+<span class="sourceLineNo">301</span>                  if (currAttr == null) {<a name="line.301"></a>
+<span class="sourceLineNo">302</span>                     // Value was '%00'<a name="line.302"></a>
+<span class="sourceLineNo">303</span>                     r.unread();<a name="line.303"></a>
+<span class="sourceLineNo">304</span>                     return null;<a name="line.304"></a>
+<span class="sourceLineNo">305</span>                  }<a name="line.305"></a>
+<span class="sourceLineNo">306</span>                  m.put(currAttr, null);<a name="line.306"></a>
+<span class="sourceLineNo">307</span>                  if (c == ')' || c == -1 || c == AMP)<a name="line.307"></a>
+<span class="sourceLineNo">308</span>                     return m;<a name="line.308"></a>
+<span class="sourceLineNo">309</span>                  state = S1;<a name="line.309"></a>
+<span class="sourceLineNo">310</span>               }<a name="line.310"></a>
+<span class="sourceLineNo">311</span>            } else if (state == S3) {<a name="line.311"></a>
+<span class="sourceLineNo">312</span>               if (c == -1 || c == ',' || c == ')' || c == AMP) {<a name="line.312"></a>
+<span class="sourceLineNo">313</span>                  V value = convertAttrToType(m, "", valueType);<a name="line.313"></a>
+<span class="sourceLineNo">314</span>                  m.put(currAttr, value);<a name="line.314"></a>
+<span class="sourceLineNo">315</span>                  if (c == -1 || c == ')' || c == AMP)<a name="line.315"></a>
+<span class="sourceLineNo">316</span>                     return m;<a name="line.316"></a>
+<span class="sourceLineNo">317</span>                  state = S1;<a name="line.317"></a>
+<span class="sourceLineNo">318</span>               } else  {<a name="line.318"></a>
+<span class="sourceLineNo">319</span>                  V value = parseAnything(valueType, r.unread(), m, false, pMeta);<a name="line.319"></a>
+<span class="sourceLineNo">320</span>                  setName(valueType, value, currAttr);<a name="line.320"></a>
+<span class="sourceLineNo">321</span>                  m.put(currAttr, value);<a name="line.321"></a>
+<span class="sourceLineNo">322</span>                  state = S4;<a name="line.322"></a>
+<span class="sourceLineNo">323</span>                  c = 0; // Avoid isInEscape if c was '\'<a name="line.323"></a>
 <span class="sourceLineNo">324</span>               }<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>         isInEscape = isInEscape(c, r, isInEscape);<a name="line.327"></a>
-<span class="sourceLineNo">328</span>      }<a name="line.328"></a>
-<span class="sourceLineNo">329</span>      if (state == S1)<a name="line.329"></a>
-<span class="sourceLineNo">330</span>         throw new ParseException(loc(r), "Could not find attribute name on object.");<a name="line.330"></a>
-<span class="sourceLineNo">331</span>      if (state == S2)<a name="line.331"></a>
-<span class="sourceLineNo">332</span>         throw new ParseException(loc(r), "Could not find '=' following attribute name on object.");<a name="line.332"></a>
-<span class="sourceLineNo">333</span>      if (state == S3)<a name="line.333"></a>
-<span class="sourceLineNo">334</span>         throw new ParseException(loc(r), "Dangling '=' found in object entry");<a name="line.334"></a>
-<span class="sourceLineNo">335</span>      if (state == S4)<a name="line.335"></a>
-<span class="sourceLineNo">336</span>         throw new ParseException(loc(r), "Could not find ')' marking end of object.");<a name="line.336"></a>
-<span class="sourceLineNo">337</span><a name="line.337"></a>
-<span class="sourceLineNo">338</span>      return null; // Unreachable.<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>   private &lt;E&gt; Collection&lt;E&gt; parseIntoCollection(UonReader r, Collection&lt;E&gt; l, ClassMeta&lt;E&gt; type, boolean isUrlParamValue, BeanPropertyMeta pMeta) throws Exception {<a name="line.341"></a>
-<span class="sourceLineNo">342</span><a name="line.342"></a>
-<span class="sourceLineNo">343</span>      int c = r.readSkipWs();<a name="line.343"></a>
-<span class="sourceLineNo">344</span>      if (c == -1 || c == AMP)<a name="line.344"></a>
-<span class="sourceLineNo">345</span>         return null;<a name="line.345"></a>
-<span class="sourceLineNo">346</span>      if (c == 'n')<a name="line.346"></a>
-<span class="sourceLineNo">347</span>         return (Collection&lt;E&gt;)parseNull(r);<a name="line.347"></a>
+<span class="sourceLineNo">325</span>            } else if (state == S4) {<a name="line.325"></a>
+<span class="sourceLineNo">326</span>               if (c == ',')<a name="line.326"></a>
+<span class="sourceLineNo">327</span>                  state = S1;<a name="line.327"></a>
+<span class="sourceLineNo">328</span>               else if (c == ')' || c == -1 || c == AMP) {<a name="line.328"></a>
+<span class="sourceLineNo">329</span>                  return m;<a name="line.329"></a>
+<span class="sourceLineNo">330</span>               }<a name="line.330"></a>
+<span class="sourceLineNo">331</span>            }<a name="line.331"></a>
+<span class="sourceLineNo">332</span>         }<a name="line.332"></a>
+<span class="sourceLineNo">333</span>         isInEscape = isInEscape(c, r, isInEscape);<a name="line.333"></a>
+<span class="sourceLineNo">334</span>      }<a name="line.334"></a>
+<span class="sourceLineNo">335</span>      if (state == S1)<a name="line.335"></a>
+<span class="sourceLineNo">336</span>         throw new ParseException(loc(r), "Could not find attribute name on object.");<a name="line.336"></a>
+<span class="sourceLineNo">337</span>      if (state == S2)<a name="line.337"></a>
+<span class="sourceLineNo">338</span>         throw new ParseException(loc(r), "Could not find '=' following attribute name on object.");<a name="line.338"></a>
+<span class="sourceLineNo">339</span>      if (state == S3)<a name="line.339"></a>
+<span class="sourceLineNo">340</span>         throw new ParseException(loc(r), "Dangling '=' found in object entry");<a name="line.340"></a>
+<span class="sourceLineNo">341</span>      if (state == S4)<a name="line.341"></a>
+<span class="sourceLineNo">342</span>         throw new ParseException(loc(r), "Could not find ')' marking end of object.");<a name="line.342"></a>
+<span class="sourceLineNo">343</span><a name="line.343"></a>
+<span class="sourceLineNo">344</span>      return null; // Unreachable.<a name="line.344"></a>
+<span class="sourceLineNo">345</span>   }<a name="line.345"></a>
+<span class="sourceLineNo">346</span><a name="line.346"></a>
+<span class="sourceLineNo">347</span>   private &lt;E&gt; Collection&lt;E&gt; parseIntoCollection(UonReader r, Collection&lt;E&gt; l, ClassMeta&lt;E&gt; type, boolean isUrlParamValue, BeanPropertyMeta pMeta) throws Exception {<a name="line.347"></a>
 <span class="sourceLineNo">348</span><a name="line.348"></a>
-<span class="sourceLineNo">349</span>      int argIndex = 0;<a name="line.349"></a>
-<span class="sourceLineNo">350</span><a name="line.350"></a>
-<span class="sourceLineNo">351</span>      // If we're parsing a top-level parameter, we're allowed to have comma-delimited lists outside parenthesis (e.g. "&amp;foo=1,2,3&amp;bar=a,b,c")<a name="line.351"></a>
-<span class="sourceLineNo">352</span>      // This is not allowed at lower levels since we use comma's as end delimiters.<a name="line.352"></a>
-<span class="sourceLineNo">353</span>      boolean isInParens = (c == '@');<a name="line.353"></a>
-<span class="sourceLineNo">354</span>      if (! isInParens) {<a name="line.354"></a>
-<span class="sourceLineNo">355</span>         if (isUrlParamValue)<a name="line.355"></a>
-<span class="sourceLineNo">356</span>            r.unread();<a name="line.356"></a>
-<span class="sourceLineNo">357</span>         else<a name="line.357"></a>
-<span class="sourceLineNo">358</span>            throw new ParseException(loc(r), "Could not find '(' marking beginning of collection.");<a name="line.358"></a>
-<span class="sourceLineNo">359</span>      } else {<a name="line.359"></a>
-<span class="sourceLineNo">360</span>         r.read();<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>      if (isInParens) {<a name="line.363"></a>
-<span class="sourceLineNo">364</span>         final int S1=1; // Looking for starting of first entry.<a name="line.364"></a>
-<span class="sourceLineNo">365</span>         final int S2=2; // Looking for starting of subsequent entries.<a name="line.365"></a>
-<span class="sourceLineNo">366</span>         final int S3=3; // Looking for , or ) after first entry.<a name="line.366"></a>
-<span class="sourceLineNo">367</span><a name="line.367"></a>
-<span class="sourceLineNo">368</span>         int state = S1;<a name="line.368"></a>
-<span class="sourceLineNo">369</span>         while (c != -1 &amp;&amp; c != AMP) {<a name="line.369"></a>
-<span class="sourceLineNo">370</span>            c = r.read();<a name="line.370"></a>
-<span class="sourceLineNo">371</span>            if (state == S1 || state == S2) {<a name="line.371"></a>
-<span class="sourceLineNo">372</span>               if (c == ')') {<a name="line.372"></a>
-<span class="sourceLineNo">373</span>                  if (state == S2) {<a name="line.373"></a>
-<span class="sourceLineNo">374</span>                     l.add((E)parseAnything(type.isArgs() ? type.getArg(argIndex++) : type.getElementType(),<a name="line.374"></a>
-<span class="sourceLineNo">375</span>                           r.unread(), l, false, pMeta));<a name="line.375"></a>
-<span class="sourceLineNo">376</span>                     r.read();<a name="line.376"></a>
-<span class="sourceLineNo">377</span>                  }<a name="line.377"></a>
-<span class="sourceLineNo">378</span>                  return l;<a name="line.378"></a>
-<span class="sourceLineNo">379</span>               } else if (Character.isWhitespace(c)) {<a name="line.379"></a>
-<span class="sourceLineNo">380</span>                  skipSpace(r);<a name="line.380"></a>
-<span class="sourceLineNo">381</span>               } else {<a name="line.381"></a>
-<span class="sourceLineNo">382</span>                  l.add((E)parseAnything(type.isArgs() ? type.getArg(argIndex++) : type.getElementType(),<a name="line.382"></a>
-<span class="sourceLineNo">383</span>                        r.unread(), l, false, pMeta));<a name="line.383"></a>
-<span class="sourceLineNo">384</span>                  state = S3;<a name="line.384"></a>
-<span class="sourceLineNo">385</span>               }<a name="line.385"></a>
-<span class="sourceLineNo">386</span>            } else if (state == S3) {<a name="line.386"></a>
-<span class="sourceLineNo">387</span>               if (c == ',') {<a name="line.387"></a>
-<span class="sourceLineNo">388</span>                  state = S2;<a name="line.388"></a>
-<span class="sourceLineNo">389</span>               } else if (c == ')') {<a name="line.389"></a>
-<span class="sourceLineNo">390</span>                  return l;<a name="line.390"></a>
+<span class="sourceLineNo">349</span>      int c = r.readSkipWs();<a name="line.349"></a>
+<span class="sourceLineNo">350</span>      if (c == -1 || c == AMP)<a name="line.350"></a>
+<span class="sourceLineNo">351</span>         return null;<a name="line.351"></a>
+<span class="sourceLineNo">352</span>      if (c == 'n')<a name="line.352"></a>
+<span class="sourceLineNo">353</span>         return (Collection&lt;E&gt;)parseNull(r);<a name="line.353"></a>
+<span class="sourceLineNo">354</span><a name="line.354"></a>
+<span class="sourceLineNo">355</span>      int argIndex = 0;<a name="line.355"></a>
+<span class="sourceLineNo">356</span><a name="line.356"></a>
+<span class="sourceLineNo">357</span>      // If we're parsing a top-level parameter, we're allowed to have comma-delimited lists outside parenthesis (e.g. "&amp;foo=1,2,3&amp;bar=a,b,c")<a name="line.357"></a>
+<span class="sourceLineNo">358</span>      // This is not allowed at lower levels since we use comma's as end delimiters.<a name="line.358"></a>
+<span class="sourceLineNo">359</span>      boolean isInParens = (c == '@');<a name="line.359"></a>
+<span class="sourceLineNo">360</span>      if (! isInParens) {<a name="line.360"></a>
+<span class="sourceLineNo">361</span>         if (isUrlParamValue)<a name="line.361"></a>
+<span class="sourceLineNo">362</span>            r.unread();<a name="line.362"></a>
+<span class="sourceLineNo">363</span>         else<a name="line.363"></a>
+<span class="sourceLineNo">364</span>            throw new ParseException(loc(r), "Could not find '(' marking beginning of collection.");<a name="line.364"></a>
+<span class="sourceLineNo">365</span>      } else {<a name="line.365"></a>
+<span class="sourceLineNo">366</span>         r.read();<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>      if (isInParens) {<a name="line.369"></a>
+<span class="sourceLineNo">370</span>         final int S1=1; // Looking for starting of first entry.<a name="line.370"></a>
+<span class="sourceLineNo">371</span>         final int S2=2; // Looking for starting of subsequent entries.<a name="line.371"></a>
+<span class="sourceLineNo">372</span>         final int S3=3; // Looking for , or ) after first entry.<a name="line.372"></a>
+<span class="sourceLineNo">373</span><a name="line.373"></a>
+<span class="sourceLineNo">374</span>         int state = S1;<a name="line.374"></a>
+<span class="sourceLineNo">375</span>         while (c != -1 &amp;&amp; c != AMP) {<a name="line.375"></a>
+<span class="sourceLineNo">376</span>            c = r.read();<a name="line.376"></a>
+<span class="sourceLineNo">377</span>            if (state == S1 || state == S2) {<a name="line.377"></a>
+<span class="sourceLineNo">378</span>               if (c == ')') {<a name="line.378"></a>
+<span class="sourceLineNo">379</span>                  if (state == S2) {<a name="line.379"></a>
+<span class="sourceLineNo">380</span>                     l.add((E)parseAnything(type.isArgs() ? type.getArg(argIndex++) : type.getElementType(),<a name="line.380"></a>
+<span class="sourceLineNo">381</span>                           r.unread(), l, false, pMeta));<a name="line.381"></a>
+<span class="sourceLineNo">382</span>                     r.read();<a name="line.382"></a>
+<span class="sourceLineNo">383</span>                  }<a name="line.383"></a>
+<span class="sourceLineNo">384</span>                  return l;<a name="line.384"></a>
+<span class="sourceLineNo">385</span>               } else if (Character.isWhitespace(c)) {<a name="line.385"></a>
+<span class="sourceLineNo">386</span>                  skipSpace(r);<a name="line.386"></a>
+<span class="sourceLineNo">387</span>               } else {<a name="line.387"></a>
+<span class="sourceLineNo">388</span>                  l.add((E)parseAnything(type.isArgs() ? type.getArg(argIndex++) : type.getElementType(),<a name="line.388"></a>
+<span class="sourceLineNo">389</span>                        r.unread(), l, false, pMeta));<a name="line.389"></a>
+<span class="sourceLineNo">390</span>                  state = S3;<a name="line.390"></a>
 <span class="sourceLineNo">391</span>               }<a name="line.391"></a>
-<span class="sourceLineNo">392</span>            }<a name="line.392"></a>
-<span class="sourceLineNo">393</span>         }<a name="line.393"></a>
-<span class="sourceLineNo">394</span>         if (state == S1 || state == S2)<a name="line.394"></a>
-<span class="sourceLineNo">395</span>            throw new ParseException(loc(r), "Could not find start of entry in array.");<a name="line.395"></a>
-<span class="sourceLineNo">396</span>         if (state == S3)<a name="line.396"></a>
-<span class="sourceLineNo">397</span>            throw new ParseException(loc(r), "Could not find end of entry in array.");<a name="line.397"></a>
-<span class="sourceLineNo">398</span><a name="line.398"></a>
-<span class="sourceLineNo">399</span>      } else {<a name="line.399"></a>
-<span class="sourceLineNo">400</span>         final int S1=1; // Looking for starting of entry.<a name="line.400"></a>
-<span class="sourceLineNo">401</span>         final int S2=2; // Looking for , or &amp; or END after first entry.<a name="line.401"></a>
-<span class="sourceLineNo">402</span><a name="line.402"></a>
-<span class="sourceLineNo">403</span>         int state = S1;<a name="line.403"></a>
-<span class="sourceLineNo">404</span>         while (c != -1 &amp;&amp; c != AMP) {<a name="line.404"></a>
-<span class="sourceLineNo">405</span>            c = r.read();<a name="line.405"></a>
-<span class="sourceLineNo">406</span>            if (state == S1) {<a name="line.406"></a>
-<span class="sourceLineNo">407</span>               if (Character.isWhitespace(c)) {<a name="line.407"></a>
-<span class="sourceLineNo">408</span>                  skipSpace(r);<a name="line.408"></a>
-<span class="sourceLineNo">409</span>               } else {<a name="line.409"></a>
-<span class="sourceLineNo">410</span>                  l.add((E)parseAnything(type.isArgs() ? type.getArg(argIndex++) : type.getElementType(),<a name="line.410"></a>
-<span class="sourceLineNo">411</span>                        r.unread(), l, false, pMeta));<a name="line.411"></a>
-<span class="sourceLineNo">412</span>                  state = S2;<a name="line.412"></a>
-<span class="sourceLineNo">413</span>               }<a name="line.413"></a>
-<span class="sourceLineNo">414</span>            } else if (state == S2) {<a name="line.414"></a>
-<span class="sourceLineNo">415</span>               if (c == ',') {<a name="line.415"></a>
-<span class="sourceLineNo">416</span>                  state = S1;<a name="line.416"></a>
-<span class="sourceLineNo">417</span>               } else if (Character.isWhitespace(c)) {<a name="line.417"></a>
-<span class="sourceLineNo">418</span>                  skipSpace(r);<a name="line.418"></a>
-<span class="sourceLineNo">419</span>               } else if (c == AMP || c == -1) {<a name="line.419"></a>
-<span class="sourceLineNo">420</span>                  r.unread();<a name="line.420"></a>
-<span class="sourceLineNo">421</span>                  return l;<a name="line.421"></a>
-<span class="sourceLineNo">422</span>               }<a name="line.422"></a>
-<span class="sourceLineNo">423</span>            }<a name="line.423"></a>
-<span class="sourceLineNo">424</span>         }<a name="line.424"></a>
-<span class="sourceLineNo">425</span>      }<a name="line.425"></a>
-<span class="sourceLineNo">426</span><a name="line.426"></a>
-<span class="sourceLineNo">427</span>      return null;  // Unreachable.<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>   private &lt;T&gt; BeanMap&lt;T&gt; parseIntoBeanMap(UonReader r, BeanMap&lt;T&gt; m) throws Exception {<a name="line.430"></a>
-<span class="sourceLineNo">431</span><a name="line.431"></a>
-<span class="sourceLineNo">432</span>      int c = r.readSkipWs();<a name="line.432"></a>
-<span class="sourceLineNo">433</span>      if (c == -1 || c == AMP)<a name="line.433"></a>
-<span class="sourceLineNo">434</span>         return null;<a name="line.434"></a>
-<span class="sourceLineNo">435</span>      if (c == 'n')<a name="line.435"></a>
-<span class="sourceLineNo">436</span>         return (BeanMap&lt;T&gt;)parseNull(r);<a name="line.436"></a>
-<span class="sourceLineNo">437</span>      if (c != '(')<a name="line.437"></a>
-<span class="sourceLineNo">438</span>         throw new ParseException(loc(r), "Expected '(' at beginning of object.");<a name="line.438"></a>
-<span class="sourceLineNo">439</span><a name="line.439"></a>
-<span class="sourceLineNo">440</span>      final int S1=1; // Looking for attrName start.<a name="line.440"></a>
-<span class="sourceLineNo">441</span>      final int S2=2; // Found attrName end, looking for =.<a name="line.441"></a>
-<span class="sourceLineNo">442</span>      final int S3=3; // Found =, looking for valStart.<a name="line.442"></a>
-<span class="sourceLineNo">443</span>      final int S4=4; // Looking for , or }<a name="line.443"></a>
-<span class="sourceLineNo">444</span>      boolean isInEscape = false;<a name="line.444"></a>
+<span class="sourceLineNo">392</span>            } else if (state == S3) {<a name="line.392"></a>
+<span class="sourceLineNo">393</span>               if (c == ',') {<a name="line.393"></a>
+<span class="sourceLineNo">394</span>                  state = S2;<a name="line.394"></a>
+<span class="sourceLineNo">395</span>               } else if (c == ')') {<a name="line.395"></a>
+<span class="sourceLineNo">396</span>                  return l;<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>         }<a name="line.399"></a>
+<span class="sourceLineNo">400</span>         if (state == S1 || state == S2)<a name="line.400"></a>
+<span class="sourceLineNo">401</span>            throw new ParseException(loc(r), "Could not find start of entry in array.");<a name="line.401"></a>
+<span class="sourceLineNo">402</span>         if (state == S3)<a name="line.402"></a>
+<span class="sourceLineNo">403</span>            throw new ParseException(loc(r), "Could not find end of entry in array.");<a name="line.403"></a>
+<span class="sourceLineNo">404</span><a name="line.404"></a>
+<span class="sourceLineNo">405</span>      } else {<a name="line.405"></a>
+<span class="sourceLineNo">406</span>         final int S1=1; // Looking for starting of entry.<a name="line.406"></a>
+<span class="sourceLineNo">407</span>         final int S2=2; // Looking for , or &amp; or END after first entry.<a name="line.407"></a>
+<span class="sourceLineNo">408</span><a name="line.408"></a>
+<span class="sourceLineNo">409</span>         int state = S1;<a name="line.409"></a>
+<span class="sourceLineNo">410</span>         while (c != -1 &amp;&amp; c != AMP) {<a name="line.410"></a>
+<span class="sourceLineNo">411</span>            c = r.read();<a name="line.411"></a>
+<span class="sourceLineNo">412</span>            if (state == S1) {<a name="line.412"></a>
+<span class="sourceLineNo">413</span>               if (Character.isWhitespace(c)) {<a name="line.413"></a>
+<span class="sourceLineNo">414</span>                  skipSpace(r);<a name="line.414"></a>
+<span class="sourceLineNo">415</span>               } else {<a name="line.415"></a>
+<span class="sourceLineNo">416</span>                  l.add((E)parseAnything(type.isArgs() ? type.getArg(argIndex++) : type.getElementType(),<a name="line.416"></a>
+<span class="sourceLineNo">417</span>                        r.unread(), l, false, pMeta));<a name="line.417"></a>
+<span class="sourceLineNo">418</span>                  state = S2;<a name="line.418"></a>
+<span class="sourceLineNo">419</span>               }<a name="line.419"></a>
+<span class="sourceLineNo">420</span>            } else if (state == S2) {<a name="line.420"></a>
+<span class="sourceLineNo">421</span>               if (c == ',') {<a name="line.421"></a>
+<span class="sourceLineNo">422</span>                  state = S1;<a name="line.422"></a>
+<span class="sourceLineNo">423</span>               } else if (Character.isWhitespace(c)) {<a name="line.423"></a>
+<span class="sourceLineNo">424</span>                  skipSpace(r);<a name="line.424"></a>
+<span class="sourceLineNo">425</span>               } else if (c == AMP || c == -1) {<a name="line.425"></a>
+<span class="sourceLineNo">426</span>                  r.unread();<a name="line.426"></a>
+<span class="sourceLineNo">427</span>                  return l;<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>      }<a name="line.431"></a>
+<span class="sourceLineNo">432</span><a name="line.432"></a>
+<span class="sourceLineNo">433</span>      return null;  // Unreachable.<a name="line.433"></a>
+<span class="sourceLineNo">434</span>   }<a name="line.434"></a>
+<span class="sourceLineNo">435</span><a name="line.435"></a>
+<span class="sourceLineNo">436</span>   private &lt;T&gt; BeanMap&lt;T&gt; parseIntoBeanMap(UonReader r, BeanMap&lt;T&gt; m) throws Exception {<a name="line.436"></a>
+<span class="sourceLineNo">437</span><a name="line.437"></a>
+<span class="sourceLineNo">438</span>      int c = r.readSkipWs();<a name="line.438"></a>
+<span class="sourceLineNo">439</span>      if (c == -1 || c == AMP)<a name="line.439"></a>
+<span class="sourceLineNo">440</span>         return null;<a name="line.440"></a>
+<span class="sourceLineNo">441</span>      if (c == 'n')<a name="line.441"></a>
+<span class="sourceLineNo">442</span>         return (BeanMap&lt;T&gt;)parseNull(r);<a name="line.442"></a>
+<span class="sourceLineNo">443</span>      if (c != '(')<a name="line.443"></a>
+<span class="sourceLineNo">444</span>         throw new ParseException(loc(r), "Expected '(' at beginning of object.");<a name="line.444"></a>
 <span class="sourceLineNo">445</span><a name="line.445"></a>
-<span class="sourceLineNo">446</span>      int state = S1;<a name="line.446"></a>
-<span class="sourceLineNo">447</span>      String currAttr = "";<a name="line.447"></a>
-<span class="sourceLineNo">448</span>      int currAttrLine = -1, currAttrCol = -1;<a name="line.448"></a>
-<span class="sourceLineNo">449</span>      while (c != -1 &amp;&amp; c != AMP) {<a name="line.449"></a>
-<span class="sourceLineNo">450</span>         c = r.read();<a name="line.450"></a>
-<span class="sourceLineNo">451</span>         if (! isInEscape) {<a name="line.451"></a>
-<span class="sourceLineNo">452</span>            if (state == S1) {<a name="line.452"></a>
-<span class="sourceLineNo">453</span>               if (c == ')' || c == -1 || c == AMP) {<a name="line.453"></a>
-<span class="sourceLineNo">454</span>                  return m;<a name="line.454"></a>
-<span class="sourceLineNo">455</span>               }<a name="line.455"></a>
-<span class="sourceLineNo">456</span>               if (Character.isWhitespace(c))<a name="line.456"></a>
-<span class="sourceLineNo">457</span>                  skipSpace(r);<a name="line.457"></a>
-<span class="sourceLineNo">458</span>               else {<a name="line.458"></a>
-<span class="sourceLineNo">459</span>                  r.unread();<a name="line.459"></a>
-<span class="sourceLineNo">460</span>                  currAttrLine= r.getLine();<a name="line.460"></a>
-<span class="sourceLineNo">461</span>                  currAttrCol = r.getColumn();<a name="line.461"></a>
-<span class="sourceLineNo">462</span>                  currAttr = parseAttrName(r, decodeChars);<a name="line.462"></a>
-<span class="sourceLineNo">463</span>                  if (currAttr == null)  // Value was '%00'<a name="line.463"></a>
-<span class="sourceLineNo">464</span>                     return null;<a name="line.464"></a>
-<span class="sourceLineNo">465</span>                  state = S2;<a name="line.465"></a>
-<span class="sourceLineNo">466</span>               }<a name="line.466"></a>
-<span class="sourceLineNo">467</span>            } else if (state == S2) {<a name="line.467"></a>
-<span class="sourceLineNo">468</span>               if (c == EQ || c == '=')<a name="line.468"></a>
-<span class="sourceLineNo">469</span>                  state = S3;<a name="line.469"></a>
-<span class="sourceLineNo">470</span>               else if (c == -1 || c == ',' || c == ')' || c == AMP) {<a name="line.470"></a>
-<span class="sourceLineNo">471</span>                  m.put(currAttr, null);<a name="line.471"></a>
-<span class="sourceLineNo">472</span>                  if (c == ')' || c == -1 || c == AMP)<a name="line.472"></a>
-<span class="sourceLineNo">473</span>                     return m;<a name="line.473"></a>
-<span class="sourceLineNo">474</span>                  state = S1;<a name="line.474"></a>
-<span class="sourceLineNo">475</span>               }<a name="line.475"></a>
-<span class="sourceLineNo">476</span>            } else if (state == S3) {<a name="line.476"></a>
-<span class="sourceLineNo">477</span>               if (c == -1 || c == ',' || c == ')' || c == AMP) {<a name="line.477"></a>
-<span class="sourceLineNo">478</span>                  if (! currAttr.equals(getBeanTypePropertyName(m.getClassMeta()))) {<a name="line.478"></a>
-<span class="sourceLineNo">479</span>                     BeanPropertyMeta pMeta = m.getPropertyMeta(currAttr);<a name="line.479"></a>
-<span class="sourceLineNo">480</span>                     if (pMeta == null) {<a name="line.480"></a>
-<span class="sourceLineNo">481</span>                        onUnknownProperty(r.getPipe(), currAttr, m, currAttrLine, currAttrCol);<a name="line.481"></a>
-<span class="sourceLineNo">482</span>                     } else {<a name="line.482"></a>
-<span class="sourceLineNo">483</span>                        Object value = convertToType("", pMeta.getClassMeta());<a name="line.483"></a>
-<span class="sourceLineNo">484</span>                        pMeta.set(m, currAttr, value);<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>                  if (c == -1 || c == ')' || c == AMP)<a name="line.487"></a>
-<span class="sourceLineNo">488</span>                     return m;<a name="line.488"></a>
-<span class="sourceLineNo">489</span>                  state = S1;<a name="line.489"></a>
-<span class="sourceLineNo">490</span>               } else {<a name="line.490"></a>
-<span class="sourceLineNo">491</span>                  if (! currAttr.equals(getBeanTypePropertyName(m.getClassMeta()))) {<a name="line.491"></a>
-<span class="sourceLineNo">492</span>                     BeanPropertyMeta pMeta = m.getPropertyMeta(currAttr);<a name="line.492"></a>
-<span class="sourceLineNo">493</span>                     if (pMeta == null) {<a name="line.493"></a>
-<span class="sourceLineNo">494</span>                        onUnknownProperty(r.getPipe(), currAttr, m, currAttrLine, currAttrCol);<a name="line.494"></a>
-<span class="sourceLineNo">495</span>                        parseAnything(object(), r.unread(), m.getBean(false), false, null); // Read content anyway to ignore it<a name="line.495"></a>
-<span class="sourceLineNo">496</span>                     } else {<a name="line.496"></a>
-<span class="sourceLineNo">497</span>                        setCurrentProperty(pMeta);<a name="line.497"></a>
-<span class="sourceLineNo">498</span>                        ClassMeta&lt;?&gt; cm = pMeta.getClassMeta();<a name="line.498"></a>
-<span class="sourceLineNo">499</span>                        Object value = parseAnything(cm, r.unread(), m.getBean(false), false, pMeta);<a name="line.499"></a>
-<span class="sourceLineNo">500</span>                        setName(cm, value, currAttr);<a name="line.500"></a>
-<span class="sourceLineNo">501</span>                        pMeta.set(m, currAttr, value);<a name="line.501"></a>
-<span class="sourceLineNo">502</span>                        setCurrentProperty(null);<a name="line.502"></a>
-<span class="sourceLineNo">503</span>                     }<a name="line.503"></a>
-<span class="sourceLineNo">504</span>                  }<a name="line.504"></a>
-<span class="sourceLineNo">505</span>                  state = S4;<a name="line.505"></a>
-<span class="sourceLineNo">506</span>               }<a name="line.506"></a>
-<span class="sourceLineNo">507</span>            } else if (state == S4) {<a name="line.507"></a>
-<span class="sourceLineNo">508</span>               if (c == ',')<a name="line.508"></a>
-<span class="sourceLineNo">509</span>                  state = S1;<a name="line.509"></a>
-<span class="sourceLineNo">510</span>               else if (c == ')' || c == -1 || c == AMP) {<a name="line.510"></a>
-<span class="sourceLineNo">511</span>                  return m;<a name="line.511"></a>
+<span class="sourceLineNo">446</span>      final int S1=1; // Looking for attrName start.<a name="line.446"></a>
+<span class="sourceLineNo">447</span>      final int S2=2; // Found attrName end, looking for =.<a name="line.447"></a>
+<span class="sourceLineNo">448</span>      final int S3=3; // Found =, looking for valStart.<a name="line.448"></a>
+<span class="sourceLineNo">449</span>      final int S4=4; // Looking for , or }<a name="line.449"></a>
+<span class="sourceLineNo">450</span>      boolean isInEscape = false;<a name="line.450"></a>
+<span class="sourceLineNo">451</span><a name="line.451"></a>
+<span class="sourceLineNo">452</span>      int state = S1;<a name="line.452"></a>
+<span class="sourceLineNo">453</span>      String currAttr = "";<a name="line.453"></a>
+<span class="sourceLineNo">454</span>      int currAttrLine = -1, currAttrCol = -1;<a name="line.454"></a>
+<span class="sourceLineNo">455</span>      while (c != -1 &amp;&amp; c != AMP) {<a name="line.455"></a>
+<span class="sourceLineNo">456</span>         c = r.read();<a name="line.456"></a>
+<span class="sourceLineNo">457</span>         if (! isInEscape) {<a name="line.457"></a>
+<span class="sourceLineNo">458</span>            if (state == S1) {<a name="line.458"></a>
+<span class="sourceLineNo">459</span>               if (c == ')' || c == -1 || c == AMP) {<a name="line.459"></a>
+<span class="sourceLineNo">460</span>                  return m;<a name="line.460"></a>
+<span class="sourceLineNo">461</span>               }<a name="line.461"></a>
+<span class="sourceLineNo">462</span>               if (Character.isWhitespace(c))<a name="line.462"></a>
+<span class="sourceLineNo">463</span>                  skipSpace(r);<a name="line.463"></a>
+<span class="sourceLineNo">464</span>               else {<a name="line.464"></a>
+<span class="sourceLineNo">465</span>                  r.unread();<a name="line.465"></a>
+<span class="sourceLineNo">466</span>                  currAttrLine= r.getLine();<a name="line.466"></a>
+<span class="sourceLineNo">467</span>                  currAttrCol = r.getColumn();<a name="line.467"></a>
+<span class="sourceLineNo">468</span>                  currAttr = parseAttrName(r, decodeChars);<a name="line.468"></a>
+<span class="sourceLineNo">469</span>                  if (currAttr == null)  // Value was '%00'<a name="line.469"></a>
+<span class="sourceLineNo">470</span>                     return null;<a name="line.470"></a>
+<span class="sourceLineNo">471</span>                  state = S2;<a name="line.471"></a>
+<span class="sourceLineNo">472</span>               }<a name="line.472"></a>
+<span class="sourceLineNo">473</span>            } else if (state == S2) {<a name="line.473"></a>
+<span class="sourceLineNo">474</span>               if (c == EQ || c == '=')<a name="line.474"></a>
+<span class="sourceLineNo">475</span>                  state = S3;<a name="line.475"></a>
+<span class="sourceLineNo">476</span>               else if (c == -1 || c == ',' || c == ')' || c == AMP) {<a name="line.476"></a>
+<span class="sourceLineNo">477</span>                  m.put(currAttr, null);<a name="line.477"></a>
+<span class="sourceLineNo">478</span>                  if (c == ')' || c == -1 || c == AMP)<a name="line.478"></a>
+<span class="sourceLineNo">479</span>                     return m;<a name="line.479"></a>
+<span class="sourceLineNo">480</span>                  state = S1;<a name="line.480"></a>
+<span class="sourceLineNo">481</span>               }<a name="line.481"></a>
+<span class="sourceLineNo">482</span>            } else if (state == S3) {<a name="line.482"></a>
+<span class="sourceLineNo">483</span>               if (c == -1 || c == ',' || c == ')' || c == AMP) {<a name="line.483"></a>
+<span class="sourceLineNo">484</span>                  if (! currAttr.equals(getBeanTypePropertyName(m.getClassMeta()))) {<a name="line.484"></a>
+<span class="sourceLineNo">485</span>                     BeanPropertyMeta pMeta = m.getPropertyMeta(currAttr);<a name="line.485"></a>
+<span class="sourceLineNo">486</span>                     if (pMeta == null) {<a name="line.486"></a>
+<span class="sourceLineNo">487</span>                        onUnknownProperty(r.getPipe(), currAttr, m, currAttrLine, currAttrCol);<a name="line.487"></a>
+<span class="sourceLineNo">488</span>                     } else {<a name="line.488"></a>
+<span class="sourceLineNo">489</span>                        Object value = convertToType("", pMeta.getClassMeta());<a name="line.489"></a>
+<span class="sourceLineNo">490</span>                        pMeta.set(m, currAttr, value);<a name="line.490"></a>
+<span class="sourceLineNo">491</span>                     }<a name="line.491"></a>
+<span class="sourceLineNo">492</span>                  }<a name="line.492"></a>
+<span class="sourceLineNo">493</span>                  if (c == -1 || c == ')' || c == AMP)<a name="line.493"></a>
+<span class="sourceLineNo">494</span>                     return m;<a name="line.494"></a>
+<span class="sourceLineNo">495</span>                  state = S1;<a name="line.495"></a>
+<span class="sourceLineNo">496</span>               } else {<a name="line.496"></a>
+<span class="sourceLineNo">497</span>                  if (! currAttr.equals(getBeanTypePropertyName(m.getClassMeta()))) {<a name="line.497"></a>
+<span class="sourceLineNo">498</span>                     BeanPropertyMeta pMeta = m.getPropertyMeta(currAttr);<a name="line.498"></a>
+<span class="sourceLineNo">499</span>                     if (pMeta == null) {<a name="line.499"></a>
+<span class="sourceLineNo">500</span>                        onUnknownProperty(r.getPipe(), currAttr, m, currAttrLine, currAttrCol);<a name="line.500"></a>
+<span class="sourceLineNo">501</span>                        parseAnything(object(), r.unread(), m.getBean(false), false, null); // Read content anyway to ignore it<a name="line.501"></a>
+<span class="sourceLineNo">502</span>                     } else {<a name="line.502"></a>
+<span class="sourceLineNo">503</span>                        setCurrentProperty(pMeta);<a name="line.503"></a>
+<span class="sourceLineNo">504</span>                        ClassMeta&lt;?&gt; cm = pMeta.getClassMeta();<a name="lin

<TRUNCATED>


Mime
View raw message