juneau-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamesbog...@apache.org
Subject [14/51] [partial] incubator-juneau-website git commit: Support for passing in more class types to REST methods.
Date Mon, 08 May 2017 15:32:44 GMT
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/f1f17bc3/content/site/apidocs/src-html/org/apache/juneau/internal/ClassUtils.ClassComparator.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/internal/ClassUtils.ClassComparator.html b/content/site/apidocs/src-html/org/apache/juneau/internal/ClassUtils.ClassComparator.html
index 8380ab1..e983a73 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/internal/ClassUtils.ClassComparator.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/internal/ClassUtils.ClassComparator.html
@@ -153,527 +153,540 @@
 <span class="sourceLineNo">145</span>   }<a name="line.145"></a>
 <span class="sourceLineNo">146</span><a name="line.146"></a>
 <span class="sourceLineNo">147</span>   /**<a name="line.147"></a>
-<span class="sourceLineNo">148</span>    * Comparator for use with {@link TreeMap TreeMaps} with {@link Class} keys.<a name="line.148"></a>
-<span class="sourceLineNo">149</span>    */<a name="line.149"></a>
-<span class="sourceLineNo">150</span>   public final static class ClassComparator implements Comparator&lt;Class&lt;?&gt;&gt;, Serializable {<a name="line.150"></a>
-<span class="sourceLineNo">151</span><a name="line.151"></a>
-<span class="sourceLineNo">152</span>      private static final long serialVersionUID = 1L;<a name="line.152"></a>
-<span class="sourceLineNo">153</span><a name="line.153"></a>
-<span class="sourceLineNo">154</span>      @Override /* Comparator */<a name="line.154"></a>
-<span class="sourceLineNo">155</span>      public int compare(Class&lt;?&gt; object1, Class&lt;?&gt; object2) {<a name="line.155"></a>
-<span class="sourceLineNo">156</span>         return object1.getName().compareTo(object2.getName());<a name="line.156"></a>
-<span class="sourceLineNo">157</span>      }<a name="line.157"></a>
+<span class="sourceLineNo">148</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; if &lt;code&gt;parent&lt;/code&gt; is a parent class or the same as &lt;code&gt;child&lt;/code&gt;.<a name="line.148"></a>
+<span class="sourceLineNo">149</span>    *<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    * @param parent The parent class.<a name="line.150"></a>
+<span class="sourceLineNo">151</span>    * @param child The child class.<a name="line.151"></a>
+<span class="sourceLineNo">152</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if &lt;code&gt;parent&lt;/code&gt; is a parent class or the same as &lt;code&gt;child&lt;/code&gt;.<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    */<a name="line.153"></a>
+<span class="sourceLineNo">154</span>   public static boolean isParentClass(Class&lt;?&gt; parent, Type child) {<a name="line.154"></a>
+<span class="sourceLineNo">155</span>      if (child instanceof Class)<a name="line.155"></a>
+<span class="sourceLineNo">156</span>         return isParentClass(parent, (Class&lt;?&gt;)child);<a name="line.156"></a>
+<span class="sourceLineNo">157</span>      return false;<a name="line.157"></a>
 <span class="sourceLineNo">158</span>   }<a name="line.158"></a>
 <span class="sourceLineNo">159</span><a name="line.159"></a>
 <span class="sourceLineNo">160</span>   /**<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    * Returns the signature of the specified method.<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    * For no-arg methods, the signature will be a simple string such as &lt;js&gt;"toString"&lt;/js&gt;.<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    * For methods with one or more args, the arguments will be fully-qualified class names (e.g. &lt;js&gt;"append(java.util.StringBuilder,boolean)"&lt;/js&gt;)<a name="line.163"></a>
-<span class="sourceLineNo">164</span>    *<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    * @param m The methods to get the signature on.<a name="line.165"></a>
-<span class="sourceLineNo">166</span>    * @return The methods signature.<a name="line.166"></a>
-<span class="sourceLineNo">167</span>    */<a name="line.167"></a>
-<span class="sourceLineNo">168</span>   public static String getMethodSignature(Method m) {<a name="line.168"></a>
-<span class="sourceLineNo">169</span>      StringBuilder sb = new StringBuilder(m.getName());<a name="line.169"></a>
-<span class="sourceLineNo">170</span>      Class&lt;?&gt;[] pt = m.getParameterTypes();<a name="line.170"></a>
-<span class="sourceLineNo">171</span>      if (pt.length &gt; 0) {<a name="line.171"></a>
-<span class="sourceLineNo">172</span>         sb.append('(');<a name="line.172"></a>
-<span class="sourceLineNo">173</span>         for (int i = 0; i &lt; pt.length; i++) {<a name="line.173"></a>
-<span class="sourceLineNo">174</span>            if (i &gt; 0)<a name="line.174"></a>
-<span class="sourceLineNo">175</span>               sb.append(',');<a name="line.175"></a>
-<span class="sourceLineNo">176</span>            sb.append(getReadableClassName(pt[i]));<a name="line.176"></a>
-<span class="sourceLineNo">177</span>         }<a name="line.177"></a>
-<span class="sourceLineNo">178</span>         sb.append(')');<a name="line.178"></a>
-<span class="sourceLineNo">179</span>      }<a name="line.179"></a>
-<span class="sourceLineNo">180</span>      return sb.toString();<a name="line.180"></a>
-<span class="sourceLineNo">181</span>   }<a name="line.181"></a>
-<span class="sourceLineNo">182</span><a name="line.182"></a>
-<span class="sourceLineNo">183</span>   private final static Map&lt;Class&lt;?&gt;, Class&lt;?&gt;&gt; pmap1 = new HashMap&lt;Class&lt;?&gt;, Class&lt;?&gt;&gt;(), pmap2 = new HashMap&lt;Class&lt;?&gt;, Class&lt;?&gt;&gt;();<a name="line.183"></a>
-<span class="sourceLineNo">184</span>   static {<a name="line.184"></a>
-<span class="sourceLineNo">185</span>      pmap1.put(boolean.class, Boolean.class);<a name="line.185"></a>
-<span class="sourceLineNo">186</span>      pmap1.put(byte.class, Byte.class);<a name="line.186"></a>
-<span class="sourceLineNo">187</span>      pmap1.put(short.class, Short.class);<a name="line.187"></a>
-<span class="sourceLineNo">188</span>      pmap1.put(char.class, Character.class);<a name="line.188"></a>
-<span class="sourceLineNo">189</span>      pmap1.put(int.class, Integer.class);<a name="line.189"></a>
-<span class="sourceLineNo">190</span>      pmap1.put(long.class, Long.class);<a name="line.190"></a>
-<span class="sourceLineNo">191</span>      pmap1.put(float.class, Float.class);<a name="line.191"></a>
-<span class="sourceLineNo">192</span>      pmap1.put(double.class, Double.class);<a name="line.192"></a>
-<span class="sourceLineNo">193</span>      pmap2.put(Boolean.class, boolean.class);<a name="line.193"></a>
-<span class="sourceLineNo">194</span>      pmap2.put(Byte.class, byte.class);<a name="line.194"></a>
-<span class="sourceLineNo">195</span>      pmap2.put(Short.class, short.class);<a name="line.195"></a>
-<span class="sourceLineNo">196</span>      pmap2.put(Character.class, char.class);<a name="line.196"></a>
-<span class="sourceLineNo">197</span>      pmap2.put(Integer.class, int.class);<a name="line.197"></a>
-<span class="sourceLineNo">198</span>      pmap2.put(Long.class, long.class);<a name="line.198"></a>
-<span class="sourceLineNo">199</span>      pmap2.put(Float.class, float.class);<a name="line.199"></a>
-<span class="sourceLineNo">200</span>      pmap2.put(Double.class, double.class);<a name="line.200"></a>
-<span class="sourceLineNo">201</span>   }<a name="line.201"></a>
-<span class="sourceLineNo">202</span><a name="line.202"></a>
-<span class="sourceLineNo">203</span>   /**<a name="line.203"></a>
-<span class="sourceLineNo">204</span>    * If the specified class is a primitive (e.g. &lt;code&gt;&lt;jk&gt;int&lt;/jk&gt;.&lt;jk&gt;class&lt;/jk&gt;&lt;/code&gt;)<a name="line.204"></a>
-<span class="sourceLineNo">205</span>    *    returns it's wrapper class (e.g. &lt;code&gt;Integer.&lt;jk&gt;class&lt;/jk&gt;&lt;/code&gt;).<a name="line.205"></a>
-<span class="sourceLineNo">206</span>    *<a name="line.206"></a>
-<span class="sourceLineNo">207</span>    * @param c The class.<a name="line.207"></a>
-<span class="sourceLineNo">208</span>    * @return The wrapper class, or &lt;jk&gt;null&lt;/jk&gt; if class is not a primitive.<a name="line.208"></a>
-<span class="sourceLineNo">209</span>    */<a name="line.209"></a>
-<span class="sourceLineNo">210</span>   public static Class&lt;?&gt; getPrimitiveWrapper(Class&lt;?&gt; c) {<a name="line.210"></a>
-<span class="sourceLineNo">211</span>      return pmap1.get(c);<a name="line.211"></a>
-<span class="sourceLineNo">212</span>   }<a name="line.212"></a>
-<span class="sourceLineNo">213</span><a name="line.213"></a>
-<span class="sourceLineNo">214</span>   /**<a name="line.214"></a>
-<span class="sourceLineNo">215</span>    * If the specified class is a primitive wrapper (e.g. &lt;code&gt;&lt;jk&gt;Integer&lt;/jk&gt;.&lt;jk&gt;class&lt;/jk&gt;&lt;/code&gt;)<a name="line.215"></a>
-<span class="sourceLineNo">216</span>    *    returns it's primitive class (e.g. &lt;code&gt;int.&lt;jk&gt;class&lt;/jk&gt;&lt;/code&gt;).<a name="line.216"></a>
-<span class="sourceLineNo">217</span>    *<a name="line.217"></a>
-<span class="sourceLineNo">218</span>    * @param c The class.<a name="line.218"></a>
-<span class="sourceLineNo">219</span>    * @return The primitive class, or &lt;jk&gt;null&lt;/jk&gt; if class is not a primitive wrapper.<a name="line.219"></a>
-<span class="sourceLineNo">220</span>    */<a name="line.220"></a>
-<span class="sourceLineNo">221</span>   public static Class&lt;?&gt; getPrimitiveForWrapper(Class&lt;?&gt; c) {<a name="line.221"></a>
-<span class="sourceLineNo">222</span>      return pmap2.get(c);<a name="line.222"></a>
-<span class="sourceLineNo">223</span>   }<a name="line.223"></a>
-<span class="sourceLineNo">224</span><a name="line.224"></a>
-<span class="sourceLineNo">225</span>   /**<a name="line.225"></a>
-<span class="sourceLineNo">226</span>    * If the specified class is a primitive (e.g. &lt;code&gt;&lt;jk&gt;int&lt;/jk&gt;.&lt;jk&gt;class&lt;/jk&gt;&lt;/code&gt;)<a name="line.226"></a>
-<span class="sourceLineNo">227</span>    *    returns it's wrapper class (e.g. &lt;code&gt;Integer.&lt;jk&gt;class&lt;/jk&gt;&lt;/code&gt;).<a name="line.227"></a>
-<span class="sourceLineNo">228</span>    *<a name="line.228"></a>
-<span class="sourceLineNo">229</span>    * @param c The class.<a name="line.229"></a>
-<span class="sourceLineNo">230</span>    * @return The wrapper class if it's primitive, or the same class if class is not a primitive.<a name="line.230"></a>
-<span class="sourceLineNo">231</span>    */<a name="line.231"></a>
-<span class="sourceLineNo">232</span>   public static Class&lt;?&gt; getWrapperIfPrimitive(Class&lt;?&gt; c) {<a name="line.232"></a>
-<span class="sourceLineNo">233</span>      if (! c.isPrimitive())<a name="line.233"></a>
-<span class="sourceLineNo">234</span>         return c;<a name="line.234"></a>
-<span class="sourceLineNo">235</span>      return pmap1.get(c);<a name="line.235"></a>
+<span class="sourceLineNo">161</span>    * Comparator for use with {@link TreeMap TreeMaps} with {@link Class} keys.<a name="line.161"></a>
+<span class="sourceLineNo">162</span>    */<a name="line.162"></a>
+<span class="sourceLineNo">163</span>   public final static class ClassComparator implements Comparator&lt;Class&lt;?&gt;&gt;, Serializable {<a name="line.163"></a>
+<span class="sourceLineNo">164</span><a name="line.164"></a>
+<span class="sourceLineNo">165</span>      private static final long serialVersionUID = 1L;<a name="line.165"></a>
+<span class="sourceLineNo">166</span><a name="line.166"></a>
+<span class="sourceLineNo">167</span>      @Override /* Comparator */<a name="line.167"></a>
+<span class="sourceLineNo">168</span>      public int compare(Class&lt;?&gt; object1, Class&lt;?&gt; object2) {<a name="line.168"></a>
+<span class="sourceLineNo">169</span>         return object1.getName().compareTo(object2.getName());<a name="line.169"></a>
+<span class="sourceLineNo">170</span>      }<a name="line.170"></a>
+<span class="sourceLineNo">171</span>   }<a name="line.171"></a>
+<span class="sourceLineNo">172</span><a name="line.172"></a>
+<span class="sourceLineNo">173</span>   /**<a name="line.173"></a>
+<span class="sourceLineNo">174</span>    * Returns the signature of the specified method.<a name="line.174"></a>
+<span class="sourceLineNo">175</span>    * For no-arg methods, the signature will be a simple string such as &lt;js&gt;"toString"&lt;/js&gt;.<a name="line.175"></a>
+<span class="sourceLineNo">176</span>    * For methods with one or more args, the arguments will be fully-qualified class names (e.g. &lt;js&gt;"append(java.util.StringBuilder,boolean)"&lt;/js&gt;)<a name="line.176"></a>
+<span class="sourceLineNo">177</span>    *<a name="line.177"></a>
+<span class="sourceLineNo">178</span>    * @param m The methods to get the signature on.<a name="line.178"></a>
+<span class="sourceLineNo">179</span>    * @return The methods signature.<a name="line.179"></a>
+<span class="sourceLineNo">180</span>    */<a name="line.180"></a>
+<span class="sourceLineNo">181</span>   public static String getMethodSignature(Method m) {<a name="line.181"></a>
+<span class="sourceLineNo">182</span>      StringBuilder sb = new StringBuilder(m.getName());<a name="line.182"></a>
+<span class="sourceLineNo">183</span>      Class&lt;?&gt;[] pt = m.getParameterTypes();<a name="line.183"></a>
+<span class="sourceLineNo">184</span>      if (pt.length &gt; 0) {<a name="line.184"></a>
+<span class="sourceLineNo">185</span>         sb.append('(');<a name="line.185"></a>
+<span class="sourceLineNo">186</span>         for (int i = 0; i &lt; pt.length; i++) {<a name="line.186"></a>
+<span class="sourceLineNo">187</span>            if (i &gt; 0)<a name="line.187"></a>
+<span class="sourceLineNo">188</span>               sb.append(',');<a name="line.188"></a>
+<span class="sourceLineNo">189</span>            sb.append(getReadableClassName(pt[i]));<a name="line.189"></a>
+<span class="sourceLineNo">190</span>         }<a name="line.190"></a>
+<span class="sourceLineNo">191</span>         sb.append(')');<a name="line.191"></a>
+<span class="sourceLineNo">192</span>      }<a name="line.192"></a>
+<span class="sourceLineNo">193</span>      return sb.toString();<a name="line.193"></a>
+<span class="sourceLineNo">194</span>   }<a name="line.194"></a>
+<span class="sourceLineNo">195</span><a name="line.195"></a>
+<span class="sourceLineNo">196</span>   private final static Map&lt;Class&lt;?&gt;, Class&lt;?&gt;&gt; pmap1 = new HashMap&lt;Class&lt;?&gt;, Class&lt;?&gt;&gt;(), pmap2 = new HashMap&lt;Class&lt;?&gt;, Class&lt;?&gt;&gt;();<a name="line.196"></a>
+<span class="sourceLineNo">197</span>   static {<a name="line.197"></a>
+<span class="sourceLineNo">198</span>      pmap1.put(boolean.class, Boolean.class);<a name="line.198"></a>
+<span class="sourceLineNo">199</span>      pmap1.put(byte.class, Byte.class);<a name="line.199"></a>
+<span class="sourceLineNo">200</span>      pmap1.put(short.class, Short.class);<a name="line.200"></a>
+<span class="sourceLineNo">201</span>      pmap1.put(char.class, Character.class);<a name="line.201"></a>
+<span class="sourceLineNo">202</span>      pmap1.put(int.class, Integer.class);<a name="line.202"></a>
+<span class="sourceLineNo">203</span>      pmap1.put(long.class, Long.class);<a name="line.203"></a>
+<span class="sourceLineNo">204</span>      pmap1.put(float.class, Float.class);<a name="line.204"></a>
+<span class="sourceLineNo">205</span>      pmap1.put(double.class, Double.class);<a name="line.205"></a>
+<span class="sourceLineNo">206</span>      pmap2.put(Boolean.class, boolean.class);<a name="line.206"></a>
+<span class="sourceLineNo">207</span>      pmap2.put(Byte.class, byte.class);<a name="line.207"></a>
+<span class="sourceLineNo">208</span>      pmap2.put(Short.class, short.class);<a name="line.208"></a>
+<span class="sourceLineNo">209</span>      pmap2.put(Character.class, char.class);<a name="line.209"></a>
+<span class="sourceLineNo">210</span>      pmap2.put(Integer.class, int.class);<a name="line.210"></a>
+<span class="sourceLineNo">211</span>      pmap2.put(Long.class, long.class);<a name="line.211"></a>
+<span class="sourceLineNo">212</span>      pmap2.put(Float.class, float.class);<a name="line.212"></a>
+<span class="sourceLineNo">213</span>      pmap2.put(Double.class, double.class);<a name="line.213"></a>
+<span class="sourceLineNo">214</span>   }<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>    * If the specified class is a primitive (e.g. &lt;code&gt;&lt;jk&gt;int&lt;/jk&gt;.&lt;jk&gt;class&lt;/jk&gt;&lt;/code&gt;)<a name="line.217"></a>
+<span class="sourceLineNo">218</span>    *    returns it's wrapper class (e.g. &lt;code&gt;Integer.&lt;jk&gt;class&lt;/jk&gt;&lt;/code&gt;).<a name="line.218"></a>
+<span class="sourceLineNo">219</span>    *<a name="line.219"></a>
+<span class="sourceLineNo">220</span>    * @param c The class.<a name="line.220"></a>
+<span class="sourceLineNo">221</span>    * @return The wrapper class, or &lt;jk&gt;null&lt;/jk&gt; if class is not a primitive.<a name="line.221"></a>
+<span class="sourceLineNo">222</span>    */<a name="line.222"></a>
+<span class="sourceLineNo">223</span>   public static Class&lt;?&gt; getPrimitiveWrapper(Class&lt;?&gt; c) {<a name="line.223"></a>
+<span class="sourceLineNo">224</span>      return pmap1.get(c);<a name="line.224"></a>
+<span class="sourceLineNo">225</span>   }<a name="line.225"></a>
+<span class="sourceLineNo">226</span><a name="line.226"></a>
+<span class="sourceLineNo">227</span>   /**<a name="line.227"></a>
+<span class="sourceLineNo">228</span>    * If the specified class is a primitive wrapper (e.g. &lt;code&gt;&lt;jk&gt;Integer&lt;/jk&gt;.&lt;jk&gt;class&lt;/jk&gt;&lt;/code&gt;)<a name="line.228"></a>
+<span class="sourceLineNo">229</span>    *    returns it's primitive class (e.g. &lt;code&gt;int.&lt;jk&gt;class&lt;/jk&gt;&lt;/code&gt;).<a name="line.229"></a>
+<span class="sourceLineNo">230</span>    *<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    * @param c The class.<a name="line.231"></a>
+<span class="sourceLineNo">232</span>    * @return The primitive class, or &lt;jk&gt;null&lt;/jk&gt; if class is not a primitive wrapper.<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    */<a name="line.233"></a>
+<span class="sourceLineNo">234</span>   public static Class&lt;?&gt; getPrimitiveForWrapper(Class&lt;?&gt; c) {<a name="line.234"></a>
+<span class="sourceLineNo">235</span>      return pmap2.get(c);<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>   /**<a name="line.238"></a>
-<span class="sourceLineNo">239</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified class has the {@link Deprecated @Deprecated} annotation on it.<a name="line.239"></a>
-<span class="sourceLineNo">240</span>    *<a name="line.240"></a>
-<span class="sourceLineNo">241</span>    * @param c The class.<a name="line.241"></a>
-<span class="sourceLineNo">242</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the specified class has the {@link Deprecated @Deprecated} annotation on it.<a name="line.242"></a>
-<span class="sourceLineNo">243</span>    */<a name="line.243"></a>
-<span class="sourceLineNo">244</span>   public static boolean isNotDeprecated(Class&lt;?&gt; c) {<a name="line.244"></a>
-<span class="sourceLineNo">245</span>      return ! c.isAnnotationPresent(Deprecated.class);<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>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified method has the {@link Deprecated @Deprecated} annotation on it.<a name="line.249"></a>
-<span class="sourceLineNo">250</span>    *<a name="line.250"></a>
-<span class="sourceLineNo">251</span>    * @param m The method.<a name="line.251"></a>
-<span class="sourceLineNo">252</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the specified method has the {@link Deprecated @Deprecated} annotation on it.<a name="line.252"></a>
-<span class="sourceLineNo">253</span>    */<a name="line.253"></a>
-<span class="sourceLineNo">254</span>   public static boolean isNotDeprecated(Method m) {<a name="line.254"></a>
-<span class="sourceLineNo">255</span>      return ! m.isAnnotationPresent(Deprecated.class);<a name="line.255"></a>
-<span class="sourceLineNo">256</span><a name="line.256"></a>
-<span class="sourceLineNo">257</span>   }<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>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified constructor has the {@link Deprecated @Deprecated} annotation on it.<a name="line.260"></a>
-<span class="sourceLineNo">261</span>    *<a name="line.261"></a>
-<span class="sourceLineNo">262</span>    * @param c The constructor.<a name="line.262"></a>
-<span class="sourceLineNo">263</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the specified constructor has the {@link Deprecated @Deprecated} annotation on it.<a name="line.263"></a>
-<span class="sourceLineNo">264</span>    */<a name="line.264"></a>
-<span class="sourceLineNo">265</span>   public static boolean isNotDeprecated(Constructor&lt;?&gt; c) {<a name="line.265"></a>
-<span class="sourceLineNo">266</span>      return ! c.isAnnotationPresent(Deprecated.class);<a name="line.266"></a>
-<span class="sourceLineNo">267</span>   }<a name="line.267"></a>
-<span class="sourceLineNo">268</span><a name="line.268"></a>
-<span class="sourceLineNo">269</span>   /**<a name="line.269"></a>
-<span class="sourceLineNo">270</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified class is public.<a name="line.270"></a>
-<span class="sourceLineNo">271</span>    *<a name="line.271"></a>
-<span class="sourceLineNo">272</span>    * @param c The class.<a name="line.272"></a>
-<span class="sourceLineNo">273</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the specified class is public.<a name="line.273"></a>
-<span class="sourceLineNo">274</span>    */<a name="line.274"></a>
-<span class="sourceLineNo">275</span>   public static boolean isPublic(Class&lt;?&gt; c) {<a name="line.275"></a>
-<span class="sourceLineNo">276</span>      return Modifier.isPublic(c.getModifiers());<a name="line.276"></a>
-<span class="sourceLineNo">277</span>   }<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>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified class is public.<a name="line.280"></a>
-<span class="sourceLineNo">281</span>    *<a name="line.281"></a>
-<span class="sourceLineNo">282</span>    * @param c The class.<a name="line.282"></a>
-<span class="sourceLineNo">283</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the specified class is public.<a name="line.283"></a>
-<span class="sourceLineNo">284</span>    */<a name="line.284"></a>
-<span class="sourceLineNo">285</span>   public static boolean isStatic(Class&lt;?&gt; c) {<a name="line.285"></a>
-<span class="sourceLineNo">286</span>      return Modifier.isStatic(c.getModifiers());<a name="line.286"></a>
-<span class="sourceLineNo">287</span>   }<a name="line.287"></a>
-<span class="sourceLineNo">288</span><a name="line.288"></a>
-<span class="sourceLineNo">289</span>   /**<a name="line.289"></a>
-<span class="sourceLineNo">290</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified method is public.<a name="line.290"></a>
-<span class="sourceLineNo">291</span>    *<a name="line.291"></a>
-<span class="sourceLineNo">292</span>    * @param m The method.<a name="line.292"></a>
-<span class="sourceLineNo">293</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the specified method is public.<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    */<a name="line.294"></a>
-<span class="sourceLineNo">295</span>   public static boolean isPublic(Method m) {<a name="line.295"></a>
-<span class="sourceLineNo">296</span>      return Modifier.isPublic(m.getModifiers());<a name="line.296"></a>
-<span class="sourceLineNo">297</span>   }<a name="line.297"></a>
-<span class="sourceLineNo">298</span><a name="line.298"></a>
-<span class="sourceLineNo">299</span>   /**<a name="line.299"></a>
-<span class="sourceLineNo">300</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified method is static.<a name="line.300"></a>
-<span class="sourceLineNo">301</span>    *<a name="line.301"></a>
-<span class="sourceLineNo">302</span>    * @param m The method.<a name="line.302"></a>
-<span class="sourceLineNo">303</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the specified method is static.<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    */<a name="line.304"></a>
-<span class="sourceLineNo">305</span>   public static boolean isStatic(Method m) {<a name="line.305"></a>
-<span class="sourceLineNo">306</span>      return Modifier.isStatic(m.getModifiers());<a name="line.306"></a>
-<span class="sourceLineNo">307</span>   }<a name="line.307"></a>
-<span class="sourceLineNo">308</span><a name="line.308"></a>
-<span class="sourceLineNo">309</span>   /**<a name="line.309"></a>
-<span class="sourceLineNo">310</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified constructor is public.<a name="line.310"></a>
-<span class="sourceLineNo">311</span>    *<a name="line.311"></a>
-<span class="sourceLineNo">312</span>    * @param c The constructor.<a name="line.312"></a>
-<span class="sourceLineNo">313</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the specified constructor is public.<a name="line.313"></a>
-<span class="sourceLineNo">314</span>    */<a name="line.314"></a>
-<span class="sourceLineNo">315</span>   public static boolean isPublic(Constructor&lt;?&gt; c) {<a name="line.315"></a>
-<span class="sourceLineNo">316</span>      return Modifier.isPublic(c.getModifiers());<a name="line.316"></a>
-<span class="sourceLineNo">317</span>   }<a name="line.317"></a>
-<span class="sourceLineNo">318</span><a name="line.318"></a>
-<span class="sourceLineNo">319</span><a name="line.319"></a>
-<span class="sourceLineNo">320</span>   /**<a name="line.320"></a>
-<span class="sourceLineNo">321</span>    * Locates the no-arg constructor for the specified class.<a name="line.321"></a>
-<span class="sourceLineNo">322</span>    * Constructor must match the visibility requirements specified by parameter 'v'.<a name="line.322"></a>
-<span class="sourceLineNo">323</span>    * If class is abstract, always returns &lt;jk&gt;null&lt;/jk&gt;.<a name="line.323"></a>
-<span class="sourceLineNo">324</span>    * Note that this also returns the 1-arg constructor for non-static member classes.<a name="line.324"></a>
-<span class="sourceLineNo">325</span>    *<a name="line.325"></a>
-<span class="sourceLineNo">326</span>    * @param c The class from which to locate the no-arg constructor.<a name="line.326"></a>
-<span class="sourceLineNo">327</span>    * @param v The minimum visibility.<a name="line.327"></a>
-<span class="sourceLineNo">328</span>    * @return The constructor, or &lt;jk&gt;null&lt;/jk&gt; if no no-arg constructor exists with the required visibility.<a name="line.328"></a>
-<span class="sourceLineNo">329</span>    */<a name="line.329"></a>
-<span class="sourceLineNo">330</span>   @SuppressWarnings({"rawtypes","unchecked"})<a name="line.330"></a>
-<span class="sourceLineNo">331</span>   public static final &lt;T&gt; Constructor&lt;T&gt; findNoArgConstructor(Class&lt;T&gt; c, Visibility v) {<a name="line.331"></a>
-<span class="sourceLineNo">332</span>      int mod = c.getModifiers();<a name="line.332"></a>
-<span class="sourceLineNo">333</span>      if (Modifier.isAbstract(mod))<a name="line.333"></a>
-<span class="sourceLineNo">334</span>         return null;<a name="line.334"></a>
-<span class="sourceLineNo">335</span>      boolean isMemberClass = c.isMemberClass() &amp;&amp; ! isStatic(c);<a name="line.335"></a>
-<span class="sourceLineNo">336</span>      for (Constructor cc : c.getConstructors()) {<a name="line.336"></a>
-<span class="sourceLineNo">337</span>         mod = cc.getModifiers();<a name="line.337"></a>
-<span class="sourceLineNo">338</span>         if (cc.getParameterTypes().length == (isMemberClass ? 1 : 0) &amp;&amp; v.isVisible(mod) &amp;&amp; isNotDeprecated(cc))<a name="line.338"></a>
-<span class="sourceLineNo">339</span>            return v.transform(cc);<a name="line.339"></a>
-<span class="sourceLineNo">340</span>      }<a name="line.340"></a>
-<span class="sourceLineNo">341</span>      return null;<a name="line.341"></a>
-<span class="sourceLineNo">342</span>   }<a name="line.342"></a>
-<span class="sourceLineNo">343</span><a name="line.343"></a>
-<span class="sourceLineNo">344</span>   /**<a name="line.344"></a>
-<span class="sourceLineNo">345</span>    * Finds the real parameter type of the specified class.<a name="line.345"></a>
-<span class="sourceLineNo">346</span>    *<a name="line.346"></a>
-<span class="sourceLineNo">347</span>    * @param c The class containing the parameters (e.g. PojoSwap&amp;lt;T,S&amp;gt;)<a name="line.347"></a>
-<span class="sourceLineNo">348</span>    * @param index The zero-based index of the parameter to resolve.<a name="line.348"></a>
-<span class="sourceLineNo">349</span>    * @param oc The class we're trying to resolve the parameter type for.<a name="line.349"></a>
-<span class="sourceLineNo">350</span>    * @return The resolved real class.<a name="line.350"></a>
-<span class="sourceLineNo">351</span>    */<a name="line.351"></a>
-<span class="sourceLineNo">352</span>   public static Class&lt;?&gt; resolveParameterType(Class&lt;?&gt; c, int index, Class&lt;?&gt; oc) {<a name="line.352"></a>
-<span class="sourceLineNo">353</span><a name="line.353"></a>
-<span class="sourceLineNo">354</span>      // We need to make up a mapping of type names.<a name="line.354"></a>
-<span class="sourceLineNo">355</span>      Map&lt;Type,Type&gt; typeMap = new HashMap&lt;Type,Type&gt;();<a name="line.355"></a>
-<span class="sourceLineNo">356</span>      while (c != oc.getSuperclass()) {<a name="line.356"></a>
-<span class="sourceLineNo">357</span>         extractTypes(typeMap, oc);<a name="line.357"></a>
-<span class="sourceLineNo">358</span>         oc = oc.getSuperclass();<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>      ParameterizedType opt = (ParameterizedType)oc.getGenericSuperclass();<a name="line.361"></a>
-<span class="sourceLineNo">362</span>      Type actualType = opt.getActualTypeArguments()[index];<a name="line.362"></a>
-<span class="sourceLineNo">363</span><a name="line.363"></a>
-<span class="sourceLineNo">364</span>      if (typeMap.containsKey(actualType))<a name="line.364"></a>
-<span class="sourceLineNo">365</span>         actualType = typeMap.get(actualType);<a name="line.365"></a>
+<span class="sourceLineNo">239</span>    * If the specified class is a primitive (e.g. &lt;code&gt;&lt;jk&gt;int&lt;/jk&gt;.&lt;jk&gt;class&lt;/jk&gt;&lt;/code&gt;)<a name="line.239"></a>
+<span class="sourceLineNo">240</span>    *    returns it's wrapper class (e.g. &lt;code&gt;Integer.&lt;jk&gt;class&lt;/jk&gt;&lt;/code&gt;).<a name="line.240"></a>
+<span class="sourceLineNo">241</span>    *<a name="line.241"></a>
+<span class="sourceLineNo">242</span>    * @param c The class.<a name="line.242"></a>
+<span class="sourceLineNo">243</span>    * @return The wrapper class if it's primitive, or the same class if class is not a primitive.<a name="line.243"></a>
+<span class="sourceLineNo">244</span>    */<a name="line.244"></a>
+<span class="sourceLineNo">245</span>   public static Class&lt;?&gt; getWrapperIfPrimitive(Class&lt;?&gt; c) {<a name="line.245"></a>
+<span class="sourceLineNo">246</span>      if (! c.isPrimitive())<a name="line.246"></a>
+<span class="sourceLineNo">247</span>         return c;<a name="line.247"></a>
+<span class="sourceLineNo">248</span>      return pmap1.get(c);<a name="line.248"></a>
+<span class="sourceLineNo">249</span>   }<a name="line.249"></a>
+<span class="sourceLineNo">250</span><a name="line.250"></a>
+<span class="sourceLineNo">251</span>   /**<a name="line.251"></a>
+<span class="sourceLineNo">252</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified class has the {@link Deprecated @Deprecated} annotation on it.<a name="line.252"></a>
+<span class="sourceLineNo">253</span>    *<a name="line.253"></a>
+<span class="sourceLineNo">254</span>    * @param c The class.<a name="line.254"></a>
+<span class="sourceLineNo">255</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the specified class has the {@link Deprecated @Deprecated} annotation on it.<a name="line.255"></a>
+<span class="sourceLineNo">256</span>    */<a name="line.256"></a>
+<span class="sourceLineNo">257</span>   public static boolean isNotDeprecated(Class&lt;?&gt; c) {<a name="line.257"></a>
+<span class="sourceLineNo">258</span>      return ! c.isAnnotationPresent(Deprecated.class);<a name="line.258"></a>
+<span class="sourceLineNo">259</span>   }<a name="line.259"></a>
+<span class="sourceLineNo">260</span><a name="line.260"></a>
+<span class="sourceLineNo">261</span>   /**<a name="line.261"></a>
+<span class="sourceLineNo">262</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified method has the {@link Deprecated @Deprecated} annotation on it.<a name="line.262"></a>
+<span class="sourceLineNo">263</span>    *<a name="line.263"></a>
+<span class="sourceLineNo">264</span>    * @param m The method.<a name="line.264"></a>
+<span class="sourceLineNo">265</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the specified method has the {@link Deprecated @Deprecated} annotation on it.<a name="line.265"></a>
+<span class="sourceLineNo">266</span>    */<a name="line.266"></a>
+<span class="sourceLineNo">267</span>   public static boolean isNotDeprecated(Method m) {<a name="line.267"></a>
+<span class="sourceLineNo">268</span>      return ! m.isAnnotationPresent(Deprecated.class);<a name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span>   }<a name="line.270"></a>
+<span class="sourceLineNo">271</span><a name="line.271"></a>
+<span class="sourceLineNo">272</span>   /**<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified constructor has the {@link Deprecated @Deprecated} annotation on it.<a name="line.273"></a>
+<span class="sourceLineNo">274</span>    *<a name="line.274"></a>
+<span class="sourceLineNo">275</span>    * @param c The constructor.<a name="line.275"></a>
+<span class="sourceLineNo">276</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the specified constructor has the {@link Deprecated @Deprecated} annotation on it.<a name="line.276"></a>
+<span class="sourceLineNo">277</span>    */<a name="line.277"></a>
+<span class="sourceLineNo">278</span>   public static boolean isNotDeprecated(Constructor&lt;?&gt; c) {<a name="line.278"></a>
+<span class="sourceLineNo">279</span>      return ! c.isAnnotationPresent(Deprecated.class);<a name="line.279"></a>
+<span class="sourceLineNo">280</span>   }<a name="line.280"></a>
+<span class="sourceLineNo">281</span><a name="line.281"></a>
+<span class="sourceLineNo">282</span>   /**<a name="line.282"></a>
+<span class="sourceLineNo">283</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified class is public.<a name="line.283"></a>
+<span class="sourceLineNo">284</span>    *<a name="line.284"></a>
+<span class="sourceLineNo">285</span>    * @param c The class.<a name="line.285"></a>
+<span class="sourceLineNo">286</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the specified class is public.<a name="line.286"></a>
+<span class="sourceLineNo">287</span>    */<a name="line.287"></a>
+<span class="sourceLineNo">288</span>   public static boolean isPublic(Class&lt;?&gt; c) {<a name="line.288"></a>
+<span class="sourceLineNo">289</span>      return Modifier.isPublic(c.getModifiers());<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>   /**<a name="line.292"></a>
+<span class="sourceLineNo">293</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified class is public.<a name="line.293"></a>
+<span class="sourceLineNo">294</span>    *<a name="line.294"></a>
+<span class="sourceLineNo">295</span>    * @param c The class.<a name="line.295"></a>
+<span class="sourceLineNo">296</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the specified class is public.<a name="line.296"></a>
+<span class="sourceLineNo">297</span>    */<a name="line.297"></a>
+<span class="sourceLineNo">298</span>   public static boolean isStatic(Class&lt;?&gt; c) {<a name="line.298"></a>
+<span class="sourceLineNo">299</span>      return Modifier.isStatic(c.getModifiers());<a name="line.299"></a>
+<span class="sourceLineNo">300</span>   }<a name="line.300"></a>
+<span class="sourceLineNo">301</span><a name="line.301"></a>
+<span class="sourceLineNo">302</span>   /**<a name="line.302"></a>
+<span class="sourceLineNo">303</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified method is public.<a name="line.303"></a>
+<span class="sourceLineNo">304</span>    *<a name="line.304"></a>
+<span class="sourceLineNo">305</span>    * @param m The method.<a name="line.305"></a>
+<span class="sourceLineNo">306</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the specified method is public.<a name="line.306"></a>
+<span class="sourceLineNo">307</span>    */<a name="line.307"></a>
+<span class="sourceLineNo">308</span>   public static boolean isPublic(Method m) {<a name="line.308"></a>
+<span class="sourceLineNo">309</span>      return Modifier.isPublic(m.getModifiers());<a name="line.309"></a>
+<span class="sourceLineNo">310</span>   }<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>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified method is static.<a name="line.313"></a>
+<span class="sourceLineNo">314</span>    *<a name="line.314"></a>
+<span class="sourceLineNo">315</span>    * @param m The method.<a name="line.315"></a>
+<span class="sourceLineNo">316</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the specified method is static.<a name="line.316"></a>
+<span class="sourceLineNo">317</span>    */<a name="line.317"></a>
+<span class="sourceLineNo">318</span>   public static boolean isStatic(Method m) {<a name="line.318"></a>
+<span class="sourceLineNo">319</span>      return Modifier.isStatic(m.getModifiers());<a name="line.319"></a>
+<span class="sourceLineNo">320</span>   }<a name="line.320"></a>
+<span class="sourceLineNo">321</span><a name="line.321"></a>
+<span class="sourceLineNo">322</span>   /**<a name="line.322"></a>
+<span class="sourceLineNo">323</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified constructor is public.<a name="line.323"></a>
+<span class="sourceLineNo">324</span>    *<a name="line.324"></a>
+<span class="sourceLineNo">325</span>    * @param c The constructor.<a name="line.325"></a>
+<span class="sourceLineNo">326</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the specified constructor is public.<a name="line.326"></a>
+<span class="sourceLineNo">327</span>    */<a name="line.327"></a>
+<span class="sourceLineNo">328</span>   public static boolean isPublic(Constructor&lt;?&gt; c) {<a name="line.328"></a>
+<span class="sourceLineNo">329</span>      return Modifier.isPublic(c.getModifiers());<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>   /**<a name="line.333"></a>
+<span class="sourceLineNo">334</span>    * Locates the no-arg constructor for the specified class.<a name="line.334"></a>
+<span class="sourceLineNo">335</span>    * Constructor must match the visibility requirements specified by parameter 'v'.<a name="line.335"></a>
+<span class="sourceLineNo">336</span>    * If class is abstract, always returns &lt;jk&gt;null&lt;/jk&gt;.<a name="line.336"></a>
+<span class="sourceLineNo">337</span>    * Note that this also returns the 1-arg constructor for non-static member classes.<a name="line.337"></a>
+<span class="sourceLineNo">338</span>    *<a name="line.338"></a>
+<span class="sourceLineNo">339</span>    * @param c The class from which to locate the no-arg constructor.<a name="line.339"></a>
+<span class="sourceLineNo">340</span>    * @param v The minimum visibility.<a name="line.340"></a>
+<span class="sourceLineNo">341</span>    * @return The constructor, or &lt;jk&gt;null&lt;/jk&gt; if no no-arg constructor exists with the required visibility.<a name="line.341"></a>
+<span class="sourceLineNo">342</span>    */<a name="line.342"></a>
+<span class="sourceLineNo">343</span>   @SuppressWarnings({"rawtypes","unchecked"})<a name="line.343"></a>
+<span class="sourceLineNo">344</span>   public static final &lt;T&gt; Constructor&lt;T&gt; findNoArgConstructor(Class&lt;T&gt; c, Visibility v) {<a name="line.344"></a>
+<span class="sourceLineNo">345</span>      int mod = c.getModifiers();<a name="line.345"></a>
+<span class="sourceLineNo">346</span>      if (Modifier.isAbstract(mod))<a name="line.346"></a>
+<span class="sourceLineNo">347</span>         return null;<a name="line.347"></a>
+<span class="sourceLineNo">348</span>      boolean isMemberClass = c.isMemberClass() &amp;&amp; ! isStatic(c);<a name="line.348"></a>
+<span class="sourceLineNo">349</span>      for (Constructor cc : c.getConstructors()) {<a name="line.349"></a>
+<span class="sourceLineNo">350</span>         mod = cc.getModifiers();<a name="line.350"></a>
+<span class="sourceLineNo">351</span>         if (cc.getParameterTypes().length == (isMemberClass ? 1 : 0) &amp;&amp; v.isVisible(mod) &amp;&amp; isNotDeprecated(cc))<a name="line.351"></a>
+<span class="sourceLineNo">352</span>            return v.transform(cc);<a name="line.352"></a>
+<span class="sourceLineNo">353</span>      }<a name="line.353"></a>
+<span class="sourceLineNo">354</span>      return null;<a name="line.354"></a>
+<span class="sourceLineNo">355</span>   }<a name="line.355"></a>
+<span class="sourceLineNo">356</span><a name="line.356"></a>
+<span class="sourceLineNo">357</span>   /**<a name="line.357"></a>
+<span class="sourceLineNo">358</span>    * Finds the real parameter type of the specified class.<a name="line.358"></a>
+<span class="sourceLineNo">359</span>    *<a name="line.359"></a>
+<span class="sourceLineNo">360</span>    * @param c The class containing the parameters (e.g. PojoSwap&amp;lt;T,S&amp;gt;)<a name="line.360"></a>
+<span class="sourceLineNo">361</span>    * @param index The zero-based index of the parameter to resolve.<a name="line.361"></a>
+<span class="sourceLineNo">362</span>    * @param oc The class we're trying to resolve the parameter type for.<a name="line.362"></a>
+<span class="sourceLineNo">363</span>    * @return The resolved real class.<a name="line.363"></a>
+<span class="sourceLineNo">364</span>    */<a name="line.364"></a>
+<span class="sourceLineNo">365</span>   public static Class&lt;?&gt; resolveParameterType(Class&lt;?&gt; c, int index, Class&lt;?&gt; oc) {<a name="line.365"></a>
 <span class="sourceLineNo">366</span><a name="line.366"></a>
-<span class="sourceLineNo">367</span>      if (actualType instanceof Class) {<a name="line.367"></a>
-<span class="sourceLineNo">368</span>         return (Class&lt;?&gt;)actualType;<a name="line.368"></a>
-<span class="sourceLineNo">369</span><a name="line.369"></a>
-<span class="sourceLineNo">370</span>      } else if (actualType instanceof GenericArrayType) {<a name="line.370"></a>
-<span class="sourceLineNo">371</span>         Class&lt;?&gt; cmpntType = (Class&lt;?&gt;)((GenericArrayType)actualType).getGenericComponentType();<a name="line.371"></a>
-<span class="sourceLineNo">372</span>         return Array.newInstance(cmpntType, 0).getClass();<a name="line.372"></a>
+<span class="sourceLineNo">367</span>      // We need to make up a mapping of type names.<a name="line.367"></a>
+<span class="sourceLineNo">368</span>      Map&lt;Type,Type&gt; typeMap = new HashMap&lt;Type,Type&gt;();<a name="line.368"></a>
+<span class="sourceLineNo">369</span>      while (c != oc.getSuperclass()) {<a name="line.369"></a>
+<span class="sourceLineNo">370</span>         extractTypes(typeMap, oc);<a name="line.370"></a>
+<span class="sourceLineNo">371</span>         oc = oc.getSuperclass();<a name="line.371"></a>
+<span class="sourceLineNo">372</span>      }<a name="line.372"></a>
 <span class="sourceLineNo">373</span><a name="line.373"></a>
-<span class="sourceLineNo">374</span>      } else if (actualType instanceof TypeVariable) {<a name="line.374"></a>
-<span class="sourceLineNo">375</span>         TypeVariable&lt;?&gt; typeVariable = (TypeVariable&lt;?&gt;)actualType;<a name="line.375"></a>
-<span class="sourceLineNo">376</span>         List&lt;Class&lt;?&gt;&gt; nestedOuterTypes = new LinkedList&lt;Class&lt;?&gt;&gt;();<a name="line.376"></a>
-<span class="sourceLineNo">377</span>         for (Class&lt;?&gt; ec = oc.getEnclosingClass(); ec != null; ec = ec.getEnclosingClass()) {<a name="line.377"></a>
-<span class="sourceLineNo">378</span>            try {<a name="line.378"></a>
-<span class="sourceLineNo">379</span>               Class&lt;?&gt; outerClass = oc.getClass();<a name="line.379"></a>
-<span class="sourceLineNo">380</span>               nestedOuterTypes.add(outerClass);<a name="line.380"></a>
-<span class="sourceLineNo">381</span>               Map&lt;Type,Type&gt; outerTypeMap = new HashMap&lt;Type,Type&gt;();<a name="line.381"></a>
-<span class="sourceLineNo">382</span>               extractTypes(outerTypeMap, outerClass);<a name="line.382"></a>
-<span class="sourceLineNo">383</span>               for (Map.Entry&lt;Type,Type&gt; entry : outerTypeMap.entrySet()) {<a name="line.383"></a>
-<span class="sourceLineNo">384</span>                  Type key = entry.getKey(), value = entry.getValue();<a name="line.384"></a>
-<span class="sourceLineNo">385</span>                  if (key instanceof TypeVariable) {<a name="line.385"></a>
-<span class="sourceLineNo">386</span>                     TypeVariable&lt;?&gt; keyType = (TypeVariable&lt;?&gt;)key;<a name="line.386"></a>
-<span class="sourceLineNo">387</span>                     if (keyType.getName().equals(typeVariable.getName()) &amp;&amp; isInnerClass(keyType.getGenericDeclaration(), typeVariable.getGenericDeclaration())) {<a name="line.387"></a>
-<span class="sourceLineNo">388</span>                        if (value instanceof Class)<a name="line.388"></a>
-<span class="sourceLineNo">389</span>                           return (Class&lt;?&gt;)value;<a name="line.389"></a>
-<span class="sourceLineNo">390</span>                        typeVariable = (TypeVariable&lt;?&gt;)entry.getValue();<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>            } catch (Exception e) {<a name="line.394"></a>
-<span class="sourceLineNo">395</span>               throw new RuntimeException(e);<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>         throw new RuntimeException("Could not resolve type: " + actualType);<a name="line.398"></a>
-<span class="sourceLineNo">399</span>      } else {<a name="line.399"></a>
-<span class="sourceLineNo">400</span>         throw new RuntimeException("Invalid type found in resolveParameterType: " + actualType);<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>   private static boolean isInnerClass(GenericDeclaration od, GenericDeclaration id) {<a name="line.404"></a>
-<span class="sourceLineNo">405</span>      if (od instanceof Class &amp;&amp; id instanceof Class) {<a name="line.405"></a>
-<span class="sourceLineNo">406</span>         Class&lt;?&gt; oc = (Class&lt;?&gt;)od;<a name="line.406"></a>
-<span class="sourceLineNo">407</span>         Class&lt;?&gt; ic = (Class&lt;?&gt;)id;<a name="line.407"></a>
-<span class="sourceLineNo">408</span>         while ((ic = ic.getEnclosingClass()) != null)<a name="line.408"></a>
-<span class="sourceLineNo">409</span>            if (ic == oc)<a name="line.409"></a>
-<span class="sourceLineNo">410</span>               return true;<a name="line.410"></a>
-<span class="sourceLineNo">411</span>      }<a name="line.411"></a>
-<span class="sourceLineNo">412</span>      return false;<a name="line.412"></a>
-<span class="sourceLineNo">413</span>   }<a name="line.413"></a>
-<span class="sourceLineNo">414</span><a name="line.414"></a>
-<span class="sourceLineNo">415</span>   private static void extractTypes(Map&lt;Type,Type&gt; typeMap, Class&lt;?&gt; c) {<a name="line.415"></a>
-<span class="sourceLineNo">416</span>      Type gs = c.getGenericSuperclass();<a name="line.416"></a>
-<span class="sourceLineNo">417</span>      if (gs instanceof ParameterizedType) {<a name="line.417"></a>
-<span class="sourceLineNo">418</span>         ParameterizedType pt = (ParameterizedType)gs;<a name="line.418"></a>
-<span class="sourceLineNo">419</span>         Type[] typeParameters = ((Class&lt;?&gt;)pt.getRawType()).getTypeParameters();<a name="line.419"></a>
-<span class="sourceLineNo">420</span>         Type[] actualTypeArguments = pt.getActualTypeArguments();<a name="line.420"></a>
-<span class="sourceLineNo">421</span>         for (int i = 0; i &lt; typeParameters.length; i++) {<a name="line.421"></a>
-<span class="sourceLineNo">422</span>            if (typeMap.containsKey(actualTypeArguments[i]))<a name="line.422"></a>
-<span class="sourceLineNo">423</span>               actualTypeArguments[i] = typeMap.get(actualTypeArguments[i]);<a name="line.423"></a>
-<span class="sourceLineNo">424</span>            typeMap.put(typeParameters[i], actualTypeArguments[i]);<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>   }<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>    * Finds a public method with the specified parameters.<a name="line.430"></a>
-<span class="sourceLineNo">431</span>    *<a name="line.431"></a>
-<span class="sourceLineNo">432</span>    * @param c The class to look for the method.<a name="line.432"></a>
-<span class="sourceLineNo">433</span>    * @param name The method name.<a name="line.433"></a>
-<span class="sourceLineNo">434</span>    * @param returnType The return type of the method.<a name="line.434"></a>
-<span class="sourceLineNo">435</span>    * Can be a super type of the actual return type.<a name="line.435"></a>
-<span class="sourceLineNo">436</span>    * For example, if the actual return type is &lt;code&gt;CharSequence&lt;/code&gt;, then &lt;code&gt;Object&lt;/code&gt; will match but &lt;code&gt;String&lt;/code&gt; will not.<a name="line.436"></a>
-<span class="sourceLineNo">437</span>    * @param parameterTypes The parameter types of the method.<a name="line.437"></a>
-<span class="sourceLineNo">438</span>    * Can be subtypes of the actual parameter types.<a name="line.438"></a>
-<span class="sourceLineNo">439</span>    * For example, if the parameter type is &lt;code&gt;CharSequence&lt;/code&gt;, then &lt;code&gt;String&lt;/code&gt; will match but &lt;code&gt;Object&lt;/code&gt; will not.<a name="line.439"></a>
-<span class="sourceLineNo">440</span>    * @return The matched method, or &lt;jk&gt;null&lt;/jk&gt; if no match was found.<a name="line.440"></a>
-<span class="sourceLineNo">441</span>    */<a name="line.441"></a>
-<span class="sourceLineNo">442</span>   public static Method findPublicMethod(Class&lt;?&gt; c, String name, Class&lt;?&gt; returnType, Class&lt;?&gt;...parameterTypes) {<a name="line.442"></a>
-<span class="sourceLineNo">443</span>      for (Method m : c.getMethods()) {<a name="line.443"></a>
-<span class="sourceLineNo">444</span>         if (isPublic(m) &amp;&amp; m.getName().equals(name)) {<a name="line.444"></a>
-<span class="sourceLineNo">445</span>            Class&lt;?&gt; rt = m.getReturnType();<a name="line.445"></a>
-<span class="sourceLineNo">446</span>            if (isParentClass(returnType, rt)) {<a name="line.446"></a>
-<span class="sourceLineNo">447</span>               Class&lt;?&gt;[] pt = m.getParameterTypes();<a name="line.447"></a>
-<span class="sourceLineNo">448</span>               if (pt.length == parameterTypes.length) {<a name="line.448"></a>
-<span class="sourceLineNo">449</span>                  boolean matches = true;<a name="line.449"></a>
-<span class="sourceLineNo">450</span>                  for (int i = 0; i &lt; pt.length; i++) {<a name="line.450"></a>
-<span class="sourceLineNo">451</span>                     if (! isParentClass(pt[i], parameterTypes[i])) {<a name="line.451"></a>
-<span class="sourceLineNo">452</span>                        matches = false;<a name="line.452"></a>
-<span class="sourceLineNo">453</span>                        break;<a name="line.453"></a>
-<span class="sourceLineNo">454</span>                     }<a name="line.454"></a>
-<span class="sourceLineNo">455</span>                  }<a name="line.455"></a>
-<span class="sourceLineNo">456</span>                  if (matches)<a name="line.456"></a>
-<span class="sourceLineNo">457</span>                     return m;<a name="line.457"></a>
-<span class="sourceLineNo">458</span>               }<a name="line.458"></a>
-<span class="sourceLineNo">459</span>            }<a name="line.459"></a>
-<span class="sourceLineNo">460</span>         }<a name="line.460"></a>
-<span class="sourceLineNo">461</span>      }<a name="line.461"></a>
-<span class="sourceLineNo">462</span>      return null;<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>    * Finds a public constructor with the specified parameters without throwing an exception.<a name="line.466"></a>
-<span class="sourceLineNo">467</span>    *<a name="line.467"></a>
-<span class="sourceLineNo">468</span>    * @param c The class to search for a constructor.<a name="line.468"></a>
-<span class="sourceLineNo">469</span>    * @param parameterTypes The parameter types in the constructor.<a name="line.469"></a>
-<span class="sourceLineNo">470</span>    * Can be subtypes of the actual constructor argument types.<a name="line.470"></a>
-<span class="sourceLineNo">471</span>    * @return The matching constructor, or &lt;jk&gt;null&lt;/jk&gt; if constructor could not be found.<a name="line.471"></a>
-<span class="sourceLineNo">472</span>    */<a name="line.472"></a>
-<span class="sourceLineNo">473</span>   @SuppressWarnings("unchecked")<a name="line.473"></a>
-<span class="sourceLineNo">474</span>   public static &lt;T&gt; Constructor&lt;T&gt; findPublicConstructor(Class&lt;T&gt; c, Class&lt;?&gt;...parameterTypes) {<a name="line.474"></a>
-<span class="sourceLineNo">475</span>      for (Constructor&lt;?&gt; n : c.getConstructors()) {<a name="line.475"></a>
-<span class="sourceLineNo">476</span>         if (isPublic(n)) {<a name="line.476"></a>
-<span class="sourceLineNo">477</span>            Class&lt;?&gt;[] pt = n.getParameterTypes();<a name="line.477"></a>
-<span class="sourceLineNo">478</span>            if (pt.length == parameterTypes.length) {<a name="line.478"></a>
-<span class="sourceLineNo">479</span>               boolean matches = true;<a name="line.479"></a>
-<span class="sourceLineNo">480</span>               for (int i = 0; i &lt; pt.length; i++) {<a name="line.480"></a>
-<span class="sourceLineNo">481</span>                  if (! isParentClass(pt[i], parameterTypes[i])) {<a name="line.481"></a>
-<span class="sourceLineNo">482</span>                     matches = false;<a name="line.482"></a>
-<span class="sourceLineNo">483</span>                     break;<a name="line.483"></a>
-<span class="sourceLineNo">484</span>                  }<a name="line.484"></a>
-<span class="sourceLineNo">485</span>               }<a name="line.485"></a>
-<span class="sourceLineNo">486</span>               if (matches)<a name="line.486"></a>
-<span class="sourceLineNo">487</span>                  return (Constructor&lt;T&gt;)n;<a name="line.487"></a>
-<span class="sourceLineNo">488</span>            }<a name="line.488"></a>
-<span class="sourceLineNo">489</span>         }<a name="line.489"></a>
-<span class="sourceLineNo">490</span>      }<a name="line.490"></a>
-<span class="sourceLineNo">491</span>      return null;<a name="line.491"></a>
-<span class="sourceLineNo">492</span>   }<a name="line.492"></a>
-<span class="sourceLineNo">493</span><a name="line.493"></a>
-<span class="sourceLineNo">494</span>   /**<a name="line.494"></a>
-<span class="sourceLineNo">495</span>    * Finds the public constructor that can take in the specified arguments.<a name="line.495"></a>
-<span class="sourceLineNo">496</span>    *<a name="line.496"></a>
-<span class="sourceLineNo">497</span>    * @param c The class we're trying to construct.<a name="line.497"></a>
-<span class="sourceLineNo">498</span>    * @param args The arguments we want to pass into the constructor.<a name="line.498"></a>
-<span class="sourceLineNo">499</span>    * @return The constructor, or &lt;jk&gt;null&lt;/jk&gt; if a public constructor could not be found that takes<a name="line.499"></a>
-<span class="sourceLineNo">500</span>    * in the specified arguments.<a name="line.500"></a>
-<span class="sourceLineNo">501</span>    */<a name="line.501"></a>
-<span class="sourceLineNo">502</span>   public static &lt;T&gt; Constructor&lt;T&gt; findPublicConstructor(Class&lt;T&gt; c, Object...args) {<a name="line.502"></a>
-<span class="sourceLineNo">503</span>      return findPublicConstructor(c, getClasses(args));<a name="line.503"></a>
-<span class="sourceLineNo">504</span>   }<a name="line.504"></a>
-<span class="sourceLineNo">505</span><a name="line.505"></a>
-<span class="sourceLineNo">506</span>   /**<a name="line.506"></a>
-<span class="sourceLineNo">507</span>    * Returns the class types for the specified arguments.<a name="line.507"></a>
-<span class="sourceLineNo">508</span>    *<a name="line.508"></a>
-<span class="sourceLineNo">509</span>    * @param args The objects we're getting the classes of.<a name="line.509"></a>
-<span class="sourceLineNo">510</span>    * @return The classes of the arguments.<a name="line.510"></a>
-<span class="sourceLineNo">511</span>    */<a name="line.511"></a>
-<span class="sourceLineNo">512</span>   public static Class&lt;?&gt;[] getClasses(Object...args) {<a name="line.512"></a>
-<span class="sourceLineNo">513</span>      Class&lt;?&gt;[] pt = new Class&lt;?&gt;[args.length];<a name="line.513"></a>
-<span class="sourceLineNo">514</span>      for (int i = 0; i &lt; args.length; i++)<a name="line.514"></a>
-<span class="sourceLineNo">515</span>         pt[i] = args[i] == null ? null : args[i].getClass();<a name="line.515"></a>
-<span class="sourceLineNo">516</span>      return pt;<a name="line.516"></a>
+<span class="sourceLineNo">374</span>      ParameterizedType opt = (ParameterizedType)oc.getGenericSuperclass();<a name="line.374"></a>
+<span class="sourceLineNo">375</span>      Type actualType = opt.getActualTypeArguments()[index];<a name="line.375"></a>
+<span class="sourceLineNo">376</span><a name="line.376"></a>
+<span class="sourceLineNo">377</span>      if (typeMap.containsKey(actualType))<a name="line.377"></a>
+<span class="sourceLineNo">378</span>         actualType = typeMap.get(actualType);<a name="line.378"></a>
+<span class="sourceLineNo">379</span><a name="line.379"></a>
+<span class="sourceLineNo">380</span>      if (actualType instanceof Class) {<a name="line.380"></a>
+<span class="sourceLineNo">381</span>         return (Class&lt;?&gt;)actualType;<a name="line.381"></a>
+<span class="sourceLineNo">382</span><a name="line.382"></a>
+<span class="sourceLineNo">383</span>      } else if (actualType instanceof GenericArrayType) {<a name="line.383"></a>
+<span class="sourceLineNo">384</span>         Class&lt;?&gt; cmpntType = (Class&lt;?&gt;)((GenericArrayType)actualType).getGenericComponentType();<a name="line.384"></a>
+<span class="sourceLineNo">385</span>         return Array.newInstance(cmpntType, 0).getClass();<a name="line.385"></a>
+<span class="sourceLineNo">386</span><a name="line.386"></a>
+<span class="sourceLineNo">387</span>      } else if (actualType instanceof TypeVariable) {<a name="line.387"></a>
+<span class="sourceLineNo">388</span>         TypeVariable&lt;?&gt; typeVariable = (TypeVariable&lt;?&gt;)actualType;<a name="line.388"></a>
+<span class="sourceLineNo">389</span>         List&lt;Class&lt;?&gt;&gt; nestedOuterTypes = new LinkedList&lt;Class&lt;?&gt;&gt;();<a name="line.389"></a>
+<span class="sourceLineNo">390</span>         for (Class&lt;?&gt; ec = oc.getEnclosingClass(); ec != null; ec = ec.getEnclosingClass()) {<a name="line.390"></a>
+<span class="sourceLineNo">391</span>            try {<a name="line.391"></a>
+<span class="sourceLineNo">392</span>               Class&lt;?&gt; outerClass = oc.getClass();<a name="line.392"></a>
+<span class="sourceLineNo">393</span>               nestedOuterTypes.add(outerClass);<a name="line.393"></a>
+<span class="sourceLineNo">394</span>               Map&lt;Type,Type&gt; outerTypeMap = new HashMap&lt;Type,Type&gt;();<a name="line.394"></a>
+<span class="sourceLineNo">395</span>               extractTypes(outerTypeMap, outerClass);<a name="line.395"></a>
+<span class="sourceLineNo">396</span>               for (Map.Entry&lt;Type,Type&gt; entry : outerTypeMap.entrySet()) {<a name="line.396"></a>
+<span class="sourceLineNo">397</span>                  Type key = entry.getKey(), value = entry.getValue();<a name="line.397"></a>
+<span class="sourceLineNo">398</span>                  if (key instanceof TypeVariable) {<a name="line.398"></a>
+<span class="sourceLineNo">399</span>                     TypeVariable&lt;?&gt; keyType = (TypeVariable&lt;?&gt;)key;<a name="line.399"></a>
+<span class="sourceLineNo">400</span>                     if (keyType.getName().equals(typeVariable.getName()) &amp;&amp; isInnerClass(keyType.getGenericDeclaration(), typeVariable.getGenericDeclaration())) {<a name="line.400"></a>
+<span class="sourceLineNo">401</span>                        if (value instanceof Class)<a name="line.401"></a>
+<span class="sourceLineNo">402</span>                           return (Class&lt;?&gt;)value;<a name="line.402"></a>
+<span class="sourceLineNo">403</span>                        typeVariable = (TypeVariable&lt;?&gt;)entry.getValue();<a name="line.403"></a>
+<span class="sourceLineNo">404</span>                     }<a name="line.404"></a>
+<span class="sourceLineNo">405</span>                  }<a name="line.405"></a>
+<span class="sourceLineNo">406</span>               }<a name="line.406"></a>
+<span class="sourceLineNo">407</span>            } catch (Exception e) {<a name="line.407"></a>
+<span class="sourceLineNo">408</span>               throw new RuntimeException(e);<a name="line.408"></a>
+<span class="sourceLineNo">409</span>            }<a name="line.409"></a>
+<span class="sourceLineNo">410</span>         }<a name="line.410"></a>
+<span class="sourceLineNo">411</span>         throw new RuntimeException("Could not resolve type: " + actualType);<a name="line.411"></a>
+<span class="sourceLineNo">412</span>      } else {<a name="line.412"></a>
+<span class="sourceLineNo">413</span>         throw new RuntimeException("Invalid type found in resolveParameterType: " + actualType);<a name="line.413"></a>
+<span class="sourceLineNo">414</span>      }<a name="line.414"></a>
+<span class="sourceLineNo">415</span>   }<a name="line.415"></a>
+<span class="sourceLineNo">416</span><a name="line.416"></a>
+<span class="sourceLineNo">417</span>   private static boolean isInnerClass(GenericDeclaration od, GenericDeclaration id) {<a name="line.417"></a>
+<span class="sourceLineNo">418</span>      if (od instanceof Class &amp;&amp; id instanceof Class) {<a name="line.418"></a>
+<span class="sourceLineNo">419</span>         Class&lt;?&gt; oc = (Class&lt;?&gt;)od;<a name="line.419"></a>
+<span class="sourceLineNo">420</span>         Class&lt;?&gt; ic = (Class&lt;?&gt;)id;<a name="line.420"></a>
+<span class="sourceLineNo">421</span>         while ((ic = ic.getEnclosingClass()) != null)<a name="line.421"></a>
+<span class="sourceLineNo">422</span>            if (ic == oc)<a name="line.422"></a>
+<span class="sourceLineNo">423</span>               return true;<a name="line.423"></a>
+<span class="sourceLineNo">424</span>      }<a name="line.424"></a>
+<span class="sourceLineNo">425</span>      return false;<a name="line.425"></a>
+<span class="sourceLineNo">426</span>   }<a name="line.426"></a>
+<span class="sourceLineNo">427</span><a name="line.427"></a>
+<span class="sourceLineNo">428</span>   private static void extractTypes(Map&lt;Type,Type&gt; typeMap, Class&lt;?&gt; c) {<a name="line.428"></a>
+<span class="sourceLineNo">429</span>      Type gs = c.getGenericSuperclass();<a name="line.429"></a>
+<span class="sourceLineNo">430</span>      if (gs instanceof ParameterizedType) {<a name="line.430"></a>
+<span class="sourceLineNo">431</span>         ParameterizedType pt = (ParameterizedType)gs;<a name="line.431"></a>
+<span class="sourceLineNo">432</span>         Type[] typeParameters = ((Class&lt;?&gt;)pt.getRawType()).getTypeParameters();<a name="line.432"></a>
+<span class="sourceLineNo">433</span>         Type[] actualTypeArguments = pt.getActualTypeArguments();<a name="line.433"></a>
+<span class="sourceLineNo">434</span>         for (int i = 0; i &lt; typeParameters.length; i++) {<a name="line.434"></a>
+<span class="sourceLineNo">435</span>            if (typeMap.containsKey(actualTypeArguments[i]))<a name="line.435"></a>
+<span class="sourceLineNo">436</span>               actualTypeArguments[i] = typeMap.get(actualTypeArguments[i]);<a name="line.436"></a>
+<span class="sourceLineNo">437</span>            typeMap.put(typeParameters[i], actualTypeArguments[i]);<a name="line.437"></a>
+<span class="sourceLineNo">438</span>         }<a name="line.438"></a>
+<span class="sourceLineNo">439</span>      }<a name="line.439"></a>
+<span class="sourceLineNo">440</span>   }<a name="line.440"></a>
+<span class="sourceLineNo">441</span><a name="line.441"></a>
+<span class="sourceLineNo">442</span>   /**<a name="line.442"></a>
+<span class="sourceLineNo">443</span>    * Finds a public method with the specified parameters.<a name="line.443"></a>
+<span class="sourceLineNo">444</span>    *<a name="line.444"></a>
+<span class="sourceLineNo">445</span>    * @param c The class to look for the method.<a name="line.445"></a>
+<span class="sourceLineNo">446</span>    * @param name The method name.<a name="line.446"></a>
+<span class="sourceLineNo">447</span>    * @param returnType The return type of the method.<a name="line.447"></a>
+<span class="sourceLineNo">448</span>    * Can be a super type of the actual return type.<a name="line.448"></a>
+<span class="sourceLineNo">449</span>    * For example, if the actual return type is &lt;code&gt;CharSequence&lt;/code&gt;, then &lt;code&gt;Object&lt;/code&gt; will match but &lt;code&gt;String&lt;/code&gt; will not.<a name="line.449"></a>
+<span class="sourceLineNo">450</span>    * @param parameterTypes The parameter types of the method.<a name="line.450"></a>
+<span class="sourceLineNo">451</span>    * Can be subtypes of the actual parameter types.<a name="line.451"></a>
+<span class="sourceLineNo">452</span>    * For example, if the parameter type is &lt;code&gt;CharSequence&lt;/code&gt;, then &lt;code&gt;String&lt;/code&gt; will match but &lt;code&gt;Object&lt;/code&gt; will not.<a name="line.452"></a>
+<span class="sourceLineNo">453</span>    * @return The matched method, or &lt;jk&gt;null&lt;/jk&gt; if no match was found.<a name="line.453"></a>
+<span class="sourceLineNo">454</span>    */<a name="line.454"></a>
+<span class="sourceLineNo">455</span>   public static Method findPublicMethod(Class&lt;?&gt; c, String name, Class&lt;?&gt; returnType, Class&lt;?&gt;...parameterTypes) {<a name="line.455"></a>
+<span class="sourceLineNo">456</span>      for (Method m : c.getMethods()) {<a name="line.456"></a>
+<span class="sourceLineNo">457</span>         if (isPublic(m) &amp;&amp; m.getName().equals(name)) {<a name="line.457"></a>
+<span class="sourceLineNo">458</span>            Class&lt;?&gt; rt = m.getReturnType();<a name="line.458"></a>
+<span class="sourceLineNo">459</span>            if (isParentClass(returnType, rt)) {<a name="line.459"></a>
+<span class="sourceLineNo">460</span>               Class&lt;?&gt;[] pt = m.getParameterTypes();<a name="line.460"></a>
+<span class="sourceLineNo">461</span>               if (pt.length == parameterTypes.length) {<a name="line.461"></a>
+<span class="sourceLineNo">462</span>                  boolean matches = true;<a name="line.462"></a>
+<span class="sourceLineNo">463</span>                  for (int i = 0; i &lt; pt.length; i++) {<a name="line.463"></a>
+<span class="sourceLineNo">464</span>                     if (! isParentClass(pt[i], parameterTypes[i])) {<a name="line.464"></a>
+<span class="sourceLineNo">465</span>                        matches = false;<a name="line.465"></a>
+<span class="sourceLineNo">466</span>                        break;<a name="line.466"></a>
+<span class="sourceLineNo">467</span>                     }<a name="line.467"></a>
+<span class="sourceLineNo">468</span>                  }<a name="line.468"></a>
+<span class="sourceLineNo">469</span>                  if (matches)<a name="line.469"></a>
+<span class="sourceLineNo">470</span>                     return m;<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>         }<a name="line.473"></a>
+<span class="sourceLineNo">474</span>      }<a name="line.474"></a>
+<span class="sourceLineNo">475</span>      return null;<a name="line.475"></a>
+<span class="sourceLineNo">476</span>   }<a name="line.476"></a>
+<span class="sourceLineNo">477</span><a name="line.477"></a>
+<span class="sourceLineNo">478</span>   /**<a name="line.478"></a>
+<span class="sourceLineNo">479</span>    * Finds a public constructor with the specified parameters without throwing an exception.<a name="line.479"></a>
+<span class="sourceLineNo">480</span>    *<a name="line.480"></a>
+<span class="sourceLineNo">481</span>    * @param c The class to search for a constructor.<a name="line.481"></a>
+<span class="sourceLineNo">482</span>    * @param parameterTypes The parameter types in the constructor.<a name="line.482"></a>
+<span class="sourceLineNo">483</span>    * Can be subtypes of the actual constructor argument types.<a name="line.483"></a>
+<span class="sourceLineNo">484</span>    * @return The matching constructor, or &lt;jk&gt;null&lt;/jk&gt; if constructor could not be found.<a name="line.484"></a>
+<span class="sourceLineNo">485</span>    */<a name="line.485"></a>
+<span class="sourceLineNo">486</span>   @SuppressWarnings("unchecked")<a name="line.486"></a>
+<span class="sourceLineNo">487</span>   public static &lt;T&gt; Constructor&lt;T&gt; findPublicConstructor(Class&lt;T&gt; c, Class&lt;?&gt;...parameterTypes) {<a name="line.487"></a>
+<span class="sourceLineNo">488</span>      for (Constructor&lt;?&gt; n : c.getConstructors()) {<a name="line.488"></a>
+<span class="sourceLineNo">489</span>         if (isPublic(n)) {<a name="line.489"></a>
+<span class="sourceLineNo">490</span>            Class&lt;?&gt;[] pt = n.getParameterTypes();<a name="line.490"></a>
+<span class="sourceLineNo">491</span>            if (pt.length == parameterTypes.length) {<a name="line.491"></a>
+<span class="sourceLineNo">492</span>               boolean matches = true;<a name="line.492"></a>
+<span class="sourceLineNo">493</span>               for (int i = 0; i &lt; pt.length; i++) {<a name="line.493"></a>
+<span class="sourceLineNo">494</span>                  if (! isParentClass(pt[i], parameterTypes[i])) {<a name="line.494"></a>
+<span class="sourceLineNo">495</span>                     matches = false;<a name="line.495"></a>
+<span class="sourceLineNo">496</span>                     break;<a name="line.496"></a>
+<span class="sourceLineNo">497</span>                  }<a name="line.497"></a>
+<span class="sourceLineNo">498</span>               }<a name="line.498"></a>
+<span class="sourceLineNo">499</span>               if (matches)<a name="line.499"></a>
+<span class="sourceLineNo">500</span>                  return (Constructor&lt;T&gt;)n;<a name="line.500"></a>
+<span class="sourceLineNo">501</span>            }<a name="line.501"></a>
+<span class="sourceLineNo">502</span>         }<a name="line.502"></a>
+<span class="sourceLineNo">503</span>      }<a name="line.503"></a>
+<span class="sourceLineNo">504</span>      return null;<a name="line.504"></a>
+<span class="sourceLineNo">505</span>   }<a name="line.505"></a>
+<span class="sourceLineNo">506</span><a name="line.506"></a>
+<span class="sourceLineNo">507</span>   /**<a name="line.507"></a>
+<span class="sourceLineNo">508</span>    * Finds the public constructor that can take in the specified arguments.<a name="line.508"></a>
+<span class="sourceLineNo">509</span>    *<a name="line.509"></a>
+<span class="sourceLineNo">510</span>    * @param c The class we're trying to construct.<a name="line.510"></a>
+<span class="sourceLineNo">511</span>    * @param args The arguments we want to pass into the constructor.<a name="line.511"></a>
+<span class="sourceLineNo">512</span>    * @return The constructor, or &lt;jk&gt;null&lt;/jk&gt; if a public constructor could not be found that takes<a name="line.512"></a>
+<span class="sourceLineNo">513</span>    * in the specified arguments.<a name="line.513"></a>
+<span class="sourceLineNo">514</span>    */<a name="line.514"></a>
+<span class="sourceLineNo">515</span>   public static &lt;T&gt; Constructor&lt;T&gt; findPublicConstructor(Class&lt;T&gt; c, Object...args) {<a name="line.515"></a>
+<span class="sourceLineNo">516</span>      return findPublicConstructor(c, getClasses(args));<a name="line.516"></a>
 <span class="sourceLineNo">517</span>   }<a name="line.517"></a>
 <span class="sourceLineNo">518</span><a name="line.518"></a>
-<span class="sourceLineNo">519</span>// This code is inherently unsafe (but still potentially useful?)<a name="line.519"></a>
-<span class="sourceLineNo">520</span>//<a name="line.520"></a>
-<span class="sourceLineNo">521</span>// /**<a name="line.521"></a>
-<span class="sourceLineNo">522</span>//  * Converts class name strings to ClassMeta objects.<a name="line.522"></a>
-<span class="sourceLineNo">523</span>//  *<a name="line.523"></a>
-<span class="sourceLineNo">524</span>//  * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.524"></a>
-<span class="sourceLineNo">525</span>//  * &lt;ul&gt;<a name="line.525"></a>
-<span class="sourceLineNo">526</span>//  *    &lt;li&gt;&lt;js&gt;"java.lang.String"&lt;/js&gt;<a name="line.526"></a>
-<span class="sourceLineNo">527</span>//  *    &lt;li&gt;&lt;js&gt;"com.foo.sample.MyBean[]"&lt;/js&gt;<a name="line.527"></a>
-<span class="sourceLineNo">528</span>//  *    &lt;li&gt;&lt;js&gt;"java.util.HashMap&lt;java.lang.String,java.lang.Integer&gt;"&lt;/js&gt;<a name="line.528"></a>
-<span class="sourceLineNo">529</span>//  *    &lt;li&gt;&lt;js&gt;"[Ljava.lang.String;"&lt;/js&gt; (i.e. the value of &lt;code&gt;String[].&lt;jk&gt;class&lt;/jk&gt;.getName()&lt;/code&gt;)<a name="line.529"></a>
-<span class="sourceLineNo">530</span>//  * &lt;/ul&gt;<a name="line.530"></a>
-<span class="sourceLineNo">531</span>//  *<a name="line.531"></a>
-<span class="sourceLineNo">532</span>//  * @param s The class name.<a name="line.532"></a>
-<span class="sourceLineNo">533</span>//  * @return The ClassMeta corresponding to the class name string.<a name="line.533"></a>
-<span class="sourceLineNo">534</span>//  */<a name="line.534"></a>
-<span class="sourceLineNo">535</span>// protected final ClassMeta&lt;?&gt; getClassMetaFromString(String s) {<a name="line.535"></a>
-<span class="sourceLineNo">536</span>//    int d = 0;<a name="line.536"></a>
-<span class="sourceLineNo">537</span>//    if (s == null || s.isEmpty())<a name="line.537"></a>
-<span class="sourceLineNo">538</span>//       return null;<a name="line.538"></a>
-<span class="sourceLineNo">539</span>//<a name="line.539"></a>
-<span class="sourceLineNo">540</span>//    // Check for Class.getName() on array class types.<a name="line.540"></a>
-<span class="sourceLineNo">541</span>//    if (s.charAt(0) == '[') {<a name="line.541"></a>
-<span class="sourceLineNo">542</span>//       try {<a name="line.542"></a>
-<span class="sourceLineNo">543</span>//          return getClassMeta(findClass(s));<a name="line.543"></a>
-<span class="sourceLineNo">544</span>//       } catch (ClassNotFoundException e) {<a name="line.544"></a>
-<span class="sourceLineNo">545</span>//          throw new RuntimeException(e);<a name="line.545"></a>
-<span class="sourceLineNo">546</span>//       }<a name="line.546"></a>
-<span class="sourceLineNo">547</span>//    }<a name="line.547"></a>
-<span class="sourceLineNo">548</span>//<a name="line.548"></a>
-<span class="sourceLineNo">549</span>//    int i1 = 0;<a name="line.549"></a>
-<span class="sourceLineNo">550</span>//    int i2 = 0;<a name="line.550"></a>
-<span class="sourceLineNo">551</span>//    int dim = 0;<a name="line.551"></a>
-<span class="sourceLineNo">552</span>//    List&lt;ClassMeta&lt;?&gt;&gt; p = null;<a name="line.552"></a>
-<span class="sourceLineNo">553</span>//    for (int i = 0; i &lt; s.length(); i++) {<a name="line.553"></a>
-<span class="sourceLineNo">554</span>//       char c = s.charAt(i);<a name="line.554"></a>
-<span class="sourceLineNo">555</span>//       if (c == '&lt;') {<a name="line.555"></a>
-<span class="sourceLineNo">556</span>//          if (d == 0) {<a name="line.556"></a>
-<span class="sourceLineNo">557</span>//             i1 = i;<a name="line.557"></a>
-<span class="sourceLineNo">558</span>//             i2 = i+1;<a name="line.558"></a>
-<span class="sourceLineNo">559</span>//             p = new LinkedList&lt;ClassMeta&lt;?&gt;&gt;();<a name="line.559"></a>
-<span class="sourceLineNo">560</span>//          }<a name="line.560"></a>
-<span class="sourceLineNo">561</span>//          d++;<a name="line.561"></a>
-<span class="sourceLineNo">562</span>//       } else if (c == '&gt;') {<a name="line.562"></a>
-<span class="sourceLineNo">563</span>//          d--;<a name="line.563"></a>
-<span class="sourceLineNo">564</span>//          if (d == 0 &amp;&amp; p != null)<a name="line.564"></a>
-<span class="sourceLineNo">565</span>//             p.add(getClassMetaFromString(s.substring(i2, i)));<a name="line.565"></a>
-<span class="sourceLineNo">566</span>//       } else if (c == ',' &amp;&amp; d == 1) {<a name="line.566"></a>
-<span class="sourceLineNo">567</span>//          if (p != null)<a name="line.567"></a>
-<span class="sourceLineNo">568</span>//             p.add(getClassMetaFromString(s.substring(i2, i)));<a name="line.568"></a>
-<span class="sourceLineNo">569</span>//          i2 = i+1;<a name="line.569"></a>
-<span class="sourceLineNo">570</span>//       }<a name="line.570"></a>
-<span class="sourceLineNo">571</span>//       if (c == '[') {<a name="line.571"></a>
-<span class="sourceLineNo">572</span>//          if (i1 == 0)<a name="line.572"></a>
-<span class="sourceLineNo">573</span>//             i1 = i;<a name="line.573"></a>
-<span class="sourceLineNo">574</span>//          dim++;<a name="line.574"></a>
-<span class="sourceLineNo">575</span>//       }<a name="line.575"></a>
-<span class="sourceLineNo">576</span>//    }<a name="line.576"></a>
-<span class="sourceLineNo">577</span>//    if (i1 == 0)<a name="line.577"></a>
-<span class="sourceLineNo">578</span>//       i1 = s.length();<a name="line.578"></a>
-<span class="sourceLineNo">579</span>//    try {<a name="line.579"></a>
-<span class="sourceLineNo">580</span>//       String name = s.substring(0, i1).trim();<a name="line.580"></a>
-<span class="sourceLineNo">581</span>//       char x = name.charAt(0);<a name="line.581"></a>
-<span class="sourceLineNo">582</span>//       Class&lt;?&gt; c = null;<a name="line.582"></a>
-<span class="sourceLineNo">583</span>//       if (x &gt;= 'b' &amp;&amp; x &lt;= 's') {<a name="line.583"></a>
-<span class="sourceLineNo">584</span>//          if (x == 'b' &amp;&amp; name.equals("boolean"))<a name="line.584"></a>
-<span class="sourceLineNo">585</span>//             c = boolean.class;<a name="line.585"></a>
-<span class="sourceLineNo">586</span>//          else if (x == 'b' &amp;&amp; name.equals("byte"))<a name="line.586"></a>
-<span class="sourceLineNo">587</span>//             c = byte.class;<a name="line.587"></a>
-<span class="sourceLineNo">588</span>//          else if (x == 'c' &amp;&amp; name.equals("char"))<a name="line.588"></a>
-<span class="sourceLineNo">589</span>//             c = char.class;<a name="line.589"></a>
-<span class="sourceLineNo">590</span>//          else if (x == 'd' &amp;&amp; name.equals("double"))<a name="line.590"></a>
-<span class="sourceLineNo">591</span>//             c = double.class;<a name="line.591"></a>
-<span class="sourceLineNo">592</span>//          else if (x == 'i' &amp;&amp; name.equals("int"))<a name="line.592"></a>
-<span class="sourceLineNo">593</span>//             c = int.class;<a name="line.593"></a>
-<span class="sourceLineNo">594</span>//          else if (x == 'l' &amp;&amp; name.equals("long"))<a name="line.594"></a>
-<span class="sourceLineNo">595</span>//             c = long.class;<a name="line.595"></a>
-<span class="sourceLineNo">596</span>//          else if (x == 's' &amp;&amp; name.equals("short"))<a name="line.596"></a>
-<span class="sourceLineNo">597</span>//             c = short.class;<a name="line.597"></a>
-<span class="sourceLineNo">598</span>//          else<a name="line.598"></a>
-<span class="sourceLineNo">599</span>//             c = findClass(name);<a name="line.599"></a>
-<span class="sourceLineNo">600</span>//       } else {<a name="line.600"></a>
-<span class="sourceLineNo">601</span>//          c = findClass(name);<a name="line.601"></a>
-<span class="sourceLineNo">602</span>//       }<a name="line.602"></a>
-<span class="sourceLineNo">603</span>//<a name="line.603"></a>
-<span class="sourceLineNo">604</span>//       ClassMeta&lt;?&gt; cm = getClassMeta(c);<a name="line.604"></a>
-<span class="sourceLineNo">605</span>//<a name="line.605"></a>
-<span class="sourceLineNo">606</span>//       if (p != null) {<a name="line.606"></a>
-<span class="sourceLineNo">607</span>//          if (cm.isMap())<a name="line.607"></a>
-<span class="sourceLineNo">608</span>//             cm = new ClassMeta(c, this).setKeyType(p.get(0)).setValueType(p.get(1));<a name="line.608"></a>
-<span class="sourceLineNo">609</span>//          if (cm.isCollection())<a name="line.609"></a>
-<span class="sourceLineNo">610</span>//             cm = new ClassMeta(c, this).setElementType(p.get(0));<a name="line.610"></a>
-<span class="sourceLineNo">611</span>//       }<a name="line.611"></a>
-<span class="sourceLineNo">612</span>//<a name="line.612"></a>
-<span class="sourceLineNo">613</span>//       while (dim &gt; 0) {<a name="line.613"></a>
-<span class="sourceLineNo">614</span>//          cm = new ClassMeta(Array.newInstance(cm.getInnerClass(), 0).getClass(), this);<a name="line.614"></a>
-<span class="sourceLineNo">615</span>//          dim--;<a name="line.615"></a>
-<span class="sourceLineNo">616</span>//       }<a name="line.616"></a>
-<span class="sourceLineNo">617</span>//<a name="line.617"></a>
-<span class="sourceLineNo">618</span>//       return cm;<a name="line.618"></a>
-<span class="sourceLineNo">619</span>//    } catch (ClassNotFoundException e) {<a name="line.619"></a>
-<span class="sourceLineNo">620</span>//       throw new RuntimeException(e);<a name="line.620"></a>
-<span class="sourceLineNo">621</span>//    }<a name="line.621"></a>
-<span class="sourceLineNo">622</span>// }<a name="line.622"></a>
-<span class="sourceLineNo">623</span>//<a name="line.623"></a>
-<span class="sourceLineNo">624</span>// private Class&lt;?&gt; findClass(String name) throws ClassNotFoundException {<a name="line.624"></a>
-<span class="sourceLineNo">625</span>//    return classLoader == null ? Class.forName(name) : Class.forName(name, true, classLoader);<a name="line.625"></a>
-<span class="sourceLineNo">626</span>// }<a name="line.626"></a>
-<span class="sourceLineNo">627</span><a name="line.627"></a>
-<span class="sourceLineNo">628</span>   /**<a name="line.628"></a>
-<span class="sourceLineNo">629</span>    * Returns a {@link MethodInfo} bean that describes the specified method.<a name="line.629"></a>
-<span class="sourceLineNo">630</span>    * @param m The method to describe.<a name="line.630"></a>
-<span class="sourceLineNo">631</span>    * @return The bean with information about the method.<a name="line.631"></a>
-<span class="sourceLineNo">632</span>    */<a name="line.632"></a>
-<span class="sourceLineNo">633</span>   public static MethodInfo getMethodInfo(Method m) {<a name="line.633"></a>
-<span class="sourceLineNo">634</span>      return new MethodInfo(m);<a name="line.634"></a>
-<span class="sourceLineNo">635</span>   }<a name="line.635"></a>
-<span class="sourceLineNo">636</span><a name="line.636"></a>
-<span class="sourceLineNo">637</span>   /**<a name="line.637"></a>
-<span class="sourceLineNo">638</span>    * Returns {@link MethodInfo} beans that describe the specified methods.<a name="line.638"></a>
-<span class="sourceLineNo">639</span>    * @param m The methods to describe.<a name="line.639"></a>
-<span class="sourceLineNo">640</span>    * @return The beans with information about the methods.<a name="line.640"></a>
-<span class="sourceLineNo">641</span>    */<a name="line.641"></a>
-<span class="sourceLineNo">642</span>   public static MethodInfo[] getMethodInfo(Collection&lt;Method&gt; m) {<a name="line.642"></a>
-<span class="sourceLineNo">643</span>      MethodInfo[] mi = new MethodInfo[m.size()];<a name="line.643"></a>
-<span class="sourceLineNo">644</span>      int i = 0;<a name="line.644"></a>
-<span class="sourceLineNo">645</span>      for (Method mm : m)<a name="line.645"></a>
-<span class="sourceLineNo">646</span>         mi[i++] = getMethodInfo(mm);<a name="line.646"></a>
-<span class="sourceLineNo">647</span>      return mi;<a name="line.647"></a>
+<span class="sourceLineNo">519</span>   /**<a name="line.519"></a>
+<span class="sourceLineNo">520</span>    * Returns the class types for the specified arguments.<a name="line.520"></a>
+<span class="sourceLineNo">521</span>    *<a name="line.521"></a>
+<span class="sourceLineNo">522</span>    * @param args The objects we're getting the classes of.<a name="line.522"></a>
+<span class="sourceLineNo">523</span>    * @return The classes of the arguments.<a name="line.523"></a>
+<span class="sourceLineNo">524</span>    */<a name="line.524"></a>
+<span class="sourceLineNo">525</span>   public static Class&lt;?&gt;[] getClasses(Object...args) {<a name="line.525"></a>
+<span class="sourceLineNo">526</span>      C

<TRUNCATED>


Mime
View raw message