You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by el...@apache.org on 2018/06/11 20:18:17 UTC

[2/2] hbase git commit: HBASE-20635 Add missing shaded-pb conversion method for UserPermission

HBASE-20635 Add missing shaded-pb conversion method for UserPermission

Signed-off-by: Josh Elser <el...@apache.org>
Signed-off-by: Ted Yu <yu...@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c0d67209
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c0d67209
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c0d67209

Branch: refs/heads/branch-2
Commit: c0d67209dff9afb40fb658fb7dc68f381a9240a0
Parents: a8ea49b
Author: Rajeshbabu Chintaguntla <ra...@apache.org>
Authored: Mon Jun 11 14:58:18 2018 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Mon Jun 11 15:13:17 2018 -0400

----------------------------------------------------------------------
 .../hbase/security/access/ShadedAccessControlUtil.java   | 11 +++++++++++
 1 file changed, 11 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/c0d67209/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/ShadedAccessControlUtil.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/ShadedAccessControlUtil.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/ShadedAccessControlUtil.java
index de26f39..5a94805 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/ShadedAccessControlUtil.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/ShadedAccessControlUtil.java
@@ -274,4 +274,15 @@ public class ShadedAccessControlUtil {
     }
     return builder.build();
   }
+
+  /**
+   * Converts a user permission proto to a client user permission object.
+   *
+   * @param proto the protobuf UserPermission
+   * @return the converted UserPermission
+   */
+  public static UserPermission toUserPermission(org.apache.hadoop.hbase.shaded.protobuf.generated.AccessControlProtos.UserPermission proto) {
+    return new UserPermission(proto.getUser().toByteArray(),
+        toTablePermission(proto.getPermission()));
+  }
 }