You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2018/01/18 19:34:51 UTC
[15/33] juneau-website git commit: Update javadocs.
http://git-wip-us.apache.org/repos/asf/juneau-website/blob/60d9bd65/content/site/apidocs/org/apache/juneau/internal/package-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/internal/package-summary.html b/content/site/apidocs/org/apache/juneau/internal/package-summary.html
index 6f85aee..188dcae 100644
--- a/content/site/apidocs/org/apache/juneau/internal/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/internal/package-summary.html
@@ -104,231 +104,237 @@
</td>
</tr>
<tr class="rowColor">
+<td class="colFirst"><a href="../../../../org/apache/juneau/internal/BeanPropertyUtils.html" title="class in org.apache.juneau.internal">BeanPropertyUtils</a></td>
+<td class="colLast">
+<div class="block">Utility methods when working with setting of bean properties.</div>
+</td>
+</tr>
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/internal/ByteArrayCache.html" title="class in org.apache.juneau.internal">ByteArrayCache</a></td>
<td class="colLast">
<div class="block">A utility class for caching byte arrays in memory so that duplicate arrays can be reused.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/internal/ByteArrayInOutStream.html" title="class in org.apache.juneau.internal">ByteArrayInOutStream</a></td>
<td class="colLast">
<div class="block">Subclass of a ByteArrayOutputStream that avoids a byte array copy when reading from an input stream.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/internal/Cache.html" title="class in org.apache.juneau.internal">Cache</a><K,V></td>
<td class="colLast">
<div class="block">Simple in-memory cache of objects.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/internal/CharSequenceReader.html" title="class in org.apache.juneau.internal">CharSequenceReader</a></td>
<td class="colLast">
<div class="block">Similar to <a href="http://docs.oracle.com/javase/7/docs/api/java/io/StringReader.html?is-external=true" title="class or interface in java.io"><code>StringReader</code></a> except reads from a generic <a href="../../../../org/apache/juneau/internal/CharSequenceReader.html" title="class in org.apache.juneau.internal"><code>CharSequenceReader</code></a>.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/internal/ClassUtils.html" title="class in org.apache.juneau.internal">ClassUtils</a></td>
<td class="colLast">
<div class="block">Class-related utility methods.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/internal/ClassUtils.MethodInfo.html" title="class in org.apache.juneau.internal">ClassUtils.MethodInfo</a></td>
<td class="colLast">
<div class="block">Simple bean that shows the name, parameter types, and return type of a method.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/internal/CollectionUtils.html" title="class in org.apache.juneau.internal">CollectionUtils</a></td>
<td class="colLast">
<div class="block">Utility methods for collections.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/internal/DateUtils.html" title="class in org.apache.juneau.internal">DateUtils</a></td>
<td class="colLast">
<div class="block">A utility class for parsing and formatting HTTP dates as used in cookies and other headers.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/internal/DelegateBeanMap.html" title="class in org.apache.juneau.internal">DelegateBeanMap</a><T></td>
<td class="colLast">
<div class="block">Represents a wrapped <a href="../../../../org/apache/juneau/BeanMap.html" title="class in org.apache.juneau"><code>BeanMap</code></a> where property values can be overridden, removed, or reordered without
affecting the underlying bean.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/internal/DelegateList.html" title="class in org.apache.juneau.internal">DelegateList</a><T extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><?>></td>
<td class="colLast">
<div class="block">Represents a wrapped <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util"><code>Collection</code></a> where entries in the list can be removed or reordered without affecting the
underlying list.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/internal/DelegateMap.html" title="class in org.apache.juneau.internal">DelegateMap</a><T></td>
<td class="colLast">
<div class="block">Represents a wrapped <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util"><code>Map</code></a> where entries in the map can be removed without affecting the underlying map.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/internal/FileReaderBuilder.html" title="class in org.apache.juneau.internal">FileReaderBuilder</a></td>
<td class="colLast">
<div class="block">Utility class for creating <a href="http://docs.oracle.com/javase/7/docs/api/java/io/FileReader.html?is-external=true" title="class or interface in java.io"><code>FileReader</code></a> objects.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/internal/FileUtils.html" title="class in org.apache.juneau.internal">FileUtils</a></td>
<td class="colLast">
<div class="block">File utilities.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/internal/FileWriterBuilder.html" title="class in org.apache.juneau.internal">FileWriterBuilder</a></td>
<td class="colLast">
<div class="block">Utility class for creating <a href="http://docs.oracle.com/javase/7/docs/api/java/io/FileWriter.html?is-external=true" title="class or interface in java.io"><code>FileWriter</code></a> objects.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/internal/FilteredMap.html" title="class in org.apache.juneau.internal">FilteredMap</a><K,V></td>
<td class="colLast">
<div class="block">Wrapper around a map where the key names are overridden.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/internal/HashCode.html" title="class in org.apache.juneau.internal">HashCode</a></td>
<td class="colLast">
<div class="block">Utility class for generating integer hash codes.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/internal/IdentityList.html" title="class in org.apache.juneau.internal">IdentityList</a><T></td>
<td class="colLast">
<div class="block">Combination of a <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedList.html?is-external=true" title="class or interface in java.util"><code>LinkedList</code></a> and <code>IdentitySet</code>.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/internal/IOUtils.html" title="class in org.apache.juneau.internal">IOUtils</a></td>
<td class="colLast">
<div class="block">Various I/O related utility methods.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/internal/JuneauLogger.html" title="class in org.apache.juneau.internal">JuneauLogger</a></td>
<td class="colLast">
<div class="block">Wraps and extends the <a href="http://docs.oracle.com/javase/7/docs/api/java/util/logging/Logger.html?is-external=true" title="class or interface in java.util.logging"><code>Logger</code></a> class to provide some additional convenience methods.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/internal/KeywordSet.html" title="class in org.apache.juneau.internal">KeywordSet</a></td>
<td class="colLast">
<div class="block">Stores a set of language keywords for quick lookup.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/internal/MultiIterable.html" title="class in org.apache.juneau.internal">MultiIterable</a><E></td>
<td class="colLast">
<div class="block">Utility class for defining an iterator over one or more iterables.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/internal/MultiSet.html" title="class in org.apache.juneau.internal">MultiSet</a><E></td>
<td class="colLast">
<div class="block">Encapsulates multiple collections so they can be iterated over as if they were all part of the same collection.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/internal/NoCloseOutputStream.html" title="class in org.apache.juneau.internal">NoCloseOutputStream</a></td>
<td class="colLast">
<div class="block">Wraps an existing <a href="http://docs.oracle.com/javase/7/docs/api/java/io/OutputStream.html?is-external=true" title="class or interface in java.io"><code>OutputStream</code></a> where the <a href="../../../../org/apache/juneau/internal/NoCloseOutputStream.html#close--"><code>NoCloseOutputStream.close()</code></a> method is a no-op.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/internal/NoCloseWriter.html" title="class in org.apache.juneau.internal">NoCloseWriter</a></td>
<td class="colLast">
<div class="block">Wraps an existing <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io"><code>Writer</code></a> where the <a href="../../../../org/apache/juneau/internal/NoCloseWriter.html#close--"><code>NoCloseWriter.close()</code></a> method is a no-op.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/internal/ObjectUtils.html" title="class in org.apache.juneau.internal">ObjectUtils</a></td>
<td class="colLast">
<div class="block">Utility class for efficiently converting objects between types.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/internal/Pair.html" title="class in org.apache.juneau.internal">Pair</a><F,S></td>
<td class="colLast">
<div class="block">Represents a simple object pair.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/internal/ReflectionUtils.html" title="class in org.apache.juneau.internal">ReflectionUtils</a></td>
<td class="colLast">
<div class="block">Reflection utilities.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/internal/SimpleMap.html" title="class in org.apache.juneau.internal">SimpleMap</a></td>
<td class="colLast">
<div class="block">An instance of a <code>Map</code> where the keys and values are simple <code>String[]</code> and
<code>Object[]</code> arrays.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/internal/StringBuilderWriter.html" title="class in org.apache.juneau.internal">StringBuilderWriter</a></td>
<td class="colLast">
<div class="block">Similar to <a href="http://docs.oracle.com/javase/7/docs/api/java/io/StringWriter.html?is-external=true" title="class or interface in java.io"><code>StringWriter</code></a>, but uses a <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/StringBuilder.html?is-external=true" title="class or interface in java.lang"><code>StringBuilder</code></a> instead to avoid synchronization overhead.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/internal/StringUtils.html" title="class in org.apache.juneau.internal">StringUtils</a></td>
<td class="colLast">
<div class="block">Reusable string utility methods.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/internal/SystemUtils.html" title="class in org.apache.juneau.internal">SystemUtils</a></td>
<td class="colLast">
<div class="block">System utilities.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/internal/TeeOutputStream.html" title="class in org.apache.juneau.internal">TeeOutputStream</a></td>
<td class="colLast">
<div class="block">Output stream that can send output to multiple output streams.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/internal/TeeWriter.html" title="class in org.apache.juneau.internal">TeeWriter</a></td>
<td class="colLast">
<div class="block">Writer that can send output to multiple writers.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/internal/ThrowableUtils.html" title="class in org.apache.juneau.internal">ThrowableUtils</a></td>
<td class="colLast">
<div class="block">Various utility methods for creating and working with throwables.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/internal/Utils.html" title="class in org.apache.juneau.internal">Utils</a></td>
<td class="colLast">
<div class="block">Various utility methods.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/internal/Version.html" title="class in org.apache.juneau.internal">Version</a></td>
<td class="colLast">
<div class="block">Represents a version string such as <js>"1.2"</js> or <js>"1.2.3"</js></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/internal/VersionRange.html" title="class in org.apache.juneau.internal">VersionRange</a></td>
<td class="colLast">
<div class="block">Represents an OSGi-style version range like <js>"1.2"</js> or <js>"[1.0,2.0)"</js>.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/internal/WrappedMap.html" title="class in org.apache.juneau.internal">WrappedMap</a><K,V></td>
<td class="colLast">
<div class="block">Wraps an existing map inside an extensible interface so that convenience methods can be added to the subclass.</div>
http://git-wip-us.apache.org/repos/asf/juneau-website/blob/60d9bd65/content/site/apidocs/org/apache/juneau/internal/package-tree.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/internal/package-tree.html b/content/site/apidocs/org/apache/juneau/internal/package-tree.html
index 8aeba8e..751a9d3 100644
--- a/content/site/apidocs/org/apache/juneau/internal/package-tree.html
+++ b/content/site/apidocs/org/apache/juneau/internal/package-tree.html
@@ -134,6 +134,7 @@
<li type="circle">org.apache.juneau.internal.<a href="../../../../org/apache/juneau/internal/ArrayUtils.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">ArrayUtils</span></a></li>
<li type="circle">org.apache.juneau.internal.<a href="../../../../org/apache/juneau/internal/AsciiMap.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">AsciiMap</span></a></li>
<li type="circle">org.apache.juneau.internal.<a href="../../../../org/apache/juneau/internal/AsciiSet.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">AsciiSet</span></a></li>
+<li type="circle">org.apache.juneau.internal.<a href="../../../../org/apache/juneau/internal/BeanPropertyUtils.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">BeanPropertyUtils</span></a></li>
<li type="circle">org.apache.juneau.internal.<a href="../../../../org/apache/juneau/internal/ByteArrayCache.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">ByteArrayCache</span></a></li>
<li type="circle">org.apache.juneau.internal.<a href="../../../../org/apache/juneau/internal/Cache.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">Cache</span></a><K,V></li>
<li type="circle">org.apache.juneau.internal.<a href="../../../../org/apache/juneau/internal/ClassUtils.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">ClassUtils</span></a></li>
http://git-wip-us.apache.org/repos/asf/juneau-website/blob/60d9bd65/content/site/apidocs/overview-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/overview-summary.html b/content/site/apidocs/overview-summary.html
index 601f33e..0dd2b47 100644
--- a/content/site/apidocs/overview-summary.html
+++ b/content/site/apidocs/overview-summary.html
@@ -4392,23 +4392,39 @@
.response(405, <jsm>responseInfo</jsm>(<js>"Invalid input"</js>))
);
+ <jc>// Serialize using JSON serializer.</jc>
String swaggerJson = JsonSerializer.<jsf>DEFAULT_READABLE</jsf>.serialize(swagger);
+
+ <jc>// Or just use toString().</jc>
+ String swaggerJson = swagger.toString();
+ </p>
+ <p>
+ Methods that take in beans and collections of beans can also take in JSON representations
+ of those objects.
+ </p>
+ <p class='bcode'>
+ <jc>// Pass in a JSON object representation of an Info object.</jc>
+ swagger.info(<js>"{title:'Swagger Petstore',...}"</js>);
+ </p>
+ <p>
+ Properties can also be accessed via the <a href="org/apache/juneau/dto/swagger/SwaggerElement.html#get-java.lang.String-java.lang.Class-"><code>SwaggerElement.get(String,Class)</code></a>
+ and <a href="org/apache/juneau/dto/swagger/SwaggerElement.html#set-java.lang.String-java.lang.Object-"><code>SwaggerElement.set(String,Object)</code></a> methods.
+ <br>These methods can also be used to set and retrieve non-Swagger attributes such as
+ <js>"$ref"</js> (which is not a part of the Swagger spec, but is part of the JSON Schema spec).
+ </p>
+ <p class='bcode'>
+ <jc>// Set a non-standard attribute.</jc>
+ swagger.set(<js>"$ref"</js>, <js>"http://foo.com"</js>);
+
+ <jc>// Retrieve a non-standard attribute.</jc>
+ URI ref = swagger.get(<js>"$ref"</js>, URI.<jk>class</jk>);
</p>
<p>
Swagger docs can be parsed back into Swagger beans using the following code:
</p>
<p class='bcode'>
- Swagger swagger = JsonParser.<jsf>DEFAULT</jsf>.parse(swaggerJson, Swagger.<jk>class</jk>);
+ Swagger swagger = JsonParser.<jsf>DEFAULT</jsf>.parse(swaggerJson, Swagger.<jk>class</jk>);
</p>
-
- <h6 class='toc'>Additional Information - org.apache.juneau.dto.swagger</h6>
- <ol class='toc'>
- <li><p><a class='doclink' href='org/apache/juneau/dto/swagger/package-summary.html#Overview'>Overview</a></p>
- <ol>
- <li><p><a class='doclink' href='org/apache/juneau/dto/swagger/package-summary.html#Serialize'>Generating Swagger Docs</a></p>
- <li><p><a class='doclink' href='org/apache/juneau/dto/swagger/package-summary.html#Parse'>Parsing Swagger Docs</a></p>
- </ol>
- </ol>
</div>
<!-- ======================================================================================================= -->
@@ -9521,6 +9537,25 @@
</ul>
</ul>
+ <h6 class='topic'>juneau-marshall</h6>
+ <ul class='spaced-list'>
+ <li>
+ Enhancements to Swagger DTO:
+ <ul>
+ <li>New methods for setting and retrieving properties via name:
+ <ul>
+ <li><a href="org/apache/juneau/dto/swagger/SwaggerElement.html#get-java.lang.String-java.lang.Class-"><code>SwaggerElement.get(String,Class)</code></a>
+ <li><a href="org/apache/juneau/dto/swagger/SwaggerElement.html#set-java.lang.String-java.lang.Object-"><code>SwaggerElement.set(String,Object)</code></a>
+ </ul>
+ <li>
+ Support for setting non-standard fields such as <js>"$ref"</js> via getter and setter
+ above.
+ <li>
+ Setter methods that take in beans and collections of beans can now take in
+ JSON strings.
+ </ul>
+ </ul>
+
<h6 class='topic'>juneau-rest-server</h6>
<ul class='spaced-list'>
<li>
http://git-wip-us.apache.org/repos/asf/juneau-website/blob/60d9bd65/content/site/apidocs/overview-tree.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/overview-tree.html b/content/site/apidocs/overview-tree.html
index c9d315e..f96cdfc 100644
--- a/content/site/apidocs/overview-tree.html
+++ b/content/site/apidocs/overview-tree.html
@@ -284,6 +284,7 @@
<li type="circle">org.apache.juneau.xml.<a href="org/apache/juneau/xml/XmlBeanPropertyMeta.html" title="class in org.apache.juneau.xml"><span class="typeNameLink">XmlBeanPropertyMeta</span></a></li>
</ul>
</li>
+<li type="circle">org.apache.juneau.internal.<a href="org/apache/juneau/internal/BeanPropertyUtils.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">BeanPropertyUtils</span></a></li>
<li type="circle">org.apache.juneau.<a href="org/apache/juneau/BeanPropertyValue.html" title="class in org.apache.juneau"><span class="typeNameLink">BeanPropertyValue</span></a> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>)</li>
<li type="circle">org.apache.juneau.<a href="org/apache/juneau/BeanProxyInvocationHandler.html" title="class in org.apache.juneau"><span class="typeNameLink">BeanProxyInvocationHandler</span></a><T> (implements java.lang.reflect.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/InvocationHandler.html?is-external=true" title="class or interface in java.lang.reflect">InvocationHandler</a>)</li>
<li type="circle">org.apache.juneau.<a href="org/apache/juneau/BeanRegistry.html" title="class in org.apache.juneau"><span class="typeNameLink">BeanRegistry</span></a></li>
http://git-wip-us.apache.org/repos/asf/juneau-website/blob/60d9bd65/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 64d0dda..0c5b905 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
@@ -145,7 +145,7 @@
<span class="sourceLineNo">137</span> * @return The attribute value, or <jk>null</jk> if the named attribute does not exist.<a name="line.137"></a>
<span class="sourceLineNo">138</span> */<a name="line.138"></a>
<span class="sourceLineNo">139</span> public <T> T getAttr(Class<T> type, String key) {<a name="line.139"></a>
-<span class="sourceLineNo">140</span> return attrs == null ? null : ObjectUtils.convertToType(attrs.get(key), type);<a name="line.140"></a>
+<span class="sourceLineNo">140</span> return attrs == null ? null : ObjectUtils.toType(attrs.get(key), type);<a name="line.140"></a>
<span class="sourceLineNo">141</span> }<a name="line.141"></a>
<span class="sourceLineNo">142</span><a name="line.142"></a>
<span class="sourceLineNo">143</span> /**<a name="line.143"></a>
http://git-wip-us.apache.org/repos/asf/juneau-website/blob/60d9bd65/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 9a1fb22..844974a 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
@@ -121,7 +121,7 @@
<span class="sourceLineNo">113</span> public <T> T getChild(Class<T> type, int index) {<a name="line.113"></a>
<span class="sourceLineNo">114</span> return (children == null || children.size() <= index || index < 0<a name="line.114"></a>
<span class="sourceLineNo">115</span> ? null<a name="line.115"></a>
-<span class="sourceLineNo">116</span> : ObjectUtils.convertToType(children.get(index), type)<a name="line.116"></a>
+<span class="sourceLineNo">116</span> : ObjectUtils.toType(children.get(index), type)<a name="line.116"></a>
<span class="sourceLineNo">117</span> );<a name="line.117"></a>
<span class="sourceLineNo">118</span> }<a name="line.118"></a>
<span class="sourceLineNo">119</span><a name="line.119"></a>
http://git-wip-us.apache.org/repos/asf/juneau-website/blob/60d9bd65/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 f5157b2..36374b2 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
@@ -122,7 +122,7 @@
<span class="sourceLineNo">114</span> return (<a name="line.114"></a>
<span class="sourceLineNo">115</span> children == null || children.size() <= index || index < 0<a name="line.115"></a>
<span class="sourceLineNo">116</span> ? null<a name="line.116"></a>
-<span class="sourceLineNo">117</span> : ObjectUtils.convertToType(children.get(index), type)<a name="line.117"></a>
+<span class="sourceLineNo">117</span> : ObjectUtils.toType(children.get(index), type)<a name="line.117"></a>
<span class="sourceLineNo">118</span> );<a name="line.118"></a>
<span class="sourceLineNo">119</span> }<a name="line.119"></a>
<span class="sourceLineNo">120</span><a name="line.120"></a>
http://git-wip-us.apache.org/repos/asf/juneau-website/blob/60d9bd65/content/site/apidocs/src-html/org/apache/juneau/dto/swagger/Contact.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/dto/swagger/Contact.html b/content/site/apidocs/src-html/org/apache/juneau/dto/swagger/Contact.html
index df99785..444483e 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/dto/swagger/Contact.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/dto/swagger/Contact.html
@@ -20,7 +20,7 @@
<span class="sourceLineNo">012</span>// ***************************************************************************************************************************<a name="line.12"></a>
<span class="sourceLineNo">013</span>package org.apache.juneau.dto.swagger;<a name="line.13"></a>
<span class="sourceLineNo">014</span><a name="line.14"></a>
-<span class="sourceLineNo">015</span>import static org.apache.juneau.internal.StringUtils.*;<a name="line.15"></a>
+<span class="sourceLineNo">015</span>import static org.apache.juneau.internal.BeanPropertyUtils.*;<a name="line.15"></a>
<span class="sourceLineNo">016</span><a name="line.16"></a>
<span class="sourceLineNo">017</span>import java.net.*;<a name="line.17"></a>
<span class="sourceLineNo">018</span>import java.net.URI;<a name="line.18"></a>
@@ -33,147 +33,191 @@
<span class="sourceLineNo">025</span> * <a name="line.25"></a>
<span class="sourceLineNo">026</span> * <h5 class='section'>Example:</h5><a name="line.26"></a>
<span class="sourceLineNo">027</span> * <p class='bcode'><a name="line.27"></a>
-<span class="sourceLineNo">028</span> * {<a name="line.28"></a>
-<span class="sourceLineNo">029</span> * <js>"name"</js>: <js>"API Support"</js>,<a name="line.29"></a>
-<span class="sourceLineNo">030</span> * <js>"url"</js>: <js>"http://www.swagger.io/support"</js>,<a name="line.30"></a>
-<span class="sourceLineNo">031</span> * <js>"email"</js>: <js>"support@swagger.io"</js><a name="line.31"></a>
-<span class="sourceLineNo">032</span> * }<a name="line.32"></a>
-<span class="sourceLineNo">033</span> * </p><a name="line.33"></a>
-<span class="sourceLineNo">034</span> * <a name="line.34"></a>
-<span class="sourceLineNo">035</span> * <h6 class='topic'>Additional Information</h6><a name="line.35"></a>
-<span class="sourceLineNo">036</span> * <ul class='doctree'><a name="line.36"></a>
-<span class="sourceLineNo">037</span> * <li class='link'><a name="line.37"></a>
-<span class="sourceLineNo">038</span> * <a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects<a name="line.38"></a>
-<span class="sourceLineNo">039</span> * (org.apache.juneau.dto)</a><a name="line.39"></a>
-<span class="sourceLineNo">040</span> * <ul><a name="line.40"></a>
-<span class="sourceLineNo">041</span> * <li class='sublink'><a name="line.41"></a>
-<span class="sourceLineNo">042</span> * <a class='doclink' href='../../../../../overview-summary.html#DTOs.Swagger'>Swagger</a><a name="line.42"></a>
-<span class="sourceLineNo">043</span> * </ul><a name="line.43"></a>
-<span class="sourceLineNo">044</span> * </li><a name="line.44"></a>
-<span class="sourceLineNo">045</span> * <li class='jp'><a name="line.45"></a>
-<span class="sourceLineNo">046</span> * <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.swagger</a><a name="line.46"></a>
-<span class="sourceLineNo">047</span> * </li><a name="line.47"></a>
-<span class="sourceLineNo">048</span> * </ul><a name="line.48"></a>
-<span class="sourceLineNo">049</span> */<a name="line.49"></a>
-<span class="sourceLineNo">050</span>@Bean(properties="name,url,email")<a name="line.50"></a>
-<span class="sourceLineNo">051</span>public class Contact extends SwaggerElement {<a name="line.51"></a>
-<span class="sourceLineNo">052</span><a name="line.52"></a>
-<span class="sourceLineNo">053</span> private String name;<a name="line.53"></a>
-<span class="sourceLineNo">054</span> private URI url;<a name="line.54"></a>
-<span class="sourceLineNo">055</span> private String email;<a name="line.55"></a>
-<span class="sourceLineNo">056</span><a name="line.56"></a>
-<span class="sourceLineNo">057</span> /**<a name="line.57"></a>
-<span class="sourceLineNo">058</span> * Bean property getter: <property>name</property>.<a name="line.58"></a>
-<span class="sourceLineNo">059</span> * <a name="line.59"></a>
-<span class="sourceLineNo">060</span> * <p><a name="line.60"></a>
-<span class="sourceLineNo">061</span> * The identifying name of the contact person/organization.<a name="line.61"></a>
-<span class="sourceLineNo">062</span> * <a name="line.62"></a>
-<span class="sourceLineNo">063</span> * @return The value of the <property>name</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.63"></a>
-<span class="sourceLineNo">064</span> */<a name="line.64"></a>
-<span class="sourceLineNo">065</span> public String getName() {<a name="line.65"></a>
-<span class="sourceLineNo">066</span> return name;<a name="line.66"></a>
-<span class="sourceLineNo">067</span> }<a name="line.67"></a>
-<span class="sourceLineNo">068</span><a name="line.68"></a>
-<span class="sourceLineNo">069</span> /**<a name="line.69"></a>
-<span class="sourceLineNo">070</span> * Bean property setter: <property>name</property>.<a name="line.70"></a>
-<span class="sourceLineNo">071</span> * <a name="line.71"></a>
-<span class="sourceLineNo">072</span> * <p><a name="line.72"></a>
-<span class="sourceLineNo">073</span> * The identifying name of the contact person/organization.<a name="line.73"></a>
-<span class="sourceLineNo">074</span> * <a name="line.74"></a>
-<span class="sourceLineNo">075</span> * @param name The new value for the <property>name</property> property on this bean.<a name="line.75"></a>
-<span class="sourceLineNo">076</span> * @return This object (for method chaining).<a name="line.76"></a>
-<span class="sourceLineNo">077</span> */<a name="line.77"></a>
-<span class="sourceLineNo">078</span> public Contact setName(String name) {<a name="line.78"></a>
-<span class="sourceLineNo">079</span> this.name = name;<a name="line.79"></a>
-<span class="sourceLineNo">080</span> return this;<a name="line.80"></a>
-<span class="sourceLineNo">081</span> }<a name="line.81"></a>
-<span class="sourceLineNo">082</span><a name="line.82"></a>
-<span class="sourceLineNo">083</span> /**<a name="line.83"></a>
-<span class="sourceLineNo">084</span> * Synonym for {@link #setName(String)}.<a name="line.84"></a>
-<span class="sourceLineNo">085</span> * <a name="line.85"></a>
-<span class="sourceLineNo">086</span> * @param name The new value for the <property>name</property> property on this bean.<a name="line.86"></a>
-<span class="sourceLineNo">087</span> * @return This object (for method chaining).<a name="line.87"></a>
-<span class="sourceLineNo">088</span> */<a name="line.88"></a>
-<span class="sourceLineNo">089</span> public Contact name(String name) {<a name="line.89"></a>
-<span class="sourceLineNo">090</span> return setName(name);<a name="line.90"></a>
-<span class="sourceLineNo">091</span> }<a name="line.91"></a>
-<span class="sourceLineNo">092</span><a name="line.92"></a>
-<span class="sourceLineNo">093</span> /**<a name="line.93"></a>
-<span class="sourceLineNo">094</span> * Bean property getter: <property>url</property>.<a name="line.94"></a>
-<span class="sourceLineNo">095</span> * <a name="line.95"></a>
-<span class="sourceLineNo">096</span> * <p><a name="line.96"></a>
-<span class="sourceLineNo">097</span> * The URL pointing to the contact information. MUST be in the format of a URL.<a name="line.97"></a>
-<span class="sourceLineNo">098</span> * <a name="line.98"></a>
-<span class="sourceLineNo">099</span> * @return The value of the <property>url</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.99"></a>
-<span class="sourceLineNo">100</span> */<a name="line.100"></a>
-<span class="sourceLineNo">101</span> public URI getUrl() {<a name="line.101"></a>
-<span class="sourceLineNo">102</span> return url;<a name="line.102"></a>
-<span class="sourceLineNo">103</span> }<a name="line.103"></a>
-<span class="sourceLineNo">104</span><a name="line.104"></a>
-<span class="sourceLineNo">105</span> /**<a name="line.105"></a>
-<span class="sourceLineNo">106</span> * Bean property setter: <property>url</property>.<a name="line.106"></a>
-<span class="sourceLineNo">107</span> * <a name="line.107"></a>
-<span class="sourceLineNo">108</span> * <p><a name="line.108"></a>
-<span class="sourceLineNo">109</span> * The value can be of any of the following types: {@link URI}, {@link URL}, {@link String}.<a name="line.109"></a>
-<span class="sourceLineNo">110</span> * Strings must be valid URIs.<a name="line.110"></a>
-<span class="sourceLineNo">111</span> * <a name="line.111"></a>
-<span class="sourceLineNo">112</span> * <p><a name="line.112"></a>
-<span class="sourceLineNo">113</span> * URIs defined by {@link UriResolver} can be used for values.<a name="line.113"></a>
-<span class="sourceLineNo">114</span> * <a name="line.114"></a>
-<span class="sourceLineNo">115</span> * @param url The new value for the <property>url</property> property on this bean.<a name="line.115"></a>
-<span class="sourceLineNo">116</span> * @return This object (for method chaining).<a name="line.116"></a>
-<span class="sourceLineNo">117</span> */<a name="line.117"></a>
-<span class="sourceLineNo">118</span> public Contact setUrl(Object url) {<a name="line.118"></a>
-<span class="sourceLineNo">119</span> this.url = toURI(url);<a name="line.119"></a>
-<span class="sourceLineNo">120</span> return this;<a name="line.120"></a>
-<span class="sourceLineNo">121</span> }<a name="line.121"></a>
-<span class="sourceLineNo">122</span><a name="line.122"></a>
-<span class="sourceLineNo">123</span> /**<a name="line.123"></a>
-<span class="sourceLineNo">124</span> * Synonym for {@link #setUrl(Object)}.<a name="line.124"></a>
-<span class="sourceLineNo">125</span> * <a name="line.125"></a>
-<span class="sourceLineNo">126</span> * @param url The new value for the <property>url</property> property on this bean.<a name="line.126"></a>
-<span class="sourceLineNo">127</span> * @return This object (for method chaining).<a name="line.127"></a>
-<span class="sourceLineNo">128</span> */<a name="line.128"></a>
-<span class="sourceLineNo">129</span> public Contact url(Object url) {<a name="line.129"></a>
-<span class="sourceLineNo">130</span> return setUrl(url);<a name="line.130"></a>
-<span class="sourceLineNo">131</span> }<a name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span> /**<a name="line.133"></a>
-<span class="sourceLineNo">134</span> * Bean property getter: <property>email</property>.<a name="line.134"></a>
-<span class="sourceLineNo">135</span> * <a name="line.135"></a>
-<span class="sourceLineNo">136</span> * <p><a name="line.136"></a>
-<span class="sourceLineNo">137</span> * The email address of the contact person/organization. MUST be in the format of an email address.<a name="line.137"></a>
-<span class="sourceLineNo">138</span> * <a name="line.138"></a>
-<span class="sourceLineNo">139</span> * @return The value of the <property>email</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.139"></a>
-<span class="sourceLineNo">140</span> */<a name="line.140"></a>
-<span class="sourceLineNo">141</span> public String getEmail() {<a name="line.141"></a>
-<span class="sourceLineNo">142</span> return email;<a name="line.142"></a>
-<span class="sourceLineNo">143</span> }<a name="line.143"></a>
-<span class="sourceLineNo">144</span><a name="line.144"></a>
-<span class="sourceLineNo">145</span> /**<a name="line.145"></a>
-<span class="sourceLineNo">146</span> * Bean property setter: <property>email</property>.<a name="line.146"></a>
-<span class="sourceLineNo">147</span> * <a name="line.147"></a>
-<span class="sourceLineNo">148</span> * <p><a name="line.148"></a>
-<span class="sourceLineNo">149</span> * The email address of the contact person/organization. MUST be in the format of an email address.<a name="line.149"></a>
-<span class="sourceLineNo">150</span> * <a name="line.150"></a>
-<span class="sourceLineNo">151</span> * @param email The new value for the <property>email</property> property on this bean.<a name="line.151"></a>
-<span class="sourceLineNo">152</span> * @return This object (for method chaining).<a name="line.152"></a>
-<span class="sourceLineNo">153</span> */<a name="line.153"></a>
-<span class="sourceLineNo">154</span> public Contact setEmail(String email) {<a name="line.154"></a>
-<span class="sourceLineNo">155</span> this.email = email;<a name="line.155"></a>
-<span class="sourceLineNo">156</span> return this;<a name="line.156"></a>
-<span class="sourceLineNo">157</span> }<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> * Synonym for {@link #setEmail(String)}.<a name="line.160"></a>
+<span class="sourceLineNo">028</span> * <jc>// Construct using SwaggerBuilder.</jc><a name="line.28"></a>
+<span class="sourceLineNo">029</span> * Contact x = <jsm>contact</jsm>(<js>"API Support"</js>, <js>"http://www.swagger.io/support"</js>, <js>"support@swagger.io"</js>);<a name="line.29"></a>
+<span class="sourceLineNo">030</span> * <a name="line.30"></a>
+<span class="sourceLineNo">031</span> * <jc>// Serialize using JsonSerializer.</jc><a name="line.31"></a>
+<span class="sourceLineNo">032</span> * String json = JsonSerializer.<jsf>DEFAULT</jsf>.toString(x);<a name="line.32"></a>
+<span class="sourceLineNo">033</span> * <a name="line.33"></a>
+<span class="sourceLineNo">034</span> * <jc>// Or just use toString() which does the same as above.</jc><a name="line.34"></a>
+<span class="sourceLineNo">035</span> * String json = x.toString();<a name="line.35"></a>
+<span class="sourceLineNo">036</span> * </p><a name="line.36"></a>
+<span class="sourceLineNo">037</span> * <p class='bcode'><a name="line.37"></a>
+<span class="sourceLineNo">038</span> * <jc>// Output</jc><a name="line.38"></a>
+<span class="sourceLineNo">039</span> * {<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * <js>"name"</js>: <js>"API Support"</js>,<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * <js>"url"</js>: <js>"http://www.swagger.io/support"</js>,<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * <js>"email"</js>: <js>"support@swagger.io"</js><a name="line.42"></a>
+<span class="sourceLineNo">043</span> * }<a name="line.43"></a>
+<span class="sourceLineNo">044</span> * </p><a name="line.44"></a>
+<span class="sourceLineNo">045</span> * <a name="line.45"></a>
+<span class="sourceLineNo">046</span> * <h6 class='topic'>Additional Information</h6><a name="line.46"></a>
+<span class="sourceLineNo">047</span> * <ul class='doctree'><a name="line.47"></a>
+<span class="sourceLineNo">048</span> * <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.Swagger'>Overview > juneau-dto > Swagger</a><a name="line.48"></a>
+<span class="sourceLineNo">049</span> * </ul><a name="line.49"></a>
+<span class="sourceLineNo">050</span> */<a name="line.50"></a>
+<span class="sourceLineNo">051</span>@Bean(properties="name,url,email,*")<a name="line.51"></a>
+<span class="sourceLineNo">052</span>public class Contact extends SwaggerElement {<a name="line.52"></a>
+<span class="sourceLineNo">053</span><a name="line.53"></a>
+<span class="sourceLineNo">054</span> private String name;<a name="line.54"></a>
+<span class="sourceLineNo">055</span> private URI url;<a name="line.55"></a>
+<span class="sourceLineNo">056</span> private String email;<a name="line.56"></a>
+<span class="sourceLineNo">057</span><a name="line.57"></a>
+<span class="sourceLineNo">058</span> /**<a name="line.58"></a>
+<span class="sourceLineNo">059</span> * Bean property getter: <property>name</property>.<a name="line.59"></a>
+<span class="sourceLineNo">060</span> * <a name="line.60"></a>
+<span class="sourceLineNo">061</span> * <p><a name="line.61"></a>
+<span class="sourceLineNo">062</span> * The identifying name of the contact person/organization.<a name="line.62"></a>
+<span class="sourceLineNo">063</span> * <a name="line.63"></a>
+<span class="sourceLineNo">064</span> * @return The property value, or <jk>null</jk> if it is not set.<a name="line.64"></a>
+<span class="sourceLineNo">065</span> */<a name="line.65"></a>
+<span class="sourceLineNo">066</span> public String getName() {<a name="line.66"></a>
+<span class="sourceLineNo">067</span> return name;<a name="line.67"></a>
+<span class="sourceLineNo">068</span> }<a name="line.68"></a>
+<span class="sourceLineNo">069</span><a name="line.69"></a>
+<span class="sourceLineNo">070</span> /**<a name="line.70"></a>
+<span class="sourceLineNo">071</span> * Bean property setter: <property>name</property>.<a name="line.71"></a>
+<span class="sourceLineNo">072</span> * <a name="line.72"></a>
+<span class="sourceLineNo">073</span> * <p><a name="line.73"></a>
+<span class="sourceLineNo">074</span> * The identifying name of the contact person/organization.<a name="line.74"></a>
+<span class="sourceLineNo">075</span> * <a name="line.75"></a>
+<span class="sourceLineNo">076</span> * @param value <a name="line.76"></a>
+<span class="sourceLineNo">077</span> * The new value for this property.<a name="line.77"></a>
+<span class="sourceLineNo">078</span> * <br>Can be <jk>null</jk> to unset the property.<a name="line.78"></a>
+<span class="sourceLineNo">079</span> * @return This object (for method chaining).<a name="line.79"></a>
+<span class="sourceLineNo">080</span> */<a name="line.80"></a>
+<span class="sourceLineNo">081</span> public Contact setName(String value) {<a name="line.81"></a>
+<span class="sourceLineNo">082</span> name = value;<a name="line.82"></a>
+<span class="sourceLineNo">083</span> return this;<a name="line.83"></a>
+<span class="sourceLineNo">084</span> }<a name="line.84"></a>
+<span class="sourceLineNo">085</span><a name="line.85"></a>
+<span class="sourceLineNo">086</span> /**<a name="line.86"></a>
+<span class="sourceLineNo">087</span> * Same as {@link #setName(String)}.<a name="line.87"></a>
+<span class="sourceLineNo">088</span> * <a name="line.88"></a>
+<span class="sourceLineNo">089</span> * @param value<a name="line.89"></a>
+<span class="sourceLineNo">090</span> * The new value for this property.<a name="line.90"></a>
+<span class="sourceLineNo">091</span> * <br>Non-String values will be converted to String using <code>toString()</code>.<a name="line.91"></a>
+<span class="sourceLineNo">092</span> * <br>Can be <jk>null</jk> to unset the property.<a name="line.92"></a>
+<span class="sourceLineNo">093</span> * @return This object (for method chaining).<a name="line.93"></a>
+<span class="sourceLineNo">094</span> */<a name="line.94"></a>
+<span class="sourceLineNo">095</span> public Contact name(Object value) {<a name="line.95"></a>
+<span class="sourceLineNo">096</span> return setName(toStringVal(value));<a name="line.96"></a>
+<span class="sourceLineNo">097</span> }<a name="line.97"></a>
+<span class="sourceLineNo">098</span><a name="line.98"></a>
+<span class="sourceLineNo">099</span> /**<a name="line.99"></a>
+<span class="sourceLineNo">100</span> * Bean property getter: <property>url</property>.<a name="line.100"></a>
+<span class="sourceLineNo">101</span> * <a name="line.101"></a>
+<span class="sourceLineNo">102</span> * <p><a name="line.102"></a>
+<span class="sourceLineNo">103</span> * The URL pointing to the contact information. <a name="line.103"></a>
+<span class="sourceLineNo">104</span> * <a name="line.104"></a>
+<span class="sourceLineNo">105</span> * @return The property value, or <jk>null</jk> if it is not set.<a name="line.105"></a>
+<span class="sourceLineNo">106</span> */<a name="line.106"></a>
+<span class="sourceLineNo">107</span> public URI getUrl() {<a name="line.107"></a>
+<span class="sourceLineNo">108</span> return url;<a name="line.108"></a>
+<span class="sourceLineNo">109</span> }<a name="line.109"></a>
+<span class="sourceLineNo">110</span><a name="line.110"></a>
+<span class="sourceLineNo">111</span> /**<a name="line.111"></a>
+<span class="sourceLineNo">112</span> * Bean property setter: <property>url</property>.<a name="line.112"></a>
+<span class="sourceLineNo">113</span> * <a name="line.113"></a>
+<span class="sourceLineNo">114</span> * <p><a name="line.114"></a>
+<span class="sourceLineNo">115</span> * The value can be of any of the following types: {@link URI}, {@link URL}, {@link String}.<a name="line.115"></a>
+<span class="sourceLineNo">116</span> * <br>Strings must be valid URIs.<a name="line.116"></a>
+<span class="sourceLineNo">117</span> * <a name="line.117"></a>
+<span class="sourceLineNo">118</span> * <p><a name="line.118"></a>
+<span class="sourceLineNo">119</span> * URIs defined by {@link UriResolver} can be used for values.<a name="line.119"></a>
+<span class="sourceLineNo">120</span> * <a name="line.120"></a>
+<span class="sourceLineNo">121</span> * @param value <a name="line.121"></a>
+<span class="sourceLineNo">122</span> * The new value for this property.<a name="line.122"></a>
+<span class="sourceLineNo">123</span> * <br>Can be <jk>null</jk> to unset the property.<a name="line.123"></a>
+<span class="sourceLineNo">124</span> * @return This object (for method chaining).<a name="line.124"></a>
+<span class="sourceLineNo">125</span> */<a name="line.125"></a>
+<span class="sourceLineNo">126</span> public Contact setUrl(URI value) {<a name="line.126"></a>
+<span class="sourceLineNo">127</span> url = value;<a name="line.127"></a>
+<span class="sourceLineNo">128</span> return this;<a name="line.128"></a>
+<span class="sourceLineNo">129</span> }<a name="line.129"></a>
+<span class="sourceLineNo">130</span><a name="line.130"></a>
+<span class="sourceLineNo">131</span> /**<a name="line.131"></a>
+<span class="sourceLineNo">132</span> * Same as {@link #setUrl(URI)}.<a name="line.132"></a>
+<span class="sourceLineNo">133</span> * <a name="line.133"></a>
+<span class="sourceLineNo">134</span> * @param value<a name="line.134"></a>
+<span class="sourceLineNo">135</span> * The new value for this property.<a name="line.135"></a>
+<span class="sourceLineNo">136</span> * <br>Non-URI values will be converted to URI using <code><jk>new</jk> URI(value.toString())</code>.<a name="line.136"></a>
+<span class="sourceLineNo">137</span> * <br>Can be <jk>null</jk> to unset the property.<a name="line.137"></a>
+<span class="sourceLineNo">138</span> * @return This object (for method chaining).<a name="line.138"></a>
+<span class="sourceLineNo">139</span> */<a name="line.139"></a>
+<span class="sourceLineNo">140</span> public Contact url(Object value) {<a name="line.140"></a>
+<span class="sourceLineNo">141</span> return setUrl(toURI(value));<a name="line.141"></a>
+<span class="sourceLineNo">142</span> }<a name="line.142"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
+<span class="sourceLineNo">144</span> /**<a name="line.144"></a>
+<span class="sourceLineNo">145</span> * Bean property getter: <property>email</property>.<a name="line.145"></a>
+<span class="sourceLineNo">146</span> * <a name="line.146"></a>
+<span class="sourceLineNo">147</span> * <p><a name="line.147"></a>
+<span class="sourceLineNo">148</span> * The email address of the contact person/organization. <a name="line.148"></a>
+<span class="sourceLineNo">149</span> * <a name="line.149"></a>
+<span class="sourceLineNo">150</span> * @return The property value, or <jk>null</jk> if it is not set.<a name="line.150"></a>
+<span class="sourceLineNo">151</span> */<a name="line.151"></a>
+<span class="sourceLineNo">152</span> public String getEmail() {<a name="line.152"></a>
+<span class="sourceLineNo">153</span> return email;<a name="line.153"></a>
+<span class="sourceLineNo">154</span> }<a name="line.154"></a>
+<span class="sourceLineNo">155</span><a name="line.155"></a>
+<span class="sourceLineNo">156</span> /**<a name="line.156"></a>
+<span class="sourceLineNo">157</span> * Bean property setter: <property>email</property>.<a name="line.157"></a>
+<span class="sourceLineNo">158</span> * <a name="line.158"></a>
+<span class="sourceLineNo">159</span> * <p><a name="line.159"></a>
+<span class="sourceLineNo">160</span> * The email address of the contact person/organization. <a name="line.160"></a>
<span class="sourceLineNo">161</span> * <a name="line.161"></a>
-<span class="sourceLineNo">162</span> * @param email The new value for the <property>email</property> property on this bean.<a name="line.162"></a>
-<span class="sourceLineNo">163</span> * @return This object (for method chaining).<a name="line.163"></a>
-<span class="sourceLineNo">164</span> */<a name="line.164"></a>
-<span class="sourceLineNo">165</span> public Contact email(String email) {<a name="line.165"></a>
-<span class="sourceLineNo">166</span> return setEmail(email);<a name="line.166"></a>
-<span class="sourceLineNo">167</span> }<a name="line.167"></a>
-<span class="sourceLineNo">168</span>}<a name="line.168"></a>
+<span class="sourceLineNo">162</span> * @param value <a name="line.162"></a>
+<span class="sourceLineNo">163</span> * The new value for this property.<a name="line.163"></a>
+<span class="sourceLineNo">164</span> * <br>MUST be in the format of an email address.<a name="line.164"></a>
+<span class="sourceLineNo">165</span> * <br>Can be <jk>null</jk> to unset the property.<a name="line.165"></a>
+<span class="sourceLineNo">166</span> * @return This object (for method chaining).<a name="line.166"></a>
+<span class="sourceLineNo">167</span> */<a name="line.167"></a>
+<span class="sourceLineNo">168</span> public Contact setEmail(String value) {<a name="line.168"></a>
+<span class="sourceLineNo">169</span> email = value;<a name="line.169"></a>
+<span class="sourceLineNo">170</span> return this;<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> * Same as {@link #setEmail(String)}.<a name="line.174"></a>
+<span class="sourceLineNo">175</span> * <a name="line.175"></a>
+<span class="sourceLineNo">176</span> * @param value<a name="line.176"></a>
+<span class="sourceLineNo">177</span> * The new value for this property.<a name="line.177"></a>
+<span class="sourceLineNo">178</span> * <br>Non-String values will be converted to String using <code>toString()</code>.<a name="line.178"></a>
+<span class="sourceLineNo">179</span> * <br>MUST be in the format of an email address.<a name="line.179"></a>
+<span class="sourceLineNo">180</span> * <br>Can be <jk>null</jk> to unset the property.<a name="line.180"></a>
+<span class="sourceLineNo">181</span> * @return This object (for method chaining).<a name="line.181"></a>
+<span class="sourceLineNo">182</span> */<a name="line.182"></a>
+<span class="sourceLineNo">183</span> public Contact email(Object value) {<a name="line.183"></a>
+<span class="sourceLineNo">184</span> return setEmail(toStringVal(value));<a name="line.184"></a>
+<span class="sourceLineNo">185</span> }<a name="line.185"></a>
+<span class="sourceLineNo">186</span><a name="line.186"></a>
+<span class="sourceLineNo">187</span> @Override /* SwaggerElement */<a name="line.187"></a>
+<span class="sourceLineNo">188</span> public <T> T get(String property, Class<T> type) {<a name="line.188"></a>
+<span class="sourceLineNo">189</span> if (property == null)<a name="line.189"></a>
+<span class="sourceLineNo">190</span> return null;<a name="line.190"></a>
+<span class="sourceLineNo">191</span> switch (property) {<a name="line.191"></a>
+<span class="sourceLineNo">192</span> case "name": return toType(getName(), type);<a name="line.192"></a>
+<span class="sourceLineNo">193</span> case "url": return toType(getUrl(), type);<a name="line.193"></a>
+<span class="sourceLineNo">194</span> case "email": return toType(getEmail(), type);<a name="line.194"></a>
+<span class="sourceLineNo">195</span> default: return super.get(property, type);<a name="line.195"></a>
+<span class="sourceLineNo">196</span> }<a name="line.196"></a>
+<span class="sourceLineNo">197</span> }<a name="line.197"></a>
+<span class="sourceLineNo">198</span><a name="line.198"></a>
+<span class="sourceLineNo">199</span> @Override /* SwaggerElement */<a name="line.199"></a>
+<span class="sourceLineNo">200</span> public Contact set(String property, Object value) {<a name="line.200"></a>
+<span class="sourceLineNo">201</span> if (property == null)<a name="line.201"></a>
+<span class="sourceLineNo">202</span> return this;<a name="line.202"></a>
+<span class="sourceLineNo">203</span> switch (property) {<a name="line.203"></a>
+<span class="sourceLineNo">204</span> case "name": return name(value);<a name="line.204"></a>
+<span class="sourceLineNo">205</span> case "url": return url(value);<a name="line.205"></a>
+<span class="sourceLineNo">206</span> case "email": return email(value);<a name="line.206"></a>
+<span class="sourceLineNo">207</span> default: <a name="line.207"></a>
+<span class="sourceLineNo">208</span> super.set(property, value);<a name="line.208"></a>
+<span class="sourceLineNo">209</span> return this;<a name="line.209"></a>
+<span class="sourceLineNo">210</span> }<a name="line.210"></a>
+<span class="sourceLineNo">211</span> }<a name="line.211"></a>
+<span class="sourceLineNo">212</span>}<a name="line.212"></a>
http://git-wip-us.apache.org/repos/asf/juneau-website/blob/60d9bd65/content/site/apidocs/src-html/org/apache/juneau/dto/swagger/ExternalDocumentation.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/dto/swagger/ExternalDocumentation.html b/content/site/apidocs/src-html/org/apache/juneau/dto/swagger/ExternalDocumentation.html
index 56c48c2..f5b66d7 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/dto/swagger/ExternalDocumentation.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/dto/swagger/ExternalDocumentation.html
@@ -20,7 +20,7 @@
<span class="sourceLineNo">012</span>// ***************************************************************************************************************************<a name="line.12"></a>
<span class="sourceLineNo">013</span>package org.apache.juneau.dto.swagger;<a name="line.13"></a>
<span class="sourceLineNo">014</span><a name="line.14"></a>
-<span class="sourceLineNo">015</span>import static org.apache.juneau.internal.StringUtils.*;<a name="line.15"></a>
+<span class="sourceLineNo">015</span>import static org.apache.juneau.internal.BeanPropertyUtils.*;<a name="line.15"></a>
<span class="sourceLineNo">016</span><a name="line.16"></a>
<span class="sourceLineNo">017</span>import java.net.*;<a name="line.17"></a>
<span class="sourceLineNo">018</span>import java.net.URI;<a name="line.18"></a>
@@ -33,41 +33,41 @@
<span class="sourceLineNo">025</span> * <a name="line.25"></a>
<span class="sourceLineNo">026</span> * <h5 class='section'>Example:</h5><a name="line.26"></a>
<span class="sourceLineNo">027</span> * <p class='bcode'><a name="line.27"></a>
-<span class="sourceLineNo">028</span> * {<a name="line.28"></a>
-<span class="sourceLineNo">029</span> * <js>"description"</js>: <js>"Find more info here"</js>,<a name="line.29"></a>
-<span class="sourceLineNo">030</span> * <js>"url"</js>: <js>"https://swagger.io"</js><a name="line.30"></a>
-<span class="sourceLineNo">031</span> * }<a name="line.31"></a>
-<span class="sourceLineNo">032</span> * </p><a name="line.32"></a>
+<span class="sourceLineNo">028</span> * <jc>// Construct using SwaggerBuilder.</jc><a name="line.28"></a>
+<span class="sourceLineNo">029</span> * ExternalDocumentation x = <jsm>externalDocumentation</jsm>(<js>"https://swagger.io"</js>, <js>"Find more info here"</js>);<a name="line.29"></a>
+<span class="sourceLineNo">030</span> * <a name="line.30"></a>
+<span class="sourceLineNo">031</span> * <jc>// Serialize using JsonSerializer.</jc><a name="line.31"></a>
+<span class="sourceLineNo">032</span> * String json = JsonSerializer.<jsf>DEFAULT</jsf>.toString(x);<a name="line.32"></a>
<span class="sourceLineNo">033</span> * <a name="line.33"></a>
-<span class="sourceLineNo">034</span> * <h6 class='topic'>Additional Information</h6><a name="line.34"></a>
-<span class="sourceLineNo">035</span> * <ul class='doctree'><a name="line.35"></a>
-<span class="sourceLineNo">036</span> * <li class='link'><a name="line.36"></a>
-<span class="sourceLineNo">037</span> * <a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects<a name="line.37"></a>
-<span class="sourceLineNo">038</span> * (org.apache.juneau.dto)</a><a name="line.38"></a>
-<span class="sourceLineNo">039</span> * <ul><a name="line.39"></a>
-<span class="sourceLineNo">040</span> * <li class='sublink'><a name="line.40"></a>
-<span class="sourceLineNo">041</span> * <a class='doclink' href='../../../../../overview-summary.html#DTOs.Swagger'>Swagger</a><a name="line.41"></a>
-<span class="sourceLineNo">042</span> * </ul><a name="line.42"></a>
-<span class="sourceLineNo">043</span> * </li><a name="line.43"></a>
-<span class="sourceLineNo">044</span> * <li class='jp'><a name="line.44"></a>
-<span class="sourceLineNo">045</span> * <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.swagger</a><a name="line.45"></a>
-<span class="sourceLineNo">046</span> * </li><a name="line.46"></a>
-<span class="sourceLineNo">047</span> * </ul><a name="line.47"></a>
-<span class="sourceLineNo">048</span> */<a name="line.48"></a>
-<span class="sourceLineNo">049</span>@Bean(properties="description,url")<a name="line.49"></a>
-<span class="sourceLineNo">050</span>public class ExternalDocumentation extends SwaggerElement {<a name="line.50"></a>
-<span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span> private String description;<a name="line.52"></a>
-<span class="sourceLineNo">053</span> private URI url;<a name="line.53"></a>
-<span class="sourceLineNo">054</span><a name="line.54"></a>
-<span class="sourceLineNo">055</span> /**<a name="line.55"></a>
-<span class="sourceLineNo">056</span> * Bean property getter: <property>description</property>.<a name="line.56"></a>
-<span class="sourceLineNo">057</span> * <a name="line.57"></a>
-<span class="sourceLineNo">058</span> * <p><a name="line.58"></a>
-<span class="sourceLineNo">059</span> * A short description of the target documentation. GFM syntax can be used for rich text representation.<a name="line.59"></a>
-<span class="sourceLineNo">060</span> * <a name="line.60"></a>
-<span class="sourceLineNo">061</span> * @return<a name="line.61"></a>
-<span class="sourceLineNo">062</span> * The value of the <property>description</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.62"></a>
+<span class="sourceLineNo">034</span> * <jc>// Or just use toString() which does the same as above.</jc><a name="line.34"></a>
+<span class="sourceLineNo">035</span> * String json = x.toString();<a name="line.35"></a>
+<span class="sourceLineNo">036</span> * </p><a name="line.36"></a>
+<span class="sourceLineNo">037</span> * <p class='bcode'><a name="line.37"></a>
+<span class="sourceLineNo">038</span> * <jc>// Output</jc><a name="line.38"></a>
+<span class="sourceLineNo">039</span> * {<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * <js>"description"</js>: <js>"Find more info here"</js>,<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * <js>"url"</js>: <js>"https://swagger.io"</js><a name="line.41"></a>
+<span class="sourceLineNo">042</span> * }<a name="line.42"></a>
+<span class="sourceLineNo">043</span> * </p><a name="line.43"></a>
+<span class="sourceLineNo">044</span> * <a name="line.44"></a>
+<span class="sourceLineNo">045</span> * <h6 class='topic'>Additional Information</h6><a name="line.45"></a>
+<span class="sourceLineNo">046</span> * <ul class='doctree'><a name="line.46"></a>
+<span class="sourceLineNo">047</span> * <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.Swagger'>Overview > juneau-dto > Swagger</a><a name="line.47"></a>
+<span class="sourceLineNo">048</span> * </ul><a name="line.48"></a>
+<span class="sourceLineNo">049</span> */<a name="line.49"></a>
+<span class="sourceLineNo">050</span>@Bean(properties="description,url,*")<a name="line.50"></a>
+<span class="sourceLineNo">051</span>public class ExternalDocumentation extends SwaggerElement {<a name="line.51"></a>
+<span class="sourceLineNo">052</span><a name="line.52"></a>
+<span class="sourceLineNo">053</span> private String description;<a name="line.53"></a>
+<span class="sourceLineNo">054</span> private URI url;<a name="line.54"></a>
+<span class="sourceLineNo">055</span><a name="line.55"></a>
+<span class="sourceLineNo">056</span> /**<a name="line.56"></a>
+<span class="sourceLineNo">057</span> * Bean property getter: <property>description</property>.<a name="line.57"></a>
+<span class="sourceLineNo">058</span> * <a name="line.58"></a>
+<span class="sourceLineNo">059</span> * <p><a name="line.59"></a>
+<span class="sourceLineNo">060</span> * A short description of the target documentation. <a name="line.60"></a>
+<span class="sourceLineNo">061</span> * <a name="line.61"></a>
+<span class="sourceLineNo">062</span> * @return The property value, or <jk>null</jk> if it is not set.<a name="line.62"></a>
<span class="sourceLineNo">063</span> */<a name="line.63"></a>
<span class="sourceLineNo">064</span> public String getDescription() {<a name="line.64"></a>
<span class="sourceLineNo">065</span> return description;<a name="line.65"></a>
@@ -77,73 +77,106 @@
<span class="sourceLineNo">069</span> * Bean property setter: <property>description</property>.<a name="line.69"></a>
<span class="sourceLineNo">070</span> * <a name="line.70"></a>
<span class="sourceLineNo">071</span> * <p><a name="line.71"></a>
-<span class="sourceLineNo">072</span> * A short description of the target documentation. GFM syntax can be used for rich text representation.<a name="line.72"></a>
+<span class="sourceLineNo">072</span> * A short description of the target documentation. <a name="line.72"></a>
<span class="sourceLineNo">073</span> * <a name="line.73"></a>
-<span class="sourceLineNo">074</span> * @param description The new value for the <property>description</property> property on this bean.<a name="line.74"></a>
-<span class="sourceLineNo">075</span> * @return This object (for method chaining).<a name="line.75"></a>
-<span class="sourceLineNo">076</span> */<a name="line.76"></a>
-<span class="sourceLineNo">077</span> public ExternalDocumentation setDescription(String description) {<a name="line.77"></a>
-<span class="sourceLineNo">078</span> this.description = description;<a name="line.78"></a>
-<span class="sourceLineNo">079</span> return this;<a name="line.79"></a>
-<span class="sourceLineNo">080</span> }<a name="line.80"></a>
-<span class="sourceLineNo">081</span><a name="line.81"></a>
-<span class="sourceLineNo">082</span> /**<a name="line.82"></a>
-<span class="sourceLineNo">083</span> * Synonym for {@link #setDescription(String)}.<a name="line.83"></a>
-<span class="sourceLineNo">084</span> * <a name="line.84"></a>
-<span class="sourceLineNo">085</span> * @param description The new value for the <property>description</property> property on this bean.<a name="line.85"></a>
-<span class="sourceLineNo">086</span> * @return This object (for method chaining).<a name="line.86"></a>
-<span class="sourceLineNo">087</span> */<a name="line.87"></a>
-<span class="sourceLineNo">088</span> public ExternalDocumentation description(String description) {<a name="line.88"></a>
-<span class="sourceLineNo">089</span> return setDescription(description);<a name="line.89"></a>
-<span class="sourceLineNo">090</span> }<a name="line.90"></a>
-<span class="sourceLineNo">091</span><a name="line.91"></a>
-<span class="sourceLineNo">092</span> /**<a name="line.92"></a>
-<span class="sourceLineNo">093</span> * Bean property getter: <property>url</property>.<a name="line.93"></a>
-<span class="sourceLineNo">094</span> * <a name="line.94"></a>
-<span class="sourceLineNo">095</span> * <p><a name="line.95"></a>
-<span class="sourceLineNo">096</span> * Required. The URL for the target documentation.<a name="line.96"></a>
-<span class="sourceLineNo">097</span> * <a name="line.97"></a>
-<span class="sourceLineNo">098</span> * <p><a name="line.98"></a>
-<span class="sourceLineNo">099</span> * The value can be of any of the following types: {@link URI}, {@link URL}, {@link String}.<a name="line.99"></a>
-<span class="sourceLineNo">100</span> * Strings must be valid URIs.<a name="line.100"></a>
-<span class="sourceLineNo">101</span> * <a name="line.101"></a>
-<span class="sourceLineNo">102</span> * <p><a name="line.102"></a>
-<span class="sourceLineNo">103</span> * URIs defined by {@link UriResolver} can be used for values.<a name="line.103"></a>
-<span class="sourceLineNo">104</span> * <a name="line.104"></a>
-<span class="sourceLineNo">105</span> * @return The value of the <property>url</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.105"></a>
-<span class="sourceLineNo">106</span> */<a name="line.106"></a>
-<span class="sourceLineNo">107</span> public URI getUrl() {<a name="line.107"></a>
-<span class="sourceLineNo">108</span> return url;<a name="line.108"></a>
-<span class="sourceLineNo">109</span> }<a name="line.109"></a>
-<span class="sourceLineNo">110</span><a name="line.110"></a>
-<span class="sourceLineNo">111</span> /**<a name="line.111"></a>
-<span class="sourceLineNo">112</span> * Bean property setter: <property>url</property>.<a name="line.112"></a>
-<span class="sourceLineNo">113</span> * <a name="line.113"></a>
-<span class="sourceLineNo">114</span> * <p><a name="line.114"></a>
-<span class="sourceLineNo">115</span> * The value can be of any of the following types: {@link URI}, {@link URL}, {@link String}.<a name="line.115"></a>
-<span class="sourceLineNo">116</span> * Strings must be valid URIs.<a name="line.116"></a>
-<span class="sourceLineNo">117</span> * <a name="line.117"></a>
-<span class="sourceLineNo">118</span> * <p><a name="line.118"></a>
-<span class="sourceLineNo">119</span> * URIs defined by {@link UriResolver} can be used for values.<a name="line.119"></a>
-<span class="sourceLineNo">120</span> * <a name="line.120"></a>
-<span class="sourceLineNo">121</span> * @param url The new value for the <property>url</property> property on this bean.<a name="line.121"></a>
-<span class="sourceLineNo">122</span> * @return This object (for method chaining).<a name="line.122"></a>
-<span class="sourceLineNo">123</span> */<a name="line.123"></a>
-<span class="sourceLineNo">124</span> public ExternalDocumentation setUrl(Object url) {<a name="line.124"></a>
-<span class="sourceLineNo">125</span> this.url = toURI(url);<a name="line.125"></a>
-<span class="sourceLineNo">126</span> return this;<a name="line.126"></a>
-<span class="sourceLineNo">127</span> }<a name="line.127"></a>
-<span class="sourceLineNo">128</span><a name="line.128"></a>
-<span class="sourceLineNo">129</span> /**<a name="line.129"></a>
-<span class="sourceLineNo">130</span> * Synonym for {@link #setUrl(Object)}.<a name="line.130"></a>
-<span class="sourceLineNo">131</span> * <a name="line.131"></a>
-<span class="sourceLineNo">132</span> * @param url The new value for the <property>url</property> property on this bean.<a name="line.132"></a>
-<span class="sourceLineNo">133</span> * @return This object (for method chaining).<a name="line.133"></a>
-<span class="sourceLineNo">134</span> */<a name="line.134"></a>
-<span class="sourceLineNo">135</span> public ExternalDocumentation url(Object url) {<a name="line.135"></a>
-<span class="sourceLineNo">136</span> return setUrl(url);<a name="line.136"></a>
-<span class="sourceLineNo">137</span> }<a name="line.137"></a>
-<span class="sourceLineNo">138</span>}<a name="line.138"></a>
+<span class="sourceLineNo">074</span> * @param value <a name="line.74"></a>
+<span class="sourceLineNo">075</span> * The new value for this property.<a name="line.75"></a>
+<span class="sourceLineNo">076</span> * <br><a class="doclink" href="https://help.github.com/articles/github-flavored-markdown">GFM syntax</a> can be used for rich text representation.<a name="line.76"></a>
+<span class="sourceLineNo">077</span> * <br>Can be <jk>null</jk> to unset the property.<a name="line.77"></a>
+<span class="sourceLineNo">078</span> * @return This object (for method chaining).<a name="line.78"></a>
+<span class="sourceLineNo">079</span> */<a name="line.79"></a>
+<span class="sourceLineNo">080</span> public ExternalDocumentation setDescription(String value) {<a name="line.80"></a>
+<span class="sourceLineNo">081</span> description = value;<a name="line.81"></a>
+<span class="sourceLineNo">082</span> return this;<a name="line.82"></a>
+<span class="sourceLineNo">083</span> }<a name="line.83"></a>
+<span class="sourceLineNo">084</span><a name="line.84"></a>
+<span class="sourceLineNo">085</span> /**<a name="line.85"></a>
+<span class="sourceLineNo">086</span> * Same as {@link #setDescription(String)}.<a name="line.86"></a>
+<span class="sourceLineNo">087</span> * <a name="line.87"></a>
+<span class="sourceLineNo">088</span> * @param value<a name="line.88"></a>
+<span class="sourceLineNo">089</span> * The new value for this property.<a name="line.89"></a>
+<span class="sourceLineNo">090</span> * <br>Non-String values will be converted to String using <code>toString()</code>.<a name="line.90"></a>
+<span class="sourceLineNo">091</span> * <br>Can be <jk>null</jk> to unset the property.<a name="line.91"></a>
+<span class="sourceLineNo">092</span> * @return This object (for method chaining).<a name="line.92"></a>
+<span class="sourceLineNo">093</span> */<a name="line.93"></a>
+<span class="sourceLineNo">094</span> public ExternalDocumentation description(Object value) {<a name="line.94"></a>
+<span class="sourceLineNo">095</span> return setDescription(toStringVal(value));<a name="line.95"></a>
+<span class="sourceLineNo">096</span> }<a name="line.96"></a>
+<span class="sourceLineNo">097</span><a name="line.97"></a>
+<span class="sourceLineNo">098</span> /**<a name="line.98"></a>
+<span class="sourceLineNo">099</span> * Bean property getter: <property>url</property>.<a name="line.99"></a>
+<span class="sourceLineNo">100</span> * <a name="line.100"></a>
+<span class="sourceLineNo">101</span> * <p><a name="line.101"></a>
+<span class="sourceLineNo">102</span> * The URL for the target documentation.<a name="line.102"></a>
+<span class="sourceLineNo">103</span> * <a name="line.103"></a>
+<span class="sourceLineNo">104</span> * @return The property value, or <jk>null</jk> if it is not set.<a name="line.104"></a>
+<span class="sourceLineNo">105</span> */<a name="line.105"></a>
+<span class="sourceLineNo">106</span> public URI getUrl() {<a name="line.106"></a>
+<span class="sourceLineNo">107</span> return url;<a name="line.107"></a>
+<span class="sourceLineNo">108</span> }<a name="line.108"></a>
+<span class="sourceLineNo">109</span><a name="line.109"></a>
+<span class="sourceLineNo">110</span> /**<a name="line.110"></a>
+<span class="sourceLineNo">111</span> * Bean property setter: <property>url</property>.<a name="line.111"></a>
+<span class="sourceLineNo">112</span> * <a name="line.112"></a>
+<span class="sourceLineNo">113</span> * <p><a name="line.113"></a>
+<span class="sourceLineNo">114</span> * The URL for the target documentation.<a name="line.114"></a>
+<span class="sourceLineNo">115</span> * <a name="line.115"></a>
+<span class="sourceLineNo">116</span> * @param value <a name="line.116"></a>
+<span class="sourceLineNo">117</span> * The new value for this property.<a name="line.117"></a>
+<span class="sourceLineNo">118</span> * <br>Property value is required.<a name="line.118"></a>
+<span class="sourceLineNo">119</span> * <br>URIs defined by {@link UriResolver} can be used for values.<a name="line.119"></a>
+<span class="sourceLineNo">120</span> * @return This object (for method chaining).<a name="line.120"></a>
+<span class="sourceLineNo">121</span> */<a name="line.121"></a>
+<span class="sourceLineNo">122</span> public ExternalDocumentation setUrl(URI value) {<a name="line.122"></a>
+<span class="sourceLineNo">123</span> url = value;<a name="line.123"></a>
+<span class="sourceLineNo">124</span> return this;<a name="line.124"></a>
+<span class="sourceLineNo">125</span> }<a name="line.125"></a>
+<span class="sourceLineNo">126</span><a name="line.126"></a>
+<span class="sourceLineNo">127</span> /**<a name="line.127"></a>
+<span class="sourceLineNo">128</span> * Same as {@link #setUrl(URI)}.<a name="line.128"></a>
+<span class="sourceLineNo">129</span> * <a name="line.129"></a>
+<span class="sourceLineNo">130</span> * @param value<a name="line.130"></a>
+<span class="sourceLineNo">131</span> * The new value for this property.<a name="line.131"></a>
+<span class="sourceLineNo">132</span> * <br>URIs defined by {@link UriResolver} can be used for values.<a name="line.132"></a>
+<span class="sourceLineNo">133</span> * <br>Valid types:<a name="line.133"></a>
+<span class="sourceLineNo">134</span> * <ul><a name="line.134"></a>
+<span class="sourceLineNo">135</span> * <li>{@link URI}<a name="line.135"></a>
+<span class="sourceLineNo">136</span> * <li>{@link URL}<a name="line.136"></a>
+<span class="sourceLineNo">137</span> * <li>{@link String} <a name="line.137"></a>
+<span class="sourceLineNo">138</span> * <br>Converted to URI using <code><jk>new</jk> URI(value.toString())</code>.<a name="line.138"></a>
+<span class="sourceLineNo">139</span> * <li><a name="line.139"></a>
+<span class="sourceLineNo">140</span> * </ul><a name="line.140"></a>
+<span class="sourceLineNo">141</span> * <br>Can be <jk>null</jk> to unset the property.<a name="line.141"></a>
+<span class="sourceLineNo">142</span> * @return This object (for method chaining).<a name="line.142"></a>
+<span class="sourceLineNo">143</span> */<a name="line.143"></a>
+<span class="sourceLineNo">144</span> public ExternalDocumentation url(Object value) {<a name="line.144"></a>
+<span class="sourceLineNo">145</span> return setUrl(toURI(value));<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> @Override /* SwaggerElement */<a name="line.148"></a>
+<span class="sourceLineNo">149</span> public <T> T get(String property, Class<T> type) {<a name="line.149"></a>
+<span class="sourceLineNo">150</span> if (property == null)<a name="line.150"></a>
+<span class="sourceLineNo">151</span> return null;<a name="line.151"></a>
+<span class="sourceLineNo">152</span> switch (property) {<a name="line.152"></a>
+<span class="sourceLineNo">153</span> case "description": return toType(getDescription(), type);<a name="line.153"></a>
+<span class="sourceLineNo">154</span> case "url": return toType(getUrl(), type);<a name="line.154"></a>
+<span class="sourceLineNo">155</span> default: return super.get(property, type);<a name="line.155"></a>
+<span class="sourceLineNo">156</span> }<a name="line.156"></a>
+<span class="sourceLineNo">157</span> }<a name="line.157"></a>
+<span class="sourceLineNo">158</span><a name="line.158"></a>
+<span class="sourceLineNo">159</span> @Override /* SwaggerElement */<a name="line.159"></a>
+<span class="sourceLineNo">160</span> public ExternalDocumentation set(String property, Object value) {<a name="line.160"></a>
+<span class="sourceLineNo">161</span> if (property == null)<a name="line.161"></a>
+<span class="sourceLineNo">162</span> return this;<a name="line.162"></a>
+<span class="sourceLineNo">163</span> switch (property) {<a name="line.163"></a>
+<span class="sourceLineNo">164</span> case "description": return description(value);<a name="line.164"></a>
+<span class="sourceLineNo">165</span> case "url": return url(value);<a name="line.165"></a>
+<span class="sourceLineNo">166</span> default: <a name="line.166"></a>
+<span class="sourceLineNo">167</span> super.set(property, value);<a name="line.167"></a>
+<span class="sourceLineNo">168</span> return this;<a name="line.168"></a>
+<span class="sourceLineNo">169</span> }<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>