Remove references to ClientProtos

Author: charlesconnell

hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/RegionCoprocessorEnvironment.java

@@ -18,7 +18,6 @@
 package org.apache.hadoop.hbase.coprocessor;
 
 import java.io.IOException;
-import java.util.List;
 import java.util.concurrent.ConcurrentMap;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.CoprocessorEnvironment;
@@ -37,8 +36,6 @@
 import org.apache.yetus.audience.InterfaceAudience;
 import org.apache.yetus.audience.InterfaceStability;
 
-import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos;
-
 @InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.COPROC)
 @InterfaceStability.Evolving
 public interface RegionCoprocessorEnvironment extends CoprocessorEnvironment<RegionCoprocessor> {
@@ -167,12 +164,12 @@ OperationQuota checkBatchQuota(final Region region, final OperationQuota.Operati
    * available quota and to report the data/usage of the operation. This method does not support
    * scans because estimating a scan's workload is more complicated than estimating the workload of
    * a get/put.
-   * @param region       the region where the operation will be performed
-   * @param actions      the "multi" actions to perform
-   * @param hasCondition whether the RegionAction has a condition
+   * @param region    the region where the operation will be performed
+   * @param numWrites number of writes to count against quota
+   * @param numReads  number of reads to count against quota
    * @return the OperationQuota
    * @throws RpcThrottlingException if the operation cannot be executed due to quota exceeded.
    */
-  OperationQuota checkBatchQuota(final Region region, final List<ClientProtos.Action> actions,
-    boolean hasCondition) throws IOException, RpcThrottlingException;
+  OperationQuota checkBatchQuota(final Region region, int numWrites, int numReads)
+    throws IOException, RpcThrottlingException;
 }

hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/RegionServerRpcQuotaManager.java

@@ -225,7 +225,8 @@ public OperationQuota checkBatchQuota(final Region region,
    * @return the OperationQuota
    * @throws RpcThrottlingException if the operation cannot be executed due to quota exceeded.
    */
-  private OperationQuota checkBatchQuota(final Region region, final int numWrites,
+  @Override
+  public OperationQuota checkBatchQuota(final Region region, final int numWrites,
     final int numReads) throws IOException, RpcThrottlingException {
     Optional<User> user = RpcServer.getRequestUser();
     UserGroupInformation ugi;

hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/RpcQuotaManager.java

@@ -75,4 +75,18 @@ OperationQuota checkBatchQuota(final Region region, final OperationQuota.Operati
    */
   OperationQuota checkBatchQuota(final Region region, final List<ClientProtos.Action> actions,
     boolean hasCondition) throws IOException, RpcThrottlingException;
+
+  /**
+   * Check the quota for the current (rpc-context) user. Returns the OperationQuota used to get the
+   * available quota and to report the data/usage of the operation. This method does not support
+   * scans because estimating a scan's workload is more complicated than estimating the workload of
+   * a get/put.
+   * @param region    the region where the operation will be performed
+   * @param numWrites number of writes to count against quota
+   * @param numReads  number of reads to count against quota
+   * @return the OperationQuota
+   * @throws RpcThrottlingException if the operation cannot be executed due to quota exceeded.
+   */
+  OperationQuota checkBatchQuota(final Region region, int numWrites, int numReads)
+    throws IOException, RpcThrottlingException;
 }

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java

@@ -225,9 +225,9 @@ public OperationQuota checkBatchQuota(Region region, OperationQuota.OperationTyp
     }
 
     @Override
-    public OperationQuota checkBatchQuota(Region region, List<ClientProtos.Action> actions,
-      boolean hasCondition) throws IOException, RpcThrottlingException {
-      return rpcQuotaManager.checkBatchQuota(region, actions, hasCondition);
+    public OperationQuota checkBatchQuota(final Region region, int numWrites, int numReads)
+      throws IOException, RpcThrottlingException {
+      return rpcQuotaManager.checkBatchQuota(region, numWrites, numReads);
     }
   }