You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2017/08/27 22:20:02 UTC

[29/51] [partial] incubator-juneau-website git commit: Update javadocs.

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/2ead32d5/content/site/apidocs/src-html/org/apache/juneau/jso/JsoSerializerSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/jso/JsoSerializerSession.html b/content/site/apidocs/src-html/org/apache/juneau/jso/JsoSerializerSession.html
index a9de9d9..51c51f6 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/jso/JsoSerializerSession.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/jso/JsoSerializerSession.html
@@ -28,7 +28,7 @@
 <span class="sourceLineNo">020</span> * Session object that lives for the duration of a single use of {@link JsoSerializer}.<a name="line.20"></a>
 <span class="sourceLineNo">021</span> *<a name="line.21"></a>
 <span class="sourceLineNo">022</span> * &lt;p&gt;<a name="line.22"></a>
-<span class="sourceLineNo">023</span> * This class is NOT thread safe.  <a name="line.23"></a>
+<span class="sourceLineNo">023</span> * This class is NOT thread safe.<a name="line.23"></a>
 <span class="sourceLineNo">024</span> * It is typically discarded after one-time use although it can be reused within the same thread.<a name="line.24"></a>
 <span class="sourceLineNo">025</span> */<a name="line.25"></a>
 <span class="sourceLineNo">026</span>public class JsoSerializerSession extends OutputStreamSerializerSession {<a name="line.26"></a>
@@ -44,20 +44,19 @@
 <span class="sourceLineNo">036</span>    *    These specify session-level information such as locale and URI context.<a name="line.36"></a>
 <span class="sourceLineNo">037</span>    *    It also include session-level properties that override the properties defined on the bean and<a name="line.37"></a>
 <span class="sourceLineNo">038</span>    *    serializer contexts.<a name="line.38"></a>
-<span class="sourceLineNo">039</span>    *    &lt;br&gt;If &lt;jk&gt;null&lt;/jk&gt;, defaults to {@link SerializerSessionArgs#DEFAULT}.<a name="line.39"></a>
-<span class="sourceLineNo">040</span>    */<a name="line.40"></a>
-<span class="sourceLineNo">041</span>   protected JsoSerializerSession(SerializerContext ctx, SerializerSessionArgs args) {<a name="line.41"></a>
-<span class="sourceLineNo">042</span>      super(ctx, args);<a name="line.42"></a>
-<span class="sourceLineNo">043</span>   }<a name="line.43"></a>
-<span class="sourceLineNo">044</span><a name="line.44"></a>
-<span class="sourceLineNo">045</span>   @Override /* OutputStreamSerializerSession */<a name="line.45"></a>
-<span class="sourceLineNo">046</span>   protected void doSerialize(SerializerPipe out, Object o) throws Exception {<a name="line.46"></a>
-<span class="sourceLineNo">047</span>      ObjectOutputStream oos = new ObjectOutputStream(out.getOutputStream());<a name="line.47"></a>
-<span class="sourceLineNo">048</span>      oos.writeObject(o);<a name="line.48"></a>
-<span class="sourceLineNo">049</span>      oos.flush();<a name="line.49"></a>
-<span class="sourceLineNo">050</span>      oos.close();<a name="line.50"></a>
-<span class="sourceLineNo">051</span>   }<a name="line.51"></a>
-<span class="sourceLineNo">052</span>}<a name="line.52"></a>
+<span class="sourceLineNo">039</span>    */<a name="line.39"></a>
+<span class="sourceLineNo">040</span>   protected JsoSerializerSession(SerializerContext ctx, SerializerSessionArgs args) {<a name="line.40"></a>
+<span class="sourceLineNo">041</span>      super(ctx, args);<a name="line.41"></a>
+<span class="sourceLineNo">042</span>   }<a name="line.42"></a>
+<span class="sourceLineNo">043</span><a name="line.43"></a>
+<span class="sourceLineNo">044</span>   @Override /* OutputStreamSerializerSession */<a name="line.44"></a>
+<span class="sourceLineNo">045</span>   protected void doSerialize(SerializerPipe out, Object o) throws Exception {<a name="line.45"></a>
+<span class="sourceLineNo">046</span>      ObjectOutputStream oos = new ObjectOutputStream(out.getOutputStream());<a name="line.46"></a>
+<span class="sourceLineNo">047</span>      oos.writeObject(o);<a name="line.47"></a>
+<span class="sourceLineNo">048</span>      oos.flush();<a name="line.48"></a>
+<span class="sourceLineNo">049</span>      oos.close();<a name="line.49"></a>
+<span class="sourceLineNo">050</span>   }<a name="line.50"></a>
+<span class="sourceLineNo">051</span>}<a name="line.51"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/2ead32d5/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.Strict.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.Strict.html b/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.Strict.html
index 6c50a51..0308ccd 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.Strict.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.Strict.html
@@ -23,144 +23,152 @@
 <span class="sourceLineNo">015</span>import static org.apache.juneau.parser.ParserContext.*;<a name="line.15"></a>
 <span class="sourceLineNo">016</span><a name="line.16"></a>
 <span class="sourceLineNo">017</span>import org.apache.juneau.*;<a name="line.17"></a>
