http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/dto/cognos/DataSet.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/dto/cognos/DataSet.html 
b/content/site/apidocs/src-html/org/apache/juneau/dto/cognos/DataSet.html
index a51c435..7e6218c 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/dto/cognos/DataSet.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/dto/cognos/DataSet.html
@@ -169,7 +169,7 @@
 <span class="sourceLineNo">161</span>    *<a name="line.161"></a>
 <span class="sourceLineNo">162</span>    * @return The value of the 
&lt;property&gt;metadata&lt;/property&gt; property on this bean, or 
&lt;jk&gt;null&lt;/jk&gt; if it is not set.<a name="line.162"></a>
 <span class="sourceLineNo">163</span>    */<a name="line.163"></a>
-<span class="sourceLineNo">164</span>   @BeanProperty(name="metadata")<a 
name="line.164"></a>
+<span class="sourceLineNo">164</span>   @BeanProperty("metadata")<a 
name="line.164"></a>
 <span class="sourceLineNo">165</span>   public Column[] getMetaData() {<a 
name="line.165"></a>
 <span class="sourceLineNo">166</span>      return metaData;<a 
name="line.166"></a>
 <span class="sourceLineNo">167</span>   }<a name="line.167"></a>
@@ -180,7 +180,7 @@
 <span class="sourceLineNo">172</span>    * @param metaData The new value for 
the &lt;property&gt;metadata&lt;/property&gt; property on this bean.<a 
name="line.172"></a>
 <span class="sourceLineNo">173</span>    * @return This object (for method 
chaining).<a name="line.173"></a>
 <span class="sourceLineNo">174</span>    */<a name="line.174"></a>
