HBASE-22258 Removed deprecated methods in VisibilityClient

Author: HorizonNet

hbase-client/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityClient.java

@@ -26,10 +26,8 @@
 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.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.client.security.SecurityCapability;
@@ -66,23 +64,6 @@ public static boolean isCellVisibilityEnabled(Connection connection) throws IOEx
         .contains(SecurityCapability.CELL_VISIBILITY);
   }
 
-  /**
-   * 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.
    *
@@ -96,23 +77,6 @@ public static VisibilityLabelsResponse addLabel(Connection connection, final Str
     return addLabels(connection, new String[] { label });
   }
 
-  /**
-   * 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.
    *
@@ -156,23 +120,6 @@ public VisibilityLabelsResponse call(VisibilityLabelsService service) throws IOE
     }
   }
 
-  /**
-   * 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
@@ -186,20 +133,6 @@ public static VisibilityLabelsResponse setAuths(Connection connection, final Str
     return setOrClearAuths(connection, auths, user, true);
   }
 
-  /**
-   * @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
@@ -235,22 +168,6 @@ public GetAuthsResponse call(VisibilityLabelsService service) throws IOException
     }
   }
 
-  /**
-   * 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.
@@ -291,23 +208,6 @@ public ListLabelsResponse call(VisibilityLabelsService service) throws IOExcepti
     }
   }
 
-  /**
-   * 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