-<span class="sourceLineNo">018</span>import org.apache.juneau.annotation.*;<a name="line.18"></a>
-<span class="sourceLineNo">019</span>import org.apache.juneau.parser.*;<a name="line.19"></a>
-<span class="sourceLineNo">020</span><a name="line.20"></a>
-<span class="sourceLineNo">021</span>/**<a name="line.21"></a>
-<span class="sourceLineNo">022</span> * Parses any valid JSON text into a POJO model.<a name="line.22"></a>
-<span class="sourceLineNo">023</span> *<a name="line.23"></a>
-<span class="sourceLineNo">024</span> * &lt;h5 class='section'&gt;Media types:&lt;/h5&gt;<a name="line.24"></a>
-<span class="sourceLineNo">025</span> *<a name="line.25"></a>
-<span class="sourceLineNo">026</span> * Handles &lt;code&gt;Content-Type&lt;/code&gt; types: &lt;code&gt;application/json, text/json&lt;/code&gt;<a name="line.26"></a>
-<span class="sourceLineNo">027</span> *<a name="line.27"></a>
-<span class="sourceLineNo">028</span> * &lt;h5 class='section'&gt;Description:&lt;/h5&gt;<a name="line.28"></a>
-<span class="sourceLineNo">029</span> *<a name="line.29"></a>
-<span class="sourceLineNo">030</span> * This parser uses a state machine, which makes it very fast and efficient.  It parses JSON in about 70% of the<a name="line.30"></a>
-<span class="sourceLineNo">031</span> * time that it takes the built-in Java DOM parsers to parse equivalent XML.<a name="line.31"></a>
-<span class="sourceLineNo">032</span> *<a name="line.32"></a>
-<span class="sourceLineNo">033</span> * &lt;p&gt;<a name="line.33"></a>
-<span class="sourceLineNo">034</span> * This parser handles all valid JSON syntax.<a name="line.34"></a>
-<span class="sourceLineNo">035</span> * In addition, when strict mode is disable, the parser also handles the following:<a name="line.35"></a>
-<span class="sourceLineNo">036</span> * &lt;ul class='spaced-list'&gt;<a name="line.36"></a>
-<span class="sourceLineNo">037</span> *    &lt;li&gt;<a name="line.37"></a>
-<span class="sourceLineNo">038</span> *       Javascript comments (both {@code /*} and {@code //}) are ignored.<a name="line.38"></a>
-<span class="sourceLineNo">039</span> *    &lt;li&gt;<a name="line.39"></a>
-<span class="sourceLineNo">040</span> *       Both single and double quoted strings.<a name="line.40"></a>
-<span class="sourceLineNo">041</span> *    &lt;li&gt;<a name="line.41"></a>
-<span class="sourceLineNo">042</span> *       Automatically joins concatenated strings (e.g. &lt;code&gt;&lt;js&gt;"aaa"&lt;/js&gt; + &lt;js&gt;'bbb'&lt;/js&gt;&lt;/code&gt;).<a name="line.42"></a>
-<span class="sourceLineNo">043</span> *    &lt;li&gt;<a name="line.43"></a>
-<span class="sourceLineNo">044</span> *       Unquoted attributes.<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * &lt;/ul&gt;<a name="line.45"></a>
-<span class="sourceLineNo">046</span> *<a name="line.46"></a>
-<span class="sourceLineNo">047</span> * &lt;p&gt;<a name="line.47"></a>
-<span class="sourceLineNo">048</span> * Also handles negative, decimal, hexadecimal, octal, and double numbers, including exponential notation.<a name="line.48"></a>
-<span class="sourceLineNo">049</span> *<a name="line.49"></a>
-<span class="sourceLineNo">050</span> * &lt;p&gt;<a name="line.50"></a>
-<span class="sourceLineNo">051</span> * This parser handles the following input, and automatically returns the corresponding Java class.<a name="line.51"></a>
-<span class="sourceLineNo">052</span> * &lt;ul class='spaced-list'&gt;<a name="line.52"></a>
-<span class="sourceLineNo">053</span> *    &lt;li&gt;<a name="line.53"></a>
-<span class="sourceLineNo">054</span> *       JSON objects (&lt;js&gt;"{...}"&lt;/js&gt;) are converted to {@link ObjectMap ObjectMaps}.<a name="line.54"></a>
-<span class="sourceLineNo">055</span> *       &lt;b&gt;Note:&lt;/b&gt;  If a &lt;code&gt;&lt;xa&gt;_type&lt;/xa&gt;=&lt;xs&gt;'xxx'&lt;/xs&gt;&lt;/code&gt; attribute is specified on the object, then an<a name="line.55"></a>
-<span class="sourceLineNo">056</span> *       attempt is made to convert the object to an instance of the specified Java bean class.<a name="line.56"></a>
-<span class="sourceLineNo">057</span> *       See the &lt;code&gt;beanTypeName&lt;/code&gt; setting on the {@link PropertyStore} for more information about parsing<a name="line.57"></a>
-<span class="sourceLineNo">058</span> *       beans from JSON.<a name="line.58"></a>
-<span class="sourceLineNo">059</span> *    &lt;li&gt;<a name="line.59"></a>
-<span class="sourceLineNo">060</span> *       JSON arrays (&lt;js&gt;"[...]"&lt;/js&gt;) are converted to {@link ObjectList ObjectLists}.<a name="line.60"></a>
-<span class="sourceLineNo">061</span> *    &lt;li&gt;<a name="line.61"></a>
-<span class="sourceLineNo">062</span> *       JSON string literals (&lt;js&gt;"'xyz'"&lt;/js&gt;) are converted to {@link String Strings}.<a name="line.62"></a>
-<span class="sourceLineNo">063</span> *    &lt;li&gt;<a name="line.63"></a>
-<span class="sourceLineNo">064</span> *       JSON numbers (&lt;js&gt;"123"&lt;/js&gt;, including octal/hexadecimal/exponential notation) are converted to<a name="line.64"></a>
-<span class="sourceLineNo">065</span> *       {@link Integer Integers}, {@link Long Longs}, {@link Float Floats}, or {@link Double Doubles} depending on<a name="line.65"></a>
-<span class="sourceLineNo">066</span> *       whether the number is decimal, and the size of the number.<a name="line.66"></a>
-<span class="sourceLineNo">067</span> *    &lt;li&gt;<a name="line.67"></a>
-<span class="sourceLineNo">068</span> *       JSON booleans (&lt;js&gt;"false"&lt;/js&gt;) are converted to {@link Boolean Booleans}.<a name="line.68"></a>
-<span class="sourceLineNo">069</span> *    &lt;li&gt;<a name="line.69"></a>
-<span class="sourceLineNo">070</span> *       JSON nulls (&lt;js&gt;"null"&lt;/js&gt;) are converted to &lt;jk&gt;null&lt;/jk&gt;.<a name="line.70"></a>
-<span class="sourceLineNo">071</span> *    &lt;li&gt;<a name="line.71"></a>
-<span class="sourceLineNo">072</span> *       Input consisting of only whitespace or JSON comments are converted to &lt;jk&gt;null&lt;/jk&gt;.<a name="line.72"></a>
-<span class="sourceLineNo">073</span> * &lt;/ul&gt;<a name="line.73"></a>
-<span class="sourceLineNo">074</span> *<a name="line.74"></a>
-<span class="sourceLineNo">075</span> * &lt;p&gt;<a name="line.75"></a>
-<span class="sourceLineNo">076</span> * Input can be any of the following:<a name="line.76"></a>
-<span class="sourceLineNo">077</span> * &lt;ul class='spaced-list'&gt;<a name="line.77"></a>
-<span class="sourceLineNo">078</span> *    &lt;li&gt;<a name="line.78"></a>
-<span class="sourceLineNo">079</span> *       &lt;js&gt;"{...}"&lt;/js&gt; - Converted to a {@link ObjectMap} or an instance of a Java bean if a &lt;xa&gt;_type&lt;/xa&gt;<a name="line.79"></a>
-<span class="sourceLineNo">080</span> *       attribute is present.<a name="line.80"></a>
-<span class="sourceLineNo">081</span> *    &lt;li&gt;<a name="line.81"></a>
-<span class="sourceLineNo">082</span> *       &lt;js&gt;"[...]"&lt;/js&gt; - Converted to a {@link ObjectList}.<a name="line.82"></a>
-<span class="sourceLineNo">083</span> *    &lt;li&gt;<a name="line.83"></a>
-<span class="sourceLineNo">084</span> *       &lt;js&gt;"123..."&lt;/js&gt; - Converted to a {@link Number} (either {@link Integer}, {@link Long}, {@link Float},<a name="line.84"></a>
-<span class="sourceLineNo">085</span> *       or {@link Double}).<a name="line.85"></a>
-<span class="sourceLineNo">086</span> *    &lt;li&gt;<a name="line.86"></a>
-<span class="sourceLineNo">087</span> *       &lt;js&gt;"true"&lt;/js&gt;/&lt;js&gt;"false"&lt;/js&gt; - Converted to a {@link Boolean}.<a name="line.87"></a>
-<span class="sourceLineNo">088</span> *    &lt;li&gt;<a name="line.88"></a>
-<span class="sourceLineNo">089</span> *       &lt;js&gt;"null"&lt;/js&gt; - Returns &lt;jk&gt;null&lt;/jk&gt;.<a name="line.89"></a>
-<span class="sourceLineNo">090</span> *    &lt;li&gt;<a name="line.90"></a>
-<span class="sourceLineNo">091</span> *       &lt;js&gt;"'xxx'"&lt;/js&gt; - Converted to a {@link String}.<a name="line.91"></a>
-<span class="sourceLineNo">092</span> *    &lt;li&gt;<a name="line.92"></a>
-<span class="sourceLineNo">093</span> *       &lt;js&gt;"\"xxx\""&lt;/js&gt; - Converted to a {@link String}.<a name="line.93"></a>
-<span class="sourceLineNo">094</span> *    &lt;li&gt;<a name="line.94"></a>
-<span class="sourceLineNo">095</span> *       &lt;js&gt;"'xxx' + \"yyy\""&lt;/js&gt; - Converted to a concatenated {@link String}.<a name="line.95"></a>
-<span class="sourceLineNo">096</span> * &lt;/ul&gt;<a name="line.96"></a>
-<span class="sourceLineNo">097</span> *<a name="line.97"></a>
-<span class="sourceLineNo">098</span> * &lt;p&gt;<a name="line.98"></a>
-<span class="sourceLineNo">099</span> * TIP:  If you know you're parsing a JSON object or array, it can be easier to parse it using the<a name="line.99"></a>
-<span class="sourceLineNo">100</span> * {@link ObjectMap#ObjectMap(CharSequence) ObjectMap(CharSequence)} or {@link ObjectList#ObjectList(CharSequence)<a name="line.100"></a>
-<span class="sourceLineNo">101</span> * ObjectList(CharSequence)} constructors instead of using this class.<a name="line.101"></a>
-<span class="sourceLineNo">102</span> * The end result should be the same.<a name="line.102"></a>
-<span class="sourceLineNo">103</span> *<a name="line.103"></a>
-<span class="sourceLineNo">104</span> * &lt;h5 class='section'&gt;Configurable properties:&lt;/h5&gt;<a name="line.104"></a>
-<span class="sourceLineNo">105</span> *<a name="line.105"></a>
-<span class="sourceLineNo">106</span> * This class has the following properties associated with it:<a name="line.106"></a>
-<span class="sourceLineNo">107</span> * &lt;ul&gt;<a name="line.107"></a>
-<span class="sourceLineNo">108</span> *    &lt;li&gt;{@link JsonParserContext}<a name="line.108"></a>
-<span class="sourceLineNo">109</span> * &lt;/ul&gt;<a name="line.109"></a>
-<span class="sourceLineNo">110</span> */<a name="line.110"></a>
-<span class="sourceLineNo">111</span>@Consumes("application/json,text/json")<a name="line.111"></a>
-<span class="sourceLineNo">112</span>public class JsonParser extends ReaderParser {<a name="line.112"></a>
-<span class="sourceLineNo">113</span><a name="line.113"></a>
-<span class="sourceLineNo">114</span>   /** Default parser, all default settings.*/<a name="line.114"></a>
-<span class="sourceLineNo">115</span>   public static final JsonParser DEFAULT = new JsonParser(PropertyStore.create());<a name="line.115"></a>
-<span class="sourceLineNo">116</span><a name="line.116"></a>
-<span class="sourceLineNo">117</span>   /** Default parser, all default settings.*/<a name="line.117"></a>
-<span class="sourceLineNo">118</span>   public static final JsonParser DEFAULT_STRICT = new JsonParser.Strict(PropertyStore.create());<a name="line.118"></a>
-<span class="sourceLineNo">119</span><a name="line.119"></a>
-<span class="sourceLineNo">120</span>   /** Default parser, strict mode. */<a name="line.120"></a>
-<span class="sourceLineNo">121</span>   public static class Strict extends JsonParser {<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>       * Constructor.<a name="line.124"></a>
-<span class="sourceLineNo">125</span>       *<a name="line.125"></a>
-<span class="sourceLineNo">126</span>       * @param propertyStore The property store containing all the settings for this object.<a name="line.126"></a>
-<span class="sourceLineNo">127</span>       */<a name="line.127"></a>
-<span class="sourceLineNo">128</span>      public Strict(PropertyStore propertyStore) {<a name="line.128"></a>
-<span class="sourceLineNo">129</span>         super(propertyStore.copy().append(PARSER_strict, true));<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><a name="line.132"></a>
+<span class="sourceLineNo">018</span>import org.apache.juneau.parser.*;<a name="line.18"></a>
+<span class="sourceLineNo">019</span><a name="line.19"></a>
+<span class="sourceLineNo">020</span>/**<a name="line.20"></a>
+<span class="sourceLineNo">021</span> * Parses any valid JSON text into a POJO model.<a name="line.21"></a>
+<span class="sourceLineNo">022</span> *<a name="line.22"></a>
+<span class="sourceLineNo">023</span> * &lt;h5 class='section'&gt;Media types:&lt;/h5&gt;<a name="line.23"></a>
+<span class="sourceLineNo">024</span> *<a name="line.24"></a>
+<span class="sourceLineNo">025</span> * Handles &lt;code&gt;Content-Type&lt;/code&gt; types: &lt;code&gt;application/json, text/json&lt;/code&gt;<a name="line.25"></a>
+<span class="sourceLineNo">026</span> *<a name="line.26"></a>
+<span class="sourceLineNo">027</span> * &lt;h5 class='section'&gt;Description:&lt;/h5&gt;<a name="line.27"></a>
+<span class="sourceLineNo">028</span> *<a name="line.28"></a>
+<span class="sourceLineNo">029</span> * This parser uses a state machine, which makes it very fast and efficient.  It parses JSON in about 70% of the<a name="line.29"></a>
+<span class="sourceLineNo">030</span> * time that it takes the built-in Java DOM parsers to parse equivalent XML.<a name="line.30"></a>
+<span class="sourceLineNo">031</span> *<a name="line.31"></a>
+<span class="sourceLineNo">032</span> * &lt;p&gt;<a name="line.32"></a>
+<span class="sourceLineNo">033</span> * This parser handles all valid JSON syntax.<a name="line.33"></a>
+<span class="sourceLineNo">034</span> * In addition, when strict mode is disable, the parser also handles the following:<a name="line.34"></a>
+<span class="sourceLineNo">035</span> * &lt;ul class='spaced-list'&gt;<a name="line.35"></a>
+<span class="sourceLineNo">036</span> *    &lt;li&gt;<a name="line.36"></a>
+<span class="sourceLineNo">037</span> *       Javascript comments (both {@code /*} and {@code //}) are ignored.<a name="line.37"></a>
+<span class="sourceLineNo">038</span> *    &lt;li&gt;<a name="line.38"></a>
+<span class="sourceLineNo">039</span> *       Both single and double quoted strings.<a name="line.39"></a>
+<span class="sourceLineNo">040</span> *    &lt;li&gt;<a name="line.40"></a>
+<span class="sourceLineNo">041</span> *       Automatically joins concatenated strings (e.g. &lt;code&gt;&lt;js&gt;"aaa"&lt;/js&gt; + &lt;js&gt;'bbb'&lt;/js&gt;&lt;/code&gt;).<a name="line.41"></a>
+<span class="sourceLineNo">042</span> *    &lt;li&gt;<a name="line.42"></a>
+<span class="sourceLineNo">043</span> *       Unquoted attributes.<a name="line.43"></a>
+<span class="sourceLineNo">044</span> * &lt;/ul&gt;<a name="line.44"></a>
+<span class="sourceLineNo">045</span> *<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * &lt;p&gt;<a name="line.46"></a>
+<span class="sourceLineNo">047</span> * Also handles negative, decimal, hexadecimal, octal, and double numbers, including exponential notation.<a name="line.47"></a>
+<span class="sourceLineNo">048</span> *<a name="line.48"></a>
+<span class="sourceLineNo">049</span> * &lt;p&gt;<a name="line.49"></a>
+<span class="sourceLineNo">050</span> * This parser handles the following input, and automatically returns the corresponding Java class.<a name="line.50"></a>
+<span class="sourceLineNo">051</span> * &lt;ul class='spaced-list'&gt;<a name="line.51"></a>
+<span class="sourceLineNo">052</span> *    &lt;li&gt;<a name="line.52"></a>
+<span class="sourceLineNo">053</span> *       JSON objects (&lt;js&gt;"{...}"&lt;/js&gt;) are converted to {@link ObjectMap ObjectMaps}.<a name="line.53"></a>
+<span class="sourceLineNo">054</span> *       &lt;b&gt;Note:&lt;/b&gt;  If a &lt;code&gt;&lt;xa&gt;_type&lt;/xa&gt;=&lt;xs&gt;'xxx'&lt;/xs&gt;&lt;/code&gt; attribute is specified on the object, then an<a name="line.54"></a>
+<span class="sourceLineNo">055</span> *       attempt is made to convert the object to an instance of the specified Java bean class.<a name="line.55"></a>
+<span class="sourceLineNo">056</span> *       See the &lt;code&gt;beanTypeName&lt;/code&gt; setting on the {@link PropertyStore} for more information about parsing<a name="line.56"></a>
+<span class="sourceLineNo">057</span> *       beans from JSON.<a name="line.57"></a>
+<span class="sourceLineNo">058</span> *    &lt;li&gt;<a name="line.58"></a>
+<span class="sourceLineNo">059</span> *       JSON arrays (&lt;js&gt;"[...]"&lt;/js&gt;) are converted to {@link ObjectList ObjectLists}.<a name="line.59"></a>
+<span class="sourceLineNo">060</span> *    &lt;li&gt;<a name="line.60"></a>
+<span class="sourceLineNo">061</span> *       JSON string literals (&lt;js&gt;"'xyz'"&lt;/js&gt;) are converted to {@link String Strings}.<a name="line.61"></a>
+<span class="sourceLineNo">062</span> *    &lt;li&gt;<a name="line.62"></a>
+<span class="sourceLineNo">063</span> *       JSON numbers (&lt;js&gt;"123"&lt;/js&gt;, including octal/hexadecimal/exponential notation) are converted to<a name="line.63"></a>
+<span class="sourceLineNo">064</span> *       {@link Integer Integers}, {@link Long Longs}, {@link Float Floats}, or {@link Double Doubles} depending on<a name="line.64"></a>
+<span class="sourceLineNo">065</span> *       whether the number is decimal, and the size of the number.<a name="line.65"></a>
+<span class="sourceLineNo">066</span> *    &lt;li&gt;<a name="line.66"></a>
+<span class="sourceLineNo">067</span> *       JSON booleans (&lt;js&gt;"false"&lt;/js&gt;) are converted to {@link Boolean Booleans}.<a name="line.67"></a>
+<span class="sourceLineNo">068</span> *    &lt;li&gt;<a name="line.68"></a>
+<span class="sourceLineNo">069</span> *       JSON nulls (&lt;js&gt;"null"&lt;/js&gt;) are converted to &lt;jk&gt;null&lt;/jk&gt;.<a name="line.69"></a>
+<span class="sourceLineNo">070</span> *    &lt;li&gt;<a name="line.70"></a>
+<span class="sourceLineNo">071</span> *       Input consisting of only whitespace or JSON comments are converted to &lt;jk&gt;null&lt;/jk&gt;.<a name="line.71"></a>
+<span class="sourceLineNo">072</span> * &lt;/ul&gt;<a name="line.72"></a>
+<span class="sourceLineNo">073</span> *<a name="line.73"></a>
+<span class="sourceLineNo">074</span> * &lt;p&gt;<a name="line.74"></a>
+<span class="sourceLineNo">075</span> * Input can be any of the following:<a name="line.75"></a>
+<span class="sourceLineNo">076</span> * &lt;ul class='spaced-list'&gt;<a name="line.76"></a>
+<span class="sourceLineNo">077</span> *    &lt;li&gt;<a name="line.77"></a>
+<span class="sourceLineNo">078</span> *       &lt;js&gt;"{...}"&lt;/js&gt; - Converted to a {@link ObjectMap} or an instance of a Java bean if a &lt;xa&gt;_type&lt;/xa&gt;<a name="line.78"></a>
+<span class="sourceLineNo">079</span> *       attribute is present.<a name="line.79"></a>
+<span class="sourceLineNo">080</span> *    &lt;li&gt;<a name="line.80"></a>
+<span class="sourceLineNo">081</span> *       &lt;js&gt;"[...]"&lt;/js&gt; - Converted to a {@link ObjectList}.<a name="line.81"></a>
+<span class="sourceLineNo">082</span> *    &lt;li&gt;<a name="line.82"></a>
+<span class="sourceLineNo">083</span> *       &lt;js&gt;"123..."&lt;/js&gt; - Converted to a {@link Number} (either {@link Integer}, {@link Long}, {@link Float},<a name="line.83"></a>
+<span class="sourceLineNo">084</span> *       or {@link Double}).<a name="line.84"></a>
+<span class="sourceLineNo">085</span> *    &lt;li&gt;<a name="line.85"></a>
+<span class="sourceLineNo">086</span> *       &lt;js&gt;"true"&lt;/js&gt;/&lt;js&gt;"false"&lt;/js&gt; - Converted to a {@link Boolean}.<a name="line.86"></a>
+<span class="sourceLineNo">087</span> *    &lt;li&gt;<a name="line.87"></a>
+<span class="sourceLineNo">088</span> *       &lt;js&gt;"null"&lt;/js&gt; - Returns &lt;jk&gt;null&lt;/jk&gt;.<a name="line.88"></a>
+<span class="sourceLineNo">089</span> *    &lt;li&gt;<a name="line.89"></a>
+<span class="sourceLineNo">090</span> *       &lt;js&gt;"'xxx'"&lt;/js&gt; - Converted to a {@link String}.<a name="line.90"></a>
+<span class="sourceLineNo">091</span> *    &lt;li&gt;<a name="line.91"></a>
+<span class="sourceLineNo">092</span> *       &lt;js&gt;"\"xxx\""&lt;/js&gt; - Converted to a {@link String}.<a name="line.92"></a>
+<span class="sourceLineNo">093</span> *    &lt;li&gt;<a name="line.93"></a>
+<span class="sourceLineNo">094</span> *       &lt;js&gt;"'xxx' + \"yyy\""&lt;/js&gt; - Converted to a concatenated {@link String}.<a name="line.94"></a>
+<span class="sourceLineNo">095</span> * &lt;/ul&gt;<a name="line.95"></a>
+<span class="sourceLineNo">096</span> *<a name="line.96"></a>
+<span class="sourceLineNo">097</span> * &lt;p&gt;<a name="line.97"></a>
+<span class="sourceLineNo">098</span> * TIP:  If you know you're parsing a JSON object or array, it can be easier to parse it using the<a name="line.98"></a>
+<span class="sourceLineNo">099</span> * {@link ObjectMap#ObjectMap(CharSequence) ObjectMap(CharSequence)} or {@link ObjectList#ObjectList(CharSequence)<a name="line.99"></a>
+<span class="sourceLineNo">100</span> * ObjectList(CharSequence)} constructors instead of using this class.<a name="line.100"></a>
+<span class="sourceLineNo">101</span> * The end result should be the same.<a name="line.101"></a>
+<span class="sourceLineNo">102</span> *<a name="line.102"></a>
+<span class="sourceLineNo">103</span> * &lt;h5 class='section'&gt;Configurable properties:&lt;/h5&gt;<a name="line.103"></a>
+<span class="sourceLineNo">104</span> *<a name="line.104"></a>
+<span class="sourceLineNo">105</span> * This class has the following properties associated with it:<a name="line.105"></a>
+<span class="sourceLineNo">106</span> * &lt;ul&gt;<a name="line.106"></a>
+<span class="sourceLineNo">107</span> *    &lt;li&gt;{@link JsonParserContext}<a name="line.107"></a>
+<span class="sourceLineNo">108</span> * &lt;/ul&gt;<a name="line.108"></a>
+<span class="sourceLineNo">109</span> */<a name="line.109"></a>
+<span class="sourceLineNo">110</span>public class JsonParser extends ReaderParser {<a name="line.110"></a>
+<span class="sourceLineNo">111</span><a name="line.111"></a>
+<span class="sourceLineNo">112</span>   /** Default parser, all default settings.*/<a name="line.112"></a>
+<span class="sourceLineNo">113</span>   public static final JsonParser DEFAULT = new JsonParser(PropertyStore.create());<a name="line.113"></a>
+<span class="sourceLineNo">114</span><a name="line.114"></a>
+<span class="sourceLineNo">115</span>   /** Default parser, all default settings.*/<a name="line.115"></a>
+<span class="sourceLineNo">116</span>   public static final JsonParser DEFAULT_STRICT = new JsonParser.Strict(PropertyStore.create());<a name="line.116"></a>
+<span class="sourceLineNo">117</span><a name="line.117"></a>
+<span class="sourceLineNo">118</span>   /** Default parser, strict mode. */<a name="line.118"></a>
+<span class="sourceLineNo">119</span>   public static class Strict extends JsonParser {<a name="line.119"></a>
+<span class="sourceLineNo">120</span><a name="line.120"></a>
+<span class="sourceLineNo">121</span>      /**<a name="line.121"></a>
+<span class="sourceLineNo">122</span>       * Constructor.<a name="line.122"></a>
+<span class="sourceLineNo">123</span>       *<a name="line.123"></a>
+<span class="sourceLineNo">124</span>       * @param propertyStore The property store containing all the settings for this object.<a name="line.124"></a>
+<span class="sourceLineNo">125</span>       */<a name="line.125"></a>
+<span class="sourceLineNo">126</span>      public Strict(PropertyStore propertyStore) {<a name="line.126"></a>
+<span class="sourceLineNo">127</span>         super(propertyStore.copy().append(PARSER_strict, true));<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><a name="line.130"></a>
+<span class="sourceLineNo">131</span><a name="line.131"></a>
+<span class="sourceLineNo">132</span>   private final JsonParserContext ctx;<a name="line.132"></a>
 <span class="sourceLineNo">133</span><a name="line.133"></a>
-<span class="sourceLineNo">134</span>   private final JsonParserContext ctx;<a name="line.134"></a>
-<span class="sourceLineNo">135</span><a name="line.135"></a>
-<span class="sourceLineNo">136</span>   /**<a name="line.136"></a>
-<span class="sourceLineNo">137</span>    * Constructor.<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    *<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    * @param propertyStore The property store containing all the settings for this object.<a name="line.139"></a>
-<span class="sourceLineNo">140</span>    */<a name="line.140"></a>
-<span class="sourceLineNo">141</span>   public JsonParser(PropertyStore propertyStore) {<a name="line.141"></a>
-<span class="sourceLineNo">142</span>      super(propertyStore);<a name="line.142"></a>
-<span class="sourceLineNo">143</span>      this.ctx = createContext(JsonParserContext.class);<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>   @Override /* CoreObject */<a name="line.146"></a>
-<span class="sourceLineNo">147</span>   public JsonParserBuilder builder() {<a name="line.147"></a>
-<span class="sourceLineNo">148</span>      return new JsonParserBuilder(propertyStore);<a name="line.148"></a>
-<span class="sourceLineNo">149</span>   }<a name="line.149"></a>
-<span class="sourceLineNo">150</span><a name="line.150"></a>
-<span class="sourceLineNo">151</span>   @Override /* Parser */<a name="line.151"></a>
-<span class="sourceLineNo">152</span>   public ReaderParserSession createSession(ParserSessionArgs args) {<a name="line.152"></a>
-<span class="sourceLineNo">153</span>      return new JsonParserSession(ctx, args);<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">134</span>   /**<a name="line.134"></a>
+<span class="sourceLineNo">135</span>    * Constructor.<a name="line.135"></a>
+<span class="sourceLineNo">136</span>    *<a name="line.136"></a>
+<span class="sourceLineNo">137</span>    * @param propertyStore The property store containing all the settings for this object.<a name="line.137"></a>
+<span class="sourceLineNo">138</span>    */<a name="line.138"></a>
+<span class="sourceLineNo">139</span>   public JsonParser(PropertyStore propertyStore) {<a name="line.139"></a>
+<span class="sourceLineNo">140</span>      this(propertyStore, "application/json", "text/json");<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>
+<span class="sourceLineNo">144</span>    * Constructor.<a name="line.144"></a>
+<span class="sourceLineNo">145</span>    *<a name="line.145"></a>
+<span class="sourceLineNo">146</span>    * @param propertyStore The property store containing all the settings for this object.<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    * @param consumes The list of media types that this parser consumes (e.g. &lt;js&gt;"application/json"&lt;/js&gt;).<a name="line.147"></a>
+<span class="sourceLineNo">148</span>    */<a name="line.148"></a>
+<span class="sourceLineNo">149</span>   public JsonParser(PropertyStore propertyStore, String...consumes) {<a name="line.149"></a>
+<span class="sourceLineNo">150</span>      super(propertyStore, consumes);<a name="line.150"></a>
+<span class="sourceLineNo">151</span>      this.ctx = createContext(JsonParserContext.class);<a name="line.151"></a>
+<span class="sourceLineNo">152</span>   }<a name="line.152"></a>
+<span class="sourceLineNo">153</span><a name="line.153"></a>
+<span class="sourceLineNo">154</span>   @Override /* CoreObject */<a name="line.154"></a>
+<span class="sourceLineNo">155</span>   public JsonParserBuilder builder() {<a name="line.155"></a>
+<span class="sourceLineNo">156</span>      return new JsonParserBuilder(propertyStore);<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 /* Parser */<a name="line.159"></a>
+<span class="sourceLineNo">160</span>   public ReaderParserSession createSession(ParserSessionArgs args) {<a name="line.160"></a>
+<span class="sourceLineNo">161</span>      return new JsonParserSession(ctx, args);<a name="line.161"></a>
+<span class="sourceLineNo">162</span>   }<a name="line.162"></a>
+<span class="sourceLineNo">163</span>}<a name="line.163"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/2ead32d5/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.html b/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.html
index 6c50a51..0308ccd 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.html
@@ -23,144 +23,152 @@
 <span class="sourceLineNo">015</span>import static org.apache.juneau.parser.ParserContext.*;<a name="line.15"></a>
 <span class="sourceLineNo">016</span><a name="line.16"></a>
 <span class="sourceLineNo">017</span>import org.apache.juneau.*;<a name="line.17"></a>
-<span class="sourceLineNo">018</span>import org.apache.juneau.annotation.*;<a name="line.18"></a>
-<span class="sourceLineNo">019</span>import org.apache.juneau.parser.*;<a name="line.19"></a>
-<span class="sourceLineNo">020</span><a name="line.20"></a>
-<span class="sourceLineNo">021</span>/**<a name="line.21"></a>
-<span class="sourceLineNo">022</span> * Parses any valid JSON text into a POJO model.<a name="line.22"></a>
-<span class="sourceLineNo">023</span> *<a name="line.23"></a>
-<span class="sourceLineNo">024</span> * &lt;h5 class='section'&gt;Media types:&lt;/h5&gt;<a name="line.24"></a>
-<span class="sourceLineNo">025</span> *<a name="line.25"></a>
-<span class="sourceLineNo">026</span> * Handles &lt;code&gt;Content-Type&lt;/code&gt; types: &lt;code&gt;application/json, text/json&lt;/code&gt;<a name="line.26"></a>
-<span class="sourceLineNo">027</span> *<a name="line.27"></a>
-<span class="sourceLineNo">028</span> * &lt;h5 class='section'&gt;Description:&lt;/h5&gt;<a name="line.28"></a>
-<span class="sourceLineNo">029</span> *<a name="line.29"></a>
-<span class="sourceLineNo">030</span> * This parser uses a state machine, which makes it very fast and efficient.  It parses JSON in about 70% of the<a name="line.30"></a>
-<span class="sourceLineNo">031</span> * time that it takes the built-in Java DOM parsers to parse equivalent XML.<a name="line.31"></a>
-<span class="sourceLineNo">032</span> *<a name="line.32"></a>
-<span class="sourceLineNo">033</span> * &lt;p&gt;<a name="line.33"></a>
-<span class="sourceLineNo">034</span> * This parser handles all valid JSON syntax.<a name="line.34"></a>
-<span class="sourceLineNo">035</span> * In addition, when strict mode is disable, the parser also handles the following:<a name="line.35"></a>
-<span class="sourceLineNo">036</span> * &lt;ul class='spaced-list'&gt;<a name="line.36"></a>
-<span class="sourceLineNo">037</span> *    &lt;li&gt;<a name="line.37"></a>
-<span class="sourceLineNo">038</span> *       Javascript comments (both {@code /*} and {@code //}) are ignored.<a name="line.38"></a>
-<span class="sourceLineNo">039</span> *    &lt;li&gt;<a name="line.39"></a>
-<span class="sourceLineNo">040</span> *       Both single and double quoted strings.<a name="line.40"></a>
-<span class="sourceLineNo">041</span> *    &lt;li&gt;<a name="line.41"></a>
-<span class="sourceLineNo">042</span> *       Automatically joins concatenated strings (e.g. &lt;code&gt;&lt;js&gt;"aaa"&lt;/js&gt; + &lt;js&gt;'bbb'&lt;/js&gt;&lt;/code&gt;).<a name="line.42"></a>
-<span class="sourceLineNo">043</span> *    &lt;li&gt;<a name="line.43"></a>
-<span class="sourceLineNo">044</span> *       Unquoted attributes.<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * &lt;/ul&gt;<a name="line.45"></a>
-<span class="sourceLineNo">046</span> *<a name="line.46"></a>
-<span class="sourceLineNo">047</span> * &lt;p&gt;<a name="line.47"></a>
-<span class="sourceLineNo">048</span> * Also handles negative, decimal, hexadecimal, octal, and double numbers, including exponential notation.<a name="line.48"></a>
-<span class="sourceLineNo">049</span> *<a name="line.49"></a>
-<span class="sourceLineNo">050</span> * &lt;p&gt;<a name="line.50"></a>
-<span class="sourceLineNo">051</span> * This parser handles the following input, and automatically returns the corresponding Java class.<a name="line.51"></a>
-<span class="sourceLineNo">052</span> * &lt;ul class='spaced-list'&gt;<a name="line.52"></a>
-<span class="sourceLineNo">053</span> *    &lt;li&gt;<a name="line.53"></a>
-<span class="sourceLineNo">054</span> *       JSON objects (&lt;js&gt;"{...}"&lt;/js&gt;) are converted to {@link ObjectMap ObjectMaps}.<a name="line.54"></a>
-<span class="sourceLineNo">055</span> *       &lt;b&gt;Note:&lt;/b&gt;  If a &lt;code&gt;&lt;xa&gt;_type&lt;/xa&gt;=&lt;xs&gt;'xxx'&lt;/xs&gt;&lt;/code&gt; attribute is specified on the object, then an<a name="line.55"></a>
-<span class="sourceLineNo">056</span> *       attempt is made to convert the object to an instance of the specified Java bean class.<a name="line.56"></a>
-<span class="sourceLineNo">057</span> *       See the &lt;code&gt;beanTypeName&lt;/code&gt; setting on the {@link PropertyStore} for more information about parsing<a name="line.57"></a>
-<span class="sourceLineNo">058</span> *       beans from JSON.<a name="line.58"></a>
-<span class="sourceLineNo">059</span> *    &lt;li&gt;<a name="line.59"></a>
-<span class="sourceLineNo">060</span> *       JSON arrays (&lt;js&gt;"[...]"&lt;/js&gt;) are converted to {@link ObjectList ObjectLists}.<a name="line.60"></a>
-<span class="sourceLineNo">061</span> *    &lt;li&gt;<a name="line.61"></a>
-<span class="sourceLineNo">062</span> *       JSON string literals (&lt;js&gt;"'xyz'"&lt;/js&gt;) are converted to {@link String Strings}.<a name="line.62"></a>
-<span class="sourceLineNo">063</span> *    &lt;li&gt;<a name="line.63"></a>
-<span class="sourceLineNo">064</span> *       JSON numbers (&lt;js&gt;"123"&lt;/js&gt;, including octal/hexadecimal/exponential notation) are converted to<a name="line.64"></a>
-<span class="sourceLineNo">065</span> *       {@link Integer Integers}, {@link Long Longs}, {@link Float Floats}, or {@link Double Doubles} depending on<a name="line.65"></a>
-<span class="sourceLineNo">066</span> *       whether the number is decimal, and the size of the number.<a name="line.66"></a>
-<span class="sourceLineNo">067</span> *    &lt;li&gt;<a name="line.67"></a>
-<span class="sourceLineNo">068</span> *       JSON booleans (&lt;js&gt;"false"&lt;/js&gt;) are converted to {@link Boolean Booleans}.<a name="line.68"></a>
-<span class="sourceLineNo">069</span> *    &lt;li&gt;<a name="line.69"></a>
-<span class="sourceLineNo">070</span> *       JSON nulls (&lt;js&gt;"null"&lt;/js&gt;) are converted to &lt;jk&gt;null&lt;/jk&gt;.<a name="line.70"></a>
-<span class="sourceLineNo">071</span> *    &lt;li&gt;<a name="line.71"></a>
-<span class="sourceLineNo">072</span> *       Input consisting of only whitespace or JSON comments are converted to &lt;jk&gt;null&lt;/jk&gt;.<a name="line.72"></a>
-<span class="sourceLineNo">073</span> * &lt;/ul&gt;<a name="line.73"></a>
-<span class="sourceLineNo">074</span> *<a name="line.74"></a>
-<span class="sourceLineNo">075</span> * &lt;p&gt;<a name="line.75"></a>
-<span class="sourceLineNo">076</span> * Input can be any of the following:<a name="line.76"></a>
-<span class="sourceLineNo">077</span> * &lt;ul class='spaced-list'&gt;<a name="line.77"></a>
-<span class="sourceLineNo">078</span> *    &lt;li&gt;<a name="line.78"></a>
-<span class="sourceLineNo">079</span> *       &lt;js&gt;"{...}"&lt;/js&gt; - Converted to a {@link ObjectMap} or an instance of a Java bean if a &lt;xa&gt;_type&lt;/xa&gt;<a name="line.79"></a>
-<span class="sourceLineNo">080</span> *       attribute is present.<a name="line.80"></a>
-<span class="sourceLineNo">081</span> *    &lt;li&gt;<a name="line.81"></a>
-<span class="sourceLineNo">082</span> *       &lt;js&gt;"[...]"&lt;/js&gt; - Converted to a {@link ObjectList}.<a name="line.82"></a>
-<span class="sourceLineNo">083</span> *    &lt;li&gt;<a name="line.83"></a>
-<span class="sourceLineNo">084</span> *       &lt;js&gt;"123..."&lt;/js&gt; - Converted to a {@link Number} (either {@link Integer}, {@link Long}, {@link Float},<a name="line.84"></a>
-<span class="sourceLineNo">085</span> *       or {@link Double}).<a name="line.85"></a>
-<span class="sourceLineNo">086</span> *    &lt;li&gt;<a name="line.86"></a>
-<span class="sourceLineNo">087</span> *       &lt;js&gt;"true"&lt;/js&gt;/&lt;js&gt;"false"&lt;/js&gt; - Converted to a {@link Boolean}.<a name="line.87"></a>
-<span class="sourceLineNo">088</span> *    &lt;li&gt;<a name="line.88"></a>
-<span class="sourceLineNo">089</span> *       &lt;js&gt;"null"&lt;/js&gt; - Returns &lt;jk&gt;null&lt;/jk&gt;.<a name="line.89"></a>
-<span class="sourceLineNo">090</span> *    &lt;li&gt;<a name="line.90"></a>
-<span class="sourceLineNo">091</span> *       &lt;js&gt;"'xxx'"&lt;/js&gt; - Converted to a {@link String}.<a name="line.91"></a>
-<span class="sourceLineNo">092</span> *    &lt;li&gt;<a name="line.92"></a>
-<span class="sourceLineNo">093</span> *       &lt;js&gt;"\"xxx\""&lt;/js&gt; - Converted to a {@link String}.<a name="line.93"></a>
-<span class="sourceLineNo">094</span> *    &lt;li&gt;<a name="line.94"></a>
-<span class="sourceLineNo">095</span> *       &lt;js&gt;"'xxx' + \"yyy\""&lt;/js&gt; - Converted to a concatenated {@link String}.<a name="line.95"></a>
-<span class="sourceLineNo">096</span> * &lt;/ul&gt;<a name="line.96"></a>
-<span class="sourceLineNo">097</span> *<a name="line.97"></a>
-<span class="sourceLineNo">098</span> * &lt;p&gt;<a name="line.98"></a>
-<span class="sourceLineNo">099</span> * TIP:  If you know you're parsing a JSON object or array, it can be easier to parse it using the<a name="line.99"></a>
-<span class="sourceLineNo">100</span> * {@link ObjectMap#ObjectMap(CharSequence) ObjectMap(CharSequence)} or {@link ObjectList#ObjectList(CharSequence)<a name="line.100"></a>
-<span class="sourceLineNo">101</span> * ObjectList(CharSequence)} constructors instead of using this class.<a name="line.101"></a>
-<span class="sourceLineNo">102</span> * The end result should be the same.<a name="line.102"></a>
-<span class="sourceLineNo">103</span> *<a name="line.103"></a>
-<span class="sourceLineNo">104</span> * &lt;h5 class='section'&gt;Configurable properties:&lt;/h5&gt;<a name="line.104"></a>
-<span class="sourceLineNo">105</span> *<a name="line.105"></a>
-<span class="sourceLineNo">106</span> * This class has the following properties associated with it:<a name="line.106"></a>
-<span class="sourceLineNo">107</span> * &lt;ul&gt;<a name="line.107"></a>
-<span class="sourceLineNo">108</span> *    &lt;li&gt;{@link JsonParserContext}<a name="line.108"></a>
-<span class="sourceLineNo">109</span> * &lt;/ul&gt;<a name="line.109"></a>
-<span class="sourceLineNo">110</span> */<a name="line.110"></a>
-<span class="sourceLineNo">111</span>@Consumes("application/json,text/json")<a name="line.111"></a>
-<span class="sourceLineNo">112</span>public class JsonParser extends ReaderParser {<a name="line.112"></a>
-<span class="sourceLineNo">113</span><a name="line.113"></a>
-<span class="sourceLineNo">114</span>   /** Default parser, all default settings.*/<a name="line.114"></a>
-<span class="sourceLineNo">115</span>   public static final JsonParser DEFAULT = new JsonParser(PropertyStore.create());<a name="line.115"></a>
-<span class="sourceLineNo">116</span><a name="line.116"></a>
-<span class="sourceLineNo">117</span>   /** Default parser, all default settings.*/<a name="line.117"></a>
-<span class="sourceLineNo">118</span>   public static final JsonParser DEFAULT_STRICT = new JsonParser.Strict(PropertyStore.create());<a name="line.118"></a>
-<span class="sourceLineNo">119</span><a name="line.119"></a>
-<span class="sourceLineNo">120</span>   /** Default parser, strict mode. */<a name="line.120"></a>
-<span class="sourceLineNo">121</span>   public static class Strict extends JsonParser {<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>       * Constructor.<a name="line.124"></a>
-<span class="sourceLineNo">125</span>       *<a name="line.125"></a>
-<span class="sourceLineNo">126</span>       * @param propertyStore The property store containing all the settings for this object.<a name="line.126"></a>
-<span class="sourceLineNo">127</span>       */<a name="line.127"></a>
-<span class="sourceLineNo">128</span>      public Strict(PropertyStore propertyStore) {<a name="line.128"></a>
-<span class="sourceLineNo">129</span>         super(propertyStore.copy().append(PARSER_strict, true));<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><a name="line.132"></a>
+<span class="sourceLineNo">018</span>import org.apache.juneau.parser.*;<a name="line.18"></a>
+<span class="sourceLineNo">019</span><a name="line.19"></a>
+<span class="sourceLineNo">020</span>/**<a name="line.20"></a>
+<span class="sourceLineNo">021</span> * Parses any valid JSON text into a POJO model.<a name="line.21"></a>
+<span class="sourceLineNo">022</span> *<a name="line.22"></a>
+<span class="sourceLineNo">023</span> * &lt;h5 class='section'&gt;Media types:&lt;/h5&gt;<a name="line.23"></a>
+<span class="sourceLineNo">024</span> *<a name="line.24"></a>
+<span class="sourceLineNo">025</span> * Handles &lt;code&gt;Content-Type&lt;/code&gt; types: &lt;code&gt;application/json, text/json&lt;/code&gt;<a name="line.25"></a>
+<span class="sourceLineNo">026</span> *<a name="line.26"></a>
+<span class="sourceLineNo">027</span> * &lt;h5 class='section'&gt;Description:&lt;/h5&gt;<a name="line.27"></a>
+<span class="sourceLineNo">028</span> *<a name="line.28"></a>
+<span class="sourceLineNo">029</span> * This parser uses a state machine, which makes it very fast and efficient.  It parses JSON in about 70% of the<a name="line.29"></a>
+<span class="sourceLineNo">030</span> * time that it takes the built-in Java DOM parsers to parse equivalent XML.<a name="line.30"></a>
+<span class="sourceLineNo">031</span> *<a name="line.31"></a>
+<span class="sourceLineNo">032</span> * &lt;p&gt;<a name="line.32"></a>
+<span class="sourceLineNo">033</span> * This parser handles all valid JSON syntax.<a name="line.33"></a>
+<span class="sourceLineNo">034</span> * In addition, when strict mode is disable, the parser also handles the following:<a name="line.34"></a>
+<span class="sourceLineNo">035</span> * &lt;ul class='spaced-list'&gt;<a name="line.35"></a>
+<span class="sourceLineNo">036</span> *    &lt;li&gt;<a name="line.36"></a>
+<span class="sourceLineNo">037</span> *       Javascript comments (both {@code /*} and {@code //}) are ignored.<a name="line.37"></a>
+<span class="sourceLineNo">038</span> *    &lt;li&gt;<a name="line.38"></a>
+<span class="sourceLineNo">039</span> *       Both single and double quoted strings.<a name="line.39"></a>
+<span class="sourceLineNo">040</span> *    &lt;li&gt;<a name="line.40"></a>
+<span class="sourceLineNo">041</span> *       Automatically joins concatenated strings (e.g. &lt;code&gt;&lt;js&gt;"aaa"&lt;/js&gt; + &lt;js&gt;'bbb'&lt;/js&gt;&lt;/code&gt;).<a name="line.41"></a>
+<span class="sourceLineNo">042</span> *    &lt;li&gt;<a name="line.42"></a>
+<span class="sourceLineNo">043</span> *       Unquoted attributes.<a name="line.43"></a>
+<span class="sourceLineNo">044</span> * &lt;/ul&gt;<a name="line.44"></a>
+<span class="sourceLineNo">045</span> *<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * &lt;p&gt;<a name="line.46"></a>
+<span class="sourceLineNo">047</span> * Also handles negative, decimal, hexadecimal, octal, and double numbers, including exponential notation.<a name="line.47"></a>
+<span class="sourceLineNo">048</span> *<a name="line.48"></a>
+<span class="sourceLineNo">049</span> * &lt;p&gt;<a name="line.49"></a>
+<span class="sourceLineNo">050</span> * This parser handles the following input, and automatically returns the corresponding Java class.<a name="line.50"></a>
+<span class="sourceLineNo">051</span> * &lt;ul class='spaced-list'&gt;<a name="line.51"></a>
+<span class="sourceLineNo">052</span> *    &lt;li&gt;<a name="line.52"></a>
+<span class="sourceLineNo">053</span> *       JSON objects (&lt;js&gt;"{...}"&lt;/js&gt;) are converted to {@link ObjectMap ObjectMaps}.<a name="line.53"></a>
+<span class="sourceLineNo">054</span> *       &lt;b&gt;Note:&lt;/b&gt;  If a &lt;code&gt;&lt;xa&gt;_type&lt;/xa&gt;=&lt;xs&gt;'xxx'&lt;/xs&gt;&lt;/code&gt; attribute is specified on the object, then an<a name="line.54"></a>
+<span class="sourceLineNo">055</span> *       attempt is made to convert the object to an instance of the specified Java bean class.<a name="line.55"></a>
+<span class="sourceLineNo">056</span> *       See the &lt;code&gt;beanTypeName&lt;/code&gt; setting on the {@link PropertyStore} for more information about parsing<a name="line.56"></a>
+<span class="sourceLineNo">057</span> *       beans from JSON.<a name="line.57"></a>
+<span class="sourceLineNo">058</span> *    &lt;li&gt;<a name="line.58"></a>
+<span class="sourceLineNo">059</span> *       JSON arrays (&lt;js&gt;"[...]"&lt;/js&gt;) are converted to {@link ObjectList ObjectLists}.<a name="line.59"></a>
+<span class="sourceLineNo">060</span> *    &lt;li&gt;<a name="line.60"></a>
+<span class="sourceLineNo">061</span> *       JSON string literals (&lt;js&gt;"'xyz'"&lt;/js&gt;) are converted to {@link String Strings}.<a name="line.61"></a>
+<span class="sourceLineNo">062</span> *    &lt;li&gt;<a name="line.62"></a>
+<span class="sourceLineNo">063</span> *       JSON numbers (&lt;js&gt;"123"&lt;/js&gt;, including octal/hexadecimal/exponential notation) are converted to<a name="line.63"></a>
+<span class="sourceLineNo">064</span> *       {@link Integer Integers}, {@link Long Longs}, {@link Float Floats}, or {@link Double Doubles} depending on<a name="line.64"></a>
+<span class="sourceLineNo">065</span> *       whether the number is decimal, and the size of the number.<a name="line.65"></a>
+<span class="sourceLineNo">066</span> *    &lt;li&gt;<a name="line.66"></a>
+<span class="sourceLineNo">067</span> *       JSON booleans (&lt;js&gt;"false"&lt;/js&gt;) are converted to {@link Boolean Booleans}.<a name="line.67"></a>
+<span class="sourceLineNo">068</span> *    &lt;li&gt;<a name="line.68"></a>
+<span class="sourceLineNo">069</span> *       JSON nulls (&lt;js&gt;"null"&lt;/js&gt;) are converted to &lt;jk&gt;null&lt;/jk&gt;.<a name="line.69"></a>
+<span class="sourceLineNo">070</span> *    &lt;li&gt;<a name="line.70"></a>
+<span class="sourceLineNo">071</span> *       Input consisting of only whitespace or JSON comments are converted to &lt;jk&gt;null&lt;/jk&gt;.<a name="line.71"></a>
+<span class="sourceLineNo">072</span> * &lt;/ul&gt;<a name="line.72"></a>
+<span class="sourceLineNo">073</span> *<a name="line.73"></a>
+<span class="sourceLineNo">074</span> * &lt;p&gt;<a name="line.74"></a>
+<span class="sourceLineNo">075</span> * Input can be any of the following:<a name="line.75"></a>
+<span class="sourceLineNo">076</span> * &lt;ul class='spaced-list'&gt;<a name="line.76"></a>
+<span class="sourceLineNo">077</span> *    &lt;li&gt;<a name="line.77"></a>
+<span class="sourceLineNo">078</span> *       &lt;js&gt;"{...}"&lt;/js&gt; - Converted to a {@link ObjectMap} or an instance of a Java bean if a &lt;xa&gt;_type&lt;/xa&gt;<a name="line.78"></a>
+<span class="sourceLineNo">079</span> *       attribute is present.<a name="line.79"></a>
+<span class="sourceLineNo">080</span> *    &lt;li&gt;<a name="line.80"></a>
+<span class="sourceLineNo">081</span> *       &lt;js&gt;"[...]"&lt;/js&gt; - Converted to a {@link ObjectList}.<a name="line.81"></a>
+<span class="sourceLineNo">082</span> *    &lt;li&gt;<a name="line.82"></a>
+<span class="sourceLineNo">083</span> *       &lt;js&gt;"123..."&lt;/js&gt; - Converted to a {@link Number} (either {@link Integer}, {@link Long}, {@link Float},<a name="line.83"></a>
+<span class="sourceLineNo">084</span> *       or {@link Double}).<a name="line.84"></a>
+<span class="sourceLineNo">085</span> *    &lt;li&gt;<a name="line.85"></a>
+<span class="sourceLineNo">086</span> *       &lt;js&gt;"true"&lt;/js&gt;/&lt;js&gt;"false"&lt;/js&gt; - Converted to a {@link Boolean}.<a name="line.86"></a>
+<span class="sourceLineNo">087</span> *    &lt;li&gt;<a name="line.87"></a>
+<span class="sourceLineNo">088</span> *       &lt;js&gt;"null"&lt;/js&gt; - Returns &lt;jk&gt;null&lt;/jk&gt;.<a name="line.88"></a>
+<span class="sourceLineNo">089</span> *    &lt;li&gt;<a name="line.89"></a>
+<span class="sourceLineNo">090</span> *       &lt;js&gt;"'xxx'"&lt;/js&gt; - Converted to a {@link String}.<a name="line.90"></a>
+<span class="sourceLineNo">091</span> *    &lt;li&gt;<a name="line.91"></a>
+<span class="sourceLineNo">092</span> *       &lt;js&gt;"\"xxx\""&lt;/js&gt; - Converted to a {@link String}.<a name="line.92"></a>
+<span class="sourceLineNo">093</span> *    &lt;li&gt;<a name="line.93"></a>
+<span class="sourceLineNo">094</span> *       &lt;js&gt;"'xxx' + \"yyy\""&lt;/js&gt; - Converted to a concatenated {@link String}.<a name="line.94"></a>
+<span class="sourceLineNo">095</span> * &lt;/ul&gt;<a name="line.95"></a>
+<span class="sourceLineNo">096</span> *<a name="line.96"></a>
+<span class="sourceLineNo">097</span> * &lt;p&gt;<a name="line.97"></a>
+<span class="sourceLineNo">098</span> * TIP:  If you know you're parsing a JSON object or array, it can be easier to parse it using the<a name="line.98"></a>
+<span class="sourceLineNo">099</span> * {@link ObjectMap#ObjectMap(CharSequence) ObjectMap(CharSequence)} or {@link ObjectList#ObjectList(CharSequence)<a name="line.99"></a>
+<span class="sourceLineNo">100</span> * ObjectList(CharSequence)} constructors instead of using this class.<a name="line.100"></a>
+<span class="sourceLineNo">101</span> * The end result should be the same.<a name="line.101"></a>
+<span class="sourceLineNo">102</span> *<a name="line.102"></a>
+<span class="sourceLineNo">103</span> * &lt;h5 class='section'&gt;Configurable properties:&lt;/h5&gt;<a name="line.103"></a>
+<span class="sourceLineNo">104</span> *<a name="line.104"></a>
+<span class="sourceLineNo">105</span> * This class has the following properties associated with it:<a name="line.105"></a>
+<span class="sourceLineNo">106</span> * &lt;ul&gt;<a name="line.106"></a>
+<span class="sourceLineNo">107</span> *    &lt;li&gt;{@link JsonParserContext}<a name="line.107"></a>
+<span class="sourceLineNo">108</span> * &lt;/ul&gt;<a name="line.108"></a>
+<span class="sourceLineNo">109</span> */<a name="line.109"></a>
+<span class="sourceLineNo">110</span>public class JsonParser extends ReaderParser {<a name="line.110"></a>
+<span class="sourceLineNo">111</span><a name="line.111"></a>
+<span class="sourceLineNo">112</span>   /** Default parser, all default settings.*/<a name="line.112"></a>
+<span class="sourceLineNo">113</span>   public static final JsonParser DEFAULT = new JsonParser(PropertyStore.create());<a name="line.113"></a>
+<span class="sourceLineNo">114</span><a name="line.114"></a>
+<span class="sourceLineNo">115</span>   /** Default parser, all default settings.*/<a name="line.115"></a>
+<span class="sourceLineNo">116</span>   public static final JsonParser DEFAULT_STRICT = new JsonParser.Strict(PropertyStore.create());<a name="line.116"></a>
+<span class="sourceLineNo">117</span><a name="line.117"></a>
+<span class="sourceLineNo">118</span>   /** Default parser, strict mode. */<a name="line.118"></a>
+<span class="sourceLineNo">119</span>   public static class Strict extends JsonParser {<a name="line.119"></a>
+<span class="sourceLineNo">120</span><a name="line.120"></a>
+<span class="sourceLineNo">121</span>      /**<a name="line.121"></a>
+<span class="sourceLineNo">122</span>       * Constructor.<a name="line.122"></a>
+<span class="sourceLineNo">123</span>       *<a name="line.123"></a>
+<span class="sourceLineNo">124</span>       * @param propertyStore The property store containing all the settings for this object.<a name="line.124"></a>
+<span class="sourceLineNo">125</span>       */<a name="line.125"></a>
+<span class="sourceLineNo">126</span>      public Strict(PropertyStore propertyStore) {<a name="line.126"></a>
+<span class="sourceLineNo">127</span>         super(propertyStore.copy().append(PARSER_strict, true));<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><a name="line.130"></a>
+<span class="sourceLineNo">131</span><a name="line.131"></a>
+<span class="sourceLineNo">132</span>   private final JsonParserContext ctx;<a name="line.132"></a>
 <span class="sourceLineNo">133</span><a name="line.133"></a>
-<span class="sourceLineNo">134</span>   private final JsonParserContext ctx;<a name="line.134"></a>
-<span class="sourceLineNo">135</span><a name="line.135"></a>
-<span class="sourceLineNo">136</span>   /**<a name="line.136"></a>
-<span class="sourceLineNo">137</span>    * Constructor.<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    *<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    * @param propertyStore The property store containing all the settings for this object.<a name="line.139"></a>
-<span class="sourceLineNo">140</span>    */<a name="line.140"></a>
-<span class="sourceLineNo">141</span>   public JsonParser(PropertyStore propertyStore) {<a name="line.141"></a>
-<span class="sourceLineNo">142</span>      super(propertyStore);<a name="line.142"></a>
-<span class="sourceLineNo">143</span>      this.ctx = createContext(JsonParserContext.class);<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>   @Override /* CoreObject */<a name="line.146"></a>
-<span class="sourceLineNo">147</span>   public JsonParserBuilder builder() {<a name="line.147"></a>
-<span class="sourceLineNo">148</span>      return new JsonParserBuilder(propertyStore);<a name="line.148"></a>
-<span class="sourceLineNo">149</span>   }<a name="line.149"></a>
-<span class="sourceLineNo">150</span><a name="line.150"></a>
-<span class="sourceLineNo">151</span>   @Override /* Parser */<a name="line.151"></a>
-<span class="sourceLineNo">152</span>   public ReaderParserSession createSession(ParserSessionArgs args) {<a name="line.152"></a>
-<span class="sourceLineNo">153</span>      return new JsonParserSession(ctx, args);<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">134</span>   /**<a name="line.134"></a>
+<span class="sourceLineNo">135</span>    * Constructor.<a name="line.135"></a>
+<span class="sourceLineNo">136</span>    *<a name="line.136"></a>
+<span class="sourceLineNo">137</span>    * @param propertyStore The property store containing all the settings for this object.<a name="line.137"></a>
+<span class="sourceLineNo">138</span>    */<a name="line.138"></a>
+<span class="sourceLineNo">139</span>   public JsonParser(PropertyStore propertyStore) {<a name="line.139"></a>
+<span class="sourceLineNo">140</span>      this(propertyStore, "application/json", "text/json");<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>
+<span class="sourceLineNo">144</span>    * Constructor.<a name="line.144"></a>
+<span class="sourceLineNo">145</span>    *<a name="line.145"></a>
+<span class="sourceLineNo">146</span>    * @param propertyStore The property store containing all the settings for this object.<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    * @param consumes The list of media types that this parser consumes (e.g. &lt;js&gt;"application/json"&lt;/js&gt;).<a name="line.147"></a>
+<span class="sourceLineNo">148</span>    */<a name="line.148"></a>
+<span class="sourceLineNo">149</span>   public JsonParser(PropertyStore propertyStore, String...consumes) {<a name="line.149"></a>
+<span class="sourceLineNo">150</span>      super(propertyStore, consumes);<a name="line.150"></a>
+<span class="sourceLineNo">151</span>      this.ctx = createContext(JsonParserContext.class);<a name="line.151"></a>
+<span class="sourceLineNo">152</span>   }<a name="line.152"></a>
+<span class="sourceLineNo">153</span><a name="line.153"></a>
+<span class="sourceLineNo">154</span>   @Override /* CoreObject */<a name="line.154"></a>
+<span class="sourceLineNo">155</span>   public JsonParserBuilder builder() {<a name="line.155"></a>
+<span class="sourceLineNo">156</span>      return new JsonParserBuilder(propertyStore);<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 /* Parser */<a name="line.159"></a>
+<span class="sourceLineNo">160</span>   public ReaderParserSession createSession(ParserSessionArgs args) {<a name="line.160"></a>
+<span class="sourceLineNo">161</span>      return new JsonParserSession(ctx, args);<a name="line.161"></a>
+<span class="sourceLineNo">162</span>   }<a name="line.162"></a>
+<span class="sourceLineNo">163</span>}<a name="line.163"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/2ead32d5/content/site/apidocs/src-html/org/apache/juneau/json/JsonSchemaSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/json/JsonSchemaSerializer.html b/content/site/apidocs/src-html/org/apache/juneau/json/JsonSchemaSerializer.html
index 28c9634..beb8d62 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/json/JsonSchemaSerializer.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/json/JsonSchemaSerializer.html
@@ -23,35 +23,35 @@
 <span class="sourceLineNo">015</span>import static org.apache.juneau.serializer.SerializerContext.*;<a name="line.15"></a>
 <span class="sourceLineNo">016</span><a name="line.16"></a>
 <span class="sourceLineNo">017</span>import org.apache.juneau.*;<a name="line.17"></a>
-<span class="sourceLineNo">018</span>import org.apache.juneau.annotation.*;<a name="line.18"></a>
-<span class="sourceLineNo">019</span>import org.apache.juneau.serializer.*;<a name="line.19"></a>
-<span class="sourceLineNo">020</span><a name="line.20"></a>
-<span class="sourceLineNo">021</span>/**<a name="line.21"></a>
-<span class="sourceLineNo">022</span> * Serializes POJO metadata to HTTP responses as JSON.<a name="line.22"></a>
-<span class="sourceLineNo">023</span> *<a name="line.23"></a>
-<span class="sourceLineNo">024</span> * &lt;h5 class='section'&gt;Media types:&lt;/h5&gt;<a name="line.24"></a>
-<span class="sourceLineNo">025</span> *<a name="line.25"></a>
-<span class="sourceLineNo">026</span> * Handles &lt;code&gt;Accept&lt;/code&gt; types: &lt;code&gt;application/json+schema, text/json+schema&lt;/code&gt;<a name="line.26"></a>
-<span class="sourceLineNo">027</span> * &lt;p&gt;<a name="line.27"></a>
-<span class="sourceLineNo">028</span> * Produces &lt;code&gt;Content-Type&lt;/code&gt; types: &lt;code&gt;application/json&lt;/code&gt;<a name="line.28"></a>
-<span class="sourceLineNo">029</span> *<a name="line.29"></a>
-<span class="sourceLineNo">030</span> * &lt;h5 class='section'&gt;Description:&lt;/h5&gt;<a name="line.30"></a>
-<span class="sourceLineNo">031</span> *<a name="line.31"></a>
-<span class="sourceLineNo">032</span> * Produces the JSON-schema for the JSON produced by the {@link JsonSerializer} class with the same properties.<a name="line.32"></a>
-<span class="sourceLineNo">033</span> */<a name="line.33"></a>
-<span class="sourceLineNo">034</span>@Produces(value="application/json+schema,text/json+schema",contentType="application/json")<a name="line.34"></a>
-<span class="sourceLineNo">035</span>public final class JsonSchemaSerializer extends JsonSerializer {<a name="line.35"></a>
-<span class="sourceLineNo">036</span><a name="line.36"></a>
-<span class="sourceLineNo">037</span>   /**<a name="line.37"></a>
-<span class="sourceLineNo">038</span>    * Constructor.<a name="line.38"></a>
-<span class="sourceLineNo">039</span>    *<a name="line.39"></a>
-<span class="sourceLineNo">040</span>    * @param propertyStore Initialize with the specified config property store.<a name="line.40"></a>
-<span class="sourceLineNo">041</span>    */<a name="line.41"></a>
-<span class="sourceLineNo">042</span>   public JsonSchemaSerializer(PropertyStore propertyStore) {<a name="line.42"></a>
-<span class="sourceLineNo">043</span>      super(<a name="line.43"></a>
-<span class="sourceLineNo">044</span>         propertyStore.copy()<a name="line.44"></a>
-<span class="sourceLineNo">045</span>         .append(SERIALIZER_detectRecursions, true)<a name="line.45"></a>
-<span class="sourceLineNo">046</span>         .append(SERIALIZER_ignoreRecursions, true)<a name="line.46"></a>
+<span class="sourceLineNo">018</span>import org.apache.juneau.serializer.*;<a name="line.18"></a>
+<span class="sourceLineNo">019</span><a name="line.19"></a>
+<span class="sourceLineNo">020</span>/**<a name="line.20"></a>
+<span class="sourceLineNo">021</span> * Serializes POJO metadata to HTTP responses as JSON.<a name="line.21"></a>
+<span class="sourceLineNo">022</span> *<a name="line.22"></a>
+<span class="sourceLineNo">023</span> * &lt;h5 class='section'&gt;Media types:&lt;/h5&gt;<a name="line.23"></a>
+<span class="sourceLineNo">024</span> *<a name="line.24"></a>
+<span class="sourceLineNo">025</span> * Handles &lt;code&gt;Accept&lt;/code&gt; types: &lt;code&gt;application/json+schema, text/json+schema&lt;/code&gt;<a name="line.25"></a>
+<span class="sourceLineNo">026</span> * &lt;p&gt;<a name="line.26"></a>
+<span class="sourceLineNo">027</span> * Produces &lt;code&gt;Content-Type&lt;/code&gt; types: &lt;code&gt;application/json&lt;/code&gt;<a name="line.27"></a>
+<span class="sourceLineNo">028</span> *<a name="line.28"></a>
+<span class="sourceLineNo">029</span> * &lt;h5 class='section'&gt;Description:&lt;/h5&gt;<a name="line.29"></a>
+<span class="sourceLineNo">030</span> *<a name="line.30"></a>
+<span class="sourceLineNo">031</span> * Produces the JSON-schema for the JSON produced by the {@link JsonSerializer} class with the same properties.<a name="line.31"></a>
+<span class="sourceLineNo">032</span> */<a name="line.32"></a>
+<span class="sourceLineNo">033</span>public final class JsonSchemaSerializer extends JsonSerializer {<a name="line.33"></a>
+<span class="sourceLineNo">034</span><a name="line.34"></a>
+<span class="sourceLineNo">035</span>   /**<a name="line.35"></a>
+<span class="sourceLineNo">036</span>    * Constructor.<a name="line.36"></a>
+<span class="sourceLineNo">037</span>    *<a name="line.37"></a>
+<span class="sourceLineNo">038</span>    * @param propertyStore Initialize with the specified config property store.<a name="line.38"></a>
+<span class="sourceLineNo">039</span>    */<a name="line.39"></a>
+<span class="sourceLineNo">040</span>   public JsonSchemaSerializer(PropertyStore propertyStore) {<a name="line.40"></a>
+<span class="sourceLineNo">041</span>      super(<a name="line.41"></a>
+<span class="sourceLineNo">042</span>         propertyStore.copy()<a name="line.42"></a>
+<span class="sourceLineNo">043</span>            .append(SERIALIZER_detectRecursions, true)<a name="line.43"></a>
+<span class="sourceLineNo">044</span>            .append(SERIALIZER_ignoreRecursions, true),<a name="line.44"></a>
+<span class="sourceLineNo">045</span>         "application/json",<a name="line.45"></a>
+<span class="sourceLineNo">046</span>         "application/json+schema", "text/json+schema"<a name="line.46"></a>
 <span class="sourceLineNo">047</span>      );<a name="line.47"></a>
 <span class="sourceLineNo">048</span>   }<a name="line.48"></a>
 <span class="sourceLineNo">049</span><a name="line.49"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/2ead32d5/content/site/apidocs/src-html/org/apache/juneau/json/JsonSchemaSerializerSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/json/JsonSchemaSerializerSession.html b/content/site/apidocs/src-html/org/apache/juneau/json/JsonSchemaSerializerSession.html
index 1898193..08fa670 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/json/JsonSchemaSerializerSession.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/json/JsonSchemaSerializerSession.html
@@ -48,93 +48,92 @@
 <span class="sourceLineNo">040</span>    *    These specify session-level information such as locale and URI context.<a name="line.40"></a>
 <span class="sourceLineNo">041</span>    *    It also include session-level properties that override the properties defined on the bean and<a name="line.41"></a>
 <span class="sourceLineNo">042</span>    *    serializer contexts.<a name="line.42"></a>
-<span class="sourceLineNo">043</span>    *    &lt;br&gt;If &lt;jk&gt;null&lt;/jk&gt;, defaults to {@link SerializerSessionArgs#DEFAULT}.<a name="line.43"></a>
-<span class="sourceLineNo">044</span>    */<a name="line.44"></a>
-<span class="sourceLineNo">045</span>   protected JsonSchemaSerializerSession(JsonSerializerContext ctx, SerializerSessionArgs args) {<a name="line.45"></a>
-<span class="sourceLineNo">046</span>      super(ctx, args);<a name="line.46"></a>
-<span class="sourceLineNo">047</span>   }<a name="line.47"></a>
-<span class="sourceLineNo">048</span><a name="line.48"></a>
-<span class="sourceLineNo">049</span>   @Override /* SerializerSession */<a name="line.49"></a>
-<span class="sourceLineNo">050</span>   protected void doSerialize(SerializerPipe out, Object o) throws Exception {<a name="line.50"></a>
-<span class="sourceLineNo">051</span>      ObjectMap schema = getSchema(getClassMetaForObject(o), "root", null);<a name="line.51"></a>
-<span class="sourceLineNo">052</span>      serializeAnything(getJsonWriter(out), schema, getExpectedRootType(o), "root", null);<a name="line.52"></a>
-<span class="sourceLineNo">053</span>   }<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>    * Creates a schema representation of the specified class type.<a name="line.56"></a>
-<span class="sourceLineNo">057</span>    *<a name="line.57"></a>
-<span class="sourceLineNo">058</span>    * @param eType The class type to get the schema of.<a name="line.58"></a>
-<span class="sourceLineNo">059</span>    * @param ctx Serialize context used to prevent infinite loops.<a name="line.59"></a>
-<span class="sourceLineNo">060</span>    * @param attrName The name of the current attribute.<a name="line.60"></a>
-<span class="sourceLineNo">061</span>    * @return A schema representation of the specified class.<a name="line.61"></a>
-<span class="sourceLineNo">062</span>    * @throws SerializeException If a problem occurred trying to convert the output.<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    */<a name="line.63"></a>
-<span class="sourceLineNo">064</span>   @SuppressWarnings({ "unchecked", "rawtypes" })<a name="line.64"></a>
-<span class="sourceLineNo">065</span>   private ObjectMap getSchema(ClassMeta&lt;?&gt; eType, String attrName, String[] pNames) throws Exception {<a name="line.65"></a>
-<span class="sourceLineNo">066</span>      ObjectMap out = new ObjectMap();<a name="line.66"></a>
-<span class="sourceLineNo">067</span><a name="line.67"></a>
-<span class="sourceLineNo">068</span>      if (eType == null)<a name="line.68"></a>
-<span class="sourceLineNo">069</span>         eType = object();<a name="line.69"></a>
-<span class="sourceLineNo">070</span><a name="line.70"></a>
-<span class="sourceLineNo">071</span>      ClassMeta&lt;?&gt; aType;        // The actual type (will be null if recursion occurs)<a name="line.71"></a>
-<span class="sourceLineNo">072</span>      ClassMeta&lt;?&gt; sType;        // The serialized type<a name="line.72"></a>
-<span class="sourceLineNo">073</span><a name="line.73"></a>
-<span class="sourceLineNo">074</span>      aType = push(attrName, eType, null);<a name="line.74"></a>
-<span class="sourceLineNo">075</span><a name="line.75"></a>
-<span class="sourceLineNo">076</span>      sType = eType.getSerializedClassMeta();<a name="line.76"></a>
-<span class="sourceLineNo">077</span>      String type = null;<a name="line.77"></a>
-<span class="sourceLineNo">078</span><a name="line.78"></a>
-<span class="sourceLineNo">079</span>      if (sType.isEnum() || sType.isCharSequence() || sType.isChar())<a name="line.79"></a>
-<span class="sourceLineNo">080</span>         type = "string";<a name="line.80"></a>
-<span class="sourceLineNo">081</span>      else if (sType.isNumber())<a name="line.81"></a>
-<span class="sourceLineNo">082</span>         type = "number";<a name="line.82"></a>
-<span class="sourceLineNo">083</span>      else if (sType.isBoolean())<a name="line.83"></a>
-<span class="sourceLineNo">084</span>         type = "boolean";<a name="line.84"></a>
-<span class="sourceLineNo">085</span>      else if (sType.isMapOrBean())<a name="line.85"></a>
-<span class="sourceLineNo">086</span>         type = "object";<a name="line.86"></a>
-<span class="sourceLineNo">087</span>      else if (sType.isCollectionOrArray())<a name="line.87"></a>
-<span class="sourceLineNo">088</span>         type = "array";<a name="line.88"></a>
-<span class="sourceLineNo">089</span>      else<a name="line.89"></a>
-<span class="sourceLineNo">090</span>         type = "any";<a name="line.90"></a>
-<span class="sourceLineNo">091</span><a name="line.91"></a>
-<span class="sourceLineNo">092</span>      out.put("type", type);<a name="line.92"></a>
-<span class="sourceLineNo">093</span>      out.put("description", eType.toString());<a name="line.93"></a>
-<span class="sourceLineNo">094</span>      PojoSwap f = eType.getPojoSwap();<a name="line.94"></a>
-<span class="sourceLineNo">095</span>      if (f != null)<a name="line.95"></a>
-<span class="sourceLineNo">096</span>         out.put("transform", f);<a name="line.96"></a>
-<span class="sourceLineNo">097</span><a name="line.97"></a>
-<span class="sourceLineNo">098</span>      if (aType != null) {<a name="line.98"></a>
-<span class="sourceLineNo">099</span>         if (sType.isEnum())<a name="line.99"></a>
-<span class="sourceLineNo">100</span>            out.put("enum", getEnumStrings((Class&lt;Enum&lt;?&gt;&gt;)sType.getInnerClass()));<a name="line.100"></a>
-<span class="sourceLineNo">101</span>         else if (sType.isCollectionOrArray()) {<a name="line.101"></a>
-<span class="sourceLineNo">102</span>            ClassMeta componentType = sType.getElementType();<a name="line.102"></a>
-<span class="sourceLineNo">103</span>            if (sType.isCollection() &amp;&amp; isParentClass(Set.class, sType.getInnerClass()))<a name="line.103"></a>
-<span class="sourceLineNo">104</span>               out.put("uniqueItems", true);<a name="line.104"></a>
-<span class="sourceLineNo">105</span>            out.put("items", getSchema(componentType, "items", pNames));<a name="line.105"></a>
-<span class="sourceLineNo">106</span>         } else if (sType.isBean()) {<a name="line.106"></a>
-<span class="sourceLineNo">107</span>            ObjectMap properties = new ObjectMap();<a name="line.107"></a>
-<span class="sourceLineNo">108</span>            BeanMeta bm = getBeanMeta(sType.getInnerClass());<a name="line.108"></a>
-<span class="sourceLineNo">109</span>            if (pNames != null)<a name="line.109"></a>
-<span class="sourceLineNo">110</span>               bm = new BeanMetaFiltered(bm, pNames);<a name="line.110"></a>
-<span class="sourceLineNo">111</span>            for (Iterator&lt;BeanPropertyMeta&gt; i = bm.getPropertyMetas().iterator(); i.hasNext();) {<a name="line.111"></a>
-<span class="sourceLineNo">112</span>               BeanPropertyMeta p = i.next();<a name="line.112"></a>
-<span class="sourceLineNo">113</span>               properties.put(p.getName(), getSchema(p.getClassMeta(), p.getName(), p.getProperties()));<a name="line.113"></a>
-<span class="sourceLineNo">114</span>            }<a name="line.114"></a>
-<span class="sourceLineNo">115</span>            out.put("properties", properties);<a name="line.115"></a>
-<span class="sourceLineNo">116</span>         }<a name="line.116"></a>
-<span class="sourceLineNo">117</span>      }<a name="line.117"></a>
-<span class="sourceLineNo">118</span>      pop();<a name="line.118"></a>
-<span class="sourceLineNo">119</span>      return out;<a name="line.119"></a>
-<span class="sourceLineNo">120</span>   }<a name="line.120"></a>
-<span class="sourceLineNo">121</span><a name="line.121"></a>
-<span class="sourceLineNo">122</span>   @SuppressWarnings({ "unchecked", "rawtypes" })<a name="line.122"></a>
-<span class="sourceLineNo">123</span>   private static List&lt;String&gt; getEnumStrings(Class&lt;? extends Enum&gt; c) {<a name="line.123"></a>
-<span class="sourceLineNo">124</span>      List&lt;String&gt; l = new LinkedList&lt;String&gt;();<a name="line.124"></a>
-<span class="sourceLineNo">125</span>      for (Object e : EnumSet.allOf(c))<a name="line.125"></a>
-<span class="sourceLineNo">126</span>         l.add(e.toString());<a name="line.126"></a>
-<span class="sourceLineNo">127</span>      return l;<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">043</span>    */<a name="line.43"></a>
+<span class="sourceLineNo">044</span>   protected JsonSchemaSerializerSession(JsonSerializerContext ctx, SerializerSessionArgs args) {<a name="line.44"></a>
+<span class="sourceLineNo">045</span>      super(ctx, args);<a name="line.45"></a>
+<span class="sourceLineNo">046</span>   }<a name="line.46"></a>
+<span class="sourceLineNo">047</span><a name="line.47"></a>
+<span class="sourceLineNo">048</span>   @Override /* SerializerSession */<a name="line.48"></a>
+<span class="sourceLineNo">049</span>   protected void doSerialize(SerializerPipe out, Object o) throws Exception {<a name="line.49"></a>
+<span class="sourceLineNo">050</span>      ObjectMap schema = getSchema(getClassMetaForObject(o), "root", null);<a name="line.50"></a>
+<span class="sourceLineNo">051</span>      serializeAnything(getJsonWriter(out), schema, getExpectedRootType(o), "root", null);<a name="line.51"></a>
+<span class="sourceLineNo">052</span>   }<a name="line.52"></a>
+<span class="sourceLineNo">053</span><a name="line.53"></a>
+<span class="sourceLineNo">054</span>   /*<a name="line.54"></a>
+<span class="sourceLineNo">055</span>    * Creates a schema representation of the specified class type.<a name="line.55"></a>
+<span class="sourceLineNo">056</span>    *<a name="line.56"></a>
+<span class="sourceLineNo">057</span>    * @param eType The class type to get the schema of.<a name="line.57"></a>
+<span class="sourceLineNo">058</span>    * @param ctx Serialize context used to prevent infinite loops.<a name="line.58"></a>
+<span class="sourceLineNo">059</span>    * @param attrName The name of the current attribute.<a name="line.59"></a>
+<span class="sourceLineNo">060</span>    * @return A schema representation of the specified class.<a name="line.60"></a>
+<span class="sourceLineNo">061</span>    * @throws SerializeException If a problem occurred trying to convert the output.<a name="line.61"></a>
+<span class="sourceLineNo">062</span>    */<a name="line.62"></a>
+<span class="sourceLineNo">063</span>   @SuppressWarnings({ "unchecked", "rawtypes" })<a name="line.63"></a>
+<span class="sourceLineNo">064</span>   private ObjectMap getSchema(ClassMeta&lt;?&gt; eType, String attrName, String[] pNames) throws Exception {<a name="line.64"></a>
+<span class="sourceLineNo">065</span>      ObjectMap out = new ObjectMap();<a name="line.65"></a>
+<span class="sourceLineNo">066</span><a name="line.66"></a>
+<span class="sourceLineNo">067</span>      if (eType == null)<a name="line.67"></a>
+<span class="sourceLineNo">068</span>         eType = object();<a name="line.68"></a>
+<span class="sourceLineNo">069</span><a name="line.69"></a>
+<span class="sourceLineNo">070</span>      ClassMeta&lt;?&gt; aType;        // The actual type (will be null if recursion occurs)<a name="line.70"></a>
+<span class="sourceLineNo">071</span>      ClassMeta&lt;?&gt; sType;        // The serialized type<a name="line.71"></a>
+<span class="sourceLineNo">072</span><a name="line.72"></a>
+<span class="sourceLineNo">073</span>      aType = push(attrName, eType, null);<a name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span>      sType = eType.getSerializedClassMeta();<a name="line.75"></a>
+<span class="sourceLineNo">076</span>      String type = null;<a name="line.76"></a>
+<span class="sourceLineNo">077</span><a name="line.77"></a>
+<span class="sourceLineNo">078</span>      if (sType.isEnum() || sType.isCharSequence() || sType.isChar())<a name="line.78"></a>
+<span class="sourceLineNo">079</span>         type = "string";<a name="line.79"></a>
+<span class="sourceLineNo">080</span>      else if (sType.isNumber())<a name="line.80"></a>
+<span class="sourceLineNo">081</span>         type = "number";<a name="line.81"></a>
+<span class="sourceLineNo">082</span>      else if (sType.isBoolean())<a name="line.82"></a>
+<span class="sourceLineNo">083</span>         type = "boolean";<a name="line.83"></a>
+<span class="sourceLineNo">084</span>      else if (sType.isMapOrBean())<a name="line.84"></a>
+<span class="sourceLineNo">085</span>         type = "object";<a name="line.85"></a>
+<span class="sourceLineNo">086</span>      else if (sType.isCollectionOrArray())<a name="line.86"></a>
+<span class="sourceLineNo">087</span>         type = "array";<a name="line.87"></a>
+<span class="sourceLineNo">088</span>      else<a name="line.88"></a>
+<span class="sourceLineNo">089</span>         type = "any";<a name="line.89"></a>
+<span class="sourceLineNo">090</span><a name="line.90"></a>
+<span class="sourceLineNo">091</span>      out.put("type", type);<a name="line.91"></a>
+<span class="sourceLineNo">092</span>      out.put("description", eType.toString());<a name="line.92"></a>
+<span class="sourceLineNo">093</span>      PojoSwap f = eType.getPojoSwap();<a name="line.93"></a>
+<span class="sourceLineNo">094</span>      if (f != null)<a name="line.94"></a>
+<span class="sourceLineNo">095</span>         out.put("transform", f);<a name="line.95"></a>
+<span class="sourceLineNo">096</span><a name="line.96"></a>
+<span class="sourceLineNo">097</span>      if (aType != null) {<a name="line.97"></a>
+<span class="sourceLineNo">098</span>         if (sType.isEnum())<a name="line.98"></a>
+<span class="sourceLineNo">099</span>            out.put("enum", getEnumStrings((Class&lt;Enum&lt;?&gt;&gt;)sType.getInnerClass()));<a name="line.99"></a>
+<span class="sourceLineNo">100</span>         else if (sType.isCollectionOrArray()) {<a name="line.100"></a>
+<span class="sourceLineNo">101</span>            ClassMeta componentType = sType.getElementType();<a name="line.101"></a>
+<span class="sourceLineNo">102</span>            if (sType.isCollection() &amp;&amp; isParentClass(Set.class, sType.getInnerClass()))<a name="line.102"></a>
+<span class="sourceLineNo">103</span>               out.put("uniqueItems", true);<a name="line.103"></a>
+<span class="sourceLineNo">104</span>            out.put("items", getSchema(componentType, "items", pNames));<a name="line.104"></a>
+<span class="sourceLineNo">105</span>         } else if (sType.isBean()) {<a name="line.105"></a>
+<span class="sourceLineNo">106</span>            ObjectMap properties = new ObjectMap();<a name="line.106"></a>
+<span class="sourceLineNo">107</span>            BeanMeta bm = getBeanMeta(sType.getInnerClass());<a name="line.107"></a>
+<span class="sourceLineNo">108</span>            if (pNames != null)<a name="line.108"></a>
+<span class="sourceLineNo">109</span>               bm = new BeanMetaFiltered(bm, pNames);<a name="line.109"></a>
+<span class="sourceLineNo">110</span>            for (Iterator&lt;BeanPropertyMeta&gt; i = bm.getPropertyMetas().iterator(); i.hasNext();) {<a name="line.110"></a>
+<span class="sourceLineNo">111</span>               BeanPropertyMeta p = i.next();<a name="line.111"></a>
+<span class="sourceLineNo">112</span>               properties.put(p.getName(), getSchema(p.getClassMeta(), p.getName(), p.getProperties()));<a name="line.112"></a>
+<span class="sourceLineNo">113</span>            }<a name="line.113"></a>
+<span class="sourceLineNo">114</span>            out.put("properties", properties);<a name="line.114"></a>
+<span class="sourceLineNo">115</span>         }<a name="line.115"></a>
+<span class="sourceLineNo">116</span>      }<a name="line.116"></a>
+<span class="sourceLineNo">117</span>      pop();<a name="line.117"></a>
+<span class="sourceLineNo">118</span>      return out;<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>
+<span class="sourceLineNo">121</span>   @SuppressWarnings({ "unchecked", "rawtypes" })<a name="line.121"></a>
+<span class="sourceLineNo">122</span>   private static List&lt;String&gt; getEnumStrings(Class&lt;? extends Enum&gt; c) {<a name="line.122"></a>
+<span class="sourceLineNo">123</span>      List&lt;String&gt; l = new LinkedList&lt;String&gt;();<a name="line.123"></a>
+<span class="sourceLineNo">124</span>      for (Object e : EnumSet.allOf(c))<a name="line.124"></a>
+<span class="sourceLineNo">125</span>         l.add(e.toString());<a name="line.125"></a>
+<span class="sourceLineNo">126</span>      return l;<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>