hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmhs...@apache.org
Subject [06/50] [abbrv] hbase git commit: HBASE-13620 Bring back the removed VisibilityClient methods and mark them as deprecated.
Date Wed, 20 May 2015 15:25:19 GMT
HBASE-13620 Bring back the removed VisibilityClient methods and mark them as deprecated.


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

Branch: refs/heads/hbase-11339
Commit: 70b5c9790325ee5129ddd75b5ee3ac72cf6dd244
Parents: a7e7782
Author: Srikanth Srungarapu <ssrungarapu@cloudera.com>
Authored: Fri May 8 20:27:36 2015 -0700
Committer: Srikanth Srungarapu <ssrungarapu@cloudera.com>
Committed: Fri May 8 20:27:36 2015 -0700

----------------------------------------------------------------------
 .../security/visibility/VisibilityClient.java   | 100 +++++++++++++++++++
 1 file changed, 100 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/70b5c979/hbase-client/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityClient.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityClient.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityClient.java
index b6ae86d..8de783c 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityClient.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityClient.java
@@ -23,10 +23,12 @@ import java.io.IOException;
 import java.util.Map;
 import java.util.regex.Pattern;
 
+import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.classification.InterfaceAudience;
 import org.apache.hadoop.hbase.classification.InterfaceStability;
 import org.apache.hadoop.hbase.client.Connection;
+import org.apache.hadoop.hbase.client.ConnectionFactory;
 import org.apache.hadoop.hbase.client.Table;
 import org.apache.hadoop.hbase.client.coprocessor.Batch;
 import org.apache.hadoop.hbase.ipc.BlockingRpcCallback;
@@ -55,6 +57,23 @@ public class VisibilityClient {
   /**
    * Utility method for adding label to the system.
    *
+   * @param conf
+   * @param label
+   * @return VisibilityLabelsResponse
+   * @throws Throwable
+   * @deprecated Use {@link #addLabel(Connection,String)} instead.
+   */
+  @Deprecated
+  public static VisibilityLabelsResponse addLabel(Configuration conf, final String label)
+      throws Throwable {
+    try (Connection connection = ConnectionFactory.createConnection(conf)) {
+      return addLabels(connection, new String[] { label });
+    }
+  }
+
+  /**
+   * Utility method for adding label to the system.
+   *
    * @param connection
    * @param label
    * @return VisibilityLabelsResponse
@@ -68,6 +87,23 @@ public class VisibilityClient {
   /**
    * Utility method for adding labels to the system.
    *
+   * @param conf
+   * @param labels
+   * @return VisibilityLabelsResponse
+   * @throws Throwable
+   * @deprecated Use {@link #addLabels(Connection,String[])} instead.
+   */
+  @Deprecated
+  public static VisibilityLabelsResponse addLabels(Configuration conf, final String[] labels)
+      throws Throwable {
+    try (Connection connection = ConnectionFactory.createConnection(conf)) {
+      return addLabels(connection, labels);
+    }
+  }
+
+  /**
+   * Utility method for adding labels to the system.
+   *
    * @param connection
    * @param labels
    * @return VisibilityLabelsResponse
@@ -111,6 +147,23 @@ public class VisibilityClient {
 
   /**
    * Sets given labels globally authorized for the user.
+   * @param conf
+   * @param auths
+   * @param user
+   * @return VisibilityLabelsResponse
+   * @throws Throwable
+   * @deprecated Use {@link #setAuths(Connection,String[],String)} instead.
+   */
+  @Deprecated
+  public static VisibilityLabelsResponse setAuths(Configuration conf, final String[] auths,
+      final String user) throws Throwable {
+    try (Connection connection = ConnectionFactory.createConnection(conf)) {
+      return setOrClearAuths(connection, auths, user, true);
+    }
+  }
+
+  /**
+   * Sets given labels globally authorized for the user.
    * @param connection
    * @param auths
    * @param user
@@ -123,6 +176,20 @@ public class VisibilityClient {
   }
 
   /**
+   * @param conf
+   * @param user
+   * @return labels, the given user is globally authorized for.
+   * @throws Throwable
+   * @deprecated Use {@link #getAuths(Connection,String)} instead.
+   */
+  @Deprecated
+  public static GetAuthsResponse getAuths(Configuration conf, final String user) throws Throwable
{
+    try (Connection connection = ConnectionFactory.createConnection(conf)) {
+      return getAuths(connection, user);
+    }
+  }
+
+  /**
    * @param connection the Connection instance to use.
    * @param user
    * @return labels, the given user is globally authorized for.
@@ -158,6 +225,22 @@ public class VisibilityClient {
 
   /**
    * Retrieve the list of visibility labels defined in the system.
+   * @param conf
+   * @param regex  The regular expression to filter which labels are returned.
+   * @return labels The list of visibility labels defined in the system.
+   * @throws Throwable
+   * @deprecated Use {@link #listLabels(Connection,String)} instead.
+   */
+  @Deprecated
+  public static ListLabelsResponse listLabels(Configuration conf, final String regex)
+      throws Throwable {
+    try(Connection connection = ConnectionFactory.createConnection(conf)){
+      return listLabels(connection, regex);
+    }
+  }
+
+  /**
+   * Retrieve the list of visibility labels defined in the system.
    * @param connection The Connection instance to use.
    * @param regex  The regular expression to filter which labels are returned.
    * @return labels The list of visibility labels defined in the system.
@@ -207,6 +290,23 @@ public class VisibilityClient {
 
   /**
    * Removes given labels from user's globally authorized list of labels.
+   * @param conf
+   * @param auths
+   * @param user
+   * @return VisibilityLabelsResponse
+   * @throws Throwable
+   * @deprecated Use {@link #clearAuths(Connection,String[],String)} instead.
+   */
+  @Deprecated
+  public static VisibilityLabelsResponse clearAuths(Configuration conf, final String[] auths,
+      final String user) throws Throwable {
+    try (Connection connection = ConnectionFactory.createConnection(conf)) {
+      return setOrClearAuths(connection, auths, user, false);
+    }
+  }
+
+  /**
+   * Removes given labels from user's globally authorized list of labels.
    * @param connection
    * @param auths
    * @param user


Mime
View raw message