http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/02c10736/content/site/apidocs/src-html/org/apache/juneau/parser/ParserContext.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/parser/ParserContext.html 
b/content/site/apidocs/src-html/org/apache/juneau/parser/ParserContext.html
index 5c50b1c..26822ac 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/parser/ParserContext.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/parser/ParserContext.html
@@ -21,77 +21,155 @@
 <span class="sourceLineNo">013</span>package org.apache.juneau.parser;<a 
name="line.13"></a>
 <span class="sourceLineNo">014</span><a name="line.14"></a>
 <span class="sourceLineNo">015</span>import org.apache.juneau.*;<a 
name="line.15"></a>
-<span class="sourceLineNo">016</span><a name="line.16"></a>
-<span class="sourceLineNo">017</span>/**<a name="line.17"></a>
-<span class="sourceLineNo">018</span> * Configurable properties common to all 
parsers.<a name="line.18"></a>
-<span class="sourceLineNo">019</span> *<a name="line.19"></a>
+<span class="sourceLineNo">016</span>import org.apache.juneau.json.*;<a 
name="line.16"></a>
+<span class="sourceLineNo">017</span><a name="line.17"></a>
+<span class="sourceLineNo">018</span>/**<a name="line.18"></a>
+<span class="sourceLineNo">019</span> * Configurable properties common to all 
parsers.<a name="line.19"></a>
 <span class="sourceLineNo">020</span> *<a name="line.20"></a>
-<span class="sourceLineNo">021</span> * &lt;h6 class='topic' 
id='ConfigProperties'&gt;Configurable properties common to all 
parsers&lt;/h6&gt;<a name="line.21"></a>
-<span class="sourceLineNo">022</span> * &lt;table class='styled' 
style='border-collapse: collapse;'&gt;<a name="line.22"></a>
-<span class="sourceLineNo">023</span> *    &lt;tr&gt;&lt;th&gt;Setting 
name&lt;/th&gt;&lt;th&gt;Description&lt;/th&gt;&lt;th&gt;Data 
type&lt;/th&gt;&lt;th&gt;Default value&lt;/th&gt;&lt;/tr&gt;<a 
name="line.23"></a>
-<span class="sourceLineNo">024</span> *    &lt;tr&gt;<a name="line.24"></a>
-<span class="sourceLineNo">025</span> *       &lt;td&gt;{@link 
#PARSER_debug}&lt;/td&gt;<a name="line.25"></a>
-<span class="sourceLineNo">026</span> *       &lt;td&gt;Debug 
mode.&lt;/td&gt;<a name="line.26"></a>
-<span class="sourceLineNo">027</span> *       
&lt;td&gt;&lt;code&gt;Boolean&lt;/code&gt;&lt;/td&gt;<a name="line.27"></a>
-<span class="sourceLineNo">028</span> *       
&lt;td&gt;&lt;jk&gt;false&lt;/jk&gt;&lt;/td&gt;<a name="line.28"></a>
-<span class="sourceLineNo">029</span> *    &lt;/tr&gt;<a name="line.29"></a>
-<span class="sourceLineNo">030</span> *    &lt;tr&gt;<a name="line.30"></a>
-<span class="sourceLineNo">031</span> *       &lt;td&gt;{@link 
#PARSER_trimStrings}&lt;/td&gt;<a name="line.31"></a>
-<span class="sourceLineNo">032</span> *       &lt;td&gt;Trim parsed 
strings.&lt;/td&gt;<a name="line.32"></a>
-<span class="sourceLineNo">033</span> *       
&lt;td&gt;&lt;code&gt;Boolean&lt;/code&gt;&lt;/td&gt;<a name="line.33"></a>
-<span class="sourceLineNo">034</span> *       
&lt;td&gt;&lt;jk&gt;false&lt;/jk&gt;&lt;/td&gt;<a name="line.34"></a>
-<span class="sourceLineNo">035</span> *    &lt;/tr&gt;<a name="line.35"></a>
-<span class="sourceLineNo">036</span> * &lt;/table&gt;<a name="line.36"></a>
-<span class="sourceLineNo">037</span> *<a name="line.37"></a>
+<span class="sourceLineNo">021</span> *<a name="line.21"></a>
+<span class="sourceLineNo">022</span> * &lt;h6 class='topic' 
id='ConfigProperties'&gt;Configurable properties common to all 
parsers&lt;/h6&gt;<a name="line.22"></a>
+<span class="sourceLineNo">023</span> * &lt;table class='styled' 
style='border-collapse: collapse;'&gt;<a name="line.23"></a>
+<span class="sourceLineNo">024</span> *    &lt;tr&gt;&lt;th&gt;Setting 
name&lt;/th&gt;&lt;th&gt;Description&lt;/th&gt;&lt;th&gt;Data 
type&lt;/th&gt;&lt;th&gt;Default value&lt;/th&gt;&lt;/tr&gt;<a 
name="line.24"></a>
+<span class="sourceLineNo">025</span> *    &lt;tr&gt;<a name="line.25"></a>
+<span class="sourceLineNo">026</span> *       &lt;td&gt;{@link 
#PARSER_debug}&lt;/td&gt;<a name="line.26"></a>
+<span class="sourceLineNo">027</span> *       &lt;td&gt;Debug 
mode.&lt;/td&gt;<a name="line.27"></a>
+<span class="sourceLineNo">028</span> *       
&lt;td&gt;&lt;code&gt;Boolean&lt;/code&gt;&lt;/td&gt;<a name="line.28"></a>
+<span class="sourceLineNo">029</span> *       
&lt;td&gt;&lt;jk&gt;false&lt;/jk&gt;&lt;/td&gt;<a name="line.29"></a>
+<span class="sourceLineNo">030</span> *    &lt;/tr&gt;<a name="line.30"></a>
+<span class="sourceLineNo">031</span> *    &lt;tr&gt;<a name="line.31"></a>
+<span class="sourceLineNo">032</span> *       &lt;td&gt;{@link 
#PARSER_trimStrings}&lt;/td&gt;<a name="line.32"></a>
+<span class="sourceLineNo">033</span> *       &lt;td&gt;Trim parsed 
strings.&lt;/td&gt;<a name="line.33"></a>
+<span class="sourceLineNo">034</span> *       
&lt;td&gt;&lt;code&gt;Boolean&lt;/code&gt;&lt;/td&gt;<a name="line.34"></a>
+<span class="sourceLineNo">035</span> *       
&lt;td&gt;&lt;jk&gt;false&lt;/jk&gt;&lt;/td&gt;<a name="line.35"></a>
+<span class="sourceLineNo">036</span> *    &lt;/tr&gt;<a name="line.36"></a>
+<span class="sourceLineNo">037</span> * &lt;/table&gt;<a name="line.37"></a>
 <span class="sourceLineNo">038</span> *<a name="line.38"></a>
-<span class="sourceLineNo">039</span> * @author James Bognar 
([email protected])<a name="line.39"></a>
-<span class="sourceLineNo">040</span> */<a name="line.40"></a>
-<span class="sourceLineNo">041</span>public class ParserContext extends 
Context {<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>    * &lt;b&gt;Configuration 
property:&lt;/b&gt;  Debug mode.<a name="line.44"></a>
-<span class="sourceLineNo">045</span>    * &lt;p&gt;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>    * &lt;ul&gt;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>    *    
&lt;li&gt;&lt;b&gt;Name:&lt;/b&gt; &lt;js&gt;"Parser.debug"&lt;/js&gt;<a 
name="line.47"></a>
-<span class="sourceLineNo">048</span>    *    &lt;li&gt;&lt;b&gt;Data 
type:&lt;/b&gt; &lt;code&gt;Boolean&lt;/code&gt;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>    *    
&lt;li&gt;&lt;b&gt;Default:&lt;/b&gt; &lt;jk&gt;false&lt;/jk&gt;<a 
name="line.49"></a>
-<span class="sourceLineNo">050</span>    * &lt;/ul&gt;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>    * &lt;p&gt;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>    * Enables the following additional 
information during parsing:<a name="line.52"></a>
-<span class="sourceLineNo">053</span>    * &lt;ul class='spaced-list'&gt;<a 
name="line.53"></a>
-<span class="sourceLineNo">054</span>    *    &lt;li&gt;When bean setters 
throws exceptions, the exception includes the object stack information<a 
name="line.54"></a>
-<span class="sourceLineNo">055</span>    *       in order to determine how 
that method was invoked.<a name="line.55"></a>
-<span class="sourceLineNo">056</span>    * &lt;/ul&gt;<a name="line.56"></a>
-<span class="sourceLineNo">057</span>    */<a name="line.57"></a>
-<span class="sourceLineNo">058</span>   public static final String 
PARSER_debug = "Parser.debug";<a name="line.58"></a>
-<span class="sourceLineNo">059</span><a name="line.59"></a>
-<span class="sourceLineNo">060</span>   /**<a name="line.60"></a>
-<span class="sourceLineNo">061</span>    * &lt;b&gt;Configuration 
property:&lt;/b&gt;  Trim parsed strings.<a name="line.61"></a>
-<span class="sourceLineNo">062</span>    * &lt;p&gt;<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    * &lt;ul&gt;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>    *    
&lt;li&gt;&lt;b&gt;Name:&lt;/b&gt; &lt;js&gt;"Parser.trimStrings"&lt;/js&gt;<a 
name="line.64"></a>
-<span class="sourceLineNo">065</span>    *    &lt;li&gt;&lt;b&gt;Data 
type:&lt;/b&gt; &lt;code&gt;Boolean&lt;/code&gt;<a name="line.65"></a>
-<span class="sourceLineNo">066</span>    *    
&lt;li&gt;&lt;b&gt;Default:&lt;/b&gt; &lt;jk&gt;false&lt;/jk&gt;<a 
name="line.66"></a>
-<span class="sourceLineNo">067</span>    * &lt;/ul&gt;<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    * &lt;p&gt;<a name="line.68"></a>
-<span class="sourceLineNo">069</span>    * If &lt;jk&gt;true&lt;/jk&gt;, 
string values will be trimmed of whitespace using {@link String#trim()} before 
being added to the POJO.<a name="line.69"></a>
-<span class="sourceLineNo">070</span>    */<a name="line.70"></a>
-<span class="sourceLineNo">071</span>   public static final String 
PARSER_trimStrings = "Parser.trimStrings";<a name="line.71"></a>
-<span class="sourceLineNo">072</span><a name="line.72"></a>
+<span class="sourceLineNo">039</span> *<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * @author James Bognar 
([email protected])<a name="line.40"></a>
+<span class="sourceLineNo">041</span> */<a name="line.41"></a>
+<span class="sourceLineNo">042</span>public class ParserContext extends 
Context {<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>    * &lt;b&gt;Configuration 
property:&lt;/b&gt;  Debug mode.<a name="line.45"></a>
+<span class="sourceLineNo">046</span>    * &lt;p&gt;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>    * &lt;ul&gt;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>    *    
&lt;li&gt;&lt;b&gt;Name:&lt;/b&gt; &lt;js&gt;"Parser.debug"&lt;/js&gt;<a 
name="line.48"></a>
+<span class="sourceLineNo">049</span>    *    &lt;li&gt;&lt;b&gt;Data 
type:&lt;/b&gt; &lt;code&gt;Boolean&lt;/code&gt;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>    *    
&lt;li&gt;&lt;b&gt;Default:&lt;/b&gt; &lt;jk&gt;false&lt;/jk&gt;<a 
name="line.50"></a>
+<span class="sourceLineNo">051</span>    * &lt;/ul&gt;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>    * &lt;p&gt;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>    * Enables the following additional 
information during parsing:<a name="line.53"></a>
+<span class="sourceLineNo">054</span>    * &lt;ul class='spaced-list'&gt;<a 
name="line.54"></a>
+<span class="sourceLineNo">055</span>    *    &lt;li&gt;When bean setters 
throws exceptions, the exception includes the object stack information<a 
name="line.55"></a>
+<span class="sourceLineNo">056</span>    *       in order to determine how 
that method was invoked.<a name="line.56"></a>
+<span class="sourceLineNo">057</span>    * &lt;/ul&gt;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>    */<a name="line.58"></a>
+<span class="sourceLineNo">059</span>   public static final String 
PARSER_debug = "Parser.debug";<a name="line.59"></a>
+<span class="sourceLineNo">060</span><a name="line.60"></a>
+<span class="sourceLineNo">061</span>   /**<a name="line.61"></a>
+<span class="sourceLineNo">062</span>    * &lt;b&gt;Configuration 
property:&lt;/b&gt;  Trim parsed strings.<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    * &lt;p&gt;<a name="line.63"></a>
+<span class="sourceLineNo">064</span>    * &lt;ul&gt;<a name="line.64"></a>
+<span class="sourceLineNo">065</span>    *    
&lt;li&gt;&lt;b&gt;Name:&lt;/b&gt; &lt;js&gt;"Parser.trimStrings"&lt;/js&gt;<a 
name="line.65"></a>
+<span class="sourceLineNo">066</span>    *    &lt;li&gt;&lt;b&gt;Data 
type:&lt;/b&gt; &lt;code&gt;Boolean&lt;/code&gt;<a name="line.66"></a>
+<span class="sourceLineNo">067</span>    *    
&lt;li&gt;&lt;b&gt;Default:&lt;/b&gt; &lt;jk&gt;false&lt;/jk&gt;<a 
name="line.67"></a>
+<span class="sourceLineNo">068</span>    * &lt;/ul&gt;<a name="line.68"></a>
+<span class="sourceLineNo">069</span>    * &lt;p&gt;<a name="line.69"></a>
+<span class="sourceLineNo">070</span>    * If &lt;jk&gt;true&lt;/jk&gt;, 
string values will be trimmed of whitespace using {@link String#trim()} before 
being added to the POJO.<a name="line.70"></a>
+<span class="sourceLineNo">071</span>    */<a name="line.71"></a>
+<span class="sourceLineNo">072</span>   public static final String 
PARSER_trimStrings = "Parser.trimStrings";<a name="line.72"></a>
 <span class="sourceLineNo">073</span><a name="line.73"></a>
-<span class="sourceLineNo">074</span>   final boolean debug, trimStrings;<a 
name="line.74"></a>
-<span class="sourceLineNo">075</span><a name="line.75"></a>
-<span class="sourceLineNo">076</span>   /**<a name="line.76"></a>
-<span class="sourceLineNo">077</span>    * Constructor.<a name="line.77"></a>
-<span class="sourceLineNo">078</span>    *<a name="line.78"></a>
-<span class="sourceLineNo">079</span>    * @param cf The factory that created 
this context.<a name="line.79"></a>
-<span class="sourceLineNo">080</span>    */<a name="line.80"></a>
-<span class="sourceLineNo">081</span>   public ParserContext(ContextFactory 
cf) {<a name="line.81"></a>
-<span class="sourceLineNo">082</span>      super(cf);<a name="line.82"></a>
-<span class="sourceLineNo">083</span>      this.debug = 
cf.getProperty(PARSER_debug, boolean.class, false);<a name="line.83"></a>
-<span class="sourceLineNo">084</span>      this.trimStrings = 
cf.getProperty(PARSER_trimStrings, boolean.class, false);<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">074</span>   /**<a name="line.74"></a>
+<span class="sourceLineNo">075</span>    * &lt;b&gt;Configuration 
property:&lt;/b&gt;  Strict mode.<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    * &lt;p&gt;<a name="line.76"></a>
+<span class="sourceLineNo">077</span>    * &lt;ul&gt;<a name="line.77"></a>
+<span class="sourceLineNo">078</span>    *    
&lt;li&gt;&lt;b&gt;Name:&lt;/b&gt; &lt;js&gt;"Parser.strict"&lt;/js&gt;<a 
name="line.78"></a>
+<span class="sourceLineNo">079</span>    *    &lt;li&gt;&lt;b&gt;Data 
type:&lt;/b&gt; &lt;code&gt;Boolean&lt;/code&gt;<a name="line.79"></a>
+<span class="sourceLineNo">080</span>    *    
&lt;li&gt;&lt;b&gt;Default:&lt;/b&gt; &lt;jk&gt;false&lt;/jk&gt;<a 
name="line.80"></a>
+<span class="sourceLineNo">081</span>    * &lt;/ul&gt;<a name="line.81"></a>
+<span class="sourceLineNo">082</span>    * &lt;p&gt;<a name="line.82"></a>
+<span class="sourceLineNo">083</span>    * If &lt;jk&gt;true&lt;/jk&gt;, 
strict mode for the parser is enabled.<a name="line.83"></a>
+<span class="sourceLineNo">084</span>    * &lt;p&gt;<a name="line.84"></a>
+<span class="sourceLineNo">085</span>    * Strict mode can mean different 
things for different parsers.<a name="line.85"></a>
+<span class="sourceLineNo">086</span>    * However, all reader-based parsers 
will<a name="line.86"></a>
+<span class="sourceLineNo">087</span>    * &lt;p&gt;<a name="line.87"></a>
+<span class="sourceLineNo">088</span>    * &lt;table class='styled'&gt;<a 
name="line.88"></a>
+<span class="sourceLineNo">089</span>    *    &lt;tr&gt;&lt;th&gt;Parser 
class&lt;/th&gt;&lt;th&gt;Strict behavior&lt;/td&gt;&lt;/tr&gt;<a 
name="line.89"></a>
+<span class="sourceLineNo">090</span>    *    &lt;tr&gt;<a name="line.90"></a>
+<span class="sourceLineNo">091</span>    *       &lt;td&gt;All reader-based 
parsers&lt;/td&gt;<a name="line.91"></a>
+<span class="sourceLineNo">092</span>    *       &lt;td&gt;<a 
name="line.92"></a>
+<span class="sourceLineNo">093</span>    *          When enabled, throws 
{@link ParseException ParseExceptions} on malformed charset input.<a 
name="line.93"></a>
+<span class="sourceLineNo">094</span>    *          Otherwise, malformed input 
is ignored.<a name="line.94"></a>
+<span class="sourceLineNo">095</span>    *       &lt;/td&gt;<a 
name="line.95"></a>
+<span class="sourceLineNo">096</span>    *    &lt;/tr&gt;<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    *    &lt;tr&gt;<a name="line.97"></a>
+<span class="sourceLineNo">098</span>    *       &lt;td&gt;{@link 
JsonParser}&lt;/td&gt;<a name="line.98"></a>
+<span class="sourceLineNo">099</span>    *       &lt;td&gt;<a 
name="line.99"></a>
+<span class="sourceLineNo">100</span>    *          When enabled, throws 
exceptions on the following invalid JSON syntax:<a name="line.100"></a>
+<span class="sourceLineNo">101</span>    *          &lt;ul&gt;<a 
name="line.101"></a>
+<span class="sourceLineNo">102</span>    *             &lt;li&gt;Unquoted 
attributes.<a name="line.102"></a>
+<span class="sourceLineNo">103</span>    *             &lt;li&gt;Missing 
attribute values.<a name="line.103"></a>
+<span class="sourceLineNo">104</span>    *             &lt;li&gt;Concatenated 
strings.<a name="line.104"></a>
+<span class="sourceLineNo">105</span>    *             &lt;li&gt;Javascript 
comments.<a name="line.105"></a>
+<span class="sourceLineNo">106</span>    *             &lt;li&gt;Numbers and 
booleans when Strings are expected.<a name="line.106"></a>
+<span class="sourceLineNo">107</span>    *             &lt;li&gt;Numbers valid 
in Java but not JSON (e.g. octal notation, etc...)<a name="line.107"></a>
+<span class="sourceLineNo">108</span>    *          &lt;/ul&gt;<a 
name="line.108"></a>
+<span class="sourceLineNo">109</span>    *       &lt;/td&gt;<a 
name="line.109"></a>
+<span class="sourceLineNo">110</span>    *    &lt;/tr&gt;<a 
name="line.110"></a>
+<span class="sourceLineNo">111</span>    * &lt;/table&gt;<a 
name="line.111"></a>
+<span class="sourceLineNo">112</span>    */<a name="line.112"></a>
+<span class="sourceLineNo">113</span>   public static final String 
PARSER_strict = "Parser.strict";<a name="line.113"></a>
+<span class="sourceLineNo">114</span><a name="line.114"></a>
+<span class="sourceLineNo">115</span>   /**<a name="line.115"></a>
+<span class="sourceLineNo">116</span>    * &lt;b&gt;Configuration 
property:&lt;/b&gt;  Input stream charset.<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    * &lt;p&gt;<a name="line.117"></a>
+<span class="sourceLineNo">118</span>    * &lt;ul&gt;<a name="line.118"></a>
+<span class="sourceLineNo">119</span>    *    
&lt;li&gt;&lt;b&gt;Name:&lt;/b&gt; 
&lt;js&gt;"Parser.inputStreamCharset"&lt;/js&gt;<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    *    &lt;li&gt;&lt;b&gt;Data 
type:&lt;/b&gt; &lt;code&gt;String&lt;/code&gt;<a name="line.120"></a>
+<span class="sourceLineNo">121</span>    *    
&lt;li&gt;&lt;b&gt;Default:&lt;/b&gt; &lt;js&gt;"UTF-8"&lt;/js&gt;<a 
name="line.121"></a>
+<span class="sourceLineNo">122</span>    * &lt;/ul&gt;<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    * &lt;p&gt;<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    * The character set to use for 
converting &lt;code&gt;InputStreams&lt;/code&gt; and byte arrays to readers.<a 
name="line.124"></a>
+<span class="sourceLineNo">125</span>    * &lt;p&gt;<a name="line.125"></a>
+<span class="sourceLineNo">126</span>    * Used when passing in input streams 
and byte arrays to {@link Parser#parse(Object, Class)}.<a name="line.126"></a>
+<span class="sourceLineNo">127</span>    */<a name="line.127"></a>
+<span class="sourceLineNo">128</span>   public static final String 
PARSER_inputStreamCharset = "Parser.inputStreamCharset";<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>    * &lt;b&gt;Configuration 
property:&lt;/b&gt;  File charset.<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    * &lt;p&gt;<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    * &lt;ul&gt;<a name="line.133"></a>
+<span class="sourceLineNo">134</span>    *    
&lt;li&gt;&lt;b&gt;Name:&lt;/b&gt; &lt;js&gt;"Parser.fileCharset"&lt;/js&gt;<a 
name="line.134"></a>
+<span class="sourceLineNo">135</span>    *    &lt;li&gt;&lt;b&gt;Data 
type:&lt;/b&gt; &lt;code&gt;String&lt;/code&gt;<a name="line.135"></a>
+<span class="sourceLineNo">136</span>    *    
&lt;li&gt;&lt;b&gt;Default:&lt;/b&gt; &lt;js&gt;"default"&lt;/js&gt;<a 
name="line.136"></a>
+<span class="sourceLineNo">137</span>    * &lt;/ul&gt;<a name="line.137"></a>
+<span class="sourceLineNo">138</span>    * &lt;p&gt;<a name="line.138"></a>
+<span class="sourceLineNo">139</span>    * The character set to use for 
reading &lt;code&gt;Files&lt;/code&gt; from the file system.<a 
name="line.139"></a>
+<span class="sourceLineNo">140</span>    * &lt;p&gt;<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    * Used when passing in files to 
{@link Parser#parse(Object, Class)}.<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    * &lt;p&gt;<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    * &lt;js&gt;"default"&lt;/js&gt; can 
be used to indicate the JVM default file system charset.<a name="line.143"></a>
+<span class="sourceLineNo">144</span>    */<a name="line.144"></a>
+<span class="sourceLineNo">145</span>   public static final String 
PARSER_fileCharset = "Parser.fileCharset";<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>   final boolean debug, trimStrings, 
strict;<a name="line.148"></a>
+<span class="sourceLineNo">149</span>   final String inputStreamCharset, 
fileCharset;<a name="line.149"></a>
+<span class="sourceLineNo">150</span><a name="line.150"></a>
+<span class="sourceLineNo">151</span>   /**<a name="line.151"></a>
+<span class="sourceLineNo">152</span>    * Constructor.<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    *<a name="line.153"></a>
+<span class="sourceLineNo">154</span>    * @param cf The factory that created 
this context.<a name="line.154"></a>
+<span class="sourceLineNo">155</span>    */<a name="line.155"></a>
+<span class="sourceLineNo">156</span>   public ParserContext(ContextFactory 
cf) {<a name="line.156"></a>
+<span class="sourceLineNo">157</span>      super(cf);<a name="line.157"></a>
+<span class="sourceLineNo">158</span>      this.debug = 
cf.getProperty(PARSER_debug, boolean.class, false);<a name="line.158"></a>
+<span class="sourceLineNo">159</span>      this.trimStrings = 
cf.getProperty(PARSER_trimStrings, boolean.class, false);<a name="line.159"></a>
+<span class="sourceLineNo">160</span>      this.strict = 
cf.getProperty(PARSER_strict, boolean.class, false);<a name="line.160"></a>
+<span class="sourceLineNo">161</span>      this.inputStreamCharset = 
cf.getProperty(PARSER_inputStreamCharset, String.class, "UTF-8");<a 
name="line.161"></a>
+<span class="sourceLineNo">162</span>      this.fileCharset = 
cf.getProperty(PARSER_fileCharset, String.class, "default");<a 
name="line.162"></a>
+<span class="sourceLineNo">163</span>   }<a name="line.163"></a>
+<span class="sourceLineNo">164</span>}<a name="line.164"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/02c10736/content/site/apidocs/src-html/org/apache/juneau/parser/ParserSession.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/parser/ParserSession.html 
b/content/site/apidocs/src-html/org/apache/juneau/parser/ParserSession.html
index 21ffbfa..c8c753f 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/parser/ParserSession.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/parser/ParserSession.html
@@ -24,298 +24,335 @@
 <span class="sourceLineNo">016</span><a name="line.16"></a>
 <span class="sourceLineNo">017</span>import java.io.*;<a name="line.17"></a>
 <span class="sourceLineNo">018</span>import java.lang.reflect.*;<a 
name="line.18"></a>
-<span class="sourceLineNo">019</span>import java.util.*;<a name="line.19"></a>
-<span class="sourceLineNo">020</span><a name="line.20"></a>
-<span class="sourceLineNo">021</span>import org.apache.juneau.*;<a 
name="line.21"></a>
-<span class="sourceLineNo">022</span>import org.apache.juneau.internal.*;<a 
name="line.22"></a>
-<span class="sourceLineNo">023</span><a name="line.23"></a>
-<span class="sourceLineNo">024</span>/**<a name="line.24"></a>
-<span class="sourceLineNo">025</span> * Session object that lives for the 
duration of a single use of {@link Parser}.<a name="line.25"></a>
-<span class="sourceLineNo">026</span> * &lt;p&gt;<a name="line.26"></a>
-<span class="sourceLineNo">027</span> * This class is NOT thread safe.  It is 
meant to be discarded after one-time use.<a name="line.27"></a>
-<span class="sourceLineNo">028</span> *<a name="line.28"></a>
-<span class="sourceLineNo">029</span> * @author James Bognar 
([email protected])<a name="line.29"></a>
-<span class="sourceLineNo">030</span> */<a name="line.30"></a>
-<span class="sourceLineNo">031</span>public class ParserSession extends 
Session {<a name="line.31"></a>
-<span class="sourceLineNo">032</span><a name="line.32"></a>
-<span class="sourceLineNo">033</span>   private static JuneauLogger logger = 
JuneauLogger.getLogger(ParserSession.class);<a name="line.33"></a>
-<span class="sourceLineNo">034</span><a name="line.34"></a>
-<span class="sourceLineNo">035</span>   private final boolean debug, 
trimStrings;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>   private boolean closed;<a 
name="line.36"></a>
-<span class="sourceLineNo">037</span>   private final BeanContext 
beanContext;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>   private final List&lt;String&gt; 
warnings = new LinkedList&lt;String&gt;();<a name="line.38"></a>
-<span class="sourceLineNo">039</span><a name="line.39"></a>
-<span class="sourceLineNo">040</span>   private final ObjectMap properties;<a 
name="line.40"></a>
-<span class="sourceLineNo">041</span>   private final Method javaMethod;<a 
name="line.41"></a>
-<span class="sourceLineNo">042</span>   private final Object outer;<a 
name="line.42"></a>
-<span class="sourceLineNo">043</span>   private final Object input;<a 
name="line.43"></a>
-<span class="sourceLineNo">044</span>   private InputStream inputStream;<a 
name="line.44"></a>
-<span class="sourceLineNo">045</span>   private Reader reader, 
noCloseReader;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>   private BeanPropertyMeta 
currentProperty;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>   private ClassMeta&lt;?&gt; 
currentClass;<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>
-<span class="sourceLineNo">050</span>    * Create a new session using 
properties specified in the context.<a name="line.50"></a>
-<span class="sourceLineNo">051</span>    *<a name="line.51"></a>
-<span class="sourceLineNo">052</span>    * @param ctx The context creating 
this session object.<a name="line.52"></a>
-<span class="sourceLineNo">053</span>    *    The context contains all the 
configuration settings for this object.<a name="line.53"></a>
-<span class="sourceLineNo">054</span>    * @param beanContext The bean context 
being used.<a name="line.54"></a>
-<span class="sourceLineNo">055</span>    * @param input The input.<a 
name="line.55"></a>
-<span class="sourceLineNo">056</span>    *    &lt;br&gt;For character-based 
parsers, this can be any of the following types:<a name="line.56"></a>
-<span class="sourceLineNo">057</span>    *    &lt;ul&gt;<a name="line.57"></a>
-<span class="sourceLineNo">058</span>    *       
&lt;li&gt;&lt;jk&gt;null&lt;/jk&gt;<a name="line.58"></a>
-<span class="sourceLineNo">059</span>    *       &lt;li&gt;{@link Reader}<a 
name="line.59"></a>
-<span class="sourceLineNo">060</span>    *       &lt;li&gt;{@link 
CharSequence}<a name="line.60"></a>
-<span class="sourceLineNo">061</span>    *       &lt;li&gt;{@link InputStream} 
containing UTF-8 encoded text.<a name="line.61"></a>
-<span class="sourceLineNo">062</span>    *       &lt;li&gt;{@link File} 
containing system encoded text.<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    *    &lt;/ul&gt;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>    *    &lt;br&gt;For byte-based 
parsers, this can be any of the following types:<a name="line.64"></a>
-<span class="sourceLineNo">065</span>    *    &lt;ul&gt;<a name="line.65"></a>
-<span class="sourceLineNo">066</span>    *       
&lt;li&gt;&lt;jk&gt;null&lt;/jk&gt;<a name="line.66"></a>
-<span class="sourceLineNo">067</span>    *       &lt;li&gt;{@link 
InputStream}<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    *       
&lt;li&gt;&lt;code&gt;&lt;jk&gt;byte&lt;/jk&gt;[]&lt;/code&gt;<a 
name="line.68"></a>
-<span class="sourceLineNo">069</span>    *       &lt;li&gt;{@link File}<a 
name="line.69"></a>
-<span class="sourceLineNo">070</span>    *    &lt;/ul&gt;<a name="line.70"></a>
-<span class="sourceLineNo">071</span>    * @param op The override 
properties.<a name="line.71"></a>
-<span class="sourceLineNo">072</span>    *    These override any context 
properties defined in the context.<a name="line.72"></a>
-<span class="sourceLineNo">073</span>    * @param javaMethod The java method 
that called this parser, usually the method in a REST servlet.<a 
name="line.73"></a>
-<span class="sourceLineNo">074</span>    * @param outer The outer object for 
instantiating top-level non-static inner classes.<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    */<a name="line.75"></a>
-<span class="sourceLineNo">076</span>   public ParserSession(ParserContext 
ctx, BeanContext beanContext, Object input, ObjectMap op, Method javaMethod, 
Object outer) {<a name="line.76"></a>
-<span class="sourceLineNo">077</span>      super(ctx);<a name="line.77"></a>
-<span class="sourceLineNo">078</span>      if (op == null || op.isEmpty()) {<a 
name="line.78"></a>
-<span class="sourceLineNo">079</span>         debug = ctx.debug;<a 
name="line.79"></a>
-<span class="sourceLineNo">080</span>         trimStrings = ctx.trimStrings;<a 
name="line.80"></a>
-<span class="sourceLineNo">081</span>      } else {<a name="line.81"></a>
-<span class="sourceLineNo">082</span>         debug = 
op.getBoolean(PARSER_debug, ctx.debug);<a name="line.82"></a>
-<span class="sourceLineNo">083</span>         trimStrings = 
op.getBoolean(PARSER_trimStrings, ctx.trimStrings);<a name="line.83"></a>
-<span class="sourceLineNo">084</span>      }<a name="line.84"></a>
-<span class="sourceLineNo">085</span>      this.beanContext = beanContext;<a 
name="line.85"></a>
-<span class="sourceLineNo">086</span>      this.input = input;<a 
name="line.86"></a>
-<span class="sourceLineNo">087</span>      this.properties = op;<a 
name="line.87"></a>
-<span class="sourceLineNo">088</span>      this.javaMethod = javaMethod;<a 
name="line.88"></a>
-<span class="sourceLineNo">089</span>      this.outer = outer;<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>    * Wraps the specified input object 
inside an input stream.<a name="line.93"></a>
-<span class="sourceLineNo">094</span>    * Subclasses can override this method 
to implement their own input streams.<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    *<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    * @return The input object wrapped in 
an input stream, or &lt;jk&gt;null&lt;/jk&gt; if the object is null.<a 
name="line.96"></a>
-<span class="sourceLineNo">097</span>    * @throws ParseException If object 
could not be converted to an input stream.<a name="line.97"></a>
-<span class="sourceLineNo">098</span>    */<a name="line.98"></a>
-<span class="sourceLineNo">099</span>   public InputStream getInputStream() 
throws ParseException {<a name="line.99"></a>
-<span class="sourceLineNo">100</span>      if (input == null)<a 
name="line.100"></a>
-<span class="sourceLineNo">101</span>         return null;<a 
name="line.101"></a>
-<span class="sourceLineNo">102</span>      if (input instanceof InputStream)<a 
name="line.102"></a>
-<span class="sourceLineNo">103</span>         return (InputStream)input;<a 
name="line.103"></a>
-<span class="sourceLineNo">104</span>      if (input instanceof byte[])<a 
name="line.104"></a>
-<span class="sourceLineNo">105</span>         return new 
ByteArrayInputStream((byte[])input);<a name="line.105"></a>
-<span class="sourceLineNo">106</span>      if (input instanceof File)<a 
name="line.106"></a>
-<span class="sourceLineNo">107</span>         try {<a name="line.107"></a>
-<span class="sourceLineNo">108</span>            inputStream = new 
FileInputStream((File)input);<a name="line.108"></a>
-<span class="sourceLineNo">109</span>            return inputStream;<a 
name="line.109"></a>
-<span class="sourceLineNo">110</span>         } catch (FileNotFoundException 
e) {<a name="line.110"></a>
-<span class="sourceLineNo">111</span>            throw new 
ParseException(e);<a name="line.111"></a>
-<span class="sourceLineNo">112</span>         }<a name="line.112"></a>
-<span class="sourceLineNo">113</span>      throw new ParseException("Cannot 
convert object of type {0} to an InputStream.", input.getClass().getName());<a 
name="line.113"></a>
-<span class="sourceLineNo">114</span>   }<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>   /**<a name="line.117"></a>
-<span class="sourceLineNo">118</span>    * Wraps the specified input object 
inside a reader.<a name="line.118"></a>
-<span class="sourceLineNo">119</span>    * Subclasses can override this method 
to implement their own readers.<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    *<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    * @return The input object wrapped in 
a Reader, or &lt;jk&gt;null&lt;/jk&gt; if the object is null.<a 
name="line.121"></a>
-<span class="sourceLineNo">122</span>    * @throws Exception If object could 
not be converted to a reader.<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    */<a name="line.123"></a>
-<span class="sourceLineNo">124</span>   public Reader getReader() throws 
Exception {<a name="line.124"></a>
-<span class="sourceLineNo">125</span>      if (input == null)<a 
name="line.125"></a>
-<span class="sourceLineNo">126</span>         return null;<a 
name="line.126"></a>
-<span class="sourceLineNo">127</span>      if (input instanceof Reader)<a 
name="line.127"></a>
-<span class="sourceLineNo">128</span>         return (Reader)input;<a 
name="line.128"></a>
-<span class="sourceLineNo">129</span>      if (input instanceof CharSequence) 
{<a name="line.129"></a>
-<span class="sourceLineNo">130</span>         if (reader == null)<a 
name="line.130"></a>
-<span class="sourceLineNo">131</span>            reader = new 
ParserReader((CharSequence)input);<a name="line.131"></a>
-<span class="sourceLineNo">132</span>         return reader;<a 
name="line.132"></a>
-<span class="sourceLineNo">133</span>      }<a name="line.133"></a>
-<span class="sourceLineNo">134</span>      if (input instanceof InputStream) 
{<a name="line.134"></a>
-<span class="sourceLineNo">135</span>         if (noCloseReader == null)<a 
name="line.135"></a>
-<span class="sourceLineNo">136</span>            noCloseReader = new 
InputStreamReader((InputStream)input, IOUtils.UTF8);<a name="line.136"></a>
-<span class="sourceLineNo">137</span>         return noCloseReader;<a 
name="line.137"></a>
-<span class="sourceLineNo">138</span>      }<a name="line.138"></a>
-<span class="sourceLineNo">139</span>      if (input instanceof File) {<a 
name="line.139"></a>
-<span class="sourceLineNo">140</span>         if (reader == null)<a 
name="line.140"></a>
-<span class="sourceLineNo">141</span>            reader = new 
FileReader((File)input);<a name="line.141"></a>
-<span class="sourceLineNo">142</span>         return reader;<a 
name="line.142"></a>
-<span class="sourceLineNo">143</span>      }<a name="line.143"></a>
-<span class="sourceLineNo">144</span>      throw new ParseException("Cannot 
convert object of type {0} to a Reader.", input.getClass().getName());<a 
name="line.144"></a>
-<span class="sourceLineNo">145</span>   }<a name="line.145"></a>
-<span class="sourceLineNo">146</span><a name="line.146"></a>
-<span class="sourceLineNo">147</span>   /**<a name="line.147"></a>
-<span class="sourceLineNo">148</span>    * Returns information used to 
determine at what location in the parse a failure occurred.<a 
name="line.148"></a>
-<span class="sourceLineNo">149</span>    *<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    * @return A map, typically containing 
something like 
&lt;code&gt;{line:123,column:456,currentProperty:"foobar"}&lt;/code&gt;<a 
name="line.150"></a>
-<span class="sourceLineNo">151</span>    */<a name="line.151"></a>
-<span class="sourceLineNo">152</span>   public Map&lt;String,Object&gt; 
getLastLocation() {<a name="line.152"></a>
-<span class="sourceLineNo">153</span>      Map&lt;String,Object&gt; m = new 
LinkedHashMap&lt;String,Object&gt;();<a name="line.153"></a>
-<span class="sourceLineNo">154</span>      if (currentClass != null)<a 
name="line.154"></a>
-<span class="sourceLineNo">155</span>         m.put("currentClass", 
currentClass.toString(true));<a name="line.155"></a>
-<span class="sourceLineNo">156</span>      if (currentProperty != null)<a 
name="line.156"></a>
-<span class="sourceLineNo">157</span>         m.put("currentProperty", 
currentProperty);<a name="line.157"></a>
-<span class="sourceLineNo">158</span>      return m;<a name="line.158"></a>
-<span class="sourceLineNo">159</span>   }<a name="line.159"></a>
-<span class="sourceLineNo">160</span><a name="line.160"></a>
-<span class="sourceLineNo">161</span>   /**<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    * Returns the raw input object passed 
into this session.<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    *<a name="line.163"></a>
-<span class="sourceLineNo">164</span>    * @return The raw input object passed 
into this session.<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    */<a name="line.165"></a>
-<span class="sourceLineNo">166</span>   protected Object getInput() {<a 
name="line.166"></a>
-<span class="sourceLineNo">167</span>      return input;<a name="line.167"></a>
-<span class="sourceLineNo">168</span>   }<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>    * Returns the bean context in use for 
this session.<a name="line.171"></a>
-<span class="sourceLineNo">172</span>    *<a name="line.172"></a>
-<span class="sourceLineNo">173</span>    * @return The bean context in use for 
this session.<a name="line.173"></a>
-<span class="sourceLineNo">174</span>    */<a name="line.174"></a>
-<span class="sourceLineNo">175</span>   public final BeanContext 
getBeanContext() {<a name="line.175"></a>
-<span class="sourceLineNo">176</span>      return beanContext;<a 
name="line.176"></a>
-<span class="sourceLineNo">177</span>   }<a name="line.177"></a>
-<span class="sourceLineNo">178</span><a name="line.178"></a>
-<span class="sourceLineNo">179</span>   /**<a name="line.179"></a>
-<span class="sourceLineNo">180</span>    * Returns the Java method that 
invoked this parser.<a name="line.180"></a>
-<span class="sourceLineNo">181</span>    * &lt;p&gt;<a name="line.181"></a>
-<span class="sourceLineNo">182</span>    * When using the REST API, this is 
the Java method invoked by the REST call.<a name="line.182"></a>
-<span class="sourceLineNo">183</span>    * Can be used to access annotations 
defined on the method or class.<a name="line.183"></a>
-<span class="sourceLineNo">184</span>    *<a name="line.184"></a>
-<span class="sourceLineNo">185</span>    * @return The Java method that 
invoked this parser.<a name="line.185"></a>
-<span class="sourceLineNo">186</span>   */<a name="line.186"></a>
-<span class="sourceLineNo">187</span>   public final Method getJavaMethod() 
{<a name="line.187"></a>
-<span class="sourceLineNo">188</span>      return javaMethod;<a 
name="line.188"></a>
-<span class="sourceLineNo">189</span>   }<a name="line.189"></a>
-<span class="sourceLineNo">190</span><a name="line.190"></a>
-<span class="sourceLineNo">191</span>   /**<a name="line.191"></a>
-<span class="sourceLineNo">192</span>    * Returns the outer object used for 
instantiating top-level non-static member classes.<a name="line.192"></a>
-<span class="sourceLineNo">193</span>    * When using the REST API, this is 
the servlet object.<a name="line.193"></a>
-<span class="sourceLineNo">194</span>    *<a name="line.194"></a>
-<span class="sourceLineNo">195</span>    * @return The outer object.<a 
name="line.195"></a>
-<span class="sourceLineNo">196</span>   */<a name="line.196"></a>
-<span class="sourceLineNo">197</span>   public final Object getOuter() {<a 
name="line.197"></a>
-<span class="sourceLineNo">198</span>      return outer;<a name="line.198"></a>
-<span class="sourceLineNo">199</span>   }<a name="line.199"></a>
-<span class="sourceLineNo">200</span><a name="line.200"></a>
-<span class="sourceLineNo">201</span>   /**<a name="line.201"></a>
-<span class="sourceLineNo">202</span>    * Sets the current bean property 
being parsed for proper error messages.<a name="line.202"></a>
-<span class="sourceLineNo">203</span>    * @param currentProperty The current 
property being parsed.<a name="line.203"></a>
-<span class="sourceLineNo">204</span>    */<a name="line.204"></a>
-<span class="sourceLineNo">205</span>   public void 
setCurrentProperty(BeanPropertyMeta currentProperty) {<a name="line.205"></a>
-<span class="sourceLineNo">206</span>      this.currentProperty = 
currentProperty;<a name="line.206"></a>
-<span class="sourceLineNo">207</span>   }<a name="line.207"></a>
-<span class="sourceLineNo">208</span><a name="line.208"></a>
-<span class="sourceLineNo">209</span>   /**<a name="line.209"></a>
-<span class="sourceLineNo">210</span>    * Sets the current class being parsed 
for proper error messages.<a name="line.210"></a>
-<span class="sourceLineNo">211</span>    * @param currentClass The current 
class being parsed.<a name="line.211"></a>
-<span class="sourceLineNo">212</span>    */<a name="line.212"></a>
-<span class="sourceLineNo">213</span>   public void 
setCurrentClass(ClassMeta&lt;?&gt; currentClass) {<a name="line.213"></a>
-<span class="sourceLineNo">214</span>      this.currentClass = currentClass;<a 
name="line.214"></a>
-<span class="sourceLineNo">215</span>   }<a name="line.215"></a>
-<span class="sourceLineNo">216</span><a name="line.216"></a>
-<span class="sourceLineNo">217</span>   /**<a name="line.217"></a>
-<span class="sourceLineNo">218</span>    * Returns the {@link 
ParserContext#PARSER_debug} setting value for this session.<a 
name="line.218"></a>
-<span class="sourceLineNo">219</span>    *<a name="line.219"></a>
-<span class="sourceLineNo">220</span>    * @return The {@link 
ParserContext#PARSER_debug} setting value for this session.<a 
name="line.220"></a>
-<span class="sourceLineNo">221</span>    */<a name="line.221"></a>
-<span class="sourceLineNo">222</span>   public final boolean isDebug() {<a 
name="line.222"></a>
-<span class="sourceLineNo">223</span>      return debug;<a name="line.223"></a>
-<span class="sourceLineNo">224</span>   }<a name="line.224"></a>
-<span class="sourceLineNo">225</span><a name="line.225"></a>
-<span class="sourceLineNo">226</span>   /**<a name="line.226"></a>
-<span class="sourceLineNo">227</span>    * Returns the {@link 
ParserContext#PARSER_trimStrings} setting value for this session.<a 
name="line.227"></a>
-<span class="sourceLineNo">228</span>    *<a name="line.228"></a>
-<span class="sourceLineNo">229</span>    * @return The {@link 
ParserContext#PARSER_trimStrings} setting value for this session.<a 
name="line.229"></a>
-<span class="sourceLineNo">230</span>    */<a name="line.230"></a>
-<span class="sourceLineNo">231</span>   public final boolean isTrimStrings() 
{<a name="line.231"></a>
-<span class="sourceLineNo">232</span>      return trimStrings;<a 
name="line.232"></a>
-<span class="sourceLineNo">233</span>   }<a name="line.233"></a>
-<span class="sourceLineNo">234</span><a name="line.234"></a>
-<span class="sourceLineNo">235</span>   /**<a name="line.235"></a>
-<span class="sourceLineNo">236</span>    * Returns the runtime properties 
associated with this context.<a name="line.236"></a>
-<span class="sourceLineNo">237</span>    *<a name="line.237"></a>
-<span class="sourceLineNo">238</span>    * @return The runtime properties 
associated with this context.<a name="line.238"></a>
-<span class="sourceLineNo">239</span>    */<a name="line.239"></a>
-<span class="sourceLineNo">240</span>   public final ObjectMap getProperties() 
{<a name="line.240"></a>
-<span class="sourceLineNo">241</span>      return properties;<a 
name="line.241"></a>
-<span class="sourceLineNo">242</span>   }<a name="line.242"></a>
-<span class="sourceLineNo">243</span><a name="line.243"></a>
-<span class="sourceLineNo">244</span>   /**<a name="line.244"></a>
-<span class="sourceLineNo">245</span>    * Logs a warning message.<a 
name="line.245"></a>
-<span class="sourceLineNo">246</span>    *<a name="line.246"></a>
-<span class="sourceLineNo">247</span>    * @param msg The warning message.<a 
name="line.247"></a>
-<span class="sourceLineNo">248</span>    * @param args Optional printf 
arguments to replace in the error message.<a name="line.248"></a>
+<span class="sourceLineNo">019</span>import java.nio.charset.*;<a 
name="line.19"></a>
+<span class="sourceLineNo">020</span>import java.util.*;<a name="line.20"></a>
+<span class="sourceLineNo">021</span><a name="line.21"></a>
+<span class="sourceLineNo">022</span>import org.apache.juneau.*;<a 
name="line.22"></a>
+<span class="sourceLineNo">023</span>import org.apache.juneau.internal.*;<a 
name="line.23"></a>
+<span class="sourceLineNo">024</span><a name="line.24"></a>
+<span class="sourceLineNo">025</span>/**<a name="line.25"></a>
+<span class="sourceLineNo">026</span> * Session object that lives for the 
duration of a single use of {@link Parser}.<a name="line.26"></a>
+<span class="sourceLineNo">027</span> * &lt;p&gt;<a name="line.27"></a>
+<span class="sourceLineNo">028</span> * This class is NOT thread safe.  It is 
meant to be discarded after one-time use.<a name="line.28"></a>
+<span class="sourceLineNo">029</span> *<a name="line.29"></a>
+<span class="sourceLineNo">030</span> * @author James Bognar 
([email protected])<a name="line.30"></a>
+<span class="sourceLineNo">031</span> */<a name="line.31"></a>
+<span class="sourceLineNo">032</span>public class ParserSession extends 
Session {<a name="line.32"></a>
+<span class="sourceLineNo">033</span><a name="line.33"></a>
+<span class="sourceLineNo">034</span>   private static JuneauLogger logger = 
JuneauLogger.getLogger(ParserSession.class);<a name="line.34"></a>
+<span class="sourceLineNo">035</span><a name="line.35"></a>
+<span class="sourceLineNo">036</span>   private final boolean debug, 
trimStrings, strict;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>   private final String 
inputStreamCharset, fileCharset;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>   private boolean closed;<a 
name="line.38"></a>
+<span class="sourceLineNo">039</span>   private final BeanContext 
beanContext;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>   private final List&lt;String&gt; 
warnings = new LinkedList&lt;String&gt;();<a name="line.40"></a>
+<span class="sourceLineNo">041</span><a name="line.41"></a>
+<span class="sourceLineNo">042</span>   private final ObjectMap properties;<a 
name="line.42"></a>
+<span class="sourceLineNo">043</span>   private final Method javaMethod;<a 
name="line.43"></a>
+<span class="sourceLineNo">044</span>   private final Object outer;<a 
name="line.44"></a>
+<span class="sourceLineNo">045</span>   private final Object input;<a 
name="line.45"></a>
+<span class="sourceLineNo">046</span>   private InputStream inputStream;<a 
name="line.46"></a>
+<span class="sourceLineNo">047</span>   private Reader reader, 
noCloseReader;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>   private BeanPropertyMeta 
currentProperty;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>   private ClassMeta&lt;?&gt; 
currentClass;<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>
+<span class="sourceLineNo">052</span>    * Create a new session using 
properties specified in the context.<a name="line.52"></a>
+<span class="sourceLineNo">053</span>    *<a name="line.53"></a>
+<span class="sourceLineNo">054</span>    * @param ctx The context creating 
this session object.<a name="line.54"></a>
+<span class="sourceLineNo">055</span>    *    The context contains all the 
configuration settings for this object.<a name="line.55"></a>
+<span class="sourceLineNo">056</span>    * @param beanContext The bean context 
being used.<a name="line.56"></a>
+<span class="sourceLineNo">057</span>    * @param input The input.<a 
name="line.57"></a>
+<span class="sourceLineNo">058</span>    *    &lt;br&gt;For character-based 
parsers, this can be any of the following types:<a name="line.58"></a>
+<span class="sourceLineNo">059</span>    *    &lt;ul&gt;<a name="line.59"></a>
+<span class="sourceLineNo">060</span>    *       
&lt;li&gt;&lt;jk&gt;null&lt;/jk&gt;<a name="line.60"></a>
+<span class="sourceLineNo">061</span>    *       &lt;li&gt;{@link Reader}<a 
name="line.61"></a>
+<span class="sourceLineNo">062</span>    *       &lt;li&gt;{@link 
CharSequence}<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    *       &lt;li&gt;{@link InputStream} 
containing UTF-8 encoded text (or whatever the encoding specified by {@link 
ParserContext#PARSER_inputStreamCharset}).<a name="line.63"></a>
+<span class="sourceLineNo">064</span>    *       
&lt;li&gt;&lt;code&gt;&lt;jk&gt;byte&lt;/jk&gt;[]&lt;/code&gt; containing UTF-8 
encoded text (or whatever the encoding specified by {@link 
ParserContext#PARSER_inputStreamCharset}).<a name="line.64"></a>
+<span class="sourceLineNo">065</span>    *       &lt;li&gt;{@link File} 
containing system encoded text (or whatever the encoding specified by {@link 
ParserContext#PARSER_fileCharset}).<a name="line.65"></a>
+<span class="sourceLineNo">066</span>    *    &lt;/ul&gt;<a name="line.66"></a>
+<span class="sourceLineNo">067</span>    *    &lt;br&gt;For byte-based 
parsers, this can be any of the following types:<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    *    &lt;ul&gt;<a name="line.68"></a>
+<span class="sourceLineNo">069</span>    *       
&lt;li&gt;&lt;jk&gt;null&lt;/jk&gt;<a name="line.69"></a>
+<span class="sourceLineNo">070</span>    *       &lt;li&gt;{@link 
InputStream}<a name="line.70"></a>
+<span class="sourceLineNo">071</span>    *       
&lt;li&gt;&lt;code&gt;&lt;jk&gt;byte&lt;/jk&gt;[]&lt;/code&gt;<a 
name="line.71"></a>
+<span class="sourceLineNo">072</span>    *       &lt;li&gt;{@link File}<a 
name="line.72"></a>
+<span class="sourceLineNo">073</span>    *    &lt;/ul&gt;<a name="line.73"></a>
+<span class="sourceLineNo">074</span>    * @param op The override 
properties.<a name="line.74"></a>
+<span class="sourceLineNo">075</span>    *    These override any context 
properties defined in the context.<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    * @param javaMethod The java method 
that called this parser, usually the method in a REST servlet.<a 
name="line.76"></a>
+<span class="sourceLineNo">077</span>    * @param outer The outer object for 
instantiating top-level non-static inner classes.<a name="line.77"></a>
+<span class="sourceLineNo">078</span>    */<a name="line.78"></a>
+<span class="sourceLineNo">079</span>   public ParserSession(ParserContext 
ctx, BeanContext beanContext, Object input, ObjectMap op, Method javaMethod, 
Object outer) {<a name="line.79"></a>
+<span class="sourceLineNo">080</span>      super(ctx);<a name="line.80"></a>
+<span class="sourceLineNo">081</span>      if (op == null || op.isEmpty()) {<a 
name="line.81"></a>
+<span class="sourceLineNo">082</span>         debug = ctx.debug;<a 
name="line.82"></a>
+<span class="sourceLineNo">083</span>         trimStrings = ctx.trimStrings;<a 
name="line.83"></a>
+<span class="sourceLineNo">084</span>         strict = ctx.strict;<a 
name="line.84"></a>
+<span class="sourceLineNo">085</span>         inputStreamCharset = 
ctx.inputStreamCharset;<a name="line.85"></a>
+<span class="sourceLineNo">086</span>         fileCharset = ctx.fileCharset;<a 
name="line.86"></a>
+<span class="sourceLineNo">087</span>      } else {<a name="line.87"></a>
+<span class="sourceLineNo">088</span>         debug = 
op.getBoolean(PARSER_debug, ctx.debug);<a name="line.88"></a>
+<span class="sourceLineNo">089</span>         trimStrings = 
op.getBoolean(PARSER_trimStrings, ctx.trimStrings);<a name="line.89"></a>
+<span class="sourceLineNo">090</span>         strict = 
op.getBoolean(PARSER_strict, ctx.strict);<a name="line.90"></a>
+<span class="sourceLineNo">091</span>         inputStreamCharset = 
op.getString(PARSER_inputStreamCharset, ctx.inputStreamCharset);<a 
name="line.91"></a>
+<span class="sourceLineNo">092</span>         fileCharset = 
op.getString(PARSER_fileCharset, ctx.fileCharset);<a name="line.92"></a>
+<span class="sourceLineNo">093</span>      }<a name="line.93"></a>
+<span class="sourceLineNo">094</span>      this.beanContext = beanContext;<a 
name="line.94"></a>
+<span class="sourceLineNo">095</span>      this.input = input;<a 
name="line.95"></a>
+<span class="sourceLineNo">096</span>      this.properties = op;<a 
name="line.96"></a>
+<span class="sourceLineNo">097</span>      this.javaMethod = javaMethod;<a 
name="line.97"></a>
+<span class="sourceLineNo">098</span>      this.outer = outer;<a 
name="line.98"></a>
+<span class="sourceLineNo">099</span>   }<a name="line.99"></a>
+<span class="sourceLineNo">100</span><a name="line.100"></a>
+<span class="sourceLineNo">101</span>   /**<a name="line.101"></a>
+<span class="sourceLineNo">102</span>    * Wraps the specified input object 
inside an input stream.<a name="line.102"></a>
+<span class="sourceLineNo">103</span>    * Subclasses can override this method 
to implement their own input streams.<a name="line.103"></a>
+<span class="sourceLineNo">104</span>    *<a name="line.104"></a>
+<span class="sourceLineNo">105</span>    * @return The input object wrapped in 
an input stream, or &lt;jk&gt;null&lt;/jk&gt; if the object is null.<a 
name="line.105"></a>
+<span class="sourceLineNo">106</span>    * @throws ParseException If object 
could not be converted to an input stream.<a name="line.106"></a>
+<span class="sourceLineNo">107</span>    */<a name="line.107"></a>
+<span class="sourceLineNo">108</span>   public InputStream getInputStream() 
throws ParseException {<a name="line.108"></a>
+<span class="sourceLineNo">109</span>      if (input == null)<a 
name="line.109"></a>
+<span class="sourceLineNo">110</span>         return null;<a 
name="line.110"></a>
+<span class="sourceLineNo">111</span>      if (input instanceof InputStream)<a 
name="line.111"></a>
+<span class="sourceLineNo">112</span>         return (InputStream)input;<a 
name="line.112"></a>
+<span class="sourceLineNo">113</span>      if (input instanceof byte[])<a 
name="line.113"></a>
+<span class="sourceLineNo">114</span>         return new 
ByteArrayInputStream((byte[])input);<a name="line.114"></a>
+<span class="sourceLineNo">115</span>      if (input instanceof File)<a 
name="line.115"></a>
+<span class="sourceLineNo">116</span>         try {<a name="line.116"></a>
+<span class="sourceLineNo">117</span>            inputStream = new 
FileInputStream((File)input);<a name="line.117"></a>
+<span class="sourceLineNo">118</span>            return inputStream;<a 
name="line.118"></a>
+<span class="sourceLineNo">119</span>         } catch (FileNotFoundException 
e) {<a name="line.119"></a>
+<span class="sourceLineNo">120</span>            throw new 
ParseException(e);<a name="line.120"></a>
+<span class="sourceLineNo">121</span>         }<a name="line.121"></a>
+<span class="sourceLineNo">122</span>      throw new ParseException("Cannot 
convert object of type {0} to an InputStream.", input.getClass().getName());<a 
name="line.122"></a>
+<span class="sourceLineNo">123</span>   }<a name="line.123"></a>
+<span class="sourceLineNo">124</span><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>    * Wraps the specified input object 
inside a reader.<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    * Subclasses can override this method 
to implement their own readers.<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    *<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    * @return The input object wrapped in 
a Reader, or &lt;jk&gt;null&lt;/jk&gt; if the object is null.<a 
name="line.130"></a>
+<span class="sourceLineNo">131</span>    * @throws Exception If object could 
not be converted to a reader.<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    */<a name="line.132"></a>
+<span class="sourceLineNo">133</span>   public Reader getReader() throws 
Exception {<a name="line.133"></a>
+<span class="sourceLineNo">134</span>      if (input == null)<a 
name="line.134"></a>
+<span class="sourceLineNo">135</span>         return null;<a 
name="line.135"></a>
+<span class="sourceLineNo">136</span>      if (input instanceof Reader)<a 
name="line.136"></a>
+<span class="sourceLineNo">137</span>         return (Reader)input;<a 
name="line.137"></a>
+<span class="sourceLineNo">138</span>      if (input instanceof CharSequence) 
{<a name="line.138"></a>
+<span class="sourceLineNo">139</span>         if (reader == null)<a 
name="line.139"></a>
+<span class="sourceLineNo">140</span>            reader = new 
ParserReader((CharSequence)input);<a name="line.140"></a>
+<span class="sourceLineNo">141</span>         return reader;<a 
name="line.141"></a>
+<span class="sourceLineNo">142</span>      }<a name="line.142"></a>
+<span class="sourceLineNo">143</span>      if (input instanceof InputStream || 
input instanceof byte[]) {<a name="line.143"></a>
+<span class="sourceLineNo">144</span>         InputStream is = (input 
instanceof InputStream ? (InputStream)input : new 
ByteArrayInputStream((byte[])input));<a name="line.144"></a>
+<span class="sourceLineNo">145</span>         if (noCloseReader == null) {<a 
name="line.145"></a>
+<span class="sourceLineNo">146</span>            CharsetDecoder cd = 
("default".equalsIgnoreCase(inputStreamCharset) ? Charset.defaultCharset() : 
Charset.forName(inputStreamCharset)).newDecoder();<a name="line.146"></a>
+<span class="sourceLineNo">147</span>            if (strict) {<a 
name="line.147"></a>
+<span class="sourceLineNo">148</span>               
cd.onMalformedInput(CodingErrorAction.REPORT);<a name="line.148"></a>
+<span class="sourceLineNo">149</span>               
cd.onUnmappableCharacter(CodingErrorAction.REPORT);<a name="line.149"></a>
+<span class="sourceLineNo">150</span>            } else {<a 
name="line.150"></a>
+<span class="sourceLineNo">151</span>               
cd.onMalformedInput(CodingErrorAction.REPLACE);<a name="line.151"></a>
+<span class="sourceLineNo">152</span>               
cd.onUnmappableCharacter(CodingErrorAction.REPLACE);<a name="line.152"></a>
+<span class="sourceLineNo">153</span>            }<a name="line.153"></a>
+<span class="sourceLineNo">154</span>            noCloseReader = new 
InputStreamReader(is, cd);<a name="line.154"></a>
+<span class="sourceLineNo">155</span>         }<a name="line.155"></a>
+<span class="sourceLineNo">156</span>         return noCloseReader;<a 
name="line.156"></a>
+<span class="sourceLineNo">157</span>      }<a name="line.157"></a>
+<span class="sourceLineNo">158</span>      if (input instanceof File) {<a 
name="line.158"></a>
+<span class="sourceLineNo">159</span>         if (reader == null) {<a 
name="line.159"></a>
+<span class="sourceLineNo">160</span>            CharsetDecoder cd = 
("default".equalsIgnoreCase(fileCharset) ? Charset.defaultCharset() : 
Charset.forName(fileCharset)).newDecoder();<a name="line.160"></a>
+<span class="sourceLineNo">161</span>            if (strict) {<a 
name="line.161"></a>
+<span class="sourceLineNo">162</span>               
cd.onMalformedInput(CodingErrorAction.REPORT);<a name="line.162"></a>
+<span class="sourceLineNo">163</span>               
cd.onUnmappableCharacter(CodingErrorAction.REPORT);<a name="line.163"></a>
+<span class="sourceLineNo">164</span>            } else {<a 
name="line.164"></a>
+<span class="sourceLineNo">165</span>               
cd.onMalformedInput(CodingErrorAction.REPLACE);<a name="line.165"></a>
+<span class="sourceLineNo">166</span>               
cd.onUnmappableCharacter(CodingErrorAction.REPLACE);<a name="line.166"></a>
+<span class="sourceLineNo">167</span>            }<a name="line.167"></a>
+<span class="sourceLineNo">168</span>            reader = new 
InputStreamReader(new FileInputStream((File)input), cd);<a name="line.168"></a>
+<span class="sourceLineNo">169</span>         }<a name="line.169"></a>
+<span class="sourceLineNo">170</span>         return reader;<a 
name="line.170"></a>
+<span class="sourceLineNo">171</span>      }<a name="line.171"></a>
+<span class="sourceLineNo">172</span>      throw new ParseException("Cannot 
convert object of type {0} to a Reader.", input.getClass().getName());<a 
name="line.172"></a>
+<span class="sourceLineNo">173</span>   }<a name="line.173"></a>
+<span class="sourceLineNo">174</span><a name="line.174"></a>
+<span class="sourceLineNo">175</span>   /**<a name="line.175"></a>
+<span class="sourceLineNo">176</span>    * Returns information used to 
determine at what location in the parse a failure occurred.<a 
name="line.176"></a>
+<span class="sourceLineNo">177</span>    *<a name="line.177"></a>
+<span class="sourceLineNo">178</span>    * @return A map, typically containing 
something like 
&lt;code&gt;{line:123,column:456,currentProperty:"foobar"}&lt;/code&gt;<a 
name="line.178"></a>
+<span class="sourceLineNo">179</span>    */<a name="line.179"></a>
+<span class="sourceLineNo">180</span>   public Map&lt;String,Object&gt; 
getLastLocation() {<a name="line.180"></a>
+<span class="sourceLineNo">181</span>      Map&lt;String,Object&gt; m = new 
LinkedHashMap&lt;String,Object&gt;();<a name="line.181"></a>
+<span class="sourceLineNo">182</span>      if (currentClass != null)<a 
name="line.182"></a>
+<span class="sourceLineNo">183</span>         m.put("currentClass", 
currentClass.toString(true));<a name="line.183"></a>
+<span class="sourceLineNo">184</span>      if (currentProperty != null)<a 
name="line.184"></a>
+<span class="sourceLineNo">185</span>         m.put("currentProperty", 
currentProperty);<a name="line.185"></a>
+<span class="sourceLineNo">186</span>      return m;<a name="line.186"></a>
+<span class="sourceLineNo">187</span>   }<a name="line.187"></a>
+<span class="sourceLineNo">188</span><a name="line.188"></a>
+<span class="sourceLineNo">189</span>   /**<a name="line.189"></a>
+<span class="sourceLineNo">190</span>    * Returns the raw input object passed 
into this session.<a name="line.190"></a>
+<span class="sourceLineNo">191</span>    *<a name="line.191"></a>
+<span class="sourceLineNo">192</span>    * @return The raw input object passed 
into this session.<a name="line.192"></a>
+<span class="sourceLineNo">193</span>    */<a name="line.193"></a>
+<span class="sourceLineNo">194</span>   protected Object getInput() {<a 
name="line.194"></a>
+<span class="sourceLineNo">195</span>      return input;<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>    * Returns the bean context in use for 
this session.<a name="line.199"></a>
+<span class="sourceLineNo">200</span>    *<a name="line.200"></a>
+<span class="sourceLineNo">201</span>    * @return The bean context in use for 
this session.<a name="line.201"></a>
+<span class="sourceLineNo">202</span>    */<a name="line.202"></a>
+<span class="sourceLineNo">203</span>   public final BeanContext 
getBeanContext() {<a name="line.203"></a>
+<span class="sourceLineNo">204</span>      return beanContext;<a 
name="line.204"></a>
+<span class="sourceLineNo">205</span>   }<a name="line.205"></a>
+<span class="sourceLineNo">206</span><a name="line.206"></a>
+<span class="sourceLineNo">207</span>   /**<a name="line.207"></a>
+<span class="sourceLineNo">208</span>    * Returns the Java method that 
invoked this parser.<a name="line.208"></a>
+<span class="sourceLineNo">209</span>    * &lt;p&gt;<a name="line.209"></a>
+<span class="sourceLineNo">210</span>    * When using the REST API, this is 
the Java method invoked by the REST call.<a name="line.210"></a>
+<span class="sourceLineNo">211</span>    * Can be used to access annotations 
defined on the method or class.<a name="line.211"></a>
+<span class="sourceLineNo">212</span>    *<a name="line.212"></a>
+<span class="sourceLineNo">213</span>    * @return The Java method that 
invoked this parser.<a name="line.213"></a>
+<span class="sourceLineNo">214</span>   */<a name="line.214"></a>
+<span class="sourceLineNo">215</span>   public final Method getJavaMethod() 
{<a name="line.215"></a>
+<span class="sourceLineNo">216</span>      return javaMethod;<a 
name="line.216"></a>
+<span class="sourceLineNo">217</span>   }<a name="line.217"></a>
+<span class="sourceLineNo">218</span><a name="line.218"></a>
+<span class="sourceLineNo">219</span>   /**<a name="line.219"></a>
+<span class="sourceLineNo">220</span>    * Returns the outer object used for 
instantiating top-level non-static member classes.<a name="line.220"></a>
+<span class="sourceLineNo">221</span>    * When using the REST API, this is 
the servlet object.<a name="line.221"></a>
+<span class="sourceLineNo">222</span>    *<a name="line.222"></a>
+<span class="sourceLineNo">223</span>    * @return The outer object.<a 
name="line.223"></a>
+<span class="sourceLineNo">224</span>   */<a name="line.224"></a>
+<span class="sourceLineNo">225</span>   public final Object getOuter() {<a 
name="line.225"></a>
+<span class="sourceLineNo">226</span>      return outer;<a name="line.226"></a>
+<span class="sourceLineNo">227</span>   }<a name="line.227"></a>
+<span class="sourceLineNo">228</span><a name="line.228"></a>
+<span class="sourceLineNo">229</span>   /**<a name="line.229"></a>
+<span class="sourceLineNo">230</span>    * Sets the current bean property 
being parsed for proper error messages.<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    * @param currentProperty The current 
property being parsed.<a name="line.231"></a>
+<span class="sourceLineNo">232</span>    */<a name="line.232"></a>
+<span class="sourceLineNo">233</span>   public void 
setCurrentProperty(BeanPropertyMeta currentProperty) {<a name="line.233"></a>
+<span class="sourceLineNo">234</span>      this.currentProperty = 
currentProperty;<a name="line.234"></a>
+<span class="sourceLineNo">235</span>   }<a name="line.235"></a>
+<span class="sourceLineNo">236</span><a name="line.236"></a>
+<span class="sourceLineNo">237</span>   /**<a name="line.237"></a>
+<span class="sourceLineNo">238</span>    * Sets the current class being parsed 
for proper error messages.<a name="line.238"></a>
+<span class="sourceLineNo">239</span>    * @param currentClass The current 
class being parsed.<a name="line.239"></a>
+<span class="sourceLineNo">240</span>    */<a name="line.240"></a>
+<span class="sourceLineNo">241</span>   public void 
setCurrentClass(ClassMeta&lt;?&gt; currentClass) {<a name="line.241"></a>
+<span class="sourceLineNo">242</span>      this.currentClass = currentClass;<a 
name="line.242"></a>
+<span class="sourceLineNo">243</span>   }<a name="line.243"></a>
+<span class="sourceLineNo">244</span><a name="line.244"></a>
+<span class="sourceLineNo">245</span>   /**<a name="line.245"></a>
+<span class="sourceLineNo">246</span>    * Returns the {@link 
ParserContext#PARSER_debug} setting value for this session.<a 
name="line.246"></a>
+<span class="sourceLineNo">247</span>    *<a name="line.247"></a>
+<span class="sourceLineNo">248</span>    * @return The {@link 
ParserContext#PARSER_debug} setting value for this session.<a 
name="line.248"></a>
 <span class="sourceLineNo">249</span>    */<a name="line.249"></a>
-<span class="sourceLineNo">250</span>   public void addWarning(String msg, 
Object... args) {<a name="line.250"></a>
-<span class="sourceLineNo">251</span>      logger.warning(msg, args);<a 
name="line.251"></a>
-<span class="sourceLineNo">252</span>      msg = args.length == 0 ? msg : 
String.format(msg, args);<a name="line.252"></a>
-<span class="sourceLineNo">253</span>      warnings.add((warnings.size() + 1) 
+ ": " + msg);<a name="line.253"></a>
-<span class="sourceLineNo">254</span>   }<a name="line.254"></a>
-<span class="sourceLineNo">255</span><a name="line.255"></a>
-<span class="sourceLineNo">256</span>   /**<a name="line.256"></a>
-<span class="sourceLineNo">257</span>    * Trims the specified object if it's 
a &lt;code&gt;String&lt;/code&gt; and {@link #isTrimStrings()} returns 
&lt;jk&gt;true&lt;/jk&gt;.<a name="line.257"></a>
-<span class="sourceLineNo">258</span>    *<a name="line.258"></a>
-<span class="sourceLineNo">259</span>    * @param o The object to trim.<a 
name="line.259"></a>
-<span class="sourceLineNo">260</span>    * @return The trimmmed string if it's 
a string.<a name="line.260"></a>
-<span class="sourceLineNo">261</span>    */<a name="line.261"></a>
-<span class="sourceLineNo">262</span>   @SuppressWarnings("unchecked")<a 
name="line.262"></a>
-<span class="sourceLineNo">263</span>   public final &lt;K&gt; K trim(K o) {<a 
name="line.263"></a>
-<span class="sourceLineNo">264</span>      if (trimStrings &amp;&amp; o 
instanceof String)<a name="line.264"></a>
-<span class="sourceLineNo">265</span>         return (K)o.toString().trim();<a 
name="line.265"></a>
-<span class="sourceLineNo">266</span>      return o;<a name="line.266"></a>
-<span class="sourceLineNo">267</span><a name="line.267"></a>
-<span class="sourceLineNo">268</span>   }<a name="line.268"></a>
-<span class="sourceLineNo">269</span><a name="line.269"></a>
-<span class="sourceLineNo">270</span>   /**<a name="line.270"></a>
-<span class="sourceLineNo">271</span>    * Trims the specified string if 
{@link ParserSession#isTrimStrings()} returns &lt;jk&gt;true&lt;/jk&gt;.<a 
name="line.271"></a>
-<span class="sourceLineNo">272</span>    *<a name="line.272"></a>
-<span class="sourceLineNo">273</span>    * @param s The input string to 
trim.<a name="line.273"></a>
-<span class="sourceLineNo">274</span>    * @return The trimmed string, or 
&lt;jk&gt;null&lt;/jk&gt; if the input was &lt;jk&gt;null&lt;/jk&gt;.<a 
name="line.274"></a>
-<span class="sourceLineNo">275</span>    */<a name="line.275"></a>
-<span class="sourceLineNo">276</span>   public final String trim(String s) {<a 
name="line.276"></a>
-<span class="sourceLineNo">277</span>      if (trimStrings &amp;&amp; s != 
null)<a name="line.277"></a>
-<span class="sourceLineNo">278</span>         return s.trim();<a 
name="line.278"></a>
-<span class="sourceLineNo">279</span>      return s;<a name="line.279"></a>
-<span class="sourceLineNo">280</span>   }<a name="line.280"></a>
-<span class="sourceLineNo">281</span><a name="line.281"></a>
-<span class="sourceLineNo">282</span>   /**<a name="line.282"></a>
-<span class="sourceLineNo">283</span>    * Perform cleanup on this context 
object if necessary.<a name="line.283"></a>
-<span class="sourceLineNo">284</span>    *<a name="line.284"></a>
-<span class="sourceLineNo">285</span>    * @throws ParseException If called 
more than once, or in debug mode and warnings occurred.<a name="line.285"></a>
+<span class="sourceLineNo">250</span>   public final boolean isDebug() {<a 
name="line.250"></a>
+<span class="sourceLineNo">251</span>      return debug;<a name="line.251"></a>
+<span class="sourceLineNo">252</span>   }<a name="line.252"></a>
+<span class="sourceLineNo">253</span><a name="line.253"></a>
+<span class="sourceLineNo">254</span>   /**<a name="line.254"></a>
+<span class="sourceLineNo">255</span>    * Returns the {@link 
ParserContext#PARSER_trimStrings} setting value for this session.<a 
name="line.255"></a>
+<span class="sourceLineNo">256</span>    *<a name="line.256"></a>
+<span class="sourceLineNo">257</span>    * @return The {@link 
ParserContext#PARSER_trimStrings} setting value for this session.<a 
name="line.257"></a>
+<span class="sourceLineNo">258</span>    */<a name="line.258"></a>
+<span class="sourceLineNo">259</span>   public final boolean isTrimStrings() 
{<a name="line.259"></a>
+<span class="sourceLineNo">260</span>      return trimStrings;<a 
name="line.260"></a>
+<span class="sourceLineNo">261</span>   }<a name="line.261"></a>
+<span class="sourceLineNo">262</span><a name="line.262"></a>
+<span class="sourceLineNo">263</span>   /**<a name="line.263"></a>
+<span class="sourceLineNo">264</span>    * Returns the {@link 
ParserContext#PARSER_strict} setting value for this session.<a 
name="line.264"></a>
+<span class="sourceLineNo">265</span>    *<a name="line.265"></a>
+<span class="sourceLineNo">266</span>    * @return The {@link 
ParserContext#PARSER_strict} setting value for this session.<a 
name="line.266"></a>
+<span class="sourceLineNo">267</span>    */<a name="line.267"></a>
+<span class="sourceLineNo">268</span>   public final boolean isStrict() {<a 
name="line.268"></a>
+<span class="sourceLineNo">269</span>      return strict;<a 
name="line.269"></a>
+<span class="sourceLineNo">270</span>   }<a name="line.270"></a>
+<span class="sourceLineNo">271</span><a name="line.271"></a>
+<span class="sourceLineNo">272</span>   /**<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    * Returns the runtime properties 
associated with this context.<a name="line.273"></a>
+<span class="sourceLineNo">274</span>    *<a name="line.274"></a>
+<span class="sourceLineNo">275</span>    * @return The runtime properties 
associated with this context.<a name="line.275"></a>
+<span class="sourceLineNo">276</span>    */<a name="line.276"></a>
+<span class="sourceLineNo">277</span>   public final ObjectMap getProperties() 
{<a name="line.277"></a>
+<span class="sourceLineNo">278</span>      return properties;<a 
name="line.278"></a>
+<span class="sourceLineNo">279</span>   }<a name="line.279"></a>
+<span class="sourceLineNo">280</span><a name="line.280"></a>
+<span class="sourceLineNo">281</span>   /**<a name="line.281"></a>
+<span class="sourceLineNo">282</span>    * Logs a warning message.<a 
name="line.282"></a>
+<span class="sourceLineNo">283</span>    *<a name="line.283"></a>
+<span class="sourceLineNo">284</span>    * @param msg The warning message.<a 
name="line.284"></a>
+<span class="sourceLineNo">285</span>    * @param args Optional printf 
arguments to replace in the error message.<a name="line.285"></a>
 <span class="sourceLineNo">286</span>    */<a name="line.286"></a>
-<span class="sourceLineNo">287</span>   public void close() throws 
ParseException {<a name="line.287"></a>
-<span class="sourceLineNo">288</span>      if (closed)<a name="line.288"></a>
-<span class="sourceLineNo">289</span>         throw new 
ParseException("Attempt to close ParserSession more than once.");<a 
name="line.289"></a>
-<span class="sourceLineNo">290</span><a name="line.290"></a>
-<span class="sourceLineNo">291</span>      try {<a name="line.291"></a>
-<span class="sourceLineNo">292</span>         if (inputStream != null)<a 
name="line.292"></a>
-<span class="sourceLineNo">293</span>            inputStream.close();<a 
name="line.293"></a>
-<span class="sourceLineNo">294</span>         if (reader != null)<a 
name="line.294"></a>
-<span class="sourceLineNo">295</span>            reader.close();<a 
name="line.295"></a>
-<span class="sourceLineNo">296</span>      } catch (IOException e) {<a 
name="line.296"></a>
-<span class="sourceLineNo">297</span>         throw new ParseException(e);<a 
name="line.297"></a>
-<span class="sourceLineNo">298</span>      }<a name="line.298"></a>
-<span class="sourceLineNo">299</span><a name="line.299"></a>
-<span class="sourceLineNo">300</span>      if (debug &amp;&amp; 
warnings.size() &gt; 0)<a name="line.300"></a>
-<span class="sourceLineNo">301</span>         throw new 
ParseException("Warnings occurred during parsing: \n" + 
StringUtils.join(warnings, "\n"));<a name="line.301"></a>
-<span class="sourceLineNo">302</span>      closed = true;<a 
name="line.302"></a>
-<span class="sourceLineNo">303</span>   }<a name="line.303"></a>
+<span class="sourceLineNo">287</span>   public void addWarning(String msg, 
Object... args) {<a name="line.287"></a>
+<span class="sourceLineNo">288</span>      logger.warning(msg, args);<a 
name="line.288"></a>
+<span class="sourceLineNo">289</span>      msg = args.length == 0 ? msg : 
String.format(msg, args);<a name="line.289"></a>
+<span class="sourceLineNo">290</span>      warnings.add((warnings.size() + 1) 
+ ": " + msg);<a name="line.290"></a>
+<span class="sourceLineNo">291</span>   }<a name="line.291"></a>
+<span class="sourceLineNo">292</span><a name="line.292"></a>
+<span class="sourceLineNo">293</span>   /**<a name="line.293"></a>
+<span class="sourceLineNo">294</span>    * Trims the specified object if it's 
a &lt;code&gt;String&lt;/code&gt; and {@link #isTrimStrings()} returns 
&lt;jk&gt;true&lt;/jk&gt;.<a name="line.294"></a>
+<span class="sourceLineNo">295</span>    *<a name="line.295"></a>
+<span class="sourceLineNo">296</span>    * @param o The object to trim.<a 
name="line.296"></a>
+<span class="sourceLineNo">297</span>    * @return The trimmmed string if it's 
a string.<a name="line.297"></a>
+<span class="sourceLineNo">298</span>    */<a name="line.298"></a>
+<span class="sourceLineNo">299</span>   @SuppressWarnings("unchecked")<a 
name="line.299"></a>
+<span class="sourceLineNo">300</span>   public final &lt;K&gt; K trim(K o) {<a 
name="line.300"></a>
+<span class="sourceLineNo">301</span>      if (trimStrings &amp;&amp; o 
instanceof String)<a name="line.301"></a>
+<span class="sourceLineNo">302</span>         return (K)o.toString().trim();<a 
name="line.302"></a>
+<span class="sourceLineNo">303</span>      return o;<a name="line.303"></a>
 <span class="sourceLineNo">304</span><a name="line.304"></a>
-<span class="sourceLineNo">305</span>   @Override /* Object */<a 
name="line.305"></a>
-<span class="sourceLineNo">306</span>   protected void finalize() throws 
Throwable {<a name="line.306"></a>
-<span class="sourceLineNo">307</span>      if (! closed)<a name="line.307"></a>
-<span class="sourceLineNo">308</span>         throw new 
RuntimeException("ParserSession was not closed.");<a name="line.308"></a>
-<span class="sourceLineNo">309</span>   }<a name="line.309"></a>
-<span class="sourceLineNo">310</span>}<a name="line.310"></a>
+<span class="sourceLineNo">305</span>   }<a name="line.305"></a>
+<span class="sourceLineNo">306</span><a name="line.306"></a>
+<span class="sourceLineNo">307</span>   /**<a name="line.307"></a>
+<span class="sourceLineNo">308</span>    * Trims the specified string if 
{@link ParserSession#isTrimStrings()} returns &lt;jk&gt;true&lt;/jk&gt;.<a 
name="line.308"></a>
+<span class="sourceLineNo">309</span>    *<a name="line.309"></a>
+<span class="sourceLineNo">310</span>    * @param s The input string to 
trim.<a name="line.310"></a>
+<span class="sourceLineNo">311</span>    * @return The trimmed string, or 
&lt;jk&gt;null&lt;/jk&gt; if the input was &lt;jk&gt;null&lt;/jk&gt;.<a 
name="line.311"></a>
+<span class="sourceLineNo">312</span>    */<a name="line.312"></a>
+<span class="sourceLineNo">313</span>   public final String trim(String s) {<a 
name="line.313"></a>
+<span class="sourceLineNo">314</span>      if (trimStrings &amp;&amp; s != 
null)<a name="line.314"></a>
+<span class="sourceLineNo">315</span>         return s.trim();<a 
name="line.315"></a>
+<span class="sourceLineNo">316</span>      return s;<a name="line.316"></a>
+<span class="sourceLineNo">317</span>   }<a name="line.317"></a>
+<span class="sourceLineNo">318</span><a name="line.318"></a>
+<span class="sourceLineNo">319</span>   /**<a name="line.319"></a>
+<span class="sourceLineNo">320</span>    * Perform cleanup on this context 
object if necessary.<a name="line.320"></a>
+<span class="sourceLineNo">321</span>    *<a name="line.321"></a>
+<span class="sourceLineNo">322</span>    * @throws ParseException If called 
more than once, or in debug mode and warnings occurred.<a name="line.322"></a>
+<span class="sourceLineNo">323</span>    */<a name="line.323"></a>
+<span class="sourceLineNo">324</span>   public void close() throws 
ParseException {<a name="line.324"></a>
+<span class="sourceLineNo">325</span>      if (closed)<a name="line.325"></a>
+<span class="sourceLineNo">326</span>         throw new 
ParseException("Attempt to close ParserSession more than once.");<a 
name="line.326"></a>
+<span class="sourceLineNo">327</span><a name="line.327"></a>
+<span class="sourceLineNo">328</span>      try {<a name="line.328"></a>
+<span class="sourceLineNo">329</span>         if (inputStream != null)<a 
name="line.329"></a>
+<span class="sourceLineNo">330</span>            inputStream.close();<a 
name="line.330"></a>
+<span class="sourceLineNo">331</span>         if (reader != null)<a 
name="line.331"></a>
+<span class="sourceLineNo">332</span>            reader.close();<a 
name="line.332"></a>
+<span class="sourceLineNo">333</span>      } catch (IOException e) {<a 
name="line.333"></a>
+<span class="sourceLineNo">334</span>         throw new ParseException(e);<a 
name="line.334"></a>
+<span class="sourceLineNo">335</span>      }<a name="line.335"></a>
+<span class="sourceLineNo">336</span><a name="line.336"></a>
+<span class="sourceLineNo">337</span>      if (debug &amp;&amp; 
warnings.size() &gt; 0)<a name="line.337"></a>
+<span class="sourceLineNo">338</span>         throw new 
ParseException("Warnings occurred during parsing: \n" + 
StringUtils.join(warnings, "\n"));<a name="line.338"></a>
+<span class="sourceLineNo">339</span>      closed = true;<a 
name="line.339"></a>
+<span class="sourceLineNo">340</span>   }<a name="line.340"></a>
+<span class="sourceLineNo">341</span><a name="line.341"></a>
+<span class="sourceLineNo">342</span>   @Override /* Object */<a 
name="line.342"></a>
+<span class="sourceLineNo">343</span>   protected void finalize() throws 
Throwable {<a name="line.343"></a>
+<span class="sourceLineNo">344</span>      if (! closed)<a name="line.344"></a>
+<span class="sourceLineNo">345</span>         throw new 
RuntimeException("ParserSession was not closed.");<a name="line.345"></a>
+<span class="sourceLineNo">346</span>   }<a name="line.346"></a>
+<span class="sourceLineNo">347</span>}<a name="line.347"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/02c10736/content/site/apidocs/src-html/org/apache/juneau/server/RestServlet.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/server/RestServlet.html 
b/content/site/apidocs/src-html/org/apache/juneau/server/RestServlet.html
index cb581ed..a44e41f 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/server/RestServlet.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/server/RestServlet.html
@@ -127,7 +127,7 @@
 <span class="sourceLineNo">119</span>   private String[] 
staticFilesPrefixes;<a name="line.119"></a>
 <span class="sourceLineNo">120</span>   private ResponseHandler[] 
responseHandlers;<a name="line.120"></a>
 <span class="sourceLineNo">121</span>   private String clientVersionHeader = 
"";<a name="line.121"></a>
-<span class="sourceLineNo">122</span>   private Map&lt;Locale,Swagger&gt; 
swaggers = new ConcurrentHashMap&lt;Locale,Swagger&gt;();<a name="line.122"></a>
+<span class="sourceLineNo">122</span>   private 
ConcurrentHashMap&lt;Locale,Swagger&gt; swaggers = new 
ConcurrentHashMap&lt;Locale,Swagger&gt;();<a name="line.122"></a>
 <span class="sourceLineNo">123</span><a name="line.123"></a>
 <span class="sourceLineNo">124</span>   RestServletContext context;<a 
name="line.124"></a>
 <span class="sourceLineNo">125</span><a name="line.125"></a>

Reply via email to