http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/756ffe72/content/site/apidocs/src-html/org/apache/juneau/rest/matchers/MultipartFormDataMatcher.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/matchers/MultipartFormDataMatcher.html b/content/site/apidocs/src-html/org/apache/juneau/rest/matchers/MultipartFormDataMatcher.html index 318b682..805dca6 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/rest/matchers/MultipartFormDataMatcher.html +++ b/content/site/apidocs/src-html/org/apache/juneau/rest/matchers/MultipartFormDataMatcher.html @@ -26,12 +26,13 @@ <span class="sourceLineNo">018</span> * Predefined matcher for matching requests with content type <js>"multipart/form-data"</js>.<a name="line.18"></a> <span class="sourceLineNo">019</span> */<a name="line.19"></a> <span class="sourceLineNo">020</span>public class MultipartFormDataMatcher extends RestMatcher {<a name="line.20"></a> -<span class="sourceLineNo">021</span> @Override /* RestMatcher */<a name="line.21"></a> -<span class="sourceLineNo">022</span> public boolean matches(RestRequest req) {<a name="line.22"></a> -<span class="sourceLineNo">023</span> String contentType = req.getContentType();<a name="line.23"></a> -<span class="sourceLineNo">024</span> return contentType != null && contentType.startsWith("multipart/form-data"); //$NON-NLS-1$<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">021</span><a name="line.21"></a> +<span class="sourceLineNo">022</span> @Override /* RestMatcher */<a name="line.22"></a> +<span class="sourceLineNo">023</span> public boolean matches(RestRequest req) {<a name="line.23"></a> +<span class="sourceLineNo">024</span> String contentType = req.getContentType();<a name="line.24"></a> +<span class="sourceLineNo">025</span> return contentType != null && contentType.startsWith("multipart/form-data"); //$NON-NLS-1$<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>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/756ffe72/content/site/apidocs/src-html/org/apache/juneau/rest/matchers/UrlEncodedFormMatcher.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/matchers/UrlEncodedFormMatcher.html b/content/site/apidocs/src-html/org/apache/juneau/rest/matchers/UrlEncodedFormMatcher.html index e0ad4f7..6ee44a6 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/rest/matchers/UrlEncodedFormMatcher.html +++ b/content/site/apidocs/src-html/org/apache/juneau/rest/matchers/UrlEncodedFormMatcher.html @@ -26,12 +26,13 @@ <span class="sourceLineNo">018</span> * Predefined matcher for matching requests with content type <js>"application/x-www-form-urlencoded"</js>.<a name="line.18"></a> <span class="sourceLineNo">019</span> */<a name="line.19"></a> <span class="sourceLineNo">020</span>public class UrlEncodedFormMatcher extends RestMatcher {<a name="line.20"></a> -<span class="sourceLineNo">021</span> @Override /* RestMatcher */<a name="line.21"></a> -<span class="sourceLineNo">022</span> public boolean matches(RestRequest req) {<a name="line.22"></a> -<span class="sourceLineNo">023</span> String contentType = req.getContentType();<a name="line.23"></a> -<span class="sourceLineNo">024</span> return contentType != null && contentType.equals("application/x-www-form-urlencoded"); //$NON-NLS-1$<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">021</span><a name="line.21"></a> +<span class="sourceLineNo">022</span> @Override /* RestMatcher */<a name="line.22"></a> +<span class="sourceLineNo">023</span> public boolean matches(RestRequest req) {<a name="line.23"></a> +<span class="sourceLineNo">024</span> String contentType = req.getContentType();<a name="line.24"></a> +<span class="sourceLineNo">025</span> return contentType != null && contentType.equals("application/x-www-form-urlencoded"); //$NON-NLS-1$<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> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/756ffe72/content/site/apidocs/src-html/org/apache/juneau/rest/remoteable/RemoteableServlet.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/remoteable/RemoteableServlet.html b/content/site/apidocs/src-html/org/apache/juneau/rest/remoteable/RemoteableServlet.html index d5a2eb2..0a14d29 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/rest/remoteable/RemoteableServlet.html +++ b/content/site/apidocs/src-html/org/apache/juneau/rest/remoteable/RemoteableServlet.html @@ -44,7 +44,7 @@ <span class="sourceLineNo">036</span>@SuppressWarnings("serial")<a name="line.36"></a> <span class="sourceLineNo">037</span>public abstract class RemoteableServlet extends RestServletDefault {<a name="line.37"></a> <span class="sourceLineNo">038</span><a name="line.38"></a> -<span class="sourceLineNo">039</span> private Map<String,Class<?>> classNameMap = new ConcurrentHashMap<String,Class<?>>();<a name="line.39"></a> +<span class="sourceLineNo">039</span> private final Map<String,Class<?>> classNameMap = new ConcurrentHashMap<String,Class<?>>();<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> // Abstract methods<a name="line.42"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/756ffe72/content/site/apidocs/src-html/org/apache/juneau/rest/response/StreamableHandler.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/response/StreamableHandler.html b/content/site/apidocs/src-html/org/apache/juneau/rest/response/StreamableHandler.html index 7209cae..dbe6672 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/rest/response/StreamableHandler.html +++ b/content/site/apidocs/src-html/org/apache/juneau/rest/response/StreamableHandler.html @@ -41,9 +41,9 @@ <span class="sourceLineNo">033</span> if (output instanceof Streamable) {<a name="line.33"></a> <span class="sourceLineNo">034</span> if (output instanceof StreamResource) {<a name="line.34"></a> <span class="sourceLineNo">035</span> StreamResource r = (StreamResource)output;<a name="line.35"></a> -<span class="sourceLineNo">036</span> String mediaType = r.getMediaType();<a name="line.36"></a> +<span class="sourceLineNo">036</span> MediaType mediaType = r.getMediaType();<a name="line.36"></a> <span class="sourceLineNo">037</span> if (mediaType != null)<a name="line.37"></a> -<span class="sourceLineNo">038</span> res.setContentType(mediaType);<a name="line.38"></a> +<span class="sourceLineNo">038</span> res.setContentType(mediaType.toString());<a name="line.38"></a> <span class="sourceLineNo">039</span> for (Map.Entry<String,String> h : r.getHeaders().entrySet())<a name="line.39"></a> <span class="sourceLineNo">040</span> res.setHeader(h.getKey(), h.getValue());<a name="line.40"></a> <span class="sourceLineNo">041</span> }<a name="line.41"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/756ffe72/content/site/apidocs/src-html/org/apache/juneau/rest/vars/LocalizationVar.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/vars/LocalizationVar.html b/content/site/apidocs/src-html/org/apache/juneau/rest/vars/LocalizationVar.html index d40747f..30295f7 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/rest/vars/LocalizationVar.html +++ b/content/site/apidocs/src-html/org/apache/juneau/rest/vars/LocalizationVar.html @@ -43,23 +43,26 @@ <span class="sourceLineNo">035</span> */<a name="line.35"></a> <span class="sourceLineNo">036</span>public class LocalizationVar extends MultipartVar {<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> * Constructor.<a name="line.39"></a> -<span class="sourceLineNo">040</span> */<a name="line.40"></a> -<span class="sourceLineNo">041</span> public LocalizationVar() {<a name="line.41"></a> -<span class="sourceLineNo">042</span> super("L");<a name="line.42"></a> -<span class="sourceLineNo">043</span> }<a name="line.43"></a> -<span class="sourceLineNo">044</span><a name="line.44"></a> -<span class="sourceLineNo">045</span> @Override /* Parameter */<a name="line.45"></a> -<span class="sourceLineNo">046</span> public String resolve(VarResolverSession session, String[] args) {<a name="line.46"></a> -<span class="sourceLineNo">047</span> if (args.length > 0) {<a name="line.47"></a> -<span class="sourceLineNo">048</span> String key = args[0];<a name="line.48"></a> -<span class="sourceLineNo">049</span> String[] a = (args.length > 1) ? Arrays.copyOfRange(args, 1, args.length) : new String[0];<a name="line.49"></a> -<span class="sourceLineNo">050</span> return session.getSessionObject(RestRequest.class, RequestVar.SESSION_req).getMessage(key, (Object[])a);<a name="line.50"></a> -<span class="sourceLineNo">051</span> }<a name="line.51"></a> -<span class="sourceLineNo">052</span> return "";<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">038</span> /** The name of this variable. */<a name="line.38"></a> +<span class="sourceLineNo">039</span> public static final String NAME = "L";<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> public LocalizationVar() {<a name="line.44"></a> +<span class="sourceLineNo">045</span> super(NAME);<a name="line.45"></a> +<span class="sourceLineNo">046</span> }<a name="line.46"></a> +<span class="sourceLineNo">047</span><a name="line.47"></a> +<span class="sourceLineNo">048</span> @Override /* Parameter */<a name="line.48"></a> +<span class="sourceLineNo">049</span> public String resolve(VarResolverSession session, String[] args) {<a name="line.49"></a> +<span class="sourceLineNo">050</span> if (args.length > 0) {<a name="line.50"></a> +<span class="sourceLineNo">051</span> String key = args[0];<a name="line.51"></a> +<span class="sourceLineNo">052</span> String[] a = (args.length > 1) ? Arrays.copyOfRange(args, 1, args.length) : new String[0];<a name="line.52"></a> +<span class="sourceLineNo">053</span> return session.getSessionObject(RestRequest.class, RequestVar.SESSION_req).getMessage(key, (Object[])a);<a name="line.53"></a> +<span class="sourceLineNo">054</span> }<a name="line.54"></a> +<span class="sourceLineNo">055</span> return "";<a name="line.55"></a> +<span class="sourceLineNo">056</span> }<a name="line.56"></a> +<span class="sourceLineNo">057</span>}<a name="line.57"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/756ffe72/content/site/apidocs/src-html/org/apache/juneau/rest/vars/RequestVar.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/vars/RequestVar.html b/content/site/apidocs/src-html/org/apache/juneau/rest/vars/RequestVar.html index 3644228..560a642 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/rest/vars/RequestVar.html +++ b/content/site/apidocs/src-html/org/apache/juneau/rest/vars/RequestVar.html @@ -59,76 +59,79 @@ <span class="sourceLineNo">051</span> */<a name="line.51"></a> <span class="sourceLineNo">052</span> public static final String SESSION_req = "req";<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> * Constructor.<a name="line.55"></a> -<span class="sourceLineNo">056</span> */<a name="line.56"></a> -<span class="sourceLineNo">057</span> public RequestVar() {<a name="line.57"></a> -<span class="sourceLineNo">058</span> super("R");<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> @Override /* Parameter */<a name="line.61"></a> -<span class="sourceLineNo">062</span> public String resolve(VarResolverSession session, String key) {<a name="line.62"></a> -<span class="sourceLineNo">063</span> RestRequest req = session.getSessionObject(RestRequest.class, SESSION_req);<a name="line.63"></a> -<span class="sourceLineNo">064</span> if (key.length() > 0) {<a name="line.64"></a> -<span class="sourceLineNo">065</span> String k = key.toString();<a name="line.65"></a> -<span class="sourceLineNo">066</span> if (k.indexOf('.') != -1) {<a name="line.66"></a> -<span class="sourceLineNo">067</span> String prefix = k.substring(0, k.indexOf('.'));<a name="line.67"></a> -<span class="sourceLineNo">068</span> String remainder = k.substring(k.indexOf('.')+1);<a name="line.68"></a> -<span class="sourceLineNo">069</span> if ("path".equals(prefix))<a name="line.69"></a> -<span class="sourceLineNo">070</span> return req.getPathParameter(remainder);<a name="line.70"></a> -<span class="sourceLineNo">071</span> if ("query".equals(prefix))<a name="line.71"></a> -<span class="sourceLineNo">072</span> return req.getQueryParameter(remainder);<a name="line.72"></a> -<span class="sourceLineNo">073</span> if ("formData".equals(prefix))<a name="line.73"></a> -<span class="sourceLineNo">074</span> return req.getFormDataParameter(remainder);<a name="line.74"></a> -<span class="sourceLineNo">075</span> if ("header".equals(prefix))<a name="line.75"></a> -<span class="sourceLineNo">076</span> return req.getHeader(remainder);<a name="line.76"></a> -<span class="sourceLineNo">077</span> if ("attribute".equals(prefix))<a name="line.77"></a> -<span class="sourceLineNo">078</span> return StringUtils.toString(req.getAttribute(remainder));<a name="line.78"></a> -<span class="sourceLineNo">079</span> }<a name="line.79"></a> -<span class="sourceLineNo">080</span> char c = key.charAt(0);<a name="line.80"></a> -<span class="sourceLineNo">081</span> if (c == 'c') {<a name="line.81"></a> -<span class="sourceLineNo">082</span> if (key.equals("contextPath"))<a name="line.82"></a> -<span class="sourceLineNo">083</span> return req.getContextPath();<a name="line.83"></a> -<span class="sourceLineNo">084</span> } else if (c == 'm') {<a name="line.84"></a> -<span class="sourceLineNo">085</span> if (key.equals("method"))<a name="line.85"></a> -<span class="sourceLineNo">086</span> return req.getMethod();<a name="line.86"></a> -<span class="sourceLineNo">087</span> if (key.equals("methodSummary"))<a name="line.87"></a> -<span class="sourceLineNo">088</span> return req.getMethodSummary();<a name="line.88"></a> -<span class="sourceLineNo">089</span> if (key.equals("methodDescription"))<a name="line.89"></a> -<span class="sourceLineNo">090</span> return req.getMethodDescription();<a name="line.90"></a> -<span class="sourceLineNo">091</span> } else if (c == 'p') {<a name="line.91"></a> -<span class="sourceLineNo">092</span> if (key.equals("pathInfo"))<a name="line.92"></a> -<span class="sourceLineNo">093</span> return req.getPathInfo();<a name="line.93"></a> -<span class="sourceLineNo">094</span> } else if (c == 'r') {<a name="line.94"></a> -<span class="sourceLineNo">095</span> if (key.equals("requestURI"))<a name="line.95"></a> -<span class="sourceLineNo">096</span> return req.getRequestURI();<a name="line.96"></a> -<span class="sourceLineNo">097</span> if (key.equals("relativeServletURI"))<a name="line.97"></a> -<span class="sourceLineNo">098</span> return req.getRelativeServletURI();<a name="line.98"></a> -<span class="sourceLineNo">099</span> if (key.equals("requestParentURI"))<a name="line.99"></a> -<span class="sourceLineNo">100</span> return req.getRequestParentURI();<a name="line.100"></a> -<span class="sourceLineNo">101</span> } else if (c == 's') {<a name="line.101"></a> -<span class="sourceLineNo">102</span> if (key.equals("servletPath"))<a name="line.102"></a> -<span class="sourceLineNo">103</span> return req.getServletPath();<a name="line.103"></a> -<span class="sourceLineNo">104</span> if (key.equals("servletURI"))<a name="line.104"></a> -<span class="sourceLineNo">105</span> return req.getServletURI();<a name="line.105"></a> -<span class="sourceLineNo">106</span> if (key.equals("servletParentURI"))<a name="line.106"></a> -<span class="sourceLineNo">107</span> return req.getServletParentURI();<a name="line.107"></a> -<span class="sourceLineNo">108</span> if (key.equals("servletTitle"))<a name="line.108"></a> -<span class="sourceLineNo">109</span> return req.getServletTitle();<a name="line.109"></a> -<span class="sourceLineNo">110</span> if (key.equals("servletDescription"))<a name="line.110"></a> -<span class="sourceLineNo">111</span> return req.getServletDescription();<a name="line.111"></a> -<span class="sourceLineNo">112</span> } else if (c == 't') {<a name="line.112"></a> -<span class="sourceLineNo">113</span> if (key.equals("trimmedRequestURI"))<a name="line.113"></a> -<span class="sourceLineNo">114</span> return req.getTrimmedRequestURI();<a name="line.114"></a> -<span class="sourceLineNo">115</span> }<a name="line.115"></a> -<span class="sourceLineNo">116</span> Object o = req.getProperties().get(key);<a name="line.116"></a> -<span class="sourceLineNo">117</span> if (o != null)<a name="line.117"></a> -<span class="sourceLineNo">118</span> return o.toString();<a name="line.118"></a> -<span class="sourceLineNo">119</span> return req.getPathParameter(key);<a name="line.119"></a> -<span class="sourceLineNo">120</span> }<a name="line.120"></a> -<span class="sourceLineNo">121</span> return null;<a name="line.121"></a> -<span class="sourceLineNo">122</span> }<a name="line.122"></a> -<span class="sourceLineNo">123</span>}<a name="line.123"></a> +<span class="sourceLineNo">054</span> /** The name of this variable. */<a name="line.54"></a> +<span class="sourceLineNo">055</span> public static final String NAME = "R";<a name="line.55"></a> +<span class="sourceLineNo">056</span><a name="line.56"></a> +<span class="sourceLineNo">057</span> /**<a name="line.57"></a> +<span class="sourceLineNo">058</span> * Constructor.<a name="line.58"></a> +<span class="sourceLineNo">059</span> */<a name="line.59"></a> +<span class="sourceLineNo">060</span> public RequestVar() {<a name="line.60"></a> +<span class="sourceLineNo">061</span> super(NAME);<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 /* Parameter */<a name="line.64"></a> +<span class="sourceLineNo">065</span> public String resolve(VarResolverSession session, String key) {<a name="line.65"></a> +<span class="sourceLineNo">066</span> RestRequest req = session.getSessionObject(RestRequest.class, SESSION_req);<a name="line.66"></a> +<span class="sourceLineNo">067</span> if (key.length() > 0) {<a name="line.67"></a> +<span class="sourceLineNo">068</span> String k = key.toString();<a name="line.68"></a> +<span class="sourceLineNo">069</span> if (k.indexOf('.') != -1) {<a name="line.69"></a> +<span class="sourceLineNo">070</span> String prefix = k.substring(0, k.indexOf('.'));<a name="line.70"></a> +<span class="sourceLineNo">071</span> String remainder = k.substring(k.indexOf('.')+1);<a name="line.71"></a> +<span class="sourceLineNo">072</span> if ("path".equals(prefix))<a name="line.72"></a> +<span class="sourceLineNo">073</span> return req.getPathParameter(remainder);<a name="line.73"></a> +<span class="sourceLineNo">074</span> if ("query".equals(prefix))<a name="line.74"></a> +<span class="sourceLineNo">075</span> return req.getQueryParameter(remainder);<a name="line.75"></a> +<span class="sourceLineNo">076</span> if ("formData".equals(prefix))<a name="line.76"></a> +<span class="sourceLineNo">077</span> return req.getFormDataParameter(remainder);<a name="line.77"></a> +<span class="sourceLineNo">078</span> if ("header".equals(prefix))<a name="line.78"></a> +<span class="sourceLineNo">079</span> return req.getHeader(remainder);<a name="line.79"></a> +<span class="sourceLineNo">080</span> if ("attribute".equals(prefix))<a name="line.80"></a> +<span class="sourceLineNo">081</span> return StringUtils.toString(req.getAttribute(remainder));<a name="line.81"></a> +<span class="sourceLineNo">082</span> }<a name="line.82"></a> +<span class="sourceLineNo">083</span> char c = key.charAt(0);<a name="line.83"></a> +<span class="sourceLineNo">084</span> if (c == 'c') {<a name="line.84"></a> +<span class="sourceLineNo">085</span> if (key.equals("contextPath"))<a name="line.85"></a> +<span class="sourceLineNo">086</span> return req.getContextPath();<a name="line.86"></a> +<span class="sourceLineNo">087</span> } else if (c == 'm') {<a name="line.87"></a> +<span class="sourceLineNo">088</span> if (key.equals("method"))<a name="line.88"></a> +<span class="sourceLineNo">089</span> return req.getMethod();<a name="line.89"></a> +<span class="sourceLineNo">090</span> if (key.equals("methodSummary"))<a name="line.90"></a> +<span class="sourceLineNo">091</span> return req.getMethodSummary();<a name="line.91"></a> +<span class="sourceLineNo">092</span> if (key.equals("methodDescription"))<a name="line.92"></a> +<span class="sourceLineNo">093</span> return req.getMethodDescription();<a name="line.93"></a> +<span class="sourceLineNo">094</span> } else if (c == 'p') {<a name="line.94"></a> +<span class="sourceLineNo">095</span> if (key.equals("pathInfo"))<a name="line.95"></a> +<span class="sourceLineNo">096</span> return req.getPathInfo();<a name="line.96"></a> +<span class="sourceLineNo">097</span> } else if (c == 'r') {<a name="line.97"></a> +<span class="sourceLineNo">098</span> if (key.equals("requestURI"))<a name="line.98"></a> +<span class="sourceLineNo">099</span> return req.getRequestURI();<a name="line.99"></a> +<span class="sourceLineNo">100</span> if (key.equals("relativeServletURI"))<a name="line.100"></a> +<span class="sourceLineNo">101</span> return req.getRelativeServletURI();<a name="line.101"></a> +<span class="sourceLineNo">102</span> if (key.equals("requestParentURI"))<a name="line.102"></a> +<span class="sourceLineNo">103</span> return req.getRequestParentURI();<a name="line.103"></a> +<span class="sourceLineNo">104</span> } else if (c == 's') {<a name="line.104"></a> +<span class="sourceLineNo">105</span> if (key.equals("servletPath"))<a name="line.105"></a> +<span class="sourceLineNo">106</span> return req.getServletPath();<a name="line.106"></a> +<span class="sourceLineNo">107</span> if (key.equals("servletURI"))<a name="line.107"></a> +<span class="sourceLineNo">108</span> return req.getServletURI();<a name="line.108"></a> +<span class="sourceLineNo">109</span> if (key.equals("servletParentURI"))<a name="line.109"></a> +<span class="sourceLineNo">110</span> return req.getServletParentURI();<a name="line.110"></a> +<span class="sourceLineNo">111</span> if (key.equals("servletTitle"))<a name="line.111"></a> +<span class="sourceLineNo">112</span> return req.getServletTitle();<a name="line.112"></a> +<span class="sourceLineNo">113</span> if (key.equals("servletDescription"))<a name="line.113"></a> +<span class="sourceLineNo">114</span> return req.getServletDescription();<a name="line.114"></a> +<span class="sourceLineNo">115</span> } else if (c == 't') {<a name="line.115"></a> +<span class="sourceLineNo">116</span> if (key.equals("trimmedRequestURI"))<a name="line.116"></a> +<span class="sourceLineNo">117</span> return req.getTrimmedRequestURI();<a name="line.117"></a> +<span class="sourceLineNo">118</span> }<a name="line.118"></a> +<span class="sourceLineNo">119</span> Object o = req.getProperties().get(key);<a name="line.119"></a> +<span class="sourceLineNo">120</span> if (o != null)<a name="line.120"></a> +<span class="sourceLineNo">121</span> return o.toString();<a name="line.121"></a> +<span class="sourceLineNo">122</span> return req.getPathParameter(key);<a name="line.122"></a> +<span class="sourceLineNo">123</span> }<a name="line.123"></a> +<span class="sourceLineNo">124</span> return null;<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> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/756ffe72/content/site/apidocs/src-html/org/apache/juneau/rest/vars/SerializedRequestAttrVar.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/vars/SerializedRequestAttrVar.html b/content/site/apidocs/src-html/org/apache/juneau/rest/vars/SerializedRequestAttrVar.html index 1afe267..8513a5b 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/rest/vars/SerializedRequestAttrVar.html +++ b/content/site/apidocs/src-html/org/apache/juneau/rest/vars/SerializedRequestAttrVar.html @@ -42,34 +42,37 @@ <span class="sourceLineNo">034</span> */<a name="line.34"></a> <span class="sourceLineNo">035</span>public class SerializedRequestAttrVar extends StreamedVar {<a name="line.35"></a> <span class="sourceLineNo">036</span><a name="line.36"></a> -<span class="sourceLineNo">037</span> /**<a name="line.37"></a> -<span class="sourceLineNo">038</span> * Constructor.<a name="line.38"></a> -<span class="sourceLineNo">039</span> */<a name="line.39"></a> -<span class="sourceLineNo">040</span> public SerializedRequestAttrVar() {<a name="line.40"></a> -<span class="sourceLineNo">041</span> super("SA");<a name="line.41"></a> -<span class="sourceLineNo">042</span> }<a name="line.42"></a> -<span class="sourceLineNo">043</span><a name="line.43"></a> -<span class="sourceLineNo">044</span> @Override /* Parameter */<a name="line.44"></a> -<span class="sourceLineNo">045</span> public void resolveTo(VarResolverSession session, Writer w, String key) {<a name="line.45"></a> -<span class="sourceLineNo">046</span> try {<a name="line.46"></a> -<span class="sourceLineNo">047</span> int i = key.indexOf(',');<a name="line.47"></a> -<span class="sourceLineNo">048</span> if (i == -1)<a name="line.48"></a> -<span class="sourceLineNo">049</span> throw new RuntimeException("Invalid format for $SA var. Must be of the format $SA{contentType,key[,defaultValue]}");<a name="line.49"></a> -<span class="sourceLineNo">050</span> String[] s2 = StringUtils.split(key, ',');<a name="line.50"></a> -<span class="sourceLineNo">051</span> RestRequest req = session.getSessionObject(RestRequest.class, RequestVar.SESSION_req);<a name="line.51"></a> -<span class="sourceLineNo">052</span> if (req != null) {<a name="line.52"></a> -<span class="sourceLineNo">053</span> Object o = req.getAttribute(key);<a name="line.53"></a> -<span class="sourceLineNo">054</span> if (o == null)<a name="line.54"></a> -<span class="sourceLineNo">055</span> o = key;<a name="line.55"></a> -<span class="sourceLineNo">056</span> Serializer s = req.getSerializerGroup().getSerializer(s2[0]);<a name="line.56"></a> -<span class="sourceLineNo">057</span> if (s != null)<a name="line.57"></a> -<span class="sourceLineNo">058</span> s.serialize(w, o);<a name="line.58"></a> -<span class="sourceLineNo">059</span> }<a name="line.59"></a> -<span class="sourceLineNo">060</span> } catch (Exception e) {<a name="line.60"></a> -<span class="sourceLineNo">061</span> throw new RuntimeException(e);<a name="line.61"></a> -<span class="sourceLineNo">062</span> }<a name="line.62"></a> -<span class="sourceLineNo">063</span> }<a name="line.63"></a> -<span class="sourceLineNo">064</span>}<a name="line.64"></a> +<span class="sourceLineNo">037</span> /** The name of this variable. */<a name="line.37"></a> +<span class="sourceLineNo">038</span> public static final String NAME = "SA";<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> * Constructor.<a name="line.41"></a> +<span class="sourceLineNo">042</span> */<a name="line.42"></a> +<span class="sourceLineNo">043</span> public SerializedRequestAttrVar() {<a name="line.43"></a> +<span class="sourceLineNo">044</span> super(NAME);<a name="line.44"></a> +<span class="sourceLineNo">045</span> }<a name="line.45"></a> +<span class="sourceLineNo">046</span><a name="line.46"></a> +<span class="sourceLineNo">047</span> @Override /* Parameter */<a name="line.47"></a> +<span class="sourceLineNo">048</span> public void resolveTo(VarResolverSession session, Writer w, String key) {<a name="line.48"></a> +<span class="sourceLineNo">049</span> try {<a name="line.49"></a> +<span class="sourceLineNo">050</span> int i = key.indexOf(',');<a name="line.50"></a> +<span class="sourceLineNo">051</span> if (i == -1)<a name="line.51"></a> +<span class="sourceLineNo">052</span> throw new RuntimeException("Invalid format for $SA var. Must be of the format $SA{contentType,key[,defaultValue]}");<a name="line.52"></a> +<span class="sourceLineNo">053</span> String[] s2 = StringUtils.split(key, ',');<a name="line.53"></a> +<span class="sourceLineNo">054</span> RestRequest req = session.getSessionObject(RestRequest.class, RequestVar.SESSION_req);<a name="line.54"></a> +<span class="sourceLineNo">055</span> if (req != null) {<a name="line.55"></a> +<span class="sourceLineNo">056</span> Object o = req.getAttribute(key);<a name="line.56"></a> +<span class="sourceLineNo">057</span> if (o == null)<a name="line.57"></a> +<span class="sourceLineNo">058</span> o = key;<a name="line.58"></a> +<span class="sourceLineNo">059</span> Serializer s = req.getSerializerGroup().getSerializer(s2[0]);<a name="line.59"></a> +<span class="sourceLineNo">060</span> if (s != null)<a name="line.60"></a> +<span class="sourceLineNo">061</span> s.serialize(w, o);<a name="line.61"></a> +<span class="sourceLineNo">062</span> }<a name="line.62"></a> +<span class="sourceLineNo">063</span> } catch (Exception e) {<a name="line.63"></a> +<span class="sourceLineNo">064</span> throw new RuntimeException(e);<a name="line.64"></a> +<span class="sourceLineNo">065</span> }<a name="line.65"></a> +<span class="sourceLineNo">066</span> }<a name="line.66"></a> +<span class="sourceLineNo">067</span>}<a name="line.67"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/756ffe72/content/site/apidocs/src-html/org/apache/juneau/rest/vars/ServletInitParamVar.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/vars/ServletInitParamVar.html b/content/site/apidocs/src-html/org/apache/juneau/rest/vars/ServletInitParamVar.html index 940e071..6d728d5 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/rest/vars/ServletInitParamVar.html +++ b/content/site/apidocs/src-html/org/apache/juneau/rest/vars/ServletInitParamVar.html @@ -40,18 +40,21 @@ <span class="sourceLineNo">032</span> */<a name="line.32"></a> <span class="sourceLineNo">033</span>public class ServletInitParamVar extends DefaultingVar {<a name="line.33"></a> <span class="sourceLineNo">034</span><a name="line.34"></a> -<span class="sourceLineNo">035</span> /**<a name="line.35"></a> -<span class="sourceLineNo">036</span> * Constructor.<a name="line.36"></a> -<span class="sourceLineNo">037</span> */<a name="line.37"></a> -<span class="sourceLineNo">038</span> public ServletInitParamVar() {<a name="line.38"></a> -<span class="sourceLineNo">039</span> super("I");<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> @Override /* Parameter */<a name="line.42"></a> -<span class="sourceLineNo">043</span> public String resolve(VarResolverSession session, String key) {<a name="line.43"></a> -<span class="sourceLineNo">044</span> return session.getSessionObject(RestRequest.class, RequestVar.SESSION_req).getServlet().getServletConfig().getInitParameter(key);<a name="line.44"></a> -<span class="sourceLineNo">045</span> }<a name="line.45"></a> -<span class="sourceLineNo">046</span>}<a name="line.46"></a> +<span class="sourceLineNo">035</span> /** The name of this variable. */<a name="line.35"></a> +<span class="sourceLineNo">036</span> public static final String NAME = "I";<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> * Constructor.<a name="line.39"></a> +<span class="sourceLineNo">040</span> */<a name="line.40"></a> +<span class="sourceLineNo">041</span> public ServletInitParamVar() {<a name="line.41"></a> +<span class="sourceLineNo">042</span> super(NAME);<a name="line.42"></a> +<span class="sourceLineNo">043</span> }<a name="line.43"></a> +<span class="sourceLineNo">044</span><a name="line.44"></a> +<span class="sourceLineNo">045</span> @Override /* Parameter */<a name="line.45"></a> +<span class="sourceLineNo">046</span> public String resolve(VarResolverSession session, String key) {<a name="line.46"></a> +<span class="sourceLineNo">047</span> return session.getSessionObject(RestRequest.class, RequestVar.SESSION_req).getServlet().getServletConfig().getInitParameter(key);<a name="line.47"></a> +<span class="sourceLineNo">048</span> }<a name="line.48"></a> +<span class="sourceLineNo">049</span>}<a name="line.49"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/756ffe72/content/site/apidocs/src-html/org/apache/juneau/rest/vars/UrlEncodeVar.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/vars/UrlEncodeVar.html b/content/site/apidocs/src-html/org/apache/juneau/rest/vars/UrlEncodeVar.html index 00c5d7d..4bbdd5f 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/rest/vars/UrlEncodeVar.html +++ b/content/site/apidocs/src-html/org/apache/juneau/rest/vars/UrlEncodeVar.html @@ -37,18 +37,21 @@ <span class="sourceLineNo">029</span> */<a name="line.29"></a> <span class="sourceLineNo">030</span>public class UrlEncodeVar extends SimpleVar {<a name="line.30"></a> <span class="sourceLineNo">031</span><a name="line.31"></a> -<span class="sourceLineNo">032</span> /**<a name="line.32"></a> -<span class="sourceLineNo">033</span> * Constructor.<a name="line.33"></a> -<span class="sourceLineNo">034</span> */<a name="line.34"></a> -<span class="sourceLineNo">035</span> public UrlEncodeVar() {<a name="line.35"></a> -<span class="sourceLineNo">036</span> super("UE");<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> @Override /* Parameter */<a name="line.39"></a> -<span class="sourceLineNo">040</span> public String resolve(VarResolverSession session, String key) {<a name="line.40"></a> -<span class="sourceLineNo">041</span> return RestUtils.encode(key);<a name="line.41"></a> -<span class="sourceLineNo">042</span> }<a name="line.42"></a> -<span class="sourceLineNo">043</span>}<a name="line.43"></a> +<span class="sourceLineNo">032</span> /** The name of this variable. */<a name="line.32"></a> +<span class="sourceLineNo">033</span> public static final String NAME = "UE";<a name="line.33"></a> +<span class="sourceLineNo">034</span><a name="line.34"></a> +<span class="sourceLineNo">035</span> /**<a name="line.35"></a> +<span class="sourceLineNo">036</span> * Constructor.<a name="line.36"></a> +<span class="sourceLineNo">037</span> */<a name="line.37"></a> +<span class="sourceLineNo">038</span> public UrlEncodeVar() {<a name="line.38"></a> +<span class="sourceLineNo">039</span> super(NAME);<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> @Override /* Parameter */<a name="line.42"></a> +<span class="sourceLineNo">043</span> public String resolve(VarResolverSession session, String key) {<a name="line.43"></a> +<span class="sourceLineNo">044</span> return RestUtils.encode(key);<a name="line.44"></a> +<span class="sourceLineNo">045</span> }<a name="line.45"></a> +<span class="sourceLineNo">046</span>}<a name="line.46"></a>
