http://git-wip-us.apache.org/repos/asf/hbase-site/blob/96e5e102/devapidocs/src-html/org/apache/hadoop/hbase/rest/MultiRowResource.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/rest/MultiRowResource.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/rest/MultiRowResource.html
index 340a4ae..60a1376 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/rest/MultiRowResource.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/rest/MultiRowResource.html
@@ -35,100 +35,101 @@
 <span class="sourceLineNo">027</span>import javax.ws.rs.core.Response;<a 
name="line.27"></a>
 <span class="sourceLineNo">028</span>import javax.ws.rs.core.UriInfo;<a 
name="line.28"></a>
 <span class="sourceLineNo">029</span><a name="line.29"></a>
-<span class="sourceLineNo">030</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.slf4j.Logger;<a 
name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.slf4j.LoggerFactory;<a 
name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.Cell;<a 
name="line.33"></a>
-<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.CellUtil;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.rest.model.CellModel;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.rest.model.CellSetModel;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.rest.model.RowModel;<a name="line.37"></a>
-<span class="sourceLineNo">038</span><a name="line.38"></a>
-<span class="sourceLineNo">039</span>@InterfaceAudience.Private<a 
name="line.39"></a>
-<span class="sourceLineNo">040</span>public class MultiRowResource extends 
ResourceBase implements Constants {<a name="line.40"></a>
-<span class="sourceLineNo">041</span>  private static final Logger LOG = 
LoggerFactory.getLogger(MultiRowResource.class);<a name="line.41"></a>
-<span class="sourceLineNo">042</span><a name="line.42"></a>
-<span class="sourceLineNo">043</span>  TableResource tableResource;<a 
name="line.43"></a>
-<span class="sourceLineNo">044</span>  Integer versions = null;<a 
name="line.44"></a>
-<span class="sourceLineNo">045</span>  String[] columns = null;<a 
name="line.45"></a>
-<span class="sourceLineNo">046</span><a name="line.46"></a>
-<span class="sourceLineNo">047</span>  /**<a name="line.47"></a>
-<span class="sourceLineNo">048</span>   * Constructor<a name="line.48"></a>
-<span class="sourceLineNo">049</span>   *<a name="line.49"></a>
-<span class="sourceLineNo">050</span>   * @param tableResource<a 
name="line.50"></a>
-<span class="sourceLineNo">051</span>   * @param versions<a name="line.51"></a>
-<span class="sourceLineNo">052</span>   * @throws java.io.IOException<a 
name="line.52"></a>
-<span class="sourceLineNo">053</span>   */<a name="line.53"></a>
-<span class="sourceLineNo">054</span>  public MultiRowResource(TableResource 
tableResource, String versions, String columnsStr)<a name="line.54"></a>
-<span class="sourceLineNo">055</span>      throws IOException {<a 
name="line.55"></a>
-<span class="sourceLineNo">056</span>    super();<a name="line.56"></a>
-<span class="sourceLineNo">057</span>    this.tableResource = tableResource;<a 
name="line.57"></a>
-<span class="sourceLineNo">058</span><a name="line.58"></a>
-<span class="sourceLineNo">059</span>    if (columnsStr != null &amp;&amp; 
!columnsStr.equals("")) {<a name="line.59"></a>
-<span class="sourceLineNo">060</span>      this.columns = 
columnsStr.split(",");<a name="line.60"></a>
-<span class="sourceLineNo">061</span>    }<a name="line.61"></a>
-<span class="sourceLineNo">062</span><a name="line.62"></a>
-<span class="sourceLineNo">063</span>    if (versions != null) {<a 
name="line.63"></a>
-<span class="sourceLineNo">064</span>      this.versions = 
Integer.valueOf(versions);<a name="line.64"></a>
-<span class="sourceLineNo">065</span><a name="line.65"></a>
-<span class="sourceLineNo">066</span>    }<a name="line.66"></a>
-<span class="sourceLineNo">067</span>  }<a name="line.67"></a>
-<span class="sourceLineNo">068</span><a name="line.68"></a>
-<span class="sourceLineNo">069</span>  @GET<a name="line.69"></a>
-<span class="sourceLineNo">070</span>  @Produces({ MIMETYPE_XML, 
MIMETYPE_JSON, MIMETYPE_PROTOBUF, MIMETYPE_PROTOBUF_IETF })<a 
name="line.70"></a>
-<span class="sourceLineNo">071</span>  public Response get(final @Context 
UriInfo uriInfo) {<a name="line.71"></a>
-<span class="sourceLineNo">072</span>    MultivaluedMap&lt;String, String&gt; 
params = uriInfo.getQueryParameters();<a name="line.72"></a>
-<span class="sourceLineNo">073</span><a name="line.73"></a>
-<span class="sourceLineNo">074</span>    
servlet.getMetrics().incrementRequests(1);<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    try {<a name="line.75"></a>
-<span class="sourceLineNo">076</span>      CellSetModel model = new 
CellSetModel();<a name="line.76"></a>
-<span class="sourceLineNo">077</span>      for (String rk : 
params.get(ROW_KEYS_PARAM_NAME)) {<a name="line.77"></a>
-<span class="sourceLineNo">078</span>        RowSpec rowSpec = new 
RowSpec(rk);<a name="line.78"></a>
-<span class="sourceLineNo">079</span><a name="line.79"></a>
-<span class="sourceLineNo">080</span>        if (this.versions != null) {<a 
name="line.80"></a>
-<span class="sourceLineNo">081</span>          
rowSpec.setMaxVersions(this.versions);<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>        if (this.columns != null) {<a 
name="line.84"></a>
-<span class="sourceLineNo">085</span>          for (int i = 0; i &lt; 
this.columns.length; i++) {<a name="line.85"></a>
-<span class="sourceLineNo">086</span>            
rowSpec.addColumn(this.columns[i].getBytes());<a name="line.86"></a>
-<span class="sourceLineNo">087</span>          }<a name="line.87"></a>
-<span class="sourceLineNo">088</span>        }<a name="line.88"></a>
-<span class="sourceLineNo">089</span><a name="line.89"></a>
-<span class="sourceLineNo">090</span>        ResultGenerator generator =<a 
name="line.90"></a>
-<span class="sourceLineNo">091</span>          
ResultGenerator.fromRowSpec(this.tableResource.getName(), rowSpec, null,<a 
name="line.91"></a>
-<span class="sourceLineNo">092</span>            
!params.containsKey(NOCACHE_PARAM_NAME));<a name="line.92"></a>
-<span class="sourceLineNo">093</span>        Cell value = null;<a 
name="line.93"></a>
-<span class="sourceLineNo">094</span>        RowModel rowModel = new 
RowModel(rk);<a name="line.94"></a>
-<span class="sourceLineNo">095</span>        if (generator.hasNext()) {<a 
name="line.95"></a>
-<span class="sourceLineNo">096</span>          while ((value = 
generator.next()) != null) {<a name="line.96"></a>
-<span class="sourceLineNo">097</span>            rowModel.addCell(new 
CellModel(CellUtil.cloneFamily(value), CellUtil<a name="line.97"></a>
-<span class="sourceLineNo">098</span>                .cloneQualifier(value), 
value.getTimestamp(), CellUtil.cloneValue(value)));<a name="line.98"></a>
-<span class="sourceLineNo">099</span>          }<a name="line.99"></a>
-<span class="sourceLineNo">100</span>          model.addRow(rowModel);<a 
name="line.100"></a>
-<span class="sourceLineNo">101</span>        } else {<a name="line.101"></a>
-<span class="sourceLineNo">102</span>          if (LOG.isTraceEnabled()) {<a 
name="line.102"></a>
-<span class="sourceLineNo">103</span>            LOG.trace("The row : " + rk + 
" not found in the table.");<a name="line.103"></a>
-<span class="sourceLineNo">104</span>          }<a name="line.104"></a>
-<span class="sourceLineNo">105</span>        }<a name="line.105"></a>
-<span class="sourceLineNo">106</span>      }<a name="line.106"></a>
-<span class="sourceLineNo">107</span><a name="line.107"></a>
-<span class="sourceLineNo">108</span>      if (model.getRows().isEmpty()) {<a 
name="line.108"></a>
-<span class="sourceLineNo">109</span>      //If no rows found.<a 
name="line.109"></a>
-<span class="sourceLineNo">110</span>        
servlet.getMetrics().incrementFailedGetRequests(1);<a name="line.110"></a>
-<span class="sourceLineNo">111</span>        return 
Response.status(Response.Status.NOT_FOUND)<a name="line.111"></a>
-<span class="sourceLineNo">112</span>            
.type(MIMETYPE_TEXT).entity("No rows found." + CRLF)<a name="line.112"></a>
-<span class="sourceLineNo">113</span>            .build();<a 
name="line.113"></a>
-<span class="sourceLineNo">114</span>      } else {<a name="line.114"></a>
-<span class="sourceLineNo">115</span>        
servlet.getMetrics().incrementSucessfulGetRequests(1);<a name="line.115"></a>
-<span class="sourceLineNo">116</span>        return 
Response.ok(model).build();<a name="line.116"></a>
-<span class="sourceLineNo">117</span>      }<a name="line.117"></a>
-<span class="sourceLineNo">118</span>    } catch (IOException e) {<a 
name="line.118"></a>
-<span class="sourceLineNo">119</span>      
servlet.getMetrics().incrementFailedGetRequests(1);<a name="line.119"></a>
-<span class="sourceLineNo">120</span>      return processException(e);<a 
name="line.120"></a>
-<span class="sourceLineNo">121</span>    }<a name="line.121"></a>
-<span class="sourceLineNo">122</span>  }<a name="line.122"></a>
-<span class="sourceLineNo">123</span>}<a name="line.123"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.Cell;<a 
name="line.30"></a>
+<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.CellUtil;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.rest.model.CellModel;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.rest.model.CellSetModel;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.rest.model.RowModel;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.slf4j.Logger;<a 
name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.slf4j.LoggerFactory;<a 
name="line.38"></a>
+<span class="sourceLineNo">039</span><a name="line.39"></a>
+<span class="sourceLineNo">040</span>@InterfaceAudience.Private<a 
name="line.40"></a>
+<span class="sourceLineNo">041</span>public class MultiRowResource extends 
ResourceBase implements Constants {<a name="line.41"></a>
+<span class="sourceLineNo">042</span>  private static final Logger LOG = 
LoggerFactory.getLogger(MultiRowResource.class);<a name="line.42"></a>
+<span class="sourceLineNo">043</span><a name="line.43"></a>
+<span class="sourceLineNo">044</span>  TableResource tableResource;<a 
name="line.44"></a>
+<span class="sourceLineNo">045</span>  Integer versions = null;<a 
name="line.45"></a>
+<span class="sourceLineNo">046</span>  String[] columns = null;<a 
name="line.46"></a>
+<span class="sourceLineNo">047</span><a name="line.47"></a>
+<span class="sourceLineNo">048</span>  /**<a name="line.48"></a>
+<span class="sourceLineNo">049</span>   * Constructor<a name="line.49"></a>
+<span class="sourceLineNo">050</span>   *<a name="line.50"></a>
+<span class="sourceLineNo">051</span>   * @param tableResource<a 
name="line.51"></a>
+<span class="sourceLineNo">052</span>   * @param versions<a name="line.52"></a>
+<span class="sourceLineNo">053</span>   * @throws java.io.IOException<a 
name="line.53"></a>
+<span class="sourceLineNo">054</span>   */<a name="line.54"></a>
+<span class="sourceLineNo">055</span>  public MultiRowResource(TableResource 
tableResource, String versions, String columnsStr)<a name="line.55"></a>
+<span class="sourceLineNo">056</span>      throws IOException {<a 
name="line.56"></a>
+<span class="sourceLineNo">057</span>    super();<a name="line.57"></a>
+<span class="sourceLineNo">058</span>    this.tableResource = tableResource;<a 
name="line.58"></a>
+<span class="sourceLineNo">059</span><a name="line.59"></a>
+<span class="sourceLineNo">060</span>    if (columnsStr != null &amp;&amp; 
!columnsStr.equals("")) {<a name="line.60"></a>
+<span class="sourceLineNo">061</span>      this.columns = 
columnsStr.split(",");<a name="line.61"></a>
+<span class="sourceLineNo">062</span>    }<a name="line.62"></a>
+<span class="sourceLineNo">063</span><a name="line.63"></a>
+<span class="sourceLineNo">064</span>    if (versions != null) {<a 
name="line.64"></a>
+<span class="sourceLineNo">065</span>      this.versions = 
Integer.valueOf(versions);<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>  }<a name="line.68"></a>
+<span class="sourceLineNo">069</span><a name="line.69"></a>
+<span class="sourceLineNo">070</span>  @GET<a name="line.70"></a>
+<span class="sourceLineNo">071</span>  @Produces({ MIMETYPE_XML, 
MIMETYPE_JSON, MIMETYPE_PROTOBUF, MIMETYPE_PROTOBUF_IETF })<a 
name="line.71"></a>
+<span class="sourceLineNo">072</span>  public Response get(final @Context 
UriInfo uriInfo) {<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    MultivaluedMap&lt;String, String&gt; 
params = uriInfo.getQueryParameters();<a name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span>    
servlet.getMetrics().incrementRequests(1);<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    try {<a name="line.76"></a>
+<span class="sourceLineNo">077</span>      CellSetModel model = new 
CellSetModel();<a name="line.77"></a>
+<span class="sourceLineNo">078</span>      for (String rk : 
params.get(ROW_KEYS_PARAM_NAME)) {<a name="line.78"></a>
+<span class="sourceLineNo">079</span>        RowSpec rowSpec = new 
RowSpec(rk);<a name="line.79"></a>
+<span class="sourceLineNo">080</span><a name="line.80"></a>
+<span class="sourceLineNo">081</span>        if (this.versions != null) {<a 
name="line.81"></a>
+<span class="sourceLineNo">082</span>          
rowSpec.setMaxVersions(this.versions);<a name="line.82"></a>
+<span class="sourceLineNo">083</span>        }<a name="line.83"></a>
+<span class="sourceLineNo">084</span><a name="line.84"></a>
+<span class="sourceLineNo">085</span>        if (this.columns != null) {<a 
name="line.85"></a>
+<span class="sourceLineNo">086</span>          for (int i = 0; i &lt; 
this.columns.length; i++) {<a name="line.86"></a>
+<span class="sourceLineNo">087</span>            
rowSpec.addColumn(Bytes.toBytes(this.columns[i]));<a name="line.87"></a>
+<span class="sourceLineNo">088</span>          }<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>        ResultGenerator generator =<a 
name="line.91"></a>
+<span class="sourceLineNo">092</span>          
ResultGenerator.fromRowSpec(this.tableResource.getName(), rowSpec, null,<a 
name="line.92"></a>
+<span class="sourceLineNo">093</span>            
!params.containsKey(NOCACHE_PARAM_NAME));<a name="line.93"></a>
+<span class="sourceLineNo">094</span>        Cell value = null;<a 
name="line.94"></a>
+<span class="sourceLineNo">095</span>        RowModel rowModel = new 
RowModel(rk);<a name="line.95"></a>
+<span class="sourceLineNo">096</span>        if (generator.hasNext()) {<a 
name="line.96"></a>
+<span class="sourceLineNo">097</span>          while ((value = 
generator.next()) != null) {<a name="line.97"></a>
+<span class="sourceLineNo">098</span>            rowModel.addCell(new 
CellModel(CellUtil.cloneFamily(value), CellUtil<a name="line.98"></a>
+<span class="sourceLineNo">099</span>                .cloneQualifier(value), 
value.getTimestamp(), CellUtil.cloneValue(value)));<a name="line.99"></a>
+<span class="sourceLineNo">100</span>          }<a name="line.100"></a>
+<span class="sourceLineNo">101</span>          model.addRow(rowModel);<a 
name="line.101"></a>
+<span class="sourceLineNo">102</span>        } else {<a name="line.102"></a>
+<span class="sourceLineNo">103</span>          if (LOG.isTraceEnabled()) {<a 
name="line.103"></a>
+<span class="sourceLineNo">104</span>            LOG.trace("The row : " + rk + 
" not found in the table.");<a name="line.104"></a>
+<span class="sourceLineNo">105</span>          }<a name="line.105"></a>
+<span class="sourceLineNo">106</span>        }<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>      if (model.getRows().isEmpty()) {<a 
name="line.109"></a>
+<span class="sourceLineNo">110</span>      //If no rows found.<a 
name="line.110"></a>
+<span class="sourceLineNo">111</span>        
servlet.getMetrics().incrementFailedGetRequests(1);<a name="line.111"></a>
+<span class="sourceLineNo">112</span>        return 
Response.status(Response.Status.NOT_FOUND)<a name="line.112"></a>
+<span class="sourceLineNo">113</span>            
.type(MIMETYPE_TEXT).entity("No rows found." + CRLF)<a name="line.113"></a>
+<span class="sourceLineNo">114</span>            .build();<a 
name="line.114"></a>
+<span class="sourceLineNo">115</span>      } else {<a name="line.115"></a>
+<span class="sourceLineNo">116</span>        
servlet.getMetrics().incrementSucessfulGetRequests(1);<a name="line.116"></a>
+<span class="sourceLineNo">117</span>        return 
Response.ok(model).build();<a name="line.117"></a>
+<span class="sourceLineNo">118</span>      }<a name="line.118"></a>
+<span class="sourceLineNo">119</span>    } catch (IOException e) {<a 
name="line.119"></a>
+<span class="sourceLineNo">120</span>      
servlet.getMetrics().incrementFailedGetRequests(1);<a name="line.120"></a>
+<span class="sourceLineNo">121</span>      return processException(e);<a 
name="line.121"></a>
+<span class="sourceLineNo">122</span>    }<a name="line.122"></a>
+<span class="sourceLineNo">123</span>  }<a name="line.123"></a>
+<span class="sourceLineNo">124</span>}<a name="line.124"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/96e5e102/devapidocs/src-html/org/apache/hadoop/hbase/rest/RowResultGenerator.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/rest/RowResultGenerator.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/rest/RowResultGenerator.html
index 93931e3..5f7b50f 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/rest/RowResultGenerator.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/rest/RowResultGenerator.html
@@ -31,17 +31,17 @@
 <span class="sourceLineNo">023</span>import java.util.Iterator;<a 
name="line.23"></a>
 <span class="sourceLineNo">024</span>import 
java.util.NoSuchElementException;<a name="line.24"></a>
 <span class="sourceLineNo">025</span><a name="line.25"></a>
-<span class="sourceLineNo">026</span>import 
org.apache.hadoop.hbase.CellUtil;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.slf4j.Logger;<a 
name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.slf4j.LoggerFactory;<a 
name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.Cell;<a 
name="line.30"></a>
-<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.DoNotRetryIOException;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.client.Get;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.client.Result;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.client.Table;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.filter.Filter;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import 
org.apache.hadoop.util.StringUtils;<a name="line.36"></a>
+<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.Cell;<a 
name="line.26"></a>
+<span class="sourceLineNo">027</span>import 
org.apache.hadoop.hbase.CellUtil;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import 
org.apache.hadoop.hbase.DoNotRetryIOException;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.client.Get;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.client.Result;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.client.Table;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.filter.Filter;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import 
org.apache.hadoop.util.StringUtils;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.slf4j.Logger;<a 
name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.slf4j.LoggerFactory;<a 
name="line.36"></a>
 <span class="sourceLineNo">037</span><a name="line.37"></a>
 <span class="sourceLineNo">038</span>@InterfaceAudience.Private<a 
name="line.38"></a>
 <span class="sourceLineNo">039</span>public class RowResultGenerator extends 
ResultGenerator {<a name="line.39"></a>
@@ -91,43 +91,48 @@
 <span class="sourceLineNo">083</span>    }<a name="line.83"></a>
 <span class="sourceLineNo">084</span>  }<a name="line.84"></a>
 <span class="sourceLineNo">085</span><a name="line.85"></a>
-<span class="sourceLineNo">086</span>  public void close() {<a 
name="line.86"></a>
-<span class="sourceLineNo">087</span>  }<a name="line.87"></a>
-<span class="sourceLineNo">088</span><a name="line.88"></a>
-<span class="sourceLineNo">089</span>  public boolean hasNext() {<a 
name="line.89"></a>
-<span class="sourceLineNo">090</span>    if (cache != null) {<a 
name="line.90"></a>
-<span class="sourceLineNo">091</span>      return true;<a name="line.91"></a>
-<span class="sourceLineNo">092</span>    }<a name="line.92"></a>
-<span class="sourceLineNo">093</span>    if (valuesI == null) {<a 
name="line.93"></a>
-<span class="sourceLineNo">094</span>      return false;<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    }<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    return valuesI.hasNext();<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>  public Cell next() {<a 
name="line.99"></a>
-<span class="sourceLineNo">100</span>    if (cache != null) {<a 
name="line.100"></a>
-<span class="sourceLineNo">101</span>      Cell kv = cache;<a 
name="line.101"></a>
-<span class="sourceLineNo">102</span>      cache = null;<a name="line.102"></a>
-<span class="sourceLineNo">103</span>      return kv;<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    }<a name="line.104"></a>
-<span class="sourceLineNo">105</span>    if (valuesI == null) {<a 
name="line.105"></a>
-<span class="sourceLineNo">106</span>      return null;<a name="line.106"></a>
+<span class="sourceLineNo">086</span>  @Override<a name="line.86"></a>
+<span class="sourceLineNo">087</span>  public void close() {<a 
name="line.87"></a>
+<span class="sourceLineNo">088</span>  }<a name="line.88"></a>
+<span class="sourceLineNo">089</span><a name="line.89"></a>
+<span class="sourceLineNo">090</span>  @Override<a name="line.90"></a>
+<span class="sourceLineNo">091</span>  public boolean hasNext() {<a 
name="line.91"></a>
+<span class="sourceLineNo">092</span>    if (cache != null) {<a 
name="line.92"></a>
+<span class="sourceLineNo">093</span>      return true;<a name="line.93"></a>
+<span class="sourceLineNo">094</span>    }<a name="line.94"></a>
+<span class="sourceLineNo">095</span>    if (valuesI == null) {<a 
name="line.95"></a>
+<span class="sourceLineNo">096</span>      return false;<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    }<a name="line.97"></a>
+<span class="sourceLineNo">098</span>    return valuesI.hasNext();<a 
name="line.98"></a>
+<span class="sourceLineNo">099</span>  }<a name="line.99"></a>
+<span class="sourceLineNo">100</span><a name="line.100"></a>
+<span class="sourceLineNo">101</span>  @Override<a name="line.101"></a>
+<span class="sourceLineNo">102</span>  public Cell next() {<a 
name="line.102"></a>
+<span class="sourceLineNo">103</span>    if (cache != null) {<a 
name="line.103"></a>
+<span class="sourceLineNo">104</span>      Cell kv = cache;<a 
name="line.104"></a>
+<span class="sourceLineNo">105</span>      cache = null;<a name="line.105"></a>
+<span class="sourceLineNo">106</span>      return kv;<a name="line.106"></a>
 <span class="sourceLineNo">107</span>    }<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    try {<a name="line.108"></a>
-<span class="sourceLineNo">109</span>      return valuesI.next();<a 
name="line.109"></a>
-<span class="sourceLineNo">110</span>    } catch (NoSuchElementException e) 
{<a name="line.110"></a>
-<span class="sourceLineNo">111</span>      return null;<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><a name="line.114"></a>
-<span class="sourceLineNo">115</span>  public void putBack(Cell kv) {<a 
name="line.115"></a>
-<span class="sourceLineNo">116</span>    this.cache = kv;<a 
name="line.116"></a>
-<span class="sourceLineNo">117</span>  }<a name="line.117"></a>
-<span class="sourceLineNo">118</span><a name="line.118"></a>
-<span class="sourceLineNo">119</span>  public void remove() {<a 
name="line.119"></a>
-<span class="sourceLineNo">120</span>    throw new 
UnsupportedOperationException("remove not supported");<a name="line.120"></a>
+<span class="sourceLineNo">108</span>    if (valuesI == null) {<a 
name="line.108"></a>
+<span class="sourceLineNo">109</span>      return null;<a name="line.109"></a>
+<span class="sourceLineNo">110</span>    }<a name="line.110"></a>
+<span class="sourceLineNo">111</span>    try {<a name="line.111"></a>
+<span class="sourceLineNo">112</span>      return valuesI.next();<a 
name="line.112"></a>
+<span class="sourceLineNo">113</span>    } catch (NoSuchElementException e) 
{<a name="line.113"></a>
+<span class="sourceLineNo">114</span>      return null;<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><a name="line.117"></a>
+<span class="sourceLineNo">118</span>  @Override<a name="line.118"></a>
+<span class="sourceLineNo">119</span>  public void putBack(Cell kv) {<a 
name="line.119"></a>
+<span class="sourceLineNo">120</span>    this.cache = kv;<a 
name="line.120"></a>
 <span class="sourceLineNo">121</span>  }<a name="line.121"></a>
-<span class="sourceLineNo">122</span>}<a name="line.122"></a>
+<span class="sourceLineNo">122</span><a name="line.122"></a>
+<span class="sourceLineNo">123</span>  @Override<a name="line.123"></a>
+<span class="sourceLineNo">124</span>  public void remove() {<a 
name="line.124"></a>
+<span class="sourceLineNo">125</span>    throw new 
UnsupportedOperationException("remove not supported");<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/96e5e102/devapidocs/src-html/org/apache/hadoop/hbase/rest/RowSpec.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/rest/RowSpec.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/rest/RowSpec.html
index 74b4181..19bdde8 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/rest/RowSpec.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/rest/RowSpec.html
@@ -384,34 +384,35 @@
 <span class="sourceLineNo">376</span>    this.endTime = endTime;<a 
name="line.376"></a>
 <span class="sourceLineNo">377</span>  }<a name="line.377"></a>
 <span class="sourceLineNo">378</span><a name="line.378"></a>
-<span class="sourceLineNo">379</span>  public String toString() {<a 
name="line.379"></a>
-<span class="sourceLineNo">380</span>    StringBuilder result = new 
StringBuilder();<a name="line.380"></a>
-<span class="sourceLineNo">381</span>    result.append("{startRow =&gt; '");<a 
name="line.381"></a>
-<span class="sourceLineNo">382</span>    if (row != null) {<a 
name="line.382"></a>
-<span class="sourceLineNo">383</span>      
result.append(Bytes.toString(row));<a name="line.383"></a>
-<span class="sourceLineNo">384</span>    }<a name="line.384"></a>
-<span class="sourceLineNo">385</span>    result.append("', endRow =&gt; '");<a 
name="line.385"></a>
-<span class="sourceLineNo">386</span>    if (endRow != null)  {<a 
name="line.386"></a>
-<span class="sourceLineNo">387</span>      
result.append(Bytes.toString(endRow));<a name="line.387"></a>
-<span class="sourceLineNo">388</span>    }<a name="line.388"></a>
-<span class="sourceLineNo">389</span>    result.append("', columns =&gt; 
[");<a name="line.389"></a>
-<span class="sourceLineNo">390</span>    for (byte[] col: columns) {<a 
name="line.390"></a>
-<span class="sourceLineNo">391</span>      result.append(" '");<a 
name="line.391"></a>
-<span class="sourceLineNo">392</span>      
result.append(Bytes.toString(col));<a name="line.392"></a>
-<span class="sourceLineNo">393</span>      result.append("'");<a 
name="line.393"></a>
-<span class="sourceLineNo">394</span>    }<a name="line.394"></a>
-<span class="sourceLineNo">395</span>    result.append(" ], startTime =&gt; 
");<a name="line.395"></a>
-<span class="sourceLineNo">396</span>    
result.append(Long.toString(startTime));<a name="line.396"></a>
-<span class="sourceLineNo">397</span>    result.append(", endTime =&gt; ");<a 
name="line.397"></a>
-<span class="sourceLineNo">398</span>    
result.append(Long.toString(endTime));<a name="line.398"></a>
-<span class="sourceLineNo">399</span>    result.append(", maxVersions =&gt; 
");<a name="line.399"></a>
-<span class="sourceLineNo">400</span>    
result.append(Integer.toString(maxVersions));<a name="line.400"></a>
-<span class="sourceLineNo">401</span>    result.append(", maxValues =&gt; 
");<a name="line.401"></a>
-<span class="sourceLineNo">402</span>    
result.append(Integer.toString(maxValues));<a name="line.402"></a>
-<span class="sourceLineNo">403</span>    result.append("}");<a 
name="line.403"></a>
-<span class="sourceLineNo">404</span>    return result.toString();<a 
name="line.404"></a>
-<span class="sourceLineNo">405</span>  }<a name="line.405"></a>
-<span class="sourceLineNo">406</span>}<a name="line.406"></a>
+<span class="sourceLineNo">379</span>  @Override<a name="line.379"></a>
+<span class="sourceLineNo">380</span>  public String toString() {<a 
name="line.380"></a>
+<span class="sourceLineNo">381</span>    StringBuilder result = new 
StringBuilder();<a name="line.381"></a>
+<span class="sourceLineNo">382</span>    result.append("{startRow =&gt; '");<a 
name="line.382"></a>
+<span class="sourceLineNo">383</span>    if (row != null) {<a 
name="line.383"></a>
+<span class="sourceLineNo">384</span>      
result.append(Bytes.toString(row));<a name="line.384"></a>
+<span class="sourceLineNo">385</span>    }<a name="line.385"></a>
+<span class="sourceLineNo">386</span>    result.append("', endRow =&gt; '");<a 
name="line.386"></a>
+<span class="sourceLineNo">387</span>    if (endRow != null)  {<a 
name="line.387"></a>
+<span class="sourceLineNo">388</span>      
result.append(Bytes.toString(endRow));<a name="line.388"></a>
+<span class="sourceLineNo">389</span>    }<a name="line.389"></a>
+<span class="sourceLineNo">390</span>    result.append("', columns =&gt; 
[");<a name="line.390"></a>
+<span class="sourceLineNo">391</span>    for (byte[] col: columns) {<a 
name="line.391"></a>
+<span class="sourceLineNo">392</span>      result.append(" '");<a 
name="line.392"></a>
+<span class="sourceLineNo">393</span>      
result.append(Bytes.toString(col));<a name="line.393"></a>
+<span class="sourceLineNo">394</span>      result.append("'");<a 
name="line.394"></a>
+<span class="sourceLineNo">395</span>    }<a name="line.395"></a>
+<span class="sourceLineNo">396</span>    result.append(" ], startTime =&gt; 
");<a name="line.396"></a>
+<span class="sourceLineNo">397</span>    
result.append(Long.toString(startTime));<a name="line.397"></a>
+<span class="sourceLineNo">398</span>    result.append(", endTime =&gt; ");<a 
name="line.398"></a>
+<span class="sourceLineNo">399</span>    
result.append(Long.toString(endTime));<a name="line.399"></a>
+<span class="sourceLineNo">400</span>    result.append(", maxVersions =&gt; 
");<a name="line.400"></a>
+<span class="sourceLineNo">401</span>    
result.append(Integer.toString(maxVersions));<a name="line.401"></a>
+<span class="sourceLineNo">402</span>    result.append(", maxValues =&gt; 
");<a name="line.402"></a>
+<span class="sourceLineNo">403</span>    
result.append(Integer.toString(maxValues));<a name="line.403"></a>
+<span class="sourceLineNo">404</span>    result.append("}");<a 
name="line.404"></a>
+<span class="sourceLineNo">405</span>    return result.toString();<a 
name="line.405"></a>
+<span class="sourceLineNo">406</span>  }<a name="line.406"></a>
+<span class="sourceLineNo">407</span>}<a name="line.407"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/96e5e102/devapidocs/src-html/org/apache/hadoop/hbase/rest/ScannerResultGenerator.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/rest/ScannerResultGenerator.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/rest/ScannerResultGenerator.html
index 7657902..5c15673 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/rest/ScannerResultGenerator.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/rest/ScannerResultGenerator.html
@@ -35,17 +35,17 @@
 <span class="sourceLineNo">027</span>import 
org.apache.hadoop.hbase.TableNotEnabledException;<a name="line.27"></a>
 <span class="sourceLineNo">028</span>import 
org.apache.hadoop.hbase.TableNotFoundException;<a name="line.28"></a>
 <span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.UnknownScannerException;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.slf4j.Logger;<a 
name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.slf4j.LoggerFactory;<a 
name="line.32"></a>
-<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.client.Result;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.client.ResultScanner;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.client.Scan;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.client.Table;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.filter.Filter;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import 
org.apache.hadoop.hbase.rest.model.ScannerModel;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import 
org.apache.hadoop.hbase.security.visibility.Authorizations;<a 
name="line.39"></a>
-<span class="sourceLineNo">040</span>import 
org.apache.hadoop.util.StringUtils;<a name="line.40"></a>
+<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.client.Result;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.client.ResultScanner;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.client.Scan;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.client.Table;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.filter.Filter;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.rest.model.ScannerModel;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.security.visibility.Authorizations;<a 
name="line.36"></a>
+<span class="sourceLineNo">037</span>import 
org.apache.hadoop.util.StringUtils;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.slf4j.Logger;<a 
name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.slf4j.LoggerFactory;<a 
name="line.40"></a>
 <span class="sourceLineNo">041</span><a name="line.41"></a>
 <span class="sourceLineNo">042</span>@InterfaceAudience.Private<a 
name="line.42"></a>
 <span class="sourceLineNo">043</span>public class ScannerResultGenerator 
extends ResultGenerator {<a name="line.43"></a>
@@ -123,86 +123,91 @@
 <span class="sourceLineNo">115</span>    return id;<a name="line.115"></a>
 <span class="sourceLineNo">116</span>  }<a name="line.116"></a>
 <span class="sourceLineNo">117</span><a name="line.117"></a>
-<span class="sourceLineNo">118</span>  public void close() {<a 
name="line.118"></a>
-<span class="sourceLineNo">119</span>    if (scanner != null) {<a 
name="line.119"></a>
-<span class="sourceLineNo">120</span>      scanner.close();<a 
name="line.120"></a>
-<span class="sourceLineNo">121</span>      scanner = null;<a 
name="line.121"></a>
-<span class="sourceLineNo">122</span>    }<a name="line.122"></a>
-<span class="sourceLineNo">123</span>  }<a name="line.123"></a>
-<span class="sourceLineNo">124</span><a name="line.124"></a>
-<span class="sourceLineNo">125</span>  public boolean hasNext() {<a 
name="line.125"></a>
-<span class="sourceLineNo">126</span>    if (cache != null) {<a 
name="line.126"></a>
-<span class="sourceLineNo">127</span>      return true;<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    }<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    if (rowI != null &amp;&amp; 
rowI.hasNext()) {<a name="line.129"></a>
-<span class="sourceLineNo">130</span>      return true;<a name="line.130"></a>
-<span class="sourceLineNo">131</span>    }<a name="line.131"></a>
-<span class="sourceLineNo">132</span>    if (cached != null) {<a 
name="line.132"></a>
-<span class="sourceLineNo">133</span>      return true;<a name="line.133"></a>
-<span class="sourceLineNo">134</span>    }<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    try {<a name="line.135"></a>
-<span class="sourceLineNo">136</span>      Result result = scanner.next();<a 
name="line.136"></a>
-<span class="sourceLineNo">137</span>      if (result != null &amp;&amp; 
!result.isEmpty()) {<a name="line.137"></a>
-<span class="sourceLineNo">138</span>        cached = result;<a 
name="line.138"></a>
-<span class="sourceLineNo">139</span>      }<a name="line.139"></a>
-<span class="sourceLineNo">140</span>    } catch (UnknownScannerException e) 
{<a name="line.140"></a>
-<span class="sourceLineNo">141</span>      throw new 
IllegalArgumentException(e);<a name="line.141"></a>
-<span class="sourceLineNo">142</span>    } catch (IOException e) {<a 
name="line.142"></a>
-<span class="sourceLineNo">143</span>      
LOG.error(StringUtils.stringifyException(e));<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    }<a name="line.144"></a>
-<span class="sourceLineNo">145</span>    return cached != null;<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>  public Cell next() {<a 
name="line.148"></a>
-<span class="sourceLineNo">149</span>    if (cache != null) {<a 
name="line.149"></a>
-<span class="sourceLineNo">150</span>      Cell kv = cache;<a 
name="line.150"></a>
-<span class="sourceLineNo">151</span>      cache = null;<a name="line.151"></a>
-<span class="sourceLineNo">152</span>      return kv;<a name="line.152"></a>
-<span class="sourceLineNo">153</span>    }<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    boolean loop;<a name="line.154"></a>
-<span class="sourceLineNo">155</span>    do {<a name="line.155"></a>
-<span class="sourceLineNo">156</span>      loop = false;<a name="line.156"></a>
-<span class="sourceLineNo">157</span>      if (rowI != null) {<a 
name="line.157"></a>
-<span class="sourceLineNo">158</span>        if (rowI.hasNext()) {<a 
name="line.158"></a>
-<span class="sourceLineNo">159</span>          return rowI.next();<a 
name="line.159"></a>
-<span class="sourceLineNo">160</span>        } else {<a name="line.160"></a>
-<span class="sourceLineNo">161</span>          rowI = null;<a 
name="line.161"></a>
-<span class="sourceLineNo">162</span>        }<a name="line.162"></a>
-<span class="sourceLineNo">163</span>      }<a name="line.163"></a>
-<span class="sourceLineNo">164</span>      if (cached != null) {<a 
name="line.164"></a>
-<span class="sourceLineNo">165</span>        rowI = 
cached.listCells().iterator();<a name="line.165"></a>
-<span class="sourceLineNo">166</span>        loop = true;<a 
name="line.166"></a>
-<span class="sourceLineNo">167</span>        cached = null;<a 
name="line.167"></a>
-<span class="sourceLineNo">168</span>      } else {<a name="line.168"></a>
-<span class="sourceLineNo">169</span>        Result result = null;<a 
name="line.169"></a>
-<span class="sourceLineNo">170</span>        try {<a name="line.170"></a>
-<span class="sourceLineNo">171</span>          result = scanner.next();<a 
name="line.171"></a>
-<span class="sourceLineNo">172</span>        } catch (UnknownScannerException 
e) {<a name="line.172"></a>
-<span class="sourceLineNo">173</span>          throw new 
IllegalArgumentException(e);<a name="line.173"></a>
-<span class="sourceLineNo">174</span>        } catch (TableNotEnabledException 
tnee) {<a name="line.174"></a>
-<span class="sourceLineNo">175</span>          throw new 
IllegalStateException(tnee);<a name="line.175"></a>
-<span class="sourceLineNo">176</span>        } catch (TableNotFoundException 
tnfe) {<a name="line.176"></a>
-<span class="sourceLineNo">177</span>          throw new 
IllegalArgumentException(tnfe);<a name="line.177"></a>
-<span class="sourceLineNo">178</span>        } catch (IOException e) {<a 
name="line.178"></a>
-<span class="sourceLineNo">179</span>          
LOG.error(StringUtils.stringifyException(e));<a name="line.179"></a>
-<span class="sourceLineNo">180</span>        }<a name="line.180"></a>
-<span class="sourceLineNo">181</span>        if (result != null &amp;&amp; 
!result.isEmpty()) {<a name="line.181"></a>
-<span class="sourceLineNo">182</span>          rowI = 
result.listCells().iterator();<a name="line.182"></a>
-<span class="sourceLineNo">183</span>          loop = true;<a 
name="line.183"></a>
-<span class="sourceLineNo">184</span>        }<a name="line.184"></a>
-<span class="sourceLineNo">185</span>      }<a name="line.185"></a>
-<span class="sourceLineNo">186</span>    } while (loop);<a name="line.186"></a>
-<span class="sourceLineNo">187</span>    return null;<a name="line.187"></a>
-<span class="sourceLineNo">188</span>  }<a name="line.188"></a>
-<span class="sourceLineNo">189</span><a name="line.189"></a>
-<span class="sourceLineNo">190</span>  public void putBack(Cell kv) {<a 
name="line.190"></a>
-<span class="sourceLineNo">191</span>    this.cache = kv;<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>  public void remove() {<a 
name="line.194"></a>
-<span class="sourceLineNo">195</span>    throw new 
UnsupportedOperationException("remove not supported");<a name="line.195"></a>
+<span class="sourceLineNo">118</span>  @Override<a name="line.118"></a>
+<span class="sourceLineNo">119</span>  public void close() {<a 
name="line.119"></a>
+<span class="sourceLineNo">120</span>    if (scanner != null) {<a 
name="line.120"></a>
+<span class="sourceLineNo">121</span>      scanner.close();<a 
name="line.121"></a>
+<span class="sourceLineNo">122</span>      scanner = null;<a 
name="line.122"></a>
+<span class="sourceLineNo">123</span>    }<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>  @Override<a name="line.126"></a>
+<span class="sourceLineNo">127</span>  public boolean hasNext() {<a 
name="line.127"></a>
+<span class="sourceLineNo">128</span>    if (cache != null) {<a 
name="line.128"></a>
+<span class="sourceLineNo">129</span>      return true;<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    }<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    if (rowI != null &amp;&amp; 
rowI.hasNext()) {<a name="line.131"></a>
+<span class="sourceLineNo">132</span>      return true;<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    }<a name="line.133"></a>
+<span class="sourceLineNo">134</span>    if (cached != null) {<a 
name="line.134"></a>
+<span class="sourceLineNo">135</span>      return true;<a name="line.135"></a>
+<span class="sourceLineNo">136</span>    }<a name="line.136"></a>
+<span class="sourceLineNo">137</span>    try {<a name="line.137"></a>
+<span class="sourceLineNo">138</span>      Result result = scanner.next();<a 
name="line.138"></a>
+<span class="sourceLineNo">139</span>      if (result != null &amp;&amp; 
!result.isEmpty()) {<a name="line.139"></a>
+<span class="sourceLineNo">140</span>        cached = result;<a 
name="line.140"></a>
+<span class="sourceLineNo">141</span>      }<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    } catch (UnknownScannerException e) 
{<a name="line.142"></a>
+<span class="sourceLineNo">143</span>      throw new 
IllegalArgumentException(e);<a name="line.143"></a>
+<span class="sourceLineNo">144</span>    } catch (IOException e) {<a 
name="line.144"></a>
+<span class="sourceLineNo">145</span>      
LOG.error(StringUtils.stringifyException(e));<a name="line.145"></a>
+<span class="sourceLineNo">146</span>    }<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    return cached != null;<a 
name="line.147"></a>
+<span class="sourceLineNo">148</span>  }<a name="line.148"></a>
+<span class="sourceLineNo">149</span><a name="line.149"></a>
+<span class="sourceLineNo">150</span>  @Override<a name="line.150"></a>
+<span class="sourceLineNo">151</span>  public Cell next() {<a 
name="line.151"></a>
+<span class="sourceLineNo">152</span>    if (cache != null) {<a 
name="line.152"></a>
+<span class="sourceLineNo">153</span>      Cell kv = cache;<a 
name="line.153"></a>
+<span class="sourceLineNo">154</span>      cache = null;<a name="line.154"></a>
+<span class="sourceLineNo">155</span>      return kv;<a name="line.155"></a>
+<span class="sourceLineNo">156</span>    }<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    boolean loop;<a name="line.157"></a>
+<span class="sourceLineNo">158</span>    do {<a name="line.158"></a>
+<span class="sourceLineNo">159</span>      loop = false;<a name="line.159"></a>
+<span class="sourceLineNo">160</span>      if (rowI != null) {<a 
name="line.160"></a>
+<span class="sourceLineNo">161</span>        if (rowI.hasNext()) {<a 
name="line.161"></a>
+<span class="sourceLineNo">162</span>          return rowI.next();<a 
name="line.162"></a>
+<span class="sourceLineNo">163</span>        } else {<a name="line.163"></a>
+<span class="sourceLineNo">164</span>          rowI = null;<a 
name="line.164"></a>
+<span class="sourceLineNo">165</span>        }<a name="line.165"></a>
+<span class="sourceLineNo">166</span>      }<a name="line.166"></a>
+<span class="sourceLineNo">167</span>      if (cached != null) {<a 
name="line.167"></a>
+<span class="sourceLineNo">168</span>        rowI = 
cached.listCells().iterator();<a name="line.168"></a>
+<span class="sourceLineNo">169</span>        loop = true;<a 
name="line.169"></a>
+<span class="sourceLineNo">170</span>        cached = null;<a 
name="line.170"></a>
+<span class="sourceLineNo">171</span>      } else {<a name="line.171"></a>
+<span class="sourceLineNo">172</span>        Result result = null;<a 
name="line.172"></a>
+<span class="sourceLineNo">173</span>        try {<a name="line.173"></a>
+<span class="sourceLineNo">174</span>          result = scanner.next();<a 
name="line.174"></a>
+<span class="sourceLineNo">175</span>        } catch (UnknownScannerException 
e) {<a name="line.175"></a>
+<span class="sourceLineNo">176</span>          throw new 
IllegalArgumentException(e);<a name="line.176"></a>
+<span class="sourceLineNo">177</span>        } catch (TableNotEnabledException 
tnee) {<a name="line.177"></a>
+<span class="sourceLineNo">178</span>          throw new 
IllegalStateException(tnee);<a name="line.178"></a>
+<span class="sourceLineNo">179</span>        } catch (TableNotFoundException 
tnfe) {<a name="line.179"></a>
+<span class="sourceLineNo">180</span>          throw new 
IllegalArgumentException(tnfe);<a name="line.180"></a>
+<span class="sourceLineNo">181</span>        } catch (IOException e) {<a 
name="line.181"></a>
+<span class="sourceLineNo">182</span>          
LOG.error(StringUtils.stringifyException(e));<a name="line.182"></a>
+<span class="sourceLineNo">183</span>        }<a name="line.183"></a>
+<span class="sourceLineNo">184</span>        if (result != null &amp;&amp; 
!result.isEmpty()) {<a name="line.184"></a>
+<span class="sourceLineNo">185</span>          rowI = 
result.listCells().iterator();<a name="line.185"></a>
+<span class="sourceLineNo">186</span>          loop = true;<a 
name="line.186"></a>
+<span class="sourceLineNo">187</span>        }<a name="line.187"></a>
+<span class="sourceLineNo">188</span>      }<a name="line.188"></a>
+<span class="sourceLineNo">189</span>    } while (loop);<a name="line.189"></a>
+<span class="sourceLineNo">190</span>    return null;<a name="line.190"></a>
+<span class="sourceLineNo">191</span>  }<a name="line.191"></a>
+<span class="sourceLineNo">192</span><a name="line.192"></a>
+<span class="sourceLineNo">193</span>  @Override<a name="line.193"></a>
+<span class="sourceLineNo">194</span>  public void putBack(Cell kv) {<a 
name="line.194"></a>
+<span class="sourceLineNo">195</span>    this.cache = kv;<a 
name="line.195"></a>
 <span class="sourceLineNo">196</span>  }<a name="line.196"></a>
-<span class="sourceLineNo">197</span>}<a name="line.197"></a>
+<span class="sourceLineNo">197</span><a name="line.197"></a>
+<span class="sourceLineNo">198</span>  @Override<a name="line.198"></a>
+<span class="sourceLineNo">199</span>  public void remove() {<a 
name="line.199"></a>
+<span class="sourceLineNo">200</span>    throw new 
UnsupportedOperationException("remove not supported");<a name="line.200"></a>
+<span class="sourceLineNo">201</span>  }<a name="line.201"></a>
+<span class="sourceLineNo">202</span>}<a name="line.202"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/96e5e102/devapidocs/src-html/org/apache/hadoop/hbase/rest/model/RowModel.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/rest/model/RowModel.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/rest/model/RowModel.html
index 50e69e1..c39ce49 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/rest/model/RowModel.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/rest/model/RowModel.html
@@ -27,173 +27,175 @@
 <span class="sourceLineNo">019</span><a name="line.19"></a>
 <span class="sourceLineNo">020</span>package 
org.apache.hadoop.hbase.rest.model;<a name="line.20"></a>
 <span class="sourceLineNo">021</span><a name="line.21"></a>
-<span class="sourceLineNo">022</span>import java.io.IOException;<a 
name="line.22"></a>
-<span class="sourceLineNo">023</span>import java.io.Serializable;<a 
name="line.23"></a>
-<span class="sourceLineNo">024</span>import java.util.ArrayList;<a 
name="line.24"></a>
-<span class="sourceLineNo">025</span>import java.util.List;<a 
name="line.25"></a>
-<span class="sourceLineNo">026</span><a name="line.26"></a>
-<span class="sourceLineNo">027</span>import 
javax.xml.bind.annotation.XmlAccessType;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import 
javax.xml.bind.annotation.XmlAccessorType;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import 
javax.xml.bind.annotation.XmlAttribute;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import 
javax.xml.bind.annotation.XmlElement;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import 
javax.xml.bind.annotation.XmlRootElement;<a name="line.31"></a>
-<span class="sourceLineNo">032</span><a name="line.32"></a>
-<span class="sourceLineNo">033</span>import 
com.fasterxml.jackson.annotation.JsonProperty;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import 
org.apache.commons.lang3.builder.EqualsBuilder;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import 
org.apache.commons.lang3.builder.HashCodeBuilder;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import 
org.apache.commons.lang3.builder.ToStringBuilder;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.37"></a>
+<span class="sourceLineNo">022</span>import 
com.fasterxml.jackson.annotation.JsonProperty;<a name="line.22"></a>
+<span class="sourceLineNo">023</span><a name="line.23"></a>
+<span class="sourceLineNo">024</span>import java.io.IOException;<a 
name="line.24"></a>
+<span class="sourceLineNo">025</span>import java.io.Serializable;<a 
name="line.25"></a>
+<span class="sourceLineNo">026</span>import java.util.ArrayList;<a 
name="line.26"></a>
+<span class="sourceLineNo">027</span>import java.util.List;<a 
name="line.27"></a>
+<span class="sourceLineNo">028</span><a name="line.28"></a>
+<span class="sourceLineNo">029</span>import 
javax.xml.bind.annotation.XmlAccessType;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import 
javax.xml.bind.annotation.XmlAccessorType;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import 
javax.xml.bind.annotation.XmlAttribute;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import 
javax.xml.bind.annotation.XmlElement;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import 
javax.xml.bind.annotation.XmlRootElement;<a name="line.33"></a>
+<span class="sourceLineNo">034</span><a name="line.34"></a>
+<span class="sourceLineNo">035</span>import 
org.apache.commons.lang3.builder.EqualsBuilder;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import 
org.apache.commons.lang3.builder.HashCodeBuilder;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import 
org.apache.commons.lang3.builder.ToStringBuilder;<a name="line.37"></a>
 <span class="sourceLineNo">038</span>import 
org.apache.hadoop.hbase.rest.ProtobufMessageHandler;<a name="line.38"></a>
-<span class="sourceLineNo">039</span><a name="line.39"></a>
-<span class="sourceLineNo">040</span>/**<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * Representation of a row. A row is a 
related set of cells, grouped by common<a name="line.41"></a>
-<span class="sourceLineNo">042</span> * row key. RowModels do not appear in 
results by themselves. They are always<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * encapsulated within CellSetModels.<a 
name="line.43"></a>
-<span class="sourceLineNo">044</span> * <a name="line.44"></a>
-<span class="sourceLineNo">045</span> * &lt;pre&gt;<a name="line.45"></a>
-<span class="sourceLineNo">046</span> * &amp;lt;complexType 
name="Row"&amp;gt;<a name="line.46"></a>
-<span class="sourceLineNo">047</span> *   &amp;lt;sequence&amp;gt;<a 
name="line.47"></a>
-<span class="sourceLineNo">048</span> *     &amp;lt;element name="key" 
type="base64Binary"&amp;gt;&amp;lt;/element&amp;gt;<a name="line.48"></a>
-<span class="sourceLineNo">049</span> *     &amp;lt;element name="cell" 
type="tns:Cell" <a name="line.49"></a>
-<span class="sourceLineNo">050</span> *       maxOccurs="unbounded" 
minOccurs="1"&amp;gt;&amp;lt;/element&amp;gt;<a name="line.50"></a>
-<span class="sourceLineNo">051</span> *   &amp;lt;/sequence&amp;gt;<a 
name="line.51"></a>
-<span class="sourceLineNo">052</span> * &amp;lt;/complexType&amp;gt;<a 
name="line.52"></a>
-<span class="sourceLineNo">053</span> * &lt;/pre&gt;<a name="line.53"></a>
-<span class="sourceLineNo">054</span> */<a name="line.54"></a>
-<span class="sourceLineNo">055</span>@XmlRootElement(name="Row")<a 
name="line.55"></a>
-<span class="sourceLineNo">056</span>@XmlAccessorType(XmlAccessType.FIELD)<a 
name="line.56"></a>
-<span class="sourceLineNo">057</span>@InterfaceAudience.Private<a 
name="line.57"></a>
-<span class="sourceLineNo">058</span>public class RowModel implements 
ProtobufMessageHandler, Serializable {<a name="line.58"></a>
-<span class="sourceLineNo">059</span>  private static final long 
serialVersionUID = 1L;<a name="line.59"></a>
-<span class="sourceLineNo">060</span><a name="line.60"></a>
-<span class="sourceLineNo">061</span>  @JsonProperty("key")<a 
name="line.61"></a>
-<span class="sourceLineNo">062</span>  @XmlAttribute<a name="line.62"></a>
-<span class="sourceLineNo">063</span>  private byte[] key;<a 
name="line.63"></a>
-<span class="sourceLineNo">064</span><a name="line.64"></a>
-<span class="sourceLineNo">065</span>  @JsonProperty("Cell")<a 
name="line.65"></a>
-<span class="sourceLineNo">066</span>  @XmlElement(name="Cell")<a 
name="line.66"></a>
-<span class="sourceLineNo">067</span>  private List&lt;CellModel&gt; cells = 
new ArrayList&lt;&gt;();<a name="line.67"></a>
-<span class="sourceLineNo">068</span><a name="line.68"></a>
-<span class="sourceLineNo">069</span><a name="line.69"></a>
-<span class="sourceLineNo">070</span>  /**<a name="line.70"></a>
-<span class="sourceLineNo">071</span>   * Default constructor<a 
name="line.71"></a>
-<span class="sourceLineNo">072</span>   */<a name="line.72"></a>
-<span class="sourceLineNo">073</span>  public RowModel() { }<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>   * Constructor<a name="line.76"></a>
-<span class="sourceLineNo">077</span>   * @param key the row key<a 
name="line.77"></a>
-<span class="sourceLineNo">078</span>   */<a name="line.78"></a>
-<span class="sourceLineNo">079</span>  public RowModel(final String key) {<a 
name="line.79"></a>
-<span class="sourceLineNo">080</span>    this(key.getBytes());<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>   * Constructor<a name="line.84"></a>
-<span class="sourceLineNo">085</span>   * @param key the row key<a 
name="line.85"></a>
-<span class="sourceLineNo">086</span>   */<a name="line.86"></a>
-<span class="sourceLineNo">087</span>  public RowModel(final byte[] key) {<a 
name="line.87"></a>
-<span class="sourceLineNo">088</span>    this.key = key;<a name="line.88"></a>
-<span class="sourceLineNo">089</span>    cells = new ArrayList&lt;&gt;();<a 
name="line.89"></a>
-<span class="sourceLineNo">090</span>  }<a name="line.90"></a>
-<span class="sourceLineNo">091</span><a name="line.91"></a>
-<span class="sourceLineNo">092</span>  /**<a name="line.92"></a>
-<span class="sourceLineNo">093</span>   * Constructor<a name="line.93"></a>
-<span class="sourceLineNo">094</span>   * @param key the row key<a 
name="line.94"></a>
-<span class="sourceLineNo">095</span>   * @param cells the cells<a 
name="line.95"></a>
-<span class="sourceLineNo">096</span>   */<a name="line.96"></a>
-<span class="sourceLineNo">097</span>  public RowModel(final String key, final 
List&lt;CellModel&gt; cells) {<a name="line.97"></a>
-<span class="sourceLineNo">098</span>    this(key.getBytes(), cells);<a 
name="line.98"></a>
-<span class="sourceLineNo">099</span>  }<a name="line.99"></a>
-<span class="sourceLineNo">100</span>  <a name="line.100"></a>
-<span class="sourceLineNo">101</span>  /**<a name="line.101"></a>
-<span class="sourceLineNo">102</span>   * Constructor<a name="line.102"></a>
-<span class="sourceLineNo">103</span>   * @param key the row key<a 
name="line.103"></a>
-<span class="sourceLineNo">104</span>   * @param cells the cells<a 
name="line.104"></a>
-<span class="sourceLineNo">105</span>   */<a name="line.105"></a>
-<span class="sourceLineNo">106</span>  public RowModel(final byte[] key, final 
List&lt;CellModel&gt; cells) {<a name="line.106"></a>
-<span class="sourceLineNo">107</span>    this.key = key;<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    this.cells = cells;<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>  /**<a name="line.111"></a>
-<span class="sourceLineNo">112</span>   * Adds a cell to the list of cells for 
this row<a name="line.112"></a>
-<span class="sourceLineNo">113</span>   * @param cell the cell<a 
name="line.113"></a>
-<span class="sourceLineNo">114</span>   */<a name="line.114"></a>
-<span class="sourceLineNo">115</span>  public void addCell(CellModel cell) {<a 
name="line.115"></a>
-<span class="sourceLineNo">116</span>    cells.add(cell);<a 
name="line.116"></a>
-<span class="sourceLineNo">117</span>  }<a name="line.117"></a>
-<span class="sourceLineNo">118</span><a name="line.118"></a>
-<span class="sourceLineNo">119</span>  /**<a name="line.119"></a>
-<span class="sourceLineNo">120</span>   * @return the row key<a 
name="line.120"></a>
-<span class="sourceLineNo">121</span>   */<a name="line.121"></a>
-<span class="sourceLineNo">122</span>  public byte[] getKey() {<a 
name="line.122"></a>
-<span class="sourceLineNo">123</span>    return key;<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>  /**<a name="line.126"></a>
-<span class="sourceLineNo">127</span>   * @param key the row key<a 
name="line.127"></a>
-<span class="sourceLineNo">128</span>   */<a name="line.128"></a>
-<span class="sourceLineNo">129</span>  public void setKey(byte[] key) {<a 
name="line.129"></a>
-<span class="sourceLineNo">130</span>    this.key = key;<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>  /**<a name="line.133"></a>
-<span class="sourceLineNo">134</span>   * @return the cells<a 
name="line.134"></a>
-<span class="sourceLineNo">135</span>   */<a name="line.135"></a>
-<span class="sourceLineNo">136</span>  public List&lt;CellModel&gt; getCells() 
{<a name="line.136"></a>
-<span class="sourceLineNo">137</span>    return cells;<a name="line.137"></a>
-<span class="sourceLineNo">138</span>  }<a name="line.138"></a>
-<span class="sourceLineNo">139</span><a name="line.139"></a>
-<span class="sourceLineNo">140</span>  @Override<a name="line.140"></a>
-<span class="sourceLineNo">141</span>  public byte[] createProtobufOutput() 
{<a name="line.141"></a>
-<span class="sourceLineNo">142</span>    // there is no standalone row 
protobuf message<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    throw new 
UnsupportedOperationException(<a name="line.143"></a>
-<span class="sourceLineNo">144</span>        "no protobuf equivalent to 
RowModel");<a name="line.144"></a>
-<span class="sourceLineNo">145</span>  }<a name="line.145"></a>
-<span class="sourceLineNo">146</span><a name="line.146"></a>
-<span class="sourceLineNo">147</span>  @Override<a name="line.147"></a>
-<span class="sourceLineNo">148</span>  public ProtobufMessageHandler 
getObjectFromMessage(byte[] message)<a name="line.148"></a>
-<span class="sourceLineNo">149</span>      throws IOException {<a 
name="line.149"></a>
-<span class="sourceLineNo">150</span>    // there is no standalone row 
protobuf message<a name="line.150"></a>
-<span class="sourceLineNo">151</span>    throw new 
UnsupportedOperationException(<a name="line.151"></a>
-<span class="sourceLineNo">152</span>        "no protobuf equivalent to 
RowModel");<a name="line.152"></a>
-<span class="sourceLineNo">153</span>  }<a name="line.153"></a>
-<span class="sourceLineNo">154</span><a name="line.154"></a>
-<span class="sourceLineNo">155</span>  @Override<a name="line.155"></a>
-<span class="sourceLineNo">156</span>  public boolean equals(Object obj) {<a 
name="line.156"></a>
-<span class="sourceLineNo">157</span>    if (obj == null) {<a 
name="line.157"></a>
-<span class="sourceLineNo">158</span>      return false;<a name="line.158"></a>
-<span class="sourceLineNo">159</span>    }<a name="line.159"></a>
-<span class="sourceLineNo">160</span>    if (obj == this) {<a 
name="line.160"></a>
-<span class="sourceLineNo">161</span>      return true;<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    }<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    if (obj.getClass() != getClass()) {<a 
name="line.163"></a>
-<span class="sourceLineNo">164</span>      return false;<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    }<a name="line.165"></a>
-<span class="sourceLineNo">166</span>    RowModel rowModel = (RowModel) obj;<a 
name="line.166"></a>
-<span class="sourceLineNo">167</span>    return new EqualsBuilder().<a 
name="line.167"></a>
-<span class="sourceLineNo">168</span>        append(key, rowModel.key).<a 
name="line.168"></a>
-<span class="sourceLineNo">169</span>        append(cells, rowModel.cells).<a 
name="line.169"></a>
-<span class="sourceLineNo">170</span>        isEquals();<a name="line.170"></a>
-<span class="sourceLineNo">171</span>  }<a name="line.171"></a>
-<span class="sourceLineNo">172</span><a name="line.172"></a>
-<span class="sourceLineNo">173</span>  @Override<a name="line.173"></a>
-<span class="sourceLineNo">174</span>  public int hashCode() {<a 
name="line.174"></a>
-<span class="sourceLineNo">175</span>    return new HashCodeBuilder().<a 
name="line.175"></a>
-<span class="sourceLineNo">176</span>        append(key).<a 
name="line.176"></a>
-<span class="sourceLineNo">177</span>        append(cells).<a 
name="line.177"></a>
-<span class="sourceLineNo">178</span>        toHashCode();<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>  @Override<a name="line.181"></a>
-<span class="sourceLineNo">182</span>  public String toString() {<a 
name="line.182"></a>
-<span class="sourceLineNo">183</span>    return new ToStringBuilder(this).<a 
name="line.183"></a>
-<span class="sourceLineNo">184</span>        append("key", key).<a 
name="line.184"></a>
-<span class="sourceLineNo">185</span>        append("cells", cells).<a 
name="line.185"></a>
-<span class="sourceLineNo">186</span>        toString();<a name="line.186"></a>
-<span class="sourceLineNo">187</span>  }<a name="line.187"></a>
-<span class="sourceLineNo">188</span>}<a name="line.188"></a>
+<span class="sourceLineNo">039</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.40"></a>
+<span class="sourceLineNo">041</span><a name="line.41"></a>
+<span class="sourceLineNo">042</span>/**<a name="line.42"></a>
+<span class="sourceLineNo">043</span> * Representation of a row. A row is a 
related set of cells, grouped by common<a name="line.43"></a>
+<span class="sourceLineNo">044</span> * row key. RowModels do not appear in 
results by themselves. They are always<a name="line.44"></a>
+<span class="sourceLineNo">045</span> * encapsulated within CellSetModels.<a 
name="line.45"></a>
+<span class="sourceLineNo">046</span> * <a name="line.46"></a>
+<span class="sourceLineNo">047</span> * &lt;pre&gt;<a name="line.47"></a>
+<span class="sourceLineNo">048</span> * &amp;lt;complexType 
name="Row"&amp;gt;<a name="line.48"></a>
+<span class="sourceLineNo">049</span> *   &amp;lt;sequence&amp;gt;<a 
name="line.49"></a>
+<span class="sourceLineNo">050</span> *     &amp;lt;element name="key" 
type="base64Binary"&amp;gt;&amp;lt;/element&amp;gt;<a name="line.50"></a>
+<span class="sourceLineNo">051</span> *     &amp;lt;element name="cell" 
type="tns:Cell" <a name="line.51"></a>
+<span class="sourceLineNo">052</span> *       maxOccurs="unbounded" 
minOccurs="1"&amp;gt;&amp;lt;/element&amp;gt;<a name="line.52"></a>
+<span class="sourceLineNo">053</span> *   &amp;lt;/sequence&amp;gt;<a 
name="line.53"></a>
+<span class="sourceLineNo">054</span> * &amp;lt;/complexType&amp;gt;<a 
name="line.54"></a>
+<span class="sourceLineNo">055</span> * &lt;/pre&gt;<a name="line.55"></a>
+<span class="sourceLineNo">056</span> */<a name="line.56"></a>
+<span class="sourceLineNo">057</span>@XmlRootElement(name="Row")<a 
name="line.57"></a>
+<span class="sourceLineNo">058</span>@XmlAccessorType(XmlAccessType.FIELD)<a 
name="line.58"></a>
+<span class="sourceLineNo">059</span>@InterfaceAudience.Private<a 
name="line.59"></a>
+<span class="sourceLineNo">060</span>public class RowModel implements 
ProtobufMessageHandler, Serializable {<a name="line.60"></a>
+<span class="sourceLineNo">061</span>  private static final long 
serialVersionUID = 1L;<a name="line.61"></a>
+<span class="sourceLineNo">062</span><a name="line.62"></a>
+<span class="sourceLineNo">063</span>  @JsonProperty("key")<a 
name="line.63"></a>
+<span class="sourceLineNo">064</span>  @XmlAttribute<a name="line.64"></a>
+<span class="sourceLineNo">065</span>  private byte[] key;<a 
name="line.65"></a>
+<span class="sourceLineNo">066</span><a name="line.66"></a>
+<span class="sourceLineNo">067</span>  @JsonProperty("Cell")<a 
name="line.67"></a>
+<span class="sourceLineNo">068</span>  @XmlElement(name="Cell")<a 
name="line.68"></a>
+<span class="sourceLineNo">069</span>  private List&lt;CellModel&gt; cells = 
new ArrayList&lt;&gt;();<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>  /**<a name="line.72"></a>
+<span class="sourceLineNo">073</span>   * Default constructor<a 
name="line.73"></a>
+<span class="sourceLineNo">074</span>   */<a name="line.74"></a>
+<span class="sourceLineNo">075</span>  public RowModel() { }<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>   * Constructor<a name="line.78"></a>
+<span class="sourceLineNo">079</span>   * @param key the row key<a 
name="line.79"></a>
+<span class="sourceLineNo">080</span>   */<a name="line.80"></a>
+<span class="sourceLineNo">081</span>  public RowModel(final String key) {<a 
name="line.81"></a>
+<span class="sourceLineNo">082</span>    this(Bytes.toBytes(key));<a 
name="line.82"></a>
+<span class="sourceLineNo">083</span>  }<a name="line.83"></a>
+<span class="sourceLineNo">084</span>  <a name="line.84"></a>
+<span class="sourceLineNo">085</span>  /**<a name="line.85"></a>
+<span class="sourceLineNo">086</span>   * Constructor<a name="line.86"></a>
+<span class="sourceLineNo">087</span>   * @param key the row key<a 
name="line.87"></a>
+<span class="sourceLineNo">088</span>   */<a name="line.88"></a>
+<span class="sourceLineNo">089</span>  public RowModel(final byte[] key) {<a 
name="line.89"></a>
+<span class="sourceLineNo">090</span>    this.key = key;<a name="line.90"></a>
+<span class="sourceLineNo">091</span>    cells = new ArrayList&lt;&gt;();<a 
name="line.91"></a>
+<span class="sourceLineNo">092</span>  }<a name="line.92"></a>
+<span class="sourceLineNo">093</span><a name="line.93"></a>
+<span class="sourceLineNo">094</span>  /**<a name="line.94"></a>
+<span class="sourceLineNo">095</span>   * Constructor<a name="line.95"></a>
+<span class="sourceLineNo">096</span>   * @param key the row key<a 
name="line.96"></a>
+<span class="sourceLineNo">097</span>   * @param cells the cells<a 
name="line.97"></a>
+<span class="sourceLineNo">098</span>   */<a name="line.98"></a>
+<span class="sourceLineNo">099</span>  public RowModel(final String key, final 
List&lt;CellModel&gt; cells) {<a name="line.99"></a>
+<span class="sourceLineNo">100</span>    this(Bytes.toBytes(key), cells);<a 
name="line.100"></a>
+<span class="sourceLineNo">101</span>  }<a name="line.101"></a>
+<span class="sourceLineNo">102</span>  <a name="line.102"></a>
+<span class="sourceLineNo">103</span>  /**<a name="line.103"></a>
+<span class="sourceLineNo">104</span>   * Constructor<a name="line.104"></a>
+<span class="sourceLineNo">105</span>   * @param key the row key<a 
name="line.105"></a>
+<span class="sourceLineNo">106</span>   * @param cells the cells<a 
name="line.106"></a>
+<span class="sourceLineNo">107</span>   */<a name="line.107"></a>
+<span class="sourceLineNo">108</span>  public RowModel(final byte[] key, final 
List&lt;CellModel&gt; cells) {<a name="line.108"></a>
+<span class="sourceLineNo">109</span>    this.key = key;<a name="line.109"></a>
+<span class="sourceLineNo">110</span>    this.cells = cells;<a 
name="line.110"></a>
+<span class="sourceLineNo">111</span>  }<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>   * Adds a cell to the list of cells for 
this row<a name="line.114"></a>
+<span class="sourceLineNo">115</span>   * @param cell the cell<a 
name="line.115"></a>
+<span class="sourceLineNo">116</span>   */<a name="line.116"></a>
+<span class="sourceLineNo">117</span>  public void addCell(CellModel cell) {<a 
name="line.117"></a>
+<span class="sourceLineNo">118</span>    cells.add(cell);<a 
name="line.118"></a>
+<span class="sourceLineNo">119</span>  }<a name="line.119"></a>
+<span class="sourceLineNo">120</span><a name="line.120"></a>
+<span class="sourceLineNo">121</span>  /**<a name="line.121"></a>
+<span class="sourceLineNo">122</span>   * @return the row key<a 
name="line.122"></a>
+<span class="sourceLineNo">123</span>   */<a name="line.123"></a>
+<span class="sourceLineNo">124</span>  public byte[] getKey() {<a 
name="line.124"></a>
+<span class="sourceLineNo">125</span>    return key;<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>  /**<a name="line.128"></a>
+<span class="sourceLineNo">129</span>   * @param key the row key<a 
name="line.129"></a>
+<span class="sourceLineNo">130</span>   */<a name="line.130"></a>
+<span class="sourceLineNo">131</span>  public void setKey(byte[] key) {<a 
name="line.131"></a>
+<span class="sourceLineNo">132</span>    this.key = key;<a name="line.132"></a>
+<span class="sourceLineNo">133</span>  }<a name="line.133"></a>
+<span class="sourceLineNo">134</span><a name="line.134"></a>
+<span class="sourceLineNo">135</span>  /**<a name="line.135"></a>
+<span class="sourceLineNo">136</span>   * @return the cells<a 
name="line.136"></a>
+<span class="sourceLineNo">137</span>   */<a name="line.137"></a>
+<span class="sourceLineNo">138</span>  public List&lt;CellModel&gt; getCells() 
{<a name="line.138"></a>
+<span class="sourceLineNo">139</span>    return cells;<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>  @Override<a name="line.142"></a>
+<span class="sourceLineNo">143</span>  public byte[] createProtobufOutput() 
{<a name="line.143"></a>
+<span class="sourceLineNo">144</span>    // there is no standalone row 
protobuf message<a name="line.144"></a>
+<span class="sourceLineNo">145</span>    throw new 
UnsupportedOperationException(<a name="line.145"></a>
+<span class="sourceLineNo">146</span>        "no protobuf equivalent to 
RowModel");<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>  @Override<a name="line.149"></a>
+<span class="sourceLineNo">150</span>  public ProtobufMessageHandler 
getObjectFromMessage(byte[] message)<a name="line.150"></a>
+<span class="sourceLineNo">151</span>      throws IOException {<a 
name="line.151"></a>
+<span class="sourceLineNo">152</span>    // there is no standalone row 
protobuf message<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    throw new 
UnsupportedOperationException(<a name="line.153"></a>
+<span class="sourceLineNo">154</span>        "no protobuf equivalent to 
RowModel");<a name="line.154"></a>
+<span class="sourceLineNo">155</span>  }<a name="line.155"></a>
+<span class="sourceLineNo">156</span><a name="line.156"></a>
+<span class="sourceLineNo">157</span>  @Override<a name="line.157"></a>
+<span class="sourceLineNo">158</span>  public boolean equals(Object obj) {<a 
name="line.158"></a>
+<span class="sourceLineNo">159</span>    if (obj == null) {<a 
name="line.159"></a>
+<span class="sourceLineNo">160</span>      return false;<a name="line.160"></a>
+<span class="sourceLineNo">161</span>    }<a name="line.161"></a>
+<span class="sourceLineNo">162</span>    if (obj == this) {<a 
name="line.162"></a>
+<span class="sourceLineNo">163</span>      return true;<a name="line.163"></a>
+<span class="sourceLineNo">164</span>    }<a name="line.164"></a>
+<span class="sourceLineNo">165</span>    if (obj.getClass() != getClass()) {<a 
name="line.165"></a>
+<span class="sourceLineNo">166</span>      return false;<a name="line.166"></a>
+<span class="sourceLineNo">167</span>    }<a name="line.167"></a>
+<span class="sourceLineNo">168</span>    RowModel rowModel = (RowModel) obj;<a 
name="line.168"></a>
+<span class="sourceLineNo">169</span>    return new EqualsBuilder().<a 
name="line.169"></a>
+<span class="sourceLineNo">170</span>        append(key, rowModel.key).<a 
name="line.170"></a>
+<span class="sourceLineNo">171</span>        append(cells, rowModel.cells).<a 
name="line.171"></a>
+<span class="sourceLineNo">172</span>        isEquals();<a name="line.172"></a>
+<span class="sourceLineNo">173</span>  }<a name="line.173"></a>
+<span class="sourceLineNo">174</span><a name="line.174"></a>
+<span class="sourceLineNo">175</span>  @Override<a name="line.175"></a>
+<span class="sourceLineNo">176</span>  public int hashCode() {<a 
name="line.176"></a>
+<span class="sourceLineNo">177</span>    return new HashCodeBuilder().<a 
name="line.177"></a>
+<span class="sourceLineNo">178</span>        append(key).<a 
name="line.178"></a>
+<span class="sourceLineNo">179</span>        append(cells).<a 
name="line.179"></a>
+<span class="sourceLineNo">180</span>        toHashCode();<a 
name="line.180"></a>
+<span class="sourceLineNo">181</span>  }<a name="line.181"></a>
+<span class="sourceLineNo">182</span><a name="line.182"></a>
+<span class="sourceLineNo">183</span>  @Override<a name="line.183"></a>
+<span class="sourceLineNo">184</span>  public String toString() {<a 
name="line.184"></a>
+<span class="sourceLineNo">185</span>    return new ToStringBuilder(this).<a 
name="line.185"></a>
+<span class="sourceLineNo">186</span>        append("key", key).<a 
name="line.186"></a>
+<span class="sourceLineNo">187</span>        append("cells", cells).<a 
name="line.187"></a>
+<span class="sourceLineNo">188</span>        toString();<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>
 
 
 

Reply via email to