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/05/21 09:02:56 UTC

[03/39] incubator-juneau-website git commit: Javadoc updates.

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/uon/UonWriter.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/uon/UonWriter.html b/content/site/apidocs/src-html/org/apache/juneau/uon/UonWriter.html
index 4c30f4e..9615c0a 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/uon/UonWriter.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/uon/UonWriter.html
@@ -22,255 +22,258 @@
 <span class="sourceLineNo">014</span><a name="line.14"></a>
 <span class="sourceLineNo">015</span>import java.io.*;<a name="line.15"></a>
 <span class="sourceLineNo">016</span><a name="line.16"></a>
-<span class="sourceLineNo">017</span>import org.apache.juneau.internal.*;<a name="line.17"></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> * Specialized writer for serializing UON-encoded text.<a name="line.21"></a>
-<span class="sourceLineNo">022</span> * &lt;p&gt;<a name="line.22"></a>
-<span class="sourceLineNo">023</span> * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.23"></a>
-<span class="sourceLineNo">024</span> * &lt;ul&gt;<a name="line.24"></a>
-<span class="sourceLineNo">025</span> *    &lt;li&gt;This class is not intended for external use.<a name="line.25"></a>
-<span class="sourceLineNo">026</span> * &lt;/ul&gt;<a name="line.26"></a>
-<span class="sourceLineNo">027</span> */<a name="line.27"></a>
-<span class="sourceLineNo">028</span>public final class UonWriter extends SerializerWriter {<a name="line.28"></a>
-<span class="sourceLineNo">029</span><a name="line.29"></a>
-<span class="sourceLineNo">030</span>   private final UonSerializerSession session;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>   private final boolean encodeChars;<a name="line.31"></a>
-<span class="sourceLineNo">032</span><a name="line.32"></a>
-<span class="sourceLineNo">033</span>   // Characters that do not need to be URL-encoded in strings.<a name="line.33"></a>
-<span class="sourceLineNo">034</span>   private static final AsciiSet unencodedChars = new AsciiSet("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789;/?:@-_.!*'$(),~=");<a name="line.34"></a>
-<span class="sourceLineNo">035</span><a name="line.35"></a>
-<span class="sourceLineNo">036</span>   // Characters that do not need to be URL-encoded in attribute names.<a name="line.36"></a>
-<span class="sourceLineNo">037</span>   // Identical to unencodedChars, but excludes '='.<a name="line.37"></a>
-<span class="sourceLineNo">038</span>   private static final AsciiSet unencodedCharsAttrName = new AsciiSet("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789;/?:@-_.!*'$(),~");<a name="line.38"></a>
-<span class="sourceLineNo">039</span><a name="line.39"></a>
-<span class="sourceLineNo">040</span>   // Characters that need to be preceeded with an escape character.<a name="line.40"></a>
-<span class="sourceLineNo">041</span>   private static final AsciiSet escapedChars = new AsciiSet("~'");<a name="line.41"></a>
-<span class="sourceLineNo">042</span><a name="line.42"></a>
-<span class="sourceLineNo">043</span>   private static final AsciiSet noChars = new AsciiSet("");<a name="line.43"></a>
-<span class="sourceLineNo">044</span><a name="line.44"></a>
-<span class="sourceLineNo">045</span>   private static char[] hexArray = "0123456789ABCDEF".toCharArray();<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>    * Constructor.<a name="line.48"></a>
-<span class="sourceLineNo">049</span>    *<a name="line.49"></a>
-<span class="sourceLineNo">050</span>    * @param session The session that created this writer.<a name="line.50"></a>
-<span class="sourceLineNo">051</span>    * @param out The writer being wrapped.<a name="line.51"></a>
-<span class="sourceLineNo">052</span>    * @param useWhitespace If &lt;jk&gt;true&lt;/jk&gt;, tabs will be used in output.<a name="line.52"></a>
-<span class="sourceLineNo">053</span>    * @param encodeChars If &lt;jk&gt;true&lt;/jk&gt;, special characters should be encoded.<a name="line.53"></a>
-<span class="sourceLineNo">054</span>    * @param trimStrings If &lt;jk&gt;true&lt;/jk&gt;, strings should be trimmed before they're serialized.<a name="line.54"></a>
-<span class="sourceLineNo">055</span>    * @param relativeUriBase The base (e.g. &lt;js&gt;https://localhost:9443/contextPath"&lt;/js&gt;) for relative URIs (e.g. &lt;js&gt;"my/path"&lt;/js&gt;).<a name="line.55"></a>
-<span class="sourceLineNo">056</span>    * @param absolutePathUriBase The base (e.g. &lt;js&gt;https://localhost:9443"&lt;/js&gt;) for relative URIs with absolute paths (e.g. &lt;js&gt;"/contextPath/my/path"&lt;/js&gt;).<a name="line.56"></a>
-<span class="sourceLineNo">057</span>    */<a name="line.57"></a>
-<span class="sourceLineNo">058</span>   protected UonWriter(UonSerializerSession session, Writer out, boolean useWhitespace, boolean encodeChars, boolean trimStrings, String relativeUriBase, String absolutePathUriBase) {<a name="line.58"></a>
-<span class="sourceLineNo">059</span>      super(out, useWhitespace, trimStrings, '\'', relativeUriBase, absolutePathUriBase);<a name="line.59"></a>
-<span class="sourceLineNo">060</span>      this.session = session;<a name="line.60"></a>
-<span class="sourceLineNo">061</span>      this.encodeChars = encodeChars;<a name="line.61"></a>
-<span class="sourceLineNo">062</span>   }<a name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span>   /**<a name="line.64"></a>
-<span class="sourceLineNo">065</span>    * Serializes the specified simple object as a UON string value.<a name="line.65"></a>
-<span class="sourceLineNo">066</span>    *<a name="line.66"></a>
-<span class="sourceLineNo">067</span>    * @param o The object being serialized.<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    * @param isTopAttrName If this is a top-level attribute name we're serializing.<a name="line.68"></a>
-<span class="sourceLineNo">069</span>    * @param plainTextParams This is a top-level name or parameter we're serializing and the parameter format is PLAINTEXT.<a name="line.69"></a>
-<span class="sourceLineNo">070</span>    * @return This object (for method chaining).<a name="line.70"></a>
-<span class="sourceLineNo">071</span>    * @throws IOException Should never happen.<a name="line.71"></a>
-<span class="sourceLineNo">072</span>    */<a name="line.72"></a>
-<span class="sourceLineNo">073</span>   public final UonWriter appendObject(Object o, boolean isTopAttrName, boolean plainTextParams) throws IOException {<a name="line.73"></a>
-<span class="sourceLineNo">074</span><a name="line.74"></a>
-<span class="sourceLineNo">075</span>      if (o instanceof Boolean)<a name="line.75"></a>
-<span class="sourceLineNo">076</span>         return appendBoolean(o);<a name="line.76"></a>
-<span class="sourceLineNo">077</span>      if (o instanceof Number)<a name="line.77"></a>
-<span class="sourceLineNo">078</span>         return appendNumber(o);<a name="line.78"></a>
-<span class="sourceLineNo">079</span>      if (o == null)<a name="line.79"></a>
-<span class="sourceLineNo">080</span>         return append("null");<a name="line.80"></a>
-<span class="sourceLineNo">081</span><a name="line.81"></a>
-<span class="sourceLineNo">082</span>      String s = session.toString(o);<a name="line.82"></a>
-<span class="sourceLineNo">083</span><a name="line.83"></a>
-<span class="sourceLineNo">084</span>      boolean needsQuotes = (! plainTextParams) &amp;&amp; UonUtils.needsQuotes(s);<a name="line.84"></a>
-<span class="sourceLineNo">085</span><a name="line.85"></a>
-<span class="sourceLineNo">086</span>      AsciiSet unenc = (isTopAttrName ? unencodedCharsAttrName : unencodedChars);<a name="line.86"></a>
-<span class="sourceLineNo">087</span>      AsciiSet esc = plainTextParams ? noChars : escapedChars;<a name="line.87"></a>
+<span class="sourceLineNo">017</span>import org.apache.juneau.*;<a name="line.17"></a>
+<span class="sourceLineNo">018</span>import org.apache.juneau.internal.*;<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> * Specialized writer for serializing UON-encoded text.<a name="line.22"></a>
+<span class="sourceLineNo">023</span> * &lt;p&gt;<a name="line.23"></a>
+<span class="sourceLineNo">024</span> * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.24"></a>
+<span class="sourceLineNo">025</span> * &lt;ul&gt;<a name="line.25"></a>
+<span class="sourceLineNo">026</span> *    &lt;li&gt;This class is not intended for external use.<a name="line.26"></a>
+<span class="sourceLineNo">027</span> * &lt;/ul&gt;<a name="line.27"></a>
+<span class="sourceLineNo">028</span> */<a name="line.28"></a>
+<span class="sourceLineNo">029</span>public final class UonWriter extends SerializerWriter {<a name="line.29"></a>
+<span class="sourceLineNo">030</span><a name="line.30"></a>
+<span class="sourceLineNo">031</span>   private final UonSerializerSession session;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>   private final boolean encodeChars;<a name="line.32"></a>
+<span class="sourceLineNo">033</span><a name="line.33"></a>
+<span class="sourceLineNo">034</span>   // Characters that do not need to be URL-encoded in strings.<a name="line.34"></a>
+<span class="sourceLineNo">035</span>   private static final AsciiSet unencodedChars = new AsciiSet("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789;/?:@-_.!*'$(),~=");<a name="line.35"></a>
+<span class="sourceLineNo">036</span><a name="line.36"></a>
+<span class="sourceLineNo">037</span>   // Characters that do not need to be URL-encoded in attribute names.<a name="line.37"></a>
+<span class="sourceLineNo">038</span>   // Identical to unencodedChars, but excludes '='.<a name="line.38"></a>
+<span class="sourceLineNo">039</span>   private static final AsciiSet unencodedCharsAttrName = new AsciiSet("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789;/?:@-_.!*'$(),~");<a name="line.39"></a>
+<span class="sourceLineNo">040</span><a name="line.40"></a>
+<span class="sourceLineNo">041</span>   // Characters that need to be preceeded with an escape character.<a name="line.41"></a>
+<span class="sourceLineNo">042</span>   private static final AsciiSet escapedChars = new AsciiSet("~'");<a name="line.42"></a>
+<span class="sourceLineNo">043</span><a name="line.43"></a>
+<span class="sourceLineNo">044</span>   private static final AsciiSet noChars = new AsciiSet("");<a name="line.44"></a>
+<span class="sourceLineNo">045</span><a name="line.45"></a>
+<span class="sourceLineNo">046</span>   private static char[] hexArray = "0123456789ABCDEF".toCharArray();<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>    * Constructor.<a name="line.49"></a>
+<span class="sourceLineNo">050</span>    *<a name="line.50"></a>
+<span class="sourceLineNo">051</span>    * @param session The session that created this writer.<a name="line.51"></a>
+<span class="sourceLineNo">052</span>    * @param out The writer being wrapped.<a name="line.52"></a>
+<span class="sourceLineNo">053</span>    * @param useWhitespace If &lt;jk&gt;true&lt;/jk&gt;, tabs will be used in output.<a name="line.53"></a>
+<span class="sourceLineNo">054</span>    * @param encodeChars If &lt;jk&gt;true&lt;/jk&gt;, special characters should be encoded.<a name="line.54"></a>
+<span class="sourceLineNo">055</span>    * @param trimStrings If &lt;jk&gt;true&lt;/jk&gt;, strings should be trimmed before they're serialized.<a name="line.55"></a>
+<span class="sourceLineNo">056</span>    * @param relativeUriBase The base (e.g. &lt;js&gt;https://localhost:9443/contextPath"&lt;/js&gt;) for relative URIs (e.g. &lt;js&gt;"my/path"&lt;/js&gt;).<a name="line.56"></a>
+<span class="sourceLineNo">057</span>    * @param absolutePathUriBase The base (e.g. &lt;js&gt;https://localhost:9443"&lt;/js&gt;) for relative URIs with absolute paths (e.g. &lt;js&gt;"/contextPath/my/path"&lt;/js&gt;).<a name="line.57"></a>
+<span class="sourceLineNo">058</span>    * @param uriContext The URI context.<a name="line.58"></a>
+<span class="sourceLineNo">059</span>    *    Identifies the current request URI used for resolution of URIs to absolute or root-relative form.<a name="line.59"></a>
+<span class="sourceLineNo">060</span>    */<a name="line.60"></a>
+<span class="sourceLineNo">061</span>   protected UonWriter(UonSerializerSession session, Writer out, boolean useWhitespace, boolean encodeChars, boolean trimStrings, String relativeUriBase, String absolutePathUriBase, UriContext uriContext) {<a name="line.61"></a>
+<span class="sourceLineNo">062</span>      super(out, useWhitespace, trimStrings, '\'', relativeUriBase, absolutePathUriBase, uriContext);<a name="line.62"></a>
+<span class="sourceLineNo">063</span>      this.session = session;<a name="line.63"></a>
+<span class="sourceLineNo">064</span>      this.encodeChars = encodeChars;<a name="line.64"></a>
+<span class="sourceLineNo">065</span>   }<a name="line.65"></a>
+<span class="sourceLineNo">066</span><a name="line.66"></a>
+<span class="sourceLineNo">067</span>   /**<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    * Serializes the specified simple object as a UON string value.<a name="line.68"></a>
+<span class="sourceLineNo">069</span>    *<a name="line.69"></a>
+<span class="sourceLineNo">070</span>    * @param o The object being serialized.<a name="line.70"></a>
+<span class="sourceLineNo">071</span>    * @param isTopAttrName If this is a top-level attribute name we're serializing.<a name="line.71"></a>
+<span class="sourceLineNo">072</span>    * @param plainTextParams This is a top-level name or parameter we're serializing and the parameter format is PLAINTEXT.<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    * @return This object (for method chaining).<a name="line.73"></a>
+<span class="sourceLineNo">074</span>    * @throws IOException Should never happen.<a name="line.74"></a>
+<span class="sourceLineNo">075</span>    */<a name="line.75"></a>
+<span class="sourceLineNo">076</span>   public final UonWriter appendObject(Object o, boolean isTopAttrName, boolean plainTextParams) throws IOException {<a name="line.76"></a>
+<span class="sourceLineNo">077</span><a name="line.77"></a>
+<span class="sourceLineNo">078</span>      if (o instanceof Boolean)<a name="line.78"></a>
+<span class="sourceLineNo">079</span>         return appendBoolean(o);<a name="line.79"></a>
+<span class="sourceLineNo">080</span>      if (o instanceof Number)<a name="line.80"></a>
+<span class="sourceLineNo">081</span>         return appendNumber(o);<a name="line.81"></a>
+<span class="sourceLineNo">082</span>      if (o == null)<a name="line.82"></a>
+<span class="sourceLineNo">083</span>         return append("null");<a name="line.83"></a>
+<span class="sourceLineNo">084</span><a name="line.84"></a>
+<span class="sourceLineNo">085</span>      String s = session.toString(o);<a name="line.85"></a>
+<span class="sourceLineNo">086</span><a name="line.86"></a>
+<span class="sourceLineNo">087</span>      boolean needsQuotes = (! plainTextParams) &amp;&amp; UonUtils.needsQuotes(s);<a name="line.87"></a>
 <span class="sourceLineNo">088</span><a name="line.88"></a>
-<span class="sourceLineNo">089</span>      if (needsQuotes)<a name="line.89"></a>
-<span class="sourceLineNo">090</span>         append('\'');<a name="line.90"></a>
-<span class="sourceLineNo">091</span>      for (int i = 0; i &lt; s.length(); i++) {<a name="line.91"></a>
-<span class="sourceLineNo">092</span>         char c = s.charAt(i);<a name="line.92"></a>
-<span class="sourceLineNo">093</span>         if (esc.contains(c))<a name="line.93"></a>
-<span class="sourceLineNo">094</span>            append('~');<a name="line.94"></a>
-<span class="sourceLineNo">095</span>         if ((!encodeChars) || unenc.contains(c))<a name="line.95"></a>
-<span class="sourceLineNo">096</span>            append(c);<a name="line.96"></a>
-<span class="sourceLineNo">097</span>         else {<a name="line.97"></a>
-<span class="sourceLineNo">098</span>            if (c == ' ')<a name="line.98"></a>
-<span class="sourceLineNo">099</span>               append('+');<a name="line.99"></a>
-<span class="sourceLineNo">100</span>            else {<a name="line.100"></a>
-<span class="sourceLineNo">101</span>               int p = s.codePointAt(i);<a name="line.101"></a>
-<span class="sourceLineNo">102</span>               if (p &lt; 0x0080)<a name="line.102"></a>
-<span class="sourceLineNo">103</span>                  appendHex(p);<a name="line.103"></a>
-<span class="sourceLineNo">104</span>               else if (p &lt; 0x0800) {<a name="line.104"></a>
-<span class="sourceLineNo">105</span>                  int p1=p&gt;&gt;&gt;6;<a name="line.105"></a>
-<span class="sourceLineNo">106</span>                  appendHex(p1+192).appendHex((p&amp;63)+128);<a name="line.106"></a>
-<span class="sourceLineNo">107</span>               } else if (p &lt; 0x10000) {<a name="line.107"></a>
-<span class="sourceLineNo">108</span>                  int p1=p&gt;&gt;&gt;6, p2=p1&gt;&gt;&gt;6;<a name="line.108"></a>
-<span class="sourceLineNo">109</span>                  appendHex(p2+224).appendHex((p1&amp;63)+128).appendHex((p&amp;63)+128);<a name="line.109"></a>
-<span class="sourceLineNo">110</span>               } else {<a name="line.110"></a>
-<span class="sourceLineNo">111</span>                  i++;  // Two-byte codepoint...skip past surrogate pair lower byte.<a name="line.111"></a>
-<span class="sourceLineNo">112</span>                  int p1=p&gt;&gt;&gt;6, p2=p1&gt;&gt;&gt;6, p3=p2&gt;&gt;&gt;6;<a name="line.112"></a>
-<span class="sourceLineNo">113</span>                  appendHex(p3+240).appendHex((p2&amp;63)+128).appendHex((p1&amp;63)+128).appendHex((p&amp;63)+128);<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>      if (needsQuotes)<a name="line.118"></a>
-<span class="sourceLineNo">119</span>         append('\'');<a name="line.119"></a>
-<span class="sourceLineNo">120</span><a name="line.120"></a>
-<span class="sourceLineNo">121</span>      return this;<a name="line.121"></a>
-<span class="sourceLineNo">122</span>   }<a name="line.122"></a>
+<span class="sourceLineNo">089</span>      AsciiSet unenc = (isTopAttrName ? unencodedCharsAttrName : unencodedChars);<a name="line.89"></a>
+<span class="sourceLineNo">090</span>      AsciiSet esc = plainTextParams ? noChars : escapedChars;<a name="line.90"></a>
+<span class="sourceLineNo">091</span><a name="line.91"></a>
+<span class="sourceLineNo">092</span>      if (needsQuotes)<a name="line.92"></a>
+<span class="sourceLineNo">093</span>         append('\'');<a name="line.93"></a>
+<span class="sourceLineNo">094</span>      for (int i = 0; i &lt; s.length(); i++) {<a name="line.94"></a>
+<span class="sourceLineNo">095</span>         char c = s.charAt(i);<a name="line.95"></a>
+<span class="sourceLineNo">096</span>         if (esc.contains(c))<a name="line.96"></a>
+<span class="sourceLineNo">097</span>            append('~');<a name="line.97"></a>
+<span class="sourceLineNo">098</span>         if ((!encodeChars) || unenc.contains(c))<a name="line.98"></a>
+<span class="sourceLineNo">099</span>            append(c);<a name="line.99"></a>
+<span class="sourceLineNo">100</span>         else {<a name="line.100"></a>
+<span class="sourceLineNo">101</span>            if (c == ' ')<a name="line.101"></a>
+<span class="sourceLineNo">102</span>               append('+');<a name="line.102"></a>
+<span class="sourceLineNo">103</span>            else {<a name="line.103"></a>
+<span class="sourceLineNo">104</span>               int p = s.codePointAt(i);<a name="line.104"></a>
+<span class="sourceLineNo">105</span>               if (p &lt; 0x0080)<a name="line.105"></a>
+<span class="sourceLineNo">106</span>                  appendHex(p);<a name="line.106"></a>
+<span class="sourceLineNo">107</span>               else if (p &lt; 0x0800) {<a name="line.107"></a>
+<span class="sourceLineNo">108</span>                  int p1=p&gt;&gt;&gt;6;<a name="line.108"></a>
+<span class="sourceLineNo">109</span>                  appendHex(p1+192).appendHex((p&amp;63)+128);<a name="line.109"></a>
+<span class="sourceLineNo">110</span>               } else if (p &lt; 0x10000) {<a name="line.110"></a>
+<span class="sourceLineNo">111</span>                  int p1=p&gt;&gt;&gt;6, p2=p1&gt;&gt;&gt;6;<a name="line.111"></a>
+<span class="sourceLineNo">112</span>                  appendHex(p2+224).appendHex((p1&amp;63)+128).appendHex((p&amp;63)+128);<a name="line.112"></a>
+<span class="sourceLineNo">113</span>               } else {<a name="line.113"></a>
+<span class="sourceLineNo">114</span>                  i++;  // Two-byte codepoint...skip past surrogate pair lower byte.<a name="line.114"></a>
+<span class="sourceLineNo">115</span>                  int p1=p&gt;&gt;&gt;6, p2=p1&gt;&gt;&gt;6, p3=p2&gt;&gt;&gt;6;<a name="line.115"></a>
+<span class="sourceLineNo">116</span>                  appendHex(p3+240).appendHex((p2&amp;63)+128).appendHex((p1&amp;63)+128).appendHex((p&amp;63)+128);<a name="line.116"></a>
+<span class="sourceLineNo">117</span>               }<a name="line.117"></a>
+<span class="sourceLineNo">118</span>            }<a name="line.118"></a>
+<span class="sourceLineNo">119</span>         }<a name="line.119"></a>
+<span class="sourceLineNo">120</span>      }<a name="line.120"></a>
+<span class="sourceLineNo">121</span>      if (needsQuotes)<a name="line.121"></a>
+<span class="sourceLineNo">122</span>         append('\'');<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>    * Appends a boolean value to the output.<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    *<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    * @param o The boolean value to append to the output.<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    * @return This object (for method chaining).<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    * @throws IOException<a name="line.129"></a>
-<span class="sourceLineNo">130</span>    */<a name="line.130"></a>
-<span class="sourceLineNo">131</span>   protected UonWriter appendBoolean(Object o) throws IOException {<a name="line.131"></a>
-<span class="sourceLineNo">132</span>      append(o.toString());<a name="line.132"></a>
-<span class="sourceLineNo">133</span>      return this;<a name="line.133"></a>
-<span class="sourceLineNo">134</span>   }<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>    * Appends a numeric value to the output.<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    *<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    * @param o The numeric value to append to the output.<a name="line.139"></a>
-<span class="sourceLineNo">140</span>    * @return This object (for method chaining).<a name="line.140"></a>
-<span class="sourceLineNo">141</span>    * @throws IOException<a name="line.141"></a>
-<span class="sourceLineNo">142</span>    */<a name="line.142"></a>
-<span class="sourceLineNo">143</span>   protected UonWriter appendNumber(Object o) throws IOException {<a name="line.143"></a>
-<span class="sourceLineNo">144</span>      append(o.toString());<a name="line.144"></a>
-<span class="sourceLineNo">145</span>      return this;<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>   /**<a name="line.148"></a>
-<span class="sourceLineNo">149</span>    * Prints out a two-byte %xx sequence for the given byte value.<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    */<a name="line.150"></a>
-<span class="sourceLineNo">151</span>   private UonWriter appendHex(int b) throws IOException {<a name="line.151"></a>
-<span class="sourceLineNo">152</span>      if (b &gt; 255)<a name="line.152"></a>
-<span class="sourceLineNo">153</span>         throw new IOException("Invalid value passed to appendHex.  Must be in the range 0-255.  Value=" + b);<a name="line.153"></a>
-<span class="sourceLineNo">154</span>      append('%').append(hexArray[b&gt;&gt;&gt;4]).append(hexArray[b&amp;0x0F]);<a name="line.154"></a>
-<span class="sourceLineNo">155</span>      return this;<a name="line.155"></a>
-<span class="sourceLineNo">156</span>   }<a name="line.156"></a>
-<span class="sourceLineNo">157</span><a name="line.157"></a>
-<span class="sourceLineNo">158</span>   /**<a name="line.158"></a>
-<span class="sourceLineNo">159</span>    * Appends a URI to the output.<a name="line.159"></a>
-<span class="sourceLineNo">160</span>    *<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    * @param uri The URI to append to the output.<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    * @return This object (for method chaining).<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    * @throws IOException<a name="line.163"></a>
-<span class="sourceLineNo">164</span>    */<a name="line.164"></a>
-<span class="sourceLineNo">165</span>   @Override<a name="line.165"></a>
-<span class="sourceLineNo">166</span>   public SerializerWriter appendUri(Object uri) throws IOException {<a name="line.166"></a>
-<span class="sourceLineNo">167</span>      String s = uri.toString();<a name="line.167"></a>
-<span class="sourceLineNo">168</span>      if (s.indexOf("://") == -1) {<a name="line.168"></a>
-<span class="sourceLineNo">169</span>         if (StringUtils.startsWith(s, '/')) {<a name="line.169"></a>
-<span class="sourceLineNo">170</span>            if (absolutePathUriBase != null)<a name="line.170"></a>
-<span class="sourceLineNo">171</span>               append(absolutePathUriBase);<a name="line.171"></a>
-<span class="sourceLineNo">172</span>         } else {<a name="line.172"></a>
-<span class="sourceLineNo">173</span>            if (relativeUriBase != null) {<a name="line.173"></a>
-<span class="sourceLineNo">174</span>               append(relativeUriBase);<a name="line.174"></a>
-<span class="sourceLineNo">175</span>               if (! relativeUriBase.equals("/"))<a name="line.175"></a>
-<span class="sourceLineNo">176</span>                  append("/");<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>      return appendObject(s, false, false);<a name="line.180"></a>
-<span class="sourceLineNo">181</span>   }<a name="line.181"></a>
-<span class="sourceLineNo">182</span><a name="line.182"></a>
-<span class="sourceLineNo">183</span><a name="line.183"></a>
-<span class="sourceLineNo">184</span>   //--------------------------------------------------------------------------------<a name="line.184"></a>
-<span class="sourceLineNo">185</span>   // Overridden methods<a name="line.185"></a>
-<span class="sourceLineNo">186</span>   //--------------------------------------------------------------------------------<a name="line.186"></a>
-<span class="sourceLineNo">187</span><a name="line.187"></a>
-<span class="sourceLineNo">188</span>   @Override /* SerializerWriter */<a name="line.188"></a>
-<span class="sourceLineNo">189</span>   public UonWriter cr(int depth) throws IOException {<a name="line.189"></a>
-<span class="sourceLineNo">190</span>      super.cr(depth);<a name="line.190"></a>
-<span class="sourceLineNo">191</span>      return this;<a name="line.191"></a>
-<span class="sourceLineNo">192</span>   }<a name="line.192"></a>
-<span class="sourceLineNo">193</span><a name="line.193"></a>
-<span class="sourceLineNo">194</span>   @Override /* SerializerWriter */<a name="line.194"></a>
-<span class="sourceLineNo">195</span>   public UonWriter appendln(int indent, String text) throws IOException {<a name="line.195"></a>
-<span class="sourceLineNo">196</span>      super.appendln(indent, text);<a name="line.196"></a>
-<span class="sourceLineNo">197</span>      return this;<a name="line.197"></a>
-<span class="sourceLineNo">198</span>   }<a name="line.198"></a>
-<span class="sourceLineNo">199</span><a name="line.199"></a>
-<span class="sourceLineNo">200</span>   @Override /* SerializerWriter */<a name="line.200"></a>
-<span class="sourceLineNo">201</span>   public UonWriter appendln(String text) throws IOException {<a name="line.201"></a>
-<span class="sourceLineNo">202</span>      super.appendln(text);<a name="line.202"></a>
-<span class="sourceLineNo">203</span>      return this;<a name="line.203"></a>
-<span class="sourceLineNo">204</span>   }<a name="line.204"></a>
-<span class="sourceLineNo">205</span><a name="line.205"></a>
-<span class="sourceLineNo">206</span>   @Override /* SerializerWriter */<a name="line.206"></a>
-<span class="sourceLineNo">207</span>   public UonWriter append(int indent, String text) throws IOException {<a name="line.207"></a>
-<span class="sourceLineNo">208</span>      super.append(indent, text);<a name="line.208"></a>
-<span class="sourceLineNo">209</span>      return this;<a name="line.209"></a>
-<span class="sourceLineNo">210</span>   }<a name="line.210"></a>
-<span class="sourceLineNo">211</span><a name="line.211"></a>
-<span class="sourceLineNo">212</span>   @Override /* SerializerWriter */<a name="line.212"></a>
-<span class="sourceLineNo">213</span>   public UonWriter append(int indent, char c) throws IOException {<a name="line.213"></a>
-<span class="sourceLineNo">214</span>      super.append(indent, c);<a name="line.214"></a>
-<span class="sourceLineNo">215</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.218"></a>
-<span class="sourceLineNo">219</span>   public UonWriter q() throws IOException {<a name="line.219"></a>
-<span class="sourceLineNo">220</span>      super.q();<a name="line.220"></a>
-<span class="sourceLineNo">221</span>      return this;<a name="line.221"></a>
-<span class="sourceLineNo">222</span>   }<a name="line.222"></a>
-<span class="sourceLineNo">223</span><a name="line.223"></a>
-<span class="sourceLineNo">224</span>   @Override /* SerializerWriter */<a name="line.224"></a>
-<span class="sourceLineNo">225</span>   public UonWriter i(int indent) throws IOException {<a name="line.225"></a>
-<span class="sourceLineNo">226</span>      super.i(indent);<a name="line.226"></a>
-<span class="sourceLineNo">227</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.230"></a>
-<span class="sourceLineNo">231</span>   public UonWriter nl() throws IOException {<a name="line.231"></a>
-<span class="sourceLineNo">232</span>      super.nl();<a name="line.232"></a>
-<span class="sourceLineNo">233</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.236"></a>
-<span class="sourceLineNo">237</span>   public UonWriter append(Object text) throws IOException {<a name="line.237"></a>
-<span class="sourceLineNo">238</span>      super.append(text);<a name="line.238"></a>
-<span class="sourceLineNo">239</span>      return this;<a name="line.239"></a>
-<span class="sourceLineNo">240</span>   }<a name="line.240"></a>
-<span class="sourceLineNo">241</span><a name="line.241"></a>
-<span class="sourceLineNo">242</span>   @Override /* SerializerWriter */<a name="line.242"></a>
-<span class="sourceLineNo">243</span>   public UonWriter append(String text) throws IOException {<a name="line.243"></a>
-<span class="sourceLineNo">244</span>      super.append(text);<a name="line.244"></a>
-<span class="sourceLineNo">245</span>      return this;<a name="line.245"></a>
-<span class="sourceLineNo">246</span>   }<a name="line.246"></a>
-<span class="sourceLineNo">247</span><a name="line.247"></a>
-<span class="sourceLineNo">248</span>   @Override /* SerializerWriter */<a name="line.248"></a>
-<span class="sourceLineNo">249</span>   public UonWriter appendIf(boolean b, String text) throws IOException {<a name="line.249"></a>
-<span class="sourceLineNo">250</span>      super.appendIf(b, text);<a name="line.250"></a>
-<span class="sourceLineNo">251</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.254"></a>
-<span class="sourceLineNo">255</span>   public UonWriter appendIf(boolean b, char c) throws IOException {<a name="line.255"></a>
-<span class="sourceLineNo">256</span>      super.appendIf(b, c);<a name="line.256"></a>
-<span class="sourceLineNo">257</span>      return this;<a name="line.257"></a>
-<span class="sourceLineNo">258</span>   }<a name="line.258"></a>
-<span class="sourceLineNo">259</span><a name="line.259"></a>
-<span class="sourceLineNo">260</span>   @Override /* SerializerWriter */<a name="line.260"></a>
-<span class="sourceLineNo">261</span>   public UonWriter append(char c) throws IOException {<a name="line.261"></a>
-<span class="sourceLineNo">262</span>      super.append(c);<a name="line.262"></a>
-<span class="sourceLineNo">263</span>      return this;<a name="line.263"></a>
-<span class="sourceLineNo">264</span>   }<a name="line.264"></a>
-<span class="sourceLineNo">265</span>}<a name="line.265"></a>
+<span class="sourceLineNo">124</span>      return this;<a name="line.124"></a>
+<span class="sourceLineNo">125</span>   }<a name="line.125"></a>
+<span class="sourceLineNo">126</span><a name="line.126"></a>
+<span class="sourceLineNo">127</span>   /**<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    * Appends a boolean value to the output.<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    *<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    * @param o The boolean value to append to the output.<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    * @return This object (for method chaining).<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    * @throws IOException<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    */<a name="line.133"></a>
+<span class="sourceLineNo">134</span>   protected UonWriter appendBoolean(Object o) throws IOException {<a name="line.134"></a>
+<span class="sourceLineNo">135</span>      append(o.toString());<a name="line.135"></a>
+<span class="sourceLineNo">136</span>      return this;<a name="line.136"></a>
+<span class="sourceLineNo">137</span>   }<a name="line.137"></a>
+<span class="sourceLineNo">138</span><a name="line.138"></a>
+<span class="sourceLineNo">139</span>   /**<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    * Appends a numeric value to the output.<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    *<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    * @param o The numeric value to append to the output.<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    * @return This object (for method chaining).<a name="line.143"></a>
+<span class="sourceLineNo">144</span>    * @throws IOException<a name="line.144"></a>
+<span class="sourceLineNo">145</span>    */<a name="line.145"></a>
+<span class="sourceLineNo">146</span>   protected UonWriter appendNumber(Object o) throws IOException {<a name="line.146"></a>
+<span class="sourceLineNo">147</span>      append(o.toString());<a name="line.147"></a>
+<span class="sourceLineNo">148</span>      return this;<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>   /**<a name="line.151"></a>
+<span class="sourceLineNo">152</span>    * Prints out a two-byte %xx sequence for the given byte value.<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    */<a name="line.153"></a>
+<span class="sourceLineNo">154</span>   private UonWriter appendHex(int b) throws IOException {<a name="line.154"></a>
+<span class="sourceLineNo">155</span>      if (b &gt; 255)<a name="line.155"></a>
+<span class="sourceLineNo">156</span>         throw new IOException("Invalid value passed to appendHex.  Must be in the range 0-255.  Value=" + b);<a name="line.156"></a>
+<span class="sourceLineNo">157</span>      append('%').append(hexArray[b&gt;&gt;&gt;4]).append(hexArray[b&amp;0x0F]);<a name="line.157"></a>
+<span class="sourceLineNo">158</span>      return this;<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>    * Appends a URI to the output.<a name="line.162"></a>
+<span class="sourceLineNo">163</span>    *<a name="line.163"></a>
+<span class="sourceLineNo">164</span>    * @param uri The URI to append to the output.<a name="line.164"></a>
+<span class="sourceLineNo">165</span>    * @return This object (for method chaining).<a name="line.165"></a>
+<span class="sourceLineNo">166</span>    * @throws IOException<a name="line.166"></a>
+<span class="sourceLineNo">167</span>    */<a name="line.167"></a>
+<span class="sourceLineNo">168</span>   @Override<a name="line.168"></a>
+<span class="sourceLineNo">169</span>   public SerializerWriter appendUri(Object uri) throws IOException {<a name="line.169"></a>
+<span class="sourceLineNo">170</span>      String s = uri.toString();<a name="line.170"></a>
+<span class="sourceLineNo">171</span>      if (s.indexOf("://") == -1) {<a name="line.171"></a>
+<span class="sourceLineNo">172</span>         if (StringUtils.startsWith(s, '/')) {<a name="line.172"></a>
+<span class="sourceLineNo">173</span>            if (absolutePathUriBase != null)<a name="line.173"></a>
+<span class="sourceLineNo">174</span>               append(absolutePathUriBase);<a name="line.174"></a>
+<span class="sourceLineNo">175</span>         } else {<a name="line.175"></a>
+<span class="sourceLineNo">176</span>            if (relativeUriBase != null) {<a name="line.176"></a>
+<span class="sourceLineNo">177</span>               append(relativeUriBase);<a name="line.177"></a>
+<span class="sourceLineNo">178</span>               if (! relativeUriBase.equals("/"))<a name="line.178"></a>
+<span class="sourceLineNo">179</span>                  append("/");<a name="line.179"></a>
+<span class="sourceLineNo">180</span>            }<a name="line.180"></a>
+<span class="sourceLineNo">181</span>         }<a name="line.181"></a>
+<span class="sourceLineNo">182</span>      }<a name="line.182"></a>
+<span class="sourceLineNo">183</span>      return appendObject(s, false, false);<a name="line.183"></a>
+<span class="sourceLineNo">184</span>   }<a name="line.184"></a>
+<span class="sourceLineNo">185</span><a name="line.185"></a>
+<span class="sourceLineNo">186</span><a name="line.186"></a>
+<span class="sourceLineNo">187</span>   //--------------------------------------------------------------------------------<a name="line.187"></a>
+<span class="sourceLineNo">188</span>   // Overridden methods<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>   @Override /* SerializerWriter */<a name="line.191"></a>
+<span class="sourceLineNo">192</span>   public UonWriter cr(int depth) throws IOException {<a name="line.192"></a>
+<span class="sourceLineNo">193</span>      super.cr(depth);<a name="line.193"></a>
+<span class="sourceLineNo">194</span>      return this;<a name="line.194"></a>
+<span class="sourceLineNo">195</span>   }<a name="line.195"></a>
+<span class="sourceLineNo">196</span><a name="line.196"></a>
+<span class="sourceLineNo">197</span>   @Override /* SerializerWriter */<a name="line.197"></a>
+<span class="sourceLineNo">198</span>   public UonWriter appendln(int indent, String text) throws IOException {<a name="line.198"></a>
+<span class="sourceLineNo">199</span>      super.appendln(indent, text);<a name="line.199"></a>
+<span class="sourceLineNo">200</span>      return this;<a name="line.200"></a>
+<span class="sourceLineNo">201</span>   }<a name="line.201"></a>
+<span class="sourceLineNo">202</span><a name="line.202"></a>
+<span class="sourceLineNo">203</span>   @Override /* SerializerWriter */<a name="line.203"></a>
+<span class="sourceLineNo">204</span>   public UonWriter appendln(String text) throws IOException {<a name="line.204"></a>
+<span class="sourceLineNo">205</span>      super.appendln(text);<a name="line.205"></a>
+<span class="sourceLineNo">206</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.209"></a>
+<span class="sourceLineNo">210</span>   public UonWriter append(int indent, String text) throws IOException {<a name="line.210"></a>
+<span class="sourceLineNo">211</span>      super.append(indent, text);<a name="line.211"></a>
+<span class="sourceLineNo">212</span>      return this;<a name="line.212"></a>
+<span class="sourceLineNo">213</span>   }<a name="line.213"></a>
+<span class="sourceLineNo">214</span><a name="line.214"></a>
+<span class="sourceLineNo">215</span>   @Override /* SerializerWriter */<a name="line.215"></a>
+<span class="sourceLineNo">216</span>   public UonWriter append(int indent, char c) throws IOException {<a name="line.216"></a>
+<span class="sourceLineNo">217</span>      super.append(indent, c);<a name="line.217"></a>
+<span class="sourceLineNo">218</span>      return this;<a name="line.218"></a>
+<span class="sourceLineNo">219</span>   }<a name="line.219"></a>
+<span class="sourceLineNo">220</span><a name="line.220"></a>
+<span class="sourceLineNo">221</span>   @Override /* SerializerWriter */<a name="line.221"></a>
+<span class="sourceLineNo">222</span>   public UonWriter q() throws IOException {<a name="line.222"></a>
+<span class="sourceLineNo">223</span>      super.q();<a name="line.223"></a>
+<span class="sourceLineNo">224</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.227"></a>
+<span class="sourceLineNo">228</span>   public UonWriter i(int indent) throws IOException {<a name="line.228"></a>
+<span class="sourceLineNo">229</span>      super.i(indent);<a name="line.229"></a>
+<span class="sourceLineNo">230</span>      return this;<a name="line.230"></a>
+<span class="sourceLineNo">231</span>   }<a name="line.231"></a>
+<span class="sourceLineNo">232</span><a name="line.232"></a>
+<span class="sourceLineNo">233</span>   @Override /* SerializerWriter */<a name="line.233"></a>
+<span class="sourceLineNo">234</span>   public UonWriter nl() throws IOException {<a name="line.234"></a>
+<span class="sourceLineNo">235</span>      super.nl();<a name="line.235"></a>
+<span class="sourceLineNo">236</span>      return this;<a name="line.236"></a>
+<span class="sourceLineNo">237</span>   }<a name="line.237"></a>
+<span class="sourceLineNo">238</span><a name="line.238"></a>
+<span class="sourceLineNo">239</span>   @Override /* SerializerWriter */<a name="line.239"></a>
+<span class="sourceLineNo">240</span>   public UonWriter append(Object text) throws IOException {<a name="line.240"></a>
+<span class="sourceLineNo">241</span>      super.append(text);<a name="line.241"></a>
+<span class="sourceLineNo">242</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.245"></a>
+<span class="sourceLineNo">246</span>   public UonWriter append(String text) throws IOException {<a name="line.246"></a>
+<span class="sourceLineNo">247</span>      super.append(text);<a name="line.247"></a>
+<span class="sourceLineNo">248</span>      return this;<a name="line.248"></a>
+<span class="sourceLineNo">249</span>   }<a name="line.249"></a>
+<span class="sourceLineNo">250</span><a name="line.250"></a>
+<span class="sourceLineNo">251</span>   @Override /* SerializerWriter */<a name="line.251"></a>
+<span class="sourceLineNo">252</span>   public UonWriter appendIf(boolean b, String text) throws IOException {<a name="line.252"></a>
+<span class="sourceLineNo">253</span>      super.appendIf(b, text);<a name="line.253"></a>
+<span class="sourceLineNo">254</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.257"></a>
+<span class="sourceLineNo">258</span>   public UonWriter appendIf(boolean b, char c) throws IOException {<a name="line.258"></a>
+<span class="sourceLineNo">259</span>      super.appendIf(b, c);<a name="line.259"></a>
+<span class="sourceLineNo">260</span>      return this;<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>   @Override /* SerializerWriter */<a name="line.263"></a>
+<span class="sourceLineNo">264</span>   public UonWriter append(char c) throws IOException {<a name="line.264"></a>
+<span class="sourceLineNo">265</span>      super.append(c);<a name="line.265"></a>
+<span class="sourceLineNo">266</span>      return this;<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html b/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html
index c7cf0f9..1557a76 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html
@@ -420,7 +420,7 @@
 <span class="sourceLineNo">412</span>         }<a name="line.412"></a>
 <span class="sourceLineNo">413</span><a name="line.413"></a>
 <span class="sourceLineNo">414</span>         StringWriter w = new StringWriter();<a name="line.414"></a>
-<span class="sourceLineNo">415</span>         UonSerializerSession s = new UrlEncodingSerializerSession(ctx, urlEncode, null, w, null, null, null, MediaType.UON);<a name="line.415"></a>
+<span class="sourceLineNo">415</span>         UonSerializerSession s = new UrlEncodingSerializerSession(ctx, urlEncode, null, w, null, null, null, MediaType.UON, null);<a name="line.415"></a>
 <span class="sourceLineNo">416</span>         super.doSerialize(s, o);<a name="line.416"></a>
 <span class="sourceLineNo">417</span>         return w.toString();<a name="line.417"></a>
 <span class="sourceLineNo">418</span>      } catch (Exception e) {<a name="line.418"></a>
@@ -434,8 +434,8 @@
 <span class="sourceLineNo">426</span>   //--------------------------------------------------------------------------------<a name="line.426"></a>
 <span class="sourceLineNo">427</span><a name="line.427"></a>
 <span class="sourceLineNo">428</span>   @Override /* Serializer */<a name="line.428"></a>
-<span class="sourceLineNo">429</span>   public UrlEncodingSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.429"></a>
-<span class="sourceLineNo">430</span>      return new UrlEncodingSerializerSession(ctx, null, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.430"></a>
+<span class="sourceLineNo">429</span>   public UrlEncodingSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.429"></a>
+<span class="sourceLineNo">430</span>      return new UrlEncodingSerializerSession(ctx, null, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.430"></a>
 <span class="sourceLineNo">431</span>   }<a name="line.431"></a>
 <span class="sourceLineNo">432</span><a name="line.432"></a>
 <span class="sourceLineNo">433</span>   @Override /* Serializer */<a name="line.433"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html b/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html
index c7cf0f9..1557a76 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html
@@ -420,7 +420,7 @@
 <span class="sourceLineNo">412</span>         }<a name="line.412"></a>
 <span class="sourceLineNo">413</span><a name="line.413"></a>
 <span class="sourceLineNo">414</span>         StringWriter w = new StringWriter();<a name="line.414"></a>
-<span class="sourceLineNo">415</span>         UonSerializerSession s = new UrlEncodingSerializerSession(ctx, urlEncode, null, w, null, null, null, MediaType.UON);<a name="line.415"></a>
+<span class="sourceLineNo">415</span>         UonSerializerSession s = new UrlEncodingSerializerSession(ctx, urlEncode, null, w, null, null, null, MediaType.UON, null);<a name="line.415"></a>
 <span class="sourceLineNo">416</span>         super.doSerialize(s, o);<a name="line.416"></a>
 <span class="sourceLineNo">417</span>         return w.toString();<a name="line.417"></a>
 <span class="sourceLineNo">418</span>      } catch (Exception e) {<a name="line.418"></a>
@@ -434,8 +434,8 @@
 <span class="sourceLineNo">426</span>   //--------------------------------------------------------------------------------<a name="line.426"></a>
 <span class="sourceLineNo">427</span><a name="line.427"></a>
 <span class="sourceLineNo">428</span>   @Override /* Serializer */<a name="line.428"></a>
-<span class="sourceLineNo">429</span>   public UrlEncodingSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.429"></a>
-<span class="sourceLineNo">430</span>      return new UrlEncodingSerializerSession(ctx, null, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.430"></a>
+<span class="sourceLineNo">429</span>   public UrlEncodingSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.429"></a>
+<span class="sourceLineNo">430</span>      return new UrlEncodingSerializerSession(ctx, null, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.430"></a>
 <span class="sourceLineNo">431</span>   }<a name="line.431"></a>
 <span class="sourceLineNo">432</span><a name="line.432"></a>
 <span class="sourceLineNo">433</span>   @Override /* Serializer */<a name="line.433"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.html b/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.html
index c7cf0f9..1557a76 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.html
@@ -420,7 +420,7 @@
 <span class="sourceLineNo">412</span>         }<a name="line.412"></a>
 <span class="sourceLineNo">413</span><a name="line.413"></a>
 <span class="sourceLineNo">414</span>         StringWriter w = new StringWriter();<a name="line.414"></a>
-<span class="sourceLineNo">415</span>         UonSerializerSession s = new UrlEncodingSerializerSession(ctx, urlEncode, null, w, null, null, null, MediaType.UON);<a name="line.415"></a>
+<span class="sourceLineNo">415</span>         UonSerializerSession s = new UrlEncodingSerializerSession(ctx, urlEncode, null, w, null, null, null, MediaType.UON, null);<a name="line.415"></a>
 <span class="sourceLineNo">416</span>         super.doSerialize(s, o);<a name="line.416"></a>
 <span class="sourceLineNo">417</span>         return w.toString();<a name="line.417"></a>
 <span class="sourceLineNo">418</span>      } catch (Exception e) {<a name="line.418"></a>
@@ -434,8 +434,8 @@
 <span class="sourceLineNo">426</span>   //--------------------------------------------------------------------------------<a name="line.426"></a>
 <span class="sourceLineNo">427</span><a name="line.427"></a>
 <span class="sourceLineNo">428</span>   @Override /* Serializer */<a name="line.428"></a>
-<span class="sourceLineNo">429</span>   public UrlEncodingSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.429"></a>
-<span class="sourceLineNo">430</span>      return new UrlEncodingSerializerSession(ctx, null, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.430"></a>
+<span class="sourceLineNo">429</span>   public UrlEncodingSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.429"></a>
+<span class="sourceLineNo">430</span>      return new UrlEncodingSerializerSession(ctx, null, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.430"></a>
 <span class="sourceLineNo">431</span>   }<a name="line.431"></a>
 <span class="sourceLineNo">432</span><a name="line.432"></a>
 <span class="sourceLineNo">433</span>   @Override /* Serializer */<a name="line.433"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html b/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html
index 0b96df7..d11761c 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html
@@ -41,71 +41,73 @@
 <span class="sourceLineNo">033</span>    * Create a new session using properties specified in the context.<a name="line.33"></a>
 <span class="sourceLineNo">034</span>    *<a name="line.34"></a>
 <span class="sourceLineNo">035</span>    * @param ctx The context creating this session object.<a name="line.35"></a>
-<span class="sourceLineNo">036</span>    * The context contains all the configuration settings for this object.<a name="line.36"></a>
+<span class="sourceLineNo">036</span>    *    The context contains all the configuration settings for this object.<a name="line.36"></a>
 <span class="sourceLineNo">037</span>    * @param encode Overrides the {@link UonSerializerContext#UON_encodeChars} setting.<a name="line.37"></a>
 <span class="sourceLineNo">038</span>    * @param output The output object.  See {@link JsonSerializerSession#getWriter()} for valid class types.<a name="line.38"></a>
 <span class="sourceLineNo">039</span>    * @param op The override properties.<a name="line.39"></a>
-<span class="sourceLineNo">040</span>    * These override any context properties defined in the context.<a name="line.40"></a>
+<span class="sourceLineNo">040</span>    *    These override any context properties defined in the context.<a name="line.40"></a>
 <span class="sourceLineNo">041</span>    * @param javaMethod The java method that called this serializer, usually the method in a REST servlet.<a name="line.41"></a>
 <span class="sourceLineNo">042</span>    * @param locale The session locale.<a name="line.42"></a>
-<span class="sourceLineNo">043</span>    * If &lt;jk&gt;null&lt;/jk&gt;, then the locale defined on the context is used.<a name="line.43"></a>
+<span class="sourceLineNo">043</span>    *    If &lt;jk&gt;null&lt;/jk&gt;, then the locale defined on the context is used.<a name="line.43"></a>
 <span class="sourceLineNo">044</span>    * @param timeZone The session timezone.<a name="line.44"></a>
-<span class="sourceLineNo">045</span>    * If &lt;jk&gt;null&lt;/jk&gt;, then the timezone defined on the context is used.<a name="line.45"></a>
+<span class="sourceLineNo">045</span>    *    If &lt;jk&gt;null&lt;/jk&gt;, then the timezone defined on the context is used.<a name="line.45"></a>
 <span class="sourceLineNo">046</span>    * @param mediaType The session media type (e.g. &lt;js&gt;"application/json"&lt;/js&gt;).<a name="line.46"></a>
-<span class="sourceLineNo">047</span>    */<a name="line.47"></a>
-<span class="sourceLineNo">048</span>   public UrlEncodingSerializerSession(UrlEncodingSerializerContext ctx, Boolean encode, ObjectMap op, Object output, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.48"></a>
-<span class="sourceLineNo">049</span>      super(ctx, encode, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.49"></a>
-<span class="sourceLineNo">050</span>      if (op == null || op.isEmpty()) {<a name="line.50"></a>
-<span class="sourceLineNo">051</span>         expandedParams = ctx.expandedParams;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>         plainTextParams = ctx.plainTextParams;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>      } else {<a name="line.53"></a>
-<span class="sourceLineNo">054</span>         expandedParams = op.getBoolean(UrlEncodingContext.URLENC_expandedParams, false);<a name="line.54"></a>
-<span class="sourceLineNo">055</span>         plainTextParams = op.getString(UrlEncodingSerializerContext.URLENC_paramFormat, "UON").equals("PLAINTEXT");<a name="line.55"></a>
-<span class="sourceLineNo">056</span>      }<a name="line.56"></a>
-<span class="sourceLineNo">057</span>   }<a name="line.57"></a>
-<span class="sourceLineNo">058</span><a name="line.58"></a>
-<span class="sourceLineNo">059</span>   /**<a name="line.59"></a>
-<span class="sourceLineNo">060</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified bean property should be expanded as multiple key-value pairs.<a name="line.60"></a>
-<span class="sourceLineNo">061</span>    *<a name="line.61"></a>
-<span class="sourceLineNo">062</span>    * @param pMeta The metadata on the bean property.<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the specified bean property should be expanded as multiple key-value pairs.<a name="line.63"></a>
-<span class="sourceLineNo">064</span>    */<a name="line.64"></a>
-<span class="sourceLineNo">065</span>   public final boolean shouldUseExpandedParams(BeanPropertyMeta pMeta) {<a name="line.65"></a>
-<span class="sourceLineNo">066</span>      ClassMeta&lt;?&gt; cm = pMeta.getClassMeta();<a name="line.66"></a>
-<span class="sourceLineNo">067</span>      if (cm.isCollectionOrArray()) {<a name="line.67"></a>
-<span class="sourceLineNo">068</span>         if (expandedParams)<a name="line.68"></a>
-<span class="sourceLineNo">069</span>            return true;<a name="line.69"></a>
-<span class="sourceLineNo">070</span>         if (pMeta.getBeanMeta().getClassMeta().getExtendedMeta(UrlEncodingClassMeta.class).isExpandedParams())<a name="line.70"></a>
+<span class="sourceLineNo">047</span>    * @param uriContext The URI context.<a name="line.47"></a>
+<span class="sourceLineNo">048</span>    *    Identifies the current request URI used for resolution of URIs to absolute or root-relative form.<a name="line.48"></a>
+<span class="sourceLineNo">049</span>    */<a name="line.49"></a>
+<span class="sourceLineNo">050</span>   public UrlEncodingSerializerSession(UrlEncodingSerializerContext ctx, Boolean encode, ObjectMap op, Object output, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.50"></a>
+<span class="sourceLineNo">051</span>      super(ctx, encode, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.51"></a>
+<span class="sourceLineNo">052</span>      if (op == null || op.isEmpty()) {<a name="line.52"></a>
+<span class="sourceLineNo">053</span>         expandedParams = ctx.expandedParams;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>         plainTextParams = ctx.plainTextParams;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>      } else {<a name="line.55"></a>
+<span class="sourceLineNo">056</span>         expandedParams = op.getBoolean(UrlEncodingContext.URLENC_expandedParams, false);<a name="line.56"></a>
+<span class="sourceLineNo">057</span>         plainTextParams = op.getString(UrlEncodingSerializerContext.URLENC_paramFormat, "UON").equals("PLAINTEXT");<a name="line.57"></a>
+<span class="sourceLineNo">058</span>      }<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>   /**<a name="line.61"></a>
+<span class="sourceLineNo">062</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified bean property should be expanded as multiple key-value pairs.<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    *<a name="line.63"></a>
+<span class="sourceLineNo">064</span>    * @param pMeta The metadata on the bean property.<a name="line.64"></a>
+<span class="sourceLineNo">065</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the specified bean property should be expanded as multiple key-value pairs.<a name="line.65"></a>
+<span class="sourceLineNo">066</span>    */<a name="line.66"></a>
+<span class="sourceLineNo">067</span>   public final boolean shouldUseExpandedParams(BeanPropertyMeta pMeta) {<a name="line.67"></a>
+<span class="sourceLineNo">068</span>      ClassMeta&lt;?&gt; cm = pMeta.getClassMeta();<a name="line.68"></a>
+<span class="sourceLineNo">069</span>      if (cm.isCollectionOrArray()) {<a name="line.69"></a>
+<span class="sourceLineNo">070</span>         if (expandedParams)<a name="line.70"></a>
 <span class="sourceLineNo">071</span>            return true;<a name="line.71"></a>
-<span class="sourceLineNo">072</span>      }<a name="line.72"></a>
-<span class="sourceLineNo">073</span>      return false;<a name="line.73"></a>
-<span class="sourceLineNo">074</span>   }<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>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified value should be represented as an expanded parameter list.<a name="line.77"></a>
-<span class="sourceLineNo">078</span>    *<a name="line.78"></a>
-<span class="sourceLineNo">079</span>    * @param value The value to check.<a name="line.79"></a>
-<span class="sourceLineNo">080</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the specified value should be represented as an expanded parameter list.<a name="line.80"></a>
-<span class="sourceLineNo">081</span>    */<a name="line.81"></a>
-<span class="sourceLineNo">082</span>   public final boolean shouldUseExpandedParams(Object value) {<a name="line.82"></a>
-<span class="sourceLineNo">083</span>      if (value == null || ! expandedParams)<a name="line.83"></a>
-<span class="sourceLineNo">084</span>         return false;<a name="line.84"></a>
-<span class="sourceLineNo">085</span>      ClassMeta&lt;?&gt; cm = getClassMetaForObject(value).getSerializedClassMeta();<a name="line.85"></a>
-<span class="sourceLineNo">086</span>      if (cm.isCollectionOrArray()) {<a name="line.86"></a>
-<span class="sourceLineNo">087</span>         if (expandedParams)<a name="line.87"></a>
-<span class="sourceLineNo">088</span>            return true;<a name="line.88"></a>
-<span class="sourceLineNo">089</span>      }<a name="line.89"></a>
-<span class="sourceLineNo">090</span>      return false;<a name="line.90"></a>
-<span class="sourceLineNo">091</span>   }<a name="line.91"></a>
-<span class="sourceLineNo">092</span><a name="line.92"></a>
-<span class="sourceLineNo">093</span>   /**<a name="line.93"></a>
-<span class="sourceLineNo">094</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the {@link UrlEncodingSerializerContext#URLENC_paramFormat} is &lt;js&gt;"PLAINTEXT"&lt;/js&gt;.<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the {@link UrlEncodingSerializerContext#URLENC_paramFormat} is &lt;js&gt;"PLAINTEXT"&lt;/js&gt;.<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    */<a name="line.96"></a>
-<span class="sourceLineNo">097</span>   protected boolean plainTextParams() {<a name="line.97"></a>
-<span class="sourceLineNo">098</span>      return plainTextParams;<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">072</span>         if (pMeta.getBeanMeta().getClassMeta().getExtendedMeta(UrlEncodingClassMeta.class).isExpandedParams())<a name="line.72"></a>
+<span class="sourceLineNo">073</span>            return true;<a name="line.73"></a>
+<span class="sourceLineNo">074</span>      }<a name="line.74"></a>
+<span class="sourceLineNo">075</span>      return false;<a name="line.75"></a>
+<span class="sourceLineNo">076</span>   }<a name="line.76"></a>
+<span class="sourceLineNo">077</span><a name="line.77"></a>
+<span class="sourceLineNo">078</span>   /**<a name="line.78"></a>
+<span class="sourceLineNo">079</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified value should be represented as an expanded parameter list.<a name="line.79"></a>
+<span class="sourceLineNo">080</span>    *<a name="line.80"></a>
+<span class="sourceLineNo">081</span>    * @param value The value to check.<a name="line.81"></a>
+<span class="sourceLineNo">082</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the specified value should be represented as an expanded parameter list.<a name="line.82"></a>
+<span class="sourceLineNo">083</span>    */<a name="line.83"></a>
+<span class="sourceLineNo">084</span>   public final boolean shouldUseExpandedParams(Object value) {<a name="line.84"></a>
+<span class="sourceLineNo">085</span>      if (value == null || ! expandedParams)<a name="line.85"></a>
+<span class="sourceLineNo">086</span>         return false;<a name="line.86"></a>
+<span class="sourceLineNo">087</span>      ClassMeta&lt;?&gt; cm = getClassMetaForObject(value).getSerializedClassMeta();<a name="line.87"></a>
+<span class="sourceLineNo">088</span>      if (cm.isCollectionOrArray()) {<a name="line.88"></a>
+<span class="sourceLineNo">089</span>         if (expandedParams)<a name="line.89"></a>
+<span class="sourceLineNo">090</span>            return true;<a name="line.90"></a>
+<span class="sourceLineNo">091</span>      }<a name="line.91"></a>
+<span class="sourceLineNo">092</span>      return false;<a name="line.92"></a>
+<span class="sourceLineNo">093</span>   }<a name="line.93"></a>
+<span class="sourceLineNo">094</span><a name="line.94"></a>
+<span class="sourceLineNo">095</span>   /**<a name="line.95"></a>
+<span class="sourceLineNo">096</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the {@link UrlEncodingSerializerContext#URLENC_paramFormat} is &lt;js&gt;"PLAINTEXT"&lt;/js&gt;.<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the {@link UrlEncodingSerializerContext#URLENC_paramFormat} is &lt;js&gt;"PLAINTEXT"&lt;/js&gt;.<a name="line.97"></a>
+<span class="sourceLineNo">098</span>    */<a name="line.98"></a>
+<span class="sourceLineNo">099</span>   protected boolean plainTextParams() {<a name="line.99"></a>
+<span class="sourceLineNo">100</span>      return plainTextParams;<a name="line.100"></a>
+<span class="sourceLineNo">101</span>   }<a name="line.101"></a>
+<span class="sourceLineNo">102</span>}<a name="line.102"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSchemaSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSchemaSerializer.html b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSchemaSerializer.html
index 6824037..90077d8 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSchemaSerializer.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSchemaSerializer.html
@@ -103,7 +103,7 @@
 <span class="sourceLineNo">095</span>   /**<a name="line.95"></a>
 <span class="sourceLineNo">096</span>    * Returns an XML-Schema validator based on the output returned by {@link #doSerialize(SerializerSession, Object)};<a name="line.96"></a>
 <span class="sourceLineNo">097</span>    *<a name="line.97"></a>
-<span class="sourceLineNo">098</span>    * @param session The serializer session object return by {@link #createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType)}.&lt;br&gt;<a name="line.98"></a>
+<span class="sourceLineNo">098</span>    * @param session The serializer session object return by {@link #createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType, UriContext)}.&lt;br&gt;<a name="line.98"></a>
 <span class="sourceLineNo">099</span>    * Can be &lt;jk&gt;null&lt;/jk&gt;.<a name="line.99"></a>
 <span class="sourceLineNo">100</span>    * @param o The object to serialize.<a name="line.100"></a>
 <span class="sourceLineNo">101</span>    * @return The new validator.<a name="line.101"></a>
@@ -274,7 +274,7 @@
 <span class="sourceLineNo">266</span>         this.defaultNs = defaultNs;<a name="line.266"></a>
 <span class="sourceLineNo">267</span>         this.targetNs = targetNs;<a name="line.267"></a>
 <span class="sourceLineNo">268</span>         this.session = session;<a name="line.268"></a>
-<span class="sourceLineNo">269</span>         w = new XmlWriter(sw, session.isUseWhitespace(), session.isTrimStrings(), session.getQuoteChar(), null, null, true, null);<a name="line.269"></a>
+<span class="sourceLineNo">269</span>         w = new XmlWriter(sw, session.isUseWhitespace(), session.isTrimStrings(), session.getQuoteChar(), null, null, null, true, null);<a name="line.269"></a>
 <span class="sourceLineNo">270</span>         int i = session.getIndent();<a name="line.270"></a>
 <span class="sourceLineNo">271</span>         w.oTag(i, "schema");<a name="line.271"></a>
 <span class="sourceLineNo">272</span>         w.attr("xmlns", xs.getUri());<a name="line.272"></a>
@@ -588,12 +588,12 @@
 <span class="sourceLineNo">580</span>   }<a name="line.580"></a>
 <span class="sourceLineNo">581</span><a name="line.581"></a>
 <span class="sourceLineNo">582</span>   @Override /* Serializer */<a name="line.582"></a>
-<span class="sourceLineNo">583</span>   public XmlSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.583"></a>
+<span class="sourceLineNo">583</span>   public XmlSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.583"></a>
 <span class="sourceLineNo">584</span>      // This serializer must always have namespaces enabled.<a name="line.584"></a>
 <span class="sourceLineNo">585</span>      if (op == null)<a name="line.585"></a>
 <span class="sourceLineNo">586</span>         op = new ObjectMap();<a name="line.586"></a>
 <span class="sourceLineNo">587</span>      op.put(XmlSerializerContext.XML_enableNamespaces, true);<a name="line.587"></a>
-<span class="sourceLineNo">588</span>      return new XmlSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.588"></a>
+<span class="sourceLineNo">588</span>      return new XmlSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.588"></a>
 <span class="sourceLineNo">589</span>   }<a name="line.589"></a>
 <span class="sourceLineNo">590</span>}<a name="line.590"></a>
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.Ns.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.Ns.html b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.Ns.html
index ef78ef9..6ba0167 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.Ns.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.Ns.html
@@ -839,8 +839,8 @@
 <span class="sourceLineNo">831</span>   }<a name="line.831"></a>
 <span class="sourceLineNo">832</span><a name="line.832"></a>
 <span class="sourceLineNo">833</span>   @Override /* Serializer */<a name="line.833"></a>
-<span class="sourceLineNo">834</span>   public XmlSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.834"></a>
-<span class="sourceLineNo">835</span>      return new XmlSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.835"></a>
+<span class="sourceLineNo">834</span>   public XmlSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.834"></a>
+<span class="sourceLineNo">835</span>      return new XmlSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.835"></a>
 <span class="sourceLineNo">836</span>   }<a name="line.836"></a>
 <span class="sourceLineNo">837</span>}<a name="line.837"></a>
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.NsSq.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.NsSq.html b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.NsSq.html
index ef78ef9..6ba0167 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.NsSq.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.NsSq.html
@@ -839,8 +839,8 @@
 <span class="sourceLineNo">831</span>   }<a name="line.831"></a>
 <span class="sourceLineNo">832</span><a name="line.832"></a>
 <span class="sourceLineNo">833</span>   @Override /* Serializer */<a name="line.833"></a>
-<span class="sourceLineNo">834</span>   public XmlSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.834"></a>
-<span class="sourceLineNo">835</span>      return new XmlSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.835"></a>
+<span class="sourceLineNo">834</span>   public XmlSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.834"></a>
+<span class="sourceLineNo">835</span>      return new XmlSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.835"></a>
 <span class="sourceLineNo">836</span>   }<a name="line.836"></a>
 <span class="sourceLineNo">837</span>}<a name="line.837"></a>
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.NsSqReadable.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.NsSqReadable.html b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.NsSqReadable.html
index ef78ef9..6ba0167 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.NsSqReadable.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.NsSqReadable.html
@@ -839,8 +839,8 @@
 <span class="sourceLineNo">831</span>   }<a name="line.831"></a>
 <span class="sourceLineNo">832</span><a name="line.832"></a>
 <span class="sourceLineNo">833</span>   @Override /* Serializer */<a name="line.833"></a>
-<span class="sourceLineNo">834</span>   public XmlSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.834"></a>
-<span class="sourceLineNo">835</span>      return new XmlSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.835"></a>
+<span class="sourceLineNo">834</span>   public XmlSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.834"></a>
+<span class="sourceLineNo">835</span>      return new XmlSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.835"></a>
 <span class="sourceLineNo">836</span>   }<a name="line.836"></a>
 <span class="sourceLineNo">837</span>}<a name="line.837"></a>
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.Sq.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.Sq.html b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.Sq.html
index ef78ef9..6ba0167 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.Sq.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.Sq.html
@@ -839,8 +839,8 @@
 <span class="sourceLineNo">831</span>   }<a name="line.831"></a>
 <span class="sourceLineNo">832</span><a name="line.832"></a>
 <span class="sourceLineNo">833</span>   @Override /* Serializer */<a name="line.833"></a>
-<span class="sourceLineNo">834</span>   public XmlSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.834"></a>
-<span class="sourceLineNo">835</span>      return new XmlSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.835"></a>
+<span class="sourceLineNo">834</span>   public XmlSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.834"></a>
+<span class="sourceLineNo">835</span>      return new XmlSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.835"></a>
 <span class="sourceLineNo">836</span>   }<a name="line.836"></a>
 <span class="sourceLineNo">837</span>}<a name="line.837"></a>
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.SqReadable.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.SqReadable.html b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.SqReadable.html
index ef78ef9..6ba0167 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.SqReadable.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.SqReadable.html
@@ -839,8 +839,8 @@
 <span class="sourceLineNo">831</span>   }<a name="line.831"></a>
 <span class="sourceLineNo">832</span><a name="line.832"></a>
 <span class="sourceLineNo">833</span>   @Override /* Serializer */<a name="line.833"></a>
-<span class="sourceLineNo">834</span>   public XmlSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.834"></a>
-<span class="sourceLineNo">835</span>      return new XmlSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.835"></a>
+<span class="sourceLineNo">834</span>   public XmlSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.834"></a>
+<span class="sourceLineNo">835</span>      return new XmlSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.835"></a>
 <span class="sourceLineNo">836</span>   }<a name="line.836"></a>
 <span class="sourceLineNo">837</span>}<a name="line.837"></a>
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/37ddf434/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.html b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.html
index ef78ef9..6ba0167 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.html
@@ -839,8 +839,8 @@
 <span class="sourceLineNo">831</span>   }<a name="line.831"></a>
 <span class="sourceLineNo">832</span><a name="line.832"></a>
 <span class="sourceLineNo">833</span>   @Override /* Serializer */<a name="line.833"></a>
-<span class="sourceLineNo">834</span>   public XmlSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.834"></a>
-<span class="sourceLineNo">835</span>      return new XmlSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.835"></a>
+<span class="sourceLineNo">834</span>   public XmlSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.834"></a>
+<span class="sourceLineNo">835</span>      return new XmlSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.835"></a>
 <span class="sourceLineNo">836</span>   }<a name="line.836"></a>
 <span class="sourceLineNo">837</span>}<a name="line.837"></a>