You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2017/09/07 15:13:49 UTC
[02/27] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f9e8b54d/testdevapidocs/src-html/org/apache/hadoop/hbase/TestTableName.Names.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/TestTableName.Names.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/TestTableName.Names.html
new file mode 100644
index 0000000..4c6a591
--- /dev/null
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/TestTableName.Names.html
@@ -0,0 +1,263 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+<head>
+<title>Source code</title>
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
+</head>
+<body>
+<div class="sourceContainer">
+<pre><span class="sourceLineNo">001</span>/**<a name="line.1"></a>
+<span class="sourceLineNo">002</span> * Licensed to the Apache Software Foundation (ASF) under one<a name="line.2"></a>
+<span class="sourceLineNo">003</span> * or more contributor license agreements. See the NOTICE file<a name="line.3"></a>
+<span class="sourceLineNo">004</span> * distributed with this work for additional information<a name="line.4"></a>
+<span class="sourceLineNo">005</span> * regarding copyright ownership. The ASF licenses this file<a name="line.5"></a>
+<span class="sourceLineNo">006</span> * to you under the Apache License, Version 2.0 (the<a name="line.6"></a>
+<span class="sourceLineNo">007</span> * "License"); you may not use this file except in compliance<a name="line.7"></a>
+<span class="sourceLineNo">008</span> * with the License. You may obtain a copy of the License at<a name="line.8"></a>
+<span class="sourceLineNo">009</span> *<a name="line.9"></a>
+<span class="sourceLineNo">010</span> * http://www.apache.org/licenses/LICENSE-2.0<a name="line.10"></a>
+<span class="sourceLineNo">011</span> *<a name="line.11"></a>
+<span class="sourceLineNo">012</span> * Unless required by applicable law or agreed to in writing, software<a name="line.12"></a>
+<span class="sourceLineNo">013</span> * distributed under the License is distributed on an "AS IS" BASIS,<a name="line.13"></a>
+<span class="sourceLineNo">014</span> * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.<a name="line.14"></a>
+<span class="sourceLineNo">015</span> * See the License for the specific language governing permissions and<a name="line.15"></a>
+<span class="sourceLineNo">016</span> * limitations under the License.<a name="line.16"></a>
+<span class="sourceLineNo">017</span> */<a name="line.17"></a>
+<span class="sourceLineNo">018</span>package org.apache.hadoop.hbase;<a name="line.18"></a>
+<span class="sourceLineNo">019</span><a name="line.19"></a>
+<span class="sourceLineNo">020</span>import java.nio.ByteBuffer;<a name="line.20"></a>
+<span class="sourceLineNo">021</span>import java.util.HashMap;<a name="line.21"></a>
+<span class="sourceLineNo">022</span>import java.util.Map;<a name="line.22"></a>
+<span class="sourceLineNo">023</span><a name="line.23"></a>
+<span class="sourceLineNo">024</span>import static org.junit.Assert.assertArrayEquals;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import static org.junit.Assert.assertEquals;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import static org.junit.Assert.assertSame;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import static org.junit.Assert.fail;<a name="line.27"></a>
+<span class="sourceLineNo">028</span><a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.testclassification.MiscTests;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.TableName;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.junit.Test;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.junit.experimental.categories.Category;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.junit.rules.TestWatcher;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.junit.runner.Description;<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> * Returns a {@code byte[]} containing the name of the currently running test method.<a name="line.39"></a>
+<span class="sourceLineNo">040</span> */<a name="line.40"></a>
+<span class="sourceLineNo">041</span>@Category({MiscTests.class, MediumTests.class})<a name="line.41"></a>
+<span class="sourceLineNo">042</span>public class TestTableName extends TestWatcher {<a name="line.42"></a>
+<span class="sourceLineNo">043</span> private TableName tableName;<a name="line.43"></a>
+<span class="sourceLineNo">044</span><a name="line.44"></a>
+<span class="sourceLineNo">045</span> /**<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * Invoked when a test is about to start<a name="line.46"></a>
+<span class="sourceLineNo">047</span> */<a name="line.47"></a>
+<span class="sourceLineNo">048</span> @Override<a name="line.48"></a>
+<span class="sourceLineNo">049</span> protected void starting(Description description) {<a name="line.49"></a>
+<span class="sourceLineNo">050</span> tableName = TableName.valueOf(description.getMethodName());<a name="line.50"></a>
+<span class="sourceLineNo">051</span> }<a name="line.51"></a>
+<span class="sourceLineNo">052</span><a name="line.52"></a>
+<span class="sourceLineNo">053</span> public TableName getTableName() {<a name="line.53"></a>
+<span class="sourceLineNo">054</span> return tableName;<a name="line.54"></a>
+<span class="sourceLineNo">055</span> }<a name="line.55"></a>
+<span class="sourceLineNo">056</span><a name="line.56"></a>
+<span class="sourceLineNo">057</span> String emptyNames[] ={"", " "};<a name="line.57"></a>
+<span class="sourceLineNo">058</span> String invalidNamespace[] = {":a", "%:a"};<a name="line.58"></a>
+<span class="sourceLineNo">059</span> String legalTableNames[] = { "foo", "with-dash_under.dot", "_under_start_ok",<a name="line.59"></a>
+<span class="sourceLineNo">060</span> "with-dash.with_underscore", "02-01-2012.my_table_01-02", "xyz._mytable_", "9_9_0.table_02"<a name="line.60"></a>
+<span class="sourceLineNo">061</span> , "dot1.dot2.table", "new.-mytable", "with-dash.with.dot", "legal..t2", "legal..legal.t2",<a name="line.61"></a>
+<span class="sourceLineNo">062</span> "trailingdots..", "trailing.dots...", "ns:mytable", "ns:_mytable_", "ns:my_table_01-02"};<a name="line.62"></a>
+<span class="sourceLineNo">063</span> String illegalTableNames[] = { ".dot_start_illegal", "-dash_start_illegal", "spaces not ok",<a name="line.63"></a>
+<span class="sourceLineNo">064</span> "-dash-.start_illegal", "new.table with space", "01 .table", "ns:-illegaldash",<a name="line.64"></a>
+<span class="sourceLineNo">065</span> "new:.illegaldot", "new:illegalcolon1:", "new:illegalcolon1:2"};<a name="line.65"></a>
+<span class="sourceLineNo">066</span><a name="line.66"></a>
+<span class="sourceLineNo">067</span><a name="line.67"></a>
+<span class="sourceLineNo">068</span> @Test(expected = IllegalArgumentException.class)<a name="line.68"></a>
+<span class="sourceLineNo">069</span> public void testInvalidNamespace() {<a name="line.69"></a>
+<span class="sourceLineNo">070</span> for (String tn : invalidNamespace) {<a name="line.70"></a>
+<span class="sourceLineNo">071</span> TableName.isLegalFullyQualifiedTableName(Bytes.toBytes(tn));<a name="line.71"></a>
+<span class="sourceLineNo">072</span> fail("invalid namespace " + tn + " should have failed with IllegalArgumentException for namespace");<a name="line.72"></a>
+<span class="sourceLineNo">073</span> }<a name="line.73"></a>
+<span class="sourceLineNo">074</span> }<a name="line.74"></a>
+<span class="sourceLineNo">075</span><a name="line.75"></a>
+<span class="sourceLineNo">076</span> @Test(expected = IllegalArgumentException.class)<a name="line.76"></a>
+<span class="sourceLineNo">077</span> public void testEmptyNamespaceName() {<a name="line.77"></a>
+<span class="sourceLineNo">078</span> for (String nn : emptyNames) {<a name="line.78"></a>
+<span class="sourceLineNo">079</span> TableName.isLegalNamespaceName(Bytes.toBytes(nn));<a name="line.79"></a>
+<span class="sourceLineNo">080</span> fail("invalid Namespace name " + nn + " should have failed with IllegalArgumentException");<a name="line.80"></a>
+<span class="sourceLineNo">081</span> }<a name="line.81"></a>
+<span class="sourceLineNo">082</span> }<a name="line.82"></a>
+<span class="sourceLineNo">083</span><a name="line.83"></a>
+<span class="sourceLineNo">084</span> @Test(expected = IllegalArgumentException.class)<a name="line.84"></a>
+<span class="sourceLineNo">085</span> public void testEmptyTableName() {<a name="line.85"></a>
+<span class="sourceLineNo">086</span> for (String tn : emptyNames) {<a name="line.86"></a>
+<span class="sourceLineNo">087</span> TableName.isLegalFullyQualifiedTableName(Bytes.toBytes(tn));<a name="line.87"></a>
+<span class="sourceLineNo">088</span> fail("invalid tablename " + tn + " should have failed with IllegalArgumentException");<a name="line.88"></a>
+<span class="sourceLineNo">089</span> }<a name="line.89"></a>
+<span class="sourceLineNo">090</span> }<a name="line.90"></a>
+<span class="sourceLineNo">091</span><a name="line.91"></a>
+<span class="sourceLineNo">092</span> @Test<a name="line.92"></a>
+<span class="sourceLineNo">093</span> public void testLegalHTableNames() {<a name="line.93"></a>
+<span class="sourceLineNo">094</span> for (String tn : legalTableNames) {<a name="line.94"></a>
+<span class="sourceLineNo">095</span> TableName.isLegalFullyQualifiedTableName(Bytes.toBytes(tn));<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> @Test<a name="line.99"></a>
+<span class="sourceLineNo">100</span> public void testIllegalHTableNames() {<a name="line.100"></a>
+<span class="sourceLineNo">101</span> for (String tn : illegalTableNames) {<a name="line.101"></a>
+<span class="sourceLineNo">102</span> try {<a name="line.102"></a>
+<span class="sourceLineNo">103</span> TableName.isLegalFullyQualifiedTableName(Bytes.toBytes(tn));<a name="line.103"></a>
+<span class="sourceLineNo">104</span> fail("invalid tablename " + tn + " should have failed");<a name="line.104"></a>
+<span class="sourceLineNo">105</span> } catch (Exception e) {<a name="line.105"></a>
+<span class="sourceLineNo">106</span> // expected<a name="line.106"></a>
+<span class="sourceLineNo">107</span> }<a name="line.107"></a>
+<span class="sourceLineNo">108</span> }<a name="line.108"></a>
+<span class="sourceLineNo">109</span> }<a name="line.109"></a>
+<span class="sourceLineNo">110</span><a name="line.110"></a>
+<span class="sourceLineNo">111</span> class Names {<a name="line.111"></a>
+<span class="sourceLineNo">112</span> String ns;<a name="line.112"></a>
+<span class="sourceLineNo">113</span> byte[] nsb;<a name="line.113"></a>
+<span class="sourceLineNo">114</span> String tn;<a name="line.114"></a>
+<span class="sourceLineNo">115</span> byte[] tnb;<a name="line.115"></a>
+<span class="sourceLineNo">116</span> String nn;<a name="line.116"></a>
+<span class="sourceLineNo">117</span> byte[] nnb;<a name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span> Names(String ns, String tn) {<a name="line.119"></a>
+<span class="sourceLineNo">120</span> this.ns = ns;<a name="line.120"></a>
+<span class="sourceLineNo">121</span> nsb = ns.getBytes();<a name="line.121"></a>
+<span class="sourceLineNo">122</span> this.tn = tn;<a name="line.122"></a>
+<span class="sourceLineNo">123</span> tnb = tn.getBytes();<a name="line.123"></a>
+<span class="sourceLineNo">124</span> nn = this.ns + ":" + this.tn;<a name="line.124"></a>
+<span class="sourceLineNo">125</span> nnb = nn.getBytes();<a name="line.125"></a>
+<span class="sourceLineNo">126</span> }<a name="line.126"></a>
+<span class="sourceLineNo">127</span><a name="line.127"></a>
+<span class="sourceLineNo">128</span> @Override<a name="line.128"></a>
+<span class="sourceLineNo">129</span> public boolean equals(Object o) {<a name="line.129"></a>
+<span class="sourceLineNo">130</span> if (this == o) return true;<a name="line.130"></a>
+<span class="sourceLineNo">131</span> if (o == null || getClass() != o.getClass()) return false;<a name="line.131"></a>
+<span class="sourceLineNo">132</span><a name="line.132"></a>
+<span class="sourceLineNo">133</span> Names names = (Names) o;<a name="line.133"></a>
+<span class="sourceLineNo">134</span><a name="line.134"></a>
+<span class="sourceLineNo">135</span> if (!ns.equals(names.ns)) return false;<a name="line.135"></a>
+<span class="sourceLineNo">136</span> if (!tn.equals(names.tn)) return false;<a name="line.136"></a>
+<span class="sourceLineNo">137</span><a name="line.137"></a>
+<span class="sourceLineNo">138</span> return true;<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> @Override<a name="line.141"></a>
+<span class="sourceLineNo">142</span> public int hashCode() {<a name="line.142"></a>
+<span class="sourceLineNo">143</span> int result = ns.hashCode();<a name="line.143"></a>
+<span class="sourceLineNo">144</span> result = 31 * result + tn.hashCode();<a name="line.144"></a>
+<span class="sourceLineNo">145</span> return result;<a name="line.145"></a>
+<span class="sourceLineNo">146</span> }<a name="line.146"></a>
+<span class="sourceLineNo">147</span> }<a name="line.147"></a>
+<span class="sourceLineNo">148</span><a name="line.148"></a>
+<span class="sourceLineNo">149</span> Names[] names = new Names[] {<a name="line.149"></a>
+<span class="sourceLineNo">150</span> new Names("n1", "n1"),<a name="line.150"></a>
+<span class="sourceLineNo">151</span> new Names("n2", "n2"),<a name="line.151"></a>
+<span class="sourceLineNo">152</span> new Names("table1", "table1"),<a name="line.152"></a>
+<span class="sourceLineNo">153</span> new Names("table2", "table2"),<a name="line.153"></a>
+<span class="sourceLineNo">154</span> new Names("table2", "table1"),<a name="line.154"></a>
+<span class="sourceLineNo">155</span> new Names("table1", "table2"),<a name="line.155"></a>
+<span class="sourceLineNo">156</span> new Names("n1", "table1"),<a name="line.156"></a>
+<span class="sourceLineNo">157</span> new Names("n1", "table1"),<a name="line.157"></a>
+<span class="sourceLineNo">158</span> new Names("n2", "table2"),<a name="line.158"></a>
+<span class="sourceLineNo">159</span> new Names("n2", "table2")<a name="line.159"></a>
+<span class="sourceLineNo">160</span> };<a name="line.160"></a>
+<span class="sourceLineNo">161</span><a name="line.161"></a>
+<span class="sourceLineNo">162</span> @Test<a name="line.162"></a>
+<span class="sourceLineNo">163</span> public void testValueOf() {<a name="line.163"></a>
+<span class="sourceLineNo">164</span><a name="line.164"></a>
+<span class="sourceLineNo">165</span> Map<String, TableName> inCache = new HashMap<>();<a name="line.165"></a>
+<span class="sourceLineNo">166</span> // fill cache<a name="line.166"></a>
+<span class="sourceLineNo">167</span> for (Names name : names) {<a name="line.167"></a>
+<span class="sourceLineNo">168</span> inCache.put(name.nn, TableName.valueOf(name.ns, name.tn));<a name="line.168"></a>
+<span class="sourceLineNo">169</span> }<a name="line.169"></a>
+<span class="sourceLineNo">170</span> for (Names name : names) {<a name="line.170"></a>
+<span class="sourceLineNo">171</span> assertSame(inCache.get(name.nn), validateNames(TableName.valueOf(name.ns, name.tn), name));<a name="line.171"></a>
+<span class="sourceLineNo">172</span> assertSame(inCache.get(name.nn), validateNames(TableName.valueOf(name.nsb, name.tnb), name));<a name="line.172"></a>
+<span class="sourceLineNo">173</span> assertSame(inCache.get(name.nn), validateNames(TableName.valueOf(name.nn), name));<a name="line.173"></a>
+<span class="sourceLineNo">174</span> assertSame(inCache.get(name.nn), validateNames(TableName.valueOf(name.nnb), name));<a name="line.174"></a>
+<span class="sourceLineNo">175</span> assertSame(inCache.get(name.nn), validateNames(TableName.valueOf(<a name="line.175"></a>
+<span class="sourceLineNo">176</span> ByteBuffer.wrap(name.nsb), ByteBuffer.wrap(name.tnb)), name));<a name="line.176"></a>
+<span class="sourceLineNo">177</span> }<a name="line.177"></a>
+<span class="sourceLineNo">178</span><a name="line.178"></a>
+<span class="sourceLineNo">179</span> }<a name="line.179"></a>
+<span class="sourceLineNo">180</span><a name="line.180"></a>
+<span class="sourceLineNo">181</span> private TableName validateNames(TableName expected, Names names) {<a name="line.181"></a>
+<span class="sourceLineNo">182</span> assertEquals(expected.getNameAsString(), names.nn);<a name="line.182"></a>
+<span class="sourceLineNo">183</span> assertArrayEquals(expected.getName(), names.nnb);<a name="line.183"></a>
+<span class="sourceLineNo">184</span> assertEquals(expected.getQualifierAsString(), names.tn);<a name="line.184"></a>
+<span class="sourceLineNo">185</span> assertArrayEquals(expected.getQualifier(), names.tnb);<a name="line.185"></a>
+<span class="sourceLineNo">186</span> assertEquals(expected.getNamespaceAsString(), names.ns);<a name="line.186"></a>
+<span class="sourceLineNo">187</span> assertArrayEquals(expected.getNamespace(), names.nsb);<a name="line.187"></a>
+<span class="sourceLineNo">188</span> return expected;<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>}<a name="line.191"></a>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f9e8b54d/testdevapidocs/src-html/org/apache/hadoop/hbase/TestTableName.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/TestTableName.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/TestTableName.html
new file mode 100644
index 0000000..4c6a591
--- /dev/null
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/TestTableName.html
@@ -0,0 +1,263 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+<head>
+<title>Source code</title>
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
+</head>
+<body>
+<div class="sourceContainer">
+<pre><span class="sourceLineNo">001</span>/**<a name="line.1"></a>
+<span class="sourceLineNo">002</span> * Licensed to the Apache Software Foundation (ASF) under one<a name="line.2"></a>
+<span class="sourceLineNo">003</span> * or more contributor license agreements. See the NOTICE file<a name="line.3"></a>
+<span class="sourceLineNo">004</span> * distributed with this work for additional information<a name="line.4"></a>
+<span class="sourceLineNo">005</span> * regarding copyright ownership. The ASF licenses this file<a name="line.5"></a>
+<span class="sourceLineNo">006</span> * to you under the Apache License, Version 2.0 (the<a name="line.6"></a>
+<span class="sourceLineNo">007</span> * "License"); you may not use this file except in compliance<a name="line.7"></a>
+<span class="sourceLineNo">008</span> * with the License. You may obtain a copy of the License at<a name="line.8"></a>
+<span class="sourceLineNo">009</span> *<a name="line.9"></a>
+<span class="sourceLineNo">010</span> * http://www.apache.org/licenses/LICENSE-2.0<a name="line.10"></a>
+<span class="sourceLineNo">011</span> *<a name="line.11"></a>
+<span class="sourceLineNo">012</span> * Unless required by applicable law or agreed to in writing, software<a name="line.12"></a>
+<span class="sourceLineNo">013</span> * distributed under the License is distributed on an "AS IS" BASIS,<a name="line.13"></a>
+<span class="sourceLineNo">014</span> * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.<a name="line.14"></a>
+<span class="sourceLineNo">015</span> * See the License for the specific language governing permissions and<a name="line.15"></a>
+<span class="sourceLineNo">016</span> * limitations under the License.<a name="line.16"></a>
+<span class="sourceLineNo">017</span> */<a name="line.17"></a>
+<span class="sourceLineNo">018</span>package org.apache.hadoop.hbase;<a name="line.18"></a>
+<span class="sourceLineNo">019</span><a name="line.19"></a>
+<span class="sourceLineNo">020</span>import java.nio.ByteBuffer;<a name="line.20"></a>
+<span class="sourceLineNo">021</span>import java.util.HashMap;<a name="line.21"></a>
+<span class="sourceLineNo">022</span>import java.util.Map;<a name="line.22"></a>
+<span class="sourceLineNo">023</span><a name="line.23"></a>
+<span class="sourceLineNo">024</span>import static org.junit.Assert.assertArrayEquals;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import static org.junit.Assert.assertEquals;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import static org.junit.Assert.assertSame;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import static org.junit.Assert.fail;<a name="line.27"></a>
+<span class="sourceLineNo">028</span><a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.testclassification.MiscTests;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.TableName;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.junit.Test;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.junit.experimental.categories.Category;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.junit.rules.TestWatcher;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.junit.runner.Description;<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> * Returns a {@code byte[]} containing the name of the currently running test method.<a name="line.39"></a>
+<span class="sourceLineNo">040</span> */<a name="line.40"></a>
+<span class="sourceLineNo">041</span>@Category({MiscTests.class, MediumTests.class})<a name="line.41"></a>
+<span class="sourceLineNo">042</span>public class TestTableName extends TestWatcher {<a name="line.42"></a>
+<span class="sourceLineNo">043</span> private TableName tableName;<a name="line.43"></a>
+<span class="sourceLineNo">044</span><a name="line.44"></a>
+<span class="sourceLineNo">045</span> /**<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * Invoked when a test is about to start<a name="line.46"></a>
+<span class="sourceLineNo">047</span> */<a name="line.47"></a>
+<span class="sourceLineNo">048</span> @Override<a name="line.48"></a>
+<span class="sourceLineNo">049</span> protected void starting(Description description) {<a name="line.49"></a>
+<span class="sourceLineNo">050</span> tableName = TableName.valueOf(description.getMethodName());<a name="line.50"></a>
+<span class="sourceLineNo">051</span> }<a name="line.51"></a>
+<span class="sourceLineNo">052</span><a name="line.52"></a>
+<span class="sourceLineNo">053</span> public TableName getTableName() {<a name="line.53"></a>
+<span class="sourceLineNo">054</span> return tableName;<a name="line.54"></a>
+<span class="sourceLineNo">055</span> }<a name="line.55"></a>
+<span class="sourceLineNo">056</span><a name="line.56"></a>
+<span class="sourceLineNo">057</span> String emptyNames[] ={"", " "};<a name="line.57"></a>
+<span class="sourceLineNo">058</span> String invalidNamespace[] = {":a", "%:a"};<a name="line.58"></a>
+<span class="sourceLineNo">059</span> String legalTableNames[] = { "foo", "with-dash_under.dot", "_under_start_ok",<a name="line.59"></a>
+<span class="sourceLineNo">060</span> "with-dash.with_underscore", "02-01-2012.my_table_01-02", "xyz._mytable_", "9_9_0.table_02"<a name="line.60"></a>
+<span class="sourceLineNo">061</span> , "dot1.dot2.table", "new.-mytable", "with-dash.with.dot", "legal..t2", "legal..legal.t2",<a name="line.61"></a>
+<span class="sourceLineNo">062</span> "trailingdots..", "trailing.dots...", "ns:mytable", "ns:_mytable_", "ns:my_table_01-02"};<a name="line.62"></a>
+<span class="sourceLineNo">063</span> String illegalTableNames[] = { ".dot_start_illegal", "-dash_start_illegal", "spaces not ok",<a name="line.63"></a>
+<span class="sourceLineNo">064</span> "-dash-.start_illegal", "new.table with space", "01 .table", "ns:-illegaldash",<a name="line.64"></a>
+<span class="sourceLineNo">065</span> "new:.illegaldot", "new:illegalcolon1:", "new:illegalcolon1:2"};<a name="line.65"></a>
+<span class="sourceLineNo">066</span><a name="line.66"></a>
+<span class="sourceLineNo">067</span><a name="line.67"></a>
+<span class="sourceLineNo">068</span> @Test(expected = IllegalArgumentException.class)<a name="line.68"></a>
+<span class="sourceLineNo">069</span> public void testInvalidNamespace() {<a name="line.69"></a>
+<span class="sourceLineNo">070</span> for (String tn : invalidNamespace) {<a name="line.70"></a>
+<span class="sourceLineNo">071</span> TableName.isLegalFullyQualifiedTableName(Bytes.toBytes(tn));<a name="line.71"></a>
+<span class="sourceLineNo">072</span> fail("invalid namespace " + tn + " should have failed with IllegalArgumentException for namespace");<a name="line.72"></a>
+<span class="sourceLineNo">073</span> }<a name="line.73"></a>
+<span class="sourceLineNo">074</span> }<a name="line.74"></a>
+<span class="sourceLineNo">075</span><a name="line.75"></a>
+<span class="sourceLineNo">076</span> @Test(expected = IllegalArgumentException.class)<a name="line.76"></a>
+<span class="sourceLineNo">077</span> public void testEmptyNamespaceName() {<a name="line.77"></a>
+<span class="sourceLineNo">078</span> for (String nn : emptyNames) {<a name="line.78"></a>
+<span class="sourceLineNo">079</span> TableName.isLegalNamespaceName(Bytes.toBytes(nn));<a name="line.79"></a>
+<span class="sourceLineNo">080</span> fail("invalid Namespace name " + nn + " should have failed with IllegalArgumentException");<a name="line.80"></a>
+<span class="sourceLineNo">081</span> }<a name="line.81"></a>
+<span class="sourceLineNo">082</span> }<a name="line.82"></a>
+<span class="sourceLineNo">083</span><a name="line.83"></a>
+<span class="sourceLineNo">084</span> @Test(expected = IllegalArgumentException.class)<a name="line.84"></a>
+<span class="sourceLineNo">085</span> public void testEmptyTableName() {<a name="line.85"></a>
+<span class="sourceLineNo">086</span> for (String tn : emptyNames) {<a name="line.86"></a>
+<span class="sourceLineNo">087</span> TableName.isLegalFullyQualifiedTableName(Bytes.toBytes(tn));<a name="line.87"></a>
+<span class="sourceLineNo">088</span> fail("invalid tablename " + tn + " should have failed with IllegalArgumentException");<a name="line.88"></a>
+<span class="sourceLineNo">089</span> }<a name="line.89"></a>
+<span class="sourceLineNo">090</span> }<a name="line.90"></a>
+<span class="sourceLineNo">091</span><a name="line.91"></a>
+<span class="sourceLineNo">092</span> @Test<a name="line.92"></a>
+<span class="sourceLineNo">093</span> public void testLegalHTableNames() {<a name="line.93"></a>
+<span class="sourceLineNo">094</span> for (String tn : legalTableNames) {<a name="line.94"></a>
+<span class="sourceLineNo">095</span> TableName.isLegalFullyQualifiedTableName(Bytes.toBytes(tn));<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> @Test<a name="line.99"></a>
+<span class="sourceLineNo">100</span> public void testIllegalHTableNames() {<a name="line.100"></a>
+<span class="sourceLineNo">101</span> for (String tn : illegalTableNames) {<a name="line.101"></a>
+<span class="sourceLineNo">102</span> try {<a name="line.102"></a>
+<span class="sourceLineNo">103</span> TableName.isLegalFullyQualifiedTableName(Bytes.toBytes(tn));<a name="line.103"></a>
+<span class="sourceLineNo">104</span> fail("invalid tablename " + tn + " should have failed");<a name="line.104"></a>
+<span class="sourceLineNo">105</span> } catch (Exception e) {<a name="line.105"></a>
+<span class="sourceLineNo">106</span> // expected<a name="line.106"></a>
+<span class="sourceLineNo">107</span> }<a name="line.107"></a>
+<span class="sourceLineNo">108</span> }<a name="line.108"></a>
+<span class="sourceLineNo">109</span> }<a name="line.109"></a>
+<span class="sourceLineNo">110</span><a name="line.110"></a>
+<span class="sourceLineNo">111</span> class Names {<a name="line.111"></a>
+<span class="sourceLineNo">112</span> String ns;<a name="line.112"></a>
+<span class="sourceLineNo">113</span> byte[] nsb;<a name="line.113"></a>
+<span class="sourceLineNo">114</span> String tn;<a name="line.114"></a>
+<span class="sourceLineNo">115</span> byte[] tnb;<a name="line.115"></a>
+<span class="sourceLineNo">116</span> String nn;<a name="line.116"></a>
+<span class="sourceLineNo">117</span> byte[] nnb;<a name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span> Names(String ns, String tn) {<a name="line.119"></a>
+<span class="sourceLineNo">120</span> this.ns = ns;<a name="line.120"></a>
+<span class="sourceLineNo">121</span> nsb = ns.getBytes();<a name="line.121"></a>
+<span class="sourceLineNo">122</span> this.tn = tn;<a name="line.122"></a>
+<span class="sourceLineNo">123</span> tnb = tn.getBytes();<a name="line.123"></a>
+<span class="sourceLineNo">124</span> nn = this.ns + ":" + this.tn;<a name="line.124"></a>
+<span class="sourceLineNo">125</span> nnb = nn.getBytes();<a name="line.125"></a>
+<span class="sourceLineNo">126</span> }<a name="line.126"></a>
+<span class="sourceLineNo">127</span><a name="line.127"></a>
+<span class="sourceLineNo">128</span> @Override<a name="line.128"></a>
+<span class="sourceLineNo">129</span> public boolean equals(Object o) {<a name="line.129"></a>
+<span class="sourceLineNo">130</span> if (this == o) return true;<a name="line.130"></a>
+<span class="sourceLineNo">131</span> if (o == null || getClass() != o.getClass()) return false;<a name="line.131"></a>
+<span class="sourceLineNo">132</span><a name="line.132"></a>
+<span class="sourceLineNo">133</span> Names names = (Names) o;<a name="line.133"></a>
+<span class="sourceLineNo">134</span><a name="line.134"></a>
+<span class="sourceLineNo">135</span> if (!ns.equals(names.ns)) return false;<a name="line.135"></a>
+<span class="sourceLineNo">136</span> if (!tn.equals(names.tn)) return false;<a name="line.136"></a>
+<span class="sourceLineNo">137</span><a name="line.137"></a>
+<span class="sourceLineNo">138</span> return true;<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> @Override<a name="line.141"></a>
+<span class="sourceLineNo">142</span> public int hashCode() {<a name="line.142"></a>
+<span class="sourceLineNo">143</span> int result = ns.hashCode();<a name="line.143"></a>
+<span class="sourceLineNo">144</span> result = 31 * result + tn.hashCode();<a name="line.144"></a>
+<span class="sourceLineNo">145</span> return result;<a name="line.145"></a>
+<span class="sourceLineNo">146</span> }<a name="line.146"></a>
+<span class="sourceLineNo">147</span> }<a name="line.147"></a>
+<span class="sourceLineNo">148</span><a name="line.148"></a>
+<span class="sourceLineNo">149</span> Names[] names = new Names[] {<a name="line.149"></a>
+<span class="sourceLineNo">150</span> new Names("n1", "n1"),<a name="line.150"></a>
+<span class="sourceLineNo">151</span> new Names("n2", "n2"),<a name="line.151"></a>
+<span class="sourceLineNo">152</span> new Names("table1", "table1"),<a name="line.152"></a>
+<span class="sourceLineNo">153</span> new Names("table2", "table2"),<a name="line.153"></a>
+<span class="sourceLineNo">154</span> new Names("table2", "table1"),<a name="line.154"></a>
+<span class="sourceLineNo">155</span> new Names("table1", "table2"),<a name="line.155"></a>
+<span class="sourceLineNo">156</span> new Names("n1", "table1"),<a name="line.156"></a>
+<span class="sourceLineNo">157</span> new Names("n1", "table1"),<a name="line.157"></a>
+<span class="sourceLineNo">158</span> new Names("n2", "table2"),<a name="line.158"></a>
+<span class="sourceLineNo">159</span> new Names("n2", "table2")<a name="line.159"></a>
+<span class="sourceLineNo">160</span> };<a name="line.160"></a>
+<span class="sourceLineNo">161</span><a name="line.161"></a>
+<span class="sourceLineNo">162</span> @Test<a name="line.162"></a>
+<span class="sourceLineNo">163</span> public void testValueOf() {<a name="line.163"></a>
+<span class="sourceLineNo">164</span><a name="line.164"></a>
+<span class="sourceLineNo">165</span> Map<String, TableName> inCache = new HashMap<>();<a name="line.165"></a>
+<span class="sourceLineNo">166</span> // fill cache<a name="line.166"></a>
+<span class="sourceLineNo">167</span> for (Names name : names) {<a name="line.167"></a>
+<span class="sourceLineNo">168</span> inCache.put(name.nn, TableName.valueOf(name.ns, name.tn));<a name="line.168"></a>
+<span class="sourceLineNo">169</span> }<a name="line.169"></a>
+<span class="sourceLineNo">170</span> for (Names name : names) {<a name="line.170"></a>
+<span class="sourceLineNo">171</span> assertSame(inCache.get(name.nn), validateNames(TableName.valueOf(name.ns, name.tn), name));<a name="line.171"></a>
+<span class="sourceLineNo">172</span> assertSame(inCache.get(name.nn), validateNames(TableName.valueOf(name.nsb, name.tnb), name));<a name="line.172"></a>
+<span class="sourceLineNo">173</span> assertSame(inCache.get(name.nn), validateNames(TableName.valueOf(name.nn), name));<a name="line.173"></a>
+<span class="sourceLineNo">174</span> assertSame(inCache.get(name.nn), validateNames(TableName.valueOf(name.nnb), name));<a name="line.174"></a>
+<span class="sourceLineNo">175</span> assertSame(inCache.get(name.nn), validateNames(TableName.valueOf(<a name="line.175"></a>
+<span class="sourceLineNo">176</span> ByteBuffer.wrap(name.nsb), ByteBuffer.wrap(name.tnb)), name));<a name="line.176"></a>
+<span class="sourceLineNo">177</span> }<a name="line.177"></a>
+<span class="sourceLineNo">178</span><a name="line.178"></a>
+<span class="sourceLineNo">179</span> }<a name="line.179"></a>
+<span class="sourceLineNo">180</span><a name="line.180"></a>
+<span class="sourceLineNo">181</span> private TableName validateNames(TableName expected, Names names) {<a name="line.181"></a>
+<span class="sourceLineNo">182</span> assertEquals(expected.getNameAsString(), names.nn);<a name="line.182"></a>
+<span class="sourceLineNo">183</span> assertArrayEquals(expected.getName(), names.nnb);<a name="line.183"></a>
+<span class="sourceLineNo">184</span> assertEquals(expected.getQualifierAsString(), names.tn);<a name="line.184"></a>
+<span class="sourceLineNo">185</span> assertArrayEquals(expected.getQualifier(), names.tnb);<a name="line.185"></a>
+<span class="sourceLineNo">186</span> assertEquals(expected.getNamespaceAsString(), names.ns);<a name="line.186"></a>
+<span class="sourceLineNo">187</span> assertArrayEquals(expected.getNamespace(), names.nsb);<a name="line.187"></a>
+<span class="sourceLineNo">188</span> return expected;<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>}<a name="line.191"></a>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f9e8b54d/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.AlwaysNextColFilter.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.AlwaysNextColFilter.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.AlwaysNextColFilter.html
index 4364432..bf4d98e 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.AlwaysNextColFilter.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.AlwaysNextColFilter.html
@@ -509,7 +509,7 @@
<span class="sourceLineNo">501</span> FilterList filterList = new FilterList(Operator.MUST_PASS_ONE,<a name="line.501"></a>
<span class="sourceLineNo">502</span> Arrays.asList(new Filter [] { filterMinHint, filterMaxHint } ));<a name="line.502"></a>
<span class="sourceLineNo">503</span> assertEquals(0, CellComparator.COMPARATOR.compare(filterList.getNextCellHint(null),<a name="line.503"></a>
-<span class="sourceLineNo">504</span> minKeyValue));<a name="line.504"></a>
+<span class="sourceLineNo">504</span> minKeyValue));<a name="line.504"></a>
<span class="sourceLineNo">505</span><a name="line.505"></a>
<span class="sourceLineNo">506</span> // Should have no hint if any filter has no hint<a name="line.506"></a>
<span class="sourceLineNo">507</span> filterList = new FilterList(Operator.MUST_PASS_ONE,<a name="line.507"></a>
@@ -533,7 +533,7 @@
<span class="sourceLineNo">525</span> Arrays.asList(new Filter [] { filterMinHint, filterMaxHint } ));<a name="line.525"></a>
<span class="sourceLineNo">526</span> filterList.filterKeyValue(null);<a name="line.526"></a>
<span class="sourceLineNo">527</span> assertEquals(0, CellComparator.COMPARATOR.compare(filterList.getNextCellHint(null),<a name="line.527"></a>
-<span class="sourceLineNo">528</span> minKeyValue));<a name="line.528"></a>
+<span class="sourceLineNo">528</span> maxKeyValue));<a name="line.528"></a>
<span class="sourceLineNo">529</span><a name="line.529"></a>
<span class="sourceLineNo">530</span> filterList = new FilterList(Operator.MUST_PASS_ALL,<a name="line.530"></a>
<span class="sourceLineNo">531</span> Arrays.asList(new Filter [] { filterMaxHint, filterMinHint } ));<a name="line.531"></a>
@@ -547,7 +547,7 @@
<span class="sourceLineNo">539</span> new Filter [] { filterNoHint, filterMinHint, filterMaxHint } ));<a name="line.539"></a>
<span class="sourceLineNo">540</span> filterList.filterKeyValue(null);<a name="line.540"></a>
<span class="sourceLineNo">541</span> assertEquals(0, CellComparator.COMPARATOR.compare(filterList.getNextCellHint(null),<a name="line.541"></a>
-<span class="sourceLineNo">542</span> minKeyValue));<a name="line.542"></a>
+<span class="sourceLineNo">542</span> maxKeyValue));<a name="line.542"></a>
<span class="sourceLineNo">543</span> filterList = new FilterList(Operator.MUST_PASS_ALL,<a name="line.543"></a>
<span class="sourceLineNo">544</span> Arrays.asList(new Filter [] { filterNoHint, filterMaxHint } ));<a name="line.544"></a>
<span class="sourceLineNo">545</span> filterList.filterKeyValue(null);<a name="line.545"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f9e8b54d/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.MockFilter.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.MockFilter.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.MockFilter.html
index 4364432..bf4d98e 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.MockFilter.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.MockFilter.html
@@ -509,7 +509,7 @@
<span class="sourceLineNo">501</span> FilterList filterList = new FilterList(Operator.MUST_PASS_ONE,<a name="line.501"></a>
<span class="sourceLineNo">502</span> Arrays.asList(new Filter [] { filterMinHint, filterMaxHint } ));<a name="line.502"></a>
<span class="sourceLineNo">503</span> assertEquals(0, CellComparator.COMPARATOR.compare(filterList.getNextCellHint(null),<a name="line.503"></a>
-<span class="sourceLineNo">504</span> minKeyValue));<a name="line.504"></a>
+<span class="sourceLineNo">504</span> minKeyValue));<a name="line.504"></a>
<span class="sourceLineNo">505</span><a name="line.505"></a>
<span class="sourceLineNo">506</span> // Should have no hint if any filter has no hint<a name="line.506"></a>
<span class="sourceLineNo">507</span> filterList = new FilterList(Operator.MUST_PASS_ONE,<a name="line.507"></a>
@@ -533,7 +533,7 @@
<span class="sourceLineNo">525</span> Arrays.asList(new Filter [] { filterMinHint, filterMaxHint } ));<a name="line.525"></a>
<span class="sourceLineNo">526</span> filterList.filterKeyValue(null);<a name="line.526"></a>
<span class="sourceLineNo">527</span> assertEquals(0, CellComparator.COMPARATOR.compare(filterList.getNextCellHint(null),<a name="line.527"></a>
-<span class="sourceLineNo">528</span> minKeyValue));<a name="line.528"></a>
+<span class="sourceLineNo">528</span> maxKeyValue));<a name="line.528"></a>
<span class="sourceLineNo">529</span><a name="line.529"></a>
<span class="sourceLineNo">530</span> filterList = new FilterList(Operator.MUST_PASS_ALL,<a name="line.530"></a>
<span class="sourceLineNo">531</span> Arrays.asList(new Filter [] { filterMaxHint, filterMinHint } ));<a name="line.531"></a>
@@ -547,7 +547,7 @@
<span class="sourceLineNo">539</span> new Filter [] { filterNoHint, filterMinHint, filterMaxHint } ));<a name="line.539"></a>
<span class="sourceLineNo">540</span> filterList.filterKeyValue(null);<a name="line.540"></a>
<span class="sourceLineNo">541</span> assertEquals(0, CellComparator.COMPARATOR.compare(filterList.getNextCellHint(null),<a name="line.541"></a>
-<span class="sourceLineNo">542</span> minKeyValue));<a name="line.542"></a>
+<span class="sourceLineNo">542</span> maxKeyValue));<a name="line.542"></a>
<span class="sourceLineNo">543</span> filterList = new FilterList(Operator.MUST_PASS_ALL,<a name="line.543"></a>
<span class="sourceLineNo">544</span> Arrays.asList(new Filter [] { filterNoHint, filterMaxHint } ));<a name="line.544"></a>
<span class="sourceLineNo">545</span> filterList.filterKeyValue(null);<a name="line.545"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f9e8b54d/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.html
index 4364432..bf4d98e 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestFilterList.html
@@ -509,7 +509,7 @@
<span class="sourceLineNo">501</span> FilterList filterList = new FilterList(Operator.MUST_PASS_ONE,<a name="line.501"></a>
<span class="sourceLineNo">502</span> Arrays.asList(new Filter [] { filterMinHint, filterMaxHint } ));<a name="line.502"></a>
<span class="sourceLineNo">503</span> assertEquals(0, CellComparator.COMPARATOR.compare(filterList.getNextCellHint(null),<a name="line.503"></a>
-<span class="sourceLineNo">504</span> minKeyValue));<a name="line.504"></a>
+<span class="sourceLineNo">504</span> minKeyValue));<a name="line.504"></a>
<span class="sourceLineNo">505</span><a name="line.505"></a>
<span class="sourceLineNo">506</span> // Should have no hint if any filter has no hint<a name="line.506"></a>
<span class="sourceLineNo">507</span> filterList = new FilterList(Operator.MUST_PASS_ONE,<a name="line.507"></a>
@@ -533,7 +533,7 @@
<span class="sourceLineNo">525</span> Arrays.asList(new Filter [] { filterMinHint, filterMaxHint } ));<a name="line.525"></a>
<span class="sourceLineNo">526</span> filterList.filterKeyValue(null);<a name="line.526"></a>
<span class="sourceLineNo">527</span> assertEquals(0, CellComparator.COMPARATOR.compare(filterList.getNextCellHint(null),<a name="line.527"></a>
-<span class="sourceLineNo">528</span> minKeyValue));<a name="line.528"></a>
+<span class="sourceLineNo">528</span> maxKeyValue));<a name="line.528"></a>
<span class="sourceLineNo">529</span><a name="line.529"></a>
<span class="sourceLineNo">530</span> filterList = new FilterList(Operator.MUST_PASS_ALL,<a name="line.530"></a>
<span class="sourceLineNo">531</span> Arrays.asList(new Filter [] { filterMaxHint, filterMinHint } ));<a name="line.531"></a>
@@ -547,7 +547,7 @@
<span class="sourceLineNo">539</span> new Filter [] { filterNoHint, filterMinHint, filterMaxHint } ));<a name="line.539"></a>
<span class="sourceLineNo">540</span> filterList.filterKeyValue(null);<a name="line.540"></a>
<span class="sourceLineNo">541</span> assertEquals(0, CellComparator.COMPARATOR.compare(filterList.getNextCellHint(null),<a name="line.541"></a>
-<span class="sourceLineNo">542</span> minKeyValue));<a name="line.542"></a>
+<span class="sourceLineNo">542</span> maxKeyValue));<a name="line.542"></a>
<span class="sourceLineNo">543</span> filterList = new FilterList(Operator.MUST_PASS_ALL,<a name="line.543"></a>
<span class="sourceLineNo">544</span> Arrays.asList(new Filter [] { filterNoHint, filterMaxHint } ));<a name="line.544"></a>
<span class="sourceLineNo">545</span> filterList.filterKeyValue(null);<a name="line.545"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f9e8b54d/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestCorruptedRegionStoreFile.ScanInjector.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestCorruptedRegionStoreFile.ScanInjector.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestCorruptedRegionStoreFile.ScanInjector.html
index 4744675..c614a36 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestCorruptedRegionStoreFile.ScanInjector.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestCorruptedRegionStoreFile.ScanInjector.html
@@ -51,7 +51,7 @@
<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.43"></a>
<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.util.FSUtils;<a name="line.44"></a>
<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.util.FSVisitor;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.util.TestTableName;<a name="line.46"></a>
+<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.TestTableName;<a name="line.46"></a>
<span class="sourceLineNo">047</span><a name="line.47"></a>
<span class="sourceLineNo">048</span>import org.junit.After;<a name="line.48"></a>
<span class="sourceLineNo">049</span>import org.junit.Before;<a name="line.49"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f9e8b54d/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestCorruptedRegionStoreFile.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestCorruptedRegionStoreFile.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestCorruptedRegionStoreFile.html
index 4744675..c614a36 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestCorruptedRegionStoreFile.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestCorruptedRegionStoreFile.html
@@ -51,7 +51,7 @@
<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.43"></a>
<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.util.FSUtils;<a name="line.44"></a>
<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.util.FSVisitor;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.util.TestTableName;<a name="line.46"></a>
+<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.TestTableName;<a name="line.46"></a>
<span class="sourceLineNo">047</span><a name="line.47"></a>
<span class="sourceLineNo">048</span>import org.junit.After;<a name="line.48"></a>
<span class="sourceLineNo">049</span>import org.junit.Before;<a name="line.49"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f9e8b54d/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerRetriableFailure.FaultyScannerObserver.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerRetriableFailure.FaultyScannerObserver.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerRetriableFailure.FaultyScannerObserver.html
index 216716b..09c211a 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerRetriableFailure.FaultyScannerObserver.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerRetriableFailure.FaultyScannerObserver.html
@@ -50,7 +50,7 @@
<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.testclassification.RegionServerTests;<a name="line.42"></a>
<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.43"></a>
<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.util.TestTableName;<a name="line.45"></a>
+<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.TestTableName;<a name="line.45"></a>
<span class="sourceLineNo">046</span><a name="line.46"></a>
<span class="sourceLineNo">047</span>import org.junit.AfterClass;<a name="line.47"></a>
<span class="sourceLineNo">048</span>import org.junit.BeforeClass;<a name="line.48"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f9e8b54d/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerRetriableFailure.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerRetriableFailure.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerRetriableFailure.html
index 216716b..09c211a 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerRetriableFailure.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerRetriableFailure.html
@@ -50,7 +50,7 @@
<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.testclassification.RegionServerTests;<a name="line.42"></a>
<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.43"></a>
<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.util.TestTableName;<a name="line.45"></a>
+<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.TestTableName;<a name="line.45"></a>
<span class="sourceLineNo">046</span><a name="line.46"></a>
<span class="sourceLineNo">047</span>import org.junit.AfterClass;<a name="line.47"></a>
<span class="sourceLineNo">048</span>import org.junit.BeforeClass;<a name="line.48"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f9e8b54d/testdevapidocs/src-html/org/apache/hadoop/hbase/rest/TestVersionResource.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/rest/TestVersionResource.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/rest/TestVersionResource.html
index 473f1a2..b059791 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/rest/TestVersionResource.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/rest/TestVersionResource.html
@@ -29,162 +29,177 @@
<span class="sourceLineNo">021</span>import java.io.ByteArrayInputStream;<a name="line.21"></a>
<span class="sourceLineNo">022</span>import java.io.IOException;<a name="line.22"></a>
<span class="sourceLineNo">023</span><a name="line.23"></a>
-<span class="sourceLineNo">024</span>import javax.xml.bind.JAXBContext;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import javax.xml.bind.JAXBException;<a name="line.25"></a>
-<span class="sourceLineNo">026</span><a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.commons.logging.Log;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.commons.logging.LogFactory;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.rest.client.Client;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.rest.client.Cluster;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.rest.client.Response;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.rest.model.StorageClusterVersionModel;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.rest.model.VersionModel;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.testclassification.RestTests;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.glassfish.jersey.servlet.ServletContainer;<a name="line.38"></a>
-<span class="sourceLineNo">039</span><a name="line.39"></a>
-<span class="sourceLineNo">040</span>import static org.junit.Assert.*;<a name="line.40"></a>
-<span class="sourceLineNo">041</span><a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.junit.AfterClass;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.junit.BeforeClass;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.junit.Test;<a name="line.44"></a>
-<span class="sourceLineNo">045</span><a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.junit.experimental.categories.Category;<a name="line.46"></a>
-<span class="sourceLineNo">047</span><a name="line.47"></a>
-<span class="sourceLineNo">048</span>@Category({RestTests.class, MediumTests.class})<a name="line.48"></a>
-<span class="sourceLineNo">049</span>public class TestVersionResource {<a name="line.49"></a>
-<span class="sourceLineNo">050</span> private static final Log LOG = LogFactory.getLog(TestVersionResource.class);<a name="line.50"></a>
-<span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span> private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();<a name="line.52"></a>
-<span class="sourceLineNo">053</span> private static final HBaseRESTTestingUtility REST_TEST_UTIL = <a name="line.53"></a>
-<span class="sourceLineNo">054</span> new HBaseRESTTestingUtility();<a name="line.54"></a>
-<span class="sourceLineNo">055</span> private static Client client;<a name="line.55"></a>
-<span class="sourceLineNo">056</span> private static JAXBContext context;<a name="line.56"></a>
-<span class="sourceLineNo">057</span><a name="line.57"></a>
-<span class="sourceLineNo">058</span> @BeforeClass<a name="line.58"></a>
-<span class="sourceLineNo">059</span> public static void setUpBeforeClass() throws Exception {<a name="line.59"></a>
-<span class="sourceLineNo">060</span> TEST_UTIL.startMiniCluster();<a name="line.60"></a>
-<span class="sourceLineNo">061</span> REST_TEST_UTIL.startServletContainer(TEST_UTIL.getConfiguration());<a name="line.61"></a>
-<span class="sourceLineNo">062</span> client = new Client(new Cluster().add("localhost", <a name="line.62"></a>
-<span class="sourceLineNo">063</span> REST_TEST_UTIL.getServletPort()));<a name="line.63"></a>
-<span class="sourceLineNo">064</span> context = JAXBContext.newInstance(<a name="line.64"></a>
-<span class="sourceLineNo">065</span> VersionModel.class,<a name="line.65"></a>
-<span class="sourceLineNo">066</span> StorageClusterVersionModel.class);<a name="line.66"></a>
-<span class="sourceLineNo">067</span> }<a name="line.67"></a>
-<span class="sourceLineNo">068</span><a name="line.68"></a>
-<span class="sourceLineNo">069</span> @AfterClass<a name="line.69"></a>
-<span class="sourceLineNo">070</span> public static void tearDownAfterClass() throws Exception {<a name="line.70"></a>
-<span class="sourceLineNo">071</span> REST_TEST_UTIL.shutdownServletContainer();<a name="line.71"></a>
-<span class="sourceLineNo">072</span> TEST_UTIL.shutdownMiniCluster();<a name="line.72"></a>
-<span class="sourceLineNo">073</span> }<a name="line.73"></a>
-<span class="sourceLineNo">074</span><a name="line.74"></a>
-<span class="sourceLineNo">075</span> private static void validate(VersionModel model) {<a name="line.75"></a>
-<span class="sourceLineNo">076</span> assertNotNull(model);<a name="line.76"></a>
-<span class="sourceLineNo">077</span> assertNotNull(model.getRESTVersion());<a name="line.77"></a>
-<span class="sourceLineNo">078</span> assertEquals(model.getRESTVersion(), RESTServlet.VERSION_STRING);<a name="line.78"></a>
-<span class="sourceLineNo">079</span> String osVersion = model.getOSVersion(); <a name="line.79"></a>
-<span class="sourceLineNo">080</span> assertNotNull(osVersion);<a name="line.80"></a>
-<span class="sourceLineNo">081</span> assertTrue(osVersion.contains(System.getProperty("os.name")));<a name="line.81"></a>
-<span class="sourceLineNo">082</span> assertTrue(osVersion.contains(System.getProperty("os.version")));<a name="line.82"></a>
-<span class="sourceLineNo">083</span> assertTrue(osVersion.contains(System.getProperty("os.arch")));<a name="line.83"></a>
-<span class="sourceLineNo">084</span> String jvmVersion = model.getJVMVersion();<a name="line.84"></a>
-<span class="sourceLineNo">085</span> assertNotNull(jvmVersion);<a name="line.85"></a>
-<span class="sourceLineNo">086</span> assertTrue(jvmVersion.contains(System.getProperty("java.vm.vendor")));<a name="line.86"></a>
-<span class="sourceLineNo">087</span> assertTrue(jvmVersion.contains(System.getProperty("java.version")));<a name="line.87"></a>
-<span class="sourceLineNo">088</span> assertTrue(jvmVersion.contains(System.getProperty("java.vm.version")));<a name="line.88"></a>
-<span class="sourceLineNo">089</span> assertNotNull(model.getServerVersion());<a name="line.89"></a>
-<span class="sourceLineNo">090</span> String jerseyVersion = model.getJerseyVersion();<a name="line.90"></a>
-<span class="sourceLineNo">091</span> assertNotNull(jerseyVersion);<a name="line.91"></a>
-<span class="sourceLineNo">092</span> assertEquals(jerseyVersion, ServletContainer.class.getClass().getPackage()<a name="line.92"></a>
-<span class="sourceLineNo">093</span> .getImplementationVersion());<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> @Test<a name="line.96"></a>
-<span class="sourceLineNo">097</span> public void testGetStargateVersionText() throws IOException {<a name="line.97"></a>
-<span class="sourceLineNo">098</span> Response response = client.get("/version", Constants.MIMETYPE_TEXT);<a name="line.98"></a>
-<span class="sourceLineNo">099</span> assertTrue(response.getCode() == 200);<a name="line.99"></a>
-<span class="sourceLineNo">100</span> assertEquals(Constants.MIMETYPE_TEXT, response.getHeader("content-type"));<a name="line.100"></a>
-<span class="sourceLineNo">101</span> String body = Bytes.toString(response.getBody());<a name="line.101"></a>
-<span class="sourceLineNo">102</span> assertTrue(body.length() > 0);<a name="line.102"></a>
-<span class="sourceLineNo">103</span> assertTrue(body.contains(RESTServlet.VERSION_STRING));<a name="line.103"></a>
-<span class="sourceLineNo">104</span> assertTrue(body.contains(System.getProperty("java.vm.vendor")));<a name="line.104"></a>
-<span class="sourceLineNo">105</span> assertTrue(body.contains(System.getProperty("java.version")));<a name="line.105"></a>
-<span class="sourceLineNo">106</span> assertTrue(body.contains(System.getProperty("java.vm.version")));<a name="line.106"></a>
-<span class="sourceLineNo">107</span> assertTrue(body.contains(System.getProperty("os.name")));<a name="line.107"></a>
-<span class="sourceLineNo">108</span> assertTrue(body.contains(System.getProperty("os.version")));<a name="line.108"></a>
-<span class="sourceLineNo">109</span> assertTrue(body.contains(System.getProperty("os.arch")));<a name="line.109"></a>
-<span class="sourceLineNo">110</span> assertTrue(body.contains(ServletContainer.class.getClass().getPackage()<a name="line.110"></a>
-<span class="sourceLineNo">111</span> .getImplementationVersion()));<a name="line.111"></a>
-<span class="sourceLineNo">112</span> }<a name="line.112"></a>
-<span class="sourceLineNo">113</span><a name="line.113"></a>
-<span class="sourceLineNo">114</span> @Test<a name="line.114"></a>
-<span class="sourceLineNo">115</span> public void testGetStargateVersionXML() throws IOException, JAXBException {<a name="line.115"></a>
-<span class="sourceLineNo">116</span> Response response = client.get("/version", Constants.MIMETYPE_XML);<a name="line.116"></a>
-<span class="sourceLineNo">117</span> assertTrue(response.getCode() == 200);<a name="line.117"></a>
-<span class="sourceLineNo">118</span> assertEquals(Constants.MIMETYPE_XML, response.getHeader("content-type"));<a name="line.118"></a>
-<span class="sourceLineNo">119</span> VersionModel model = (VersionModel)<a name="line.119"></a>
-<span class="sourceLineNo">120</span> context.createUnmarshaller().unmarshal(<a name="line.120"></a>
-<span class="sourceLineNo">121</span> new ByteArrayInputStream(response.getBody()));<a name="line.121"></a>
-<span class="sourceLineNo">122</span> validate(model);<a name="line.122"></a>
-<span class="sourceLineNo">123</span> LOG.info("success retrieving Stargate version as XML");<a name="line.123"></a>
-<span class="sourceLineNo">124</span> }<a name="line.124"></a>
-<span class="sourceLineNo">125</span><a name="line.125"></a>
-<span class="sourceLineNo">126</span> @Test<a name="line.126"></a>
-<span class="sourceLineNo">127</span> public void testGetStargateVersionJSON() throws IOException {<a name="line.127"></a>
-<span class="sourceLineNo">128</span> Response response = client.get("/version", Constants.MIMETYPE_JSON);<a name="line.128"></a>
-<span class="sourceLineNo">129</span> assertTrue(response.getCode() == 200);<a name="line.129"></a>
-<span class="sourceLineNo">130</span> assertEquals(Constants.MIMETYPE_JSON, response.getHeader("content-type"));<a name="line.130"></a>
-<span class="sourceLineNo">131</span> }<a name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span> @Test<a name="line.133"></a>
-<span class="sourceLineNo">134</span> public void testGetStargateVersionPB() throws IOException {<a name="line.134"></a>
-<span class="sourceLineNo">135</span> Response response = client.get("/version", Constants.MIMETYPE_PROTOBUF);<a name="line.135"></a>
-<span class="sourceLineNo">136</span> assertTrue(response.getCode() == 200);<a name="line.136"></a>
-<span class="sourceLineNo">137</span> assertEquals(Constants.MIMETYPE_PROTOBUF, response.getHeader("content-type"));<a name="line.137"></a>
-<span class="sourceLineNo">138</span> VersionModel model = new VersionModel();<a name="line.138"></a>
-<span class="sourceLineNo">139</span> model.getObjectFromMessage(response.getBody());<a name="line.139"></a>
-<span class="sourceLineNo">140</span> validate(model);<a name="line.140"></a>
-<span class="sourceLineNo">141</span> response = client.get("/version", Constants.MIMETYPE_PROTOBUF_IETF);<a name="line.141"></a>
-<span class="sourceLineNo">142</span> assertTrue(response.getCode() == 200);<a name="line.142"></a>
-<span class="sourceLineNo">143</span> assertEquals(Constants.MIMETYPE_PROTOBUF_IETF, response.getHeader("content-type"));<a name="line.143"></a>
-<span class="sourceLineNo">144</span> model = new VersionModel();<a name="line.144"></a>
-<span class="sourceLineNo">145</span> model.getObjectFromMessage(response.getBody());<a name="line.145"></a>
-<span class="sourceLineNo">146</span> validate(model);<a name="line.146"></a>
-<span class="sourceLineNo">147</span> }<a name="line.147"></a>
-<span class="sourceLineNo">148</span><a name="line.148"></a>
-<span class="sourceLineNo">149</span> @Test<a name="line.149"></a>
-<span class="sourceLineNo">150</span> public void testGetStorageClusterVersionText() throws IOException {<a name="line.150"></a>
-<span class="sourceLineNo">151</span> Response response = client.get("/version/cluster", Constants.MIMETYPE_TEXT);<a name="line.151"></a>
-<span class="sourceLineNo">152</span> assertTrue(response.getCode() == 200);<a name="line.152"></a>
-<span class="sourceLineNo">153</span> assertEquals(Constants.MIMETYPE_TEXT, response.getHeader("content-type"));<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> @Test<a name="line.156"></a>
-<span class="sourceLineNo">157</span> public void testGetStorageClusterVersionXML() throws IOException,<a name="line.157"></a>
-<span class="sourceLineNo">158</span> JAXBException {<a name="line.158"></a>
-<span class="sourceLineNo">159</span> Response response = client.get("/version/cluster",Constants.MIMETYPE_XML);<a name="line.159"></a>
-<span class="sourceLineNo">160</span> assertTrue(response.getCode() == 200);<a name="line.160"></a>
-<span class="sourceLineNo">161</span> assertEquals(Constants.MIMETYPE_XML, response.getHeader("content-type"));<a name="line.161"></a>
-<span class="sourceLineNo">162</span> StorageClusterVersionModel clusterVersionModel = <a name="line.162"></a>
-<span class="sourceLineNo">163</span> (StorageClusterVersionModel)<a name="line.163"></a>
-<span class="sourceLineNo">164</span> context.createUnmarshaller().unmarshal(<a name="line.164"></a>
-<span class="sourceLineNo">165</span> new ByteArrayInputStream(response.getBody()));<a name="line.165"></a>
-<span class="sourceLineNo">166</span> assertNotNull(clusterVersionModel);<a name="line.166"></a>
-<span class="sourceLineNo">167</span> assertNotNull(clusterVersionModel.getVersion());<a name="line.167"></a>
-<span class="sourceLineNo">168</span> LOG.info("success retrieving storage cluster version as XML");<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">171</span> @Test<a name="line.171"></a>
-<span class="sourceLineNo">172</span> public void doTestGetStorageClusterVersionJSON() throws IOException {<a name="line.172"></a>
-<span class="sourceLineNo">173</span> Response response = client.get("/version/cluster", Constants.MIMETYPE_JSON);<a name="line.173"></a>
-<span class="sourceLineNo">174</span> assertTrue(response.getCode() == 200);<a name="line.174"></a>
-<span class="sourceLineNo">175</span> assertEquals(Constants.MIMETYPE_JSON, response.getHeader("content-type"));<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">024</span>import javax.ws.rs.core.MediaType;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import javax.xml.bind.JAXBContext;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import javax.xml.bind.JAXBException;<a name="line.26"></a>
+<span class="sourceLineNo">027</span><a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.commons.logging.Log;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.commons.logging.LogFactory;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.rest.client.Client;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.rest.client.Cluster;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.rest.client.Response;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.rest.model.StorageClusterVersionModel;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.rest.model.VersionModel;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.testclassification.RestTests;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.codehaus.jackson.map.ObjectMapper;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.glassfish.jersey.servlet.ServletContainer;<a name="line.41"></a>
+<span class="sourceLineNo">042</span><a name="line.42"></a>
+<span class="sourceLineNo">043</span>import static org.junit.Assert.*;<a name="line.43"></a>
+<span class="sourceLineNo">044</span><a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.junit.AfterClass;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.junit.BeforeClass;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.junit.Test;<a name="line.47"></a>
+<span class="sourceLineNo">048</span><a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.junit.experimental.categories.Category;<a name="line.49"></a>
+<span class="sourceLineNo">050</span><a name="line.50"></a>
+<span class="sourceLineNo">051</span>@Category({RestTests.class, MediumTests.class})<a name="line.51"></a>
+<span class="sourceLineNo">052</span>public class TestVersionResource {<a name="line.52"></a>
+<span class="sourceLineNo">053</span> private static final Log LOG = LogFactory.getLog(TestVersionResource.class);<a name="line.53"></a>
+<span class="sourceLineNo">054</span><a name="line.54"></a>
+<span class="sourceLineNo">055</span> private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();<a name="line.55"></a>
+<span class="sourceLineNo">056</span> private static final HBaseRESTTestingUtility REST_TEST_UTIL = <a name="line.56"></a>
+<span class="sourceLineNo">057</span> new HBaseRESTTestingUtility();<a name="line.57"></a>
+<span class="sourceLineNo">058</span> private static Client client;<a name="line.58"></a>
+<span class="sourceLineNo">059</span> private static JAXBContext context;<a name="line.59"></a>
+<span class="sourceLineNo">060</span><a name="line.60"></a>
+<span class="sourceLineNo">061</span> @BeforeClass<a name="line.61"></a>
+<span class="sourceLineNo">062</span> public static void setUpBeforeClass() throws Exception {<a name="line.62"></a>
+<span class="sourceLineNo">063</span> TEST_UTIL.startMiniCluster();<a name="line.63"></a>
+<span class="sourceLineNo">064</span> REST_TEST_UTIL.startServletContainer(TEST_UTIL.getConfiguration());<a name="line.64"></a>
+<span class="sourceLineNo">065</span> client = new Client(new Cluster().add("localhost", <a name="line.65"></a>
+<span class="sourceLineNo">066</span> REST_TEST_UTIL.getServletPort()));<a name="line.66"></a>
+<span class="sourceLineNo">067</span> context = JAXBContext.newInstance(<a name="line.67"></a>
+<span class="sourceLineNo">068</span> VersionModel.class,<a name="line.68"></a>
+<span class="sourceLineNo">069</span> StorageClusterVersionModel.class);<a name="line.69"></a>
+<span class="sourceLineNo">070</span> }<a name="line.70"></a>
+<span class="sourceLineNo">071</span><a name="line.71"></a>
+<span class="sourceLineNo">072</span> @AfterClass<a name="line.72"></a>
+<span class="sourceLineNo">073</span> public static void tearDownAfterClass() throws Exception {<a name="line.73"></a>
+<span class="sourceLineNo">074</span> REST_TEST_UTIL.shutdownServletContainer();<a name="line.74"></a>
+<span class="sourceLineNo">075</span> TEST_UTIL.shutdownMiniCluster();<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> private static void validate(VersionModel model) {<a name="line.78"></a>
+<span class="sourceLineNo">079</span> assertNotNull(model);<a name="line.79"></a>
+<span class="sourceLineNo">080</span> assertNotNull(model.getRESTVersion());<a name="line.80"></a>
+<span class="sourceLineNo">081</span> assertEquals(model.getRESTVersion(), RESTServlet.VERSION_STRING);<a name="line.81"></a>
+<span class="sourceLineNo">082</span> String osVersion = model.getOSVersion(); <a name="line.82"></a>
+<span class="sourceLineNo">083</span> assertNotNull(osVersion);<a name="line.83"></a>
+<span class="sourceLineNo">084</span> assertTrue(osVersion.contains(System.getProperty("os.name")));<a name="line.84"></a>
+<span class="sourceLineNo">085</span> assertTrue(osVersion.contains(System.getProperty("os.version")));<a name="line.85"></a>
+<span class="sourceLineNo">086</span> assertTrue(osVersion.contains(System.getProperty("os.arch")));<a name="line.86"></a>
+<span class="sourceLineNo">087</span> String jvmVersion = model.getJVMVersion();<a name="line.87"></a>
+<span class="sourceLineNo">088</span> assertNotNull(jvmVersion);<a name="line.88"></a>
+<span class="sourceLineNo">089</span> assertTrue(jvmVersion.contains(System.getProperty("java.vm.vendor")));<a name="line.89"></a>
+<span class="sourceLineNo">090</span> assertTrue(jvmVersion.contains(System.getProperty("java.version")));<a name="line.90"></a>
+<span class="sourceLineNo">091</span> assertTrue(jvmVersion.contains(System.getProperty("java.vm.version")));<a name="line.91"></a>
+<span class="sourceLineNo">092</span> assertNotNull(model.getServerVersion());<a name="line.92"></a>
+<span class="sourceLineNo">093</span> String jerseyVersion = model.getJerseyVersion();<a name="line.93"></a>
+<span class="sourceLineNo">094</span> assertNotNull(jerseyVersion);<a name="line.94"></a>
+<span class="sourceLineNo">095</span> assertEquals(jerseyVersion, ServletContainer.class.getClass().getPackage()<a name="line.95"></a>
+<span class="sourceLineNo">096</span> .getImplementationVersion());<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> @Test<a name="line.99"></a>
+<span class="sourceLineNo">100</span> public void testGetStargateVersionText() throws IOException {<a name="line.100"></a>
+<span class="sourceLineNo">101</span> Response response = client.get("/version", Constants.MIMETYPE_TEXT);<a name="line.101"></a>
+<span class="sourceLineNo">102</span> assertTrue(response.getCode() == 200);<a name="line.102"></a>
+<span class="sourceLineNo">103</span> assertEquals(Constants.MIMETYPE_TEXT, response.getHeader("content-type"));<a name="line.103"></a>
+<span class="sourceLineNo">104</span> String body = Bytes.toString(response.getBody());<a name="line.104"></a>
+<span class="sourceLineNo">105</span> assertTrue(body.length() > 0);<a name="line.105"></a>
+<span class="sourceLineNo">106</span> assertTrue(body.contains(RESTServlet.VERSION_STRING));<a name="line.106"></a>
+<span class="sourceLineNo">107</span> assertTrue(body.contains(System.getProperty("java.vm.vendor")));<a name="line.107"></a>
+<span class="sourceLineNo">108</span> assertTrue(body.contains(System.getProperty("java.version")));<a name="line.108"></a>
+<span class="sourceLineNo">109</span> assertTrue(body.contains(System.getProperty("java.vm.version")));<a name="line.109"></a>
+<span class="sourceLineNo">110</span> assertTrue(body.contains(System.getProperty("os.name")));<a name="line.110"></a>
+<span class="sourceLineNo">111</span> assertTrue(body.contains(System.getProperty("os.version")));<a name="line.111"></a>
+<span class="sourceLineNo">112</span> assertTrue(body.contains(System.getProperty("os.arch")));<a name="line.112"></a>
+<span class="sourceLineNo">113</span> assertTrue(body.contains(ServletContainer.class.getClass().getPackage()<a name="line.113"></a>
+<span class="sourceLineNo">114</span> .getImplementationVersion()));<a name="line.114"></a>
+<span class="sourceLineNo">115</span> }<a name="line.115"></a>
+<span class="sourceLineNo">116</span><a name="line.116"></a>
+<span class="sourceLineNo">117</span> @Test<a name="line.117"></a>
+<span class="sourceLineNo">118</span> public void testGetStargateVersionXML() throws IOException, JAXBException {<a name="line.118"></a>
+<span class="sourceLineNo">119</span> Response response = client.get("/version", Constants.MIMETYPE_XML);<a name="line.119"></a>
+<span class="sourceLineNo">120</span> assertTrue(response.getCode() == 200);<a name="line.120"></a>
+<span class="sourceLineNo">121</span> assertEquals(Constants.MIMETYPE_XML, response.getHeader("content-type"));<a name="line.121"></a>
+<span class="sourceLineNo">122</span> VersionModel model = (VersionModel)<a name="line.122"></a>
+<span class="sourceLineNo">123</span> context.createUnmarshaller().unmarshal(<a name="line.123"></a>
+<span class="sourceLineNo">124</span> new ByteArrayInputStream(response.getBody()));<a name="line.124"></a>
+<span class="sourceLineNo">125</span> validate(model);<a name="line.125"></a>
+<span class="sourceLineNo">126</span> LOG.info("success retrieving Stargate version as XML");<a name="line.126"></a>
+<span class="sourceLineNo">127</span> }<a name="line.127"></a>
+<span class="sourceLineNo">128</span><a name="line.128"></a>
+<span class="sourceLineNo">129</span> @Test<a name="line.129"></a>
+<span class="sourceLineNo">130</span> public void testGetStargateVersionJSON() throws IOException {<a name="line.130"></a>
+<span class="sourceLineNo">131</span> Response response = client.get("/version", Constants.MIMETYPE_JSON);<a name="line.131"></a>
+<span class="sourceLineNo">132</span> assertTrue(response.getCode() == 200);<a name="line.132"></a>
+<span class="sourceLineNo">133</span> assertEquals(Constants.MIMETYPE_JSON, response.getHeader("content-type"));<a name="line.133"></a>
+<span class="sourceLineNo">134</span> ObjectMapper mapper = new JacksonJaxbJsonProvider()<a name="line.134"></a>
+<span class="sourceLineNo">135</span> .locateMapper(VersionModel.class, MediaType.APPLICATION_JSON_TYPE);<a name="line.135"></a>
+<span class="sourceLineNo">136</span> VersionModel model<a name="line.136"></a>
+<span class="sourceLineNo">137</span> = mapper.readValue(response.getBody(), VersionModel.class);<a name="line.137"></a>
+<span class="sourceLineNo">138</span> validate(model);<a name="line.138"></a>
+<span class="sourceLineNo">139</span> LOG.info("success retrieving Stargate version as JSON");<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> @Test<a name="line.142"></a>
+<span class="sourceLineNo">143</span> public void testGetStargateVersionPB() throws IOException {<a name="line.143"></a>
+<span class="sourceLineNo">144</span> Response response = client.get("/version", Constants.MIMETYPE_PROTOBUF);<a name="line.144"></a>
+<span class="sourceLineNo">145</span> assertTrue(response.getCode() == 200);<a name="line.145"></a>
+<span class="sourceLineNo">146</span> assertEquals(Constants.MIMETYPE_PROTOBUF, response.getHeader("content-type"));<a name="line.146"></a>
+<span class="sourceLineNo">147</span> VersionModel model = new VersionModel();<a name="line.147"></a>
+<span class="sourceLineNo">148</span> model.getObjectFromMessage(response.getBody());<a name="line.148"></a>
+<span class="sourceLineNo">149</span> validate(model);<a name="line.149"></a>
+<span class="sourceLineNo">150</span> response = client.get("/version", Constants.MIMETYPE_PROTOBUF_IETF);<a name="line.150"></a>
+<span class="sourceLineNo">151</span> assertTrue(response.getCode() == 200);<a name="line.151"></a>
+<span class="sourceLineNo">152</span> assertEquals(Constants.MIMETYPE_PROTOBUF_IETF, response.getHeader("content-type"));<a name="line.152"></a>
+<span class="sourceLineNo">153</span> model = new VersionModel();<a name="line.153"></a>
+<span class="sourceLineNo">154</span> model.getObjectFromMessage(response.getBody());<a name="line.154"></a>
+<span class="sourceLineNo">155</span> validate(model);<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> @Test<a name="line.158"></a>
+<span class="sourceLineNo">159</span> public void testGetStorageClusterVersionText() throws IOException {<a name="line.159"></a>
+<span class="sourceLineNo">160</span> Response response = client.get("/version/cluster", Constants.MIMETYPE_TEXT);<a name="line.160"></a>
+<span class="sourceLineNo">161</span> assertTrue(response.getCode() == 200);<a name="line.161"></a>
+<span class="sourceLineNo">162</span> assertEquals(Constants.MIMETYPE_TEXT, response.getHeader("content-type"));<a name="line.162"></a>
+<span class="sourceLineNo">163</span> }<a name="line.163"></a>
+<span class="sourceLineNo">164</span><a name="line.164"></a>
+<span class="sourceLineNo">165</span> @Test<a name="line.165"></a>
+<span class="sourceLineNo">166</span> public void testGetStorageClusterVersionXML() throws IOException,<a name="line.166"></a>
+<span class="sourceLineNo">167</span> JAXBException {<a name="line.167"></a>
+<span class="sourceLineNo">168</span> Response response = client.get("/version/cluster",Constants.MIMETYPE_XML);<a name="line.168"></a>
+<span class="sourceLineNo">169</span> assertTrue(response.getCode() == 200);<a name="line.169"></a>
+<span class="sourceLineNo">170</span> assertEquals(Constants.MIMETYPE_XML, response.getHeader("content-type"));<a name="line.170"></a>
+<span class="sourceLineNo">171</span> StorageClusterVersionModel clusterVersionModel = <a name="line.171"></a>
+<span class="sourceLineNo">172</span> (StorageClusterVersionModel)<a name="line.172"></a>
+<span class="sourceLineNo">173</span> context.createUnmarshaller().unmarshal(<a name="line.173"></a>
+<span class="sourceLineNo">174</span> new ByteArrayInputStream(response.getBody()));<a name="line.174"></a>
+<span class="sourceLineNo">175</span> assertNotNull(clusterVersionModel);<a name="line.175"></a>
+<span class="sourceLineNo">176</span> assertNotNull(clusterVersionModel.getVersion());<a name="line.176"></a>
+<span class="sourceLineNo">177</span> LOG.info("success retrieving storage cluster version as XML");<a name="line.177"></a>
+<span class="sourceLineNo">178</span> }<a name="line.178"></a>
<span class="sourceLineNo">179</span><a name="line.179"></a>
+<span class="sourceLineNo">180</span> @Test<a name="line.180"></a>
+<span class="sourceLineNo">181</span> public void testGetStorageClusterVersionJSON() throws IOException {<a name="line.181"></a>
+<span class="sourceLineNo">182</span> Response response = client.get("/version/cluster", Constants.MIMETYPE_JSON);<a name="line.182"></a>
+<span class="sourceLineNo">183</span> assertTrue(response.getCode() == 200);<a name="line.183"></a>
+<span class="sourceLineNo">184</span> assertEquals(Constants.MIMETYPE_JSON, response.getHeader("content-type"));<a name="line.184"></a>
+<span class="sourceLineNo">185</span> ObjectMapper mapper = new JacksonJaxbJsonProvider()<a name="line.185"></a>
+<span class="sourceLineNo">186</span> .locateMapper(StorageClusterVersionModel.class, MediaType.APPLICATION_JSON_TYPE);<a name="line.186"></a>
+<span class="sourceLineNo">187</span> StorageClusterVersionModel clusterVersionModel<a name="line.187"></a>
+<span class="sourceLineNo">188</span> = mapper.readValue(response.getBody(), StorageClusterVersionModel.class);<a name="line.188"></a>
+<span class="sourceLineNo">189</span> assertNotNull(clusterVersionModel);<a name="line.189"></a>
+<span class="sourceLineNo">190</span> assertNotNull(clusterVersionModel.getVersion());<a name="line.190"></a>
+<span class="sourceLineNo">191</span> LOG.info("success retrieving storage cluster version as JSON");<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><a name="line.194"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f9e8b54d/testdevapidocs/src-html/org/apache/hadoop/hbase/rest/client/TestXmlParsing.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/rest/client/TestXmlParsing.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/rest/client/TestXmlParsing.html
index b61016c..66a2c26 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/rest/client/TestXmlParsing.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/rest/client/TestXmlParsing.html
@@ -49,7 +49,7 @@
<span class="sourceLineNo">041</span> @Test<a name="line.41"></a>
<span class="sourceLineNo">042</span> public void testParsingClusterVersion() throws Exception {<a name="line.42"></a>
<span class="sourceLineNo">043</span> final String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"<a name="line.43"></a>
-<span class="sourceLineNo">044</span> + "<ClusterVersion>2.0.0</ClusterVersion>";<a name="line.44"></a>
+<span class="sourceLineNo">044</span> + "<ClusterVersion Version=\"2.0.0\"/>";<a name="line.44"></a>
<span class="sourceLineNo">045</span> Client client = mock(Client.class);<a name="line.45"></a>
<span class="sourceLineNo">046</span> RemoteAdmin admin = new RemoteAdmin(client, HBaseConfiguration.create(), null);<a name="line.46"></a>
<span class="sourceLineNo">047</span> Response resp = new Response(200, null, xml.getBytes());<a name="line.47"></a>