You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2018/11/15 14:54:56 UTC
[14/51] [partial] hbase-site git commit: Published site at
130057f13774f6b213cdb06952c805a29d59396e.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/68eae623/devapidocs/src-html/org/apache/hadoop/hbase/security/access/UserPermission.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/security/access/UserPermission.html b/devapidocs/src-html/org/apache/hadoop/hbase/security/access/UserPermission.html
index da23956..abb7072 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/security/access/UserPermission.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/security/access/UserPermission.html
@@ -26,191 +26,164 @@
<span class="sourceLineNo">018</span><a name="line.18"></a>
<span class="sourceLineNo">019</span>package org.apache.hadoop.hbase.security.access;<a name="line.19"></a>
<span class="sourceLineNo">020</span><a name="line.20"></a>
-<span class="sourceLineNo">021</span>import java.io.DataInput;<a name="line.21"></a>
-<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><a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.TableName;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.slf4j.Logger;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.slf4j.LoggerFactory;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.29"></a>
-<span class="sourceLineNo">030</span><a name="line.30"></a>
-<span class="sourceLineNo">031</span>/**<a name="line.31"></a>
-<span class="sourceLineNo">032</span> * Represents an authorization for access over the given table, column family<a name="line.32"></a>
-<span class="sourceLineNo">033</span> * plus qualifier, for the given user.<a name="line.33"></a>
-<span class="sourceLineNo">034</span> */<a name="line.34"></a>
-<span class="sourceLineNo">035</span>@InterfaceAudience.Private<a name="line.35"></a>
-<span class="sourceLineNo">036</span>public class UserPermission extends TablePermission {<a name="line.36"></a>
-<span class="sourceLineNo">037</span> private static final Logger LOG = LoggerFactory.getLogger(UserPermission.class);<a name="line.37"></a>
-<span class="sourceLineNo">038</span><a name="line.38"></a>
-<span class="sourceLineNo">039</span> private byte[] user;<a name="line.39"></a>
-<span class="sourceLineNo">040</span><a name="line.40"></a>
-<span class="sourceLineNo">041</span> /** Nullary constructor for Writable, do not use */<a name="line.41"></a>
-<span class="sourceLineNo">042</span> public UserPermission() {<a name="line.42"></a>
-<span class="sourceLineNo">043</span> super();<a name="line.43"></a>
+<span class="sourceLineNo">021</span>import java.util.Objects;<a name="line.21"></a>
+<span class="sourceLineNo">022</span><a name="line.22"></a>
+<span class="sourceLineNo">023</span>import org.apache.hadoop.hbase.TableName;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.24"></a>
+<span class="sourceLineNo">025</span><a name="line.25"></a>
+<span class="sourceLineNo">026</span>/**<a name="line.26"></a>
+<span class="sourceLineNo">027</span> * UserPermission consists of a user name and a permission.<a name="line.27"></a>
+<span class="sourceLineNo">028</span> * Permission can be one of [Global, Namespace, Table] permission.<a name="line.28"></a>
+<span class="sourceLineNo">029</span> */<a name="line.29"></a>
+<span class="sourceLineNo">030</span>@InterfaceAudience.Private<a name="line.30"></a>
+<span class="sourceLineNo">031</span>public class UserPermission {<a name="line.31"></a>
+<span class="sourceLineNo">032</span><a name="line.32"></a>
+<span class="sourceLineNo">033</span> private String user;<a name="line.33"></a>
+<span class="sourceLineNo">034</span> private Permission permission;<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> * Construct a global user permission.<a name="line.37"></a>
+<span class="sourceLineNo">038</span> * @param user user name<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * @param assigned assigned actions<a name="line.39"></a>
+<span class="sourceLineNo">040</span> */<a name="line.40"></a>
+<span class="sourceLineNo">041</span> public UserPermission(String user, Permission.Action... assigned) {<a name="line.41"></a>
+<span class="sourceLineNo">042</span> this.user = user;<a name="line.42"></a>
+<span class="sourceLineNo">043</span> this.permission = new GlobalPermission(assigned);<a name="line.43"></a>
<span class="sourceLineNo">044</span> }<a name="line.44"></a>
<span class="sourceLineNo">045</span><a name="line.45"></a>
<span class="sourceLineNo">046</span> /**<a name="line.46"></a>
-<span class="sourceLineNo">047</span> * Creates a new instance for the given user.<a name="line.47"></a>
-<span class="sourceLineNo">048</span> * @param user the user<a name="line.48"></a>
-<span class="sourceLineNo">049</span> * @param assigned the list of allowed actions<a name="line.49"></a>
+<span class="sourceLineNo">047</span> * Construct a global user permission.<a name="line.47"></a>
+<span class="sourceLineNo">048</span> * @param user user name<a name="line.48"></a>
+<span class="sourceLineNo">049</span> * @param actionCode action codes<a name="line.49"></a>
<span class="sourceLineNo">050</span> */<a name="line.50"></a>
-<span class="sourceLineNo">051</span> public UserPermission(byte[] user, Action... assigned) {<a name="line.51"></a>
-<span class="sourceLineNo">052</span> super(null, null, null, assigned);<a name="line.52"></a>
-<span class="sourceLineNo">053</span> this.user = user;<a name="line.53"></a>
+<span class="sourceLineNo">051</span> public UserPermission(String user, byte[] actionCode) {<a name="line.51"></a>
+<span class="sourceLineNo">052</span> this.user = user;<a name="line.52"></a>
+<span class="sourceLineNo">053</span> this.permission = new GlobalPermission(actionCode);<a name="line.53"></a>
<span class="sourceLineNo">054</span> }<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> * Creates a new instance for the given user,<a name="line.57"></a>
-<span class="sourceLineNo">058</span> * matching the actions with the given codes.<a name="line.58"></a>
-<span class="sourceLineNo">059</span> * @param user the user<a name="line.59"></a>
-<span class="sourceLineNo">060</span> * @param actionCodes the list of allowed action codes<a name="line.60"></a>
+<span class="sourceLineNo">057</span> * Construct a namespace user permission.<a name="line.57"></a>
+<span class="sourceLineNo">058</span> * @param user user name<a name="line.58"></a>
+<span class="sourceLineNo">059</span> * @param namespace namespace<a name="line.59"></a>
+<span class="sourceLineNo">060</span> * @param assigned assigned actions<a name="line.60"></a>
<span class="sourceLineNo">061</span> */<a name="line.61"></a>
-<span class="sourceLineNo">062</span> public UserPermission(byte[] user, byte[] actionCodes) {<a name="line.62"></a>
-<span class="sourceLineNo">063</span> super(null, null, null, actionCodes);<a name="line.63"></a>
-<span class="sourceLineNo">064</span> this.user = user;<a name="line.64"></a>
+<span class="sourceLineNo">062</span> public UserPermission(String user, String namespace, Permission.Action... assigned) {<a name="line.62"></a>
+<span class="sourceLineNo">063</span> this.user = user;<a name="line.63"></a>
+<span class="sourceLineNo">064</span> this.permission = new NamespacePermission(namespace, assigned);<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> * Creates a new instance for the given user.<a name="line.68"></a>
-<span class="sourceLineNo">069</span> * @param user the user<a name="line.69"></a>
-<span class="sourceLineNo">070</span> * @param namespace<a name="line.70"></a>
-<span class="sourceLineNo">071</span> * @param assigned the list of allowed actions<a name="line.71"></a>
+<span class="sourceLineNo">068</span> * Construct a table user permission.<a name="line.68"></a>
+<span class="sourceLineNo">069</span> * @param user user name<a name="line.69"></a>
+<span class="sourceLineNo">070</span> * @param tableName table name<a name="line.70"></a>
+<span class="sourceLineNo">071</span> * @param assigned assigned actions<a name="line.71"></a>
<span class="sourceLineNo">072</span> */<a name="line.72"></a>
-<span class="sourceLineNo">073</span> public UserPermission(byte[] user, String namespace, Action... assigned) {<a name="line.73"></a>
-<span class="sourceLineNo">074</span> super(namespace, assigned);<a name="line.74"></a>
-<span class="sourceLineNo">075</span> this.user = user;<a name="line.75"></a>
+<span class="sourceLineNo">073</span> public UserPermission(String user, TableName tableName, Permission.Action... assigned) {<a name="line.73"></a>
+<span class="sourceLineNo">074</span> this.user = user;<a name="line.74"></a>
+<span class="sourceLineNo">075</span> this.permission = new TablePermission(tableName, assigned);<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> * Creates a new instance for the given user,<a name="line.79"></a>
-<span class="sourceLineNo">080</span> * matching the actions with the given codes.<a name="line.80"></a>
-<span class="sourceLineNo">081</span> * @param user the user<a name="line.81"></a>
-<span class="sourceLineNo">082</span> * @param namespace<a name="line.82"></a>
-<span class="sourceLineNo">083</span> * @param actionCodes the list of allowed action codes<a name="line.83"></a>
+<span class="sourceLineNo">079</span> * Construct a table:family user permission.<a name="line.79"></a>
+<span class="sourceLineNo">080</span> * @param user user name<a name="line.80"></a>
+<span class="sourceLineNo">081</span> * @param tableName table name<a name="line.81"></a>
+<span class="sourceLineNo">082</span> * @param family family name of table<a name="line.82"></a>
+<span class="sourceLineNo">083</span> * @param assigned assigned actions<a name="line.83"></a>
<span class="sourceLineNo">084</span> */<a name="line.84"></a>
-<span class="sourceLineNo">085</span> public UserPermission(byte[] user, String namespace, byte[] actionCodes) {<a name="line.85"></a>
-<span class="sourceLineNo">086</span> super(namespace, actionCodes);<a name="line.86"></a>
-<span class="sourceLineNo">087</span> this.user = user;<a name="line.87"></a>
+<span class="sourceLineNo">085</span> public UserPermission(String user, TableName tableName, byte[] family,<a name="line.85"></a>
+<span class="sourceLineNo">086</span> Permission.Action... assigned) {<a name="line.86"></a>
+<span class="sourceLineNo">087</span> this(user, tableName, family, null, assigned);<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> * Creates a new instance for the given user, table and column family.<a name="line.91"></a>
-<span class="sourceLineNo">092</span> * @param user the user<a name="line.92"></a>
-<span class="sourceLineNo">093</span> * @param table the table<a name="line.93"></a>
-<span class="sourceLineNo">094</span> * @param family the family, can be null if action is allowed over the entire<a name="line.94"></a>
-<span class="sourceLineNo">095</span> * table<a name="line.95"></a>
-<span class="sourceLineNo">096</span> * @param assigned the list of allowed actions<a name="line.96"></a>
+<span class="sourceLineNo">091</span> * Construct a table:family:qualifier user permission.<a name="line.91"></a>
+<span class="sourceLineNo">092</span> * @param user user name<a name="line.92"></a>
+<span class="sourceLineNo">093</span> * @param tableName table name<a name="line.93"></a>
+<span class="sourceLineNo">094</span> * @param family family name of table<a name="line.94"></a>
+<span class="sourceLineNo">095</span> * @param qualifier qualifier name of table<a name="line.95"></a>
+<span class="sourceLineNo">096</span> * @param assigned assigned actions<a name="line.96"></a>
<span class="sourceLineNo">097</span> */<a name="line.97"></a>
-<span class="sourceLineNo">098</span> public UserPermission(byte[] user, TableName table, byte[] family,<a name="line.98"></a>
-<span class="sourceLineNo">099</span> Action... assigned) {<a name="line.99"></a>
-<span class="sourceLineNo">100</span> super(table, family, assigned);<a name="line.100"></a>
-<span class="sourceLineNo">101</span> this.user = user;<a name="line.101"></a>
+<span class="sourceLineNo">098</span> public UserPermission(String user, TableName tableName, byte[] family, byte[] qualifier,<a name="line.98"></a>
+<span class="sourceLineNo">099</span> Permission.Action... assigned) {<a name="line.99"></a>
+<span class="sourceLineNo">100</span> this.user = user;<a name="line.100"></a>
+<span class="sourceLineNo">101</span> this.permission = new TablePermission(tableName, family, qualifier, assigned);<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> /**<a name="line.104"></a>
-<span class="sourceLineNo">105</span> * Creates a new permission for the given user, table, column family and<a name="line.105"></a>
-<span class="sourceLineNo">106</span> * column qualifier.<a name="line.106"></a>
-<span class="sourceLineNo">107</span> * @param user the user<a name="line.107"></a>
-<span class="sourceLineNo">108</span> * @param table the table<a name="line.108"></a>
-<span class="sourceLineNo">109</span> * @param family the family, can be null if action is allowed over the entire<a name="line.109"></a>
-<span class="sourceLineNo">110</span> * table<a name="line.110"></a>
-<span class="sourceLineNo">111</span> * @param qualifier the column qualifier, can be null if action is allowed<a name="line.111"></a>
-<span class="sourceLineNo">112</span> * over the entire column family<a name="line.112"></a>
-<span class="sourceLineNo">113</span> * @param assigned the list of allowed actions<a name="line.113"></a>
-<span class="sourceLineNo">114</span> */<a name="line.114"></a>
-<span class="sourceLineNo">115</span> public UserPermission(byte[] user, TableName table, byte[] family,<a name="line.115"></a>
-<span class="sourceLineNo">116</span> byte[] qualifier, Action... assigned) {<a name="line.116"></a>
-<span class="sourceLineNo">117</span> super(table, family, qualifier, assigned);<a name="line.117"></a>
-<span class="sourceLineNo">118</span> this.user = user;<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> * Creates a new instance for the given user, table, column family and<a name="line.122"></a>
-<span class="sourceLineNo">123</span> * qualifier, matching the actions with the given codes.<a name="line.123"></a>
-<span class="sourceLineNo">124</span> * @param user the user<a name="line.124"></a>
-<span class="sourceLineNo">125</span> * @param table the table<a name="line.125"></a>
-<span class="sourceLineNo">126</span> * @param family the family, can be null if action is allowed over the entire<a name="line.126"></a>
-<span class="sourceLineNo">127</span> * table<a name="line.127"></a>
-<span class="sourceLineNo">128</span> * @param qualifier the column qualifier, can be null if action is allowed<a name="line.128"></a>
-<span class="sourceLineNo">129</span> * over the entire column family<a name="line.129"></a>
-<span class="sourceLineNo">130</span> * @param actionCodes the list of allowed action codes<a name="line.130"></a>
+<span class="sourceLineNo">105</span> * Construct a table:family:qualifier user permission.<a name="line.105"></a>
+<span class="sourceLineNo">106</span> * @param user user name<a name="line.106"></a>
+<span class="sourceLineNo">107</span> * @param tableName table name<a name="line.107"></a>
+<span class="sourceLineNo">108</span> * @param family family name of table<a name="line.108"></a>
+<span class="sourceLineNo">109</span> * @param qualifier qualifier name of table<a name="line.109"></a>
+<span class="sourceLineNo">110</span> * @param actionCodes assigned actions<a name="line.110"></a>
+<span class="sourceLineNo">111</span> */<a name="line.111"></a>
+<span class="sourceLineNo">112</span> public UserPermission(String user, TableName tableName, byte[] family, byte[] qualifier,<a name="line.112"></a>
+<span class="sourceLineNo">113</span> byte[] actionCodes) {<a name="line.113"></a>
+<span class="sourceLineNo">114</span> this.user = user;<a name="line.114"></a>
+<span class="sourceLineNo">115</span> this.permission = new TablePermission(tableName, family, qualifier, actionCodes);<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> * Construct a user permission given permission.<a name="line.119"></a>
+<span class="sourceLineNo">120</span> * @param user user name<a name="line.120"></a>
+<span class="sourceLineNo">121</span> * @param permission one of [Global, Namespace, Table] permission<a name="line.121"></a>
+<span class="sourceLineNo">122</span> */<a name="line.122"></a>
+<span class="sourceLineNo">123</span> public UserPermission(String user, Permission permission) {<a name="line.123"></a>
+<span class="sourceLineNo">124</span> this.user = user;<a name="line.124"></a>
+<span class="sourceLineNo">125</span> this.permission = permission;<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> * Get this permission access scope.<a name="line.129"></a>
+<span class="sourceLineNo">130</span> * @return access scope<a name="line.130"></a>
<span class="sourceLineNo">131</span> */<a name="line.131"></a>
-<span class="sourceLineNo">132</span> public UserPermission(byte[] user, TableName table, byte[] family,<a name="line.132"></a>
-<span class="sourceLineNo">133</span> byte[] qualifier, byte[] actionCodes) {<a name="line.133"></a>
-<span class="sourceLineNo">134</span> super(table, family, qualifier, actionCodes);<a name="line.134"></a>
-<span class="sourceLineNo">135</span> this.user = user;<a name="line.135"></a>
-<span class="sourceLineNo">136</span> }<a name="line.136"></a>
-<span class="sourceLineNo">137</span><a name="line.137"></a>
-<span class="sourceLineNo">138</span> /**<a name="line.138"></a>
-<span class="sourceLineNo">139</span> * Creates a new instance for the given user, table, column family and<a name="line.139"></a>
-<span class="sourceLineNo">140</span> * qualifier, matching the actions with the given codes.<a name="line.140"></a>
-<span class="sourceLineNo">141</span> * @param user the user<a name="line.141"></a>
-<span class="sourceLineNo">142</span> * @param perm a TablePermission<a name="line.142"></a>
-<span class="sourceLineNo">143</span> */<a name="line.143"></a>
-<span class="sourceLineNo">144</span> public UserPermission(byte[] user, TablePermission perm) {<a name="line.144"></a>
-<span class="sourceLineNo">145</span> super(perm.getNamespace(), perm.getTableName(), perm.getFamily(), perm.getQualifier(),<a name="line.145"></a>
-<span class="sourceLineNo">146</span> perm.actions);<a name="line.146"></a>
-<span class="sourceLineNo">147</span> this.user = user;<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> public byte[] getUser() {<a name="line.150"></a>
-<span class="sourceLineNo">151</span> return user;<a name="line.151"></a>
-<span class="sourceLineNo">152</span> }<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> * Returns true if this permission describes a global user permission.<a name="line.155"></a>
-<span class="sourceLineNo">156</span> */<a name="line.156"></a>
-<span class="sourceLineNo">157</span> public boolean isGlobal() {<a name="line.157"></a>
-<span class="sourceLineNo">158</span> return(!hasTable() && !hasNamespace());<a name="line.158"></a>
+<span class="sourceLineNo">132</span> public Permission.Scope getAccessScope() {<a name="line.132"></a>
+<span class="sourceLineNo">133</span> return permission.getAccessScope();<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> public String getUser() {<a name="line.136"></a>
+<span class="sourceLineNo">137</span> return user;<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> public Permission getPermission() {<a name="line.140"></a>
+<span class="sourceLineNo">141</span> return permission;<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> public boolean equalsExceptActions(Object obj) {<a name="line.144"></a>
+<span class="sourceLineNo">145</span> if (!(obj instanceof UserPermission)) {<a name="line.145"></a>
+<span class="sourceLineNo">146</span> return false;<a name="line.146"></a>
+<span class="sourceLineNo">147</span> }<a name="line.147"></a>
+<span class="sourceLineNo">148</span> UserPermission other = (UserPermission) obj;<a name="line.148"></a>
+<span class="sourceLineNo">149</span> return user.equals(other.user) && permission.equalsExceptActions(other.permission);<a name="line.149"></a>
+<span class="sourceLineNo">150</span> }<a name="line.150"></a>
+<span class="sourceLineNo">151</span><a name="line.151"></a>
+<span class="sourceLineNo">152</span> @Override<a name="line.152"></a>
+<span class="sourceLineNo">153</span> public boolean equals(Object obj) {<a name="line.153"></a>
+<span class="sourceLineNo">154</span> if (!(obj instanceof UserPermission)) {<a name="line.154"></a>
+<span class="sourceLineNo">155</span> return false;<a name="line.155"></a>
+<span class="sourceLineNo">156</span> }<a name="line.156"></a>
+<span class="sourceLineNo">157</span> UserPermission other = (UserPermission) obj;<a name="line.157"></a>
+<span class="sourceLineNo">158</span> return user.equals(other.user) && permission.equals(other.permission);<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> @Override<a name="line.161"></a>
-<span class="sourceLineNo">162</span> public boolean equals(Object obj) {<a name="line.162"></a>
-<span class="sourceLineNo">163</span> if (!(obj instanceof UserPermission)) {<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> UserPermission other = (UserPermission)obj;<a name="line.166"></a>
-<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span> if ((Bytes.equals(user, other.getUser()) &&<a name="line.168"></a>
-<span class="sourceLineNo">169</span> super.equals(obj))) {<a name="line.169"></a>
-<span class="sourceLineNo">170</span> return true;<a name="line.170"></a>
-<span class="sourceLineNo">171</span> } else {<a name="line.171"></a>
-<span class="sourceLineNo">172</span> return false;<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><a name="line.175"></a>
-<span class="sourceLineNo">176</span> @Override<a name="line.176"></a>
-<span class="sourceLineNo">177</span> public int hashCode() {<a name="line.177"></a>
-<span class="sourceLineNo">178</span> final int prime = 37;<a name="line.178"></a>
-<span class="sourceLineNo">179</span> int result = super.hashCode();<a name="line.179"></a>
-<span class="sourceLineNo">180</span> if (user != null) {<a name="line.180"></a>
-<span class="sourceLineNo">181</span> result = prime * result + Bytes.hashCode(user);<a name="line.181"></a>
-<span class="sourceLineNo">182</span> }<a name="line.182"></a>
-<span class="sourceLineNo">183</span> return result;<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> @Override<a name="line.186"></a>
-<span class="sourceLineNo">187</span> public String toString() {<a name="line.187"></a>
-<span class="sourceLineNo">188</span> StringBuilder str = new StringBuilder("UserPermission: ")<a name="line.188"></a>
-<span class="sourceLineNo">189</span> .append("user=").append(Bytes.toString(user))<a name="line.189"></a>
-<span class="sourceLineNo">190</span> .append(", ").append(super.toString());<a name="line.190"></a>
-<span class="sourceLineNo">191</span> return str.toString();<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> @Override<a name="line.194"></a>
-<span class="sourceLineNo">195</span> public void readFields(DataInput in) throws IOException {<a name="line.195"></a>
-<span class="sourceLineNo">196</span> super.readFields(in);<a name="line.196"></a>
-<span class="sourceLineNo">197</span> user = Bytes.readByteArray(in);<a name="line.197"></a>
-<span class="sourceLineNo">198</span> }<a name="line.198"></a>
-<span class="sourceLineNo">199</span><a name="line.199"></a>
-<span class="sourceLineNo">200</span> @Override<a name="line.200"></a>
-<span class="sourceLineNo">201</span> public void write(DataOutput out) throws IOException {<a name="line.201"></a>
-<span class="sourceLineNo">202</span> super.write(out);<a name="line.202"></a>
-<span class="sourceLineNo">203</span> Bytes.writeByteArray(out, user);<a name="line.203"></a>
-<span class="sourceLineNo">204</span> }<a name="line.204"></a>
-<span class="sourceLineNo">205</span>}<a name="line.205"></a>
+<span class="sourceLineNo">162</span> public int hashCode() {<a name="line.162"></a>
+<span class="sourceLineNo">163</span> final int prime = 37;<a name="line.163"></a>
+<span class="sourceLineNo">164</span> int result = permission.hashCode();<a name="line.164"></a>
+<span class="sourceLineNo">165</span> if (user != null) {<a name="line.165"></a>
+<span class="sourceLineNo">166</span> result = prime * result + Objects.hashCode(user);<a name="line.166"></a>
+<span class="sourceLineNo">167</span> }<a name="line.167"></a>
+<span class="sourceLineNo">168</span> return result;<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> @Override<a name="line.171"></a>
+<span class="sourceLineNo">172</span> public String toString() {<a name="line.172"></a>
+<span class="sourceLineNo">173</span> StringBuilder str = new StringBuilder("UserPermission: ")<a name="line.173"></a>
+<span class="sourceLineNo">174</span> .append("user=").append(user)<a name="line.174"></a>
+<span class="sourceLineNo">175</span> .append(", ").append(permission.toString());<a name="line.175"></a>
+<span class="sourceLineNo">176</span> return str.toString();<a name="line.176"></a>
+<span class="sourceLineNo">177</span> }<a name="line.177"></a>
+<span class="sourceLineNo">178</span>}<a name="line.178"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/68eae623/devapidocs/src-html/org/apache/hadoop/hbase/security/access/ZKPermissionWatcher.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/security/access/ZKPermissionWatcher.html b/devapidocs/src-html/org/apache/hadoop/hbase/security/access/ZKPermissionWatcher.html
index c38c185..8240018 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/security/access/ZKPermissionWatcher.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/security/access/ZKPermissionWatcher.html
@@ -57,21 +57,21 @@
<span class="sourceLineNo">049</span> * {@code /hbase/acl/tablename}, with the znode data containing a serialized<a name="line.49"></a>
<span class="sourceLineNo">050</span> * list of the permissions granted for the table. The {@code AccessController}<a name="line.50"></a>
<span class="sourceLineNo">051</span> * instances on all other cluster hosts watch the znodes for updates, which<a name="line.51"></a>
-<span class="sourceLineNo">052</span> * trigger updates in the {@link TableAuthManager} permission cache.<a name="line.52"></a>
+<span class="sourceLineNo">052</span> * trigger updates in the {@link AuthManager} permission cache.<a name="line.52"></a>
<span class="sourceLineNo">053</span> */<a name="line.53"></a>
<span class="sourceLineNo">054</span>@InterfaceAudience.Private<a name="line.54"></a>
<span class="sourceLineNo">055</span>public class ZKPermissionWatcher extends ZKListener implements Closeable {<a name="line.55"></a>
<span class="sourceLineNo">056</span> private static final Logger LOG = LoggerFactory.getLogger(ZKPermissionWatcher.class);<a name="line.56"></a>
<span class="sourceLineNo">057</span> // parent node for permissions lists<a name="line.57"></a>
<span class="sourceLineNo">058</span> static final String ACL_NODE = "acl";<a name="line.58"></a>
-<span class="sourceLineNo">059</span> private final TableAuthManager authManager;<a name="line.59"></a>
+<span class="sourceLineNo">059</span> private final AuthManager authManager;<a name="line.59"></a>
<span class="sourceLineNo">060</span> private final String aclZNode;<a name="line.60"></a>
<span class="sourceLineNo">061</span> private final CountDownLatch initialized = new CountDownLatch(1);<a name="line.61"></a>
<span class="sourceLineNo">062</span> private final ExecutorService executor;<a name="line.62"></a>
<span class="sourceLineNo">063</span> private Future<?> childrenChangedFuture;<a name="line.63"></a>
<span class="sourceLineNo">064</span><a name="line.64"></a>
<span class="sourceLineNo">065</span> public ZKPermissionWatcher(ZKWatcher watcher,<a name="line.65"></a>
-<span class="sourceLineNo">066</span> TableAuthManager authManager, Configuration conf) {<a name="line.66"></a>
+<span class="sourceLineNo">066</span> AuthManager authManager, Configuration conf) {<a name="line.66"></a>
<span class="sourceLineNo">067</span> super(watcher);<a name="line.67"></a>
<span class="sourceLineNo">068</span> this.authManager = authManager;<a name="line.68"></a>
<span class="sourceLineNo">069</span> String aclZnodeParent = conf.get("zookeeper.znode.acl.parent", ACL_NODE);<a name="line.69"></a>