-<span class="sourceLineNo">175</span>   @BeanProperty(name="metadata")<a 
name="line.175"></a>
+<span class="sourceLineNo">175</span>   @BeanProperty("metadata")<a 
name="line.175"></a>
 <span class="sourceLineNo">176</span>   public DataSet setMetaData(Column[] 
metaData) {<a name="line.176"></a>
 <span class="sourceLineNo">177</span>      this.metaData = metaData;<a 
name="line.177"></a>
 <span class="sourceLineNo">178</span>      return this;<a name="line.178"></a>
@@ -191,7 +191,7 @@
 <span class="sourceLineNo">183</span>    *<a name="line.183"></a>
 <span class="sourceLineNo">184</span>    * @return The value of the 
&lt;property&gt;data&lt;/property&gt; property on this bean, or 
&lt;jk&gt;null&lt;/jk&gt; if it is not set.<a name="line.184"></a>
 <span class="sourceLineNo">185</span>    */<a name="line.185"></a>
-<span class="sourceLineNo">186</span>   @BeanProperty(name="data")<a 
name="line.186"></a>
+<span class="sourceLineNo">186</span>   @BeanProperty("data")<a 
name="line.186"></a>
 <span class="sourceLineNo">187</span>   public List&lt;Row&gt; getData() {<a 
name="line.187"></a>
 <span class="sourceLineNo">188</span>      return data;<a name="line.188"></a>
 <span class="sourceLineNo">189</span>   }<a name="line.189"></a>
@@ -202,7 +202,7 @@
 <span class="sourceLineNo">194</span>    * @param data The new value for the 
&lt;property&gt;data&lt;/property&gt; property on this bean.<a 
name="line.194"></a>
 <span class="sourceLineNo">195</span>    * @return This object (for method 
chaining).<a name="line.195"></a>
 <span class="sourceLineNo">196</span>    */<a name="line.196"></a>
-<span class="sourceLineNo">197</span>   @BeanProperty(name="data")<a 
name="line.197"></a>
+<span class="sourceLineNo">197</span>   @BeanProperty("data")<a 
name="line.197"></a>
 <span class="sourceLineNo">198</span>   public DataSet setData(List&lt;Row&gt; 
data) {<a name="line.198"></a>
 <span class="sourceLineNo">199</span>      this.data = data;<a 
name="line.199"></a>
 <span class="sourceLineNo">200</span>      return this;<a name="line.200"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElement.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElement.html 
b/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElement.html
index f79dcff..39b4b0b 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElement.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElement.html
@@ -44,7 +44,7 @@
 <span class="sourceLineNo">036</span>    * @return The attributes of this 
element.<a name="line.36"></a>
 <span class="sourceLineNo">037</span>    */<a name="line.37"></a>
 <span class="sourceLineNo">038</span>   @Xml(format=ATTRS)<a 
name="line.38"></a>
-<span class="sourceLineNo">039</span>   @BeanProperty(name="a")<a 
name="line.39"></a>
+<span class="sourceLineNo">039</span>   @BeanProperty("a")<a 
name="line.39"></a>
 <span class="sourceLineNo">040</span>   public 
LinkedHashMap&lt;String,Object&gt; getAttrs() {<a name="line.40"></a>
 <span class="sourceLineNo">041</span>      return attrs;<a name="line.41"></a>
 <span class="sourceLineNo">042</span>   }<a name="line.42"></a>
@@ -54,7 +54,7 @@
 <span class="sourceLineNo">046</span>    * @param attrs The new attributes for 
this element.<a name="line.46"></a>
 <span class="sourceLineNo">047</span>    * @return This object (for method 
chaining).<a name="line.47"></a>
 <span class="sourceLineNo">048</span>    */<a name="line.48"></a>
-<span class="sourceLineNo">049</span>   @BeanProperty(name="a")<a 
name="line.49"></a>
+<span class="sourceLineNo">049</span>   @BeanProperty("a")<a 
name="line.49"></a>
 <span class="sourceLineNo">050</span>   public HtmlElement 
setAttrs(LinkedHashMap&lt;String,Object&gt; attrs) {<a name="line.50"></a>
 <span class="sourceLineNo">051</span>      this.attrs = attrs;<a 
name="line.51"></a>
 <span class="sourceLineNo">052</span>      return this;<a name="line.52"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElementContainer.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElementContainer.html
 
b/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElementContainer.html
index a05d29a..302303b 100644
--- 
a/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElementContainer.html
+++ 
b/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElementContainer.html
@@ -51,7 +51,7 @@
 <span class="sourceLineNo">043</span>    * @param children The new children 
for this container.<a name="line.43"></a>
 <span class="sourceLineNo">044</span>    * @return This object (for method 
chaining).<a name="line.44"></a>
 <span class="sourceLineNo">045</span>    */<a name="line.45"></a>
-<span class="sourceLineNo">046</span>   @BeanProperty(name="c")<a 
name="line.46"></a>
+<span class="sourceLineNo">046</span>   @BeanProperty("c")<a 
name="line.46"></a>
 <span class="sourceLineNo">047</span>   public HtmlElementContainer 
setChildren(LinkedList&lt;Object&gt; children) {<a name="line.47"></a>
 <span class="sourceLineNo">048</span>      this.children = children;<a 
name="line.48"></a>
 <span class="sourceLineNo">049</span>      return this;<a name="line.49"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElementMixed.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElementMixed.html
 
b/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElementMixed.html
index ef15404..c7eac9d 100644
--- 
a/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElementMixed.html
+++ 
b/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElementMixed.html
@@ -52,7 +52,7 @@
 <span class="sourceLineNo">044</span>    * @param children The new children of 
this element.<a name="line.44"></a>
 <span class="sourceLineNo">045</span>    * @return This object (for method 
chaining).<a name="line.45"></a>
 <span class="sourceLineNo">046</span>    */<a name="line.46"></a>
-<span class="sourceLineNo">047</span>   @BeanProperty(name="c")<a 
name="line.47"></a>
+<span class="sourceLineNo">047</span>   @BeanProperty("c")<a 
name="line.47"></a>
 <span class="sourceLineNo">048</span>   public HtmlElement 
setChildren(LinkedList&lt;Object&gt; children) {<a name="line.48"></a>
 <span class="sourceLineNo">049</span>      this.children = children;<a 
name="line.49"></a>
 <span class="sourceLineNo">050</span>      return this;<a name="line.50"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElementRawText.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElementRawText.html
 
b/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElementRawText.html
index 4de9a58..46daab0 100644
--- 
a/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElementRawText.html
+++ 
b/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElementRawText.html
@@ -37,7 +37,7 @@
 <span class="sourceLineNo">029</span>    * @return The inner text of this 
element, or &lt;jk&gt;null&lt;/jk&gt; if no text is set.<a name="line.29"></a>
 <span class="sourceLineNo">030</span>    */<a name="line.30"></a>
 <span class="sourceLineNo">031</span>   @Xml(format=XmlFormat.TEXT_PWS)<a 
name="line.31"></a>
-<span class="sourceLineNo">032</span>   @BeanProperty(name="c")<a 
name="line.32"></a>
+<span class="sourceLineNo">032</span>   @BeanProperty("c")<a 
name="line.32"></a>
 <span class="sourceLineNo">033</span>   public Object getText() {<a 
name="line.33"></a>
 <span class="sourceLineNo">034</span>      return text;<a name="line.34"></a>
 <span class="sourceLineNo">035</span>   }<a name="line.35"></a>
@@ -48,7 +48,7 @@
 <span class="sourceLineNo">040</span>    * @param text The inner text of this 
element, or &lt;jk&gt;null&lt;/jk&gt; if no text is set.<a name="line.40"></a>
 <span class="sourceLineNo">041</span>    * @return This object (for method 
chaining).<a name="line.41"></a>
 <span class="sourceLineNo">042</span>    */<a name="line.42"></a>
-<span class="sourceLineNo">043</span>   @BeanProperty(name="c")<a 
name="line.43"></a>
+<span class="sourceLineNo">043</span>   @BeanProperty("c")<a 
name="line.43"></a>
 <span class="sourceLineNo">044</span>   public HtmlElement setText(Object 
text) {<a name="line.44"></a>
 <span class="sourceLineNo">045</span>      this.text = text;<a 
name="line.45"></a>
 <span class="sourceLineNo">046</span>      return this;<a name="line.46"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElementText.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElementText.html
 
b/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElementText.html
index 7d157cf..2068f63 100644
--- 
a/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElementText.html
+++ 
b/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElementText.html
@@ -37,7 +37,7 @@
 <span class="sourceLineNo">029</span>    * @return The inner text of this 
element, or &lt;jk&gt;null&lt;/jk&gt; if no text is set.<a name="line.29"></a>
 <span class="sourceLineNo">030</span>    */<a name="line.30"></a>
 <span class="sourceLineNo">031</span>   @Xml(format=XmlFormat.TEXT)<a 
name="line.31"></a>
-<span class="sourceLineNo">032</span>   @BeanProperty(name="c")<a 
name="line.32"></a>
+<span class="sourceLineNo">032</span>   @BeanProperty("c")<a 
name="line.32"></a>
 <span class="sourceLineNo">033</span>   public Object getText() {<a 
name="line.33"></a>
 <span class="sourceLineNo">034</span>      return text;<a name="line.34"></a>
 <span class="sourceLineNo">035</span>   }<a name="line.35"></a>
@@ -48,7 +48,7 @@
 <span class="sourceLineNo">040</span>    * @param text The inner text of this 
element, or &lt;jk&gt;null&lt;/jk&gt; if no text is set.<a name="line.40"></a>
 <span class="sourceLineNo">041</span>    * @return This object (for method 
chaining).<a name="line.41"></a>
 <span class="sourceLineNo">042</span>    */<a name="line.42"></a>
-<span class="sourceLineNo">043</span>   @BeanProperty(name="c")<a 
name="line.43"></a>
+<span class="sourceLineNo">043</span>   @BeanProperty("c")<a 
name="line.43"></a>
 <span class="sourceLineNo">044</span>   public HtmlElement setText(Object 
text) {<a name="line.44"></a>
 <span class="sourceLineNo">045</span>      this.text = text;<a 
name="line.45"></a>
 <span class="sourceLineNo">046</span>      return this;<a name="line.46"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.BooleanOrSchemaArraySwap.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.BooleanOrSchemaArraySwap.html
 
b/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.BooleanOrSchemaArraySwap.html
index 273e06f..beb7e17 100644
--- 
a/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.BooleanOrSchemaArraySwap.html
+++ 
b/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.BooleanOrSchemaArraySwap.html
@@ -151,7 +151,7 @@
 <span class="sourceLineNo">143</span>    *<a name="line.143"></a>
 <span class="sourceLineNo">144</span>    * @return The value of the 
&lt;property&gt;$schema&lt;/property&gt; property on this bean, or 
&lt;jk&gt;null&lt;/jk&gt; if it is not set.<a name="line.144"></a>
 <span class="sourceLineNo">145</span>    */<a name="line.145"></a>
-<span class="sourceLineNo">146</span>   @BeanProperty(name="$schema")<a 
name="line.146"></a>
+<span class="sourceLineNo">146</span>   @BeanProperty("$schema")<a 
name="line.146"></a>
 <span class="sourceLineNo">147</span>   public URI getSchemaVersionUri() {<a 
name="line.147"></a>
 <span class="sourceLineNo">148</span>      return schemaVersion;<a 
name="line.148"></a>
 <span class="sourceLineNo">149</span>   }<a name="line.149"></a>
@@ -162,7 +162,7 @@
 <span class="sourceLineNo">154</span>    * @param schemaVersion The new value 
for the &lt;property&gt;schemaVersion&lt;/property&gt; property on this bean.<a 
name="line.154"></a>
 <span class="sourceLineNo">155</span>    * @return This object (for method 
chaining).<a name="line.155"></a>
 <span class="sourceLineNo">156</span>    */<a name="line.156"></a>
-<span class="sourceLineNo">157</span>   @BeanProperty(name="$schema")<a 
name="line.157"></a>
+<span class="sourceLineNo">157</span>   @BeanProperty("$schema")<a 
name="line.157"></a>
 <span class="sourceLineNo">158</span>   public Schema setSchemaVersionUri(URI 
schemaVersion) {<a name="line.158"></a>
 <span class="sourceLineNo">159</span>      this.schemaVersion = 
schemaVersion;<a name="line.159"></a>
 <span class="sourceLineNo">160</span>      return this;<a name="line.160"></a>
@@ -1280,7 +1280,7 @@
 <span class="sourceLineNo">1272</span>    *<a name="line.1272"></a>
 <span class="sourceLineNo">1273</span>    * @return The value of the 
&lt;property&gt;$ref&lt;/property&gt; property on this bean, or 
&lt;jk&gt;null&lt;/jk&gt; if it is not set.<a name="line.1273"></a>
 <span class="sourceLineNo">1274</span>    */<a name="line.1274"></a>
-<span class="sourceLineNo">1275</span>   @BeanProperty(name="$ref")<a 
name="line.1275"></a>
+<span class="sourceLineNo">1275</span>   @BeanProperty("$ref")<a 
name="line.1275"></a>
 <span class="sourceLineNo">1276</span>   public URI getRef() {<a 
name="line.1276"></a>
 <span class="sourceLineNo">1277</span>      return ref;<a name="line.1277"></a>
 <span class="sourceLineNo">1278</span>   }<a name="line.1278"></a>
@@ -1291,7 +1291,7 @@
 <span class="sourceLineNo">1283</span>    * @param ref The new value for the 
&lt;property&gt;$ref&lt;/property&gt; property on this bean.<a 
name="line.1283"></a>
 <span class="sourceLineNo">1284</span>    * @return This object (for method 
chaining).<a name="line.1284"></a>
 <span class="sourceLineNo">1285</span>    */<a name="line.1285"></a>
-<span class="sourceLineNo">1286</span>   @BeanProperty(name="$ref")<a 
name="line.1286"></a>
+<span class="sourceLineNo">1286</span>   @BeanProperty("$ref")<a 
name="line.1286"></a>
 <span class="sourceLineNo">1287</span>   public Schema setRef(URI ref) {<a 
name="line.1287"></a>
 <span class="sourceLineNo">1288</span>      this.ref = ref;<a 
name="line.1288"></a>
 <span class="sourceLineNo">1289</span>      return this;<a 
name="line.1289"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.BooleanOrSchemaSwap.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.BooleanOrSchemaSwap.html
 
b/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.BooleanOrSchemaSwap.html
index 273e06f..beb7e17 100644
--- 
a/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.BooleanOrSchemaSwap.html
+++ 
b/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.BooleanOrSchemaSwap.html
@@ -151,7 +151,7 @@
 <span class="sourceLineNo">143</span>    *<a name="line.143"></a>
 <span class="sourceLineNo">144</span>    * @return The value of the 
&lt;property&gt;$schema&lt;/property&gt; property on this bean, or 
&lt;jk&gt;null&lt;/jk&gt; if it is not set.<a name="line.144"></a>
 <span class="sourceLineNo">145</span>    */<a name="line.145"></a>
-<span class="sourceLineNo">146</span>   @BeanProperty(name="$schema")<a 
name="line.146"></a>
+<span class="sourceLineNo">146</span>   @BeanProperty("$schema")<a 
name="line.146"></a>
 <span class="sourceLineNo">147</span>   public URI getSchemaVersionUri() {<a 
name="line.147"></a>
 <span class="sourceLineNo">148</span>      return schemaVersion;<a 
name="line.148"></a>
 <span class="sourceLineNo">149</span>   }<a name="line.149"></a>
@@ -162,7 +162,7 @@
 <span class="sourceLineNo">154</span>    * @param schemaVersion The new value 
for the &lt;property&gt;schemaVersion&lt;/property&gt; property on this bean.<a 
name="line.154"></a>
 <span class="sourceLineNo">155</span>    * @return This object (for method 
chaining).<a name="line.155"></a>
 <span class="sourceLineNo">156</span>    */<a name="line.156"></a>
-<span class="sourceLineNo">157</span>   @BeanProperty(name="$schema")<a 
name="line.157"></a>
+<span class="sourceLineNo">157</span>   @BeanProperty("$schema")<a 
name="line.157"></a>
 <span class="sourceLineNo">158</span>   public Schema setSchemaVersionUri(URI 
schemaVersion) {<a name="line.158"></a>
 <span class="sourceLineNo">159</span>      this.schemaVersion = 
schemaVersion;<a name="line.159"></a>
 <span class="sourceLineNo">160</span>      return this;<a name="line.160"></a>
@@ -1280,7 +1280,7 @@
 <span class="sourceLineNo">1272</span>    *<a name="line.1272"></a>
 <span class="sourceLineNo">1273</span>    * @return The value of the 
&lt;property&gt;$ref&lt;/property&gt; property on this bean, or 
&lt;jk&gt;null&lt;/jk&gt; if it is not set.<a name="line.1273"></a>
 <span class="sourceLineNo">1274</span>    */<a name="line.1274"></a>
-<span class="sourceLineNo">1275</span>   @BeanProperty(name="$ref")<a 
name="line.1275"></a>
+<span class="sourceLineNo">1275</span>   @BeanProperty("$ref")<a 
name="line.1275"></a>
 <span class="sourceLineNo">1276</span>   public URI getRef() {<a 
name="line.1276"></a>
 <span class="sourceLineNo">1277</span>      return ref;<a name="line.1277"></a>
 <span class="sourceLineNo">1278</span>   }<a name="line.1278"></a>
@@ -1291,7 +1291,7 @@
 <span class="sourceLineNo">1283</span>    * @param ref The new value for the 
&lt;property&gt;$ref&lt;/property&gt; property on this bean.<a 
name="line.1283"></a>
 <span class="sourceLineNo">1284</span>    * @return This object (for method 
chaining).<a name="line.1284"></a>
 <span class="sourceLineNo">1285</span>    */<a name="line.1285"></a>
-<span class="sourceLineNo">1286</span>   @BeanProperty(name="$ref")<a 
name="line.1286"></a>
+<span class="sourceLineNo">1286</span>   @BeanProperty("$ref")<a 
name="line.1286"></a>
 <span class="sourceLineNo">1287</span>   public Schema setRef(URI ref) {<a 
name="line.1287"></a>
 <span class="sourceLineNo">1288</span>      this.ref = ref;<a 
name="line.1288"></a>
 <span class="sourceLineNo">1289</span>      return this;<a 
name="line.1289"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.JsonTypeOrJsonTypeArraySwap.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.JsonTypeOrJsonTypeArraySwap.html
 
b/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.JsonTypeOrJsonTypeArraySwap.html
index 273e06f..beb7e17 100644
--- 
a/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.JsonTypeOrJsonTypeArraySwap.html
+++ 
b/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.JsonTypeOrJsonTypeArraySwap.html
@@ -151,7 +151,7 @@
 <span class="sourceLineNo">143</span>    *<a name="line.143"></a>
 <span class="sourceLineNo">144</span>    * @return The value of the 
&lt;property&gt;$schema&lt;/property&gt; property on this bean, or 
&lt;jk&gt;null&lt;/jk&gt; if it is not set.<a name="line.144"></a>
 <span class="sourceLineNo">145</span>    */<a name="line.145"></a>
-<span class="sourceLineNo">146</span>   @BeanProperty(name="$schema")<a 
name="line.146"></a>
+<span class="sourceLineNo">146</span>   @BeanProperty("$schema")<a 
name="line.146"></a>
 <span class="sourceLineNo">147</span>   public URI getSchemaVersionUri() {<a 
name="line.147"></a>
 <span class="sourceLineNo">148</span>      return schemaVersion;<a 
name="line.148"></a>
 <span class="sourceLineNo">149</span>   }<a name="line.149"></a>
@@ -162,7 +162,7 @@
 <span class="sourceLineNo">154</span>    * @param schemaVersion The new value 
for the &lt;property&gt;schemaVersion&lt;/property&gt; property on this bean.<a 
name="line.154"></a>
 <span class="sourceLineNo">155</span>    * @return This object (for method 
chaining).<a name="line.155"></a>
 <span class="sourceLineNo">156</span>    */<a name="line.156"></a>
-<span class="sourceLineNo">157</span>   @BeanProperty(name="$schema")<a 
name="line.157"></a>
+<span class="sourceLineNo">157</span>   @BeanProperty("$schema")<a 
name="line.157"></a>
 <span class="sourceLineNo">158</span>   public Schema setSchemaVersionUri(URI 
schemaVersion) {<a name="line.158"></a>
 <span class="sourceLineNo">159</span>      this.schemaVersion = 
schemaVersion;<a name="line.159"></a>
 <span class="sourceLineNo">160</span>      return this;<a name="line.160"></a>
@@ -1280,7 +1280,7 @@
 <span class="sourceLineNo">1272</span>    *<a name="line.1272"></a>
 <span class="sourceLineNo">1273</span>    * @return The value of the 
&lt;property&gt;$ref&lt;/property&gt; property on this bean, or 
&lt;jk&gt;null&lt;/jk&gt; if it is not set.<a name="line.1273"></a>
 <span class="sourceLineNo">1274</span>    */<a name="line.1274"></a>
-<span class="sourceLineNo">1275</span>   @BeanProperty(name="$ref")<a 
name="line.1275"></a>
+<span class="sourceLineNo">1275</span>   @BeanProperty("$ref")<a 
name="line.1275"></a>
 <span class="sourceLineNo">1276</span>   public URI getRef() {<a 
name="line.1276"></a>
 <span class="sourceLineNo">1277</span>      return ref;<a name="line.1277"></a>
 <span class="sourceLineNo">1278</span>   }<a name="line.1278"></a>
@@ -1291,7 +1291,7 @@
 <span class="sourceLineNo">1283</span>    * @param ref The new value for the 
&lt;property&gt;$ref&lt;/property&gt; property on this bean.<a 
name="line.1283"></a>
 <span class="sourceLineNo">1284</span>    * @return This object (for method 
chaining).<a name="line.1284"></a>
 <span class="sourceLineNo">1285</span>    */<a name="line.1285"></a>
-<span class="sourceLineNo">1286</span>   @BeanProperty(name="$ref")<a 
name="line.1286"></a>
+<span class="sourceLineNo">1286</span>   @BeanProperty("$ref")<a 
name="line.1286"></a>
 <span class="sourceLineNo">1287</span>   public Schema setRef(URI ref) {<a 
name="line.1287"></a>
 <span class="sourceLineNo">1288</span>      this.ref = ref;<a 
name="line.1288"></a>
 <span class="sourceLineNo">1289</span>      return this;<a 
name="line.1289"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.SchemaOrSchemaArraySwap.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.SchemaOrSchemaArraySwap.html
 
b/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.SchemaOrSchemaArraySwap.html
index 273e06f..beb7e17 100644
--- 
a/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.SchemaOrSchemaArraySwap.html
+++ 
b/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.SchemaOrSchemaArraySwap.html
@@ -151,7 +151,7 @@
 <span class="sourceLineNo">143</span>    *<a name="line.143"></a>
 <span class="sourceLineNo">144</span>    * @return The value of the 
&lt;property&gt;$schema&lt;/property&gt; property on this bean, or 
&lt;jk&gt;null&lt;/jk&gt; if it is not set.<a name="line.144"></a>
 <span class="sourceLineNo">145</span>    */<a name="line.145"></a>
-<span class="sourceLineNo">146</span>   @BeanProperty(name="$schema")<a 
name="line.146"></a>
+<span class="sourceLineNo">146</span>   @BeanProperty("$schema")<a 
name="line.146"></a>
 <span class="sourceLineNo">147</span>   public URI getSchemaVersionUri() {<a 
name="line.147"></a>
 <span class="sourceLineNo">148</span>      return schemaVersion;<a 
name="line.148"></a>
 <span class="sourceLineNo">149</span>   }<a name="line.149"></a>
@@ -162,7 +162,7 @@
 <span class="sourceLineNo">154</span>    * @param schemaVersion The new value 
for the &lt;property&gt;schemaVersion&lt;/property&gt; property on this bean.<a 
name="line.154"></a>
 <span class="sourceLineNo">155</span>    * @return This object (for method 
chaining).<a name="line.155"></a>
 <span class="sourceLineNo">156</span>    */<a name="line.156"></a>
-<span class="sourceLineNo">157</span>   @BeanProperty(name="$schema")<a 
name="line.157"></a>
+<span class="sourceLineNo">157</span>   @BeanProperty("$schema")<a 
name="line.157"></a>
 <span class="sourceLineNo">158</span>   public Schema setSchemaVersionUri(URI 
schemaVersion) {<a name="line.158"></a>
 <span class="sourceLineNo">159</span>      this.schemaVersion = 
schemaVersion;<a name="line.159"></a>
 <span class="sourceLineNo">160</span>      return this;<a name="line.160"></a>
@@ -1280,7 +1280,7 @@
 <span class="sourceLineNo">1272</span>    *<a name="line.1272"></a>
 <span class="sourceLineNo">1273</span>    * @return The value of the 
&lt;property&gt;$ref&lt;/property&gt; property on this bean, or 
&lt;jk&gt;null&lt;/jk&gt; if it is not set.<a name="line.1273"></a>
 <span class="sourceLineNo">1274</span>    */<a name="line.1274"></a>
-<span class="sourceLineNo">1275</span>   @BeanProperty(name="$ref")<a 
name="line.1275"></a>
+<span class="sourceLineNo">1275</span>   @BeanProperty("$ref")<a 
name="line.1275"></a>
 <span class="sourceLineNo">1276</span>   public URI getRef() {<a 
name="line.1276"></a>
 <span class="sourceLineNo">1277</span>      return ref;<a name="line.1277"></a>
 <span class="sourceLineNo">1278</span>   }<a name="line.1278"></a>
@@ -1291,7 +1291,7 @@
 <span class="sourceLineNo">1283</span>    * @param ref The new value for the 
&lt;property&gt;$ref&lt;/property&gt; property on this bean.<a 
name="line.1283"></a>
 <span class="sourceLineNo">1284</span>    * @return This object (for method 
chaining).<a name="line.1284"></a>
 <span class="sourceLineNo">1285</span>    */<a name="line.1285"></a>
-<span class="sourceLineNo">1286</span>   @BeanProperty(name="$ref")<a 
name="line.1286"></a>
+<span class="sourceLineNo">1286</span>   @BeanProperty("$ref")<a 
name="line.1286"></a>
 <span class="sourceLineNo">1287</span>   public Schema setRef(URI ref) {<a 
name="line.1287"></a>
 <span class="sourceLineNo">1288</span>      this.ref = ref;<a 
name="line.1288"></a>
 <span class="sourceLineNo">1289</span>      return this;<a 
name="line.1289"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.html 
b/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.html
index 273e06f..beb7e17 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.html
@@ -151,7 +151,7 @@
 <span class="sourceLineNo">143</span>    *<a name="line.143"></a>
 <span class="sourceLineNo">144</span>    * @return The value of the 
&lt;property&gt;$schema&lt;/property&gt; property on this bean, or 
&lt;jk&gt;null&lt;/jk&gt; if it is not set.<a name="line.144"></a>
 <span class="sourceLineNo">145</span>    */<a name="line.145"></a>
-<span class="sourceLineNo">146</span>   @BeanProperty(name="$schema")<a 
name="line.146"></a>
+<span class="sourceLineNo">146</span>   @BeanProperty("$schema")<a 
name="line.146"></a>
 <span class="sourceLineNo">147</span>   public URI getSchemaVersionUri() {<a 
name="line.147"></a>
 <span class="sourceLineNo">148</span>      return schemaVersion;<a 
name="line.148"></a>
 <span class="sourceLineNo">149</span>   }<a name="line.149"></a>
@@ -162,7 +162,7 @@
 <span class="sourceLineNo">154</span>    * @param schemaVersion The new value 
for the &lt;property&gt;schemaVersion&lt;/property&gt; property on this bean.<a 
name="line.154"></a>
 <span class="sourceLineNo">155</span>    * @return This object (for method 
chaining).<a name="line.155"></a>
 <span class="sourceLineNo">156</span>    */<a name="line.156"></a>
-<span class="sourceLineNo">157</span>   @BeanProperty(name="$schema")<a 
name="line.157"></a>
+<span class="sourceLineNo">157</span>   @BeanProperty("$schema")<a 
name="line.157"></a>
 <span class="sourceLineNo">158</span>   public Schema setSchemaVersionUri(URI 
schemaVersion) {<a name="line.158"></a>
 <span class="sourceLineNo">159</span>      this.schemaVersion = 
schemaVersion;<a name="line.159"></a>
 <span class="sourceLineNo">160</span>      return this;<a name="line.160"></a>
@@ -1280,7 +1280,7 @@
 <span class="sourceLineNo">1272</span>    *<a name="line.1272"></a>
 <span class="sourceLineNo">1273</span>    * @return The value of the 
&lt;property&gt;$ref&lt;/property&gt; property on this bean, or 
&lt;jk&gt;null&lt;/jk&gt; if it is not set.<a name="line.1273"></a>
 <span class="sourceLineNo">1274</span>    */<a name="line.1274"></a>
-<span class="sourceLineNo">1275</span>   @BeanProperty(name="$ref")<a 
name="line.1275"></a>
+<span class="sourceLineNo">1275</span>   @BeanProperty("$ref")<a 
name="line.1275"></a>
 <span class="sourceLineNo">1276</span>   public URI getRef() {<a 
name="line.1276"></a>
 <span class="sourceLineNo">1277</span>      return ref;<a name="line.1277"></a>
 <span class="sourceLineNo">1278</span>   }<a name="line.1278"></a>
@@ -1291,7 +1291,7 @@
 <span class="sourceLineNo">1283</span>    * @param ref The new value for the 
&lt;property&gt;$ref&lt;/property&gt; property on this bean.<a 
name="line.1283"></a>
 <span class="sourceLineNo">1284</span>    * @return This object (for method 
chaining).<a name="line.1284"></a>
 <span class="sourceLineNo">1285</span>    */<a name="line.1285"></a>
-<span class="sourceLineNo">1286</span>   @BeanProperty(name="$ref")<a 
name="line.1286"></a>
+<span class="sourceLineNo">1286</span>   @BeanProperty("$ref")<a 
name="line.1286"></a>
 <span class="sourceLineNo">1287</span>   public Schema setRef(URI ref) {<a 
name="line.1287"></a>
 <span class="sourceLineNo">1288</span>      this.ref = ref;<a 
name="line.1288"></a>
 <span class="sourceLineNo">1289</span>      return this;<a 
name="line.1289"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/internal/ArrayUtils.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/internal/ArrayUtils.html 
b/content/site/apidocs/src-html/org/apache/juneau/internal/ArrayUtils.html
index 4cc8339..5dc5d1e 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/internal/ArrayUtils.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/internal/ArrayUtils.html
@@ -213,125 +213,152 @@
 <span class="sourceLineNo">205</span>   }<a name="line.205"></a>
 <span class="sourceLineNo">206</span><a name="line.206"></a>
 <span class="sourceLineNo">207</span>   /**<a name="line.207"></a>
-<span class="sourceLineNo">208</span>    * Shortcut for calling 
&lt;code&gt;myList.toArray(new T[myList.size()]);&lt;/code&gt;<a 
name="line.208"></a>
-<span class="sourceLineNo">209</span>    *<a name="line.209"></a>
-<span class="sourceLineNo">210</span>    * @param c The collection being 
converted to an array.<a name="line.210"></a>
-<span class="sourceLineNo">211</span>    * @param componentType The component 
type of the array.<a name="line.211"></a>
-<span class="sourceLineNo">212</span>    * @return The collection converted to 
an array.<a name="line.212"></a>
-<span class="sourceLineNo">213</span>    */<a name="line.213"></a>
-<span class="sourceLineNo">214</span>   @SuppressWarnings("unchecked")<a 
name="line.214"></a>
-<span class="sourceLineNo">215</span>   public static &lt;T&gt; T[] 
toObjectArray(Collection&lt;?&gt; c, Class&lt;T&gt; componentType) {<a 
name="line.215"></a>
-<span class="sourceLineNo">216</span>      Object a = 
Array.newInstance(componentType, c.size());<a name="line.216"></a>
-<span class="sourceLineNo">217</span>      Iterator&lt;?&gt; it = 
c.iterator();<a name="line.217"></a>
-<span class="sourceLineNo">218</span>      int i = 0;<a name="line.218"></a>
-<span class="sourceLineNo">219</span>      while (it.hasNext())<a 
name="line.219"></a>
-<span class="sourceLineNo">220</span>         Array.set(a, i++, it.next());<a 
name="line.220"></a>
-<span class="sourceLineNo">221</span>      return (T[])a;<a 
name="line.221"></a>
-<span class="sourceLineNo">222</span>   }<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>    * Copies the specified array into the 
specified list.<a name="line.225"></a>
-<span class="sourceLineNo">226</span>    * Works on both object and primitive 
arrays.<a name="line.226"></a>
-<span class="sourceLineNo">227</span>    *<a name="line.227"></a>
-<span class="sourceLineNo">228</span>    * @param array The array to copy into 
a list.<a name="line.228"></a>
-<span class="sourceLineNo">229</span>    * @param list The list to copy the 
values into.<a name="line.229"></a>
-<span class="sourceLineNo">230</span>    */<a name="line.230"></a>
-<span class="sourceLineNo">231</span>   
@SuppressWarnings({"unchecked","rawtypes"})<a name="line.231"></a>
-<span class="sourceLineNo">232</span>   public static void copyToList(Object 
array, List list) {<a name="line.232"></a>
-<span class="sourceLineNo">233</span>      if (array != null) {<a 
name="line.233"></a>
-<span class="sourceLineNo">234</span>         int length = 
Array.getLength(array);<a name="line.234"></a>
-<span class="sourceLineNo">235</span>         for (int i = 0; i &lt; length; 
i++)<a name="line.235"></a>
-<span class="sourceLineNo">236</span>            list.add(Array.get(array, 
i));<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><a name="line.239"></a>
-<span class="sourceLineNo">240</span>   /**<a name="line.240"></a>
-<span class="sourceLineNo">241</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; 
if the specified array contains the specified element<a name="line.241"></a>
-<span class="sourceLineNo">242</span>    *    using the {@link 
Object#equals(Object)} method.<a name="line.242"></a>
-<span class="sourceLineNo">243</span>    *<a name="line.243"></a>
-<span class="sourceLineNo">244</span>    * @param element The element to check 
for.<a name="line.244"></a>
-<span class="sourceLineNo">245</span>    * @param array The array to check.<a 
name="line.245"></a>
-<span class="sourceLineNo">246</span>    * @return &lt;jk&gt;true&lt;/jk&gt; 
if the specified array contains the specified element,<a name="line.246"></a>
-<span class="sourceLineNo">247</span>    *    &lt;jk&gt;false&lt;/jk&gt; if 
the array or element is &lt;jk&gt;null&lt;/jk&gt;.<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    */<a name="line.248"></a>
-<span class="sourceLineNo">249</span>   public static &lt;T&gt; boolean 
contains(T element, T[] array) {<a name="line.249"></a>
-<span class="sourceLineNo">250</span>      return indexOf(element, array) != 
-1;<a name="line.250"></a>
-<span class="sourceLineNo">251</span>   }<a name="line.251"></a>
-<span class="sourceLineNo">252</span><a name="line.252"></a>
-<span class="sourceLineNo">253</span>   /**<a name="line.253"></a>
-<span class="sourceLineNo">254</span>    * Returns the index position of the 
element in the specified array<a name="line.254"></a>
-<span class="sourceLineNo">255</span>    *    using the {@link 
Object#equals(Object)} method.<a name="line.255"></a>
-<span class="sourceLineNo">256</span>    *<a name="line.256"></a>
-<span class="sourceLineNo">257</span>    * @param element The element to check 
for.<a name="line.257"></a>
-<span class="sourceLineNo">258</span>    * @param array The array to check.<a 
name="line.258"></a>
-<span class="sourceLineNo">259</span>    * @return The index position of the 
element in the specified array, or<a name="line.259"></a>
-<span class="sourceLineNo">260</span>    *    &lt;code&gt;-1&lt;/code&gt; if 
the array doesn't contain the element, or the array or element is 
&lt;jk&gt;null&lt;/jk&gt;.<a name="line.260"></a>
-<span class="sourceLineNo">261</span>    */<a name="line.261"></a>
-<span class="sourceLineNo">262</span>   public static &lt;T&gt; int indexOf(T 
element, T[] array) {<a name="line.262"></a>
-<span class="sourceLineNo">263</span>      if (element == null)<a 
name="line.263"></a>
-<span class="sourceLineNo">264</span>         return -1;<a name="line.264"></a>
-<span class="sourceLineNo">265</span>      if (array == null)<a 
name="line.265"></a>
-<span class="sourceLineNo">266</span>         return -1;<a name="line.266"></a>
-<span class="sourceLineNo">267</span>      for (int i = 0; i &lt; 
array.length; i++)<a name="line.267"></a>
-<span class="sourceLineNo">268</span>         if (element.equals(array[i]))<a 
name="line.268"></a>
-<span class="sourceLineNo">269</span>            return i;<a 
name="line.269"></a>
-<span class="sourceLineNo">270</span>      return -1;<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>   /**<a name="line.273"></a>
-<span class="sourceLineNo">274</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; 
if the specified array contains the specified element<a name="line.274"></a>
-<span class="sourceLineNo">275</span>    *    using the {@link 
String#equals(Object)} method.<a name="line.275"></a>
-<span class="sourceLineNo">276</span>    *<a name="line.276"></a>
-<span class="sourceLineNo">277</span>    * @param element The element to check 
for.<a name="line.277"></a>
-<span class="sourceLineNo">278</span>    * @param array The array to check.<a 
name="line.278"></a>
-<span class="sourceLineNo">279</span>    * @return &lt;jk&gt;true&lt;/jk&gt; 
if the specified array contains the specified element,<a name="line.279"></a>
-<span class="sourceLineNo">280</span>    *    &lt;jk&gt;false&lt;/jk&gt; if 
the array or element is &lt;jk&gt;null&lt;/jk&gt;.<a name="line.280"></a>
-<span class="sourceLineNo">281</span>    */<a name="line.281"></a>
-<span class="sourceLineNo">282</span>   public static boolean contains(String 
element, String[] array) {<a name="line.282"></a>
-<span class="sourceLineNo">283</span>      return indexOf(element, array) != 
-1;<a name="line.283"></a>
-<span class="sourceLineNo">284</span>   }<a name="line.284"></a>
-<span class="sourceLineNo">285</span><a name="line.285"></a>
-<span class="sourceLineNo">286</span>   /**<a name="line.286"></a>
-<span class="sourceLineNo">287</span>    * Returns the index position of the 
element in the specified array<a name="line.287"></a>
-<span class="sourceLineNo">288</span>    *    using the {@link 
String#equals(Object)} method.<a name="line.288"></a>
-<span class="sourceLineNo">289</span>    *<a name="line.289"></a>
-<span class="sourceLineNo">290</span>    * @param element The element to check 
for.<a name="line.290"></a>
-<span class="sourceLineNo">291</span>    * @param array The array to check.<a 
name="line.291"></a>
-<span class="sourceLineNo">292</span>    * @return The index position of the 
element in the specified array, or<a name="line.292"></a>
-<span class="sourceLineNo">293</span>    *    &lt;code&gt;-1&lt;/code&gt; if 
the array doesn't contain the element, or the array or element is 
&lt;jk&gt;null&lt;/jk&gt;.<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    */<a name="line.294"></a>
-<span class="sourceLineNo">295</span>   public static int indexOf(String 
element, String[] array) {<a name="line.295"></a>
-<span class="sourceLineNo">296</span>      if (element == null)<a 
name="line.296"></a>
-<span class="sourceLineNo">297</span>         return -1;<a name="line.297"></a>
-<span class="sourceLineNo">298</span>      if (array == null)<a 
name="line.298"></a>
-<span class="sourceLineNo">299</span>         return -1;<a name="line.299"></a>
-<span class="sourceLineNo">300</span>      for (int i = 0; i &lt; 
array.length; i++)<a name="line.300"></a>
-<span class="sourceLineNo">301</span>         if (element.equals(array[i]))<a 
name="line.301"></a>
-<span class="sourceLineNo">302</span>            return i;<a 
name="line.302"></a>
-<span class="sourceLineNo">303</span>      return -1;<a name="line.303"></a>
-<span class="sourceLineNo">304</span>   }<a name="line.304"></a>
-<span class="sourceLineNo">305</span><a name="line.305"></a>
-<span class="sourceLineNo">306</span>   /**<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    * Converts a primitive wrapper array 
(e.g. &lt;code&gt;Integer[]&lt;/code&gt;) to a primitive array (e.g. 
&lt;code&gt;&lt;jk&gt;int&lt;/jk&gt;[]&lt;/code&gt;).<a name="line.307"></a>
-<span class="sourceLineNo">308</span>    *<a name="line.308"></a>
-<span class="sourceLineNo">309</span>    * @param o The array to convert.  
Must be a primitive wrapper array.<a name="line.309"></a>
-<span class="sourceLineNo">310</span>    * @return A new array.<a 
name="line.310"></a>
-<span class="sourceLineNo">311</span>    * @throws IllegalArgumentException If 
object is not a wrapper object array.<a name="line.311"></a>
-<span class="sourceLineNo">312</span>    */<a name="line.312"></a>
-<span class="sourceLineNo">313</span>   public static Object 
toPrimitiveArray(Object o) {<a name="line.313"></a>
-<span class="sourceLineNo">314</span>      Class&lt;?&gt; c = o.getClass();<a 
name="line.314"></a>
-<span class="sourceLineNo">315</span>      if (! c.isArray())<a 
name="line.315"></a>
-<span class="sourceLineNo">316</span>         throw new 
IllegalArgumentException("Cannot pass non-array objects to 
toPrimitiveArray()");<a name="line.316"></a>
-<span class="sourceLineNo">317</span>      int l = Array.getLength(o);<a 
name="line.317"></a>
-<span class="sourceLineNo">318</span>      Class&lt;?&gt; tc = 
ClassUtils.getPrimitiveForWrapper(c.getComponentType());<a name="line.318"></a>
-<span class="sourceLineNo">319</span>      if (tc == null)<a 
name="line.319"></a>
-<span class="sourceLineNo">320</span>         throw new 
IllegalArgumentException("Array type is not a primitive wrapper array.");<a 
name="line.320"></a>
-<span class="sourceLineNo">321</span>      Object a = Array.newInstance(tc, 
l);<a name="line.321"></a>
-<span class="sourceLineNo">322</span>      for (int i = 0; i &lt; l; i++)<a 
name="line.322"></a>
-<span class="sourceLineNo">323</span>         Array.set(a, i, Array.get(o, 
i));<a name="line.323"></a>
-<span class="sourceLineNo">324</span>      return a;<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">208</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; 
if the specified object is an array.<a name="line.208"></a>
+<span class="sourceLineNo">209</span>    * @param array The array to test.<a 
name="line.209"></a>
+<span class="sourceLineNo">210</span>    * @return &lt;jk&gt;true&lt;/jk&gt; 
if the specified object is an array.<a name="line.210"></a>
+<span class="sourceLineNo">211</span>    */<a name="line.211"></a>
+<span class="sourceLineNo">212</span>   public static boolean isArray(Object 
array) {<a name="line.212"></a>
+<span class="sourceLineNo">213</span>      return array != null &amp;&amp; 
array.getClass().isArray();<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>    * Converts the specified array to an 
&lt;code&gt;ArrayList&lt;/code&gt;<a name="line.217"></a>
+<span class="sourceLineNo">218</span>    * <a name="line.218"></a>
+<span class="sourceLineNo">219</span>    * @param array The array to 
convert.<a name="line.219"></a>
+<span class="sourceLineNo">220</span>    * @param componentType The type of 
objects in the array.<a name="line.220"></a>
+<span class="sourceLineNo">221</span>    *    It must match the actual 
component type in the array.<a name="line.221"></a>
+<span class="sourceLineNo">222</span>    * @return A new {@link ArrayList}<a 
name="line.222"></a>
+<span class="sourceLineNo">223</span>    */<a name="line.223"></a>
+<span class="sourceLineNo">224</span>   @SuppressWarnings("unchecked")<a 
name="line.224"></a>
+<span class="sourceLineNo">225</span>   public static &lt;T&gt; List&lt;T&gt; 
toList(Object array, Class&lt;T&gt; componentType) {<a name="line.225"></a>
+<span class="sourceLineNo">226</span>      List&lt;T&gt; l = new 
ArrayList&lt;T&gt;(Array.getLength(array));<a name="line.226"></a>
+<span class="sourceLineNo">227</span>      for (int i = 0; i &lt; 
Array.getLength(array); i++)<a name="line.227"></a>
+<span class="sourceLineNo">228</span>         l.add((T)Array.get(array, i));<a 
name="line.228"></a>
+<span class="sourceLineNo">229</span>      return l;<a name="line.229"></a>
+<span class="sourceLineNo">230</span>   }<a name="line.230"></a>
+<span class="sourceLineNo">231</span><a name="line.231"></a>
+<span class="sourceLineNo">232</span>   /**<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    * Shortcut for calling 
&lt;code&gt;myList.toArray(new T[myList.size()]);&lt;/code&gt;<a 
name="line.233"></a>
+<span class="sourceLineNo">234</span>    *<a name="line.234"></a>
+<span class="sourceLineNo">235</span>    * @param c The collection being 
converted to an array.<a name="line.235"></a>
+<span class="sourceLineNo">236</span>    * @param componentType The component 
type of the array.<a name="line.236"></a>
+<span class="sourceLineNo">237</span>    * @return The collection converted to 
an array.<a name="line.237"></a>
+<span class="sourceLineNo">238</span>    */<a name="line.238"></a>
+<span class="sourceLineNo">239</span>   @SuppressWarnings("unchecked")<a 
name="line.239"></a>
+<span class="sourceLineNo">240</span>   public static &lt;T&gt; T[] 
toObjectArray(Collection&lt;?&gt; c, Class&lt;T&gt; componentType) {<a 
name="line.240"></a>
+<span class="sourceLineNo">241</span>      Object a = 
Array.newInstance(componentType, c.size());<a name="line.241"></a>
+<span class="sourceLineNo">242</span>      Iterator&lt;?&gt; it = 
c.iterator();<a name="line.242"></a>
+<span class="sourceLineNo">243</span>      int i = 0;<a name="line.243"></a>
+<span class="sourceLineNo">244</span>      while (it.hasNext())<a 
name="line.244"></a>
+<span class="sourceLineNo">245</span>         Array.set(a, i++, it.next());<a 
name="line.245"></a>
+<span class="sourceLineNo">246</span>      return (T[])a;<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>   /**<a name="line.249"></a>
+<span class="sourceLineNo">250</span>    * Copies the specified array into the 
specified list.<a name="line.250"></a>
+<span class="sourceLineNo">251</span>    * Works on both object and primitive 
arrays.<a name="line.251"></a>
+<span class="sourceLineNo">252</span>    *<a name="line.252"></a>
+<span class="sourceLineNo">253</span>    * @param array The array to copy into 
a list.<a name="line.253"></a>
+<span class="sourceLineNo">254</span>    * @param list The list to copy the 
values into.<a name="line.254"></a>
+<span class="sourceLineNo">255</span>    * @return The same list passed in.<a 
name="line.255"></a>
+<span class="sourceLineNo">256</span>    */<a name="line.256"></a>
+<span class="sourceLineNo">257</span>   
@SuppressWarnings({"unchecked","rawtypes"})<a name="line.257"></a>
+<span class="sourceLineNo">258</span>   public static List copyToList(Object 
array, List list) {<a name="line.258"></a>
+<span class="sourceLineNo">259</span>      if (array != null) {<a 
name="line.259"></a>
+<span class="sourceLineNo">260</span>         int length = 
Array.getLength(array);<a name="line.260"></a>
+<span class="sourceLineNo">261</span>         for (int i = 0; i &lt; length; 
i++)<a name="line.261"></a>
+<span class="sourceLineNo">262</span>            list.add(Array.get(array, 
i));<a name="line.262"></a>
+<span class="sourceLineNo">263</span>      }<a name="line.263"></a>
+<span class="sourceLineNo">264</span>      return list;<a name="line.264"></a>
+<span class="sourceLineNo">265</span>   }<a name="line.265"></a>
+<span class="sourceLineNo">266</span><a name="line.266"></a>
+<span class="sourceLineNo">267</span>   /**<a name="line.267"></a>
+<span class="sourceLineNo">268</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; 
if the specified array contains the specified element<a name="line.268"></a>
+<span class="sourceLineNo">269</span>    *    using the {@link 
Object#equals(Object)} method.<a name="line.269"></a>
+<span class="sourceLineNo">270</span>    *<a name="line.270"></a>
+<span class="sourceLineNo">271</span>    * @param element The element to check 
for.<a name="line.271"></a>
+<span class="sourceLineNo">272</span>    * @param array The array to check.<a 
name="line.272"></a>
+<span class="sourceLineNo">273</span>    * @return &lt;jk&gt;true&lt;/jk&gt; 
if the specified array contains the specified element,<a name="line.273"></a>
+<span class="sourceLineNo">274</span>    *    &lt;jk&gt;false&lt;/jk&gt; if 
the array or element is &lt;jk&gt;null&lt;/jk&gt;.<a name="line.274"></a>
+<span class="sourceLineNo">275</span>    */<a name="line.275"></a>
+<span class="sourceLineNo">276</span>   public static &lt;T&gt; boolean 
contains(T element, T[] array) {<a name="line.276"></a>
+<span class="sourceLineNo">277</span>      return indexOf(element, array) != 
-1;<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>   /**<a name="line.280"></a>
+<span class="sourceLineNo">281</span>    * Returns the index position of the 
element in the specified array<a name="line.281"></a>
+<span class="sourceLineNo">282</span>    *    using the {@link 
Object#equals(Object)} method.<a name="line.282"></a>
+<span class="sourceLineNo">283</span>    *<a name="line.283"></a>
+<span class="sourceLineNo">284</span>    * @param element The element to check 
for.<a name="line.284"></a>
+<span class="sourceLineNo">285</span>    * @param array The array to check.<a 
name="line.285"></a>
+<span class="sourceLineNo">286</span>    * @return The index position of the 
element in the specified array, or<a name="line.286"></a>
+<span class="sourceLineNo">287</span>    *    &lt;code&gt;-1&lt;/code&gt; if 
the array doesn't contain the element, or the array or element is 
&lt;jk&gt;null&lt;/jk&gt;.<a name="line.287"></a>
+<span class="sourceLineNo">288</span>    */<a name="line.288"></a>
+<span class="sourceLineNo">289</span>   public static &lt;T&gt; int indexOf(T 
element, T[] array) {<a name="line.289"></a>
+<span class="sourceLineNo">290</span>      if (element == null)<a 
name="line.290"></a>
+<span class="sourceLineNo">291</span>         return -1;<a name="line.291"></a>
+<span class="sourceLineNo">292</span>      if (array == null)<a 
name="line.292"></a>
+<span class="sourceLineNo">293</span>         return -1;<a name="line.293"></a>
+<span class="sourceLineNo">294</span>      for (int i = 0; i &lt; 
array.length; i++)<a name="line.294"></a>
+<span class="sourceLineNo">295</span>         if (element.equals(array[i]))<a 
name="line.295"></a>
+<span class="sourceLineNo">296</span>            return i;<a 
name="line.296"></a>
+<span class="sourceLineNo">297</span>      return -1;<a name="line.297"></a>
+<span class="sourceLineNo">298</span>   }<a name="line.298"></a>
+<span class="sourceLineNo">299</span><a name="line.299"></a>
+<span class="sourceLineNo">300</span>   /**<a name="line.300"></a>
+<span class="sourceLineNo">301</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; 
if the specified array contains the specified element<a name="line.301"></a>
+<span class="sourceLineNo">302</span>    *    using the {@link 
String#equals(Object)} method.<a name="line.302"></a>
+<span class="sourceLineNo">303</span>    *<a name="line.303"></a>
+<span class="sourceLineNo">304</span>    * @param element The element to check 
for.<a name="line.304"></a>
+<span class="sourceLineNo">305</span>    * @param array The array to check.<a 
name="line.305"></a>
+<span class="sourceLineNo">306</span>    * @return &lt;jk&gt;true&lt;/jk&gt; 
if the specified array contains the specified element,<a name="line.306"></a>
+<span class="sourceLineNo">307</span>    *    &lt;jk&gt;false&lt;/jk&gt; if 
the array or element is &lt;jk&gt;null&lt;/jk&gt;.<a name="line.307"></a>
+<span class="sourceLineNo">308</span>    */<a name="line.308"></a>
+<span class="sourceLineNo">309</span>   public static boolean contains(String 
element, String[] array) {<a name="line.309"></a>
+<span class="sourceLineNo">310</span>      return indexOf(element, array) != 
-1;<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>   /**<a name="line.313"></a>
+<span class="sourceLineNo">314</span>    * Returns the index position of the 
element in the specified array<a name="line.314"></a>
+<span class="sourceLineNo">315</span>    *    using the {@link 
String#equals(Object)} method.<a name="line.315"></a>
+<span class="sourceLineNo">316</span>    *<a name="line.316"></a>
+<span class="sourceLineNo">317</span>    * @param element The element to check 
for.<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    * @param array The array to check.<a 
name="line.318"></a>
+<span class="sourceLineNo">319</span>    * @return The index position of the 
element in the specified array, or<a name="line.319"></a>
+<span class="sourceLineNo">320</span>    *    &lt;code&gt;-1&lt;/code&gt; if 
the array doesn't contain the element, or the array or element is 
&lt;jk&gt;null&lt;/jk&gt;.<a name="line.320"></a>
+<span class="sourceLineNo">321</span>    */<a name="line.321"></a>
+<span class="sourceLineNo">322</span>   public static int indexOf(String 
element, String[] array) {<a name="line.322"></a>
+<span class="sourceLineNo">323</span>      if (element == null)<a 
name="line.323"></a>
+<span class="sourceLineNo">324</span>         return -1;<a name="line.324"></a>
+<span class="sourceLineNo">325</span>      if (array == null)<a 
name="line.325"></a>
+<span class="sourceLineNo">326</span>         return -1;<a name="line.326"></a>
+<span class="sourceLineNo">327</span>      for (int i = 0; i &lt; 
array.length; i++)<a name="line.327"></a>
+<span class="sourceLineNo">328</span>         if (element.equals(array[i]))<a 
name="line.328"></a>
+<span class="sourceLineNo">329</span>            return i;<a 
name="line.329"></a>
+<span class="sourceLineNo">330</span>      return -1;<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>    * Converts a primitive wrapper array 
(e.g. &lt;code&gt;Integer[]&lt;/code&gt;) to a primitive array (e.g. 
&lt;code&gt;&lt;jk&gt;int&lt;/jk&gt;[]&lt;/code&gt;).<a name="line.334"></a>
+<span class="sourceLineNo">335</span>    *<a name="line.335"></a>
+<span class="sourceLineNo">336</span>    * @param o The array to convert.  
Must be a primitive wrapper array.<a name="line.336"></a>
+<span class="sourceLineNo">337</span>    * @return A new array.<a 
name="line.337"></a>
+<span class="sourceLineNo">338</span>    * @throws IllegalArgumentException If 
object is not a wrapper object array.<a name="line.338"></a>
+<span class="sourceLineNo">339</span>    */<a name="line.339"></a>
+<span class="sourceLineNo">340</span>   public static Object 
toPrimitiveArray(Object o) {<a name="line.340"></a>
+<span class="sourceLineNo">341</span>      Class&lt;?&gt; c = o.getClass();<a 
name="line.341"></a>
+<span class="sourceLineNo">342</span>      if (! c.isArray())<a 
name="line.342"></a>
+<span class="sourceLineNo">343</span>         throw new 
IllegalArgumentException("Cannot pass non-array objects to 
toPrimitiveArray()");<a name="line.343"></a>
+<span class="sourceLineNo">344</span>      int l = Array.getLength(o);<a 
name="line.344"></a>
+<span class="sourceLineNo">345</span>      Class&lt;?&gt; tc = 
ClassUtils.getPrimitiveForWrapper(c.getComponentType());<a name="line.345"></a>
+<span class="sourceLineNo">346</span>      if (tc == null)<a 
name="line.346"></a>
+<span class="sourceLineNo">347</span>         throw new 
IllegalArgumentException("Array type is not a primitive wrapper array.");<a 
name="line.347"></a>
+<span class="sourceLineNo">348</span>      Object a = Array.newInstance(tc, 
l);<a name="line.348"></a>
+<span class="sourceLineNo">349</span>      for (int i = 0; i &lt; l; i++)<a 
name="line.349"></a>
+<span class="sourceLineNo">350</span>         Array.set(a, i, Array.get(o, 
i));<a name="line.350"></a>
+<span class="sourceLineNo">351</span>      return a;<a name="line.351"></a>
+<span class="sourceLineNo">352</span>   }<a name="line.352"></a>
+<span class="sourceLineNo">353</span>}<a name="line.353"></a>
 
 
 

Reply via email to