http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c115ab43/testdevapidocs/src-html/org/apache/hadoop/hbase/rest/TestGetAndPutResource.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/rest/TestGetAndPutResource.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/rest/TestGetAndPutResource.html
index 2205ba7..c4b3f3b 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/rest/TestGetAndPutResource.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/rest/TestGetAndPutResource.html
@@ -206,458 +206,511 @@
 <span class="sourceLineNo">198</span>  }<a name="line.198"></a>
 <span class="sourceLineNo">199</span><a name="line.199"></a>
 <span class="sourceLineNo">200</span>  @Test<a name="line.200"></a>
-<span class="sourceLineNo">201</span>  public void 
testSingleCellGetPutBinary() throws IOException {<a name="line.201"></a>
-<span class="sourceLineNo">202</span>    final String path = "/" + TABLE + "/" 
+ ROW_3 + "/" + COLUMN_1;<a name="line.202"></a>
-<span class="sourceLineNo">203</span>    final byte[] body = 
Bytes.toBytes(VALUE_3);<a name="line.203"></a>
-<span class="sourceLineNo">204</span>    Response response = client.put(path, 
Constants.MIMETYPE_BINARY, body);<a name="line.204"></a>
-<span class="sourceLineNo">205</span>    assertEquals(response.getCode(), 
200);<a name="line.205"></a>
-<span class="sourceLineNo">206</span>    Thread.yield();<a name="line.206"></a>
-<span class="sourceLineNo">207</span><a name="line.207"></a>
-<span class="sourceLineNo">208</span>    response = client.get(path, 
Constants.MIMETYPE_BINARY);<a name="line.208"></a>
-<span class="sourceLineNo">209</span>    assertEquals(response.getCode(), 
200);<a name="line.209"></a>
-<span class="sourceLineNo">210</span>    
assertEquals(Constants.MIMETYPE_BINARY, response.getHeader("content-type"));<a 
name="line.210"></a>
-<span class="sourceLineNo">211</span>    
assertTrue(Bytes.equals(response.getBody(), body));<a name="line.211"></a>
-<span class="sourceLineNo">212</span>    boolean foundTimestampHeader = 
false;<a name="line.212"></a>
-<span class="sourceLineNo">213</span>    for (Header header: 
response.getHeaders()) {<a name="line.213"></a>
-<span class="sourceLineNo">214</span>      if 
(header.getName().equals("X-Timestamp")) {<a name="line.214"></a>
-<span class="sourceLineNo">215</span>        foundTimestampHeader = true;<a 
name="line.215"></a>
-<span class="sourceLineNo">216</span>        break;<a name="line.216"></a>
-<span class="sourceLineNo">217</span>      }<a name="line.217"></a>
-<span class="sourceLineNo">218</span>    }<a name="line.218"></a>
-<span class="sourceLineNo">219</span>    assertTrue(foundTimestampHeader);<a 
name="line.219"></a>
-<span class="sourceLineNo">220</span><a name="line.220"></a>
-<span class="sourceLineNo">221</span>    response = deleteRow(TABLE, ROW_3);<a 
name="line.221"></a>
-<span class="sourceLineNo">222</span>    assertEquals(response.getCode(), 
200);<a name="line.222"></a>
-<span class="sourceLineNo">223</span>  }<a name="line.223"></a>
-<span class="sourceLineNo">224</span><a name="line.224"></a>
-<span class="sourceLineNo">225</span>  @Test<a name="line.225"></a>
-<span class="sourceLineNo">226</span>  public void testSingleCellGetJSON() 
throws IOException, JAXBException {<a name="line.226"></a>
-<span class="sourceLineNo">227</span>    final String path = "/" + TABLE + "/" 
+ ROW_4 + "/" + COLUMN_1;<a name="line.227"></a>
-<span class="sourceLineNo">228</span>    Response response = client.put(path, 
Constants.MIMETYPE_BINARY,<a name="line.228"></a>
-<span class="sourceLineNo">229</span>      Bytes.toBytes(VALUE_4));<a 
name="line.229"></a>
-<span class="sourceLineNo">230</span>    assertEquals(response.getCode(), 
200);<a name="line.230"></a>
-<span class="sourceLineNo">231</span>    Thread.yield();<a name="line.231"></a>
-<span class="sourceLineNo">232</span>    response = client.get(path, 
Constants.MIMETYPE_JSON);<a name="line.232"></a>
-<span class="sourceLineNo">233</span>    assertEquals(response.getCode(), 
200);<a name="line.233"></a>
-<span class="sourceLineNo">234</span>    assertEquals(Constants.MIMETYPE_JSON, 
response.getHeader("content-type"));<a name="line.234"></a>
-<span class="sourceLineNo">235</span>    response = deleteRow(TABLE, ROW_4);<a 
name="line.235"></a>
+<span class="sourceLineNo">201</span>  public void 
testMultipleCellCheckDeletePB() throws IOException, JAXBException {<a 
name="line.201"></a>
+<span class="sourceLineNo">202</span>    Response response = getValuePB(TABLE, 
ROW_1, COLUMN_1);<a name="line.202"></a>
+<span class="sourceLineNo">203</span>    assertEquals(response.getCode(), 
404);<a name="line.203"></a>
+<span class="sourceLineNo">204</span><a name="line.204"></a>
+<span class="sourceLineNo">205</span>    // Add 3 Columns to setup the test<a 
name="line.205"></a>
+<span class="sourceLineNo">206</span>    response = putValuePB(TABLE, ROW_1, 
COLUMN_1, VALUE_1);<a name="line.206"></a>
+<span class="sourceLineNo">207</span>    assertEquals(response.getCode(), 
200);<a name="line.207"></a>
+<span class="sourceLineNo">208</span>    checkValuePB(TABLE, ROW_1, COLUMN_1, 
VALUE_1);<a name="line.208"></a>
+<span class="sourceLineNo">209</span><a name="line.209"></a>
+<span class="sourceLineNo">210</span>    response = putValuePB(TABLE, ROW_1, 
COLUMN_2, VALUE_2);<a name="line.210"></a>
+<span class="sourceLineNo">211</span>    assertEquals(response.getCode(), 
200);<a name="line.211"></a>
+<span class="sourceLineNo">212</span>    checkValuePB(TABLE, ROW_1, COLUMN_2, 
VALUE_2);<a name="line.212"></a>
+<span class="sourceLineNo">213</span><a name="line.213"></a>
+<span class="sourceLineNo">214</span>    response = putValuePB(TABLE, ROW_1, 
COLUMN_3, VALUE_3);<a name="line.214"></a>
+<span class="sourceLineNo">215</span>    assertEquals(response.getCode(), 
200);<a name="line.215"></a>
+<span class="sourceLineNo">216</span>    checkValuePB(TABLE, ROW_1, COLUMN_3, 
VALUE_3);<a name="line.216"></a>
+<span class="sourceLineNo">217</span><a name="line.217"></a>
+<span class="sourceLineNo">218</span>    // Deletes the following columns 
based on Column1 check<a name="line.218"></a>
+<span class="sourceLineNo">219</span>    HashMap&lt;String,String&gt; 
cellsToDelete = new HashMap&lt;String, String&gt;();<a name="line.219"></a>
+<span class="sourceLineNo">220</span>    cellsToDelete.put(COLUMN_2,VALUE_2); 
// Value does not matter<a name="line.220"></a>
+<span class="sourceLineNo">221</span>    cellsToDelete.put(COLUMN_3,VALUE_3); 
// Value does not matter<a name="line.221"></a>
+<span class="sourceLineNo">222</span><a name="line.222"></a>
+<span class="sourceLineNo">223</span>    // On Success update both the cells<a 
name="line.223"></a>
+<span class="sourceLineNo">224</span>    response = checkAndDeletePB(TABLE, 
ROW_1, COLUMN_1, VALUE_1, cellsToDelete);<a name="line.224"></a>
+<span class="sourceLineNo">225</span>    assertEquals(response.getCode(), 
200);<a name="line.225"></a>
+<span class="sourceLineNo">226</span><a name="line.226"></a>
+<span class="sourceLineNo">227</span>    checkValuePB(TABLE, ROW_1, COLUMN_1, 
VALUE_1);<a name="line.227"></a>
+<span class="sourceLineNo">228</span><a name="line.228"></a>
+<span class="sourceLineNo">229</span>    response = getValuePB(TABLE, ROW_1, 
COLUMN_2);<a name="line.229"></a>
+<span class="sourceLineNo">230</span>    assertEquals(response.getCode(), 
404);<a name="line.230"></a>
+<span class="sourceLineNo">231</span><a name="line.231"></a>
+<span class="sourceLineNo">232</span>    response = getValuePB(TABLE, ROW_1, 
COLUMN_3);<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    assertEquals(response.getCode(), 
404);<a name="line.233"></a>
+<span class="sourceLineNo">234</span><a name="line.234"></a>
+<span class="sourceLineNo">235</span>    response = putValuePB(TABLE, ROW_1, 
COLUMN_2, VALUE_2);<a name="line.235"></a>
 <span class="sourceLineNo">236</span>    assertEquals(response.getCode(), 
200);<a name="line.236"></a>
-<span class="sourceLineNo">237</span>  }<a name="line.237"></a>
+<span class="sourceLineNo">237</span>    checkValuePB(TABLE, ROW_1, COLUMN_2, 
VALUE_2);<a name="line.237"></a>
 <span class="sourceLineNo">238</span><a name="line.238"></a>
-<span class="sourceLineNo">239</span>  @Test<a name="line.239"></a>
-<span class="sourceLineNo">240</span>  public void testLatestCellGetJSON() 
throws IOException, JAXBException {<a name="line.240"></a>
-<span class="sourceLineNo">241</span>    final String path = "/" + TABLE + "/" 
+ ROW_4 + "/" + COLUMN_1;<a name="line.241"></a>
-<span class="sourceLineNo">242</span>    CellSetModel cellSetModel = new 
CellSetModel();<a name="line.242"></a>
-<span class="sourceLineNo">243</span>    RowModel rowModel = new 
RowModel(ROW_4);<a name="line.243"></a>
-<span class="sourceLineNo">244</span>    CellModel cellOne = new 
CellModel(Bytes.toBytes(COLUMN_1), 1L,<a name="line.244"></a>
-<span class="sourceLineNo">245</span>      Bytes.toBytes(VALUE_1));<a 
name="line.245"></a>
-<span class="sourceLineNo">246</span>    CellModel cellTwo = new 
CellModel(Bytes.toBytes(COLUMN_1), 2L,<a name="line.246"></a>
-<span class="sourceLineNo">247</span>      Bytes.toBytes(VALUE_2));<a 
name="line.247"></a>
-<span class="sourceLineNo">248</span>    rowModel.addCell(cellOne);<a 
name="line.248"></a>
-<span class="sourceLineNo">249</span>    rowModel.addCell(cellTwo);<a 
name="line.249"></a>
-<span class="sourceLineNo">250</span>    cellSetModel.addRow(rowModel);<a 
name="line.250"></a>
-<span class="sourceLineNo">251</span>    String jsonString = 
jsonMapper.writeValueAsString(cellSetModel);<a name="line.251"></a>
-<span class="sourceLineNo">252</span>    Response response = client.put(path, 
Constants.MIMETYPE_JSON,<a name="line.252"></a>
-<span class="sourceLineNo">253</span>      Bytes.toBytes(jsonString));<a 
name="line.253"></a>
-<span class="sourceLineNo">254</span>    assertEquals(response.getCode(), 
200);<a name="line.254"></a>
-<span class="sourceLineNo">255</span>    Thread.yield();<a name="line.255"></a>
-<span class="sourceLineNo">256</span>    response = client.get(path, 
Constants.MIMETYPE_JSON);<a name="line.256"></a>
-<span class="sourceLineNo">257</span>    assertEquals(response.getCode(), 
200);<a name="line.257"></a>
-<span class="sourceLineNo">258</span>    assertEquals(Constants.MIMETYPE_JSON, 
response.getHeader("content-type"));<a name="line.258"></a>
-<span class="sourceLineNo">259</span>    CellSetModel cellSet = 
jsonMapper.readValue(response.getBody(), CellSetModel.class);<a 
name="line.259"></a>
-<span class="sourceLineNo">260</span>    assertTrue(cellSet.getRows().size() 
== 1);<a name="line.260"></a>
-<span class="sourceLineNo">261</span>    
assertTrue(cellSet.getRows().get(0).getCells().size() == 1);<a 
name="line.261"></a>
-<span class="sourceLineNo">262</span>    CellModel cell = 
cellSet.getRows().get(0).getCells().get(0);<a name="line.262"></a>
-<span class="sourceLineNo">263</span>    assertEquals(VALUE_2 , 
Bytes.toString(cell.getValue()));<a name="line.263"></a>
-<span class="sourceLineNo">264</span>    assertEquals(2L , 
cell.getTimestamp());<a name="line.264"></a>
-<span class="sourceLineNo">265</span>    response = deleteRow(TABLE, ROW_4);<a 
name="line.265"></a>
-<span class="sourceLineNo">266</span>    assertEquals(response.getCode(), 
200);<a name="line.266"></a>
-<span class="sourceLineNo">267</span>  }<a name="line.267"></a>
-<span class="sourceLineNo">268</span><a name="line.268"></a>
-<span class="sourceLineNo">269</span>  @Test<a name="line.269"></a>
-<span class="sourceLineNo">270</span>  public void testURLEncodedKey() throws 
IOException, JAXBException {<a name="line.270"></a>
-<span class="sourceLineNo">271</span>    String urlKey = 
"http://example.com/foo";;<a name="line.271"></a>
-<span class="sourceLineNo">272</span>    StringBuilder path = new 
StringBuilder();<a name="line.272"></a>
-<span class="sourceLineNo">273</span>    path.append('/');<a 
name="line.273"></a>
-<span class="sourceLineNo">274</span>    path.append(TABLE);<a 
name="line.274"></a>
-<span class="sourceLineNo">275</span>    path.append('/');<a 
name="line.275"></a>
-<span class="sourceLineNo">276</span>    path.append(URLEncoder.encode(urlKey, 
HConstants.UTF8_ENCODING));<a name="line.276"></a>
-<span class="sourceLineNo">277</span>    path.append('/');<a 
name="line.277"></a>
-<span class="sourceLineNo">278</span>    path.append(COLUMN_1);<a 
name="line.278"></a>
-<span class="sourceLineNo">279</span>    Response response;<a 
name="line.279"></a>
-<span class="sourceLineNo">280</span>    response = 
putValueXML(path.toString(), TABLE, urlKey, COLUMN_1,<a name="line.280"></a>
-<span class="sourceLineNo">281</span>      VALUE_1);<a name="line.281"></a>
-<span class="sourceLineNo">282</span>    assertEquals(response.getCode(), 
200);<a name="line.282"></a>
-<span class="sourceLineNo">283</span>    checkValueXML(path.toString(), TABLE, 
urlKey, COLUMN_1, VALUE_1);<a name="line.283"></a>
-<span class="sourceLineNo">284</span>  }<a name="line.284"></a>
-<span class="sourceLineNo">285</span><a name="line.285"></a>
-<span class="sourceLineNo">286</span>  @Test<a name="line.286"></a>
-<span class="sourceLineNo">287</span>  public void testNoSuchCF() throws 
IOException, JAXBException {<a name="line.287"></a>
-<span class="sourceLineNo">288</span>    final String goodPath = "/" + TABLE + 
"/" + ROW_1 + "/" + CFA+":";<a name="line.288"></a>
-<span class="sourceLineNo">289</span>    final String badPath = "/" + TABLE + 
"/" + ROW_1 + "/" + "BAD";<a name="line.289"></a>
-<span class="sourceLineNo">290</span>    Response response = 
client.post(goodPath, Constants.MIMETYPE_BINARY,<a name="line.290"></a>
-<span class="sourceLineNo">291</span>      Bytes.toBytes(VALUE_1));<a 
name="line.291"></a>
-<span class="sourceLineNo">292</span>    assertEquals(response.getCode(), 
200);<a name="line.292"></a>
-<span class="sourceLineNo">293</span>    assertEquals(client.get(goodPath, 
Constants.MIMETYPE_BINARY).getCode(),<a name="line.293"></a>
-<span class="sourceLineNo">294</span>      200);<a name="line.294"></a>
-<span class="sourceLineNo">295</span>    assertEquals(client.get(badPath, 
Constants.MIMETYPE_BINARY).getCode(),<a name="line.295"></a>
-<span class="sourceLineNo">296</span>      404);<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    assertEquals(client.get(goodPath, 
Constants.MIMETYPE_BINARY).getCode(),<a name="line.297"></a>
-<span class="sourceLineNo">298</span>      200);<a name="line.298"></a>
-<span class="sourceLineNo">299</span>  }<a name="line.299"></a>
-<span class="sourceLineNo">300</span><a name="line.300"></a>
-<span class="sourceLineNo">301</span>  @Test<a name="line.301"></a>
-<span class="sourceLineNo">302</span>  public void testMultiCellGetPutXML() 
throws IOException, JAXBException {<a name="line.302"></a>
-<span class="sourceLineNo">303</span>    String path = "/" + TABLE + 
"/fakerow";  // deliberate nonexistent row<a name="line.303"></a>
-<span class="sourceLineNo">304</span><a name="line.304"></a>
-<span class="sourceLineNo">305</span>    CellSetModel cellSetModel = new 
CellSetModel();<a name="line.305"></a>
-<span class="sourceLineNo">306</span>    RowModel rowModel = new 
RowModel(ROW_1);<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_1),<a name="line.307"></a>
-<span class="sourceLineNo">308</span>      Bytes.toBytes(VALUE_1)));<a 
name="line.308"></a>
-<span class="sourceLineNo">309</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_2),<a name="line.309"></a>
-<span class="sourceLineNo">310</span>      Bytes.toBytes(VALUE_2)));<a 
name="line.310"></a>
-<span class="sourceLineNo">311</span>    cellSetModel.addRow(rowModel);<a 
name="line.311"></a>
-<span class="sourceLineNo">312</span>    rowModel = new RowModel(ROW_2);<a 
name="line.312"></a>
-<span class="sourceLineNo">313</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_1),<a name="line.313"></a>
-<span class="sourceLineNo">314</span>      Bytes.toBytes(VALUE_3)));<a 
name="line.314"></a>
-<span class="sourceLineNo">315</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_2),<a name="line.315"></a>
-<span class="sourceLineNo">316</span>      Bytes.toBytes(VALUE_4)));<a 
name="line.316"></a>
-<span class="sourceLineNo">317</span>    cellSetModel.addRow(rowModel);<a 
name="line.317"></a>
-<span class="sourceLineNo">318</span>    StringWriter writer = new 
StringWriter();<a name="line.318"></a>
-<span class="sourceLineNo">319</span>    xmlMarshaller.marshal(cellSetModel, 
writer);<a name="line.319"></a>
-<span class="sourceLineNo">320</span>    Response response = client.put(path, 
Constants.MIMETYPE_XML,<a name="line.320"></a>
-<span class="sourceLineNo">321</span>      
Bytes.toBytes(writer.toString()));<a name="line.321"></a>
-<span class="sourceLineNo">322</span>    Thread.yield();<a name="line.322"></a>
-<span class="sourceLineNo">323</span><a name="line.323"></a>
-<span class="sourceLineNo">324</span>    // make sure the fake row was not 
actually created<a name="line.324"></a>
-<span class="sourceLineNo">325</span>    response = client.get(path, 
Constants.MIMETYPE_XML);<a name="line.325"></a>
-<span class="sourceLineNo">326</span>    assertEquals(response.getCode(), 
404);<a name="line.326"></a>
-<span class="sourceLineNo">327</span><a name="line.327"></a>
-<span class="sourceLineNo">328</span>    // check that all of the values were 
created<a name="line.328"></a>
-<span class="sourceLineNo">329</span>    checkValueXML(TABLE, ROW_1, COLUMN_1, 
VALUE_1);<a name="line.329"></a>
-<span class="sourceLineNo">330</span>    checkValueXML(TABLE, ROW_1, COLUMN_2, 
VALUE_2);<a name="line.330"></a>
-<span class="sourceLineNo">331</span>    checkValueXML(TABLE, ROW_2, COLUMN_1, 
VALUE_3);<a name="line.331"></a>
-<span class="sourceLineNo">332</span>    checkValueXML(TABLE, ROW_2, COLUMN_2, 
VALUE_4);<a name="line.332"></a>
-<span class="sourceLineNo">333</span><a name="line.333"></a>
-<span class="sourceLineNo">334</span>    response = deleteRow(TABLE, ROW_1);<a 
name="line.334"></a>
+<span class="sourceLineNo">239</span>    response = putValuePB(TABLE, ROW_1, 
COLUMN_3, VALUE_3);<a name="line.239"></a>
+<span class="sourceLineNo">240</span>    assertEquals(response.getCode(), 
200);<a name="line.240"></a>
+<span class="sourceLineNo">241</span>    checkValuePB(TABLE, ROW_1, COLUMN_3, 
VALUE_3);<a name="line.241"></a>
+<span class="sourceLineNo">242</span><a name="line.242"></a>
+<span class="sourceLineNo">243</span>    // On Failure, we dont update any 
cells<a name="line.243"></a>
+<span class="sourceLineNo">244</span>    response = checkAndDeletePB(TABLE, 
ROW_1, COLUMN_1, VALUE_3, cellsToDelete);<a name="line.244"></a>
+<span class="sourceLineNo">245</span>    assertEquals(response.getCode(), 
304);<a name="line.245"></a>
+<span class="sourceLineNo">246</span>    checkValuePB(TABLE, ROW_1, COLUMN_1, 
VALUE_1);<a name="line.246"></a>
+<span class="sourceLineNo">247</span>    checkValuePB(TABLE, ROW_1, COLUMN_2, 
VALUE_2);<a name="line.247"></a>
+<span class="sourceLineNo">248</span>    checkValuePB(TABLE, ROW_1, COLUMN_3, 
VALUE_3);<a name="line.248"></a>
+<span class="sourceLineNo">249</span><a name="line.249"></a>
+<span class="sourceLineNo">250</span>    response = deleteRow(TABLE, ROW_1);<a 
name="line.250"></a>
+<span class="sourceLineNo">251</span>    assertEquals(response.getCode(), 
200);<a name="line.251"></a>
+<span class="sourceLineNo">252</span>  }<a name="line.252"></a>
+<span class="sourceLineNo">253</span>  @Test<a name="line.253"></a>
+<span class="sourceLineNo">254</span>  public void 
testSingleCellGetPutBinary() throws IOException {<a name="line.254"></a>
+<span class="sourceLineNo">255</span>    final String path = "/" + TABLE + "/" 
+ ROW_3 + "/" + COLUMN_1;<a name="line.255"></a>
+<span class="sourceLineNo">256</span>    final byte[] body = 
Bytes.toBytes(VALUE_3);<a name="line.256"></a>
+<span class="sourceLineNo">257</span>    Response response = client.put(path, 
Constants.MIMETYPE_BINARY, body);<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    assertEquals(response.getCode(), 
200);<a name="line.258"></a>
+<span class="sourceLineNo">259</span>    Thread.yield();<a name="line.259"></a>
+<span class="sourceLineNo">260</span><a name="line.260"></a>
+<span class="sourceLineNo">261</span>    response = client.get(path, 
Constants.MIMETYPE_BINARY);<a name="line.261"></a>
+<span class="sourceLineNo">262</span>    assertEquals(response.getCode(), 
200);<a name="line.262"></a>
+<span class="sourceLineNo">263</span>    
assertEquals(Constants.MIMETYPE_BINARY, response.getHeader("content-type"));<a 
name="line.263"></a>
+<span class="sourceLineNo">264</span>    
assertTrue(Bytes.equals(response.getBody(), body));<a name="line.264"></a>
+<span class="sourceLineNo">265</span>    boolean foundTimestampHeader = 
false;<a name="line.265"></a>
+<span class="sourceLineNo">266</span>    for (Header header: 
response.getHeaders()) {<a name="line.266"></a>
+<span class="sourceLineNo">267</span>      if 
(header.getName().equals("X-Timestamp")) {<a name="line.267"></a>
+<span class="sourceLineNo">268</span>        foundTimestampHeader = true;<a 
name="line.268"></a>
+<span class="sourceLineNo">269</span>        break;<a name="line.269"></a>
+<span class="sourceLineNo">270</span>      }<a name="line.270"></a>
+<span class="sourceLineNo">271</span>    }<a name="line.271"></a>
+<span class="sourceLineNo">272</span>    assertTrue(foundTimestampHeader);<a 
name="line.272"></a>
+<span class="sourceLineNo">273</span><a name="line.273"></a>
+<span class="sourceLineNo">274</span>    response = deleteRow(TABLE, ROW_3);<a 
name="line.274"></a>
+<span class="sourceLineNo">275</span>    assertEquals(response.getCode(), 
200);<a name="line.275"></a>
+<span class="sourceLineNo">276</span>  }<a name="line.276"></a>
+<span class="sourceLineNo">277</span><a name="line.277"></a>
+<span class="sourceLineNo">278</span>  @Test<a name="line.278"></a>
+<span class="sourceLineNo">279</span>  public void testSingleCellGetJSON() 
throws IOException, JAXBException {<a name="line.279"></a>
+<span class="sourceLineNo">280</span>    final String path = "/" + TABLE + "/" 
+ ROW_4 + "/" + COLUMN_1;<a name="line.280"></a>
+<span class="sourceLineNo">281</span>    Response response = client.put(path, 
Constants.MIMETYPE_BINARY,<a name="line.281"></a>
+<span class="sourceLineNo">282</span>      Bytes.toBytes(VALUE_4));<a 
name="line.282"></a>
+<span class="sourceLineNo">283</span>    assertEquals(response.getCode(), 
200);<a name="line.283"></a>
+<span class="sourceLineNo">284</span>    Thread.yield();<a name="line.284"></a>
+<span class="sourceLineNo">285</span>    response = client.get(path, 
Constants.MIMETYPE_JSON);<a name="line.285"></a>
+<span class="sourceLineNo">286</span>    assertEquals(response.getCode(), 
200);<a name="line.286"></a>
+<span class="sourceLineNo">287</span>    assertEquals(Constants.MIMETYPE_JSON, 
response.getHeader("content-type"));<a name="line.287"></a>
+<span class="sourceLineNo">288</span>    response = deleteRow(TABLE, ROW_4);<a 
name="line.288"></a>
+<span class="sourceLineNo">289</span>    assertEquals(response.getCode(), 
200);<a name="line.289"></a>
+<span class="sourceLineNo">290</span>  }<a name="line.290"></a>
+<span class="sourceLineNo">291</span><a name="line.291"></a>
+<span class="sourceLineNo">292</span>  @Test<a name="line.292"></a>
+<span class="sourceLineNo">293</span>  public void testLatestCellGetJSON() 
throws IOException, JAXBException {<a name="line.293"></a>
+<span class="sourceLineNo">294</span>    final String path = "/" + TABLE + "/" 
+ ROW_4 + "/" + COLUMN_1;<a name="line.294"></a>
+<span class="sourceLineNo">295</span>    CellSetModel cellSetModel = new 
CellSetModel();<a name="line.295"></a>
+<span class="sourceLineNo">296</span>    RowModel rowModel = new 
RowModel(ROW_4);<a name="line.296"></a>
+<span class="sourceLineNo">297</span>    CellModel cellOne = new 
CellModel(Bytes.toBytes(COLUMN_1), 1L,<a name="line.297"></a>
+<span class="sourceLineNo">298</span>      Bytes.toBytes(VALUE_1));<a 
name="line.298"></a>
+<span class="sourceLineNo">299</span>    CellModel cellTwo = new 
CellModel(Bytes.toBytes(COLUMN_1), 2L,<a name="line.299"></a>
+<span class="sourceLineNo">300</span>      Bytes.toBytes(VALUE_2));<a 
name="line.300"></a>
+<span class="sourceLineNo">301</span>    rowModel.addCell(cellOne);<a 
name="line.301"></a>
+<span class="sourceLineNo">302</span>    rowModel.addCell(cellTwo);<a 
name="line.302"></a>
+<span class="sourceLineNo">303</span>    cellSetModel.addRow(rowModel);<a 
name="line.303"></a>
+<span class="sourceLineNo">304</span>    String jsonString = 
jsonMapper.writeValueAsString(cellSetModel);<a name="line.304"></a>
+<span class="sourceLineNo">305</span>    Response response = client.put(path, 
Constants.MIMETYPE_JSON,<a name="line.305"></a>
+<span class="sourceLineNo">306</span>      Bytes.toBytes(jsonString));<a 
name="line.306"></a>
+<span class="sourceLineNo">307</span>    assertEquals(response.getCode(), 
200);<a name="line.307"></a>
+<span class="sourceLineNo">308</span>    Thread.yield();<a name="line.308"></a>
+<span class="sourceLineNo">309</span>    response = client.get(path, 
Constants.MIMETYPE_JSON);<a name="line.309"></a>
+<span class="sourceLineNo">310</span>    assertEquals(response.getCode(), 
200);<a name="line.310"></a>
+<span class="sourceLineNo">311</span>    assertEquals(Constants.MIMETYPE_JSON, 
response.getHeader("content-type"));<a name="line.311"></a>
+<span class="sourceLineNo">312</span>    CellSetModel cellSet = 
jsonMapper.readValue(response.getBody(), CellSetModel.class);<a 
name="line.312"></a>
+<span class="sourceLineNo">313</span>    assertTrue(cellSet.getRows().size() 
== 1);<a name="line.313"></a>
+<span class="sourceLineNo">314</span>    
assertTrue(cellSet.getRows().get(0).getCells().size() == 1);<a 
name="line.314"></a>
+<span class="sourceLineNo">315</span>    CellModel cell = 
cellSet.getRows().get(0).getCells().get(0);<a name="line.315"></a>
+<span class="sourceLineNo">316</span>    assertEquals(VALUE_2 , 
Bytes.toString(cell.getValue()));<a name="line.316"></a>
+<span class="sourceLineNo">317</span>    assertEquals(2L , 
cell.getTimestamp());<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    response = deleteRow(TABLE, ROW_4);<a 
name="line.318"></a>
+<span class="sourceLineNo">319</span>    assertEquals(response.getCode(), 
200);<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>  @Test<a name="line.322"></a>
+<span class="sourceLineNo">323</span>  public void testURLEncodedKey() throws 
IOException, JAXBException {<a name="line.323"></a>
+<span class="sourceLineNo">324</span>    String urlKey = 
"http://example.com/foo";;<a name="line.324"></a>
+<span class="sourceLineNo">325</span>    StringBuilder path = new 
StringBuilder();<a name="line.325"></a>
+<span class="sourceLineNo">326</span>    path.append('/');<a 
name="line.326"></a>
+<span class="sourceLineNo">327</span>    path.append(TABLE);<a 
name="line.327"></a>
+<span class="sourceLineNo">328</span>    path.append('/');<a 
name="line.328"></a>
+<span class="sourceLineNo">329</span>    path.append(URLEncoder.encode(urlKey, 
HConstants.UTF8_ENCODING));<a name="line.329"></a>
+<span class="sourceLineNo">330</span>    path.append('/');<a 
name="line.330"></a>
+<span class="sourceLineNo">331</span>    path.append(COLUMN_1);<a 
name="line.331"></a>
+<span class="sourceLineNo">332</span>    Response response;<a 
name="line.332"></a>
+<span class="sourceLineNo">333</span>    response = 
putValueXML(path.toString(), TABLE, urlKey, COLUMN_1,<a name="line.333"></a>
+<span class="sourceLineNo">334</span>      VALUE_1);<a name="line.334"></a>
 <span class="sourceLineNo">335</span>    assertEquals(response.getCode(), 
200);<a name="line.335"></a>
-<span class="sourceLineNo">336</span>    response = deleteRow(TABLE, ROW_2);<a 
name="line.336"></a>
-<span class="sourceLineNo">337</span>    assertEquals(response.getCode(), 
200);<a name="line.337"></a>
-<span class="sourceLineNo">338</span>  }<a name="line.338"></a>
-<span class="sourceLineNo">339</span><a name="line.339"></a>
-<span class="sourceLineNo">340</span>  @Test<a name="line.340"></a>
-<span class="sourceLineNo">341</span>  public void testMultiCellGetPutPB() 
throws IOException {<a name="line.341"></a>
-<span class="sourceLineNo">342</span>    String path = "/" + TABLE + 
"/fakerow";  // deliberate nonexistent row<a name="line.342"></a>
-<span class="sourceLineNo">343</span><a name="line.343"></a>
-<span class="sourceLineNo">344</span>    CellSetModel cellSetModel = new 
CellSetModel();<a name="line.344"></a>
-<span class="sourceLineNo">345</span>    RowModel rowModel = new 
RowModel(ROW_1);<a name="line.345"></a>
-<span class="sourceLineNo">346</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_1),<a name="line.346"></a>
-<span class="sourceLineNo">347</span>      Bytes.toBytes(VALUE_1)));<a 
name="line.347"></a>
-<span class="sourceLineNo">348</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_2),<a name="line.348"></a>
-<span class="sourceLineNo">349</span>      Bytes.toBytes(VALUE_2)));<a 
name="line.349"></a>
-<span class="sourceLineNo">350</span>    cellSetModel.addRow(rowModel);<a 
name="line.350"></a>
-<span class="sourceLineNo">351</span>    rowModel = new RowModel(ROW_2);<a 
name="line.351"></a>
-<span class="sourceLineNo">352</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_1),<a name="line.352"></a>
-<span class="sourceLineNo">353</span>      Bytes.toBytes(VALUE_3)));<a 
name="line.353"></a>
-<span class="sourceLineNo">354</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_2),<a name="line.354"></a>
-<span class="sourceLineNo">355</span>      Bytes.toBytes(VALUE_4)));<a 
name="line.355"></a>
-<span class="sourceLineNo">356</span>    cellSetModel.addRow(rowModel);<a 
name="line.356"></a>
-<span class="sourceLineNo">357</span>    Response response = client.put(path, 
Constants.MIMETYPE_PROTOBUF,<a name="line.357"></a>
-<span class="sourceLineNo">358</span>      
cellSetModel.createProtobufOutput());<a name="line.358"></a>
-<span class="sourceLineNo">359</span>    Thread.yield();<a name="line.359"></a>
-<span class="sourceLineNo">360</span><a name="line.360"></a>
-<span class="sourceLineNo">361</span>    // make sure the fake row was not 
actually created<a name="line.361"></a>
-<span class="sourceLineNo">362</span>    response = client.get(path, 
Constants.MIMETYPE_PROTOBUF);<a name="line.362"></a>
-<span class="sourceLineNo">363</span>    assertEquals(response.getCode(), 
404);<a name="line.363"></a>
-<span class="sourceLineNo">364</span><a name="line.364"></a>
-<span class="sourceLineNo">365</span>    // check that all of the values were 
created<a name="line.365"></a>
-<span class="sourceLineNo">366</span>    checkValuePB(TABLE, ROW_1, COLUMN_1, 
VALUE_1);<a name="line.366"></a>
-<span class="sourceLineNo">367</span>    checkValuePB(TABLE, ROW_1, COLUMN_2, 
VALUE_2);<a name="line.367"></a>
-<span class="sourceLineNo">368</span>    checkValuePB(TABLE, ROW_2, COLUMN_1, 
VALUE_3);<a name="line.368"></a>
-<span class="sourceLineNo">369</span>    checkValuePB(TABLE, ROW_2, COLUMN_2, 
VALUE_4);<a name="line.369"></a>
-<span class="sourceLineNo">370</span><a name="line.370"></a>
-<span class="sourceLineNo">371</span>    response = deleteRow(TABLE, ROW_1);<a 
name="line.371"></a>
-<span class="sourceLineNo">372</span>    assertEquals(response.getCode(), 
200);<a name="line.372"></a>
-<span class="sourceLineNo">373</span>    response = deleteRow(TABLE, ROW_2);<a 
name="line.373"></a>
-<span class="sourceLineNo">374</span>    assertEquals(response.getCode(), 
200);<a name="line.374"></a>
-<span class="sourceLineNo">375</span>  }<a name="line.375"></a>
+<span class="sourceLineNo">336</span>    checkValueXML(path.toString(), TABLE, 
urlKey, COLUMN_1, VALUE_1);<a name="line.336"></a>
+<span class="sourceLineNo">337</span>  }<a name="line.337"></a>
+<span class="sourceLineNo">338</span><a name="line.338"></a>
+<span class="sourceLineNo">339</span>  @Test<a name="line.339"></a>
+<span class="sourceLineNo">340</span>  public void testNoSuchCF() throws 
IOException, JAXBException {<a name="line.340"></a>
+<span class="sourceLineNo">341</span>    final String goodPath = "/" + TABLE + 
"/" + ROW_1 + "/" + CFA+":";<a name="line.341"></a>
+<span class="sourceLineNo">342</span>    final String badPath = "/" + TABLE + 
"/" + ROW_1 + "/" + "BAD";<a name="line.342"></a>
+<span class="sourceLineNo">343</span>    Response response = 
client.post(goodPath, Constants.MIMETYPE_BINARY,<a name="line.343"></a>
+<span class="sourceLineNo">344</span>      Bytes.toBytes(VALUE_1));<a 
name="line.344"></a>
+<span class="sourceLineNo">345</span>    assertEquals(response.getCode(), 
200);<a name="line.345"></a>
+<span class="sourceLineNo">346</span>    assertEquals(client.get(goodPath, 
Constants.MIMETYPE_BINARY).getCode(),<a name="line.346"></a>
+<span class="sourceLineNo">347</span>      200);<a name="line.347"></a>
+<span class="sourceLineNo">348</span>    assertEquals(client.get(badPath, 
Constants.MIMETYPE_BINARY).getCode(),<a name="line.348"></a>
+<span class="sourceLineNo">349</span>      404);<a name="line.349"></a>
+<span class="sourceLineNo">350</span>    assertEquals(client.get(goodPath, 
Constants.MIMETYPE_BINARY).getCode(),<a name="line.350"></a>
+<span class="sourceLineNo">351</span>      200);<a name="line.351"></a>
+<span class="sourceLineNo">352</span>  }<a name="line.352"></a>
+<span class="sourceLineNo">353</span><a name="line.353"></a>
+<span class="sourceLineNo">354</span>  @Test<a name="line.354"></a>
+<span class="sourceLineNo">355</span>  public void testMultiCellGetPutXML() 
throws IOException, JAXBException {<a name="line.355"></a>
+<span class="sourceLineNo">356</span>    String path = "/" + TABLE + 
"/fakerow";  // deliberate nonexistent row<a name="line.356"></a>
+<span class="sourceLineNo">357</span><a name="line.357"></a>
+<span class="sourceLineNo">358</span>    CellSetModel cellSetModel = new 
CellSetModel();<a name="line.358"></a>
+<span class="sourceLineNo">359</span>    RowModel rowModel = new 
RowModel(ROW_1);<a name="line.359"></a>
+<span class="sourceLineNo">360</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_1),<a name="line.360"></a>
+<span class="sourceLineNo">361</span>      Bytes.toBytes(VALUE_1)));<a 
name="line.361"></a>
+<span class="sourceLineNo">362</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_2),<a name="line.362"></a>
+<span class="sourceLineNo">363</span>      Bytes.toBytes(VALUE_2)));<a 
name="line.363"></a>
+<span class="sourceLineNo">364</span>    cellSetModel.addRow(rowModel);<a 
name="line.364"></a>
+<span class="sourceLineNo">365</span>    rowModel = new RowModel(ROW_2);<a 
name="line.365"></a>
+<span class="sourceLineNo">366</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_1),<a name="line.366"></a>
+<span class="sourceLineNo">367</span>      Bytes.toBytes(VALUE_3)));<a 
name="line.367"></a>
+<span class="sourceLineNo">368</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_2),<a name="line.368"></a>
+<span class="sourceLineNo">369</span>      Bytes.toBytes(VALUE_4)));<a 
name="line.369"></a>
+<span class="sourceLineNo">370</span>    cellSetModel.addRow(rowModel);<a 
name="line.370"></a>
+<span class="sourceLineNo">371</span>    StringWriter writer = new 
StringWriter();<a name="line.371"></a>
+<span class="sourceLineNo">372</span>    xmlMarshaller.marshal(cellSetModel, 
writer);<a name="line.372"></a>
+<span class="sourceLineNo">373</span>    Response response = client.put(path, 
Constants.MIMETYPE_XML,<a name="line.373"></a>
+<span class="sourceLineNo">374</span>      
Bytes.toBytes(writer.toString()));<a name="line.374"></a>
+<span class="sourceLineNo">375</span>    Thread.yield();<a name="line.375"></a>
 <span class="sourceLineNo">376</span><a name="line.376"></a>
