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:55:06 UTC
[24/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/AccessControlUtil.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/security/access/AccessControlUtil.html b/devapidocs/src-html/org/apache/hadoop/hbase/security/access/AccessControlUtil.html
index 69565e9..3e1345c 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/security/access/AccessControlUtil.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/security/access/AccessControlUtil.html
@@ -55,7 +55,7 @@
<span class="sourceLineNo">047</span> private AccessControlUtil() {}<a name="line.47"></a>
<span class="sourceLineNo">048</span><a name="line.48"></a>
<span class="sourceLineNo">049</span> /**<a name="line.49"></a>
-<span class="sourceLineNo">050</span> * Create a request to grant user permissions.<a name="line.50"></a>
+<span class="sourceLineNo">050</span> * Create a request to grant user table permissions.<a name="line.50"></a>
<span class="sourceLineNo">051</span> *<a name="line.51"></a>
<span class="sourceLineNo">052</span> * @param username the short user name who to grant permissions<a name="line.52"></a>
<span class="sourceLineNo">053</span> * @param tableName optional table name the permissions apply<a name="line.53"></a>
@@ -96,7 +96,7 @@
<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> * Create a request to grant user permissions.<a name="line.91"></a>
+<span class="sourceLineNo">091</span> * Create a request to grant user namespace permissions.<a name="line.91"></a>
<span class="sourceLineNo">092</span> *<a name="line.92"></a>
<span class="sourceLineNo">093</span> * @param username the short user name who to grant permissions<a name="line.93"></a>
<span class="sourceLineNo">094</span> * @param namespace optional table name the permissions apply<a name="line.94"></a>
@@ -127,7 +127,7 @@
<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> * Create a request to revoke user permissions.<a name="line.122"></a>
+<span class="sourceLineNo">122</span> * Create a request to revoke user global permissions.<a name="line.122"></a>
<span class="sourceLineNo">123</span> *<a name="line.123"></a>
<span class="sourceLineNo">124</span> * @param username the short user name whose permissions to be revoked<a name="line.124"></a>
<span class="sourceLineNo">125</span> * @param actions the permissions to be revoked<a name="line.125"></a>
@@ -153,7 +153,7 @@
<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> /**<a name="line.147"></a>
-<span class="sourceLineNo">148</span> * Create a request to revoke user permissions.<a name="line.148"></a>
+<span class="sourceLineNo">148</span> * Create a request to revoke user namespace permissions.<a name="line.148"></a>
<span class="sourceLineNo">149</span> *<a name="line.149"></a>
<span class="sourceLineNo">150</span> * @param username the short user name whose permissions to be revoked<a name="line.150"></a>
<span class="sourceLineNo">151</span> * @param namespace optional table name the permissions apply<a name="line.151"></a>
@@ -184,7 +184,7 @@
<span class="sourceLineNo">176</span> }<a name="line.176"></a>
<span class="sourceLineNo">177</span><a name="line.177"></a>
<span class="sourceLineNo">178</span> /**<a name="line.178"></a>
-<span class="sourceLineNo">179</span> * Create a request to grant user permissions.<a name="line.179"></a>
+<span class="sourceLineNo">179</span> * Create a request to grant user global permissions.<a name="line.179"></a>
<span class="sourceLineNo">180</span> *<a name="line.180"></a>
<span class="sourceLineNo">181</span> * @param username the short user name who to grant permissions<a name="line.181"></a>
<span class="sourceLineNo">182</span> * @param actions the permissions to be granted<a name="line.182"></a>
@@ -248,669 +248,661 @@
<span class="sourceLineNo">240</span> return result;<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><a name="line.243"></a>
-<span class="sourceLineNo">244</span> /**<a name="line.244"></a>
-<span class="sourceLineNo">245</span> * Converts a Permission proto to a client Permission object.<a name="line.245"></a>
-<span class="sourceLineNo">246</span> *<a name="line.246"></a>
-<span class="sourceLineNo">247</span> * @param proto the protobuf Permission<a name="line.247"></a>
-<span class="sourceLineNo">248</span> * @return the converted Permission<a name="line.248"></a>
-<span class="sourceLineNo">249</span> */<a name="line.249"></a>
-<span class="sourceLineNo">250</span> public static Permission toPermission(AccessControlProtos.Permission proto) {<a name="line.250"></a>
-<span class="sourceLineNo">251</span> if (proto.getType() != AccessControlProtos.Permission.Type.Global) {<a name="line.251"></a>
-<span class="sourceLineNo">252</span> return toTablePermission(proto);<a name="line.252"></a>
-<span class="sourceLineNo">253</span> } else {<a name="line.253"></a>
-<span class="sourceLineNo">254</span> List<Permission.Action> actions = toPermissionActions(<a name="line.254"></a>
-<span class="sourceLineNo">255</span> proto.getGlobalPermission().getActionList());<a name="line.255"></a>
-<span class="sourceLineNo">256</span> return new Permission(actions.toArray(new Permission.Action[actions.size()]));<a name="line.256"></a>
-<span class="sourceLineNo">257</span> }<a name="line.257"></a>
-<span class="sourceLineNo">258</span> }<a name="line.258"></a>
-<span class="sourceLineNo">259</span><a name="line.259"></a>
-<span class="sourceLineNo">260</span> /**<a name="line.260"></a>
-<span class="sourceLineNo">261</span> * Converts a TablePermission proto to a client TablePermission object.<a name="line.261"></a>
-<span class="sourceLineNo">262</span> * @param proto the protobuf TablePermission<a name="line.262"></a>
-<span class="sourceLineNo">263</span> * @return the converted TablePermission<a name="line.263"></a>
-<span class="sourceLineNo">264</span> */<a name="line.264"></a>
-<span class="sourceLineNo">265</span> public static TablePermission toTablePermission(AccessControlProtos.TablePermission proto) {<a name="line.265"></a>
-<span class="sourceLineNo">266</span> List<Permission.Action> actions = toPermissionActions(proto.getActionList());<a name="line.266"></a>
-<span class="sourceLineNo">267</span> TableName table = null;<a name="line.267"></a>
-<span class="sourceLineNo">268</span> byte[] qualifier = null;<a name="line.268"></a>
-<span class="sourceLineNo">269</span> byte[] family = null;<a name="line.269"></a>
-<span class="sourceLineNo">270</span> if (!proto.hasTableName()) {<a name="line.270"></a>
-<span class="sourceLineNo">271</span> throw new IllegalStateException("TableName cannot be empty");<a name="line.271"></a>
-<span class="sourceLineNo">272</span> }<a name="line.272"></a>
-<span class="sourceLineNo">273</span> table = ProtobufUtil.toTableName(proto.getTableName());<a name="line.273"></a>
-<span class="sourceLineNo">274</span> if (proto.hasFamily()) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span> family = proto.getFamily().toByteArray();<a name="line.275"></a>
-<span class="sourceLineNo">276</span> }<a name="line.276"></a>
-<span class="sourceLineNo">277</span> if (proto.hasQualifier()) {<a name="line.277"></a>
-<span class="sourceLineNo">278</span> qualifier = proto.getQualifier().toByteArray();<a name="line.278"></a>
-<span class="sourceLineNo">279</span> }<a name="line.279"></a>
-<span class="sourceLineNo">280</span> return new TablePermission(table, family, qualifier,<a name="line.280"></a>
-<span class="sourceLineNo">281</span> actions.toArray(new Permission.Action[actions.size()]));<a name="line.281"></a>
-<span class="sourceLineNo">282</span> }<a name="line.282"></a>
-<span class="sourceLineNo">283</span><a name="line.283"></a>
-<span class="sourceLineNo">284</span> /**<a name="line.284"></a>
-<span class="sourceLineNo">285</span> * Converts a Permission proto to a client TablePermission object.<a name="line.285"></a>
-<span class="sourceLineNo">286</span> * @param proto the protobuf Permission<a name="line.286"></a>
-<span class="sourceLineNo">287</span> * @return the converted TablePermission<a name="line.287"></a>
-<span class="sourceLineNo">288</span> */<a name="line.288"></a>
-<span class="sourceLineNo">289</span> public static TablePermission toTablePermission(AccessControlProtos.Permission proto) {<a name="line.289"></a>
-<span class="sourceLineNo">290</span> if(proto.getType() == AccessControlProtos.Permission.Type.Global) {<a name="line.290"></a>
-<span class="sourceLineNo">291</span> AccessControlProtos.GlobalPermission perm = proto.getGlobalPermission();<a name="line.291"></a>
-<span class="sourceLineNo">292</span> List<Permission.Action> actions = toPermissionActions(perm.getActionList());<a name="line.292"></a>
-<span class="sourceLineNo">293</span><a name="line.293"></a>
-<span class="sourceLineNo">294</span> return new TablePermission(null, null, null,<a name="line.294"></a>
-<span class="sourceLineNo">295</span> actions.toArray(new Permission.Action[actions.size()]));<a name="line.295"></a>
-<span class="sourceLineNo">296</span> }<a name="line.296"></a>
-<span class="sourceLineNo">297</span> if(proto.getType() == AccessControlProtos.Permission.Type.Namespace) {<a name="line.297"></a>
-<span class="sourceLineNo">298</span> AccessControlProtos.NamespacePermission perm = proto.getNamespacePermission();<a name="line.298"></a>
-<span class="sourceLineNo">299</span> List<Permission.Action> actions = toPermissionActions(perm.getActionList());<a name="line.299"></a>
-<span class="sourceLineNo">300</span><a name="line.300"></a>
-<span class="sourceLineNo">301</span> if(!proto.hasNamespacePermission()) {<a name="line.301"></a>
-<span class="sourceLineNo">302</span> throw new IllegalStateException("Namespace must not be empty in NamespacePermission");<a name="line.302"></a>
-<span class="sourceLineNo">303</span> }<a name="line.303"></a>
-<span class="sourceLineNo">304</span> String namespace = perm.getNamespaceName().toStringUtf8();<a name="line.304"></a>
-<span class="sourceLineNo">305</span> return new TablePermission(namespace, actions.toArray(new Permission.Action[actions.size()]));<a name="line.305"></a>
-<span class="sourceLineNo">306</span> }<a name="line.306"></a>
-<span class="sourceLineNo">307</span> if(proto.getType() == AccessControlProtos.Permission.Type.Table) {<a name="line.307"></a>
-<span class="sourceLineNo">308</span> AccessControlProtos.TablePermission perm = proto.getTablePermission();<a name="line.308"></a>
-<span class="sourceLineNo">309</span> List<Permission.Action> actions = toPermissionActions(perm.getActionList());<a name="line.309"></a>
-<span class="sourceLineNo">310</span><a name="line.310"></a>
-<span class="sourceLineNo">311</span> byte[] qualifier = null;<a name="line.311"></a>
-<span class="sourceLineNo">312</span> byte[] family = null;<a name="line.312"></a>
-<span class="sourceLineNo">313</span> TableName table = null;<a name="line.313"></a>
-<span class="sourceLineNo">314</span><a name="line.314"></a>
-<span class="sourceLineNo">315</span> if (!perm.hasTableName()) {<a name="line.315"></a>
-<span class="sourceLineNo">316</span> throw new IllegalStateException("TableName cannot be empty");<a name="line.316"></a>
-<span class="sourceLineNo">317</span> }<a name="line.317"></a>
-<span class="sourceLineNo">318</span> table = ProtobufUtil.toTableName(perm.getTableName());<a name="line.318"></a>
-<span class="sourceLineNo">319</span><a name="line.319"></a>
-<span class="sourceLineNo">320</span> if (perm.hasFamily()) family = perm.getFamily().toByteArray();<a name="line.320"></a>
-<span class="sourceLineNo">321</span> if (perm.hasQualifier()) qualifier = perm.getQualifier().toByteArray();<a name="line.321"></a>
-<span class="sourceLineNo">322</span><a name="line.322"></a>
-<span class="sourceLineNo">323</span> return new TablePermission(table, family, qualifier,<a name="line.323"></a>
-<span class="sourceLineNo">324</span> actions.toArray(new Permission.Action[actions.size()]));<a name="line.324"></a>
-<span class="sourceLineNo">325</span> }<a name="line.325"></a>
-<span class="sourceLineNo">326</span> throw new IllegalStateException("Unrecognize Perm Type: "+proto.getType());<a name="line.326"></a>
-<span class="sourceLineNo">327</span> }<a name="line.327"></a>
-<span class="sourceLineNo">328</span><a name="line.328"></a>
-<span class="sourceLineNo">329</span> /**<a name="line.329"></a>
-<span class="sourceLineNo">330</span> * Convert a client Permission to a Permission proto<a name="line.330"></a>
-<span class="sourceLineNo">331</span> *<a name="line.331"></a>
-<span class="sourceLineNo">332</span> * @param perm the client Permission<a name="line.332"></a>
-<span class="sourceLineNo">333</span> * @return the protobuf Permission<a name="line.333"></a>
-<span class="sourceLineNo">334</span> */<a name="line.334"></a>
-<span class="sourceLineNo">335</span> public static AccessControlProtos.Permission toPermission(Permission perm) {<a name="line.335"></a>
-<span class="sourceLineNo">336</span> AccessControlProtos.Permission.Builder ret = AccessControlProtos.Permission.newBuilder();<a name="line.336"></a>
-<span class="sourceLineNo">337</span> if (perm instanceof TablePermission) {<a name="line.337"></a>
-<span class="sourceLineNo">338</span> TablePermission tablePerm = (TablePermission)perm;<a name="line.338"></a>
-<span class="sourceLineNo">339</span> if(tablePerm.hasNamespace()) {<a name="line.339"></a>
-<span class="sourceLineNo">340</span> ret.setType(AccessControlProtos.Permission.Type.Namespace);<a name="line.340"></a>
-<span class="sourceLineNo">341</span><a name="line.341"></a>
-<span class="sourceLineNo">342</span> AccessControlProtos.NamespacePermission.Builder builder =<a name="line.342"></a>
-<span class="sourceLineNo">343</span> AccessControlProtos.NamespacePermission.newBuilder();<a name="line.343"></a>
-<span class="sourceLineNo">344</span> builder.setNamespaceName(ByteString.copyFromUtf8(tablePerm.getNamespace()));<a name="line.344"></a>
-<span class="sourceLineNo">345</span> Permission.Action[] actions = perm.getActions();<a name="line.345"></a>
-<span class="sourceLineNo">346</span> if (actions != null) {<a name="line.346"></a>
-<span class="sourceLineNo">347</span> for (Permission.Action a : actions) {<a name="line.347"></a>
-<span class="sourceLineNo">348</span> builder.addAction(toPermissionAction(a));<a name="line.348"></a>
-<span class="sourceLineNo">349</span> }<a name="line.349"></a>
-<span class="sourceLineNo">350</span> }<a name="line.350"></a>
-<span class="sourceLineNo">351</span> ret.setNamespacePermission(builder);<a name="line.351"></a>
-<span class="sourceLineNo">352</span> return ret.build();<a name="line.352"></a>
-<span class="sourceLineNo">353</span> } else if (tablePerm.hasTable()) {<a name="line.353"></a>
-<span class="sourceLineNo">354</span> ret.setType(AccessControlProtos.Permission.Type.Table);<a name="line.354"></a>
-<span class="sourceLineNo">355</span><a name="line.355"></a>
-<span class="sourceLineNo">356</span> AccessControlProtos.TablePermission.Builder builder =<a name="line.356"></a>
-<span class="sourceLineNo">357</span> AccessControlProtos.TablePermission.newBuilder();<a name="line.357"></a>
-<span class="sourceLineNo">358</span> builder.setTableName(ProtobufUtil.toProtoTableName(tablePerm.getTableName()));<a name="line.358"></a>
-<span class="sourceLineNo">359</span> if (tablePerm.hasFamily()) {<a name="line.359"></a>
-<span class="sourceLineNo">360</span> builder.setFamily(ByteStringer.wrap(tablePerm.getFamily()));<a name="line.360"></a>
-<span class="sourceLineNo">361</span> }<a name="line.361"></a>
-<span class="sourceLineNo">362</span> if (tablePerm.hasQualifier()) {<a name="line.362"></a>
-<span class="sourceLineNo">363</span> builder.setQualifier(ByteStringer.wrap(tablePerm.getQualifier()));<a name="line.363"></a>
-<span class="sourceLineNo">364</span> }<a name="line.364"></a>
-<span class="sourceLineNo">365</span> Permission.Action actions[] = perm.getActions();<a name="line.365"></a>
-<span class="sourceLineNo">366</span> if (actions != null) {<a name="line.366"></a>
-<span class="sourceLineNo">367</span> for (Permission.Action a : actions) {<a name="line.367"></a>
-<span class="sourceLineNo">368</span> builder.addAction(toPermissionAction(a));<a name="line.368"></a>
-<span class="sourceLineNo">369</span> }<a name="line.369"></a>
-<span class="sourceLineNo">370</span> }<a name="line.370"></a>
-<span class="sourceLineNo">371</span> ret.setTablePermission(builder);<a name="line.371"></a>
-<span class="sourceLineNo">372</span> return ret.build();<a name="line.372"></a>
-<span class="sourceLineNo">373</span> }<a name="line.373"></a>
-<span class="sourceLineNo">374</span> }<a name="line.374"></a>
-<span class="sourceLineNo">375</span><a name="line.375"></a>
-<span class="sourceLineNo">376</span> ret.setType(AccessControlProtos.Permission.Type.Global);<a name="line.376"></a>
-<span class="sourceLineNo">377</span><a name="line.377"></a>
-<span class="sourceLineNo">378</span> AccessControlProtos.GlobalPermission.Builder builder =<a name="line.378"></a>
-<span class="sourceLineNo">379</span> AccessControlProtos.GlobalPermission.newBuilder();<a name="line.379"></a>
-<span class="sourceLineNo">380</span> Permission.Action actions[] = perm.getActions();<a name="line.380"></a>
-<span class="sourceLineNo">381</span> if (actions != null) {<a name="line.381"></a>
-<span class="sourceLineNo">382</span> for (Permission.Action a: actions) {<a name="line.382"></a>
-<span class="sourceLineNo">383</span> builder.addAction(toPermissionAction(a));<a name="line.383"></a>
-<span class="sourceLineNo">384</span> }<a name="line.384"></a>
-<span class="sourceLineNo">385</span> }<a name="line.385"></a>
-<span class="sourceLineNo">386</span> ret.setGlobalPermission(builder);<a name="line.386"></a>
-<span class="sourceLineNo">387</span> return ret.build();<a name="line.387"></a>
-<span class="sourceLineNo">388</span> }<a name="line.388"></a>
-<span class="sourceLineNo">389</span><a name="line.389"></a>
-<span class="sourceLineNo">390</span> /**<a name="line.390"></a>
-<span class="sourceLineNo">391</span> * Converts a list of Permission.Action proto to a list of client Permission.Action objects.<a name="line.391"></a>
-<span class="sourceLineNo">392</span> *<a name="line.392"></a>
-<span class="sourceLineNo">393</span> * @param protoActions the list of protobuf Actions<a name="line.393"></a>
-<span class="sourceLineNo">394</span> * @return the converted list of Actions<a name="line.394"></a>
-<span class="sourceLineNo">395</span> */<a name="line.395"></a>
-<span class="sourceLineNo">396</span> public static List<Permission.Action> toPermissionActions(<a name="line.396"></a>
-<span class="sourceLineNo">397</span> List<AccessControlProtos.Permission.Action> protoActions) {<a name="line.397"></a>
-<span class="sourceLineNo">398</span> List<Permission.Action> actions = new ArrayList<>(protoActions.size());<a name="line.398"></a>
-<span class="sourceLineNo">399</span> for (AccessControlProtos.Permission.Action a : protoActions) {<a name="line.399"></a>
-<span class="sourceLineNo">400</span> actions.add(toPermissionAction(a));<a name="line.400"></a>
-<span class="sourceLineNo">401</span> }<a name="line.401"></a>
-<span class="sourceLineNo">402</span> return actions;<a name="line.402"></a>
-<span class="sourceLineNo">403</span> }<a name="line.403"></a>
-<span class="sourceLineNo">404</span><a name="line.404"></a>
-<span class="sourceLineNo">405</span> /**<a name="line.405"></a>
-<span class="sourceLineNo">406</span> * Converts a Permission.Action proto to a client Permission.Action object.<a name="line.406"></a>
-<span class="sourceLineNo">407</span> *<a name="line.407"></a>
-<span class="sourceLineNo">408</span> * @param action the protobuf Action<a name="line.408"></a>
-<span class="sourceLineNo">409</span> * @return the converted Action<a name="line.409"></a>
-<span class="sourceLineNo">410</span> */<a name="line.410"></a>
-<span class="sourceLineNo">411</span> public static Permission.Action toPermissionAction(<a name="line.411"></a>
-<span class="sourceLineNo">412</span> AccessControlProtos.Permission.Action action) {<a name="line.412"></a>
-<span class="sourceLineNo">413</span> switch (action) {<a name="line.413"></a>
-<span class="sourceLineNo">414</span> case READ:<a name="line.414"></a>
-<span class="sourceLineNo">415</span> return Permission.Action.READ;<a name="line.415"></a>
-<span class="sourceLineNo">416</span> case WRITE:<a name="line.416"></a>
-<span class="sourceLineNo">417</span> return Permission.Action.WRITE;<a name="line.417"></a>
-<span class="sourceLineNo">418</span> case EXEC:<a name="line.418"></a>
-<span class="sourceLineNo">419</span> return Permission.Action.EXEC;<a name="line.419"></a>
-<span class="sourceLineNo">420</span> case CREATE:<a name="line.420"></a>
-<span class="sourceLineNo">421</span> return Permission.Action.CREATE;<a name="line.421"></a>
-<span class="sourceLineNo">422</span> case ADMIN:<a name="line.422"></a>
-<span class="sourceLineNo">423</span> return Permission.Action.ADMIN;<a name="line.423"></a>
-<span class="sourceLineNo">424</span> }<a name="line.424"></a>
-<span class="sourceLineNo">425</span> throw new IllegalArgumentException("Unknown action value "+action.name());<a name="line.425"></a>
-<span class="sourceLineNo">426</span> }<a name="line.426"></a>
-<span class="sourceLineNo">427</span><a name="line.427"></a>
-<span class="sourceLineNo">428</span> /**<a name="line.428"></a>
-<span class="sourceLineNo">429</span> * Convert a client Permission.Action to a Permission.Action proto<a name="line.429"></a>
-<span class="sourceLineNo">430</span> *<a name="line.430"></a>
-<span class="sourceLineNo">431</span> * @param action the client Action<a name="line.431"></a>
-<span class="sourceLineNo">432</span> * @return the protobuf Action<a name="line.432"></a>
-<span class="sourceLineNo">433</span> */<a name="line.433"></a>
-<span class="sourceLineNo">434</span> public static AccessControlProtos.Permission.Action toPermissionAction(<a name="line.434"></a>
-<span class="sourceLineNo">435</span> Permission.Action action) {<a name="line.435"></a>
-<span class="sourceLineNo">436</span> switch (action) {<a name="line.436"></a>
-<span class="sourceLineNo">437</span> case READ:<a name="line.437"></a>
-<span class="sourceLineNo">438</span> return AccessControlProtos.Permission.Action.READ;<a name="line.438"></a>
-<span class="sourceLineNo">439</span> case WRITE:<a name="line.439"></a>
-<span class="sourceLineNo">440</span> return AccessControlProtos.Permission.Action.WRITE;<a name="line.440"></a>
-<span class="sourceLineNo">441</span> case EXEC:<a name="line.441"></a>
-<span class="sourceLineNo">442</span> return AccessControlProtos.Permission.Action.EXEC;<a name="line.442"></a>
-<span class="sourceLineNo">443</span> case CREATE:<a name="line.443"></a>
-<span class="sourceLineNo">444</span> return AccessControlProtos.Permission.Action.CREATE;<a name="line.444"></a>
-<span class="sourceLineNo">445</span> case ADMIN:<a name="line.445"></a>
-<span class="sourceLineNo">446</span> return AccessControlProtos.Permission.Action.ADMIN;<a name="line.446"></a>
+<span class="sourceLineNo">243</span> /**<a name="line.243"></a>
+<span class="sourceLineNo">244</span> * Converts a TablePermission proto to a client TablePermission object.<a name="line.244"></a>
+<span class="sourceLineNo">245</span> * @param proto the protobuf TablePermission<a name="line.245"></a>
+<span class="sourceLineNo">246</span> * @return the converted TablePermission<a name="line.246"></a>
+<span class="sourceLineNo">247</span> */<a name="line.247"></a>
+<span class="sourceLineNo">248</span> public static TablePermission toTablePermission(AccessControlProtos.TablePermission proto) {<a name="line.248"></a>
+<span class="sourceLineNo">249</span> List<Permission.Action> actions = toPermissionActions(proto.getActionList());<a name="line.249"></a>
+<span class="sourceLineNo">250</span> TableName table = null;<a name="line.250"></a>
+<span class="sourceLineNo">251</span> byte[] qualifier = null;<a name="line.251"></a>
+<span class="sourceLineNo">252</span> byte[] family = null;<a name="line.252"></a>
+<span class="sourceLineNo">253</span> if (!proto.hasTableName()) {<a name="line.253"></a>
+<span class="sourceLineNo">254</span> throw new IllegalStateException("TableName cannot be empty");<a name="line.254"></a>
+<span class="sourceLineNo">255</span> }<a name="line.255"></a>
+<span class="sourceLineNo">256</span> table = ProtobufUtil.toTableName(proto.getTableName());<a name="line.256"></a>
+<span class="sourceLineNo">257</span> if (proto.hasFamily()) {<a name="line.257"></a>
+<span class="sourceLineNo">258</span> family = proto.getFamily().toByteArray();<a name="line.258"></a>
+<span class="sourceLineNo">259</span> }<a name="line.259"></a>
+<span class="sourceLineNo">260</span> if (proto.hasQualifier()) {<a name="line.260"></a>
+<span class="sourceLineNo">261</span> qualifier = proto.getQualifier().toByteArray();<a name="line.261"></a>
+<span class="sourceLineNo">262</span> }<a name="line.262"></a>
+<span class="sourceLineNo">263</span> return new TablePermission(table, family, qualifier,<a name="line.263"></a>
+<span class="sourceLineNo">264</span> actions.toArray(new Permission.Action[actions.size()]));<a name="line.264"></a>
+<span class="sourceLineNo">265</span> }<a name="line.265"></a>
+<span class="sourceLineNo">266</span><a name="line.266"></a>
+<span class="sourceLineNo">267</span> /**<a name="line.267"></a>
+<span class="sourceLineNo">268</span> * Converts a Permission proto to a client Permission object.<a name="line.268"></a>
+<span class="sourceLineNo">269</span> * @param proto the protobuf Permission<a name="line.269"></a>
+<span class="sourceLineNo">270</span> * @return the converted Permission<a name="line.270"></a>
+<span class="sourceLineNo">271</span> */<a name="line.271"></a>
+<span class="sourceLineNo">272</span> public static Permission toPermission(AccessControlProtos.Permission proto) {<a name="line.272"></a>
+<span class="sourceLineNo">273</span> if (proto.getType() == AccessControlProtos.Permission.Type.Global) {<a name="line.273"></a>
+<span class="sourceLineNo">274</span> AccessControlProtos.GlobalPermission perm = proto.getGlobalPermission();<a name="line.274"></a>
+<span class="sourceLineNo">275</span> List<Permission.Action> actions = toPermissionActions(perm.getActionList());<a name="line.275"></a>
+<span class="sourceLineNo">276</span> return new GlobalPermission(actions.toArray(new Permission.Action[actions.size()]));<a name="line.276"></a>
+<span class="sourceLineNo">277</span> }<a name="line.277"></a>
+<span class="sourceLineNo">278</span> if (proto.getType() == AccessControlProtos.Permission.Type.Namespace) {<a name="line.278"></a>
+<span class="sourceLineNo">279</span> AccessControlProtos.NamespacePermission perm = proto.getNamespacePermission();<a name="line.279"></a>
+<span class="sourceLineNo">280</span> List<Permission.Action> actions = toPermissionActions(perm.getActionList());<a name="line.280"></a>
+<span class="sourceLineNo">281</span> if (!proto.hasNamespacePermission()) {<a name="line.281"></a>
+<span class="sourceLineNo">282</span> throw new IllegalStateException("Namespace must not be empty in NamespacePermission");<a name="line.282"></a>
+<span class="sourceLineNo">283</span> }<a name="line.283"></a>
+<span class="sourceLineNo">284</span> return new NamespacePermission(perm.getNamespaceName().toStringUtf8(),<a name="line.284"></a>
+<span class="sourceLineNo">285</span> actions.toArray(new Permission.Action[actions.size()]));<a name="line.285"></a>
+<span class="sourceLineNo">286</span> }<a name="line.286"></a>
+<span class="sourceLineNo">287</span> if (proto.getType() == AccessControlProtos.Permission.Type.Table) {<a name="line.287"></a>
+<span class="sourceLineNo">288</span> AccessControlProtos.TablePermission perm = proto.getTablePermission();<a name="line.288"></a>
+<span class="sourceLineNo">289</span> List<Permission.Action> actions = toPermissionActions(perm.getActionList());<a name="line.289"></a>
+<span class="sourceLineNo">290</span> byte[] qualifier = null;<a name="line.290"></a>
+<span class="sourceLineNo">291</span> byte[] family = null;<a name="line.291"></a>
+<span class="sourceLineNo">292</span> TableName table = null;<a name="line.292"></a>
+<span class="sourceLineNo">293</span> if (!perm.hasTableName()) {<a name="line.293"></a>
+<span class="sourceLineNo">294</span> throw new IllegalStateException("TableName cannot be empty");<a name="line.294"></a>
+<span class="sourceLineNo">295</span> }<a name="line.295"></a>
+<span class="sourceLineNo">296</span> table = ProtobufUtil.toTableName(perm.getTableName());<a name="line.296"></a>
+<span class="sourceLineNo">297</span> if (perm.hasFamily()) {<a name="line.297"></a>
+<span class="sourceLineNo">298</span> family = perm.getFamily().toByteArray();<a name="line.298"></a>
+<span class="sourceLineNo">299</span> }<a name="line.299"></a>
+<span class="sourceLineNo">300</span> if (perm.hasQualifier()) {<a name="line.300"></a>
+<span class="sourceLineNo">301</span> qualifier = perm.getQualifier().toByteArray();<a name="line.301"></a>
+<span class="sourceLineNo">302</span> }<a name="line.302"></a>
+<span class="sourceLineNo">303</span> return new TablePermission(table, family, qualifier,<a name="line.303"></a>
+<span class="sourceLineNo">304</span> actions.toArray(new Permission.Action[actions.size()]));<a name="line.304"></a>
+<span class="sourceLineNo">305</span> }<a name="line.305"></a>
+<span class="sourceLineNo">306</span> throw new IllegalStateException("Unrecognize Perm Type: " + proto.getType());<a name="line.306"></a>
+<span class="sourceLineNo">307</span> }<a name="line.307"></a>
+<span class="sourceLineNo">308</span><a name="line.308"></a>
+<span class="sourceLineNo">309</span> /**<a name="line.309"></a>
+<span class="sourceLineNo">310</span> * Convert a client Permission to a Permission proto<a name="line.310"></a>
+<span class="sourceLineNo">311</span> *<a name="line.311"></a>
+<span class="sourceLineNo">312</span> * @param perm the client Permission<a name="line.312"></a>
+<span class="sourceLineNo">313</span> * @return the protobuf Permission<a name="line.313"></a>
+<span class="sourceLineNo">314</span> */<a name="line.314"></a>
+<span class="sourceLineNo">315</span> public static AccessControlProtos.Permission toPermission(Permission perm) {<a name="line.315"></a>
+<span class="sourceLineNo">316</span> AccessControlProtos.Permission.Builder ret = AccessControlProtos.Permission.newBuilder();<a name="line.316"></a>
+<span class="sourceLineNo">317</span> if (perm instanceof NamespacePermission) {<a name="line.317"></a>
+<span class="sourceLineNo">318</span> NamespacePermission namespace = (NamespacePermission) perm;<a name="line.318"></a>
+<span class="sourceLineNo">319</span> ret.setType(AccessControlProtos.Permission.Type.Namespace);<a name="line.319"></a>
+<span class="sourceLineNo">320</span> AccessControlProtos.NamespacePermission.Builder builder =<a name="line.320"></a>
+<span class="sourceLineNo">321</span> AccessControlProtos.NamespacePermission.newBuilder();<a name="line.321"></a>
+<span class="sourceLineNo">322</span> builder.setNamespaceName(ByteString.copyFromUtf8(namespace.getNamespace()));<a name="line.322"></a>
+<span class="sourceLineNo">323</span> Permission.Action[] actions = perm.getActions();<a name="line.323"></a>
+<span class="sourceLineNo">324</span> if (actions != null) {<a name="line.324"></a>
+<span class="sourceLineNo">325</span> for (Permission.Action a : actions) {<a name="line.325"></a>
+<span class="sourceLineNo">326</span> builder.addAction(toPermissionAction(a));<a name="line.326"></a>
+<span class="sourceLineNo">327</span> }<a name="line.327"></a>
+<span class="sourceLineNo">328</span> }<a name="line.328"></a>
+<span class="sourceLineNo">329</span> ret.setNamespacePermission(builder);<a name="line.329"></a>
+<span class="sourceLineNo">330</span> } else if (perm instanceof TablePermission) {<a name="line.330"></a>
+<span class="sourceLineNo">331</span> TablePermission table = (TablePermission) perm;<a name="line.331"></a>
+<span class="sourceLineNo">332</span> ret.setType(AccessControlProtos.Permission.Type.Table);<a name="line.332"></a>
+<span class="sourceLineNo">333</span> AccessControlProtos.TablePermission.Builder builder =<a name="line.333"></a>
+<span class="sourceLineNo">334</span> AccessControlProtos.TablePermission.newBuilder();<a name="line.334"></a>
+<span class="sourceLineNo">335</span> builder.setTableName(ProtobufUtil.toProtoTableName(table.getTableName()));<a name="line.335"></a>
+<span class="sourceLineNo">336</span> if (table.hasFamily()) {<a name="line.336"></a>
+<span class="sourceLineNo">337</span> builder.setFamily(ByteStringer.wrap(table.getFamily()));<a name="line.337"></a>
+<span class="sourceLineNo">338</span> }<a name="line.338"></a>
+<span class="sourceLineNo">339</span> if (table.hasQualifier()) {<a name="line.339"></a>
+<span class="sourceLineNo">340</span> builder.setQualifier(ByteStringer.wrap(table.getQualifier()));<a name="line.340"></a>
+<span class="sourceLineNo">341</span> }<a name="line.341"></a>
+<span class="sourceLineNo">342</span> Permission.Action[] actions = perm.getActions();<a name="line.342"></a>
+<span class="sourceLineNo">343</span> if (actions != null) {<a name="line.343"></a>
+<span class="sourceLineNo">344</span> for (Permission.Action a : actions) {<a name="line.344"></a>
+<span class="sourceLineNo">345</span> builder.addAction(toPermissionAction(a));<a name="line.345"></a>
+<span class="sourceLineNo">346</span> }<a name="line.346"></a>
+<span class="sourceLineNo">347</span> }<a name="line.347"></a>
+<span class="sourceLineNo">348</span> ret.setTablePermission(builder);<a name="line.348"></a>
+<span class="sourceLineNo">349</span> } else {<a name="line.349"></a>
+<span class="sourceLineNo">350</span> // perm instanceof GlobalPermission<a name="line.350"></a>
+<span class="sourceLineNo">351</span> ret.setType(AccessControlProtos.Permission.Type.Global);<a name="line.351"></a>
+<span class="sourceLineNo">352</span> AccessControlProtos.GlobalPermission.Builder builder =<a name="line.352"></a>
+<span class="sourceLineNo">353</span> AccessControlProtos.GlobalPermission.newBuilder();<a name="line.353"></a>
+<span class="sourceLineNo">354</span> Permission.Action[] actions = perm.getActions();<a name="line.354"></a>
+<span class="sourceLineNo">355</span> if (actions != null) {<a name="line.355"></a>
+<span class="sourceLineNo">356</span> for (Permission.Action a: actions) {<a name="line.356"></a>
+<span class="sourceLineNo">357</span> builder.addAction(toPermissionAction(a));<a name="line.357"></a>
+<span class="sourceLineNo">358</span> }<a name="line.358"></a>
+<span class="sourceLineNo">359</span> }<a name="line.359"></a>
+<span class="sourceLineNo">360</span> ret.setGlobalPermission(builder);<a name="line.360"></a>
+<span class="sourceLineNo">361</span> }<a name="line.361"></a>
+<span class="sourceLineNo">362</span> return ret.build();<a name="line.362"></a>
+<span class="sourceLineNo">363</span> }<a name="line.363"></a>
+<span class="sourceLineNo">364</span><a name="line.364"></a>
+<span class="sourceLineNo">365</span> /**<a name="line.365"></a>
+<span class="sourceLineNo">366</span> * Converts a list of Permission.Action proto to a list of client Permission.Action objects.<a name="line.366"></a>
+<span class="sourceLineNo">367</span> *<a name="line.367"></a>
+<span class="sourceLineNo">368</span> * @param protoActions the list of protobuf Actions<a name="line.368"></a>
+<span class="sourceLineNo">369</span> * @return the converted list of Actions<a name="line.369"></a>
+<span class="sourceLineNo">370</span> */<a name="line.370"></a>
+<span class="sourceLineNo">371</span> public static List<Permission.Action> toPermissionActions(<a name="line.371"></a>
+<span class="sourceLineNo">372</span> List<AccessControlProtos.Permission.Action> protoActions) {<a name="line.372"></a>
+<span class="sourceLineNo">373</span> List<Permission.Action> actions = new ArrayList<>(protoActions.size());<a name="line.373"></a>
+<span class="sourceLineNo">374</span> for (AccessControlProtos.Permission.Action a : protoActions) {<a name="line.374"></a>
+<span class="sourceLineNo">375</span> actions.add(toPermissionAction(a));<a name="line.375"></a>
+<span class="sourceLineNo">376</span> }<a name="line.376"></a>
+<span class="sourceLineNo">377</span> return actions;<a name="line.377"></a>
+<span class="sourceLineNo">378</span> }<a name="line.378"></a>
+<span class="sourceLineNo">379</span><a name="line.379"></a>
+<span class="sourceLineNo">380</span> /**<a name="line.380"></a>
+<span class="sourceLineNo">381</span> * Converts a Permission.Action proto to a client Permission.Action object.<a name="line.381"></a>
+<span class="sourceLineNo">382</span> *<a name="line.382"></a>
+<span class="sourceLineNo">383</span> * @param action the protobuf Action<a name="line.383"></a>
+<span class="sourceLineNo">384</span> * @return the converted Action<a name="line.384"></a>
+<span class="sourceLineNo">385</span> */<a name="line.385"></a>
+<span class="sourceLineNo">386</span> public static Permission.Action toPermissionAction(<a name="line.386"></a>
+<span class="sourceLineNo">387</span> AccessControlProtos.Permission.Action action) {<a name="line.387"></a>
+<span class="sourceLineNo">388</span> switch (action) {<a name="line.388"></a>
+<span class="sourceLineNo">389</span> case READ:<a name="line.389"></a>
+<span class="sourceLineNo">390</span> return Permission.Action.READ;<a name="line.390"></a>
+<span class="sourceLineNo">391</span> case WRITE:<a name="line.391"></a>
+<span class="sourceLineNo">392</span> return Permission.Action.WRITE;<a name="line.392"></a>
+<span class="sourceLineNo">393</span> case EXEC:<a name="line.393"></a>
+<span class="sourceLineNo">394</span> return Permission.Action.EXEC;<a name="line.394"></a>
+<span class="sourceLineNo">395</span> case CREATE:<a name="line.395"></a>
+<span class="sourceLineNo">396</span> return Permission.Action.CREATE;<a name="line.396"></a>
+<span class="sourceLineNo">397</span> case ADMIN:<a name="line.397"></a>
+<span class="sourceLineNo">398</span> return Permission.Action.ADMIN;<a name="line.398"></a>
+<span class="sourceLineNo">399</span> }<a name="line.399"></a>
+<span class="sourceLineNo">400</span> throw new IllegalArgumentException("Unknown action value "+action.name());<a name="line.400"></a>
+<span class="sourceLineNo">401</span> }<a name="line.401"></a>
+<span class="sourceLineNo">402</span><a name="line.402"></a>
+<span class="sourceLineNo">403</span> /**<a name="line.403"></a>
+<span class="sourceLineNo">404</span> * Convert a client Permission.Action to a Permission.Action proto<a name="line.404"></a>
+<span class="sourceLineNo">405</span> *<a name="line.405"></a>
+<span class="sourceLineNo">406</span> * @param action the client Action<a name="line.406"></a>
+<span class="sourceLineNo">407</span> * @return the protobuf Action<a name="line.407"></a>
+<span class="sourceLineNo">408</span> */<a name="line.408"></a>
+<span class="sourceLineNo">409</span> public static AccessControlProtos.Permission.Action toPermissionAction(<a name="line.409"></a>
+<span class="sourceLineNo">410</span> Permission.Action action) {<a name="line.410"></a>
+<span class="sourceLineNo">411</span> switch (action) {<a name="line.411"></a>
+<span class="sourceLineNo">412</span> case READ:<a name="line.412"></a>
+<span class="sourceLineNo">413</span> return AccessControlProtos.Permission.Action.READ;<a name="line.413"></a>
+<span class="sourceLineNo">414</span> case WRITE:<a name="line.414"></a>
+<span class="sourceLineNo">415</span> return AccessControlProtos.Permission.Action.WRITE;<a name="line.415"></a>
+<span class="sourceLineNo">416</span> case EXEC:<a name="line.416"></a>
+<span class="sourceLineNo">417</span> return AccessControlProtos.Permission.Action.EXEC;<a name="line.417"></a>
+<span class="sourceLineNo">418</span> case CREATE:<a name="line.418"></a>
+<span class="sourceLineNo">419</span> return AccessControlProtos.Permission.Action.CREATE;<a name="line.419"></a>
+<span class="sourceLineNo">420</span> case ADMIN:<a name="line.420"></a>
+<span class="sourceLineNo">421</span> return AccessControlProtos.Permission.Action.ADMIN;<a name="line.421"></a>
+<span class="sourceLineNo">422</span> }<a name="line.422"></a>
+<span class="sourceLineNo">423</span> throw new IllegalArgumentException("Unknown action value "+action.name());<a name="line.423"></a>
+<span class="sourceLineNo">424</span> }<a name="line.424"></a>
+<span class="sourceLineNo">425</span><a name="line.425"></a>
+<span class="sourceLineNo">426</span> /**<a name="line.426"></a>
+<span class="sourceLineNo">427</span> * Convert a client user permission to a user permission proto<a name="line.427"></a>
+<span class="sourceLineNo">428</span> *<a name="line.428"></a>
+<span class="sourceLineNo">429</span> * @param perm the client UserPermission<a name="line.429"></a>
+<span class="sourceLineNo">430</span> * @return the protobuf UserPermission<a name="line.430"></a>
+<span class="sourceLineNo">431</span> */<a name="line.431"></a>
+<span class="sourceLineNo">432</span> public static AccessControlProtos.UserPermission toUserPermission(UserPermission perm) {<a name="line.432"></a>
+<span class="sourceLineNo">433</span> return AccessControlProtos.UserPermission.newBuilder()<a name="line.433"></a>
+<span class="sourceLineNo">434</span> .setUser(ByteString.copyFromUtf8(perm.getUser()))<a name="line.434"></a>
+<span class="sourceLineNo">435</span> .setPermission(toPermission(perm.getPermission()))<a name="line.435"></a>
+<span class="sourceLineNo">436</span> .build();<a name="line.436"></a>
+<span class="sourceLineNo">437</span> }<a name="line.437"></a>
+<span class="sourceLineNo">438</span><a name="line.438"></a>
+<span class="sourceLineNo">439</span> /**<a name="line.439"></a>
+<span class="sourceLineNo">440</span> * Converts the permissions list into a protocol buffer GetUserPermissionsResponse<a name="line.440"></a>
+<span class="sourceLineNo">441</span> */<a name="line.441"></a>
+<span class="sourceLineNo">442</span> public static GetUserPermissionsResponse buildGetUserPermissionsResponse(<a name="line.442"></a>
+<span class="sourceLineNo">443</span> final List<UserPermission> permissions) {<a name="line.443"></a>
+<span class="sourceLineNo">444</span> GetUserPermissionsResponse.Builder builder = GetUserPermissionsResponse.newBuilder();<a name="line.444"></a>
+<span class="sourceLineNo">445</span> for (UserPermission perm : permissions) {<a name="line.445"></a>
+<span class="sourceLineNo">446</span> builder.addUserPermission(toUserPermission(perm));<a name="line.446"></a>
<span class="sourceLineNo">447</span> }<a name="line.447"></a>
-<span class="sourceLineNo">448</span> throw new IllegalArgumentException("Unknown action value "+action.name());<a name="line.448"></a>
+<span class="sourceLineNo">448</span> return builder.build();<a name="line.448"></a>
<span class="sourceLineNo">449</span> }<a name="line.449"></a>
<span class="sourceLineNo">450</span><a name="line.450"></a>
<span class="sourceLineNo">451</span> /**<a name="line.451"></a>
-<span class="sourceLineNo">452</span> * Convert a client user permission to a user permission proto<a name="line.452"></a>
+<span class="sourceLineNo">452</span> * Converts a user permission proto to a client user permission object.<a name="line.452"></a>
<span class="sourceLineNo">453</span> *<a name="line.453"></a>
-<span class="sourceLineNo">454</span> * @param perm the client UserPermission<a name="line.454"></a>
-<span class="sourceLineNo">455</span> * @return the protobuf UserPermission<a name="line.455"></a>
+<span class="sourceLineNo">454</span> * @param proto the protobuf UserPermission<a name="line.454"></a>
+<span class="sourceLineNo">455</span> * @return the converted UserPermission<a name="line.455"></a>
<span class="sourceLineNo">456</span> */<a name="line.456"></a>
-<span class="sourceLineNo">457</span> public static AccessControlProtos.UserPermission toUserPermission(UserPermission perm) {<a name="line.457"></a>
-<span class="sourceLineNo">458</span> return AccessControlProtos.UserPermission.newBuilder()<a name="line.458"></a>
-<span class="sourceLineNo">459</span> .setUser(ByteStringer.wrap(perm.getUser()))<a name="line.459"></a>
-<span class="sourceLineNo">460</span> .setPermission(toPermission(perm))<a name="line.460"></a>
-<span class="sourceLineNo">461</span> .build();<a name="line.461"></a>
-<span class="sourceLineNo">462</span> }<a name="line.462"></a>
-<span class="sourceLineNo">463</span><a name="line.463"></a>
-<span class="sourceLineNo">464</span> /**<a name="line.464"></a>
-<span class="sourceLineNo">465</span> * Converts the permissions list into a protocol buffer GetUserPermissionsResponse<a name="line.465"></a>
-<span class="sourceLineNo">466</span> */<a name="line.466"></a>
-<span class="sourceLineNo">467</span> public static GetUserPermissionsResponse buildGetUserPermissionsResponse(<a name="line.467"></a>
-<span class="sourceLineNo">468</span> final List<UserPermission> permissions) {<a name="line.468"></a>
-<span class="sourceLineNo">469</span> GetUserPermissionsResponse.Builder builder = GetUserPermissionsResponse.newBuilder();<a name="line.469"></a>
-<span class="sourceLineNo">470</span> for (UserPermission perm : permissions) {<a name="line.470"></a>
-<span class="sourceLineNo">471</span> builder.addUserPermission(toUserPermission(perm));<a name="line.471"></a>
-<span class="sourceLineNo">472</span> }<a name="line.472"></a>
-<span class="sourceLineNo">473</span> return builder.build();<a name="line.473"></a>
-<span class="sourceLineNo">474</span> }<a name="line.474"></a>
-<span class="sourceLineNo">475</span><a name="line.475"></a>
-<span class="sourceLineNo">476</span> /**<a name="line.476"></a>
-<span class="sourceLineNo">477</span> * Converts a user permission proto to a client user permission object.<a name="line.477"></a>
-<span class="sourceLineNo">478</span> *<a name="line.478"></a>
-<span class="sourceLineNo">479</span> * @param proto the protobuf UserPermission<a name="line.479"></a>
-<span class="sourceLineNo">480</span> * @return the converted UserPermission<a name="line.480"></a>
-<span class="sourceLineNo">481</span> */<a name="line.481"></a>
-<span class="sourceLineNo">482</span> public static UserPermission toUserPermission(AccessControlProtos.UserPermission proto) {<a name="line.482"></a>
-<span class="sourceLineNo">483</span> return new UserPermission(proto.getUser().toByteArray(),<a name="line.483"></a>
-<span class="sourceLineNo">484</span> toTablePermission(proto.getPermission()));<a name="line.484"></a>
-<span class="sourceLineNo">485</span> }<a name="line.485"></a>
-<span class="sourceLineNo">486</span><a name="line.486"></a>
-<span class="sourceLineNo">487</span> /**<a name="line.487"></a>
-<span class="sourceLineNo">488</span> * Convert a ListMultimap&lt;String, TablePermission&gt; where key is username<a name="line.488"></a>
-<span class="sourceLineNo">489</span> * to a protobuf UserPermission<a name="line.489"></a>
-<span class="sourceLineNo">490</span> *<a name="line.490"></a>
-<span class="sourceLineNo">491</span> * @param perm the list of user and table permissions<a name="line.491"></a>
-<span class="sourceLineNo">492</span> * @return the protobuf UserTablePermissions<a name="line.492"></a>
+<span class="sourceLineNo">457</span> public static UserPermission toUserPermission(AccessControlProtos.UserPermission proto) {<a name="line.457"></a>
+<span class="sourceLineNo">458</span> return new UserPermission(proto.getUser().toStringUtf8(), toPermission(proto.getPermission()));<a name="line.458"></a>
+<span class="sourceLineNo">459</span> }<a name="line.459"></a>
+<span class="sourceLineNo">460</span><a name="line.460"></a>
+<span class="sourceLineNo">461</span> /**<a name="line.461"></a>
+<span class="sourceLineNo">462</span> * Convert a ListMultimap&lt;String, TablePermission&gt; where key is username<a name="line.462"></a>
+<span class="sourceLineNo">463</span> * to a protobuf UserPermission<a name="line.463"></a>
+<span class="sourceLineNo">464</span> *<a name="line.464"></a>
+<span class="sourceLineNo">465</span> * @param perm the list of user and table permissions<a name="line.465"></a>
+<span class="sourceLineNo">466</span> * @return the protobuf UserTablePermissions<a name="line.466"></a>
+<span class="sourceLineNo">467</span> */<a name="line.467"></a>
+<span class="sourceLineNo">468</span> public static AccessControlProtos.UsersAndPermissions toUserTablePermissions(<a name="line.468"></a>
+<span class="sourceLineNo">469</span> ListMultimap<String, UserPermission> perm) {<a name="line.469"></a>
+<span class="sourceLineNo">470</span> AccessControlProtos.UsersAndPermissions.Builder builder =<a name="line.470"></a>
+<span class="sourceLineNo">471</span> AccessControlProtos.UsersAndPermissions.newBuilder();<a name="line.471"></a>
+<span class="sourceLineNo">472</span> for (Map.Entry<String, Collection<UserPermission>> entry : perm.asMap().entrySet()) {<a name="line.472"></a>
+<span class="sourceLineNo">473</span> AccessControlProtos.UsersAndPermissions.UserPermissions.Builder userPermBuilder =<a name="line.473"></a>
+<span class="sourceLineNo">474</span> AccessControlProtos.UsersAndPermissions.UserPermissions.newBuilder();<a name="line.474"></a>
+<span class="sourceLineNo">475</span> userPermBuilder.setUser(ByteString.copyFromUtf8(entry.getKey()));<a name="line.475"></a>
+<span class="sourceLineNo">476</span> for (UserPermission userPerm: entry.getValue()) {<a name="line.476"></a>
+<span class="sourceLineNo">477</span> userPermBuilder.addPermissions(toPermission(userPerm.getPermission()));<a name="line.477"></a>
+<span class="sourceLineNo">478</span> }<a name="line.478"></a>
+<span class="sourceLineNo">479</span> builder.addUserPermissions(userPermBuilder.build());<a name="line.479"></a>
+<span class="sourceLineNo">480</span> }<a name="line.480"></a>
+<span class="sourceLineNo">481</span> return builder.build();<a name="line.481"></a>
+<span class="sourceLineNo">482</span> }<a name="line.482"></a>
+<span class="sourceLineNo">483</span><a name="line.483"></a>
+<span class="sourceLineNo">484</span> /**<a name="line.484"></a>
+<span class="sourceLineNo">485</span> * A utility used to grant a user global permissions.<a name="line.485"></a>
+<span class="sourceLineNo">486</span> * <p><a name="line.486"></a>
+<span class="sourceLineNo">487</span> * It's also called by the shell, in case you want to find references.<a name="line.487"></a>
+<span class="sourceLineNo">488</span> *<a name="line.488"></a>
+<span class="sourceLineNo">489</span> * @param protocol the AccessControlService protocol proxy<a name="line.489"></a>
+<span class="sourceLineNo">490</span> * @param userShortName the short name of the user to grant permissions<a name="line.490"></a>
+<span class="sourceLineNo">491</span> * @param actions the permissions to be granted<a name="line.491"></a>
+<span class="sourceLineNo">492</span> * @throws ServiceException<a name="line.492"></a>
<span class="sourceLineNo">493</span> */<a name="line.493"></a>
-<span class="sourceLineNo">494</span> public static AccessControlProtos.UsersAndPermissions toUserTablePermissions(<a name="line.494"></a>
-<span class="sourceLineNo">495</span> ListMultimap<String, TablePermission> perm) {<a name="line.495"></a>
-<span class="sourceLineNo">496</span> AccessControlProtos.UsersAndPermissions.Builder builder =<a name="line.496"></a>
-<span class="sourceLineNo">497</span> AccessControlProtos.UsersAndPermissions.newBuilder();<a name="line.497"></a>
-<span class="sourceLineNo">498</span> for (Map.Entry<String, Collection<TablePermission>> entry : perm.asMap().entrySet()) {<a name="line.498"></a>
-<span class="sourceLineNo">499</span> AccessControlProtos.UsersAndPermissions.UserPermissions.Builder userPermBuilder =<a name="line.499"></a>
-<span class="sourceLineNo">500</span> AccessControlProtos.UsersAndPermissions.UserPermissions.newBuilder();<a name="line.500"></a>
-<span class="sourceLineNo">501</span> userPermBuilder.setUser(ByteString.copyFromUtf8(entry.getKey()));<a name="line.501"></a>
-<span class="sourceLineNo">502</span> for (TablePermission tablePerm: entry.getValue()) {<a name="line.502"></a>
-<span class="sourceLineNo">503</span> userPermBuilder.addPermissions(toPermission(tablePerm));<a name="line.503"></a>
-<span class="sourceLineNo">504</span> }<a name="line.504"></a>
-<span class="sourceLineNo">505</span> builder.addUserPermissions(userPermBuilder.build());<a name="line.505"></a>
-<span class="sourceLineNo">506</span> }<a name="line.506"></a>
-<span class="sourceLineNo">507</span> return builder.build();<a name="line.507"></a>
-<span class="sourceLineNo">508</span> }<a name="line.508"></a>
-<span class="sourceLineNo">509</span><a name="line.509"></a>
-<span class="sourceLineNo">510</span> /**<a name="line.510"></a>
-<span class="sourceLineNo">511</span> * A utility used to grant a user global permissions.<a name="line.511"></a>
-<span class="sourceLineNo">512</span> * <p><a name="line.512"></a>
-<span class="sourceLineNo">513</span> * It's also called by the shell, in case you want to find references.<a name="line.513"></a>
-<span class="sourceLineNo">514</span> *<a name="line.514"></a>
-<span class="sourceLineNo">515</span> * @param protocol the AccessControlService protocol proxy<a name="line.515"></a>
-<span class="sourceLineNo">516</span> * @param userShortName the short name of the user to grant permissions<a name="line.516"></a>
-<span class="sourceLineNo">517</span> * @param actions the permissions to be granted<a name="line.517"></a>
-<span class="sourceLineNo">518</span> * @throws ServiceException<a name="line.518"></a>
-<span class="sourceLineNo">519</span> */<a name="line.519"></a>
-<span class="sourceLineNo">520</span> public static void grant(RpcController controller,<a name="line.520"></a>
-<span class="sourceLineNo">521</span> AccessControlService.BlockingInterface protocol, String userShortName, boolean mergeExistingPermissions,<a name="line.521"></a>
-<span class="sourceLineNo">522</span> Permission.Action... actions) throws ServiceException {<a name="line.522"></a>
-<span class="sourceLineNo">523</span> List<AccessControlProtos.Permission.Action> permActions =<a name="line.523"></a>
-<span class="sourceLineNo">524</span> Lists.newArrayListWithCapacity(actions.length);<a name="line.524"></a>
-<span class="sourceLineNo">525</span> for (Permission.Action a : actions) {<a name="line.525"></a>
-<span class="sourceLineNo">526</span> permActions.add(toPermissionAction(a));<a name="line.526"></a>
-<span class="sourceLineNo">527</span> }<a name="line.527"></a>
-<span class="sourceLineNo">528</span> AccessControlProtos.GrantRequest request = buildGrantRequest(userShortName, mergeExistingPermissions,<a name="line.528"></a>
-<span class="sourceLineNo">529</span> permActions.toArray(new AccessControlProtos.Permission.Action[actions.length]));<a name="line.529"></a>
-<span class="sourceLineNo">530</span> protocol.grant(controller, request);<a name="line.530"></a>
-<span class="sourceLineNo">531</span> }<a name="line.531"></a>
-<span class="sourceLineNo">532</span><a name="line.532"></a>
-<span class="sourceLineNo">533</span> /**<a name="line.533"></a>
-<span class="sourceLineNo">534</span> * A utility used to grant a user table permissions. The permissions will<a name="line.534"></a>
-<span class="sourceLineNo">535</span> * be for a table table/column family/qualifier.<a name="line.535"></a>
-<span class="sourceLineNo">536</span> * <p><a name="line.536"></a>
-<span class="sourceLineNo">537</span> * It's also called by the shell, in case you want to find references.<a name="line.537"></a>
-<span class="sourceLineNo">538</span> *<a name="line.538"></a>
-<span class="sourceLineNo">539</span> * @param protocol the AccessControlService protocol proxy<a name="line.539"></a>
-<span class="sourceLineNo">540</span> * @param userShortName the short name of the user to grant permissions<a name="line.540"></a>
-<span class="sourceLineNo">541</span> * @param tableName optional table name<a name="line.541"></a>
-<span class="sourceLineNo">542</span> * @param f optional column family<a name="line.542"></a>
-<span class="sourceLineNo">543</span> * @param q optional qualifier<a name="line.543"></a>
+<span class="sourceLineNo">494</span> public static void grant(RpcController controller,<a name="line.494"></a>
+<span class="sourceLineNo">495</span> AccessControlService.BlockingInterface protocol, String userShortName, boolean mergeExistingPermissions,<a name="line.495"></a>
+<span class="sourceLineNo">496</span> Permission.Action... actions) throws ServiceException {<a name="line.496"></a>
+<span class="sourceLineNo">497</span> List<AccessControlProtos.Permission.Action> permActions =<a name="line.497"></a>
+<span class="sourceLineNo">498</span> Lists.newArrayListWithCapacity(actions.length);<a name="line.498"></a>
+<span class="sourceLineNo">499</span> for (Permission.Action a : actions) {<a name="line.499"></a>
+<span class="sourceLineNo">500</span> permActions.add(toPermissionAction(a));<a name="line.500"></a>
+<span class="sourceLineNo">501</span> }<a name="line.501"></a>
+<span class="sourceLineNo">502</span> AccessControlProtos.GrantRequest request = buildGrantRequest(userShortName, mergeExistingPermissions,<a name="line.502"></a>
+<span class="sourceLineNo">503</span> permActions.toArray(new AccessControlProtos.Permission.Action[actions.length]));<a name="line.503"></a>
+<span class="sourceLineNo">504</span> protocol.grant(controller, request);<a name="line.504"></a>
+<span class="sourceLineNo">505</span> }<a name="line.505"></a>
+<span class="sourceLineNo">506</span><a name="line.506"></a>
+<span class="sourceLineNo">507</span> /**<a name="line.507"></a>
+<span class="sourceLineNo">508</span> * A utility used to grant a user table permissions. The permissions will<a name="line.508"></a>
+<span class="sourceLineNo">509</span> * be for a table table/column family/qualifier.<a name="line.509"></a>
+<span class="sourceLineNo">510</span> * <p><a name="line.510"></a>
+<span class="sourceLineNo">511</span> * It's also called by the shell, in case you want to find references.<a name="line.511"></a>
+<span class="sourceLineNo">512</span> *<a name="line.512"></a>
+<span class="sourceLineNo">513</span> * @param protocol the AccessControlService protocol proxy<a name="line.513"></a>
+<span class="sourceLineNo">514</span> * @param userShortName the short name of the user to grant permissions<a name="line.514"></a>
+<span class="sourceLineNo">515</span> * @param tableName optional table name<a name="line.515"></a>
+<span class="sourceLineNo">516</span> * @param f optional column family<a name="line.516"></a>
+<span class="sourceLineNo">517</span> * @param q optional qualifier<a name="line.517"></a>
+<span class="sourceLineNo">518</span> * @param actions the permissions to be granted<a name="line.518"></a>
+<span class="sourceLineNo">519</span> * @throws ServiceException<a name="line.519"></a>
+<span class="sourceLineNo">520</span> */<a name="line.520"></a>
+<span class="sourceLineNo">521</span> public static void grant(RpcController controller,<a name="line.521"></a>
+<span class="sourceLineNo">522</span> AccessControlService.BlockingInterface protocol, String userShortName, TableName tableName,<a name="line.522"></a>
+<span class="sourceLineNo">523</span> byte[] f, byte[] q, boolean mergeExistingPermissions, Permission.Action... actions)<a name="line.523"></a>
+<span class="sourceLineNo">524</span> throws ServiceException {<a name="line.524"></a>
+<span class="sourceLineNo">525</span> List<AccessControlProtos.Permission.Action> permActions =<a name="line.525"></a>
+<span class="sourceLineNo">526</span> Lists.newArrayListWithCapacity(actions.length);<a name="line.526"></a>
+<span class="sourceLineNo">527</span> for (Permission.Action a : actions) {<a name="line.527"></a>
+<span class="sourceLineNo">528</span> permActions.add(toPermissionAction(a));<a name="line.528"></a>
+<span class="sourceLineNo">529</span> }<a name="line.529"></a>
+<span class="sourceLineNo">530</span> AccessControlProtos.GrantRequest request =<a name="line.530"></a>
+<span class="sourceLineNo">531</span> buildGrantRequest(userShortName, tableName, f, q, mergeExistingPermissions,<a name="line.531"></a>
+<span class="sourceLineNo">532</span> permActions.toArray(new AccessControlProtos.Permission.Action[actions.length]));<a name="line.532"></a>
+<span class="sourceLineNo">533</span> protocol.grant(controller, request);<a name="line.533"></a>
+<span class="sourceLineNo">534</span> }<a name="line.534"></a>
+<span class="sourceLineNo">535</span><a name="line.535"></a>
+<span class="sourceLineNo">536</span> /**<a name="line.536"></a>
+<span class="sourceLineNo">537</span> * A utility used to grant a user namespace permissions.<a name="line.537"></a>
+<span class="sourceLineNo">538</span> * <p><a name="line.538"></a>
+<span class="sourceLineNo">539</span> * It's also called by the shell, in case you want to find references.<a name="line.539"></a>
+<span class="sourceLineNo">540</span> *<a name="line.540"></a>
+<span class="sourceLineNo">541</span> * @param controller RpcController<a name="line.541"></a>
+<span class="sourceLineNo">542</span> * @param protocol the AccessControlService protocol proxy<a name="line.542"></a>
+<span class="sourceLineNo">543</span> * @param namespace the short name of the user to grant permissions<a name="line.543"></a>
<span class="sourceLineNo">544</span> * @param actions the permissions to be granted<a name="line.544"></a>
<span class="sourceLineNo">545</span> * @throws ServiceException<a name="line.545"></a>
<span class="sourceLineNo">546</span> */<a name="line.546"></a>
<span class="sourceLineNo">547</span> public static void grant(RpcController controller,<a name="line.547"></a>
-<span class="sourceLineNo">548</span> AccessControlService.BlockingInterface protocol, String userShortName, TableName tableName,<a name="line.548"></a>
-<span class="sourceLineNo">549</span> byte[] f, byte[] q, boolean mergeExistingPermissions, Permission.Action... actions)<a name="line.549"></a>
-<span class="sourceLineNo">550</span> throws ServiceException {<a name="line.550"></a>
-<span class="sourceLineNo">551</span> List<AccessControlProtos.Permission.Action> permActions =<a name="line.551"></a>
-<span class="sourceLineNo">552</span> Lists.newArrayListWithCapacity(actions.length);<a name="line.552"></a>
-<span class="sourceLineNo">553</span> for (Permission.Action a : actions) {<a name="line.553"></a>
-<span class="sourceLineNo">554</span> permActions.add(toPermissionAction(a));<a name="line.554"></a>
-<span class="sourceLineNo">555</span> }<a name="line.555"></a>
-<span class="sourceLineNo">556</span> AccessControlProtos.GrantRequest request =<a name="line.556"></a>
-<span class="sourceLineNo">557</span> buildGrantRequest(userShortName, tableName, f, q, mergeExistingPermissions,<a name="line.557"></a>
-<span class="sourceLineNo">558</span> permActions.toArray(new AccessControlProtos.Permission.Action[actions.length]));<a name="line.558"></a>
-<span class="sourceLineNo">559</span> protocol.grant(controller, request);<a name="line.559"></a>
-<span class="sourceLineNo">560</span> }<a name="line.560"></a>
-<span class="sourceLineNo">561</span><a name="line.561"></a>
-<span class="sourceLineNo">562</span> /**<a name="line.562"></a>
-<span class="sourceLineNo">563</span> * A utility used to grant a user namespace permissions.<a name="line.563"></a>
-<span class="sourceLineNo">564</span> * <p><a name="line.564"></a>
-<span class="sourceLineNo">565</span> * It's also called by the shell, in case you want to find references.<a name="line.565"></a>
-<span class="sourceLineNo">566</span> *<a name="line.566"></a>
-<span class="sourceLineNo">567</span> * @param controller RpcController<a name="line.567"></a>
-<span class="sourceLineNo">568</span> * @param protocol the AccessControlService protocol proxy<a name="line.568"></a>
-<span class="sourceLineNo">569</span> * @param namespace the short name of the user to grant permissions<a name="line.569"></a>
-<span class="sourceLineNo">570</span> * @param actions the permissions to be granted<a name="line.570"></a>
-<span class="sourceLineNo">571</span> * @throws ServiceException<a name="line.571"></a>
-<span class="sourceLineNo">572</span> */<a name="line.572"></a>
-<span class="sourceLineNo">573</span> public static void grant(RpcController controller,<a name="line.573"></a>
-<span class="sourceLineNo">574</span> AccessControlService.BlockingInterface protocol, String userShortName, String namespace,<a name="line.574"></a>
-<span class="sourceLineNo">575</span> boolean mergeExistingPermissions, Permission.Action... actions) throws ServiceException {<a name="line.575"></a>
-<span class="sourceLineNo">576</span> List<AccessControlProtos.Permission.Action> permActions =<a name="line.576"></a>
-<span class="sourceLineNo">577</span> Lists.newArrayListWithCapacity(actions.length);<a name="line.577"></a>
-<span class="sourceLineNo">578</span> for (Permission.Action a : actions) {<a name="line.578"></a>
-<span class="sourceLineNo">579</span> permActions.add(toPermissionAction(a));<a name="line.579"></a>
-<span class="sourceLineNo">580</span> }<a name="line.580"></a>
-<span class="sourceLineNo">581</span> AccessControlProtos.GrantRequest request = buildGrantRequest(userShortName, namespace, mergeExistingPermissions,<a name="line.581"></a>
-<span class="sourceLineNo">582</span> permActions.toArray(new AccessControlProtos.Permission.Action[actions.length]));<a name="line.582"></a>
-<span class="sourceLineNo">583</span> protocol.grant(controller, request);<a name="line.583"></a>
-<span class="sourceLineNo">584</span> }<a name="line.584"></a>
-<span class="sourceLineNo">585</span><a name="line.585"></a>
-<span class="sourceLineNo">586</span> /**<a name="line.586"></a>
-<span class="sourceLineNo">587</span> * A utility used to revoke a user's global permissions.<a name="line.587"></a>
-<span class="sourceLineNo">588</span> * <p><a name="line.588"></a>
-<span class="sourceLineNo">589</span> * It's also called by the shell, in case you want to find references.<a name="line.589"></a>
-<span class="sourceLineNo">590</span> *<a name="line.590"></a>
-<span class="sourceLineNo">591</span> * @param controller RpcController<a name="line.591"></a>
-<span class="sourceLineNo">592</span> * @param protocol the AccessControlService protocol proxy<a name="line.592"></a>
-<span class="sourceLineNo">593</span> * @param userShortName the short name of the user to revoke permissions<a name="line.593"></a>
-<span class="sourceLineNo">594</span> * @param actions the permissions to be revoked<a name="line.594"></a>
-<span class="sourceLineNo">595</span> * @throws ServiceException on failure<a name="line.595"></a>
-<span class="sourceLineNo">596</span> */<a name="line.596"></a>
-<span class="sourceLineNo">597</span> public static void revoke(RpcController controller,<a name="line.597"></a>
-<span class="sourceLineNo">598</span> AccessControlService.BlockingInterface protocol, String userShortName,<a name="line.598"></a>
-<span class="sourceLineNo">599</span> Permission.Action... actions) throws ServiceException {<a name="line.599"></a>
-<span class="sourceLineNo">600</span> List<AccessControlProtos.Permission.Action> permActions =<a name="line.600"></a>
-<span class="sourceLineNo">601</span> Lists.newArrayListWithCapacity(actions.length);<a name="line.601"></a>
-<span class="sourceLineNo">602</span> for (Permission.Action a : actions) {<a name="line.602"></a>
-<span class="sourceLineNo">603</span> permActions.add(toPermissionAction(a));<a name="line.603"></a>
-<span class="sourceLineNo">604</span> }<a name="line.604"></a>
-<span class="sourceLineNo">605</span> AccessControlProtos.RevokeRequest request = buildRevokeRequest(userShortName,<a name="line.605"></a>
-<span class="sourceLineNo">606</span> permActions.toArray(new AccessControlProtos.Permission.Action[actions.length]));<a name="line.606"></a>
-<span class="sourceLineNo">607</span> protocol.revoke(controller, request);<a name="line.607"></a>
-<span class="sourceLineNo">608</span> }<a name="line.608"></a>
-<span class="sourceLineNo">609</span><a name="line.609"></a>
-<span class="sourceLineNo">610</span> /**<a name="line.610"></a>
-<span class="sourceLineNo">611</span> * A utility used to revoke a user's table permissions. The permissions will<a name="line.611"></a>
-<span class="sourceLineNo">612</span> * be for a table/column family/qualifier.<a name="line.612"></a>
-<span class="sourceLineNo">613</span> * <p><a name="line.613"></a>
-<span class="sourceLineNo">614</span> * It's also called by the shell, in case you want to find references.<a name="line.614"></a>
-<span class="sourceLineNo">615</span> *<a name="line.615"></a>
-<span class="sourceLineNo">616</span> * @param controller RpcController<a name="line.616"></a>
-<span class="sourceLineNo">617</span> * @param protocol the AccessControlService protocol proxy<a name="line.617"></a>
-<span class="sourceLineNo">618</span> * @param userShortName the short name of the user to revoke permissions<a name="line.618"></a>
-<span class="sourceLineNo">619</span> * @param tableName optional table name<a name="line.619"></a>
-<span class="sourceLineNo">620</span> * @param f optional column family<a name="line.620"></a>
-<span class="sourceLineNo">621</span> * @param q optional qualifier<a name="line.621"></a>
-<span class="sourceLineNo">622</span> * @param actions the permissions to be revoked<a name="line.622"></a>
-<span class="sourceLineNo">623</span> * @throws ServiceException on failure<a name="line.623"></a>
-<span class="sourceLineNo">624</span> */<a name="line.624"></a>
-<span class="sourceLineNo">625</span> public static void revoke(RpcController controller,<a name="line.625"></a>
-<span class="sourceLineNo">626</span> AccessControlService.BlockingInterface protocol, String userShortName, TableName tableName,<a name="line.626"></a>
-<span class="sourceLineNo">627</span> byte[] f, byte[] q, Permission.Action... actions) throws ServiceException {<a name="line.627"></a>
-<span class="sourceLineNo">628</span> List<AccessControlProtos.Permission.Action> permActions =<a name="line.628"></a>
-<span class="sourceLineNo">629</span> Lists.newArrayListWithCapacity(actions.length);<a name="line.629"></a>
-<span class="sourceLineNo">630</span> for (Permission.Action a : actions) {<a name="line.630"></a>
-<span class="sourceLineNo">631</span> permActions.add(toPermissionAction(a));<a name="line.631"></a>
-<span class="sourceLineNo">632</span> }<a name="line.632"></a>
-<span class="sourceLineNo">633</span> AccessControlProtos.RevokeRequest request = buildRevokeRequest(userShortName, tableName, f, q,<a name="line.633"></a>
-<span class="sourceLineNo">634</span> permActions.toArray(new AccessControlProtos.Permission.Action[actions.length]));<a name="line.634"></a>
-<span class="sourceLineNo">635</span> protocol.revoke(controller, request);<a name="line.635"></a>
-<span class="sourceLineNo">636</span> }<a name="line.636"></a>
-<span class="sourceLineNo">637</span><a name="line.637"></a>
-<span class="sourceLineNo">638</span> /**<a name="line.638"></a>
-<span class="sourceLineNo">639</span> * A utility used to revoke a user's namespace permissions.<a name="line.639"></a>
-<span class="sourceLineNo">640</span> * <p><a name="line.640"></a>
-<span class="sourceLineNo">641</span> * It's also called by the shell, in case you want to find references.<a name="line.641"></a>
-<span class="sourceLineNo">642</span> *<a name="line.642"></a>
-<span class="sourceLineNo">643</span> * @param controller RpcController<a name="line.643"></a>
-<span class="sourceLineNo">644</span> * @param protocol the AccessControlService protocol proxy<a name="line.644"></a>
-<span class="sourceLineNo">645</span> * @param userShortName the short name of the user to revoke permissions<a name="line.645"></a>
-<span class="sourceLineNo">646</span> * @param namespace optional table name<a name="line.646"></a>
-<span class="sourceLineNo">647</span> * @param actions the permissions to be revoked<a name="line.647"></a>
-<span class="sourceLineNo">648</span> * @throws ServiceException on failure<a name="line.648"></a>
-<span class="sourceLineNo">649</span> */<a name="line.649"></a>
-<span class="sourceLineNo">650</span> public static void revoke(RpcController controller,<a name="line.650"></a>
-<span class="sourceLineNo">651</span> AccessControlService.BlockingInterface protocol, String userShortName, String namespace,<a name="line.651"></a>
-<span class="sourceLineNo">652</span> Permission.Action... actions) throws ServiceException {<a name="line.652"></a>
-<span class="sourceLineNo">653</span> List<AccessControlProtos.Permission.Action> permActions =<a name="line.653"></a>
-<span class="sourceLineNo">654</span> Lists.newArrayListWithCapacity(actions.length);<a name="line.654"></a>
-<span class="sourceLineNo">655</span> for (Permission.Action a : actions) {<a name="line.655"></a>
-<span class="sourceLineNo">656</span> permActions.add(toPermissionAction(a));<a name="line.656"></a>
-<span class="sourceLineNo">657</span> }<a name="line.657"></a>
-<span class="sourceLineNo">658</span> AccessControlProtos.RevokeRequest request = buildRevokeRequest(userShortName, namespace,<a name="line.658"></a>
-<span class="sourceLineNo">659</span> permActions.toArray(new AccessControlProtos.Permission.Action[actions.length]));<a name="line.659"></a>
-<span class="sourceLineNo">660</span> protocol.revoke(controller, request);<a name="line.660"></a>
-<span class="sourceLineNo">661</span> }<a name="line.661"></a>
-<span class="sourceLineNo">662</span><a name="line.662"></a>
-<span class="sourceLineNo">663</span> /**<a name="line.663"></a>
-<span class="sourceLineNo">664</span> * A utility used to get user's global permissions.<a name="line.664"></a>
-<span class="sourceLineNo">665</span> * <p><a name="line.665"></a>
-<span class="sourceLineNo">666</span> * It's also called by the shell, in case you want to find references.<a name="line.666"></a>
-<span class="sourceLineNo">667</span> *<a name="line.667"></a>
-<span class="sourceLineNo">668</span> * @param controller RpcController<a name="line.668"></a>
-<span class="sourceLineNo">669</span> * @param protocol the AccessControlService protocol proxy<a name="line.669"></a>
-<span class="sourceLineNo">670</span> * @throws ServiceException on failure<a name="line.670"></a>
-<span class="sourceLineNo">671</span> */<a name="line.671"></a>
-<span class="sourceLineNo">672</span> public static List<UserPermission> getUserPermissions(RpcController controller,<a name="line.672"></a>
-<span class="sourceLineNo">673</span> AccessControlService.BlockingInterface protocol) throws ServiceException {<a name="line.673"></a>
-<span class="sourceLineNo">674</span> return getUserPermissions(controller, protocol, HConstants.EMPTY_STRING);<a name="line.674"></a>
+<span class="sourceLineNo">548</span> AccessControlService.BlockingInterface protocol, String userShortName, String namespace,<a name="line.548"></a>
+<span class="sourceLineNo">549</span> boolean mergeExistingPermissions, Permission.Action... actions) throws ServiceException {<a name="line.549"></a>
+<span class="sourceLineNo">550</span> List<AccessControlProtos.Permission.Action> permActions =<a name="line.550"></a>
+<span class="sourceLineNo">551</span> Lists.newArrayListWithCapacity(actions.length);<a name="line.551"></a>
+<span class="sourceLineNo">552</span> for (Permission.Action a : actions) {<a name="line.552"></a>
+<span class="sourceLineNo">553</span> permActions.add(toPermissionAction(a));<a name="line.553"></a>
+<span class="sourceLineNo">554</span> }<a name="line.554"></a>
+<span class="sourceLineNo">555</span> AccessControlProtos.GrantRequest request = buildGrantRequest(userShortName, namespace, mergeExistingPermissions,<a name="line.555"></a>
+<span class="sourceLineNo">556</span> permActions.toArray(new AccessControlProtos.Permission.Action[actions.length]));<a name="line.556"></a>
+<span class="sourceLineNo">557</span> protocol.grant(controller, request);<a name="line.557"></a>
+<span class="sourceLineNo">558</span> }<a name="line.558"></a>
+<span class="sourceLineNo">559</span><a name="line.559"></a>
+<span class="sourceLineNo">560</span> /**<a name="line.560"></a>
+<span class="sourceLineNo">561</span> * A utility used to revoke a user's global permissions.<a name="line.561"></a>
+<span class="sourceLineNo">562</span> * <p><a name="line.562"></a>
+<span class="sourceLineNo">563</span> * It's also called by the shell, in case you want to find references.<a name="line.563"></a>
+<span class="sourceLineNo">564</span> *<a name="line.564"></a>
+<span class="sourceLineNo">565</span> * @param controller RpcController<a name="line.565"></a>
+<span class="sourceLineNo">566</span> * @param protocol the AccessControlService protocol proxy<a name="line.566"></a>
+<span class="sourceLineNo">567</span> * @param userShortName the short name of the user to revoke permissions<a name="line.567"></a>
+<span class="sourceLineNo">568</span> * @param actions the permissions to be revoked<a name="line.568"></a>
+<span class="sourceLineNo">569</span> * @throws ServiceException on failure<a name="line.569"></a>
+<span class="sourceLineNo">570</span> */<a name="line.570"></a>
+<span class="sourceLineNo">571</span> public static void revoke(RpcController controller,<a name="line.571"></a>
+<span class="sourceLineNo">572</span> AccessControlService.BlockingInterface protocol, String userShortName,<a name="line.572"></a>
+<span class="sourceLineNo">573</span> Permission.Action... actions) throws ServiceException {<a name="line.573"></a>
+<span class="sourceLineNo">574</span> List<AccessControlProtos.Permission.Action> permActions =<a name="line.574"></a>
+<span class="sourceLineNo">575</span> Lists.newArrayListWithCapacity(actions.length);<a name="line.575"></a>
+<span class="sourceLineNo">576</span> for (Permission.Action a : actions) {<a name="line.576"></a>
+<span class="sourceLineNo">577</span> permActions.add(toPermissionAction(a));<a name="line.577"></a>
+<span class="sourceLineNo">578</span> }<a name="line.578"></a>
+<span class="sourceLineNo">579</span> AccessControlProtos.RevokeRequest request = buildRevokeRequest(userShortName,<a name="line.579"></a>
+<span class="sourceLineNo">580</span> permActions.toArray(new AccessControlProtos.Permission.Action[actions.length]));<a name="line.580"></a>
+<span class="sourceLineNo">581</span> protocol.revoke(controller, request);<a name="line.581"></a>
+<span class="sourceLineNo">582</span> }<a name="line.582"></a>
+<span class="sourceLineNo">583</span><a name="line.583"></a>
+<span class="sourceLineNo">584</span> /**<a name="line.584"></a>
+<span class="sourceLineNo">585</span> * A utility used to revoke a user's table permissions. The permissions will<a name="line.585"></a>
+<span class="sourceLineNo">586</span> * be for a table/column family/qualifier.<a name="line.586"></a>
+<span class="sourceLineNo">587</span> * <p><a name="line.587"></a>
+<span class="sourceLineNo">588</span> * It's also called by the shell, in case you want to find references.<a name="line.588"></a>
+<span class="sourceLineNo">589</span> *<a name="line.589"></a>
+<span class="sourceLineNo">590</span> * @param controller RpcController<a name="line.590"></a>
+<span class="sourceLineNo">591</span> * @param protocol the AccessControlService protocol proxy<a name="line.591"></a>
+<span class="sourceLineNo">592</span> * @param userShortName the short name of the user to revoke permissions<a name="line.592"></a>
+<span class="sourceLineNo">593</span> * @param tableName optional table name<a name="line.593"></a>
+<span class="sourceLineNo">594</span> * @param f optional column family<a name="line.594"></a>
+<span class="sourceLineNo">595</span> * @param q optional qualifier<a name="line.595"></a>
+<span class="sourceLineNo">596</span> * @param actions the permissions to be revoked<a name="line.596"></a>
+<span class="sourceLineNo">597</span> * @throws ServiceException on failure<a name="line.597"></a>
+<span class="sourceLineNo">598</span> */<a name="line.598"></a>
+<span class="sourceLineNo">599</span> public static void revoke(RpcController controller,<a name="line.599"></a>
+<span class="sourceLineNo">600</span> AccessControlService.BlockingInterface protocol, String userShortName, TableName tableName,<a name="line.600"></a>
+<span class="sourceLineNo">601</span> byte[] f, byte[] q, Permission.Action... actions) throws ServiceException {<a name="line.601"></a>
+<span class="sourceLineNo">602</span> List<AccessControlProtos.Permission.Action> permActions =<a name="line.602"></a>
+<span class="sourceLineNo">603</span> Lists.newArrayListWithCapacity(actions.length);<a name="line.603"></a>
+<span class="sourceLineNo">604</span> for (Permission.Action a : actions) {<a name="line.604"></a>
+<span class="sourceLineNo">605</span> permActions.add(toPermissionAction(a));<a name="line.605"></a>
+<span class="sourceLineNo">606</span> }<a name="line.606"></a>
+<span class="sourceLineNo">607</span> AccessControlProtos.RevokeRequest request = buildRevokeRequest(userShortName, tableName, f, q,<a name="line.607"></a>
+<span class="sourceLineNo">608</span> permActions.toArray(new AccessControlProtos.Permission.Action[actions.length]));<a name="line.608"></a>
+<span class="sourceLineNo">609</span> protocol.revoke(controller, request);<a name="line.609"></a>
+<span class="sourceLineNo">610</span> }<a name="line.610"></a>
+<span class="sourceLineNo">611</span><a name="line.611"></a>
+<span class="sourceLineNo">612</span> /**<a name="line.612"></a>
+<span class="sourceLineNo">613</span> * A utility used to revoke a user's namespace permissions.<a name="line.613"></a>
+<span class="sourceLineNo">614</span> * <p><a name="line.614"></a>
+<span class="sourceLineNo">615</span> * It's also called by the shell, in case you want to find references.<a name="line.615"></a>
+<span class="sourceLineNo">616</span> *<a name="line.616"></a>
+<span class="sourceLineNo">617</span> * @param controller RpcController<a name="line.617"></a>
+<span class="sourceLineNo">618</span> * @param protocol the AccessControlService protocol proxy<a name="line.618"></a>
+<span class="sourceLineNo">619</span> * @param userShortName the short name of the user to revoke permissions<a name="line.619"></a>
+<span class="sourceLineNo">620</span> * @param namespace optional table name<a name="line.620"></a>
+<span class="sourceLineNo">621</span> * @param actions the permissions to be revoked<a name="line.621"></a>
+<span class="sourceLineNo">622</span> * @throws ServiceException on failure<a name="line.622"></a>
+<span class="sourceLineNo">623</span> */<a name="line.623"></a>
+<span class="sourceLineNo">624</span> public static void revoke(RpcController controller,<a name="line.624"></a>
+<span class="sourceLineNo">625</span> AccessControlService.BlockingInterface protocol, String userShortName, String namespace,<a name="line.625"></a>
+<span class="sourceLineNo">626</span> Permission.Action... actions) throws ServiceException {<a name="line.626"></a>
+<span class="sourceLineNo">627</span> List<AccessControlProtos.Permission.Action> permActions =<a name="line.627"></a>
+<span class="sourceLineNo">628</span> Lists.newArrayListWithCapacity(actions.length);<a name="line.628"></a>
+<span class="sourceLineNo">629</span> for (Permission.Action a : actions) {<a name="line.629"></a>
+<span class="sourceLineNo">630</span> permActions.add(toPermissionAction(a));<a name="line.630"></a>
+<span class="sourceLineNo">631</span> }<a name="line.631"></a>
+<span class="sourceLineNo">632</span> AccessControlProtos.RevokeRequest request = buildRevokeRequest(userShortName, namespace,<a name="line.632"></a>
+<span class="sourceLineNo">633</span> permActions.toArray(new AccessControlProtos.Permission.Action[actions.length]));<a name="line.633"></a>
+<span class="sourceLineNo">634</span> protocol.revoke(controller, request);<a name="line.634"></a>
+<span class="sourceLineNo">635</span> }<a name="line.635"></a>
+<span class="sourceLineNo">636</span><a name="line.636"></a>
+<span class="sourceLineNo">637</span> /**<a name="line.637"></a>
+<span class="sourceLineNo">638</span> * A utility used to get user's global permissions.<a name="line.638"></a>
+<span class="sourceLineNo">639</span> * <p><a name="line.639"></a>
+<span class="sourceLineNo">640</span> * It's also called by the shell, in case you want to find references.<a name="line.640"></a>
+<span class="sourceLineNo">641</span> *<a name="line.641"></a>
+<span class="sourceLineNo">642</span> * @param controller RpcController<a name="line.642"></a>
+<span class="sourceLineNo">643</span> * @param protocol the AccessControlService protocol proxy<a name="line.643"></a>
+<span class="sourceLineNo">644</span> * @throws ServiceException on failure<a name="line.644"></a>
+<span class="sourceLineNo">645</span> */<a name="line.645"></a>
+<span class="sourceLineNo">646</span> public static List<UserPermission> getUserPermissions(RpcController controller,<a name="line.646"></a>
+<span class="sour
<TRUNCATED>