HBASE-24640 [branch-2] Purge use of VisibleForTesting (#2696)

Signed-off-by: Nick Dimiduk <ndimiduk@apache.org>

hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java

@@ -72,13 +72,11 @@
 import org.apache.hadoop.hbase.util.ExceptionUtil;
 import org.apache.hadoop.hbase.util.Pair;
 import org.apache.hadoop.hbase.util.PairOfSameType;
+import org.apache.hbase.thirdparty.com.google.common.base.Throwables;
 import org.apache.yetus.audience.InterfaceAudience;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;
-import org.apache.hbase.thirdparty.com.google.common.base.Throwables;
-
 /**
  * <p>
  * Read/write operations on <code>hbase:meta</code> region as well as assignment information stored
@@ -148,7 +146,6 @@ public class MetaTableAccessor {
   private static final Logger LOG = LoggerFactory.getLogger(MetaTableAccessor.class);
   private static final Logger METALOG = LoggerFactory.getLogger("org.apache.hadoop.hbase.META");
 
-  @VisibleForTesting
   public static final byte[] REPLICATION_PARENT_QUALIFIER = Bytes.toBytes("parent");
 
   private static final byte ESCAPE_BYTE = (byte) 0xFF;
@@ -451,7 +448,6 @@ private static boolean isMergeQualifierPrefix(Cell cell) {
    *                                    true and we'll leave out offlined regions from returned list
    * @return List of all user-space regions.
    */
-  @VisibleForTesting
   public static List<RegionInfo> getAllRegions(Connection connection,
       boolean excludeOfflinedSplitParents)
       throws IOException {
@@ -908,7 +904,6 @@ public static byte[] getServerNameColumn(int replicaId) {
    * @param replicaId the replicaId of the region
    * @return a byte[] for server column qualifier
    */
-  @VisibleForTesting
   public static byte[] getServerColumn(int replicaId) {
     return replicaId == 0
       ? HConstants.SERVER_QUALIFIER
@@ -921,7 +916,6 @@ public static byte[] getServerColumn(int replicaId) {
    * @param replicaId the replicaId of the region
    * @return a byte[] for server start code column qualifier
    */
-  @VisibleForTesting
   public static byte[] getStartCodeColumn(int replicaId) {
     return replicaId == 0
       ? HConstants.STARTCODE_QUALIFIER
@@ -934,7 +928,6 @@ public static byte[] getStartCodeColumn(int replicaId) {
    * @param replicaId the replicaId of the region
    * @return a byte[] for seqNum column qualifier
    */
-  @VisibleForTesting
   public static byte[] getSeqNumColumn(int replicaId) {
     return replicaId == 0
       ? HConstants.SEQNUM_QUALIFIER
@@ -948,7 +941,6 @@ public static byte[] getSeqNumColumn(int replicaId) {
    * @param serverColumn the column qualifier
    * @return an int for the replicaId
    */
-  @VisibleForTesting
   static int parseReplicaIdFromServerColumn(byte[] serverColumn) {
     String serverStr = Bytes.toString(serverColumn);
 
@@ -1472,7 +1464,6 @@ public static void addSplitsToParent(Connection connection, RegionInfo regionInf
    * @param regionInfo region information
    * @throws IOException if problem connecting or updating meta
    */
-  @VisibleForTesting
   public static void addRegionToMeta(Connection connection, RegionInfo regionInfo)
       throws IOException {
     addRegionsToMeta(connection, Collections.singletonList(regionInfo), 1);
@@ -1699,7 +1690,6 @@ private static void multiMutate(Table table, byte[] row,
    * merge and split as these want to make atomic mutations across multiple rows.
    * @throws IOException even if we encounter a RuntimeException, we'll still wrap it in an IOE.
    */
-  @VisibleForTesting
   static void multiMutate(final Table table, byte[] row, final List<Mutation> mutations)
       throws IOException {
     debugLogMutations(mutations);
@@ -1752,7 +1742,6 @@ static void multiMutate(final Table table, byte[] row, final List<Mutation> muta
    * @param sn Server name
    * @param masterSystemTime wall clock time from master if passed in the open region RPC
    */
-  @VisibleForTesting
   public static void updateRegionLocation(Connection connection, RegionInfo regionInfo,
       ServerName sn, long openSeqNum, long masterSystemTime) throws IOException {
     updateLocation(connection, regionInfo, sn, openSeqNum, masterSystemTime);
@@ -1937,7 +1926,6 @@ private static void writeRegionName(ByteArrayOutputStream out, byte[] regionName
     }
   }
 
-  @VisibleForTesting
   public static byte[] getParentsBytes(List<RegionInfo> parents) {
     ByteArrayOutputStream bos = new ByteArrayOutputStream();
     Iterator<RegionInfo> iter = parents.iterator();

hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncBufferedMutatorImpl.java

@@ -30,11 +30,9 @@
 import java.util.stream.Stream;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.TableName;
-import org.apache.yetus.audience.InterfaceAudience;
-
-import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;
 import org.apache.hbase.thirdparty.io.netty.util.HashedWheelTimer;
 import org.apache.hbase.thirdparty.io.netty.util.Timeout;
+import org.apache.yetus.audience.InterfaceAudience;
 
 /**
  * The implementation of {@link AsyncBufferedMutator}. Simply wrap an {@link AsyncTable}.
@@ -60,7 +58,6 @@ class AsyncBufferedMutatorImpl implements AsyncBufferedMutator {
 
   private boolean closed;
 
-  @VisibleForTesting
   Timeout periodicFlushTask;
 
   AsyncBufferedMutatorImpl(HashedWheelTimer periodicalFlushTimer, AsyncTable<?> table,
@@ -83,7 +80,6 @@ public Configuration getConfiguration() {
   }
 
   // will be overridden in test
-  @VisibleForTesting
   protected void internalFlush() {
     if (periodicFlushTask != null) {
       periodicFlushTask.cancel();

hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncConnectionImpl.java

@@ -48,22 +48,19 @@
 import org.apache.hadoop.hbase.ipc.RpcClientFactory;
 import org.apache.hadoop.hbase.ipc.RpcControllerFactory;
 import org.apache.hadoop.hbase.security.User;
+import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.AdminService;
+import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.ClientService;
+import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos;
+import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.MasterService;
 import org.apache.hadoop.hbase.util.ConcurrentMapUtils;
 import org.apache.hadoop.hbase.util.Threads;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hbase.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
+import org.apache.hbase.thirdparty.io.netty.util.HashedWheelTimer;
 import org.apache.yetus.audience.InterfaceAudience;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;
-import org.apache.hbase.thirdparty.io.netty.util.HashedWheelTimer;
-
-import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.AdminService;
-import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.ClientService;
-import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos;
-import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.MasterService;
-
 /**
  * The implementation of AsyncConnection.
  */
@@ -72,7 +69,6 @@ class AsyncConnectionImpl implements AsyncConnection {
 
   private static final Logger LOG = LoggerFactory.getLogger(AsyncConnectionImpl.class);
 
-  @VisibleForTesting
   static final HashedWheelTimer RETRY_TIMER = new HashedWheelTimer(
     new ThreadFactoryBuilder().setNameFormat("Async-Client-Retry-Timer-pool-%d").setDaemon(true)
       .setUncaughtExceptionHandler(Threads.LOGGING_EXCEPTION_HANDLER).build(),
@@ -244,7 +240,6 @@ AsyncRegionLocator getLocator() {
   }
 
   // ditto
-  @VisibleForTesting
   public NonceGenerator getNonceGenerator() {
     return nonceGenerator;
   }

hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncNonMetaRegionLocator.java

@@ -59,13 +59,11 @@
 import org.apache.hadoop.hbase.TableNotFoundException;
 import org.apache.hadoop.hbase.client.Scan.ReadType;
 import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.hbase.thirdparty.com.google.common.base.Objects;
 import org.apache.yetus.audience.InterfaceAudience;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;
-import org.apache.hbase.thirdparty.com.google.common.base.Objects;
-
 /**
  * The asynchronous locator for regions other than meta.
  */
@@ -74,13 +72,11 @@ class AsyncNonMetaRegionLocator {
 
   private static final Logger LOG = LoggerFactory.getLogger(AsyncNonMetaRegionLocator.class);
 
-  @VisibleForTesting
   static final String MAX_CONCURRENT_LOCATE_REQUEST_PER_TABLE =
     "hbase.client.meta.max.concurrent.locate.per.table";
 
   private static final int DEFAULT_MAX_CONCURRENT_LOCATE_REQUEST_PER_TABLE = 8;
 
-  @VisibleForTesting
   static String LOCATE_PREFETCH_LIMIT = "hbase.client.locate.prefetch.limit";
 
   private static final int DEFAULT_LOCATE_PREFETCH_LIMIT = 10;
@@ -710,7 +706,6 @@ void clearCache(ServerName serverName) {
   }
 
   // only used for testing whether we have cached the location for a region.
-  @VisibleForTesting
   RegionLocations getRegionLocationInCache(TableName tableName, byte[] row) {
     TableCache tableCache = cache.get(tableName);
     if (tableCache == null) {

hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java

@@ -19,9 +19,6 @@
 
 package org.apache.hadoop.hbase.client;
 
-
-import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;
-
 import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.util.ArrayList;
@@ -40,14 +37,14 @@
 import org.apache.hadoop.hbase.RegionLocations;
 import org.apache.hadoop.hbase.ServerName;
 import org.apache.hadoop.hbase.TableName;
-import org.apache.yetus.audience.InterfaceAudience;
-import org.apache.yetus.audience.InterfaceStability;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.hadoop.hbase.client.AsyncProcessTask.SubmittedRows;
 import org.apache.hadoop.hbase.client.RequestController.ReturnCode;
 import org.apache.hadoop.hbase.ipc.RpcControllerFactory;
 import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.yetus.audience.InterfaceAudience;
+import org.apache.yetus.audience.InterfaceStability;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This class  allows a continuous flow of requests. It's written to be compatible with a
@@ -146,7 +143,6 @@ public void waitUntilDone() throws InterruptedIOException {
   final long pause;
   final long pauseForCQTBE;// pause for CallQueueTooBigException, if specified
   final int numTries;
-  @VisibleForTesting
   long serverTrackerTimeout;
   final long primaryCallTimeoutMicroseconds;
   /** Whether to log details for batch errors */
@@ -156,7 +152,6 @@ public void waitUntilDone() throws InterruptedIOException {
   /**
    * The traffic control for requests.
    */
-  @VisibleForTesting
   final RequestController requestController;
   public static final String LOG_DETAILS_PERIOD = "hbase.client.log.detail.period.ms";
   private static final int DEFAULT_LOG_DETAILS_PERIOD = 10000;
@@ -422,7 +417,6 @@ private int checkRpcTimeout(int rpcTimeout) {
     return checkTimeout("rpc timeout", rpcTimeout);
   }
 
-  @VisibleForTesting
   <CResult> AsyncRequestFutureImpl<CResult> createAsyncRequestFuture(
       AsyncProcessTask task, List<Action> actions, long nonceGroup) {
     return new AsyncRequestFutureImpl<>(task, actions, nonceGroup, this);
@@ -456,13 +450,11 @@ void decTaskCounters(Collection<byte[]> regions, ServerName sn) {
   /**
    * Create a caller. Isolated to be easily overridden in the tests.
    */
-  @VisibleForTesting
   protected RpcRetryingCaller<AbstractResponse> createCaller(
       CancellableRegionServerCallable callable, int rpcTimeout) {
     return rpcCallerFactory.<AbstractResponse> newCaller(checkRpcTimeout(rpcTimeout));
   }
 
-
   /**
    * Creates the server error tracker to use inside process.
    * Currently, to preserve the main assumption about current retries, and to work well with

hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRegionLocator.java

@@ -30,14 +30,12 @@
 import org.apache.hadoop.hbase.exceptions.TimeoutIOException;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.FutureUtils;
+import org.apache.hbase.thirdparty.io.netty.util.HashedWheelTimer;
+import org.apache.hbase.thirdparty.io.netty.util.Timeout;
 import org.apache.yetus.audience.InterfaceAudience;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;
-import org.apache.hbase.thirdparty.io.netty.util.HashedWheelTimer;
-import org.apache.hbase.thirdparty.io.netty.util.Timeout;
-
 /**
  * The asynchronous region locator.
  */
@@ -175,7 +173,6 @@ void clearCache() {
     nonMetaRegionLocator.clearCache();
   }
 
-  @VisibleForTesting
   AsyncNonMetaRegionLocator getNonMetaRegionLocator() {
     return nonMetaRegionLocator;
   }

hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.java

@@ -54,8 +54,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;
-
 /**
  * The context, and return value, for a single submit/submitAll call.
  * Note on how this class (one AP submit) works. Initially, all requests are split into groups
@@ -178,13 +176,11 @@ private void addReplicaActionsAgain(
    * Runnable (that can be submitted to thread pool) that submits MultiAction to a
    * single server. The server call is synchronous, therefore we do it on a thread pool.
    */
-  @VisibleForTesting
   final class SingleServerRequestRunnable implements Runnable {
     private final MultiAction multiAction;
     private final int numAttempt;
     private final ServerName server;
     private final Set<CancellableRegionServerCallable> callsInProgress;
-    @VisibleForTesting
     SingleServerRequestRunnable(
         MultiAction multiAction, int numAttempt, ServerName server,
         Set<CancellableRegionServerCallable> callsInProgress) {
@@ -394,12 +390,10 @@ public AsyncRequestFutureImpl(AsyncProcessTask task, List<Action> actions,
     }
   }
 
-  @VisibleForTesting
   protected Set<CancellableRegionServerCallable> getCallsInProgress() {
     return callsInProgress;
   }
 
-  @VisibleForTesting
   SingleServerRequestRunnable createSingleServerRequest(MultiAction multiAction, int numAttempt, ServerName server,
         Set<CancellableRegionServerCallable> callsInProgress) {
     return new SingleServerRequestRunnable(multiAction, numAttempt, server, callsInProgress);
@@ -920,13 +914,11 @@ private void cleanServerCache(ServerName server, Throwable regionException) {
     }
   }
 
-  @VisibleForTesting
   protected void updateStats(ServerName server, MultiResponse resp) {
     ConnectionUtils.updateStats(Optional.ofNullable(asyncProcess.connection.getStatisticsTracker()),
       Optional.ofNullable(asyncProcess.connection.getConnectionMetrics()), server, resp);
   }
 
-
   private String createLog(int numAttempt, int failureCount, int replaySize, ServerName sn,
                            Throwable error, long backOffTime, boolean willRetry, String startTime,
                            int failed, int stopped) {
@@ -1242,7 +1234,6 @@ private void updateResult(int index, Object result) {
     results[index] = result;
   }
 
-  @VisibleForTesting
   long getNumberOfActionsInProgress() {
     return actionsInProgress.get();
   }

hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncTableResultScanner.java

@@ -29,8 +29,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;
-
 /**
  * The {@link ResultScanner} implementation for {@link AsyncTable}. It will fetch data automatically
  * in background and cache it in memory. Typically the {@link #maxCacheSize} will be
@@ -177,7 +175,6 @@ public boolean renewLease() {
   }
 
   // used in tests to test whether the scanner has been suspended
-  @VisibleForTesting
   synchronized boolean isSuspended() {
     return resumer != null;
   }