Repository: incubator-juneau-website Updated Branches: refs/heads/asf-site 0c968486d -> a61cb5e34
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/a61cb5e3/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFileWrapped.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFileWrapped.html b/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFileWrapped.html index 266c824..0002ef8 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFileWrapped.html +++ b/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFileWrapped.html @@ -23,266 +23,277 @@ <span class="sourceLineNo">015</span>import static org.apache.juneau.internal.ThrowableUtils.*;<a name="line.15"></a> <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.util.*;<a name="line.18"></a> -<span class="sourceLineNo">019</span><a name="line.19"></a> -<span class="sourceLineNo">020</span>import org.apache.juneau.*;<a name="line.20"></a> -<span class="sourceLineNo">021</span>import org.apache.juneau.parser.*;<a name="line.21"></a> -<span class="sourceLineNo">022</span>import org.apache.juneau.serializer.*;<a name="line.22"></a> -<span class="sourceLineNo">023</span>import org.apache.juneau.svl.*;<a name="line.23"></a> -<span class="sourceLineNo">024</span>import org.apache.juneau.svl.vars.*;<a name="line.24"></a> -<span class="sourceLineNo">025</span><a name="line.25"></a> -<span class="sourceLineNo">026</span>/**<a name="line.26"></a> -<span class="sourceLineNo">027</span> * Wraps an instance of {@link ConfigFileImpl} in an interface that will<a name="line.27"></a> -<span class="sourceLineNo">028</span> * automatically replace {@link VarResolver} variables.<a name="line.28"></a> -<span class="sourceLineNo">029</span> * <p><a name="line.29"></a> -<span class="sourceLineNo">030</span> * The {@link ConfigFile#getResolving(VarResolver)} returns an instance of this class.<a name="line.30"></a> -<span class="sourceLineNo">031</span> * <p><a name="line.31"></a> -<span class="sourceLineNo">032</span> * This class overrides the {@link #getString(String, String)} to resolve string variables.<a name="line.32"></a> -<span class="sourceLineNo">033</span> * All other method calls are passed through to the inner config file.<a name="line.33"></a> -<span class="sourceLineNo">034</span> */<a name="line.34"></a> -<span class="sourceLineNo">035</span>public final class ConfigFileWrapped extends ConfigFile {<a name="line.35"></a> -<span class="sourceLineNo">036</span><a name="line.36"></a> -<span class="sourceLineNo">037</span> private final ConfigFileImpl cf;<a name="line.37"></a> -<span class="sourceLineNo">038</span> private final VarResolverSession vs;<a name="line.38"></a> -<span class="sourceLineNo">039</span><a name="line.39"></a> -<span class="sourceLineNo">040</span> ConfigFileWrapped(ConfigFileImpl cf, VarResolver vr) {<a name="line.40"></a> -<span class="sourceLineNo">041</span> this.cf = cf;<a name="line.41"></a> -<span class="sourceLineNo">042</span> this.vs = vr.builder()<a name="line.42"></a> -<span class="sourceLineNo">043</span> .vars(ConfigFileVar.class)<a name="line.43"></a> -<span class="sourceLineNo">044</span> .contextObject(ConfigFileVar.SESSION_config, cf)<a name="line.44"></a> -<span class="sourceLineNo">045</span> .build()<a name="line.45"></a> -<span class="sourceLineNo">046</span> .createSession();<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> ConfigFileWrapped(ConfigFileImpl cf, VarResolverSession vs) {<a name="line.49"></a> -<span class="sourceLineNo">050</span> this.cf = cf;<a name="line.50"></a> -<span class="sourceLineNo">051</span> this.vs = vs;<a name="line.51"></a> -<span class="sourceLineNo">052</span> }<a name="line.52"></a> -<span class="sourceLineNo">053</span><a name="line.53"></a> -<span class="sourceLineNo">054</span> @Override /* ConfigFile */<a name="line.54"></a> -<span class="sourceLineNo">055</span> public void clear() {<a name="line.55"></a> -<span class="sourceLineNo">056</span> cf.clear();<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> @Override /* ConfigFile */<a name="line.59"></a> -<span class="sourceLineNo">060</span> public boolean containsKey(Object key) {<a name="line.60"></a> -<span class="sourceLineNo">061</span> return cf.containsKey(key);<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> @Override /* ConfigFile */<a name="line.64"></a> -<span class="sourceLineNo">065</span> public boolean containsValue(Object value) {<a name="line.65"></a> -<span class="sourceLineNo">066</span> return cf.containsValue(value);<a name="line.66"></a> -<span class="sourceLineNo">067</span> }<a name="line.67"></a> -<span class="sourceLineNo">068</span><a name="line.68"></a> -<span class="sourceLineNo">069</span> @Override /* ConfigFile */<a name="line.69"></a> -<span class="sourceLineNo">070</span> public Set<java.util.Map.Entry<String,Section>> entrySet() {<a name="line.70"></a> -<span class="sourceLineNo">071</span> return cf.entrySet();<a name="line.71"></a> -<span class="sourceLineNo">072</span> }<a name="line.72"></a> -<span class="sourceLineNo">073</span><a name="line.73"></a> -<span class="sourceLineNo">074</span> @Override /* ConfigFile */<a name="line.74"></a> -<span class="sourceLineNo">075</span> public Section get(Object key) {<a name="line.75"></a> -<span class="sourceLineNo">076</span> return cf.get(key);<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> @Override /* ConfigFile */<a name="line.79"></a> -<span class="sourceLineNo">080</span> public boolean isEmpty() {<a name="line.80"></a> -<span class="sourceLineNo">081</span> return cf.isEmpty();<a name="line.81"></a> -<span class="sourceLineNo">082</span> }<a name="line.82"></a> -<span class="sourceLineNo">083</span><a name="line.83"></a> -<span class="sourceLineNo">084</span> @Override /* ConfigFile */<a name="line.84"></a> -<span class="sourceLineNo">085</span> public Set<String> keySet() {<a name="line.85"></a> -<span class="sourceLineNo">086</span> return cf.keySet();<a name="line.86"></a> -<span class="sourceLineNo">087</span> }<a name="line.87"></a> -<span class="sourceLineNo">088</span><a name="line.88"></a> -<span class="sourceLineNo">089</span> @Override /* ConfigFile */<a name="line.89"></a> -<span class="sourceLineNo">090</span> public Section put(String key, Section value) {<a name="line.90"></a> -<span class="sourceLineNo">091</span> return cf.put(key, value);<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> @Override /* ConfigFile */<a name="line.94"></a> -<span class="sourceLineNo">095</span> public void putAll(Map<? extends String,? extends Section> map) {<a name="line.95"></a> -<span class="sourceLineNo">096</span> cf.putAll(map);<a name="line.96"></a> -<span class="sourceLineNo">097</span> }<a name="line.97"></a> -<span class="sourceLineNo">098</span><a name="line.98"></a> -<span class="sourceLineNo">099</span> @Override /* ConfigFile */<a name="line.99"></a> -<span class="sourceLineNo">100</span> public Section remove(Object key) {<a name="line.100"></a> -<span class="sourceLineNo">101</span> return cf.remove(key);<a name="line.101"></a> -<span class="sourceLineNo">102</span> }<a name="line.102"></a> -<span class="sourceLineNo">103</span><a name="line.103"></a> -<span class="sourceLineNo">104</span> @Override /* ConfigFile */<a name="line.104"></a> -<span class="sourceLineNo">105</span> public int size() {<a name="line.105"></a> -<span class="sourceLineNo">106</span> return cf.size();<a name="line.106"></a> -<span class="sourceLineNo">107</span> }<a name="line.107"></a> -<span class="sourceLineNo">108</span><a name="line.108"></a> -<span class="sourceLineNo">109</span> @Override /* ConfigFile */<a name="line.109"></a> -<span class="sourceLineNo">110</span> public Collection<Section> values() {<a name="line.110"></a> -<span class="sourceLineNo">111</span> return cf.values();<a name="line.111"></a> -<span class="sourceLineNo">112</span> }<a name="line.112"></a> -<span class="sourceLineNo">113</span><a name="line.113"></a> -<span class="sourceLineNo">114</span> @Override /* ConfigFile */<a name="line.114"></a> -<span class="sourceLineNo">115</span> public ConfigFile loadIfModified() throws IOException {<a name="line.115"></a> -<span class="sourceLineNo">116</span> cf.loadIfModified();<a name="line.116"></a> -<span class="sourceLineNo">117</span> return this;<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> @Override /* ConfigFile */<a name="line.120"></a> -<span class="sourceLineNo">121</span> public ConfigFile load() throws IOException {<a name="line.121"></a> -<span class="sourceLineNo">122</span> cf.load();<a name="line.122"></a> -<span class="sourceLineNo">123</span> return this;<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> @Override /* ConfigFile */<a name="line.126"></a> -<span class="sourceLineNo">127</span> public ConfigFile load(Reader r) throws IOException {<a name="line.127"></a> -<span class="sourceLineNo">128</span> cf.load(r);<a name="line.128"></a> -<span class="sourceLineNo">129</span> return this;<a name="line.129"></a> -<span class="sourceLineNo">130</span> }<a name="line.130"></a> -<span class="sourceLineNo">131</span><a name="line.131"></a> +<span class="sourceLineNo">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.parser.*;<a name="line.22"></a> +<span class="sourceLineNo">023</span>import org.apache.juneau.serializer.*;<a name="line.23"></a> +<span class="sourceLineNo">024</span>import org.apache.juneau.svl.*;<a name="line.24"></a> +<span class="sourceLineNo">025</span>import org.apache.juneau.svl.vars.*;<a name="line.25"></a> +<span class="sourceLineNo">026</span><a name="line.26"></a> +<span class="sourceLineNo">027</span>/**<a name="line.27"></a> +<span class="sourceLineNo">028</span> * Wraps an instance of {@link ConfigFileImpl} in an interface that will<a name="line.28"></a> +<span class="sourceLineNo">029</span> * automatically replace {@link VarResolver} variables.<a name="line.29"></a> +<span class="sourceLineNo">030</span> * <p><a name="line.30"></a> +<span class="sourceLineNo">031</span> * The {@link ConfigFile#getResolving(VarResolver)} returns an instance of this class.<a name="line.31"></a> +<span class="sourceLineNo">032</span> * <p><a name="line.32"></a> +<span class="sourceLineNo">033</span> * This class overrides the {@link #getString(String, String)} to resolve string variables.<a name="line.33"></a> +<span class="sourceLineNo">034</span> * All other method calls are passed through to the inner config file.<a name="line.34"></a> +<span class="sourceLineNo">035</span> */<a name="line.35"></a> +<span class="sourceLineNo">036</span>public final class ConfigFileWrapped extends ConfigFile {<a name="line.36"></a> +<span class="sourceLineNo">037</span><a name="line.37"></a> +<span class="sourceLineNo">038</span> private final ConfigFileImpl cf;<a name="line.38"></a> +<span class="sourceLineNo">039</span> private final VarResolverSession vs;<a name="line.39"></a> +<span class="sourceLineNo">040</span><a name="line.40"></a> +<span class="sourceLineNo">041</span> ConfigFileWrapped(ConfigFileImpl cf, VarResolver vr) {<a name="line.41"></a> +<span class="sourceLineNo">042</span> this.cf = cf;<a name="line.42"></a> +<span class="sourceLineNo">043</span> this.vs = vr.builder()<a name="line.43"></a> +<span class="sourceLineNo">044</span> .vars(ConfigFileVar.class)<a name="line.44"></a> +<span class="sourceLineNo">045</span> .contextObject(ConfigFileVar.SESSION_config, cf)<a name="line.45"></a> +<span class="sourceLineNo">046</span> .build()<a name="line.46"></a> +<span class="sourceLineNo">047</span> .createSession();<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> ConfigFileWrapped(ConfigFileImpl cf, VarResolverSession vs) {<a name="line.50"></a> +<span class="sourceLineNo">051</span> this.cf = cf;<a name="line.51"></a> +<span class="sourceLineNo">052</span> this.vs = vs;<a name="line.52"></a> +<span class="sourceLineNo">053</span> }<a name="line.53"></a> +<span class="sourceLineNo">054</span><a name="line.54"></a> +<span class="sourceLineNo">055</span> @Override /* ConfigFile */<a name="line.55"></a> +<span class="sourceLineNo">056</span> public void clear() {<a name="line.56"></a> +<span class="sourceLineNo">057</span> cf.clear();<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> @Override /* ConfigFile */<a name="line.60"></a> +<span class="sourceLineNo">061</span> public boolean containsKey(Object key) {<a name="line.61"></a> +<span class="sourceLineNo">062</span> return cf.containsKey(key);<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> @Override /* ConfigFile */<a name="line.65"></a> +<span class="sourceLineNo">066</span> public boolean containsValue(Object value) {<a name="line.66"></a> +<span class="sourceLineNo">067</span> return cf.containsValue(value);<a name="line.67"></a> +<span class="sourceLineNo">068</span> }<a name="line.68"></a> +<span class="sourceLineNo">069</span><a name="line.69"></a> +<span class="sourceLineNo">070</span> @Override /* ConfigFile */<a name="line.70"></a> +<span class="sourceLineNo">071</span> public Set<java.util.Map.Entry<String,Section>> entrySet() {<a name="line.71"></a> +<span class="sourceLineNo">072</span> return cf.entrySet();<a name="line.72"></a> +<span class="sourceLineNo">073</span> }<a name="line.73"></a> +<span class="sourceLineNo">074</span><a name="line.74"></a> +<span class="sourceLineNo">075</span> @Override /* ConfigFile */<a name="line.75"></a> +<span class="sourceLineNo">076</span> public Section get(Object key) {<a name="line.76"></a> +<span class="sourceLineNo">077</span> return cf.get(key);<a name="line.77"></a> +<span class="sourceLineNo">078</span> }<a name="line.78"></a> +<span class="sourceLineNo">079</span><a name="line.79"></a> +<span class="sourceLineNo">080</span> @Override /* ConfigFile */<a name="line.80"></a> +<span class="sourceLineNo">081</span> public boolean isEmpty() {<a name="line.81"></a> +<span class="sourceLineNo">082</span> return cf.isEmpty();<a name="line.82"></a> +<span class="sourceLineNo">083</span> }<a name="line.83"></a> +<span class="sourceLineNo">084</span><a name="line.84"></a> +<span class="sourceLineNo">085</span> @Override /* ConfigFile */<a name="line.85"></a> +<span class="sourceLineNo">086</span> public Set<String> keySet() {<a name="line.86"></a> +<span class="sourceLineNo">087</span> return cf.keySet();<a name="line.87"></a> +<span class="sourceLineNo">088</span> }<a name="line.88"></a> +<span class="sourceLineNo">089</span><a name="line.89"></a> +<span class="sourceLineNo">090</span> @Override /* ConfigFile */<a name="line.90"></a> +<span class="sourceLineNo">091</span> public Section put(String key, Section value) {<a name="line.91"></a> +<span class="sourceLineNo">092</span> return cf.put(key, value);<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> @Override /* ConfigFile */<a name="line.95"></a> +<span class="sourceLineNo">096</span> public void putAll(Map<? extends String,? extends Section> map) {<a name="line.96"></a> +<span class="sourceLineNo">097</span> cf.putAll(map);<a name="line.97"></a> +<span class="sourceLineNo">098</span> }<a name="line.98"></a> +<span class="sourceLineNo">099</span><a name="line.99"></a> +<span class="sourceLineNo">100</span> @Override /* ConfigFile */<a name="line.100"></a> +<span class="sourceLineNo">101</span> public Section remove(Object key) {<a name="line.101"></a> +<span class="sourceLineNo">102</span> return cf.remove(key);<a name="line.102"></a> +<span class="sourceLineNo">103</span> }<a name="line.103"></a> +<span class="sourceLineNo">104</span><a name="line.104"></a> +<span class="sourceLineNo">105</span> @Override /* ConfigFile */<a name="line.105"></a> +<span class="sourceLineNo">106</span> public int size() {<a name="line.106"></a> +<span class="sourceLineNo">107</span> return cf.size();<a name="line.107"></a> +<span class="sourceLineNo">108</span> }<a name="line.108"></a> +<span class="sourceLineNo">109</span><a name="line.109"></a> +<span class="sourceLineNo">110</span> @Override /* ConfigFile */<a name="line.110"></a> +<span class="sourceLineNo">111</span> public Collection<Section> values() {<a name="line.111"></a> +<span class="sourceLineNo">112</span> return cf.values();<a name="line.112"></a> +<span class="sourceLineNo">113</span> }<a name="line.113"></a> +<span class="sourceLineNo">114</span><a name="line.114"></a> +<span class="sourceLineNo">115</span> @Override /* ConfigFile */<a name="line.115"></a> +<span class="sourceLineNo">116</span> public ConfigFile loadIfModified() throws IOException {<a name="line.116"></a> +<span class="sourceLineNo">117</span> cf.loadIfModified();<a name="line.117"></a> +<span class="sourceLineNo">118</span> return this;<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> @Override /* ConfigFile */<a name="line.121"></a> +<span class="sourceLineNo">122</span> public ConfigFile load() throws IOException {<a name="line.122"></a> +<span class="sourceLineNo">123</span> cf.load();<a name="line.123"></a> +<span class="sourceLineNo">124</span> return this;<a name="line.124"></a> +<span class="sourceLineNo">125</span> }<a name="line.125"></a> +<span class="sourceLineNo">126</span><a name="line.126"></a> +<span class="sourceLineNo">127</span> @Override /* ConfigFile */<a name="line.127"></a> +<span class="sourceLineNo">128</span> public ConfigFile load(Reader r) throws IOException {<a name="line.128"></a> +<span class="sourceLineNo">129</span> cf.load(r);<a name="line.129"></a> +<span class="sourceLineNo">130</span> return this;<a name="line.130"></a> +<span class="sourceLineNo">131</span> }<a name="line.131"></a> <span class="sourceLineNo">132</span><a name="line.132"></a> -<span class="sourceLineNo">133</span> @Override /* ConfigFile */<a name="line.133"></a> -<span class="sourceLineNo">134</span> public boolean isEncoded(String key) {<a name="line.134"></a> -<span class="sourceLineNo">135</span> return cf.isEncoded(key);<a name="line.135"></a> -<span class="sourceLineNo">136</span> }<a name="line.136"></a> -<span class="sourceLineNo">137</span><a name="line.137"></a> -<span class="sourceLineNo">138</span> @Override /* ConfigFile */<a name="line.138"></a> -<span class="sourceLineNo">139</span> public ConfigFile addLines(String section, String... lines) {<a name="line.139"></a> -<span class="sourceLineNo">140</span> cf.addLines(section, lines);<a name="line.140"></a> -<span class="sourceLineNo">141</span> return this;<a name="line.141"></a> -<span class="sourceLineNo">142</span> }<a name="line.142"></a> -<span class="sourceLineNo">143</span><a name="line.143"></a> -<span class="sourceLineNo">144</span> @Override /* ConfigFile */<a name="line.144"></a> -<span class="sourceLineNo">145</span> public ConfigFile addHeaderComments(String section, String... headerComments) {<a name="line.145"></a> -<span class="sourceLineNo">146</span> cf.addHeaderComments(section, headerComments);<a name="line.146"></a> -<span class="sourceLineNo">147</span> return this;<a name="line.147"></a> -<span class="sourceLineNo">148</span> }<a name="line.148"></a> -<span class="sourceLineNo">149</span><a name="line.149"></a> -<span class="sourceLineNo">150</span> @Override /* ConfigFile */<a name="line.150"></a> -<span class="sourceLineNo">151</span> public ConfigFile clearHeaderComments(String section) {<a name="line.151"></a> -<span class="sourceLineNo">152</span> cf.clearHeaderComments(section);<a name="line.152"></a> -<span class="sourceLineNo">153</span> return this;<a name="line.153"></a> -<span class="sourceLineNo">154</span> }<a name="line.154"></a> -<span class="sourceLineNo">155</span><a name="line.155"></a> -<span class="sourceLineNo">156</span> @Override /* ConfigFile */<a name="line.156"></a> -<span class="sourceLineNo">157</span> public Section getSection(String name) {<a name="line.157"></a> -<span class="sourceLineNo">158</span> return cf.getSection(name);<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> @Override /* ConfigFile */<a name="line.161"></a> -<span class="sourceLineNo">162</span> public Section getSection(String name, boolean create) {<a name="line.162"></a> -<span class="sourceLineNo">163</span> return cf.getSection(name, create);<a name="line.163"></a> -<span class="sourceLineNo">164</span> }<a name="line.164"></a> -<span class="sourceLineNo">165</span><a name="line.165"></a> -<span class="sourceLineNo">166</span> @Override /* ConfigFile */<a name="line.166"></a> -<span class="sourceLineNo">167</span> public ConfigFile addSection(String name) {<a name="line.167"></a> -<span class="sourceLineNo">168</span> cf.addSection(name);<a name="line.168"></a> -<span class="sourceLineNo">169</span> return this;<a name="line.169"></a> -<span class="sourceLineNo">170</span> }<a name="line.170"></a> -<span class="sourceLineNo">171</span><a name="line.171"></a> -<span class="sourceLineNo">172</span> @Override /* ConfigFile */<a name="line.172"></a> -<span class="sourceLineNo">173</span> public ConfigFile setSection(String name, Map<String,String> contents) {<a name="line.173"></a> -<span class="sourceLineNo">174</span> cf.setSection(name, contents);<a name="line.174"></a> -<span class="sourceLineNo">175</span> return this;<a name="line.175"></a> -<span class="sourceLineNo">176</span> }<a name="line.176"></a> -<span class="sourceLineNo">177</span><a name="line.177"></a> -<span class="sourceLineNo">178</span> @Override /* ConfigFile */<a name="line.178"></a> -<span class="sourceLineNo">179</span> public ConfigFile removeSection(String name) {<a name="line.179"></a> -<span class="sourceLineNo">180</span> cf.removeSection(name);<a name="line.180"></a> -<span class="sourceLineNo">181</span> return this;<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> @Override /* ConfigFile */<a name="line.184"></a> -<span class="sourceLineNo">185</span> public ConfigFile save() throws IOException {<a name="line.185"></a> -<span class="sourceLineNo">186</span> cf.save();<a name="line.186"></a> -<span class="sourceLineNo">187</span> return this;<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> @Override /* ConfigFile */<a name="line.190"></a> -<span class="sourceLineNo">191</span> public ConfigFile serializeTo(Writer out, ConfigFileFormat format) throws IOException {<a name="line.191"></a> -<span class="sourceLineNo">192</span> cf.serializeTo(out, format);<a name="line.192"></a> -<span class="sourceLineNo">193</span> return this;<a name="line.193"></a> -<span class="sourceLineNo">194</span> }<a name="line.194"></a> -<span class="sourceLineNo">195</span><a name="line.195"></a> -<span class="sourceLineNo">196</span> @Override /* ConfigFile */<a name="line.196"></a> -<span class="sourceLineNo">197</span> public String toString() {<a name="line.197"></a> -<span class="sourceLineNo">198</span> return cf.toString();<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> @Override /* ConfigFile */<a name="line.201"></a> -<span class="sourceLineNo">202</span> public ConfigFile getResolving(VarResolver varResolver) {<a name="line.202"></a> -<span class="sourceLineNo">203</span> assertFieldNotNull(varResolver, "vr");<a name="line.203"></a> -<span class="sourceLineNo">204</span> return new ConfigFileWrapped(cf, varResolver);<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> @Override /* ConfigFile */<a name="line.207"></a> -<span class="sourceLineNo">208</span> public ConfigFile getResolving(VarResolverSession varSession) {<a name="line.208"></a> -<span class="sourceLineNo">209</span> assertFieldNotNull(varSession, "vs");<a name="line.209"></a> -<span class="sourceLineNo">210</span> return new ConfigFileWrapped(cf, varSession);<a name="line.210"></a> -<span class="sourceLineNo">211</span> }<a name="line.211"></a> -<span class="sourceLineNo">212</span><a name="line.212"></a> -<span class="sourceLineNo">213</span> @Override /* ConfigFile */<a name="line.213"></a> -<span class="sourceLineNo">214</span> public ConfigFile getResolving() {<a name="line.214"></a> -<span class="sourceLineNo">215</span> return new ConfigFileWrapped(cf, VarResolver.DEFAULT);<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 /* ConfigFile */<a name="line.218"></a> -<span class="sourceLineNo">219</span> public ConfigFile addListener(ConfigFileListener listener) {<a name="line.219"></a> -<span class="sourceLineNo">220</span> cf.addListener(listener);<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 /* ConfigFile */<a name="line.224"></a> -<span class="sourceLineNo">225</span> public Writable toWritable() {<a name="line.225"></a> -<span class="sourceLineNo">226</span> return cf.toWritable();<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> @Override /* ConfigFile */<a name="line.229"></a> -<span class="sourceLineNo">230</span> public ConfigFile merge(ConfigFile newCf) {<a name="line.230"></a> -<span class="sourceLineNo">231</span> cf.merge(newCf);<a name="line.231"></a> -<span class="sourceLineNo">232</span> return this;<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> @Override /* ConfigFile */<a name="line.235"></a> -<span class="sourceLineNo">236</span> protected WriterSerializer getSerializer() throws SerializeException {<a name="line.236"></a> -<span class="sourceLineNo">237</span> return cf.getSerializer();<a name="line.237"></a> -<span class="sourceLineNo">238</span> }<a name="line.238"></a> -<span class="sourceLineNo">239</span><a name="line.239"></a> -<span class="sourceLineNo">240</span> @Override /* ConfigFile */<a name="line.240"></a> -<span class="sourceLineNo">241</span> protected ReaderParser getParser() throws ParseException {<a name="line.241"></a> -<span class="sourceLineNo">242</span> return cf.getParser();<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 /* ConfigFile */<a name="line.245"></a> -<span class="sourceLineNo">246</span> public String get(String sectionName, String sectionKey) {<a name="line.246"></a> -<span class="sourceLineNo">247</span> String s = cf.get(sectionName, sectionKey);<a name="line.247"></a> -<span class="sourceLineNo">248</span> if (s == null)<a name="line.248"></a> -<span class="sourceLineNo">249</span> return null;<a name="line.249"></a> -<span class="sourceLineNo">250</span> return vs.resolve(s);<a name="line.250"></a> -<span class="sourceLineNo">251</span> }<a name="line.251"></a> -<span class="sourceLineNo">252</span><a name="line.252"></a> -<span class="sourceLineNo">253</span> @Override /* ConfigFile */<a name="line.253"></a> -<span class="sourceLineNo">254</span> public String put(String sectionName, String sectionKey, Object value, boolean encoded) {<a name="line.254"></a> -<span class="sourceLineNo">255</span> return cf.put(sectionName, sectionKey, value, encoded);<a name="line.255"></a> -<span class="sourceLineNo">256</span> }<a name="line.256"></a> -<span class="sourceLineNo">257</span><a name="line.257"></a> -<span class="sourceLineNo">258</span> @Override /* ConfigFile */<a name="line.258"></a> -<span class="sourceLineNo">259</span> public String remove(String sectionName, String sectionKey) {<a name="line.259"></a> -<span class="sourceLineNo">260</span> return cf.remove(sectionName, sectionKey);<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 /* ConfigFile */<a name="line.263"></a> -<span class="sourceLineNo">264</span> public Set<String> getSectionKeys(String sectionName) {<a name="line.264"></a> -<span class="sourceLineNo">265</span> return cf.getSectionKeys(sectionName);<a name="line.265"></a> -<span class="sourceLineNo">266</span> }<a name="line.266"></a> -<span class="sourceLineNo">267</span><a name="line.267"></a> -<span class="sourceLineNo">268</span> @Override /* ConfigFile */<a name="line.268"></a> -<span class="sourceLineNo">269</span> protected void readLock() {<a name="line.269"></a> -<span class="sourceLineNo">270</span> cf.readLock();<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> @Override /* ConfigFile */<a name="line.273"></a> -<span class="sourceLineNo">274</span> protected void readUnlock() {<a name="line.274"></a> -<span class="sourceLineNo">275</span> cf.readUnlock();<a name="line.275"></a> -<span class="sourceLineNo">276</span> }<a name="line.276"></a> -<span class="sourceLineNo">277</span>}<a name="line.277"></a> +<span class="sourceLineNo">133</span><a name="line.133"></a> +<span class="sourceLineNo">134</span> @Override /* ConfigFile */<a name="line.134"></a> +<span class="sourceLineNo">135</span> public boolean isEncoded(String key) {<a name="line.135"></a> +<span class="sourceLineNo">136</span> return cf.isEncoded(key);<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> @Override /* ConfigFile */<a name="line.139"></a> +<span class="sourceLineNo">140</span> public ConfigFile addLines(String section, String... lines) {<a name="line.140"></a> +<span class="sourceLineNo">141</span> cf.addLines(section, lines);<a name="line.141"></a> +<span class="sourceLineNo">142</span> return this;<a name="line.142"></a> +<span class="sourceLineNo">143</span> }<a name="line.143"></a> +<span class="sourceLineNo">144</span><a name="line.144"></a> +<span class="sourceLineNo">145</span> @Override /* ConfigFile */<a name="line.145"></a> +<span class="sourceLineNo">146</span> public ConfigFile addHeaderComments(String section, String... headerComments) {<a name="line.146"></a> +<span class="sourceLineNo">147</span> cf.addHeaderComments(section, headerComments);<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> @Override /* ConfigFile */<a name="line.151"></a> +<span class="sourceLineNo">152</span> public ConfigFile clearHeaderComments(String section) {<a name="line.152"></a> +<span class="sourceLineNo">153</span> cf.clearHeaderComments(section);<a name="line.153"></a> +<span class="sourceLineNo">154</span> return this;<a name="line.154"></a> +<span class="sourceLineNo">155</span> }<a name="line.155"></a> +<span class="sourceLineNo">156</span><a name="line.156"></a> +<span class="sourceLineNo">157</span> @Override /* ConfigFile */<a name="line.157"></a> +<span class="sourceLineNo">158</span> public Section getSection(String name) {<a name="line.158"></a> +<span class="sourceLineNo">159</span> return cf.getSection(name);<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> @Override /* ConfigFile */<a name="line.162"></a> +<span class="sourceLineNo">163</span> public Section getSection(String name, boolean create) {<a name="line.163"></a> +<span class="sourceLineNo">164</span> return cf.getSection(name, create);<a name="line.164"></a> +<span class="sourceLineNo">165</span> }<a name="line.165"></a> +<span class="sourceLineNo">166</span><a name="line.166"></a> +<span class="sourceLineNo">167</span> @Override /* ConfigFile */<a name="line.167"></a> +<span class="sourceLineNo">168</span> public ConfigFile addSection(String name) {<a name="line.168"></a> +<span class="sourceLineNo">169</span> cf.addSection(name);<a name="line.169"></a> +<span class="sourceLineNo">170</span> return this;<a name="line.170"></a> +<span class="sourceLineNo">171</span> }<a name="line.171"></a> +<span class="sourceLineNo">172</span><a name="line.172"></a> +<span class="sourceLineNo">173</span> @Override /* ConfigFile */<a name="line.173"></a> +<span class="sourceLineNo">174</span> public ConfigFile setSection(String name, Map<String,String> contents) {<a name="line.174"></a> +<span class="sourceLineNo">175</span> cf.setSection(name, contents);<a name="line.175"></a> +<span class="sourceLineNo">176</span> return this;<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> @Override /* ConfigFile */<a name="line.179"></a> +<span class="sourceLineNo">180</span> public ConfigFile removeSection(String name) {<a name="line.180"></a> +<span class="sourceLineNo">181</span> cf.removeSection(name);<a name="line.181"></a> +<span class="sourceLineNo">182</span> return this;<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> @Override /* ConfigFile */<a name="line.185"></a> +<span class="sourceLineNo">186</span> public ConfigFile save() throws IOException {<a name="line.186"></a> +<span class="sourceLineNo">187</span> cf.save();<a name="line.187"></a> +<span class="sourceLineNo">188</span> return this;<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 /* ConfigFile */<a name="line.191"></a> +<span class="sourceLineNo">192</span> public ConfigFile serializeTo(Writer out, ConfigFileFormat format) throws IOException {<a name="line.192"></a> +<span class="sourceLineNo">193</span> cf.serializeTo(out, format);<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 /* ConfigFile */<a name="line.197"></a> +<span class="sourceLineNo">198</span> public String toString() {<a name="line.198"></a> +<span class="sourceLineNo">199</span> return cf.toString();<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> @Override /* ConfigFile */<a name="line.202"></a> +<span class="sourceLineNo">203</span> public ConfigFile getResolving(VarResolver varResolver) {<a name="line.203"></a> +<span class="sourceLineNo">204</span> assertFieldNotNull(varResolver, "vr");<a name="line.204"></a> +<span class="sourceLineNo">205</span> return new ConfigFileWrapped(cf, varResolver);<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> @Override /* ConfigFile */<a name="line.208"></a> +<span class="sourceLineNo">209</span> public ConfigFile getResolving(VarResolverSession varSession) {<a name="line.209"></a> +<span class="sourceLineNo">210</span> assertFieldNotNull(varSession, "vs");<a name="line.210"></a> +<span class="sourceLineNo">211</span> return new ConfigFileWrapped(cf, varSession);<a name="line.211"></a> +<span class="sourceLineNo">212</span> }<a name="line.212"></a> +<span class="sourceLineNo">213</span><a name="line.213"></a> +<span class="sourceLineNo">214</span> @Override /* ConfigFile */<a name="line.214"></a> +<span class="sourceLineNo">215</span> public ConfigFile getResolving() {<a name="line.215"></a> +<span class="sourceLineNo">216</span> return new ConfigFileWrapped(cf, VarResolver.DEFAULT);<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> @Override /* ConfigFile */<a name="line.219"></a> +<span class="sourceLineNo">220</span> public ConfigFile addListener(ConfigFileListener listener) {<a name="line.220"></a> +<span class="sourceLineNo">221</span> cf.addListener(listener);<a name="line.221"></a> +<span class="sourceLineNo">222</span> return this;<a name="line.222"></a> +<span class="sourceLineNo">223</span> }<a name="line.223"></a> +<span class="sourceLineNo">224</span><a name="line.224"></a> +<span class="sourceLineNo">225</span> @Override /* ConfigFile */<a name="line.225"></a> +<span class="sourceLineNo">226</span> public Writable toWritable() {<a name="line.226"></a> +<span class="sourceLineNo">227</span> return cf.toWritable();<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 /* ConfigFile */<a name="line.230"></a> +<span class="sourceLineNo">231</span> public ConfigFile merge(ConfigFile newCf) {<a name="line.231"></a> +<span class="sourceLineNo">232</span> cf.merge(newCf);<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 /* ConfigFile */<a name="line.236"></a> +<span class="sourceLineNo">237</span> protected BeanSession getBeanSession() {<a name="line.237"></a> +<span class="sourceLineNo">238</span> return cf.getBeanSession();<a name="line.238"></a> +<span class="sourceLineNo">239</span> }<a name="line.239"></a> +<span class="sourceLineNo">240</span><a name="line.240"></a> +<span class="sourceLineNo">241</span> @Override /* ConfigFile */<a name="line.241"></a> +<span class="sourceLineNo">242</span> public String get(String sectionName, String sectionKey) {<a name="line.242"></a> +<span class="sourceLineNo">243</span> String s = cf.get(sectionName, sectionKey);<a name="line.243"></a> +<span class="sourceLineNo">244</span> if (s == null)<a name="line.244"></a> +<span class="sourceLineNo">245</span> return null;<a name="line.245"></a> +<span class="sourceLineNo">246</span> return vs.resolve(s);<a name="line.246"></a> +<span class="sourceLineNo">247</span> }<a name="line.247"></a> +<span class="sourceLineNo">248</span><a name="line.248"></a> +<span class="sourceLineNo">249</span> @Override /* ConfigFile */<a name="line.249"></a> +<span class="sourceLineNo">250</span> public String put(String sectionName, String sectionKey, String value, boolean encoded) {<a name="line.250"></a> +<span class="sourceLineNo">251</span> return cf.put(sectionName, sectionKey, value, encoded);<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 /* ConfigFile */<a name="line.254"></a> +<span class="sourceLineNo">255</span> public String put(String sectionName, String sectionKey, Object value, boolean encoded) throws SerializeException {<a name="line.255"></a> +<span class="sourceLineNo">256</span> return cf.put(sectionName, sectionKey, value, encoded);<a name="line.256"></a> +<span class="sourceLineNo">257</span> }<a name="line.257"></a> +<span class="sourceLineNo">258</span><a name="line.258"></a> +<span class="sourceLineNo">259</span> @Override /* ConfigFile */<a name="line.259"></a> +<span class="sourceLineNo">260</span> public String remove(String sectionName, String sectionKey) {<a name="line.260"></a> +<span class="sourceLineNo">261</span> return cf.remove(sectionName, sectionKey);<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> @Override /* ConfigFile */<a name="line.264"></a> +<span class="sourceLineNo">265</span> public Set<String> getSectionKeys(String sectionName) {<a name="line.265"></a> +<span class="sourceLineNo">266</span> return cf.getSectionKeys(sectionName);<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> @Override /* ConfigFile */<a name="line.269"></a> +<span class="sourceLineNo">270</span> protected void readLock() {<a name="line.270"></a> +<span class="sourceLineNo">271</span> cf.readLock();<a name="line.271"></a> +<span class="sourceLineNo">272</span> }<a name="line.272"></a> +<span class="sourceLineNo">273</span><a name="line.273"></a> +<span class="sourceLineNo">274</span> @Override /* ConfigFile */<a name="line.274"></a> +<span class="sourceLineNo">275</span> protected void readUnlock() {<a name="line.275"></a> +<span class="sourceLineNo">276</span> cf.readUnlock();<a name="line.276"></a> +<span class="sourceLineNo">277</span> }<a name="line.277"></a> +<span class="sourceLineNo">278</span><a name="line.278"></a> +<span class="sourceLineNo">279</span> @Override /* ConfigFile */<a name="line.279"></a> +<span class="sourceLineNo">280</span> protected String serialize(Object o) throws SerializeException {<a name="line.280"></a> +<span class="sourceLineNo">281</span> return cf.serialize(o);<a name="line.281"></a> +<span class="sourceLineNo">282</span> }<a name="line.282"></a> +<span class="sourceLineNo">283</span><a name="line.283"></a> +<span class="sourceLineNo">284</span> @Override /* ConfigFile */<a name="line.284"></a> +<span class="sourceLineNo">285</span> protected <T> T parse(String s, Type type, Type... args) throws ParseException {<a name="line.285"></a> +<span class="sourceLineNo">286</span> return cf.parse(s, type, args);<a name="line.286"></a> +<span class="sourceLineNo">287</span> }<a name="line.287"></a> +<span class="sourceLineNo">288</span>}<a name="line.288"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/a61cb5e3/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.Strict.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.Strict.html b/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.Strict.html index 9dd1c86..d00c3d4 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.Strict.html +++ b/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.Strict.html @@ -598,7 +598,7 @@ <span class="sourceLineNo">590</span> break;<a name="line.590"></a> <span class="sourceLineNo">591</span> }<a name="line.591"></a> <span class="sourceLineNo">592</span> } else {<a name="line.592"></a> -<span class="sourceLineNo">593</span> if (c == ',' || c == '}' || session.isWhitespace(c)) {<a name="line.593"></a> +<span class="sourceLineNo">593</span> if (c == ',' || c == '}' || c == ']' || session.isWhitespace(c)) {<a name="line.593"></a> <span class="sourceLineNo">594</span> s = r.getMarked(0, -1);<a name="line.594"></a> <span class="sourceLineNo">595</span> r.unread();<a name="line.595"></a> <span class="sourceLineNo">596</span> break;<a name="line.596"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/a61cb5e3/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.html b/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.html index 9dd1c86..d00c3d4 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.html +++ b/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.html @@ -598,7 +598,7 @@ <span class="sourceLineNo">590</span> break;<a name="line.590"></a> <span class="sourceLineNo">591</span> }<a name="line.591"></a> <span class="sourceLineNo">592</span> } else {<a name="line.592"></a> -<span class="sourceLineNo">593</span> if (c == ',' || c == '}' || session.isWhitespace(c)) {<a name="line.593"></a> +<span class="sourceLineNo">593</span> if (c == ',' || c == '}' || c == ']' || session.isWhitespace(c)) {<a name="line.593"></a> <span class="sourceLineNo">594</span> s = r.getMarked(0, -1);<a name="line.594"></a> <span class="sourceLineNo">595</span> r.unread();<a name="line.595"></a> <span class="sourceLineNo">596</span> break;<a name="line.596"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/a61cb5e3/content/site/apidocs/src-html/org/apache/juneau/microservice/RestMicroservice.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/microservice/RestMicroservice.html b/content/site/apidocs/src-html/org/apache/juneau/microservice/RestMicroservice.html index c02e4c0..63325ba 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/microservice/RestMicroservice.html +++ b/content/site/apidocs/src-html/org/apache/juneau/microservice/RestMicroservice.html @@ -277,7 +277,7 @@ <span class="sourceLineNo">269</span> ch.setFormatter(new LogEntryFormatter(format, dateFormat, false));<a name="line.269"></a> <span class="sourceLineNo">270</span> logger.addHandler(ch);<a name="line.270"></a> <span class="sourceLineNo">271</span> }<a name="line.271"></a> -<span class="sourceLineNo">272</span> ObjectMap loggerLevels = cf.getObject(ObjectMap.class, "Logging/levels");<a name="line.272"></a> +<span class="sourceLineNo">272</span> ObjectMap loggerLevels = cf.getObject("Logging/levels", ObjectMap.class);<a name="line.272"></a> <span class="sourceLineNo">273</span> if (loggerLevels != null)<a name="line.273"></a> <span class="sourceLineNo">274</span> for (String l : loggerLevels.keySet())<a name="line.274"></a> <span class="sourceLineNo">275</span> Logger.getLogger(l).setLevel(loggerLevels.get(Level.class, l));<a name="line.275"></a> @@ -347,7 +347,7 @@ <span class="sourceLineNo">339</span> ConfigFile cf = getConfig();<a name="line.339"></a> <span class="sourceLineNo">340</span> ObjectMap mf = getManifest();<a name="line.340"></a> <span class="sourceLineNo">341</span> <a name="line.341"></a> -<span class="sourceLineNo">342</span> int[] ports = cf.getObject(int[].class, "REST/port", mf.get(int[].class, "Rest-Port", new int[]{8000}));<a name="line.342"></a> +<span class="sourceLineNo">342</span> int[] ports = cf.getObjectWithDefault("REST/port", mf.get(int[].class, "Rest-Port", new int[]{8000}), int[].class);<a name="line.342"></a> <span class="sourceLineNo">343</span><a name="line.343"></a> <span class="sourceLineNo">344</span> port = findOpenPort(ports);<a name="line.344"></a> <span class="sourceLineNo">345</span> if (port == 0) {<a name="line.345"></a> @@ -482,7 +482,7 @@ <span class="sourceLineNo">474</span> ObjectMap mf = getManifest();<a name="line.474"></a> <span class="sourceLineNo">475</span> Map<String,Class<? extends Servlet>> rm = new LinkedHashMap<String,Class<? extends Servlet>>();<a name="line.475"></a> <span class="sourceLineNo">476</span><a name="line.476"></a> -<span class="sourceLineNo">477</span> ObjectMap resourceMap = cf.getObject(ObjectMap.class, "REST/resourceMap");<a name="line.477"></a> +<span class="sourceLineNo">477</span> ObjectMap resourceMap = cf.getObject("REST/resourceMap", ObjectMap.class);<a name="line.477"></a> <span class="sourceLineNo">478</span> String[] resources = cf.getStringArray("REST/resources", mf.getStringArray("Rest-Resources"));<a name="line.478"></a> <span class="sourceLineNo">479</span><a name="line.479"></a> <span class="sourceLineNo">480</span> if (resourceMap != null && ! resourceMap.isEmpty()) {<a name="line.480"></a>
