http://git-wip-us.apache.org/repos/asf/hbase-site/blob/68eae623/devapidocs/src-html/org/apache/hadoop/hbase/security/access/Permission.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/security/access/Permission.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/security/access/Permission.html
index 042bf4a..cb2cfdc 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/security/access/Permission.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/security/access/Permission.html
@@ -30,194 +30,226 @@
 <span class="sourceLineNo">022</span>import java.io.DataOutput;<a 
name="line.22"></a>
 <span class="sourceLineNo">023</span>import java.io.IOException;<a 
name="line.23"></a>
 <span class="sourceLineNo">024</span>import java.util.Arrays;<a 
name="line.24"></a>
-<span class="sourceLineNo">025</span>import java.util.Map;<a 
name="line.25"></a>
-<span class="sourceLineNo">026</span><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.util.Bytes;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import 
org.apache.hadoop.io.VersionedWritable;<a name="line.31"></a>
-<span class="sourceLineNo">032</span><a name="line.32"></a>
-<span class="sourceLineNo">033</span>import 
org.apache.hbase.thirdparty.com.google.common.collect.Maps;<a 
name="line.33"></a>
-<span class="sourceLineNo">034</span><a name="line.34"></a>
-<span class="sourceLineNo">035</span>/**<a name="line.35"></a>
-<span class="sourceLineNo">036</span> * Base permissions instance representing 
the ability to perform a given set<a name="line.36"></a>
-<span class="sourceLineNo">037</span> * of actions.<a name="line.37"></a>
-<span class="sourceLineNo">038</span> *<a name="line.38"></a>
-<span class="sourceLineNo">039</span> * @see TablePermission<a 
name="line.39"></a>
-<span class="sourceLineNo">040</span> */<a name="line.40"></a>
-<span class="sourceLineNo">041</span>@InterfaceAudience.Public<a 
name="line.41"></a>
-<span class="sourceLineNo">042</span>public class Permission extends 
VersionedWritable {<a name="line.42"></a>
-<span class="sourceLineNo">043</span>  protected static final byte VERSION = 
0;<a name="line.43"></a>
-<span class="sourceLineNo">044</span><a name="line.44"></a>
-<span class="sourceLineNo">045</span>  @InterfaceAudience.Public<a 
name="line.45"></a>
-<span class="sourceLineNo">046</span>  public enum Action {<a 
name="line.46"></a>
-<span class="sourceLineNo">047</span>    READ('R'), WRITE('W'), EXEC('X'), 
CREATE('C'), ADMIN('A');<a name="line.47"></a>
-<span class="sourceLineNo">048</span><a name="line.48"></a>
-<span class="sourceLineNo">049</span>    private final byte code;<a 
name="line.49"></a>
-<span class="sourceLineNo">050</span>    Action(char code) {<a 
name="line.50"></a>
-<span class="sourceLineNo">051</span>      this.code = (byte)code;<a 
name="line.51"></a>
-<span class="sourceLineNo">052</span>    }<a name="line.52"></a>
-<span class="sourceLineNo">053</span><a name="line.53"></a>
-<span class="sourceLineNo">054</span>    public byte code() { return code; }<a 
name="line.54"></a>
-<span class="sourceLineNo">055</span>  }<a name="line.55"></a>
-<span class="sourceLineNo">056</span><a name="line.56"></a>
-<span class="sourceLineNo">057</span>  private static final Logger LOG = 
LoggerFactory.getLogger(Permission.class);<a name="line.57"></a>
-<span class="sourceLineNo">058</span>  protected static final 
Map&lt;Byte,Action&gt; ACTION_BY_CODE = Maps.newHashMap();<a name="line.58"></a>
-<span class="sourceLineNo">059</span><a name="line.59"></a>
-<span class="sourceLineNo">060</span>  protected Action[] actions;<a 
name="line.60"></a>
+<span class="sourceLineNo">025</span>import java.util.EnumSet;<a 
name="line.25"></a>
+<span class="sourceLineNo">026</span>import java.util.Map;<a 
name="line.26"></a>
+<span class="sourceLineNo">027</span><a name="line.27"></a>
+<span class="sourceLineNo">028</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.slf4j.Logger;<a 
name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.slf4j.LoggerFactory;<a 
name="line.30"></a>
+<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import 
org.apache.hadoop.io.VersionedWritable;<a name="line.32"></a>
+<span class="sourceLineNo">033</span><a name="line.33"></a>
+<span class="sourceLineNo">034</span>import 
org.apache.hbase.thirdparty.com.google.common.collect.ImmutableMap;<a 
name="line.34"></a>
+<span class="sourceLineNo">035</span><a name="line.35"></a>
+<span class="sourceLineNo">036</span>/**<a name="line.36"></a>
+<span class="sourceLineNo">037</span> * Base permissions instance representing 
the ability to perform a given set<a name="line.37"></a>
+<span class="sourceLineNo">038</span> * of actions.<a name="line.38"></a>
+<span class="sourceLineNo">039</span> *<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * @see TablePermission<a 
name="line.40"></a>
+<span class="sourceLineNo">041</span> */<a name="line.41"></a>
+<span class="sourceLineNo">042</span>@InterfaceAudience.Public<a 
name="line.42"></a>
+<span class="sourceLineNo">043</span>public class Permission extends 
VersionedWritable {<a name="line.43"></a>
+<span class="sourceLineNo">044</span>  protected static final byte VERSION = 
0;<a name="line.44"></a>
+<span class="sourceLineNo">045</span><a name="line.45"></a>
+<span class="sourceLineNo">046</span>  @InterfaceAudience.Public<a 
name="line.46"></a>
+<span class="sourceLineNo">047</span>  public enum Action {<a 
name="line.47"></a>
+<span class="sourceLineNo">048</span>    READ('R'), WRITE('W'), EXEC('X'), 
CREATE('C'), ADMIN('A');<a name="line.48"></a>
+<span class="sourceLineNo">049</span><a name="line.49"></a>
+<span class="sourceLineNo">050</span>    private final byte code;<a 
name="line.50"></a>
+<span class="sourceLineNo">051</span>    Action(char code) {<a 
name="line.51"></a>
+<span class="sourceLineNo">052</span>      this.code = (byte) code;<a 
name="line.52"></a>
+<span class="sourceLineNo">053</span>    }<a name="line.53"></a>
+<span class="sourceLineNo">054</span><a name="line.54"></a>
+<span class="sourceLineNo">055</span>    public byte code() { return code; }<a 
name="line.55"></a>
+<span class="sourceLineNo">056</span>  }<a name="line.56"></a>
+<span class="sourceLineNo">057</span><a name="line.57"></a>
+<span class="sourceLineNo">058</span>  @InterfaceAudience.Private<a 
name="line.58"></a>
+<span class="sourceLineNo">059</span>  protected enum Scope {<a 
name="line.59"></a>
+<span class="sourceLineNo">060</span>    GLOBAL('G'), NAMESPACE('N'), 
TABLE('T'), EMPTY('E');<a name="line.60"></a>
 <span class="sourceLineNo">061</span><a name="line.61"></a>
-<span class="sourceLineNo">062</span>  static {<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    for (Action a : Action.values()) {<a 
name="line.63"></a>
-<span class="sourceLineNo">064</span>      ACTION_BY_CODE.put(a.code(), a);<a 
name="line.64"></a>
+<span class="sourceLineNo">062</span>    private final byte code;<a 
name="line.62"></a>
+<span class="sourceLineNo">063</span>    Scope(char code) {<a 
name="line.63"></a>
+<span class="sourceLineNo">064</span>      this.code = (byte) code;<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>  /** Empty constructor for Writable 
implementation.  &lt;b&gt;Do not use.&lt;/b&gt; */<a name="line.68"></a>
-<span class="sourceLineNo">069</span>  public Permission() {<a 
name="line.69"></a>
-<span class="sourceLineNo">070</span>    super();<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>  public Permission(Action... assigned) 
{<a name="line.73"></a>
-<span class="sourceLineNo">074</span>    if (assigned != null &amp;&amp; 
assigned.length &gt; 0) {<a name="line.74"></a>
-<span class="sourceLineNo">075</span>      actions = Arrays.copyOf(assigned, 
assigned.length);<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><a name="line.78"></a>
-<span class="sourceLineNo">079</span>  public Permission(byte[] actionCodes) 
{<a name="line.79"></a>
-<span class="sourceLineNo">080</span>    if (actionCodes != null) {<a 
name="line.80"></a>
-<span class="sourceLineNo">081</span>      Action acts[] = new 
Action[actionCodes.length];<a name="line.81"></a>
-<span class="sourceLineNo">082</span>      int j = 0;<a name="line.82"></a>
-<span class="sourceLineNo">083</span>      for (int i=0; 
i&lt;actionCodes.length; i++) {<a name="line.83"></a>
-<span class="sourceLineNo">084</span>        byte b = actionCodes[i];<a 
name="line.84"></a>
-<span class="sourceLineNo">085</span>        Action a = 
ACTION_BY_CODE.get(b);<a name="line.85"></a>
-<span class="sourceLineNo">086</span>        if (a == null) {<a 
name="line.86"></a>
-<span class="sourceLineNo">087</span>          LOG.error("Ignoring unknown 
action code '"+<a name="line.87"></a>
-<span class="sourceLineNo">088</span>              Bytes.toStringBinary(new 
byte[]{b})+"'");<a name="line.88"></a>
-<span class="sourceLineNo">089</span>          continue;<a name="line.89"></a>
-<span class="sourceLineNo">090</span>        }<a name="line.90"></a>
-<span class="sourceLineNo">091</span>        acts[j++] = a;<a 
name="line.91"></a>
-<span class="sourceLineNo">092</span>      }<a name="line.92"></a>
-<span class="sourceLineNo">093</span>      this.actions = Arrays.copyOf(acts, 
j);<a name="line.93"></a>
-<span class="sourceLineNo">094</span>    }<a name="line.94"></a>
+<span class="sourceLineNo">066</span><a name="line.66"></a>
+<span class="sourceLineNo">067</span>    public byte code() {<a 
name="line.67"></a>
+<span class="sourceLineNo">068</span>      return code;<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><a name="line.71"></a>
+<span class="sourceLineNo">072</span>  private static final Logger LOG = 
LoggerFactory.getLogger(Permission.class);<a name="line.72"></a>
+<span class="sourceLineNo">073</span><a name="line.73"></a>
+<span class="sourceLineNo">074</span>  protected static final Map&lt;Byte, 
Action&gt; ACTION_BY_CODE;<a name="line.74"></a>
+<span class="sourceLineNo">075</span>  protected static final Map&lt;Byte, 
Scope&gt; SCOPE_BY_CODE;<a name="line.75"></a>
+<span class="sourceLineNo">076</span><a name="line.76"></a>
+<span class="sourceLineNo">077</span>  protected EnumSet&lt;Action&gt; actions 
= EnumSet.noneOf(Action.class);<a name="line.77"></a>
+<span class="sourceLineNo">078</span>  protected Scope scope = Scope.EMPTY;<a 
name="line.78"></a>
+<span class="sourceLineNo">079</span><a name="line.79"></a>
+<span class="sourceLineNo">080</span>  static {<a name="line.80"></a>
+<span class="sourceLineNo">081</span>    ACTION_BY_CODE = ImmutableMap.of(<a 
name="line.81"></a>
+<span class="sourceLineNo">082</span>      Action.READ.code, Action.READ,<a 
name="line.82"></a>
+<span class="sourceLineNo">083</span>      Action.WRITE.code, Action.WRITE,<a 
name="line.83"></a>
+<span class="sourceLineNo">084</span>      Action.EXEC.code, Action.EXEC,<a 
name="line.84"></a>
+<span class="sourceLineNo">085</span>      Action.CREATE.code, 
Action.CREATE,<a name="line.85"></a>
+<span class="sourceLineNo">086</span>      Action.ADMIN.code, Action.ADMIN<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>    SCOPE_BY_CODE = ImmutableMap.of(<a 
name="line.89"></a>
+<span class="sourceLineNo">090</span>      Scope.GLOBAL.code, Scope.GLOBAL,<a 
name="line.90"></a>
+<span class="sourceLineNo">091</span>      Scope.NAMESPACE.code, 
Scope.NAMESPACE,<a name="line.91"></a>
+<span class="sourceLineNo">092</span>      Scope.TABLE.code, Scope.TABLE,<a 
name="line.92"></a>
+<span class="sourceLineNo">093</span>      Scope.EMPTY.code, Scope.EMPTY<a 
name="line.93"></a>
+<span class="sourceLineNo">094</span>    );<a name="line.94"></a>
 <span class="sourceLineNo">095</span>  }<a name="line.95"></a>
 <span class="sourceLineNo">096</span><a name="line.96"></a>
-<span class="sourceLineNo">097</span>  public Action[] getActions() {<a 
name="line.97"></a>
-<span class="sourceLineNo">098</span>    return actions;<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>  public boolean implies(Action action) 
{<a name="line.101"></a>
-<span class="sourceLineNo">102</span>    if (this.actions != null) {<a 
name="line.102"></a>
-<span class="sourceLineNo">103</span>      for (Action a : this.actions) {<a 
name="line.103"></a>
-<span class="sourceLineNo">104</span>        if (a == action) {<a 
name="line.104"></a>
-<span class="sourceLineNo">105</span>          return true;<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><a name="line.109"></a>
-<span class="sourceLineNo">110</span>    return false;<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>  public void setActions(Action[] 
assigned) {<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    if (assigned != null &amp;&amp; 
assigned.length &gt; 0) {<a name="line.114"></a>
-<span class="sourceLineNo">115</span>      actions = Arrays.copyOf(assigned, 
assigned.length);<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><a name="line.118"></a>
-<span class="sourceLineNo">119</span>  @Override<a name="line.119"></a>
-<span class="sourceLineNo">120</span>  public boolean equals(Object obj) {<a 
name="line.120"></a>
-<span class="sourceLineNo">121</span>    if (!(obj instanceof Permission)) {<a 
name="line.121"></a>
-<span class="sourceLineNo">122</span>      return false;<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    }<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    Permission other = (Permission)obj;<a 
name="line.124"></a>
-<span class="sourceLineNo">125</span>    // check actions<a 
name="line.125"></a>
-<span class="sourceLineNo">126</span>    if (actions == null &amp;&amp; 
other.getActions() == null) {<a name="line.126"></a>
-<span class="sourceLineNo">127</span>      return true;<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    } else if (actions != null &amp;&amp; 
other.getActions() != null) {<a name="line.128"></a>
-<span class="sourceLineNo">129</span>      Action[] otherActions = 
other.getActions();<a name="line.129"></a>
-<span class="sourceLineNo">130</span>      if (actions.length != 
otherActions.length) {<a name="line.130"></a>
-<span class="sourceLineNo">131</span>        return false;<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>      outer:<a name="line.134"></a>
-<span class="sourceLineNo">135</span>      for (Action a : actions) {<a 
name="line.135"></a>
-<span class="sourceLineNo">136</span>        for (Action oa : otherActions) 
{<a name="line.136"></a>
-<span class="sourceLineNo">137</span>          if (a == oa) continue outer;<a 
name="line.137"></a>
-<span class="sourceLineNo">138</span>        }<a name="line.138"></a>
-<span class="sourceLineNo">139</span>        return false;<a 
name="line.139"></a>
-<span class="sourceLineNo">140</span>      }<a name="line.140"></a>
-<span class="sourceLineNo">141</span>      return true;<a name="line.141"></a>
-<span class="sourceLineNo">142</span>    }<a name="line.142"></a>
+<span class="sourceLineNo">097</span>  /** Empty constructor for Writable 
implementation.  &lt;b&gt;Do not use.&lt;/b&gt; */<a name="line.97"></a>
+<span class="sourceLineNo">098</span>  public Permission() {<a 
name="line.98"></a>
+<span class="sourceLineNo">099</span>    super();<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>  public Permission(Action... assigned) 
{<a name="line.102"></a>
+<span class="sourceLineNo">103</span>    if (assigned != null &amp;&amp; 
assigned.length &gt; 0) {<a name="line.103"></a>
+<span class="sourceLineNo">104</span>      
actions.addAll(Arrays.asList(assigned));<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>  public Permission(byte[] actionCodes) 
{<a name="line.108"></a>
+<span class="sourceLineNo">109</span>    if (actionCodes != null) {<a 
name="line.109"></a>
+<span class="sourceLineNo">110</span>      for (byte code : actionCodes) {<a 
name="line.110"></a>
+<span class="sourceLineNo">111</span>        Action action = 
ACTION_BY_CODE.get(code);<a name="line.111"></a>
+<span class="sourceLineNo">112</span>        if (action == null) {<a 
name="line.112"></a>
+<span class="sourceLineNo">113</span>          LOG.error("Ignoring unknown 
action code '" +<a name="line.113"></a>
+<span class="sourceLineNo">114</span>            Bytes.toStringBinary(new 
byte[] { code }) + "'");<a name="line.114"></a>
+<span class="sourceLineNo">115</span>          continue;<a name="line.115"></a>
+<span class="sourceLineNo">116</span>        }<a name="line.116"></a>
+<span class="sourceLineNo">117</span>        actions.add(action);<a 
name="line.117"></a>
+<span class="sourceLineNo">118</span>      }<a name="line.118"></a>
+<span class="sourceLineNo">119</span>    }<a name="line.119"></a>
+<span class="sourceLineNo">120</span>  }<a name="line.120"></a>
+<span class="sourceLineNo">121</span><a name="line.121"></a>
+<span class="sourceLineNo">122</span>  public Action[] getActions() {<a 
name="line.122"></a>
+<span class="sourceLineNo">123</span>    return actions.toArray(new 
Action[actions.size()]);<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>   * check if given action is granted<a 
name="line.127"></a>
+<span class="sourceLineNo">128</span>   * @param action action to be checked<a 
name="line.128"></a>
+<span class="sourceLineNo">129</span>   * @return true if granted, false 
otherwise<a name="line.129"></a>
+<span class="sourceLineNo">130</span>   */<a name="line.130"></a>
+<span class="sourceLineNo">131</span>  public boolean implies(Action action) 
{<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    return actions.contains(action);<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>  public void setActions(Action[] 
assigned) {<a name="line.135"></a>
+<span class="sourceLineNo">136</span>    if (assigned != null &amp;&amp; 
assigned.length &gt; 0) {<a name="line.136"></a>
+<span class="sourceLineNo">137</span>      // setActions should cover the 
previous actions,<a name="line.137"></a>
+<span class="sourceLineNo">138</span>      // so we call clear here.<a 
name="line.138"></a>
+<span class="sourceLineNo">139</span>      actions.clear();<a 
name="line.139"></a>
+<span class="sourceLineNo">140</span>      
actions.addAll(Arrays.asList(assigned));<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    }<a name="line.141"></a>
+<span class="sourceLineNo">142</span>  }<a name="line.142"></a>
 <span class="sourceLineNo">143</span><a name="line.143"></a>
-<span class="sourceLineNo">144</span>    return false;<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 int hashCode() {<a 
name="line.148"></a>
-<span class="sourceLineNo">149</span>    final int prime = 37;<a 
name="line.149"></a>
-<span class="sourceLineNo">150</span>    int result = 23;<a 
name="line.150"></a>
-<span class="sourceLineNo">151</span>    for (Action a : actions) {<a 
name="line.151"></a>
-<span class="sourceLineNo">152</span>      result = prime * result + 
a.code();<a name="line.152"></a>
-<span class="sourceLineNo">153</span>    }<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    return result;<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 String toString() {<a 
name="line.158"></a>
-<span class="sourceLineNo">159</span>    StringBuilder str = new 
StringBuilder("[Permission: ")<a name="line.159"></a>
-<span class="sourceLineNo">160</span>        .append("actions=");<a 
name="line.160"></a>
-<span class="sourceLineNo">161</span>    if (actions != null) {<a 
name="line.161"></a>
-<span class="sourceLineNo">162</span>      for (int i=0; i&lt;actions.length; 
i++) {<a name="line.162"></a>
-<span class="sourceLineNo">163</span>        if (i &gt; 0)<a 
name="line.163"></a>
-<span class="sourceLineNo">164</span>          str.append(",");<a 
name="line.164"></a>
-<span class="sourceLineNo">165</span>        if (actions[i] != null)<a 
name="line.165"></a>
-<span class="sourceLineNo">166</span>          
str.append(actions[i].toString());<a name="line.166"></a>
-<span class="sourceLineNo">167</span>        else<a name="line.167"></a>
-<span class="sourceLineNo">168</span>          str.append("NULL");<a 
name="line.168"></a>
-<span class="sourceLineNo">169</span>      }<a name="line.169"></a>
-<span class="sourceLineNo">170</span>    }<a name="line.170"></a>
-<span class="sourceLineNo">171</span>    str.append("]");<a 
name="line.171"></a>
+<span class="sourceLineNo">144</span>  /**<a name="line.144"></a>
+<span class="sourceLineNo">145</span>   * Check if two permission equals 
regardless of actions. It is useful when<a name="line.145"></a>
+<span class="sourceLineNo">146</span>   * merging a new permission with an 
existed permission which needs to check two permissions's<a name="line.146"></a>
+<span class="sourceLineNo">147</span>   * fields.<a name="line.147"></a>
+<span class="sourceLineNo">148</span>   * @param obj instance<a 
name="line.148"></a>
+<span class="sourceLineNo">149</span>   * @return true if equals, false 
otherwise<a name="line.149"></a>
+<span class="sourceLineNo">150</span>   */<a name="line.150"></a>
+<span class="sourceLineNo">151</span>  public boolean 
equalsExceptActions(Object obj) {<a name="line.151"></a>
+<span class="sourceLineNo">152</span>    return obj instanceof Permission;<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 instanceof Permission)) {<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><a name="line.160"></a>
+<span class="sourceLineNo">161</span>    Permission other = (Permission) 
obj;<a name="line.161"></a>
+<span class="sourceLineNo">162</span>    if (actions.isEmpty() &amp;&amp; 
other.actions.isEmpty()) {<a name="line.162"></a>
+<span class="sourceLineNo">163</span>      return true;<a name="line.163"></a>
+<span class="sourceLineNo">164</span>    } else if (!actions.isEmpty() 
&amp;&amp; !other.actions.isEmpty()) {<a name="line.164"></a>
+<span class="sourceLineNo">165</span>      if (actions.size() != 
other.actions.size()) {<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>      return 
actions.containsAll(other.actions);<a name="line.168"></a>
+<span class="sourceLineNo">169</span>    }<a name="line.169"></a>
+<span class="sourceLineNo">170</span>    return false;<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>    return str.toString();<a 
name="line.173"></a>
-<span class="sourceLineNo">174</span>  }<a name="line.174"></a>
-<span class="sourceLineNo">175</span><a name="line.175"></a>
-<span class="sourceLineNo">176</span>  /** @return the object version number 
*/<a name="line.176"></a>
-<span class="sourceLineNo">177</span>  @Override<a name="line.177"></a>
-<span class="sourceLineNo">178</span>  public byte getVersion() {<a 
name="line.178"></a>
-<span class="sourceLineNo">179</span>    return VERSION;<a name="line.179"></a>
-<span class="sourceLineNo">180</span>  }<a name="line.180"></a>
-<span class="sourceLineNo">181</span><a name="line.181"></a>
-<span class="sourceLineNo">182</span>  @Override<a name="line.182"></a>
-<span class="sourceLineNo">183</span>  public void readFields(DataInput in) 
throws IOException {<a name="line.183"></a>
-<span class="sourceLineNo">184</span>    super.readFields(in);<a 
name="line.184"></a>
-<span class="sourceLineNo">185</span>    int length = (int)in.readByte();<a 
name="line.185"></a>
-<span class="sourceLineNo">186</span>    if (length &gt; 0) {<a 
name="line.186"></a>
-<span class="sourceLineNo">187</span>      actions = new Action[length];<a 
name="line.187"></a>
-<span class="sourceLineNo">188</span>      for (int i = 0; i &lt; length; i++) 
{<a name="line.188"></a>
-<span class="sourceLineNo">189</span>        byte b = in.readByte();<a 
name="line.189"></a>
-<span class="sourceLineNo">190</span>        Action a = 
ACTION_BY_CODE.get(b);<a name="line.190"></a>
-<span class="sourceLineNo">191</span>        if (a == null) {<a 
name="line.191"></a>
-<span class="sourceLineNo">192</span>          throw new IOException("Unknown 
action code '"+<a name="line.192"></a>
-<span class="sourceLineNo">193</span>              Bytes.toStringBinary(new 
byte[]{b})+"' in input");<a name="line.193"></a>
-<span class="sourceLineNo">194</span>        }<a name="line.194"></a>
-<span class="sourceLineNo">195</span>        this.actions[i] = a;<a 
name="line.195"></a>
-<span class="sourceLineNo">196</span>      }<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    } else {<a name="line.197"></a>
-<span class="sourceLineNo">198</span>      actions = new Action[0];<a 
name="line.198"></a>
-<span class="sourceLineNo">199</span>    }<a name="line.199"></a>
-<span class="sourceLineNo">200</span>  }<a name="line.200"></a>
-<span class="sourceLineNo">201</span><a name="line.201"></a>
-<span class="sourceLineNo">202</span>  @Override<a name="line.202"></a>
-<span class="sourceLineNo">203</span>  public void write(DataOutput out) 
throws IOException {<a name="line.203"></a>
-<span class="sourceLineNo">204</span>    super.write(out);<a 
name="line.204"></a>
-<span class="sourceLineNo">205</span>    out.writeByte(actions != null ? 
actions.length : 0);<a name="line.205"></a>
-<span class="sourceLineNo">206</span>    if (actions != null) {<a 
name="line.206"></a>
-<span class="sourceLineNo">207</span>      for (Action a: actions) {<a 
name="line.207"></a>
-<span class="sourceLineNo">208</span>        out.writeByte(a.code());<a 
name="line.208"></a>
-<span class="sourceLineNo">209</span>      }<a name="line.209"></a>
-<span class="sourceLineNo">210</span>    }<a name="line.210"></a>
-<span class="sourceLineNo">211</span>  }<a name="line.211"></a>
-<span class="sourceLineNo">212</span>}<a name="line.212"></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>    final int prime = 37;<a 
name="line.175"></a>
+<span class="sourceLineNo">176</span>    int result = 23;<a 
name="line.176"></a>
+<span class="sourceLineNo">177</span>    for (Action a : actions) {<a 
name="line.177"></a>
+<span class="sourceLineNo">178</span>      result = prime * result + 
a.code();<a name="line.178"></a>
+<span class="sourceLineNo">179</span>    }<a name="line.179"></a>
+<span class="sourceLineNo">180</span>    result = prime * result + 
scope.code();<a name="line.180"></a>
+<span class="sourceLineNo">181</span>    return result;<a name="line.181"></a>
+<span class="sourceLineNo">182</span>  }<a name="line.182"></a>
+<span class="sourceLineNo">183</span><a name="line.183"></a>
+<span class="sourceLineNo">184</span>  @Override<a name="line.184"></a>
+<span class="sourceLineNo">185</span>  public String toString() {<a 
name="line.185"></a>
+<span class="sourceLineNo">186</span>    return "[Permission: " + 
rawExpression() + "]";<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>  protected String rawExpression() {<a 
name="line.189"></a>
+<span class="sourceLineNo">190</span>    StringBuilder raw = new 
StringBuilder("actions=");<a name="line.190"></a>
+<span class="sourceLineNo">191</span>    if (actions != null) {<a 
name="line.191"></a>
+<span class="sourceLineNo">192</span>      int i = 0;<a name="line.192"></a>
+<span class="sourceLineNo">193</span>      for (Action action : actions) {<a 
name="line.193"></a>
+<span class="sourceLineNo">194</span>        if (i &gt; 0) {<a 
name="line.194"></a>
+<span class="sourceLineNo">195</span>          raw.append(",");<a 
name="line.195"></a>
+<span class="sourceLineNo">196</span>        }<a name="line.196"></a>
+<span class="sourceLineNo">197</span>        raw.append(action != null ? 
action.toString() : "NULL");<a name="line.197"></a>
+<span class="sourceLineNo">198</span>        i++;<a name="line.198"></a>
+<span class="sourceLineNo">199</span>      }<a name="line.199"></a>
+<span class="sourceLineNo">200</span>    }<a name="line.200"></a>
+<span class="sourceLineNo">201</span>    return raw.toString();<a 
name="line.201"></a>
+<span class="sourceLineNo">202</span>  }<a name="line.202"></a>
+<span class="sourceLineNo">203</span><a name="line.203"></a>
+<span class="sourceLineNo">204</span>  /** @return the object version number 
*/<a name="line.204"></a>
+<span class="sourceLineNo">205</span>  @Override<a name="line.205"></a>
+<span class="sourceLineNo">206</span>  public byte getVersion() {<a 
name="line.206"></a>
+<span class="sourceLineNo">207</span>    return VERSION;<a name="line.207"></a>
+<span class="sourceLineNo">208</span>  }<a name="line.208"></a>
+<span class="sourceLineNo">209</span><a name="line.209"></a>
+<span class="sourceLineNo">210</span>  @Override<a name="line.210"></a>
+<span class="sourceLineNo">211</span>  public void readFields(DataInput in) 
throws IOException {<a name="line.211"></a>
+<span class="sourceLineNo">212</span>    super.readFields(in);<a 
name="line.212"></a>
+<span class="sourceLineNo">213</span>    int length = (int) in.readByte();<a 
name="line.213"></a>
+<span class="sourceLineNo">214</span>    actions = 
EnumSet.noneOf(Action.class);<a name="line.214"></a>
+<span class="sourceLineNo">215</span>    if (length &gt; 0) {<a 
name="line.215"></a>
+<span class="sourceLineNo">216</span>      for (int i = 0; i &lt; length; i++) 
{<a name="line.216"></a>
+<span class="sourceLineNo">217</span>        byte b = in.readByte();<a 
name="line.217"></a>
+<span class="sourceLineNo">218</span>        Action action = 
ACTION_BY_CODE.get(b);<a name="line.218"></a>
+<span class="sourceLineNo">219</span>        if (action == null) {<a 
name="line.219"></a>
+<span class="sourceLineNo">220</span>          throw new IOException("Unknown 
action code '" +<a name="line.220"></a>
+<span class="sourceLineNo">221</span>            Bytes.toStringBinary(new 
byte[] { b }) + "' in input");<a name="line.221"></a>
+<span class="sourceLineNo">222</span>        }<a name="line.222"></a>
+<span class="sourceLineNo">223</span>        actions.add(action);<a 
name="line.223"></a>
+<span class="sourceLineNo">224</span>      }<a name="line.224"></a>
+<span class="sourceLineNo">225</span>    }<a name="line.225"></a>
+<span class="sourceLineNo">226</span>    scope = 
SCOPE_BY_CODE.get(in.readByte());<a name="line.226"></a>
+<span class="sourceLineNo">227</span>  }<a name="line.227"></a>
+<span class="sourceLineNo">228</span><a name="line.228"></a>
+<span class="sourceLineNo">229</span>  @Override<a name="line.229"></a>
+<span class="sourceLineNo">230</span>  public void write(DataOutput out) 
throws IOException {<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    super.write(out);<a 
name="line.231"></a>
+<span class="sourceLineNo">232</span>    out.writeByte(actions != null ? 
actions.size() : 0);<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    if (actions != null) {<a 
name="line.233"></a>
+<span class="sourceLineNo">234</span>      for (Action a: actions) {<a 
name="line.234"></a>
+<span class="sourceLineNo">235</span>        out.writeByte(a.code());<a 
name="line.235"></a>
+<span class="sourceLineNo">236</span>      }<a name="line.236"></a>
+<span class="sourceLineNo">237</span>    }<a name="line.237"></a>
+<span class="sourceLineNo">238</span>    out.writeByte(scope.code());<a 
name="line.238"></a>
+<span class="sourceLineNo">239</span>  }<a name="line.239"></a>
+<span class="sourceLineNo">240</span><a name="line.240"></a>
+<span class="sourceLineNo">241</span>  public Scope getAccessScope() {<a 
name="line.241"></a>
+<span class="sourceLineNo">242</span>    return scope;<a name="line.242"></a>
+<span class="sourceLineNo">243</span>  }<a name="line.243"></a>
+<span class="sourceLineNo">244</span>}<a name="line.244"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/68eae623/devapidocs/src-html/org/apache/hadoop/hbase/security/access/ShadedAccessControlUtil.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/security/access/ShadedAccessControlUtil.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/security/access/ShadedAccessControlUtil.html
index b413e1d..0300d2b 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/security/access/ShadedAccessControlUtil.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/security/access/ShadedAccessControlUtil.html
@@ -127,173 +127,155 @@
 <span class="sourceLineNo">119</span>   * @param proto the protobuf 
Permission<a name="line.119"></a>
 <span class="sourceLineNo">120</span>   * @return the converted 
TablePermission<a name="line.120"></a>
 <span class="sourceLineNo">121</span>   */<a name="line.121"></a>
-<span class="sourceLineNo">122</span>  public static TablePermission 
toTablePermission(AccessControlProtos.Permission proto) {<a name="line.122"></a>
+<span class="sourceLineNo">122</span>  public static Permission 
toPermission(AccessControlProtos.Permission proto) {<a name="line.122"></a>
 <span class="sourceLineNo">123</span><a name="line.123"></a>
 <span class="sourceLineNo">124</span>    if (proto.getType() == 
AccessControlProtos.Permission.Type.Global) {<a name="line.124"></a>
 <span class="sourceLineNo">125</span>      
AccessControlProtos.GlobalPermission perm = proto.getGlobalPermission();<a 
name="line.125"></a>
 <span class="sourceLineNo">126</span>      List&lt;Action&gt; actions = 
toPermissionActions(perm.getActionList());<a name="line.126"></a>
 <span class="sourceLineNo">127</span><a name="line.127"></a>
-<span class="sourceLineNo">128</span>      return new TablePermission(null, 
null, null,<a name="line.128"></a>
-<span class="sourceLineNo">129</span>          actions.toArray(new 
Permission.Action[actions.size()]));<a name="line.129"></a>
-<span class="sourceLineNo">130</span>    }<a name="line.130"></a>
-<span class="sourceLineNo">131</span>    if (proto.getType() == 
AccessControlProtos.Permission.Type.Namespace) {<a name="line.131"></a>
-<span class="sourceLineNo">132</span>      
AccessControlProtos.NamespacePermission perm = 
proto.getNamespacePermission();<a name="line.132"></a>
-<span class="sourceLineNo">133</span>      List&lt;Permission.Action&gt; 
actions = toPermissionActions(perm.getActionList());<a name="line.133"></a>
-<span class="sourceLineNo">134</span><a name="line.134"></a>
-<span class="sourceLineNo">135</span>      if 
(!proto.hasNamespacePermission()) {<a name="line.135"></a>
-<span class="sourceLineNo">136</span>        throw new 
IllegalStateException("Namespace must not be empty in NamespacePermission");<a 
name="line.136"></a>
-<span class="sourceLineNo">137</span>      }<a name="line.137"></a>
-<span class="sourceLineNo">138</span>      String namespace = 
perm.getNamespaceName().toStringUtf8();<a name="line.138"></a>
-<span class="sourceLineNo">139</span>      return new 
TablePermission(namespace, actions.toArray(new 
Permission.Action[actions.size()]));<a name="line.139"></a>
-<span class="sourceLineNo">140</span>    }<a name="line.140"></a>
-<span class="sourceLineNo">141</span>    if (proto.getType() == 
AccessControlProtos.Permission.Type.Table) {<a name="line.141"></a>
-<span class="sourceLineNo">142</span>      AccessControlProtos.TablePermission 
perm = proto.getTablePermission();<a name="line.142"></a>
-<span class="sourceLineNo">143</span>      List&lt;Permission.Action&gt; 
actions = toPermissionActions(perm.getActionList());<a name="line.143"></a>
-<span class="sourceLineNo">144</span><a name="line.144"></a>
-<span class="sourceLineNo">145</span>      byte[] qualifier = null;<a 
name="line.145"></a>
-<span class="sourceLineNo">146</span>      byte[] family = null;<a 
name="line.146"></a>
-<span class="sourceLineNo">147</span>      TableName table = null;<a 
name="line.147"></a>
-<span class="sourceLineNo">148</span><a name="line.148"></a>
-<span class="sourceLineNo">149</span>      if (!perm.hasTableName()) {<a 
name="line.149"></a>
-<span class="sourceLineNo">150</span>        throw new 
IllegalStateException("TableName cannot be empty");<a name="line.150"></a>
-<span class="sourceLineNo">151</span>      }<a name="line.151"></a>
-<span class="sourceLineNo">152</span>      table = 
toTableName(perm.getTableName());<a name="line.152"></a>
-<span class="sourceLineNo">153</span><a name="line.153"></a>
-<span class="sourceLineNo">154</span>      if (perm.hasFamily()) family = 
perm.getFamily().toByteArray();<a name="line.154"></a>
-<span class="sourceLineNo">155</span>      if (perm.hasQualifier()) qualifier 
= perm.getQualifier().toByteArray();<a name="line.155"></a>
-<span class="sourceLineNo">156</span><a name="line.156"></a>
-<span class="sourceLineNo">157</span>      return new TablePermission(table, 
family, qualifier,<a name="line.157"></a>
-<span class="sourceLineNo">158</span>          actions.toArray(new 
Permission.Action[actions.size()]));<a name="line.158"></a>
-<span class="sourceLineNo">159</span>    }<a name="line.159"></a>
-<span class="sourceLineNo">160</span>    throw new 
IllegalStateException("Unrecognize Perm Type: " + proto.getType());<a 
name="line.160"></a>
-<span class="sourceLineNo">161</span>  }<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>   * Convert a client Permission to a 
Permission shaded proto<a name="line.164"></a>
-<span class="sourceLineNo">165</span>   * @param perm the client Permission<a 
name="line.165"></a>
-<span class="sourceLineNo">166</span>   * @return the protobuf Permission<a 
name="line.166"></a>
-<span class="sourceLineNo">167</span>   */<a name="line.167"></a>
-<span class="sourceLineNo">168</span>  public static 
org.apache.hadoop.hbase.shaded.protobuf.generated.AccessControlProtos.Permission<a
 name="line.168"></a>
-<span class="sourceLineNo">169</span>      toPermission(Permission perm) {<a 
name="line.169"></a>
-<span class="sourceLineNo">170</span>    
org.apache.hadoop.hbase.shaded.protobuf.generated.AccessControlProtos.Permission.Builder
 ret =<a name="line.170"></a>
-<span class="sourceLineNo">171</span>        
org.apache.hadoop.hbase.shaded.protobuf.generated.AccessControlProtos.Permission<a
 name="line.171"></a>
-<span class="sourceLineNo">172</span>            .newBuilder();<a 
name="line.172"></a>
-<span class="sourceLineNo">173</span>    if (perm instanceof TablePermission) 
{<a name="line.173"></a>
-<span class="sourceLineNo">174</span>      TablePermission tablePerm = 
(TablePermission) perm;<a name="line.174"></a>
-<span class="sourceLineNo">175</span>      if (tablePerm.hasNamespace()) {<a 
name="line.175"></a>
-<span class="sourceLineNo">176</span>        ret.setType(<a 
name="line.176"></a>
-<span class="sourceLineNo">177</span>          
org.apache.hadoop.hbase.shaded.protobuf.generated.AccessControlProtos.Permission.Type.Namespace);<a
 name="line.177"></a>
-<span class="sourceLineNo">178</span><a name="line.178"></a>
-<span class="sourceLineNo">179</span>        
org.apache.hadoop.hbase.shaded.protobuf.generated.AccessControlProtos.NamespacePermission.Builder
 builder =<a name="line.179"></a>
-<span class="sourceLineNo">180</span>            
org.apache.hadoop.hbase.shaded.protobuf.generated.AccessControlProtos.NamespacePermission<a
 name="line.180"></a>
-<span class="sourceLineNo">181</span>                .newBuilder();<a 
name="line.181"></a>
-<span class="sourceLineNo">182</span>        
builder.setNamespaceName(org.apache.hbase.thirdparty.com.google.protobuf.ByteString<a
 name="line.182"></a>
-<span class="sourceLineNo">183</span>            
.copyFromUtf8(tablePerm.getNamespace()));<a name="line.183"></a>
-<span class="sourceLineNo">184</span>        Permission.Action[] actions = 
perm.getActions();<a name="line.184"></a>
-<span class="sourceLineNo">185</span>        if (actions != null) {<a 
name="line.185"></a>
-<span class="sourceLineNo">186</span>          for (Permission.Action a : 
actions) {<a name="line.186"></a>
-<span class="sourceLineNo">187</span>            
builder.addAction(toPermissionAction(a));<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>        
ret.setNamespacePermission(builder);<a name="line.190"></a>
-<span class="sourceLineNo">191</span>        return ret.build();<a 
name="line.191"></a>
-<span class="sourceLineNo">192</span>      } else if (tablePerm.hasTable()) 
{<a name="line.192"></a>
-<span class="sourceLineNo">193</span>        ret.setType(<a 
name="line.193"></a>
-<span class="sourceLineNo">194</span>          
org.apache.hadoop.hbase.shaded.protobuf.generated.AccessControlProtos.Permission.Type.Table);<a
 name="line.194"></a>
-<span class="sourceLineNo">195</span><a name="line.195"></a>
-<span class="sourceLineNo">196</span>        
org.apache.hadoop.hbase.shaded.protobuf.generated.AccessControlProtos.TablePermission.Builder
 builder =<a name="line.196"></a>
-<span class="sourceLineNo">197</span>            
org.apache.hadoop.hbase.shaded.protobuf.generated.AccessControlProtos.TablePermission<a
 name="line.197"></a>
-<span class="sourceLineNo">198</span>                .newBuilder();<a 
name="line.198"></a>
-<span class="sourceLineNo">199</span>        
builder.setTableName(toProtoTableName(tablePerm.getTableName()));<a 
name="line.199"></a>
-<span class="sourceLineNo">200</span>        if (tablePerm.hasFamily()) {<a 
name="line.200"></a>
-<span class="sourceLineNo">201</span>          
builder.setFamily(ByteString.copyFrom(tablePerm.getFamily()));<a 
name="line.201"></a>
-<span class="sourceLineNo">202</span>        }<a name="line.202"></a>
-<span class="sourceLineNo">203</span>        if (tablePerm.hasQualifier()) {<a 
name="line.203"></a>
-<span class="sourceLineNo">204</span>          
builder.setQualifier(ByteString.copyFrom(tablePerm.getQualifier()));<a 
name="line.204"></a>
+<span class="sourceLineNo">128</span>      return new 
GlobalPermission(actions.toArray(new Permission.Action[actions.size()]));<a 
name="line.128"></a>
+<span class="sourceLineNo">129</span>    }<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    if (proto.getType() == 
AccessControlProtos.Permission.Type.Namespace) {<a name="line.130"></a>
+<span class="sourceLineNo">131</span>      
AccessControlProtos.NamespacePermission perm = 
proto.getNamespacePermission();<a name="line.131"></a>
+<span class="sourceLineNo">132</span>      List&lt;Permission.Action&gt; 
actions = toPermissionActions(perm.getActionList());<a name="line.132"></a>
+<span class="sourceLineNo">133</span><a name="line.133"></a>
+<span class="sourceLineNo">134</span>      if 
(!proto.hasNamespacePermission()) {<a name="line.134"></a>
+<span class="sourceLineNo">135</span>        throw new 
IllegalStateException("Namespace must not be empty in NamespacePermission");<a 
name="line.135"></a>
+<span class="sourceLineNo">136</span>      }<a name="line.136"></a>
+<span class="sourceLineNo">137</span>      String ns = 
perm.getNamespaceName().toStringUtf8();<a name="line.137"></a>
+<span class="sourceLineNo">138</span>      return new NamespacePermission(ns, 
actions.toArray(new Permission.Action[actions.size()]));<a name="line.138"></a>
+<span class="sourceLineNo">139</span>    }<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    if (proto.getType() == 
AccessControlProtos.Permission.Type.Table) {<a name="line.140"></a>
+<span class="sourceLineNo">141</span>      AccessControlProtos.TablePermission 
perm = proto.getTablePermission();<a name="line.141"></a>
+<span class="sourceLineNo">142</span>      List&lt;Permission.Action&gt; 
actions = toPermissionActions(perm.getActionList());<a name="line.142"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
+<span class="sourceLineNo">144</span>      byte[] qualifier = null;<a 
name="line.144"></a>
+<span class="sourceLineNo">145</span>      byte[] family = null;<a 
name="line.145"></a>
+<span class="sourceLineNo">146</span><a name="line.146"></a>
+<span class="sourceLineNo">147</span>      if (!perm.hasTableName()) {<a 
name="line.147"></a>
+<span class="sourceLineNo">148</span>        throw new 
IllegalStateException("TableName cannot be empty");<a name="line.148"></a>
+<span class="sourceLineNo">149</span>      }<a name="line.149"></a>
+<span class="sourceLineNo">150</span>      TableName table = 
toTableName(perm.getTableName());<a name="line.150"></a>
+<span class="sourceLineNo">151</span><a name="line.151"></a>
+<span class="sourceLineNo">152</span>      if (perm.hasFamily()) family = 
perm.getFamily().toByteArray();<a name="line.152"></a>
+<span class="sourceLineNo">153</span>      if (perm.hasQualifier()) qualifier 
= perm.getQualifier().toByteArray();<a name="line.153"></a>
+<span class="sourceLineNo">154</span><a name="line.154"></a>
+<span class="sourceLineNo">155</span>      return new TablePermission(table, 
family, qualifier,<a name="line.155"></a>
+<span class="sourceLineNo">156</span>          actions.toArray(new 
Permission.Action[actions.size()]));<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    }<a name="line.157"></a>
+<span class="sourceLineNo">158</span>    throw new 
IllegalStateException("Unrecognize Perm Type: " + proto.getType());<a 
name="line.158"></a>
+<span class="sourceLineNo">159</span>  }<a name="line.159"></a>
+<span class="sourceLineNo">160</span><a name="line.160"></a>
+<span class="sourceLineNo">161</span>  /**<a name="line.161"></a>
+<span class="sourceLineNo">162</span>   * Convert a client Permission to a 
Permission shaded proto<a name="line.162"></a>
+<span class="sourceLineNo">163</span>   * @param perm the client Permission<a 
name="line.163"></a>
+<span class="sourceLineNo">164</span>   * @return the protobuf Permission<a 
name="line.164"></a>
+<span class="sourceLineNo">165</span>   */<a name="line.165"></a>
+<span class="sourceLineNo">166</span>  public static 
org.apache.hadoop.hbase.shaded.protobuf.generated.AccessControlProtos.Permission<a
 name="line.166"></a>
+<span class="sourceLineNo">167</span>      toPermission(Permission perm) {<a 
name="line.167"></a>
+<span class="sourceLineNo">168</span>    
org.apache.hadoop.hbase.shaded.protobuf.generated.AccessControlProtos.Permission.Builder
 ret =<a name="line.168"></a>
+<span class="sourceLineNo">169</span>        
org.apache.hadoop.hbase.shaded.protobuf.generated.AccessControlProtos.Permission<a
 name="line.169"></a>
+<span class="sourceLineNo">170</span>            .newBuilder();<a 
name="line.170"></a>
+<span class="sourceLineNo">171</span>    if (perm instanceof 
NamespacePermission) {<a name="line.171"></a>
+<span class="sourceLineNo">172</span>      NamespacePermission nsPerm = 
(NamespacePermission) perm;<a name="line.172"></a>
+<span class="sourceLineNo">173</span>      ret.setType(<a name="line.173"></a>
+<span class="sourceLineNo">174</span>        
org.apache.hadoop.hbase.shaded.protobuf.generated.AccessControlProtos.Permission.Type.Namespace);<a
 name="line.174"></a>
+<span class="sourceLineNo">175</span>      
org.apache.hadoop.hbase.shaded.protobuf.generated.AccessControlProtos.NamespacePermission.Builder
 builder =<a name="line.175"></a>
+<span class="sourceLineNo">176</span>        
org.apache.hadoop.hbase.shaded.protobuf.generated.AccessControlProtos.NamespacePermission<a
 name="line.176"></a>
+<span class="sourceLineNo">177</span>          .newBuilder();<a 
name="line.177"></a>
+<span class="sourceLineNo">178</span>      
builder.setNamespaceName(org.apache.hbase.thirdparty.com.google.protobuf.ByteString<a
 name="line.178"></a>
+<span class="sourceLineNo">179</span>        
.copyFromUtf8(nsPerm.getNamespace()));<a name="line.179"></a>
+<span class="sourceLineNo">180</span>      Permission.Action[] actions = 
perm.getActions();<a name="line.180"></a>
+<span class="sourceLineNo">181</span>      if (actions != null) {<a 
name="line.181"></a>
+<span class="sourceLineNo">182</span>        for (Permission.Action a : 
actions) {<a name="line.182"></a>
+<span class="sourceLineNo">183</span>          
builder.addAction(toPermissionAction(a));<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>      
ret.setNamespacePermission(builder);<a name="line.186"></a>
+<span class="sourceLineNo">187</span>    } else if (perm instanceof 
TablePermission) {<a name="line.187"></a>
+<span class="sourceLineNo">188</span>      TablePermission tablePerm = 
(TablePermission) perm;<a name="line.188"></a>
+<span class="sourceLineNo">189</span>      ret.setType(<a name="line.189"></a>
+<span class="sourceLineNo">190</span>        
org.apache.hadoop.hbase.shaded.protobuf.generated.AccessControlProtos.Permission.Type.Table);<a
 name="line.190"></a>
+<span class="sourceLineNo">191</span>      
org.apache.hadoop.hbase.shaded.protobuf.generated.AccessControlProtos.TablePermission.Builder
 builder =<a name="line.191"></a>
+<span class="sourceLineNo">192</span>        
org.apache.hadoop.hbase.shaded.protobuf.generated.AccessControlProtos.TablePermission<a
 name="line.192"></a>
+<span class="sourceLineNo">193</span>          .newBuilder();<a 
name="line.193"></a>
+<span class="sourceLineNo">194</span>      
builder.setTableName(toProtoTableName(tablePerm.getTableName()));<a 
name="line.194"></a>
+<span class="sourceLineNo">195</span>      if (tablePerm.hasFamily()) {<a 
name="line.195"></a>
+<span class="sourceLineNo">196</span>        
builder.setFamily(ByteString.copyFrom(tablePerm.getFamily()));<a 
name="line.196"></a>
+<span class="sourceLineNo">197</span>      }<a name="line.197"></a>
+<span class="sourceLineNo">198</span>      if (tablePerm.hasQualifier()) {<a 
name="line.198"></a>
+<span class="sourceLineNo">199</span>        
builder.setQualifier(ByteString.copyFrom(tablePerm.getQualifier()));<a 
name="line.199"></a>
+<span class="sourceLineNo">200</span>      }<a name="line.200"></a>
+<span class="sourceLineNo">201</span>      Permission.Action[] actions = 
perm.getActions();<a name="line.201"></a>
+<span class="sourceLineNo">202</span>      if (actions != null) {<a 
name="line.202"></a>
+<span class="sourceLineNo">203</span>        for (Permission.Action a : 
actions) {<a name="line.203"></a>
+<span class="sourceLineNo">204</span>          
builder.addAction(toPermissionAction(a));<a name="line.204"></a>
 <span class="sourceLineNo">205</span>        }<a name="line.205"></a>
-<span class="sourceLineNo">206</span>        Permission.Action actions[] = 
perm.getActions();<a name="line.206"></a>
-<span class="sourceLineNo">207</span>        if (actions != null) {<a 
name="line.207"></a>
-<span class="sourceLineNo">208</span>          for (Permission.Action a : 
actions) {<a name="line.208"></a>
-<span class="sourceLineNo">209</span>            
builder.addAction(toPermissionAction(a));<a name="line.209"></a>
-<span class="sourceLineNo">210</span>          }<a name="line.210"></a>
-<span class="sourceLineNo">211</span>        }<a name="line.211"></a>
-<span class="sourceLineNo">212</span>        
ret.setTablePermission(builder);<a name="line.212"></a>
-<span class="sourceLineNo">213</span>        return ret.build();<a 
name="line.213"></a>
-<span class="sourceLineNo">214</span>      }<a name="line.214"></a>
-<span class="sourceLineNo">215</span>    }<a name="line.215"></a>
-<span class="sourceLineNo">216</span><a name="line.216"></a>
-<span class="sourceLineNo">217</span>    ret.setType(<a name="line.217"></a>
-<span class="sourceLineNo">218</span>      
org.apache.hadoop.hbase.shaded.protobuf.generated.AccessControlProtos.Permission.Type.Global);<a
 name="line.218"></a>
-<span class="sourceLineNo">219</span><a name="line.219"></a>
-<span class="sourceLineNo">220</span>    
org.apache.hadoop.hbase.shaded.protobuf.generated.AccessControlProtos.GlobalPermission.Builder
 builder =<a name="line.220"></a>
-<span class="sourceLineNo">221</span>        
org.apache.hadoop.hbase.shaded.protobuf.generated.AccessControlProtos.GlobalPermission<a
 name="line.221"></a>
-<span class="sourceLineNo">222</span>            .newBuilder();<a 
name="line.222"></a>
-<span class="sourceLineNo">223</span>    Permission.Action actions[] = 
perm.getActions();<a name="line.223"></a>
-<span class="sourceLineNo">224</span>    if (actions != null) {<a 
name="line.224"></a>
-<span class="sourceLineNo">225</span>      for (Permission.Action a : actions) 
{<a name="line.225"></a>
-<span class="sourceLineNo">226</span>        
builder.addAction(toPermissionAction(a));<a name="line.226"></a>
-<span class="sourceLineNo">227</span>      }<a name="line.227"></a>
-<span class="sourceLineNo">228</span>    }<a name="line.228"></a>
-<span class="sourceLineNo">229</span>    ret.setGlobalPermission(builder);<a 
name="line.229"></a>
-<span class="sourceLineNo">230</span>    return ret.build();<a 
name="line.230"></a>
-<span class="sourceLineNo">231</span>  }<a name="line.231"></a>
-<span class="sourceLineNo">232</span><a name="line.232"></a>
-<span class="sourceLineNo">233</span>  /**<a name="line.233"></a>
-<span class="sourceLineNo">234</span>   * Convert a shaded protobuf 
UserTablePermissions to a ListMultimap&amp;lt;String, TablePermission&amp;gt;<a 
name="line.234"></a>
-<span class="sourceLineNo">235</span>   * where key is username.<a 
name="line.235"></a>
-<span class="sourceLineNo">236</span>   * @param proto the protobuf 
UserPermission<a name="line.236"></a>
-<span class="sourceLineNo">237</span>   * @return the converted 
UserPermission<a name="line.237"></a>
-<span class="sourceLineNo">238</span>   */<a name="line.238"></a>
-<span class="sourceLineNo">239</span>  public static ListMultimap&lt;String, 
TablePermission&gt; toUserTablePermissions(<a name="line.239"></a>
-<span class="sourceLineNo">240</span>      
org.apache.hadoop.hbase.shaded.protobuf.generated.AccessControlProtos.UsersAndPermissions
 proto) {<a name="line.240"></a>
-<span class="sourceLineNo">241</span>    ListMultimap&lt;String, 
TablePermission&gt; perms = ArrayListMultimap.create();<a name="line.241"></a>
-<span class="sourceLineNo">242</span>    
org.apache.hadoop.hbase.shaded.protobuf.generated.AccessControlProtos.UsersAndPermissions.UserPermissions
 userPerm;<a name="line.242"></a>
-<span class="sourceLineNo">243</span>    for (int i = 0; i &lt; 
proto.getUserPermissionsCount(); i++) {<a name="line.243"></a>
-<span class="sourceLineNo">244</span>      userPerm = 
proto.getUserPermissions(i);<a name="line.244"></a>
-<span class="sourceLineNo">245</span>      for (int j = 0; j &lt; 
userPerm.getPermissionsCount(); j++) {<a name="line.245"></a>
-<span class="sourceLineNo">246</span>        TablePermission tablePerm = 
toTablePermission(userPerm.getPermissions(j));<a name="line.246"></a>
-<span class="sourceLineNo">247</span>        
perms.put(userPerm.getUser().toStringUtf8(), tablePerm);<a name="line.247"></a>
-<span class="sourceLineNo">248</span>      }<a name="line.248"></a>
-<span class="sourceLineNo">249</span>    }<a name="line.249"></a>
-<span class="sourceLineNo">250</span>    return perms;<a name="line.250"></a>
-<span class="sourceLineNo">251</span>  }<a name="line.251"></a>
-<span class="sourceLineNo">252</span><a name="line.252"></a>
-<span class="sourceLineNo">253</span>  /**<a name="line.253"></a>
-<span class="sourceLineNo">254</span>   * Convert a 
ListMultimap&amp;lt;String, TablePermission&amp;gt; where key is username to a 
shaded<a name="line.254"></a>
-<span class="sourceLineNo">255</span>   * protobuf UserPermission<a 
name="line.255"></a>
-<span class="sourceLineNo">256</span>   * @param perm the list of user and 
table permissions<a name="line.256"></a>
-<span class="sourceLineNo">257</span>   * @return the protobuf 
UserTablePermissions<a name="line.257"></a>
-<span class="sourceLineNo">258</span>   */<a name="line.258"></a>
-<span class="sourceLineNo">259</span>  public static<a name="line.259"></a>
-<span class="sourceLineNo">260</span>      
org.apache.hadoop.hbase.shaded.protobuf.generated.AccessControlProtos.UsersAndPermissions<a
 name="line.260"></a>
-<span class="sourceLineNo">261</span>      
toUserTablePermissions(ListMultimap&lt;String, TablePermission&gt; perm) {<a 
name="line.261"></a>
-<span class="sourceLineNo">262</span>    
org.apache.hadoop.hbase.shaded.protobuf.generated.AccessControlProtos.UsersAndPermissions.Builder
 builder =<a name="line.262"></a>
-<span class="sourceLineNo">263</span>        
org.apache.hadoop.hbase.shaded.protobuf.generated.AccessControlProtos.UsersAndPermissions<a
 name="line.263"></a>
-<span class="sourceLineNo">264</span>            .newBuilder();<a 
name="line.264"></a>
-<span class="sourceLineNo">265</span>    for (Map.Entry&lt;String, 
Collection&lt;TablePermission&gt;&gt; entry : perm.asMap().entrySet()) {<a 
name="line.265"></a>
-<span class="sourceLineNo">266</span>      
org.apache.hadoop.hbase.shaded.protobuf.generated.AccessControlProtos.UsersAndPermissions.UserPermissions.Builder
 userPermBuilder =<a name="line.266"></a>
-<span class="sourceLineNo">267</span>          
org.apache.hadoop.hbase.shaded.protobuf.generated.AccessControlProtos.UsersAndPermissions.UserPermissions<a
 name="line.267"></a>
-<span class="sourceLineNo">268</span>              .newBuilder();<a 
name="line.268"></a>
-<span class="sourceLineNo">269</span>      
userPermBuilder.setUser(ByteString.copyFromUtf8(entry.getKey()));<a 
name="line.269"></a>
-<span class="sourceLineNo">270</span>      for (TablePermission tablePerm : 
entry.getValue()) {<a name="line.270"></a>
-<span class="sourceLineNo">271</span>        
userPermBuilder.addPermissions(toPermission(tablePerm));<a name="line.271"></a>
-<span class="sourceLineNo">272</span>      }<a name="line.272"></a>
-<span class="sourceLineNo">273</span>      
builder.addUserPermissions(userPermBuilder.build());<a name="line.273"></a>
-<span class="sourceLineNo">274</span>    }<a name="line.274"></a>
-<span class="sourceLineNo">275</span>    return builder.build();<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>  /**<a name="line.278"></a>
-<span class="sourceLineNo">279</span>   * Converts a user permission proto to 
a client user permission object.<a name="line.279"></a>
-<span class="sourceLineNo">280</span>   *<a name="line.280"></a>
-<span class="sourceLineNo">281</span>   * @param proto the protobuf 
UserPermission<a name="line.281"></a>
-<span class="sourceLineNo">282</span>   * @return the converted 
UserPermission<a name="line.282"></a>
-<span class="sourceLineNo">283</span>   */<a name="line.283"></a>
-<span class="sourceLineNo">284</span>  public static UserPermission 
toUserPermission(org.apache.hadoop.hbase.shaded.protobuf.generated.AccessControlProtos.UserPermission
 proto) {<a name="line.284"></a>
-<span class="sourceLineNo">285</span>    return new 
UserPermission(proto.getUser().toByteArray(),<a name="line.285"></a>
-<span class="sourceLineNo">286</span>        
toTablePermission(proto.getPermission()));<a name="line.286"></a>
-<span class="sourceLineNo">287</span>  }<a name="line.287"></a>
-<span class="sourceLineNo">288</span>}<a name="line.288"></a>
+<span class="sourceLineNo">206</span>      }<a name="line.206"></a>
+<span class="sourceLineNo">207</span>      ret.setTablePermission(builder);<a 
name="line.207"></a>
+<span class="sourceLineNo">208</span>    } else {<a name="line.208"></a>
+<span class="sourceLineNo">209</span>      // perm.getAccessScope() == 
Permission.Scope.GLOBAL<a name="line.209"></a>
+<span class="sourceLineNo">210</span>      ret.setType(<a name="line.210"></a>
+<span class="sourceLineNo">211</span>        
org.apache.hadoop.hbase.shaded.protobuf.generated.AccessControlProtos.Permission.Type.Global);<a
 name="line.211"></a>
+<span class="sourceLineNo">212</span>      
org.apache.hadoop.hbase.shaded.protobuf.generated.AccessControlProtos.GlobalPermission.Builder
 builder =<a name="line.212"></a>
+<span class="sourceLineNo">213</span>        
org.apache.hadoop.hbase.shaded.protobuf.generated.AccessControlProtos.GlobalPermission<a
 name="line.213"></a>
+<span class="sourceLineNo">214</span>          .newBuilder();<a 
name="line.214"></a>
+<span class="sourceLineNo">215</span>      Permission.Action[] actions = 
perm.getActions();<a name="line.215"></a>
+<span class="sourceLineNo">216</span>      if (actions != null) {<a 
name="line.216"></a>
+<span class="sourceLineNo">217</span>        for (Permission.Action a : 
actions) {<a name="line.217"></a>
+<span class="sourceLineNo">218</span>          
builder.addAction(toPermissionAction(a));<a name="line.218"></a>
+<span class="sourceLineNo">219</span>        }<a name="line.219"></a>
+<span class="sourceLineNo">220</span>      }<a name="line.220"></a>
+<span class="sourceLineNo">221</span>      ret.setGlobalPermission(builder);<a 
name="line.221"></a>
+<span class="sourceLineNo">222</span>    }<a name="line.222"></a>
+<span class="sourceLineNo">223</span>    return ret.build();<a 
name="line.223"></a>
+<span class="sourceLineNo">224</span>  }<a name="line.224"></a>
+<span class="sourceLineNo">225</span><a name="line.225"></a>
+<span class="sourceLineNo">226</span>  /**<a name="line.226"></a>
+<span class="sourceLineNo">227</span>   * Convert a shaded protobuf 
UserTablePermissions to a ListMultimap&amp;lt;String, TablePermission&amp;gt;<a 
name="line.227"></a>
+<span class="sourceLineNo">228</span>   * where key is username.<a 
name="line.228"></a>
+<span class="sourceLineNo">229</span>   * @param proto the protobuf 
UserPermission<a name="line.229"></a>
+<span class="sourceLineNo">230</span>   * @return the converted 
UserPermission<a name="line.230"></a>
+<span class="sourceLineNo">231</span>   */<a name="line.231"></a>
+<span class="sourceLineNo">232</span>  public static ListMultimap&lt;String, 
Permission&gt; toUserTablePermissions(<a name="line.232"></a>
+<span class="sourceLineNo">233</span>      
org.apache.hadoop.hbase.shaded.protobuf.generated.AccessControlProtos.UsersAndPermissions
 proto) {<a name="line.233"></a>
+<span class="sourceLineNo">234</span>    ListMultimap&lt;String, 
Permission&gt; perms = ArrayListMultimap.create();<a name="line.234"></a>
+<span class="sourceLineNo">235</span>    
org.apache.hadoop.hbase.shaded.protobuf.generated.AccessControlProtos.UsersAndPermissions.UserPermissions
 userPerm;<a name="line.235"></a>
+<span class="sourceLineNo">236</span>    for (int i = 0; i &lt; 
proto.getUserPermissionsCount(); i++) {<a name="line.236"></a>
+<span class="sourceLineNo">237</span>      userPerm = 
proto.getUserPermissions(i);<a name="line.237"></a>
+<span class="sourceLineNo">238</span>      for (int j = 0; j &lt; 
userPerm.getPermissionsCount(); j++) {<a name="line.238"></a>
+<span class="sourceLineNo">239</span>        Permission perm = 
toPermission(userPerm.getPermissions(j));<a name="line.239"></a>
+<span class="sourceLineNo">240</span>        
perms.put(userPerm.getUser().toStringUtf8(), perm);<a name="line.240"></a>
+<span class="sourceLineNo">241</span>      }<a name="line.241"></a>
+<span class="sourceLineNo">242</span>    }<a name="line.242"></a>
+<span class="sourceLineNo">243</span>    return perms;<a name="line.243"></a>
+<span class="sourceLineNo">244</span>  }<a name="line.244"></a>
+<span class="sourceLineNo">245</span><a name="line.245"></a>
+<span class="sourceLineNo">246</span>  /**<a name="line.246"></a>
+<span class="sourceLineNo">247</span>   * Convert a 
ListMultimap&amp;lt;String, TablePermission&amp;gt; where key is username to a 
shaded<a name="line.247"></a>
+<span class="sourceLineNo">248</span>   * protobuf UserPermission<a 
name="line.248"></a>
+<span class="sourceLineNo">249</span>   * @param perm the list of user and 
table permissions<a name="line.249"></a>
+<span class="sourceLineNo">250</span>   * @return the protobuf 
UserTablePermissions<a name="line.250"></a>
+<span class="sourceLineNo">251</span>   */<a name="line.251"></a>
+<span class="sourceLineNo">252</span>  public static<a name="line.252"></a>
+<span class="sourceLineNo">253</span>      
org.apache.hadoop.hbase.shaded.protobuf.generated.AccessControlProtos.UsersAndPermissions<a
 name="line.253"></a>
+<span class="sourceLineNo">254</span>      
toUserTablePermissions(ListMultimap&lt;String, UserPermission&gt; perm) {<a 
name="line.254"></a>
+<span class="sourceLineNo">255</span>    
org.apache.hadoop.hbase.shaded.protobuf.generated.AccessControlProtos.UsersAndPermissions.Builder
 builder =<a name="line.255"></a>
+<span class="sourceLineNo">256</span>        
org.apache.hadoop.hbase.shaded.protobuf.generated.AccessControlProtos.UsersAndPermissions<a
 name="line.256"></a>
+<span class="sourceLineNo">257</span>            .newBuilder();<a 
name="line.257"></a>
+<span class="sourceLineNo">258</span>    for (Map.Entry&lt;String, 
Collection&lt;UserPermission&gt;&gt; entry : perm.asMap().entrySet()) {<a 
name="line.258"></a>
+<span class="sourceLineNo">259</span>      
org.apache.hadoop.hbase.shaded.protobuf.generated.AccessControlProtos.UsersAndPermissions.UserPermissions.Builder
 userPermBuilder =<a name="line.259"></a>
+<span class="sourceLineNo">260</span>          
org.apache.hadoop.hbase.shaded.protobuf.generated.AccessControlProtos.UsersAndPermissions.UserPermissions<a
 name="line.260"></a>
+<span class="sourceLineNo">261</span>              .newBuilder();<a 
name="line.261"></a>
+<span class="sourceLineNo">262</span>      
userPermBuilder.setUser(ByteString.copyFromUtf8(entry.getKey()));<a 
name="line.262"></a>
+<span class="sourceLineNo">263</span>      for (UserPermission userPerm : 
entry.getValue()) {<a name="line.263"></a>
+<span class="sourceLineNo">264</span>        
userPermBuilder.addPermissions(toPermission(userPerm.getPermission()));<a 
name="line.264"></a>
+<span class="sourceLineNo">265</span>      }<a name="line.265"></a>
+<span class="sourceLineNo">266</span>      
builder.addUserPermissions(userPermBuilder.build());<a name="line.266"></a>
+<span class="sourceLineNo">267</span>    }<a name="line.267"></a>
+<span class="sourceLineNo">268</span>    return builder.build();<a 
name="line.268"></a>
+<span class="sourceLineNo">269</span>  }<a name="line.269"></a>
+<span class="sourceLineNo">270</span>}<a name="line.270"></a>
 
 
 

Reply via email to