-<span class="sourceLineNo">377</span>  @Test<a name="line.377"></a>
-<span class="sourceLineNo">378</span>  public void testStartEndRowGetPutXML() 
throws IOException, JAXBException {<a name="line.378"></a>
-<span class="sourceLineNo">379</span>    String[] rows = { ROW_1, ROW_2, ROW_3 
};<a name="line.379"></a>
-<span class="sourceLineNo">380</span>    String[] values = { VALUE_1, VALUE_2, 
VALUE_3 };<a name="line.380"></a>
-<span class="sourceLineNo">381</span>    Response response = null;<a 
name="line.381"></a>
-<span class="sourceLineNo">382</span>    for (int i = 0; i &lt; rows.length; 
i++) {<a name="line.382"></a>
-<span class="sourceLineNo">383</span>      response = putValueXML(TABLE, 
rows[i], COLUMN_1, values[i]);<a name="line.383"></a>
-<span class="sourceLineNo">384</span>      assertEquals(200, 
response.getCode());<a name="line.384"></a>
-<span class="sourceLineNo">385</span>      checkValueXML(TABLE, rows[i], 
COLUMN_1, values[i]);<a name="line.385"></a>
-<span class="sourceLineNo">386</span>    }<a name="line.386"></a>
-<span class="sourceLineNo">387</span>    response = getValueXML(TABLE, 
rows[0], rows[2], COLUMN_1);<a name="line.387"></a>
-<span class="sourceLineNo">388</span>    assertEquals(200, 
response.getCode());<a name="line.388"></a>
-<span class="sourceLineNo">389</span>    CellSetModel cellSet = 
(CellSetModel)<a name="line.389"></a>
-<span class="sourceLineNo">390</span>      xmlUnmarshaller.unmarshal(new 
ByteArrayInputStream(response.getBody()));<a name="line.390"></a>
-<span class="sourceLineNo">391</span>    assertEquals(2, 
cellSet.getRows().size());<a name="line.391"></a>
-<span class="sourceLineNo">392</span>    for (int i = 0; i &lt; 
cellSet.getRows().size()-1; i++) {<a name="line.392"></a>
-<span class="sourceLineNo">393</span>      RowModel rowModel = 
cellSet.getRows().get(i);<a name="line.393"></a>
-<span class="sourceLineNo">394</span>      for (CellModel cell: 
rowModel.getCells()) {<a name="line.394"></a>
-<span class="sourceLineNo">395</span>        assertEquals(COLUMN_1, 
Bytes.toString(cell.getColumn()));<a name="line.395"></a>
-<span class="sourceLineNo">396</span>        assertEquals(values[i], 
Bytes.toString(cell.getValue()));<a name="line.396"></a>
-<span class="sourceLineNo">397</span>      }<a name="line.397"></a>
-<span class="sourceLineNo">398</span>    }<a name="line.398"></a>
-<span class="sourceLineNo">399</span>    for (String row : rows) {<a 
name="line.399"></a>
-<span class="sourceLineNo">400</span>      response = deleteRow(TABLE, row);<a 
name="line.400"></a>
-<span class="sourceLineNo">401</span>      assertEquals(200, 
response.getCode());<a name="line.401"></a>
-<span class="sourceLineNo">402</span>    }<a name="line.402"></a>
-<span class="sourceLineNo">403</span>  }<a name="line.403"></a>
-<span class="sourceLineNo">404</span><a name="line.404"></a>
-<span class="sourceLineNo">405</span>  @Test<a name="line.405"></a>
-<span class="sourceLineNo">406</span>  public void testInvalidCheckParam() 
throws IOException, JAXBException {<a name="line.406"></a>
-<span class="sourceLineNo">407</span>    CellSetModel cellSetModel = new 
CellSetModel();<a name="line.407"></a>
-<span class="sourceLineNo">408</span>    RowModel rowModel = new 
RowModel(ROW_1);<a name="line.408"></a>
-<span class="sourceLineNo">409</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_1),<a name="line.409"></a>
-<span class="sourceLineNo">410</span>      Bytes.toBytes(VALUE_1)));<a 
name="line.410"></a>
-<span class="sourceLineNo">411</span>    cellSetModel.addRow(rowModel);<a 
name="line.411"></a>
-<span class="sourceLineNo">412</span>    StringWriter writer = new 
StringWriter();<a name="line.412"></a>
-<span class="sourceLineNo">413</span>    xmlMarshaller.marshal(cellSetModel, 
writer);<a name="line.413"></a>
-<span class="sourceLineNo">414</span><a name="line.414"></a>
-<span class="sourceLineNo">415</span>    final String path = "/" + TABLE + "/" 
+ ROW_1 + "/" + COLUMN_1 + "?check=blah";<a name="line.415"></a>
-<span class="sourceLineNo">416</span><a name="line.416"></a>
-<span class="sourceLineNo">417</span>    Response response = client.put(path, 
Constants.MIMETYPE_XML,<a name="line.417"></a>
-<span class="sourceLineNo">418</span>      
Bytes.toBytes(writer.toString()));<a name="line.418"></a>
-<span class="sourceLineNo">419</span>    assertEquals(response.getCode(), 
400);<a name="line.419"></a>
-<span class="sourceLineNo">420</span>  }<a name="line.420"></a>
-<span class="sourceLineNo">421</span><a name="line.421"></a>
-<span class="sourceLineNo">422</span>  @Test<a name="line.422"></a>
-<span class="sourceLineNo">423</span>  public void testInvalidColumnPut() 
throws IOException, JAXBException {<a name="line.423"></a>
-<span class="sourceLineNo">424</span>    String dummyColumn = 
"doesnot:exist";<a name="line.424"></a>
-<span class="sourceLineNo">425</span>    CellSetModel cellSetModel = new 
CellSetModel();<a name="line.425"></a>
-<span class="sourceLineNo">426</span>    RowModel rowModel = new 
RowModel(ROW_1);<a name="line.426"></a>
-<span class="sourceLineNo">427</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(dummyColumn),<a name="line.427"></a>
-<span class="sourceLineNo">428</span>      Bytes.toBytes(VALUE_1)));<a 
name="line.428"></a>
-<span class="sourceLineNo">429</span>    cellSetModel.addRow(rowModel);<a 
name="line.429"></a>
-<span class="sourceLineNo">430</span>    StringWriter writer = new 
StringWriter();<a name="line.430"></a>
-<span class="sourceLineNo">431</span>    xmlMarshaller.marshal(cellSetModel, 
writer);<a name="line.431"></a>
-<span class="sourceLineNo">432</span><a name="line.432"></a>
-<span class="sourceLineNo">433</span>    final String path = "/" + TABLE + "/" 
+ ROW_1 + "/" + dummyColumn;<a name="line.433"></a>
-<span class="sourceLineNo">434</span><a name="line.434"></a>
-<span class="sourceLineNo">435</span>    Response response = client.put(path, 
Constants.MIMETYPE_XML,<a name="line.435"></a>
-<span class="sourceLineNo">436</span>      
Bytes.toBytes(writer.toString()));<a name="line.436"></a>
-<span class="sourceLineNo">437</span>    assertEquals(response.getCode(), 
404);<a name="line.437"></a>
-<span class="sourceLineNo">438</span>  }<a name="line.438"></a>
-<span class="sourceLineNo">439</span><a name="line.439"></a>
-<span class="sourceLineNo">440</span>  @Test<a name="line.440"></a>
-<span class="sourceLineNo">441</span>  public void testMultiCellGetJson() 
throws IOException, JAXBException {<a name="line.441"></a>
-<span class="sourceLineNo">442</span>    String path = "/" + TABLE + 
"/fakerow";  // deliberate nonexistent row<a name="line.442"></a>
-<span class="sourceLineNo">443</span><a name="line.443"></a>
-<span class="sourceLineNo">444</span>    CellSetModel cellSetModel = new 
CellSetModel();<a name="line.444"></a>
-<span class="sourceLineNo">445</span>    RowModel rowModel = new 
RowModel(ROW_1);<a name="line.445"></a>
-<span class="sourceLineNo">446</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_1),<a name="line.446"></a>
-<span class="sourceLineNo">447</span>      Bytes.toBytes(VALUE_1)));<a 
name="line.447"></a>
-<span class="sourceLineNo">448</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_2),<a name="line.448"></a>
-<span class="sourceLineNo">449</span>      Bytes.toBytes(VALUE_2)));<a 
name="line.449"></a>
-<span class="sourceLineNo">450</span>    cellSetModel.addRow(rowModel);<a 
name="line.450"></a>
-<span class="sourceLineNo">451</span>    rowModel = new RowModel(ROW_2);<a 
name="line.451"></a>
-<span class="sourceLineNo">452</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_1),<a name="line.452"></a>
-<span class="sourceLineNo">453</span>      Bytes.toBytes(VALUE_3)));<a 
name="line.453"></a>
-<span class="sourceLineNo">454</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_2),<a name="line.454"></a>
-<span class="sourceLineNo">455</span>      Bytes.toBytes(VALUE_4)));<a 
name="line.455"></a>
-<span class="sourceLineNo">456</span>    cellSetModel.addRow(rowModel);<a 
name="line.456"></a>
-<span class="sourceLineNo">457</span>    String jsonString = 
jsonMapper.writeValueAsString(cellSetModel);<a name="line.457"></a>
-<span class="sourceLineNo">458</span><a name="line.458"></a>
-<span class="sourceLineNo">459</span>    Response response = client.put(path, 
Constants.MIMETYPE_JSON,<a name="line.459"></a>
-<span class="sourceLineNo">460</span>      Bytes.toBytes(jsonString));<a 
name="line.460"></a>
-<span class="sourceLineNo">461</span>    Thread.yield();<a name="line.461"></a>
-<span class="sourceLineNo">462</span><a name="line.462"></a>
-<span class="sourceLineNo">463</span>    // make sure the fake row was not 
actually created<a name="line.463"></a>
-<span class="sourceLineNo">464</span>    response = client.get(path, 
Constants.MIMETYPE_JSON);<a name="line.464"></a>
-<span class="sourceLineNo">465</span>    assertEquals(response.getCode(), 
404);<a name="line.465"></a>
-<span class="sourceLineNo">466</span><a name="line.466"></a>
-<span class="sourceLineNo">467</span>    // check that all of the values were 
created<a name="line.467"></a>
-<span class="sourceLineNo">468</span>    checkValueJSON(TABLE, ROW_1, 
COLUMN_1, VALUE_1);<a name="line.468"></a>
-<span class="sourceLineNo">469</span>    checkValueJSON(TABLE, ROW_1, 
COLUMN_2, VALUE_2);<a name="line.469"></a>
-<span class="sourceLineNo">470</span>    checkValueJSON(TABLE, ROW_2, 
COLUMN_1, VALUE_3);<a name="line.470"></a>
-<span class="sourceLineNo">471</span>    checkValueJSON(TABLE, ROW_2, 
COLUMN_2, VALUE_4);<a name="line.471"></a>
-<span class="sourceLineNo">472</span><a name="line.472"></a>
-<span class="sourceLineNo">473</span>    response = deleteRow(TABLE, ROW_1);<a 
name="line.473"></a>
-<span class="sourceLineNo">474</span>    assertEquals(response.getCode(), 
200);<a name="line.474"></a>
-<span class="sourceLineNo">475</span>    response = deleteRow(TABLE, ROW_2);<a 
name="line.475"></a>
-<span class="sourceLineNo">476</span>    assertEquals(response.getCode(), 
200);<a name="line.476"></a>
-<span class="sourceLineNo">477</span>  }<a name="line.477"></a>
-<span class="sourceLineNo">478</span>  <a name="line.478"></a>
-<span class="sourceLineNo">479</span>  @Test<a name="line.479"></a>
-<span class="sourceLineNo">480</span>  public void testMetrics() throws 
IOException, JAXBException {<a name="line.480"></a>
-<span class="sourceLineNo">481</span>    final String path = "/" + TABLE + "/" 
+ ROW_4 + "/" + COLUMN_1;<a name="line.481"></a>
-<span class="sourceLineNo">482</span>    Response response = client.put(path, 
Constants.MIMETYPE_BINARY,<a name="line.482"></a>
-<span class="sourceLineNo">483</span>        Bytes.toBytes(VALUE_4));<a 
name="line.483"></a>
-<span class="sourceLineNo">484</span>    assertEquals(response.getCode(), 
200);<a name="line.484"></a>
-<span class="sourceLineNo">485</span>    Thread.yield();<a name="line.485"></a>
-<span class="sourceLineNo">486</span>    response = client.get(path, 
Constants.MIMETYPE_JSON);<a name="line.486"></a>
-<span class="sourceLineNo">487</span>    assertEquals(response.getCode(), 
200);<a name="line.487"></a>
-<span class="sourceLineNo">488</span>    assertEquals(Constants.MIMETYPE_JSON, 
response.getHeader("content-type"));<a name="line.488"></a>
-<span class="sourceLineNo">489</span>    response = deleteRow(TABLE, ROW_4);<a 
name="line.489"></a>
-<span class="sourceLineNo">490</span>    assertEquals(response.getCode(), 
200);<a name="line.490"></a>
-<span class="sourceLineNo">491</span><a name="line.491"></a>
-<span class="sourceLineNo">492</span>    UserProvider userProvider = 
UserProvider.instantiate(conf);<a name="line.492"></a>
-<span class="sourceLineNo">493</span>    
METRICS_ASSERT.assertCounterGt("requests", 2l,<a name="line.493"></a>
-<span class="sourceLineNo">494</span>      RESTServlet.getInstance(conf, 
userProvider).getMetrics().getSource());<a name="line.494"></a>
-<span class="sourceLineNo">495</span><a name="line.495"></a>
-<span class="sourceLineNo">496</span>    
METRICS_ASSERT.assertCounterGt("successfulGet", 0l,<a name="line.496"></a>
-<span class="sourceLineNo">497</span>      RESTServlet.getInstance(conf, 
userProvider).getMetrics().getSource());<a name="line.497"></a>
-<span class="sourceLineNo">498</span><a name="line.498"></a>
-<span class="sourceLineNo">499</span>    
METRICS_ASSERT.assertCounterGt("successfulPut", 0l,<a name="line.499"></a>
-<span class="sourceLineNo">500</span>      RESTServlet.getInstance(conf, 
userProvider).getMetrics().getSource());<a name="line.500"></a>
-<span class="sourceLineNo">501</span><a name="line.501"></a>
-<span class="sourceLineNo">502</span>    
METRICS_ASSERT.assertCounterGt("successfulDelete", 0l,<a name="line.502"></a>
-<span class="sourceLineNo">503</span>      RESTServlet.getInstance(conf, 
userProvider).getMetrics().getSource());<a name="line.503"></a>
-<span class="sourceLineNo">504</span>  }<a name="line.504"></a>
-<span class="sourceLineNo">505</span>  <a name="line.505"></a>
-<span class="sourceLineNo">506</span>  @Test<a name="line.506"></a>
-<span class="sourceLineNo">507</span>  public void testMultiColumnGetXML() 
throws Exception {<a name="line.507"></a>
-<span class="sourceLineNo">508</span>    String path = "/" + TABLE + 
"/fakerow";<a name="line.508"></a>
-<span class="sourceLineNo">509</span>    CellSetModel cellSetModel = new 
CellSetModel();<a name="line.509"></a>
-<span class="sourceLineNo">510</span>    RowModel rowModel = new 
RowModel(ROW_1);<a name="line.510"></a>
-<span class="sourceLineNo">511</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_1), Bytes.toBytes(VALUE_1)));<a 
name="line.511"></a>
-<span class="sourceLineNo">512</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_2), Bytes.toBytes(VALUE_2)));<a 
name="line.512"></a>
-<span class="sourceLineNo">513</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_3), Bytes.toBytes(VALUE_2)));<a 
name="line.513"></a>
-<span class="sourceLineNo">514</span>    cellSetModel.addRow(rowModel);<a 
name="line.514"></a>
-<span class="sourceLineNo">515</span>    StringWriter writer = new 
StringWriter();<a name="line.515"></a>
-<span class="sourceLineNo">516</span>    xmlMarshaller.marshal(cellSetModel, 
writer);<a name="line.516"></a>
-<span class="sourceLineNo">517</span><a name="line.517"></a>
-<span class="sourceLineNo">518</span>    Response response = client.put(path, 
Constants.MIMETYPE_XML, Bytes.toBytes(writer.toString()));<a 
name="line.518"></a>
-<span class="sourceLineNo">519</span>    Thread.yield();<a name="line.519"></a>
-<span class="sourceLineNo">520</span><a name="line.520"></a>
-<span class="sourceLineNo">521</span>    // make sure the fake row was not 
actually created<a name="line.521"></a>
-<span class="sourceLineNo">522</span>    response = client.get(path, 
Constants.MIMETYPE_XML);<a name="line.522"></a>
-<span class="sourceLineNo">523</span>    assertEquals(response.getCode(), 
404);<a name="line.523"></a>
-<span class="sourceLineNo">524</span><a name="line.524"></a>
-<span class="sourceLineNo">525</span>    // Try getting all the column values 
at once.<a name="line.525"></a>
-<span class="sourceLineNo">526</span>    path = "/" + TABLE + "/" + ROW_1 + 
"/" + COLUMN_1 + "," + COLUMN_2 + "," + COLUMN_3;<a name="line.526"></a>
-<span class="sourceLineNo">527</span>    response = client.get(path, 
Constants.MIMETYPE_XML);<a name="line.527"></a>
-<span class="sourceLineNo">528</span>    assertEquals(200, 
response.getCode());<a name="line.528"></a>
-<span class="sourceLineNo">529</span>    CellSetModel cellSet = (CellSetModel) 
xmlUnmarshaller.unmarshal(new ByteArrayInputStream(response<a 
name="line.529"></a>
-<span class="sourceLineNo">530</span>        .getBody()));<a 
name="line.530"></a>
-<span class="sourceLineNo">531</span>    assertTrue(cellSet.getRows().size() 
== 1);<a name="line.531"></a>
-<span class="sourceLineNo">532</span>    
assertTrue(cellSet.getRows().get(0).getCells().size() == 3);<a 
name="line.532"></a>
-<span class="sourceLineNo">533</span>    List&lt;CellModel&gt; cells = 
cellSet.getRows().get(0).getCells();<a name="line.533"></a>
-<span class="sourceLineNo">534</span><a name="line.534"></a>
-<span class="sourceLineNo">535</span>    assertTrue(containsCellModel(cells, 
COLUMN_1, VALUE_1));<a name="line.535"></a>
-<span class="sourceLineNo">536</span>    assertTrue(containsCellModel(cells, 
COLUMN_2, VALUE_2));<a name="line.536"></a>
-<span class="sourceLineNo">537</span>    assertTrue(containsCellModel(cells, 
COLUMN_3, VALUE_2));<a name="line.537"></a>
-<span class="sourceLineNo">538</span>    response = deleteRow(TABLE, ROW_1);<a 
name="line.538"></a>
-<span class="sourceLineNo">539</span>    assertEquals(response.getCode(), 
200);<a name="line.539"></a>
-<span class="sourceLineNo">540</span>  }<a name="line.540"></a>
-<span class="sourceLineNo">541</span><a name="line.541"></a>
-<span class="sourceLineNo">542</span>  private boolean 
containsCellModel(List&lt;CellModel&gt; cells, String column, String value) {<a 
name="line.542"></a>
-<span class="sourceLineNo">543</span>    boolean contains = false;<a 
name="line.543"></a>
-<span class="sourceLineNo">544</span>    for (CellModel cell : cells) {<a 
name="line.544"></a>
-<span class="sourceLineNo">545</span>      if 
(Bytes.toString(cell.getColumn()).equals(column)<a name="line.545"></a>
-<span class="sourceLineNo">546</span>          &amp;&amp; 
Bytes.toString(cell.getValue()).equals(value)) {<a name="line.546"></a>
-<span class="sourceLineNo">547</span>        contains = true;<a 
name="line.547"></a>
-<span class="sourceLineNo">548</span>        return contains;<a 
name="line.548"></a>
-<span class="sourceLineNo">549</span>      }<a name="line.549"></a>
-<span class="sourceLineNo">550</span>    }<a name="line.550"></a>
-<span class="sourceLineNo">551</span>    return contains;<a 
name="line.551"></a>
-<span class="sourceLineNo">552</span>  }<a name="line.552"></a>
-<span class="sourceLineNo">553</span><a name="line.553"></a>
-<span class="sourceLineNo">554</span>  @Test<a name="line.554"></a>
-<span class="sourceLineNo">555</span>  public void 
testSuffixGlobbingXMLWithNewScanner() throws IOException, JAXBException {<a 
name="line.555"></a>
-<span class="sourceLineNo">556</span>    String path = "/" + TABLE + 
"/fakerow";  // deliberate nonexistent row<a name="line.556"></a>
-<span class="sourceLineNo">557</span><a name="line.557"></a>
-<span class="sourceLineNo">558</span>    CellSetModel cellSetModel = new 
CellSetModel();<a name="line.558"></a>
-<span class="sourceLineNo">559</span>    RowModel rowModel = new 
RowModel(ROW_1);<a name="line.559"></a>
-<span class="sourceLineNo">560</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_1),<a name="line.560"></a>
-<span class="sourceLineNo">561</span>      Bytes.toBytes(VALUE_1)));<a 
name="line.561"></a>
-<span class="sourceLineNo">562</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_2),<a name="line.562"></a>
-<span class="sourceLineNo">563</span>      Bytes.toBytes(VALUE_2)));<a 
name="line.563"></a>
-<span class="sourceLineNo">564</span>    cellSetModel.addRow(rowModel);<a 
name="line.564"></a>
-<span class="sourceLineNo">565</span>    rowModel = new RowModel(ROW_2);<a 
name="line.565"></a>
-<span class="sourceLineNo">566</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_1),<a name="line.566"></a>
-<span class="sourceLineNo">567</span>      Bytes.toBytes(VALUE_3)));<a 
name="line.567"></a>
-<span class="sourceLineNo">568</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_2),<a name="line.568"></a>
-<span class="sourceLineNo">569</span>      Bytes.toBytes(VALUE_4)));<a 
name="line.569"></a>
-<span class="sourceLineNo">570</span>    cellSetModel.addRow(rowModel);<a 
name="line.570"></a>
-<span class="sourceLineNo">571</span>    StringWriter writer = new 
StringWriter();<a name="line.571"></a>
-<span class="sourceLineNo">572</span>    xmlMarshaller.marshal(cellSetModel, 
writer);<a name="line.572"></a>
-<span class="sourceLineNo">573</span>    Response response = client.put(path, 
Constants.MIMETYPE_XML,<a name="line.573"></a>
-<span class="sourceLineNo">574</span>      
Bytes.toBytes(writer.toString()));<a name="line.574"></a>
-<span class="sourceLineNo">575</span>    Thread.yield();<a name="line.575"></a>
-<span class="sourceLineNo">576</span><a name="line.576"></a>
-<span class="sourceLineNo">577</span>    // make sure the fake row was not 
actually created<a name="line.577"></a>
-<span class="sourceLineNo">578</span>    response = client.get(path, 
Constants.MIMETYPE_XML);<a name="line.578"></a>
-<span class="sourceLineNo">579</span>    assertEquals(response.getCode(), 
404);<a name="line.579"></a>
-<span class="sourceLineNo">580</span><a name="line.580"></a>
-<span class="sourceLineNo">581</span>    // check that all of the values were 
created<a name="line.581"></a>
-<span class="sourceLineNo">582</span>    StringBuilder query = new 
StringBuilder();<a name="line.582"></a>
-<span class="sourceLineNo">583</span>    query.append('/');<a 
name="line.583"></a>
-<span class="sourceLineNo">584</span>    query.append(TABLE);<a 
name="line.584"></a>
-<span class="sourceLineNo">585</span>    query.append('/');<a 
name="line.585"></a>
-<span class="sourceLineNo">586</span>    query.append("testrow*");<a 
name="line.586"></a>
-<span class="sourceLineNo">587</span>    response = 
client.get(query.toString(), Constants.MIMETYPE_XML);<a name="line.587"></a>
-<span class="sourceLineNo">588</span>    assertEquals(response.getCode(), 
200);<a name="line.588"></a>
-<span class="sourceLineNo">589</span>    assertEquals(Constants.MIMETYPE_XML, 
response.getHeader("content-type"));<a name="line.589"></a>
-<span class="sourceLineNo">590</span>    CellSetModel cellSet = 
(CellSetModel)<a name="line.590"></a>
-<span class="sourceLineNo">591</span>      xmlUnmarshaller.unmarshal(new 
ByteArrayInputStream(response.getBody()));<a name="line.591"></a>
-<span class="sourceLineNo">592</span>    assertTrue(cellSet.getRows().size() 
== 2);<a name="line.592"></a>
-<span class="sourceLineNo">593</span><a name="line.593"></a>
-<span class="sourceLineNo">594</span>    response = deleteRow(TABLE, ROW_1);<a 
name="line.594"></a>
-<span class="sourceLineNo">595</span>    assertEquals(response.getCode(), 
200);<a name="line.595"></a>
-<span class="sourceLineNo">596</span>    response = deleteRow(TABLE, ROW_2);<a 
name="line.596"></a>
-<span class="sourceLineNo">597</span>    assertEquals(response.getCode(), 
200);<a name="line.597"></a>
-<span class="sourceLineNo">598</span>  }<a name="line.598"></a>
-<span class="sourceLineNo">599</span><a name="line.599"></a>
-<span class="sourceLineNo">600</span>  @Test<a name="line.600"></a>
-<span class="sourceLineNo">601</span>  public void testSuffixGlobbingXML() 
throws IOException, JAXBException {<a name="line.601"></a>
-<span class="sourceLineNo">602</span>    String path = "/" + TABLE + 
"/fakerow";  // deliberate nonexistent row<a name="line.602"></a>
-<span class="sourceLineNo">603</span><a name="line.603"></a>
-<span class="sourceLineNo">604</span>    CellSetModel cellSetModel = new 
CellSetModel();<a name="line.604"></a>
-<span class="sourceLineNo">605</span>    RowModel rowModel = new 
RowModel(ROW_1);<a name="line.605"></a>
-<span class="sourceLineNo">606</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_1),<a name="line.606"></a>
-<span class="sourceLineNo">607</span>      Bytes.toBytes(VALUE_1)));<a 
name="line.607"></a>
-<span class="sourceLineNo">608</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_2),<a name="line.608"></a>
-<span class="sourceLineNo">609</span>      Bytes.toBytes(VALUE_2)));<a 
name="line.609"></a>
-<span class="sourceLineNo">610</span>    cellSetModel.addRow(rowModel);<a 
name="line.610"></a>
-<span class="sourceLineNo">611</span>    rowModel = new RowModel(ROW_2);<a 
name="line.611"></a>
-<span class="sourceLineNo">612</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_1),<a name="line.612"></a>
-<span class="sourceLineNo">613</span>      Bytes.toBytes(VALUE_3)));<a 
name="line.613"></a>
-<span class="sourceLineNo">614</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_2),<a name="line.614"></a>
-<span class="sourceLineNo">615</span>      Bytes.toBytes(VALUE_4)));<a 
name="line.615"></a>
-<span class="sourceLineNo">616</span>    cellSetModel.addRow(rowModel);<a 
name="line.616"></a>
-<span class="sourceLineNo">617</span>    StringWriter writer = new 
StringWriter();<a name="line.617"></a>
-<span class="sourceLineNo">618</span>    xmlMarshaller.marshal(cellSetModel, 
writer);<a name="line.618"></a>
-<span class="sourceLineNo">619</span>    Response response = client.put(path, 
Constants.MIMETYPE_XML,<a name="line.619"></a>
-<span class="sourceLineNo">620</span>      
Bytes.toBytes(writer.toString()));<a name="line.620"></a>
-<span class="sourceLineNo">621</span>    Thread.yield();<a name="line.621"></a>
-<span class="sourceLineNo">622</span><a name="line.622"></a>
-<span class="sourceLineNo">623</span>    // make sure the fake row was not 
actually created<a name="line.623"></a>
-<span class="sourceLineNo">624</span>    response = client.get(path, 
Constants.MIMETYPE_XML);<a name="line.624"></a>
-<span class="sourceLineNo">625</span>    assertEquals(response.getCode(), 
404);<a name="line.625"></a>
-<span class="sourceLineNo">626</span><a name="line.626"></a>
-<span class="sourceLineNo">627</span>    // check that all of the values were 
created<a name="line.627"></a>
-<span class="sourceLineNo">628</span>    StringBuilder query = new 
StringBuilder();<a name="line.628"></a>
-<span class="sourceLineNo">629</span>    query.append('/');<a 
name="line.629"></a>
-<span class="sourceLineNo">630</span>    query.append(TABLE);<a 
name="line.630"></a>
-<span class="sourceLineNo">631</span>    query.append('/');<a 
name="line.631"></a>
-<span class="sourceLineNo">632</span>    query.append("testrow*");<a 
name="line.632"></a>
-<span class="sourceLineNo">633</span>    query.append('/');<a 
name="line.633"></a>
-<span class="sourceLineNo">634</span>    query.append(COLUMN_1);<a 
name="line.634"></a>
-<span class="sourceLineNo">635</span>    response = 
client.get(query.toString(), Constants.MIMETYPE_XML);<a name="line.635"></a>
-<span class="sourceLineNo">636</span>    assertEquals(response.getCode(), 
200);<a name="line.636"></a>
-<span class="sourceLineNo">637</span>    assertEquals(Constants.MIMETYPE_XML, 
response.getHeader("content-type"));<a name="line.637"></a>
-<span class="sourceLineNo">638</span>    CellSetModel cellSet = 
(CellSetModel)<a name="line.638"></a>
-<span class="sourceLineNo">639</span>      xmlUnmarshaller.unmarshal(new 
ByteArrayInputStream(response.getBody()));<a name="line.639"></a>
-<span class="sourceLineNo">640</span>    List&lt;RowModel&gt; rows = 
cellSet.getRows();<a name="line.640"></a>
-<span class="sourceLineNo">641</span>    assertTrue(rows.size() == 2);<a 
name="line.641"></a>
-<span class="sourceLineNo">642</span>    for (RowModel row : rows) {<a 
name="line.642"></a>
-<span class="sourceLineNo">643</span>      assertTrue(row.getCells().size() == 
1);<a name="line.643"></a>
-<span class="sourceLineNo">644</span>      assertEquals(COLUMN_1, 
Bytes.toString(row.getCells().get(0).getColumn()));<a name="line.644"></a>
-<span class="sourceLineNo">645</span>    }<a name="line.645"></a>
-<span class="sourceLineNo">646</span>    response = deleteRow(TABLE, ROW_1);<a 
name="line.646"></a>
-<span class="sourceLineNo">647</span>    assertEquals(response.getCode(), 
200);<a name="line.647"></a>
-<span class="sourceLineNo">648</span>    response = deleteRow(TABLE, ROW_2);<a 
name="line.648"></a>
-<span class="sourceLineNo">649</span>    assertEquals(response.getCode(), 
200);<a name="line.649"></a>
-<span class="sourceLineNo">650</span>  }<a name="line.650"></a>
-<span class="sourceLineNo">651</span>}<a name="line.651"></a>
+<span class="sourceLineNo">377</span>    // make sure the fake row was not 
actually created<a name="line.377"></a>
+<span class="sourceLineNo">378</span>    response = client.get(path, 
Constants.MIMETYPE_XML);<a name="line.378"></a>
+<span class="sourceLineNo">379</span>    assertEquals(response.getCode(), 
404);<a name="line.379"></a>
+<span class="sourceLineNo">380</span><a name="line.380"></a>
+<span class="sourceLineNo">381</span>    // check that all of the values were 
created<a name="line.381"></a>
+<span class="sourceLineNo">382</span>    checkValueXML(TABLE, ROW_1, COLUMN_1, 
VALUE_1);<a name="line.382"></a>
+<span class="sourceLineNo">383</span>    checkValueXML(TABLE, ROW_1, COLUMN_2, 
VALUE_2);<a name="line.383"></a>
+<span class="sourceLineNo">384</span>    checkValueXML(TABLE, ROW_2, COLUMN_1, 
VALUE_3);<a name="line.384"></a>
+<span class="sourceLineNo">385</span>    checkValueXML(TABLE, ROW_2, COLUMN_2, 
VALUE_4);<a name="line.385"></a>
+<span class="sourceLineNo">386</span><a name="line.386"></a>
+<span class="sourceLineNo">387</span>    response = deleteRow(TABLE, ROW_1);<a 
name="line.387"></a>
+<span class="sourceLineNo">388</span>    assertEquals(response.getCode(), 
200);<a name="line.388"></a>
+<span class="sourceLineNo">389</span>    response = deleteRow(TABLE, ROW_2);<a 
name="line.389"></a>
+<span class="sourceLineNo">390</span>    assertEquals(response.getCode(), 
200);<a name="line.390"></a>
+<span class="sourceLineNo">391</span>  }<a name="line.391"></a>
+<span class="sourceLineNo">392</span><a name="line.392"></a>
+<span class="sourceLineNo">393</span>  @Test<a name="line.393"></a>
+<span class="sourceLineNo">394</span>  public void testMultiCellGetPutPB() 
throws IOException {<a name="line.394"></a>
+<span class="sourceLineNo">395</span>    String path = "/" + TABLE + 
"/fakerow";  // deliberate nonexistent row<a name="line.395"></a>
+<span class="sourceLineNo">396</span><a name="line.396"></a>
+<span class="sourceLineNo">397</span>    CellSetModel cellSetModel = new 
CellSetModel();<a name="line.397"></a>
+<span class="sourceLineNo">398</span>    RowModel rowModel = new 
RowModel(ROW_1);<a name="line.398"></a>
+<span class="sourceLineNo">399</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_1),<a name="line.399"></a>
+<span class="sourceLineNo">400</span>      Bytes.toBytes(VALUE_1)));<a 
name="line.400"></a>
+<span class="sourceLineNo">401</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_2),<a name="line.401"></a>
+<span class="sourceLineNo">402</span>      Bytes.toBytes(VALUE_2)));<a 
name="line.402"></a>
+<span class="sourceLineNo">403</span>    cellSetModel.addRow(rowModel);<a 
name="line.403"></a>
+<span class="sourceLineNo">404</span>    rowModel = new RowModel(ROW_2);<a 
name="line.404"></a>
+<span class="sourceLineNo">405</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_1),<a name="line.405"></a>
+<span class="sourceLineNo">406</span>      Bytes.toBytes(VALUE_3)));<a 
name="line.406"></a>
+<span class="sourceLineNo">407</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_2),<a name="line.407"></a>
+<span class="sourceLineNo">408</span>      Bytes.toBytes(VALUE_4)));<a 
name="line.408"></a>
+<span class="sourceLineNo">409</span>    cellSetModel.addRow(rowModel);<a 
name="line.409"></a>
+<span class="sourceLineNo">410</span>    Response response = client.put(path, 
Constants.MIMETYPE_PROTOBUF,<a name="line.410"></a>
+<span class="sourceLineNo">411</span>      
cellSetModel.createProtobufOutput());<a name="line.411"></a>
+<span class="sourceLineNo">412</span>    Thread.yield();<a name="line.412"></a>
+<span class="sourceLineNo">413</span><a name="line.413"></a>
+<span class="sourceLineNo">414</span>    // make sure the fake row was not 
actually created<a name="line.414"></a>
+<span class="sourceLineNo">415</span>    response = client.get(path, 
Constants.MIMETYPE_PROTOBUF);<a name="line.415"></a>
+<span class="sourceLineNo">416</span>    assertEquals(response.getCode(), 
404);<a name="line.416"></a>
+<span class="sourceLineNo">417</span><a name="line.417"></a>
+<span class="sourceLineNo">418</span>    // check that all of the values were 
created<a name="line.418"></a>
+<span class="sourceLineNo">419</span>    checkValuePB(TABLE, ROW_1, COLUMN_1, 
VALUE_1);<a name="line.419"></a>
+<span class="sourceLineNo">420</span>    checkValuePB(TABLE, ROW_1, COLUMN_2, 
VALUE_2);<a name="line.420"></a>
+<span class="sourceLineNo">421</span>    checkValuePB(TABLE, ROW_2, COLUMN_1, 
VALUE_3);<a name="line.421"></a>
+<span class="sourceLineNo">422</span>    checkValuePB(TABLE, ROW_2, COLUMN_2, 
VALUE_4);<a name="line.422"></a>
+<span class="sourceLineNo">423</span><a name="line.423"></a>
+<span class="sourceLineNo">424</span>    response = deleteRow(TABLE, ROW_1);<a 
name="line.424"></a>
+<span class="sourceLineNo">425</span>    assertEquals(response.getCode(), 
200);<a name="line.425"></a>
+<span class="sourceLineNo">426</span>    response = deleteRow(TABLE, ROW_2);<a 
name="line.426"></a>
+<span class="sourceLineNo">427</span>    assertEquals(response.getCode(), 
200);<a name="line.427"></a>
+<span class="sourceLineNo">428</span>  }<a name="line.428"></a>
+<span class="sourceLineNo">429</span><a name="line.429"></a>
+<span class="sourceLineNo">430</span>  @Test<a name="line.430"></a>
+<span class="sourceLineNo">431</span>  public void testStartEndRowGetPutXML() 
throws IOException, JAXBException {<a name="line.431"></a>
+<span class="sourceLineNo">432</span>    String[] rows = { ROW_1, ROW_2, ROW_3 
};<a name="line.432"></a>
+<span class="sourceLineNo">433</span>    String[] values = { VALUE_1, VALUE_2, 
VALUE_3 };<a name="line.433"></a>
+<span class="sourceLineNo">434</span>    Response response = null;<a 
name="line.434"></a>
+<span class="sourceLineNo">435</span>    for (int i = 0; i &lt; rows.length; 
i++) {<a name="line.435"></a>
+<span class="sourceLineNo">436</span>      response = putValueXML(TABLE, 
rows[i], COLUMN_1, values[i]);<a name="line.436"></a>
+<span class="sourceLineNo">437</span>      assertEquals(200, 
response.getCode());<a name="line.437"></a>
+<span class="sourceLineNo">438</span>      checkValueXML(TABLE, rows[i], 
COLUMN_1, values[i]);<a name="line.438"></a>
+<span class="sourceLineNo">439</span>    }<a name="line.439"></a>
+<span class="sourceLineNo">440</span>    response = getValueXML(TABLE, 
rows[0], rows[2], COLUMN_1);<a name="line.440"></a>
+<span class="sourceLineNo">441</span>    assertEquals(200, 
response.getCode());<a name="line.441"></a>
+<span class="sourceLineNo">442</span>    CellSetModel cellSet = 
(CellSetModel)<a name="line.442"></a>
+<span class="sourceLineNo">443</span>      xmlUnmarshaller.unmarshal(new 
ByteArrayInputStream(response.getBody()));<a name="line.443"></a>
+<span class="sourceLineNo">444</span>    assertEquals(2, 
cellSet.getRows().size());<a name="line.444"></a>
+<span class="sourceLineNo">445</span>    for (int i = 0; i &lt; 
cellSet.getRows().size()-1; i++) {<a name="line.445"></a>
+<span class="sourceLineNo">446</span>      RowModel rowModel = 
cellSet.getRows().get(i);<a name="line.446"></a>
+<span class="sourceLineNo">447</span>      for (CellModel cell: 
rowModel.getCells()) {<a name="line.447"></a>
+<span class="sourceLineNo">448</span>        assertEquals(COLUMN_1, 
Bytes.toString(cell.getColumn()));<a name="line.448"></a>
+<span class="sourceLineNo">449</span>        assertEquals(values[i], 
Bytes.toString(cell.getValue()));<a name="line.449"></a>
+<span class="sourceLineNo">450</span>      }<a name="line.450"></a>
+<span class="sourceLineNo">451</span>    }<a name="line.451"></a>
+<span class="sourceLineNo">452</span>    for (String row : rows) {<a 
name="line.452"></a>
+<span class="sourceLineNo">453</span>      response = deleteRow(TABLE, row);<a 
name="line.453"></a>
+<span class="sourceLineNo">454</span>      assertEquals(200, 
response.getCode());<a name="line.454"></a>
+<span class="sourceLineNo">455</span>    }<a name="line.455"></a>
+<span class="sourceLineNo">456</span>  }<a name="line.456"></a>
+<span class="sourceLineNo">457</span><a name="line.457"></a>
+<span class="sourceLineNo">458</span>  @Test<a name="line.458"></a>
+<span class="sourceLineNo">459</span>  public void testInvalidCheckParam() 
throws IOException, JAXBException {<a name="line.459"></a>
+<span class="sourceLineNo">460</span>    CellSetModel cellSetModel = new 
CellSetModel();<a name="line.460"></a>
+<span class="sourceLineNo">461</span>    RowModel rowModel = new 
RowModel(ROW_1);<a name="line.461"></a>
+<span class="sourceLineNo">462</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_1),<a name="line.462"></a>
+<span class="sourceLineNo">463</span>      Bytes.toBytes(VALUE_1)));<a 
name="line.463"></a>
+<span class="sourceLineNo">464</span>    cellSetModel.addRow(rowModel);<a 
name="line.464"></a>
+<span class="sourceLineNo">465</span>    StringWriter writer = new 
StringWriter();<a name="line.465"></a>
+<span class="sourceLineNo">466</span>    xmlMarshaller.marshal(cellSetModel, 
writer);<a name="line.466"></a>
+<span class="sourceLineNo">467</span><a name="line.467"></a>
+<span class="sourceLineNo">468</span>    final String path = "/" + TABLE + "/" 
+ ROW_1 + "/" + COLUMN_1 + "?check=blah";<a name="line.468"></a>
+<span class="sourceLineNo">469</span><a name="line.469"></a>
+<span class="sourceLineNo">470</span>    Response response = client.put(path, 
Constants.MIMETYPE_XML,<a name="line.470"></a>
+<span class="sourceLineNo">471</span>      
Bytes.toBytes(writer.toString()));<a name="line.471"></a>
+<span class="sourceLineNo">472</span>    assertEquals(response.getCode(), 
400);<a name="line.472"></a>
+<span class="sourceLineNo">473</span>  }<a name="line.473"></a>
+<span class="sourceLineNo">474</span><a name="line.474"></a>
+<span class="sourceLineNo">475</span>  @Test<a name="line.475"></a>
+<span class="sourceLineNo">476</span>  public void testInvalidColumnPut() 
throws IOException, JAXBException {<a name="line.476"></a>
+<span class="sourceLineNo">477</span>    String dummyColumn = 
"doesnot:exist";<a name="line.477"></a>
+<span class="sourceLineNo">478</span>    CellSetModel cellSetModel = new 
CellSetModel();<a name="line.478"></a>
+<span class="sourceLineNo">479</span>    RowModel rowModel = new 
RowModel(ROW_1);<a name="line.479"></a>
+<span class="sourceLineNo">480</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(dummyColumn),<a name="line.480"></a>
+<span class="sourceLineNo">481</span>      Bytes.toBytes(VALUE_1)));<a 
name="line.481"></a>
+<span class="sourceLineNo">482</span>    cellSetModel.addRow(rowModel);<a 
name="line.482"></a>
+<span class="sourceLineNo">483</span>    StringWriter writer = new 
StringWriter();<a name="line.483"></a>
+<span class="sourceLineNo">484</span>    xmlMarshaller.marshal(cellSetModel, 
writer);<a name="line.484"></a>
+<span class="sourceLineNo">485</span><a name="line.485"></a>
+<span class="sourceLineNo">486</span>    final String path = "/" + TABLE + "/" 
+ ROW_1 + "/" + dummyColumn;<a name="line.486"></a>
+<span class="sourceLineNo">487</span><a name="line.487"></a>
+<span class="sourceLineNo">488</span>    Response response = client.put(path, 
Constants.MIMETYPE_XML,<a name="line.488"></a>
+<span class="sourceLineNo">489</span>      
Bytes.toBytes(writer.toString()));<a name="line.489"></a>
+<span class="sourceLineNo">490</span>    assertEquals(response.getCode(), 
404);<a name="line.490"></a>
+<span class="sourceLineNo">491</span>  }<a name="line.491"></a>
+<span class="sourceLineNo">492</span><a name="line.492"></a>
+<span class="sourceLineNo">493</span>  @Test<a name="line.493"></a>
+<span class="sourceLineNo">494</span>  public void testMultiCellGetJson() 
throws IOException, JAXBException {<a name="line.494"></a>
+<span class="sourceLineNo">495</span>    String path = "/" + TABLE + 
"/fakerow";  // deliberate nonexistent row<a name="line.495"></a>
+<span class="sourceLineNo">496</span><a name="line.496"></a>
+<span class="sourceLineNo">497</span>    CellSetModel cellSetModel = new 
CellSetModel();<a name="line.497"></a>
+<span class="sourceLineNo">498</span>    RowModel rowModel = new 
RowModel(ROW_1);<a name="line.498"></a>
+<span class="sourceLineNo">499</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_1),<a name="line.499"></a>
+<span class="sourceLineNo">500</span>      Bytes.toBytes(VALUE_1)));<a 
name="line.500"></a>
+<span class="sourceLineNo">501</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_2),<a name="line.501"></a>
+<span class="sourceLineNo">502</span>      Bytes.toBytes(VALUE_2)));<a 
name="line.502"></a>
+<span class="sourceLineNo">503</span>    cellSetModel.addRow(rowModel);<a 
name="line.503"></a>
+<span class="sourceLineNo">504</span>    rowModel = new RowModel(ROW_2);<a 
name="line.504"></a>
+<span class="sourceLineNo">505</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_1),<a name="line.505"></a>
+<span class="sourceLineNo">506</span>      Bytes.toBytes(VALUE_3)));<a 
name="line.506"></a>
+<span class="sourceLineNo">507</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_2),<a name="line.507"></a>
+<span class="sourceLineNo">508</span>      Bytes.toBytes(VALUE_4)));<a 
name="line.508"></a>
+<span class="sourceLineNo">509</span>    cellSetModel.addRow(rowModel);<a 
name="line.509"></a>
+<span class="sourceLineNo">510</span>    String jsonString = 
jsonMapper.writeValueAsString(cellSetModel);<a name="line.510"></a>
+<span class="sourceLineNo">511</span><a name="line.511"></a>
+<span class="sourceLineNo">512</span>    Response response = client.put(path, 
Constants.MIMETYPE_JSON,<a name="line.512"></a>
+<span class="sourceLineNo">513</span>      Bytes.toBytes(jsonString));<a 
name="line.513"></a>
+<span class="sourceLineNo">514</span>    Thread.yield();<a name="line.514"></a>
+<span class="sourceLineNo">515</span><a name="line.515"></a>
+<span class="sourceLineNo">516</span>    // make sure the fake row was not 
actually created<a name="line.516"></a>
+<span class="sourceLineNo">517</span>    response = client.get(path, 
Constants.MIMETYPE_JSON);<a name="line.517"></a>
+<span class="sourceLineNo">518</span>    assertEquals(response.getCode(), 
404);<a name="line.518"></a>
+<span class="sourceLineNo">519</span><a name="line.519"></a>
+<span class="sourceLineNo">520</span>    // check that all of the values were 
created<a name="line.520"></a>
+<span class="sourceLineNo">521</span>    checkValueJSON(TABLE, ROW_1, 
COLUMN_1, VALUE_1);<a name="line.521"></a>
+<span class="sourceLineNo">522</span>    checkValueJSON(TABLE, ROW_1, 
COLUMN_2, VALUE_2);<a name="line.522"></a>
+<span class="sourceLineNo">523</span>    checkValueJSON(TABLE, ROW_2, 
COLUMN_1, VALUE_3);<a name="line.523"></a>
+<span class="sourceLineNo">524</span>    checkValueJSON(TABLE, ROW_2, 
COLUMN_2, VALUE_4);<a name="line.524"></a>
+<span class="sourceLineNo">525</span><a name="line.525"></a>
+<span class="sourceLineNo">526</span>    response = deleteRow(TABLE, ROW_1);<a 
name="line.526"></a>
+<span class="sourceLineNo">527</span>    assertEquals(response.getCode(), 
200);<a name="line.527"></a>
+<span class="sourceLineNo">528</span>    response = deleteRow(TABLE, ROW_2);<a 
name="line.528"></a>
+<span class="sourceLineNo">529</span>    assertEquals(response.getCode(), 
200);<a name="line.529"></a>
+<span class="sourceLineNo">530</span>  }<a name="line.530"></a>
+<span class="sourceLineNo">531</span>  <a name="line.531"></a>
+<span class="sourceLineNo">532</span>  @Test<a name="line.532"></a>
+<span class="sourceLineNo">533</span>  public void testMetrics() throws 
IOException, JAXBException {<a name="line.533"></a>
+<span class="sourceLineNo">534</span>    final String path = "/" + TABLE + "/" 
+ ROW_4 + "/" + COLUMN_1;<a name="line.534"></a>
+<span class="sourceLineNo">535</span>    Response response = client.put(path, 
Constants.MIMETYPE_BINARY,<a name="line.535"></a>
+<span class="sourceLineNo">536</span>        Bytes.toBytes(VALUE_4));<a 
name="line.536"></a>
+<span class="sourceLineNo">537</span>    assertEquals(response.getCode(), 
200);<a name="line.537"></a>
+<span class="sourceLineNo">538</span>    Thread.yield();<a name="line.538"></a>
+<span class="sourceLineNo">539</span>    response = client.get(path, 
Constants.MIMETYPE_JSON);<a name="line.539"></a>
+<span class="sourceLineNo">540</span>    assertEquals(response.getCode(), 
200);<a name="line.540"></a>
+<span class="sourceLineNo">541</span>    assertEquals(Constants.MIMETYPE_JSON, 
response.getHeader("content-type"));<a name="line.541"></a>
+<span class="sourceLineNo">542</span>    response = deleteRow(TABLE, ROW_4);<a 
name="line.542"></a>
+<span class="sourceLineNo">543</span>    assertEquals(response.getCode(), 
200);<a name="line.543"></a>
+<span class="sourceLineNo">544</span><a name="line.544"></a>
+<span class="sourceLineNo">545</span>    UserProvider userProvider = 
UserProvider.instantiate(conf);<a name="line.545"></a>
+<span class="sourceLineNo">546</span>    
METRICS_ASSERT.assertCounterGt("requests", 2l,<a name="line.546"></a>
+<span class="sourceLineNo">547</span>      RESTServlet.getInstance(conf, 
userProvider).getMetrics().getSource());<a name="line.547"></a>
+<span class="sourceLineNo">548</span><a name="line.548"></a>
+<span class="sourceLineNo">549</span>    
METRICS_ASSERT.assertCounterGt("successfulGet", 0l,<a name="line.549"></a>
+<span class="sourceLineNo">550</span>      RESTServlet.getInstance(conf, 
userProvider).getMetrics().getSource());<a name="line.550"></a>
+<span class="sourceLineNo">551</span><a name="line.551"></a>
+<span class="sourceLineNo">552</span>    
METRICS_ASSERT.assertCounterGt("successfulPut", 0l,<a name="line.552"></a>
+<span class="sourceLineNo">553</span>      RESTServlet.getInstance(conf, 
userProvider).getMetrics().getSource());<a name="line.553"></a>
+<span class="sourceLineNo">554</span><a name="line.554"></a>
+<span class="sourceLineNo">555</span>    
METRICS_ASSERT.assertCounterGt("successfulDelete", 0l,<a name="line.555"></a>
+<span class="sourceLineNo">556</span>      RESTServlet.getInstance(conf, 
userProvider).getMetrics().getSource());<a name="line.556"></a>
+<span class="sourceLineNo">557</span>  }<a name="line.557"></a>
+<span class="sourceLineNo">558</span>  <a name="line.558"></a>
+<span class="sourceLineNo">559</span>  @Test<a name="line.559"></a>
+<span class="sourceLineNo">560</span>  public void testMultiColumnGetXML() 
throws Exception {<a name="line.560"></a>
+<span class="sourceLineNo">561</span>    String path = "/" + TABLE + 
"/fakerow";<a name="line.561"></a>
+<span class="sourceLineNo">562</span>    CellSetModel cellSetModel = new 
CellSetModel();<a name="line.562"></a>
+<span class="sourceLineNo">563</span>    RowModel rowModel = new 
RowModel(ROW_1);<a name="line.563"></a>
+<span class="sourceLineNo">564</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_1), Bytes.toBytes(VALUE_1)));<a 
name="line.564"></a>
+<span class="sourceLineNo">565</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_2), Bytes.toBytes(VALUE_2)));<a 
name="line.565"></a>
+<span class="sourceLineNo">566</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_3), Bytes.toBytes(VALUE_2)));<a 
name="line.566"></a>
+<span class="sourceLineNo">567</span>    cellSetModel.addRow(rowModel);<a 
name="line.567"></a>
+<span class="sourceLineNo">568</span>    StringWriter writer = new 
StringWriter();<a name="line.568"></a>
+<span class="sourceLineNo">569</span>    xmlMarshaller.marshal(cellSetModel, 
writer);<a name="line.569"></a>
+<span class="sourceLineNo">570</span><a name="line.570"></a>
+<span class="sourceLineNo">571</span>    Response response = client.put(path, 
Constants.MIMETYPE_XML, Bytes.toBytes(writer.toString()));<a 
name="line.571"></a>
+<span class="sourceLineNo">572</span>    Thread.yield();<a name="line.572"></a>
+<span class="sourceLineNo">573</span><a name="line.573"></a>
+<span class="sourceLineNo">574</span>    // make sure the fake row was not 
actually created<a name="line.574"></a>
+<span class="sourceLineNo">575</span>    response = client.get(path, 
Constants.MIMETYPE_XML);<a name="line.575"></a>
+<span class="sourceLineNo">576</span>    assertEquals(response.getCode(), 
404);<a name="line.576"></a>
+<span class="sourceLineNo">577</span><a name="line.577"></a>
+<span class="sourceLineNo">578</span>    // Try getting all the column values 
at once.<a name="line.578"></a>
+<span class="sourceLineNo">579</span>    path = "/" + TABLE + "/" + ROW_1 + 
"/" + COLUMN_1 + "," + COLUMN_2 + "," + COLUMN_3;<a name="line.579"></a>
+<span class="sourceLineNo">580</span>    response = client.get(path, 
Constants.MIMETYPE_XML);<a name="line.580"></a>
+<span class="sourceLineNo">581</span>    assertEquals(200, 
response.getCode());<a name="line.581"></a>
+<span class="sourceLineNo">582</span>    CellSetModel cellSet = (CellSetModel) 
xmlUnmarshaller.unmarshal(new ByteArrayInputStream(response<a 
name="line.582"></a>
+<span class="sourceLineNo">583</span>        .getBody()));<a 
name="line.583"></a>
+<span class="sourceLineNo">584</span>    assertTrue(cellSet.getRows().size() 
== 1);<a name="line.584"></a>
+<span class="sourceLineNo">585</span>    
assertTrue(cellSet.getRows().get(0).getCells().size() == 3);<a 
name="line.585"></a>
+<span class="sourceLineNo">586</span>    List&lt;CellModel&gt; cells = 
cellSet.getRows().get(0).getCells();<a name="line.586"></a>
+<span class="sourceLineNo">587</span><a name="line.587"></a>
+<span class="sourceLineNo">588</span>    assertTrue(containsCellModel(cells, 
COLUMN_1, VALUE_1));<a name="line.588"></a>
+<span class="sourceLineNo">589</span>    assertTrue(containsCellModel(cells, 
COLUMN_2, VALUE_2));<a name="line.589"></a>
+<span class="sourceLineNo">590</span>    assertTrue(containsCellModel(cells, 
COLUMN_3, VALUE_2));<a name="line.590"></a>
+<span class="sourceLineNo">591</span>    response = deleteRow(TABLE, ROW_1);<a 
name="line.591"></a>
+<span class="sourceLineNo">592</span>    assertEquals(response.getCode(), 
200);<a name="line.592"></a>
+<span class="sourceLineNo">593</span>  }<a name="line.593"></a>
+<span class="sourceLineNo">594</span><a name="line.594"></a>
+<span class="sourceLineNo">595</span>  private boolean 
containsCellModel(List&lt;CellModel&gt; cells, String column, String value) {<a 
name="line.595"></a>
+<span class="sourceLineNo">596</span>    boolean contains = false;<a 
name="line.596"></a>
+<span class="sourceLineNo">597</span>    for (CellModel cell : cells) {<a 
name="line.597"></a>
+<span class="sourceLineNo">598</span>      if 
(Bytes.toString(cell.getColumn()).equals(column)<a name="line.598"></a>
+<span class="sourceLineNo">599</span>          &amp;&amp; 
Bytes.toString(cell.getValue()).equals(value)) {<a name="line.599"></a>
+<span class="sourceLineNo">600</span>        contains = true;<a 
name="line.600"></a>
+<span class="sourceLineNo">601</span>        return contains;<a 
name="line.601"></a>
+<span class="sourceLineNo">602</span>      }<a name="line.602"></a>
+<span class="sourceLineNo">603</span>    }<a name="line.603"></a>
+<span class="sourceLineNo">604</span>    return contains;<a 
name="line.604"></a>
+<span class="sourceLineNo">605</span>  }<a name="line.605"></a>
+<span class="sourceLineNo">606</span><a name="line.606"></a>
+<span class="sourceLineNo">607</span>  @Test<a name="line.607"></a>
+<span class="sourceLineNo">608</span>  public void 
testSuffixGlobbingXMLWithNewScanner() throws IOException, JAXBException {<a 
name="line.608"></a>
+<span class="sourceLineNo">609</span>    String path = "/" + TABLE + 
"/fakerow";  // deliberate nonexistent row<a name="line.609"></a>
+<span class="sourceLineNo">610</span><a name="line.610"></a>
+<span class="sourceLineNo">611</span>    CellSetModel cellSetModel = new 
CellSetModel();<a name="line.611"></a>
+<span class="sourceLineNo">612</span>    RowModel rowModel = new 
RowModel(ROW_1);<a name="line.612"></a>
+<span class="sourceLineNo">613</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_1),<a name="line.613"></a>
+<span class="sourceLineNo">614</span>      Bytes.toBytes(VALUE_1)));<a 
name="line.614"></a>
+<span class="sourceLineNo">615</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_2),<a name="line.615"></a>
+<span class="sourceLineNo">616</span>      Bytes.toBytes(VALUE_2)));<a 
name="line.616"></a>
+<span class="sourceLineNo">617</span>    cellSetModel.addRow(rowModel);<a 
name="line.617"></a>
+<span class="sourceLineNo">618</span>    rowModel = new RowModel(ROW_2);<a 
name="line.618"></a>
+<span class="sourceLineNo">619</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_1),<a name="line.619"></a>
+<span class="sourceLineNo">620</span>      Bytes.toBytes(VALUE_3)));<a 
name="line.620"></a>
+<span class="sourceLineNo">621</span>    rowModel.addCell(new 
CellModel(Bytes.toBytes(COLUMN_2),<a name="line.621"></a>
+<span class="sourceLineNo">622</span>      Bytes.toBytes(VALUE_4)));<a 
name="line.622"></a>
+<span class="sourceLineNo">623</span>    cellSetModel.addRow(rowModel);<a 
name="line.623"></a>
+<span class="sourceLineNo">624</span>    StringWriter writer = new 
StringWriter();<a name="line.624"></a>
+<span class="sourceLineNo">625</span>    xmlMarshaller.marshal(cellSetModel, 
writer);<a name="line.625"></a>
+<span class="sourceLineNo">626</span>    Response response = client.put(path, 
Constants.MIMETYPE_XML,<a name="line.626"></a>
+<span clas

<TRUNCATED>

Reply via email to