http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5f11cb85/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 9130373..8ef24a7 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 @@ -107,7 +107,7 @@ <span class="sourceLineNo">099</span> super(args);<a name="line.99"></a> <span class="sourceLineNo">100</span> }<a name="line.100"></a> <span class="sourceLineNo">101</span><a name="line.101"></a> -<span class="sourceLineNo">102</span> <a name="line.102"></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> // Methods implemented on Microservice API<a name="line.104"></a> <span class="sourceLineNo">105</span> //--------------------------------------------------------------------------------<a name="line.105"></a> @@ -155,11 +155,11 @@ <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> <a name="line.150"></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> // RestMicroservice API methods.<a name="line.152"></a> <span class="sourceLineNo">153</span> //--------------------------------------------------------------------------------<a name="line.153"></a> -<span class="sourceLineNo">154</span> <a name="line.154"></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> * Returns the port that this microservice started up on.<a name="line.156"></a> <span class="sourceLineNo">157</span> * @return The port that this microservice started up on.<a name="line.157"></a> @@ -350,7 +350,7 @@ <span class="sourceLineNo">342</span><a name="line.342"></a> <span class="sourceLineNo">343</span> ConfigFile cf = getConfig();<a name="line.343"></a> <span class="sourceLineNo">344</span> ObjectMap mf = getManifest();<a name="line.344"></a> -<span class="sourceLineNo">345</span> <a name="line.345"></a> +<span class="sourceLineNo">345</span><a name="line.345"></a> <span class="sourceLineNo">346</span> int[] ports = cf.getObjectWithDefault("REST/port", mf.get(int[].class, "Rest-Port", new int[]{8000}), int[].class);<a name="line.346"></a> <span class="sourceLineNo">347</span><a name="line.347"></a> <span class="sourceLineNo">348</span> port = findOpenPort(ports);<a name="line.348"></a> @@ -358,7 +358,7 @@ <span class="sourceLineNo">350</span> System.err.println("Open port not found. Tried " + JsonSerializer.DEFAULT_LAX.toString(ports));<a name="line.350"></a> <span class="sourceLineNo">351</span> System.exit(1);<a name="line.351"></a> <span class="sourceLineNo">352</span> }<a name="line.352"></a> -<span class="sourceLineNo">353</span> <a name="line.353"></a> +<span class="sourceLineNo">353</span><a name="line.353"></a> <span class="sourceLineNo">354</span> contextPath = cf.getString("REST/contextPath", mf.getString("Rest-ContextPath", "/"));<a name="line.354"></a> <span class="sourceLineNo">355</span><a name="line.355"></a> <span class="sourceLineNo">356</span> if (cf.getBoolean("REST/useSsl")) {<a name="line.356"></a> @@ -374,7 +374,7 @@ <span class="sourceLineNo">366</span> // We're using Jetty 8 that doesn't allow regular expression matching in SslContextFactory.setExcludeCipherSuites(),<a name="line.366"></a> <span class="sourceLineNo">367</span> // so to prevent having the config file list all old cipher suites, exclude the known bad ones.<a name="line.367"></a> <span class="sourceLineNo">368</span> String[] excludeCipherSuites = combine(<a name="line.368"></a> -<span class="sourceLineNo">369</span> split("SSL_RSA_WITH_DES_CBC_SHA,SSL_DHE_RSA_WITH_DES_CBC_SHA,SSL_DHE_DSS_WITH_DES_CBC_SHA,SSL_RSA_EXPORT_WITH_RC4_40_MD5,SSL_RSA_EXPORT_WITH_DES40_CBC_SHA,SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA,SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA,SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA,TLS_DHE_RSA_WITH_AES_256_CBC_SHA256,TLS_DHE_DSS_WITH_AES_256_CBC_SHA256,TLS_DHE_RSA_WITH_AES_256_CBC_SHA,TLS_DHE_DSS_WITH_AES_256_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,TLS_DHE_DSS_WITH_AES_128_CBC_SHA256,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_DSS_WITH_AES_128_CBC_SHA", ','),<a name="line.369"></a> +<span class="sourceLineNo">369</span> split("SSL_RSA_WITH_DES_CBC_SHA,SSL_DHE_RSA_WITH_DES_CBC_SHA,SSL_DHE_DSS_WITH_DES_CBC_SHA,SSL_RSA_EXPORT_WITH_RC4_40_MD5,SSL_RSA_EXPORT_WITH_DES40_CBC_SHA,SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA,SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA,SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA,TLS_DHE_RSA_WITH_AES_256_CBC_SHA256,TLS_DHE_DSS_WITH_AES_256_CBC_SHA256,TLS_DHE_RSA_WITH_AES_256_CBC_SHA,TLS_DHE_DSS_WITH_AES_256_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,TLS_DHE_DSS_WITH_AES_128_CBC_SHA256,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_DSS_WITH_AES_128_CBC_SHA"),<a name="line.369"></a> <span class="sourceLineNo">370</span> sslContextFactory.getExcludeCipherSuites()<a name="line.370"></a> <span class="sourceLineNo">371</span> );<a name="line.371"></a> <span class="sourceLineNo">372</span> sslContextFactory.setExcludeCipherSuites(excludeCipherSuites);<a name="line.372"></a> @@ -405,7 +405,7 @@ <span class="sourceLineNo">397</span><a name="line.397"></a> <span class="sourceLineNo">398</span> return server;<a name="line.398"></a> <span class="sourceLineNo">399</span> }<a name="line.399"></a> -<span class="sourceLineNo">400</span> <a name="line.400"></a> +<span class="sourceLineNo">400</span><a name="line.400"></a> <span class="sourceLineNo">401</span> private static int findOpenPort(int[] ports) {<a name="line.401"></a> <span class="sourceLineNo">402</span> for (int port : ports) {<a name="line.402"></a> <span class="sourceLineNo">403</span> try {<a name="line.403"></a> @@ -424,7 +424,7 @@ <span class="sourceLineNo">416</span> * Method used to start the Jetty server created by {@link #createServer()}.<a name="line.416"></a> <span class="sourceLineNo">417</span> * <p><a name="line.417"></a> <span class="sourceLineNo">418</span> * Subclasses can override this method to customize server startup.<a name="line.418"></a> -<span class="sourceLineNo">419</span> * <a name="line.419"></a> +<span class="sourceLineNo">419</span> *<a name="line.419"></a> <span class="sourceLineNo">420</span> * @return The port that this server started on.<a name="line.420"></a> <span class="sourceLineNo">421</span> * @throws Exception<a name="line.421"></a> <span class="sourceLineNo">422</span> */<a name="line.422"></a> @@ -552,7 +552,7 @@ <span class="sourceLineNo">544</span> }<a name="line.544"></a> <span class="sourceLineNo">545</span> }<a name="line.545"></a> <span class="sourceLineNo">546</span><a name="line.546"></a> -<span class="sourceLineNo">547</span> <a name="line.547"></a> +<span class="sourceLineNo">547</span><a name="line.547"></a> <span class="sourceLineNo">548</span> //--------------------------------------------------------------------------------<a name="line.548"></a> <span class="sourceLineNo">549</span> // Lifecycle listener methods.<a name="line.549"></a> <span class="sourceLineNo">550</span> //--------------------------------------------------------------------------------<a name="line.550"></a> @@ -592,17 +592,17 @@ <span class="sourceLineNo">584</span> */<a name="line.584"></a> <span class="sourceLineNo">585</span> protected void onPostStopServer() {}<a name="line.585"></a> <span class="sourceLineNo">586</span><a name="line.586"></a> -<span class="sourceLineNo">587</span> <a name="line.587"></a> +<span class="sourceLineNo">587</span><a name="line.587"></a> <span class="sourceLineNo">588</span> //--------------------------------------------------------------------------------<a name="line.588"></a> <span class="sourceLineNo">589</span> // Overridden methods.<a name="line.589"></a> <span class="sourceLineNo">590</span> //--------------------------------------------------------------------------------<a name="line.590"></a> -<span class="sourceLineNo">591</span> <a name="line.591"></a> +<span class="sourceLineNo">591</span><a name="line.591"></a> <span class="sourceLineNo">592</span> @Override /* Microservice */<a name="line.592"></a> <span class="sourceLineNo">593</span> public RestMicroservice setConfig(String cfPath, boolean create) throws IOException {<a name="line.593"></a> <span class="sourceLineNo">594</span> super.setConfig(cfPath, create);<a name="line.594"></a> <span class="sourceLineNo">595</span> return this;<a name="line.595"></a> <span class="sourceLineNo">596</span> }<a name="line.596"></a> -<span class="sourceLineNo">597</span> <a name="line.597"></a> +<span class="sourceLineNo">597</span><a name="line.597"></a> <span class="sourceLineNo">598</span> @Override /* Microservice */<a name="line.598"></a> <span class="sourceLineNo">599</span> public RestMicroservice setConfig(ConfigFile cf) {<a name="line.599"></a> <span class="sourceLineNo">600</span> super.setConfig(cf);<a name="line.600"></a> @@ -632,7 +632,7 @@ <span class="sourceLineNo">624</span> super.setManifest(c);<a name="line.624"></a> <span class="sourceLineNo">625</span> return this;<a name="line.625"></a> <span class="sourceLineNo">626</span> }<a name="line.626"></a> -<span class="sourceLineNo">627</span> <a name="line.627"></a> +<span class="sourceLineNo">627</span><a name="line.627"></a> <span class="sourceLineNo">628</span> //--------------------------------------------------------------------------------<a name="line.628"></a> <span class="sourceLineNo">629</span> // Other methods.<a name="line.629"></a> <span class="sourceLineNo">630</span> //--------------------------------------------------------------------------------<a name="line.630"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5f11cb85/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html b/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html index 4590557..f4a9aad 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html +++ b/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html @@ -51,8 +51,8 @@ <span class="sourceLineNo">043</span> description="Log files from this service",<a name="line.43"></a> <span class="sourceLineNo">044</span> properties={<a name="line.44"></a> <span class="sourceLineNo">045</span> @Property(name=HTML_uriAnchorText, value=PROPERTY_NAME),<a name="line.45"></a> -<span class="sourceLineNo">046</span> @Property(name=REST_allowMethodParam, value="true")<a name="line.46"></a> -<span class="sourceLineNo">047</span> },<a name="line.47"></a> +<span class="sourceLineNo">046</span> },<a name="line.46"></a> +<span class="sourceLineNo">047</span> flags={REST_allowMethodParam},<a name="line.47"></a> <span class="sourceLineNo">048</span> pojoSwaps={<a name="line.48"></a> <span class="sourceLineNo">049</span> IteratorSwap.class, // Allows Iterators and Iterables to be serialized.<a name="line.49"></a> <span class="sourceLineNo">050</span> DateSwap.ISO8601DT.class // Serialize Date objects as ISO8601 strings.<a name="line.50"></a> @@ -71,12 +71,12 @@ <span class="sourceLineNo">063</span> return f.isDirectory() || f.getName().endsWith(".log");<a name="line.63"></a> <span class="sourceLineNo">064</span> }<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">066</span><a name="line.66"></a> <span class="sourceLineNo">067</span> @Override /* RestServlet */<a name="line.67"></a> <span class="sourceLineNo">068</span> public synchronized void init(RestConfig config) throws Exception {<a name="line.68"></a> <span class="sourceLineNo">069</span> super.init(config);<a name="line.69"></a> <span class="sourceLineNo">070</span> ConfigFile cf = config.getConfigFile();<a name="line.70"></a> -<span class="sourceLineNo">071</span> <a name="line.71"></a> +<span class="sourceLineNo">071</span><a name="line.71"></a> <span class="sourceLineNo">072</span> logDir = new File(cf.getString("Logging/logDir", "."));<a name="line.72"></a> <span class="sourceLineNo">073</span> leFormatter = new LogEntryFormatter(<a name="line.73"></a> <span class="sourceLineNo">074</span> cf.getString("Logging/format", "[{date} {level}] {msg}%n"),<a name="line.74"></a> @@ -96,12 +96,12 @@ <span class="sourceLineNo">088</span> * @throws Exception<a name="line.88"></a> <span class="sourceLineNo">089</span> */<a name="line.89"></a> <span class="sourceLineNo">090</span> @RestMethod(<a name="line.90"></a> -<span class="sourceLineNo">091</span> name="GET", <a name="line.91"></a> -<span class="sourceLineNo">092</span> path="/*", <a name="line.92"></a> +<span class="sourceLineNo">091</span> name="GET",<a name="line.91"></a> +<span class="sourceLineNo">092</span> path="/*",<a name="line.92"></a> <span class="sourceLineNo">093</span> swagger=@MethodSwagger(<a name="line.93"></a> <span class="sourceLineNo">094</span> responses={@Response(200),@Response(404)}<a name="line.94"></a> <span class="sourceLineNo">095</span> )<a name="line.95"></a> -<span class="sourceLineNo">096</span> ) <a name="line.96"></a> +<span class="sourceLineNo">096</span> )<a name="line.96"></a> <span class="sourceLineNo">097</span> public Object getFileOrDirectory(RestRequest req, RestResponse res, @Properties ObjectMap properties, @PathRemainder String path) throws Exception {<a name="line.97"></a> <span class="sourceLineNo">098</span><a name="line.98"></a> <span class="sourceLineNo">099</span> File f = getFile(path);<a name="line.99"></a> @@ -140,7 +140,7 @@ <span class="sourceLineNo">132</span> * @throws Exception<a name="line.132"></a> <span class="sourceLineNo">133</span> */<a name="line.133"></a> <span class="sourceLineNo">134</span> @RestMethod(<a name="line.134"></a> -<span class="sourceLineNo">135</span> name="VIEW", <a name="line.135"></a> +<span class="sourceLineNo">135</span> name="VIEW",<a name="line.135"></a> <span class="sourceLineNo">136</span> path="/*",<a name="line.136"></a> <span class="sourceLineNo">137</span> swagger=@MethodSwagger(<a name="line.137"></a> <span class="sourceLineNo">138</span> responses={@Response(200),@Response(404)}<a name="line.138"></a> @@ -219,9 +219,9 @@ <span class="sourceLineNo">211</span> * @throws Exception<a name="line.211"></a> <span class="sourceLineNo">212</span> */<a name="line.212"></a> <span class="sourceLineNo">213</span> @RestMethod(<a name="line.213"></a> -<span class="sourceLineNo">214</span> name="PARSE", <a name="line.214"></a> -<span class="sourceLineNo">215</span> path="/*", <a name="line.215"></a> -<span class="sourceLineNo">216</span> converters=Queryable.class, <a name="line.216"></a> +<span class="sourceLineNo">214</span> name="PARSE",<a name="line.214"></a> +<span class="sourceLineNo">215</span> path="/*",<a name="line.215"></a> +<span class="sourceLineNo">216</span> converters=Queryable.class,<a name="line.216"></a> <span class="sourceLineNo">217</span> swagger=@MethodSwagger(<a name="line.217"></a> <span class="sourceLineNo">218</span> responses={@Response(200),@Response(404)}<a name="line.218"></a> <span class="sourceLineNo">219</span> )<a name="line.219"></a> @@ -246,8 +246,8 @@ <span class="sourceLineNo">238</span> * @throws Exception<a name="line.238"></a> <span class="sourceLineNo">239</span> */<a name="line.239"></a> <span class="sourceLineNo">240</span> @RestMethod(<a name="line.240"></a> -<span class="sourceLineNo">241</span> name="DOWNLOAD", <a name="line.241"></a> -<span class="sourceLineNo">242</span> path="/*", <a name="line.242"></a> +<span class="sourceLineNo">241</span> name="DOWNLOAD",<a name="line.241"></a> +<span class="sourceLineNo">242</span> path="/*",<a name="line.242"></a> <span class="sourceLineNo">243</span> swagger=@MethodSwagger(<a name="line.243"></a> <span class="sourceLineNo">244</span> responses={@Response(200),@Response(404)}<a name="line.244"></a> <span class="sourceLineNo">245</span> )<a name="line.245"></a> @@ -272,7 +272,7 @@ <span class="sourceLineNo">264</span> * @throws Exception<a name="line.264"></a> <span class="sourceLineNo">265</span> */<a name="line.265"></a> <span class="sourceLineNo">266</span> @RestMethod(<a name="line.266"></a> -<span class="sourceLineNo">267</span> name="DELETE", <a name="line.267"></a> +<span class="sourceLineNo">267</span> name="DELETE",<a name="line.267"></a> <span class="sourceLineNo">268</span> path="/*",<a name="line.268"></a> <span class="sourceLineNo">269</span> swagger=@MethodSwagger(<a name="line.269"></a> <span class="sourceLineNo">270</span> responses={@Response(200),@Response(404)}<a name="line.270"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5f11cb85/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/LogsResource.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/LogsResource.html b/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/LogsResource.html index 4590557..f4a9aad 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/LogsResource.html +++ b/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/LogsResource.html @@ -51,8 +51,8 @@ <span class="sourceLineNo">043</span> description="Log files from this service",<a name="line.43"></a> <span class="sourceLineNo">044</span> properties={<a name="line.44"></a> <span class="sourceLineNo">045</span> @Property(name=HTML_uriAnchorText, value=PROPERTY_NAME),<a name="line.45"></a> -<span class="sourceLineNo">046</span> @Property(name=REST_allowMethodParam, value="true")<a name="line.46"></a> -<span class="sourceLineNo">047</span> },<a name="line.47"></a> +<span class="sourceLineNo">046</span> },<a name="line.46"></a> +<span class="sourceLineNo">047</span> flags={REST_allowMethodParam},<a name="line.47"></a> <span class="sourceLineNo">048</span> pojoSwaps={<a name="line.48"></a> <span class="sourceLineNo">049</span> IteratorSwap.class, // Allows Iterators and Iterables to be serialized.<a name="line.49"></a> <span class="sourceLineNo">050</span> DateSwap.ISO8601DT.class // Serialize Date objects as ISO8601 strings.<a name="line.50"></a> @@ -71,12 +71,12 @@ <span class="sourceLineNo">063</span> return f.isDirectory() || f.getName().endsWith(".log");<a name="line.63"></a> <span class="sourceLineNo">064</span> }<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">066</span><a name="line.66"></a> <span class="sourceLineNo">067</span> @Override /* RestServlet */<a name="line.67"></a> <span class="sourceLineNo">068</span> public synchronized void init(RestConfig config) throws Exception {<a name="line.68"></a> <span class="sourceLineNo">069</span> super.init(config);<a name="line.69"></a> <span class="sourceLineNo">070</span> ConfigFile cf = config.getConfigFile();<a name="line.70"></a> -<span class="sourceLineNo">071</span> <a name="line.71"></a> +<span class="sourceLineNo">071</span><a name="line.71"></a> <span class="sourceLineNo">072</span> logDir = new File(cf.getString("Logging/logDir", "."));<a name="line.72"></a> <span class="sourceLineNo">073</span> leFormatter = new LogEntryFormatter(<a name="line.73"></a> <span class="sourceLineNo">074</span> cf.getString("Logging/format", "[{date} {level}] {msg}%n"),<a name="line.74"></a> @@ -96,12 +96,12 @@ <span class="sourceLineNo">088</span> * @throws Exception<a name="line.88"></a> <span class="sourceLineNo">089</span> */<a name="line.89"></a> <span class="sourceLineNo">090</span> @RestMethod(<a name="line.90"></a> -<span class="sourceLineNo">091</span> name="GET", <a name="line.91"></a> -<span class="sourceLineNo">092</span> path="/*", <a name="line.92"></a> +<span class="sourceLineNo">091</span> name="GET",<a name="line.91"></a> +<span class="sourceLineNo">092</span> path="/*",<a name="line.92"></a> <span class="sourceLineNo">093</span> swagger=@MethodSwagger(<a name="line.93"></a> <span class="sourceLineNo">094</span> responses={@Response(200),@Response(404)}<a name="line.94"></a> <span class="sourceLineNo">095</span> )<a name="line.95"></a> -<span class="sourceLineNo">096</span> ) <a name="line.96"></a> +<span class="sourceLineNo">096</span> )<a name="line.96"></a> <span class="sourceLineNo">097</span> public Object getFileOrDirectory(RestRequest req, RestResponse res, @Properties ObjectMap properties, @PathRemainder String path) throws Exception {<a name="line.97"></a> <span class="sourceLineNo">098</span><a name="line.98"></a> <span class="sourceLineNo">099</span> File f = getFile(path);<a name="line.99"></a> @@ -140,7 +140,7 @@ <span class="sourceLineNo">132</span> * @throws Exception<a name="line.132"></a> <span class="sourceLineNo">133</span> */<a name="line.133"></a> <span class="sourceLineNo">134</span> @RestMethod(<a name="line.134"></a> -<span class="sourceLineNo">135</span> name="VIEW", <a name="line.135"></a> +<span class="sourceLineNo">135</span> name="VIEW",<a name="line.135"></a> <span class="sourceLineNo">136</span> path="/*",<a name="line.136"></a> <span class="sourceLineNo">137</span> swagger=@MethodSwagger(<a name="line.137"></a> <span class="sourceLineNo">138</span> responses={@Response(200),@Response(404)}<a name="line.138"></a> @@ -219,9 +219,9 @@ <span class="sourceLineNo">211</span> * @throws Exception<a name="line.211"></a> <span class="sourceLineNo">212</span> */<a name="line.212"></a> <span class="sourceLineNo">213</span> @RestMethod(<a name="line.213"></a> -<span class="sourceLineNo">214</span> name="PARSE", <a name="line.214"></a> -<span class="sourceLineNo">215</span> path="/*", <a name="line.215"></a> -<span class="sourceLineNo">216</span> converters=Queryable.class, <a name="line.216"></a> +<span class="sourceLineNo">214</span> name="PARSE",<a name="line.214"></a> +<span class="sourceLineNo">215</span> path="/*",<a name="line.215"></a> +<span class="sourceLineNo">216</span> converters=Queryable.class,<a name="line.216"></a> <span class="sourceLineNo">217</span> swagger=@MethodSwagger(<a name="line.217"></a> <span class="sourceLineNo">218</span> responses={@Response(200),@Response(404)}<a name="line.218"></a> <span class="sourceLineNo">219</span> )<a name="line.219"></a> @@ -246,8 +246,8 @@ <span class="sourceLineNo">238</span> * @throws Exception<a name="line.238"></a> <span class="sourceLineNo">239</span> */<a name="line.239"></a> <span class="sourceLineNo">240</span> @RestMethod(<a name="line.240"></a> -<span class="sourceLineNo">241</span> name="DOWNLOAD", <a name="line.241"></a> -<span class="sourceLineNo">242</span> path="/*", <a name="line.242"></a> +<span class="sourceLineNo">241</span> name="DOWNLOAD",<a name="line.241"></a> +<span class="sourceLineNo">242</span> path="/*",<a name="line.242"></a> <span class="sourceLineNo">243</span> swagger=@MethodSwagger(<a name="line.243"></a> <span class="sourceLineNo">244</span> responses={@Response(200),@Response(404)}<a name="line.244"></a> <span class="sourceLineNo">245</span> )<a name="line.245"></a> @@ -272,7 +272,7 @@ <span class="sourceLineNo">264</span> * @throws Exception<a name="line.264"></a> <span class="sourceLineNo">265</span> */<a name="line.265"></a> <span class="sourceLineNo">266</span> @RestMethod(<a name="line.266"></a> -<span class="sourceLineNo">267</span> name="DELETE", <a name="line.267"></a> +<span class="sourceLineNo">267</span> name="DELETE",<a name="line.267"></a> <span class="sourceLineNo">268</span> path="/*",<a name="line.268"></a> <span class="sourceLineNo">269</span> swagger=@MethodSwagger(<a name="line.269"></a> <span class="sourceLineNo">270</span> responses={@Response(200),@Response(404)}<a name="line.270"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5f11cb85/content/site/apidocs/src-html/org/apache/juneau/parser/ParseException.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/parser/ParseException.html b/content/site/apidocs/src-html/org/apache/juneau/parser/ParseException.html index dd7f145..e1138ec 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/parser/ParseException.html +++ b/content/site/apidocs/src-html/org/apache/juneau/parser/ParseException.html @@ -20,95 +20,97 @@ <span class="sourceLineNo">012</span>// ***************************************************************************************************************************<a name="line.12"></a> <span class="sourceLineNo">013</span>package org.apache.juneau.parser;<a name="line.13"></a> <span class="sourceLineNo">014</span><a name="line.14"></a> -<span class="sourceLineNo">015</span>import java.text.*;<a name="line.15"></a> -<span class="sourceLineNo">016</span>import java.util.*;<a name="line.16"></a> -<span class="sourceLineNo">017</span><a name="line.17"></a> -<span class="sourceLineNo">018</span>import org.apache.juneau.*;<a name="line.18"></a> -<span class="sourceLineNo">019</span>import org.apache.juneau.json.*;<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> * Exception that indicates invalid syntax encountered during parsing.<a name="line.22"></a> -<span class="sourceLineNo">023</span> */<a name="line.23"></a> -<span class="sourceLineNo">024</span>public final class ParseException extends FormattedException {<a name="line.24"></a> -<span class="sourceLineNo">025</span><a name="line.25"></a> -<span class="sourceLineNo">026</span> private static final long serialVersionUID = 1L;<a name="line.26"></a> +<span class="sourceLineNo">015</span>import static org.apache.juneau.internal.StringUtils.*;<a name="line.15"></a> +<span class="sourceLineNo">016</span><a name="line.16"></a> +<span class="sourceLineNo">017</span>import java.text.*;<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.json.*;<a name="line.21"></a> +<span class="sourceLineNo">022</span><a name="line.22"></a> +<span class="sourceLineNo">023</span>/**<a name="line.23"></a> +<span class="sourceLineNo">024</span> * Exception that indicates invalid syntax encountered during parsing.<a name="line.24"></a> +<span class="sourceLineNo">025</span> */<a name="line.25"></a> +<span class="sourceLineNo">026</span>public final class ParseException extends FormattedException {<a name="line.26"></a> <span class="sourceLineNo">027</span><a name="line.27"></a> -<span class="sourceLineNo">028</span> /**<a name="line.28"></a> -<span class="sourceLineNo">029</span> * Constructor.<a name="line.29"></a> -<span class="sourceLineNo">030</span> *<a name="line.30"></a> -<span class="sourceLineNo">031</span> * @param session The parser session to extract information from.<a name="line.31"></a> -<span class="sourceLineNo">032</span> * @param message The exception message containing {@link MessageFormat}-style arguments.<a name="line.32"></a> -<span class="sourceLineNo">033</span> * @param args Optional {@link MessageFormat}-style arguments.<a name="line.33"></a> -<span class="sourceLineNo">034</span> */<a name="line.34"></a> -<span class="sourceLineNo">035</span> public ParseException(ParserSession session, String message, Object...args) {<a name="line.35"></a> -<span class="sourceLineNo">036</span> super(getMessage(session, message, args));<a name="line.36"></a> -<span class="sourceLineNo">037</span> }<a name="line.37"></a> -<span class="sourceLineNo">038</span><a name="line.38"></a> -<span class="sourceLineNo">039</span> /**<a name="line.39"></a> -<span class="sourceLineNo">040</span> * Constructor.<a name="line.40"></a> -<span class="sourceLineNo">041</span> *<a name="line.41"></a> -<span class="sourceLineNo">042</span> * @param message The exception message containing {@link MessageFormat}-style arguments.<a name="line.42"></a> -<span class="sourceLineNo">043</span> * @param args Optional {@link MessageFormat}-style arguments.<a name="line.43"></a> -<span class="sourceLineNo">044</span> */<a name="line.44"></a> -<span class="sourceLineNo">045</span> public ParseException(String message, Object...args) {<a name="line.45"></a> -<span class="sourceLineNo">046</span> super(getMessage(null, message, args));<a name="line.46"></a> -<span class="sourceLineNo">047</span> }<a name="line.47"></a> -<span class="sourceLineNo">048</span><a name="line.48"></a> -<span class="sourceLineNo">049</span> /**<a name="line.49"></a> -<span class="sourceLineNo">050</span> * Constructor.<a name="line.50"></a> -<span class="sourceLineNo">051</span> *<a name="line.51"></a> -<span class="sourceLineNo">052</span> * @param session The parser session to extract information from.<a name="line.52"></a> -<span class="sourceLineNo">053</span> * @param causedBy The inner exception.<a name="line.53"></a> -<span class="sourceLineNo">054</span> */<a name="line.54"></a> -<span class="sourceLineNo">055</span> public ParseException(ParserSession session, Exception causedBy) {<a name="line.55"></a> -<span class="sourceLineNo">056</span> super(causedBy, getMessage(session, causedBy.getMessage()));<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> * Constructor.<a name="line.60"></a> -<span class="sourceLineNo">061</span> *<a name="line.61"></a> -<span class="sourceLineNo">062</span> * @param causedBy The inner exception.<a name="line.62"></a> -<span class="sourceLineNo">063</span> */<a name="line.63"></a> -<span class="sourceLineNo">064</span> public ParseException(Exception causedBy) {<a name="line.64"></a> -<span class="sourceLineNo">065</span> super(causedBy, getMessage(null, causedBy.getMessage()));<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> private static String getMessage(ParserSession session, String msg, Object... args) {<a name="line.68"></a> -<span class="sourceLineNo">069</span> if (args.length != 0)<a name="line.69"></a> -<span class="sourceLineNo">070</span> msg = MessageFormat.format(msg, args);<a name="line.70"></a> -<span class="sourceLineNo">071</span> if (session != null) {<a name="line.71"></a> -<span class="sourceLineNo">072</span> Map<String,Object> m = session.getLastLocation();<a name="line.72"></a> -<span class="sourceLineNo">073</span> if (m != null && ! m.isEmpty())<a name="line.73"></a> -<span class="sourceLineNo">074</span> msg = "Parse exception occurred at " + JsonSerializer.DEFAULT_LAX.toString(m) + ". " + msg;<a name="line.74"></a> -<span class="sourceLineNo">075</span> }<a name="line.75"></a> -<span class="sourceLineNo">076</span> return msg;<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> /**<a name="line.79"></a> -<span class="sourceLineNo">080</span> * Returns the highest-level <code>ParseException</code> in the stack trace.<a name="line.80"></a> -<span class="sourceLineNo">081</span> * Useful for JUnit testing of error conditions.<a name="line.81"></a> -<span class="sourceLineNo">082</span> *<a name="line.82"></a> -<span class="sourceLineNo">083</span> * @return The root parse exception, or this exception if there isn't one.<a name="line.83"></a> -<span class="sourceLineNo">084</span> */<a name="line.84"></a> -<span class="sourceLineNo">085</span> public ParseException getRootCause() {<a name="line.85"></a> -<span class="sourceLineNo">086</span> ParseException t = this;<a name="line.86"></a> -<span class="sourceLineNo">087</span> while (! (t.getCause() == null || ! (t.getCause() instanceof ParseException)))<a name="line.87"></a> -<span class="sourceLineNo">088</span> t = (ParseException)t.getCause();<a name="line.88"></a> -<span class="sourceLineNo">089</span> return t;<a name="line.89"></a> -<span class="sourceLineNo">090</span> }<a name="line.90"></a> -<span class="sourceLineNo">091</span><a name="line.91"></a> -<span class="sourceLineNo">092</span> /**<a name="line.92"></a> -<span class="sourceLineNo">093</span> * Sets the inner cause for this exception.<a name="line.93"></a> -<span class="sourceLineNo">094</span> *<a name="line.94"></a> -<span class="sourceLineNo">095</span> * @param cause The inner cause.<a name="line.95"></a> -<span class="sourceLineNo">096</span> * @return This object (for method chaining).<a name="line.96"></a> -<span class="sourceLineNo">097</span> */<a name="line.97"></a> -<span class="sourceLineNo">098</span> @Override /* Throwable */<a name="line.98"></a> -<span class="sourceLineNo">099</span> public synchronized ParseException initCause(Throwable cause) {<a name="line.99"></a> -<span class="sourceLineNo">100</span> super.initCause(cause);<a name="line.100"></a> -<span class="sourceLineNo">101</span> return this;<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">028</span> private static final long serialVersionUID = 1L;<a name="line.28"></a> +<span class="sourceLineNo">029</span><a name="line.29"></a> +<span class="sourceLineNo">030</span> /**<a name="line.30"></a> +<span class="sourceLineNo">031</span> * Constructor.<a name="line.31"></a> +<span class="sourceLineNo">032</span> *<a name="line.32"></a> +<span class="sourceLineNo">033</span> * @param session The parser session to extract information from.<a name="line.33"></a> +<span class="sourceLineNo">034</span> * @param message The exception message containing {@link MessageFormat}-style arguments.<a name="line.34"></a> +<span class="sourceLineNo">035</span> * @param args Optional {@link MessageFormat}-style arguments.<a name="line.35"></a> +<span class="sourceLineNo">036</span> */<a name="line.36"></a> +<span class="sourceLineNo">037</span> public ParseException(ParserSession session, String message, Object...args) {<a name="line.37"></a> +<span class="sourceLineNo">038</span> super(getMessage(session, message, args));<a name="line.38"></a> +<span class="sourceLineNo">039</span> }<a name="line.39"></a> +<span class="sourceLineNo">040</span><a name="line.40"></a> +<span class="sourceLineNo">041</span> /**<a name="line.41"></a> +<span class="sourceLineNo">042</span> * Constructor.<a name="line.42"></a> +<span class="sourceLineNo">043</span> *<a name="line.43"></a> +<span class="sourceLineNo">044</span> * @param message The exception message containing {@link MessageFormat}-style arguments.<a name="line.44"></a> +<span class="sourceLineNo">045</span> * @param args Optional {@link MessageFormat}-style arguments.<a name="line.45"></a> +<span class="sourceLineNo">046</span> */<a name="line.46"></a> +<span class="sourceLineNo">047</span> public ParseException(String message, Object...args) {<a name="line.47"></a> +<span class="sourceLineNo">048</span> super(getMessage(null, message, args));<a name="line.48"></a> +<span class="sourceLineNo">049</span> }<a name="line.49"></a> +<span class="sourceLineNo">050</span><a name="line.50"></a> +<span class="sourceLineNo">051</span> /**<a name="line.51"></a> +<span class="sourceLineNo">052</span> * Constructor.<a name="line.52"></a> +<span class="sourceLineNo">053</span> *<a name="line.53"></a> +<span class="sourceLineNo">054</span> * @param session The parser session to extract information from.<a name="line.54"></a> +<span class="sourceLineNo">055</span> * @param causedBy The inner exception.<a name="line.55"></a> +<span class="sourceLineNo">056</span> */<a name="line.56"></a> +<span class="sourceLineNo">057</span> public ParseException(ParserSession session, Exception causedBy) {<a name="line.57"></a> +<span class="sourceLineNo">058</span> super(causedBy, getMessage(session, causedBy.getMessage()));<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> * Constructor.<a name="line.62"></a> +<span class="sourceLineNo">063</span> *<a name="line.63"></a> +<span class="sourceLineNo">064</span> * @param causedBy The inner exception.<a name="line.64"></a> +<span class="sourceLineNo">065</span> */<a name="line.65"></a> +<span class="sourceLineNo">066</span> public ParseException(Exception causedBy) {<a name="line.66"></a> +<span class="sourceLineNo">067</span> super(causedBy, getMessage(null, causedBy.getMessage()));<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> private static String getMessage(ParserSession session, String msg, Object... args) {<a name="line.70"></a> +<span class="sourceLineNo">071</span> if (args.length != 0)<a name="line.71"></a> +<span class="sourceLineNo">072</span> msg = format(msg, args);<a name="line.72"></a> +<span class="sourceLineNo">073</span> if (session != null) {<a name="line.73"></a> +<span class="sourceLineNo">074</span> Map<String,Object> m = session.getLastLocation();<a name="line.74"></a> +<span class="sourceLineNo">075</span> if (m != null && ! m.isEmpty())<a name="line.75"></a> +<span class="sourceLineNo">076</span> msg = "Parse exception occurred at " + JsonSerializer.DEFAULT_LAX.toString(m) + ". " + msg;<a name="line.76"></a> +<span class="sourceLineNo">077</span> }<a name="line.77"></a> +<span class="sourceLineNo">078</span> return msg;<a name="line.78"></a> +<span class="sourceLineNo">079</span> }<a name="line.79"></a> +<span class="sourceLineNo">080</span><a name="line.80"></a> +<span class="sourceLineNo">081</span> /**<a name="line.81"></a> +<span class="sourceLineNo">082</span> * Returns the highest-level <code>ParseException</code> in the stack trace.<a name="line.82"></a> +<span class="sourceLineNo">083</span> * Useful for JUnit testing of error conditions.<a name="line.83"></a> +<span class="sourceLineNo">084</span> *<a name="line.84"></a> +<span class="sourceLineNo">085</span> * @return The root parse exception, or this exception if there isn't one.<a name="line.85"></a> +<span class="sourceLineNo">086</span> */<a name="line.86"></a> +<span class="sourceLineNo">087</span> public ParseException getRootCause() {<a name="line.87"></a> +<span class="sourceLineNo">088</span> ParseException t = this;<a name="line.88"></a> +<span class="sourceLineNo">089</span> while (! (t.getCause() == null || ! (t.getCause() instanceof ParseException)))<a name="line.89"></a> +<span class="sourceLineNo">090</span> t = (ParseException)t.getCause();<a name="line.90"></a> +<span class="sourceLineNo">091</span> return t;<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> /**<a name="line.94"></a> +<span class="sourceLineNo">095</span> * Sets the inner cause for this exception.<a name="line.95"></a> +<span class="sourceLineNo">096</span> *<a name="line.96"></a> +<span class="sourceLineNo">097</span> * @param cause The inner cause.<a name="line.97"></a> +<span class="sourceLineNo">098</span> * @return This object (for method chaining).<a name="line.98"></a> +<span class="sourceLineNo">099</span> */<a name="line.99"></a> +<span class="sourceLineNo">100</span> @Override /* Throwable */<a name="line.100"></a> +<span class="sourceLineNo">101</span> public synchronized ParseException initCause(Throwable cause) {<a name="line.101"></a> +<span class="sourceLineNo">102</span> super.initCause(cause);<a name="line.102"></a> +<span class="sourceLineNo">103</span> return this;<a name="line.103"></a> +<span class="sourceLineNo">104</span> }<a name="line.104"></a> +<span class="sourceLineNo">105</span>}<a name="line.105"></a>
