http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/d35b70d1/content/site/apidocs/src-html/org/apache/juneau/internal/FileUtils.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/internal/FileUtils.html b/content/site/apidocs/src-html/org/apache/juneau/internal/FileUtils.html index 92071fe..b7571fd 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/internal/FileUtils.html +++ b/content/site/apidocs/src-html/org/apache/juneau/internal/FileUtils.html @@ -24,158 +24,160 @@ <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><a name="line.18"></a> -<span class="sourceLineNo">019</span>/**<a name="line.19"></a> -<span class="sourceLineNo">020</span> * File utilities.<a name="line.20"></a> -<span class="sourceLineNo">021</span> */<a name="line.21"></a> -<span class="sourceLineNo">022</span>public class FileUtils {<a name="line.22"></a> -<span class="sourceLineNo">023</span><a name="line.23"></a> -<span class="sourceLineNo">024</span> /**<a name="line.24"></a> -<span class="sourceLineNo">025</span> * Same as {@link File#mkdirs()} except throws a RuntimeExeption if directory could not be created.<a name="line.25"></a> -<span class="sourceLineNo">026</span> *<a name="line.26"></a> -<span class="sourceLineNo">027</span> * @param f The directory to create. Must not be <jk>null</jk>.<a name="line.27"></a> -<span class="sourceLineNo">028</span> * @param clean If <jk>true</jk>, deletes the contents of the directory if it already exists.<a name="line.28"></a> -<span class="sourceLineNo">029</span> * @return The same file.<a name="line.29"></a> -<span class="sourceLineNo">030</span> * @throws RuntimeException if directory could not be created.<a name="line.30"></a> -<span class="sourceLineNo">031</span> */<a name="line.31"></a> -<span class="sourceLineNo">032</span> public static File mkdirs(File f, boolean clean) {<a name="line.32"></a> -<span class="sourceLineNo">033</span> assertFieldNotNull(f, "f");<a name="line.33"></a> -<span class="sourceLineNo">034</span> if (f.exists()) {<a name="line.34"></a> -<span class="sourceLineNo">035</span> if (clean) {<a name="line.35"></a> -<span class="sourceLineNo">036</span> if (! delete(f))<a name="line.36"></a> -<span class="sourceLineNo">037</span> throw new RuntimeException("Could not clean directory '"+f.getAbsolutePath()+"'");<a name="line.37"></a> -<span class="sourceLineNo">038</span> } else {<a name="line.38"></a> -<span class="sourceLineNo">039</span> return f;<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> if (! f.mkdirs())<a name="line.42"></a> -<span class="sourceLineNo">043</span> throw new RuntimeException("Could not create directory '" + f.getAbsolutePath() + "'");<a name="line.43"></a> -<span class="sourceLineNo">044</span> return f;<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> /**<a name="line.47"></a> -<span class="sourceLineNo">048</span> * Same as {@link #mkdirs(String, boolean)} but uses String path.<a name="line.48"></a> -<span class="sourceLineNo">049</span> *<a name="line.49"></a> -<span class="sourceLineNo">050</span> * @param path The path of the directory to create. Must not be <jk>null</jk><a name="line.50"></a> -<span class="sourceLineNo">051</span> * @param clean If <jk>true</jk>, deletes the contents of the directory if it already exists.<a name="line.51"></a> -<span class="sourceLineNo">052</span> * @return The directory.<a name="line.52"></a> -<span class="sourceLineNo">053</span> */<a name="line.53"></a> -<span class="sourceLineNo">054</span> public static File mkdirs(String path, boolean clean) {<a name="line.54"></a> -<span class="sourceLineNo">055</span> assertFieldNotNull(path, "path");<a name="line.55"></a> -<span class="sourceLineNo">056</span> return mkdirs(new File(path), clean);<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> * Recursively deletes a file or directory.<a name="line.60"></a> -<span class="sourceLineNo">061</span> *<a name="line.61"></a> -<span class="sourceLineNo">062</span> * @param f The file or directory to delete.<a name="line.62"></a> -<span class="sourceLineNo">063</span> * @return <jk>true</jk> if file or directory was successfully deleted.<a name="line.63"></a> -<span class="sourceLineNo">064</span> */<a name="line.64"></a> -<span class="sourceLineNo">065</span> public static boolean delete(File f) {<a name="line.65"></a> -<span class="sourceLineNo">066</span> if (f == null)<a name="line.66"></a> -<span class="sourceLineNo">067</span> return true;<a name="line.67"></a> -<span class="sourceLineNo">068</span> if (f.isDirectory()) {<a name="line.68"></a> -<span class="sourceLineNo">069</span> File[] cf = f.listFiles();<a name="line.69"></a> -<span class="sourceLineNo">070</span> if (cf != null)<a name="line.70"></a> -<span class="sourceLineNo">071</span> for (File c : cf)<a name="line.71"></a> -<span class="sourceLineNo">072</span> delete(c);<a name="line.72"></a> -<span class="sourceLineNo">073</span> }<a name="line.73"></a> -<span class="sourceLineNo">074</span> return f.delete();<a name="line.74"></a> -<span class="sourceLineNo">075</span> }<a name="line.75"></a> -<span class="sourceLineNo">076</span><a name="line.76"></a> -<span class="sourceLineNo">077</span> /**<a name="line.77"></a> -<span class="sourceLineNo">078</span> * Creates a file if it doesn't already exist using {@link File#createNewFile()}.<a name="line.78"></a> -<span class="sourceLineNo">079</span> *<a name="line.79"></a> -<span class="sourceLineNo">080</span> * <p><a name="line.80"></a> -<span class="sourceLineNo">081</span> * Throws a {@link RuntimeException} if the file could not be created.<a name="line.81"></a> -<span class="sourceLineNo">082</span> *<a name="line.82"></a> -<span class="sourceLineNo">083</span> * @param f The file to create.<a name="line.83"></a> -<span class="sourceLineNo">084</span> */<a name="line.84"></a> -<span class="sourceLineNo">085</span> public static void create(File f) {<a name="line.85"></a> -<span class="sourceLineNo">086</span> if (f.exists())<a name="line.86"></a> -<span class="sourceLineNo">087</span> return;<a name="line.87"></a> -<span class="sourceLineNo">088</span> try {<a name="line.88"></a> -<span class="sourceLineNo">089</span> if (! f.createNewFile())<a name="line.89"></a> -<span class="sourceLineNo">090</span> throw new RuntimeException("Could not create file '"+f.getAbsolutePath()+"'");<a name="line.90"></a> -<span class="sourceLineNo">091</span> } catch (IOException e) {<a name="line.91"></a> -<span class="sourceLineNo">092</span> throw new RuntimeException(e);<a name="line.92"></a> -<span class="sourceLineNo">093</span> }<a name="line.93"></a> -<span class="sourceLineNo">094</span> }<a name="line.94"></a> -<span class="sourceLineNo">095</span><a name="line.95"></a> -<span class="sourceLineNo">096</span> /**<a name="line.96"></a> -<span class="sourceLineNo">097</span> * Updates the modified timestamp on the specified file.<a name="line.97"></a> -<span class="sourceLineNo">098</span> *<a name="line.98"></a> -<span class="sourceLineNo">099</span> * <p><a name="line.99"></a> -<span class="sourceLineNo">100</span> * Method ensures that the timestamp changes even if it's been modified within the past millisecond.<a name="line.100"></a> -<span class="sourceLineNo">101</span> *<a name="line.101"></a> -<span class="sourceLineNo">102</span> * @param f The file to modify the modified timestamp on.<a name="line.102"></a> -<span class="sourceLineNo">103</span> */<a name="line.103"></a> -<span class="sourceLineNo">104</span> public static void modifyTimestamp(File f) {<a name="line.104"></a> -<span class="sourceLineNo">105</span> long lm = f.lastModified();<a name="line.105"></a> -<span class="sourceLineNo">106</span> long l = System.currentTimeMillis();<a name="line.106"></a> -<span class="sourceLineNo">107</span> if (lm == l)<a name="line.107"></a> -<span class="sourceLineNo">108</span> l++;<a name="line.108"></a> -<span class="sourceLineNo">109</span> if (! f.setLastModified(l))<a name="line.109"></a> -<span class="sourceLineNo">110</span> throw new RuntimeException("Could not modify timestamp on file '"+f.getAbsolutePath()+"'");<a name="line.110"></a> -<span class="sourceLineNo">111</span><a name="line.111"></a> -<span class="sourceLineNo">112</span> // Linux only gives 1s precision, so set the date 1s into the future.<a name="line.112"></a> -<span class="sourceLineNo">113</span> if (lm == f.lastModified()) {<a name="line.113"></a> -<span class="sourceLineNo">114</span> l += 1000;<a name="line.114"></a> -<span class="sourceLineNo">115</span> if (! f.setLastModified(l))<a name="line.115"></a> -<span class="sourceLineNo">116</span> throw new RuntimeException("Could not modify timestamp on file '"+f.getAbsolutePath()+"'");<a name="line.116"></a> -<span class="sourceLineNo">117</span> }<a name="line.117"></a> -<span class="sourceLineNo">118</span> }<a name="line.118"></a> -<span class="sourceLineNo">119</span><a name="line.119"></a> -<span class="sourceLineNo">120</span> /**<a name="line.120"></a> -<span class="sourceLineNo">121</span> * Create a temporary file with the specified name.<a name="line.121"></a> -<span class="sourceLineNo">122</span> *<a name="line.122"></a> -<span class="sourceLineNo">123</span> * <p><a name="line.123"></a> -<span class="sourceLineNo">124</span> * The name is broken into file name and suffix, and the parts are passed to<a name="line.124"></a> -<span class="sourceLineNo">125</span> * {@link File#createTempFile(String, String)}.<a name="line.125"></a> -<span class="sourceLineNo">126</span> *<a name="line.126"></a> -<span class="sourceLineNo">127</span> * <p><a name="line.127"></a> -<span class="sourceLineNo">128</span> * {@link File#deleteOnExit()} is called on the resulting file before being returned by this method.<a name="line.128"></a> -<span class="sourceLineNo">129</span> *<a name="line.129"></a> -<span class="sourceLineNo">130</span> * @param name The file name<a name="line.130"></a> -<span class="sourceLineNo">131</span> * @return A newly-created temporary file.<a name="line.131"></a> -<span class="sourceLineNo">132</span> * @throws IOException<a name="line.132"></a> -<span class="sourceLineNo">133</span> */<a name="line.133"></a> -<span class="sourceLineNo">134</span> public static File createTempFile(String name) throws IOException {<a name="line.134"></a> -<span class="sourceLineNo">135</span> String[] parts = name.split("\\.");<a name="line.135"></a> -<span class="sourceLineNo">136</span> File f = File.createTempFile(parts[0], "." + parts[1]);<a name="line.136"></a> -<span class="sourceLineNo">137</span> f.deleteOnExit();<a name="line.137"></a> -<span class="sourceLineNo">138</span> return f;<a name="line.138"></a> -<span class="sourceLineNo">139</span> }<a name="line.139"></a> -<span class="sourceLineNo">140</span><a name="line.140"></a> -<span class="sourceLineNo">141</span> /**<a name="line.141"></a> -<span class="sourceLineNo">142</span> * Strips the extension from a file name.<a name="line.142"></a> -<span class="sourceLineNo">143</span> *<a name="line.143"></a> -<span class="sourceLineNo">144</span> * @param name The file name.<a name="line.144"></a> -<span class="sourceLineNo">145</span> * @return The file name without the extension, or <jk>null</jk> if name was <jk>null</jk>.<a name="line.145"></a> -<span class="sourceLineNo">146</span> */<a name="line.146"></a> -<span class="sourceLineNo">147</span> public static String getBaseName(String name) {<a name="line.147"></a> -<span class="sourceLineNo">148</span> if (name == null)<a name="line.148"></a> -<span class="sourceLineNo">149</span> return null;<a name="line.149"></a> -<span class="sourceLineNo">150</span> int i = name.lastIndexOf('.');<a name="line.150"></a> -<span class="sourceLineNo">151</span> if (i == -1)<a name="line.151"></a> -<span class="sourceLineNo">152</span> return name;<a name="line.152"></a> -<span class="sourceLineNo">153</span> return name.substring(0, i);<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> /**<a name="line.156"></a> -<span class="sourceLineNo">157</span> * Returns the extension from a file name.<a name="line.157"></a> -<span class="sourceLineNo">158</span> *<a name="line.158"></a> -<span class="sourceLineNo">159</span> * @param name The file name.<a name="line.159"></a> -<span class="sourceLineNo">160</span> * @return The the extension, or <jk>null</jk> if name was <jk>null</jk>.<a name="line.160"></a> -<span class="sourceLineNo">161</span> */<a name="line.161"></a> -<span class="sourceLineNo">162</span> public static String getExtension(String name) {<a name="line.162"></a> -<span class="sourceLineNo">163</span> if (name == null)<a name="line.163"></a> -<span class="sourceLineNo">164</span> return null;<a name="line.164"></a> -<span class="sourceLineNo">165</span> int i = name.lastIndexOf('.');<a name="line.165"></a> -<span class="sourceLineNo">166</span> if (i == -1)<a name="line.166"></a> -<span class="sourceLineNo">167</span> return "";<a name="line.167"></a> -<span class="sourceLineNo">168</span> return name.substring(i+1);<a name="line.168"></a> -<span class="sourceLineNo">169</span> }<a name="line.169"></a> -<span class="sourceLineNo">170</span>}<a name="line.170"></a> +<span class="sourceLineNo">019</span>import org.apache.juneau.*;<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> * File utilities.<a name="line.22"></a> +<span class="sourceLineNo">023</span> */<a name="line.23"></a> +<span class="sourceLineNo">024</span>public class FileUtils {<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> * Same as {@link File#mkdirs()} except throws a RuntimeExeption if directory could not be created.<a name="line.27"></a> +<span class="sourceLineNo">028</span> *<a name="line.28"></a> +<span class="sourceLineNo">029</span> * @param f The directory to create. Must not be <jk>null</jk>.<a name="line.29"></a> +<span class="sourceLineNo">030</span> * @param clean If <jk>true</jk>, deletes the contents of the directory if it already exists.<a name="line.30"></a> +<span class="sourceLineNo">031</span> * @return The same file.<a name="line.31"></a> +<span class="sourceLineNo">032</span> * @throws RuntimeException if directory could not be created.<a name="line.32"></a> +<span class="sourceLineNo">033</span> */<a name="line.33"></a> +<span class="sourceLineNo">034</span> public static File mkdirs(File f, boolean clean) {<a name="line.34"></a> +<span class="sourceLineNo">035</span> assertFieldNotNull(f, "f");<a name="line.35"></a> +<span class="sourceLineNo">036</span> if (f.exists()) {<a name="line.36"></a> +<span class="sourceLineNo">037</span> if (clean) {<a name="line.37"></a> +<span class="sourceLineNo">038</span> if (! delete(f))<a name="line.38"></a> +<span class="sourceLineNo">039</span> throw new FormattedRuntimeException("Could not clean directory ''{0}''", f.getAbsolutePath());<a name="line.39"></a> +<span class="sourceLineNo">040</span> } else {<a name="line.40"></a> +<span class="sourceLineNo">041</span> return f;<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> if (! f.mkdirs())<a name="line.44"></a> +<span class="sourceLineNo">045</span> throw new FormattedRuntimeException("Could not create directory ''{0}''", f.getAbsolutePath());<a name="line.45"></a> +<span class="sourceLineNo">046</span> return f;<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> * Same as {@link #mkdirs(String, boolean)} but uses String path.<a name="line.50"></a> +<span class="sourceLineNo">051</span> *<a name="line.51"></a> +<span class="sourceLineNo">052</span> * @param path The path of the directory to create. Must not be <jk>null</jk><a name="line.52"></a> +<span class="sourceLineNo">053</span> * @param clean If <jk>true</jk>, deletes the contents of the directory if it already exists.<a name="line.53"></a> +<span class="sourceLineNo">054</span> * @return The directory.<a name="line.54"></a> +<span class="sourceLineNo">055</span> */<a name="line.55"></a> +<span class="sourceLineNo">056</span> public static File mkdirs(String path, boolean clean) {<a name="line.56"></a> +<span class="sourceLineNo">057</span> assertFieldNotNull(path, "path");<a name="line.57"></a> +<span class="sourceLineNo">058</span> return mkdirs(new File(path), clean);<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> * Recursively deletes a file or directory.<a name="line.62"></a> +<span class="sourceLineNo">063</span> *<a name="line.63"></a> +<span class="sourceLineNo">064</span> * @param f The file or directory to delete.<a name="line.64"></a> +<span class="sourceLineNo">065</span> * @return <jk>true</jk> if file or directory was successfully deleted.<a name="line.65"></a> +<span class="sourceLineNo">066</span> */<a name="line.66"></a> +<span class="sourceLineNo">067</span> public static boolean delete(File f) {<a name="line.67"></a> +<span class="sourceLineNo">068</span> if (f == null)<a name="line.68"></a> +<span class="sourceLineNo">069</span> return true;<a name="line.69"></a> +<span class="sourceLineNo">070</span> if (f.isDirectory()) {<a name="line.70"></a> +<span class="sourceLineNo">071</span> File[] cf = f.listFiles();<a name="line.71"></a> +<span class="sourceLineNo">072</span> if (cf != null)<a name="line.72"></a> +<span class="sourceLineNo">073</span> for (File c : cf)<a name="line.73"></a> +<span class="sourceLineNo">074</span> delete(c);<a name="line.74"></a> +<span class="sourceLineNo">075</span> }<a name="line.75"></a> +<span class="sourceLineNo">076</span> return f.delete();<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> * Creates a file if it doesn't already exist using {@link File#createNewFile()}.<a name="line.80"></a> +<span class="sourceLineNo">081</span> *<a name="line.81"></a> +<span class="sourceLineNo">082</span> * <p><a name="line.82"></a> +<span class="sourceLineNo">083</span> * Throws a {@link RuntimeException} if the file could not be created.<a name="line.83"></a> +<span class="sourceLineNo">084</span> *<a name="line.84"></a> +<span class="sourceLineNo">085</span> * @param f The file to create.<a name="line.85"></a> +<span class="sourceLineNo">086</span> */<a name="line.86"></a> +<span class="sourceLineNo">087</span> public static void create(File f) {<a name="line.87"></a> +<span class="sourceLineNo">088</span> if (f.exists())<a name="line.88"></a> +<span class="sourceLineNo">089</span> return;<a name="line.89"></a> +<span class="sourceLineNo">090</span> try {<a name="line.90"></a> +<span class="sourceLineNo">091</span> if (! f.createNewFile())<a name="line.91"></a> +<span class="sourceLineNo">092</span> throw new FormattedRuntimeException("Could not create file ''{0}''", f.getAbsolutePath());<a name="line.92"></a> +<span class="sourceLineNo">093</span> } catch (IOException e) {<a name="line.93"></a> +<span class="sourceLineNo">094</span> throw new RuntimeException(e);<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">097</span><a name="line.97"></a> +<span class="sourceLineNo">098</span> /**<a name="line.98"></a> +<span class="sourceLineNo">099</span> * Updates the modified timestamp on the specified file.<a name="line.99"></a> +<span class="sourceLineNo">100</span> *<a name="line.100"></a> +<span class="sourceLineNo">101</span> * <p><a name="line.101"></a> +<span class="sourceLineNo">102</span> * Method ensures that the timestamp changes even if it's been modified within the past millisecond.<a name="line.102"></a> +<span class="sourceLineNo">103</span> *<a name="line.103"></a> +<span class="sourceLineNo">104</span> * @param f The file to modify the modified timestamp on.<a name="line.104"></a> +<span class="sourceLineNo">105</span> */<a name="line.105"></a> +<span class="sourceLineNo">106</span> public static void modifyTimestamp(File f) {<a name="line.106"></a> +<span class="sourceLineNo">107</span> long lm = f.lastModified();<a name="line.107"></a> +<span class="sourceLineNo">108</span> long l = System.currentTimeMillis();<a name="line.108"></a> +<span class="sourceLineNo">109</span> if (lm == l)<a name="line.109"></a> +<span class="sourceLineNo">110</span> l++;<a name="line.110"></a> +<span class="sourceLineNo">111</span> if (! f.setLastModified(l))<a name="line.111"></a> +<span class="sourceLineNo">112</span> throw new FormattedRuntimeException("Could not modify timestamp on file ''{0}''", f.getAbsolutePath());<a name="line.112"></a> +<span class="sourceLineNo">113</span><a name="line.113"></a> +<span class="sourceLineNo">114</span> // Linux only gives 1s precision, so set the date 1s into the future.<a name="line.114"></a> +<span class="sourceLineNo">115</span> if (lm == f.lastModified()) {<a name="line.115"></a> +<span class="sourceLineNo">116</span> l += 1000;<a name="line.116"></a> +<span class="sourceLineNo">117</span> if (! f.setLastModified(l))<a name="line.117"></a> +<span class="sourceLineNo">118</span> throw new FormattedRuntimeException("Could not modify timestamp on file ''{0}''", f.getAbsolutePath());<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><a name="line.121"></a> +<span class="sourceLineNo">122</span> /**<a name="line.122"></a> +<span class="sourceLineNo">123</span> * Create a temporary file with the specified name.<a name="line.123"></a> +<span class="sourceLineNo">124</span> *<a name="line.124"></a> +<span class="sourceLineNo">125</span> * <p><a name="line.125"></a> +<span class="sourceLineNo">126</span> * The name is broken into file name and suffix, and the parts are passed to<a name="line.126"></a> +<span class="sourceLineNo">127</span> * {@link File#createTempFile(String, String)}.<a name="line.127"></a> +<span class="sourceLineNo">128</span> *<a name="line.128"></a> +<span class="sourceLineNo">129</span> * <p><a name="line.129"></a> +<span class="sourceLineNo">130</span> * {@link File#deleteOnExit()} is called on the resulting file before being returned by this method.<a name="line.130"></a> +<span class="sourceLineNo">131</span> *<a name="line.131"></a> +<span class="sourceLineNo">132</span> * @param name The file name<a name="line.132"></a> +<span class="sourceLineNo">133</span> * @return A newly-created temporary file.<a name="line.133"></a> +<span class="sourceLineNo">134</span> * @throws IOException<a name="line.134"></a> +<span class="sourceLineNo">135</span> */<a name="line.135"></a> +<span class="sourceLineNo">136</span> public static File createTempFile(String name) throws IOException {<a name="line.136"></a> +<span class="sourceLineNo">137</span> String[] parts = name.split("\\.");<a name="line.137"></a> +<span class="sourceLineNo">138</span> File f = File.createTempFile(parts[0], "." + parts[1]);<a name="line.138"></a> +<span class="sourceLineNo">139</span> f.deleteOnExit();<a name="line.139"></a> +<span class="sourceLineNo">140</span> return f;<a name="line.140"></a> +<span class="sourceLineNo">141</span> }<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> * Strips the extension from a file name.<a name="line.144"></a> +<span class="sourceLineNo">145</span> *<a name="line.145"></a> +<span class="sourceLineNo">146</span> * @param name The file name.<a name="line.146"></a> +<span class="sourceLineNo">147</span> * @return The file name without the extension, or <jk>null</jk> if name was <jk>null</jk>.<a name="line.147"></a> +<span class="sourceLineNo">148</span> */<a name="line.148"></a> +<span class="sourceLineNo">149</span> public static String getBaseName(String name) {<a name="line.149"></a> +<span class="sourceLineNo">150</span> if (name == null)<a name="line.150"></a> +<span class="sourceLineNo">151</span> return null;<a name="line.151"></a> +<span class="sourceLineNo">152</span> int i = name.lastIndexOf('.');<a name="line.152"></a> +<span class="sourceLineNo">153</span> if (i == -1)<a name="line.153"></a> +<span class="sourceLineNo">154</span> return name;<a name="line.154"></a> +<span class="sourceLineNo">155</span> return name.substring(0, i);<a name="line.155"></a> +<span class="sourceLineNo">156</span> }<a name="line.156"></a> +<span class="sourceLineNo">157</span><a name="line.157"></a> +<span class="sourceLineNo">158</span> /**<a name="line.158"></a> +<span class="sourceLineNo">159</span> * Returns the extension from a file name.<a name="line.159"></a> +<span class="sourceLineNo">160</span> *<a name="line.160"></a> +<span class="sourceLineNo">161</span> * @param name The file name.<a name="line.161"></a> +<span class="sourceLineNo">162</span> * @return The the extension, or <jk>null</jk> if name was <jk>null</jk>.<a name="line.162"></a> +<span class="sourceLineNo">163</span> */<a name="line.163"></a> +<span class="sourceLineNo">164</span> public static String getExtension(String name) {<a name="line.164"></a> +<span class="sourceLineNo">165</span> if (name == null)<a name="line.165"></a> +<span class="sourceLineNo">166</span> return null;<a name="line.166"></a> +<span class="sourceLineNo">167</span> int i = name.lastIndexOf('.');<a name="line.167"></a> +<span class="sourceLineNo">168</span> if (i == -1)<a name="line.168"></a> +<span class="sourceLineNo">169</span> return "";<a name="line.169"></a> +<span class="sourceLineNo">170</span> return name.substring(i+1);<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>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/d35b70d1/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializerSession.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializerSession.html b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializerSession.html index 02944e3..92243ce 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializerSession.html +++ b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializerSession.html @@ -133,7 +133,7 @@ <span class="sourceLineNo">125</span> // Only apply properties with this prefix!<a name="line.125"></a> <span class="sourceLineNo">126</span> String propPrefix = RdfCommonContext.LANG_PROP_MAP.get(rdfLanguage);<a name="line.126"></a> <span class="sourceLineNo">127</span> if (propPrefix == null)<a name="line.127"></a> -<span class="sourceLineNo">128</span> throw new RuntimeException("Unknown RDF language encountered: '"+rdfLanguage+"'");<a name="line.128"></a> +<span class="sourceLineNo">128</span> throw new FormattedRuntimeException("Unknown RDF language encountered: ''{0}''", rdfLanguage);<a name="line.128"></a> <span class="sourceLineNo">129</span><a name="line.129"></a> <span class="sourceLineNo">130</span> for (Map.Entry<String,Object> e : jenaSettings.entrySet())<a name="line.130"></a> <span class="sourceLineNo">131</span> if (e.getKey().startsWith(propPrefix))<a name="line.131"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/d35b70d1/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 769fa2a..57f2d9e 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 @@ -299,7 +299,7 @@ <span class="sourceLineNo">291</span> // Lax allows blank strings to represent 0.<a name="line.291"></a> <span class="sourceLineNo">292</span> // Strict does not allow blank strings.<a name="line.292"></a> <span class="sourceLineNo">293</span> if (s.length() == 0)<a name="line.293"></a> -<span class="sourceLineNo">294</span> throw new ParseException(session, "Invalid JSON number: '"+s+"'");<a name="line.294"></a> +<span class="sourceLineNo">294</span> throw new ParseException(session, "Invalid JSON number: ''{0}''", s);<a name="line.294"></a> <span class="sourceLineNo">295</span><a name="line.295"></a> <span class="sourceLineNo">296</span> // Need to weed out octal and hexadecimal formats: 0123,-0123,0x123,-0x123.<a name="line.296"></a> <span class="sourceLineNo">297</span> // Don't weed out 0 or -0.<a name="line.297"></a> @@ -312,19 +312,19 @@ <span class="sourceLineNo">304</span><a name="line.304"></a> <span class="sourceLineNo">305</span> // JSON doesn't allow '.123' and '-.123'.<a name="line.305"></a> <span class="sourceLineNo">306</span> if (c == '.')<a name="line.306"></a> -<span class="sourceLineNo">307</span> throw new ParseException(session, "Invalid JSON number: '"+s+"'");<a name="line.307"></a> +<span class="sourceLineNo">307</span> throw new ParseException(session, "Invalid JSON number: ''{0}''", s);<a name="line.307"></a> <span class="sourceLineNo">308</span><a name="line.308"></a> <span class="sourceLineNo">309</span> // '01' is not a valid number, but '0.1', '0e1', '0e+1' are valid.<a name="line.309"></a> <span class="sourceLineNo">310</span> if (c == '0' && s.length() > (isNegative ? 2 : 1)) {<a name="line.310"></a> <span class="sourceLineNo">311</span> char c2 = s.charAt((isNegative ? 2 : 1));<a name="line.311"></a> <span class="sourceLineNo">312</span> if (c2 != '.' && c2 != 'e' && c2 != 'E')<a name="line.312"></a> -<span class="sourceLineNo">313</span> throw new ParseException(session, "Invalid JSON number: '"+s+"'");<a name="line.313"></a> +<span class="sourceLineNo">313</span> throw new ParseException(session, "Invalid JSON number: ''{0}''", s);<a name="line.313"></a> <span class="sourceLineNo">314</span> }<a name="line.314"></a> <span class="sourceLineNo">315</span><a name="line.315"></a> <span class="sourceLineNo">316</span> // JSON doesn't allow '1.' or '0.e1'.<a name="line.316"></a> <span class="sourceLineNo">317</span> int i = s.indexOf('.');<a name="line.317"></a> <span class="sourceLineNo">318</span> if (i != -1 && (s.length() == (i+1) || ! decChars.contains(s.charAt(i+1))))<a name="line.318"></a> -<span class="sourceLineNo">319</span> throw new ParseException(session, "Invalid JSON number: '"+s+"'");<a name="line.319"></a> +<span class="sourceLineNo">319</span> throw new ParseException(session, "Invalid JSON number: ''{0}''", s);<a name="line.319"></a> <span class="sourceLineNo">320</span><a name="line.320"></a> <span class="sourceLineNo">321</span> }<a name="line.321"></a> <span class="sourceLineNo">322</span> return StringUtils.parseNumber(s, type);<a name="line.322"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/d35b70d1/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 769fa2a..57f2d9e 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 @@ -299,7 +299,7 @@ <span class="sourceLineNo">291</span> // Lax allows blank strings to represent 0.<a name="line.291"></a> <span class="sourceLineNo">292</span> // Strict does not allow blank strings.<a name="line.292"></a> <span class="sourceLineNo">293</span> if (s.length() == 0)<a name="line.293"></a> -<span class="sourceLineNo">294</span> throw new ParseException(session, "Invalid JSON number: '"+s+"'");<a name="line.294"></a> +<span class="sourceLineNo">294</span> throw new ParseException(session, "Invalid JSON number: ''{0}''", s);<a name="line.294"></a> <span class="sourceLineNo">295</span><a name="line.295"></a> <span class="sourceLineNo">296</span> // Need to weed out octal and hexadecimal formats: 0123,-0123,0x123,-0x123.<a name="line.296"></a> <span class="sourceLineNo">297</span> // Don't weed out 0 or -0.<a name="line.297"></a> @@ -312,19 +312,19 @@ <span class="sourceLineNo">304</span><a name="line.304"></a> <span class="sourceLineNo">305</span> // JSON doesn't allow '.123' and '-.123'.<a name="line.305"></a> <span class="sourceLineNo">306</span> if (c == '.')<a name="line.306"></a> -<span class="sourceLineNo">307</span> throw new ParseException(session, "Invalid JSON number: '"+s+"'");<a name="line.307"></a> +<span class="sourceLineNo">307</span> throw new ParseException(session, "Invalid JSON number: ''{0}''", s);<a name="line.307"></a> <span class="sourceLineNo">308</span><a name="line.308"></a> <span class="sourceLineNo">309</span> // '01' is not a valid number, but '0.1', '0e1', '0e+1' are valid.<a name="line.309"></a> <span class="sourceLineNo">310</span> if (c == '0' && s.length() > (isNegative ? 2 : 1)) {<a name="line.310"></a> <span class="sourceLineNo">311</span> char c2 = s.charAt((isNegative ? 2 : 1));<a name="line.311"></a> <span class="sourceLineNo">312</span> if (c2 != '.' && c2 != 'e' && c2 != 'E')<a name="line.312"></a> -<span class="sourceLineNo">313</span> throw new ParseException(session, "Invalid JSON number: '"+s+"'");<a name="line.313"></a> +<span class="sourceLineNo">313</span> throw new ParseException(session, "Invalid JSON number: ''{0}''", s);<a name="line.313"></a> <span class="sourceLineNo">314</span> }<a name="line.314"></a> <span class="sourceLineNo">315</span><a name="line.315"></a> <span class="sourceLineNo">316</span> // JSON doesn't allow '1.' or '0.e1'.<a name="line.316"></a> <span class="sourceLineNo">317</span> int i = s.indexOf('.');<a name="line.317"></a> <span class="sourceLineNo">318</span> if (i != -1 && (s.length() == (i+1) || ! decChars.contains(s.charAt(i+1))))<a name="line.318"></a> -<span class="sourceLineNo">319</span> throw new ParseException(session, "Invalid JSON number: '"+s+"'");<a name="line.319"></a> +<span class="sourceLineNo">319</span> throw new ParseException(session, "Invalid JSON number: ''{0}''", s);<a name="line.319"></a> <span class="sourceLineNo">320</span><a name="line.320"></a> <span class="sourceLineNo">321</span> }<a name="line.321"></a> <span class="sourceLineNo">322</span> return StringUtils.parseNumber(s, type);<a name="line.322"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/d35b70d1/content/site/apidocs/src-html/org/apache/juneau/microservice/Resource.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/microservice/Resource.html b/content/site/apidocs/src-html/org/apache/juneau/microservice/Resource.html index dfeaade..777236c 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/microservice/Resource.html +++ b/content/site/apidocs/src-html/org/apache/juneau/microservice/Resource.html @@ -52,7 +52,7 @@ <span class="sourceLineNo">044</span>@RestResource(<a name="line.44"></a> <span class="sourceLineNo">045</span> htmldoc=@HtmlDoc(<a name="line.45"></a> <span class="sourceLineNo">046</span> links="{up:'request:/..',options:'servlet:/?method=OPTIONS'}",<a name="line.46"></a> -<span class="sourceLineNo">047</span> styleImport="$C{REST/stylesheet,servlet:/styles/devops.css}"<a name="line.47"></a> +<span class="sourceLineNo">047</span> stylesheet="$C{REST/stylesheet,servlet:/styles/devops.css}"<a name="line.47"></a> <span class="sourceLineNo">048</span> ),<a name="line.48"></a> <span class="sourceLineNo">049</span> config="$S{juneau.configFile}"<a name="line.49"></a> <span class="sourceLineNo">050</span>)<a name="line.50"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/d35b70d1/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceGroup.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceGroup.html b/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceGroup.html index 3838671..46265ca 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceGroup.html +++ b/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceGroup.html @@ -53,7 +53,7 @@ <span class="sourceLineNo">045</span>@RestResource(<a name="line.45"></a> <span class="sourceLineNo">046</span> htmldoc=@HtmlDoc(<a name="line.46"></a> <span class="sourceLineNo">047</span> links="{up:'request:/..',options:'servlet:/?method=OPTIONS'}",<a name="line.47"></a> -<span class="sourceLineNo">048</span> styleImport="$C{REST/stylesheet,servlet:/styles/devops.css}"<a name="line.48"></a> +<span class="sourceLineNo">048</span> stylesheet="$C{REST/stylesheet,servlet:/styles/devops.css}"<a name="line.48"></a> <span class="sourceLineNo">049</span> ),<a name="line.49"></a> <span class="sourceLineNo">050</span> config="$S{juneau.configFile}"<a name="line.50"></a> <span class="sourceLineNo">051</span>)<a name="line.51"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/d35b70d1/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceJena.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceJena.html b/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceJena.html index 7402869..4b8fbc6 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceJena.html +++ b/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceJena.html @@ -30,7 +30,7 @@ <span class="sourceLineNo">022</span>@RestResource(<a name="line.22"></a> <span class="sourceLineNo">023</span> htmldoc=@HtmlDoc(<a name="line.23"></a> <span class="sourceLineNo">024</span> links="{up:'request:/..',options:'servlet:/?method=OPTIONS'}",<a name="line.24"></a> -<span class="sourceLineNo">025</span> styleImport="$C{REST/stylesheet,servlet:/styles/devops.css}"<a name="line.25"></a> +<span class="sourceLineNo">025</span> stylesheet="$C{REST/stylesheet,servlet:/styles/devops.css}"<a name="line.25"></a> <span class="sourceLineNo">026</span> ),<a name="line.26"></a> <span class="sourceLineNo">027</span> config="$S{juneau.configFile}"<a name="line.27"></a> <span class="sourceLineNo">028</span>)<a name="line.28"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/d35b70d1/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceJenaGroup.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceJenaGroup.html b/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceJenaGroup.html index 6630fc7..6459540 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceJenaGroup.html +++ b/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceJenaGroup.html @@ -54,7 +54,7 @@ <span class="sourceLineNo">046</span>@RestResource(<a name="line.46"></a> <span class="sourceLineNo">047</span> htmldoc=@HtmlDoc(<a name="line.47"></a> <span class="sourceLineNo">048</span> links="{up:'request:/..',options:'servlet:/?method=OPTIONS'}",<a name="line.48"></a> -<span class="sourceLineNo">049</span> styleImport="$C{REST/stylesheet,servlet:/styles/devops.css}"<a name="line.49"></a> +<span class="sourceLineNo">049</span> stylesheet="$C{REST/stylesheet,servlet:/styles/devops.css}"<a name="line.49"></a> <span class="sourceLineNo">050</span> ),<a name="line.50"></a> <span class="sourceLineNo">051</span> config="$S{juneau.configFile}"<a name="line.51"></a> <span class="sourceLineNo">052</span>)<a name="line.52"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/d35b70d1/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 f4a1312..68eef5a 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 @@ -31,7 +31,7 @@ <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">026</span>public class ParseException extends FormattedException {<a name="line.26"></a> <span class="sourceLineNo">027</span><a name="line.27"></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> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/d35b70d1/content/site/apidocs/src-html/org/apache/juneau/parser/ParserGroup.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/parser/ParserGroup.html b/content/site/apidocs/src-html/org/apache/juneau/parser/ParserGroup.html index 8d152e2..8b31894 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/parser/ParserGroup.html +++ b/content/site/apidocs/src-html/org/apache/juneau/parser/ParserGroup.html @@ -120,90 +120,93 @@ <span class="sourceLineNo">112</span> /**<a name="line.112"></a> <span class="sourceLineNo">113</span> * Searches the group for a parser that can handle the specified <l>Content-Type</l> header value.<a name="line.113"></a> <span class="sourceLineNo">114</span> *<a name="line.114"></a> -<span class="sourceLineNo">115</span> * @param contentTypeHeader The HTTP <l>Content-Type</l> header value.<a name="line.115"></a> -<span class="sourceLineNo">116</span> * @return The parser and media type that matched the content type header, or <jk>null</jk> if no match was made.<a name="line.116"></a> -<span class="sourceLineNo">117</span> */<a name="line.117"></a> -<span class="sourceLineNo">118</span> public ParserMatch getParserMatch(String contentTypeHeader) {<a name="line.118"></a> -<span class="sourceLineNo">119</span> ParserMatch pm = cache.get(contentTypeHeader);<a name="line.119"></a> -<span class="sourceLineNo">120</span> if (pm != null)<a name="line.120"></a> -<span class="sourceLineNo">121</span> return pm;<a name="line.121"></a> -<span class="sourceLineNo">122</span><a name="line.122"></a> -<span class="sourceLineNo">123</span> ContentType ct = ContentType.forString(contentTypeHeader);<a name="line.123"></a> -<span class="sourceLineNo">124</span> int match = ct.findMatch(mediaTypes);<a name="line.124"></a> +<span class="sourceLineNo">115</span> * <p><a name="line.115"></a> +<span class="sourceLineNo">116</span> * The returned object includes both the parser and media type that matched.<a name="line.116"></a> +<span class="sourceLineNo">117</span> *<a name="line.117"></a> +<span class="sourceLineNo">118</span> * @param contentTypeHeader The HTTP <l>Content-Type</l> header value.<a name="line.118"></a> +<span class="sourceLineNo">119</span> * @return The parser and media type that matched the content type header, or <jk>null</jk> if no match was made.<a name="line.119"></a> +<span class="sourceLineNo">120</span> */<a name="line.120"></a> +<span class="sourceLineNo">121</span> public ParserMatch getParserMatch(String contentTypeHeader) {<a name="line.121"></a> +<span class="sourceLineNo">122</span> ParserMatch pm = cache.get(contentTypeHeader);<a name="line.122"></a> +<span class="sourceLineNo">123</span> if (pm != null)<a name="line.123"></a> +<span class="sourceLineNo">124</span> return pm;<a name="line.124"></a> <span class="sourceLineNo">125</span><a name="line.125"></a> -<span class="sourceLineNo">126</span> if (match >= 0) {<a name="line.126"></a> -<span class="sourceLineNo">127</span> pm = new ParserMatch(mediaTypes[match], mediaTypeParsers[match]);<a name="line.127"></a> -<span class="sourceLineNo">128</span> cache.putIfAbsent(contentTypeHeader, pm);<a name="line.128"></a> -<span class="sourceLineNo">129</span> }<a name="line.129"></a> -<span class="sourceLineNo">130</span><a name="line.130"></a> -<span class="sourceLineNo">131</span> return cache.get(contentTypeHeader);<a name="line.131"></a> -<span class="sourceLineNo">132</span> }<a name="line.132"></a> +<span class="sourceLineNo">126</span> ContentType ct = ContentType.forString(contentTypeHeader);<a name="line.126"></a> +<span class="sourceLineNo">127</span> int match = ct.findMatch(mediaTypes);<a name="line.127"></a> +<span class="sourceLineNo">128</span><a name="line.128"></a> +<span class="sourceLineNo">129</span> if (match >= 0) {<a name="line.129"></a> +<span class="sourceLineNo">130</span> pm = new ParserMatch(mediaTypes[match], mediaTypeParsers[match]);<a name="line.130"></a> +<span class="sourceLineNo">131</span> cache.putIfAbsent(contentTypeHeader, pm);<a name="line.131"></a> +<span class="sourceLineNo">132</span> }<a name="line.132"></a> <span class="sourceLineNo">133</span><a name="line.133"></a> -<span class="sourceLineNo">134</span> /**<a name="line.134"></a> -<span class="sourceLineNo">135</span> * Same as {@link #getParserMatch(String)} but matches using a {@link MediaType} instance.<a name="line.135"></a> -<span class="sourceLineNo">136</span> *<a name="line.136"></a> -<span class="sourceLineNo">137</span> * @param mediaType The HTTP <l>Content-Type</l> header value as a media type.<a name="line.137"></a> -<span class="sourceLineNo">138</span> * @return The parser and media type that matched the media type, or <jk>null</jk> if no match was made.<a name="line.138"></a> -<span class="sourceLineNo">139</span> */<a name="line.139"></a> -<span class="sourceLineNo">140</span> public ParserMatch getParserMatch(MediaType mediaType) {<a name="line.140"></a> -<span class="sourceLineNo">141</span> return getParserMatch(mediaType.toString());<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> /**<a name="line.144"></a> -<span class="sourceLineNo">145</span> * Same as {@link #getParserMatch(String)} but returns just the matched parser.<a name="line.145"></a> -<span class="sourceLineNo">146</span> *<a name="line.146"></a> -<span class="sourceLineNo">147</span> * @param contentTypeHeader The HTTP <l>Content-Type</l> header string.<a name="line.147"></a> -<span class="sourceLineNo">148</span> * @return The parser that matched the content type header, or <jk>null</jk> if no match was made.<a name="line.148"></a> -<span class="sourceLineNo">149</span> */<a name="line.149"></a> -<span class="sourceLineNo">150</span> public Parser getParser(String contentTypeHeader) {<a name="line.150"></a> -<span class="sourceLineNo">151</span> ParserMatch pm = getParserMatch(contentTypeHeader);<a name="line.151"></a> -<span class="sourceLineNo">152</span> return pm == null ? null : pm.getParser();<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">155</span> /**<a name="line.155"></a> -<span class="sourceLineNo">156</span> * Same as {@link #getParserMatch(MediaType)} but returns just the matched parser.<a name="line.156"></a> -<span class="sourceLineNo">157</span> *<a name="line.157"></a> -<span class="sourceLineNo">158</span> * @param mediaType The HTTP media type.<a name="line.158"></a> -<span class="sourceLineNo">159</span> * @return The parser that matched the media type, or <jk>null</jk> if no match was made.<a name="line.159"></a> -<span class="sourceLineNo">160</span> */<a name="line.160"></a> -<span class="sourceLineNo">161</span> public Parser getParser(MediaType mediaType) {<a name="line.161"></a> -<span class="sourceLineNo">162</span> ParserMatch pm = getParserMatch(mediaType);<a name="line.162"></a> -<span class="sourceLineNo">163</span> return pm == null ? null : pm.getParser();<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> /**<a name="line.166"></a> -<span class="sourceLineNo">167</span> * Returns the media types that all parsers in this group can handle<a name="line.167"></a> -<span class="sourceLineNo">168</span> *<a name="line.168"></a> -<span class="sourceLineNo">169</span> * <p><a name="line.169"></a> -<span class="sourceLineNo">170</span> * Entries are ordered in the same order as the parsers in the group.<a name="line.170"></a> +<span class="sourceLineNo">134</span> return cache.get(contentTypeHeader);<a name="line.134"></a> +<span class="sourceLineNo">135</span> }<a name="line.135"></a> +<span class="sourceLineNo">136</span><a name="line.136"></a> +<span class="sourceLineNo">137</span> /**<a name="line.137"></a> +<span class="sourceLineNo">138</span> * Same as {@link #getParserMatch(String)} but matches using a {@link MediaType} instance.<a name="line.138"></a> +<span class="sourceLineNo">139</span> *<a name="line.139"></a> +<span class="sourceLineNo">140</span> * @param mediaType The HTTP <l>Content-Type</l> header value as a media type.<a name="line.140"></a> +<span class="sourceLineNo">141</span> * @return The parser and media type that matched the media type, or <jk>null</jk> if no match was made.<a name="line.141"></a> +<span class="sourceLineNo">142</span> */<a name="line.142"></a> +<span class="sourceLineNo">143</span> public ParserMatch getParserMatch(MediaType mediaType) {<a name="line.143"></a> +<span class="sourceLineNo">144</span> return getParserMatch(mediaType.toString());<a name="line.144"></a> +<span class="sourceLineNo">145</span> }<a name="line.145"></a> +<span class="sourceLineNo">146</span><a name="line.146"></a> +<span class="sourceLineNo">147</span> /**<a name="line.147"></a> +<span class="sourceLineNo">148</span> * Same as {@link #getParserMatch(String)} but returns just the matched parser.<a name="line.148"></a> +<span class="sourceLineNo">149</span> *<a name="line.149"></a> +<span class="sourceLineNo">150</span> * @param contentTypeHeader The HTTP <l>Content-Type</l> header string.<a name="line.150"></a> +<span class="sourceLineNo">151</span> * @return The parser that matched the content type header, or <jk>null</jk> if no match was made.<a name="line.151"></a> +<span class="sourceLineNo">152</span> */<a name="line.152"></a> +<span class="sourceLineNo">153</span> public Parser getParser(String contentTypeHeader) {<a name="line.153"></a> +<span class="sourceLineNo">154</span> ParserMatch pm = getParserMatch(contentTypeHeader);<a name="line.154"></a> +<span class="sourceLineNo">155</span> return pm == null ? null : pm.getParser();<a name="line.155"></a> +<span class="sourceLineNo">156</span> }<a name="line.156"></a> +<span class="sourceLineNo">157</span><a name="line.157"></a> +<span class="sourceLineNo">158</span> /**<a name="line.158"></a> +<span class="sourceLineNo">159</span> * Same as {@link #getParserMatch(MediaType)} but returns just the matched parser.<a name="line.159"></a> +<span class="sourceLineNo">160</span> *<a name="line.160"></a> +<span class="sourceLineNo">161</span> * @param mediaType The HTTP media type.<a name="line.161"></a> +<span class="sourceLineNo">162</span> * @return The parser that matched the media type, or <jk>null</jk> if no match was made.<a name="line.162"></a> +<span class="sourceLineNo">163</span> */<a name="line.163"></a> +<span class="sourceLineNo">164</span> public Parser getParser(MediaType mediaType) {<a name="line.164"></a> +<span class="sourceLineNo">165</span> ParserMatch pm = getParserMatch(mediaType);<a name="line.165"></a> +<span class="sourceLineNo">166</span> return pm == null ? null : pm.getParser();<a name="line.166"></a> +<span class="sourceLineNo">167</span> }<a name="line.167"></a> +<span class="sourceLineNo">168</span><a name="line.168"></a> +<span class="sourceLineNo">169</span> /**<a name="line.169"></a> +<span class="sourceLineNo">170</span> * Returns the media types that all parsers in this group can handle<a name="line.170"></a> <span class="sourceLineNo">171</span> *<a name="line.171"></a> -<span class="sourceLineNo">172</span> * @return An unmodifiable list of media types.<a name="line.172"></a> -<span class="sourceLineNo">173</span> */<a name="line.173"></a> -<span class="sourceLineNo">174</span> public List<MediaType> getSupportedMediaTypes() {<a name="line.174"></a> -<span class="sourceLineNo">175</span> return mediaTypesList;<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> /**<a name="line.178"></a> -<span class="sourceLineNo">179</span> * Returns a copy of the property store that was used to create the parsers in this group.<a name="line.179"></a> -<span class="sourceLineNo">180</span> *<a name="line.180"></a> -<span class="sourceLineNo">181</span> * <p><a name="line.181"></a> -<span class="sourceLineNo">182</span> * This method returns a new factory each time so is somewhat expensive.<a name="line.182"></a> +<span class="sourceLineNo">172</span> * <p><a name="line.172"></a> +<span class="sourceLineNo">173</span> * Entries are ordered in the same order as the parsers in the group.<a name="line.173"></a> +<span class="sourceLineNo">174</span> *<a name="line.174"></a> +<span class="sourceLineNo">175</span> * @return An unmodifiable list of media types.<a name="line.175"></a> +<span class="sourceLineNo">176</span> */<a name="line.176"></a> +<span class="sourceLineNo">177</span> public List<MediaType> getSupportedMediaTypes() {<a name="line.177"></a> +<span class="sourceLineNo">178</span> return mediaTypesList;<a name="line.178"></a> +<span class="sourceLineNo">179</span> }<a name="line.179"></a> +<span class="sourceLineNo">180</span><a name="line.180"></a> +<span class="sourceLineNo">181</span> /**<a name="line.181"></a> +<span class="sourceLineNo">182</span> * Returns a copy of the property store that was used to create the parsers in this group.<a name="line.182"></a> <span class="sourceLineNo">183</span> *<a name="line.183"></a> -<span class="sourceLineNo">184</span> * @return A new copy of the property store passed in to the constructor.<a name="line.184"></a> -<span class="sourceLineNo">185</span> */<a name="line.185"></a> -<span class="sourceLineNo">186</span> public PropertyStore createPropertyStore() {<a name="line.186"></a> -<span class="sourceLineNo">187</span> return PropertyStore.create(propertyStore);<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> /**<a name="line.190"></a> -<span class="sourceLineNo">191</span> * Returns the parsers in this group.<a name="line.191"></a> -<span class="sourceLineNo">192</span> *<a name="line.192"></a> -<span class="sourceLineNo">193</span> * @return An unmodifiable list of parsers in this group.<a name="line.193"></a> -<span class="sourceLineNo">194</span> */<a name="line.194"></a> -<span class="sourceLineNo">195</span> public List<Parser> getParsers() {<a name="line.195"></a> -<span class="sourceLineNo">196</span> return parsers;<a name="line.196"></a> -<span class="sourceLineNo">197</span> }<a name="line.197"></a> -<span class="sourceLineNo">198</span>}<a name="line.198"></a> +<span class="sourceLineNo">184</span> * <p><a name="line.184"></a> +<span class="sourceLineNo">185</span> * This method returns a new factory each time so is somewhat expensive.<a name="line.185"></a> +<span class="sourceLineNo">186</span> *<a name="line.186"></a> +<span class="sourceLineNo">187</span> * @return A new copy of the property store passed in to the constructor.<a name="line.187"></a> +<span class="sourceLineNo">188</span> */<a name="line.188"></a> +<span class="sourceLineNo">189</span> public PropertyStore createPropertyStore() {<a name="line.189"></a> +<span class="sourceLineNo">190</span> return PropertyStore.create(propertyStore);<a name="line.190"></a> +<span class="sourceLineNo">191</span> }<a name="line.191"></a> +<span class="sourceLineNo">192</span><a name="line.192"></a> +<span class="sourceLineNo">193</span> /**<a name="line.193"></a> +<span class="sourceLineNo">194</span> * Returns the parsers in this group.<a name="line.194"></a> +<span class="sourceLineNo">195</span> *<a name="line.195"></a> +<span class="sourceLineNo">196</span> * @return An unmodifiable list of parsers in this group.<a name="line.196"></a> +<span class="sourceLineNo">197</span> */<a name="line.197"></a> +<span class="sourceLineNo">198</span> public List<Parser> getParsers() {<a name="line.198"></a> +<span class="sourceLineNo">199</span> return parsers;<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> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/d35b70d1/content/site/apidocs/src-html/org/apache/juneau/rest/RestConfig.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/RestConfig.html b/content/site/apidocs/src-html/org/apache/juneau/rest/RestConfig.html index ab96a7e..63150e3 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/rest/RestConfig.html +++ b/content/site/apidocs/src-html/org/apache/juneau/rest/RestConfig.html @@ -121,7 +121,7 @@ <span class="sourceLineNo">113</span> List<Object> staticFiles;<a name="line.113"></a> <span class="sourceLineNo">114</span> RestContext parentContext;<a name="line.114"></a> <span class="sourceLineNo">115</span> String path, htmlTitle, htmlDescription, htmlBranding, htmlLinks, htmlHeader, htmlNav, htmlAside, htmlFooter,<a name="line.115"></a> -<span class="sourceLineNo">116</span> htmlStyle, htmlStyleImport, htmlScript, htmlNoResultsMessage;<a name="line.116"></a> +<span class="sourceLineNo">116</span> htmlStyle, htmlStylesheet, htmlScript, htmlNoResultsMessage;<a name="line.116"></a> <span class="sourceLineNo">117</span> String clientVersionHeader = "X-Client-Version";<a name="line.117"></a> <span class="sourceLineNo">118</span><a name="line.118"></a> <span class="sourceLineNo">119</span> Object resourceResolver = RestResourceResolver.class;<a name="line.119"></a> @@ -249,8 +249,8 @@ <span class="sourceLineNo">241</span> setHtmlFooter(hd.footer());<a name="line.241"></a> <span class="sourceLineNo">242</span> if (! hd.style().isEmpty())<a name="line.242"></a> <span class="sourceLineNo">243</span> setHtmlStyle(hd.style());<a name="line.243"></a> -<span class="sourceLineNo">244</span> if (! hd.styleImport().isEmpty())<a name="line.244"></a> -<span class="sourceLineNo">245</span> setHtmlStyleImport(hd.styleImport());<a name="line.245"></a> +<span class="sourceLineNo">244</span> if (! hd.stylesheet().isEmpty())<a name="line.244"></a> +<span class="sourceLineNo">245</span> setHtmlStylesheet(hd.stylesheet());<a name="line.245"></a> <span class="sourceLineNo">246</span> if (! hd.noResultsMessage().isEmpty())<a name="line.246"></a> <span class="sourceLineNo">247</span> setHtmlNoResultsMessage(hd.noResultsMessage());<a name="line.247"></a> <span class="sourceLineNo">248</span> if (hd.nowrap())<a name="line.248"></a> @@ -1407,13 +1407,13 @@ <span class="sourceLineNo">1399</span> * by {@link UriResolver}.<a name="line.1399"></a> <span class="sourceLineNo">1400</span> *<a name="line.1400"></a> <span class="sourceLineNo">1401</span> * <p><a name="line.1401"></a> -<span class="sourceLineNo">1402</span> * This is the programmatic equivalent to the {@link HtmlDoc#styleImport() @HtmlDoc.styleImport()} annotation.<a name="line.1402"></a> +<span class="sourceLineNo">1402</span> * This is the programmatic equivalent to the {@link HtmlDoc#stylesheet() @HtmlDoc.stylesheet()} annotation.<a name="line.1402"></a> <span class="sourceLineNo">1403</span> *<a name="line.1403"></a> <span class="sourceLineNo">1404</span> * @param value The CSS URL in the HTML CSS style section.<a name="line.1404"></a> <span class="sourceLineNo">1405</span> * @return This object (for method chaining).<a name="line.1405"></a> <span class="sourceLineNo">1406</span> */<a name="line.1406"></a> -<span class="sourceLineNo">1407</span> public RestConfig setHtmlStyleImport(String value) {<a name="line.1407"></a> -<span class="sourceLineNo">1408</span> this.htmlStyleImport = value;<a name="line.1408"></a> +<span class="sourceLineNo">1407</span> public RestConfig setHtmlStylesheet(String value) {<a name="line.1407"></a> +<span class="sourceLineNo">1408</span> this.htmlStylesheet = value;<a name="line.1408"></a> <span class="sourceLineNo">1409</span> return this;<a name="line.1409"></a> <span class="sourceLineNo">1410</span> }<a name="line.1410"></a> <span class="sourceLineNo">1411</span><a name="line.1411"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/d35b70d1/content/site/apidocs/src-html/org/apache/juneau/rest/RestContext.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/RestContext.html b/content/site/apidocs/src-html/org/apache/juneau/rest/RestContext.html index 8df8c7d..77f28a8 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/rest/RestContext.html +++ b/content/site/apidocs/src-html/org/apache/juneau/rest/RestContext.html @@ -366,7 +366,7 @@ <span class="sourceLineNo">358</span> htmlNav,<a name="line.358"></a> <span class="sourceLineNo">359</span> htmlAside,<a name="line.359"></a> <span class="sourceLineNo">360</span> htmlStyle,<a name="line.360"></a> -<span class="sourceLineNo">361</span> htmlStyleImport,<a name="line.361"></a> +<span class="sourceLineNo">361</span> htmlStylesheet,<a name="line.361"></a> <span class="sourceLineNo">362</span> htmlScript,<a name="line.362"></a> <span class="sourceLineNo">363</span> htmlFooter,<a name="line.363"></a> <span class="sourceLineNo">364</span> htmlNoResultsMessage;<a name="line.364"></a> @@ -481,7 +481,7 @@ <span class="sourceLineNo">473</span> this.htmlNav = b.htmlNav;<a name="line.473"></a> <span class="sourceLineNo">474</span> this.htmlAside = b.htmlAside;<a name="line.474"></a> <span class="sourceLineNo">475</span> this.htmlStyle = b.htmlStyle;<a name="line.475"></a> -<span class="sourceLineNo">476</span> this.htmlStyleImport = b.htmlStyleImport;<a name="line.476"></a> +<span class="sourceLineNo">476</span> this.htmlStylesheet = b.htmlStylesheet;<a name="line.476"></a> <span class="sourceLineNo">477</span> this.htmlScript = b.htmlScript;<a name="line.477"></a> <span class="sourceLineNo">478</span> this.htmlFooter = b.htmlFooter;<a name="line.478"></a> <span class="sourceLineNo">479</span> this.htmlNoWrap = b.htmlNoWrap;<a name="line.479"></a> @@ -661,7 +661,7 @@ <span class="sourceLineNo">653</span> UrlEncodingParser urlEncodingParser;<a name="line.653"></a> <span class="sourceLineNo">654</span> EncoderGroup encoders;<a name="line.654"></a> <span class="sourceLineNo">655</span> String clientVersionHeader = "", defaultCharset, paramFormat, htmlTitle, htmlDescription, htmlBranding,<a name="line.655"></a> -<span class="sourceLineNo">656</span> htmlHeader, htmlLinks, htmlNav, htmlAside, htmlStyle, htmlStyleImport, htmlScript, htmlFooter, htmlNoResultsMessage;<a name="line.656"></a> +<span class="sourceLineNo">656</span> htmlHeader, htmlLinks, htmlNav, htmlAside, htmlStyle, htmlStylesheet, htmlScript, htmlFooter, htmlNoResultsMessage;<a name="line.656"></a> <span class="sourceLineNo">657</span> boolean htmlNoWrap;<a name="line.657"></a> <span class="sourceLineNo">658</span> HtmlDocTemplate htmlTemplate;<a name="line.658"></a> <span class="sourceLineNo">659</span><a name="line.659"></a> @@ -802,7 +802,7 @@ <span class="sourceLineNo">794</span> htmlNav = sc.htmlNav;<a name="line.794"></a> <span class="sourceLineNo">795</span> htmlAside = sc.htmlAside;<a name="line.795"></a> <span class="sourceLineNo">796</span> htmlStyle = sc.htmlStyle;<a name="line.796"></a> -<span class="sourceLineNo">797</span> htmlStyleImport = sc.htmlStyleImport;<a name="line.797"></a> +<span class="sourceLineNo">797</span> htmlStylesheet = sc.htmlStylesheet;<a name="line.797"></a> <span class="sourceLineNo">798</span> htmlScript = sc.htmlScript;<a name="line.798"></a> <span class="sourceLineNo">799</span> htmlFooter = sc.htmlFooter;<a name="line.799"></a> <span class="sourceLineNo">800</span> htmlNoWrap = sc.htmlNoWrap;<a name="line.800"></a> @@ -1108,12 +1108,12 @@ <span class="sourceLineNo">1100</span> * The HTML page stylesheet URL.<a name="line.1100"></a> <span class="sourceLineNo">1101</span> *<a name="line.1101"></a> <span class="sourceLineNo">1102</span> * <p><a name="line.1102"></a> -<span class="sourceLineNo">1103</span> * Defined by the {@link HtmlDoc#styleImport()} annotation or {@link RestConfig#setHtmlStyleImport(String)} method.<a name="line.1103"></a> +<span class="sourceLineNo">1103</span> * Defined by the {@link HtmlDoc#stylesheet()} annotation or {@link RestConfig#setHtmlStylesheet(String)} method.<a name="line.1103"></a> <span class="sourceLineNo">1104</span> *<a name="line.1104"></a> <span class="sourceLineNo">1105</span> * @return The HTML page CSS URL.<a name="line.1105"></a> <span class="sourceLineNo">1106</span> */<a name="line.1106"></a> -<span class="sourceLineNo">1107</span> public String getHtmlStyleImport() {<a name="line.1107"></a> -<span class="sourceLineNo">1108</span> return htmlStyleImport;<a name="line.1108"></a> +<span class="sourceLineNo">1107</span> public String getHtmlStylesheet() {<a name="line.1107"></a> +<span class="sourceLineNo">1108</span> return htmlStylesheet;<a name="line.1108"></a> <span class="sourceLineNo">1109</span> }<a name="line.1109"></a> <span class="sourceLineNo">1110</span><a name="line.1110"></a> <span class="sourceLineNo">1111</span> /**<a name="line.1111"></a>
